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

- porting to PyQt6

Browse Source
This commit is contained in:
Marius Stanciu
2021-08-04 18:34:24 +03:00
parent c3d5fccb80
commit 53272da959
136 changed files with 1732 additions and 1715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
appObjects/FlatCAMCNCJob.py
View File

@@ -217,7 +217,7 @@ class CNCJobObject(FlatCAMObj, CNCjob):
row_no = tool_idx - 1
t_id = QtWidgets.QTableWidgetItem('%d' % int(tool_idx))
# id.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
# id.setFlags(QtCore.Qt.ItemFlag.ItemIsSelectable | QtCore.Qt.ItemFlag.ItemIsEnabled)
self.ui.cnc_tools_table.setItem(row_no, 0, t_id) # Tool name/id
# Make sure that the tool diameter when in MM is with no more than 2 decimals.
@@ -245,11 +245,11 @@ class CNCJobObject(FlatCAMObj, CNCjob):
tool_shape_item_txt = dia_value['data']['tools_mill_tool_shape']
tool_shape_item = QtWidgets.QTableWidgetItem(tool_shape_item_txt)
t_id.setFlags(QtCore.Qt.ItemIsEnabled)
dia_item.setFlags(QtCore.Qt.ItemIsEnabled)
offset_item.setFlags(QtCore.Qt.ItemIsEnabled)
job_item.setFlags(QtCore.Qt.ItemIsEnabled)
tool_shape_item.setFlags(QtCore.Qt.ItemIsEnabled)
t_id.setFlags(QtCore.Qt.ItemFlag.ItemIsEnabled)
dia_item.setFlags(QtCore.Qt.ItemFlag.ItemIsEnabled)
offset_item.setFlags(QtCore.Qt.ItemFlag.ItemIsEnabled)
job_item.setFlags(QtCore.Qt.ItemFlag.ItemIsEnabled)
tool_shape_item.setFlags(QtCore.Qt.ItemFlag.ItemIsEnabled)
# hack so the checkbox stay centered in the table cell
# used this:
@@ -262,7 +262,7 @@ class CNCJobObject(FlatCAMObj, CNCjob):
# qhboxlayout.setAlignment(QtCore.Qt.AlignCenter)
# qhboxlayout.setContentsMargins(0, 0, 0, 0)
plot_item = FCCheckBox()
plot_item.setLayoutDirection(QtCore.Qt.RightToLeft)
plot_item.setLayoutDirection(QtCore.Qt.LayoutDirection.RightToLeft)
tool_uid_item = QtWidgets.QTableWidgetItem(str(dia_key))
if self.ui.plot_cb.isChecked():
plot_item.setChecked(True)
@@ -278,12 +278,12 @@ class CNCJobObject(FlatCAMObj, CNCjob):
# make the diameter column editable
# for row in range(tool_idx):
# self.ui.cnc_tools_table.item(row, 1).setFlags(QtCore.Qt.ItemIsSelectable |
# QtCore.Qt.ItemIsEnabled)
# self.ui.cnc_tools_table.item(row, 1).setFlags(QtCore.Qt.ItemFlag.ItemIsSelectable |
# QtCore.Qt.ItemFlag.ItemIsEnabled)
for row in range(tool_idx):
self.ui.cnc_tools_table.item(row, 0).setFlags(
self.ui.cnc_tools_table.item(row, 0).flags() ^ QtCore.Qt.ItemIsSelectable)
self.ui.cnc_tools_table.item(row, 0).flags() ^ QtCore.Qt.ItemFlag.ItemIsSelectable)
self.ui.cnc_tools_table.resizeColumnsToContents()
self.ui.cnc_tools_table.resizeRowsToContents()
@@ -341,11 +341,11 @@ class CNCJobObject(FlatCAMObj, CNCjob):
cutz_item = QtWidgets.QTableWidgetItem('%f' % offset_val)
t_id_item.setFlags(QtCore.Qt.ItemIsEnabled)
dia_item.setFlags(QtCore.Qt.ItemIsEnabled)
nr_drills_item.setFlags(QtCore.Qt.ItemIsEnabled)
nr_slots_item.setFlags(QtCore.Qt.ItemIsEnabled)
cutz_item.setFlags(QtCore.Qt.ItemIsEnabled)
t_id_item.setFlags(QtCore.Qt.ItemFlag.ItemIsEnabled)
dia_item.setFlags(QtCore.Qt.ItemFlag.ItemIsEnabled)
nr_drills_item.setFlags(QtCore.Qt.ItemFlag.ItemIsEnabled)
nr_slots_item.setFlags(QtCore.Qt.ItemFlag.ItemIsEnabled)
cutz_item.setFlags(QtCore.Qt.ItemFlag.ItemIsEnabled)
# hack so the checkbox stay centered in the table cell
# used this:
@@ -359,7 +359,7 @@ class CNCJobObject(FlatCAMObj, CNCjob):
# qhboxlayout.setContentsMargins(0, 0, 0, 0)
plot_item = FCCheckBox()
plot_item.setLayoutDirection(QtCore.Qt.RightToLeft)
plot_item.setLayoutDirection(QtCore.Qt.LayoutDirection.RightToLeft)
if self.ui.plot_cb.isChecked():
plot_item.setChecked(True)
@@ -376,7 +376,7 @@ class CNCJobObject(FlatCAMObj, CNCjob):
for row in range(row_no):
self.ui.exc_cnc_tools_table.item(row, 0).setFlags(
self.ui.exc_cnc_tools_table.item(row, 0).flags() ^ QtCore.Qt.ItemIsSelectable)
self.ui.exc_cnc_tools_table.item(row, 0).flags() ^ QtCore.Qt.ItemFlag.ItemIsSelectable)
self.ui.exc_cnc_tools_table.resizeColumnsToContents()
self.ui.exc_cnc_tools_table.resizeRowsToContents()
@@ -617,7 +617,7 @@ class CNCJobObject(FlatCAMObj, CNCjob):
self.ui.treeWidget.clear()
self.add_properties_items(obj=self, treeWidget=self.ui.treeWidget)
self.ui.treeWidget.setSizePolicy(QtWidgets.QSizePolicy.Ignored, QtWidgets.QSizePolicy.MinimumExpanding)
self.ui.treeWidget.setSizePolicy(QtWidgets.QSizePolicy.Policy.Ignored, QtWidgets.QSizePolicy.Policy.MinimumExpanding)
# make sure that the FCTree widget columns are resized to content
self.ui.treeWidget.resize_sig.emit()

15
appObjects/FlatCAMDocument.py
View File

@@ -109,11 +109,14 @@ class DocumentObject(FlatCAMObj):
self.ui.sel_color_entry.editingFinished.connect(self.on_selection_color_entry)
self.ui.sel_color_button.clicked.connect(self.on_selection_color_button)
self.ui.al_left_tb.clicked.connect(lambda: self.document_editor_tab.code_editor.setAlignment(Qt.AlignLeft))
self.ui.al_center_tb.clicked.connect(lambda: self.document_editor_tab.code_editor.setAlignment(Qt.AlignCenter))
self.ui.al_right_tb.clicked.connect(lambda: self.document_editor_tab.code_editor.setAlignment(Qt.AlignRight))
self.ui.al_left_tb.clicked.connect(
lambda: self.document_editor_tab.code_editor.setAlignment(Qt.AlignmentFlag.AlignLeft))
self.ui.al_center_tb.clicked.connect(
lambda: self.document_editor_tab.code_editor.setAlignment(Qt.AlignmentFlag.AlignCenter))
self.ui.al_right_tb.clicked.connect(
lambda: self.document_editor_tab.code_editor.setAlignment(Qt.AlignmentFlag.AlignRight))
self.ui.al_justify_tb.clicked.connect(
lambda: self.document_editor_tab.code_editor.setAlignment(Qt.AlignJustify)
lambda: self.document_editor_tab.code_editor.setAlignment(Qt.AlignmentFlag.AlignJustify)
)
self.ui.autocomplete_cb.stateChanged.connect(self.on_autocomplete_changed)
@@ -300,8 +303,8 @@ class DocumentObject(FlatCAMObj):
return
p = QtGui.QPalette()
p.setColor(QtGui.QPalette.Highlight, sel_color)
p.setColor(QtGui.QPalette.HighlightedText, QtGui.QColor('white'))
p.setColor(QtGui.QPalette.ColorRole.Highlight, sel_color)
p.setColor(QtGui.QPalette.ColorRole.HighlightedText, QtGui.QColor('white'))
self.document_editor_tab.code_editor.setPalette(p)

42
appObjects/FlatCAMExcellon.py
View File

@@ -314,29 +314,29 @@ class ExcellonObject(FlatCAMObj, Excellon):
# Tool ID
exc_id_item = QtWidgets.QTableWidgetItem('%d' % int(tool_no))
exc_id_item.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
exc_id_item.setFlags(QtCore.Qt.ItemFlag.ItemIsSelectable | QtCore.Qt.ItemFlag.ItemIsEnabled)
self.ui.tools_table.setItem(self.tool_row, 0, exc_id_item) # Tool name/id
# Diameter
dia_item = QtWidgets.QTableWidgetItem('%.*f' % (self.decimals, dia_val))
dia_item.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
dia_item.setFlags(QtCore.Qt.ItemFlag.ItemIsSelectable | QtCore.Qt.ItemFlag.ItemIsEnabled)
self.ui.tools_table.setItem(self.tool_row, 1, dia_item) # Diameter
# Drill count
drill_count_item = QtWidgets.QTableWidgetItem('%d' % drill_cnt)
drill_count_item.setFlags(QtCore.Qt.ItemIsEnabled)
drill_count_item.setFlags(QtCore.Qt.ItemFlag.ItemIsEnabled)
self.ui.tools_table.setItem(self.tool_row, 2, drill_count_item) # Number of drills per tool
# Slot Count
# if the slot number is zero is better to not clutter the GUI with zero's so we print a space
slot_count_str = '%d' % slot_cnt if slot_cnt > 0 else ''
slot_count_item = QtWidgets.QTableWidgetItem(slot_count_str)
slot_count_item.setFlags(QtCore.Qt.ItemIsEnabled)
slot_count_item.setFlags(QtCore.Qt.ItemFlag.ItemIsEnabled)
self.ui.tools_table.setItem(self.tool_row, 3, slot_count_item) # Number of drills per tool
# Empty Plot Item
empty_plot_item = QtWidgets.QTableWidgetItem('')
empty_plot_item.setFlags(QtCore.Qt.NoItemFlags)
empty_plot_item.setFlags(QtCore.Qt.ItemFlag.NoItemFlags)
self.ui.tools_table.setItem(self.tool_row, 4, empty_plot_item)
if 'multicolor' in self.tools[tool_no] and self.tools[tool_no]['multicolor'] is not None:
@@ -354,7 +354,7 @@ class ExcellonObject(FlatCAMObj, Excellon):
# Plot Item
plot_item = FCCheckBox()
plot_item.setLayoutDirection(QtCore.Qt.RightToLeft)
plot_item.setLayoutDirection(QtCore.Qt.LayoutDirection.RightToLeft)
if self.ui.plot_cb.isChecked():
plot_item.setChecked(True)
self.ui.tools_table.setCellWidget(self.tool_row, 5, plot_item)
@@ -363,20 +363,20 @@ class ExcellonObject(FlatCAMObj, Excellon):
# add a last row with the Total number of drills
empty_1 = QtWidgets.QTableWidgetItem('')
empty_1.setFlags(QtCore.Qt.NoItemFlags)
empty_1.setFlags(QtCore.Qt.ItemFlag.NoItemFlags)
empty_1_1 = QtWidgets.QTableWidgetItem('')
empty_1_1.setFlags(QtCore.Qt.NoItemFlags)
empty_1_1.setFlags(QtCore.Qt.ItemFlag.NoItemFlags)
empty_1_2 = QtWidgets.QTableWidgetItem('')
empty_1_2.setFlags(QtCore.Qt.NoItemFlags)
empty_1_2.setFlags(QtCore.Qt.ItemFlag.NoItemFlags)
empty_1_3 = QtWidgets.QTableWidgetItem('')
empty_1_3.setFlags(QtCore.Qt.NoItemFlags)
empty_1_3.setFlags(QtCore.Qt.ItemFlag.NoItemFlags)
empty_1_4 = QtWidgets.QTableWidgetItem('')
empty_1_4.setFlags(QtCore.Qt.NoItemFlags)
empty_1_4.setFlags(QtCore.Qt.ItemFlag.NoItemFlags)
label_tot_drill_count = QtWidgets.QTableWidgetItem(_('Total Drills'))
tot_drill_count = QtWidgets.QTableWidgetItem('%d' % self.tot_drill_cnt)
label_tot_drill_count.setFlags(QtCore.Qt.ItemIsEnabled)
tot_drill_count.setFlags(QtCore.Qt.ItemIsEnabled)
label_tot_drill_count.setFlags(QtCore.Qt.ItemFlag.ItemIsEnabled)
tot_drill_count.setFlags(QtCore.Qt.ItemFlag.ItemIsEnabled)
self.ui.tools_table.setItem(self.tool_row, 0, empty_1)
self.ui.tools_table.setItem(self.tool_row, 1, label_tot_drill_count)
@@ -397,20 +397,20 @@ class ExcellonObject(FlatCAMObj, Excellon):
# add a last row with the Total number of slots
empty_2 = QtWidgets.QTableWidgetItem('')
empty_2.setFlags(QtCore.Qt.NoItemFlags)
empty_2.setFlags(QtCore.Qt.ItemFlag.NoItemFlags)
empty_2_1 = QtWidgets.QTableWidgetItem('')
empty_2_1.setFlags(QtCore.Qt.NoItemFlags)
empty_2_1.setFlags(QtCore.Qt.ItemFlag.NoItemFlags)
empty_2_2 = QtWidgets.QTableWidgetItem('')
empty_2_2.setFlags(QtCore.Qt.NoItemFlags)
empty_2_2.setFlags(QtCore.Qt.ItemFlag.NoItemFlags)
empty_2_3 = QtWidgets.QTableWidgetItem('')
empty_2_3.setFlags(QtCore.Qt.NoItemFlags)
empty_2_3.setFlags(QtCore.Qt.ItemFlag.NoItemFlags)
empty_2_4 = QtWidgets.QTableWidgetItem('')
empty_2_4.setFlags(QtCore.Qt.NoItemFlags)
empty_2_4.setFlags(QtCore.Qt.ItemFlag.NoItemFlags)
label_tot_slot_count = QtWidgets.QTableWidgetItem(_('Total Slots'))
tot_slot_count = QtWidgets.QTableWidgetItem('%d' % self.tot_slot_cnt)
label_tot_slot_count.setFlags(QtCore.Qt.ItemIsEnabled)
tot_slot_count.setFlags(QtCore.Qt.ItemIsEnabled)
label_tot_slot_count.setFlags(QtCore.Qt.ItemFlag.ItemIsEnabled)
tot_slot_count.setFlags(QtCore.Qt.ItemFlag.ItemIsEnabled)
self.ui.tools_table.setItem(self.tool_row, 0, empty_2)
self.ui.tools_table.setItem(self.tool_row, 1, label_tot_slot_count)
@@ -674,7 +674,7 @@ class ExcellonObject(FlatCAMObj, Excellon):
self.ui.treeWidget.clear()
self.add_properties_items(obj=self, treeWidget=self.ui.treeWidget)
self.ui.treeWidget.setSizePolicy(QtWidgets.QSizePolicy.Ignored, QtWidgets.QSizePolicy.MinimumExpanding)
self.ui.treeWidget.setSizePolicy(QtWidgets.QSizePolicy.Policy.Ignored, QtWidgets.QSizePolicy.Policy.MinimumExpanding)
# make sure that the FCTree widget columns are resized to content
self.ui.treeWidget.resize_sig.emit()

32
appObjects/FlatCAMGeometry.py
View File

@@ -194,7 +194,7 @@ class GeometryObject(FlatCAMObj, Geometry):
# -------------------- ID ------------------------------------------ #
tool_id = QtWidgets.QTableWidgetItem('%d' % int(row_idx + 1))
tool_id.setFlags(QtCore.Qt.ItemIsEnabled)
tool_id.setFlags(QtCore.Qt.ItemFlag.ItemIsEnabled)
self.ui.geo_tools_table.setItem(row_idx, 0, tool_id) # Tool name/id
# Make sure that the tool diameter when in MM is with no more than 2 decimals.
@@ -203,7 +203,7 @@ class GeometryObject(FlatCAMObj, Geometry):
# -------------------- DIAMETER ------------------------------------- #
dia_item = QtWidgets.QTableWidgetItem('%.*f' % (self.decimals, float(tooluid_value['tooldia'])))
dia_item.setFlags(QtCore.Qt.ItemIsEnabled)
dia_item.setFlags(QtCore.Qt.ItemFlag.ItemIsEnabled)
self.ui.geo_tools_table.setItem(row_idx, 1, dia_item) # Diameter
# -------------------- OFFSET ------------------------------------- #
@@ -212,7 +212,7 @@ class GeometryObject(FlatCAMObj, Geometry):
except TypeError:
offset_item_txt = tooluid_value['data']['tools_mill_offset_type']
offset_item = QtWidgets.QTableWidgetItem(offset_item_txt)
offset_item.setFlags(QtCore.Qt.ItemIsEnabled)
offset_item.setFlags(QtCore.Qt.ItemFlag.ItemIsEnabled)
self.ui.geo_tools_table.setItem(row_idx, 2, offset_item) # Offset Type
# -------------------- JOB ------------------------------------- #
@@ -221,7 +221,7 @@ class GeometryObject(FlatCAMObj, Geometry):
except TypeError:
job_item_txt = tooluid_value['data']['tools_mill_job_type']
job_item = QtWidgets.QTableWidgetItem(job_item_txt)
job_item.setFlags(QtCore.Qt.ItemIsEnabled)
job_item.setFlags(QtCore.Qt.ItemFlag.ItemIsEnabled)
self.ui.geo_tools_table.setItem(row_idx, 3, job_item) # Job Type
# -------------------- TOOL SHAPE ------------------------------------- #
@@ -230,7 +230,7 @@ class GeometryObject(FlatCAMObj, Geometry):
except TypeError:
tool_shape_item_txt = tooluid_value['data']['tools_mill_tool_shape']
tool_shape_item = QtWidgets.QTableWidgetItem(tool_shape_item_txt)
tool_shape_item.setFlags(QtCore.Qt.ItemIsEnabled)
tool_shape_item.setFlags(QtCore.Qt.ItemFlag.ItemIsEnabled)
self.ui.geo_tools_table.setItem(row_idx, 4, tool_shape_item) # Tool Shape
# -------------------- TOOL UID ------------------------------------- #
@@ -240,10 +240,10 @@ class GeometryObject(FlatCAMObj, Geometry):
# -------------------- PLOT ------------------------------------- #
empty_plot_item = QtWidgets.QTableWidgetItem('')
empty_plot_item.setFlags(~QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
empty_plot_item.setFlags(~QtCore.Qt.ItemFlag.ItemIsSelectable | QtCore.Qt.ItemFlag.ItemIsEnabled)
self.ui.geo_tools_table.setItem(row_idx, 6, empty_plot_item)
plot_item = FCCheckBox()
plot_item.setLayoutDirection(QtCore.Qt.RightToLeft)
plot_item.setLayoutDirection(QtCore.Qt.LayoutDirection.RightToLeft)
if self.ui.plot_cb.isChecked():
plot_item.setChecked(True)
self.ui.geo_tools_table.setCellWidget(row_idx, 6, plot_item)
@@ -252,7 +252,7 @@ class GeometryObject(FlatCAMObj, Geometry):
for row in range(row_idx):
self.ui.geo_tools_table.item(row, 0).setFlags(
self.ui.geo_tools_table.item(row, 0).flags() ^ QtCore.Qt.ItemIsSelectable)
self.ui.geo_tools_table.item(row, 0).flags() ^ QtCore.Qt.ItemFlag.ItemIsSelectable)
self.ui.geo_tools_table.resizeColumnsToContents()
self.ui.geo_tools_table.resizeRowsToContents()
@@ -319,15 +319,15 @@ class GeometryObject(FlatCAMObj, Geometry):
# area_dict = self.app.exc_areas.exclusion_areas_storage[area]
#
# area_id_item = QtWidgets.QTableWidgetItem('%d' % int(area_dict["idx"]))
# area_id_item.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
# area_id_item.setFlags(QtCore.Qt.ItemFlag.ItemIsSelectable | QtCore.Qt.ItemFlag.ItemIsEnabled)
# self.ui.exclusion_table.setItem(area, 0, area_id_item) # Area id
#
# object_item = QtWidgets.QTableWidgetItem('%s' % area_dict["obj_type"])
# object_item.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
# object_item.setFlags(QtCore.Qt.ItemFlag.ItemIsSelectable | QtCore.Qt.ItemFlag.ItemIsEnabled)
# self.ui.exclusion_table.setItem(area, 1, object_item) # Origin Object
#
# # strategy_item = QtWidgets.QTableWidgetItem('%s' % area_dict["strategy"])
# # strategy_item.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
# # strategy_item.setFlags(QtCore.Qt.ItemFlag.ItemIsSelectable | QtCore.Qt.ItemFlag.ItemIsEnabled)
# strategy_item = FCComboBox2(policy=False)
# strategy_item.addItems([_("Around"), _("Over")])
# idx = 0 if area_dict["strategy"] == 'around' else 1
@@ -339,14 +339,14 @@ class GeometryObject(FlatCAMObj, Geometry):
# self.ui.exclusion_table.setCellWidget(area, 2, strategy_item) # Strategy
#
# overz_item = QtWidgets.QTableWidgetItem('%s' % area_dict["overz"])
# overz_item.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
# overz_item.setFlags(QtCore.Qt.ItemFlag.ItemIsSelectable | QtCore.Qt.ItemFlag.ItemIsEnabled)
# self.ui.exclusion_table.setItem(area, 3, overz_item) # Over Z
#
# # make the Overz column editable
# for row in range(e_len):
# self.ui.exclusion_table.item(row, 3).setFlags(QtCore.Qt.ItemIsSelectable |
# QtCore.Qt.ItemIsEditable |
# QtCore.Qt.ItemIsEnabled)
# self.ui.exclusion_table.item(row, 3).setFlags(QtCore.Qt.ItemFlag.ItemIsSelectable |
# QtCore.Qt.ItemFlag.ItemIsEditable |
# QtCore.Qt.ItemFlag.ItemIsEnabled)
#
# self.ui.exclusion_table.resizeColumnsToContents()
# self.ui.exclusion_table.resizeRowsToContents()
@@ -680,7 +680,7 @@ class GeometryObject(FlatCAMObj, Geometry):
self.ui.treeWidget.clear()
self.add_properties_items(obj=self, treeWidget=self.ui.treeWidget)
self.ui.treeWidget.setSizePolicy(QtWidgets.QSizePolicy.Ignored, QtWidgets.QSizePolicy.MinimumExpanding)
self.ui.treeWidget.setSizePolicy(QtWidgets.QSizePolicy.Policy.Ignored, QtWidgets.QSizePolicy.Policy.MinimumExpanding)
# make sure that the FCTree widget columns are resized to content
self.ui.treeWidget.resize_sig.emit()

18
appObjects/FlatCAMGerber.py
View File

@@ -275,16 +275,16 @@ class GerberObject(FlatCAMObj, Gerber):
# ------------------------ Aperture ID ----------------------------------------------------------------
ap_id_item = QtWidgets.QTableWidgetItem('%d' % int(self.apertures_row + 1))
ap_id_item.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
ap_id_item.setFlags(QtCore.Qt.ItemFlag.ItemIsSelectable | QtCore.Qt.ItemFlag.ItemIsEnabled)
self.ui.apertures_table.setItem(self.apertures_row, 0, ap_id_item) # Tool name/id
# ------------------------ Aperture CODE --------------------------------------------------------------
ap_code_item = QtWidgets.QTableWidgetItem(str(ap_code))
ap_code_item.setFlags(QtCore.Qt.ItemIsEnabled)
ap_code_item.setFlags(QtCore.Qt.ItemFlag.ItemIsEnabled)
# ------------------------ Aperture TYPE --------------------------------------------------------------
ap_type_item = QtWidgets.QTableWidgetItem(str(self.tools[ap_code]['type']))
ap_type_item.setFlags(QtCore.Qt.ItemIsEnabled)
ap_type_item.setFlags(QtCore.Qt.ItemFlag.ItemIsEnabled)
if str(self.tools[ap_code]['type']) == 'R' or str(self.tools[ap_code]['type']) == 'O':
ap_dim_item = QtWidgets.QTableWidgetItem(
@@ -292,16 +292,16 @@ class GerberObject(FlatCAMObj, Gerber):
self.decimals, self.tools[ap_code]['height']
)
)
ap_dim_item.setFlags(QtCore.Qt.ItemIsEnabled)
ap_dim_item.setFlags(QtCore.Qt.ItemFlag.ItemIsEnabled)
elif str(self.tools[ap_code]['type']) == 'P':
ap_dim_item = QtWidgets.QTableWidgetItem(
'%.*f, %.*f' % (self.decimals, self.tools[ap_code]['diam'],
self.decimals, self.tools[ap_code]['nVertices'])
)
ap_dim_item.setFlags(QtCore.Qt.ItemIsEnabled)
ap_dim_item.setFlags(QtCore.Qt.ItemFlag.ItemIsEnabled)
else:
ap_dim_item = QtWidgets.QTableWidgetItem('')
ap_dim_item.setFlags(QtCore.Qt.ItemIsEnabled)
ap_dim_item.setFlags(QtCore.Qt.ItemFlag.ItemIsEnabled)
# ------------------------ Aperture SIZE --------------------------------------------------------------
try:
@@ -312,11 +312,11 @@ class GerberObject(FlatCAMObj, Gerber):
ap_size_item = QtWidgets.QTableWidgetItem('')
except KeyError:
ap_size_item = QtWidgets.QTableWidgetItem('')
ap_size_item.setFlags(QtCore.Qt.ItemIsEnabled)
ap_size_item.setFlags(QtCore.Qt.ItemFlag.ItemIsEnabled)
# ------------------------ Aperture MARK --------------------------------------------------------------
mark_item = FCCheckBox()
mark_item.setLayoutDirection(QtCore.Qt.RightToLeft)
mark_item.setLayoutDirection(QtCore.Qt.LayoutDirection.RightToLeft)
# if self.ui.aperture_table_visibility_cb.isChecked():
# mark_item.setChecked(True)
@@ -326,7 +326,7 @@ class GerberObject(FlatCAMObj, Gerber):
self.ui.apertures_table.setItem(self.apertures_row, 4, ap_dim_item) # Aperture Dimensions
empty_plot_item = QtWidgets.QTableWidgetItem('')
empty_plot_item.setFlags(~QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
empty_plot_item.setFlags(~QtCore.Qt.ItemFlag.ItemIsSelectable | QtCore.Qt.ItemFlag.ItemIsEnabled)
self.ui.apertures_table.setItem(self.apertures_row, 5, empty_plot_item)
self.ui.apertures_table.setCellWidget(self.apertures_row, 5, mark_item)

48
appObjects/ObjectCollection.py
View File

@@ -11,10 +11,10 @@
# File modified by: Marius Stanciu #
# ##########################################################
from PyQt5 import QtGui, QtCore, QtWidgets
from PyQt5.QtCore import Qt, QSettings
from PyQt5.QtGui import QColor
# from PyQt5.QtCore import QModelIndex
from PyQt6 import QtGui, QtCore, QtWidgets
from PyQt6.QtCore import Qt, QSettings
from PyQt6.QtGui import QColor
# from PyQt6.QtCore import QModelIndex
from appObjects.FlatCAMObj import FlatCAMObj
from appObjects.FlatCAMCNCJob import CNCJobObject
@@ -53,7 +53,7 @@ class KeySensitiveListView(QtWidgets.QTreeView):
# self.setRootIsDecorated(False)
# self.setExpandsOnDoubleClick(False)
self.setEditTriggers(QtWidgets.QTreeView.NoEditTriggers) # No edit in the Project Tab Tree
self.setEditTriggers(QtWidgets.QTreeView.EditTrigger.NoEditTriggers) # No edit in the Project Tab Tree
# Enable dragging and dropping onto the appGUI
self.setAcceptDrops(True)
@@ -61,7 +61,7 @@ class KeySensitiveListView(QtWidgets.QTreeView):
self.app = app
# Enabling Drag and Drop for the items in the Project Tab
# Example: https://github.com/d1vanov/PyQt5-reorderable-list-model/blob/master/reorderable_list_model.py
# Example: https://github.com/d1vanov/PyQt6-reorderable-list-model/blob/master/reorderable_list_model.py
# https://github.com/jimmykuu/PyQt-PySide-Cookbook/blob/master/tree/drop_indicator.md
# self.setDragEnabled(True)
# self.viewport().setAcceptDrops(True)
@@ -221,8 +221,10 @@ class TreeItem(KeySensitiveListView):
self.parent_item = parent_item
def __del__(self):
del self.icon
try:
del self.icon
except AttributeError:
pass
class ObjectCollection(QtCore.QAbstractItemModel):
"""
@@ -307,13 +309,13 @@ class ObjectCollection(QtCore.QAbstractItemModel):
self.view = KeySensitiveListView(self.app)
self.view.setModel(self)
self.view.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
self.view.setSelectionMode(QtWidgets.QAbstractItemView.ExtendedSelection)
self.view.setContextMenuPolicy(QtCore.Qt.ContextMenuPolicy.CustomContextMenu)
self.view.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.ExtendedSelection)
if self.app.defaults["global_allow_edit_in_project_tab"] is True:
self.view.setEditTriggers(QtWidgets.QTreeView.SelectedClicked) # allow Edit on Tree
self.view.setEditTriggers(QtWidgets.QTreeView.EditTrigger.SelectedClicked) # allow Edit on Tree
else:
self.view.setEditTriggers(QtWidgets.QTreeView.NoEditTriggers)
self.view.setEditTriggers(QtWidgets.QTreeView.EditTrigger.NoEditTriggers)
# self.view.setDragDropMode(QtWidgets.QAbstractItemView.InternalMove)
# self.view.setDragEnabled(True)
@@ -465,14 +467,14 @@ class ObjectCollection(QtCore.QAbstractItemModel):
if not index.isValid():
return None
if role in [Qt.DisplayRole, Qt.EditRole]:
if role in [Qt.ItemDataRole.DisplayRole, Qt.ItemDataRole.EditRole]:
obj = index.internalPointer().obj
if obj:
return obj.options["name"]
else:
return index.internalPointer().data(index.column())
if role == Qt.ForegroundRole:
if role == Qt.ItemDataRole.ForegroundRole:
color = QColor(self.app.defaults['global_proj_item_color'])
color_disabled = QColor(self.app.defaults['global_proj_item_dis_color'])
obj = index.internalPointer().obj
@@ -481,13 +483,13 @@ class ObjectCollection(QtCore.QAbstractItemModel):
else:
return index.internalPointer().data(index.column())
elif role == Qt.DecorationRole:
elif role == Qt.ItemDataRole.DecorationRole:
icon = index.internalPointer().icon
if icon:
return icon
else:
return QtGui.QPixmap()
elif role == Qt.ToolTipRole:
elif role == Qt.ItemDataRole.ToolTipRole:
try:
obj = index.internalPointer().obj
except AttributeError:
@@ -540,17 +542,17 @@ class ObjectCollection(QtCore.QAbstractItemModel):
default_flags = QtCore.QAbstractItemModel.flags(self, index)
if not index.isValid():
return Qt.ItemIsEnabled | default_flags
return Qt.ItemFlag.ItemIsEnabled | default_flags
# Prevent groups from selection
try:
if not index.internalPointer().obj:
return Qt.ItemIsEnabled
return Qt.ItemFlag.ItemIsEnabled
else:
return Qt.ItemIsEnabled | Qt.ItemIsSelectable | Qt.ItemIsEditable | \
Qt.ItemIsDragEnabled | Qt.ItemIsDropEnabled
return Qt.ItemFlag.ItemIsEnabled | Qt.ItemFlag.ItemIsSelectable | Qt.ItemFlag.ItemIsEditable | \
Qt.ItemFlag.ItemIsDragEnabled | Qt.ItemFlag.ItemIsDropEnabled
except AttributeError:
return Qt.ItemIsEnabled
return Qt.ItemFlag.ItemIsEnabled
# return QtWidgets.QAbstractItemModel.flags(self, index)
def append(self, obj, active=False, to_index=None):
@@ -1113,7 +1115,7 @@ class ObjectCollection(QtCore.QAbstractItemModel):
def add_act(o_name):
obj_for_icon = self.get_by_name(o_name)
menu_action = QtWidgets.QAction(parent=self.app.ui.menuobjects)
menu_action = QtGui.QAction(parent=self.app.ui.menuobjects)
menu_action.setCheckable(True)
menu_action.setText(o_name)
menu_action.setIcon(QtGui.QIcon(icon_files[obj_for_icon.kind]))
@@ -1169,7 +1171,7 @@ class ObjectCollection(QtCore.QAbstractItemModel):
elif state == 'rename':
for act in self.app.ui.menuobjects.actions():
if act.text() == old_name:
add_action = QtWidgets.QAction(parent=self.app.ui.menuobjects)
add_action = QtGui.QAction(parent=self.app.ui.menuobjects)
add_action.setText(obj.options['name'])
add_action.setIcon(QtGui.QIcon(icon_files[obj.kind]))
add_action.triggered.connect(