- Gerber Editor: Remade the processing of 'clear_geometry' (geometry generated by polygons made with Gerber LPC command) to work if more than one such polygon exists
This commit is contained in:
parent
9d508a6840
commit
84f3166e2f
|
@ -94,8 +94,8 @@ class App(QtCore.QObject):
|
||||||
log.addHandler(handler)
|
log.addHandler(handler)
|
||||||
|
|
||||||
# Version
|
# Version
|
||||||
version = 8.913
|
version = 8.914
|
||||||
version_date = "2019/04/13"
|
version_date = "2019/04/20"
|
||||||
beta = True
|
beta = True
|
||||||
|
|
||||||
# current date now
|
# current date now
|
||||||
|
|
|
@ -9,6 +9,10 @@ CAD program, and create G-Code for Isolation routing.
|
||||||
|
|
||||||
=================================================
|
=================================================
|
||||||
|
|
||||||
|
14.04.2019
|
||||||
|
|
||||||
|
- Gerber Editor: Remade the processing of 'clear_geometry' (geometry generated by polygons made with Gerber LPC command) to work if more than one such polygon exists
|
||||||
|
|
||||||
13.04.2019
|
13.04.2019
|
||||||
|
|
||||||
- updating the German translation
|
- updating the German translation
|
||||||
|
|
16
camlib.py
16
camlib.py
|
@ -3183,16 +3183,18 @@ class Gerber (Geometry):
|
||||||
temp_geo = []
|
temp_geo = []
|
||||||
for apid in self.apertures:
|
for apid in self.apertures:
|
||||||
if 'clear_geometry' in self.apertures[apid]:
|
if 'clear_geometry' in self.apertures[apid]:
|
||||||
for clear_geo in self.apertures[apid]['clear_geometry']:
|
clear_geo = cascaded_union(self.apertures[apid]['clear_geometry'])
|
||||||
for solid_geo in self.apertures[apid]['solid_geometry']:
|
for solid_geo in self.apertures[apid]['solid_geometry']:
|
||||||
if solid_geo.intersects(clear_geo):
|
if clear_geo.intersects(solid_geo):
|
||||||
res_geo = clear_geo.symmetric_difference(solid_geo)
|
res_geo = clear_geo.symmetric_difference(solid_geo)
|
||||||
temp_geo.append(res_geo)
|
temp_geo.append(res_geo)
|
||||||
else:
|
else:
|
||||||
temp_geo.append(solid_geo)
|
temp_geo.append(solid_geo)
|
||||||
self.apertures[apid]['solid_geometry'] = deepcopy(temp_geo)
|
self.apertures[apid]['solid_geometry'] = deepcopy(temp_geo)
|
||||||
self.apertures[apid].pop('clear_geometry', None)
|
self.apertures[apid].pop('clear_geometry', None)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# --- Apply buffer ---
|
# --- Apply buffer ---
|
||||||
# this treats the case when we are storing geometry as paths
|
# this treats the case when we are storing geometry as paths
|
||||||
self.follow_geometry = follow_buffer
|
self.follow_geometry = follow_buffer
|
||||||
|
|
Loading…
Reference in New Issue