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

- in Geometry Object Properties UI - finished the new feature Simplification and Vertex Points calculation which should greatly reduce the resulting GCode size

Browse Source
This commit is contained in:
Marius Stanciu
2020-11-27 15:16:17 +02:00
committed by Marius
parent fd3f03afba
commit b0ccc15f70
3 changed files with 61 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
appObjects/FlatCAMGeometry.py
View File

@@ -638,6 +638,12 @@ class GeometryObject(FlatCAMObj, Geometry):
self.ui.geo_tools_table.setColumnHidden(2, True)
self.ui.geo_tools_table.setColumnHidden(3, True)
# #############################################################################################################
# ##################################### Setting Values#########################################################
# #############################################################################################################
self.ui.vertex_points_entry.set_value(0)
self.ui.geo_tol_entry.set_value(10 ** -self.decimals)
# #############################################################################################################
# ################################ Signals Connection #########################################################
# #############################################################################################################
@@ -665,9 +671,8 @@ class GeometryObject(FlatCAMObj, Geometry):
self.ui.milling_button.clicked.connect(self.on_milling_button_clicked)
self.ui.util_button.clicked.connect(lambda st: self.ui.util_frame.show() if st else self.ui.util_frame.hide())
self.ui.vertex_points_entry.set_value(0)
self.ui.geo_tol_entry.set_value(10 ** -self.decimals)
self.ui.vertex_points_btn.clicked.connect(self.on_calculate_vertex_points)
self.ui.simplification_btn.clicked.connect(self.on_simplify_geometry)
# # Postprocessor change
# self.ui.pp_geometry_name_cb.activated.connect(self.on_pp_changed)
@@ -715,6 +720,57 @@ class GeometryObject(FlatCAMObj, Geometry):
current_obj = self.app.collection.get_active()
self.app.milling_tool.ui.object_combo.set_value(current_obj.options['name'])
def on_calculate_vertex_points(self):
self.app.log.debug("GeometryObject.on_calculate_vertex_points()")
vertex_points = 0
for tool in self.tools:
geometry = self.tools[tool]['solid_geometry']
flattened_geo = self.flatten_list(obj_list=geometry)
for geo in flattened_geo:
if geo.geom_type == 'Polygon':
vertex_points += len(list(geo.exterior.coords))
for int in geo.interiors:
vertex_points += len(list(int.coords))
if geo.geom_type in ['LineString', 'LinearRing']:
vertex_points += len(list(geo.coords))
self.ui.vertex_points_entry.set_value(vertex_points)
self.app.inform.emit('[success] %s' % _("Vertex points calculated."))
def on_simplify_geometry(self):
self.app.log.debug("GeometryObject.on_simplify_geometry()")
tol = self.ui.geo_tol_entry.get_value()
def task_job():
with self.app.proc_container.new('%s...' % _("Simplify")):
for tool in self.tools:
new_tool_geo = []
geometry = self.tools[tool]['solid_geometry']
flattened_geo = self.flatten_list(obj_list=geometry)
for geo in flattened_geo:
new_tool_geo.append(geo.simplify(tolerance=tol))
self.tools[tool]['solid_geometry'] = deepcopy(new_tool_geo)
# update the solid_geometry
total_geo = []
for tool in self.tools:
total_geo += self.tools[tool]['solid_geometry']
self.solid_geometry = unary_union(total_geo)
# plot the new geometry
self.app.plot_all()
# update the vertex points number
self.on_calculate_vertex_points()
self.app.inform.emit('[success] %s' % _("Done."))
self.app.worker_task.emit({'fcn': task_job, 'params': []})
def on_rebuild_ui(self):
# read the table tools uid
current_uid_list = []