From ba3f10d355d80e977cb955f34e418b458f67de7d Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Mon, 18 May 2020 16:02:41 +0300 Subject: [PATCH] - renamed classes to have shorter names and grouped --- FlatCAMApp.py => App.py | 152 +++++++++--------- FlatCAMDB.py => AppDatabase.py | 10 +- .../FlatCAMExcEditor.py | 22 +-- .../FlatCAMGeoEditor.py | 32 ++-- .../FlatCAMGrbEditor.py | 24 +-- .../FlatCAMTextEditor.py | 4 +- {flatcamEditors => AppEditors}/__init__.py | 0 {flatcamGUI => AppGUI}/FlatCAMGUI.py | 70 ++++---- {flatcamGUI => AppGUI}/GUIElements.py | 2 +- {flatcamGUI => AppGUI}/ObjectUI.py | 14 +- {flatcamGUI => AppGUI}/PlotCanvas.py | 4 +- {flatcamGUI => AppGUI}/PlotCanvasLegacy.py | 2 +- {flatcamGUI => AppGUI}/VisPyCanvas.py | 0 .../VisPyData/data/fonts/opensans-regular.ttf | Bin .../VisPyData/data/freetype/freetype253.dll | Bin .../data/freetype/freetype253_x64.dll | Bin {flatcamGUI => AppGUI}/VisPyPatches.py | 0 {flatcamGUI => AppGUI}/VisPyTesselators.py | 0 {flatcamGUI => AppGUI}/VisPyVisuals.py | 2 +- {flatcamGUI => AppGUI}/__init__.py | 0 .../preferences/OptionsGroupUI.py | 0 .../preferences/PreferencesUIManager.py | 22 +-- .../preferences/__init__.py | 4 +- .../cncjob/CNCJobAdvOptPrefGroupUI.py | 6 +- .../cncjob/CNCJobGenPrefGroupUI.py | 6 +- .../cncjob/CNCJobOptPrefGroupUI.py | 6 +- .../preferences/cncjob/CNCJobPreferencesUI.py | 6 +- .../preferences/cncjob/__init__.py | 0 .../excellon/ExcellonAdvOptPrefGroupUI.py | 6 +- .../excellon/ExcellonEditorPrefGroupUI.py | 6 +- .../excellon/ExcellonExpPrefGroupUI.py | 6 +- .../excellon/ExcellonGenPrefGroupUI.py | 6 +- .../excellon/ExcellonOptPrefGroupUI.py | 8 +- .../excellon/ExcellonPreferencesUI.py | 12 +- .../preferences/excellon/__init__.py | 0 .../general/GeneralAPPSetGroupUI.py | 12 +- .../general/GeneralAppPrefGroupUI.py | 6 +- .../general/GeneralGUIPrefGroupUI.py | 10 +- .../general/GeneralPreferencesUI.py | 8 +- .../preferences/general/__init__.py | 0 .../geometry/GeometryAdvOptPrefGroupUI.py | 6 +- .../geometry/GeometryEditorPrefGroupUI.py | 6 +- .../geometry/GeometryGenPrefGroupUI.py | 6 +- .../geometry/GeometryOptPrefGroupUI.py | 8 +- .../geometry/GeometryPreferencesUI.py | 10 +- .../preferences/geometry/__init__.py | 0 .../gerber/GerberAdvOptPrefGroupUI.py | 6 +- .../gerber/GerberEditorPrefGroupUI.py | 6 +- .../gerber/GerberExpPrefGroupUI.py | 6 +- .../gerber/GerberGenPrefGroupUI.py | 6 +- .../gerber/GerberOptPrefGroupUI.py | 6 +- .../preferences/gerber/GerberPreferencesUI.py | 12 +- .../preferences/gerber/__init__.py | 0 .../tools/Tools2CThievingPrefGroupUI.py | 6 +- .../preferences/tools/Tools2CalPrefGroupUI.py | 6 +- .../tools/Tools2EDrillsPrefGroupUI.py | 6 +- .../tools/Tools2FiducialsPrefGroupUI.py | 6 +- .../tools/Tools2InvertPrefGroupUI.py | 6 +- .../tools/Tools2OptimalPrefGroupUI.py | 6 +- .../preferences/tools/Tools2PreferencesUI.py | 20 +-- .../tools/Tools2PunchGerberPrefGroupUI.py | 6 +- .../tools/Tools2QRCodePrefGroupUI.py | 6 +- .../tools/Tools2RulesCheckPrefGroupUI.py | 6 +- .../tools/Tools2sidedPrefGroupUI.py | 6 +- .../tools/ToolsCalculatorsPrefGroupUI.py | 6 +- .../tools/ToolsCornersPrefGroupUI.py | 6 +- .../tools/ToolsCutoutPrefGroupUI.py | 8 +- .../preferences/tools/ToolsFilmPrefGroupUI.py | 6 +- .../preferences/tools/ToolsNCCPrefGroupUI.py | 6 +- .../tools/ToolsPaintPrefGroupUI.py | 6 +- .../tools/ToolsPanelizePrefGroupUI.py | 6 +- .../preferences/tools/ToolsPreferencesUI.py | 24 +-- .../tools/ToolsSolderpastePrefGroupUI.py | 6 +- .../preferences/tools/ToolsSubPrefGroupUI.py | 6 +- .../tools/ToolsTransformPrefGroupUI.py | 6 +- .../preferences/tools/__init__.py | 0 .../utilities/AutoCompletePrefGroupUI.py | 6 +- .../preferences/utilities/FAExcPrefGroupUI.py | 6 +- .../preferences/utilities/FAGcoPrefGroupUI.py | 6 +- .../preferences/utilities/FAGrbPrefGroupUI.py | 6 +- .../utilities/UtilPreferencesUI.py | 8 +- .../preferences/utilities/__init__.py | 0 .../FlatCAMCNCJob.py | 6 +- .../FlatCAMDocument.py | 6 +- .../FlatCAMExcellon.py | 16 +- .../FlatCAMGeometry.py | 18 +-- .../FlatCAMGerber.py | 16 +- {flatcamObjects => AppObjects}/FlatCAMObj.py | 10 +- .../FlatCAMScript.py | 8 +- .../ObjectCollection.py | 20 +-- {flatcamObjects => AppObjects}/__init__.py | 0 {flatcamParsers => AppParsers}/ParseDXF.py | 4 +- .../ParseDXF_Spline.py | 0 .../ParseExcellon.py | 28 ++-- {flatcamParsers => AppParsers}/ParseFont.py | 2 +- {flatcamParsers => AppParsers}/ParseGerber.py | 12 +- {flatcamParsers => AppParsers}/ParseHPGL2.py | 4 +- {flatcamParsers => AppParsers}/ParsePDF.py | 2 +- {flatcamParsers => AppParsers}/ParseSVG.py | 2 +- {flatcamParsers => AppParsers}/__init__.py | 0 FlatCAMPool.py => AppPool.py | 0 FlatCAMPostProc.py => AppPreProcessor.py | 0 FlatCAMProcess.py => AppProcess.py | 4 +- FlatCAMTool.py => AppTool.py | 6 +- .../ToolAlignObjects.py | 8 +- {flatcamTools => AppTools}/ToolCalculators.py | 6 +- {flatcamTools => AppTools}/ToolCalibration.py | 14 +- .../ToolCopperThieving.py | 10 +- {flatcamTools => AppTools}/ToolCorners.py | 8 +- {flatcamTools => AppTools}/ToolCutOut.py | 8 +- {flatcamTools => AppTools}/ToolDblSided.py | 12 +- {flatcamTools => AppTools}/ToolDistance.py | 16 +- {flatcamTools => AppTools}/ToolDistanceMin.py | 14 +- .../ToolExtractDrills.py | 6 +- {flatcamTools => AppTools}/ToolFiducials.py | 8 +- {flatcamTools => AppTools}/ToolFilm.py | 6 +- {flatcamTools => AppTools}/ToolImage.py | 8 +- .../ToolInvertGerber.py | 6 +- {flatcamTools => AppTools}/ToolMove.py | 8 +- {flatcamTools => AppTools}/ToolNCC.py | 60 +++---- {flatcamTools => AppTools}/ToolOptimal.py | 12 +- {flatcamTools => AppTools}/ToolPDF.py | 14 +- {flatcamTools => AppTools}/ToolPaint.py | 42 ++--- {flatcamTools => AppTools}/ToolPanelize.py | 8 +- {flatcamTools => AppTools}/ToolPcbWizard.py | 8 +- {flatcamTools => AppTools}/ToolProperties.py | 6 +- {flatcamTools => AppTools}/ToolPunchGerber.py | 6 +- {flatcamTools => AppTools}/ToolQRCode.py | 8 +- {flatcamTools => AppTools}/ToolRulesCheck.py | 10 +- {flatcamTools => AppTools}/ToolShell.py | 6 +- {flatcamTools => AppTools}/ToolSolderPaste.py | 12 +- {flatcamTools => AppTools}/ToolSub.py | 14 +- {flatcamTools => AppTools}/ToolTransform.py | 6 +- AppTools/__init__.py | 43 +++++ FlatCAMTranslation.py => AppTranslation.py | 0 FlatCAMWorker.py => AppWorker.py | 0 FlatCAMWorkerStack.py => AppWorkerStack.py | 2 +- FlatCAMBookmark.py => Bookmark.py | 4 +- CHANGELOG.md | 1 + FlatCAMCommon.py => Common.py | 8 +- FlatCAM.py | 6 +- camlib.py | 28 ++-- defaults.py | 14 +- flatcamTools/__init__.py | 43 ----- make_freezed.py | 2 +- preprocessors/Berta_CNC.py | 4 +- preprocessors/GRBL_laser.py | 2 +- preprocessors/ISEL_CNC.py | 2 +- preprocessors/ISEL_ICP_CNC.py | 2 +- preprocessors/Marlin.py | 2 +- preprocessors/Marlin_laser_FAN_pin.py | 2 +- preprocessors/Marlin_laser_Spindle_pin.py | 2 +- preprocessors/Paste_1.py | 2 +- preprocessors/Repetier.py | 2 +- preprocessors/Roland_MDX_20.py | 2 +- preprocessors/Toolchange_Custom.py | 2 +- preprocessors/Toolchange_Manual.py | 2 +- preprocessors/Toolchange_Probe_MACH3.py | 2 +- preprocessors/default.py | 2 +- preprocessors/grbl_11.py | 2 +- preprocessors/hpgl.py | 2 +- preprocessors/line_xyz.py | 2 +- tclCommands/TclCommand.py | 4 +- tclCommands/TclCommandBbox.py | 2 +- tclCommands/TclCommandBounds.py | 2 +- tclCommands/TclCommandCopperClear.py | 2 +- tclCommands/TclCommandDrillcncjob.py | 2 +- tclCommands/TclCommandGeoCutout.py | 2 +- tclCommands/TclCommandGetNames.py | 2 +- tclCommands/TclCommandGetPath.py | 2 +- tclCommands/TclCommandHelp.py | 2 +- tclCommands/TclCommandImportSvg.py | 2 +- tclCommands/TclCommandJoinExcellon.py | 2 +- tclCommands/TclCommandJoinGeometry.py | 2 +- tclCommands/TclCommandNregions.py | 2 +- tclCommands/TclCommandOpenDXF.py | 2 +- tclCommands/TclCommandOpenSVG.py | 2 +- tclCommands/TclCommandPaint.py | 2 +- tclCommands/TclCommandPlotAll.py | 4 +- tclCommands/TclCommandPlotObjects.py | 4 +- tclCommands/TclCommandScale.py | 2 +- tclCommands/TclCommandSetActive.py | 2 +- tclCommands/TclCommandSetOrigin.py | 2 +- tclCommands/TclCommandSetPath.py | 2 +- tclCommands/TclCommandSubtractRectangle.py | 2 +- 185 files changed, 749 insertions(+), 748 deletions(-) rename FlatCAMApp.py => App.py (99%) rename FlatCAMDB.py => AppDatabase.py (99%) rename {flatcamEditors => AppEditors}/FlatCAMExcEditor.py (99%) rename {flatcamEditors => AppEditors}/FlatCAMGeoEditor.py (99%) rename {flatcamEditors => AppEditors}/FlatCAMGrbEditor.py (99%) rename {flatcamEditors => AppEditors}/FlatCAMTextEditor.py (98%) rename {flatcamEditors => AppEditors}/__init__.py (100%) rename {flatcamGUI => AppGUI}/FlatCAMGUI.py (98%) rename {flatcamGUI => AppGUI}/GUIElements.py (99%) rename {flatcamGUI => AppGUI}/ObjectUI.py (99%) rename {flatcamGUI => AppGUI}/PlotCanvas.py (99%) rename {flatcamGUI => AppGUI}/PlotCanvasLegacy.py (99%) rename {flatcamGUI => AppGUI}/VisPyCanvas.py (100%) rename {flatcamGUI => AppGUI}/VisPyData/data/fonts/opensans-regular.ttf (100%) rename {flatcamGUI => AppGUI}/VisPyData/data/freetype/freetype253.dll (100%) rename {flatcamGUI => AppGUI}/VisPyData/data/freetype/freetype253_x64.dll (100%) rename {flatcamGUI => AppGUI}/VisPyPatches.py (100%) rename {flatcamGUI => AppGUI}/VisPyTesselators.py (100%) rename {flatcamGUI => AppGUI}/VisPyVisuals.py (99%) rename {flatcamGUI => AppGUI}/__init__.py (100%) rename {flatcamGUI => AppGUI}/preferences/OptionsGroupUI.py (100%) rename {flatcamGUI => AppGUI}/preferences/PreferencesUIManager.py (99%) rename {flatcamGUI => AppGUI}/preferences/__init__.py (79%) rename {flatcamGUI => AppGUI}/preferences/cncjob/CNCJobAdvOptPrefGroupUI.py (97%) rename {flatcamGUI => AppGUI}/preferences/cncjob/CNCJobGenPrefGroupUI.py (98%) rename {flatcamGUI => AppGUI}/preferences/cncjob/CNCJobOptPrefGroupUI.py (94%) rename {flatcamGUI => AppGUI}/preferences/cncjob/CNCJobPreferencesUI.py (77%) rename {flatcamGUI => AppGUI}/preferences/cncjob/__init__.py (100%) rename {flatcamGUI => AppGUI}/preferences/excellon/ExcellonAdvOptPrefGroupUI.py (96%) rename {flatcamGUI => AppGUI}/preferences/excellon/ExcellonEditorPrefGroupUI.py (98%) rename {flatcamGUI => AppGUI}/preferences/excellon/ExcellonExpPrefGroupUI.py (97%) rename {flatcamGUI => AppGUI}/preferences/excellon/ExcellonGenPrefGroupUI.py (99%) rename {flatcamGUI => AppGUI}/preferences/excellon/ExcellonOptPrefGroupUI.py (97%) rename {flatcamGUI => AppGUI}/preferences/excellon/ExcellonPreferencesUI.py (77%) rename {flatcamGUI => AppGUI}/preferences/excellon/__init__.py (100%) rename {flatcamGUI => AppGUI}/preferences/general/GeneralAPPSetGroupUI.py (98%) rename {flatcamGUI => AppGUI}/preferences/general/GeneralAppPrefGroupUI.py (98%) rename {flatcamGUI => AppGUI}/preferences/general/GeneralGUIPrefGroupUI.py (98%) rename {flatcamGUI => AppGUI}/preferences/general/GeneralPreferencesUI.py (80%) rename {flatcamGUI => AppGUI}/preferences/general/__init__.py (100%) rename {flatcamGUI => AppGUI}/preferences/geometry/GeometryAdvOptPrefGroupUI.py (97%) rename {flatcamGUI => AppGUI}/preferences/geometry/GeometryEditorPrefGroupUI.py (93%) rename {flatcamGUI => AppGUI}/preferences/geometry/GeometryGenPrefGroupUI.py (96%) rename {flatcamGUI => AppGUI}/preferences/geometry/GeometryOptPrefGroupUI.py (97%) rename {flatcamGUI => AppGUI}/preferences/geometry/GeometryPreferencesUI.py (77%) rename {flatcamGUI => AppGUI}/preferences/geometry/__init__.py (100%) rename {flatcamGUI => AppGUI}/preferences/gerber/GerberAdvOptPrefGroupUI.py (97%) rename {flatcamGUI => AppGUI}/preferences/gerber/GerberEditorPrefGroupUI.py (97%) rename {flatcamGUI => AppGUI}/preferences/gerber/GerberExpPrefGroupUI.py (96%) rename {flatcamGUI => AppGUI}/preferences/gerber/GerberGenPrefGroupUI.py (98%) rename {flatcamGUI => AppGUI}/preferences/gerber/GerberOptPrefGroupUI.py (97%) rename {flatcamGUI => AppGUI}/preferences/gerber/GerberPreferencesUI.py (78%) rename {flatcamGUI => AppGUI}/preferences/gerber/__init__.py (100%) rename {flatcamGUI => AppGUI}/preferences/tools/Tools2CThievingPrefGroupUI.py (98%) rename {flatcamGUI => AppGUI}/preferences/tools/Tools2CalPrefGroupUI.py (96%) rename {flatcamGUI => AppGUI}/preferences/tools/Tools2EDrillsPrefGroupUI.py (97%) rename {flatcamGUI => AppGUI}/preferences/tools/Tools2FiducialsPrefGroupUI.py (96%) rename {flatcamGUI => AppGUI}/preferences/tools/Tools2InvertPrefGroupUI.py (93%) rename {flatcamGUI => AppGUI}/preferences/tools/Tools2OptimalPrefGroupUI.py (91%) rename {flatcamGUI => AppGUI}/preferences/tools/Tools2PreferencesUI.py (76%) rename {flatcamGUI => AppGUI}/preferences/tools/Tools2PunchGerberPrefGroupUI.py (97%) rename {flatcamGUI => AppGUI}/preferences/tools/Tools2QRCodePrefGroupUI.py (97%) rename {flatcamGUI => AppGUI}/preferences/tools/Tools2RulesCheckPrefGroupUI.py (98%) rename {flatcamGUI => AppGUI}/preferences/tools/Tools2sidedPrefGroupUI.py (95%) rename {flatcamGUI => AppGUI}/preferences/tools/ToolsCalculatorsPrefGroupUI.py (97%) rename {flatcamGUI => AppGUI}/preferences/tools/ToolsCornersPrefGroupUI.py (94%) rename {flatcamGUI => AppGUI}/preferences/tools/ToolsCutoutPrefGroupUI.py (96%) rename {flatcamGUI => AppGUI}/preferences/tools/ToolsFilmPrefGroupUI.py (98%) rename {flatcamGUI => AppGUI}/preferences/tools/ToolsNCCPrefGroupUI.py (98%) rename {flatcamGUI => AppGUI}/preferences/tools/ToolsPaintPrefGroupUI.py (98%) rename {flatcamGUI => AppGUI}/preferences/tools/ToolsPanelizePrefGroupUI.py (96%) rename {flatcamGUI => AppGUI}/preferences/tools/ToolsPreferencesUI.py (76%) rename {flatcamGUI => AppGUI}/preferences/tools/ToolsSolderpastePrefGroupUI.py (98%) rename {flatcamGUI => AppGUI}/preferences/tools/ToolsSubPrefGroupUI.py (88%) rename {flatcamGUI => AppGUI}/preferences/tools/ToolsTransformPrefGroupUI.py (98%) rename {flatcamGUI => AppGUI}/preferences/tools/__init__.py (100%) rename {flatcamGUI => AppGUI}/preferences/utilities/AutoCompletePrefGroupUI.py (94%) rename {flatcamGUI => AppGUI}/preferences/utilities/FAExcPrefGroupUI.py (95%) rename {flatcamGUI => AppGUI}/preferences/utilities/FAGcoPrefGroupUI.py (94%) rename {flatcamGUI => AppGUI}/preferences/utilities/FAGrbPrefGroupUI.py (94%) rename {flatcamGUI => AppGUI}/preferences/utilities/UtilPreferencesUI.py (76%) rename {flatcamGUI => AppGUI}/preferences/utilities/__init__.py (100%) rename {flatcamObjects => AppObjects}/FlatCAMCNCJob.py (99%) rename {flatcamObjects => AppObjects}/FlatCAMDocument.py (98%) rename {flatcamObjects => AppObjects}/FlatCAMExcellon.py (99%) rename {flatcamObjects => AppObjects}/FlatCAMGeometry.py (99%) rename {flatcamObjects => AppObjects}/FlatCAMGerber.py (99%) rename {flatcamObjects => AppObjects}/FlatCAMObj.py (98%) rename {flatcamObjects => AppObjects}/FlatCAMScript.py (98%) rename {flatcamObjects => AppObjects}/ObjectCollection.py (98%) rename {flatcamObjects => AppObjects}/__init__.py (100%) rename {flatcamParsers => AppParsers}/ParseDXF.py (99%) rename {flatcamParsers => AppParsers}/ParseDXF_Spline.py (100%) rename {flatcamParsers => AppParsers}/ParseExcellon.py (98%) rename {flatcamParsers => AppParsers}/ParseFont.py (99%) rename {flatcamParsers => AppParsers}/ParseGerber.py (99%) rename {flatcamParsers => AppParsers}/ParseHPGL2.py (99%) rename {flatcamParsers => AppParsers}/ParsePDF.py (99%) rename {flatcamParsers => AppParsers}/ParseSVG.py (99%) rename {flatcamParsers => AppParsers}/__init__.py (100%) rename FlatCAMPool.py => AppPool.py (100%) rename FlatCAMPostProc.py => AppPreProcessor.py (100%) rename FlatCAMProcess.py => AppProcess.py (98%) rename FlatCAMTool.py => AppTool.py (98%) rename {flatcamTools => AppTools}/ToolAlignObjects.py (99%) rename {flatcamTools => AppTools}/ToolCalculators.py (99%) rename {flatcamTools => AppTools}/ToolCalibration.py (99%) rename {flatcamTools => AppTools}/ToolCopperThieving.py (99%) rename {flatcamTools => AppTools}/ToolCorners.py (98%) rename {flatcamTools => AppTools}/ToolCutOut.py (99%) rename {flatcamTools => AppTools}/ToolDblSided.py (99%) rename {flatcamTools => AppTools}/ToolDistance.py (98%) rename {flatcamTools => AppTools}/ToolDistanceMin.py (97%) rename {flatcamTools => AppTools}/ToolExtractDrills.py (99%) rename {flatcamTools => AppTools}/ToolFiducials.py (99%) rename {flatcamTools => AppTools}/ToolFilm.py (99%) rename {flatcamTools => AppTools}/ToolImage.py (98%) rename {flatcamTools => AppTools}/ToolInvertGerber.py (98%) rename {flatcamTools => AppTools}/ToolMove.py (98%) rename {flatcamTools => AppTools}/ToolNCC.py (99%) rename {flatcamTools => AppTools}/ToolOptimal.py (98%) rename {flatcamTools => AppTools}/ToolPDF.py (98%) rename {flatcamTools => AppTools}/ToolPaint.py (99%) rename {flatcamTools => AppTools}/ToolPanelize.py (99%) rename {flatcamTools => AppTools}/ToolPcbWizard.py (99%) rename {flatcamTools => AppTools}/ToolProperties.py (99%) rename {flatcamTools => AppTools}/ToolPunchGerber.py (99%) rename {flatcamTools => AppTools}/ToolQRCode.py (99%) rename {flatcamTools => AppTools}/ToolRulesCheck.py (99%) rename {flatcamTools => AppTools}/ToolShell.py (98%) rename {flatcamTools => AppTools}/ToolSolderPaste.py (99%) rename {flatcamTools => AppTools}/ToolSub.py (99%) rename {flatcamTools => AppTools}/ToolTransform.py (99%) create mode 100644 AppTools/__init__.py rename FlatCAMTranslation.py => AppTranslation.py (100%) rename FlatCAMWorker.py => AppWorker.py (100%) rename FlatCAMWorkerStack.py => AppWorkerStack.py (97%) rename FlatCAMBookmark.py => Bookmark.py (99%) rename FlatCAMCommon.py => Common.py (99%) delete mode 100644 flatcamTools/__init__.py diff --git a/FlatCAMApp.py b/App.py similarity index 99% rename from FlatCAMApp.py rename to App.py index 8186ddf4..64799ab9 100644 --- a/FlatCAMApp.py +++ b/App.py @@ -42,57 +42,57 @@ import socket # #################################################################################################################### # Diverse -from FlatCAMCommon import LoudDict, color_variant, ExclusionAreas -from FlatCAMBookmark import BookmarkManager -from FlatCAMDB import ToolsDB2 +from Common import LoudDict, color_variant, ExclusionAreas +from Bookmark import BookmarkManager +from AppDatabase import ToolsDB2 from vispy.gloo.util import _screenshot from vispy.io import write_png -# FlatCAM Objects +# FlatCAM AppObjects from defaults import FlatCAMDefaults -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI -from flatcamGUI.preferences.PreferencesUIManager import PreferencesUIManager -from flatcamObjects.ObjectCollection import * -from flatcamObjects.FlatCAMObj import FlatCAMObj -from flatcamObjects.FlatCAMCNCJob import CNCJobObject -from flatcamObjects.FlatCAMDocument import DocumentObject -from flatcamObjects.FlatCAMExcellon import ExcellonObject -from flatcamObjects.FlatCAMGeometry import GeometryObject -from flatcamObjects.FlatCAMGerber import GerberObject -from flatcamObjects.FlatCAMScript import ScriptObject +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.preferences.PreferencesUIManager import PreferencesUIManager +from AppObjects.ObjectCollection import * +from AppObjects.FlatCAMObj import FlatCAMObj +from AppObjects.FlatCAMCNCJob import CNCJobObject +from AppObjects.FlatCAMDocument import DocumentObject +from AppObjects.FlatCAMExcellon import ExcellonObject +from AppObjects.FlatCAMGeometry import GeometryObject +from AppObjects.FlatCAMGerber import GerberObject +from AppObjects.FlatCAMScript import ScriptObject # FlatCAM Parsing files -from flatcamParsers.ParseExcellon import Excellon -from flatcamParsers.ParseGerber import Gerber +from AppParsers.ParseExcellon import Excellon +from AppParsers.ParseGerber import Gerber from camlib import to_dict, dict2obj, ET, ParseError, Geometry, CNCjob -# FlatCAM GUI -from flatcamGUI.PlotCanvas import * -from flatcamGUI.PlotCanvasLegacy import * -from flatcamGUI.FlatCAMGUI import * -from flatcamGUI.GUIElements import FCFileSaveDialog, message_dialog, FlatCAMSystemTray +# FlatCAM AppGUI +from AppGUI.PlotCanvas import * +from AppGUI.PlotCanvasLegacy import * +from AppGUI.FlatCAMGUI import * +from AppGUI.GUIElements import FCFileSaveDialog, message_dialog, FlatCAMSystemTray # FlatCAM Pre-processors -from FlatCAMPostProc import load_preprocessors +from AppPreProcessor import load_preprocessors -# FlatCAM Editors -from flatcamEditors.FlatCAMGeoEditor import FlatCAMGeoEditor -from flatcamEditors.FlatCAMExcEditor import FlatCAMExcEditor -from flatcamEditors.FlatCAMGrbEditor import FlatCAMGrbEditor -from flatcamEditors.FlatCAMTextEditor import TextEditor -from flatcamParsers.ParseHPGL2 import HPGL2 +# FlatCAM AppEditors +from AppEditors.FlatCAMGeoEditor import FlatCAMGeoEditor +from AppEditors.FlatCAMExcEditor import FlatCAMExcEditor +from AppEditors.FlatCAMGrbEditor import FlatCAMGrbEditor +from AppEditors.FlatCAMTextEditor import TextEditor +from AppParsers.ParseHPGL2 import HPGL2 # FlatCAM Workers -from FlatCAMProcess import * -from FlatCAMWorkerStack import WorkerStack +from AppProcess import * +from AppWorkerStack import WorkerStack # FlatCAM Tools -from flatcamTools import * +from AppTools import * # FlatCAM Translation import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins if sys.platform == 'win32': @@ -106,7 +106,7 @@ if '_' not in builtins.__dict__: 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() # 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 ... self.app_home = os.path.dirname(os.path.realpath(__file__)) @@ -496,7 +496,7 @@ class App(QtCore.QObject): show_splash = 0 # ########################################################################################################### - # ######################################### Initialize GUI ################################################## + # ######################################### Initialize AppGUI ################################################## # ########################################################################################################### # 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) # ########################################################################################################### - # ##################################### UPDATE PREFERENCES GUI FORMS ######################################## + # ##################################### UPDATE PREFERENCES AppGUI FORMS ######################################## # ########################################################################################################### self.preferencesUiManager = PreferencesUIManager(defaults=self.defaults, data_path=self.data_path, ui=self.ui, inform=self.inform) 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) # ########################################################################################################### @@ -596,7 +596,7 @@ class App(QtCore.QObject): # ################################ It's done only once after install ##################################### # ########################################################################################################### 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' 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) # ########################################################################################################### - # #################################### GUI PREFERENCES SIGNALS ############################################## + # #################################### AppGUI PREFERENCES SIGNALS ############################################## # ########################################################################################################### 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) # ########################################################################################################### - # ######################################## GUI SETTINGS SIGNALS ############################################# + # ######################################## AppGUI SETTINGS SIGNALS ############################################# # ########################################################################################################### 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 ################################################### # ########################################################################################################### - # 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 self.call_source = 'app' @@ -1559,7 +1559,7 @@ class App(QtCore.QObject): except AttributeError: self.tool_shapes = None else: - from flatcamGUI.PlotCanvasLegacy import ShapeCollectionLegacy + from AppGUI.PlotCanvasLegacy import ShapeCollectionLegacy self.tool_shapes = ShapeCollectionLegacy(obj=self, app=self, name="tool") # 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.") # ########################################################################################################### - # ########################################## SHOW GUI ####################################################### + # ########################################## SHOW AppGUI ####################################################### # ########################################################################################################### # if the app is not started as headless, show it @@ -1714,7 +1714,7 @@ class App(QtCore.QObject): try: shutil.copytree(from_path, to_path) 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) def on_startup_args(self, args, silent=False): @@ -2130,7 +2130,7 @@ class App(QtCore.QObject): """ 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) edited_object = self.collection.get_active() @@ -2267,8 +2267,8 @@ class App(QtCore.QObject): self.geo_editor.deactivate() - # restore GUI to the Selected TAB - # Remove anything else in the GUI + # restore AppGUI to the Selected TAB + # Remove anything else in the AppGUI self.ui.tool_scroll_area.takeWidget() # 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.")) - # restore GUI to the Selected TAB - # Remove anything else in the GUI + # restore AppGUI to the Selected TAB + # Remove anything else in the AppGUI self.ui.selected_scroll_area.takeWidget() elif isinstance(edited_obj, ExcellonObject): @@ -2318,8 +2318,8 @@ class App(QtCore.QObject): self.exc_editor.deactivate() - # restore GUI to the Selected TAB - # Remove anything else in the GUI + # restore AppGUI to the Selected TAB + # Remove anything else in the AppGUI self.ui.tool_scroll_area.takeWidget() # 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): """ 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. Notes: @@ -3568,7 +3568,7 @@ class App(QtCore.QObject): 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 'config' folder found in the FlatCAM installation folder. @@ -3952,7 +3952,7 @@ class App(QtCore.QObject): if len(objs) < 2: 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' for obj in objs: @@ -4011,7 +4011,7 @@ class App(QtCore.QObject): if len(objs) < 2: 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' def initialize(exc_obj, app): @@ -4039,7 +4039,7 @@ class App(QtCore.QObject): if len(objs) < 2: 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' def initialize(grb_obj, app): @@ -4125,7 +4125,7 @@ class App(QtCore.QObject): 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. :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() # 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 self.defaults['global_gridx'] = val_x self.defaults['global_gridy'] = val_y @@ -6194,7 +6194,7 @@ class App(QtCore.QObject): 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 :param obj_name: @@ -6378,7 +6378,7 @@ class App(QtCore.QObject): pass if obj_list: - self.inform.emit('%s' % _("Objects selection is cleared.")) + self.inform.emit('%s' % _("AppObjects selection is cleared.")) else: self.inform.emit('') @@ -6653,7 +6653,7 @@ class App(QtCore.QObject): else: 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']: for obj in self.collection.get_list(): try: @@ -7240,7 +7240,7 @@ class App(QtCore.QObject): # Init FlatCAMTools 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: # 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 @@ -9104,7 +9104,7 @@ class App(QtCore.QObject): # Register recent file self.file_opened.emit("svg", filename) - # GUI feedback + # AppGUI feedback self.inform.emit('[success] %s: %s' % (_("Opened"), filename)) def import_dxf(self, filename, geo_type='geometry', outname=None, plot=True): @@ -9150,7 +9150,7 @@ class App(QtCore.QObject): # Register recent file self.file_opened.emit("dxf", filename) - # GUI feedback + # AppGUI feedback self.inform.emit('[success] %s: %s' % (_("Opened"), filename)) def open_gerber(self, filename, outname=None, plot=True, from_tcl=False): @@ -9214,7 +9214,7 @@ class App(QtCore.QObject): # Register recent file self.file_opened.emit("gerber", filename) - # GUI feedback + # AppGUI feedback self.inform.emit('[success] %s: %s' % (_("Opened"), filename)) def open_excellon(self, filename, outname=None, plot=True, from_tcl=False): @@ -9281,7 +9281,7 @@ class App(QtCore.QObject): # Register recent file self.file_opened.emit("excellon", filename) - # GUI feedback + # AppGUI feedback self.inform.emit('[success] %s: %s' % (_("Opened"), filename)) 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 self.file_opened.emit("cncjob", filename) - # GUI feedback + # AppGUI feedback self.inform.emit('[success] %s: %s' % (_("Opened"), filename)) def open_hpgl2(self, filename, outname=None): @@ -9412,7 +9412,7 @@ class App(QtCore.QObject): # Register recent file self.file_opened.emit("geometry", filename) - # GUI feedback + # AppGUI feedback self.inform.emit('[success] %s: %s' % (_("Opened"), filename)) def open_script(self, filename, outname=None, silent=False): @@ -9469,7 +9469,7 @@ class App(QtCore.QObject): # Register recent file self.file_opened.emit("script", filename) - # GUI feedback + # AppGUI feedback self.inform.emit('[success] %s: %s' % (_("Opened"), filename)) def open_config_file(self, filename, run_from_arg=None): @@ -9898,11 +9898,11 @@ class App(QtCore.QObject): #
  • Loat/Import a Gerber, Excellon, Gcode, DXF, Raster Image or SVG # file into # FlatCAM using either the menu's, toolbars, key shortcuts or - # even dragging and dropping the files on the GUI.
    + # even dragging and dropping the files on the AppGUI.
    #
    # You can also load a FlatCAM project by double clicking on the project file, drag & # drop of the - # file into the FLATCAM GUI or through the menu/toolbar links offered within the app.
    + # file into the FLATCAM AppGUI or through the menu/toolbar links offered within the app.
    #  
    • #
  • Once an object is available in the Project Tab, by selecting it # and then @@ -9961,9 +9961,9 @@ class App(QtCore.QObject): 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 " "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, " - "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."), 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, " @@ -10211,7 +10211,7 @@ class App(QtCore.QObject): """ Enable plots - :param objects: list of Objects to be enabled + :param objects: list of AppObjects to be enabled :return: """ log.debug("Enabling plots ...") @@ -10254,7 +10254,7 @@ class App(QtCore.QObject): """ Disables plots - :param objects: list of Objects to be disabled + :param objects: list of AppObjects to be disabled :return: """ @@ -10304,7 +10304,7 @@ class App(QtCore.QObject): """ 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 """ diff --git a/FlatCAMDB.py b/AppDatabase.py similarity index 99% rename from FlatCAMDB.py rename to AppDatabase.py index f32bc37f..324ecc9b 100644 --- a/FlatCAMDB.py +++ b/AppDatabase.py @@ -1,5 +1,5 @@ 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 from camlib import to_dict @@ -9,7 +9,7 @@ import json from copy import deepcopy from datetime import datetime import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins 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: self.storage_to_form(self.db_tool_dict['1']) - # Enable GUI + # Enable AppGUI self.basic_box.setEnabled(True) self.advanced_box.setEnabled(True) self.ncc_box.setEnabled(True) @@ -1949,7 +1949,7 @@ class ToolsDB2(QtWidgets.QWidget): # self.tree_widget.setFocus() else: - # Disable GUI + # Disable AppGUI self.basic_box.setEnabled(False) self.advanced_box.setEnabled(False) self.ncc_box.setEnabled(False) diff --git a/flatcamEditors/FlatCAMExcEditor.py b/AppEditors/FlatCAMExcEditor.py similarity index 99% rename from flatcamEditors/FlatCAMExcEditor.py rename to AppEditors/FlatCAMExcEditor.py index 30d5182b..c8671180 100644 --- a/flatcamEditors/FlatCAMExcEditor.py +++ b/AppEditors/FlatCAMExcEditor.py @@ -9,9 +9,9 @@ from PyQt5 import QtGui, QtCore, QtWidgets from PyQt5.QtCore import Qt, QSettings from camlib import distance, arc, FlatCAMRTreeStorage -from flatcamGUI.GUIElements import FCEntry, FCComboBox, FCTable, FCDoubleSpinner, RadioSet, FCSpinner -from flatcamEditors.FlatCAMGeoEditor import FCShapeTool, DrawTool, DrawToolShape, DrawToolUtilityShape, FlatCAMGeoEditor -from flatcamParsers.ParseExcellon import Excellon +from AppGUI.GUIElements import FCEntry, FCComboBox, FCTable, FCDoubleSpinner, RadioSet, FCSpinner +from AppEditors.FlatCAMGeoEditor import FCShapeTool, DrawTool, DrawToolShape, DrawToolUtilityShape, FlatCAMGeoEditor +from AppParsers.ParseExcellon import Excellon from shapely.geometry import LineString, LinearRing, MultiLineString, Polygon, MultiPolygon, Point import shapely.affinity as affinity @@ -26,7 +26,7 @@ import logging from copy import deepcopy import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') @@ -2123,7 +2123,7 @@ class FlatCAMExcEditor(QtCore.QObject): else: self.tool_shape = self.app.plotcanvas.new_shape_collection(layers=1) else: - from flatcamGUI.PlotCanvasLegacy import ShapeCollectionLegacy + from AppGUI.PlotCanvasLegacy import ShapeCollectionLegacy 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') @@ -2312,7 +2312,7 @@ class FlatCAMExcEditor(QtCore.QObject): tool_dia = float('%.*f' % (self.decimals, v['C'])) self.tool2tooldia[int(k)] = tool_dia - # Init GUI + # Init AppGUI 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_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.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: slot_count = QtWidgets.QTableWidgetItem('%d' % slot_cnt) 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 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() - # 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) # Switch notebook to Selected page self.app.ui.notebook.setCurrentWidget(self.app.ui.selected_tab) @@ -3043,7 +3043,7 @@ class FlatCAMExcEditor(QtCore.QObject): 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) # 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): """ - Selects a drawing tool. Impacts the object and GUI. + Selects a drawing tool. Impacts the object and AppGUI. :param toolname: Name of the tool. :return: None diff --git a/flatcamEditors/FlatCAMGeoEditor.py b/AppEditors/FlatCAMGeoEditor.py similarity index 99% rename from flatcamEditors/FlatCAMGeoEditor.py rename to AppEditors/FlatCAMGeoEditor.py index 8c7055d8..4834cae8 100644 --- a/flatcamEditors/FlatCAMGeoEditor.py +++ b/AppEditors/FlatCAMGeoEditor.py @@ -15,11 +15,11 @@ from PyQt5 import QtGui, QtCore, QtWidgets from PyQt5.QtCore import Qt, QSettings from camlib import distance, arc, three_point_circle, Geometry, FlatCAMRTreeStorage -from FlatCAMTool import FlatCAMTool -from flatcamGUI.ObjectUI import RadioSet -from flatcamGUI.GUIElements import OptionalInputSection, FCCheckBox, FCEntry, FCComboBox, FCTextAreaRich, \ +from AppTool import FlatCAMTool +from AppGUI.ObjectUI import RadioSet +from AppGUI.GUIElements import OptionalInputSection, FCCheckBox, FCEntry, FCComboBox, FCTextAreaRich, \ 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.ops import cascaded_union, unary_union, linemerge @@ -34,7 +34,7 @@ from rtree import index as rtindex from copy import deepcopy # from vispy.io import read_png import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') @@ -118,7 +118,7 @@ class BufferSelectionTool(FlatCAMTool): self.buffer_int_button.clicked.connect(self.on_buffer_int) self.buffer_ext_button.clicked.connect(self.on_buffer_ext) - # Init GUI + # Init AppGUI self.buffer_distance_entry.set_value(0.01) def run(self): @@ -547,7 +547,7 @@ class PaintOptionsTool(FlatCAMTool): self.app.ui.notebook.setTabText(2, _("Paint Tool")) def set_tool_ui(self): - # Init GUI + # Init AppGUI if self.app.defaults["tools_painttooldia"]: self.painttooldia_entry.set_value(self.app.defaults["tools_painttooldia"]) else: @@ -3383,7 +3383,7 @@ class FlatCAMGeoEditor(QtCore.QObject): self.shapes = self.app.plotcanvas.new_shape_collection(layers=1) self.tool_shape = self.app.plotcanvas.new_shape_collection(layers=1) else: - from flatcamGUI.PlotCanvasLegacy import ShapeCollectionLegacy + from AppGUI.PlotCanvasLegacy import ShapeCollectionLegacy 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') @@ -3463,7 +3463,7 @@ class FlatCAMGeoEditor(QtCore.QObject): """ :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: """ try: @@ -3480,7 +3480,7 @@ class FlatCAMGeoEditor(QtCore.QObject): """ :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: """ if goption not in ['global_gridx', 'global_gridy']: @@ -3567,16 +3567,16 @@ class FlatCAMGeoEditor(QtCore.QObject): self.units = self.app.defaults['units'].upper() 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() - # 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) # Switch notebook to Selected page self.app.ui.notebook.setCurrentWidget(self.app.ui.selected_tab) 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: """ @@ -3683,7 +3683,7 @@ class FlatCAMGeoEditor(QtCore.QObject): self.item_selected.connect(self.on_geo_elem_selected) - # ## GUI Events + # ## AppGUI Events self.tw.itemSelectionChanged.connect(self.on_tree_selection_change) # self.tw.keyPressed.connect(self.app.ui.keyPressEvent) # self.tw.customContextMenuRequested.connect(self.on_menu_request) @@ -3746,7 +3746,7 @@ class FlatCAMGeoEditor(QtCore.QObject): pass try: - # ## GUI Events + # ## AppGUI Events self.tw.itemSelectionChanged.disconnect(self.on_tree_selection_change) # self.tw.keyPressed.connect(self.app.ui.keyPressEvent) # self.tw.customContextMenuRequested.connect(self.on_menu_request) @@ -4658,7 +4658,7 @@ class FlatCAMGeoEditor(QtCore.QObject): 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. :return: None diff --git a/flatcamEditors/FlatCAMGrbEditor.py b/AppEditors/FlatCAMGrbEditor.py similarity index 99% rename from flatcamEditors/FlatCAMGrbEditor.py rename to AppEditors/FlatCAMGrbEditor.py index bd330d40..b935d16a 100644 --- a/flatcamEditors/FlatCAMGrbEditor.py +++ b/AppEditors/FlatCAMGrbEditor.py @@ -20,9 +20,9 @@ from copy import copy, deepcopy import logging 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 -from FlatCAMTool import FlatCAMTool +from AppTool import FlatCAMTool import numpy as np from numpy.linalg import norm as numpy_norm @@ -32,7 +32,7 @@ import math # import pngcanvas import traceback import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins 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 self.toolbar_old_state = False - # Init GUI + # Init AppGUI self.apdim_lbl.hide() self.apdim_entry.hide() self.gerber_obj = None @@ -2967,7 +2967,7 @@ class FlatCAMGrbEditor(QtCore.QObject): self.tool_shape = self.canvas.new_shape_collection(layers=1) self.ma_annotation = self.canvas.new_text_group() else: - from flatcamGUI.PlotCanvasLegacy import ShapeCollectionLegacy + from AppGUI.PlotCanvasLegacy import ShapeCollectionLegacy 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.ma_annotation = ShapeCollectionLegacy( @@ -3139,7 +3139,7 @@ class FlatCAMGrbEditor(QtCore.QObject): tt_aperture = self.sorted_apcode[i] self.tid2apcode[i + 1] = tt_aperture - # Init GUI + # Init AppGUI 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"]) @@ -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 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() - # 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) # Switch notebook to Selected page self.app.ui.notebook.setCurrentWidget(self.app.ui.selected_tab) @@ -4039,7 +4039,7 @@ class FlatCAMGrbEditor(QtCore.QObject): # else: # raise 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) # # and add the first aperture to have something to play with # self.on_aperture_add('10') @@ -4186,7 +4186,7 @@ class FlatCAMGrbEditor(QtCore.QObject): def on_multiprocessing_finished(self): 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.build_ui(first_run=True) self.plot_all() @@ -4913,7 +4913,7 @@ class FlatCAMGrbEditor(QtCore.QObject): # def setup_ui_after_delayed_plot(self): # 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.plot_all() # @@ -5012,7 +5012,7 @@ class FlatCAMGrbEditor(QtCore.QObject): 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. :return: None diff --git a/flatcamEditors/FlatCAMTextEditor.py b/AppEditors/FlatCAMTextEditor.py similarity index 98% rename from flatcamEditors/FlatCAMTextEditor.py rename to AppEditors/FlatCAMTextEditor.py index 92641258..ee7eb7f3 100644 --- a/flatcamEditors/FlatCAMTextEditor.py +++ b/AppEditors/FlatCAMTextEditor.py @@ -5,7 +5,7 @@ # 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 reportlab.platypus import SimpleDocTemplate, Paragraph @@ -15,7 +15,7 @@ from reportlab.lib.units import inch, mm # from io import StringIO import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamEditors/__init__.py b/AppEditors/__init__.py similarity index 100% rename from flatcamEditors/__init__.py rename to AppEditors/__init__.py diff --git a/flatcamGUI/FlatCAMGUI.py b/AppGUI/FlatCAMGUI.py similarity index 98% rename from flatcamGUI/FlatCAMGUI.py rename to AppGUI/FlatCAMGUI.py index 1007ed92..202d5582 100644 --- a/flatcamGUI/FlatCAMGUI.py +++ b/AppGUI/FlatCAMGUI.py @@ -12,28 +12,28 @@ # ########################################################## import platform -from flatcamGUI.GUIElements import * -from flatcamGUI.preferences import settings -from flatcamGUI.preferences.cncjob.CNCJobPreferencesUI import CNCJobPreferencesUI -from flatcamGUI.preferences.excellon.ExcellonPreferencesUI import ExcellonPreferencesUI -from flatcamGUI.preferences.general.GeneralPreferencesUI import GeneralPreferencesUI -from flatcamGUI.preferences.geometry.GeometryPreferencesUI import GeometryPreferencesUI -from flatcamGUI.preferences.gerber.GerberPreferencesUI import GerberPreferencesUI -from flatcamEditors.FlatCAMGeoEditor import FCShapeTool +from AppGUI.GUIElements import * +from AppGUI.preferences import settings +from AppGUI.preferences.cncjob.CNCJobPreferencesUI import CNCJobPreferencesUI +from AppGUI.preferences.excellon.ExcellonPreferencesUI import ExcellonPreferencesUI +from AppGUI.preferences.general.GeneralPreferencesUI import GeneralPreferencesUI +from AppGUI.preferences.geometry.GeometryPreferencesUI import GeometryPreferencesUI +from AppGUI.preferences.gerber.GerberPreferencesUI import GerberPreferencesUI +from AppEditors.FlatCAMGeoEditor import FCShapeTool from matplotlib.backend_bases import KeyEvent as mpl_key_event import webbrowser -from flatcamGUI.preferences.tools.Tools2PreferencesUI import Tools2PreferencesUI -from flatcamGUI.preferences.tools.ToolsPreferencesUI import ToolsPreferencesUI -from flatcamGUI.preferences.utilities.UtilPreferencesUI import UtilPreferencesUI -from flatcamObjects.ObjectCollection import KeySensitiveListView +from AppGUI.preferences.tools.Tools2PreferencesUI import Tools2PreferencesUI +from AppGUI.preferences.tools.ToolsPreferencesUI import ToolsPreferencesUI +from AppGUI.preferences.utilities.UtilPreferencesUI import UtilPreferencesUI +from AppObjects.ObjectCollection import KeySensitiveListView import subprocess import os import sys import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') @@ -55,7 +55,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow): # 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")) # ######################################################################## - # ########################## Objects # ################################### + # ########################## AppObjects # ################################### # ######################################################################## - self.menuobjects = self.menu.addMenu(_('Objects')) + self.menuobjects = self.menu.addMenu(_('AppObjects')) self.menuobjects.addSeparator() self.menuobjects_selall = self.menuobjects.addAction( 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( QtGui.QIcon(self.app.resource_location + '/cutpath16.png'), _('Cut Path\tX')) # 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( QtGui.QIcon(self.app.resource_location + '/copy16.png'), _("Copy Geom\tC")) self.geo_delete_menuitem = self.geo_editor_menu.addAction( @@ -763,7 +763,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow): # ######################################################################## # 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. self.splitter = QtWidgets.QSplitter() self.setCentralWidget(self.splitter) @@ -912,7 +912,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow): self.dblsided_btn = self.toolbartools.addAction( QtGui.QIcon(self.app.resource_location + '/doubleside32.png'), _("2Sided Tool")) 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( 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")) self.geo_edit_toolbar.addSeparator() 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# ###################### @@ -1319,11 +1319,11 @@ class FlatCAMGUI(QtWidgets.QMainWindow): self.pref_tab_bottom_layout_1.addWidget(self.pref_open_button) # 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.setToolTip( - _("Clear the GUI settings for FlatCAM,\n" + _("Clear the AppGUI settings for FlatCAM,\n" "such as: layout, gui state, style, hdpi support etc.") ) @@ -1539,7 +1539,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow): # infobar.addWidget(self.progress_bar) # ######################################################################## - # ########################## SET GUI Elements # ########################## + # ########################## SET AppGUI Elements # ########################## # ######################################################################## self.app_icon = QtGui.QIcon() 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) # ######################################################################## - # ########################## Build GUI # ################################# + # ########################## Build AppGUI # ################################# # ######################################################################## self.grid_snap_btn.setCheckable(True) self.corner_snap_btn.setCheckable(True) @@ -1655,11 +1655,11 @@ class FlatCAMGUI(QtWidgets.QMainWindow): # restore the toolbar view self.restore_toolbar_view() - # restore the GUI geometry + # restore the AppGUI geometry self.restore_main_win_geom() # %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - # %%%%%%%%%%%%%%%%% GUI Building FINISHED %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + # %%%%%%%%%%%%%%%%% AppGUI Building FINISHED %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% # %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% # 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.splitter.setSizes([self.app.defaults["global_def_notebook_width"], 0]) 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): """ @@ -1776,8 +1776,8 @@ class FlatCAMGUI(QtWidgets.QMainWindow): resource_loc = self.app.resource_location msgbox = QtWidgets.QMessageBox() - msgbox.setText(_("Are you sure you want to delete the GUI Settings? \n")) - msgbox.setWindowTitle(_("Clear GUI Settings")) + msgbox.setText(_("Are you sure you want to delete the AppGUI Settings? \n")) + msgbox.setWindowTitle(_("Clear AppGUI Settings")) msgbox.setWindowIcon(QtGui.QIcon(resource_loc + '/trash32.png')) bt_yes = msgbox.addButton(_('Yes'), QtWidgets.QMessageBox.YesRole) bt_no = msgbox.addButton(_('No'), QtWidgets.QMessageBox.NoRole) @@ -1881,7 +1881,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow): self.dblsided_btn = self.toolbartools.addAction( QtGui.QIcon(self.app.resource_location + '/doubleside32.png'), _("2Sided Tool")) 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( 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( QtGui.QIcon(self.app.resource_location + '/cutpath32.png'), _('Cut Path')) 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( QtGui.QIcon(self.app.resource_location + '/trash32.png'), _("Delete Shape")) self.geo_transform_btn = self.geo_edit_toolbar.addAction( @@ -2004,7 +2004,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow): self.geo_edit_toolbar.addSeparator() 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 # ## @@ -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 if type(event) is int: key = event - # events from the GUI are of type QKeyEvent + # events from the AppGUI are of type QKeyEvent elif type(event) == QtGui.QKeyEvent: key = event.key() 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 if key == 'Delete': # Delete via the application to - # ensure cleanup of the GUI + # ensure cleanup of the AppGUI if active: active.app.on_delete() @@ -4010,7 +4010,7 @@ class ShortcutsTab(QtWidgets.QWidget): _("Skew on Y axis"), # 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"), _("Solder Paste Dispensing Tool"), _("Film PCB Tool"), _("Corner Markers Tool"), _("Non-Copper Clearing Tool"), _("Optimal Tool"), diff --git a/flatcamGUI/GUIElements.py b/AppGUI/GUIElements.py similarity index 99% rename from flatcamGUI/GUIElements.py rename to AppGUI/GUIElements.py index 660cc2f1..97fe2b6a 100644 --- a/flatcamGUI/GUIElements.py +++ b/AppGUI/GUIElements.py @@ -23,7 +23,7 @@ import html import sys import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins log = logging.getLogger('base') diff --git a/flatcamGUI/ObjectUI.py b/AppGUI/ObjectUI.py similarity index 99% rename from flatcamGUI/ObjectUI.py rename to AppGUI/ObjectUI.py index 6cdb71a7..59b5f139 100644 --- a/flatcamGUI/ObjectUI.py +++ b/AppGUI/ObjectUI.py @@ -11,11 +11,11 @@ # Date: 3/10/2019 # # ########################################################## -from flatcamGUI.GUIElements import * +from AppGUI.GUIElements import * import sys import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') @@ -1272,7 +1272,7 @@ class ExcellonObjectUI(ObjectUI): pp_excellon_label = QtWidgets.QLabel('%s:' % _("Preprocessor E")) pp_excellon_label.setToolTip( _("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.setFocusPolicy(QtCore.Qt.StrongFocus) @@ -1284,7 +1284,7 @@ class ExcellonObjectUI(ObjectUI): pp_geo_label = QtWidgets.QLabel('%s:' % _("Preprocessor G")) pp_geo_label.setToolTip( _("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.setFocusPolicy(QtCore.Qt.StrongFocus) @@ -2305,7 +2305,7 @@ class CNCObjectUI(ObjectUI): 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. """ @@ -2638,7 +2638,7 @@ class ScriptObjectUI(ObjectUI): 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. """ @@ -2705,7 +2705,7 @@ class DocumentObjectUI(ObjectUI): 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. """ diff --git a/flatcamGUI/PlotCanvas.py b/AppGUI/PlotCanvas.py similarity index 99% rename from flatcamGUI/PlotCanvas.py rename to AppGUI/PlotCanvas.py index 17916470..572ef50b 100644 --- a/flatcamGUI/PlotCanvas.py +++ b/AppGUI/PlotCanvas.py @@ -8,8 +8,8 @@ from PyQt5 import QtCore import logging -from flatcamGUI.VisPyCanvas import VisPyCanvas, Color -from flatcamGUI.VisPyVisuals import ShapeGroup, ShapeCollection, TextCollection, TextGroup, Cursor +from AppGUI.VisPyCanvas import VisPyCanvas, Color +from AppGUI.VisPyVisuals import ShapeGroup, ShapeCollection, TextCollection, TextGroup, Cursor from vispy.scene.visuals import InfiniteLine, Line, Rectangle, Text import numpy as np diff --git a/flatcamGUI/PlotCanvasLegacy.py b/AppGUI/PlotCanvasLegacy.py similarity index 99% rename from flatcamGUI/PlotCanvasLegacy.py rename to AppGUI/PlotCanvasLegacy.py index e8e287ce..429c5d2b 100644 --- a/flatcamGUI/PlotCanvasLegacy.py +++ b/AppGUI/PlotCanvasLegacy.py @@ -22,7 +22,7 @@ import logging import numpy as np import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins # Prevent conflict with Qt5 and above. diff --git a/flatcamGUI/VisPyCanvas.py b/AppGUI/VisPyCanvas.py similarity index 100% rename from flatcamGUI/VisPyCanvas.py rename to AppGUI/VisPyCanvas.py diff --git a/flatcamGUI/VisPyData/data/fonts/opensans-regular.ttf b/AppGUI/VisPyData/data/fonts/opensans-regular.ttf similarity index 100% rename from flatcamGUI/VisPyData/data/fonts/opensans-regular.ttf rename to AppGUI/VisPyData/data/fonts/opensans-regular.ttf diff --git a/flatcamGUI/VisPyData/data/freetype/freetype253.dll b/AppGUI/VisPyData/data/freetype/freetype253.dll similarity index 100% rename from flatcamGUI/VisPyData/data/freetype/freetype253.dll rename to AppGUI/VisPyData/data/freetype/freetype253.dll diff --git a/flatcamGUI/VisPyData/data/freetype/freetype253_x64.dll b/AppGUI/VisPyData/data/freetype/freetype253_x64.dll similarity index 100% rename from flatcamGUI/VisPyData/data/freetype/freetype253_x64.dll rename to AppGUI/VisPyData/data/freetype/freetype253_x64.dll diff --git a/flatcamGUI/VisPyPatches.py b/AppGUI/VisPyPatches.py similarity index 100% rename from flatcamGUI/VisPyPatches.py rename to AppGUI/VisPyPatches.py diff --git a/flatcamGUI/VisPyTesselators.py b/AppGUI/VisPyTesselators.py similarity index 100% rename from flatcamGUI/VisPyTesselators.py rename to AppGUI/VisPyTesselators.py diff --git a/flatcamGUI/VisPyVisuals.py b/AppGUI/VisPyVisuals.py similarity index 99% rename from flatcamGUI/VisPyVisuals.py rename to AppGUI/VisPyVisuals.py index 9cf81e54..3796f759 100644 --- a/flatcamGUI/VisPyVisuals.py +++ b/AppGUI/VisPyVisuals.py @@ -13,7 +13,7 @@ from vispy.color import Color from shapely.geometry import Polygon, LineString, LinearRing import threading import numpy as np -from flatcamGUI.VisPyTesselators import GLUTess +from AppGUI.VisPyTesselators import GLUTess class FlatCAMLineVisual(LineVisual): diff --git a/flatcamGUI/__init__.py b/AppGUI/__init__.py similarity index 100% rename from flatcamGUI/__init__.py rename to AppGUI/__init__.py diff --git a/flatcamGUI/preferences/OptionsGroupUI.py b/AppGUI/preferences/OptionsGroupUI.py similarity index 100% rename from flatcamGUI/preferences/OptionsGroupUI.py rename to AppGUI/preferences/OptionsGroupUI.py diff --git a/flatcamGUI/preferences/PreferencesUIManager.py b/AppGUI/preferences/PreferencesUIManager.py similarity index 99% rename from flatcamGUI/preferences/PreferencesUIManager.py rename to AppGUI/preferences/PreferencesUIManager.py index a9380243..99eda5d9 100644 --- a/flatcamGUI/preferences/PreferencesUIManager.py +++ b/AppGUI/preferences/PreferencesUIManager.py @@ -5,7 +5,7 @@ from defaults import FlatCAMDefaults import logging import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') @@ -30,7 +30,7 @@ class PreferencesUIManager: :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 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 @@ -73,7 +73,7 @@ class PreferencesUIManager: "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, - # General GUI Preferences + # General AppGUI Preferences "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_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_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_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, @@ -595,7 +595,7 @@ class PreferencesUIManager: 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 """ @@ -607,10 +607,10 @@ class PreferencesUIManager: 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. - :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 source_dict: the repository of options, usually is the self.defaults :return: None @@ -628,11 +628,11 @@ class PreferencesUIManager: """ 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 units: current FlatCAM measuring units :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 @@ -656,7 +656,7 @@ class PreferencesUIManager: def show_preferences_gui(self): """ - Called to initialize and show the Preferences GUI + Called to initialize and show the Preferences AppGUI :return: None """ @@ -734,7 +734,7 @@ class PreferencesUIManager: self.ui.pref_close_button.clicked.connect(self.on_pref_close_button) 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): # Init Gerber Plot Colors diff --git a/flatcamGUI/preferences/__init__.py b/AppGUI/preferences/__init__.py similarity index 79% rename from flatcamGUI/preferences/__init__.py rename to AppGUI/preferences/__init__.py index 620fbb59..193fef34 100644 --- a/flatcamGUI/preferences/__init__.py +++ b/AppGUI/preferences/__init__.py @@ -1,6 +1,6 @@ -from flatcamGUI.GUIElements import * +from AppGUI.GUIElements import * import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins diff --git a/flatcamGUI/preferences/cncjob/CNCJobAdvOptPrefGroupUI.py b/AppGUI/preferences/cncjob/CNCJobAdvOptPrefGroupUI.py similarity index 97% rename from flatcamGUI/preferences/cncjob/CNCJobAdvOptPrefGroupUI.py rename to AppGUI/preferences/cncjob/CNCJobAdvOptPrefGroupUI.py index 8d7a1cf0..f4809915 100644 --- a/flatcamGUI/preferences/cncjob/CNCJobAdvOptPrefGroupUI.py +++ b/AppGUI/preferences/cncjob/CNCJobAdvOptPrefGroupUI.py @@ -1,10 +1,10 @@ from PyQt5 import QtWidgets, QtGui, QtCore from PyQt5.QtCore import QSettings, Qt -from flatcamGUI.GUIElements import FCTextArea, FCCheckBox, FCComboBox, FCSpinner, FCEntry -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.GUIElements import FCTextArea, FCCheckBox, FCComboBox, FCSpinner, FCEntry +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/cncjob/CNCJobGenPrefGroupUI.py b/AppGUI/preferences/cncjob/CNCJobGenPrefGroupUI.py similarity index 98% rename from flatcamGUI/preferences/cncjob/CNCJobGenPrefGroupUI.py rename to AppGUI/preferences/cncjob/CNCJobGenPrefGroupUI.py index 66276e23..467b6330 100644 --- a/flatcamGUI/preferences/cncjob/CNCJobGenPrefGroupUI.py +++ b/AppGUI/preferences/cncjob/CNCJobGenPrefGroupUI.py @@ -1,10 +1,10 @@ from PyQt5 import QtWidgets, QtCore, QtGui from PyQt5.QtCore import QSettings -from flatcamGUI.GUIElements import FCCheckBox, RadioSet, FCSpinner, FCDoubleSpinner, FCEntry -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.GUIElements import FCCheckBox, RadioSet, FCSpinner, FCDoubleSpinner, FCEntry +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/cncjob/CNCJobOptPrefGroupUI.py b/AppGUI/preferences/cncjob/CNCJobOptPrefGroupUI.py similarity index 94% rename from flatcamGUI/preferences/cncjob/CNCJobOptPrefGroupUI.py rename to AppGUI/preferences/cncjob/CNCJobOptPrefGroupUI.py index c8eb7e66..5dab3cff 100644 --- a/flatcamGUI/preferences/cncjob/CNCJobOptPrefGroupUI.py +++ b/AppGUI/preferences/cncjob/CNCJobOptPrefGroupUI.py @@ -1,11 +1,11 @@ from PyQt5 import QtWidgets, QtGui from PyQt5.QtCore import QSettings -from flatcamGUI.GUIElements import FCTextArea -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.GUIElements import FCTextArea +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/cncjob/CNCJobPreferencesUI.py b/AppGUI/preferences/cncjob/CNCJobPreferencesUI.py similarity index 77% rename from flatcamGUI/preferences/cncjob/CNCJobPreferencesUI.py rename to AppGUI/preferences/cncjob/CNCJobPreferencesUI.py index cc9a7e32..79760423 100644 --- a/flatcamGUI/preferences/cncjob/CNCJobPreferencesUI.py +++ b/AppGUI/preferences/cncjob/CNCJobPreferencesUI.py @@ -1,8 +1,8 @@ from PyQt5 import QtWidgets -from flatcamGUI.preferences.cncjob.CNCJobAdvOptPrefGroupUI import CNCJobAdvOptPrefGroupUI -from flatcamGUI.preferences.cncjob.CNCJobOptPrefGroupUI import CNCJobOptPrefGroupUI -from flatcamGUI.preferences.cncjob.CNCJobGenPrefGroupUI import CNCJobGenPrefGroupUI +from AppGUI.preferences.cncjob.CNCJobAdvOptPrefGroupUI import CNCJobAdvOptPrefGroupUI +from AppGUI.preferences.cncjob.CNCJobOptPrefGroupUI import CNCJobOptPrefGroupUI +from AppGUI.preferences.cncjob.CNCJobGenPrefGroupUI import CNCJobGenPrefGroupUI class CNCJobPreferencesUI(QtWidgets.QWidget): diff --git a/flatcamGUI/preferences/cncjob/__init__.py b/AppGUI/preferences/cncjob/__init__.py similarity index 100% rename from flatcamGUI/preferences/cncjob/__init__.py rename to AppGUI/preferences/cncjob/__init__.py diff --git a/flatcamGUI/preferences/excellon/ExcellonAdvOptPrefGroupUI.py b/AppGUI/preferences/excellon/ExcellonAdvOptPrefGroupUI.py similarity index 96% rename from flatcamGUI/preferences/excellon/ExcellonAdvOptPrefGroupUI.py rename to AppGUI/preferences/excellon/ExcellonAdvOptPrefGroupUI.py index a63998f9..085ccbf1 100644 --- a/flatcamGUI/preferences/excellon/ExcellonAdvOptPrefGroupUI.py +++ b/AppGUI/preferences/excellon/ExcellonAdvOptPrefGroupUI.py @@ -1,10 +1,10 @@ from PyQt5 import QtWidgets from PyQt5.QtCore import QSettings -from flatcamGUI.GUIElements import FCDoubleSpinner, FCEntry, FloatEntry, RadioSet, FCCheckBox -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.GUIElements import FCDoubleSpinner, FCEntry, FloatEntry, RadioSet, FCCheckBox +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/excellon/ExcellonEditorPrefGroupUI.py b/AppGUI/preferences/excellon/ExcellonEditorPrefGroupUI.py similarity index 98% rename from flatcamGUI/preferences/excellon/ExcellonEditorPrefGroupUI.py rename to AppGUI/preferences/excellon/ExcellonEditorPrefGroupUI.py index 5b04cf2f..25f38aea 100644 --- a/flatcamGUI/preferences/excellon/ExcellonEditorPrefGroupUI.py +++ b/AppGUI/preferences/excellon/ExcellonEditorPrefGroupUI.py @@ -1,11 +1,11 @@ from PyQt5 import QtWidgets from PyQt5.QtCore import QSettings -from flatcamGUI.GUIElements import FCSpinner, FCDoubleSpinner, RadioSet -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.GUIElements import FCSpinner, FCDoubleSpinner, RadioSet +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/excellon/ExcellonExpPrefGroupUI.py b/AppGUI/preferences/excellon/ExcellonExpPrefGroupUI.py similarity index 97% rename from flatcamGUI/preferences/excellon/ExcellonExpPrefGroupUI.py rename to AppGUI/preferences/excellon/ExcellonExpPrefGroupUI.py index db2e922a..4cab1c6e 100644 --- a/flatcamGUI/preferences/excellon/ExcellonExpPrefGroupUI.py +++ b/AppGUI/preferences/excellon/ExcellonExpPrefGroupUI.py @@ -1,10 +1,10 @@ from PyQt5 import QtWidgets, QtCore from PyQt5.QtCore import QSettings -from flatcamGUI.GUIElements import RadioSet, FCSpinner -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.GUIElements import RadioSet, FCSpinner +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/excellon/ExcellonGenPrefGroupUI.py b/AppGUI/preferences/excellon/ExcellonGenPrefGroupUI.py similarity index 99% rename from flatcamGUI/preferences/excellon/ExcellonGenPrefGroupUI.py rename to AppGUI/preferences/excellon/ExcellonGenPrefGroupUI.py index 06d4dfc7..3471d7d5 100644 --- a/flatcamGUI/preferences/excellon/ExcellonGenPrefGroupUI.py +++ b/AppGUI/preferences/excellon/ExcellonGenPrefGroupUI.py @@ -3,10 +3,10 @@ import platform from PyQt5 import QtWidgets, QtCore, QtGui from PyQt5.QtCore import QSettings -from flatcamGUI.GUIElements import FCCheckBox, FCSpinner, RadioSet, FCEntry -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.GUIElements import FCCheckBox, FCSpinner, RadioSet, FCEntry +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/excellon/ExcellonOptPrefGroupUI.py b/AppGUI/preferences/excellon/ExcellonOptPrefGroupUI.py similarity index 97% rename from flatcamGUI/preferences/excellon/ExcellonOptPrefGroupUI.py rename to AppGUI/preferences/excellon/ExcellonOptPrefGroupUI.py index cdc6ce5e..757c9195 100644 --- a/flatcamGUI/preferences/excellon/ExcellonOptPrefGroupUI.py +++ b/AppGUI/preferences/excellon/ExcellonOptPrefGroupUI.py @@ -1,12 +1,12 @@ from PyQt5 import QtWidgets 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 -from flatcamGUI.preferences import machinist_setting -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.preferences import machinist_setting +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/excellon/ExcellonPreferencesUI.py b/AppGUI/preferences/excellon/ExcellonPreferencesUI.py similarity index 77% rename from flatcamGUI/preferences/excellon/ExcellonPreferencesUI.py rename to AppGUI/preferences/excellon/ExcellonPreferencesUI.py index b3d6d165..b62fb197 100644 --- a/flatcamGUI/preferences/excellon/ExcellonPreferencesUI.py +++ b/AppGUI/preferences/excellon/ExcellonPreferencesUI.py @@ -1,14 +1,14 @@ from PyQt5 import QtWidgets from PyQt5.QtCore import QSettings -from flatcamGUI.preferences.excellon.ExcellonEditorPrefGroupUI import ExcellonEditorPrefGroupUI -from flatcamGUI.preferences.excellon.ExcellonExpPrefGroupUI import ExcellonExpPrefGroupUI -from flatcamGUI.preferences.excellon.ExcellonAdvOptPrefGroupUI import ExcellonAdvOptPrefGroupUI -from flatcamGUI.preferences.excellon.ExcellonOptPrefGroupUI import ExcellonOptPrefGroupUI -from flatcamGUI.preferences.excellon.ExcellonGenPrefGroupUI import ExcellonGenPrefGroupUI +from AppGUI.preferences.excellon.ExcellonEditorPrefGroupUI import ExcellonEditorPrefGroupUI +from AppGUI.preferences.excellon.ExcellonExpPrefGroupUI import ExcellonExpPrefGroupUI +from AppGUI.preferences.excellon.ExcellonAdvOptPrefGroupUI import ExcellonAdvOptPrefGroupUI +from AppGUI.preferences.excellon.ExcellonOptPrefGroupUI import ExcellonOptPrefGroupUI +from AppGUI.preferences.excellon.ExcellonGenPrefGroupUI import ExcellonGenPrefGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/excellon/__init__.py b/AppGUI/preferences/excellon/__init__.py similarity index 100% rename from flatcamGUI/preferences/excellon/__init__.py rename to AppGUI/preferences/excellon/__init__.py diff --git a/flatcamGUI/preferences/general/GeneralAPPSetGroupUI.py b/AppGUI/preferences/general/GeneralAPPSetGroupUI.py similarity index 98% rename from flatcamGUI/preferences/general/GeneralAPPSetGroupUI.py rename to AppGUI/preferences/general/GeneralAPPSetGroupUI.py index 3b2964e6..a09820b9 100644 --- a/flatcamGUI/preferences/general/GeneralAPPSetGroupUI.py +++ b/AppGUI/preferences/general/GeneralAPPSetGroupUI.py @@ -1,13 +1,13 @@ from PyQt5 import QtCore, QtWidgets, QtGui 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 -from flatcamGUI.preferences import settings -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.preferences import settings +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins 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.setToolTip( _("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.") ) @@ -240,7 +240,7 @@ class GeneralAPPSetGroupUI(OptionsGroupUI): # TextBox Font Size self.textbox_font_size_label = QtWidgets.QLabel('%s:' % _('Textbox')) 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.") ) diff --git a/flatcamGUI/preferences/general/GeneralAppPrefGroupUI.py b/AppGUI/preferences/general/GeneralAppPrefGroupUI.py similarity index 98% rename from flatcamGUI/preferences/general/GeneralAppPrefGroupUI.py rename to AppGUI/preferences/general/GeneralAppPrefGroupUI.py index 2f7cb255..81d99b7d 100644 --- a/flatcamGUI/preferences/general/GeneralAppPrefGroupUI.py +++ b/AppGUI/preferences/general/GeneralAppPrefGroupUI.py @@ -3,12 +3,12 @@ import sys from PyQt5 import QtWidgets 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 -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/general/GeneralGUIPrefGroupUI.py b/AppGUI/preferences/general/GeneralGUIPrefGroupUI.py similarity index 98% rename from flatcamGUI/preferences/general/GeneralGUIPrefGroupUI.py rename to AppGUI/preferences/general/GeneralGUIPrefGroupUI.py index f9e86bf3..5d3a1eb6 100644 --- a/flatcamGUI/preferences/general/GeneralGUIPrefGroupUI.py +++ b/AppGUI/preferences/general/GeneralGUIPrefGroupUI.py @@ -1,11 +1,11 @@ from PyQt5 import QtWidgets, QtCore, QtGui from PyQt5.QtCore import QSettings, Qt -from flatcamGUI.GUIElements import RadioSet, FCCheckBox, FCButton, FCComboBox, FCEntry, FCSpinner -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.GUIElements import RadioSet, FCCheckBox, FCButton, FCComboBox, FCEntry, FCSpinner +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') @@ -23,7 +23,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI): def __init__(self, decimals=4, parent=None): super(GeneralGUIPrefGroupUI, self).__init__(self, parent=parent) - self.setTitle(str(_("GUI Preferences"))) + self.setTitle(str(_("AppGUI Preferences"))) self.decimals = decimals # Create a grid layout for the Application general settings @@ -382,7 +382,7 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI): self.layout.addStretch() # ############################################################################# - # ############################# GUI COLORS SIGNALS ############################ + # ############################# AppGUI COLORS SIGNALS ############################ # ############################################################################# # Setting selection (left - right) colors signals diff --git a/flatcamGUI/preferences/general/GeneralPreferencesUI.py b/AppGUI/preferences/general/GeneralPreferencesUI.py similarity index 80% rename from flatcamGUI/preferences/general/GeneralPreferencesUI.py rename to AppGUI/preferences/general/GeneralPreferencesUI.py index 46636438..45ccf191 100644 --- a/flatcamGUI/preferences/general/GeneralPreferencesUI.py +++ b/AppGUI/preferences/general/GeneralPreferencesUI.py @@ -1,12 +1,12 @@ from PyQt5 import QtWidgets from PyQt5.QtCore import QSettings -from flatcamGUI.preferences.general.GeneralAppPrefGroupUI import GeneralAppPrefGroupUI -from flatcamGUI.preferences.general.GeneralAPPSetGroupUI import GeneralAPPSetGroupUI -from flatcamGUI.preferences.general.GeneralGUIPrefGroupUI import GeneralGUIPrefGroupUI +from AppGUI.preferences.general.GeneralAppPrefGroupUI import GeneralAppPrefGroupUI +from AppGUI.preferences.general.GeneralAPPSetGroupUI import GeneralAPPSetGroupUI +from AppGUI.preferences.general.GeneralGUIPrefGroupUI import GeneralGUIPrefGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/general/__init__.py b/AppGUI/preferences/general/__init__.py similarity index 100% rename from flatcamGUI/preferences/general/__init__.py rename to AppGUI/preferences/general/__init__.py diff --git a/flatcamGUI/preferences/geometry/GeometryAdvOptPrefGroupUI.py b/AppGUI/preferences/geometry/GeometryAdvOptPrefGroupUI.py similarity index 97% rename from flatcamGUI/preferences/geometry/GeometryAdvOptPrefGroupUI.py rename to AppGUI/preferences/geometry/GeometryAdvOptPrefGroupUI.py index 7ade9b90..08326ee1 100644 --- a/flatcamGUI/preferences/geometry/GeometryAdvOptPrefGroupUI.py +++ b/AppGUI/preferences/geometry/GeometryAdvOptPrefGroupUI.py @@ -1,11 +1,11 @@ from PyQt5 import QtWidgets from PyQt5.QtCore import QSettings -from flatcamGUI.GUIElements import FCEntry, FloatEntry, FCDoubleSpinner, FCCheckBox, RadioSet, FCLabel -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.GUIElements import FCEntry, FloatEntry, FCDoubleSpinner, FCCheckBox, RadioSet, FCLabel +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/geometry/GeometryEditorPrefGroupUI.py b/AppGUI/preferences/geometry/GeometryEditorPrefGroupUI.py similarity index 93% rename from flatcamGUI/preferences/geometry/GeometryEditorPrefGroupUI.py rename to AppGUI/preferences/geometry/GeometryEditorPrefGroupUI.py index 9c5204ab..1ac42f42 100644 --- a/flatcamGUI/preferences/geometry/GeometryEditorPrefGroupUI.py +++ b/AppGUI/preferences/geometry/GeometryEditorPrefGroupUI.py @@ -1,11 +1,11 @@ from PyQt5 import QtWidgets from PyQt5.QtCore import QSettings -from flatcamGUI.GUIElements import FCSpinner, RadioSet -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.GUIElements import FCSpinner, RadioSet +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/geometry/GeometryGenPrefGroupUI.py b/AppGUI/preferences/geometry/GeometryGenPrefGroupUI.py similarity index 96% rename from flatcamGUI/preferences/geometry/GeometryGenPrefGroupUI.py rename to AppGUI/preferences/geometry/GeometryGenPrefGroupUI.py index 60479236..cf14c7ce 100644 --- a/flatcamGUI/preferences/geometry/GeometryGenPrefGroupUI.py +++ b/AppGUI/preferences/geometry/GeometryGenPrefGroupUI.py @@ -1,11 +1,11 @@ from PyQt5 import QtWidgets, QtCore, QtGui from PyQt5.QtCore import QSettings -from flatcamGUI.GUIElements import FCCheckBox, FCSpinner, FCEntry -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.GUIElements import FCCheckBox, FCSpinner, FCEntry +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/geometry/GeometryOptPrefGroupUI.py b/AppGUI/preferences/geometry/GeometryOptPrefGroupUI.py similarity index 97% rename from flatcamGUI/preferences/geometry/GeometryOptPrefGroupUI.py rename to AppGUI/preferences/geometry/GeometryOptPrefGroupUI.py index c2e0f6e2..f1e02bda 100644 --- a/flatcamGUI/preferences/geometry/GeometryOptPrefGroupUI.py +++ b/AppGUI/preferences/geometry/GeometryOptPrefGroupUI.py @@ -1,12 +1,12 @@ from PyQt5 import QtWidgets from PyQt5.QtCore import Qt, QSettings -from flatcamGUI.GUIElements import FCDoubleSpinner, FCCheckBox, OptionalInputSection, FCEntry, FCSpinner, FCComboBox -from flatcamGUI.preferences import machinist_setting -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.GUIElements import FCDoubleSpinner, FCCheckBox, OptionalInputSection, FCEntry, FCSpinner, FCComboBox +from AppGUI.preferences import machinist_setting +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/geometry/GeometryPreferencesUI.py b/AppGUI/preferences/geometry/GeometryPreferencesUI.py similarity index 77% rename from flatcamGUI/preferences/geometry/GeometryPreferencesUI.py rename to AppGUI/preferences/geometry/GeometryPreferencesUI.py index cf906d61..fd1709ef 100644 --- a/flatcamGUI/preferences/geometry/GeometryPreferencesUI.py +++ b/AppGUI/preferences/geometry/GeometryPreferencesUI.py @@ -1,13 +1,13 @@ from PyQt5 import QtWidgets from PyQt5.QtCore import QSettings -from flatcamGUI.preferences.geometry.GeometryEditorPrefGroupUI import GeometryEditorPrefGroupUI -from flatcamGUI.preferences.geometry.GeometryAdvOptPrefGroupUI import GeometryAdvOptPrefGroupUI -from flatcamGUI.preferences.geometry.GeometryOptPrefGroupUI import GeometryOptPrefGroupUI -from flatcamGUI.preferences.geometry.GeometryGenPrefGroupUI import GeometryGenPrefGroupUI +from AppGUI.preferences.geometry.GeometryEditorPrefGroupUI import GeometryEditorPrefGroupUI +from AppGUI.preferences.geometry.GeometryAdvOptPrefGroupUI import GeometryAdvOptPrefGroupUI +from AppGUI.preferences.geometry.GeometryOptPrefGroupUI import GeometryOptPrefGroupUI +from AppGUI.preferences.geometry.GeometryGenPrefGroupUI import GeometryGenPrefGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/geometry/__init__.py b/AppGUI/preferences/geometry/__init__.py similarity index 100% rename from flatcamGUI/preferences/geometry/__init__.py rename to AppGUI/preferences/geometry/__init__.py diff --git a/flatcamGUI/preferences/gerber/GerberAdvOptPrefGroupUI.py b/AppGUI/preferences/gerber/GerberAdvOptPrefGroupUI.py similarity index 97% rename from flatcamGUI/preferences/gerber/GerberAdvOptPrefGroupUI.py rename to AppGUI/preferences/gerber/GerberAdvOptPrefGroupUI.py index 20376bfd..f32604c9 100644 --- a/flatcamGUI/preferences/gerber/GerberAdvOptPrefGroupUI.py +++ b/AppGUI/preferences/gerber/GerberAdvOptPrefGroupUI.py @@ -1,11 +1,11 @@ from PyQt5 import QtWidgets from PyQt5.QtCore import QSettings -from flatcamGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner, FCSpinner, OptionalInputSection -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner, FCSpinner, OptionalInputSection +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/gerber/GerberEditorPrefGroupUI.py b/AppGUI/preferences/gerber/GerberEditorPrefGroupUI.py similarity index 97% rename from flatcamGUI/preferences/gerber/GerberEditorPrefGroupUI.py rename to AppGUI/preferences/gerber/GerberEditorPrefGroupUI.py index 3ba0da99..dd711a15 100644 --- a/flatcamGUI/preferences/gerber/GerberEditorPrefGroupUI.py +++ b/AppGUI/preferences/gerber/GerberEditorPrefGroupUI.py @@ -1,11 +1,11 @@ from PyQt5 import QtWidgets from PyQt5.QtCore import QSettings -from flatcamGUI.GUIElements import FCSpinner, FCDoubleSpinner, FCComboBox, FCEntry, RadioSet -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.GUIElements import FCSpinner, FCDoubleSpinner, FCComboBox, FCEntry, RadioSet +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/gerber/GerberExpPrefGroupUI.py b/AppGUI/preferences/gerber/GerberExpPrefGroupUI.py similarity index 96% rename from flatcamGUI/preferences/gerber/GerberExpPrefGroupUI.py rename to AppGUI/preferences/gerber/GerberExpPrefGroupUI.py index 01729dc5..edd41b45 100644 --- a/flatcamGUI/preferences/gerber/GerberExpPrefGroupUI.py +++ b/AppGUI/preferences/gerber/GerberExpPrefGroupUI.py @@ -1,11 +1,11 @@ from PyQt5 import QtWidgets, QtCore from PyQt5.QtCore import QSettings -from flatcamGUI.GUIElements import RadioSet, FCSpinner -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.GUIElements import RadioSet, FCSpinner +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/gerber/GerberGenPrefGroupUI.py b/AppGUI/preferences/gerber/GerberGenPrefGroupUI.py similarity index 98% rename from flatcamGUI/preferences/gerber/GerberGenPrefGroupUI.py rename to AppGUI/preferences/gerber/GerberGenPrefGroupUI.py index 6f52fe45..f20fc00e 100644 --- a/flatcamGUI/preferences/gerber/GerberGenPrefGroupUI.py +++ b/AppGUI/preferences/gerber/GerberGenPrefGroupUI.py @@ -1,11 +1,11 @@ from PyQt5 import QtWidgets, QtCore, QtGui from PyQt5.QtCore import QSettings -from flatcamGUI.GUIElements import FCCheckBox, FCSpinner, RadioSet, FCEntry -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.GUIElements import FCCheckBox, FCSpinner, RadioSet, FCEntry +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/gerber/GerberOptPrefGroupUI.py b/AppGUI/preferences/gerber/GerberOptPrefGroupUI.py similarity index 97% rename from flatcamGUI/preferences/gerber/GerberOptPrefGroupUI.py rename to AppGUI/preferences/gerber/GerberOptPrefGroupUI.py index 404f17ba..e3269322 100644 --- a/flatcamGUI/preferences/gerber/GerberOptPrefGroupUI.py +++ b/AppGUI/preferences/gerber/GerberOptPrefGroupUI.py @@ -1,11 +1,11 @@ from PyQt5 import QtWidgets from PyQt5.QtCore import QSettings -from flatcamGUI.GUIElements import FCDoubleSpinner, FCSpinner, RadioSet, FCCheckBox -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.GUIElements import FCDoubleSpinner, FCSpinner, RadioSet, FCCheckBox +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/gerber/GerberPreferencesUI.py b/AppGUI/preferences/gerber/GerberPreferencesUI.py similarity index 78% rename from flatcamGUI/preferences/gerber/GerberPreferencesUI.py rename to AppGUI/preferences/gerber/GerberPreferencesUI.py index f9d9f8aa..10c62978 100644 --- a/flatcamGUI/preferences/gerber/GerberPreferencesUI.py +++ b/AppGUI/preferences/gerber/GerberPreferencesUI.py @@ -1,14 +1,14 @@ from PyQt5 import QtWidgets from PyQt5.QtCore import QSettings -from flatcamGUI.preferences.gerber.GerberEditorPrefGroupUI import GerberEditorPrefGroupUI -from flatcamGUI.preferences.gerber.GerberExpPrefGroupUI import GerberExpPrefGroupUI -from flatcamGUI.preferences.gerber.GerberAdvOptPrefGroupUI import GerberAdvOptPrefGroupUI -from flatcamGUI.preferences.gerber.GerberOptPrefGroupUI import GerberOptPrefGroupUI -from flatcamGUI.preferences.gerber.GerberGenPrefGroupUI import GerberGenPrefGroupUI +from AppGUI.preferences.gerber.GerberEditorPrefGroupUI import GerberEditorPrefGroupUI +from AppGUI.preferences.gerber.GerberExpPrefGroupUI import GerberExpPrefGroupUI +from AppGUI.preferences.gerber.GerberAdvOptPrefGroupUI import GerberAdvOptPrefGroupUI +from AppGUI.preferences.gerber.GerberOptPrefGroupUI import GerberOptPrefGroupUI +from AppGUI.preferences.gerber.GerberGenPrefGroupUI import GerberGenPrefGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/gerber/__init__.py b/AppGUI/preferences/gerber/__init__.py similarity index 100% rename from flatcamGUI/preferences/gerber/__init__.py rename to AppGUI/preferences/gerber/__init__.py diff --git a/flatcamGUI/preferences/tools/Tools2CThievingPrefGroupUI.py b/AppGUI/preferences/tools/Tools2CThievingPrefGroupUI.py similarity index 98% rename from flatcamGUI/preferences/tools/Tools2CThievingPrefGroupUI.py rename to AppGUI/preferences/tools/Tools2CThievingPrefGroupUI.py index a3b6c0c2..7ec00a3c 100644 --- a/flatcamGUI/preferences/tools/Tools2CThievingPrefGroupUI.py +++ b/AppGUI/preferences/tools/Tools2CThievingPrefGroupUI.py @@ -1,11 +1,11 @@ from PyQt5 import QtWidgets from PyQt5.QtCore import QSettings -from flatcamGUI.GUIElements import FCSpinner, FCDoubleSpinner, RadioSet -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.GUIElements import FCSpinner, FCDoubleSpinner, RadioSet +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/tools/Tools2CalPrefGroupUI.py b/AppGUI/preferences/tools/Tools2CalPrefGroupUI.py similarity index 96% rename from flatcamGUI/preferences/tools/Tools2CalPrefGroupUI.py rename to AppGUI/preferences/tools/Tools2CalPrefGroupUI.py index 35b6fb1d..97100998 100644 --- a/flatcamGUI/preferences/tools/Tools2CalPrefGroupUI.py +++ b/AppGUI/preferences/tools/Tools2CalPrefGroupUI.py @@ -1,11 +1,11 @@ from PyQt5 import QtWidgets from PyQt5.QtCore import QSettings -from flatcamGUI.GUIElements import RadioSet, FCDoubleSpinner, FCCheckBox, FCEntry -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.GUIElements import RadioSet, FCDoubleSpinner, FCCheckBox, FCEntry +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/tools/Tools2EDrillsPrefGroupUI.py b/AppGUI/preferences/tools/Tools2EDrillsPrefGroupUI.py similarity index 97% rename from flatcamGUI/preferences/tools/Tools2EDrillsPrefGroupUI.py rename to AppGUI/preferences/tools/Tools2EDrillsPrefGroupUI.py index 89a104ea..410bb655 100644 --- a/flatcamGUI/preferences/tools/Tools2EDrillsPrefGroupUI.py +++ b/AppGUI/preferences/tools/Tools2EDrillsPrefGroupUI.py @@ -1,11 +1,11 @@ from PyQt5 import QtWidgets from PyQt5.QtCore import QSettings -from flatcamGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/tools/Tools2FiducialsPrefGroupUI.py b/AppGUI/preferences/tools/Tools2FiducialsPrefGroupUI.py similarity index 96% rename from flatcamGUI/preferences/tools/Tools2FiducialsPrefGroupUI.py rename to AppGUI/preferences/tools/Tools2FiducialsPrefGroupUI.py index 32b5fdfe..77ff939c 100644 --- a/flatcamGUI/preferences/tools/Tools2FiducialsPrefGroupUI.py +++ b/AppGUI/preferences/tools/Tools2FiducialsPrefGroupUI.py @@ -1,11 +1,11 @@ from PyQt5 import QtWidgets from PyQt5.QtCore import QSettings -from flatcamGUI.GUIElements import FCDoubleSpinner, RadioSet -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.GUIElements import FCDoubleSpinner, RadioSet +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/tools/Tools2InvertPrefGroupUI.py b/AppGUI/preferences/tools/Tools2InvertPrefGroupUI.py similarity index 93% rename from flatcamGUI/preferences/tools/Tools2InvertPrefGroupUI.py rename to AppGUI/preferences/tools/Tools2InvertPrefGroupUI.py index a063fb32..f7bb9f17 100644 --- a/flatcamGUI/preferences/tools/Tools2InvertPrefGroupUI.py +++ b/AppGUI/preferences/tools/Tools2InvertPrefGroupUI.py @@ -1,11 +1,11 @@ from PyQt5 import QtWidgets from PyQt5.QtCore import QSettings -from flatcamGUI.GUIElements import FCDoubleSpinner, RadioSet -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.GUIElements import FCDoubleSpinner, RadioSet +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/tools/Tools2OptimalPrefGroupUI.py b/AppGUI/preferences/tools/Tools2OptimalPrefGroupUI.py similarity index 91% rename from flatcamGUI/preferences/tools/Tools2OptimalPrefGroupUI.py rename to AppGUI/preferences/tools/Tools2OptimalPrefGroupUI.py index 283ddf2e..6524d439 100644 --- a/flatcamGUI/preferences/tools/Tools2OptimalPrefGroupUI.py +++ b/AppGUI/preferences/tools/Tools2OptimalPrefGroupUI.py @@ -1,11 +1,11 @@ from PyQt5 import QtWidgets from PyQt5.QtCore import QSettings -from flatcamGUI.GUIElements import FCSpinner -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.GUIElements import FCSpinner +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/tools/Tools2PreferencesUI.py b/AppGUI/preferences/tools/Tools2PreferencesUI.py similarity index 76% rename from flatcamGUI/preferences/tools/Tools2PreferencesUI.py rename to AppGUI/preferences/tools/Tools2PreferencesUI.py index 01ed4def..5101fc37 100644 --- a/flatcamGUI/preferences/tools/Tools2PreferencesUI.py +++ b/AppGUI/preferences/tools/Tools2PreferencesUI.py @@ -1,18 +1,18 @@ from PyQt5 import QtWidgets from PyQt5.QtCore import QSettings -from flatcamGUI.preferences.tools.Tools2InvertPrefGroupUI import Tools2InvertPrefGroupUI -from flatcamGUI.preferences.tools.Tools2PunchGerberPrefGroupUI import Tools2PunchGerberPrefGroupUI -from flatcamGUI.preferences.tools.Tools2EDrillsPrefGroupUI import Tools2EDrillsPrefGroupUI -from flatcamGUI.preferences.tools.Tools2CalPrefGroupUI import Tools2CalPrefGroupUI -from flatcamGUI.preferences.tools.Tools2FiducialsPrefGroupUI import Tools2FiducialsPrefGroupUI -from flatcamGUI.preferences.tools.Tools2CThievingPrefGroupUI import Tools2CThievingPrefGroupUI -from flatcamGUI.preferences.tools.Tools2QRCodePrefGroupUI import Tools2QRCodePrefGroupUI -from flatcamGUI.preferences.tools.Tools2OptimalPrefGroupUI import Tools2OptimalPrefGroupUI -from flatcamGUI.preferences.tools.Tools2RulesCheckPrefGroupUI import Tools2RulesCheckPrefGroupUI +from AppGUI.preferences.tools.Tools2InvertPrefGroupUI import Tools2InvertPrefGroupUI +from AppGUI.preferences.tools.Tools2PunchGerberPrefGroupUI import Tools2PunchGerberPrefGroupUI +from AppGUI.preferences.tools.Tools2EDrillsPrefGroupUI import Tools2EDrillsPrefGroupUI +from AppGUI.preferences.tools.Tools2CalPrefGroupUI import Tools2CalPrefGroupUI +from AppGUI.preferences.tools.Tools2FiducialsPrefGroupUI import Tools2FiducialsPrefGroupUI +from AppGUI.preferences.tools.Tools2CThievingPrefGroupUI import Tools2CThievingPrefGroupUI +from AppGUI.preferences.tools.Tools2QRCodePrefGroupUI import Tools2QRCodePrefGroupUI +from AppGUI.preferences.tools.Tools2OptimalPrefGroupUI import Tools2OptimalPrefGroupUI +from AppGUI.preferences.tools.Tools2RulesCheckPrefGroupUI import Tools2RulesCheckPrefGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/tools/Tools2PunchGerberPrefGroupUI.py b/AppGUI/preferences/tools/Tools2PunchGerberPrefGroupUI.py similarity index 97% rename from flatcamGUI/preferences/tools/Tools2PunchGerberPrefGroupUI.py rename to AppGUI/preferences/tools/Tools2PunchGerberPrefGroupUI.py index a9a3a304..073d4a68 100644 --- a/flatcamGUI/preferences/tools/Tools2PunchGerberPrefGroupUI.py +++ b/AppGUI/preferences/tools/Tools2PunchGerberPrefGroupUI.py @@ -1,11 +1,11 @@ from PyQt5 import QtWidgets from PyQt5.QtCore import QSettings -from flatcamGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.GUIElements import FCCheckBox, RadioSet, FCDoubleSpinner +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/tools/Tools2QRCodePrefGroupUI.py b/AppGUI/preferences/tools/Tools2QRCodePrefGroupUI.py similarity index 97% rename from flatcamGUI/preferences/tools/Tools2QRCodePrefGroupUI.py rename to AppGUI/preferences/tools/Tools2QRCodePrefGroupUI.py index 5c22863b..1a8a7794 100644 --- a/flatcamGUI/preferences/tools/Tools2QRCodePrefGroupUI.py +++ b/AppGUI/preferences/tools/Tools2QRCodePrefGroupUI.py @@ -1,11 +1,11 @@ from PyQt5 import QtWidgets, QtCore from PyQt5.QtCore import Qt, QSettings -from flatcamGUI.GUIElements import FCSpinner, RadioSet, FCTextArea, FCEntry -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.GUIElements import FCSpinner, RadioSet, FCTextArea, FCEntry +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/tools/Tools2RulesCheckPrefGroupUI.py b/AppGUI/preferences/tools/Tools2RulesCheckPrefGroupUI.py similarity index 98% rename from flatcamGUI/preferences/tools/Tools2RulesCheckPrefGroupUI.py rename to AppGUI/preferences/tools/Tools2RulesCheckPrefGroupUI.py index 4aba7caa..cc049d41 100644 --- a/flatcamGUI/preferences/tools/Tools2RulesCheckPrefGroupUI.py +++ b/AppGUI/preferences/tools/Tools2RulesCheckPrefGroupUI.py @@ -1,11 +1,11 @@ from PyQt5 import QtWidgets from PyQt5.QtCore import QSettings -from flatcamGUI.GUIElements import FCCheckBox, FCDoubleSpinner -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.GUIElements import FCCheckBox, FCDoubleSpinner +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/tools/Tools2sidedPrefGroupUI.py b/AppGUI/preferences/tools/Tools2sidedPrefGroupUI.py similarity index 95% rename from flatcamGUI/preferences/tools/Tools2sidedPrefGroupUI.py rename to AppGUI/preferences/tools/Tools2sidedPrefGroupUI.py index c7e17bc7..4f9174f8 100644 --- a/flatcamGUI/preferences/tools/Tools2sidedPrefGroupUI.py +++ b/AppGUI/preferences/tools/Tools2sidedPrefGroupUI.py @@ -1,11 +1,11 @@ from PyQt5 import QtWidgets from PyQt5.QtCore import QSettings -from flatcamGUI.GUIElements import FCDoubleSpinner, RadioSet -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.GUIElements import FCDoubleSpinner, RadioSet +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/tools/ToolsCalculatorsPrefGroupUI.py b/AppGUI/preferences/tools/ToolsCalculatorsPrefGroupUI.py similarity index 97% rename from flatcamGUI/preferences/tools/ToolsCalculatorsPrefGroupUI.py rename to AppGUI/preferences/tools/ToolsCalculatorsPrefGroupUI.py index df9a31fd..f1d8cec9 100644 --- a/flatcamGUI/preferences/tools/ToolsCalculatorsPrefGroupUI.py +++ b/AppGUI/preferences/tools/ToolsCalculatorsPrefGroupUI.py @@ -1,11 +1,11 @@ from PyQt5 import QtWidgets from PyQt5.QtCore import QSettings -from flatcamGUI.GUIElements import FCDoubleSpinner -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.GUIElements import FCDoubleSpinner +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/tools/ToolsCornersPrefGroupUI.py b/AppGUI/preferences/tools/ToolsCornersPrefGroupUI.py similarity index 94% rename from flatcamGUI/preferences/tools/ToolsCornersPrefGroupUI.py rename to AppGUI/preferences/tools/ToolsCornersPrefGroupUI.py index 738b9580..559eea86 100644 --- a/flatcamGUI/preferences/tools/ToolsCornersPrefGroupUI.py +++ b/AppGUI/preferences/tools/ToolsCornersPrefGroupUI.py @@ -1,11 +1,11 @@ from PyQt5 import QtWidgets from PyQt5.QtCore import QSettings -from flatcamGUI.GUIElements import FCDoubleSpinner -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.GUIElements import FCDoubleSpinner +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/tools/ToolsCutoutPrefGroupUI.py b/AppGUI/preferences/tools/ToolsCutoutPrefGroupUI.py similarity index 96% rename from flatcamGUI/preferences/tools/ToolsCutoutPrefGroupUI.py rename to AppGUI/preferences/tools/ToolsCutoutPrefGroupUI.py index 308c74c4..4e690474 100644 --- a/flatcamGUI/preferences/tools/ToolsCutoutPrefGroupUI.py +++ b/AppGUI/preferences/tools/ToolsCutoutPrefGroupUI.py @@ -1,12 +1,12 @@ from PyQt5 import QtWidgets from PyQt5.QtCore import QSettings -from flatcamGUI.GUIElements import FCDoubleSpinner, FCCheckBox, RadioSet, FCComboBox -from flatcamGUI.preferences import machinist_setting -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.GUIElements import FCDoubleSpinner, FCCheckBox, RadioSet, FCComboBox +from AppGUI.preferences import machinist_setting +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/tools/ToolsFilmPrefGroupUI.py b/AppGUI/preferences/tools/ToolsFilmPrefGroupUI.py similarity index 98% rename from flatcamGUI/preferences/tools/ToolsFilmPrefGroupUI.py rename to AppGUI/preferences/tools/ToolsFilmPrefGroupUI.py index 17e994c5..c1fb5e38 100644 --- a/flatcamGUI/preferences/tools/ToolsFilmPrefGroupUI.py +++ b/AppGUI/preferences/tools/ToolsFilmPrefGroupUI.py @@ -1,11 +1,11 @@ from PyQt5 import QtWidgets, QtCore from PyQt5.QtCore import Qt, QSettings -from flatcamGUI.GUIElements import RadioSet, FCEntry, FCDoubleSpinner, FCCheckBox, FCComboBox -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.GUIElements import RadioSet, FCEntry, FCDoubleSpinner, FCCheckBox, FCComboBox +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/tools/ToolsNCCPrefGroupUI.py b/AppGUI/preferences/tools/ToolsNCCPrefGroupUI.py similarity index 98% rename from flatcamGUI/preferences/tools/ToolsNCCPrefGroupUI.py rename to AppGUI/preferences/tools/ToolsNCCPrefGroupUI.py index 25fd24a4..bc64f83a 100644 --- a/flatcamGUI/preferences/tools/ToolsNCCPrefGroupUI.py +++ b/AppGUI/preferences/tools/ToolsNCCPrefGroupUI.py @@ -1,11 +1,11 @@ from PyQt5 import QtWidgets from PyQt5.QtCore import QSettings -from flatcamGUI.GUIElements import FCEntry, RadioSet, FCDoubleSpinner, FCComboBox, FCCheckBox -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.GUIElements import FCEntry, RadioSet, FCDoubleSpinner, FCComboBox, FCCheckBox +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/tools/ToolsPaintPrefGroupUI.py b/AppGUI/preferences/tools/ToolsPaintPrefGroupUI.py similarity index 98% rename from flatcamGUI/preferences/tools/ToolsPaintPrefGroupUI.py rename to AppGUI/preferences/tools/ToolsPaintPrefGroupUI.py index a86b270b..bac073df 100644 --- a/flatcamGUI/preferences/tools/ToolsPaintPrefGroupUI.py +++ b/AppGUI/preferences/tools/ToolsPaintPrefGroupUI.py @@ -1,11 +1,11 @@ from PyQt5 import QtWidgets from PyQt5.QtCore import QSettings -from flatcamGUI.GUIElements import FCEntry, RadioSet, FCDoubleSpinner, FCComboBox, FCCheckBox -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.GUIElements import FCEntry, RadioSet, FCDoubleSpinner, FCComboBox, FCCheckBox +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/tools/ToolsPanelizePrefGroupUI.py b/AppGUI/preferences/tools/ToolsPanelizePrefGroupUI.py similarity index 96% rename from flatcamGUI/preferences/tools/ToolsPanelizePrefGroupUI.py rename to AppGUI/preferences/tools/ToolsPanelizePrefGroupUI.py index df791742..f217ec00 100644 --- a/flatcamGUI/preferences/tools/ToolsPanelizePrefGroupUI.py +++ b/AppGUI/preferences/tools/ToolsPanelizePrefGroupUI.py @@ -1,11 +1,11 @@ from PyQt5 import QtWidgets from PyQt5.QtCore import QSettings -from flatcamGUI.GUIElements import FCDoubleSpinner, FCSpinner, RadioSet, FCCheckBox -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.GUIElements import FCDoubleSpinner, FCSpinner, RadioSet, FCCheckBox +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/tools/ToolsPreferencesUI.py b/AppGUI/preferences/tools/ToolsPreferencesUI.py similarity index 76% rename from flatcamGUI/preferences/tools/ToolsPreferencesUI.py rename to AppGUI/preferences/tools/ToolsPreferencesUI.py index 7a58dff2..ec445df8 100644 --- a/flatcamGUI/preferences/tools/ToolsPreferencesUI.py +++ b/AppGUI/preferences/tools/ToolsPreferencesUI.py @@ -1,20 +1,20 @@ from PyQt5 import QtWidgets from PyQt5.QtCore import QSettings -from flatcamGUI.preferences.tools.ToolsSubPrefGroupUI import ToolsSubPrefGroupUI -from flatcamGUI.preferences.tools.ToolsSolderpastePrefGroupUI import ToolsSolderpastePrefGroupUI -from flatcamGUI.preferences.tools.ToolsCornersPrefGroupUI import ToolsCornersPrefGroupUI -from flatcamGUI.preferences.tools.ToolsTransformPrefGroupUI import ToolsTransformPrefGroupUI -from flatcamGUI.preferences.tools.ToolsCalculatorsPrefGroupUI import ToolsCalculatorsPrefGroupUI -from flatcamGUI.preferences.tools.ToolsPanelizePrefGroupUI import ToolsPanelizePrefGroupUI -from flatcamGUI.preferences.tools.ToolsFilmPrefGroupUI import ToolsFilmPrefGroupUI -from flatcamGUI.preferences.tools.ToolsPaintPrefGroupUI import ToolsPaintPrefGroupUI -from flatcamGUI.preferences.tools.Tools2sidedPrefGroupUI import Tools2sidedPrefGroupUI -from flatcamGUI.preferences.tools.ToolsCutoutPrefGroupUI import ToolsCutoutPrefGroupUI -from flatcamGUI.preferences.tools.ToolsNCCPrefGroupUI import ToolsNCCPrefGroupUI +from AppGUI.preferences.tools.ToolsSubPrefGroupUI import ToolsSubPrefGroupUI +from AppGUI.preferences.tools.ToolsSolderpastePrefGroupUI import ToolsSolderpastePrefGroupUI +from AppGUI.preferences.tools.ToolsCornersPrefGroupUI import ToolsCornersPrefGroupUI +from AppGUI.preferences.tools.ToolsTransformPrefGroupUI import ToolsTransformPrefGroupUI +from AppGUI.preferences.tools.ToolsCalculatorsPrefGroupUI import ToolsCalculatorsPrefGroupUI +from AppGUI.preferences.tools.ToolsPanelizePrefGroupUI import ToolsPanelizePrefGroupUI +from AppGUI.preferences.tools.ToolsFilmPrefGroupUI import ToolsFilmPrefGroupUI +from AppGUI.preferences.tools.ToolsPaintPrefGroupUI import ToolsPaintPrefGroupUI +from AppGUI.preferences.tools.Tools2sidedPrefGroupUI import Tools2sidedPrefGroupUI +from AppGUI.preferences.tools.ToolsCutoutPrefGroupUI import ToolsCutoutPrefGroupUI +from AppGUI.preferences.tools.ToolsNCCPrefGroupUI import ToolsNCCPrefGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/tools/ToolsSolderpastePrefGroupUI.py b/AppGUI/preferences/tools/ToolsSolderpastePrefGroupUI.py similarity index 98% rename from flatcamGUI/preferences/tools/ToolsSolderpastePrefGroupUI.py rename to AppGUI/preferences/tools/ToolsSolderpastePrefGroupUI.py index c1f60821..c615fcb9 100644 --- a/flatcamGUI/preferences/tools/ToolsSolderpastePrefGroupUI.py +++ b/AppGUI/preferences/tools/ToolsSolderpastePrefGroupUI.py @@ -1,11 +1,11 @@ from PyQt5 import QtWidgets from PyQt5.QtCore import QSettings -from flatcamGUI.GUIElements import FCEntry, FCDoubleSpinner, FCSpinner, FCComboBox -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.GUIElements import FCEntry, FCDoubleSpinner, FCSpinner, FCComboBox +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/tools/ToolsSubPrefGroupUI.py b/AppGUI/preferences/tools/ToolsSubPrefGroupUI.py similarity index 88% rename from flatcamGUI/preferences/tools/ToolsSubPrefGroupUI.py rename to AppGUI/preferences/tools/ToolsSubPrefGroupUI.py index ff9430e1..2cc78d87 100644 --- a/flatcamGUI/preferences/tools/ToolsSubPrefGroupUI.py +++ b/AppGUI/preferences/tools/ToolsSubPrefGroupUI.py @@ -1,11 +1,11 @@ from PyQt5 import QtWidgets from PyQt5.QtCore import QSettings -from flatcamGUI.GUIElements import FCCheckBox -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.GUIElements import FCCheckBox +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/tools/ToolsTransformPrefGroupUI.py b/AppGUI/preferences/tools/ToolsTransformPrefGroupUI.py similarity index 98% rename from flatcamGUI/preferences/tools/ToolsTransformPrefGroupUI.py rename to AppGUI/preferences/tools/ToolsTransformPrefGroupUI.py index c3bffec1..58304a07 100644 --- a/flatcamGUI/preferences/tools/ToolsTransformPrefGroupUI.py +++ b/AppGUI/preferences/tools/ToolsTransformPrefGroupUI.py @@ -1,11 +1,11 @@ from PyQt5 import QtWidgets from PyQt5.QtCore import QSettings -from flatcamGUI.GUIElements import FCDoubleSpinner, FCCheckBox, FCEntry -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.GUIElements import FCDoubleSpinner, FCCheckBox, FCEntry +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/tools/__init__.py b/AppGUI/preferences/tools/__init__.py similarity index 100% rename from flatcamGUI/preferences/tools/__init__.py rename to AppGUI/preferences/tools/__init__.py diff --git a/flatcamGUI/preferences/utilities/AutoCompletePrefGroupUI.py b/AppGUI/preferences/utilities/AutoCompletePrefGroupUI.py similarity index 94% rename from flatcamGUI/preferences/utilities/AutoCompletePrefGroupUI.py rename to AppGUI/preferences/utilities/AutoCompletePrefGroupUI.py index fd138091..4f491f49 100644 --- a/flatcamGUI/preferences/utilities/AutoCompletePrefGroupUI.py +++ b/AppGUI/preferences/utilities/AutoCompletePrefGroupUI.py @@ -1,11 +1,11 @@ from PyQt5 import QtWidgets, QtGui from PyQt5.QtCore import QSettings -from flatcamGUI.GUIElements import FCButton, FCTextArea, FCEntry -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.GUIElements import FCButton, FCTextArea, FCEntry +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/utilities/FAExcPrefGroupUI.py b/AppGUI/preferences/utilities/FAExcPrefGroupUI.py similarity index 95% rename from flatcamGUI/preferences/utilities/FAExcPrefGroupUI.py rename to AppGUI/preferences/utilities/FAExcPrefGroupUI.py index 18a3b971..4cdd89f7 100644 --- a/flatcamGUI/preferences/utilities/FAExcPrefGroupUI.py +++ b/AppGUI/preferences/utilities/FAExcPrefGroupUI.py @@ -1,11 +1,11 @@ from PyQt5 import QtWidgets, QtGui from PyQt5.QtCore import QSettings -from flatcamGUI.GUIElements import VerticalScrollArea, FCButton, FCTextArea, FCEntry -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.GUIElements import VerticalScrollArea, FCButton, FCTextArea, FCEntry +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/utilities/FAGcoPrefGroupUI.py b/AppGUI/preferences/utilities/FAGcoPrefGroupUI.py similarity index 94% rename from flatcamGUI/preferences/utilities/FAGcoPrefGroupUI.py rename to AppGUI/preferences/utilities/FAGcoPrefGroupUI.py index 2ac1a1b9..9c367ed5 100644 --- a/flatcamGUI/preferences/utilities/FAGcoPrefGroupUI.py +++ b/AppGUI/preferences/utilities/FAGcoPrefGroupUI.py @@ -1,11 +1,11 @@ from PyQt5 import QtWidgets, QtGui from PyQt5.QtCore import QSettings -from flatcamGUI.GUIElements import FCButton, FCTextArea, FCEntry -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.GUIElements import FCButton, FCTextArea, FCEntry +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/utilities/FAGrbPrefGroupUI.py b/AppGUI/preferences/utilities/FAGrbPrefGroupUI.py similarity index 94% rename from flatcamGUI/preferences/utilities/FAGrbPrefGroupUI.py rename to AppGUI/preferences/utilities/FAGrbPrefGroupUI.py index 480fdb39..70e0aa78 100644 --- a/flatcamGUI/preferences/utilities/FAGrbPrefGroupUI.py +++ b/AppGUI/preferences/utilities/FAGrbPrefGroupUI.py @@ -1,11 +1,11 @@ from PyQt5 import QtWidgets, QtGui from PyQt5.QtCore import QSettings -from flatcamGUI.GUIElements import FCButton, FCTextArea, FCEntry -from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI +from AppGUI.GUIElements import FCButton, FCTextArea, FCEntry +from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamGUI/preferences/utilities/UtilPreferencesUI.py b/AppGUI/preferences/utilities/UtilPreferencesUI.py similarity index 76% rename from flatcamGUI/preferences/utilities/UtilPreferencesUI.py rename to AppGUI/preferences/utilities/UtilPreferencesUI.py index ae9e2110..e227c924 100644 --- a/flatcamGUI/preferences/utilities/UtilPreferencesUI.py +++ b/AppGUI/preferences/utilities/UtilPreferencesUI.py @@ -1,9 +1,9 @@ from PyQt5 import QtWidgets -from flatcamGUI.preferences.utilities.AutoCompletePrefGroupUI import AutoCompletePrefGroupUI -from flatcamGUI.preferences.utilities.FAGrbPrefGroupUI import FAGrbPrefGroupUI -from flatcamGUI.preferences.utilities.FAGcoPrefGroupUI import FAGcoPrefGroupUI -from flatcamGUI.preferences.utilities.FAExcPrefGroupUI import FAExcPrefGroupUI +from AppGUI.preferences.utilities.AutoCompletePrefGroupUI import AutoCompletePrefGroupUI +from AppGUI.preferences.utilities.FAGrbPrefGroupUI import FAGrbPrefGroupUI +from AppGUI.preferences.utilities.FAGcoPrefGroupUI import FAGcoPrefGroupUI +from AppGUI.preferences.utilities.FAExcPrefGroupUI import FAExcPrefGroupUI class UtilPreferencesUI(QtWidgets.QWidget): diff --git a/flatcamGUI/preferences/utilities/__init__.py b/AppGUI/preferences/utilities/__init__.py similarity index 100% rename from flatcamGUI/preferences/utilities/__init__.py rename to AppGUI/preferences/utilities/__init__.py diff --git a/flatcamObjects/FlatCAMCNCJob.py b/AppObjects/FlatCAMCNCJob.py similarity index 99% rename from flatcamObjects/FlatCAMCNCJob.py rename to AppObjects/FlatCAMCNCJob.py index b75ec21d..c8655168 100644 --- a/flatcamObjects/FlatCAMCNCJob.py +++ b/AppObjects/FlatCAMCNCJob.py @@ -14,8 +14,8 @@ from copy import deepcopy from io import StringIO from datetime import datetime -from flatcamEditors.FlatCAMTextEditor import TextEditor -from flatcamObjects.FlatCAMObj import * +from AppEditors.FlatCAMTextEditor import TextEditor +from AppObjects.FlatCAMObj import * from camlib import CNCjob @@ -24,7 +24,7 @@ import sys import math import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamObjects/FlatCAMDocument.py b/AppObjects/FlatCAMDocument.py similarity index 98% rename from flatcamObjects/FlatCAMDocument.py rename to AppObjects/FlatCAMDocument.py index ed1e8b56..c9aadca9 100644 --- a/flatcamObjects/FlatCAMDocument.py +++ b/AppObjects/FlatCAMDocument.py @@ -10,11 +10,11 @@ # File modified by: Marius Stanciu # # ########################################################## -from flatcamEditors.FlatCAMTextEditor import TextEditor -from flatcamObjects.FlatCAMObj import * +from AppEditors.FlatCAMTextEditor import TextEditor +from AppObjects.FlatCAMObj import * import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamObjects/FlatCAMExcellon.py b/AppObjects/FlatCAMExcellon.py similarity index 99% rename from flatcamObjects/FlatCAMExcellon.py rename to AppObjects/FlatCAMExcellon.py index 2e97db1e..ae800e18 100644 --- a/flatcamObjects/FlatCAMExcellon.py +++ b/AppObjects/FlatCAMExcellon.py @@ -15,13 +15,13 @@ from shapely.geometry import Point, LineString from copy import deepcopy -from flatcamParsers.ParseExcellon import Excellon -from flatcamObjects.FlatCAMObj import * +from AppParsers.ParseExcellon import Excellon +from AppObjects.FlatCAMObj import * import itertools import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins 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 - :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. :return: None """ @@ -389,7 +389,7 @@ class ExcellonObject(FlatCAMObj, Excellon): drill_count_item = QtWidgets.QTableWidgetItem('%d' % drill_cnt) 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_item = QtWidgets.QTableWidgetItem(slot_count_str) slot_count_item.setFlags(QtCore.Qt.ItemIsEnabled) @@ -855,7 +855,7 @@ class ExcellonObject(FlatCAMObj, Excellon): def form_to_storage(self): 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 self.ui_disconnect() @@ -910,7 +910,7 @@ class ExcellonObject(FlatCAMObj, Excellon): def get_selected_tools_list(self): """ 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. :rtype: list @@ -1778,7 +1778,7 @@ class ExcellonObject(FlatCAMObj, Excellon): def on_apply_param_to_all_clicked(self): 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.") return diff --git a/flatcamObjects/FlatCAMGeometry.py b/AppObjects/FlatCAMGeometry.py similarity index 99% rename from flatcamObjects/FlatCAMGeometry.py rename to AppObjects/FlatCAMGeometry.py index ae9992e0..b14f1f7e 100644 --- a/flatcamObjects/FlatCAMGeometry.py +++ b/AppObjects/FlatCAMGeometry.py @@ -15,7 +15,7 @@ import shapely.affinity as affinity from camlib import Geometry -from flatcamObjects.FlatCAMObj import * +from AppObjects.FlatCAMObj import * import ezdxf import math @@ -24,7 +24,7 @@ from copy import deepcopy import traceback import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') @@ -931,7 +931,7 @@ class GeometryObject(FlatCAMObj, Geometry): self.ui_connect() 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: self.ui.geo_param_frame.setDisabled(False) @@ -1007,7 +1007,7 @@ class GeometryObject(FlatCAMObj, Geometry): self.ui_connect() 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: self.ui.geo_param_frame.setDisabled(False) @@ -1188,7 +1188,7 @@ class GeometryObject(FlatCAMObj, Geometry): obj_active.options['xmax'] = 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: self.ui.geo_param_frame.setDisabled(True) @@ -1320,7 +1320,7 @@ class GeometryObject(FlatCAMObj, Geometry): def on_apply_param_to_all_clicked(self): 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.") return @@ -1383,7 +1383,7 @@ class GeometryObject(FlatCAMObj, Geometry): def gui_form_to_storage(self): 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.") return @@ -1748,7 +1748,7 @@ class GeometryObject(FlatCAMObj, Geometry): :param tools_dict: a dictionary that holds the whole data needed to create the Gcode (including the solid_geometry) :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 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 @@ -2738,7 +2738,7 @@ class GeometryObject(FlatCAMObj, Geometry): """ 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 multigeo: if the merged geometry objects are of type MultiGeo :return: None diff --git a/flatcamObjects/FlatCAMGerber.py b/AppObjects/FlatCAMGerber.py similarity index 99% rename from flatcamObjects/FlatCAMGerber.py rename to AppObjects/FlatCAMGerber.py index e3c80f71..7e1f64ab 100644 --- a/flatcamObjects/FlatCAMGerber.py +++ b/AppObjects/FlatCAMGerber.py @@ -14,15 +14,15 @@ from shapely.geometry import Point, Polygon, MultiPolygon, MultiLineString, LineString, LinearRing from shapely.ops import cascaded_union -from flatcamParsers.ParseGerber import Gerber -from flatcamObjects.FlatCAMObj import * +from AppParsers.ParseGerber import Gerber +from AppObjects.FlatCAMObj import * import math import numpy as np from copy import deepcopy import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') @@ -45,7 +45,7 @@ class GerberObject(FlatCAMObj, Gerber): Merges the geometry of objects in geo_list into 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. :return: None """ @@ -179,10 +179,10 @@ class GerberObject(FlatCAMObj, Gerber): def set_ui(self, ui): """ - Maps options with GUI inputs. - Connects GUI events to methods. + Maps options with AppGUI inputs. + Connects AppGUI events to methods. - :param ui: GUI object. + :param ui: AppGUI object. :type ui: GerberObjectUI :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.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']) # Show/Hide Advanced Options diff --git a/flatcamObjects/FlatCAMObj.py b/AppObjects/FlatCAMObj.py similarity index 98% rename from flatcamObjects/FlatCAMObj.py rename to AppObjects/FlatCAMObj.py index 22a12117..fda1a0c7 100644 --- a/flatcamObjects/FlatCAMObj.py +++ b/AppObjects/FlatCAMObj.py @@ -12,15 +12,15 @@ import inspect # TODO: For debugging only. -from flatcamGUI.ObjectUI import * +from AppGUI.ObjectUI import * -from FlatCAMCommon import LoudDict -from flatcamGUI.PlotCanvasLegacy import ShapeCollectionLegacy +from Common import LoudDict +from AppGUI.PlotCanvasLegacy import ShapeCollectionLegacy import sys import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') @@ -43,7 +43,7 @@ class ValidationError(Exception): class FlatCAMObj(QtCore.QObject): """ 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. """ diff --git a/flatcamObjects/FlatCAMScript.py b/AppObjects/FlatCAMScript.py similarity index 98% rename from flatcamObjects/FlatCAMScript.py rename to AppObjects/FlatCAMScript.py index e17df4d9..93892715 100644 --- a/flatcamObjects/FlatCAMScript.py +++ b/AppObjects/FlatCAMScript.py @@ -10,16 +10,16 @@ # File modified by: Marius Stanciu # # ########################################################## -from flatcamEditors.FlatCAMTextEditor import TextEditor -from flatcamObjects.FlatCAMObj import * -from flatcamGUI.ObjectUI import * +from AppEditors.FlatCAMTextEditor import TextEditor +from AppObjects.FlatCAMObj import * +from AppGUI.ObjectUI import * import tkinter as tk import sys from copy import deepcopy import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamObjects/ObjectCollection.py b/AppObjects/ObjectCollection.py similarity index 98% rename from flatcamObjects/ObjectCollection.py rename to AppObjects/ObjectCollection.py index 556728a0..60fc7d09 100644 --- a/flatcamObjects/ObjectCollection.py +++ b/AppObjects/ObjectCollection.py @@ -16,13 +16,13 @@ from PyQt5.QtCore import Qt, QSettings from PyQt5.QtGui import QColor # from PyQt5.QtCore import QModelIndex -from flatcamObjects.FlatCAMObj import FlatCAMObj -from flatcamObjects.FlatCAMCNCJob import CNCJobObject -from flatcamObjects.FlatCAMDocument import DocumentObject -from flatcamObjects.FlatCAMExcellon import ExcellonObject -from flatcamObjects.FlatCAMGeometry import GeometryObject -from flatcamObjects.FlatCAMGerber import GerberObject -from flatcamObjects.FlatCAMScript import ScriptObject +from AppObjects.FlatCAMObj import FlatCAMObj +from AppObjects.FlatCAMCNCJob import CNCJobObject +from AppObjects.FlatCAMDocument import DocumentObject +from AppObjects.FlatCAMExcellon import ExcellonObject +from AppObjects.FlatCAMGeometry import GeometryObject +from AppObjects.FlatCAMGerber import GerberObject +from AppObjects.FlatCAMScript import ScriptObject import inspect # TODO: Remove @@ -32,7 +32,7 @@ from copy import deepcopy from numpy import Inf import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') @@ -55,7 +55,7 @@ class KeySensitiveListView(QtWidgets.QTreeView): # self.setRootIsDecorated(False) # self.setExpandsOnDoubleClick(False) - # Enable dragging and dropping onto the GUI + # Enable dragging and dropping onto the AppGUI self.setAcceptDrops(True) self.filename = "" self.app = app @@ -324,7 +324,7 @@ class ObjectCollection(QtCore.QAbstractItemModel): font.setFamily("Seagoe UI") self.view.setFont(font) - # ## GUI Events + # ## AppGUI Events self.view.selectionModel().selectionChanged.connect(self.on_list_selection_change) # self.view.activated.connect(self.on_item_activated) self.view.keyPressed.connect(self.app.ui.keyPressEvent) diff --git a/flatcamObjects/__init__.py b/AppObjects/__init__.py similarity index 100% rename from flatcamObjects/__init__.py rename to AppObjects/__init__.py diff --git a/flatcamParsers/ParseDXF.py b/AppParsers/ParseDXF.py similarity index 99% rename from flatcamParsers/ParseDXF.py rename to AppParsers/ParseDXF.py index d3d482fd..698e87b8 100644 --- a/flatcamParsers/ParseDXF.py +++ b/AppParsers/ParseDXF.py @@ -12,8 +12,8 @@ import logging log = logging.getLogger('base2') -from flatcamParsers.ParseFont import * -from flatcamParsers.ParseDXF_Spline import * +from AppParsers.ParseFont import * +from AppParsers.ParseDXF_Spline import * def distance(pt1, pt2): diff --git a/flatcamParsers/ParseDXF_Spline.py b/AppParsers/ParseDXF_Spline.py similarity index 100% rename from flatcamParsers/ParseDXF_Spline.py rename to AppParsers/ParseDXF_Spline.py diff --git a/flatcamParsers/ParseExcellon.py b/AppParsers/ParseExcellon.py similarity index 98% rename from flatcamParsers/ParseExcellon.py rename to AppParsers/ParseExcellon.py index 07930005..f350ba28 100644 --- a/flatcamParsers/ParseExcellon.py +++ b/AppParsers/ParseExcellon.py @@ -17,8 +17,8 @@ import logging import traceback from copy import deepcopy -import FlatCAMTranslation as fcTranslate -from FlatCAMCommon import GracefulException as grace +import AppTranslation as fcTranslate +from Common import GracefulException as grace import gettext import builtins @@ -967,7 +967,7 @@ class Excellon(Geometry): :return: None """ - log.debug("flatcamParsers.ParseExcellon.Excellon.create_geometry()") + log.debug("AppParsers.ParseExcellon.Excellon.create_geometry()") self.solid_geometry = [] try: # clear the solid_geometry in self.tools @@ -982,7 +982,7 @@ class Excellon(Geometry): _("Excellon.create_geometry() -> a drill location was skipped " "due of not having a tool associated.\n" "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") continue 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]['data'] = deepcopy(self.default_data) 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)) return "fail" @@ -1018,10 +1018,10 @@ class Excellon(Geometry): :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: - log.debug("flatcamParsers.ParseExcellon.Excellon -> solid_geometry is None") + log.debug("AppParsers.ParseExcellon.Excellon -> solid_geometry is None") return 0, 0, 0, 0 def bounds_rec(obj): @@ -1092,7 +1092,7 @@ class Excellon(Geometry): else: log.error("Unsupported units: %s" % str(obj_units)) 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.scale(factor, factor) @@ -1118,7 +1118,7 @@ class Excellon(Geometry): :return: None :rtype: None """ - log.debug("flatcamParsers.ParseExcellon.Excellon.scale()") + log.debug("AppParsers.ParseExcellon.Excellon.scale()") if yfactor is None: yfactor = xfactor @@ -1183,7 +1183,7 @@ class Excellon(Geometry): :type vect: tuple :return: None """ - log.debug("flatcamParsers.ParseExcellon.Excellon.offset()") + log.debug("AppParsers.ParseExcellon.Excellon.offset()") dx, dy = vect @@ -1243,7 +1243,7 @@ class Excellon(Geometry): :type point: list :return: None """ - log.debug("flatcamParsers.ParseExcellon.Excellon.mirror()") + log.debug("AppParsers.ParseExcellon.Excellon.mirror()") px, py = point 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: 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: angle_x = 0.0 @@ -1396,7 +1396,7 @@ class Excellon(Geometry): :param point: tuple of coordinates (x, y) :return: None """ - log.debug("flatcamParsers.ParseExcellon.Excellon.rotate()") + log.debug("AppParsers.ParseExcellon.Excellon.rotate()") if angle == 0: return @@ -1479,7 +1479,7 @@ class Excellon(Geometry): :param join: The type of line joint used by the shapely buffer method: round, square, bevel :return: None """ - log.debug("flatcamParsers.ParseExcellon.Excellon.buffer()") + log.debug("AppParsers.ParseExcellon.Excellon.buffer()") if distance == 0: return diff --git a/flatcamParsers/ParseFont.py b/AppParsers/ParseFont.py similarity index 99% rename from flatcamParsers/ParseFont.py rename to AppParsers/ParseFont.py index cb09a862..7fa2b0d0 100644 --- a/flatcamParsers/ParseFont.py +++ b/AppParsers/ParseFont.py @@ -22,7 +22,7 @@ from fontTools import ttLib import logging import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamParsers/ParseGerber.py b/AppParsers/ParseGerber.py similarity index 99% rename from flatcamParsers/ParseGerber.py rename to AppParsers/ParseGerber.py index 57ba4d49..e3e26e4e 100644 --- a/flatcamParsers/ParseGerber.py +++ b/AppParsers/ParseGerber.py @@ -14,9 +14,9 @@ import shapely.affinity as affinity from shapely.geometry import box as shply_box, Polygon, LineString, Point, MultiPolygon from lxml import etree as ET -from flatcamParsers.ParseSVG import svgparselength, getsvggeo -from FlatCAMCommon import GracefulException as grace -import FlatCAMTranslation as fcTranslate +from AppParsers.ParseSVG import svgparselength, getsvggeo +from Common import GracefulException as grace +import AppTranslation as fcTranslate import gettext import builtins @@ -1416,7 +1416,7 @@ class Gerber(Geometry): # ######### Line did not match any pattern. Warn user. ########## # ################################################################ 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() try: @@ -1763,7 +1763,7 @@ class Gerber(Geometry): :return: None """ - log.debug("flatcamParsers.ParseGerber.Gerber.import_svg()") + log.debug("AppParsers.ParseGerber.Gerber.import_svg()") # Parse into list of shapely objects svg_tree = ET.parse(filename) @@ -2389,7 +2389,7 @@ class Gerber(Geometry): geo_p = shply_box(minx, miny, maxx, maxy) new_geo_el['solid'] = geo_p else: - log.debug("flatcamParsers.ParseGerber.Gerber.buffer() --> " + log.debug("AppParsers.ParseGerber.Gerber.buffer() --> " "ap type not supported") else: new_geo_el['solid'] = geo_el['follow'].buffer( diff --git a/flatcamParsers/ParseHPGL2.py b/AppParsers/ParseHPGL2.py similarity index 99% rename from flatcamParsers/ParseHPGL2.py rename to AppParsers/ParseHPGL2.py index a90a3184..e9eafac5 100644 --- a/flatcamParsers/ParseHPGL2.py +++ b/AppParsers/ParseHPGL2.py @@ -18,8 +18,8 @@ import sys from shapely.ops import unary_union from shapely.geometry import LineString, Point -from FlatCAMCommon import GracefulException as grace -import FlatCAMTranslation as fcTranslate +from Common import GracefulException as grace +import AppTranslation as fcTranslate import gettext import builtins diff --git a/flatcamParsers/ParsePDF.py b/AppParsers/ParsePDF.py similarity index 99% rename from flatcamParsers/ParsePDF.py rename to AppParsers/ParsePDF.py index e7f189f3..a6d282e8 100644 --- a/flatcamParsers/ParsePDF.py +++ b/AppParsers/ParsePDF.py @@ -7,7 +7,7 @@ from PyQt5 import QtCore -from FlatCAMCommon import GracefulException as grace +from Common import GracefulException as grace from shapely.geometry import Polygon, LineString, MultiPolygon diff --git a/flatcamParsers/ParseSVG.py b/AppParsers/ParseSVG.py similarity index 99% rename from flatcamParsers/ParseSVG.py rename to AppParsers/ParseSVG.py index a36e4770..713d50f1 100644 --- a/flatcamParsers/ParseSVG.py +++ b/AppParsers/ParseSVG.py @@ -27,7 +27,7 @@ from shapely.geometry import LineString, LinearRing, MultiLineString from shapely.affinity import skew, affine_transform, rotate import numpy as np -from flatcamParsers.ParseFont import * +from AppParsers.ParseFont import * log = logging.getLogger('base2') diff --git a/flatcamParsers/__init__.py b/AppParsers/__init__.py similarity index 100% rename from flatcamParsers/__init__.py rename to AppParsers/__init__.py diff --git a/FlatCAMPool.py b/AppPool.py similarity index 100% rename from FlatCAMPool.py rename to AppPool.py diff --git a/FlatCAMPostProc.py b/AppPreProcessor.py similarity index 100% rename from FlatCAMPostProc.py rename to AppPreProcessor.py diff --git a/FlatCAMProcess.py b/AppProcess.py similarity index 98% rename from FlatCAMProcess.py rename to AppProcess.py index c74d27bf..313e8581 100644 --- a/FlatCAMProcess.py +++ b/AppProcess.py @@ -6,12 +6,12 @@ # MIT Licence # # ########################################################## -from flatcamGUI.GUIElements import FlatCAMActivityView +from AppGUI.GUIElements import FlatCAMActivityView from PyQt5 import QtCore import weakref import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/FlatCAMTool.py b/AppTool.py similarity index 98% rename from FlatCAMTool.py rename to AppTool.py index 470a484a..9eb30c3c 100644 --- a/FlatCAMTool.py +++ b/AppTool.py @@ -12,7 +12,7 @@ from PyQt5.QtCore import Qt from shapely.geometry import Polygon, LineString import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') @@ -87,10 +87,10 @@ class FlatCAMTool(QtWidgets.QWidget): if self.app.tool_tab_locked is True: return - # Remove anything else in the GUI + # Remove anything else in the AppGUI self.app.ui.tool_scroll_area.takeWidget() - # Put ourself in the GUI + # Put ourself in the AppGUI self.app.ui.tool_scroll_area.setWidget(self) # Switch notebook to tool page diff --git a/flatcamTools/ToolAlignObjects.py b/AppTools/ToolAlignObjects.py similarity index 99% rename from flatcamTools/ToolAlignObjects.py rename to AppTools/ToolAlignObjects.py index 33b9611c..af593211 100644 --- a/flatcamTools/ToolAlignObjects.py +++ b/AppTools/ToolAlignObjects.py @@ -6,9 +6,9 @@ # ########################################################## from PyQt5 import QtWidgets, QtGui, QtCore -from FlatCAMTool import FlatCAMTool +from AppTool import FlatCAMTool -from flatcamGUI.GUIElements import FCComboBox, RadioSet +from AppGUI.GUIElements import FCComboBox, RadioSet import math @@ -16,7 +16,7 @@ from shapely.geometry import Point from shapely.affinity import translate import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins import logging @@ -29,7 +29,7 @@ log = logging.getLogger('base') class AlignObjects(FlatCAMTool): - toolName = _("Align Objects") + toolName = _("Align AppObjects") def __init__(self, app): FlatCAMTool.__init__(self, app) diff --git a/flatcamTools/ToolCalculators.py b/AppTools/ToolCalculators.py similarity index 99% rename from flatcamTools/ToolCalculators.py rename to AppTools/ToolCalculators.py index 4b1bbbb1..064ec784 100644 --- a/flatcamTools/ToolCalculators.py +++ b/AppTools/ToolCalculators.py @@ -6,12 +6,12 @@ # ########################################################## from PyQt5 import QtWidgets -from FlatCAMTool import FlatCAMTool -from flatcamGUI.GUIElements import FCSpinner, FCDoubleSpinner, FCEntry +from AppTool import FlatCAMTool +from AppGUI.GUIElements import FCSpinner, FCDoubleSpinner, FCEntry import math import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamTools/ToolCalibration.py b/AppTools/ToolCalibration.py similarity index 99% rename from flatcamTools/ToolCalibration.py rename to AppTools/ToolCalibration.py index c1e6b14d..05a51df7 100644 --- a/flatcamTools/ToolCalibration.py +++ b/AppTools/ToolCalibration.py @@ -7,10 +7,10 @@ from PyQt5 import QtWidgets, QtCore, QtGui -from FlatCAMTool import FlatCAMTool -from flatcamGUI.GUIElements import FCDoubleSpinner, EvalEntry, FCCheckBox, OptionalInputSection, FCEntry -from flatcamGUI.GUIElements import FCTable, FCComboBox, RadioSet -from flatcamEditors.FlatCAMTextEditor import TextEditor +from AppTool import FlatCAMTool +from AppGUI.GUIElements import FCDoubleSpinner, EvalEntry, FCCheckBox, OptionalInputSection, FCEntry +from AppGUI.GUIElements import FCTable, FCComboBox, RadioSet +from AppEditors.FlatCAMTextEditor import TextEditor from shapely.geometry import Point from shapely.geometry.base import * @@ -22,7 +22,7 @@ import logging from copy import deepcopy import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') @@ -620,7 +620,7 @@ class ToolCalibration(FlatCAMTool): grid_lay.addWidget(QtWidgets.QLabel(''), 44, 0, 1, 3) # STEP 5 # - step_5 = QtWidgets.QLabel('%s' % _("STEP 5: Calibrate FlatCAM Objects")) + step_5 = QtWidgets.QLabel('%s' % _("STEP 5: Calibrate FlatCAM AppObjects")) step_5.setToolTip( _("Adjust the FlatCAM objects\n" "with the factors determined and verified above.") @@ -656,7 +656,7 @@ class ToolCalibration(FlatCAMTool): grid_lay.addWidget(self.adj_object_label, 48, 0, 1, 3) grid_lay.addWidget(self.adj_object_combo, 49, 0, 1, 3) - # ## Adjust Objects Button + # ## Adjust AppObjects Button self.cal_button = QtWidgets.QPushButton(_("Calibrate")) self.cal_button.setToolTip( _("Adjust (scale and/or skew) the objects\n" diff --git a/flatcamTools/ToolCopperThieving.py b/AppTools/ToolCopperThieving.py similarity index 99% rename from flatcamTools/ToolCopperThieving.py rename to AppTools/ToolCopperThieving.py index 0b43f71a..3a2de2ae 100644 --- a/flatcamTools/ToolCopperThieving.py +++ b/AppTools/ToolCopperThieving.py @@ -7,9 +7,9 @@ from PyQt5 import QtWidgets, QtCore -from FlatCAMCommon import GracefulException as grace -from FlatCAMTool import FlatCAMTool -from flatcamGUI.GUIElements import FCDoubleSpinner, RadioSet, FCEntry, FCComboBox +from Common import GracefulException as grace +from AppTool import FlatCAMTool +from AppGUI.GUIElements import FCDoubleSpinner, RadioSet, FCEntry, FCComboBox import shapely.geometry.base as base from shapely.ops import cascaded_union, unary_union @@ -23,7 +23,7 @@ import numpy as np from collections import Iterable import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') @@ -493,7 +493,7 @@ class ToolCopperThieving(FlatCAMTool): """) self.layout.addWidget(self.reset_button) - # Objects involved in Copper thieving + # AppObjects involved in Copper thieving self.grb_object = None self.ref_obj = None self.sel_rect = [] diff --git a/flatcamTools/ToolCorners.py b/AppTools/ToolCorners.py similarity index 98% rename from flatcamTools/ToolCorners.py rename to AppTools/ToolCorners.py index 4abf1587..add54622 100644 --- a/flatcamTools/ToolCorners.py +++ b/AppTools/ToolCorners.py @@ -7,8 +7,8 @@ from PyQt5 import QtWidgets, QtCore -from FlatCAMTool import FlatCAMTool -from flatcamGUI.GUIElements import FCDoubleSpinner, FCCheckBox, FCComboBox, FCButton +from AppTool import FlatCAMTool +from AppGUI.GUIElements import FCDoubleSpinner, FCCheckBox, FCComboBox, FCButton from shapely.geometry import MultiPolygon, LineString @@ -16,7 +16,7 @@ from copy import deepcopy import logging import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') @@ -182,7 +182,7 @@ class ToolCorners(FlatCAMTool): """) self.layout.addWidget(self.reset_button) - # Objects involved in Copper thieving + # AppObjects involved in Copper thieving self.grb_object = None # store the flattened geometry here: diff --git a/flatcamTools/ToolCutOut.py b/AppTools/ToolCutOut.py similarity index 99% rename from flatcamTools/ToolCutOut.py rename to AppTools/ToolCutOut.py index 67295b90..f401d0da 100644 --- a/flatcamTools/ToolCutOut.py +++ b/AppTools/ToolCutOut.py @@ -6,8 +6,8 @@ # ########################################################## from PyQt5 import QtWidgets, QtGui, QtCore -from FlatCAMTool import FlatCAMTool -from flatcamGUI.GUIElements import FCDoubleSpinner, FCCheckBox, RadioSet, FCComboBox, OptionalInputSection, FCButton +from AppTool import FlatCAMTool +from AppGUI.GUIElements import FCDoubleSpinner, FCCheckBox, RadioSet, FCComboBox, OptionalInputSection, FCButton from shapely.geometry import box, MultiPolygon, Polygon, LineString, LinearRing from shapely.ops import cascaded_union, unary_union @@ -20,7 +20,7 @@ from copy import deepcopy import math import logging import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') @@ -1239,7 +1239,7 @@ class CutOut(FlatCAMTool): # events out of the self.app.collection view (it's about Project Tab) are of type int if type(event) is int: key = event - # events from the GUI are of type QKeyEvent + # events from the AppGUI are of type QKeyEvent elif type(event) == QtGui.QKeyEvent: key = event.key() elif isinstance(event, mpl_key_event): # MatPlotLib key events are trickier to interpret than the rest diff --git a/flatcamTools/ToolDblSided.py b/AppTools/ToolDblSided.py similarity index 99% rename from flatcamTools/ToolDblSided.py rename to AppTools/ToolDblSided.py index 2aed9a3f..aa9beea6 100644 --- a/flatcamTools/ToolDblSided.py +++ b/AppTools/ToolDblSided.py @@ -1,8 +1,8 @@ from PyQt5 import QtWidgets, QtCore -from FlatCAMTool import FlatCAMTool -from flatcamGUI.GUIElements import RadioSet, FCDoubleSpinner, EvalEntry, FCEntry, FCButton, FCComboBox +from AppTool import FlatCAMTool +from AppGUI.GUIElements import RadioSet, FCDoubleSpinner, EvalEntry, FCEntry, FCButton, FCComboBox from numpy import Inf @@ -11,7 +11,7 @@ from shapely import affinity import logging import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') @@ -48,9 +48,9 @@ class DblSidedTool(FlatCAMTool): grid_lay.setColumnStretch(1, 0) self.layout.addLayout(grid_lay) - # Objects to be mirrored + # AppObjects to be mirrored self.m_objects_label = QtWidgets.QLabel("%s:" % _("Mirror Operation")) - self.m_objects_label.setToolTip('%s.' % _("Objects to be mirrored")) + self.m_objects_label.setToolTip('%s.' % _("AppObjects to be mirrored")) grid_lay.addWidget(self.m_objects_label, 0, 0, 1, 2) @@ -154,7 +154,7 @@ class DblSidedTool(FlatCAMTool): grid_lay1.setColumnStretch(1, 1) self.layout.addLayout(grid_lay1) - # Objects to be mirrored + # AppObjects to be mirrored self.param_label = QtWidgets.QLabel("%s:" % _("Mirror Parameters")) self.param_label.setToolTip('%s.' % _("Parameters for the mirror operation")) diff --git a/flatcamTools/ToolDistance.py b/AppTools/ToolDistance.py similarity index 98% rename from flatcamTools/ToolDistance.py rename to AppTools/ToolDistance.py index c64e0c2b..bfdce01a 100644 --- a/flatcamTools/ToolDistance.py +++ b/AppTools/ToolDistance.py @@ -7,15 +7,15 @@ from PyQt5 import QtWidgets, QtCore -from FlatCAMTool import FlatCAMTool -from flatcamGUI.VisPyVisuals import * -from flatcamGUI.GUIElements import FCEntry, FCButton, FCCheckBox +from AppTool import FlatCAMTool +from AppGUI.VisPyVisuals import * +from AppGUI.GUIElements import FCEntry, FCButton, FCCheckBox from shapely.geometry import Point, MultiLineString, Polygon -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate from camlib import FlatCAMRTreeStorage -from flatcamEditors.FlatCAMGeoEditor import DrawToolShape +from AppEditors.FlatCAMGeoEditor import DrawToolShape from copy import copy import math @@ -176,7 +176,7 @@ class Distance(FlatCAMTool): if self.app.is_legacy is False: self.sel_shapes = ShapeCollection(parent=self.app.plotcanvas.view.scene, layers=1) else: - from flatcamGUI.PlotCanvasLegacy import ShapeCollectionLegacy + from AppGUI.PlotCanvasLegacy import ShapeCollectionLegacy self.sel_shapes = ShapeCollectionLegacy(obj=self, app=self.app, name='measurement') self.measure_btn.clicked.connect(self.activate_measure_tool) @@ -211,10 +211,10 @@ class Distance(FlatCAMTool): FlatCAMTool.install(self, icon, separator, shortcut='Ctrl+M', **kwargs) def set_tool_ui(self): - # Remove anything else in the GUI + # Remove anything else in the AppGUI self.app.ui.tool_scroll_area.takeWidget() - # Put ourselves in the GUI + # Put ourselves in the AppGUI self.app.ui.tool_scroll_area.setWidget(self) # Switch notebook to tool page diff --git a/flatcamTools/ToolDistanceMin.py b/AppTools/ToolDistanceMin.py similarity index 97% rename from flatcamTools/ToolDistanceMin.py rename to AppTools/ToolDistanceMin.py index dc4369ea..052f20dc 100644 --- a/flatcamTools/ToolDistanceMin.py +++ b/AppTools/ToolDistanceMin.py @@ -6,9 +6,9 @@ # ########################################################## from PyQt5 import QtWidgets, QtCore -from FlatCAMTool import FlatCAMTool -from flatcamGUI.VisPyVisuals import * -from flatcamGUI.GUIElements import FCEntry +from AppTool import FlatCAMTool +from AppGUI.VisPyVisuals import * +from AppGUI.GUIElements import FCEntry from shapely.ops import nearest_points from shapely.geometry import Point, MultiPolygon @@ -17,7 +17,7 @@ from shapely.ops import cascaded_union import math import logging import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') @@ -158,10 +158,10 @@ class DistanceMin(FlatCAMTool): FlatCAMTool.install(self, icon, separator, shortcut='Shift+M', **kwargs) def set_tool_ui(self): - # Remove anything else in the GUI + # Remove anything else in the AppGUI self.app.ui.tool_scroll_area.takeWidget() - # Put oneself in the GUI + # Put oneself in the AppGUI self.app.ui.tool_scroll_area.setWidget(self) # Switch notebook to tool page @@ -291,7 +291,7 @@ class DistanceMin(FlatCAMTool): ) else: self.app.inform.emit('[WARNING_NOTCL] %s: %s' % - (_("Objects intersects or touch at"), + (_("AppObjects intersects or touch at"), "(%.*f, %.*f)" % (self.decimals, self.h_point[0], self.decimals, self.h_point[1]))) def on_jump_to_half_point(self): diff --git a/flatcamTools/ToolExtractDrills.py b/AppTools/ToolExtractDrills.py similarity index 99% rename from flatcamTools/ToolExtractDrills.py rename to AppTools/ToolExtractDrills.py index 2c127c2b..242a35ce 100644 --- a/flatcamTools/ToolExtractDrills.py +++ b/AppTools/ToolExtractDrills.py @@ -7,14 +7,14 @@ from PyQt5 import QtWidgets, QtCore -from FlatCAMTool import FlatCAMTool -from flatcamGUI.GUIElements import RadioSet, FCDoubleSpinner, FCCheckBox, FCComboBox +from AppTool import FlatCAMTool +from AppGUI.GUIElements import RadioSet, FCDoubleSpinner, FCCheckBox, FCComboBox from shapely.geometry import Point import logging import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamTools/ToolFiducials.py b/AppTools/ToolFiducials.py similarity index 99% rename from flatcamTools/ToolFiducials.py rename to AppTools/ToolFiducials.py index b183914d..906214c9 100644 --- a/flatcamTools/ToolFiducials.py +++ b/AppTools/ToolFiducials.py @@ -7,8 +7,8 @@ from PyQt5 import QtWidgets, QtCore -from FlatCAMTool import FlatCAMTool -from flatcamGUI.GUIElements import FCDoubleSpinner, RadioSet, EvalEntry, FCTable, FCComboBox +from AppTool import FlatCAMTool +from AppGUI.GUIElements import FCDoubleSpinner, RadioSet, EvalEntry, FCTable, FCComboBox from shapely.geometry import Point, Polygon, MultiPolygon, LineString from shapely.geometry import box as box @@ -18,7 +18,7 @@ import logging from copy import deepcopy import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') @@ -327,7 +327,7 @@ class ToolFiducials(FlatCAMTool): """) self.layout.addWidget(self.reset_button) - # Objects involved in Copper thieving + # AppObjects involved in Copper thieving self.grb_object = None self.sm_object = None diff --git a/flatcamTools/ToolFilm.py b/AppTools/ToolFilm.py similarity index 99% rename from flatcamTools/ToolFilm.py rename to AppTools/ToolFilm.py index 0cceb34e..7141d780 100644 --- a/flatcamTools/ToolFilm.py +++ b/AppTools/ToolFilm.py @@ -7,8 +7,8 @@ from PyQt5 import QtGui, QtCore, QtWidgets -from FlatCAMTool import FlatCAMTool -from flatcamGUI.GUIElements import RadioSet, FCDoubleSpinner, FCCheckBox, \ +from AppTool import FlatCAMTool +from AppGUI.GUIElements import RadioSet, FCDoubleSpinner, FCCheckBox, \ OptionalHideInputSection, OptionalInputSection, FCComboBox, FCFileSaveDialog from copy import deepcopy @@ -27,7 +27,7 @@ from lxml import etree as ET from io import StringIO import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamTools/ToolImage.py b/AppTools/ToolImage.py similarity index 98% rename from flatcamTools/ToolImage.py rename to AppTools/ToolImage.py index 6a077a0d..03a0352e 100644 --- a/flatcamTools/ToolImage.py +++ b/AppTools/ToolImage.py @@ -7,11 +7,11 @@ from PyQt5 import QtGui, QtWidgets -from FlatCAMTool import FlatCAMTool -from flatcamGUI.GUIElements import RadioSet, FCComboBox, FCSpinner +from AppTool import FlatCAMTool +from AppGUI.GUIElements import RadioSet, FCComboBox, FCSpinner import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') @@ -293,5 +293,5 @@ class ToolImage(FlatCAMTool): # Register recent file self.app.file_opened.emit("image", filename) - # GUI feedback + # AppGUI feedback self.app.inform.emit('[success] %s: %s' % (_("Opened"), filename)) diff --git a/flatcamTools/ToolInvertGerber.py b/AppTools/ToolInvertGerber.py similarity index 98% rename from flatcamTools/ToolInvertGerber.py rename to AppTools/ToolInvertGerber.py index b1329882..f51175c8 100644 --- a/flatcamTools/ToolInvertGerber.py +++ b/AppTools/ToolInvertGerber.py @@ -7,8 +7,8 @@ from PyQt5 import QtWidgets, QtCore -from FlatCAMTool import FlatCAMTool -from flatcamGUI.GUIElements import FCButton, FCDoubleSpinner, RadioSet, FCComboBox +from AppTool import FlatCAMTool +from AppGUI.GUIElements import FCButton, FCDoubleSpinner, RadioSet, FCComboBox from shapely.geometry import box @@ -16,7 +16,7 @@ from copy import deepcopy import logging import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamTools/ToolMove.py b/AppTools/ToolMove.py similarity index 98% rename from flatcamTools/ToolMove.py rename to AppTools/ToolMove.py index 18d6a6e0..61227ed0 100644 --- a/flatcamTools/ToolMove.py +++ b/AppTools/ToolMove.py @@ -6,13 +6,13 @@ # ########################################################## from PyQt5 import QtWidgets, QtCore -from FlatCAMTool import FlatCAMTool -from flatcamGUI.VisPyVisuals import * +from AppTool import FlatCAMTool +from AppGUI.VisPyVisuals import * from copy import copy import logging import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') @@ -50,7 +50,7 @@ class ToolMove(FlatCAMTool): if self.app.is_legacy is False: self.sel_shapes = ShapeCollection(parent=self.app.plotcanvas.view.scene, layers=1) else: - from flatcamGUI.PlotCanvasLegacy import ShapeCollectionLegacy + from AppGUI.PlotCanvasLegacy import ShapeCollectionLegacy self.sel_shapes = ShapeCollectionLegacy(obj=self, app=self.app, name="move") self.mm = None diff --git a/flatcamTools/ToolNCC.py b/AppTools/ToolNCC.py similarity index 99% rename from flatcamTools/ToolNCC.py rename to AppTools/ToolNCC.py index 5ff643aa..0e268dc1 100644 --- a/flatcamTools/ToolNCC.py +++ b/AppTools/ToolNCC.py @@ -7,12 +7,12 @@ from PyQt5 import QtWidgets, QtCore, QtGui -from FlatCAMTool import FlatCAMTool -from flatcamGUI.GUIElements import FCCheckBox, FCDoubleSpinner, RadioSet, FCTable, FCInputDialog, FCButton,\ +from AppTool import FlatCAMTool +from AppGUI.GUIElements import FCCheckBox, FCDoubleSpinner, RadioSet, FCTable, FCInputDialog, FCButton,\ FCComboBox, OptionalInputSection -from flatcamParsers.ParseGerber import Gerber +from AppParsers.ParseGerber import Gerber -from FlatCAMCommon import GracefulException as grace +from Common import GracefulException as grace from copy import deepcopy @@ -27,7 +27,7 @@ from matplotlib.backend_bases import KeyEvent as mpl_key_event import logging import traceback import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') @@ -620,7 +620,7 @@ class NonCopperClear(FlatCAMTool, Gerber): } """) self.tools_box.addWidget(self.reset_button) - # ############################ FINSIHED GUI ################################### + # ############################ FINSIHED AppGUI ################################### # ############################################################################# # ############################################################################# @@ -825,7 +825,7 @@ class NonCopperClear(FlatCAMTool, Gerber): def form_to_storage(self): if self.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 self.blockSignals(True) @@ -853,7 +853,7 @@ class NonCopperClear(FlatCAMTool, Gerber): def on_apply_param_to_all_clicked(self): if self.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("NonCopperClear.on_apply_param_to_all_clicked() --> no tool in Tools Table, aborting.") return @@ -1860,7 +1860,7 @@ class NonCopperClear(FlatCAMTool, Gerber): # events out of the self.app.collection view (it's about Project Tab) are of type int if type(event) is int: key = event - # events from the GUI are of type QKeyEvent + # events from the AppGUI are of type QKeyEvent elif type(event) == QtGui.QKeyEvent: key = event.key() elif isinstance(event, mpl_key_event): # MatPlotLib key events are trickier to interpret than the rest @@ -2102,7 +2102,7 @@ class NonCopperClear(FlatCAMTool, Gerber): "than isolation tool diameter.")) try: for geo_elem in isolated_geo: - # 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() if self.app.abort_flag: @@ -2295,7 +2295,7 @@ class NonCopperClear(FlatCAMTool, Gerber): Usage of the different one is related to when this function is called from a TcL command. - :param run_threaded: If True the method will be run in a threaded way suitable for GUI usage; if False + :param run_threaded: If True the method will be run in a threaded way suitable for AppGUI usage; if False it will run non-threaded for TclShell usage :return: """ @@ -2353,7 +2353,7 @@ class NonCopperClear(FlatCAMTool, Gerber): log.debug("NCC Tool. Normal copper clearing task started.") self.app.inform.emit(_("NCC Tool. Finished non-copper polygons. Normal copper clearing task started.")) - # 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 if not run_threaded: QtWidgets.QApplication.processEvents() @@ -2397,7 +2397,7 @@ class NonCopperClear(FlatCAMTool, Gerber): # graceful abort requested by the user raise grace - # 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 if not run_threaded: QtWidgets.QApplication.processEvents() @@ -2455,7 +2455,7 @@ class NonCopperClear(FlatCAMTool, Gerber): if len(area.geoms) > 0: pol_nr = 0 for p in area.geoms: - # 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 if not run_threaded: QtWidgets.QApplication.processEvents() @@ -2606,7 +2606,7 @@ class NonCopperClear(FlatCAMTool, Gerber): log.debug("NCC Tool. Rest machining copper clearing task started.") app_obj.inform.emit('_(NCC Tool. Rest machining copper clearing task started.') - # 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 if not run_threaded: QtWidgets.QApplication.processEvents() @@ -2648,7 +2648,7 @@ class NonCopperClear(FlatCAMTool, Gerber): # graceful abort requested by the user raise grace - # 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() app_obj.inform.emit('[success] %s = %s%s %s' % ( @@ -2690,7 +2690,7 @@ class NonCopperClear(FlatCAMTool, Gerber): # Area to clear for poly in cleared_by_last_tool: - # 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() if self.app.abort_flag: @@ -2731,7 +2731,7 @@ class NonCopperClear(FlatCAMTool, Gerber): p = p.buffer(0) if p is not None and p.is_valid: - # 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() if isinstance(p, Polygon): @@ -2763,7 +2763,7 @@ class NonCopperClear(FlatCAMTool, Gerber): elif isinstance(p, MultiPolygon): for poly in p: if poly is not None: - # provide the app with a way to process the GUI events when + # provide the app with a way to process the AppGUI events when # in a blocking loop QtWidgets.QApplication.processEvents() @@ -2954,7 +2954,7 @@ class NonCopperClear(FlatCAMTool, Gerber): :param tools_storage: whether to use the current tools_storage self.ncc_tools or a different one. Usage of the different one is related to when this function is called from a TcL command. :param plot: if True after the job is finished the result will be plotted, else it will not. - :param run_threaded: If True the method will be run in a threaded way suitable for GUI usage; if False it will + :param run_threaded: If True the method will be run in a threaded way suitable for AppGUI usage; if False it will run non-threaded for TclShell usage :return: """ @@ -3098,7 +3098,7 @@ class NonCopperClear(FlatCAMTool, Gerber): assert geo_obj.kind == 'geometry', \ "Initializer expected a GeometryObject, got %s" % type(geo_obj) - # 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 if not run_threaded: QtWidgets.QApplication.processEvents() @@ -3187,7 +3187,7 @@ class NonCopperClear(FlatCAMTool, Gerber): "than isolation tool diameter.")) try: for geo_elem in isolated_geo: - # 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() if self.app.abort_flag: @@ -3295,7 +3295,7 @@ class NonCopperClear(FlatCAMTool, Gerber): # graceful abort requested by the user raise grace - # 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() app_obj.inform.emit('[success] %s = %s%s %s' % ( @@ -3329,7 +3329,7 @@ class NonCopperClear(FlatCAMTool, Gerber): if len(area.geoms) > 0: pol_nr = 0 for p in area.geoms: - # 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() if self.app.abort_flag: @@ -3502,7 +3502,7 @@ class NonCopperClear(FlatCAMTool, Gerber): log.debug("NCC Tool. Rest machining copper clearing task started.") app_obj.inform.emit('_(NCC Tool. Rest machining copper clearing task started.') - # 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 if not run_threaded: QtWidgets.QApplication.processEvents() @@ -3566,7 +3566,7 @@ class NonCopperClear(FlatCAMTool, Gerber): try: for geo_elem in isolated_geo: - # 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() if self.app.abort_flag: @@ -3694,7 +3694,7 @@ class NonCopperClear(FlatCAMTool, Gerber): # Area to clear for poly_r in cleared_by_last_tool: - # 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() if self.app.abort_flag: @@ -3735,7 +3735,7 @@ class NonCopperClear(FlatCAMTool, Gerber): p = p.buffer(0) if p is not None and p.is_valid: - # 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() if isinstance(p, Polygon): @@ -3764,7 +3764,7 @@ class NonCopperClear(FlatCAMTool, Gerber): elif isinstance(p, MultiPolygon): for poly_p in p: if poly_p is not None: - # provide the app with a way to process the GUI events when + # provide the app with a way to process the AppGUI events when # in a blocking loop QtWidgets.QApplication.processEvents() @@ -3939,7 +3939,7 @@ class NonCopperClear(FlatCAMTool, Gerber): except Exception: try: for el in target: - # 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() if self.app.abort_flag: # graceful abort requested by the user diff --git a/flatcamTools/ToolOptimal.py b/AppTools/ToolOptimal.py similarity index 98% rename from flatcamTools/ToolOptimal.py rename to AppTools/ToolOptimal.py index de46045e..a437149b 100644 --- a/flatcamTools/ToolOptimal.py +++ b/AppTools/ToolOptimal.py @@ -7,9 +7,9 @@ from PyQt5 import QtWidgets, QtCore, QtGui -from FlatCAMTool import FlatCAMTool -from flatcamGUI.GUIElements import OptionalHideInputSection, FCTextArea, FCEntry, FCSpinner, FCCheckBox, FCComboBox -from FlatCAMCommon import GracefulException as grace +from AppTool import FlatCAMTool +from AppGUI.GUIElements import OptionalHideInputSection, FCTextArea, FCEntry, FCSpinner, FCCheckBox, FCComboBox +from Common import GracefulException as grace from shapely.geometry import MultiPolygon from shapely.ops import nearest_points @@ -18,7 +18,7 @@ import numpy as np import logging import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') @@ -42,7 +42,7 @@ class ToolOptimal(FlatCAMTool): self.decimals = self.app.decimals # ############################################################################ - # ############################ GUI creation ################################## + # ############################ AppGUI creation ################################## # ## Title title_label = QtWidgets.QLabel("%s" % self.toolName) title_label.setStyleSheet( @@ -248,7 +248,7 @@ class ToolOptimal(FlatCAMTool): self.loc_ois = OptionalHideInputSection(self.locations_cb, [self.locations_textb, self.locate_button]) self.sec_loc_ois = OptionalHideInputSection(self.sec_locations_cb, [self.sec_locations_frame]) - # ################## Finished GUI creation ################################### + # ################## Finished AppGUI creation ################################### # ############################################################################ # this is the line selected in the textbox with the locations of the minimum diff --git a/flatcamTools/ToolPDF.py b/AppTools/ToolPDF.py similarity index 98% rename from flatcamTools/ToolPDF.py rename to AppTools/ToolPDF.py index 1530525a..1bc5a55b 100644 --- a/flatcamTools/ToolPDF.py +++ b/AppTools/ToolPDF.py @@ -7,9 +7,9 @@ from PyQt5 import QtWidgets, QtCore -from FlatCAMTool import FlatCAMTool -from FlatCAMCommon import GracefulException as grace -from flatcamParsers.ParsePDF import PdfParser +from AppTool import FlatCAMTool +from Common import GracefulException as grace +from AppParsers.ParsePDF import PdfParser from shapely.geometry import Point, MultiPolygon from shapely.ops import unary_union @@ -22,7 +22,7 @@ import logging import traceback import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') @@ -211,7 +211,7 @@ class ToolPDF(FlatCAMTool): return # Register recent file self.app.file_opened.emit("excellon", filename) - # GUI feedback + # AppGUI feedback self.app.inform.emit('[success] %s: %s' % (_("Rendered"), outname)) def layer_rendering_as_gerber(self, filename, ap_dict, layer_nr): @@ -284,7 +284,7 @@ class ToolPDF(FlatCAMTool): return # Register recent file self.app.file_opened.emit('gerber', filename) - # GUI feedback + # AppGUI feedback self.app.inform.emit('[success] %s: %s' % (_("Rendered"), outname)) def periodic_check(self, check_period): @@ -351,7 +351,7 @@ class ToolPDF(FlatCAMTool): self.app.worker_task.emit({'fcn': self.layer_rendering_as_gerber, 'params': [filename, ap_dict, layer_nr]}) # delete the object already processed so it will not be processed again for other objects - # that were opened at the same time; like in drag & drop on GUI + # that were opened at the same time; like in drag & drop on AppGUI for obj_name in obj_to_delete: if obj_name in self.pdf_parsed: self.pdf_parsed.pop(obj_name) diff --git a/flatcamTools/ToolPaint.py b/AppTools/ToolPaint.py similarity index 99% rename from flatcamTools/ToolPaint.py rename to AppTools/ToolPaint.py index c06b6666..d377e81d 100644 --- a/flatcamTools/ToolPaint.py +++ b/AppTools/ToolPaint.py @@ -8,13 +8,13 @@ from PyQt5 import QtWidgets, QtGui, QtCore from PyQt5.QtCore import Qt -from FlatCAMTool import FlatCAMTool +from AppTool import FlatCAMTool from copy import deepcopy # from ObjectCollection import * -from flatcamParsers.ParseGerber import Gerber +from AppParsers.ParseGerber import Gerber from camlib import Geometry, FlatCAMRTreeStorage -from flatcamGUI.GUIElements import FCTable, FCDoubleSpinner, FCCheckBox, FCInputDialog, RadioSet, FCButton, FCComboBox -from FlatCAMCommon import GracefulException as grace +from AppGUI.GUIElements import FCTable, FCDoubleSpinner, FCCheckBox, FCInputDialog, RadioSet, FCButton, FCComboBox +from Common import GracefulException as grace from shapely.geometry import base, Polygon, MultiPolygon, LinearRing, Point from shapely.ops import cascaded_union, unary_union, linemerge @@ -28,7 +28,7 @@ import traceback import logging import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') @@ -565,7 +565,7 @@ class ToolPaint(FlatCAMTool, Gerber): """) self.tools_box.addWidget(self.reset_button) - # #################################### FINSIHED GUI ########################### + # #################################### FINSIHED AppGUI ########################### # ############################################################################# # ############################################################################# @@ -790,7 +790,7 @@ class ToolPaint(FlatCAMTool, Gerber): def form_to_storage(self): if self.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 self.blockSignals(True) @@ -818,7 +818,7 @@ class ToolPaint(FlatCAMTool, Gerber): def on_apply_param_to_all_clicked(self): if self.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("NonCopperClear.on_apply_param_to_all_clicked() --> no tool in Tools Table, aborting.") return @@ -1028,7 +1028,7 @@ class ToolPaint(FlatCAMTool, Gerber): "tools_paintrest": self.app.defaults["tools_paintrest"], }) - # ## Init the GUI interface + # ## Init the AppGUI interface self.order_radio.set_value(self.app.defaults["tools_paintorder"]) self.paintmargin_entry.set_value(self.app.defaults["tools_paintmargin"]) self.paintmethod_combo.set_value(self.app.defaults["tools_paintmethod"]) @@ -1758,7 +1758,7 @@ class ToolPaint(FlatCAMTool, Gerber): # events out of the self.app.collection view (it's about Project Tab) are of type int if type(event) is int: key = event - # events from the GUI are of type QKeyEvent + # events from the AppGUI are of type QKeyEvent elif type(event) == QtGui.QKeyEvent: key = event.key() elif isinstance(event, mpl_key_event): # MatPlotLib key events are trickier to interpret than the rest @@ -1928,7 +1928,7 @@ class ToolPaint(FlatCAMTool, Gerber): # process the flashes found in the selected polygon with the 'lines' method for rectangular # flashes and with _("Seed") for oblong and circular flashes - # and pads (flahes) need the contour therefore I override the GUI settings with always True + # and pads (flahes) need the contour therefore I override the AppGUI settings with always True for ap_type in flash_el_dict: for elem in flash_el_dict[ap_type]: if 'solid' in elem: @@ -2206,7 +2206,7 @@ class ToolPaint(FlatCAMTool, Gerber): cp = [] try: for pp in poly_buf: - # 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() if self.app.abort_flag: # graceful abort requested by the user @@ -2224,7 +2224,7 @@ class ToolPaint(FlatCAMTool, Gerber): self.app.proc_container.update_view_text(' %d%%' % disp_number) old_disp_number = disp_number except TypeError: - # 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() if self.app.abort_flag: # graceful abort requested by the user @@ -2524,7 +2524,7 @@ class ToolPaint(FlatCAMTool, Gerber): cp = [] try: for pp in poly_buf: - # 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() if self.app.abort_flag: # graceful abort requested by the user @@ -2549,7 +2549,7 @@ class ToolPaint(FlatCAMTool, Gerber): # log.debug("Polygons cleared: %d. Percentage done: %d%%" % (pol_nr, disp_number)) except TypeError: - # 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() if self.app.abort_flag: # graceful abort requested by the user @@ -2712,7 +2712,7 @@ class ToolPaint(FlatCAMTool, Gerber): cp = [] try: for pp in poly_buf: - # 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() if self.app.abort_flag: # graceful abort requested by the user @@ -2730,7 +2730,7 @@ class ToolPaint(FlatCAMTool, Gerber): self.app.proc_container.update_view_text(' %d%%' % disp_number) old_disp_number = disp_number except TypeError: - # 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() if self.app.abort_flag: # graceful abort requested by the user @@ -3022,7 +3022,7 @@ class ToolPaint(FlatCAMTool, Gerber): try: try: for pp in poly_buf: - # 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() if self.app.abort_flag: # graceful abort requested by the user @@ -3047,7 +3047,7 @@ class ToolPaint(FlatCAMTool, Gerber): # log.debug("Polygons cleared: %d. Percentage done: %d%%" % (pol_nr, disp_number)) except TypeError: - # 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() if self.app.abort_flag: # graceful abort requested by the user @@ -3200,7 +3200,7 @@ class ToolPaint(FlatCAMTool, Gerber): try: try: for pp in poly_buf: - # 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() if self.app.abort_flag: # graceful abort requested by the user @@ -3225,7 +3225,7 @@ class ToolPaint(FlatCAMTool, Gerber): # log.debug("Polygons cleared: %d. Percentage done: %d%%" % (pol_nr, disp_number)) except TypeError: - # 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() if self.app.abort_flag: # graceful abort requested by the user diff --git a/flatcamTools/ToolPanelize.py b/AppTools/ToolPanelize.py similarity index 99% rename from flatcamTools/ToolPanelize.py rename to AppTools/ToolPanelize.py index ed9ded7a..ad790601 100644 --- a/flatcamTools/ToolPanelize.py +++ b/AppTools/ToolPanelize.py @@ -6,10 +6,10 @@ # ########################################################## from PyQt5 import QtWidgets, QtGui, QtCore -from FlatCAMTool import FlatCAMTool +from AppTool import FlatCAMTool -from flatcamGUI.GUIElements import FCSpinner, FCDoubleSpinner, RadioSet, FCCheckBox, OptionalInputSection, FCComboBox -from FlatCAMCommon import GracefulException as grace +from AppGUI.GUIElements import FCSpinner, FCDoubleSpinner, RadioSet, FCCheckBox, OptionalInputSection, FCComboBox +from Common import GracefulException as grace from copy import deepcopy import numpy as np @@ -18,7 +18,7 @@ from shapely.ops import unary_union from shapely.geometry import LineString import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins import logging diff --git a/flatcamTools/ToolPcbWizard.py b/AppTools/ToolPcbWizard.py similarity index 99% rename from flatcamTools/ToolPcbWizard.py rename to AppTools/ToolPcbWizard.py index 47d3a196..030bbfe7 100644 --- a/flatcamTools/ToolPcbWizard.py +++ b/AppTools/ToolPcbWizard.py @@ -7,8 +7,8 @@ from PyQt5 import QtWidgets, QtCore -from FlatCAMTool import FlatCAMTool -from flatcamGUI.GUIElements import RadioSet, FCSpinner, FCButton, FCTable +from AppTool import FlatCAMTool +from AppGUI.GUIElements import RadioSet, FCSpinner, FCButton, FCTable import re import os @@ -16,7 +16,7 @@ from datetime import datetime from io import StringIO import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') @@ -460,7 +460,7 @@ class PcbWizard(FlatCAMTool): # Register recent file self.app.file_opened.emit("excellon", name) - # GUI feedback + # AppGUI feedback self.app.inform.emit('[success] %s: %s' % (_("Imported"), name)) self.app.ui.notebook.setCurrentWidget(self.app.ui.project_tab) else: diff --git a/flatcamTools/ToolProperties.py b/AppTools/ToolProperties.py similarity index 99% rename from flatcamTools/ToolProperties.py rename to AppTools/ToolProperties.py index e1cc1c25..f66e8b11 100644 --- a/flatcamTools/ToolProperties.py +++ b/AppTools/ToolProperties.py @@ -6,8 +6,8 @@ # ########################################################## from PyQt5 import QtGui, QtCore, QtWidgets -from FlatCAMTool import FlatCAMTool -from flatcamGUI.GUIElements import FCTree +from AppTool import FlatCAMTool +from AppGUI.GUIElements import FCTree from shapely.geometry import MultiPolygon, Polygon from shapely.ops import cascaded_union @@ -17,7 +17,7 @@ import math import logging import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamTools/ToolPunchGerber.py b/AppTools/ToolPunchGerber.py similarity index 99% rename from flatcamTools/ToolPunchGerber.py rename to AppTools/ToolPunchGerber.py index f0c6a9e3..2ec20d6d 100644 --- a/flatcamTools/ToolPunchGerber.py +++ b/AppTools/ToolPunchGerber.py @@ -7,15 +7,15 @@ from PyQt5 import QtCore, QtWidgets -from FlatCAMTool import FlatCAMTool -from flatcamGUI.GUIElements import RadioSet, FCDoubleSpinner, FCCheckBox, FCComboBox +from AppTool import FlatCAMTool +from AppGUI.GUIElements import RadioSet, FCDoubleSpinner, FCCheckBox, FCComboBox from copy import deepcopy import logging from shapely.geometry import MultiPolygon, Point import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamTools/ToolQRCode.py b/AppTools/ToolQRCode.py similarity index 99% rename from flatcamTools/ToolQRCode.py rename to AppTools/ToolQRCode.py index 8d54fedd..601b81c6 100644 --- a/flatcamTools/ToolQRCode.py +++ b/AppTools/ToolQRCode.py @@ -8,9 +8,9 @@ from PyQt5 import QtWidgets, QtCore, QtGui from PyQt5.QtCore import Qt -from FlatCAMTool import FlatCAMTool -from flatcamGUI.GUIElements import RadioSet, FCTextArea, FCSpinner, FCEntry, FCCheckBox, FCComboBox, FCFileSaveDialog -from flatcamParsers.ParseSVG import * +from AppTool import FlatCAMTool +from AppGUI.GUIElements import RadioSet, FCTextArea, FCSpinner, FCEntry, FCCheckBox, FCComboBox, FCFileSaveDialog +from AppParsers.ParseSVG import * from shapely.geometry.base import * from shapely.ops import unary_union @@ -28,7 +28,7 @@ import qrcode.image.pil from lxml import etree as ET import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamTools/ToolRulesCheck.py b/AppTools/ToolRulesCheck.py similarity index 99% rename from flatcamTools/ToolRulesCheck.py rename to AppTools/ToolRulesCheck.py index fe07b683..ed090d36 100644 --- a/flatcamTools/ToolRulesCheck.py +++ b/AppTools/ToolRulesCheck.py @@ -7,18 +7,18 @@ from PyQt5 import QtWidgets -from FlatCAMTool import FlatCAMTool -from flatcamGUI.GUIElements import FCDoubleSpinner, FCCheckBox, OptionalInputSection, FCComboBox +from AppTool import FlatCAMTool +from AppGUI.GUIElements import FCDoubleSpinner, FCCheckBox, OptionalInputSection, FCComboBox from copy import deepcopy -from FlatCAMPool import * +from AppPool import * # from os import getpid from shapely.ops import nearest_points from shapely.geometry import MultiPolygon, Polygon import logging import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') @@ -196,7 +196,7 @@ class RulesCheck(FlatCAMTool): self.grid_layout.addWidget(QtWidgets.QLabel(""), 8, 0, 1, 3) - self.excellon_title_lbl = QtWidgets.QLabel('%s:' % _("Excellon Objects")) + self.excellon_title_lbl = QtWidgets.QLabel('%s:' % _("Excellon AppObjects")) self.excellon_title_lbl.setToolTip( _("Excellon objects for which to check rules.") ) diff --git a/flatcamTools/ToolShell.py b/AppTools/ToolShell.py similarity index 98% rename from flatcamTools/ToolShell.py rename to AppTools/ToolShell.py index f68a9da4..d06113f7 100644 --- a/flatcamTools/ToolShell.py +++ b/AppTools/ToolShell.py @@ -10,7 +10,7 @@ from PyQt5.QtCore import Qt from PyQt5.QtGui import QTextCursor from PyQt5.QtWidgets import QVBoxLayout, QWidget -from flatcamGUI.GUIElements import _BrowserTextEdit, _ExpandableTextEdit +from AppGUI.GUIElements import _BrowserTextEdit, _ExpandableTextEdit import html import sys import traceback @@ -19,7 +19,7 @@ import tkinter as tk import tclCommands import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') @@ -257,7 +257,7 @@ class TermWidget(QWidget): class FCShell(TermWidget): def __init__(self, app, version, *args): """ - Initialize the TCL Shell. A dock widget that holds the GUI interface to the FlatCAM command line. + Initialize the TCL Shell. A dock widget that holds the AppGUI interface to the FlatCAM command line. :param app: When instantiated the sysShell will be actually the FlatCAMApp.App() class :param version: FlatCAM version string diff --git a/flatcamTools/ToolSolderPaste.py b/AppTools/ToolSolderPaste.py similarity index 99% rename from flatcamTools/ToolSolderPaste.py rename to AppTools/ToolSolderPaste.py index 93cb4744..7831fd1e 100644 --- a/flatcamTools/ToolSolderPaste.py +++ b/AppTools/ToolSolderPaste.py @@ -5,13 +5,13 @@ # MIT Licence # # ########################################################## -from FlatCAMTool import FlatCAMTool -from FlatCAMCommon import LoudDict -from flatcamGUI.GUIElements import FCComboBox, FCEntry, FCTable, \ +from AppTool import FlatCAMTool +from Common import LoudDict +from AppGUI.GUIElements import FCComboBox, FCEntry, FCTable, \ FCInputDialog, FCDoubleSpinner, FCSpinner, FCFileSaveDialog -from FlatCAMApp import log +from App import log from camlib import distance -from flatcamEditors.FlatCAMTextEditor import TextEditor +from AppEditors.FlatCAMTextEditor import TextEditor from PyQt5 import QtGui, QtCore, QtWidgets from PyQt5.QtCore import Qt @@ -25,7 +25,7 @@ import traceback from io import StringIO import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/flatcamTools/ToolSub.py b/AppTools/ToolSub.py similarity index 99% rename from flatcamTools/ToolSub.py rename to AppTools/ToolSub.py index 5409fa76..e4938aa0 100644 --- a/flatcamTools/ToolSub.py +++ b/AppTools/ToolSub.py @@ -7,8 +7,8 @@ from PyQt5 import QtWidgets, QtCore -from FlatCAMTool import FlatCAMTool -from flatcamGUI.GUIElements import FCCheckBox, FCButton, FCComboBox +from AppTool import FlatCAMTool +from AppGUI.GUIElements import FCCheckBox, FCButton, FCComboBox from shapely.geometry import Polygon, MultiPolygon, MultiLineString, LineString from shapely.ops import cascaded_union @@ -18,7 +18,7 @@ from copy import deepcopy import time import logging import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') @@ -62,7 +62,7 @@ class ToolSub(FlatCAMTool): form_layout = QtWidgets.QFormLayout() self.tools_box.addLayout(form_layout) - self.gerber_title = QtWidgets.QLabel("%s" % _("Gerber Objects")) + self.gerber_title = QtWidgets.QLabel("%s" % _("Gerber AppObjects")) form_layout.addRow(self.gerber_title) # Target Gerber Object @@ -117,7 +117,7 @@ class ToolSub(FlatCAMTool): form_geo_layout = QtWidgets.QFormLayout() self.tools_box.addLayout(form_geo_layout) - self.geo_title = QtWidgets.QLabel("%s" % _("Geometry Objects")) + self.geo_title = QtWidgets.QLabel("%s" % _("Geometry AppObjects")) form_geo_layout.addRow(self.geo_title) # Target Geometry Object @@ -462,7 +462,7 @@ class ToolSub(FlatCAMTool): _('Generating new object failed.')) return - # GUI feedback + # AppGUI feedback self.app.inform.emit('[success] %s: %s' % (_("Created"), outname)) @@ -666,7 +666,7 @@ class ToolSub(FlatCAMTool): return # Register recent file self.app.file_opened.emit('geometry', outname) - # GUI feedback + # AppGUI feedback self.app.inform.emit('[success] %s: %s' % (_("Created"), outname)) diff --git a/flatcamTools/ToolTransform.py b/AppTools/ToolTransform.py similarity index 99% rename from flatcamTools/ToolTransform.py rename to AppTools/ToolTransform.py index 25a9b5f6..b89afffe 100644 --- a/flatcamTools/ToolTransform.py +++ b/AppTools/ToolTransform.py @@ -6,11 +6,11 @@ # ########################################################## from PyQt5 import QtWidgets -from FlatCAMTool import FlatCAMTool -from flatcamGUI.GUIElements import FCDoubleSpinner, FCCheckBox, FCButton, OptionalInputSection, FCEntry +from AppTool import FlatCAMTool +from AppGUI.GUIElements import FCDoubleSpinner, FCCheckBox, FCButton, OptionalInputSection, FCEntry import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/AppTools/__init__.py b/AppTools/__init__.py new file mode 100644 index 00000000..7a4ef9ca --- /dev/null +++ b/AppTools/__init__.py @@ -0,0 +1,43 @@ + +from AppTools.ToolCalculators import ToolCalculator +from AppTools.ToolCalibration import ToolCalibration +from AppTools.ToolCutOut import CutOut + +from AppTools.ToolDblSided import DblSidedTool +from AppTools.ToolExtractDrills import ToolExtractDrills +from AppTools.ToolAlignObjects import AlignObjects + +from AppTools.ToolFilm import Film + +from AppTools.ToolImage import ToolImage + +from AppTools.ToolDistance import Distance +from AppTools.ToolDistanceMin import DistanceMin + +from AppTools.ToolMove import ToolMove + +from AppTools.ToolNCC import NonCopperClear +from AppTools.ToolPaint import ToolPaint + +from AppTools.ToolOptimal import ToolOptimal + +from AppTools.ToolPanelize import Panelize +from AppTools.ToolPcbWizard import PcbWizard +from AppTools.ToolPDF import ToolPDF +from AppTools.ToolProperties import Properties + +from AppTools.ToolQRCode import QRCode +from AppTools.ToolRulesCheck import RulesCheck + +from AppTools.ToolCopperThieving import ToolCopperThieving +from AppTools.ToolFiducials import ToolFiducials + +from AppTools.ToolShell import FCShell +from AppTools.ToolSolderPaste import SolderPaste +from AppTools.ToolSub import ToolSub + +from AppTools.ToolTransform import ToolTransform +from AppTools.ToolPunchGerber import ToolPunchGerber + +from AppTools.ToolInvertGerber import ToolInvertGerber +from AppTools.ToolCorners import ToolCorners diff --git a/FlatCAMTranslation.py b/AppTranslation.py similarity index 100% rename from FlatCAMTranslation.py rename to AppTranslation.py diff --git a/FlatCAMWorker.py b/AppWorker.py similarity index 100% rename from FlatCAMWorker.py rename to AppWorker.py diff --git a/FlatCAMWorkerStack.py b/AppWorkerStack.py similarity index 97% rename from FlatCAMWorkerStack.py rename to AppWorkerStack.py index 3ce56011..fc8cd6d2 100644 --- a/FlatCAMWorkerStack.py +++ b/AppWorkerStack.py @@ -1,5 +1,5 @@ from PyQt5 import QtCore -from FlatCAMWorker import Worker +from AppWorker import Worker import multiprocessing diff --git a/FlatCAMBookmark.py b/Bookmark.py similarity index 99% rename from FlatCAMBookmark.py rename to Bookmark.py index b9884fe2..615d4e00 100644 --- a/FlatCAMBookmark.py +++ b/Bookmark.py @@ -1,5 +1,5 @@ from PyQt5 import QtGui, QtCore, QtWidgets -from flatcamGUI.GUIElements import FCTable, FCEntry, FCButton, FCFileSaveDialog +from AppGUI.GUIElements import FCTable, FCEntry, FCButton, FCFileSaveDialog import sys import webbrowser @@ -7,7 +7,7 @@ import webbrowser from copy import deepcopy from datetime import datetime import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/CHANGELOG.md b/CHANGELOG.md index 69ae19f5..384d73fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ CHANGELOG for FlatCAM beta - modified the GUI for Film and Panelize Tools - moved some of the GUI related methods from FlatCAMApp.App to the flatcamGUI.FlatCAMGUI class - moved Shortcuts Tab creation in it's own class +- renamed classes to have shorter names and grouped 17.05.2020 diff --git a/FlatCAMCommon.py b/Common.py similarity index 99% rename from FlatCAMCommon.py rename to Common.py index f7bfae9e..d51a8b0e 100644 --- a/FlatCAMCommon.py +++ b/Common.py @@ -14,13 +14,13 @@ from PyQt5 import QtCore from shapely.geometry import Polygon, MultiPolygon -from flatcamGUI.VisPyVisuals import ShapeCollection -from FlatCAMTool import FlatCAMTool +from AppGUI.VisPyVisuals import ShapeCollection +from AppTool import FlatCAMTool import numpy as np import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') @@ -146,7 +146,7 @@ class ExclusionAreas(QtCore.QObject): except AttributeError: self.exclusion_shapes = None else: - from flatcamGUI.PlotCanvasLegacy import ShapeCollectionLegacy + from AppGUI.PlotCanvasLegacy import ShapeCollectionLegacy self.exclusion_shapes = ShapeCollectionLegacy(obj=self, app=self.app, name="exclusion") # Event signals disconnect id holders diff --git a/FlatCAM.py b/FlatCAM.py index 3875f0f3..68cda751 100644 --- a/FlatCAM.py +++ b/FlatCAM.py @@ -3,8 +3,8 @@ import os from PyQt5 import QtWidgets from PyQt5.QtCore import QSettings, Qt -from FlatCAMApp import App -from flatcamGUI import VisPyPatches +from App import App +from AppGUI import VisPyPatches from multiprocessing import freeze_support # import copyreg @@ -31,7 +31,7 @@ def debug_trace(): if __name__ == '__main__': # All X11 calling should be thread safe otherwise we have strange issues # QtCore.QCoreApplication.setAttribute(QtCore.Qt.AA_X11InitThreads) - # NOTE: Never talk to the GUI from threads! This is why I commented the above. + # NOTE: Never talk to the AppGUI from threads! This is why I commented the above. freeze_support() major_v = sys.version_info.major diff --git a/camlib.py b/camlib.py index 613d6590..e25cb001 100644 --- a/camlib.py +++ b/camlib.py @@ -46,14 +46,14 @@ import rasterio from rasterio.features import shapes import ezdxf -from FlatCAMCommon import GracefulException as grace +from Common import GracefulException as grace # TODO: Commented for FlatCAM packaging with cx_freeze # from scipy.spatial import KDTree, Delaunay # from scipy.spatial import Delaunay -from flatcamParsers.ParseSVG import * -from flatcamParsers.ParseDXF import * +from AppParsers.ParseSVG import * +from AppParsers.ParseDXF import * if platform.architecture()[0] == '64bit': from ortools.constraint_solver import pywrapcp @@ -62,7 +62,7 @@ if platform.architecture()[0] == '64bit': import logging import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') @@ -502,7 +502,7 @@ class Geometry(object): if self.app.is_legacy is False: self.temp_shapes = self.app.plotcanvas.new_shape_group() else: - from flatcamGUI.PlotCanvasLegacy import ShapeCollectionLegacy + from AppGUI.PlotCanvasLegacy import ShapeCollectionLegacy self.temp_shapes = ShapeCollectionLegacy(obj=self, app=self.app, name='camlib.geometry') def plot_temp_shapes(self, element, color='red'): @@ -1267,7 +1267,7 @@ class Geometry(object): # graceful abort requested by the user raise grace - # 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() # Can only result in a Polygon or MultiPolygon @@ -1359,7 +1359,7 @@ class Geometry(object): # graceful abort requested by the user raise grace - # 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() path = Point(seedpoint).buffer(radius, int(steps_per_circle)).exterior @@ -1473,7 +1473,7 @@ class Geometry(object): # graceful abort requested by the user raise grace - # 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() line = LineString([(left, y), (right, y)]) @@ -1510,7 +1510,7 @@ class Geometry(object): # graceful abort requested by the user raise grace - # 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() line = LineString([(x, top), (x, bot)]) @@ -1641,7 +1641,7 @@ class Geometry(object): # graceful abort requested by the user raise grace - # 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() new_line = line.parallel_offset(distance=delta, side='left', resolution=int(steps_per_circle)) @@ -3016,7 +3016,7 @@ class CNCjob(Geometry): ) # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - # APPLY Offset only when using the GUI, for TclCommand this will create an error + # APPLY Offset only when using the AppGUI, for TclCommand this will create an error # because the values for Z offset are created in build_ui() # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! try: @@ -3235,7 +3235,7 @@ class CNCjob(Geometry): ) # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - # APPLY Offset only when using the GUI, for TclCommand this will create an error + # APPLY Offset only when using the AppGUI, for TclCommand this will create an error # because the values for Z offset are created in build_ui() # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! try: @@ -3399,7 +3399,7 @@ class CNCjob(Geometry): ) # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - # APPLY Offset only when using the GUI, for TclCommand this will create an error + # APPLY Offset only when using the AppGUI, for TclCommand this will create an error # because the values for Z offset are created in build_ui() # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! try: @@ -6418,7 +6418,7 @@ def distance_euclidian(x1, y1, x2, y2): class FlatCAMRTree(object): """ Indexes geometry (Any object with "cooords" property containing - a list of tuples with x, y values). Objects are indexed by + a list of tuples with x, y values). AppObjects are indexed by all their points by default. To index by arbitrary points, override self.points2obj. """ diff --git a/defaults.py b/defaults.py index d8bd7186..5c602258 100644 --- a/defaults.py +++ b/defaults.py @@ -2,16 +2,16 @@ import os import stat import sys from copy import deepcopy -from FlatCAMCommon import LoudDict +from Common import LoudDict from camlib import to_dict, CNCjob, Geometry import simplejson import logging import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins -from flatcamParsers.ParseExcellon import Excellon -from flatcamParsers.ParseGerber import Gerber +from AppParsers.ParseExcellon import Excellon +from AppParsers.ParseGerber import Gerber fcTranslate.apply_language('strings') if '_' not in builtins.__dict__: @@ -64,7 +64,7 @@ class FlatCAMDefaults: "global_machinist_setting": False, - # Global GUI Preferences + # Global AppGUI Preferences "global_gridx": 1.0, "global_gridy": 1.0, "global_snap_max": 0.05, @@ -125,7 +125,7 @@ class FlatCAMDefaults: "global_tcl_path": '', - # General GUI Settings + # General AppGUI Settings "global_theme": 'white', "global_gray_icons": False, "global_hover": False, @@ -636,7 +636,7 @@ class FlatCAMDefaults: "tools_punch_rectangular": False, "tools_punch_others": False, - # Align Objects Tool + # Align AppObjects Tool "tools_align_objects_align_type": 'sp', # Invert Gerber Tool diff --git a/flatcamTools/__init__.py b/flatcamTools/__init__.py deleted file mode 100644 index 184a7f43..00000000 --- a/flatcamTools/__init__.py +++ /dev/null @@ -1,43 +0,0 @@ - -from flatcamTools.ToolCalculators import ToolCalculator -from flatcamTools.ToolCalibration import ToolCalibration -from flatcamTools.ToolCutOut import CutOut - -from flatcamTools.ToolDblSided import DblSidedTool -from flatcamTools.ToolExtractDrills import ToolExtractDrills -from flatcamTools.ToolAlignObjects import AlignObjects - -from flatcamTools.ToolFilm import Film - -from flatcamTools.ToolImage import ToolImage - -from flatcamTools.ToolDistance import Distance -from flatcamTools.ToolDistanceMin import DistanceMin - -from flatcamTools.ToolMove import ToolMove - -from flatcamTools.ToolNCC import NonCopperClear -from flatcamTools.ToolPaint import ToolPaint - -from flatcamTools.ToolOptimal import ToolOptimal - -from flatcamTools.ToolPanelize import Panelize -from flatcamTools.ToolPcbWizard import PcbWizard -from flatcamTools.ToolPDF import ToolPDF -from flatcamTools.ToolProperties import Properties - -from flatcamTools.ToolQRCode import QRCode -from flatcamTools.ToolRulesCheck import RulesCheck - -from flatcamTools.ToolCopperThieving import ToolCopperThieving -from flatcamTools.ToolFiducials import ToolFiducials - -from flatcamTools.ToolShell import FCShell -from flatcamTools.ToolSolderPaste import SolderPaste -from flatcamTools.ToolSub import ToolSub - -from flatcamTools.ToolTransform import ToolTransform -from flatcamTools.ToolPunchGerber import ToolPunchGerber - -from flatcamTools.ToolInvertGerber import ToolInvertGerber -from flatcamTools.ToolCorners import ToolCorners diff --git a/make_freezed.py b/make_freezed.py index 43c144a5..170fc7a7 100644 --- a/make_freezed.py +++ b/make_freezed.py @@ -63,7 +63,7 @@ include_files.append(("assets/examples", "lib/assets/examples")) include_files.append(("assets/linux", "lib/assets/linux")) include_files.append(("assets/resources", "lib/assets/resources")) # include_files.append(("share", "lib/share")) -include_files.append(("flatcamGUI/VisPyData", "lib/vispy")) +include_files.append(("AppGUI/VisPyData", "lib/vispy")) include_files.append(("config", "lib/config")) include_files.append(("README.md", "README.md")) diff --git a/preprocessors/Berta_CNC.py b/preprocessors/Berta_CNC.py index 8239d0e9..2b2cc5c1 100644 --- a/preprocessors/Berta_CNC.py +++ b/preprocessors/Berta_CNC.py @@ -10,7 +10,7 @@ # MIT Licence # ############################################################## -from FlatCAMPostProc import * +from AppPreProcessor import * class Berta_CNC(FlatCAMPostProc): @@ -102,7 +102,7 @@ class Berta_CNC(FlatCAMPostProc): gcode += '(Spindle Speed: %s RPM)\n' % str(p['spindlespeed']) gcode += ( - # This line allow you to sets the machine to METRIC / INCH in the GUI + # This line allow you to sets the machine to METRIC / INCH in the AppGUI 'G20\n' if p.units.upper() == 'IN' else 'G21\n') + '\n' # gcode += 'G21\n' # This line sets the machine to METRIC ONLY # gcode += 'G20\n' # This line sets the machine to INCH ONLY diff --git a/preprocessors/GRBL_laser.py b/preprocessors/GRBL_laser.py index 9caf4f39..7f1c025a 100644 --- a/preprocessors/GRBL_laser.py +++ b/preprocessors/GRBL_laser.py @@ -6,7 +6,7 @@ # MIT Licence # # ########################################################## -from FlatCAMPostProc import * +from AppPreProcessor import * # This post processor is configured to output code that # is compatible with almost any version of Grbl. diff --git a/preprocessors/ISEL_CNC.py b/preprocessors/ISEL_CNC.py index 8c7c9ed0..3a92c9f8 100644 --- a/preprocessors/ISEL_CNC.py +++ b/preprocessors/ISEL_CNC.py @@ -6,7 +6,7 @@ # MIT Licence # # ########################################################## -from FlatCAMPostProc import * +from AppPreProcessor import * class ISEL_CNC(FlatCAMPostProc): diff --git a/preprocessors/ISEL_ICP_CNC.py b/preprocessors/ISEL_ICP_CNC.py index a6a137f8..d8f59acd 100644 --- a/preprocessors/ISEL_ICP_CNC.py +++ b/preprocessors/ISEL_ICP_CNC.py @@ -6,7 +6,7 @@ # MIT Licence # # ########################################################## -from FlatCAMPostProc import * +from AppPreProcessor import * class ISEL_ICP_CNC(FlatCAMPostProc): diff --git a/preprocessors/Marlin.py b/preprocessors/Marlin.py index d53a257f..539d27d8 100644 --- a/preprocessors/Marlin.py +++ b/preprocessors/Marlin.py @@ -6,7 +6,7 @@ # MIT Licence # # ########################################################## -from FlatCAMPostProc import * +from AppPreProcessor import * class Marlin(FlatCAMPostProc): diff --git a/preprocessors/Marlin_laser_FAN_pin.py b/preprocessors/Marlin_laser_FAN_pin.py index 2d06d23d..fc9e5557 100644 --- a/preprocessors/Marlin_laser_FAN_pin.py +++ b/preprocessors/Marlin_laser_FAN_pin.py @@ -6,7 +6,7 @@ # License: MIT Licence # # ########################################################## -from FlatCAMPostProc import * +from AppPreProcessor import * class Marlin_laser_FAN_pin(FlatCAMPostProc): diff --git a/preprocessors/Marlin_laser_Spindle_pin.py b/preprocessors/Marlin_laser_Spindle_pin.py index 151e9dc4..5721a1c0 100644 --- a/preprocessors/Marlin_laser_Spindle_pin.py +++ b/preprocessors/Marlin_laser_Spindle_pin.py @@ -6,7 +6,7 @@ # License: MIT Licence # # ########################################################## -from FlatCAMPostProc import * +from AppPreProcessor import * class Marlin_laser_Spindle_pin(FlatCAMPostProc): diff --git a/preprocessors/Paste_1.py b/preprocessors/Paste_1.py index cbb0b19f..b08b1473 100644 --- a/preprocessors/Paste_1.py +++ b/preprocessors/Paste_1.py @@ -6,7 +6,7 @@ # MIT Licence # # ########################################################## -from FlatCAMPostProc import * +from AppPreProcessor import * class Paste_1(FlatCAMPostProc_Tools): diff --git a/preprocessors/Repetier.py b/preprocessors/Repetier.py index bb17f9ee..74e70773 100644 --- a/preprocessors/Repetier.py +++ b/preprocessors/Repetier.py @@ -6,7 +6,7 @@ # MIT Licence # # ########################################################## -from FlatCAMPostProc import * +from AppPreProcessor import * class Repetier(FlatCAMPostProc): diff --git a/preprocessors/Roland_MDX_20.py b/preprocessors/Roland_MDX_20.py index 49b65b92..26c3662c 100644 --- a/preprocessors/Roland_MDX_20.py +++ b/preprocessors/Roland_MDX_20.py @@ -6,7 +6,7 @@ # MIT Licence # # ########################################################## -from FlatCAMPostProc import * +from AppPreProcessor import * # for Roland Preprocessors it is mandatory for the preprocessor name (python file and class name, both of them must be diff --git a/preprocessors/Toolchange_Custom.py b/preprocessors/Toolchange_Custom.py index 1c2eeffc..88de5435 100644 --- a/preprocessors/Toolchange_Custom.py +++ b/preprocessors/Toolchange_Custom.py @@ -6,7 +6,7 @@ # MIT Licence # # ########################################################## -from FlatCAMPostProc import * +from AppPreProcessor import * class Toolchange_Custom(FlatCAMPostProc): diff --git a/preprocessors/Toolchange_Manual.py b/preprocessors/Toolchange_Manual.py index 27aaec22..c113bbfc 100644 --- a/preprocessors/Toolchange_Manual.py +++ b/preprocessors/Toolchange_Manual.py @@ -6,7 +6,7 @@ # MIT Licence # # ########################################################## -from FlatCAMPostProc import * +from AppPreProcessor import * class Toolchange_Manual(FlatCAMPostProc): diff --git a/preprocessors/Toolchange_Probe_MACH3.py b/preprocessors/Toolchange_Probe_MACH3.py index f5f8c9c3..818327d2 100644 --- a/preprocessors/Toolchange_Probe_MACH3.py +++ b/preprocessors/Toolchange_Probe_MACH3.py @@ -6,7 +6,7 @@ # MIT Licence # # ########################################################## -from FlatCAMPostProc import * +from AppPreProcessor import * class Toolchange_Probe_MACH3(FlatCAMPostProc): diff --git a/preprocessors/default.py b/preprocessors/default.py index 7c5cf1c6..87d0c56c 100644 --- a/preprocessors/default.py +++ b/preprocessors/default.py @@ -6,7 +6,7 @@ # MIT Licence # # ########################################################## -from FlatCAMPostProc import * +from AppPreProcessor import * class default(FlatCAMPostProc): diff --git a/preprocessors/grbl_11.py b/preprocessors/grbl_11.py index b002b2b2..75bb8556 100644 --- a/preprocessors/grbl_11.py +++ b/preprocessors/grbl_11.py @@ -6,7 +6,7 @@ # MIT Licence # # ########################################################## -from FlatCAMPostProc import * +from AppPreProcessor import * class grbl_11(FlatCAMPostProc): diff --git a/preprocessors/hpgl.py b/preprocessors/hpgl.py index 8e8acde3..61ffc0c6 100644 --- a/preprocessors/hpgl.py +++ b/preprocessors/hpgl.py @@ -6,7 +6,7 @@ # MIT Licence # # ########################################################## -from FlatCAMPostProc import * +from AppPreProcessor import * # for Roland Preprocessors it is mandatory for the preprocessor name (python file and class name, both of them must be diff --git a/preprocessors/line_xyz.py b/preprocessors/line_xyz.py index 900d7fab..6beb432c 100644 --- a/preprocessors/line_xyz.py +++ b/preprocessors/line_xyz.py @@ -6,7 +6,7 @@ # MIT Licence # # ########################################################## -from FlatCAMPostProc import * +from AppPreProcessor import * class line_xyz(FlatCAMPostProc): diff --git a/tclCommands/TclCommand.py b/tclCommands/TclCommand.py index ed2d0260..d89eb0c4 100644 --- a/tclCommands/TclCommand.py +++ b/tclCommands/TclCommand.py @@ -1,6 +1,6 @@ import sys import re -import FlatCAMApp +import App import abc import collections from PyQt5 import QtCore @@ -53,7 +53,7 @@ class TclCommand(object): if self.app is None: raise TypeError('Expected app to be FlatCAMApp instance.') - if not isinstance(self.app, FlatCAMApp.App): + if not isinstance(self.app, App.App): raise TypeError('Expected FlatCAMApp, got %s.' % type(app)) self.log = self.app.log diff --git a/tclCommands/TclCommandBbox.py b/tclCommands/TclCommandBbox.py index 6e38bb99..012fe433 100644 --- a/tclCommands/TclCommandBbox.py +++ b/tclCommands/TclCommandBbox.py @@ -4,7 +4,7 @@ from tclCommands.TclCommand import TclCommand from shapely.ops import cascaded_union import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/tclCommands/TclCommandBounds.py b/tclCommands/TclCommandBounds.py index c5752da3..e4d68d9b 100644 --- a/tclCommands/TclCommandBounds.py +++ b/tclCommands/TclCommandBounds.py @@ -3,7 +3,7 @@ import collections import logging import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/tclCommands/TclCommandCopperClear.py b/tclCommands/TclCommandCopperClear.py index a4fd130c..0e849ee5 100644 --- a/tclCommands/TclCommandCopperClear.py +++ b/tclCommands/TclCommandCopperClear.py @@ -4,7 +4,7 @@ import collections import logging import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/tclCommands/TclCommandDrillcncjob.py b/tclCommands/TclCommandDrillcncjob.py index b2123f46..39d2f28e 100644 --- a/tclCommands/TclCommandDrillcncjob.py +++ b/tclCommands/TclCommandDrillcncjob.py @@ -4,7 +4,7 @@ import collections import math import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/tclCommands/TclCommandGeoCutout.py b/tclCommands/TclCommandGeoCutout.py index bef600c1..91a7f660 100644 --- a/tclCommands/TclCommandGeoCutout.py +++ b/tclCommands/TclCommandGeoCutout.py @@ -7,7 +7,7 @@ from shapely.ops import cascaded_union from shapely.geometry import Polygon, LineString, LinearRing import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins log = logging.getLogger('base') diff --git a/tclCommands/TclCommandGetNames.py b/tclCommands/TclCommandGetNames.py index 6bb45e14..ca6c17b4 100644 --- a/tclCommands/TclCommandGetNames.py +++ b/tclCommands/TclCommandGetNames.py @@ -5,7 +5,7 @@ import collections class TclCommandGetNames(TclCommand): """ - Tcl shell command to set an object as active in the GUI. + Tcl shell command to set an object as active in the AppGUI. example: diff --git a/tclCommands/TclCommandGetPath.py b/tclCommands/TclCommandGetPath.py index d6d76b35..346a9243 100644 --- a/tclCommands/TclCommandGetPath.py +++ b/tclCommands/TclCommandGetPath.py @@ -11,7 +11,7 @@ import collections import os import logging import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/tclCommands/TclCommandHelp.py b/tclCommands/TclCommandHelp.py index a5688381..ff1e9d12 100644 --- a/tclCommands/TclCommandHelp.py +++ b/tclCommands/TclCommandHelp.py @@ -11,7 +11,7 @@ from tclCommands.TclCommand import TclCommand import collections import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/tclCommands/TclCommandImportSvg.py b/tclCommands/TclCommandImportSvg.py index 9ef67e27..5dd7146a 100644 --- a/tclCommands/TclCommandImportSvg.py +++ b/tclCommands/TclCommandImportSvg.py @@ -81,5 +81,5 @@ class TclCommandImportSvg(TclCommandSignaled): # Register recent file self.app.file_opened.emit("svg", filename) - # GUI feedback + # AppGUI feedback self.app.inform.emit("Opened: " + filename) diff --git a/tclCommands/TclCommandJoinExcellon.py b/tclCommands/TclCommandJoinExcellon.py index 5c1962ff..0e25c829 100644 --- a/tclCommands/TclCommandJoinExcellon.py +++ b/tclCommands/TclCommandJoinExcellon.py @@ -1,5 +1,5 @@ from tclCommands.TclCommand import TclCommand -from flatcamObjects.FlatCAMExcellon import ExcellonObject +from AppObjects.FlatCAMExcellon import ExcellonObject import collections diff --git a/tclCommands/TclCommandJoinGeometry.py b/tclCommands/TclCommandJoinGeometry.py index 67e3aeb5..cb119856 100644 --- a/tclCommands/TclCommandJoinGeometry.py +++ b/tclCommands/TclCommandJoinGeometry.py @@ -1,5 +1,5 @@ from tclCommands.TclCommand import TclCommand -from flatcamObjects.FlatCAMGeometry import GeometryObject +from AppObjects.FlatCAMGeometry import GeometryObject import collections diff --git a/tclCommands/TclCommandNregions.py b/tclCommands/TclCommandNregions.py index f7aec69d..3663f0f0 100644 --- a/tclCommands/TclCommandNregions.py +++ b/tclCommands/TclCommandNregions.py @@ -5,7 +5,7 @@ from shapely.ops import cascaded_union import collections import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/tclCommands/TclCommandOpenDXF.py b/tclCommands/TclCommandOpenDXF.py index 4e46d2a4..d2de6956 100644 --- a/tclCommands/TclCommandOpenDXF.py +++ b/tclCommands/TclCommandOpenDXF.py @@ -90,5 +90,5 @@ class TclCommandOpenDXF(TclCommandSignaled): # Register recent file self.app.file_opened.emit("dxf", filename) - # GUI feedback + # AppGUI feedback self.app.inform.emit("Opened: " + filename) diff --git a/tclCommands/TclCommandOpenSVG.py b/tclCommands/TclCommandOpenSVG.py index 9c2b514e..503f8507 100644 --- a/tclCommands/TclCommandOpenSVG.py +++ b/tclCommands/TclCommandOpenSVG.py @@ -89,5 +89,5 @@ class TclCommandOpenSVG(TclCommandSignaled): # Register recent file self.app.file_opened.emit("svg", filename) - # GUI feedback + # AppGUI feedback self.app.inform.emit("Opened: " + filename) diff --git a/tclCommands/TclCommandPaint.py b/tclCommands/TclCommandPaint.py index 3ef6f1c6..d6b0916c 100644 --- a/tclCommands/TclCommandPaint.py +++ b/tclCommands/TclCommandPaint.py @@ -4,7 +4,7 @@ import collections import logging import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/tclCommands/TclCommandPlotAll.py b/tclCommands/TclCommandPlotAll.py index 4e9f8277..001afb36 100644 --- a/tclCommands/TclCommandPlotAll.py +++ b/tclCommands/TclCommandPlotAll.py @@ -14,7 +14,7 @@ class TclCommandPlotAll(TclCommandSignaled): # List of all command aliases, to be able use old names for backward compatibility (add_poly, add_polygon) aliases = ['plot_all'] - description = '%s %s' % ("--", "Plots all objects on GUI.") + description = '%s %s' % ("--", "Plots all objects on AppGUI.") # Dictionary of types from Tcl command, needs to be ordered arg_names = collections.OrderedDict([ @@ -32,7 +32,7 @@ class TclCommandPlotAll(TclCommandSignaled): # structured help for current command, args needs to be ordered help = { - 'main': "Plots all objects on GUI.", + 'main': "Plots all objects on AppGUI.", 'args': collections.OrderedDict([ ('plot_status', 'If to display or not the objects: True (1) or False (0).'), ('use_thread', 'If to use multithreading: True (1) or False (0).') diff --git a/tclCommands/TclCommandPlotObjects.py b/tclCommands/TclCommandPlotObjects.py index 8a26e36c..5fce3216 100644 --- a/tclCommands/TclCommandPlotObjects.py +++ b/tclCommands/TclCommandPlotObjects.py @@ -21,7 +21,7 @@ class TclCommandPlotObjects(TclCommand): # List of all command aliases, to be able use old names for backward compatibility (add_poly, add_polygon) aliases = ['plot_objects'] - description = '%s %s' % ("--", "Plot a specified list of objects in GUI.") + description = '%s %s' % ("--", "Plot a specified list of objects in AppGUI.") # Dictionary of types from Tcl command, needs to be ordered arg_names = collections.OrderedDict([ @@ -38,7 +38,7 @@ class TclCommandPlotObjects(TclCommand): # structured help for current command, args needs to be ordered help = { - 'main': "Plot a specified list of objects in GUI.", + 'main': "Plot a specified list of objects in AppGUI.", 'args': collections.OrderedDict([ ('names', "A list of object names to be plotted separated by comma. Required.\n" "WARNING: no spaces are allowed. If unsure enclose the entire list with quotes."), diff --git a/tclCommands/TclCommandScale.py b/tclCommands/TclCommandScale.py index ac790842..b447db8c 100644 --- a/tclCommands/TclCommandScale.py +++ b/tclCommands/TclCommandScale.py @@ -4,7 +4,7 @@ import collections import logging import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/tclCommands/TclCommandSetActive.py b/tclCommands/TclCommandSetActive.py index 6dfecd00..febe927b 100644 --- a/tclCommands/TclCommandSetActive.py +++ b/tclCommands/TclCommandSetActive.py @@ -5,7 +5,7 @@ import collections class TclCommandSetActive(TclCommand): """ - Tcl shell command to set an object as active in the GUI. + Tcl shell command to set an object as active in the AppGUI. example: diff --git a/tclCommands/TclCommandSetOrigin.py b/tclCommands/TclCommandSetOrigin.py index a0afeb08..d2c9681c 100644 --- a/tclCommands/TclCommandSetOrigin.py +++ b/tclCommands/TclCommandSetOrigin.py @@ -13,7 +13,7 @@ from camlib import get_bounds import logging import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/tclCommands/TclCommandSetPath.py b/tclCommands/TclCommandSetPath.py index 79d6c325..09b30e43 100644 --- a/tclCommands/TclCommandSetPath.py +++ b/tclCommands/TclCommandSetPath.py @@ -11,7 +11,7 @@ import collections import os import logging import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings') diff --git a/tclCommands/TclCommandSubtractRectangle.py b/tclCommands/TclCommandSubtractRectangle.py index b50a2467..95d66bd2 100644 --- a/tclCommands/TclCommandSubtractRectangle.py +++ b/tclCommands/TclCommandSubtractRectangle.py @@ -3,7 +3,7 @@ from tclCommands.TclCommand import TclCommandSignaled import collections import gettext -import FlatCAMTranslation as fcTranslate +import AppTranslation as fcTranslate import builtins fcTranslate.apply_language('strings')