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

- fixed the Tool Subtractor algorithms

Browse Source
This commit is contained in:
Marius Stanciu
2020-10-29 00:17:27 +02:00
committed by Marius
parent 31a84bb4cc
commit aa2011e5a7
2 changed files with 83 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -33,6 +33,7 @@ CHANGELOG for FlatCAM beta
- fixed Paint, Isolation and NCC Tools such the translated comboboxes values are now stored as indexes instead of translated words as before - fixed Paint, Isolation and NCC Tools such the translated comboboxes values are now stored as indexes instead of translated words as before
- in Geometry Object made sure that the widgets in the Tool Table gets populated regardless of encountering non-recognizable translated values - in Geometry Object made sure that the widgets in the Tool Table gets populated regardless of encountering non-recognizable translated values
- in Paint Tool found a small bug and fixed it - in Paint Tool found a small bug and fixed it
- fixed the Tool Subtractor algorithms
27.10.2020 27.10.2020

137
appTools/ToolSub.py
View File

@@ -87,8 +87,8 @@ class ToolSub(AppTool):
self.results = [] self.results = []
# Signals # Signals
self.ui.intersect_btn.clicked.connect(self.on_grb_intersection_click) self.ui.intersect_btn.clicked.connect(self.on_subtract_gerber_click)
self.ui.intersect_geo_btn.clicked.connect(self.on_geo_intersection_click) self.ui.intersect_geo_btn.clicked.connect(self.on_subtract_geo_click)
self.ui.reset_button.clicked.connect(self.set_tool_ui) self.ui.reset_button.clicked.connect(self.set_tool_ui)
# Custom Signals # Custom Signals
@@ -134,7 +134,7 @@ class ToolSub(AppTool):
self.ui.tools_frame.show() self.ui.tools_frame.show()
self.ui.close_paths_cb.setChecked(self.app.defaults["tools_sub_close_paths"]) self.ui.close_paths_cb.setChecked(self.app.defaults["tools_sub_close_paths"])
def on_grb_intersection_click(self): def on_subtract_gerber_click(self):
# reset previous values # reset previous values
self.new_apertures.clear() self.new_apertures.clear()
self.new_solid_geometry = [] self.new_solid_geometry = []
@@ -142,6 +142,9 @@ class ToolSub(AppTool):
self.sub_type = "gerber" self.sub_type = "gerber"
# --------------------------------
# Get TARGET name
# --------------------------------
self.target_grb_obj_name = self.ui.target_gerber_combo.currentText() self.target_grb_obj_name = self.ui.target_gerber_combo.currentText()
if self.target_grb_obj_name == '': if self.target_grb_obj_name == '':
self.app.inform.emit('[ERROR_NOTCL] %s' % _("No Target object loaded.")) self.app.inform.emit('[ERROR_NOTCL] %s' % _("No Target object loaded."))
@@ -149,28 +152,38 @@ class ToolSub(AppTool):
self.app.inform.emit('%s' % _("Loading geometry from Gerber objects.")) self.app.inform.emit('%s' % _("Loading geometry from Gerber objects."))
# Get target object. # --------------------------------
# Get TARGET object.
# --------------------------------
try: try:
self.target_grb_obj = self.app.collection.get_by_name(self.target_grb_obj_name) self.target_grb_obj = self.app.collection.get_by_name(self.target_grb_obj_name)
except Exception as e: except Exception as e:
log.debug("ToolSub.on_grb_intersection_click() --> %s" % str(e)) log.debug("ToolSub.on_subtract_gerber_click() --> %s" % str(e))
self.app.inform.emit('[ERROR_NOTCL] %s: %s' % (_("Could not retrieve object"), self.obj_name)) self.app.inform.emit('[ERROR_NOTCL] %s: %s' % (_("Could not retrieve object"), self.obj_name))
return "Could not retrieve object: %s" % self.target_grb_obj_name return "Could not retrieve object: %s" % self.target_grb_obj_name
# --------------------------------
# Get SUBTRACTOR name
# --------------------------------
self.sub_grb_obj_name = self.ui.sub_gerber_combo.currentText() self.sub_grb_obj_name = self.ui.sub_gerber_combo.currentText()
if self.sub_grb_obj_name == '': if self.sub_grb_obj_name == '':
self.app.inform.emit('[ERROR_NOTCL] %s' % _("No Subtractor object loaded.")) self.app.inform.emit('[ERROR_NOTCL] %s' % _("No Subtractor object loaded."))
return return
# Get substractor object. # --------------------------------
# Get SUBTRACTOR object.
# --------------------------------
try: try:
self.sub_grb_obj = self.app.collection.get_by_name(self.sub_grb_obj_name) self.sub_grb_obj = self.app.collection.get_by_name(self.sub_grb_obj_name)
except Exception as e: except Exception as e:
log.debug("ToolSub.on_grb_intersection_click() --> %s" % str(e)) log.debug("ToolSub.on_subtract_gerber_click() --> %s" % str(e))
self.app.inform.emit('[ERROR_NOTCL] %s: %s' % (_("Could not retrieve object"), self.obj_name)) self.app.inform.emit('[ERROR_NOTCL] %s: %s' % (_("Could not retrieve object"), self.obj_name))
return "Could not retrieve object: %s" % self.sub_grb_obj_name return "Could not retrieve object: %s" % self.sub_grb_obj_name
# crate the new_apertures dict structure # --------------------------------
# crate the new_apertures
# dict structure from TARGET apertures
# --------------------------------
for apid in self.target_grb_obj.apertures: for apid in self.target_grb_obj.apertures:
self.new_apertures[apid] = {} self.new_apertures[apid] = {}
for key in self.target_grb_obj.apertures[apid]: for key in self.target_grb_obj.apertures[apid]:
@@ -180,35 +193,39 @@ class ToolSub(AppTool):
self.new_apertures[apid][key] = self.target_grb_obj.apertures[apid][key] self.new_apertures[apid][key] = self.target_grb_obj.apertures[apid][key]
def worker_job(app_obj): def worker_job(app_obj):
for apid in self.target_grb_obj.apertures: # SUBTRACTOR geometry (always the same)
target_geo = self.target_grb_obj.apertures[apid]['geometry'] sub_geometry = {}
sub_geometry['solid'] = []
sub_geometry['clear'] = []
# iterate over SUBTRACTOR geometry and load it in the sub_geometry dict
for s_apid in app_obj.sub_grb_obj.apertures:
for s_el in app_obj.sub_grb_obj.apertures[s_apid]['geometry']:
if "solid" in s_el:
sub_geometry['solid'].append(s_el["solid"])
if "clear" in s_el:
sub_geometry['clear'].append(s_el["clear"])
sub_geometry = {} for apid in app_obj.target_grb_obj.apertures:
sub_geometry['solid'] = [] # TARGET geometry
sub_geometry['clear'] = [] target_geo = [geo for geo in app_obj.target_grb_obj.apertures[apid]['geometry']]
for s_apid in self.sub_grb_obj.apertures:
for s_el in self.sub_grb_obj.apertures[s_apid]['geometry']:
if "solid" in s_el:
sub_geometry['solid'].append(s_el["solid"])
if "clear" in s_el:
sub_geometry['clear'].append(s_el["clear"])
self.results.append( # send the job to the multiprocessing JOB
self.pool.apply_async(self.aperture_intersection, args=(apid, target_geo, sub_geometry)) app_obj.results.append(
app_obj.pool.apply_async(app_obj.aperture_intersection, args=(apid, target_geo, sub_geometry))
) )
output = [] output = []
for p in self.results: for p in app_obj.results:
res = p.get() res = p.get()
output.append(res) output.append(res)
app_obj.inform.emit('%s: %s...' % (_("Finished parsing geometry for aperture"), str(res[0]))) app_obj.app.inform.emit('%s: %s...' % (_("Finished parsing geometry for aperture"), str(res[0])))
app_obj.inform.emit("%s" % _("Subtraction aperture processing finished.")) app_obj.app.inform.emit("%s" % _("Subtraction aperture processing finished."))
outname = self.ui.target_gerber_combo.currentText() + '_sub' outname = app_obj.ui.target_gerber_combo.currentText() + '_sub'
self.aperture_processing_finished.emit(outname, output) app_obj.aperture_processing_finished.emit(outname, output)
self.app.worker_task.emit({'fcn': worker_job, 'params': [self.app]}) self.app.worker_task.emit({'fcn': worker_job, 'params': [self]})
@staticmethod @staticmethod
def aperture_intersection(apid, target_geo, sub_geometry): def aperture_intersection(apid, target_geo, sub_geometry):
@@ -227,33 +244,38 @@ class ToolSub(AppTool):
unafected_geo = [] unafected_geo = []
affected_geo = [] affected_geo = []
is_modified = False for target_geo_obj in target_geo:
for geo_el in target_geo: solid_is_modified = False
new_geo_el = {} destination_geo_obj = {}
if "solid" in geo_el: if "solid" in target_geo_obj:
diff = []
for sub_solid_geo in sub_geometry["solid"]: for sub_solid_geo in sub_geometry["solid"]:
if geo_el["solid"].intersects(sub_solid_geo): if target_geo_obj["solid"].intersects(sub_solid_geo):
new_geo = geo_el["solid"].difference(sub_solid_geo) new_geo = target_geo_obj["solid"].difference(sub_solid_geo)
if not new_geo.is_empty: if not new_geo.is_empty:
geo_el["solid"] = new_geo diff.append(new_geo)
is_modified = True solid_is_modified = True
if solid_is_modified:
target_geo_obj["solid"] = unary_union(diff)
destination_geo_obj["solid"] = deepcopy(target_geo_obj["solid"])
new_geo_el["solid"] = deepcopy(geo_el["solid"]) clear_is_modified = False
if "clear" in target_geo_obj:
if "clear" in geo_el: clear_diff = []
for sub_solid_geo in sub_geometry["clear"]: for sub_clear_geo in sub_geometry["clear"]:
if geo_el["clear"].intersects(sub_solid_geo): if target_geo_obj["clear"].intersects(sub_clear_geo):
new_geo = geo_el["clear"].difference(sub_solid_geo) new_geo = target_geo_obj["clear"].difference(sub_clear_geo)
if not new_geo.is_empty: if not new_geo.is_empty:
geo_el["clear"] = new_geo clear_diff.append(new_geo)
is_modified = True clear_is_modified = True
if clear_is_modified:
target_geo_obj["clear"] = unary_union(clear_diff)
destination_geo_obj["clear"] = deepcopy(target_geo_obj["clear"])
new_geo_el["clear"] = deepcopy(geo_el["clear"]) if solid_is_modified or clear_is_modified:
affected_geo.append(deepcopy(destination_geo_obj))
if is_modified:
affected_geo.append(new_geo_el)
else: else:
unafected_geo.append(geo_el) unafected_geo.append(deepcopy(destination_geo_obj))
return apid, unafected_geo, affected_geo return apid, unafected_geo, affected_geo
@@ -279,20 +301,25 @@ class ToolSub(AppTool):
grb_obj.apertures['0']['size'] = 0.0 grb_obj.apertures['0']['size'] = 0.0
grb_obj.apertures['0']['geometry'] = [] grb_obj.apertures['0']['geometry'] = []
for apid, apid_val in list(grb_obj.apertures.items()): for apid in list(grb_obj.apertures.keys()):
# output is a tuple in the format (apid, surviving_geo, modified_geo)
# apid is the aperture id (key in the obj.apertures and string)
# unaffected_geo and affected_geo are lists
for t in output: for t in output:
new_apid = t[0] new_apid = t[0]
if apid == new_apid: if apid == new_apid:
surving_geo = t[1] surving_geo = t[1]
modified_geo = t[2] modified_geo = t[2]
if surving_geo: if surving_geo:
apid_val['geometry'] = deepcopy(surving_geo) grb_obj.apertures[apid]['geometry'] += deepcopy(surving_geo)
else:
grb_obj.apertures.pop(apid, None)
if modified_geo: if modified_geo:
grb_obj.apertures['0']['geometry'] += modified_geo grb_obj.apertures['0']['geometry'] += modified_geo
# if the current aperture does not have geometry then get rid of it
if not grb_obj.apertures[apid]['geometry']:
grb_obj.apertures.pop(apid, None)
# delete the '0' aperture if it has no geometry # delete the '0' aperture if it has no geometry
if not grb_obj.apertures['0']['geometry']: if not grb_obj.apertures['0']['geometry']:
grb_obj.apertures.pop('0', None) grb_obj.apertures.pop('0', None)
@@ -337,7 +364,7 @@ class ToolSub(AppTool):
self.new_solid_geometry[:] = [] self.new_solid_geometry[:] = []
self.results = [] self.results = []
def on_geo_intersection_click(self): def on_subtract_geo_click(self):
# reset previous values # reset previous values
self.new_tools.clear() self.new_tools.clear()
self.target_options.clear() self.target_options.clear()
@@ -355,7 +382,7 @@ class ToolSub(AppTool):
try: try:
self.target_geo_obj = self.app.collection.get_by_name(self.target_geo_obj_name) self.target_geo_obj = self.app.collection.get_by_name(self.target_geo_obj_name)
except Exception as e: except Exception as e:
log.debug("ToolSub.on_geo_intersection_click() --> %s" % str(e)) log.debug("ToolSub.on_subtract_geo_click() --> %s" % str(e))
self.app.inform.emit('[ERROR_NOTCL] %s: %s' % (_("Could not retrieve object"), self.target_geo_obj_name)) self.app.inform.emit('[ERROR_NOTCL] %s: %s' % (_("Could not retrieve object"), self.target_geo_obj_name))
return "Could not retrieve object: %s" % self.target_grb_obj_name return "Could not retrieve object: %s" % self.target_grb_obj_name
@@ -368,7 +395,7 @@ class ToolSub(AppTool):
try: try:
self.sub_geo_obj = self.app.collection.get_by_name(self.sub_geo_obj_name) self.sub_geo_obj = self.app.collection.get_by_name(self.sub_geo_obj_name)
except Exception as e: except Exception as e:
log.debug("ToolSub.on_geo_intersection_click() --> %s" % str(e)) log.debug("ToolSub.on_subtract_geo_click() --> %s" % str(e))
self.app.inform.emit('[ERROR_NOTCL] %s: %s' % (_("Could not retrieve object"), self.sub_geo_obj_name)) self.app.inform.emit('[ERROR_NOTCL] %s: %s' % (_("Could not retrieve object"), self.sub_geo_obj_name))
return "Could not retrieve object: %s" % self.sub_geo_obj_name return "Could not retrieve object: %s" % self.sub_geo_obj_name