- continuing to fix the PyQt6 port

- added an Exception when App.on_canvas_setup() fails

appGUI/GUIElements.py

@@ -172,7 +172,7 @@ class FCTree(QtWidgets.QTreeWidget):
 
         self.setColumnCount(columns)
         self.setHeaderHidden(header_hidden)
-        self.tree_header.setSectionResizeMode(QtWidgets.QHeaderView.ResizeToContents)
+        self.tree_header.setSectionResizeMode(QtWidgets.QHeaderView.ResizeMode.ResizeToContents)
         self.setSizePolicy(QtWidgets.QSizePolicy.Policy.Ignored, QtWidgets.QSizePolicy.Policy.Expanding)
 
         palette = QtGui.QPalette()
@@ -185,9 +185,9 @@ class FCTree(QtWidgets.QTreeWidget):
         self.setPalette(palette)
 
         if extended_sel:
-            self.setSelectionMode(QtWidgets.QAbstractItemView.ExtendedSelection)
+            self.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.ExtendedSelection)
 
-        self.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows)
+        self.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows)
 
         self.protected_column = protected_column
         self.itemDoubleClicked.connect(self.on_double_click)
@@ -204,9 +204,9 @@ class FCTree(QtWidgets.QTreeWidget):
             item.setFlags(tmp_flags ^ QtCore.Qt.ItemFlag.ItemIsEditable)
 
     def on_header_double_click(self, column):
-        self.tree_header.setSectionResizeMode(column, QtWidgets.QHeaderView.ResizeToContents)
+        self.tree_header.setSectionResizeMode(column, QtWidgets.QHeaderView.ResizeMode.ResizeToContents)
         width = self.tree_header.sectionSize(column)
-        self.tree_header.setSectionResizeMode(column, QtWidgets.QHeaderView.Interactive)
+        self.tree_header.setSectionResizeMode(column, QtWidgets.QHeaderView.ResizeMode.Interactive)
         self.tree_header.resizeSection(column, width)
 
     def is_editable(self, tested_col):
@@ -276,9 +276,9 @@ class FCTree(QtWidgets.QTreeWidget):
     def on_resize(self):
         header = self.header()
         for column in range(header.count()):
-            header.setSectionResizeMode(column, QtWidgets.QHeaderView.ResizeToContents)
+            header.setSectionResizeMode(column, QtWidgets.QHeaderView.ResizeMode.ResizeToContents)
             width = header.sectionSize(column)
-            header.setSectionResizeMode(column, QtWidgets.QHeaderView.Interactive)
+            header.setSectionResizeMode(column, QtWidgets.QHeaderView.ResizeMode.Interactive)
             header.resizeSection(column, width)
 
 
@@ -3503,9 +3503,9 @@ class FCTable(QtWidgets.QTableWidget):
             self.setDragDropOverwriteMode(False)
             self.setDropIndicatorShown(True)
 
-            self.setSelectionMode(QtWidgets.QAbstractItemView.ExtendedSelection)
-            self.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows)
-            self.setDragDropMode(QtWidgets.QAbstractItemView.InternalMove)
+            self.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.ExtendedSelection)
+            self.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows)
+            self.setDragDropMode(QtWidgets.QAbstractItemView.DragDropMode.InternalMove)
 
         self.rows_not_for_drag_and_drop = []
         if protected_rows:

appGUI/MainGUI.py

@@ -2159,7 +2159,7 @@ class MainGUI(QtWidgets.QMainWindow):
         :return:
         """
         if self.app.defaults["global_toggle_tooltips"] is False:
-            if event.type() == QtCore.QEvent.ToolTip:
+            if event.type() == QtCore.QEvent.Type.ToolTip:
                 return True
             else:
                 return False
@@ -2575,7 +2575,7 @@ class MainGUI(QtWidgets.QMainWindow):
 
         if self.app.call_source == 'app':
             # CTRL + ALT
-            if modifiers == QtCore.Qt.KeyboardModifierControlModifier | QtCore.Qt.KeyboardModifier.AltModifier:
+            if modifiers == QtCore.Qt.KeyboardModifier.ControlModifier | QtCore.Qt.KeyboardModifier.AltModifier:
                 if key == QtCore.Qt.Key.Key_X:
                     self.app.abort_all_tasks()
                     return

appGUI/ObjectUI.py

@@ -660,8 +660,8 @@ class ExcellonObjectUI(ObjectUI):
         self.drills_frame.setLayout(self.tools_box)
 
         self.tools_table = FCTable()
-        self.tools_table.setSelectionMode(QtWidgets.QAbstractItemView.ExtendedSelection)
-        self.tools_table.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows)
+        self.tools_table.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.ExtendedSelection)
+        self.tools_table.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows)
         self.tools_box.addWidget(self.tools_table)
 
         self.tools_table.setColumnCount(6)
@@ -992,7 +992,7 @@ class GeometryObjectUI(ObjectUI):
 
         self.geo_tools_table = FCTable(drag_drop=True)
         grid0.addWidget(self.geo_tools_table, 1, 0, 1, 2)
-        self.geo_tools_table.setSizeAdjustPolicy(QtWidgets.QAbstractScrollArea.AdjustToContents)
+        self.geo_tools_table.setSizeAdjustPolicy(QtWidgets.QAbstractScrollArea.SizeAdjustPolicy.AdjustToContents)
 
         self.geo_tools_table.setColumnCount(7)
         self.geo_tools_table.setColumnWidth(0, 20)

appGUI/PlotCanvas.py

@@ -127,10 +127,7 @@ class PlotCanvas(QtCore.QObject, VisPyCanvas):
 
         # <VisPyCanvas>
         self.create_native()
-        gui_widget = self.fcapp.ui
-
-        assert isinstance(gui_widget, QtWidgets.QWidget)
-        self.native.setParent(gui_widget)
+        self.native.setParent(self.fcapp.ui)
 
         axis_default_color = self.fcapp.defaults['global_axis_color']
         self.axis_transparency = 0.8

appGUI/PlotCanvasLegacy.py

@@ -25,11 +25,16 @@ import gettext
 import appTranslation as fcTranslate
 import builtins
 
-# Prevent conflict with Qt5 and above.
-from matplotlib import use as mpl_use
-mpl_use("Qt5Agg")
-from matplotlib.figure import Figure
-from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg as FigureCanvas
+MATPLOTLIB_AVAILABLE = True
+try:
+    # Prevent conflict with Qt5 and above.
+    from matplotlib import use as mpl_use
+    mpl_use("Qt5Agg")
+    from matplotlib.figure import Figure
+    from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg as FigureCanvas
+except ImportError:
+    MATPLOTLIB_AVAILABLE = False
+
 from matplotlib.lines import Line2D
 from matplotlib.offsetbox import AnchoredText
 # from matplotlib.widgets import Cursor
@@ -143,6 +148,11 @@ class PlotCanvasLegacy(QtCore.QObject):
 
         super(PlotCanvasLegacy, self).__init__()
 
+        self.status = 'ok'
+        if MATPLOTLIB_AVAILABLE is False:
+            self.status = 'fail'
+            return
+
         self.app = app
 
         if self.app.defaults['global_theme'] == 'white':