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

- remade file names in the app

Browse Source 
- fixed the issue with factory_defaults being saved every time the app start
- fixed the preferences not being saved to a file when the Save button is pressed in Edit -> Preferences
- fixed and updated the Transform Tools in the Editors
This commit is contained in:
Marius Stanciu
2020-06-03 20:35:59 +03:00
committed by Marius
parent 378a497935
commit 2eecb20e95
190 changed files with 1940 additions and 1990 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
camlib.py
View File

@@ -50,8 +50,8 @@ from Common import GracefulException as grace
# from scipy.spatial import KDTree, Delaunay
# from scipy.spatial import Delaunay
from AppParsers.ParseSVG import *
from AppParsers.ParseDXF import *
from appParsers.ParseSVG import *
from appParsers.ParseDXF import *
if platform.architecture()[0] == '64bit':
from ortools.constraint_solver import pywrapcp
@@ -60,7 +60,7 @@ if platform.architecture()[0] == '64bit':
import logging
import gettext
import AppTranslation as fcTranslate
import appTranslation as fcTranslate
import builtins
fcTranslate.apply_language('strings')
@@ -500,7 +500,7 @@ class Geometry(object):
if self.app.is_legacy is False:
self.temp_shapes = self.app.plotcanvas.new_shape_collection(layers=1)
else:
from AppGUI.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'):
@@ -3086,7 +3086,7 @@ class CNCjob(Geometry):
)
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
# APPLY Offset only when using the AppGUI, 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:
@@ -3339,7 +3339,7 @@ class CNCjob(Geometry):
)
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
# APPLY Offset only when using the AppGUI, 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:
@@ -3537,7 +3537,7 @@ class CNCjob(Geometry):
)
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
# APPLY Offset only when using the AppGUI, 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: