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

- wip in porting to PyQt6: fixed OptionalInput and OptionalHideInput GUI elements

Browse Source
This commit is contained in:
Marius Stanciu
2021-08-09 12:25:20 +03:00
committed by Marius
parent 2daf191948
commit 061e109e45
7 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
appPlugins/ToolOptimal.py
View File

@@ -142,7 +142,7 @@ class ToolOptimal(AppTool):
self.ui.locations_textb.clear()
# new cursor - select all document
cursor = self.ui.locations_textb.textCursor()
cursor.select(QtGui.QTextCursor.Document)
cursor.select(QtGui.QTextCursor.SelectionType.Document)
# clear previous selection highlight
tmp = cursor.blockFormat()
@@ -316,7 +316,7 @@ class ToolOptimal(AppTool):
def on_textbox_clicked(self):
# new cursor - select all document
cursor = self.ui.locations_textb.textCursor()
cursor.select(QtGui.QTextCursor.Document)
cursor.select(QtGui.QTextCursor.SelectionType.Document)
# clear previous selection highlight
tmp = cursor.blockFormat()
@@ -325,11 +325,11 @@ class ToolOptimal(AppTool):
# new cursor - select the current line
cursor = self.ui.locations_textb.textCursor()
cursor.select(QtGui.QTextCursor.LineUnderCursor)
cursor.select(QtGui.QTextCursor.SelectionType.LineUnderCursor)
# highlight the current selected line
tmp = cursor.blockFormat()
tmp.setBackground(QtGui.QBrush(QtCore.Qt.yellow))
tmp.setBackground(QtGui.QBrush(QtCore.Qt.GlobalColor.yellow))
cursor.setBlockFormat(tmp)
self.selected_text = cursor.selectedText()
@@ -345,7 +345,7 @@ class ToolOptimal(AppTool):
def on_distances_textb_clicked(self):
# new cursor - select all document
cursor = self.ui.distances_textb.textCursor()
cursor.select(QtGui.QTextCursor.Document)
cursor.select(QtGui.QTextCursor.SelectionType.Document)
# clear previous selection highlight
tmp = cursor.blockFormat()
@@ -354,11 +354,11 @@ class ToolOptimal(AppTool):
# new cursor - select the current line
cursor = self.ui.distances_textb.textCursor()
cursor.select(QtGui.QTextCursor.LineUnderCursor)
cursor.select(QtGui.QTextCursor.SelectionType.LineUnderCursor)
# highlight the current selected line
tmp = cursor.blockFormat()
tmp.setBackground(QtGui.QBrush(QtCore.Qt.yellow))
tmp.setBackground(QtGui.QBrush(QtCore.Qt.GlobalColor.yellow))
cursor.setBlockFormat(tmp)
distance_text = cursor.selectedText()
@@ -376,7 +376,7 @@ class ToolOptimal(AppTool):
def on_locations_sec_clicked(self):
# new cursor - select all document
cursor = self.ui.locations_sec_textb.textCursor()
cursor.select(QtGui.QTextCursor.Document)
cursor.select(QtGui.QTextCursor.SelectionType.Document)
# clear previous selection highlight
tmp = cursor.blockFormat()
@@ -385,11 +385,11 @@ class ToolOptimal(AppTool):
# new cursor - select the current line
cursor = self.ui.locations_sec_textb.textCursor()
cursor.select(QtGui.QTextCursor.LineUnderCursor)
cursor.select(QtGui.QTextCursor.SelectionType.LineUnderCursor)
# highlight the current selected line
tmp = cursor.blockFormat()
tmp.setBackground(QtGui.QBrush(QtCore.Qt.yellow))
tmp.setBackground(QtGui.QBrush(QtCore.Qt.GlobalColor.yellow))
cursor.setBlockFormat(tmp)
self.selected_locations_text = cursor.selectedText()

6
appPlugins/ToolPanelize.py
View File

@@ -129,7 +129,6 @@ class Panelize(AppTool):
self.clear_ui(self.layout)
self.ui = PanelizeUI(layout=self.layout, app=self.app)
self.pluginName = self.ui.pluginName
self.connect_signals_at_init()
self.reset_fields()
@@ -194,6 +193,8 @@ class Panelize(AppTool):
self.on_type_obj_index_changed()
self.on_type_box_index_changed()
self.connect_signals_at_init()
# Show/Hide Advanced Options
app_mode = self.app.defaults["global_app_level"]
self.change_level(app_mode)
@@ -209,7 +210,8 @@ class Panelize(AppTool):
if obj_type != 1: # not Excellon
self.ui.panel_type_label.setDisabled(False)
self.ui.panel_type_radio.setDisabled(False)
self.ui.on_panel_type(val=self.ui.panel_type_radio.get_value())
panel_type = self.ui.panel_type_radio.get_value()
self.ui.on_panel_type(val=panel_type)
else:
self.ui.panel_type_label.setDisabled(True)
self.ui.panel_type_radio.setDisabled(True)