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

- finished work on Offset parameter in Excellon Object (Excellon Editor, camlib, FlatCAMObj updated to take this param in consideration)

Browse Source 
- fixed a bug where in Excellon editor when editing a file, a tool was automatically added. That is supposed to happen only for empty newly created Excellon Objects.
This commit is contained in:
Marius Stanciu
2019-02-12 15:12:12 +02:00
committed by Marius
parent d0641458e4
commit 9b61e4cc37
5 changed files with 44 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
camlib.py
View File

@@ -4399,6 +4399,8 @@ class CNCjob(Geometry):
self.units = units
self.z_cut = z_cut
self.tool_offset = {}
self.z_move = z_move
self.feedrate = feedrate
@@ -4746,6 +4748,13 @@ class CNCjob(Geometry):
if self.dwell is True:
gcode += self.doformat(p.dwell_code) # Dwell time
if self.units == 'MM':
current_tooldia = float('%.2f' % float(exobj.tools[tool]["C"]))
else:
current_tooldia = float('%.3f' % float(exobj.tools[tool]["C"]))
z_offset = float(self.tool_offset[current_tooldia]) * (-1)
self.z_cut += z_offset
# Drillling!
for k in node_list:
locx = locations[k][0]
@@ -4827,6 +4836,14 @@ class CNCjob(Geometry):
if self.dwell is True:
gcode += self.doformat(p.dwell_code) # Dwell time
if self.units == 'MM':
current_tooldia = float('%.2f' % float(exobj.tools[tool]["C"]))
else:
current_tooldia = float('%.3f' % float(exobj.tools[tool]["C"]))
z_offset = float(self.tool_offset[current_tooldia]) * (-1)
self.z_cut += z_offset
# Drillling!
for k in node_list:
locx = locations[k][0]
@@ -4868,6 +4885,12 @@ class CNCjob(Geometry):
if self.dwell is True:
gcode += self.doformat(p.dwell_code) # Dwell time
if self.units == 'MM':
current_tooldia = float('%.2f' % float(exobj.tools[tool]["C"]))
else:
current_tooldia = float('%.3f' % float(exobj.tools[tool]["C"]))
z_offset = float(self.tool_offset[current_tooldia]) * (-1)
self.z_cut += z_offset
# Drillling!
altPoints = []
for point in points[tool]: