- replaced the testing if instance of FlatCAMObj with testing the obj.kind attribute
- removed the import of the whole FlatCAMApp file only for the usage of GracefulException - remove the import of FlatCAMApp and used alternate ways - optimized the imports in some files - moved the Bookmarksmanager and ToolDB classes into their own files - solved some bugs that were not so visible in the Editors and HPGL parser - split the FlatCAMObj file into multiple files located in the flatcamObjects folder and renamed the contained classes with names more suggestive - updated the Google Translation for the German language
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
from tclCommands.TclCommand import TclCommandSignaled
|
||||
from FlatCAMObj import FlatCAMGerber, FlatCAMGeometry
|
||||
|
||||
import logging
|
||||
import collections
|
||||
@@ -209,7 +208,7 @@ class TclCommandGeoCutout(TclCommandSignaled):
|
||||
except ValueError:
|
||||
gaps_u = gaps
|
||||
|
||||
if isinstance(cutout_obj, FlatCAMGeometry):
|
||||
if cutout_obj.kind == 'geometry':
|
||||
# rename the obj name so it can be identified as cutout
|
||||
# cutout_obj.options["name"] += "_cutout"
|
||||
|
||||
@@ -306,7 +305,7 @@ class TclCommandGeoCutout(TclCommandSignaled):
|
||||
# cutout_obj.plot()
|
||||
# self.app.inform.emit("[success] Any-form Cutout operation finished.")
|
||||
# self.app.plots_updated.emit()
|
||||
elif isinstance(cutout_obj, FlatCAMGerber):
|
||||
elif cutout_obj.kind == 'gerber':
|
||||
|
||||
def geo_init(geo_obj, app_obj):
|
||||
try:
|
||||
|
||||
Reference in New Issue
Block a user