From a0a805217dd7d04af1ae1aac7b4c3a1711ba9fdb Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Mon, 18 May 2020 16:11:02 +0300 Subject: [PATCH] - removed reference to postprocessors and replaced it with preprocessors --- AppEditors/FlatCAMGeoEditor.py | 28 +++++++++++------------ AppEditors/FlatCAMGrbEditor.py | 10 ++++---- AppPreProcessor.py | 8 +++---- AppTool.py | 6 ++--- AppTools/ToolAlignObjects.py | 10 ++++---- AppTools/ToolCalculators.py | 10 ++++---- AppTools/ToolCalibration.py | 10 ++++---- AppTools/ToolCopperThieving.py | 10 ++++---- AppTools/ToolCorners.py | 10 ++++---- AppTools/ToolCutOut.py | 10 ++++---- AppTools/ToolDblSided.py | 10 ++++---- AppTools/ToolDistance.py | 8 +++---- AppTools/ToolDistanceMin.py | 8 +++---- AppTools/ToolExtractDrills.py | 10 ++++---- AppTools/ToolFiducials.py | 10 ++++---- AppTools/ToolFilm.py | 10 ++++---- AppTools/ToolImage.py | 10 ++++---- AppTools/ToolInvertGerber.py | 10 ++++---- AppTools/ToolMove.py | 8 +++---- AppTools/ToolNCC.py | 10 ++++---- AppTools/ToolOptimal.py | 10 ++++---- AppTools/ToolPDF.py | 8 +++---- AppTools/ToolPaint.py | 10 ++++---- AppTools/ToolPanelize.py | 10 ++++---- AppTools/ToolPcbWizard.py | 10 ++++---- AppTools/ToolProperties.py | 10 ++++---- AppTools/ToolPunchGerber.py | 10 ++++---- AppTools/ToolQRCode.py | 10 ++++---- AppTools/ToolRulesCheck.py | 10 ++++---- AppTools/ToolSolderPaste.py | 10 ++++---- AppTools/ToolSub.py | 10 ++++---- AppTools/ToolTransform.py | 10 ++++---- CHANGELOG.md | 1 + Common.py | 24 +++++++++---------- locale/de/LC_MESSAGES/strings.po | 4 ++-- locale/en/LC_MESSAGES/strings.po | 4 ++-- locale/es/LC_MESSAGES/strings.po | 4 ++-- locale/fr/LC_MESSAGES/strings.po | 4 ++-- locale/hu/LC_MESSAGES/strings.po | 4 ++-- locale/it/LC_MESSAGES/strings.po | 4 ++-- locale/pt_BR/LC_MESSAGES/strings.po | 4 ++-- locale/ro/LC_MESSAGES/strings.po | 4 ++-- locale/ru/LC_MESSAGES/strings.po | 4 ++-- locale_template/strings.pot | 4 ++-- preprocessors/Berta_CNC.py | 2 +- preprocessors/GRBL_laser.py | 2 +- preprocessors/ISEL_CNC.py | 2 +- preprocessors/ISEL_ICP_CNC.py | 2 +- preprocessors/Marlin.py | 2 +- preprocessors/Marlin_laser_FAN_pin.py | 2 +- preprocessors/Marlin_laser_Spindle_pin.py | 2 +- preprocessors/Paste_1.py | 2 +- preprocessors/Repetier.py | 2 +- preprocessors/Roland_MDX_20.py | 2 +- preprocessors/Toolchange_Custom.py | 2 +- preprocessors/Toolchange_Manual.py | 2 +- preprocessors/Toolchange_Probe_MACH3.py | 2 +- preprocessors/default.py | 2 +- preprocessors/grbl_11.py | 2 +- preprocessors/hpgl.py | 2 +- preprocessors/line_xyz.py | 2 +- 61 files changed, 212 insertions(+), 211 deletions(-) diff --git a/AppEditors/FlatCAMGeoEditor.py b/AppEditors/FlatCAMGeoEditor.py index 4834cae8..160038b4 100644 --- a/AppEditors/FlatCAMGeoEditor.py +++ b/AppEditors/FlatCAMGeoEditor.py @@ -15,7 +15,7 @@ from PyQt5 import QtGui, QtCore, QtWidgets from PyQt5.QtCore import Qt, QSettings from camlib import distance, arc, three_point_circle, Geometry, FlatCAMRTreeStorage -from AppTool import FlatCAMTool +from AppTool import AppTool from AppGUI.ObjectUI import RadioSet from AppGUI.GUIElements import OptionalInputSection, FCCheckBox, FCEntry, FCComboBox, FCTextAreaRich, \ FCTable, FCDoubleSpinner, FCButton, EvalEntry2, FCInputDialog, FCTree @@ -42,7 +42,7 @@ if '_' not in builtins.__dict__: _ = gettext.gettext -class BufferSelectionTool(FlatCAMTool): +class BufferSelectionTool(AppTool): """ Simple input for buffer distance. """ @@ -50,7 +50,7 @@ class BufferSelectionTool(FlatCAMTool): toolName = "Buffer Selection" def __init__(self, app, draw_app): - FlatCAMTool.__init__(self, app) + AppTool.__init__(self, app) self.draw_app = draw_app self.decimals = app.decimals @@ -123,7 +123,7 @@ class BufferSelectionTool(FlatCAMTool): def run(self): self.app.defaults.report_usage("Geo Editor ToolBuffer()") - FlatCAMTool.run(self) + AppTool.run(self) # if the splitter us hidden, display it if self.app.ui.splitter.sizes()[0] == 0: @@ -187,7 +187,7 @@ class BufferSelectionTool(FlatCAMTool): self.app.ui.notebook.setCurrentWidget(self.app.ui.project_tab) -class TextInputTool(FlatCAMTool): +class TextInputTool(AppTool): """ Simple input for buffer distance. """ @@ -195,7 +195,7 @@ class TextInputTool(FlatCAMTool): toolName = "Text Input Tool" def __init__(self, app): - FlatCAMTool.__init__(self, app) + AppTool.__init__(self, app) self.app = app self.text_path = [] @@ -340,7 +340,7 @@ class TextInputTool(FlatCAMTool): def run(self): self.app.defaults.report_usage("Geo Editor TextInputTool()") - FlatCAMTool.run(self) + AppTool.run(self) # if the splitter us hidden, display it if self.app.ui.splitter.sizes()[0] == 0: @@ -405,7 +405,7 @@ class TextInputTool(FlatCAMTool): self.app.ui.notebook.setTabText(2, _("Tool")) -class PaintOptionsTool(FlatCAMTool): +class PaintOptionsTool(AppTool): """ Inputs to specify how to paint the selected polygons. """ @@ -413,7 +413,7 @@ class PaintOptionsTool(FlatCAMTool): toolName = "Paint Tool" def __init__(self, app, fcdraw): - FlatCAMTool.__init__(self, app) + AppTool.__init__(self, app) self.app = app self.fcdraw = fcdraw @@ -538,7 +538,7 @@ class PaintOptionsTool(FlatCAMTool): def run(self): self.app.defaults.report_usage("Geo Editor ToolPaint()") - FlatCAMTool.run(self) + AppTool.run(self) # if the splitter us hidden, display it if self.app.ui.splitter.sizes()[0] == 0: @@ -599,7 +599,7 @@ class PaintOptionsTool(FlatCAMTool): self.app.ui.splitter.setSizes([0, 1]) -class TransformEditorTool(FlatCAMTool): +class TransformEditorTool(AppTool): """ Inputs to specify how to paint the selected polygons. """ @@ -612,7 +612,7 @@ class TransformEditorTool(FlatCAMTool): offsetName = _("Offset") def __init__(self, app, draw_app): - FlatCAMTool.__init__(self, app) + AppTool.__init__(self, app) self.app = app self.draw_app = draw_app @@ -981,7 +981,7 @@ class TransformEditorTool(FlatCAMTool): def run(self): self.app.defaults.report_usage("Geo Editor Transform Tool()") - FlatCAMTool.run(self) + AppTool.run(self) self.set_tool_ui() # if the splitter us hidden, display it @@ -991,7 +991,7 @@ class TransformEditorTool(FlatCAMTool): self.app.ui.notebook.setTabText(2, _("Transform Tool")) def install(self, icon=None, separator=None, **kwargs): - FlatCAMTool.install(self, icon, separator, shortcut='Alt+T', **kwargs) + AppTool.install(self, icon, separator, shortcut='Alt+T', **kwargs) def set_tool_ui(self): # Initialize form diff --git a/AppEditors/FlatCAMGrbEditor.py b/AppEditors/FlatCAMGrbEditor.py index b935d16a..c0b2acbb 100644 --- a/AppEditors/FlatCAMGrbEditor.py +++ b/AppEditors/FlatCAMGrbEditor.py @@ -22,7 +22,7 @@ import logging from camlib import distance, arc, three_point_circle from AppGUI.GUIElements import FCEntry, FCComboBox, FCTable, FCDoubleSpinner, FCSpinner, RadioSet, \ EvalEntry2, FCInputDialog, FCButton, OptionalInputSection, FCCheckBox -from AppTool import FlatCAMTool +from AppTool import AppTool import numpy as np from numpy.linalg import norm as numpy_norm @@ -5278,7 +5278,7 @@ class FlatCAMGrbEditor(QtCore.QObject): self.app.ui.notebook.setCurrentWidget(self.app.ui.selected_tab) -class TransformEditorTool(FlatCAMTool): +class TransformEditorTool(AppTool): """ Inputs to specify how to paint the selected polygons. """ @@ -5291,7 +5291,7 @@ class TransformEditorTool(FlatCAMTool): offsetName = _("Offset") def __init__(self, app, draw_app): - FlatCAMTool.__init__(self, app) + AppTool.__init__(self, app) self.app = app self.draw_app = draw_app @@ -5677,13 +5677,13 @@ class TransformEditorTool(FlatCAMTool): except AttributeError: pass - FlatCAMTool.run(self) + AppTool.run(self) self.set_tool_ui() self.app.ui.notebook.setTabText(2, _("Transform Tool")) def install(self, icon=None, separator=None, **kwargs): - FlatCAMTool.install(self, icon, separator, shortcut='Alt+T', **kwargs) + AppTool.install(self, icon, separator, shortcut='Alt+T', **kwargs) def set_tool_ui(self): # Initialize form diff --git a/AppPreProcessor.py b/AppPreProcessor.py index 15991d80..4ae297f7 100644 --- a/AppPreProcessor.py +++ b/AppPreProcessor.py @@ -19,10 +19,10 @@ log = logging.getLogger('base') preprocessors = {} -class ABCPostProcRegister(ABCMeta): +class ABCPreProcRegister(ABCMeta): # handles preprocessors registration on instantiation def __new__(cls, clsname, bases, attrs): - newclass = super(ABCPostProcRegister, cls).__new__(cls, clsname, bases, attrs) + newclass = super(ABCPreProcRegister, cls).__new__(cls, clsname, bases, attrs) if object not in bases: if newclass.__name__ in preprocessors: log.warning('Preprocessor %s has been overriden' % newclass.__name__) @@ -30,7 +30,7 @@ class ABCPostProcRegister(ABCMeta): return newclass -class FlatCAMPostProc(object, metaclass=ABCPostProcRegister): +class PreProc(object, metaclass=ABCPreProcRegister): @abstractmethod def start_code(self, p): pass @@ -76,7 +76,7 @@ class FlatCAMPostProc(object, metaclass=ABCPostProcRegister): pass -class FlatCAMPostProc_Tools(object, metaclass=ABCPostProcRegister): +class AppPreProcTools(object, metaclass=ABCPreProcRegister): @abstractmethod def start_code(self, p): pass diff --git a/AppTool.py b/AppTool.py index 9eb30c3c..1f3c1ba4 100644 --- a/AppTool.py +++ b/AppTool.py @@ -20,7 +20,7 @@ if '_' not in builtins.__dict__: _ = gettext.gettext -class FlatCAMTool(QtWidgets.QWidget): +class AppTool(QtWidgets.QWidget): toolName = "FlatCAM Generic Tool" @@ -30,7 +30,7 @@ class FlatCAMTool(QtWidgets.QWidget): :param app: The application this tool will run in. :type app: App :param parent: Qt Parent - :return: FlatCAMTool + :return: AppTool """ self.app = app self.decimals = app.decimals @@ -294,5 +294,5 @@ class FlatCAMTool(QtWidgets.QWidget): I've overloaded this just in case I will need to make changes in the future to enforce dimensions :return: """ - default_hint_size = super(FlatCAMTool, self).sizeHint() + default_hint_size = super(AppTool, self).sizeHint() return QtCore.QSize(default_hint_size.width(), default_hint_size.height()) diff --git a/AppTools/ToolAlignObjects.py b/AppTools/ToolAlignObjects.py index af593211..f158e386 100644 --- a/AppTools/ToolAlignObjects.py +++ b/AppTools/ToolAlignObjects.py @@ -6,7 +6,7 @@ # ########################################################## from PyQt5 import QtWidgets, QtGui, QtCore -from AppTool import FlatCAMTool +from AppTool import AppTool from AppGUI.GUIElements import FCComboBox, RadioSet @@ -27,12 +27,12 @@ if '_' not in builtins.__dict__: log = logging.getLogger('base') -class AlignObjects(FlatCAMTool): +class AlignObjects(AppTool): toolName = _("Align AppObjects") def __init__(self, app): - FlatCAMTool.__init__(self, app) + AppTool.__init__(self, app) self.app = app self.decimals = app.decimals @@ -238,13 +238,13 @@ class AlignObjects(FlatCAMTool): if self.app.ui.splitter.sizes()[0] == 0: self.app.ui.splitter.setSizes([1, 1]) - FlatCAMTool.run(self) + AppTool.run(self) self.set_tool_ui() self.app.ui.notebook.setTabText(2, _("Align Tool")) def install(self, icon=None, separator=None, **kwargs): - FlatCAMTool.install(self, icon, separator, shortcut='Alt+A', **kwargs) + AppTool.install(self, icon, separator, shortcut='Alt+A', **kwargs) def set_tool_ui(self): self.reset_fields() diff --git a/AppTools/ToolCalculators.py b/AppTools/ToolCalculators.py index 064ec784..08edc27d 100644 --- a/AppTools/ToolCalculators.py +++ b/AppTools/ToolCalculators.py @@ -6,7 +6,7 @@ # ########################################################## from PyQt5 import QtWidgets -from AppTool import FlatCAMTool +from AppTool import AppTool from AppGUI.GUIElements import FCSpinner, FCDoubleSpinner, FCEntry import math @@ -19,7 +19,7 @@ if '_' not in builtins.__dict__: _ = gettext.gettext -class ToolCalculator(FlatCAMTool): +class ToolCalculator(AppTool): toolName = _("Calculators") v_shapeName = _("V-Shape Tool Calculator") @@ -27,7 +27,7 @@ class ToolCalculator(FlatCAMTool): eplateName = _("ElectroPlating Calculator") def __init__(self, app): - FlatCAMTool.__init__(self, app) + AppTool.__init__(self, app) self.app = app self.decimals = self.app.decimals @@ -292,14 +292,14 @@ class ToolCalculator(FlatCAMTool): if self.app.ui.splitter.sizes()[0] == 0: self.app.ui.splitter.setSizes([1, 1]) - FlatCAMTool.run(self) + AppTool.run(self) self.set_tool_ui() self.app.ui.notebook.setTabText(2, _("Calc. Tool")) def install(self, icon=None, separator=None, **kwargs): - FlatCAMTool.install(self, icon, separator, shortcut='Alt+C', **kwargs) + AppTool.install(self, icon, separator, shortcut='Alt+C', **kwargs) def set_tool_ui(self): self.units = self.app.defaults['units'].upper() diff --git a/AppTools/ToolCalibration.py b/AppTools/ToolCalibration.py index 05a51df7..71bbd1e3 100644 --- a/AppTools/ToolCalibration.py +++ b/AppTools/ToolCalibration.py @@ -7,7 +7,7 @@ from PyQt5 import QtWidgets, QtCore, QtGui -from AppTool import FlatCAMTool +from AppTool import AppTool from AppGUI.GUIElements import FCDoubleSpinner, EvalEntry, FCCheckBox, OptionalInputSection, FCEntry from AppGUI.GUIElements import FCTable, FCComboBox, RadioSet from AppEditors.FlatCAMTextEditor import TextEditor @@ -32,12 +32,12 @@ if '_' not in builtins.__dict__: log = logging.getLogger('base') -class ToolCalibration(FlatCAMTool): +class ToolCalibration(AppTool): toolName = _("Calibration Tool") def __init__(self, app): - FlatCAMTool.__init__(self, app) + AppTool.__init__(self, app) self.app = app self.canvas = self.app.plotcanvas @@ -752,14 +752,14 @@ class ToolCalibration(FlatCAMTool): if self.app.ui.splitter.sizes()[0] == 0: self.app.ui.splitter.setSizes([1, 1]) - FlatCAMTool.run(self) + AppTool.run(self) self.set_tool_ui() self.app.ui.notebook.setTabText(2, _("Calibration Tool")) def install(self, icon=None, separator=None, **kwargs): - FlatCAMTool.install(self, icon, separator, shortcut='Alt+E', **kwargs) + AppTool.install(self, icon, separator, shortcut='Alt+E', **kwargs) def set_tool_ui(self): self.units = self.app.defaults['units'].upper() diff --git a/AppTools/ToolCopperThieving.py b/AppTools/ToolCopperThieving.py index 3a2de2ae..aa5510f7 100644 --- a/AppTools/ToolCopperThieving.py +++ b/AppTools/ToolCopperThieving.py @@ -8,7 +8,7 @@ from PyQt5 import QtWidgets, QtCore from Common import GracefulException as grace -from AppTool import FlatCAMTool +from AppTool import AppTool from AppGUI.GUIElements import FCDoubleSpinner, RadioSet, FCEntry, FCComboBox import shapely.geometry.base as base @@ -33,13 +33,13 @@ if '_' not in builtins.__dict__: log = logging.getLogger('base') -class ToolCopperThieving(FlatCAMTool): +class ToolCopperThieving(AppTool): work_finished = QtCore.pyqtSignal() toolName = _("Copper Thieving Tool") def __init__(self, app): - FlatCAMTool.__init__(self, app) + AppTool.__init__(self, app) self.app = app self.canvas = self.app.plotcanvas @@ -561,14 +561,14 @@ class ToolCopperThieving(FlatCAMTool): if self.app.ui.splitter.sizes()[0] == 0: self.app.ui.splitter.setSizes([1, 1]) - FlatCAMTool.run(self) + AppTool.run(self) self.set_tool_ui() self.app.ui.notebook.setTabText(2, _("Copper Thieving Tool")) def install(self, icon=None, separator=None, **kwargs): - FlatCAMTool.install(self, icon, separator, shortcut='Alt+F', **kwargs) + AppTool.install(self, icon, separator, shortcut='Alt+F', **kwargs) def set_tool_ui(self): self.units = self.app.defaults['units'] diff --git a/AppTools/ToolCorners.py b/AppTools/ToolCorners.py index add54622..e1d087ab 100644 --- a/AppTools/ToolCorners.py +++ b/AppTools/ToolCorners.py @@ -7,7 +7,7 @@ from PyQt5 import QtWidgets, QtCore -from AppTool import FlatCAMTool +from AppTool import AppTool from AppGUI.GUIElements import FCDoubleSpinner, FCCheckBox, FCComboBox, FCButton from shapely.geometry import MultiPolygon, LineString @@ -26,12 +26,12 @@ if '_' not in builtins.__dict__: log = logging.getLogger('base') -class ToolCorners(FlatCAMTool): +class ToolCorners(AppTool): toolName = _("Corner Markers Tool") def __init__(self, app): - FlatCAMTool.__init__(self, app) + AppTool.__init__(self, app) self.app = app self.canvas = self.app.plotcanvas @@ -218,14 +218,14 @@ class ToolCorners(FlatCAMTool): if self.app.ui.splitter.sizes()[0] == 0: self.app.ui.splitter.setSizes([1, 1]) - FlatCAMTool.run(self) + AppTool.run(self) self.set_tool_ui() self.app.ui.notebook.setTabText(2, _("Corners Tool")) def install(self, icon=None, separator=None, **kwargs): - FlatCAMTool.install(self, icon, separator, shortcut='Alt+M', **kwargs) + AppTool.install(self, icon, separator, shortcut='Alt+M', **kwargs) def set_tool_ui(self): self.units = self.app.defaults['units'] diff --git a/AppTools/ToolCutOut.py b/AppTools/ToolCutOut.py index f401d0da..105eda45 100644 --- a/AppTools/ToolCutOut.py +++ b/AppTools/ToolCutOut.py @@ -6,7 +6,7 @@ # ########################################################## from PyQt5 import QtWidgets, QtGui, QtCore -from AppTool import FlatCAMTool +from AppTool import AppTool from AppGUI.GUIElements import FCDoubleSpinner, FCCheckBox, RadioSet, FCComboBox, OptionalInputSection, FCButton from shapely.geometry import box, MultiPolygon, Polygon, LineString, LinearRing @@ -36,12 +36,12 @@ else: machinist_setting = 0 -class CutOut(FlatCAMTool): +class CutOut(AppTool): toolName = _("Cutout PCB") def __init__(self, app): - FlatCAMTool.__init__(self, app) + AppTool.__init__(self, app) self.app = app self.canvas = app.plotcanvas @@ -434,13 +434,13 @@ class CutOut(FlatCAMTool): if self.app.ui.splitter.sizes()[0] == 0: self.app.ui.splitter.setSizes([1, 1]) - FlatCAMTool.run(self) + AppTool.run(self) self.set_tool_ui() self.app.ui.notebook.setTabText(2, _("Cutout Tool")) def install(self, icon=None, separator=None, **kwargs): - FlatCAMTool.install(self, icon, separator, shortcut='Alt+X', **kwargs) + AppTool.install(self, icon, separator, shortcut='Alt+X', **kwargs) def set_tool_ui(self): self.reset_fields() diff --git a/AppTools/ToolDblSided.py b/AppTools/ToolDblSided.py index aa9beea6..a987ee55 100644 --- a/AppTools/ToolDblSided.py +++ b/AppTools/ToolDblSided.py @@ -1,7 +1,7 @@ from PyQt5 import QtWidgets, QtCore -from AppTool import FlatCAMTool +from AppTool import AppTool from AppGUI.GUIElements import RadioSet, FCDoubleSpinner, EvalEntry, FCEntry, FCButton, FCComboBox from numpy import Inf @@ -21,12 +21,12 @@ if '_' not in builtins.__dict__: log = logging.getLogger('base') -class DblSidedTool(FlatCAMTool): +class DblSidedTool(AppTool): toolName = _("2-Sided PCB") def __init__(self, app): - FlatCAMTool.__init__(self, app) + AppTool.__init__(self, app) self.decimals = self.app.decimals # ## Title @@ -511,7 +511,7 @@ class DblSidedTool(FlatCAMTool): self.drill_values = "" def install(self, icon=None, separator=None, **kwargs): - FlatCAMTool.install(self, icon, separator, shortcut='Alt+D', **kwargs) + AppTool.install(self, icon, separator, shortcut='Alt+D', **kwargs) def run(self, toggle=True): self.app.defaults.report_usage("Tool2Sided()") @@ -535,7 +535,7 @@ class DblSidedTool(FlatCAMTool): if self.app.ui.splitter.sizes()[0] == 0: self.app.ui.splitter.setSizes([1, 1]) - FlatCAMTool.run(self) + AppTool.run(self) self.set_tool_ui() self.app.ui.notebook.setTabText(2, _("2-Sided Tool")) diff --git a/AppTools/ToolDistance.py b/AppTools/ToolDistance.py index bfdce01a..6798ae8e 100644 --- a/AppTools/ToolDistance.py +++ b/AppTools/ToolDistance.py @@ -7,7 +7,7 @@ from PyQt5 import QtWidgets, QtCore -from AppTool import FlatCAMTool +from AppTool import AppTool from AppGUI.VisPyVisuals import * from AppGUI.GUIElements import FCEntry, FCButton, FCCheckBox @@ -30,12 +30,12 @@ if '_' not in builtins.__dict__: log = logging.getLogger('base') -class Distance(FlatCAMTool): +class Distance(AppTool): toolName = _("Distance Tool") def __init__(self, app): - FlatCAMTool.__init__(self, app) + AppTool.__init__(self, app) self.app = app self.decimals = self.app.decimals @@ -208,7 +208,7 @@ class Distance(FlatCAMTool): self.deactivate_measure_tool() def install(self, icon=None, separator=None, **kwargs): - FlatCAMTool.install(self, icon, separator, shortcut='Ctrl+M', **kwargs) + AppTool.install(self, icon, separator, shortcut='Ctrl+M', **kwargs) def set_tool_ui(self): # Remove anything else in the AppGUI diff --git a/AppTools/ToolDistanceMin.py b/AppTools/ToolDistanceMin.py index 052f20dc..87f56678 100644 --- a/AppTools/ToolDistanceMin.py +++ b/AppTools/ToolDistanceMin.py @@ -6,7 +6,7 @@ # ########################################################## from PyQt5 import QtWidgets, QtCore -from AppTool import FlatCAMTool +from AppTool import AppTool from AppGUI.VisPyVisuals import * from AppGUI.GUIElements import FCEntry @@ -27,12 +27,12 @@ if '_' not in builtins.__dict__: log = logging.getLogger('base') -class DistanceMin(FlatCAMTool): +class DistanceMin(AppTool): toolName = _("Minimum Distance Tool") def __init__(self, app): - FlatCAMTool.__init__(self, app) + AppTool.__init__(self, app) self.app = app self.canvas = self.app.plotcanvas @@ -155,7 +155,7 @@ class DistanceMin(FlatCAMTool): _("Select two objects and no more, to measure the distance between them ...")) def install(self, icon=None, separator=None, **kwargs): - FlatCAMTool.install(self, icon, separator, shortcut='Shift+M', **kwargs) + AppTool.install(self, icon, separator, shortcut='Shift+M', **kwargs) def set_tool_ui(self): # Remove anything else in the AppGUI diff --git a/AppTools/ToolExtractDrills.py b/AppTools/ToolExtractDrills.py index 242a35ce..d9ac5d4b 100644 --- a/AppTools/ToolExtractDrills.py +++ b/AppTools/ToolExtractDrills.py @@ -7,7 +7,7 @@ from PyQt5 import QtWidgets, QtCore -from AppTool import FlatCAMTool +from AppTool import AppTool from AppGUI.GUIElements import RadioSet, FCDoubleSpinner, FCCheckBox, FCComboBox from shapely.geometry import Point @@ -24,12 +24,12 @@ if '_' not in builtins.__dict__: log = logging.getLogger('base') -class ToolExtractDrills(FlatCAMTool): +class ToolExtractDrills(AppTool): toolName = _("Extract Drills") def __init__(self, app): - FlatCAMTool.__init__(self, app) + AppTool.__init__(self, app) self.decimals = self.app.decimals # ## Title @@ -363,7 +363,7 @@ class ToolExtractDrills(FlatCAMTool): ) def install(self, icon=None, separator=None, **kwargs): - FlatCAMTool.install(self, icon, separator, shortcut='Alt+I', **kwargs) + AppTool.install(self, icon, separator, shortcut='Alt+I', **kwargs) def run(self, toggle=True): self.app.defaults.report_usage("Extract Drills()") @@ -387,7 +387,7 @@ class ToolExtractDrills(FlatCAMTool): if self.app.ui.splitter.sizes()[0] == 0: self.app.ui.splitter.setSizes([1, 1]) - FlatCAMTool.run(self) + AppTool.run(self) self.set_tool_ui() self.app.ui.notebook.setTabText(2, _("Extract Drills Tool")) diff --git a/AppTools/ToolFiducials.py b/AppTools/ToolFiducials.py index 906214c9..b43e0944 100644 --- a/AppTools/ToolFiducials.py +++ b/AppTools/ToolFiducials.py @@ -7,7 +7,7 @@ from PyQt5 import QtWidgets, QtCore -from AppTool import FlatCAMTool +from AppTool import AppTool from AppGUI.GUIElements import FCDoubleSpinner, RadioSet, EvalEntry, FCTable, FCComboBox from shapely.geometry import Point, Polygon, MultiPolygon, LineString @@ -28,12 +28,12 @@ if '_' not in builtins.__dict__: log = logging.getLogger('base') -class ToolFiducials(FlatCAMTool): +class ToolFiducials(AppTool): toolName = _("Fiducials Tool") def __init__(self, app): - FlatCAMTool.__init__(self, app) + AppTool.__init__(self, app) self.app = app self.canvas = self.app.plotcanvas @@ -389,14 +389,14 @@ class ToolFiducials(FlatCAMTool): if self.app.ui.splitter.sizes()[0] == 0: self.app.ui.splitter.setSizes([1, 1]) - FlatCAMTool.run(self) + AppTool.run(self) self.set_tool_ui() self.app.ui.notebook.setTabText(2, _("Fiducials Tool")) def install(self, icon=None, separator=None, **kwargs): - FlatCAMTool.install(self, icon, separator, shortcut='Alt+J', **kwargs) + AppTool.install(self, icon, separator, shortcut='Alt+J', **kwargs) def set_tool_ui(self): self.units = self.app.defaults['units'] diff --git a/AppTools/ToolFilm.py b/AppTools/ToolFilm.py index 7141d780..a2ffd94f 100644 --- a/AppTools/ToolFilm.py +++ b/AppTools/ToolFilm.py @@ -7,7 +7,7 @@ from PyQt5 import QtGui, QtCore, QtWidgets -from AppTool import FlatCAMTool +from AppTool import AppTool from AppGUI.GUIElements import RadioSet, FCDoubleSpinner, FCCheckBox, \ OptionalHideInputSection, OptionalInputSection, FCComboBox, FCFileSaveDialog @@ -37,12 +37,12 @@ if '_' not in builtins.__dict__: log = logging.getLogger('base') -class Film(FlatCAMTool): +class Film(AppTool): toolName = _("Film PCB") def __init__(self, app): - FlatCAMTool.__init__(self, app) + AppTool.__init__(self, app) self.decimals = self.app.decimals @@ -562,14 +562,14 @@ class Film(FlatCAMTool): if self.app.ui.splitter.sizes()[0] == 0: self.app.ui.splitter.setSizes([1, 1]) - FlatCAMTool.run(self) + AppTool.run(self) self.set_tool_ui() self.app.ui.notebook.setTabText(2, _("Film Tool")) def install(self, icon=None, separator=None, **kwargs): - FlatCAMTool.install(self, icon, separator, shortcut='Alt+L', **kwargs) + AppTool.install(self, icon, separator, shortcut='Alt+L', **kwargs) def set_tool_ui(self): self.reset_fields() diff --git a/AppTools/ToolImage.py b/AppTools/ToolImage.py index 03a0352e..3b0a666b 100644 --- a/AppTools/ToolImage.py +++ b/AppTools/ToolImage.py @@ -7,7 +7,7 @@ from PyQt5 import QtGui, QtWidgets -from AppTool import FlatCAMTool +from AppTool import AppTool from AppGUI.GUIElements import RadioSet, FCComboBox, FCSpinner import gettext @@ -19,12 +19,12 @@ if '_' not in builtins.__dict__: _ = gettext.gettext -class ToolImage(FlatCAMTool): +class ToolImage(AppTool): toolName = _("Image as Object") def __init__(self, app): - FlatCAMTool.__init__(self, app) + AppTool.__init__(self, app) self.app = app self.decimals = self.app.decimals @@ -176,13 +176,13 @@ class ToolImage(FlatCAMTool): if self.app.ui.splitter.sizes()[0] == 0: self.app.ui.splitter.setSizes([1, 1]) - FlatCAMTool.run(self) + AppTool.run(self) self.set_tool_ui() self.app.ui.notebook.setTabText(2, _("Image Tool")) def install(self, icon=None, separator=None, **kwargs): - FlatCAMTool.install(self, icon, separator, **kwargs) + AppTool.install(self, icon, separator, **kwargs) def set_tool_ui(self): # ## Initialize form diff --git a/AppTools/ToolInvertGerber.py b/AppTools/ToolInvertGerber.py index f51175c8..bcdb394f 100644 --- a/AppTools/ToolInvertGerber.py +++ b/AppTools/ToolInvertGerber.py @@ -7,7 +7,7 @@ from PyQt5 import QtWidgets, QtCore -from AppTool import FlatCAMTool +from AppTool import AppTool from AppGUI.GUIElements import FCButton, FCDoubleSpinner, RadioSet, FCComboBox from shapely.geometry import box @@ -26,7 +26,7 @@ if '_' not in builtins.__dict__: log = logging.getLogger('base') -class ToolInvertGerber(FlatCAMTool): +class ToolInvertGerber(AppTool): toolName = _("Invert Gerber Tool") @@ -34,7 +34,7 @@ class ToolInvertGerber(FlatCAMTool): self.app = app self.decimals = self.app.decimals - FlatCAMTool.__init__(self, app) + AppTool.__init__(self, app) self.tools_frame = QtWidgets.QFrame() self.tools_frame.setContentsMargins(0, 0, 0, 0) @@ -153,7 +153,7 @@ class ToolInvertGerber(FlatCAMTool): self.reset_button.clicked.connect(self.set_tool_ui) def install(self, icon=None, separator=None, **kwargs): - FlatCAMTool.install(self, icon, separator, shortcut='', **kwargs) + AppTool.install(self, icon, separator, shortcut='', **kwargs) def run(self, toggle=True): self.app.defaults.report_usage("ToolInvertGerber()") @@ -178,7 +178,7 @@ class ToolInvertGerber(FlatCAMTool): if self.app.ui.splitter.sizes()[0] == 0: self.app.ui.splitter.setSizes([1, 1]) - FlatCAMTool.run(self) + AppTool.run(self) self.set_tool_ui() self.app.ui.notebook.setTabText(2, _("Invert Tool")) diff --git a/AppTools/ToolMove.py b/AppTools/ToolMove.py index 61227ed0..e02fed57 100644 --- a/AppTools/ToolMove.py +++ b/AppTools/ToolMove.py @@ -6,7 +6,7 @@ # ########################################################## from PyQt5 import QtWidgets, QtCore -from AppTool import FlatCAMTool +from AppTool import AppTool from AppGUI.VisPyVisuals import * from copy import copy @@ -22,13 +22,13 @@ if '_' not in builtins.__dict__: log = logging.getLogger('base') -class ToolMove(FlatCAMTool): +class ToolMove(AppTool): toolName = _("Move") replot_signal = QtCore.pyqtSignal(list) def __init__(self, app): - FlatCAMTool.__init__(self, app) + AppTool.__init__(self, app) self.app = app self.decimals = self.app.decimals @@ -60,7 +60,7 @@ class ToolMove(FlatCAMTool): self.replot_signal[list].connect(self.replot) def install(self, icon=None, separator=None, **kwargs): - FlatCAMTool.install(self, icon, separator, shortcut='M', **kwargs) + AppTool.install(self, icon, separator, shortcut='M', **kwargs) def run(self, toggle): self.app.defaults.report_usage("ToolMove()") diff --git a/AppTools/ToolNCC.py b/AppTools/ToolNCC.py index 0e268dc1..eefdd94b 100644 --- a/AppTools/ToolNCC.py +++ b/AppTools/ToolNCC.py @@ -7,7 +7,7 @@ from PyQt5 import QtWidgets, QtCore, QtGui -from AppTool import FlatCAMTool +from AppTool import AppTool from AppGUI.GUIElements import FCCheckBox, FCDoubleSpinner, RadioSet, FCTable, FCInputDialog, FCButton,\ FCComboBox, OptionalInputSection from AppParsers.ParseGerber import Gerber @@ -37,7 +37,7 @@ if '_' not in builtins.__dict__: log = logging.getLogger('base') -class NonCopperClear(FlatCAMTool, Gerber): +class NonCopperClear(AppTool, Gerber): toolName = _("Non-Copper Clearing") @@ -45,7 +45,7 @@ class NonCopperClear(FlatCAMTool, Gerber): self.app = app self.decimals = self.app.decimals - FlatCAMTool.__init__(self, app) + AppTool.__init__(self, app) Gerber.__init__(self, steps_per_circle=self.app.defaults["gerber_circle_steps"]) self.tools_frame = QtWidgets.QFrame() @@ -936,7 +936,7 @@ class NonCopperClear(FlatCAMTool, Gerber): self.app.inform.emit('[WARNING_NOTCL] %s...' % _("Adding Tool cancelled")) def install(self, icon=None, separator=None, **kwargs): - FlatCAMTool.install(self, icon, separator, shortcut='Alt+N', **kwargs) + AppTool.install(self, icon, separator, shortcut='Alt+N', **kwargs) def run(self, toggle=True): self.app.defaults.report_usage("ToolNonCopperClear()") @@ -961,7 +961,7 @@ class NonCopperClear(FlatCAMTool, Gerber): if self.app.ui.splitter.sizes()[0] == 0: self.app.ui.splitter.setSizes([1, 1]) - FlatCAMTool.run(self) + AppTool.run(self) self.set_tool_ui() # reset those objects on a new run diff --git a/AppTools/ToolOptimal.py b/AppTools/ToolOptimal.py index a437149b..004497b9 100644 --- a/AppTools/ToolOptimal.py +++ b/AppTools/ToolOptimal.py @@ -7,7 +7,7 @@ from PyQt5 import QtWidgets, QtCore, QtGui -from AppTool import FlatCAMTool +from AppTool import AppTool from AppGUI.GUIElements import OptionalHideInputSection, FCTextArea, FCEntry, FCSpinner, FCCheckBox, FCComboBox from Common import GracefulException as grace @@ -28,7 +28,7 @@ if '_' not in builtins.__dict__: log = logging.getLogger('base') -class ToolOptimal(FlatCAMTool): +class ToolOptimal(AppTool): toolName = _("Optimal Tool") @@ -36,7 +36,7 @@ class ToolOptimal(FlatCAMTool): update_sec_distances = QtCore.pyqtSignal(dict) def __init__(self, app): - FlatCAMTool.__init__(self, app) + AppTool.__init__(self, app) self.units = self.app.defaults['units'].upper() self.decimals = self.app.decimals @@ -277,7 +277,7 @@ class ToolOptimal(FlatCAMTool): self.reset_button.clicked.connect(self.set_tool_ui) def install(self, icon=None, separator=None, **kwargs): - FlatCAMTool.install(self, icon, separator, shortcut='Alt+O', **kwargs) + AppTool.install(self, icon, separator, shortcut='Alt+O', **kwargs) def run(self, toggle=True): self.app.defaults.report_usage("ToolOptimal()") @@ -301,7 +301,7 @@ class ToolOptimal(FlatCAMTool): if self.app.ui.splitter.sizes()[0] == 0: self.app.ui.splitter.setSizes([1, 1]) - FlatCAMTool.run(self) + AppTool.run(self) self.set_tool_ui() self.app.ui.notebook.setTabText(2, _("Optimal Tool")) diff --git a/AppTools/ToolPDF.py b/AppTools/ToolPDF.py index 1bc5a55b..a592394b 100644 --- a/AppTools/ToolPDF.py +++ b/AppTools/ToolPDF.py @@ -7,7 +7,7 @@ from PyQt5 import QtWidgets, QtCore -from AppTool import FlatCAMTool +from AppTool import AppTool from Common import GracefulException as grace from AppParsers.ParsePDF import PdfParser from shapely.geometry import Point, MultiPolygon @@ -32,7 +32,7 @@ if '_' not in builtins.__dict__: log = logging.getLogger('base') -class ToolPDF(FlatCAMTool): +class ToolPDF(AppTool): """ Parse a PDF file. Reference here: https://www.adobe.com/content/dam/acom/en/devnet/pdf/pdfs/pdf_reference_archives/PDFReference.pdf @@ -41,7 +41,7 @@ class ToolPDF(FlatCAMTool): toolName = _("PDF Import Tool") def __init__(self, app): - FlatCAMTool.__init__(self, app) + AppTool.__init__(self, app) self.app = app self.decimals = self.app.decimals @@ -69,7 +69,7 @@ class ToolPDF(FlatCAMTool): self.on_open_pdf_click() def install(self, icon=None, separator=None, **kwargs): - FlatCAMTool.install(self, icon, separator, shortcut='Ctrl+Q', **kwargs) + AppTool.install(self, icon, separator, shortcut='Ctrl+Q', **kwargs) def set_tool_ui(self): pass diff --git a/AppTools/ToolPaint.py b/AppTools/ToolPaint.py index d377e81d..a9f3b67e 100644 --- a/AppTools/ToolPaint.py +++ b/AppTools/ToolPaint.py @@ -8,7 +8,7 @@ from PyQt5 import QtWidgets, QtGui, QtCore from PyQt5.QtCore import Qt -from AppTool import FlatCAMTool +from AppTool import AppTool from copy import deepcopy # from ObjectCollection import * from AppParsers.ParseGerber import Gerber @@ -38,7 +38,7 @@ if '_' not in builtins.__dict__: log = logging.getLogger('base') -class ToolPaint(FlatCAMTool, Gerber): +class ToolPaint(AppTool, Gerber): toolName = _("Paint Tool") @@ -46,7 +46,7 @@ class ToolPaint(FlatCAMTool, Gerber): self.app = app self.decimals = self.app.decimals - FlatCAMTool.__init__(self, app) + AppTool.__init__(self, app) Geometry.__init__(self, geo_steps_per_circle=self.app.defaults["geometry_circle_steps"]) # ## Title @@ -707,7 +707,7 @@ class ToolPaint(FlatCAMTool, Gerber): }[self.reference_type_combo.get_value()] def install(self, icon=None, separator=None, **kwargs): - FlatCAMTool.install(self, icon, separator, shortcut='Alt+P', **kwargs) + AppTool.install(self, icon, separator, shortcut='Alt+P', **kwargs) def run(self, toggle=True): self.app.defaults.report_usage("ToolPaint()") @@ -732,7 +732,7 @@ class ToolPaint(FlatCAMTool, Gerber): if self.app.ui.splitter.sizes()[0] == 0: self.app.ui.splitter.setSizes([1, 1]) - FlatCAMTool.run(self) + AppTool.run(self) self.set_tool_ui() self.app.ui.notebook.setTabText(2, _("Paint Tool")) diff --git a/AppTools/ToolPanelize.py b/AppTools/ToolPanelize.py index ad790601..82e41491 100644 --- a/AppTools/ToolPanelize.py +++ b/AppTools/ToolPanelize.py @@ -6,7 +6,7 @@ # ########################################################## from PyQt5 import QtWidgets, QtGui, QtCore -from AppTool import FlatCAMTool +from AppTool import AppTool from AppGUI.GUIElements import FCSpinner, FCDoubleSpinner, RadioSet, FCCheckBox, OptionalInputSection, FCComboBox from Common import GracefulException as grace @@ -29,14 +29,14 @@ if '_' not in builtins.__dict__: log = logging.getLogger('base') -class Panelize(FlatCAMTool): +class Panelize(AppTool): toolName = _("Panelize PCB") def __init__(self, app): self.decimals = app.decimals - FlatCAMTool.__init__(self, app) + AppTool.__init__(self, app) # ## Title title_label = QtWidgets.QLabel("%s" % self.toolName) @@ -326,13 +326,13 @@ class Panelize(FlatCAMTool): if self.app.ui.splitter.sizes()[0] == 0: self.app.ui.splitter.setSizes([1, 1]) - FlatCAMTool.run(self) + AppTool.run(self) self.set_tool_ui() self.app.ui.notebook.setTabText(2, _("Panel. Tool")) def install(self, icon=None, separator=None, **kwargs): - FlatCAMTool.install(self, icon, separator, shortcut='Alt+Z', **kwargs) + AppTool.install(self, icon, separator, shortcut='Alt+Z', **kwargs) def set_tool_ui(self): self.reset_fields() diff --git a/AppTools/ToolPcbWizard.py b/AppTools/ToolPcbWizard.py index 030bbfe7..672ec3bd 100644 --- a/AppTools/ToolPcbWizard.py +++ b/AppTools/ToolPcbWizard.py @@ -7,7 +7,7 @@ from PyQt5 import QtWidgets, QtCore -from AppTool import FlatCAMTool +from AppTool import AppTool from AppGUI.GUIElements import RadioSet, FCSpinner, FCButton, FCTable import re @@ -24,14 +24,14 @@ if '_' not in builtins.__dict__: _ = gettext.gettext -class PcbWizard(FlatCAMTool): +class PcbWizard(AppTool): file_loaded = QtCore.pyqtSignal(str, str) toolName = _("PcbWizard Import Tool") def __init__(self, app): - FlatCAMTool.__init__(self, app) + AppTool.__init__(self, app) self.app = app self.decimals = self.app.decimals @@ -191,13 +191,13 @@ class PcbWizard(FlatCAMTool): if self.app.ui.splitter.sizes()[0] == 0: self.app.ui.splitter.setSizes([1, 1]) - FlatCAMTool.run(self) + AppTool.run(self) self.set_tool_ui() self.app.ui.notebook.setTabText(2, _("PCBWizard Tool")) def install(self, icon=None, separator=None, **kwargs): - FlatCAMTool.install(self, icon, separator, **kwargs) + AppTool.install(self, icon, separator, **kwargs) def set_tool_ui(self): self.units = 'INCH' diff --git a/AppTools/ToolProperties.py b/AppTools/ToolProperties.py index f66e8b11..59d73a8c 100644 --- a/AppTools/ToolProperties.py +++ b/AppTools/ToolProperties.py @@ -6,7 +6,7 @@ # ########################################################## from PyQt5 import QtGui, QtCore, QtWidgets -from AppTool import FlatCAMTool +from AppTool import AppTool from AppGUI.GUIElements import FCTree from shapely.geometry import MultiPolygon, Polygon @@ -27,13 +27,13 @@ if '_' not in builtins.__dict__: log = logging.getLogger('base') -class Properties(FlatCAMTool): +class Properties(AppTool): toolName = _("Properties") calculations_finished = QtCore.pyqtSignal(float, float, float, float, float, object) def __init__(self, app): - FlatCAMTool.__init__(self, app) + AppTool.__init__(self, app) self.setSizePolicy(QtWidgets.QSizePolicy.Ignored, QtWidgets.QSizePolicy.Ignored) @@ -97,13 +97,13 @@ class Properties(FlatCAMTool): if self.app.ui.splitter.sizes()[0] == 0: self.app.ui.splitter.setSizes([1, 1]) - FlatCAMTool.run(self) + AppTool.run(self) self.set_tool_ui() self.properties() def install(self, icon=None, separator=None, **kwargs): - FlatCAMTool.install(self, icon, separator, shortcut='P', **kwargs) + AppTool.install(self, icon, separator, shortcut='P', **kwargs) def set_tool_ui(self): # this reset the TreeWidget diff --git a/AppTools/ToolPunchGerber.py b/AppTools/ToolPunchGerber.py index 2ec20d6d..3dcc99f2 100644 --- a/AppTools/ToolPunchGerber.py +++ b/AppTools/ToolPunchGerber.py @@ -7,7 +7,7 @@ from PyQt5 import QtCore, QtWidgets -from AppTool import FlatCAMTool +from AppTool import AppTool from AppGUI.GUIElements import RadioSet, FCDoubleSpinner, FCCheckBox, FCComboBox from copy import deepcopy @@ -25,12 +25,12 @@ if '_' not in builtins.__dict__: log = logging.getLogger('base') -class ToolPunchGerber(FlatCAMTool): +class ToolPunchGerber(AppTool): toolName = _("Punch Gerber") def __init__(self, app): - FlatCAMTool.__init__(self, app) + AppTool.__init__(self, app) self.decimals = self.app.decimals @@ -418,14 +418,14 @@ class ToolPunchGerber(FlatCAMTool): if self.app.ui.splitter.sizes()[0] == 0: self.app.ui.splitter.setSizes([1, 1]) - FlatCAMTool.run(self) + AppTool.run(self) self.set_tool_ui() self.app.ui.notebook.setTabText(2, _("Punch Tool")) def install(self, icon=None, separator=None, **kwargs): - FlatCAMTool.install(self, icon, separator, shortcut='Alt+H', **kwargs) + AppTool.install(self, icon, separator, shortcut='Alt+H', **kwargs) def set_tool_ui(self): self.reset_fields() diff --git a/AppTools/ToolQRCode.py b/AppTools/ToolQRCode.py index 601b81c6..1462f205 100644 --- a/AppTools/ToolQRCode.py +++ b/AppTools/ToolQRCode.py @@ -8,7 +8,7 @@ from PyQt5 import QtWidgets, QtCore, QtGui from PyQt5.QtCore import Qt -from AppTool import FlatCAMTool +from AppTool import AppTool from AppGUI.GUIElements import RadioSet, FCTextArea, FCSpinner, FCEntry, FCCheckBox, FCComboBox, FCFileSaveDialog from AppParsers.ParseSVG import * @@ -38,12 +38,12 @@ if '_' not in builtins.__dict__: log = logging.getLogger('base') -class QRCode(FlatCAMTool): +class QRCode(AppTool): toolName = _("QRCode Tool") def __init__(self, app): - FlatCAMTool.__init__(self, app) + AppTool.__init__(self, app) self.app = app self.canvas = self.app.plotcanvas @@ -375,14 +375,14 @@ class QRCode(FlatCAMTool): if self.app.ui.splitter.sizes()[0] == 0: self.app.ui.splitter.setSizes([1, 1]) - FlatCAMTool.run(self) + AppTool.run(self) self.set_tool_ui() self.app.ui.notebook.setTabText(2, _("QRCode Tool")) def install(self, icon=None, separator=None, **kwargs): - FlatCAMTool.install(self, icon, separator, shortcut='Alt+Q', **kwargs) + AppTool.install(self, icon, separator, shortcut='Alt+Q', **kwargs) def set_tool_ui(self): self.units = self.app.defaults['units'] diff --git a/AppTools/ToolRulesCheck.py b/AppTools/ToolRulesCheck.py index ed090d36..54376bb3 100644 --- a/AppTools/ToolRulesCheck.py +++ b/AppTools/ToolRulesCheck.py @@ -7,7 +7,7 @@ from PyQt5 import QtWidgets -from AppTool import FlatCAMTool +from AppTool import AppTool from AppGUI.GUIElements import FCDoubleSpinner, FCCheckBox, OptionalInputSection, FCComboBox from copy import deepcopy @@ -28,7 +28,7 @@ if '_' not in builtins.__dict__: log = logging.getLogger('base') -class RulesCheck(FlatCAMTool): +class RulesCheck(AppTool): toolName = _("Check Rules") @@ -37,7 +37,7 @@ class RulesCheck(FlatCAMTool): def __init__(self, app): self.decimals = app.decimals - FlatCAMTool.__init__(self, app) + AppTool.__init__(self, app) # ## Title title_label = QtWidgets.QLabel("%s" % self.toolName) @@ -610,13 +610,13 @@ class RulesCheck(FlatCAMTool): if self.app.ui.splitter.sizes()[0] == 0: self.app.ui.splitter.setSizes([1, 1]) - FlatCAMTool.run(self) + AppTool.run(self) self.set_tool_ui() self.app.ui.notebook.setTabText(2, _("Rules Tool")) def install(self, icon=None, separator=None, **kwargs): - FlatCAMTool.install(self, icon, separator, shortcut='Alt+R', **kwargs) + AppTool.install(self, icon, separator, shortcut='Alt+R', **kwargs) def set_tool_ui(self): diff --git a/AppTools/ToolSolderPaste.py b/AppTools/ToolSolderPaste.py index 7831fd1e..2dce9d2d 100644 --- a/AppTools/ToolSolderPaste.py +++ b/AppTools/ToolSolderPaste.py @@ -5,7 +5,7 @@ # MIT Licence # # ########################################################## -from AppTool import FlatCAMTool +from AppTool import AppTool from Common import LoudDict from AppGUI.GUIElements import FCComboBox, FCEntry, FCTable, \ FCInputDialog, FCDoubleSpinner, FCSpinner, FCFileSaveDialog @@ -33,11 +33,11 @@ if '_' not in builtins.__dict__: _ = gettext.gettext -class SolderPaste(FlatCAMTool): +class SolderPaste(AppTool): toolName = _("Solder Paste Tool") def __init__(self, app): - FlatCAMTool.__init__(self, app) + AppTool.__init__(self, app) # Number of decimals to be used for tools/nozzles in this FlatCAM Tool self.decimals = self.app.decimals @@ -546,14 +546,14 @@ class SolderPaste(FlatCAMTool): if self.app.ui.splitter.sizes()[0] == 0: self.app.ui.splitter.setSizes([1, 1]) - FlatCAMTool.run(self) + AppTool.run(self) self.set_tool_ui() self.build_ui() self.app.ui.notebook.setTabText(2, _("SolderPaste Tool")) def install(self, icon=None, separator=None, **kwargs): - FlatCAMTool.install(self, icon, separator, shortcut='Alt+K', **kwargs) + AppTool.install(self, icon, separator, shortcut='Alt+K', **kwargs) def on_add_tool_by_key(self): tool_add_popup = FCInputDialog(title='%s...' % _("New Tool"), diff --git a/AppTools/ToolSub.py b/AppTools/ToolSub.py index e4938aa0..524ac125 100644 --- a/AppTools/ToolSub.py +++ b/AppTools/ToolSub.py @@ -7,7 +7,7 @@ from PyQt5 import QtWidgets, QtCore -from AppTool import FlatCAMTool +from AppTool import AppTool from AppGUI.GUIElements import FCCheckBox, FCButton, FCComboBox from shapely.geometry import Polygon, MultiPolygon, MultiLineString, LineString @@ -28,7 +28,7 @@ if '_' not in builtins.__dict__: log = logging.getLogger('base') -class ToolSub(FlatCAMTool): +class ToolSub(AppTool): job_finished = QtCore.pyqtSignal(bool) @@ -38,7 +38,7 @@ class ToolSub(FlatCAMTool): self.app = app self.decimals = self.app.decimals - FlatCAMTool.__init__(self, app) + AppTool.__init__(self, app) self.tools_frame = QtWidgets.QFrame() self.tools_frame.setContentsMargins(0, 0, 0, 0) @@ -233,7 +233,7 @@ class ToolSub(FlatCAMTool): self.reset_button.clicked.connect(self.set_tool_ui) def install(self, icon=None, separator=None, **kwargs): - FlatCAMTool.install(self, icon, separator, shortcut='Alt+W', **kwargs) + AppTool.install(self, icon, separator, shortcut='Alt+W', **kwargs) def run(self, toggle=True): self.app.defaults.report_usage("ToolSub()") @@ -257,7 +257,7 @@ class ToolSub(FlatCAMTool): if self.app.ui.splitter.sizes()[0] == 0: self.app.ui.splitter.setSizes([1, 1]) - FlatCAMTool.run(self) + AppTool.run(self) self.set_tool_ui() self.app.ui.notebook.setTabText(2, _("Sub Tool")) diff --git a/AppTools/ToolTransform.py b/AppTools/ToolTransform.py index b89afffe..f0619ddb 100644 --- a/AppTools/ToolTransform.py +++ b/AppTools/ToolTransform.py @@ -6,7 +6,7 @@ # ########################################################## from PyQt5 import QtWidgets -from AppTool import FlatCAMTool +from AppTool import AppTool from AppGUI.GUIElements import FCDoubleSpinner, FCCheckBox, FCButton, OptionalInputSection, FCEntry import gettext @@ -18,7 +18,7 @@ if '_' not in builtins.__dict__: _ = gettext.gettext -class ToolTransform(FlatCAMTool): +class ToolTransform(AppTool): toolName = _("Object Transform") rotateName = _("Rotate") @@ -29,7 +29,7 @@ class ToolTransform(FlatCAMTool): bufferName = _("Buffer") def __init__(self, app): - FlatCAMTool.__init__(self, app) + AppTool.__init__(self, app) self.decimals = self.app.decimals # ## Title @@ -454,13 +454,13 @@ class ToolTransform(FlatCAMTool): if self.app.ui.splitter.sizes()[0] == 0: self.app.ui.splitter.setSizes([1, 1]) - FlatCAMTool.run(self) + AppTool.run(self) self.set_tool_ui() self.app.ui.notebook.setTabText(2, _("Transform Tool")) def install(self, icon=None, separator=None, **kwargs): - FlatCAMTool.install(self, icon, separator, shortcut='Alt+T', **kwargs) + AppTool.install(self, icon, separator, shortcut='Alt+T', **kwargs) def set_tool_ui(self): self.rotate_button.set_value(_("Rotate")) diff --git a/CHANGELOG.md b/CHANGELOG.md index 384d73fc..ca1eaf14 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ CHANGELOG for FlatCAM beta - moved some of the GUI related methods from FlatCAMApp.App to the flatcamGUI.FlatCAMGUI class - moved Shortcuts Tab creation in it's own class - renamed classes to have shorter names and grouped +- removed reference to postprocessors and replaced it with preprocessors 17.05.2020 diff --git a/Common.py b/Common.py index d51a8b0e..efdd3252 100644 --- a/Common.py +++ b/Common.py @@ -15,7 +15,7 @@ from PyQt5 import QtCore from shapely.geometry import Polygon, MultiPolygon from AppGUI.VisPyVisuals import ShapeCollection -from AppTool import FlatCAMTool +from AppTool import AppTool import numpy as np @@ -287,7 +287,7 @@ class ExclusionAreas(QtCore.QObject): face_color = "#FF7400BF" # add a temporary shape on canvas - FlatCAMTool.draw_tool_selection_shape( + AppTool.draw_tool_selection_shape( self, old_coords=(x0, y0), coords=(x1, y1), color=color, face_color=face_color, @@ -322,7 +322,7 @@ class ExclusionAreas(QtCore.QObject): # we need to add a Polygon and a Polygon can be made only from at least 3 points if len(self.points) > 2: - FlatCAMTool.delete_moving_selection_shape(self) + AppTool.delete_moving_selection_shape(self) pol = Polygon(self.points) # do not add invalid polygons even if they are drawn by utility geometry if pol.is_valid: @@ -347,7 +347,7 @@ class ExclusionAreas(QtCore.QObject): color = "#098a8f" face_color = "#FF7400BF" - FlatCAMTool.draw_selection_shape_polygon( + AppTool.draw_selection_shape_polygon( self, points=self.points, color=color, face_color=face_color, @@ -359,7 +359,7 @@ class ExclusionAreas(QtCore.QObject): self.poly_drawn = False return - # FlatCAMTool.delete_tool_selection_shape(self, shapes_storage=self.exclusion_shapes) + # AppTool.delete_tool_selection_shape(self, shapes_storage=self.exclusion_shapes) if self.app.is_legacy is False: self.app.plotcanvas.graph_event_disconnect('mouse_release', self.on_mouse_release) @@ -428,8 +428,8 @@ class ExclusionAreas(QtCore.QObject): self.poly_drawn = False self.exclusion_areas_storage = [] - FlatCAMTool.delete_moving_selection_shape(self) - # FlatCAMTool.delete_tool_selection_shape(self, shapes_storage=self.exclusion_shapes) + AppTool.delete_moving_selection_shape(self) + # AppTool.delete_tool_selection_shape(self, shapes_storage=self.exclusion_shapes) self.app.call_source = "app" self.app.inform.emit("[WARNING_NOTCL] %s" % _("Cancelled. Area exclusion drawing was interrupted.")) @@ -498,8 +498,8 @@ class ExclusionAreas(QtCore.QObject): face_color=face_color, coords=(curr_pos[0], curr_pos[1])) else: - FlatCAMTool.delete_moving_selection_shape(self) - FlatCAMTool.draw_moving_selection_shape_poly( + AppTool.delete_moving_selection_shape(self) + AppTool.draw_moving_selection_shape_poly( self, points=self.points, color=color, face_color=face_color, @@ -521,9 +521,9 @@ class ExclusionAreas(QtCore.QObject): def clear_shapes(self): self.exclusion_areas_storage.clear() - FlatCAMTool.delete_moving_selection_shape(self) + AppTool.delete_moving_selection_shape(self) self.app.delete_selection_shape() - FlatCAMTool.delete_tool_selection_shape(self, shapes_storage=self.exclusion_shapes) + AppTool.delete_tool_selection_shape(self, shapes_storage=self.exclusion_shapes) self.app.inform.emit('[success] %s' % _("All exclusion zones deleted.")) def delete_sel_shapes(self, idxs): @@ -534,7 +534,7 @@ class ExclusionAreas(QtCore.QObject): """ # delete all plotted shapes - FlatCAMTool.delete_tool_selection_shape(self, shapes_storage=self.exclusion_shapes) + AppTool.delete_tool_selection_shape(self, shapes_storage=self.exclusion_shapes) # delete shapes for idx in sorted(idxs, reverse=True): diff --git a/locale/de/LC_MESSAGES/strings.po b/locale/de/LC_MESSAGES/strings.po index 17d6af72..d6c2a254 100644 --- a/locale/de/LC_MESSAGES/strings.po +++ b/locale/de/LC_MESSAGES/strings.po @@ -2674,12 +2674,12 @@ msgstr "Speichern Sie die Tools-Datenbankinformationen." msgid "processes running." msgstr "laufende Prozesse." -#: FlatCAMTool.py:245 FlatCAMTool.py:252 flatcamGUI/ObjectUI.py:157 +#: AppTool.py:245 AppTool.py:252 flatcamGUI/ObjectUI.py:157 #: flatcamGUI/ObjectUI.py:164 msgid "Edited value is out of range" msgstr "Der bearbeitete Wert liegt außerhalb des Bereichs" -#: FlatCAMTool.py:247 FlatCAMTool.py:254 flatcamGUI/ObjectUI.py:159 +#: AppTool.py:247 AppTool.py:254 flatcamGUI/ObjectUI.py:159 #: flatcamGUI/ObjectUI.py:166 msgid "Edited value is within limits." msgstr "Der bearbeitete Wert liegt innerhalb der Grenzen." diff --git a/locale/en/LC_MESSAGES/strings.po b/locale/en/LC_MESSAGES/strings.po index aa8f50e2..8a3c7896 100644 --- a/locale/en/LC_MESSAGES/strings.po +++ b/locale/en/LC_MESSAGES/strings.po @@ -2597,12 +2597,12 @@ msgstr "Save the Tools Database information's." msgid "processes running." msgstr "processes running." -#: FlatCAMTool.py:245 FlatCAMTool.py:252 flatcamGUI/ObjectUI.py:157 +#: AppTool.py:245 AppTool.py:252 flatcamGUI/ObjectUI.py:157 #: flatcamGUI/ObjectUI.py:164 msgid "Edited value is out of range" msgstr "Edited value is out of range" -#: FlatCAMTool.py:247 FlatCAMTool.py:254 flatcamGUI/ObjectUI.py:159 +#: AppTool.py:247 AppTool.py:254 flatcamGUI/ObjectUI.py:159 #: flatcamGUI/ObjectUI.py:166 msgid "Edited value is within limits." msgstr "Edited value is within limits." diff --git a/locale/es/LC_MESSAGES/strings.po b/locale/es/LC_MESSAGES/strings.po index b44e0a31..88f787a9 100644 --- a/locale/es/LC_MESSAGES/strings.po +++ b/locale/es/LC_MESSAGES/strings.po @@ -2640,12 +2640,12 @@ msgstr "Guarde la información de la base de datos de herramientas." msgid "processes running." msgstr "procesos en ejecución." -#: FlatCAMTool.py:245 FlatCAMTool.py:252 flatcamGUI/ObjectUI.py:157 +#: AppTool.py:245 AppTool.py:252 flatcamGUI/ObjectUI.py:157 #: flatcamGUI/ObjectUI.py:164 msgid "Edited value is out of range" msgstr "El valor editado está fuera de rango" -#: FlatCAMTool.py:247 FlatCAMTool.py:254 flatcamGUI/ObjectUI.py:159 +#: AppTool.py:247 AppTool.py:254 flatcamGUI/ObjectUI.py:159 #: flatcamGUI/ObjectUI.py:166 msgid "Edited value is within limits." msgstr "El valor editado está dentro de los límites." diff --git a/locale/fr/LC_MESSAGES/strings.po b/locale/fr/LC_MESSAGES/strings.po index 54f4a236..ab74c9a0 100644 --- a/locale/fr/LC_MESSAGES/strings.po +++ b/locale/fr/LC_MESSAGES/strings.po @@ -2630,12 +2630,12 @@ msgstr "Enregistrez les informations de la base de données des outils." msgid "processes running." msgstr "processus en cours d'exécution." -#: FlatCAMTool.py:245 FlatCAMTool.py:252 flatcamGUI/ObjectUI.py:157 +#: AppTool.py:245 AppTool.py:252 flatcamGUI/ObjectUI.py:157 #: flatcamGUI/ObjectUI.py:164 msgid "Edited value is out of range" msgstr "La valeur modifiée est hors limites" -#: FlatCAMTool.py:247 FlatCAMTool.py:254 flatcamGUI/ObjectUI.py:159 +#: AppTool.py:247 AppTool.py:254 flatcamGUI/ObjectUI.py:159 #: flatcamGUI/ObjectUI.py:166 msgid "Edited value is within limits." msgstr "La valeur modifiée est dans les limites." diff --git a/locale/hu/LC_MESSAGES/strings.po b/locale/hu/LC_MESSAGES/strings.po index 526e63b8..7a5a5c32 100644 --- a/locale/hu/LC_MESSAGES/strings.po +++ b/locale/hu/LC_MESSAGES/strings.po @@ -2597,12 +2597,12 @@ msgstr "Save the Tools Database information's." msgid "processes running." msgstr "processes running." -#: FlatCAMTool.py:245 FlatCAMTool.py:252 flatcamGUI/ObjectUI.py:157 +#: AppTool.py:245 AppTool.py:252 flatcamGUI/ObjectUI.py:157 #: flatcamGUI/ObjectUI.py:164 msgid "Edited value is out of range" msgstr "Edited value is out of range" -#: FlatCAMTool.py:247 FlatCAMTool.py:254 flatcamGUI/ObjectUI.py:159 +#: AppTool.py:247 AppTool.py:254 flatcamGUI/ObjectUI.py:159 #: flatcamGUI/ObjectUI.py:166 msgid "Edited value is within limits." msgstr "Edited value is within limits." diff --git a/locale/it/LC_MESSAGES/strings.po b/locale/it/LC_MESSAGES/strings.po index 33e36c59..a626cc78 100644 --- a/locale/it/LC_MESSAGES/strings.po +++ b/locale/it/LC_MESSAGES/strings.po @@ -2607,12 +2607,12 @@ msgstr "Salva le informazioni del Databse utensili." msgid "processes running." msgstr "processi in esecuzione." -#: FlatCAMTool.py:245 FlatCAMTool.py:252 flatcamGUI/ObjectUI.py:157 +#: AppTool.py:245 AppTool.py:252 flatcamGUI/ObjectUI.py:157 #: flatcamGUI/ObjectUI.py:164 msgid "Edited value is out of range" msgstr "Il valore modificato è fuori range" -#: FlatCAMTool.py:247 FlatCAMTool.py:254 flatcamGUI/ObjectUI.py:159 +#: AppTool.py:247 AppTool.py:254 flatcamGUI/ObjectUI.py:159 #: flatcamGUI/ObjectUI.py:166 msgid "Edited value is within limits." msgstr "Il valore editato è entro i limiti." diff --git a/locale/pt_BR/LC_MESSAGES/strings.po b/locale/pt_BR/LC_MESSAGES/strings.po index 0c56d5bf..60b86976 100644 --- a/locale/pt_BR/LC_MESSAGES/strings.po +++ b/locale/pt_BR/LC_MESSAGES/strings.po @@ -2622,12 +2622,12 @@ msgstr "Salve as informações do banco de dados de ferramentas." msgid "processes running." msgstr "processos executando." -#: FlatCAMTool.py:245 FlatCAMTool.py:252 flatcamGUI/ObjectUI.py:157 +#: AppTool.py:245 AppTool.py:252 flatcamGUI/ObjectUI.py:157 #: flatcamGUI/ObjectUI.py:164 msgid "Edited value is out of range" msgstr "Valor fora da faixa" -#: FlatCAMTool.py:247 FlatCAMTool.py:254 flatcamGUI/ObjectUI.py:159 +#: AppTool.py:247 AppTool.py:254 flatcamGUI/ObjectUI.py:159 #: flatcamGUI/ObjectUI.py:166 msgid "Edited value is within limits." msgstr "O valor editado está dentro dos limites." diff --git a/locale/ro/LC_MESSAGES/strings.po b/locale/ro/LC_MESSAGES/strings.po index 3e7d19d2..3bdd2846 100644 --- a/locale/ro/LC_MESSAGES/strings.po +++ b/locale/ro/LC_MESSAGES/strings.po @@ -2631,12 +2631,12 @@ msgstr "Salvați informațiile din DB de Unelte." msgid "processes running." msgstr "procesele care rulează." -#: FlatCAMTool.py:245 FlatCAMTool.py:252 flatcamGUI/ObjectUI.py:157 +#: AppTool.py:245 AppTool.py:252 flatcamGUI/ObjectUI.py:157 #: flatcamGUI/ObjectUI.py:164 msgid "Edited value is out of range" msgstr "Valoarea editată este in afara limitelor" -#: FlatCAMTool.py:247 FlatCAMTool.py:254 flatcamGUI/ObjectUI.py:159 +#: AppTool.py:247 AppTool.py:254 flatcamGUI/ObjectUI.py:159 #: flatcamGUI/ObjectUI.py:166 msgid "Edited value is within limits." msgstr "Valoarea editată este in limite." diff --git a/locale/ru/LC_MESSAGES/strings.po b/locale/ru/LC_MESSAGES/strings.po index 3b3e3dc3..a3f1380f 100644 --- a/locale/ru/LC_MESSAGES/strings.po +++ b/locale/ru/LC_MESSAGES/strings.po @@ -2614,12 +2614,12 @@ msgstr "Сохраните информацию базы данных инстр msgid "processes running." msgstr "процессы запущены." -#: FlatCAMTool.py:245 FlatCAMTool.py:252 flatcamGUI/ObjectUI.py:157 +#: AppTool.py:245 AppTool.py:252 flatcamGUI/ObjectUI.py:157 #: flatcamGUI/ObjectUI.py:164 msgid "Edited value is out of range" msgstr "Отредактированное значение находится вне диапазона" -#: FlatCAMTool.py:247 FlatCAMTool.py:254 flatcamGUI/ObjectUI.py:159 +#: AppTool.py:247 AppTool.py:254 flatcamGUI/ObjectUI.py:159 #: flatcamGUI/ObjectUI.py:166 msgid "Edited value is within limits." msgstr "Отредактированное значение находится в пределах нормы." diff --git a/locale_template/strings.pot b/locale_template/strings.pot index fec4a64a..3ac81693 100644 --- a/locale_template/strings.pot +++ b/locale_template/strings.pot @@ -2289,12 +2289,12 @@ msgstr "" msgid "processes running." msgstr "" -#: FlatCAMTool.py:245 FlatCAMTool.py:252 flatcamGUI/ObjectUI.py:157 +#: AppTool.py:245 AppTool.py:252 flatcamGUI/ObjectUI.py:157 #: flatcamGUI/ObjectUI.py:164 msgid "Edited value is out of range" msgstr "" -#: FlatCAMTool.py:247 FlatCAMTool.py:254 flatcamGUI/ObjectUI.py:159 +#: AppTool.py:247 AppTool.py:254 flatcamGUI/ObjectUI.py:159 #: flatcamGUI/ObjectUI.py:166 msgid "Edited value is within limits." msgstr "" diff --git a/preprocessors/Berta_CNC.py b/preprocessors/Berta_CNC.py index 2b2cc5c1..c17028c1 100644 --- a/preprocessors/Berta_CNC.py +++ b/preprocessors/Berta_CNC.py @@ -13,7 +13,7 @@ from AppPreProcessor import * -class Berta_CNC(FlatCAMPostProc): +class Berta_CNC(PreProc): include_header = True coordinate_format = "%.*f" diff --git a/preprocessors/GRBL_laser.py b/preprocessors/GRBL_laser.py index 7f1c025a..052a4898 100644 --- a/preprocessors/GRBL_laser.py +++ b/preprocessors/GRBL_laser.py @@ -12,7 +12,7 @@ from AppPreProcessor import * # is compatible with almost any version of Grbl. -class GRBL_laser(FlatCAMPostProc): +class GRBL_laser(PreProc): include_header = True coordinate_format = "%.*f" diff --git a/preprocessors/ISEL_CNC.py b/preprocessors/ISEL_CNC.py index 3a92c9f8..3d27a12e 100644 --- a/preprocessors/ISEL_CNC.py +++ b/preprocessors/ISEL_CNC.py @@ -9,7 +9,7 @@ from AppPreProcessor import * -class ISEL_CNC(FlatCAMPostProc): +class ISEL_CNC(PreProc): include_header = True coordinate_format = "%.*f" feedrate_format = '%.*f' diff --git a/preprocessors/ISEL_ICP_CNC.py b/preprocessors/ISEL_ICP_CNC.py index d8f59acd..e2690279 100644 --- a/preprocessors/ISEL_ICP_CNC.py +++ b/preprocessors/ISEL_ICP_CNC.py @@ -9,7 +9,7 @@ from AppPreProcessor import * -class ISEL_ICP_CNC(FlatCAMPostProc): +class ISEL_ICP_CNC(PreProc): include_header = False def start_code(self, p): diff --git a/preprocessors/Marlin.py b/preprocessors/Marlin.py index 539d27d8..a88e8e7d 100644 --- a/preprocessors/Marlin.py +++ b/preprocessors/Marlin.py @@ -9,7 +9,7 @@ from AppPreProcessor import * -class Marlin(FlatCAMPostProc): +class Marlin(PreProc): include_header = True coordinate_format = "%.*f" diff --git a/preprocessors/Marlin_laser_FAN_pin.py b/preprocessors/Marlin_laser_FAN_pin.py index fc9e5557..94223295 100644 --- a/preprocessors/Marlin_laser_FAN_pin.py +++ b/preprocessors/Marlin_laser_FAN_pin.py @@ -9,7 +9,7 @@ from AppPreProcessor import * -class Marlin_laser_FAN_pin(FlatCAMPostProc): +class Marlin_laser_FAN_pin(PreProc): include_header = True coordinate_format = "%.*f" diff --git a/preprocessors/Marlin_laser_Spindle_pin.py b/preprocessors/Marlin_laser_Spindle_pin.py index 5721a1c0..9e98c5c3 100644 --- a/preprocessors/Marlin_laser_Spindle_pin.py +++ b/preprocessors/Marlin_laser_Spindle_pin.py @@ -9,7 +9,7 @@ from AppPreProcessor import * -class Marlin_laser_Spindle_pin(FlatCAMPostProc): +class Marlin_laser_Spindle_pin(PreProc): include_header = True coordinate_format = "%.*f" diff --git a/preprocessors/Paste_1.py b/preprocessors/Paste_1.py index b08b1473..4de695d2 100644 --- a/preprocessors/Paste_1.py +++ b/preprocessors/Paste_1.py @@ -9,7 +9,7 @@ from AppPreProcessor import * -class Paste_1(FlatCAMPostProc_Tools): +class Paste_1(AppPreProcTools): include_header = True coordinate_format = "%.*f" diff --git a/preprocessors/Repetier.py b/preprocessors/Repetier.py index 74e70773..eace3dff 100644 --- a/preprocessors/Repetier.py +++ b/preprocessors/Repetier.py @@ -9,7 +9,7 @@ from AppPreProcessor import * -class Repetier(FlatCAMPostProc): +class Repetier(PreProc): include_header = True coordinate_format = "%.*f" diff --git a/preprocessors/Roland_MDX_20.py b/preprocessors/Roland_MDX_20.py index 26c3662c..aaafb9b8 100644 --- a/preprocessors/Roland_MDX_20.py +++ b/preprocessors/Roland_MDX_20.py @@ -11,7 +11,7 @@ from AppPreProcessor import * # for Roland Preprocessors it is mandatory for the preprocessor name (python file and class name, both of them must be # the same) to contain the following keyword, case-sensitive: 'Roland' without the quotes. -class Roland_MDX_20(FlatCAMPostProc): +class Roland_MDX_20(PreProc): include_header = False coordinate_format = "%.1f" diff --git a/preprocessors/Toolchange_Custom.py b/preprocessors/Toolchange_Custom.py index 88de5435..da299c4e 100644 --- a/preprocessors/Toolchange_Custom.py +++ b/preprocessors/Toolchange_Custom.py @@ -9,7 +9,7 @@ from AppPreProcessor import * -class Toolchange_Custom(FlatCAMPostProc): +class Toolchange_Custom(PreProc): include_header = True coordinate_format = "%.*f" diff --git a/preprocessors/Toolchange_Manual.py b/preprocessors/Toolchange_Manual.py index c113bbfc..ba2e8fda 100644 --- a/preprocessors/Toolchange_Manual.py +++ b/preprocessors/Toolchange_Manual.py @@ -9,7 +9,7 @@ from AppPreProcessor import * -class Toolchange_Manual(FlatCAMPostProc): +class Toolchange_Manual(PreProc): include_header = True coordinate_format = "%.*f" diff --git a/preprocessors/Toolchange_Probe_MACH3.py b/preprocessors/Toolchange_Probe_MACH3.py index 818327d2..1234226d 100644 --- a/preprocessors/Toolchange_Probe_MACH3.py +++ b/preprocessors/Toolchange_Probe_MACH3.py @@ -9,7 +9,7 @@ from AppPreProcessor import * -class Toolchange_Probe_MACH3(FlatCAMPostProc): +class Toolchange_Probe_MACH3(PreProc): include_header = True coordinate_format = "%.*f" diff --git a/preprocessors/default.py b/preprocessors/default.py index 87d0c56c..7da50390 100644 --- a/preprocessors/default.py +++ b/preprocessors/default.py @@ -9,7 +9,7 @@ from AppPreProcessor import * -class default(FlatCAMPostProc): +class default(PreProc): include_header = True coordinate_format = "%.*f" diff --git a/preprocessors/grbl_11.py b/preprocessors/grbl_11.py index 75bb8556..21aed110 100644 --- a/preprocessors/grbl_11.py +++ b/preprocessors/grbl_11.py @@ -9,7 +9,7 @@ from AppPreProcessor import * -class grbl_11(FlatCAMPostProc): +class grbl_11(PreProc): include_header = True coordinate_format = "%.*f" diff --git a/preprocessors/hpgl.py b/preprocessors/hpgl.py index 61ffc0c6..5126d01d 100644 --- a/preprocessors/hpgl.py +++ b/preprocessors/hpgl.py @@ -11,7 +11,7 @@ from AppPreProcessor import * # for Roland Preprocessors it is mandatory for the preprocessor name (python file and class name, both of them must be # the same) to contain the following keyword, case-sensitive: 'Roland' without the quotes. -class hpgl(FlatCAMPostProc): +class hpgl(PreProc): include_header = True coordinate_format = "%.*f" diff --git a/preprocessors/line_xyz.py b/preprocessors/line_xyz.py index 6beb432c..8bdbc97c 100644 --- a/preprocessors/line_xyz.py +++ b/preprocessors/line_xyz.py @@ -9,7 +9,7 @@ from AppPreProcessor import * -class line_xyz(FlatCAMPostProc): +class line_xyz(PreProc): include_header = True coordinate_format = "%.*f"