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

- optimized UI in Tool Isolation

Browse Source
This commit is contained in:
Marius Stanciu
2020-05-29 05:59:57 +03:00
committed by Marius
parent 8d160a6d8c
commit 527c4126b2
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
AppTools/ToolIsolation.py
View File

@@ -441,7 +441,7 @@ class ToolIsolation(AppTool, Gerber):
"If not checked, use the standard algorithm.") "If not checked, use the standard algorithm.")
) )
self.grid3.addWidget(self.rest_cb, 25, 0, 1, 2) self.grid3.addWidget(self.rest_cb, 25, 0)
# Combine All Passes # Combine All Passes
self.combine_passes_cb = FCCheckBox(label=_('Combine')) self.combine_passes_cb = FCCheckBox(label=_('Combine'))
@@ -450,7 +450,7 @@ class ToolIsolation(AppTool, Gerber):
) )
self.combine_passes_cb.setObjectName("i_combine") self.combine_passes_cb.setObjectName("i_combine")
self.grid3.addWidget(self.combine_passes_cb, 26, 0, 1, 2) self.grid3.addWidget(self.combine_passes_cb, 25, 1)
# Exception Areas # Exception Areas
self.except_cb = FCCheckBox(label=_('Except')) self.except_cb = FCCheckBox(label=_('Except'))
@@ -458,22 +458,19 @@ class ToolIsolation(AppTool, Gerber):
"by checking this, the area of the object below\n" "by checking this, the area of the object below\n"
"will be subtracted from the isolation geometry.")) "will be subtracted from the isolation geometry."))
self.except_cb.setObjectName("i_except") self.except_cb.setObjectName("i_except")
self.grid3.addWidget(self.except_cb, 27, 0, 1, 2) self.grid3.addWidget(self.except_cb, 27, 0)
# Type of object to be excepted # Type of object to be excepted
self.type_excobj_combo_label = QtWidgets.QLabel('%s:' % _("Obj Type")) self.type_excobj_radio = RadioSet([{'label': _("Geometry"), 'value': 'geometry'},
self.type_excobj_combo_label.setToolTip( {'label': _("Gerber"), 'value': 'gerber'}])
self.type_excobj_radio.setToolTip(
_("Specify the type of object to be excepted from isolation.\n" _("Specify the type of object to be excepted from isolation.\n"
"It can be of type: Gerber or Geometry.\n" "It can be of type: Gerber or Geometry.\n"
"What is selected here will dictate the kind\n" "What is selected here will dictate the kind\n"
"of objects that will populate the 'Object' combobox.") "of objects that will populate the 'Object' combobox.")
) )
self.type_excobj_radio = RadioSet([{'label': _("Geometry"), 'value': 'geometry'}, self.grid3.addWidget(self.type_excobj_radio, 27, 1)
{'label': _("Gerber"), 'value': 'gerber'}])
self.grid3.addWidget(self.type_excobj_combo_label, 28, 0)
self.grid3.addWidget(self.type_excobj_radio, 28, 1)
# The object to be excepted # The object to be excepted
self.exc_obj_combo = FCComboBox() self.exc_obj_combo = FCComboBox()
@@ -489,7 +486,6 @@ class ToolIsolation(AppTool, Gerber):
self.e_ois = OptionalHideInputSection(self.except_cb, self.e_ois = OptionalHideInputSection(self.except_cb,
[ [
self.type_excobj_combo_label,
self.type_excobj_radio, self.type_excobj_radio,
self.exc_obj_combo self.exc_obj_combo
]) ])

1
CHANGELOG.md
View File

@@ -13,6 +13,7 @@ CHANGELOG for FlatCAM beta
- in Isolation Tool when the Rest machining is checked the combine parameter is set True automatically because the rest machining concept make sense only when all tools are used together - in Isolation Tool when the Rest machining is checked the combine parameter is set True automatically because the rest machining concept make sense only when all tools are used together
- some changes in the UI; added in the status bar an icon to control the Shell Dock - some changes in the UI; added in the status bar an icon to control the Shell Dock
- clicking on the activity icon will replot all objects - clicking on the activity icon will replot all objects
- optimized UI in Tool Isolation
28.05.2020 28.05.2020