- in Geometry Object fixed the issue with not using the End X-Y value and also made some other updates here

This commit is contained in:
Marius Stanciu
2020-10-21 09:26:01 +03:00
committed by Marius
parent af85764730
commit d4555c02d0
6 changed files with 67 additions and 61 deletions

View File

@@ -4875,7 +4875,7 @@ class CNCjob(Geometry):
:return: GCode - string
"""
log.debug("Generate_from_multitool_geometry()")
log.debug("generate_from_multitool_geometry()")
temp_solid_geometry = []
if offset != 0.0:
@@ -5185,7 +5185,7 @@ class CNCjob(Geometry):
:rtype: str
"""
log.debug("Generate_from_multitool_geometry()")
log.debug("geometry_tool_gcode_gen()")
t_gcode = ''
temp_solid_geometry = []
@@ -5310,8 +5310,9 @@ class CNCjob(Geometry):
self.startz = None
self.z_end = float(tool_dict['endz'])
self.xy_end = tool_dict['endxy']
try:
if self.xy_end == '':
if self.xy_end == '' or self.xy_end is None:
self.xy_end = None
else:
# either originally it was a string or not, xy_end will be made string