giuliof
/
flatcam
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- fixed unit conversion functions in case the toolchange_xy parameter is None 

- more fixes in camlib.CNCJob regarding usage of toolchange (in case it is None)
- fixed postprocessor files to work with toolchange_xy parameter value = None (no values in Edit - Preferences fields)
This commit is contained in:
Marius Stanciu 2019-01-31 00:36:32 +02:00 committed by Marius S
parent 7e5ce009d8
commit 7bc806f1dc
4 changed files with 92 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
FlatCAMObj.py
View File

@ -1678,7 +1678,6 @@ class FlatCAMExcellon(FlatCAMObj, Excellon):
drillz=self.options['drillz'], drillz=self.options['drillz'],
toolchange=self.options["toolchange"], toolchange=self.options["toolchange"],
toolchangez=self.options["toolchangez"], toolchangez=self.options["toolchangez"],
toolchangexy=self.options["toolchangexy"],
startz=self.options["startz"], startz=self.options["startz"],
endz=self.options["endz"], endz=self.options["endz"],
excellon_optimization_type=self.options["optimization_type"]) excellon_optimization_type=self.options["optimization_type"])
@ -1724,10 +1723,17 @@ class FlatCAMExcellon(FlatCAMObj, Excellon):
self.options['feedrate_rapid'] *= factor self.options['feedrate_rapid'] *= factor
self.options['toolchangez'] *= factor self.options['toolchangez'] *= factor
coords_xy = [float(eval(coord)) for coord in self.app.defaults["excellon_toolchangexy"].split(",")] if self.app.defaults["excellon_toolchangexy"] == '':
coords_xy[0] *= factor self.options['toolchangexy'] = "0.0, 0.0"
coords_xy[1] *= factor else:
self.options['toolchangexy'] = "%f, %f" % (coords_xy[0], coords_xy[1]) coords_xy = [float(eval(coord)) for coord in self.app.defaults["excellon_toolchangexy"].split(",")]
if len(coords_xy) < 2:
self.app.inform.emit("[error]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. ")
return 'fail'
coords_xy[0] *= factor
coords_xy[1] *= factor
self.options['toolchangexy'] = "%f, %f" % (coords_xy[0], coords_xy[1])
if self.options['startz'] is not None: if self.options['startz'] is not None:
self.options['startz'] *= factor self.options['startz'] *= factor
@ -3583,10 +3589,17 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
self.options["toolchangez"] *= factor self.options["toolchangez"] *= factor
coords_xy = [float(eval(coord)) for coord in self.app.defaults["geometry_toolchangexy"].split(",")] if self.app.defaults["geometry_toolchangexy"] == '':
coords_xy[0] *= factor self.options['toolchangexy'] = "0.0, 0.0"
coords_xy[1] *= factor else:
self.options['toolchangexy'] = "%f, %f" % (coords_xy[0], coords_xy[1]) coords_xy = [float(eval(coord)) for coord in self.app.defaults["geometry_toolchangexy"].split(",")]
if len(coords_xy) < 2:
self.app.inform.emit("[error]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. ")
return 'fail'
coords_xy[0] *= factor
coords_xy[1] *= factor
self.options['toolchangexy'] = "%f, %f" % (coords_xy[0], coords_xy[1])
if self.options['startz'] is not None: if self.options['startz'] is not None:
self.options['startz'] *= factor self.options['startz'] *= factor

3
README.md
View File

@ -17,6 +17,9 @@ CAD program, and create G-Code for Isolation routing.
- added a traceback report in the TCL Shell for the errors that don't allow creation of an object; useful to trace exceptions/errors - added a traceback report in the TCL Shell for the errors that don't allow creation of an object; useful to trace exceptions/errors
- in case that the Toolchange X,Y parameter in Selected (or in Preferences) are deleted then the app will still do the job using the current coordinates for toolchange - in case that the Toolchange X,Y parameter in Selected (or in Preferences) are deleted then the app will still do the job using the current coordinates for toolchange
- fixed an issue in camlib.CNCJob where tha variable self.toolchange_xy was used for 2 different purposes which created loss of information. - fixed an issue in camlib.CNCJob where tha variable self.toolchange_xy was used for 2 different purposes which created loss of information.
- fixed unit conversion functions in case the toolchange_xy parameter is None
- more fixes in camlib.CNCJob regarding usage of toolchange (in case it is None)
- fixed postprocessor files to work with toolchange_xy parameter value = None (no values in Edit - Preferences fields)
29.01.2019 29.01.2019

96
camlib.py
View File

@ -2857,7 +2857,7 @@ class Gerber (Geometry):
traceback.print_tb(tb) traceback.print_tb(tb)
#print traceback.format_exc() #print traceback.format_exc()
log.error("PARSING FAILED. Line %d: %s" % (line_num, gline)) log.error("Gerber PARSING FAILED. Line %d: %s" % (line_num, gline))
self.app.inform.emit("[error] Gerber Parser ERROR.\n Line %d: %s" % (line_num, gline), repr(err)) self.app.inform.emit("[error] Gerber Parser ERROR.\n Line %d: %s" % (line_num, gline), repr(err))
@staticmethod @staticmethod
@ -3987,10 +3987,13 @@ class Excellon(Geometry):
# from self.defaults['excellon_units'] # from self.defaults['excellon_units']
log.info("Zeros: %s, Units %s." % (self.zeros, self.units)) log.info("Zeros: %s, Units %s." % (self.zeros, self.units))
except Exception as e: except Exception as e:
log.error("PARSING FAILED. Line %d: %s" % (line_num, eline)) log.error("Excellon PARSING FAILED. Line %d: %s" % (line_num, eline))
self.app.inform.emit('[error] Excellon Parser ERROR.\nPARSING FAILED. Line %d: %s' % (line_num, eline)) msg = "[error_notcl] An internal error has ocurred. See shell.\n"
msg += '[error] Excellon Parser error.\nParsing Failed. Line %d: %s\n' % (line_num, eline)
msg += traceback.format_exc()
self.app.inform.emit(msg)
return "fail" return "fail"
def parse_number(self, number_str): def parse_number(self, number_str):
@ -4367,7 +4370,7 @@ class CNCjob(Geometry):
pp_geometry_name='default', pp_excellon_name='default', pp_geometry_name='default', pp_excellon_name='default',
depthpercut = 0.1, depthpercut = 0.1,
spindlespeed=None, dwell=True, dwelltime=1000, spindlespeed=None, dwell=True, dwelltime=1000,
toolchangez=0.787402, toolchangez=0.787402, toolchange_xy=[0.0, 0.0],
endz=2.0, endz=2.0,
segx=None, segx=None,
segy=None, segy=None,
@ -4392,7 +4395,7 @@ class CNCjob(Geometry):
self.tooldia = tooldia self.tooldia = tooldia
self.toolchangez = toolchangez self.toolchangez = toolchangez
self.toolchange_xy = None self.toolchange_xy = toolchange_xy
self.toolchange_xy_type = None self.toolchange_xy_type = None
self.endz = endz self.endz = endz
@ -4421,6 +4424,9 @@ class CNCjob(Geometry):
self.input_geometry_bounds = None self.input_geometry_bounds = None
self.oldx = None
self.oldy = None
# Attributes to be included in serialization # Attributes to be included in serialization
# Always append to it because it carries contents # Always append to it because it carries contents
# from Geometry. # from Geometry.
@ -4491,7 +4497,7 @@ class CNCjob(Geometry):
return path return path
def generate_from_excellon_by_tool(self, exobj, tools="all", drillz = 3.0, def generate_from_excellon_by_tool(self, exobj, tools="all", drillz = 3.0,
toolchange=False, toolchangez=0.1, toolchangexy="0.0, 0.0", toolchange=False, toolchangez=0.1, toolchangexy='',
endz=2.0, startz=None, endz=2.0, startz=None,
excellon_optimization_type='B'): excellon_optimization_type='B'):
""" """
@ -4596,8 +4602,13 @@ class CNCjob(Geometry):
# Initialization # Initialization
gcode = self.doformat(p.start_code) gcode = self.doformat(p.start_code)
gcode += self.doformat(p.feedrate_code) gcode += self.doformat(p.feedrate_code)
gcode += self.doformat(p.lift_code, x=self.toolchange_xy[0], y=self.toolchange_xy[1])
gcode += self.doformat(p.startz_code, x=self.toolchange_xy[0], y=self.toolchange_xy[1]) if self.toolchange_xy is not None:
gcode += self.doformat(p.lift_code, x=self.toolchange_xy[0], y=self.toolchange_xy[1])
gcode += self.doformat(p.startz_code, x=self.toolchange_xy[0], y=self.toolchange_xy[1])
else:
gcode += self.doformat(p.lift_code, x=0.0, y=0.0)
gcode += self.doformat(p.startz_code, x=0.0, y=0.0)
# Distance callback # Distance callback
class CreateDistanceCallback(object): class CreateDistanceCallback(object):
@ -4631,8 +4642,13 @@ class CNCjob(Geometry):
locations.append((point.coords.xy[0][0], point.coords.xy[1][0])) locations.append((point.coords.xy[0][0], point.coords.xy[1][0]))
return locations return locations
oldx = self.toolchange_xy[0] if self.toolchange_xy is not None:
oldy = self.toolchange_xy[1] self.oldx = self.toolchange_xy[0]
self.oldy = self.toolchange_xy[1]
else:
self.oldx = 0.0
self.oldy = 0.0
measured_distance = 0 measured_distance = 0
current_platform = platform.architecture()[0] current_platform = platform.architecture()[0]
@ -4697,7 +4713,7 @@ class CNCjob(Geometry):
if tool in points: if tool in points:
# Tool change sequence (optional) # Tool change sequence (optional)
if toolchange: if toolchange:
gcode += self.doformat(p.toolchange_code,toolchangexy=(oldx, oldy)) gcode += self.doformat(p.toolchange_code,toolchangexy=(self.oldx, self.oldy))
gcode += self.doformat(p.spindle_code) # Spindle start gcode += self.doformat(p.spindle_code) # Spindle start
if self.dwell is True: if self.dwell is True:
gcode += self.doformat(p.dwell_code) # Dwell time gcode += self.doformat(p.dwell_code) # Dwell time
@ -4715,9 +4731,9 @@ class CNCjob(Geometry):
gcode += self.doformat(p.down_code, x=locx, y=locy) gcode += self.doformat(p.down_code, x=locx, y=locy)
gcode += self.doformat(p.up_to_zero_code, x=locx, y=locy) gcode += self.doformat(p.up_to_zero_code, x=locx, y=locy)
gcode += self.doformat(p.lift_code, x=locx, y=locy) gcode += self.doformat(p.lift_code, x=locx, y=locy)
measured_distance += abs(distance_euclidian(locx, locy, oldx, oldy)) measured_distance += abs(distance_euclidian(locx, locy, self.oldx, self.oldy))
oldx = locx self.oldx = locx
oldy = locy self.oldy = locy
log.debug("The total travel distance with OR-TOOLS Metaheuristics is: %s" % str(measured_distance)) log.debug("The total travel distance with OR-TOOLS Metaheuristics is: %s" % str(measured_distance))
elif excellon_optimization_type == 'B': elif excellon_optimization_type == 'B':
log.debug("Using OR-Tools Basic drill path optimization.") log.debug("Using OR-Tools Basic drill path optimization.")
@ -4771,7 +4787,7 @@ class CNCjob(Geometry):
if tool in points: if tool in points:
# Tool change sequence (optional) # Tool change sequence (optional)
if toolchange: if toolchange:
gcode += self.doformat(p.toolchange_code,toolchangexy=(oldx, oldy)) gcode += self.doformat(p.toolchange_code,toolchangexy=(self.oldx, self.oldy))
gcode += self.doformat(p.spindle_code) # Spindle start) gcode += self.doformat(p.spindle_code) # Spindle start)
if self.dwell is True: if self.dwell is True:
gcode += self.doformat(p.dwell_code) # Dwell time gcode += self.doformat(p.dwell_code) # Dwell time
@ -4788,9 +4804,9 @@ class CNCjob(Geometry):
gcode += self.doformat(p.down_code, x=locx, y=locy) gcode += self.doformat(p.down_code, x=locx, y=locy)
gcode += self.doformat(p.up_to_zero_code, x=locx, y=locy) gcode += self.doformat(p.up_to_zero_code, x=locx, y=locy)
gcode += self.doformat(p.lift_code, x=locx, y=locy) gcode += self.doformat(p.lift_code, x=locx, y=locy)
measured_distance += abs(distance_euclidian(locx, locy, oldx, oldy)) measured_distance += abs(distance_euclidian(locx, locy, self.oldx, self.oldy))
oldx = locx self.oldx = locx
oldy = locy self.oldy = locy
log.debug("The total travel distance with OR-TOOLS Basic Algorithm is: %s" % str(measured_distance)) log.debug("The total travel distance with OR-TOOLS Basic Algorithm is: %s" % str(measured_distance))
else: else:
self.app.inform.emit("[error_notcl] Wrong optimization type selected.") self.app.inform.emit("[error_notcl] Wrong optimization type selected.")
@ -4805,7 +4821,7 @@ class CNCjob(Geometry):
if tool in points: if tool in points:
# Tool change sequence (optional) # Tool change sequence (optional)
if toolchange: if toolchange:
gcode += self.doformat(p.toolchange_code, toolchangexy=(oldx, oldy)) gcode += self.doformat(p.toolchange_code, toolchangexy=(self.oldx, self.oldy))
gcode += self.doformat(p.spindle_code) # Spindle start) gcode += self.doformat(p.spindle_code) # Spindle start)
if self.dwell is True: if self.dwell is True:
gcode += self.doformat(p.dwell_code) # Dwell time gcode += self.doformat(p.dwell_code) # Dwell time
@ -4824,15 +4840,15 @@ class CNCjob(Geometry):
gcode += self.doformat(p.down_code, x=point[0], y=point[1]) gcode += self.doformat(p.down_code, x=point[0], y=point[1])
gcode += self.doformat(p.up_to_zero_code, x=point[0], y=point[1]) gcode += self.doformat(p.up_to_zero_code, x=point[0], y=point[1])
gcode += self.doformat(p.lift_code, x=point[0], y=point[1]) gcode += self.doformat(p.lift_code, x=point[0], y=point[1])
measured_distance += abs(distance_euclidian(point[0], point[1], oldx, oldy)) measured_distance += abs(distance_euclidian(point[0], point[1], self.oldx, self.oldy))
oldx = point[0] self.oldx = point[0]
oldy = point[1] self.oldy = point[1]
log.debug("The total travel distance with Travelling Salesman Algorithm is: %s" % str(measured_distance)) log.debug("The total travel distance with Travelling Salesman Algorithm is: %s" % str(measured_distance))
gcode += self.doformat(p.spindle_stop_code) # Spindle stop gcode += self.doformat(p.spindle_stop_code) # Spindle stop
gcode += self.doformat(p.end_code, x=0, y=0) gcode += self.doformat(p.end_code, x=0, y=0)
measured_distance += abs(distance_euclidian(oldx, oldy, 0, 0)) measured_distance += abs(distance_euclidian(self.oldx, self.oldy, 0, 0))
log.debug("The total travel distance including travel to end position is: %s" % log.debug("The total travel distance including travel to end position is: %s" %
str(measured_distance) + '\n') str(measured_distance) + '\n')
self.gcode = gcode self.gcode = gcode
@ -4900,7 +4916,19 @@ class CNCjob(Geometry):
self.multidepth = multidepth self.multidepth = multidepth
self.toolchangez = toolchangez self.toolchangez = toolchangez
self.toolchange_xy = [float(eval(a)) for a in toolchangexy.split(",")]
try:
if toolchangexy == '':
self.toolchange_xy = None
else:
self.toolchange_xy = [float(eval(a)) for a in toolchangexy.split(",")]
if len(self.toolchange_xy) < 2:
self.app.inform.emit("[error]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. ")
return 'fail'
except Exception as e:
log.debug("camlib.CNCJob.generate_from_multitool_geometry() --> %s" % str(e))
pass
self.pp_geometry_name = pp_geometry_name if pp_geometry_name else 'default' self.pp_geometry_name = pp_geometry_name if pp_geometry_name else 'default'
@ -4953,10 +4981,11 @@ class CNCjob(Geometry):
self.gcode += self.doformat(p.startz_code, x=0, y=0) self.gcode += self.doformat(p.startz_code, x=0, y=0)
if toolchange: if toolchange:
if "line_xyz" in self.pp_geometry_name: # if "line_xyz" in self.pp_geometry_name:
self.gcode += self.doformat(p.toolchange_code, x=self.toolchange_xy[0], y=self.toolchange_xy[1]) # self.gcode += self.doformat(p.toolchange_code, x=self.toolchange_xy[0], y=self.toolchange_xy[1])
else: # else:
self.gcode += self.doformat(p.toolchange_code) # self.gcode += self.doformat(p.toolchange_code)
self.gcode += self.doformat(p.toolchange_code)
self.gcode += self.doformat(p.spindle_code) # Spindle start self.gcode += self.doformat(p.spindle_code) # Spindle start
if self.dwell is True: if self.dwell is True:
@ -5146,10 +5175,11 @@ class CNCjob(Geometry):
self.gcode += self.doformat(p.startz_code, x=0, y=0) self.gcode += self.doformat(p.startz_code, x=0, y=0)
if toolchange: if toolchange:
if "line_xyz" in self.pp_geometry_name: # if "line_xyz" in self.pp_geometry_name:
self.gcode += self.doformat(p.toolchange_code, x=self.toolchange_xy[0], y=self.toolchange_xy[1]) # self.gcode += self.doformat(p.toolchange_code, x=self.toolchange_xy[0], y=self.toolchange_xy[1])
else: # else:
self.gcode += self.doformat(p.toolchange_code) # self.gcode += self.doformat(p.toolchange_code)
self.gcode += self.doformat(p.toolchange_code)
self.gcode += self.doformat(p.spindle_code) # Spindle start self.gcode += self.doformat(p.spindle_code) # Spindle start

8
postprocessors/manual_toolchange.py
View File

@ -32,7 +32,7 @@ class manual_toolchange(FlatCAMPostProc):
if coords_xy is not None: if coords_xy is not None:
gcode += '(X,Y Toolchange: ' + "%.4f, %.4f" % (coords_xy[0], coords_xy[1]) + units + ')\n' gcode += '(X,Y Toolchange: ' + "%.4f, %.4f" % (coords_xy[0], coords_xy[1]) + units + ')\n'
else: else:
gcode += '(X,Y Toolchange: ' + "0.0, 0.0" + units + ')\n' gcode += '(X,Y Toolchange: ' + "None" + units + ')\n'
gcode += '(Z Start: ' + str(p['startz']) + units + ')\n' gcode += '(Z Start: ' + str(p['startz']) + units + ')\n'
gcode += '(Z End: ' + str(p['endz']) + units + ')\n' gcode += '(Z End: ' + str(p['endz']) + units + ')\n'
gcode += '(Steps per circle: ' + str(p['steps_per_circle']) + ')\n' gcode += '(Steps per circle: ' + str(p['steps_per_circle']) + ')\n'
@ -64,14 +64,14 @@ class manual_toolchange(FlatCAMPostProc):
def toolchange_code(self, p): def toolchange_code(self, p):
toolchangez = p.toolchangez toolchangez = p.toolchangez
toolchangexy = p.toolchange_xy toolchangexy = p['toolchange_xy']
if toolchangexy is not None: if toolchangexy is not None:
toolchangex = toolchangexy[0] toolchangex = toolchangexy[0]
toolchangey = toolchangexy[1] toolchangey = toolchangexy[1]
else: else:
toolchangex = 0.0 toolchangex = p.oldx
toolchangey = 0.0 toolchangey = p.oldy
no_drills = 1 no_drills = 1