giuliof
/
flatcam
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- removed reference to postprocessors and replaced it with preprocessors

This commit is contained in:
Marius Stanciu 2020-05-18 16:11:02 +03:00 committed by Marius
parent ba3f10d355
commit a0a805217d
61 changed files with 212 additions and 211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
AppEditors/FlatCAMGeoEditor.py
View File

@ -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

10
AppEditors/FlatCAMGrbEditor.py
View File

@ -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

8
AppPreProcessor.py
View File

@ -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

6
AppTool.py
View File

@ -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())

10
AppTools/ToolAlignObjects.py
View File

@ -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()

10
AppTools/ToolCalculators.py
View File

@ -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()

10
AppTools/ToolCalibration.py
View File

@ -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()

10
AppTools/ToolCopperThieving.py
View File

@ -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']

10
AppTools/ToolCorners.py
View File

@ -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']

10
AppTools/ToolCutOut.py
View File

@ -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()

10
AppTools/ToolDblSided.py
View File

@ -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"))

8
AppTools/ToolDistance.py
View File

@ -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

8
AppTools/ToolDistanceMin.py
View File

@ -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

10
AppTools/ToolExtractDrills.py
View File

@ -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"))

10
AppTools/ToolFiducials.py
View File

@ -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']

10
AppTools/ToolFilm.py
View File

@ -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()

10
AppTools/ToolImage.py
View File

@ -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

10
AppTools/ToolInvertGerber.py
View File

@ -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"))

8
AppTools/ToolMove.py
View File

@ -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()")

10
AppTools/ToolNCC.py
View File

@ -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

10
AppTools/ToolOptimal.py
View File

@ -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"))

8
AppTools/ToolPDF.py
View File

@ -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

10
AppTools/ToolPaint.py
View File

@ -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"))

10
AppTools/ToolPanelize.py
View File

@ -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()

10
AppTools/ToolPcbWizard.py
View File

@ -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'

10
AppTools/ToolProperties.py
View File

@ -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

10
AppTools/ToolPunchGerber.py
View File

@ -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()

10
AppTools/ToolQRCode.py
View File

@ -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']

10
AppTools/ToolRulesCheck.py
View File

@ -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):

10
AppTools/ToolSolderPaste.py
View File

@ -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"),

10
AppTools/ToolSub.py
View File

@ -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"))

10
AppTools/ToolTransform.py
View File

@ -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"))

1
CHANGELOG.md
View File

@ -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

24
Common.py
View File

@ -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):

4
locale/de/LC_MESSAGES/strings.po
View File

@ -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."

4
locale/en/LC_MESSAGES/strings.po
View File

@ -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."

4
locale/es/LC_MESSAGES/strings.po
View File

@ -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."

4
locale/fr/LC_MESSAGES/strings.po
View File

@ -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."

4
locale/hu/LC_MESSAGES/strings.po
View File

@ -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."

4
locale/it/LC_MESSAGES/strings.po
View File

@ -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."

4
locale/pt_BR/LC_MESSAGES/strings.po
View File

@ -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."

4
locale/ro/LC_MESSAGES/strings.po
View File

@ -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."

4
locale/ru/LC_MESSAGES/strings.po
View File

@ -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 "Отредактированное значение находится в пределах нормы."

4
locale_template/strings.pot
View File

@ -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 ""

2
preprocessors/Berta_CNC.py
View File

@ -13,7 +13,7 @@
from AppPreProcessor import *
class Berta_CNC(FlatCAMPostProc):
class Berta_CNC(PreProc):
include_header = True
coordinate_format = "%.*f"

2
preprocessors/GRBL_laser.py
View File

@ -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"

2
preprocessors/ISEL_CNC.py
View File

@ -9,7 +9,7 @@
from AppPreProcessor import *
class ISEL_CNC(FlatCAMPostProc):
class ISEL_CNC(PreProc):
include_header = True
coordinate_format = "%.*f"
feedrate_format = '%.*f'

2
preprocessors/ISEL_ICP_CNC.py
View File

@ -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):

2
preprocessors/Marlin.py
View File

@ -9,7 +9,7 @@
from AppPreProcessor import *
class Marlin(FlatCAMPostProc):
class Marlin(PreProc):
include_header = True
coordinate_format = "%.*f"

2
preprocessors/Marlin_laser_FAN_pin.py
View File

@ -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"

2
preprocessors/Marlin_laser_Spindle_pin.py
View File

@ -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"

2
preprocessors/Paste_1.py
View File

@ -9,7 +9,7 @@
from AppPreProcessor import *
class Paste_1(FlatCAMPostProc_Tools):
class Paste_1(AppPreProcTools):
include_header = True
coordinate_format = "%.*f"

2
preprocessors/Repetier.py
View File

@ -9,7 +9,7 @@
from AppPreProcessor import *
class Repetier(FlatCAMPostProc):
class Repetier(PreProc):
include_header = True
coordinate_format = "%.*f"

2
preprocessors/Roland_MDX_20.py
View File

@ -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"

2
preprocessors/Toolchange_Custom.py
View File

@ -9,7 +9,7 @@
from AppPreProcessor import *
class Toolchange_Custom(FlatCAMPostProc):
class Toolchange_Custom(PreProc):
include_header = True
coordinate_format = "%.*f"

2
preprocessors/Toolchange_Manual.py
View File

@ -9,7 +9,7 @@
from AppPreProcessor import *
class Toolchange_Manual(FlatCAMPostProc):
class Toolchange_Manual(PreProc):
include_header = True
coordinate_format = "%.*f"

2
preprocessors/Toolchange_Probe_MACH3.py
View File

@ -9,7 +9,7 @@
from AppPreProcessor import *
class Toolchange_Probe_MACH3(FlatCAMPostProc):
class Toolchange_Probe_MACH3(PreProc):
include_header = True
coordinate_format = "%.*f"

2
preprocessors/default.py
View File

@ -9,7 +9,7 @@
from AppPreProcessor import *
class default(FlatCAMPostProc):
class default(PreProc):
include_header = True
coordinate_format = "%.*f"

2
preprocessors/grbl_11.py
View File

@ -9,7 +9,7 @@
from AppPreProcessor import *
class grbl_11(FlatCAMPostProc):
class grbl_11(PreProc):
include_header = True
coordinate_format = "%.*f"

2
preprocessors/hpgl.py
View File

@ -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"

2
preprocessors/line_xyz.py
View File

@ -9,7 +9,7 @@
from AppPreProcessor import *
class line_xyz(FlatCAMPostProc):
class line_xyz(PreProc):
include_header = True
coordinate_format = "%.*f"