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

- modified the UI in Excellon Object Properties UI in the milling section

Browse Source
This commit is contained in:
Marius Stanciu
2021-09-12 05:44:41 +03:00
committed by Marius
parent b36077cd9a
commit 58d7d56daf
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -11,6 +11,7 @@ CHANGELOG for FlatCAM beta
- some UI changes in the Milling and Drilling Plugins - some UI changes in the Milling and Drilling Plugins
- working on the Excellon side from Milling Plugin - working on the Excellon side from Milling Plugin
- modified the UI in Excellon Object Properties UI in the milling section
10.09.2021 10.09.2021

17
appObjects/FlatCAMExcellon.py
View File

@@ -565,8 +565,8 @@ class ExcellonObject(FlatCAMObj, Excellon):
self.ui.slot_tooldia_entry.setDisabled(False) self.ui.slot_tooldia_entry.setDisabled(False)
self.ui.generate_milling_slots_button.setDisabled(False) self.ui.generate_milling_slots_button.setDisabled(False)
has_drills = True has_drills = None
has_slots = True has_slots = None
for row in sel_rows: for row in sel_rows:
row_dia = self.app.dec_format(float(self.ui.tools_table.item(row, 1).text()), self.decimals) row_dia = self.app.dec_format(float(self.ui.tools_table.item(row, 1).text()), self.decimals)
@@ -574,12 +574,12 @@ class ExcellonObject(FlatCAMObj, Excellon):
tool_dia = self.app.dec_format(float(self.tools[tt]['tooldia']), self.decimals) tool_dia = self.app.dec_format(float(self.tools[tt]['tooldia']), self.decimals)
if tool_dia == row_dia: if tool_dia == row_dia:
# find if we have drills: # find if we have drills:
if 'drills' not in self.tools[tt] or not self.tools[tt]['drills']: if 'drills' in self.tools[tt] and self.tools[tt]['drills']:
has_drills = None has_drills = True
# find if we have slots # find if we have slots
if 'slots' not in self.tools[tt] or not self.tools[tt]['slots']: if 'slots' in self.tools[tt] and self.tools[tt]['slots']:
has_slots = None has_slots = True
if has_drills is None: if has_drills is None:
self.ui.tooldia_entry.setDisabled(True) self.ui.tooldia_entry.setDisabled(True)
@@ -970,6 +970,9 @@ class ExcellonObject(FlatCAMObj, Excellon):
else: else:
geo_obj.solid_geometry.append(drill.buffer(buffer_value).exterior) geo_obj.solid_geometry.append(drill.buffer(buffer_value).exterior)
if not geo_obj.solid_geometry:
return "fail"
if use_thread: if use_thread:
def geo_thread(a_obj): def geo_thread(a_obj):
a_obj.app_obj.new_object("geometry", outname, geo_init, plot=plot) a_obj.app_obj.new_object("geometry", outname, geo_init, plot=plot)
@@ -1078,6 +1081,8 @@ class ExcellonObject(FlatCAMObj, Excellon):
lines_string = LineString([start, stop]) lines_string = LineString([start, stop])
poly = lines_string.buffer(buffer_value, int(self.geo_steps_per_circle)).exterior poly = lines_string.buffer(buffer_value, int(self.geo_steps_per_circle)).exterior
geo_obj.solid_geometry.append(poly) geo_obj.solid_geometry.append(poly)
if not geo_obj.solid_geometry:
return "fail"
if use_thread: if use_thread:
def geo_thread(a_obj): def geo_thread(a_obj):