- In Extract Plugin fixed issue with not extracting soldermask for pads made with "P" type Gerber aperture

- in the method that exports the Gerber fixed issue with not exporting the geometry associated with the apertures of type "P"
This commit is contained in:
Marius Stanciu
2021-09-19 21:47:34 +03:00
committed by Marius
parent 59e19c6228
commit f6caeff9c9
3 changed files with 10 additions and 3 deletions

View File

@@ -16,6 +16,8 @@ CHANGELOG for FlatCAM beta
- In Plugins: Calculators, Copper Thieving, Corners, Extract, Fiducials and Film activated the harmonizing first column width in the Plugin UI
- DblSided Plugin - remade the UI
- fixed some issues in AppTextEditor due of Qt6 conversion
- In Extract Plugin fixed issue with not extracting soldermask for pads made with "P" type Gerber aperture
- in the method that exports the Gerber fixed issue with not exporting the geometry associated with the apertures of type "P"
18.09.2021

View File

@@ -1347,7 +1347,7 @@ class GerberObject(FlatCAMObj, Gerber):
for apid in self.tools:
if apid == 0:
continue
elif self.tools[apid]['type'] == 'AM':
elif self.tools[apid]['type'] in ['AM', 'P']:
if 'geometry' in self.tools[apid]:
for geo_elem in self.tools[apid]['geometry']:
if 'solid' in geo_elem:

View File

@@ -687,6 +687,7 @@ class ToolExtract(AppTool):
allowed_apertures.append('R')
if other:
allowed_apertures.append('AM')
allowed_apertures.append('P')
selection_index = self.ui.gerber_object_combo.currentIndex()
model_index = self.app.collection.index(selection_index, 0, self.ui.gerber_object_combo.rootModelIndex())
@@ -698,14 +699,18 @@ class ToolExtract(AppTool):
return
outname = '%s_esm' % obj.options['name'].rpartition('.')[0]
new_apertures = deepcopy(obj.tools)
# new_apertures = deepcopy(obj.tools)
new_apertures = {}
new_solid_geometry = []
new_follow_geometry = []
# selected codes in the apertures UI table
sel_g_tool = []
for it in self.ui.apertures_table.selectedItems():
sel_g_tool.append(int(it.text()))
table_aperture = int(it.text())
sel_g_tool.append(table_aperture)
new_apertures[table_aperture] = deepcopy(obj.tools[table_aperture])
for apid, apid_value in obj.tools.items():
if apid in sel_g_tool: