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

- cleaning up Isolation Plugin

Browse Source
This commit is contained in:
Marius Stanciu
2021-08-18 16:28:10 +03:00
parent 75fff68cc9
commit 261b83b445
6 changed files with 118 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
appGUI/preferences/PreferencesUIManager.py
View File

@@ -287,6 +287,7 @@ class PreferencesUIManager:
"tools_iso_tool_cutz": self.ui.plugin_eng_pref_form.tools_iso_group.cutz_entry,
"tools_iso_newdia": self.ui.plugin_eng_pref_form.tools_iso_group.newdia_entry,
"tools_iso_tool_shape": self.ui.plugin_eng_pref_form.tools_iso_group.tool_shape_combo, # "C1"
"tools_iso_passes": self.ui.plugin_eng_pref_form.tools_iso_group.passes_entry,
"tools_iso_overlap": self.ui.plugin_eng_pref_form.tools_iso_group.overlap_entry,
"tools_iso_milling_type": self.ui.plugin_eng_pref_form.tools_iso_group.milling_type_radio,

87
appGUI/preferences/tools/ToolsISOPrefGroupUI.py
View File

@@ -57,8 +57,8 @@ class ToolsISOPrefGroupUI(OptionsGroupUI):
{'label': _('Forward'), 'value': 'fwd'},
{'label': _('Reverse'), 'value': 'rev'}])
grid0.addWidget(self.order_label, 1, 0)
grid0.addWidget(self.order_radio, 1, 1, 1, 2)
grid0.addWidget(self.order_label, 2, 0)
grid0.addWidget(self.order_radio, 2, 1, 1, 2)
# Tool Type Radio Button
self.tool_type_label = FCLabel('%s:' % _('Tool Type'))
@@ -76,8 +76,8 @@ class ToolsISOPrefGroupUI(OptionsGroupUI):
"- Circular")
)
grid0.addWidget(self.tool_type_label, 2, 0)
grid0.addWidget(self.tool_type_radio, 2, 1, 1, 2)
grid0.addWidget(self.tool_type_label, 4, 0)
grid0.addWidget(self.tool_type_radio, 4, 1, 1, 2)
# Tip Dia
self.tipdialabel = FCLabel('%s:' % _('V-Tip Dia'))
@@ -88,8 +88,8 @@ class ToolsISOPrefGroupUI(OptionsGroupUI):
self.tipdia_entry.set_range(0, 1000)
self.tipdia_entry.setSingleStep(0.1)
grid0.addWidget(self.tipdialabel, 3, 0)
grid0.addWidget(self.tipdia_entry, 3, 1, 1, 2)
grid0.addWidget(self.tipdialabel, 6, 0)
grid0.addWidget(self.tipdia_entry, 6, 1, 1, 2)
# Tip Angle
self.tipanglelabel = FCLabel('%s:' % _('V-Tip Angle'))
@@ -102,8 +102,8 @@ class ToolsISOPrefGroupUI(OptionsGroupUI):
self.tipangle_entry.setSingleStep(5)
self.tipangle_entry.setWrapping(True)
grid0.addWidget(self.tipanglelabel, 4, 0)
grid0.addWidget(self.tipangle_entry, 4, 1, 1, 2)
grid0.addWidget(self.tipanglelabel, 8, 0)
grid0.addWidget(self.tipangle_entry, 8, 1, 1, 2)
# Cut Z entry
cutzlabel = FCLabel('%s:' % _('Cut Z'))
@@ -121,8 +121,8 @@ class ToolsISOPrefGroupUI(OptionsGroupUI):
"In application units.")
)
grid0.addWidget(cutzlabel, 5, 0)
grid0.addWidget(self.cutz_entry, 5, 1, 1, 2)
grid0.addWidget(cutzlabel, 10, 0)
grid0.addWidget(self.cutz_entry, 10, 1, 1, 2)
# New Diameter
self.newdialabel = FCLabel('%s:' % _('New Dia'))
@@ -136,13 +136,30 @@ class ToolsISOPrefGroupUI(OptionsGroupUI):
self.newdia_entry.set_range(0.0001, 10000.0000)
self.newdia_entry.setSingleStep(0.1)
grid0.addWidget(self.newdialabel, 6, 0)
grid0.addWidget(self.newdia_entry, 6, 1, 1, 2)
grid0.addWidget(self.newdialabel, 12, 0)
grid0.addWidget(self.newdia_entry, 12, 1, 1, 2)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 7, 0, 1, 3)
grid0.addWidget(separator_line, 14, 0, 1, 3)
# Tool Type
tool_shape_label = FCLabel('%s:' % _('Shape'))
tool_shape_label.setToolTip(
_("Tool Shape. \n"
"Can be:\n"
"C1 ... C4 = circular tool with x flutes\n"
"B = ball tip milling tool\n"
"V = v-shape milling tool")
)
self.tool_shape_combo = FCComboBox2(policy=False)
self.tool_shape_combo.setObjectName('i_tool_shape')
self.tool_shape_combo.addItems(["C1", "C2", "C3", "C4", "B", "V"])
grid0.addWidget(tool_shape_label, 16, 0)
grid0.addWidget(self.tool_shape_combo, 16, 1, 1, 2)
# Passes
passlabel = FCLabel('%s:' % _('Passes'))
@@ -154,8 +171,8 @@ class ToolsISOPrefGroupUI(OptionsGroupUI):
self.passes_entry.set_range(1, 999)
self.passes_entry.setObjectName("i_passes")
grid0.addWidget(passlabel, 8, 0)
grid0.addWidget(self.passes_entry, 8, 1, 1, 2)
grid0.addWidget(passlabel, 18, 0)
grid0.addWidget(self.passes_entry, 18, 1, 1, 2)
# Overlap Entry
overlabel = FCLabel('%s:' % _('Overlap'))
@@ -169,8 +186,8 @@ class ToolsISOPrefGroupUI(OptionsGroupUI):
self.overlap_entry.setSingleStep(0.1)
self.overlap_entry.setObjectName("i_overlap")
grid0.addWidget(overlabel, 9, 0)
grid0.addWidget(self.overlap_entry, 9, 1, 1, 2)
grid0.addWidget(overlabel, 20, 0)
grid0.addWidget(self.overlap_entry, 20, 1, 1, 2)
# Milling Type Radio Button
self.milling_type_label = FCLabel('%s:' % _('Milling Type'))
@@ -188,8 +205,8 @@ class ToolsISOPrefGroupUI(OptionsGroupUI):
"- conventional / useful when there is no backlash compensation")
)
grid0.addWidget(self.milling_type_label, 10, 0)
grid0.addWidget(self.milling_type_radio, 10, 1, 1, 2)
grid0.addWidget(self.milling_type_label, 22, 0)
grid0.addWidget(self.milling_type_radio, 22, 1, 1, 2)
# Isolation Type
self.iso_type_label = FCLabel('%s:' % _('Isolation Type'))
@@ -208,13 +225,13 @@ class ToolsISOPrefGroupUI(OptionsGroupUI):
{'label': _('Int'), 'value': 'int'}])
self.iso_type_radio.setObjectName("i_type")
grid0.addWidget(self.iso_type_label, 12, 0)
grid0.addWidget(self.iso_type_radio, 12, 1, 1, 2)
grid0.addWidget(self.iso_type_label, 24, 0)
grid0.addWidget(self.iso_type_radio, 24, 1, 1, 2)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 13, 0, 1, 3)
grid0.addWidget(separator_line, 26, 0, 1, 3)
# Rest machining CheckBox
self.rest_cb = FCCheckBox('%s' % _("Rest"))
@@ -229,7 +246,7 @@ class ToolsISOPrefGroupUI(OptionsGroupUI):
"If not checked, use the standard algorithm.")
)
grid0.addWidget(self.rest_cb, 17, 0)
grid0.addWidget(self.rest_cb, 28, 0)
# Combine All Passes
self.combine_passes_cb = FCCheckBox(label=_('Combine'))
@@ -238,7 +255,7 @@ class ToolsISOPrefGroupUI(OptionsGroupUI):
)
self.combine_passes_cb.setObjectName("i_combine")
grid0.addWidget(self.combine_passes_cb, 17, 1)
grid0.addWidget(self.combine_passes_cb, 28, 1)
# Exception Areas
self.except_cb = FCCheckBox(label=_('Except'))
@@ -246,7 +263,7 @@ class ToolsISOPrefGroupUI(OptionsGroupUI):
"by checking this, the area of the object below\n"
"will be subtracted from the isolation geometry."))
self.except_cb.setObjectName("i_except")
grid0.addWidget(self.except_cb, 17, 2)
grid0.addWidget(self.except_cb, 28, 2)
# Check Tool validity
self.valid_cb = FCCheckBox(label=_('Check validity'))
@@ -256,7 +273,7 @@ class ToolsISOPrefGroupUI(OptionsGroupUI):
)
self.valid_cb.setObjectName("i_check")
grid0.addWidget(self.valid_cb, 18, 0, 1, 3)
grid0.addWidget(self.valid_cb, 30, 0, 1, 3)
# Isolation Scope
self.select_label = FCLabel('%s:' % _("Selection"))
@@ -273,8 +290,8 @@ class ToolsISOPrefGroupUI(OptionsGroupUI):
)
self.select_combo.setObjectName("i_selection")
grid0.addWidget(self.select_label, 20, 0)
grid0.addWidget(self.select_combo, 20, 1, 1, 2)
grid0.addWidget(self.select_label, 32, 0)
grid0.addWidget(self.select_combo, 32, 1, 1, 2)
# Area Shape
self.area_shape_label = FCLabel('%s:' % _("Shape"))
@@ -285,8 +302,8 @@ class ToolsISOPrefGroupUI(OptionsGroupUI):
self.area_shape_radio = RadioSet([{'label': _("Square"), 'value': 'square'},
{'label': _("Polygon"), 'value': 'polygon'}])
grid0.addWidget(self.area_shape_label, 21, 0)
grid0.addWidget(self.area_shape_radio, 21, 1, 1, 2)
grid0.addWidget(self.area_shape_label, 34, 0)
grid0.addWidget(self.area_shape_radio, 34, 1, 1, 2)
# Polygon interiors selection
self.poly_int_cb = FCCheckBox(_("Interiors"))
@@ -302,13 +319,13 @@ class ToolsISOPrefGroupUI(OptionsGroupUI):
"interiors of a polygon (holes in the polygon) could not be isolated.\n"
"Works when 'rest machining' is used.")
)
grid0.addWidget(self.poly_int_cb, 22, 0)
grid0.addWidget(self.force_iso_cb, 22, 1)
grid0.addWidget(self.poly_int_cb, 36, 0)
grid0.addWidget(self.force_iso_cb, 36, 1)
separator_line = QtWidgets.QFrame()
separator_line.setFrameShape(QtWidgets.QFrame.Shape.HLine)
separator_line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken)
grid0.addWidget(separator_line, 24, 0, 1, 3)
grid0.addWidget(separator_line, 38, 0, 1, 3)
# ## Plotting type
self.plotting_radio = RadioSet([{'label': _('Normal'), 'value': 'normal'},
@@ -318,7 +335,7 @@ class ToolsISOPrefGroupUI(OptionsGroupUI):
_("- 'Normal' - normal plotting, done at the end of the job\n"
"- 'Progressive' - each shape is plotted after it is generated")
)
grid0.addWidget(plotting_label, 25, 0)
grid0.addWidget(self.plotting_radio, 25, 1, 1, 2)
grid0.addWidget(plotting_label, 40, 0)
grid0.addWidget(self.plotting_radio, 40, 1, 1, 2)
self.layout.addStretch()