giuliof
/
flatcam
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- Tool Cutout - some work in gaps thickness control for the free form cutout

This commit is contained in:
Marius Stanciu 2020-08-13 22:38:39 +03:00
parent daf66ae58c
commit 776034d1b1
3 changed files with 68 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -11,6 +11,7 @@ CHANGELOG for FlatCAM beta
- in CNCJob UI added GUI for an eventual Autolevelling feature - in CNCJob UI added GUI for an eventual Autolevelling feature
- in CNCJob UI updated the GUI for Autolevelling - in CNCJob UI updated the GUI for Autolevelling
- Cutout Tool - finished handler for gaps thickness control for the manual gaps
11.08.2020 11.08.2020

20
appObjects/FlatCAMGeometry.py
View File

@ -2728,13 +2728,15 @@ class GeometryObject(FlatCAMObj, Geometry):
# if self.app.is_legacy is False: # if self.app.is_legacy is False:
self.add_shape(shape=element, color=color, visible=visible, layer=0) self.add_shape(shape=element, color=color, visible=visible, layer=0)
def plot(self, visible=None, kind=None): def plot(self, visible=None, kind=None, plot_tool=None):
""" """
Plot the object. Plot the object.
:param visible: Controls if the added shape is visible of not :param visible: Controls if the added shape is visible of not
:param kind: added so there is no error when a project is loaded and it has both geometry and CNCJob, because :param kind: added so there is no error when a project is loaded and it has both geometry and CNCJob,
CNCJob require the 'kind' parameter. Perhaps the FlatCAMObj.plot() has to be rewrited because CNCJob require the 'kind' parameter. Perhaps the FlatCAMObj.plot()
has to be rewritten
:param plot_tool: plot a specif tool for multigeo objects
:return: :return:
""" """
@ -2768,8 +2770,14 @@ class GeometryObject(FlatCAMObj, Geometry):
# plot solid geometries found as members of self.tools attribute dict # plot solid geometries found as members of self.tools attribute dict
# for MultiGeo # for MultiGeo
if self.multigeo is True: # geo multi tool usage if self.multigeo is True: # geo multi tool usage
for tooluid_key in self.tools: if plot_tool is None:
solid_geometry = self.tools[tooluid_key]['solid_geometry'] for tooluid_key in self.tools:
solid_geometry = self.tools[tooluid_key]['solid_geometry']
self.plot_element(solid_geometry, visible=visible,
color=random_color() if self.options['multicolored']
else self.app.defaults["geometry_plot_line"])
else:
solid_geometry = self.tools[plot_tool]['solid_geometry']
self.plot_element(solid_geometry, visible=visible, self.plot_element(solid_geometry, visible=visible,
color=random_color() if self.options['multicolored'] color=random_color() if self.options['multicolored']
else self.app.defaults["geometry_plot_line"]) else self.app.defaults["geometry_plot_line"])

67
appTools/ToolCutOut.py
View File

@ -86,6 +86,9 @@ class CutOut(AppTool):
# store the current selection shape status to be restored after manual geo # store the current selection shape status to be restored after manual geo
self.old_selection_state = self.app.defaults['global_selection_shape'] self.old_selection_state = self.app.defaults['global_selection_shape']
# store original geometry for manual cutout
self.manual_solid_geo = None
# Signals # Signals
self.ui.ff_cutout_object_btn.clicked.connect(self.on_freeform_cutout) self.ui.ff_cutout_object_btn.clicked.connect(self.on_freeform_cutout)
self.ui.rect_cutout_object_btn.clicked.connect(self.on_rectangular_cutout) self.ui.rect_cutout_object_btn.clicked.connect(self.on_rectangular_cutout)
@ -486,7 +489,7 @@ class CutOut(AppTool):
if gaps_solid_geo is not None: if gaps_solid_geo is not None:
geo_obj.tools.update({ geo_obj.tools.update({
2: { 9999: {
'tooldia': str(dia), 'tooldia': str(dia),
'offset': 'Path', 'offset': 'Path',
'offset_value': 0.0, 'offset_value': 0.0,
@ -496,10 +499,10 @@ class CutOut(AppTool):
'solid_geometry': gaps_solid_geo 'solid_geometry': gaps_solid_geo
} }
}) })
geo_obj.tools[2]['data']['name'] = outname geo_obj.tools[9999]['data']['name'] = outname
geo_obj.tools[2]['data']['cutz'] = self.ui.thin_depth_entry.get_value() geo_obj.tools[9999]['data']['cutz'] = self.ui.thin_depth_entry.get_value()
geo_obj.tools[2]['data']['multidepth'] = self.ui.mpass_cb.get_value() geo_obj.tools[9999]['data']['multidepth'] = self.ui.mpass_cb.get_value()
geo_obj.tools[2]['data']['depthperpass'] = self.ui.maxdepth_entry.get_value() geo_obj.tools[9999]['data']['depthperpass'] = self.ui.maxdepth_entry.get_value()
outname = cutout_obj.options["name"] + "_cutout" outname = cutout_obj.options["name"] + "_cutout"
ret = self.app.app_obj.new_object('geometry', outname, geo_init) ret = self.app.app_obj.new_object('geometry', outname, geo_init)
@ -508,7 +511,7 @@ class CutOut(AppTool):
self.app.inform.emit('[ERROR_NOTCL] %s' % _("Failed.")) self.app.inform.emit('[ERROR_NOTCL] %s' % _("Failed."))
return return
cutout_obj.plot() # cutout_obj.plot(plot_tool=1)
self.app.inform.emit('[success] %s' % _("Any form CutOut operation finished.")) self.app.inform.emit('[success] %s' % _("Any form CutOut operation finished."))
# self.app.ui.notebook.setCurrentWidget(self.app.ui.project_tab) # self.app.ui.notebook.setCurrentWidget(self.app.ui.project_tab)
self.app.should_we_save = True self.app.should_we_save = True
@ -739,7 +742,7 @@ class CutOut(AppTool):
if gaps_solid_geo is not None: if gaps_solid_geo is not None:
geo_obj.tools.update({ geo_obj.tools.update({
2: { 9999: {
'tooldia': str(dia), 'tooldia': str(dia),
'offset': 'Path', 'offset': 'Path',
'offset_value': 0.0, 'offset_value': 0.0,
@ -749,10 +752,10 @@ class CutOut(AppTool):
'solid_geometry': gaps_solid_geo 'solid_geometry': gaps_solid_geo
} }
}) })
geo_obj.tools[2]['data']['name'] = outname geo_obj.tools[9999]['data']['name'] = outname
geo_obj.tools[2]['data']['cutz'] = self.ui.thin_depth_entry.get_value() geo_obj.tools[9999]['data']['cutz'] = self.ui.thin_depth_entry.get_value()
geo_obj.tools[2]['data']['multidepth'] = self.ui.mpass_cb.get_value() geo_obj.tools[9999]['data']['multidepth'] = self.ui.mpass_cb.get_value()
geo_obj.tools[2]['data']['depthperpass'] = self.ui.maxdepth_entry.get_value() geo_obj.tools[9999]['data']['depthperpass'] = self.ui.maxdepth_entry.get_value()
outname = cutout_obj.options["name"] + "_cutout" outname = cutout_obj.options["name"] + "_cutout"
ret = self.app.app_obj.new_object('geometry', outname, geo_init) ret = self.app.app_obj.new_object('geometry', outname, geo_init)
@ -786,6 +789,8 @@ class CutOut(AppTool):
self.app.inform.emit(_("Click on the selected geometry object perimeter to create a bridge gap ...")) self.app.inform.emit(_("Click on the selected geometry object perimeter to create a bridge gap ..."))
self.app.geo_editor.tool_shape.enabled = True self.app.geo_editor.tool_shape.enabled = True
self.manual_solid_geo = deepcopy(self.flatten(self.man_cutout_obj.solid_geometry))
self.cutting_dia = float(self.ui.dia.get_value()) self.cutting_dia = float(self.ui.dia.get_value())
if 0 in {self.cutting_dia}: if 0 in {self.cutting_dia}:
self.app.inform.emit('[ERROR_NOTCL] %s' % self.app.inform.emit('[ERROR_NOTCL] %s' %
@ -837,16 +842,47 @@ class CutOut(AppTool):
cut_poly = self.cutting_geo(pos=(snapped_pos[0], snapped_pos[1])) cut_poly = self.cutting_geo(pos=(snapped_pos[0], snapped_pos[1]))
gaps_solid_geo = self.intersect_geo(self.manual_solid_geo, cut_poly)
# first subtract geometry for the total solid_geometry # first subtract geometry for the total solid_geometry
new_solid_geometry = CutOut.subtract_geo(self.man_cutout_obj.solid_geometry, cut_poly) new_solid_geometry = CutOut.subtract_geo(self.man_cutout_obj.solid_geometry, cut_poly)
new_solid_geometry = linemerge(new_solid_geometry) new_solid_geometry = linemerge(new_solid_geometry)
self.man_cutout_obj.solid_geometry = new_solid_geometry self.man_cutout_obj.solid_geometry = new_solid_geometry
# then do it or each tool in the manual cutout Geometry object # then do it or each tool in the manual cutout Geometry object
for tool in self.man_cutout_obj.tools: try:
self.man_cutout_obj.tools[tool]['solid_geometry'] = new_solid_geometry self.man_cutout_obj.tools[1]['solid_geometry'] = new_solid_geometry
self.man_cutout_obj.multigeo = True
self.man_cutout_obj.tools[1]['data']['name'] = self.man_cutout_obj.options['name'] + '_cutout'
self.man_cutout_obj.tools[1]['data']['cutz'] = self.ui.cutz_entry.get_value()
self.man_cutout_obj.tools[1]['data']['multidepth'] = self.ui.mpass_cb.get_value()
self.man_cutout_obj.tools[1]['data']['depthperpass'] = self.ui.maxdepth_entry.get_value()
except KeyError:
self.app.inform.emit('[ERROR_NOTCL] %s' % _("No tool in the Geometry object."))
return
self.man_cutout_obj.plot() dia = float(self.ui.dia.get_value())
if gaps_solid_geo:
if 9999 not in self.man_cutout_obj.tools:
self.man_cutout_obj.tools.update({
9999: {
'tooldia': str(dia),
'offset': 'Path',
'offset_value': 0.0,
'type': _('Rough'),
'tool_type': 'C1',
'data': deepcopy(self.default_data),
'solid_geometry': [gaps_solid_geo]
}
})
self.man_cutout_obj.tools[9999]['data']['name'] = self.man_cutout_obj.options['name'] + '_cutout'
self.man_cutout_obj.tools[9999]['data']['cutz'] = self.ui.thin_depth_entry.get_value()
self.man_cutout_obj.tools[9999]['data']['multidepth'] = self.ui.mpass_cb.get_value()
self.man_cutout_obj.tools[9999]['data']['depthperpass'] = self.ui.maxdepth_entry.get_value()
else:
self.man_cutout_obj.tools[9999]['solid_geometry'].append(gaps_solid_geo)
self.man_cutout_obj.plot(plot_tool=1)
self.app.inform.emit('[success] %s' % _("Added manual Bridge Gap.")) self.app.inform.emit('[success] %s' % _("Added manual Bridge Gap."))
self.app.should_we_save = True self.app.should_we_save = True
@ -1017,6 +1053,9 @@ class CutOut(AppTool):
# restore selection # restore selection
self.app.defaults['global_selection_shape'] = self.old_selection_state self.app.defaults['global_selection_shape'] = self.old_selection_state
# rebuild the manual Geometry object
self.man_cutout_obj.build_ui()
def on_mouse_move(self, event): def on_mouse_move(self, event):
self.app.on_mouse_move_over_plot(event=event) self.app.on_mouse_move_over_plot(event=event)