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

- fixed the Tcl Command AlignDrill

Browse Source 
- fixed the Tcl Command AlignDrillGrid
- fixed the Tcl COmmand Panelize, Excellon panelization section
- Fixed an issue in Tool Calibration export_excellon method call
- PEP8 corrections all over the app
This commit is contained in:
Marius Stanciu
2020-11-02 03:32:00 +02:00
committed by Marius
parent fac4caf961
commit 374c29b4b0
63 changed files with 492 additions and 537 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
appTools/ToolCopperThieving.py
View File

@@ -245,9 +245,7 @@ class ToolCopperThieving(AppTool):
break
if aperture_found:
geo_elem = {}
geo_elem['solid'] = self.robber_geo
geo_elem['follow'] = self.robber_line
geo_elem = {'solid': self.robber_geo, 'follow': self.robber_line}
self.grb_object.apertures[aperture_found]['geometry'].append(deepcopy(geo_elem))
else:
ap_keys = list(self.grb_object.apertures.keys())
@@ -261,9 +259,7 @@ class ToolCopperThieving(AppTool):
self.grb_object.apertures[new_apid]['size'] = self.rb_thickness
self.grb_object.apertures[new_apid]['geometry'] = []
geo_elem = {}
geo_elem['solid'] = self.robber_geo
geo_elem['follow'] = self.robber_line
geo_elem = {'solid': self.robber_geo, 'follow': self.robber_line}
self.grb_object.apertures[new_apid]['geometry'].append(deepcopy(geo_elem))
geo_obj = self.grb_object.solid_geometry
@@ -857,18 +853,14 @@ class ToolCopperThieving(AppTool):
geo_list.append(poly)
# append into the '0' aperture
geo_elem = {}
geo_elem['solid'] = poly
geo_elem['follow'] = poly.exterior
geo_elem = {'solid': poly, 'follow': poly.exterior}
app_obj.grb_object.apertures['0']['geometry'].append(deepcopy(geo_elem))
except TypeError:
# append to the new solid geometry
geo_list.append(app_obj.new_solid_geometry)
# append into the '0' aperture
geo_elem = {}
geo_elem['solid'] = app_obj.new_solid_geometry
geo_elem['follow'] = app_obj.new_solid_geometry.exterior
geo_elem = {'solid': app_obj.new_solid_geometry, 'follow': app_obj.new_solid_geometry.exterior}
app_obj.grb_object.apertures['0']['geometry'].append(deepcopy(geo_elem))
app_obj.grb_object.solid_geometry = MultiPolygon(geo_list).buffer(0.0000001).buffer(-0.0000001)
@@ -993,9 +985,7 @@ class ToolCopperThieving(AppTool):
break
if aperture_found:
geo_elem = {}
geo_elem['solid'] = robber_solid_geo
geo_elem['follow'] = robber_line
geo_elem = {'solid': robber_solid_geo, 'follow': robber_line}
grb_obj.apertures[aperture_found]['geometry'].append(deepcopy(geo_elem))
else:
ap_keys = list(grb_obj.apertures.keys())