bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- renamed classes to have shorter names and grouped

Browse Source
This commit is contained in:
Marius Stanciu
2020-05-18 16:02:41 +03:00
committed by Marius
parent 4c83e87feb
commit ba3f10d355
185 changed files with 749 additions and 748 deletions
Download Patch File Download Diff File Expand all files Collapse all files

152
FlatCAMApp.py → App.py
View File

@@ -42,57 +42,57 @@ import socket
# #################################################################################################################### # ####################################################################################################################
# Diverse # Diverse
from FlatCAMCommon import LoudDict, color_variant, ExclusionAreas from Common import LoudDict, color_variant, ExclusionAreas
from FlatCAMBookmark import BookmarkManager from Bookmark import BookmarkManager
from FlatCAMDB import ToolsDB2 from AppDatabase import ToolsDB2
from vispy.gloo.util import _screenshot from vispy.gloo.util import _screenshot
from vispy.io import write_png from vispy.io import write_png
# FlatCAM Objects # FlatCAM AppObjects
from defaults import FlatCAMDefaults from defaults import FlatCAMDefaults
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
from flatcamGUI.preferences.PreferencesUIManager import PreferencesUIManager from AppGUI.preferences.PreferencesUIManager import PreferencesUIManager
from flatcamObjects.ObjectCollection import * from AppObjects.ObjectCollection import *
from flatcamObjects.FlatCAMObj import FlatCAMObj from AppObjects.FlatCAMObj import FlatCAMObj
from flatcamObjects.FlatCAMCNCJob import CNCJobObject from AppObjects.FlatCAMCNCJob import CNCJobObject
from flatcamObjects.FlatCAMDocument import DocumentObject from AppObjects.FlatCAMDocument import DocumentObject
from flatcamObjects.FlatCAMExcellon import ExcellonObject from AppObjects.FlatCAMExcellon import ExcellonObject
from flatcamObjects.FlatCAMGeometry import GeometryObject from AppObjects.FlatCAMGeometry import GeometryObject
from flatcamObjects.FlatCAMGerber import GerberObject from AppObjects.FlatCAMGerber import GerberObject
from flatcamObjects.FlatCAMScript import ScriptObject from AppObjects.FlatCAMScript import ScriptObject
# FlatCAM Parsing files # FlatCAM Parsing files
from flatcamParsers.ParseExcellon import Excellon from AppParsers.ParseExcellon import Excellon
from flatcamParsers.ParseGerber import Gerber from AppParsers.ParseGerber import Gerber
from camlib import to_dict, dict2obj, ET, ParseError, Geometry, CNCjob from camlib import to_dict, dict2obj, ET, ParseError, Geometry, CNCjob
# FlatCAM GUI # FlatCAM AppGUI
from flatcamGUI.PlotCanvas import * from AppGUI.PlotCanvas import *
from flatcamGUI.PlotCanvasLegacy import * from AppGUI.PlotCanvasLegacy import *
from flatcamGUI.FlatCAMGUI import * from AppGUI.FlatCAMGUI import *
from flatcamGUI.GUIElements import FCFileSaveDialog, message_dialog, FlatCAMSystemTray from AppGUI.GUIElements import FCFileSaveDialog, message_dialog, FlatCAMSystemTray
# FlatCAM Pre-processors # FlatCAM Pre-processors
from FlatCAMPostProc import load_preprocessors from AppPreProcessor import load_preprocessors
# FlatCAM Editors # FlatCAM AppEditors
from flatcamEditors.FlatCAMGeoEditor import FlatCAMGeoEditor from AppEditors.FlatCAMGeoEditor import FlatCAMGeoEditor
from flatcamEditors.FlatCAMExcEditor import FlatCAMExcEditor from AppEditors.FlatCAMExcEditor import FlatCAMExcEditor
from flatcamEditors.FlatCAMGrbEditor import FlatCAMGrbEditor from AppEditors.FlatCAMGrbEditor import FlatCAMGrbEditor
from flatcamEditors.FlatCAMTextEditor import TextEditor from AppEditors.FlatCAMTextEditor import TextEditor
from flatcamParsers.ParseHPGL2 import HPGL2 from AppParsers.ParseHPGL2 import HPGL2
# FlatCAM Workers # FlatCAM Workers
from FlatCAMProcess import * from AppProcess import *
from FlatCAMWorkerStack import WorkerStack from AppWorkerStack import WorkerStack
# FlatCAM Tools # FlatCAM Tools
from flatcamTools import * from AppTools import *
# FlatCAM Translation # FlatCAM Translation
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
if sys.platform == 'win32': if sys.platform == 'win32':
@@ -106,7 +106,7 @@ if '_' not in builtins.__dict__:
class App(QtCore.QObject): class App(QtCore.QObject):
""" """
The main application class. The constructor starts the GUI. The main application class. The constructor starts the AppGUI.
""" """
# ############################################################################################################### # ###############################################################################################################
@@ -417,7 +417,7 @@ class App(QtCore.QObject):
fp.close() fp.close()
# Application directory. CHDIR to it. Otherwise, trying to load # Application directory. CHDIR to it. Otherwise, trying to load
# GUI icons will fail as their path is relative. # AppGUI icons will fail as their path is relative.
# This will fail under cx_freeze ... # This will fail under cx_freeze ...
self.app_home = os.path.dirname(os.path.realpath(__file__)) self.app_home = os.path.dirname(os.path.realpath(__file__))
@@ -496,7 +496,7 @@ class App(QtCore.QObject):
show_splash = 0 show_splash = 0
# ########################################################################################################### # ###########################################################################################################
# ######################################### Initialize GUI ################################################## # ######################################### Initialize AppGUI ##################################################
# ########################################################################################################### # ###########################################################################################################
# FlatCAM colors used in plotting # FlatCAM colors used in plotting
@@ -581,14 +581,14 @@ class App(QtCore.QObject):
self.ui.excellon_defaults_form.excellon_opt_group.pp_excellon_name_cb.addItem(name) self.ui.excellon_defaults_form.excellon_opt_group.pp_excellon_name_cb.addItem(name)
# ########################################################################################################### # ###########################################################################################################
# ##################################### UPDATE PREFERENCES GUI FORMS ######################################## # ##################################### UPDATE PREFERENCES AppGUI FORMS ########################################
# ########################################################################################################### # ###########################################################################################################
self.preferencesUiManager = PreferencesUIManager(defaults=self.defaults, data_path=self.data_path, ui=self.ui, self.preferencesUiManager = PreferencesUIManager(defaults=self.defaults, data_path=self.data_path, ui=self.ui,
inform=self.inform) inform=self.inform)
self.preferencesUiManager.defaults_write_form() self.preferencesUiManager.defaults_write_form()
# When the self.defaults dictionary changes will update the Preferences GUI forms # When the self.defaults dictionary changes will update the Preferences AppGUI forms
self.defaults.set_change_callback(self.on_defaults_dict_change) self.defaults.set_change_callback(self.on_defaults_dict_change)
# ########################################################################################################### # ###########################################################################################################
@@ -596,7 +596,7 @@ class App(QtCore.QObject):
# ################################ It's done only once after install ##################################### # ################################ It's done only once after install #####################################
# ########################################################################################################### # ###########################################################################################################
if self.defaults["first_run"] is True: if self.defaults["first_run"] is True:
# ONLY AT FIRST STARTUP INIT THE GUI LAYOUT TO 'COMPACT' # ONLY AT FIRST STARTUP INIT THE AppGUI LAYOUT TO 'COMPACT'
initial_lay = 'minimal' initial_lay = 'minimal'
self.ui.general_defaults_form.general_gui_group.on_layout(lay=initial_lay) self.ui.general_defaults_form.general_gui_group.on_layout(lay=initial_lay)
@@ -957,7 +957,7 @@ class App(QtCore.QObject):
act.triggered.connect(self.on_set_color_action_triggered) act.triggered.connect(self.on_set_color_action_triggered)
# ########################################################################################################### # ###########################################################################################################
# #################################### GUI PREFERENCES SIGNALS ############################################## # #################################### AppGUI PREFERENCES SIGNALS ##############################################
# ########################################################################################################### # ###########################################################################################################
self.ui.general_defaults_form.general_app_group.units_radio.activated_custom.connect( self.ui.general_defaults_form.general_app_group.units_radio.activated_custom.connect(
@@ -973,7 +973,7 @@ class App(QtCore.QObject):
self.ui.general_defaults_form.general_app_set_group.workspace_cb.stateChanged.connect(self.on_workspace) self.ui.general_defaults_form.general_app_set_group.workspace_cb.stateChanged.connect(self.on_workspace)
# ########################################################################################################### # ###########################################################################################################
# ######################################## GUI SETTINGS SIGNALS ############################################# # ######################################## AppGUI SETTINGS SIGNALS #############################################
# ########################################################################################################### # ###########################################################################################################
self.ui.general_defaults_form.general_app_set_group.cursor_radio.activated_custom.connect(self.on_cursor_type) self.ui.general_defaults_form.general_app_set_group.cursor_radio.activated_custom.connect(self.on_cursor_type)
@@ -1086,7 +1086,7 @@ class App(QtCore.QObject):
# ########################################## Other setups ################################################### # ########################################## Other setups ###################################################
# ########################################################################################################### # ###########################################################################################################
# to use for tools like Distance tool who depends on the event sources who are changed inside the Editors # to use for tools like Distance tool who depends on the event sources who are changed inside the AppEditors
# depending on from where those tools are called different actions can be done # depending on from where those tools are called different actions can be done
self.call_source = 'app' self.call_source = 'app'
@@ -1559,7 +1559,7 @@ class App(QtCore.QObject):
except AttributeError: except AttributeError:
self.tool_shapes = None self.tool_shapes = None
else: else:
from flatcamGUI.PlotCanvasLegacy import ShapeCollectionLegacy from AppGUI.PlotCanvasLegacy import ShapeCollectionLegacy
self.tool_shapes = ShapeCollectionLegacy(obj=self, app=self, name="tool") self.tool_shapes = ShapeCollectionLegacy(obj=self, app=self, name="tool")
# used in the delayed shutdown self.start_delayed_quit() method # used in the delayed shutdown self.start_delayed_quit() method
@@ -1606,7 +1606,7 @@ class App(QtCore.QObject):
App.log.debug("END of constructor. Releasing control.") App.log.debug("END of constructor. Releasing control.")
# ########################################################################################################### # ###########################################################################################################
# ########################################## SHOW GUI ####################################################### # ########################################## SHOW AppGUI #######################################################
# ########################################################################################################### # ###########################################################################################################
# if the app is not started as headless, show it # if the app is not started as headless, show it
@@ -1714,7 +1714,7 @@ class App(QtCore.QObject):
try: try:
shutil.copytree(from_path, to_path) shutil.copytree(from_path, to_path)
except FileNotFoundError: except FileNotFoundError:
from_new_path = os.path.dirname(os.path.realpath(__file__)) + '\\flatcamGUI\\VisPyData\\data' from_new_path = os.path.dirname(os.path.realpath(__file__)) + '\\AppGUI\\VisPyData\\data'
shutil.copytree(from_new_path, to_path) shutil.copytree(from_new_path, to_path)
def on_startup_args(self, args, silent=False): def on_startup_args(self, args, silent=False):
@@ -2130,7 +2130,7 @@ class App(QtCore.QObject):
""" """
self.defaults.report_usage("object2editor()") self.defaults.report_usage("object2editor()")
# disable the objects menu as it may interfere with the Editors # disable the objects menu as it may interfere with the AppEditors
self.ui.menuobjects.setDisabled(True) self.ui.menuobjects.setDisabled(True)
edited_object = self.collection.get_active() edited_object = self.collection.get_active()
@@ -2267,8 +2267,8 @@ class App(QtCore.QObject):
self.geo_editor.deactivate() self.geo_editor.deactivate()
# restore GUI to the Selected TAB # restore AppGUI to the Selected TAB
# Remove anything else in the GUI # Remove anything else in the AppGUI
self.ui.tool_scroll_area.takeWidget() self.ui.tool_scroll_area.takeWidget()
# update the geo object options so it is including the bounding box values # update the geo object options so it is including the bounding box values
@@ -2306,8 +2306,8 @@ class App(QtCore.QObject):
self.inform.emit('[success] %s' % _("Editor exited. Editor content saved.")) self.inform.emit('[success] %s' % _("Editor exited. Editor content saved."))
# restore GUI to the Selected TAB # restore AppGUI to the Selected TAB
# Remove anything else in the GUI # Remove anything else in the AppGUI
self.ui.selected_scroll_area.takeWidget() self.ui.selected_scroll_area.takeWidget()
elif isinstance(edited_obj, ExcellonObject): elif isinstance(edited_obj, ExcellonObject):
@@ -2318,8 +2318,8 @@ class App(QtCore.QObject):
self.exc_editor.deactivate() self.exc_editor.deactivate()
# restore GUI to the Selected TAB # restore AppGUI to the Selected TAB
# Remove anything else in the GUI # Remove anything else in the AppGUI
self.ui.tool_scroll_area.takeWidget() self.ui.tool_scroll_area.takeWidget()
# delete the old object (the source object) if it was an empty one # delete the old object (the source object) if it was an empty one
@@ -2671,7 +2671,7 @@ class App(QtCore.QObject):
def new_object(self, kind, name, initialize, plot=True, autoselected=True): def new_object(self, kind, name, initialize, plot=True, autoselected=True):
""" """
Creates a new specialized FlatCAMObj and attaches it to the application, Creates a new specialized FlatCAMObj and attaches it to the application,
this is, updates the GUI accordingly, any other records and plots it. this is, updates the AppGUI accordingly, any other records and plots it.
This method is thread-safe. This method is thread-safe.
Notes: Notes:
@@ -3568,7 +3568,7 @@ class App(QtCore.QObject):
def on_portable_checked(self, state): def on_portable_checked(self, state):
""" """
Callback called when the checkbox in Preferences GUI is checked. Callback called when the checkbox in Preferences AppGUI is checked.
It will set the application as portable by creating the preferences and recent files in the It will set the application as portable by creating the preferences and recent files in the
'config' folder found in the FlatCAM installation folder. 'config' folder found in the FlatCAM installation folder.
@@ -3952,7 +3952,7 @@ class App(QtCore.QObject):
if len(objs) < 2: if len(objs) < 2:
self.inform.emit('[ERROR_NOTCL] %s: %d' % self.inform.emit('[ERROR_NOTCL] %s: %d' %
(_("At least two objects are required for join. Objects currently selected"), len(objs))) (_("At least two objects are required for join. AppObjects currently selected"), len(objs)))
return 'fail' return 'fail'
for obj in objs: for obj in objs:
@@ -4011,7 +4011,7 @@ class App(QtCore.QObject):
if len(objs) < 2: if len(objs) < 2:
self.inform.emit('[ERROR_NOTCL] %s: %d' % self.inform.emit('[ERROR_NOTCL] %s: %d' %
(_("At least two objects are required for join. Objects currently selected"), len(objs))) (_("At least two objects are required for join. AppObjects currently selected"), len(objs)))
return 'fail' return 'fail'
def initialize(exc_obj, app): def initialize(exc_obj, app):
@@ -4039,7 +4039,7 @@ class App(QtCore.QObject):
if len(objs) < 2: if len(objs) < 2:
self.inform.emit('[ERROR_NOTCL] %s: %d' % self.inform.emit('[ERROR_NOTCL] %s: %d' %
(_("At least two objects are required for join. Objects currently selected"), len(objs))) (_("At least two objects are required for join. AppObjects currently selected"), len(objs)))
return 'fail' return 'fail'
def initialize(grb_obj, app): def initialize(grb_obj, app):
@@ -4125,7 +4125,7 @@ class App(QtCore.QObject):
def on_defaults_dict_change(self, field): def on_defaults_dict_change(self, field):
""" """
Called whenever a key changed in the self.defaults dictionary. It will set the required GUI element in the Called whenever a key changed in the self.defaults dictionary. It will set the required AppGUI element in the
Edit -> Preferences tab window. Edit -> Preferences tab window.
:param field: the key of the self.defaults dictionary that was changed. :param field: the key of the self.defaults dictionary that was changed.
@@ -4401,7 +4401,7 @@ class App(QtCore.QObject):
self.preferencesUiManager.defaults_read_form() self.preferencesUiManager.defaults_read_form()
# the self.preferencesUiManager.defaults_read_form() will update all defaults values # the self.preferencesUiManager.defaults_read_form() will update all defaults values
# in self.defaults from the GUI elements but # in self.defaults from the AppGUI elements but
# I don't want it for the grid values, so I update them here # I don't want it for the grid values, so I update them here
self.defaults['global_gridx'] = val_x self.defaults['global_gridx'] = val_x
self.defaults['global_gridy'] = val_y self.defaults['global_gridy'] = val_y
@@ -6194,7 +6194,7 @@ class App(QtCore.QObject):
def on_row_selected(self, obj_name): def on_row_selected(self, obj_name):
""" """
This is a special string; when received it will make all Menu -> Objects entries unchecked This is a special string; when received it will make all Menu -> AppObjects entries unchecked
It mean we clicked outside of the items and deselected all It mean we clicked outside of the items and deselected all
:param obj_name: :param obj_name:
@@ -6378,7 +6378,7 @@ class App(QtCore.QObject):
pass pass
if obj_list: if obj_list:
self.inform.emit('%s' % _("Objects selection is cleared.")) self.inform.emit('%s' % _("AppObjects selection is cleared."))
else: else:
self.inform.emit('') self.inform.emit('')
@@ -6653,7 +6653,7 @@ class App(QtCore.QObject):
else: else:
self.selection_type = None self.selection_type = None
# hover effect - enabled in Preferences -> General -> GUI Settings # hover effect - enabled in Preferences -> General -> AppGUI Settings
if self.defaults['global_hover']: if self.defaults['global_hover']:
for obj in self.collection.get_list(): for obj in self.collection.get_list():
try: try:
@@ -7240,7 +7240,7 @@ class App(QtCore.QObject):
# Init FlatCAMTools # Init FlatCAMTools
self.init_tools() self.init_tools()
# Try to close all tabs in the PlotArea but only if the GUI is active (CLI is None) # Try to close all tabs in the PlotArea but only if the AppGUI is active (CLI is None)
if cli is None: if cli is None:
# we need to go in reverse because once we remove a tab then the index changes # we need to go in reverse because once we remove a tab then the index changes
# meaning that removing the first tab (idx = 0) then the tab at former idx = 1 will assume idx = 0 # meaning that removing the first tab (idx = 0) then the tab at former idx = 1 will assume idx = 0
@@ -9104,7 +9104,7 @@ class App(QtCore.QObject):
# Register recent file # Register recent file
self.file_opened.emit("svg", filename) self.file_opened.emit("svg", filename)
# GUI feedback # AppGUI feedback
self.inform.emit('[success] %s: %s' % (_("Opened"), filename)) self.inform.emit('[success] %s: %s' % (_("Opened"), filename))
def import_dxf(self, filename, geo_type='geometry', outname=None, plot=True): def import_dxf(self, filename, geo_type='geometry', outname=None, plot=True):
@@ -9150,7 +9150,7 @@ class App(QtCore.QObject):
# Register recent file # Register recent file
self.file_opened.emit("dxf", filename) self.file_opened.emit("dxf", filename)
# GUI feedback # AppGUI feedback
self.inform.emit('[success] %s: %s' % (_("Opened"), filename)) self.inform.emit('[success] %s: %s' % (_("Opened"), filename))
def open_gerber(self, filename, outname=None, plot=True, from_tcl=False): def open_gerber(self, filename, outname=None, plot=True, from_tcl=False):
@@ -9214,7 +9214,7 @@ class App(QtCore.QObject):
# Register recent file # Register recent file
self.file_opened.emit("gerber", filename) self.file_opened.emit("gerber", filename)
# GUI feedback # AppGUI feedback
self.inform.emit('[success] %s: %s' % (_("Opened"), filename)) self.inform.emit('[success] %s: %s' % (_("Opened"), filename))
def open_excellon(self, filename, outname=None, plot=True, from_tcl=False): def open_excellon(self, filename, outname=None, plot=True, from_tcl=False):
@@ -9281,7 +9281,7 @@ class App(QtCore.QObject):
# Register recent file # Register recent file
self.file_opened.emit("excellon", filename) self.file_opened.emit("excellon", filename)
# GUI feedback # AppGUI feedback
self.inform.emit('[success] %s: %s' % (_("Opened"), filename)) self.inform.emit('[success] %s: %s' % (_("Opened"), filename))
def open_gcode(self, filename, outname=None, force_parsing=None, plot=True, from_tcl=False): def open_gcode(self, filename, outname=None, force_parsing=None, plot=True, from_tcl=False):
@@ -9347,7 +9347,7 @@ class App(QtCore.QObject):
# Register recent file # Register recent file
self.file_opened.emit("cncjob", filename) self.file_opened.emit("cncjob", filename)
# GUI feedback # AppGUI feedback
self.inform.emit('[success] %s: %s' % (_("Opened"), filename)) self.inform.emit('[success] %s: %s' % (_("Opened"), filename))
def open_hpgl2(self, filename, outname=None): def open_hpgl2(self, filename, outname=None):
@@ -9412,7 +9412,7 @@ class App(QtCore.QObject):
# Register recent file # Register recent file
self.file_opened.emit("geometry", filename) self.file_opened.emit("geometry", filename)
# GUI feedback # AppGUI feedback
self.inform.emit('[success] %s: %s' % (_("Opened"), filename)) self.inform.emit('[success] %s: %s' % (_("Opened"), filename))
def open_script(self, filename, outname=None, silent=False): def open_script(self, filename, outname=None, silent=False):
@@ -9469,7 +9469,7 @@ class App(QtCore.QObject):
# Register recent file # Register recent file
self.file_opened.emit("script", filename) self.file_opened.emit("script", filename)
# GUI feedback # AppGUI feedback
self.inform.emit('[success] %s: %s' % (_("Opened"), filename)) self.inform.emit('[success] %s: %s' % (_("Opened"), filename))
def open_config_file(self, filename, run_from_arg=None): def open_config_file(self, filename, run_from_arg=None):
@@ -9898,11 +9898,11 @@ class App(QtCore.QObject):
# <li><span style="font-size:{fsize}px">Loat/Import a Gerber, Excellon, Gcode, DXF, Raster Image or SVG # <li><span style="font-size:{fsize}px">Loat/Import a Gerber, Excellon, Gcode, DXF, Raster Image or SVG
# file into # file into
# FlatCAM using either the menu&#39;s, toolbars, key shortcuts or # FlatCAM using either the menu&#39;s, toolbars, key shortcuts or
# even dragging and dropping the files on the GUI.<br /> # even dragging and dropping the files on the AppGUI.<br />
# <br /> # <br />
# You can also load a <strong>FlatCAM project</strong> by double clicking on the project file, drag &amp; # You can also load a <strong>FlatCAM project</strong> by double clicking on the project file, drag &amp;
# drop of the # drop of the
# file into the FLATCAM GUI or through the menu/toolbar links offered within the app.</span><br /> # file into the FLATCAM AppGUI or through the menu/toolbar links offered within the app.</span><br />
# &nbsp;</li> # &nbsp;</li>
# <li><span style="font-size:{fsize}px">Once an object is available in the Project Tab, by selecting it # <li><span style="font-size:{fsize}px">Once an object is available in the Project Tab, by selecting it
# and then # and then
@@ -9961,9 +9961,9 @@ class App(QtCore.QObject):
s1=_("The normal flow when working in FlatCAM is the following:"), s1=_("The normal flow when working in FlatCAM is the following:"),
s2=_("Load/Import a Gerber, Excellon, Gcode, DXF, Raster Image or SVG file into FlatCAM " s2=_("Load/Import a Gerber, Excellon, Gcode, DXF, Raster Image or SVG file into FlatCAM "
"using either the toolbars, key shortcuts or even dragging and dropping the " "using either the toolbars, key shortcuts or even dragging and dropping the "
"files on the GUI."), "files on the AppGUI."),
s3=_("You can also load a FlatCAM project by double clicking on the project file, " s3=_("You can also load a FlatCAM project by double clicking on the project file, "
"drag and drop of the file into the FLATCAM GUI or through the menu (or toolbar) " "drag and drop of the file into the FLATCAM AppGUI or through the menu (or toolbar) "
"actions offered within the app."), "actions offered within the app."),
s4=_("Once an object is available in the Project Tab, by selecting it and then focusing " s4=_("Once an object is available in the Project Tab, by selecting it and then focusing "
"on SELECTED TAB (more simpler is to double click the object name in the Project Tab, " "on SELECTED TAB (more simpler is to double click the object name in the Project Tab, "
@@ -10211,7 +10211,7 @@ class App(QtCore.QObject):
""" """
Enable plots Enable plots
:param objects: list of Objects to be enabled :param objects: list of AppObjects to be enabled
:return: :return:
""" """
log.debug("Enabling plots ...") log.debug("Enabling plots ...")
@@ -10254,7 +10254,7 @@ class App(QtCore.QObject):
""" """
Disables plots Disables plots
:param objects: list of Objects to be disabled :param objects: list of AppObjects to be disabled
:return: :return:
""" """
@@ -10304,7 +10304,7 @@ class App(QtCore.QObject):
""" """
Toggle plots visibility Toggle plots visibility
:param objects: list of Objects for which to be toggled the visibility :param objects: list of AppObjects for which to be toggled the visibility
:return: None :return: None
""" """

10
FlatCAMDB.py → AppDatabase.py
View File

@@ -1,5 +1,5 @@
from PyQt5 import QtGui, QtCore, QtWidgets from PyQt5 import QtGui, QtCore, QtWidgets
from flatcamGUI.GUIElements import FCTable, FCEntry, FCButton, FCDoubleSpinner, FCComboBox, FCCheckBox, FCSpinner, \ from AppGUI.GUIElements import FCTable, FCEntry, FCButton, FCDoubleSpinner, FCComboBox, FCCheckBox, FCSpinner, \
FCTree, RadioSet, FCFileSaveDialog FCTree, RadioSet, FCFileSaveDialog
from camlib import to_dict from camlib import to_dict
@@ -9,7 +9,7 @@ import json
from copy import deepcopy from copy import deepcopy
from datetime import datetime from datetime import datetime
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')
@@ -1623,7 +1623,7 @@ class ToolsDB2(QtWidgets.QWidget):
# #################################################################### # ####################################################################
# #################################################################### # ####################################################################
# GUI for the lower part of the window # AppGUI for the lower part of the window
# #################################################################### # ####################################################################
# #################################################################### # ####################################################################
@@ -1939,7 +1939,7 @@ class ToolsDB2(QtWidgets.QWidget):
if self.db_tool_dict: if self.db_tool_dict:
self.storage_to_form(self.db_tool_dict['1']) self.storage_to_form(self.db_tool_dict['1'])
# Enable GUI # Enable AppGUI
self.basic_box.setEnabled(True) self.basic_box.setEnabled(True)
self.advanced_box.setEnabled(True) self.advanced_box.setEnabled(True)
self.ncc_box.setEnabled(True) self.ncc_box.setEnabled(True)
@@ -1949,7 +1949,7 @@ class ToolsDB2(QtWidgets.QWidget):
# self.tree_widget.setFocus() # self.tree_widget.setFocus()
else: else:
# Disable GUI # Disable AppGUI
self.basic_box.setEnabled(False) self.basic_box.setEnabled(False)
self.advanced_box.setEnabled(False) self.advanced_box.setEnabled(False)
self.ncc_box.setEnabled(False) self.ncc_box.setEnabled(False)

22
flatcamEditors/FlatCAMExcEditor.py → AppEditors/FlatCAMExcEditor.py
View File

@@ -9,9 +9,9 @@ from PyQt5 import QtGui, QtCore, QtWidgets
from PyQt5.QtCore import Qt, QSettings from PyQt5.QtCore import Qt, QSettings
from camlib import distance, arc, FlatCAMRTreeStorage from camlib import distance, arc, FlatCAMRTreeStorage
from flatcamGUI.GUIElements import FCEntry, FCComboBox, FCTable, FCDoubleSpinner, RadioSet, FCSpinner from AppGUI.GUIElements import FCEntry, FCComboBox, FCTable, FCDoubleSpinner, RadioSet, FCSpinner
from flatcamEditors.FlatCAMGeoEditor import FCShapeTool, DrawTool, DrawToolShape, DrawToolUtilityShape, FlatCAMGeoEditor from AppEditors.FlatCAMGeoEditor import FCShapeTool, DrawTool, DrawToolShape, DrawToolUtilityShape, FlatCAMGeoEditor
from flatcamParsers.ParseExcellon import Excellon from AppParsers.ParseExcellon import Excellon
from shapely.geometry import LineString, LinearRing, MultiLineString, Polygon, MultiPolygon, Point from shapely.geometry import LineString, LinearRing, MultiLineString, Polygon, MultiPolygon, Point
import shapely.affinity as affinity import shapely.affinity as affinity
@@ -26,7 +26,7 @@ import logging
from copy import deepcopy from copy import deepcopy
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')
@@ -2123,7 +2123,7 @@ class FlatCAMExcEditor(QtCore.QObject):
else: else:
self.tool_shape = self.app.plotcanvas.new_shape_collection(layers=1) self.tool_shape = self.app.plotcanvas.new_shape_collection(layers=1)
else: else:
from flatcamGUI.PlotCanvasLegacy import ShapeCollectionLegacy from AppGUI.PlotCanvasLegacy import ShapeCollectionLegacy
self.shapes = ShapeCollectionLegacy(obj=self, app=self.app, name='shapes_exc_editor') self.shapes = ShapeCollectionLegacy(obj=self, app=self.app, name='shapes_exc_editor')
self.tool_shape = ShapeCollectionLegacy(obj=self, app=self.app, name='tool_shapes_exc_editor') self.tool_shape = ShapeCollectionLegacy(obj=self, app=self.app, name='tool_shapes_exc_editor')
@@ -2312,7 +2312,7 @@ class FlatCAMExcEditor(QtCore.QObject):
tool_dia = float('%.*f' % (self.decimals, v['C'])) tool_dia = float('%.*f' % (self.decimals, v['C']))
self.tool2tooldia[int(k)] = tool_dia self.tool2tooldia[int(k)] = tool_dia
# Init GUI # Init AppGUI
self.addtool_entry.set_value(float(self.app.defaults['excellon_editor_newdia'])) self.addtool_entry.set_value(float(self.app.defaults['excellon_editor_newdia']))
self.drill_array_size_entry.set_value(int(self.app.defaults['excellon_editor_array_size'])) self.drill_array_size_entry.set_value(int(self.app.defaults['excellon_editor_array_size']))
self.drill_axis_radio.set_value(self.app.defaults['excellon_editor_lin_dir']) self.drill_axis_radio.set_value(self.app.defaults['excellon_editor_lin_dir'])
@@ -2415,7 +2415,7 @@ class FlatCAMExcEditor(QtCore.QObject):
drill_count = QtWidgets.QTableWidgetItem('%d' % drill_cnt) drill_count = QtWidgets.QTableWidgetItem('%d' % drill_cnt)
drill_count.setFlags(QtCore.Qt.ItemIsEnabled) drill_count.setFlags(QtCore.Qt.ItemIsEnabled)
# if the slot number is zero is better to not clutter the GUI with zero's so we print a space # if the slot number is zero is better to not clutter the AppGUI with zero's so we print a space
if slot_cnt > 0: if slot_cnt > 0:
slot_count = QtWidgets.QTableWidgetItem('%d' % slot_cnt) slot_count = QtWidgets.QTableWidgetItem('%d' % slot_cnt)
else: else:
@@ -2532,9 +2532,9 @@ class FlatCAMExcEditor(QtCore.QObject):
# make sure no rows are selected so the user have to click the correct row, meaning selecting the correct tool # make sure no rows are selected so the user have to click the correct row, meaning selecting the correct tool
self.tools_table_exc.clearSelection() self.tools_table_exc.clearSelection()
# Remove anything else in the GUI Selected Tab # Remove anything else in the AppGUI Selected Tab
self.app.ui.selected_scroll_area.takeWidget() self.app.ui.selected_scroll_area.takeWidget()
# Put ourself in the GUI Selected Tab # Put ourself in the AppGUI Selected Tab
self.app.ui.selected_scroll_area.setWidget(self.exc_edit_widget) self.app.ui.selected_scroll_area.setWidget(self.exc_edit_widget)
# Switch notebook to Selected page # Switch notebook to Selected page
self.app.ui.notebook.setCurrentWidget(self.app.ui.selected_tab) self.app.ui.notebook.setCurrentWidget(self.app.ui.selected_tab)
@@ -3043,7 +3043,7 @@ class FlatCAMExcEditor(QtCore.QObject):
self.set_ui() self.set_ui()
# now that we hava data, create the GUI interface and add it to the Tool Tab # now that we hava data, create the AppGUI interface and add it to the Tool Tab
self.build_ui(first_run=True) self.build_ui(first_run=True)
# we activate this after the initial build as we don't need to see the tool been populated # we activate this after the initial build as we don't need to see the tool been populated
@@ -4024,7 +4024,7 @@ class FlatCAMExcEditor(QtCore.QObject):
def select_tool(self, toolname): def select_tool(self, toolname):
""" """
Selects a drawing tool. Impacts the object and GUI. Selects a drawing tool. Impacts the object and AppGUI.
:param toolname: Name of the tool. :param toolname: Name of the tool.
:return: None :return: None

32
flatcamEditors/FlatCAMGeoEditor.py → AppEditors/FlatCAMGeoEditor.py
View File

@@ -15,11 +15,11 @@ from PyQt5 import QtGui, QtCore, QtWidgets
from PyQt5.QtCore import Qt, QSettings from PyQt5.QtCore import Qt, QSettings
from camlib import distance, arc, three_point_circle, Geometry, FlatCAMRTreeStorage from camlib import distance, arc, three_point_circle, Geometry, FlatCAMRTreeStorage
from FlatCAMTool import FlatCAMTool from AppTool import FlatCAMTool
from flatcamGUI.ObjectUI import RadioSet from AppGUI.ObjectUI import RadioSet
from flatcamGUI.GUIElements import OptionalInputSection, FCCheckBox, FCEntry, FCComboBox, FCTextAreaRich, \ from AppGUI.GUIElements import OptionalInputSection, FCCheckBox, FCEntry, FCComboBox, FCTextAreaRich, \
FCTable, FCDoubleSpinner, FCButton, EvalEntry2, FCInputDialog, FCTree FCTable, FCDoubleSpinner, FCButton, EvalEntry2, FCInputDialog, FCTree
from flatcamParsers.ParseFont import * from AppParsers.ParseFont import *
from shapely.geometry import LineString, LinearRing, MultiLineString, Polygon, MultiPolygon from shapely.geometry import LineString, LinearRing, MultiLineString, Polygon, MultiPolygon
from shapely.ops import cascaded_union, unary_union, linemerge from shapely.ops import cascaded_union, unary_union, linemerge
@@ -34,7 +34,7 @@ from rtree import index as rtindex
from copy import deepcopy from copy import deepcopy
# from vispy.io import read_png # from vispy.io import read_png
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')
@@ -118,7 +118,7 @@ class BufferSelectionTool(FlatCAMTool):
self.buffer_int_button.clicked.connect(self.on_buffer_int) self.buffer_int_button.clicked.connect(self.on_buffer_int)
self.buffer_ext_button.clicked.connect(self.on_buffer_ext) self.buffer_ext_button.clicked.connect(self.on_buffer_ext)
# Init GUI # Init AppGUI
self.buffer_distance_entry.set_value(0.01) self.buffer_distance_entry.set_value(0.01)
def run(self): def run(self):
@@ -547,7 +547,7 @@ class PaintOptionsTool(FlatCAMTool):
self.app.ui.notebook.setTabText(2, _("Paint Tool")) self.app.ui.notebook.setTabText(2, _("Paint Tool"))
def set_tool_ui(self): def set_tool_ui(self):
# Init GUI # Init AppGUI
if self.app.defaults["tools_painttooldia"]: if self.app.defaults["tools_painttooldia"]:
self.painttooldia_entry.set_value(self.app.defaults["tools_painttooldia"]) self.painttooldia_entry.set_value(self.app.defaults["tools_painttooldia"])
else: else:
@@ -3383,7 +3383,7 @@ class FlatCAMGeoEditor(QtCore.QObject):
self.shapes = self.app.plotcanvas.new_shape_collection(layers=1) self.shapes = self.app.plotcanvas.new_shape_collection(layers=1)
self.tool_shape = self.app.plotcanvas.new_shape_collection(layers=1) self.tool_shape = self.app.plotcanvas.new_shape_collection(layers=1)
else: else:
from flatcamGUI.PlotCanvasLegacy import ShapeCollectionLegacy from AppGUI.PlotCanvasLegacy import ShapeCollectionLegacy
self.shapes = ShapeCollectionLegacy(obj=self, app=self.app, name='shapes_geo_editor') self.shapes = ShapeCollectionLegacy(obj=self, app=self.app, name='shapes_geo_editor')
self.tool_shape = ShapeCollectionLegacy(obj=self, app=self.app, name='tool_shapes_geo_editor') self.tool_shape = ShapeCollectionLegacy(obj=self, app=self.app, name='tool_shapes_geo_editor')
@@ -3463,7 +3463,7 @@ class FlatCAMGeoEditor(QtCore.QObject):
""" """
:param opt: A option from the self.options dictionary :param opt: A option from the self.options dictionary
:param entry: A GUI element which text value is used :param entry: A AppGUI element which text value is used
:return: :return:
""" """
try: try:
@@ -3480,7 +3480,7 @@ class FlatCAMGeoEditor(QtCore.QObject):
""" """
:param goption: String. Can be either 'global_gridx' or 'global_gridy' :param goption: String. Can be either 'global_gridx' or 'global_gridy'
:param gentry: A GUI element which text value is read and used :param gentry: A AppGUI element which text value is read and used
:return: :return:
""" """
if goption not in ['global_gridx', 'global_gridy']: if goption not in ['global_gridx', 'global_gridy']:
@@ -3567,16 +3567,16 @@ class FlatCAMGeoEditor(QtCore.QObject):
self.units = self.app.defaults['units'].upper() self.units = self.app.defaults['units'].upper()
self.decimals = self.app.decimals self.decimals = self.app.decimals
# Remove anything else in the GUI Selected Tab # Remove anything else in the AppGUI Selected Tab
self.app.ui.selected_scroll_area.takeWidget() self.app.ui.selected_scroll_area.takeWidget()
# Put ourselves in the GUI Selected Tab # Put ourselves in the AppGUI Selected Tab
self.app.ui.selected_scroll_area.setWidget(self.geo_edit_widget) self.app.ui.selected_scroll_area.setWidget(self.geo_edit_widget)
# Switch notebook to Selected page # Switch notebook to Selected page
self.app.ui.notebook.setCurrentWidget(self.app.ui.selected_tab) self.app.ui.notebook.setCurrentWidget(self.app.ui.selected_tab)
def build_ui(self): def build_ui(self):
""" """
Build the GUI in the Selected Tab for this editor Build the AppGUI in the Selected Tab for this editor
:return: :return:
""" """
@@ -3683,7 +3683,7 @@ class FlatCAMGeoEditor(QtCore.QObject):
self.item_selected.connect(self.on_geo_elem_selected) self.item_selected.connect(self.on_geo_elem_selected)
# ## GUI Events # ## AppGUI Events
self.tw.itemSelectionChanged.connect(self.on_tree_selection_change) self.tw.itemSelectionChanged.connect(self.on_tree_selection_change)
# self.tw.keyPressed.connect(self.app.ui.keyPressEvent) # self.tw.keyPressed.connect(self.app.ui.keyPressEvent)
# self.tw.customContextMenuRequested.connect(self.on_menu_request) # self.tw.customContextMenuRequested.connect(self.on_menu_request)
@@ -3746,7 +3746,7 @@ class FlatCAMGeoEditor(QtCore.QObject):
pass pass
try: try:
# ## GUI Events # ## AppGUI Events
self.tw.itemSelectionChanged.disconnect(self.on_tree_selection_change) self.tw.itemSelectionChanged.disconnect(self.on_tree_selection_change)
# self.tw.keyPressed.connect(self.app.ui.keyPressEvent) # self.tw.keyPressed.connect(self.app.ui.keyPressEvent)
# self.tw.customContextMenuRequested.connect(self.on_menu_request) # self.tw.customContextMenuRequested.connect(self.on_menu_request)
@@ -4658,7 +4658,7 @@ class FlatCAMGeoEditor(QtCore.QObject):
def select_tool(self, toolname): def select_tool(self, toolname):
""" """
Selects a drawing tool. Impacts the object and GUI. Selects a drawing tool. Impacts the object and AppGUI.
:param toolname: Name of the tool. :param toolname: Name of the tool.
:return: None :return: None

24
flatcamEditors/FlatCAMGrbEditor.py → AppEditors/FlatCAMGrbEditor.py
View File

@@ -20,9 +20,9 @@ from copy import copy, deepcopy
import logging import logging
from camlib import distance, arc, three_point_circle from camlib import distance, arc, three_point_circle
from flatcamGUI.GUIElements import FCEntry, FCComboBox, FCTable, FCDoubleSpinner, FCSpinner, RadioSet, \ from AppGUI.GUIElements import FCEntry, FCComboBox, FCTable, FCDoubleSpinner, FCSpinner, RadioSet, \
EvalEntry2, FCInputDialog, FCButton, OptionalInputSection, FCCheckBox EvalEntry2, FCInputDialog, FCButton, OptionalInputSection, FCCheckBox
from FlatCAMTool import FlatCAMTool from AppTool import FlatCAMTool
import numpy as np import numpy as np
from numpy.linalg import norm as numpy_norm from numpy.linalg import norm as numpy_norm
@@ -32,7 +32,7 @@ import math
# import pngcanvas # import pngcanvas
import traceback import traceback
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')
@@ -2955,7 +2955,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
# this var will store the state of the toolbar before starting the editor # this var will store the state of the toolbar before starting the editor
self.toolbar_old_state = False self.toolbar_old_state = False
# Init GUI # Init AppGUI
self.apdim_lbl.hide() self.apdim_lbl.hide()
self.apdim_entry.hide() self.apdim_entry.hide()
self.gerber_obj = None self.gerber_obj = None
@@ -2967,7 +2967,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
self.tool_shape = self.canvas.new_shape_collection(layers=1) self.tool_shape = self.canvas.new_shape_collection(layers=1)
self.ma_annotation = self.canvas.new_text_group() self.ma_annotation = self.canvas.new_text_group()
else: else:
from flatcamGUI.PlotCanvasLegacy import ShapeCollectionLegacy from AppGUI.PlotCanvasLegacy import ShapeCollectionLegacy
self.shapes = ShapeCollectionLegacy(obj=self, app=self.app, name='shapes_grb_editor') self.shapes = ShapeCollectionLegacy(obj=self, app=self.app, name='shapes_grb_editor')
self.tool_shape = ShapeCollectionLegacy(obj=self, app=self.app, name='tool_shapes_grb_editor') self.tool_shape = ShapeCollectionLegacy(obj=self, app=self.app, name='tool_shapes_grb_editor')
self.ma_annotation = ShapeCollectionLegacy( self.ma_annotation = ShapeCollectionLegacy(
@@ -3139,7 +3139,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
tt_aperture = self.sorted_apcode[i] tt_aperture = self.sorted_apcode[i]
self.tid2apcode[i + 1] = tt_aperture self.tid2apcode[i + 1] = tt_aperture
# Init GUI # Init AppGUI
self.buffer_distance_entry.set_value(self.app.defaults["gerber_editor_buff_f"]) self.buffer_distance_entry.set_value(self.app.defaults["gerber_editor_buff_f"])
self.scale_factor_entry.set_value(self.app.defaults["gerber_editor_scale_f"]) self.scale_factor_entry.set_value(self.app.defaults["gerber_editor_scale_f"])
@@ -3298,9 +3298,9 @@ class FlatCAMGrbEditor(QtCore.QObject):
# make sure no rows are selected so the user have to click the correct row, meaning selecting the correct tool # make sure no rows are selected so the user have to click the correct row, meaning selecting the correct tool
self.apertures_table.clearSelection() self.apertures_table.clearSelection()
# Remove anything else in the GUI Selected Tab # Remove anything else in the AppGUI Selected Tab
self.app.ui.selected_scroll_area.takeWidget() self.app.ui.selected_scroll_area.takeWidget()
# Put ourselves in the GUI Selected Tab # Put ourselves in the AppGUI Selected Tab
self.app.ui.selected_scroll_area.setWidget(self.grb_edit_widget) self.app.ui.selected_scroll_area.setWidget(self.grb_edit_widget)
# Switch notebook to Selected page # Switch notebook to Selected page
self.app.ui.notebook.setCurrentWidget(self.app.ui.selected_tab) self.app.ui.notebook.setCurrentWidget(self.app.ui.selected_tab)
@@ -4039,7 +4039,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
# else: # else:
# raise AttributeError # raise AttributeError
# except AttributeError: # except AttributeError:
# # now that we have data (empty data actually), create the GUI interface and add it to the Tool Tab # # now that we have data (empty data actually), create the AppGUI interface and add it to the Tool Tab
# self.build_ui(first_run=True) # self.build_ui(first_run=True)
# # and add the first aperture to have something to play with # # and add the first aperture to have something to play with
# self.on_aperture_add('10') # self.on_aperture_add('10')
@@ -4186,7 +4186,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
def on_multiprocessing_finished(self): def on_multiprocessing_finished(self):
self.app.proc_container.update_view_text(' %s' % _("Setting up the UI")) self.app.proc_container.update_view_text(' %s' % _("Setting up the UI"))
self.app.inform.emit('[success] %s.' % _("Adding geometry finished. Preparing the GUI")) self.app.inform.emit('[success] %s.' % _("Adding geometry finished. Preparing the AppGUI"))
self.set_ui() self.set_ui()
self.build_ui(first_run=True) self.build_ui(first_run=True)
self.plot_all() self.plot_all()
@@ -4913,7 +4913,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
# def setup_ui_after_delayed_plot(self): # def setup_ui_after_delayed_plot(self):
# self.plot_finished.disconnect() # self.plot_finished.disconnect()
# #
# # now that we have data, create the GUI interface and add it to the Tool Tab # # now that we have data, create the AppGUI interface and add it to the Tool Tab
# self.build_ui(first_run=True) # self.build_ui(first_run=True)
# self.plot_all() # self.plot_all()
# #
@@ -5012,7 +5012,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
def select_tool(self, toolname): def select_tool(self, toolname):
""" """
Selects a drawing tool. Impacts the object and GUI. Selects a drawing tool. Impacts the object and AppGUI.
:param toolname: Name of the tool. :param toolname: Name of the tool.
:return: None :return: None

4
flatcamEditors/FlatCAMTextEditor.py → AppEditors/FlatCAMTextEditor.py
View File

@@ -5,7 +5,7 @@
# MIT Licence # # MIT Licence #
# ########################################################## # ##########################################################
from flatcamGUI.GUIElements import FCFileSaveDialog, FCEntry, FCTextAreaExtended, FCTextAreaLineNumber from AppGUI.GUIElements import FCFileSaveDialog, FCEntry, FCTextAreaExtended, FCTextAreaLineNumber
from PyQt5 import QtPrintSupport, QtWidgets, QtCore, QtGui from PyQt5 import QtPrintSupport, QtWidgets, QtCore, QtGui
from reportlab.platypus import SimpleDocTemplate, Paragraph from reportlab.platypus import SimpleDocTemplate, Paragraph
@@ -15,7 +15,7 @@ from reportlab.lib.units import inch, mm
# from io import StringIO # from io import StringIO
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

0
flatcamEditors/__init__.py → AppEditors/__init__.py
View File

70
flatcamGUI/FlatCAMGUI.py → AppGUI/FlatCAMGUI.py
View File

@@ -12,28 +12,28 @@
# ########################################################## # ##########################################################
import platform import platform
from flatcamGUI.GUIElements import * from AppGUI.GUIElements import *
from flatcamGUI.preferences import settings from AppGUI.preferences import settings
from flatcamGUI.preferences.cncjob.CNCJobPreferencesUI import CNCJobPreferencesUI from AppGUI.preferences.cncjob.CNCJobPreferencesUI import CNCJobPreferencesUI
from flatcamGUI.preferences.excellon.ExcellonPreferencesUI import ExcellonPreferencesUI from AppGUI.preferences.excellon.ExcellonPreferencesUI import ExcellonPreferencesUI
from flatcamGUI.preferences.general.GeneralPreferencesUI import GeneralPreferencesUI from AppGUI.preferences.general.GeneralPreferencesUI import GeneralPreferencesUI
from flatcamGUI.preferences.geometry.GeometryPreferencesUI import GeometryPreferencesUI from AppGUI.preferences.geometry.GeometryPreferencesUI import GeometryPreferencesUI
from flatcamGUI.preferences.gerber.GerberPreferencesUI import GerberPreferencesUI from AppGUI.preferences.gerber.GerberPreferencesUI import GerberPreferencesUI
from flatcamEditors.FlatCAMGeoEditor import FCShapeTool from AppEditors.FlatCAMGeoEditor import FCShapeTool
from matplotlib.backend_bases import KeyEvent as mpl_key_event from matplotlib.backend_bases import KeyEvent as mpl_key_event
import webbrowser import webbrowser
from flatcamGUI.preferences.tools.Tools2PreferencesUI import Tools2PreferencesUI from AppGUI.preferences.tools.Tools2PreferencesUI import Tools2PreferencesUI
from flatcamGUI.preferences.tools.ToolsPreferencesUI import ToolsPreferencesUI from AppGUI.preferences.tools.ToolsPreferencesUI import ToolsPreferencesUI
from flatcamGUI.preferences.utilities.UtilPreferencesUI import UtilPreferencesUI from AppGUI.preferences.utilities.UtilPreferencesUI import UtilPreferencesUI
from flatcamObjects.ObjectCollection import KeySensitiveListView from AppObjects.ObjectCollection import KeySensitiveListView
import subprocess import subprocess
import os import os
import sys import sys
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')
@@ -55,7 +55,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
# Divine icon pack by Ipapun @ finicons.com # Divine icon pack by Ipapun @ finicons.com
# ####################################################################### # #######################################################################
# ############ BUILDING THE GUI IS EXECUTED HERE ######################## # ############ BUILDING THE AppGUI IS EXECUTED HERE ########################
# ####################################################################### # #######################################################################
# ####################################################################### # #######################################################################
@@ -497,9 +497,9 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
QtGui.QIcon(self.app.resource_location + '/hud_32.png'), _("Toggle HUD\tAlt+M")) QtGui.QIcon(self.app.resource_location + '/hud_32.png'), _("Toggle HUD\tAlt+M"))
# ######################################################################## # ########################################################################
# ########################## Objects # ################################### # ########################## AppObjects # ###################################
# ######################################################################## # ########################################################################
self.menuobjects = self.menu.addMenu(_('Objects')) self.menuobjects = self.menu.addMenu(_('AppObjects'))
self.menuobjects.addSeparator() self.menuobjects.addSeparator()
self.menuobjects_selall = self.menuobjects.addAction( self.menuobjects_selall = self.menuobjects.addAction(
QtGui.QIcon(self.app.resource_location + '/select_all.png'), _('Select All')) QtGui.QIcon(self.app.resource_location + '/select_all.png'), _('Select All'))
@@ -581,7 +581,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
self.geo_cutpath_menuitem = self.geo_editor_menu.addAction( self.geo_cutpath_menuitem = self.geo_editor_menu.addAction(
QtGui.QIcon(self.app.resource_location + '/cutpath16.png'), _('Cut Path\tX')) QtGui.QIcon(self.app.resource_location + '/cutpath16.png'), _('Cut Path\tX'))
# self.move_menuitem = self.menu.addAction( # self.move_menuitem = self.menu.addAction(
# QtGui.QIcon(self.app.resource_location + '/move16.png'), "Move Objects 'm'") # QtGui.QIcon(self.app.resource_location + '/move16.png'), "Move AppObjects 'm'")
self.geo_copy_menuitem = self.geo_editor_menu.addAction( self.geo_copy_menuitem = self.geo_editor_menu.addAction(
QtGui.QIcon(self.app.resource_location + '/copy16.png'), _("Copy Geom\tC")) QtGui.QIcon(self.app.resource_location + '/copy16.png'), _("Copy Geom\tC"))
self.geo_delete_menuitem = self.geo_editor_menu.addAction( self.geo_delete_menuitem = self.geo_editor_menu.addAction(
@@ -763,7 +763,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
# ######################################################################## # ########################################################################
# IMPORTANT # # IMPORTANT #
# The order: SPLITTER -> NOTEBOOK -> SNAP TOOLBAR is important and without it the GUI will not be initialized as # The order: SPLITTER -> NOTEBOOK -> SNAP TOOLBAR is important and without it the AppGUI will not be initialized as
# desired. # desired.
self.splitter = QtWidgets.QSplitter() self.splitter = QtWidgets.QSplitter()
self.setCentralWidget(self.splitter) self.setCentralWidget(self.splitter)
@@ -912,7 +912,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
self.dblsided_btn = self.toolbartools.addAction( self.dblsided_btn = self.toolbartools.addAction(
QtGui.QIcon(self.app.resource_location + '/doubleside32.png'), _("2Sided Tool")) QtGui.QIcon(self.app.resource_location + '/doubleside32.png'), _("2Sided Tool"))
self.align_btn = self.toolbartools.addAction( self.align_btn = self.toolbartools.addAction(
QtGui.QIcon(self.app.resource_location + '/align32.png'), _("Align Objects Tool")) QtGui.QIcon(self.app.resource_location + '/align32.png'), _("Align AppObjects Tool"))
self.extract_btn = self.toolbartools.addAction( self.extract_btn = self.toolbartools.addAction(
QtGui.QIcon(self.app.resource_location + '/extract_drill32.png'), _("Extract Drills Tool")) QtGui.QIcon(self.app.resource_location + '/extract_drill32.png'), _("Extract Drills Tool"))
@@ -1035,7 +1035,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
QtGui.QIcon(self.app.resource_location + '/transform.png'), _("Transformations")) QtGui.QIcon(self.app.resource_location + '/transform.png'), _("Transformations"))
self.geo_edit_toolbar.addSeparator() self.geo_edit_toolbar.addSeparator()
self.geo_move_btn = self.geo_edit_toolbar.addAction( self.geo_move_btn = self.geo_edit_toolbar.addAction(
QtGui.QIcon(self.app.resource_location + '/move32.png'), _("Move Objects ")) QtGui.QIcon(self.app.resource_location + '/move32.png'), _("Move AppObjects "))
# ######################################################################## # ########################################################################
# ########################## Gerber Editor Toolbar# ###################### # ########################## Gerber Editor Toolbar# ######################
@@ -1319,11 +1319,11 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
self.pref_tab_bottom_layout_1.addWidget(self.pref_open_button) self.pref_tab_bottom_layout_1.addWidget(self.pref_open_button)
# Clear Settings # Clear Settings
self.clear_btn = FCButton('%s' % _('Clear GUI Settings')) self.clear_btn = FCButton('%s' % _('Clear AppGUI Settings'))
self.clear_btn.setMinimumWidth(130) self.clear_btn.setMinimumWidth(130)
self.clear_btn.setToolTip( self.clear_btn.setToolTip(
_("Clear the GUI settings for FlatCAM,\n" _("Clear the AppGUI settings for FlatCAM,\n"
"such as: layout, gui state, style, hdpi support etc.") "such as: layout, gui state, style, hdpi support etc.")
) )
@@ -1539,7 +1539,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
# infobar.addWidget(self.progress_bar) # infobar.addWidget(self.progress_bar)
# ######################################################################## # ########################################################################
# ########################## SET GUI Elements # ########################## # ########################## SET AppGUI Elements # ##########################
# ######################################################################## # ########################################################################
self.app_icon = QtGui.QIcon() self.app_icon = QtGui.QIcon()
self.app_icon.addFile(self.app.resource_location + '/flatcam_icon16.png', QtCore.QSize(16, 16)) self.app_icon.addFile(self.app.resource_location + '/flatcam_icon16.png', QtCore.QSize(16, 16))
@@ -1562,7 +1562,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
self.setAcceptDrops(True) self.setAcceptDrops(True)
# ######################################################################## # ########################################################################
# ########################## Build GUI # ################################# # ########################## Build AppGUI # #################################
# ######################################################################## # ########################################################################
self.grid_snap_btn.setCheckable(True) self.grid_snap_btn.setCheckable(True)
self.corner_snap_btn.setCheckable(True) self.corner_snap_btn.setCheckable(True)
@@ -1655,11 +1655,11 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
# restore the toolbar view # restore the toolbar view
self.restore_toolbar_view() self.restore_toolbar_view()
# restore the GUI geometry # restore the AppGUI geometry
self.restore_main_win_geom() self.restore_main_win_geom()
# %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% # %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
# %%%%%%%%%%%%%%%%% GUI Building FINISHED %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% # %%%%%%%%%%%%%%%%% AppGUI Building FINISHED %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
# %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% # %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
# Variable to store the status of the fullscreen event # Variable to store the status of the fullscreen event
@@ -1677,7 +1677,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
self.app.defaults["global_def_win_h"]) self.app.defaults["global_def_win_h"])
self.splitter.setSizes([self.app.defaults["global_def_notebook_width"], 0]) self.splitter.setSizes([self.app.defaults["global_def_notebook_width"], 0])
except KeyError as e: except KeyError as e:
log.debug("flatcamGUI.FlatCAMGUI.restore_main_win_geom() --> %s" % str(e)) log.debug("AppGUI.FlatCAMGUI.restore_main_win_geom() --> %s" % str(e))
def restore_toolbar_view(self): def restore_toolbar_view(self):
""" """
@@ -1776,8 +1776,8 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
resource_loc = self.app.resource_location resource_loc = self.app.resource_location
msgbox = QtWidgets.QMessageBox() msgbox = QtWidgets.QMessageBox()
msgbox.setText(_("Are you sure you want to delete the GUI Settings? \n")) msgbox.setText(_("Are you sure you want to delete the AppGUI Settings? \n"))
msgbox.setWindowTitle(_("Clear GUI Settings")) msgbox.setWindowTitle(_("Clear AppGUI Settings"))
msgbox.setWindowIcon(QtGui.QIcon(resource_loc + '/trash32.png')) msgbox.setWindowIcon(QtGui.QIcon(resource_loc + '/trash32.png'))
bt_yes = msgbox.addButton(_('Yes'), QtWidgets.QMessageBox.YesRole) bt_yes = msgbox.addButton(_('Yes'), QtWidgets.QMessageBox.YesRole)
bt_no = msgbox.addButton(_('No'), QtWidgets.QMessageBox.NoRole) bt_no = msgbox.addButton(_('No'), QtWidgets.QMessageBox.NoRole)
@@ -1881,7 +1881,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
self.dblsided_btn = self.toolbartools.addAction( self.dblsided_btn = self.toolbartools.addAction(
QtGui.QIcon(self.app.resource_location + '/doubleside32.png'), _("2Sided Tool")) QtGui.QIcon(self.app.resource_location + '/doubleside32.png'), _("2Sided Tool"))
self.align_btn = self.toolbartools.addAction( self.align_btn = self.toolbartools.addAction(
QtGui.QIcon(self.app.resource_location + '/align32.png'), _("Align Objects Tool")) QtGui.QIcon(self.app.resource_location + '/align32.png'), _("Align AppObjects Tool"))
self.extract_btn = self.toolbartools.addAction( self.extract_btn = self.toolbartools.addAction(
QtGui.QIcon(self.app.resource_location + '/extract_drill32.png'), _("Extract Drills Tool")) QtGui.QIcon(self.app.resource_location + '/extract_drill32.png'), _("Extract Drills Tool"))
@@ -1996,7 +1996,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
self.geo_cutpath_btn = self.geo_edit_toolbar.addAction( self.geo_cutpath_btn = self.geo_edit_toolbar.addAction(
QtGui.QIcon(self.app.resource_location + '/cutpath32.png'), _('Cut Path')) QtGui.QIcon(self.app.resource_location + '/cutpath32.png'), _('Cut Path'))
self.geo_copy_btn = self.geo_edit_toolbar.addAction( self.geo_copy_btn = self.geo_edit_toolbar.addAction(
QtGui.QIcon(self.app.resource_location + '/copy32.png'), _("Copy Objects")) QtGui.QIcon(self.app.resource_location + '/copy32.png'), _("Copy AppObjects"))
self.geo_delete_btn = self.geo_edit_toolbar.addAction( self.geo_delete_btn = self.geo_edit_toolbar.addAction(
QtGui.QIcon(self.app.resource_location + '/trash32.png'), _("Delete Shape")) QtGui.QIcon(self.app.resource_location + '/trash32.png'), _("Delete Shape"))
self.geo_transform_btn = self.geo_edit_toolbar.addAction( self.geo_transform_btn = self.geo_edit_toolbar.addAction(
@@ -2004,7 +2004,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
self.geo_edit_toolbar.addSeparator() self.geo_edit_toolbar.addSeparator()
self.geo_move_btn = self.geo_edit_toolbar.addAction( self.geo_move_btn = self.geo_edit_toolbar.addAction(
QtGui.QIcon(self.app.resource_location + '/move32.png'), _("Move Objects")) QtGui.QIcon(self.app.resource_location + '/move32.png'), _("Move AppObjects"))
# ######################################################################## # ########################################################################
# ## Gerber Editor Toolbar # ## # ## Gerber Editor Toolbar # ##
@@ -2082,7 +2082,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
# events out of the self.app.collection view (it's about Project Tab) are of type int # events out of the self.app.collection view (it's about Project Tab) are of type int
if type(event) is int: if type(event) is int:
key = event key = event
# events from the GUI are of type QKeyEvent # events from the AppGUI are of type QKeyEvent
elif type(event) == QtGui.QKeyEvent: elif type(event) == QtGui.QKeyEvent:
key = event.key() key = event.key()
elif isinstance(event, mpl_key_event): # MatPlotLib key events are trickier to interpret than the rest elif isinstance(event, mpl_key_event): # MatPlotLib key events are trickier to interpret than the rest
@@ -2419,7 +2419,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
# Delete from canvas # Delete from canvas
if key == 'Delete': if key == 'Delete':
# Delete via the application to # Delete via the application to
# ensure cleanup of the GUI # ensure cleanup of the AppGUI
if active: if active:
active.app.on_delete() active.app.on_delete()
@@ -4010,7 +4010,7 @@ class ShortcutsTab(QtWidgets.QWidget):
_("Skew on Y axis"), _("Skew on Y axis"),
# ALT section # ALT section
_("Align Objects Tool"), _("Calculators Tool"), _("2-Sided PCB Tool"), _("Transformations Tool"), _("Align AppObjects Tool"), _("Calculators Tool"), _("2-Sided PCB Tool"), _("Transformations Tool"),
_("Punch Gerber Tool"), _("Extract Drills Tool"), _("Fiducials Tool"), _("Punch Gerber Tool"), _("Extract Drills Tool"), _("Fiducials Tool"),
_("Solder Paste Dispensing Tool"), _("Solder Paste Dispensing Tool"),
_("Film PCB Tool"), _("Corner Markers Tool"), _("Non-Copper Clearing Tool"), _("Optimal Tool"), _("Film PCB Tool"), _("Corner Markers Tool"), _("Non-Copper Clearing Tool"), _("Optimal Tool"),

2
flatcamGUI/GUIElements.py → AppGUI/GUIElements.py
View File

@@ -23,7 +23,7 @@ import html
import sys import sys
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
log = logging.getLogger('base') log = logging.getLogger('base')

14
flatcamGUI/ObjectUI.py → AppGUI/ObjectUI.py
View File

@@ -11,11 +11,11 @@
# Date: 3/10/2019 # # Date: 3/10/2019 #
# ########################################################## # ##########################################################
from flatcamGUI.GUIElements import * from AppGUI.GUIElements import *
import sys import sys
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')
@@ -1272,7 +1272,7 @@ class ExcellonObjectUI(ObjectUI):
pp_excellon_label = QtWidgets.QLabel('%s:' % _("Preprocessor E")) pp_excellon_label = QtWidgets.QLabel('%s:' % _("Preprocessor E"))
pp_excellon_label.setToolTip( pp_excellon_label.setToolTip(
_("The preprocessor JSON file that dictates\n" _("The preprocessor JSON file that dictates\n"
"Gcode output for Excellon Objects.") "Gcode output for Excellon AppObjects.")
) )
self.pp_excellon_name_cb = FCComboBox() self.pp_excellon_name_cb = FCComboBox()
self.pp_excellon_name_cb.setFocusPolicy(QtCore.Qt.StrongFocus) self.pp_excellon_name_cb.setFocusPolicy(QtCore.Qt.StrongFocus)
@@ -1284,7 +1284,7 @@ class ExcellonObjectUI(ObjectUI):
pp_geo_label = QtWidgets.QLabel('%s:' % _("Preprocessor G")) pp_geo_label = QtWidgets.QLabel('%s:' % _("Preprocessor G"))
pp_geo_label.setToolTip( pp_geo_label.setToolTip(
_("The preprocessor JSON file that dictates\n" _("The preprocessor JSON file that dictates\n"
"Gcode output for Geometry (Milling) Objects.") "Gcode output for Geometry (Milling) AppObjects.")
) )
self.pp_geo_name_cb = FCComboBox() self.pp_geo_name_cb = FCComboBox()
self.pp_geo_name_cb.setFocusPolicy(QtCore.Qt.StrongFocus) self.pp_geo_name_cb.setFocusPolicy(QtCore.Qt.StrongFocus)
@@ -2305,7 +2305,7 @@ class CNCObjectUI(ObjectUI):
def __init__(self, app, parent=None): def __init__(self, app, parent=None):
""" """
Creates the user interface for CNCJob objects. GUI elements should Creates the user interface for CNCJob objects. AppGUI elements should
be placed in ``self.custom_box`` to preserve the layout. be placed in ``self.custom_box`` to preserve the layout.
""" """
@@ -2638,7 +2638,7 @@ class ScriptObjectUI(ObjectUI):
def __init__(self, app, parent=None): def __init__(self, app, parent=None):
""" """
Creates the user interface for Script objects. GUI elements should Creates the user interface for Script objects. AppGUI elements should
be placed in ``self.custom_box`` to preserve the layout. be placed in ``self.custom_box`` to preserve the layout.
""" """
@@ -2705,7 +2705,7 @@ class DocumentObjectUI(ObjectUI):
def __init__(self, app, parent=None): def __init__(self, app, parent=None):
""" """
Creates the user interface for Notes objects. GUI elements should Creates the user interface for Notes objects. AppGUI elements should
be placed in ``self.custom_box`` to preserve the layout. be placed in ``self.custom_box`` to preserve the layout.
""" """

4
flatcamGUI/PlotCanvas.py → AppGUI/PlotCanvas.py
View File

@@ -8,8 +8,8 @@
from PyQt5 import QtCore from PyQt5 import QtCore
import logging import logging
from flatcamGUI.VisPyCanvas import VisPyCanvas, Color from AppGUI.VisPyCanvas import VisPyCanvas, Color
from flatcamGUI.VisPyVisuals import ShapeGroup, ShapeCollection, TextCollection, TextGroup, Cursor from AppGUI.VisPyVisuals import ShapeGroup, ShapeCollection, TextCollection, TextGroup, Cursor
from vispy.scene.visuals import InfiniteLine, Line, Rectangle, Text from vispy.scene.visuals import InfiniteLine, Line, Rectangle, Text
import numpy as np import numpy as np

2
flatcamGUI/PlotCanvasLegacy.py → AppGUI/PlotCanvasLegacy.py
View File

@@ -22,7 +22,7 @@ import logging
import numpy as np import numpy as np
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
# Prevent conflict with Qt5 and above. # Prevent conflict with Qt5 and above.

0
flatcamGUI/VisPyCanvas.py → AppGUI/VisPyCanvas.py
View File

0
flatcamGUI/VisPyData/data/fonts/opensans-regular.ttf → AppGUI/VisPyData/data/fonts/opensans-regular.ttf
View File

0
flatcamGUI/VisPyData/data/freetype/freetype253.dll → AppGUI/VisPyData/data/freetype/freetype253.dll
View File

0
flatcamGUI/VisPyData/data/freetype/freetype253_x64.dll → AppGUI/VisPyData/data/freetype/freetype253_x64.dll
View File

0
flatcamGUI/VisPyPatches.py → AppGUI/VisPyPatches.py
View File

0
flatcamGUI/VisPyTesselators.py → AppGUI/VisPyTesselators.py
View File

2
flatcamGUI/VisPyVisuals.py → AppGUI/VisPyVisuals.py
View File

@@ -13,7 +13,7 @@ from vispy.color import Color
from shapely.geometry import Polygon, LineString, LinearRing from shapely.geometry import Polygon, LineString, LinearRing
import threading import threading
import numpy as np import numpy as np
from flatcamGUI.VisPyTesselators import GLUTess from AppGUI.VisPyTesselators import GLUTess
class FlatCAMLineVisual(LineVisual): class FlatCAMLineVisual(LineVisual):

0
flatcamGUI/__init__.py → AppGUI/__init__.py
View File

0
flatcamGUI/preferences/OptionsGroupUI.py → AppGUI/preferences/OptionsGroupUI.py
View File

22
flatcamGUI/preferences/PreferencesUIManager.py → AppGUI/preferences/PreferencesUIManager.py
View File

@@ -5,7 +5,7 @@ from defaults import FlatCAMDefaults
import logging import logging
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')
@@ -30,7 +30,7 @@ class PreferencesUIManager:
:param defaults: a dictionary storage where all the application settings are stored :param defaults: a dictionary storage where all the application settings are stored
:param data_path: a path to the file where all the preferences are stored for persistence :param data_path: a path to the file where all the preferences are stored for persistence
:param ui: reference to the FlatCAMGUI class which constructs the UI :param ui: reference to the FlatCAMGUI class which constructs the UI
:param inform: a pyqtSignal used to display information's in the StatusBar of the GUI :param inform: a pyqtSignal used to display information's in the StatusBar of the AppGUI
""" """
self.defaults = defaults self.defaults = defaults
@@ -73,7 +73,7 @@ class PreferencesUIManager:
"global_tpdf_lmargin": self.ui.general_defaults_form.general_app_group.lmargin_entry, "global_tpdf_lmargin": self.ui.general_defaults_form.general_app_group.lmargin_entry,
"global_tpdf_rmargin": self.ui.general_defaults_form.general_app_group.rmargin_entry, "global_tpdf_rmargin": self.ui.general_defaults_form.general_app_group.rmargin_entry,
# General GUI Preferences # General AppGUI Preferences
"global_theme": self.ui.general_defaults_form.general_gui_group.theme_radio, "global_theme": self.ui.general_defaults_form.general_gui_group.theme_radio,
"global_gray_icons": self.ui.general_defaults_form.general_gui_group.gray_icons_cb, "global_gray_icons": self.ui.general_defaults_form.general_gui_group.gray_icons_cb,
"global_layout": self.ui.general_defaults_form.general_gui_group.layout_combo, "global_layout": self.ui.general_defaults_form.general_gui_group.layout_combo,
@@ -91,7 +91,7 @@ class PreferencesUIManager:
"global_proj_item_dis_color": self.ui.general_defaults_form.general_gui_group.proj_color_dis_entry, "global_proj_item_dis_color": self.ui.general_defaults_form.general_gui_group.proj_color_dis_entry,
"global_project_autohide": self.ui.general_defaults_form.general_gui_group.project_autohide_cb, "global_project_autohide": self.ui.general_defaults_form.general_gui_group.project_autohide_cb,
# General GUI Settings # General AppGUI Settings
"global_gridx": self.ui.general_defaults_form.general_app_set_group.gridx_entry, "global_gridx": self.ui.general_defaults_form.general_app_set_group.gridx_entry,
"global_gridy": self.ui.general_defaults_form.general_app_set_group.gridy_entry, "global_gridy": self.ui.general_defaults_form.general_app_set_group.gridy_entry,
"global_snap_max": self.ui.general_defaults_form.general_app_set_group.snap_max_dist_entry, "global_snap_max": self.ui.general_defaults_form.general_app_set_group.snap_max_dist_entry,
@@ -595,7 +595,7 @@ class PreferencesUIManager:
def defaults_read_form(self): def defaults_read_form(self):
""" """
Will read all the values in the Preferences GUI and update the defaults dictionary. Will read all the values in the Preferences AppGUI and update the defaults dictionary.
:return: None :return: None
""" """
@@ -607,10 +607,10 @@ class PreferencesUIManager:
def defaults_write_form(self, factor=None, fl_units=None, source_dict=None): def defaults_write_form(self, factor=None, fl_units=None, source_dict=None):
""" """
Will set the values for all the GUI elements in Preferences GUI based on the values found in the Will set the values for all the AppGUI elements in Preferences AppGUI based on the values found in the
self.defaults dictionary. self.defaults dictionary.
:param factor: will apply a factor to the values that written in the GUI elements :param factor: will apply a factor to the values that written in the AppGUI elements
:param fl_units: current measuring units in FlatCAM: Metric or Inch :param fl_units: current measuring units in FlatCAM: Metric or Inch
:param source_dict: the repository of options, usually is the self.defaults :param source_dict: the repository of options, usually is the self.defaults
:return: None :return: None
@@ -628,11 +628,11 @@ class PreferencesUIManager:
""" """
Basically it is the worker in the self.defaults_write_form() Basically it is the worker in the self.defaults_write_form()
:param field: the GUI element in Preferences GUI to be updated :param field: the AppGUI element in Preferences AppGUI to be updated
:param factor: factor to be applied to the field parameter :param factor: factor to be applied to the field parameter
:param units: current FlatCAM measuring units :param units: current FlatCAM measuring units
:param defaults_dict: the defaults storage :param defaults_dict: the defaults storage
:return: None, it updates GUI elements :return: None, it updates AppGUI elements
""" """
def_dict = self.defaults if defaults_dict is None else defaults_dict def_dict = self.defaults if defaults_dict is None else defaults_dict
@@ -656,7 +656,7 @@ class PreferencesUIManager:
def show_preferences_gui(self): def show_preferences_gui(self):
""" """
Called to initialize and show the Preferences GUI Called to initialize and show the Preferences AppGUI
:return: None :return: None
""" """
@@ -734,7 +734,7 @@ class PreferencesUIManager:
self.ui.pref_close_button.clicked.connect(self.on_pref_close_button) self.ui.pref_close_button.clicked.connect(self.on_pref_close_button)
self.ui.pref_defaults_button.clicked.connect(self.on_restore_defaults_preferences) self.ui.pref_defaults_button.clicked.connect(self.on_restore_defaults_preferences)
log.debug("Finished Preferences GUI form initialization.") log.debug("Finished Preferences AppGUI form initialization.")
def __init_color_pickers(self): def __init_color_pickers(self):
# Init Gerber Plot Colors # Init Gerber Plot Colors

4
flatcamGUI/preferences/__init__.py → AppGUI/preferences/__init__.py
View File

@@ -1,6 +1,6 @@
from flatcamGUI.GUIElements import * from AppGUI.GUIElements import *
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins

6
flatcamGUI/preferences/cncjob/CNCJobAdvOptPrefGroupUI.py → AppGUI/preferences/cncjob/CNCJobAdvOptPrefGroupUI.py
View File

@@ -1,10 +1,10 @@
from PyQt5 import QtWidgets, QtGui, QtCore from PyQt5 import QtWidgets, QtGui, QtCore
from PyQt5.QtCore import QSettings, Qt from PyQt5.QtCore import QSettings, Qt
from flatcamGUI.GUIElements import FCTextArea, FCCheckBox, FCComboBox, FCSpinner, FCEntry from AppGUI.GUIElements import FCTextArea, FCCheckBox, FCComboBox, FCSpinner, FCEntry
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

6
flatcamGUI/preferences/cncjob/CNCJobGenPrefGroupUI.py → AppGUI/preferences/cncjob/CNCJobGenPrefGroupUI.py
View File

@@ -1,10 +1,10 @@
from PyQt5 import QtWidgets, QtCore, QtGui from PyQt5 import QtWidgets, QtCore, QtGui
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.GUIElements import FCCheckBox, RadioSet, FCSpinner, FCDoubleSpinner, FCEntry from AppGUI.GUIElements import FCCheckBox, RadioSet, FCSpinner, FCDoubleSpinner, FCEntry
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

6
flatcamGUI/preferences/cncjob/CNCJobOptPrefGroupUI.py → AppGUI/preferences/cncjob/CNCJobOptPrefGroupUI.py
View File

@@ -1,11 +1,11 @@
from PyQt5 import QtWidgets, QtGui from PyQt5 import QtWidgets, QtGui
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.GUIElements import FCTextArea from AppGUI.GUIElements import FCTextArea
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

6
flatcamGUI/preferences/cncjob/CNCJobPreferencesUI.py → AppGUI/preferences/cncjob/CNCJobPreferencesUI.py
View File

@@ -1,8 +1,8 @@
from PyQt5 import QtWidgets from PyQt5 import QtWidgets
from flatcamGUI.preferences.cncjob.CNCJobAdvOptPrefGroupUI import CNCJobAdvOptPrefGroupUI from AppGUI.preferences.cncjob.CNCJobAdvOptPrefGroupUI import CNCJobAdvOptPrefGroupUI
from flatcamGUI.preferences.cncjob.CNCJobOptPrefGroupUI import CNCJobOptPrefGroupUI from AppGUI.preferences.cncjob.CNCJobOptPrefGroupUI import CNCJobOptPrefGroupUI
from flatcamGUI.preferences.cncjob.CNCJobGenPrefGroupUI import CNCJobGenPrefGroupUI from AppGUI.preferences.cncjob.CNCJobGenPrefGroupUI import CNCJobGenPrefGroupUI
class CNCJobPreferencesUI(QtWidgets.QWidget): class CNCJobPreferencesUI(QtWidgets.QWidget):

0
flatcamGUI/preferences/cncjob/__init__.py → AppGUI/preferences/cncjob/__init__.py
View File

6
flatcamGUI/preferences/excellon/ExcellonAdvOptPrefGroupUI.py → AppGUI/preferences/excellon/ExcellonAdvOptPrefGroupUI.py
View File

@@ -1,10 +1,10 @@
from PyQt5 import QtWidgets from PyQt5 import QtWidgets
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.GUIElements import FCDoubleSpinner, FCEntry, FloatEntry, RadioSet, FCCheckBox from AppGUI.GUIElements import FCDoubleSpinner, FCEntry, FloatEntry, RadioSet, FCCheckBox
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

6
flatcamGUI/preferences/excellon/ExcellonEditorPrefGroupUI.py → AppGUI/preferences/excellon/ExcellonEditorPrefGroupUI.py
View File

@@ -1,11 +1,11 @@
from PyQt5 import QtWidgets from PyQt5 import QtWidgets
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.GUIElements import FCSpinner, FCDoubleSpinner, RadioSet from AppGUI.GUIElements import FCSpinner, FCDoubleSpinner, RadioSet
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

6
flatcamGUI/preferences/excellon/ExcellonExpPrefGroupUI.py → AppGUI/preferences/excellon/ExcellonExpPrefGroupUI.py
View File

@@ -1,10 +1,10 @@
from PyQt5 import QtWidgets, QtCore from PyQt5 import QtWidgets, QtCore
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.GUIElements import RadioSet, FCSpinner from AppGUI.GUIElements import RadioSet, FCSpinner
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

6
flatcamGUI/preferences/excellon/ExcellonGenPrefGroupUI.py → AppGUI/preferences/excellon/ExcellonGenPrefGroupUI.py
View File

@@ -3,10 +3,10 @@ import platform
from PyQt5 import QtWidgets, QtCore, QtGui from PyQt5 import QtWidgets, QtCore, QtGui
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.GUIElements import FCCheckBox, FCSpinner, RadioSet, FCEntry from AppGUI.GUIElements import FCCheckBox, FCSpinner, RadioSet, FCEntry
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

8
flatcamGUI/preferences/excellon/ExcellonOptPrefGroupUI.py → AppGUI/preferences/excellon/ExcellonOptPrefGroupUI.py
View File

@@ -1,12 +1,12 @@
from PyQt5 import QtWidgets from PyQt5 import QtWidgets
from PyQt5.QtCore import Qt, QSettings from PyQt5.QtCore import Qt, QSettings
from flatcamGUI.GUIElements import RadioSet, FCDoubleSpinner, FCCheckBox, FCEntry, FCSpinner, OptionalInputSection, \ from AppGUI.GUIElements import RadioSet, FCDoubleSpinner, FCCheckBox, FCEntry, FCSpinner, OptionalInputSection, \
FCComboBox FCComboBox
from flatcamGUI.preferences import machinist_setting from AppGUI.preferences import machinist_setting
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

12
flatcamGUI/preferences/excellon/ExcellonPreferencesUI.py → AppGUI/preferences/excellon/ExcellonPreferencesUI.py
View File

@@ -1,14 +1,14 @@
from PyQt5 import QtWidgets from PyQt5 import QtWidgets
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.preferences.excellon.ExcellonEditorPrefGroupUI import ExcellonEditorPrefGroupUI from AppGUI.preferences.excellon.ExcellonEditorPrefGroupUI import ExcellonEditorPrefGroupUI
from flatcamGUI.preferences.excellon.ExcellonExpPrefGroupUI import ExcellonExpPrefGroupUI from AppGUI.preferences.excellon.ExcellonExpPrefGroupUI import ExcellonExpPrefGroupUI
from flatcamGUI.preferences.excellon.ExcellonAdvOptPrefGroupUI import ExcellonAdvOptPrefGroupUI from AppGUI.preferences.excellon.ExcellonAdvOptPrefGroupUI import ExcellonAdvOptPrefGroupUI
from flatcamGUI.preferences.excellon.ExcellonOptPrefGroupUI import ExcellonOptPrefGroupUI from AppGUI.preferences.excellon.ExcellonOptPrefGroupUI import ExcellonOptPrefGroupUI
from flatcamGUI.preferences.excellon.ExcellonGenPrefGroupUI import ExcellonGenPrefGroupUI from AppGUI.preferences.excellon.ExcellonGenPrefGroupUI import ExcellonGenPrefGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

0
flatcamGUI/preferences/excellon/__init__.py → AppGUI/preferences/excellon/__init__.py
View File

12
flatcamGUI/preferences/general/GeneralAPPSetGroupUI.py → AppGUI/preferences/general/GeneralAPPSetGroupUI.py
View File

@@ -1,13 +1,13 @@
from PyQt5 import QtCore, QtWidgets, QtGui from PyQt5 import QtCore, QtWidgets, QtGui
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.GUIElements import FCDoubleSpinner, FCCheckBox, FCComboBox, RadioSet, OptionalInputSection, FCSpinner, \ from AppGUI.GUIElements import FCDoubleSpinner, FCCheckBox, FCComboBox, RadioSet, OptionalInputSection, FCSpinner, \
FCEntry FCEntry
from flatcamGUI.preferences import settings from AppGUI.preferences import settings
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')
@@ -201,7 +201,7 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
self.notebook_font_size_label = QtWidgets.QLabel('%s:' % _('Notebook')) self.notebook_font_size_label = QtWidgets.QLabel('%s:' % _('Notebook'))
self.notebook_font_size_label.setToolTip( self.notebook_font_size_label.setToolTip(
_("This sets the font size for the elements found in the Notebook.\n" _("This sets the font size for the elements found in the Notebook.\n"
"The notebook is the collapsible area in the left side of the GUI,\n" "The notebook is the collapsible area in the left side of the AppGUI,\n"
"and include the Project, Selected and Tool tabs.") "and include the Project, Selected and Tool tabs.")
) )
@@ -240,7 +240,7 @@ class GeneralAPPSetGroupUI(OptionsGroupUI):
# TextBox Font Size # TextBox Font Size
self.textbox_font_size_label = QtWidgets.QLabel('%s:' % _('Textbox')) self.textbox_font_size_label = QtWidgets.QLabel('%s:' % _('Textbox'))
self.textbox_font_size_label.setToolTip( self.textbox_font_size_label.setToolTip(
_("This sets the font size for the Textbox GUI\n" _("This sets the font size for the Textbox AppGUI\n"
"elements that are used in FlatCAM.") "elements that are used in FlatCAM.")
) )

6
flatcamGUI/preferences/general/GeneralAppPrefGroupUI.py → AppGUI/preferences/general/GeneralAppPrefGroupUI.py
View File

@@ -3,12 +3,12 @@ import sys
from PyQt5 import QtWidgets from PyQt5 import QtWidgets
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.GUIElements import RadioSet, FCSpinner, FCCheckBox, FCComboBox, FCButton, OptionalInputSection, \ from AppGUI.GUIElements import RadioSet, FCSpinner, FCCheckBox, FCComboBox, FCButton, OptionalInputSection, \
FCDoubleSpinner FCDoubleSpinner
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

10
flatcamGUI/preferences/general/GeneralGUIPrefGroupUI.py → AppGUI/preferences/general/GeneralGUIPrefGroupUI.py
View File

@@ -1,11 +1,11 @@
from PyQt5 import QtWidgets, QtCore, QtGui from PyQt5 import QtWidgets, QtCore, QtGui
from PyQt5.QtCore import QSettings, Qt from PyQt5.QtCore import QSettings, Qt
from flatcamGUI.GUIElements import RadioSet, FCCheckBox, FCButton, FCComboBox, FCEntry, FCSpinner from AppGUI.GUIElements import RadioSet, FCCheckBox, FCButton, FCComboBox, FCEntry, FCSpinner
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')
@@ -23,7 +23,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
def __init__(self, decimals=4, parent=None): def __init__(self, decimals=4, parent=None):
super(GeneralGUIPrefGroupUI, self).__init__(self, parent=parent) super(GeneralGUIPrefGroupUI, self).__init__(self, parent=parent)
self.setTitle(str(_("GUI Preferences"))) self.setTitle(str(_("AppGUI Preferences")))
self.decimals = decimals self.decimals = decimals
# Create a grid layout for the Application general settings # Create a grid layout for the Application general settings
@@ -382,7 +382,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
self.layout.addStretch() self.layout.addStretch()
# ############################################################################# # #############################################################################
# ############################# GUI COLORS SIGNALS ############################ # ############################# AppGUI COLORS SIGNALS ############################
# ############################################################################# # #############################################################################
# Setting selection (left - right) colors signals # Setting selection (left - right) colors signals

8
flatcamGUI/preferences/general/GeneralPreferencesUI.py → AppGUI/preferences/general/GeneralPreferencesUI.py
View File

@@ -1,12 +1,12 @@
from PyQt5 import QtWidgets from PyQt5 import QtWidgets
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.preferences.general.GeneralAppPrefGroupUI import GeneralAppPrefGroupUI from AppGUI.preferences.general.GeneralAppPrefGroupUI import GeneralAppPrefGroupUI
from flatcamGUI.preferences.general.GeneralAPPSetGroupUI import GeneralAPPSetGroupUI from AppGUI.preferences.general.GeneralAPPSetGroupUI import GeneralAPPSetGroupUI
from flatcamGUI.preferences.general.GeneralGUIPrefGroupUI import GeneralGUIPrefGroupUI from AppGUI.preferences.general.GeneralGUIPrefGroupUI import GeneralGUIPrefGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

0
flatcamGUI/preferences/general/__init__.py → AppGUI/preferences/general/__init__.py
View File

6
flatcamGUI/preferences/geometry/GeometryAdvOptPrefGroupUI.py → AppGUI/preferences/geometry/GeometryAdvOptPrefGroupUI.py
View File

@@ -1,11 +1,11 @@
from PyQt5 import QtWidgets from PyQt5 import QtWidgets
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.GUIElements import FCEntry, FloatEntry, FCDoubleSpinner, FCCheckBox, RadioSet, FCLabel from AppGUI.GUIElements import FCEntry, FloatEntry, FCDoubleSpinner, FCCheckBox, RadioSet, FCLabel
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

6
flatcamGUI/preferences/geometry/GeometryEditorPrefGroupUI.py → AppGUI/preferences/geometry/GeometryEditorPrefGroupUI.py
View File

@@ -1,11 +1,11 @@
from PyQt5 import QtWidgets from PyQt5 import QtWidgets
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.GUIElements import FCSpinner, RadioSet from AppGUI.GUIElements import FCSpinner, RadioSet
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

6
flatcamGUI/preferences/geometry/GeometryGenPrefGroupUI.py → AppGUI/preferences/geometry/GeometryGenPrefGroupUI.py
View File

@@ -1,11 +1,11 @@
from PyQt5 import QtWidgets, QtCore, QtGui from PyQt5 import QtWidgets, QtCore, QtGui
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.GUIElements import FCCheckBox, FCSpinner, FCEntry from AppGUI.GUIElements import FCCheckBox, FCSpinner, FCEntry
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

8
flatcamGUI/preferences/geometry/GeometryOptPrefGroupUI.py → AppGUI/preferences/geometry/GeometryOptPrefGroupUI.py
View File

@@ -1,12 +1,12 @@
from PyQt5 import QtWidgets from PyQt5 import QtWidgets
from PyQt5.QtCore import Qt, QSettings from PyQt5.QtCore import Qt, QSettings
from flatcamGUI.GUIElements import FCDoubleSpinner, FCCheckBox, OptionalInputSection, FCEntry, FCSpinner, FCComboBox from AppGUI.GUIElements import FCDoubleSpinner, FCCheckBox, OptionalInputSection, FCEntry, FCSpinner, FCComboBox
from flatcamGUI.preferences import machinist_setting from AppGUI.preferences import machinist_setting
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

10
flatcamGUI/preferences/geometry/GeometryPreferencesUI.py → AppGUI/preferences/geometry/GeometryPreferencesUI.py
View File

@@ -1,13 +1,13 @@
from PyQt5 import QtWidgets from PyQt5 import QtWidgets
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.preferences.geometry.GeometryEditorPrefGroupUI import GeometryEditorPrefGroupUI from AppGUI.preferences.geometry.GeometryEditorPrefGroupUI import GeometryEditorPrefGroupUI
from flatcamGUI.preferences.geometry.GeometryAdvOptPrefGroupUI import GeometryAdvOptPrefGroupUI from AppGUI.preferences.geometry.GeometryAdvOptPrefGroupUI import GeometryAdvOptPrefGroupUI
from flatcamGUI.preferences.geometry.GeometryOptPrefGroupUI import GeometryOptPrefGroupUI from AppGUI.preferences.geometry.GeometryOptPrefGroupUI import GeometryOptPrefGroupUI
from flatcamGUI.preferences.geometry.GeometryGenPrefGroupUI import GeometryGenPrefGroupUI from AppGUI.preferences.geometry.GeometryGenPrefGroupUI import GeometryGenPrefGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

0
flatcamGUI/preferences/geometry/__init__.py → AppGUI/preferences/geometry/__init__.py
View File

6
flatcamGUI/preferences/gerber/GerberAdvOptPrefGroupUI.py → AppGUI/preferences/gerber/GerberAdvOptPrefGroupUI.py
View File

@@ -1,11 +1,11 @@
from PyQt5 import QtWidgets from PyQt5 import QtWidgets
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner, FCSpinner, OptionalInputSection from AppGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner, FCSpinner, OptionalInputSection
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

6
flatcamGUI/preferences/gerber/GerberEditorPrefGroupUI.py → AppGUI/preferences/gerber/GerberEditorPrefGroupUI.py
View File

@@ -1,11 +1,11 @@
from PyQt5 import QtWidgets from PyQt5 import QtWidgets
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.GUIElements import FCSpinner, FCDoubleSpinner, FCComboBox, FCEntry, RadioSet from AppGUI.GUIElements import FCSpinner, FCDoubleSpinner, FCComboBox, FCEntry, RadioSet
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

6
flatcamGUI/preferences/gerber/GerberExpPrefGroupUI.py → AppGUI/preferences/gerber/GerberExpPrefGroupUI.py
View File

@@ -1,11 +1,11 @@
from PyQt5 import QtWidgets, QtCore from PyQt5 import QtWidgets, QtCore
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.GUIElements import RadioSet, FCSpinner from AppGUI.GUIElements import RadioSet, FCSpinner
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

6
flatcamGUI/preferences/gerber/GerberGenPrefGroupUI.py → AppGUI/preferences/gerber/GerberGenPrefGroupUI.py
View File

@@ -1,11 +1,11 @@
from PyQt5 import QtWidgets, QtCore, QtGui from PyQt5 import QtWidgets, QtCore, QtGui
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.GUIElements import FCCheckBox, FCSpinner, RadioSet, FCEntry from AppGUI.GUIElements import FCCheckBox, FCSpinner, RadioSet, FCEntry
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

6
flatcamGUI/preferences/gerber/GerberOptPrefGroupUI.py → AppGUI/preferences/gerber/GerberOptPrefGroupUI.py
View File

@@ -1,11 +1,11 @@
from PyQt5 import QtWidgets from PyQt5 import QtWidgets
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.GUIElements import FCDoubleSpinner, FCSpinner, RadioSet, FCCheckBox from AppGUI.GUIElements import FCDoubleSpinner, FCSpinner, RadioSet, FCCheckBox
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

12
flatcamGUI/preferences/gerber/GerberPreferencesUI.py → AppGUI/preferences/gerber/GerberPreferencesUI.py
View File

@@ -1,14 +1,14 @@
from PyQt5 import QtWidgets from PyQt5 import QtWidgets
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.preferences.gerber.GerberEditorPrefGroupUI import GerberEditorPrefGroupUI from AppGUI.preferences.gerber.GerberEditorPrefGroupUI import GerberEditorPrefGroupUI
from flatcamGUI.preferences.gerber.GerberExpPrefGroupUI import GerberExpPrefGroupUI from AppGUI.preferences.gerber.GerberExpPrefGroupUI import GerberExpPrefGroupUI
from flatcamGUI.preferences.gerber.GerberAdvOptPrefGroupUI import GerberAdvOptPrefGroupUI from AppGUI.preferences.gerber.GerberAdvOptPrefGroupUI import GerberAdvOptPrefGroupUI
from flatcamGUI.preferences.gerber.GerberOptPrefGroupUI import GerberOptPrefGroupUI from AppGUI.preferences.gerber.GerberOptPrefGroupUI import GerberOptPrefGroupUI
from flatcamGUI.preferences.gerber.GerberGenPrefGroupUI import GerberGenPrefGroupUI from AppGUI.preferences.gerber.GerberGenPrefGroupUI import GerberGenPrefGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

0
flatcamGUI/preferences/gerber/__init__.py → AppGUI/preferences/gerber/__init__.py
View File

6
flatcamGUI/preferences/tools/Tools2CThievingPrefGroupUI.py → AppGUI/preferences/tools/Tools2CThievingPrefGroupUI.py
View File

@@ -1,11 +1,11 @@
from PyQt5 import QtWidgets from PyQt5 import QtWidgets
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.GUIElements import FCSpinner, FCDoubleSpinner, RadioSet from AppGUI.GUIElements import FCSpinner, FCDoubleSpinner, RadioSet
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

6
flatcamGUI/preferences/tools/Tools2CalPrefGroupUI.py → AppGUI/preferences/tools/Tools2CalPrefGroupUI.py
View File

@@ -1,11 +1,11 @@
from PyQt5 import QtWidgets from PyQt5 import QtWidgets
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.GUIElements import RadioSet, FCDoubleSpinner, FCCheckBox, FCEntry from AppGUI.GUIElements import RadioSet, FCDoubleSpinner, FCCheckBox, FCEntry
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

6
flatcamGUI/preferences/tools/Tools2EDrillsPrefGroupUI.py → AppGUI/preferences/tools/Tools2EDrillsPrefGroupUI.py
View File

@@ -1,11 +1,11 @@
from PyQt5 import QtWidgets from PyQt5 import QtWidgets
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner from AppGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

6
flatcamGUI/preferences/tools/Tools2FiducialsPrefGroupUI.py → AppGUI/preferences/tools/Tools2FiducialsPrefGroupUI.py
View File

@@ -1,11 +1,11 @@
from PyQt5 import QtWidgets from PyQt5 import QtWidgets
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.GUIElements import FCDoubleSpinner, RadioSet from AppGUI.GUIElements import FCDoubleSpinner, RadioSet
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

6
flatcamGUI/preferences/tools/Tools2InvertPrefGroupUI.py → AppGUI/preferences/tools/Tools2InvertPrefGroupUI.py
View File

@@ -1,11 +1,11 @@
from PyQt5 import QtWidgets from PyQt5 import QtWidgets
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.GUIElements import FCDoubleSpinner, RadioSet from AppGUI.GUIElements import FCDoubleSpinner, RadioSet
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

6
flatcamGUI/preferences/tools/Tools2OptimalPrefGroupUI.py → AppGUI/preferences/tools/Tools2OptimalPrefGroupUI.py
View File

@@ -1,11 +1,11 @@
from PyQt5 import QtWidgets from PyQt5 import QtWidgets
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.GUIElements import FCSpinner from AppGUI.GUIElements import FCSpinner
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

20
flatcamGUI/preferences/tools/Tools2PreferencesUI.py → AppGUI/preferences/tools/Tools2PreferencesUI.py
View File

@@ -1,18 +1,18 @@
from PyQt5 import QtWidgets from PyQt5 import QtWidgets
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.preferences.tools.Tools2InvertPrefGroupUI import Tools2InvertPrefGroupUI from AppGUI.preferences.tools.Tools2InvertPrefGroupUI import Tools2InvertPrefGroupUI
from flatcamGUI.preferences.tools.Tools2PunchGerberPrefGroupUI import Tools2PunchGerberPrefGroupUI from AppGUI.preferences.tools.Tools2PunchGerberPrefGroupUI import Tools2PunchGerberPrefGroupUI
from flatcamGUI.preferences.tools.Tools2EDrillsPrefGroupUI import Tools2EDrillsPrefGroupUI from AppGUI.preferences.tools.Tools2EDrillsPrefGroupUI import Tools2EDrillsPrefGroupUI
from flatcamGUI.preferences.tools.Tools2CalPrefGroupUI import Tools2CalPrefGroupUI from AppGUI.preferences.tools.Tools2CalPrefGroupUI import Tools2CalPrefGroupUI
from flatcamGUI.preferences.tools.Tools2FiducialsPrefGroupUI import Tools2FiducialsPrefGroupUI from AppGUI.preferences.tools.Tools2FiducialsPrefGroupUI import Tools2FiducialsPrefGroupUI
from flatcamGUI.preferences.tools.Tools2CThievingPrefGroupUI import Tools2CThievingPrefGroupUI from AppGUI.preferences.tools.Tools2CThievingPrefGroupUI import Tools2CThievingPrefGroupUI
from flatcamGUI.preferences.tools.Tools2QRCodePrefGroupUI import Tools2QRCodePrefGroupUI from AppGUI.preferences.tools.Tools2QRCodePrefGroupUI import Tools2QRCodePrefGroupUI
from flatcamGUI.preferences.tools.Tools2OptimalPrefGroupUI import Tools2OptimalPrefGroupUI from AppGUI.preferences.tools.Tools2OptimalPrefGroupUI import Tools2OptimalPrefGroupUI
from flatcamGUI.preferences.tools.Tools2RulesCheckPrefGroupUI import Tools2RulesCheckPrefGroupUI from AppGUI.preferences.tools.Tools2RulesCheckPrefGroupUI import Tools2RulesCheckPrefGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

6
flatcamGUI/preferences/tools/Tools2PunchGerberPrefGroupUI.py → AppGUI/preferences/tools/Tools2PunchGerberPrefGroupUI.py
View File

@@ -1,11 +1,11 @@
from PyQt5 import QtWidgets from PyQt5 import QtWidgets
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner from AppGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

6
flatcamGUI/preferences/tools/Tools2QRCodePrefGroupUI.py → AppGUI/preferences/tools/Tools2QRCodePrefGroupUI.py
View File

@@ -1,11 +1,11 @@
from PyQt5 import QtWidgets, QtCore from PyQt5 import QtWidgets, QtCore
from PyQt5.QtCore import Qt, QSettings from PyQt5.QtCore import Qt, QSettings
from flatcamGUI.GUIElements import FCSpinner, RadioSet, FCTextArea, FCEntry from AppGUI.GUIElements import FCSpinner, RadioSet, FCTextArea, FCEntry
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

6
flatcamGUI/preferences/tools/Tools2RulesCheckPrefGroupUI.py → AppGUI/preferences/tools/Tools2RulesCheckPrefGroupUI.py
View File

@@ -1,11 +1,11 @@
from PyQt5 import QtWidgets from PyQt5 import QtWidgets
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.GUIElements import FCCheckBox, FCDoubleSpinner from AppGUI.GUIElements import FCCheckBox, FCDoubleSpinner
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

6
flatcamGUI/preferences/tools/Tools2sidedPrefGroupUI.py → AppGUI/preferences/tools/Tools2sidedPrefGroupUI.py
View File

@@ -1,11 +1,11 @@
from PyQt5 import QtWidgets from PyQt5 import QtWidgets
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.GUIElements import FCDoubleSpinner, RadioSet from AppGUI.GUIElements import FCDoubleSpinner, RadioSet
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

6
flatcamGUI/preferences/tools/ToolsCalculatorsPrefGroupUI.py → AppGUI/preferences/tools/ToolsCalculatorsPrefGroupUI.py
View File

@@ -1,11 +1,11 @@
from PyQt5 import QtWidgets from PyQt5 import QtWidgets
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.GUIElements import FCDoubleSpinner from AppGUI.GUIElements import FCDoubleSpinner
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

6
flatcamGUI/preferences/tools/ToolsCornersPrefGroupUI.py → AppGUI/preferences/tools/ToolsCornersPrefGroupUI.py
View File

@@ -1,11 +1,11 @@
from PyQt5 import QtWidgets from PyQt5 import QtWidgets
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.GUIElements import FCDoubleSpinner from AppGUI.GUIElements import FCDoubleSpinner
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

8
flatcamGUI/preferences/tools/ToolsCutoutPrefGroupUI.py → AppGUI/preferences/tools/ToolsCutoutPrefGroupUI.py
View File

@@ -1,12 +1,12 @@
from PyQt5 import QtWidgets from PyQt5 import QtWidgets
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.GUIElements import FCDoubleSpinner, FCCheckBox, RadioSet, FCComboBox from AppGUI.GUIElements import FCDoubleSpinner, FCCheckBox, RadioSet, FCComboBox
from flatcamGUI.preferences import machinist_setting from AppGUI.preferences import machinist_setting
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

6
flatcamGUI/preferences/tools/ToolsFilmPrefGroupUI.py → AppGUI/preferences/tools/ToolsFilmPrefGroupUI.py
View File

@@ -1,11 +1,11 @@
from PyQt5 import QtWidgets, QtCore from PyQt5 import QtWidgets, QtCore
from PyQt5.QtCore import Qt, QSettings from PyQt5.QtCore import Qt, QSettings
from flatcamGUI.GUIElements import RadioSet, FCEntry, FCDoubleSpinner, FCCheckBox, FCComboBox from AppGUI.GUIElements import RadioSet, FCEntry, FCDoubleSpinner, FCCheckBox, FCComboBox
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

6
flatcamGUI/preferences/tools/ToolsNCCPrefGroupUI.py → AppGUI/preferences/tools/ToolsNCCPrefGroupUI.py
View File

@@ -1,11 +1,11 @@
from PyQt5 import QtWidgets from PyQt5 import QtWidgets
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.GUIElements import FCEntry, RadioSet, FCDoubleSpinner, FCComboBox, FCCheckBox from AppGUI.GUIElements import FCEntry, RadioSet, FCDoubleSpinner, FCComboBox, FCCheckBox
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

6
flatcamGUI/preferences/tools/ToolsPaintPrefGroupUI.py → AppGUI/preferences/tools/ToolsPaintPrefGroupUI.py
View File

@@ -1,11 +1,11 @@
from PyQt5 import QtWidgets from PyQt5 import QtWidgets
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.GUIElements import FCEntry, RadioSet, FCDoubleSpinner, FCComboBox, FCCheckBox from AppGUI.GUIElements import FCEntry, RadioSet, FCDoubleSpinner, FCComboBox, FCCheckBox
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

6
flatcamGUI/preferences/tools/ToolsPanelizePrefGroupUI.py → AppGUI/preferences/tools/ToolsPanelizePrefGroupUI.py
View File

@@ -1,11 +1,11 @@
from PyQt5 import QtWidgets from PyQt5 import QtWidgets
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.GUIElements import FCDoubleSpinner, FCSpinner, RadioSet, FCCheckBox from AppGUI.GUIElements import FCDoubleSpinner, FCSpinner, RadioSet, FCCheckBox
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

24
flatcamGUI/preferences/tools/ToolsPreferencesUI.py → AppGUI/preferences/tools/ToolsPreferencesUI.py
View File

@@ -1,20 +1,20 @@
from PyQt5 import QtWidgets from PyQt5 import QtWidgets
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.preferences.tools.ToolsSubPrefGroupUI import ToolsSubPrefGroupUI from AppGUI.preferences.tools.ToolsSubPrefGroupUI import ToolsSubPrefGroupUI
from flatcamGUI.preferences.tools.ToolsSolderpastePrefGroupUI import ToolsSolderpastePrefGroupUI from AppGUI.preferences.tools.ToolsSolderpastePrefGroupUI import ToolsSolderpastePrefGroupUI
from flatcamGUI.preferences.tools.ToolsCornersPrefGroupUI import ToolsCornersPrefGroupUI from AppGUI.preferences.tools.ToolsCornersPrefGroupUI import ToolsCornersPrefGroupUI
from flatcamGUI.preferences.tools.ToolsTransformPrefGroupUI import ToolsTransformPrefGroupUI from AppGUI.preferences.tools.ToolsTransformPrefGroupUI import ToolsTransformPrefGroupUI
from flatcamGUI.preferences.tools.ToolsCalculatorsPrefGroupUI import ToolsCalculatorsPrefGroupUI from AppGUI.preferences.tools.ToolsCalculatorsPrefGroupUI import ToolsCalculatorsPrefGroupUI
from flatcamGUI.preferences.tools.ToolsPanelizePrefGroupUI import ToolsPanelizePrefGroupUI from AppGUI.preferences.tools.ToolsPanelizePrefGroupUI import ToolsPanelizePrefGroupUI
from flatcamGUI.preferences.tools.ToolsFilmPrefGroupUI import ToolsFilmPrefGroupUI from AppGUI.preferences.tools.ToolsFilmPrefGroupUI import ToolsFilmPrefGroupUI
from flatcamGUI.preferences.tools.ToolsPaintPrefGroupUI import ToolsPaintPrefGroupUI from AppGUI.preferences.tools.ToolsPaintPrefGroupUI import ToolsPaintPrefGroupUI
from flatcamGUI.preferences.tools.Tools2sidedPrefGroupUI import Tools2sidedPrefGroupUI from AppGUI.preferences.tools.Tools2sidedPrefGroupUI import Tools2sidedPrefGroupUI
from flatcamGUI.preferences.tools.ToolsCutoutPrefGroupUI import ToolsCutoutPrefGroupUI from AppGUI.preferences.tools.ToolsCutoutPrefGroupUI import ToolsCutoutPrefGroupUI
from flatcamGUI.preferences.tools.ToolsNCCPrefGroupUI import ToolsNCCPrefGroupUI from AppGUI.preferences.tools.ToolsNCCPrefGroupUI import ToolsNCCPrefGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

6
flatcamGUI/preferences/tools/ToolsSolderpastePrefGroupUI.py → AppGUI/preferences/tools/ToolsSolderpastePrefGroupUI.py
View File

@@ -1,11 +1,11 @@
from PyQt5 import QtWidgets from PyQt5 import QtWidgets
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.GUIElements import FCEntry, FCDoubleSpinner, FCSpinner, FCComboBox from AppGUI.GUIElements import FCEntry, FCDoubleSpinner, FCSpinner, FCComboBox
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

6
flatcamGUI/preferences/tools/ToolsSubPrefGroupUI.py → AppGUI/preferences/tools/ToolsSubPrefGroupUI.py
View File

@@ -1,11 +1,11 @@
from PyQt5 import QtWidgets from PyQt5 import QtWidgets
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.GUIElements import FCCheckBox from AppGUI.GUIElements import FCCheckBox
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

6
flatcamGUI/preferences/tools/ToolsTransformPrefGroupUI.py → AppGUI/preferences/tools/ToolsTransformPrefGroupUI.py
View File

@@ -1,11 +1,11 @@
from PyQt5 import QtWidgets from PyQt5 import QtWidgets
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.GUIElements import FCDoubleSpinner, FCCheckBox, FCEntry from AppGUI.GUIElements import FCDoubleSpinner, FCCheckBox, FCEntry
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

0
flatcamGUI/preferences/tools/__init__.py → AppGUI/preferences/tools/__init__.py
View File

6
flatcamGUI/preferences/utilities/AutoCompletePrefGroupUI.py → AppGUI/preferences/utilities/AutoCompletePrefGroupUI.py
View File

@@ -1,11 +1,11 @@
from PyQt5 import QtWidgets, QtGui from PyQt5 import QtWidgets, QtGui
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.GUIElements import FCButton, FCTextArea, FCEntry from AppGUI.GUIElements import FCButton, FCTextArea, FCEntry
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

6
flatcamGUI/preferences/utilities/FAExcPrefGroupUI.py → AppGUI/preferences/utilities/FAExcPrefGroupUI.py
View File

@@ -1,11 +1,11 @@
from PyQt5 import QtWidgets, QtGui from PyQt5 import QtWidgets, QtGui
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.GUIElements import VerticalScrollArea, FCButton, FCTextArea, FCEntry from AppGUI.GUIElements import VerticalScrollArea, FCButton, FCTextArea, FCEntry
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

6
flatcamGUI/preferences/utilities/FAGcoPrefGroupUI.py → AppGUI/preferences/utilities/FAGcoPrefGroupUI.py
View File

@@ -1,11 +1,11 @@
from PyQt5 import QtWidgets, QtGui from PyQt5 import QtWidgets, QtGui
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.GUIElements import FCButton, FCTextArea, FCEntry from AppGUI.GUIElements import FCButton, FCTextArea, FCEntry
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

6
flatcamGUI/preferences/utilities/FAGrbPrefGroupUI.py → AppGUI/preferences/utilities/FAGrbPrefGroupUI.py
View File

@@ -1,11 +1,11 @@
from PyQt5 import QtWidgets, QtGui from PyQt5 import QtWidgets, QtGui
from PyQt5.QtCore import QSettings from PyQt5.QtCore import QSettings
from flatcamGUI.GUIElements import FCButton, FCTextArea, FCEntry from AppGUI.GUIElements import FCButton, FCTextArea, FCEntry
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

8
flatcamGUI/preferences/utilities/UtilPreferencesUI.py → AppGUI/preferences/utilities/UtilPreferencesUI.py
View File

@@ -1,9 +1,9 @@
from PyQt5 import QtWidgets from PyQt5 import QtWidgets
from flatcamGUI.preferences.utilities.AutoCompletePrefGroupUI import AutoCompletePrefGroupUI from AppGUI.preferences.utilities.AutoCompletePrefGroupUI import AutoCompletePrefGroupUI
from flatcamGUI.preferences.utilities.FAGrbPrefGroupUI import FAGrbPrefGroupUI from AppGUI.preferences.utilities.FAGrbPrefGroupUI import FAGrbPrefGroupUI
from flatcamGUI.preferences.utilities.FAGcoPrefGroupUI import FAGcoPrefGroupUI from AppGUI.preferences.utilities.FAGcoPrefGroupUI import FAGcoPrefGroupUI
from flatcamGUI.preferences.utilities.FAExcPrefGroupUI import FAExcPrefGroupUI from AppGUI.preferences.utilities.FAExcPrefGroupUI import FAExcPrefGroupUI
class UtilPreferencesUI(QtWidgets.QWidget): class UtilPreferencesUI(QtWidgets.QWidget):

0
flatcamGUI/preferences/utilities/__init__.py → AppGUI/preferences/utilities/__init__.py
View File

6
flatcamObjects/FlatCAMCNCJob.py → AppObjects/FlatCAMCNCJob.py
View File

@@ -14,8 +14,8 @@ from copy import deepcopy
from io import StringIO from io import StringIO
from datetime import datetime from datetime import datetime
from flatcamEditors.FlatCAMTextEditor import TextEditor from AppEditors.FlatCAMTextEditor import TextEditor
from flatcamObjects.FlatCAMObj import * from AppObjects.FlatCAMObj import *
from camlib import CNCjob from camlib import CNCjob
@@ -24,7 +24,7 @@ import sys
import math import math
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

6
flatcamObjects/FlatCAMDocument.py → AppObjects/FlatCAMDocument.py
View File

@@ -10,11 +10,11 @@
# File modified by: Marius Stanciu # # File modified by: Marius Stanciu #
# ########################################################## # ##########################################################
from flatcamEditors.FlatCAMTextEditor import TextEditor from AppEditors.FlatCAMTextEditor import TextEditor
from flatcamObjects.FlatCAMObj import * from AppObjects.FlatCAMObj import *
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

16
flatcamObjects/FlatCAMExcellon.py → AppObjects/FlatCAMExcellon.py
View File

@@ -15,13 +15,13 @@ from shapely.geometry import Point, LineString
from copy import deepcopy from copy import deepcopy
from flatcamParsers.ParseExcellon import Excellon from AppParsers.ParseExcellon import Excellon
from flatcamObjects.FlatCAMObj import * from AppObjects.FlatCAMObj import *
import itertools import itertools
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')
@@ -146,7 +146,7 @@ class ExcellonObject(FlatCAMObj, Excellon):
If only one object is in exc_list parameter then this function will copy that object in the exc_final If only one object is in exc_list parameter then this function will copy that object in the exc_final
:param exc_list: List or one object of ExcellonObject Objects to join. :param exc_list: List or one object of ExcellonObject AppObjects to join.
:param exc_final: Destination ExcellonObject object. :param exc_final: Destination ExcellonObject object.
:return: None :return: None
""" """
@@ -389,7 +389,7 @@ class ExcellonObject(FlatCAMObj, Excellon):
drill_count_item = QtWidgets.QTableWidgetItem('%d' % drill_cnt) drill_count_item = QtWidgets.QTableWidgetItem('%d' % drill_cnt)
drill_count_item.setFlags(QtCore.Qt.ItemIsEnabled) drill_count_item.setFlags(QtCore.Qt.ItemIsEnabled)
# if the slot number is zero is better to not clutter the GUI with zero's so we print a space # if the slot number is zero is better to not clutter the AppGUI with zero's so we print a space
slot_count_str = '%d' % slot_cnt if slot_cnt > 0 else '' slot_count_str = '%d' % slot_cnt if slot_cnt > 0 else ''
slot_count_item = QtWidgets.QTableWidgetItem(slot_count_str) slot_count_item = QtWidgets.QTableWidgetItem(slot_count_str)
slot_count_item.setFlags(QtCore.Qt.ItemIsEnabled) slot_count_item.setFlags(QtCore.Qt.ItemIsEnabled)
@@ -855,7 +855,7 @@ class ExcellonObject(FlatCAMObj, Excellon):
def form_to_storage(self): def form_to_storage(self):
if self.ui.tools_table.rowCount() == 0: if self.ui.tools_table.rowCount() == 0:
# there is no tool in tool table so we can't save the GUI elements values to storage # there is no tool in tool table so we can't save the AppGUI elements values to storage
return return
self.ui_disconnect() self.ui_disconnect()
@@ -910,7 +910,7 @@ class ExcellonObject(FlatCAMObj, Excellon):
def get_selected_tools_list(self): def get_selected_tools_list(self):
""" """
Returns the keys to the self.tools dictionary corresponding Returns the keys to the self.tools dictionary corresponding
to the selections on the tool list in the GUI. to the selections on the tool list in the AppGUI.
:return: List of tools. :return: List of tools.
:rtype: list :rtype: list
@@ -1778,7 +1778,7 @@ class ExcellonObject(FlatCAMObj, Excellon):
def on_apply_param_to_all_clicked(self): def on_apply_param_to_all_clicked(self):
if self.ui.tools_table.rowCount() == 0: if self.ui.tools_table.rowCount() == 0:
# there is no tool in tool table so we can't save the GUI elements values to storage # there is no tool in tool table so we can't save the AppGUI elements values to storage
log.debug("ExcellonObject.on_apply_param_to_all_clicked() --> no tool in Tools Table, aborting.") log.debug("ExcellonObject.on_apply_param_to_all_clicked() --> no tool in Tools Table, aborting.")
return return

18
flatcamObjects/FlatCAMGeometry.py → AppObjects/FlatCAMGeometry.py
View File

@@ -15,7 +15,7 @@ import shapely.affinity as affinity
from camlib import Geometry from camlib import Geometry
from flatcamObjects.FlatCAMObj import * from AppObjects.FlatCAMObj import *
import ezdxf import ezdxf
import math import math
@@ -24,7 +24,7 @@ from copy import deepcopy
import traceback import traceback
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')
@@ -931,7 +931,7 @@ class GeometryObject(FlatCAMObj, Geometry):
self.ui_connect() self.ui_connect()
self.build_ui() self.build_ui()
# if there is no tool left in the Tools Table, enable the parameters GUI # if there is no tool left in the Tools Table, enable the parameters AppGUI
if self.ui.geo_tools_table.rowCount() != 0: if self.ui.geo_tools_table.rowCount() != 0:
self.ui.geo_param_frame.setDisabled(False) self.ui.geo_param_frame.setDisabled(False)
@@ -1007,7 +1007,7 @@ class GeometryObject(FlatCAMObj, Geometry):
self.ui_connect() self.ui_connect()
self.build_ui() self.build_ui()
# if there is no tool left in the Tools Table, enable the parameters GUI # if there is no tool left in the Tools Table, enable the parameters AppGUI
if self.ui.geo_tools_table.rowCount() != 0: if self.ui.geo_tools_table.rowCount() != 0:
self.ui.geo_param_frame.setDisabled(False) self.ui.geo_param_frame.setDisabled(False)
@@ -1188,7 +1188,7 @@ class GeometryObject(FlatCAMObj, Geometry):
obj_active.options['xmax'] = 0 obj_active.options['xmax'] = 0
obj_active.options['ymax'] = 0 obj_active.options['ymax'] = 0
# if there is no tool left in the Tools Table, disable the parameters GUI # if there is no tool left in the Tools Table, disable the parameters AppGUI
if self.ui.geo_tools_table.rowCount() == 0: if self.ui.geo_tools_table.rowCount() == 0:
self.ui.geo_param_frame.setDisabled(True) self.ui.geo_param_frame.setDisabled(True)
@@ -1320,7 +1320,7 @@ class GeometryObject(FlatCAMObj, Geometry):
def on_apply_param_to_all_clicked(self): def on_apply_param_to_all_clicked(self):
if self.ui.geo_tools_table.rowCount() == 0: if self.ui.geo_tools_table.rowCount() == 0:
# there is no tool in tool table so we can't save the GUI elements values to storage # there is no tool in tool table so we can't save the AppGUI elements values to storage
log.debug("GeometryObject.gui_form_to_storage() --> no tool in Tools Table, aborting.") log.debug("GeometryObject.gui_form_to_storage() --> no tool in Tools Table, aborting.")
return return
@@ -1383,7 +1383,7 @@ class GeometryObject(FlatCAMObj, Geometry):
def gui_form_to_storage(self): def gui_form_to_storage(self):
if self.ui.geo_tools_table.rowCount() == 0: if self.ui.geo_tools_table.rowCount() == 0:
# there is no tool in tool table so we can't save the GUI elements values to storage # there is no tool in tool table so we can't save the AppGUI elements values to storage
log.debug("GeometryObject.gui_form_to_storage() --> no tool in Tools Table, aborting.") log.debug("GeometryObject.gui_form_to_storage() --> no tool in Tools Table, aborting.")
return return
@@ -1748,7 +1748,7 @@ class GeometryObject(FlatCAMObj, Geometry):
:param tools_dict: a dictionary that holds the whole data needed to create the Gcode :param tools_dict: a dictionary that holds the whole data needed to create the Gcode
(including the solid_geometry) (including the solid_geometry)
:param tools_in_use: the tools that are used, needed by some preprocessors :param tools_in_use: the tools that are used, needed by some preprocessors
:type tools_in_use list of lists, each list in the list is made out of row elements of tools table from GUI :type tools_in_use list of lists, each list in the list is made out of row elements of tools table from AppGUI
:param segx: number of segments on the X axis, for auto-levelling :param segx: number of segments on the X axis, for auto-levelling
:param segy: number of segments on the Y axis, for auto-levelling :param segy: number of segments on the Y axis, for auto-levelling
:param plot: if True the generated object will be plotted; if False will not be plotted :param plot: if True the generated object will be plotted; if False will not be plotted
@@ -2738,7 +2738,7 @@ class GeometryObject(FlatCAMObj, Geometry):
""" """
Merges the geometry of objects in grb_list into the geometry of geo_final. Merges the geometry of objects in grb_list into the geometry of geo_final.
:param geo_list: List of GerberObject Objects to join. :param geo_list: List of GerberObject AppObjects to join.
:param geo_final: Destination GerberObject object. :param geo_final: Destination GerberObject object.
:param multigeo: if the merged geometry objects are of type MultiGeo :param multigeo: if the merged geometry objects are of type MultiGeo
:return: None :return: None

16
flatcamObjects/FlatCAMGerber.py → AppObjects/FlatCAMGerber.py
View File

@@ -14,15 +14,15 @@
from shapely.geometry import Point, Polygon, MultiPolygon, MultiLineString, LineString, LinearRing from shapely.geometry import Point, Polygon, MultiPolygon, MultiLineString, LineString, LinearRing
from shapely.ops import cascaded_union from shapely.ops import cascaded_union
from flatcamParsers.ParseGerber import Gerber from AppParsers.ParseGerber import Gerber
from flatcamObjects.FlatCAMObj import * from AppObjects.FlatCAMObj import *
import math import math
import numpy as np import numpy as np
from copy import deepcopy from copy import deepcopy
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')
@@ -45,7 +45,7 @@ class GerberObject(FlatCAMObj, Gerber):
Merges the geometry of objects in geo_list into Merges the geometry of objects in geo_list into
the geometry of geo_final. the geometry of geo_final.
:param grb_list: List of GerberObject Objects to join. :param grb_list: List of GerberObject AppObjects to join.
:param grb_final: Destination GeometryObject object. :param grb_final: Destination GeometryObject object.
:return: None :return: None
""" """
@@ -179,10 +179,10 @@ class GerberObject(FlatCAMObj, Gerber):
def set_ui(self, ui): def set_ui(self, ui):
""" """
Maps options with GUI inputs. Maps options with AppGUI inputs.
Connects GUI events to methods. Connects AppGUI events to methods.
:param ui: GUI object. :param ui: AppGUI object.
:type ui: GerberObjectUI :type ui: GerberObjectUI
:return: None :return: None
""" """
@@ -243,7 +243,7 @@ class GerberObject(FlatCAMObj, Gerber):
self.ui.type_obj_combo.currentIndexChanged.connect(self.on_type_obj_index_changed) self.ui.type_obj_combo.currentIndexChanged.connect(self.on_type_obj_index_changed)
self.ui.tool_type_radio.activated_custom.connect(self.on_tool_type_change) self.ui.tool_type_radio.activated_custom.connect(self.on_tool_type_change)
# establish visibility for the GUI elements found in the slot function # establish visibility for the AppGUI elements found in the slot function
self.ui.tool_type_radio.activated_custom.emit(self.options['tool_type']) self.ui.tool_type_radio.activated_custom.emit(self.options['tool_type'])
# Show/Hide Advanced Options # Show/Hide Advanced Options

10
flatcamObjects/FlatCAMObj.py → AppObjects/FlatCAMObj.py
View File

@@ -12,15 +12,15 @@
import inspect # TODO: For debugging only. import inspect # TODO: For debugging only.
from flatcamGUI.ObjectUI import * from AppGUI.ObjectUI import *
from FlatCAMCommon import LoudDict from Common import LoudDict
from flatcamGUI.PlotCanvasLegacy import ShapeCollectionLegacy from AppGUI.PlotCanvasLegacy import ShapeCollectionLegacy
import sys import sys
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')
@@ -43,7 +43,7 @@ class ValidationError(Exception):
class FlatCAMObj(QtCore.QObject): class FlatCAMObj(QtCore.QObject):
""" """
Base type of objects handled in FlatCAM. These become interactive Base type of objects handled in FlatCAM. These become interactive
in the GUI, can be plotted, and their options can be modified in the AppGUI, can be plotted, and their options can be modified
by the user in their respective forms. by the user in their respective forms.
""" """

8
flatcamObjects/FlatCAMScript.py → AppObjects/FlatCAMScript.py
View File

@@ -10,16 +10,16 @@
# File modified by: Marius Stanciu # # File modified by: Marius Stanciu #
# ########################################################## # ##########################################################
from flatcamEditors.FlatCAMTextEditor import TextEditor from AppEditors.FlatCAMTextEditor import TextEditor
from flatcamObjects.FlatCAMObj import * from AppObjects.FlatCAMObj import *
from flatcamGUI.ObjectUI import * from AppGUI.ObjectUI import *
import tkinter as tk import tkinter as tk
import sys import sys
from copy import deepcopy from copy import deepcopy
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

20
flatcamObjects/ObjectCollection.py → AppObjects/ObjectCollection.py
View File

@@ -16,13 +16,13 @@ from PyQt5.QtCore import Qt, QSettings
from PyQt5.QtGui import QColor from PyQt5.QtGui import QColor
# from PyQt5.QtCore import QModelIndex # from PyQt5.QtCore import QModelIndex
from flatcamObjects.FlatCAMObj import FlatCAMObj from AppObjects.FlatCAMObj import FlatCAMObj
from flatcamObjects.FlatCAMCNCJob import CNCJobObject from AppObjects.FlatCAMCNCJob import CNCJobObject
from flatcamObjects.FlatCAMDocument import DocumentObject from AppObjects.FlatCAMDocument import DocumentObject
from flatcamObjects.FlatCAMExcellon import ExcellonObject from AppObjects.FlatCAMExcellon import ExcellonObject
from flatcamObjects.FlatCAMGeometry import GeometryObject from AppObjects.FlatCAMGeometry import GeometryObject
from flatcamObjects.FlatCAMGerber import GerberObject from AppObjects.FlatCAMGerber import GerberObject
from flatcamObjects.FlatCAMScript import ScriptObject from AppObjects.FlatCAMScript import ScriptObject
import inspect # TODO: Remove import inspect # TODO: Remove
@@ -32,7 +32,7 @@ from copy import deepcopy
from numpy import Inf from numpy import Inf
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')
@@ -55,7 +55,7 @@ class KeySensitiveListView(QtWidgets.QTreeView):
# self.setRootIsDecorated(False) # self.setRootIsDecorated(False)
# self.setExpandsOnDoubleClick(False) # self.setExpandsOnDoubleClick(False)
# Enable dragging and dropping onto the GUI # Enable dragging and dropping onto the AppGUI
self.setAcceptDrops(True) self.setAcceptDrops(True)
self.filename = "" self.filename = ""
self.app = app self.app = app
@@ -324,7 +324,7 @@ class ObjectCollection(QtCore.QAbstractItemModel):
font.setFamily("Seagoe UI") font.setFamily("Seagoe UI")
self.view.setFont(font) self.view.setFont(font)
# ## GUI Events # ## AppGUI Events
self.view.selectionModel().selectionChanged.connect(self.on_list_selection_change) self.view.selectionModel().selectionChanged.connect(self.on_list_selection_change)
# self.view.activated.connect(self.on_item_activated) # self.view.activated.connect(self.on_item_activated)
self.view.keyPressed.connect(self.app.ui.keyPressEvent) self.view.keyPressed.connect(self.app.ui.keyPressEvent)

0
flatcamObjects/__init__.py → AppObjects/__init__.py
View File

4
flatcamParsers/ParseDXF.py → AppParsers/ParseDXF.py
View File

@@ -12,8 +12,8 @@ import logging
log = logging.getLogger('base2') log = logging.getLogger('base2')
from flatcamParsers.ParseFont import * from AppParsers.ParseFont import *
from flatcamParsers.ParseDXF_Spline import * from AppParsers.ParseDXF_Spline import *
def distance(pt1, pt2): def distance(pt1, pt2):

0
flatcamParsers/ParseDXF_Spline.py → AppParsers/ParseDXF_Spline.py
View File

28
flatcamParsers/ParseExcellon.py → AppParsers/ParseExcellon.py
View File

@@ -17,8 +17,8 @@ import logging
import traceback import traceback
from copy import deepcopy from copy import deepcopy
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
from FlatCAMCommon import GracefulException as grace from Common import GracefulException as grace
import gettext import gettext
import builtins import builtins
@@ -967,7 +967,7 @@ class Excellon(Geometry):
:return: None :return: None
""" """
log.debug("flatcamParsers.ParseExcellon.Excellon.create_geometry()") log.debug("AppParsers.ParseExcellon.Excellon.create_geometry()")
self.solid_geometry = [] self.solid_geometry = []
try: try:
# clear the solid_geometry in self.tools # clear the solid_geometry in self.tools
@@ -982,7 +982,7 @@ class Excellon(Geometry):
_("Excellon.create_geometry() -> a drill location was skipped " _("Excellon.create_geometry() -> a drill location was skipped "
"due of not having a tool associated.\n" "due of not having a tool associated.\n"
"Check the resulting GCode.")) "Check the resulting GCode."))
log.debug("flatcamParsers.ParseExcellon.Excellon.create_geometry() -> a drill location was skipped " log.debug("AppParsers.ParseExcellon.Excellon.create_geometry() -> a drill location was skipped "
"due of not having a tool associated") "due of not having a tool associated")
continue continue
tooldia = self.tools[drill['tool']]['C'] tooldia = self.tools[drill['tool']]['C']
@@ -1006,7 +1006,7 @@ class Excellon(Geometry):
self.tools[tool_in_slots]['solid_geometry'].append(poly) self.tools[tool_in_slots]['solid_geometry'].append(poly)
self.tools[tool_in_slots]['data'] = deepcopy(self.default_data) self.tools[tool_in_slots]['data'] = deepcopy(self.default_data)
except Exception as e: except Exception as e:
log.debug("flatcamParsers.ParseExcellon.Excellon.create_geometry() -> " log.debug("AppParsers.ParseExcellon.Excellon.create_geometry() -> "
"Excellon geometry creation failed due of ERROR: %s" % str(e)) "Excellon geometry creation failed due of ERROR: %s" % str(e))
return "fail" return "fail"
@@ -1018,10 +1018,10 @@ class Excellon(Geometry):
:param flatten: No used :param flatten: No used
""" """
log.debug("flatcamParsers.ParseExcellon.Excellon.bounds()") log.debug("AppParsers.ParseExcellon.Excellon.bounds()")
if self.solid_geometry is None or not self.tools: if self.solid_geometry is None or not self.tools:
log.debug("flatcamParsers.ParseExcellon.Excellon -> solid_geometry is None") log.debug("AppParsers.ParseExcellon.Excellon -> solid_geometry is None")
return 0, 0, 0, 0 return 0, 0, 0, 0
def bounds_rec(obj): def bounds_rec(obj):
@@ -1092,7 +1092,7 @@ class Excellon(Geometry):
else: else:
log.error("Unsupported units: %s" % str(obj_units)) log.error("Unsupported units: %s" % str(obj_units))
factor = 1.0 factor = 1.0
log.debug("flatcamParsers.ParseExcellon.Excellon.convert_units() --> Factor: %s" % str(factor)) log.debug("AppParsers.ParseExcellon.Excellon.convert_units() --> Factor: %s" % str(factor))
self.units = obj_units self.units = obj_units
self.scale(factor, factor) self.scale(factor, factor)
@@ -1118,7 +1118,7 @@ class Excellon(Geometry):
:return: None :return: None
:rtype: None :rtype: None
""" """
log.debug("flatcamParsers.ParseExcellon.Excellon.scale()") log.debug("AppParsers.ParseExcellon.Excellon.scale()")
if yfactor is None: if yfactor is None:
yfactor = xfactor yfactor = xfactor
@@ -1183,7 +1183,7 @@ class Excellon(Geometry):
:type vect: tuple :type vect: tuple
:return: None :return: None
""" """
log.debug("flatcamParsers.ParseExcellon.Excellon.offset()") log.debug("AppParsers.ParseExcellon.Excellon.offset()")
dx, dy = vect dx, dy = vect
@@ -1243,7 +1243,7 @@ class Excellon(Geometry):
:type point: list :type point: list
:return: None :return: None
""" """
log.debug("flatcamParsers.ParseExcellon.Excellon.mirror()") log.debug("AppParsers.ParseExcellon.Excellon.mirror()")
px, py = point px, py = point
xscale, yscale = {"X": (1.0, -1.0), "Y": (-1.0, 1.0)}[axis] xscale, yscale = {"X": (1.0, -1.0), "Y": (-1.0, 1.0)}[axis]
@@ -1309,7 +1309,7 @@ class Excellon(Geometry):
See shapely manual for more information: See shapely manual for more information:
http://toblerity.org/shapely/manual.html#affine-transformations http://toblerity.org/shapely/manual.html#affine-transformations
""" """
log.debug("flatcamParsers.ParseExcellon.Excellon.skew()") log.debug("AppParsers.ParseExcellon.Excellon.skew()")
if angle_x is None: if angle_x is None:
angle_x = 0.0 angle_x = 0.0
@@ -1396,7 +1396,7 @@ class Excellon(Geometry):
:param point: tuple of coordinates (x, y) :param point: tuple of coordinates (x, y)
:return: None :return: None
""" """
log.debug("flatcamParsers.ParseExcellon.Excellon.rotate()") log.debug("AppParsers.ParseExcellon.Excellon.rotate()")
if angle == 0: if angle == 0:
return return
@@ -1479,7 +1479,7 @@ class Excellon(Geometry):
:param join: The type of line joint used by the shapely buffer method: round, square, bevel :param join: The type of line joint used by the shapely buffer method: round, square, bevel
:return: None :return: None
""" """
log.debug("flatcamParsers.ParseExcellon.Excellon.buffer()") log.debug("AppParsers.ParseExcellon.Excellon.buffer()")
if distance == 0: if distance == 0:
return return

2
flatcamParsers/ParseFont.py → AppParsers/ParseFont.py
View File

@@ -22,7 +22,7 @@ from fontTools import ttLib
import logging import logging
import gettext import gettext
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import builtins import builtins
fcTranslate.apply_language('strings') fcTranslate.apply_language('strings')

12
flatcamParsers/ParseGerber.py → AppParsers/ParseGerber.py
View File

@@ -14,9 +14,9 @@ import shapely.affinity as affinity
from shapely.geometry import box as shply_box, Polygon, LineString, Point, MultiPolygon from shapely.geometry import box as shply_box, Polygon, LineString, Point, MultiPolygon
from lxml import etree as ET from lxml import etree as ET
from flatcamParsers.ParseSVG import svgparselength, getsvggeo from AppParsers.ParseSVG import svgparselength, getsvggeo
from FlatCAMCommon import GracefulException as grace from Common import GracefulException as grace
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import gettext import gettext
import builtins import builtins
@@ -1416,7 +1416,7 @@ class Gerber(Geometry):
# ######### Line did not match any pattern. Warn user. ########## # ######### Line did not match any pattern. Warn user. ##########
# ################################################################ # ################################################################
log.warning("Line ignored (%d): %s" % (line_num, gline)) log.warning("Line ignored (%d): %s" % (line_num, gline))
# provide the app with a way to process the GUI events when in a blocking loop # provide the app with a way to process the AppGUI events when in a blocking loop
QtWidgets.QApplication.processEvents() QtWidgets.QApplication.processEvents()
try: try:
@@ -1763,7 +1763,7 @@ class Gerber(Geometry):
:return: None :return: None
""" """
log.debug("flatcamParsers.ParseGerber.Gerber.import_svg()") log.debug("AppParsers.ParseGerber.Gerber.import_svg()")
# Parse into list of shapely objects # Parse into list of shapely objects
svg_tree = ET.parse(filename) svg_tree = ET.parse(filename)
@@ -2389,7 +2389,7 @@ class Gerber(Geometry):
geo_p = shply_box(minx, miny, maxx, maxy) geo_p = shply_box(minx, miny, maxx, maxy)
new_geo_el['solid'] = geo_p new_geo_el['solid'] = geo_p
else: else:
log.debug("flatcamParsers.ParseGerber.Gerber.buffer() --> " log.debug("AppParsers.ParseGerber.Gerber.buffer() --> "
"ap type not supported") "ap type not supported")
else: else:
new_geo_el['solid'] = geo_el['follow'].buffer( new_geo_el['solid'] = geo_el['follow'].buffer(

4
flatcamParsers/ParseHPGL2.py → AppParsers/ParseHPGL2.py
View File

@@ -18,8 +18,8 @@ import sys
from shapely.ops import unary_union from shapely.ops import unary_union
from shapely.geometry import LineString, Point from shapely.geometry import LineString, Point
from FlatCAMCommon import GracefulException as grace from Common import GracefulException as grace
import FlatCAMTranslation as fcTranslate import AppTranslation as fcTranslate
import gettext import gettext
import builtins import builtins

2
flatcamParsers/ParsePDF.py → AppParsers/ParsePDF.py
View File

@@ -7,7 +7,7 @@
from PyQt5 import QtCore from PyQt5 import QtCore
from FlatCAMCommon import GracefulException as grace from Common import GracefulException as grace
from shapely.geometry import Polygon, LineString, MultiPolygon from shapely.geometry import Polygon, LineString, MultiPolygon

2
flatcamParsers/ParseSVG.py → AppParsers/ParseSVG.py
View File

@@ -27,7 +27,7 @@ from shapely.geometry import LineString, LinearRing, MultiLineString
from shapely.affinity import skew, affine_transform, rotate from shapely.affinity import skew, affine_transform, rotate
import numpy as np import numpy as np
from flatcamParsers.ParseFont import * from AppParsers.ParseFont import *
log = logging.getLogger('base2') log = logging.getLogger('base2')

0
flatcamParsers/__init__.py → AppParsers/__init__.py
View File

Some files were not shown because too many files have changed in this diff Show More