- 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:
@@ -2263,7 +2263,7 @@ class NonCopperClear(FlatCAMTool, Gerber):
|
||||
# ##########################################################################################
|
||||
def gen_clear_area(geo_obj, app_obj):
|
||||
assert geo_obj.kind == 'geometry', \
|
||||
"Initializer expected a FlatCAMGeometry, got %s" % type(geo_obj)
|
||||
"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
|
||||
if not run_threaded:
|
||||
@@ -2551,7 +2551,7 @@ class NonCopperClear(FlatCAMTool, Gerber):
|
||||
# ###########################################################################################
|
||||
def gen_clear_area_rest(geo_obj, app_obj):
|
||||
assert geo_obj.kind == 'geometry', \
|
||||
"Initializer expected a FlatCAMGeometry, got %s" % type(geo_obj)
|
||||
"Initializer expected a GeometryObject, got %s" % type(geo_obj)
|
||||
|
||||
log.debug("NCC Tool. Rest machining copper clearing task started.")
|
||||
app_obj.inform.emit('_(NCC Tool. Rest machining copper clearing task started.')
|
||||
@@ -3045,7 +3045,7 @@ class NonCopperClear(FlatCAMTool, Gerber):
|
||||
# ##########################################################################################
|
||||
def gen_clear_area(geo_obj, app_obj):
|
||||
assert geo_obj.kind == 'geometry', \
|
||||
"Initializer expected a FlatCAMGeometry, got %s" % type(geo_obj)
|
||||
"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
|
||||
if not run_threaded:
|
||||
@@ -3446,7 +3446,7 @@ class NonCopperClear(FlatCAMTool, Gerber):
|
||||
# ###########################################################################################
|
||||
def gen_clear_area_rest(geo_obj, app_obj):
|
||||
assert geo_obj.kind == 'geometry', \
|
||||
"Initializer expected a FlatCAMGeometry, got %s" % type(geo_obj)
|
||||
"Initializer expected a GeometryObject, got %s" % type(geo_obj)
|
||||
|
||||
log.debug("NCC Tool. Rest machining copper clearing task started.")
|
||||
app_obj.inform.emit('_(NCC Tool. Rest machining copper clearing task started.')
|
||||
|
||||
Reference in New Issue
Block a user