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

- In Excellon Editor, Drill Array Plugin, upgraded the UI and work in progress for the features

Browse Source
This commit is contained in:
Marius Stanciu
2022-04-30 03:52:57 +03:00
committed by Marius
parent b4c300b2eb
commit 6592fc5cde
9 changed files with 427 additions and 548 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
appGUI/MainGUI.py
View File

@@ -4044,14 +4044,13 @@ class MainGUI(QtWidgets.QMainWindow):
and self.app.exc_editor.active_tool.drill_tool.length != 0.0:
pass
elif self.app.exc_editor.active_tool.name == 'drill_array' \
and self.app.exc_editor.active_tool.drill_array_tool.length != 0.0:
and self.app.exc_editor.active_tool.darray_tool.length != 0.0:
pass
elif self.app.exc_editor.active_tool.name == 'slot_add' \
and self.app.exc_editor.active_tool.slot_tool.length != 0.0 :
pass
elif self.app.exc_editor.active_tool.name == 'slot_array' \
and self.app.exc_editor.active_tool.slot_array_tool.length != 0.0 \
and self.app.exc_editor.active_tool.slot_array_tool.width != 0.0:
and self.app.exc_editor.active_tool.sarray_tool.length != 0.0:
pass
elif self.app.exc_editor.active_tool.name == 'move' \
and self.app.exc_editor.active_tool.move_tool.length != 0.0 \

2
appGUI/preferences/PreferencesUIManager.py
View File

@@ -234,7 +234,7 @@ class PreferencesUIManager(QtCore.QObject):
self.ui.excellon_pref_form.excellon_editor_group.drill_circular_angle_entry,
# Excellon Slots
"excellon_editor_slot_direction":
self.ui.excellon_pref_form.excellon_editor_group.slot_axis_radio,
self.ui.excellon_pref_form.excellon_editor_group.slot_direction_radio,
"excellon_editor_slot_angle":
self.ui.excellon_pref_form.excellon_editor_group.slot_angle_spinner,
"excellon_editor_slot_length":

9
appGUI/preferences/excellon/ExcellonEditorPrefGroupUI.py
View File

@@ -1,4 +1,3 @@
from PyQt6 import QtWidgets
from appGUI.GUIElements import FCSpinner, FCDoubleSpinner, RadioSet, FCLabel, GLay, FCFrame
from appGUI.preferences.OptionsGroupUI import OptionsGroupUI
@@ -208,11 +207,11 @@ class ExcellonEditorPrefGroupUI(OptionsGroupUI):
)
self.slot_axis_label.setMinimumWidth(100)
self.slot_axis_radio = RadioSet([{'label': _('X'), 'value': 'X'},
{'label': _('Y'), 'value': 'Y'},
{'label': _('Angle'), 'value': 'A'}], compact=True)
self.slot_direction_radio = RadioSet([{'label': _('X'), 'value': 'X'},
{'label': _('Y'), 'value': 'Y'},
{'label': _('Angle'), 'value': 'A'}], compact=True)
slots_grid.addWidget(self.slot_axis_label, 2, 0)
slots_grid.addWidget(self.slot_axis_radio, 2, 1)
slots_grid.addWidget(self.slot_direction_radio, 2, 1)
# Slot custom angle
self.slot_angle_label = FCLabel('%s:' % _('Angle'))