- refactoring names for some classes

This commit is contained in:
Marius Stanciu
2022-03-24 18:35:44 +02:00
committed by Marius
parent cd42c40198
commit eec366ce7f
59 changed files with 4196 additions and 4193 deletions

View File

@@ -1,6 +1,6 @@
import sys
import re
import app_Main
import appMain
import abc
import collections
from PyQt6 import QtCore
@@ -9,7 +9,7 @@ from contextlib import contextmanager
class TclCommand(object):
# FlatCAMApp
# appMain class is held here
app = None
# Logger
@@ -51,10 +51,10 @@ class TclCommand(object):
self.app = app
if self.app is None:
raise TypeError('Expected app to be FlatCAMApp instance.')
raise TypeError('Expected app to be appMain instance.')
if not isinstance(self.app, app_Main.App):
raise TypeError('Expected FlatCAMApp, got %s.' % type(app))
if not isinstance(self.app, appMain.App):
raise TypeError('Expected appMain, got %s.' % type(app))
self.log = self.app.log
self.error_info = None

View File

@@ -120,7 +120,7 @@ class TclCommandAlignDrill(TclCommandSignaled):
object once it's created.
:param init_obj: The new object.
:param app_obj: The application (FlatCAMApp)
:param app_obj: The application (appMain class)
:return: None
"""

View File

@@ -92,7 +92,7 @@ class TclCommandAlignDrillGrid(TclCommandSignaled):
object once it's created.
:param init_obj: The new object.
:param app_obj: The application (FlatCAMApp)
:param app_obj: The application (appMain class)
:return: None
"""

View File

@@ -1,5 +1,5 @@
# ##########################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# FlatCAM Evo: 2D Post-processing for Manufacturing #
# File Author: Marius Adrian Stanciu (c) #
# Date: 8/17/2019 #
# MIT Licence #

View File

@@ -82,8 +82,8 @@ class TclCommandDrillcncjob(TclCommandSignaled):
('las_min_pwr', 'Used with "laser" preprocessors. Set the laser power when not cutting, travelling'),
('pp', 'This is the Excellon preprocessor name: case_sensitive, no_quotes'),
('opt_type', 'Name of move optimization type. B by default for Basic OR-Tools, M for Metaheuristic OR-Tools'
'T from Travelling Salesman Algorithm. B and M works only for 64bit version of FlatCAM and '
'T works only for 32bit version of FlatCAM'),
'T from Travelling Salesman Algorithm. B and M works only for 64bit application flavor and '
'T works only for 32bit application flavor'),
('diatol', 'Tolerance. Percentange (0.0 ... 100.0) within which dias in drilled_dias will be judged to be '
'the same as the ones in the tools from the Excellon object. E.g: if in drill_dias we have a '
'diameter with value 1.0, in the Excellon we have a tool with dia = 1.05 and we set a tolerance '

View File

@@ -1,5 +1,5 @@
# ##########################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# FlatCAM Evo: 2D Post-processing for Manufacturing #
# File Author: Marius Adrian Stanciu (c) #
# Date: 4/28/2020 #
# MIT Licence #

View File

@@ -1,5 +1,5 @@
# ##########################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# FlatCAM Evo: 2D Post-processing for Manufacturing #
# File Author: Marius Adrian Stanciu (c) #
# Date: 8/17/2019 #
# MIT Licence #

View File

@@ -1,5 +1,5 @@
# ##########################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# FlatCAM Evo: 2D Post-processing for Manufacturing #
# File Author: Marius Adrian Stanciu (c) #
# Content was borrowed from FlatCAM proper #
# Date: 4/22/2020 #

View File

@@ -1,5 +1,5 @@
from tclCommands.TclCommand import TclCommand
from appObjects.FlatCAMExcellon import ExcellonObject
from appObjects.ExcellonObject import ExcellonObject
import collections

View File

@@ -1,5 +1,5 @@
from tclCommands.TclCommand import TclCommand
from appObjects.FlatCAMGeometry import GeometryObject
from appObjects.GeometryObject import GeometryObject
import collections

View File

@@ -1,5 +1,5 @@
# ##########################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# FlatCAM Evo: 2D Post-processing for Manufacturing #
# File Author: Marius Adrian Stanciu (c) #
# Date: 8/17/2019 #
# MIT Licence #

View File

@@ -1,5 +1,5 @@
# ##########################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# FlatCAM Evo: 2D Post-processing for Manufacturing #
# File Author: Marius Adrian Stanciu (c) #
# Date: 8/17/2019 #
# MIT Licence #

View File

@@ -1,5 +1,5 @@
# ##########################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# FlatCAM Evo: 2D Post-processing for Manufacturing #
# File Author: Marius Adrian Stanciu (c) #
# Date: 8/17/2019 #
# MIT Licence #

View File

@@ -1,5 +1,5 @@
# ##########################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# FlatCAM Evo: 2D Post-processing for Manufacturing #
# File Author: Marius Adrian Stanciu (c) #
# Date: 8/17/2019 #
# MIT Licence #

View File

@@ -1,5 +1,5 @@
# ##########################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# FlatCAM Evo: 2D Post-processing for Manufacturing #
# File Author: Marius Adrian Stanciu (c) #
# Date: 8/17/2019 #
# MIT Licence #

View File

@@ -5,13 +5,13 @@ import collections
class TclCommandOpenProject(TclCommandSignaled):
"""
Tcl shell command to open a FlatCAM project.
Tcl shell command to open an application project.
"""
# array of all command aliases, to be able use old names for backward compatibility (add_poly, add_polygon)
aliases = ['open_project']
description = '%s %s' % ("--", "Opens an FlatCAm project file, parse it and recreate all the objects.")
description = '%s %s' % ("--", "Opens an application project file, parse it and recreate all the objects.")
# Dictionary of types from Tcl command, needs to be ordered.
# For positional arguments
@@ -30,7 +30,7 @@ class TclCommandOpenProject(TclCommandSignaled):
# structured help for current command, args needs to be ordered
help = {
'main': "Opens an FlatCAm project file, parse it and recreate all the objects.",
'main': "Opens an application project file, parse it and recreate all the objects.",
'args': collections.OrderedDict([
('filename', 'Absolute path to file to open. Required.\n'
'WARNING: no spaces are allowed. If unsure enclose the entire path with quotes.'),

View File

@@ -1,5 +1,5 @@
# ##########################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# FlatCAM Evo: 2D Post-processing for Manufacturing #
# File Author: Marius Adrian Stanciu (c) #
# Date: 8/17/2019 #
# MIT Licence #

View File

@@ -1,5 +1,5 @@
# ##########################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# FlatCAM Evo: 2D Post-processing for Manufacturing #
# File Author: Marius Adrian Stanciu (c) #
# Date: 8/17/2019 #
# MIT Licence #
@@ -13,7 +13,7 @@ import collections
class TclCommandQuit(TclCommand):
"""
Tcl shell command to quit FlatCAM from Tcl shell.
Tcl shell command to quit the application from Tcl shell.
example:
@@ -22,7 +22,7 @@ class TclCommandQuit(TclCommand):
# List of all command aliases, to be able use old names for backward compatibility (add_poly, add_polygon)
aliases = ['quit_app']
description = '%s %s' % ("--", "Tcl shell command to quit FlatCAM from Tcl shell.")
description = '%s %s' % ("--", "Tcl shell command to quit the application from Tcl shell.")
# Dictionary of types from Tcl command, needs to be ordered
arg_names = collections.OrderedDict([
@@ -39,7 +39,7 @@ class TclCommandQuit(TclCommand):
# structured help for current command, args needs to be ordered
help = {
'main': "Tcl shell command to quit FlatCAM from Tcl shell.",
'main': "Tcl shell command to quit the application from Tcl shell.",
'args': collections.OrderedDict([
]),

View File

@@ -5,13 +5,13 @@ import collections
class TclCommandSaveProject(TclCommandSignaled):
"""
Tcl shell command to save the FlatCAM project to file.
Tcl shell command to save the application project to file.
"""
# array of all command aliases, to be able use old names for backward compatibility (add_poly, add_polygon)
aliases = ['save_project']
description = '%s %s' % ("--", "Saves the FlatCAM project to file.")
description = '%s %s' % ("--", "Saves the application project to file.")
# Dictionary of types from Tcl command, needs to be ordered.
# For positional arguments
@@ -30,7 +30,7 @@ class TclCommandSaveProject(TclCommandSignaled):
# structured help for current command, args needs to be ordered
help = {
'main': "Saves the FlatCAM project to file.",
'main': "Saves the application project to file.",
'args': collections.OrderedDict([
('filename', 'Absolute path to file to save. Required.\n'
'WARNING: no spaces are allowed. If unsure enclose the entire path with quotes.'),

View File

@@ -14,7 +14,7 @@ class TclCommandSetActive(TclCommand):
# List of all command aliases, to be able use old names for backward compatibility (add_poly, add_polygon)
aliases = ['set_active']
description = '%s %s' % ("--", "Sets a FlatCAM object as active (selected).")
description = '%s %s' % ("--", "Sets an application object as active (selected).")
# Dictionary of types from Tcl command, needs to be ordered
arg_names = collections.OrderedDict([
@@ -31,9 +31,9 @@ class TclCommandSetActive(TclCommand):
# structured help for current command, args needs to be ordered
help = {
'main': 'Sets a FlatCAM object as active (selected).',
'main': 'Sets an application object as active (selected).',
'args': collections.OrderedDict([
('name', 'Name of the FlatCAM object to be set as active (selected). Required.'),
('name', 'Name of the application object to be set as active (selected). Required.'),
]),
'examples': ['set_active object_name']
}

View File

@@ -1,5 +1,5 @@
# ##########################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# FlatCAM Evo: 2D Post-processing for Manufacturing #
# File Author: Marius Adrian Stanciu (c) #
# Date: 8/17/2019 #
# MIT Licence #
@@ -25,7 +25,7 @@ log = logging.getLogger('base')
class TclCommandSetOrigin(TclCommand):
"""
Tcl shell command to set the origin to zero or to a specified location for all loaded objects in FlatCAM.
Tcl shell command to set the origin to zero or to a specified location for all loaded objects in the application.
example:

View File

@@ -1,5 +1,5 @@
# ##########################################################
# FlatCAM: 2D Post-processing for Manufacturing #
# FlatCAM Evo: 2D Post-processing for Manufacturing #
# File Author: Marius Adrian Stanciu (c) #
# Date: 4/28/2020 #
# MIT Licence #

View File

@@ -1,5 +1,5 @@
from tclCommands.TclCommand import TclCommand
from appObjects.FlatCAMGeometry import GeometryObject
from appObjects.GeometryObject import GeometryObject
import collections
from copy import deepcopy