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

- more messages

Browse Source
This commit is contained in:
Marius Stanciu
2019-09-05 17:53:59 +03:00
parent 76138986bf
commit 67f0c657c6
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
FlatCAMObj.py
View File

@@ -4785,7 +4785,9 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
else: else:
dia_cnc_dict['gcode'] = res dia_cnc_dict['gcode'] = res
self.app.inform.emit('[success] %s' % _("G-Code parsing in progress..."))
dia_cnc_dict['gcode_parsed'] = job_obj.gcode_parse() dia_cnc_dict['gcode_parsed'] = job_obj.gcode_parse()
self.app.inform.emit('[success] %s' % _("G-Code parsing finished..."))
# TODO this serve for bounding box creation only; should be optimized # TODO this serve for bounding box creation only; should be optimized
# commented this; there is no need for the actual GCode geometry - the original one will serve as well # commented this; there is no need for the actual GCode geometry - the original one will serve as well
@@ -4794,10 +4796,10 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
# geo['geom'] for geo in dia_cnc_dict['gcode_parsed'] if geo['geom'].is_valid is True # geo['geom'] for geo in dia_cnc_dict['gcode_parsed'] if geo['geom'].is_valid is True
# ]) # ])
try: try:
dia_cnc_dict['solid_geometry'] = cascaded_union(tool_solid_geometry) dia_cnc_dict['solid_geometry'] = tool_solid_geometry
self.app.inform.emit(_("[success] Finished G-Code processing...")) self.app.inform.emit('[success] %s' % _("Finished G-Code processing..."))
except Exception as e: except Exception as e:
self.app.inform.emit(_("[ERROR] G-Code processing failed with error: %s") % str(e)) self.app.inform.emit('[ERROR] %s' % _("G-Code processing failed with error: %s") % str(e))
# tell gcode_parse from which point to start drawing the lines depending on what kind of # tell gcode_parse from which point to start drawing the lines depending on what kind of
# object is the source of gcode # object is the source of gcode

8
camlib.py
View File

@@ -5813,8 +5813,9 @@ class CNCjob(Geometry):
else: else:
self.xy_toolchange = [float(eval(a)) for a in toolchangexy.split(",")] self.xy_toolchange = [float(eval(a)) for a in toolchangexy.split(",")]
if len(self.xy_toolchange) < 2: if len(self.xy_toolchange) < 2:
self.app.inform.emit(_("[ERROR]The Toolchange X,Y field in Edit -> Preferences has to be " self.app.inform.emit('[ERROR] %s' % _("The Toolchange X,Y field in Edit -> Preferences has to be "
"in the format (x, y) \nbut now there is only one value, not two. ")) "in the format (x, y) \n"
"but now there is only one value, not two."))
return 'fail' return 'fail'
except Exception as e: except Exception as e:
log.debug("camlib.CNCJob.generate_from_multitool_geometry() --> %s" % str(e)) log.debug("camlib.CNCJob.generate_from_multitool_geometry() --> %s" % str(e))
@@ -5871,6 +5872,8 @@ class CNCjob(Geometry):
# Store the geometry # Store the geometry
log.debug("Indexing geometry before generating G-Code...") log.debug("Indexing geometry before generating G-Code...")
self.app.inform.emit(_("Indexing geometry before generating G-Code..."))
for shape in flat_geometry: for shape in flat_geometry:
if shape is not None: # TODO: This shouldn't have happened. if shape is not None: # TODO: This shouldn't have happened.
storage.insert(shape) storage.insert(shape)
@@ -5919,6 +5922,7 @@ class CNCjob(Geometry):
# ## Iterate over geometry paths getting the nearest each time. # ## Iterate over geometry paths getting the nearest each time.
log.debug("Starting G-Code...") log.debug("Starting G-Code...")
self.app.inform.emit(_("Starting G-Code..."))
path_count = 0 path_count = 0
current_pt = (0, 0) current_pt = (0, 0)