fix: update compatibility for qt6

Author: lachlangrose

loopstructural/gui/compatibility.py

@@ -0,0 +1,20 @@
+# compat.py
+from qgis.PyQt.QtCore import QVariant
+
+try:
+    from qgis.PyQt.QtCore import QMetaType
+
+    # We create a proxy class to mimic the old QVariant.Type behavior
+    class QVariantProxy:
+        Type = QMetaType.Type
+        # Add common types here if needed
+        Int = QMetaType.Type.Int
+        Double = QMetaType.Type.Double
+        String = QMetaType.Type.QString
+        Bool = QMetaType.Type.Bool
+
+    # In QGIS 4, we use our proxy
+    QVariantCompat = QVariantProxy
+except (ImportError, AttributeError):
+    # In QGIS 3, QVariant already has .Type
+    QVariantCompat = QVariant

loopstructural/gui/data_conversion/data_conversion_widget.py

@@ -8,8 +8,10 @@
 from typing import Any, Dict, Iterable, List, Mapping, Optional, Tuple
 
 from LoopDataConverter import Datatype, InputData, LoopConverter, SurveyName
-from PyQt5.QtCore import Qt, QTimer
-from PyQt5.QtWidgets import (
+from qgis.core import QgsMapLayerProxyModel, QgsProject, QgsVectorLayer
+from qgis.gui import QgsMapLayerComboBox
+from qgis.PyQt.QtCore import Qt, QTimer
+from qgis.PyQt.QtWidgets import (
     QComboBox,
     QDialog,
     QDialogButtonBox,
@@ -21,8 +23,6 @@
     QVBoxLayout,
     QWidget,
 )
-from qgis.core import QgsMapLayerProxyModel, QgsProject, QgsVectorLayer
-from qgis.gui import QgsMapLayerComboBox
 
 from ...main.helpers import ColumnMatcher
 from ...main.vectorLayerWrapper import QgsLayerFromDataFrame, QgsLayerFromGeoDataFrame

loopstructural/gui/loop_widget.py

@@ -5,7 +5,7 @@
 interface for interacting with LoopStructural features inside QGIS.
 """
 
-from PyQt5.QtWidgets import QTabWidget, QVBoxLayout, QWidget
+from qgis.PyQt.QtWidgets import QTabWidget, QVBoxLayout, QWidget
 
 from .modelling.modelling_widget import ModellingWidget
 from .visualisation.visualisation_widget import VisualisationWidget

loopstructural/gui/map2loop_tools/basal_contacts_widget.py

@@ -2,9 +2,9 @@
 
 import os
 
-from PyQt5.QtWidgets import QMessageBox, QWidget
 from qgis.core import QgsProject, QgsVectorFileWriter
 from qgis.PyQt import uic
+from qgis.PyQt.QtWidgets import QMessageBox, QWidget
 
 from ...main.helpers import ColumnMatcher, get_layer_names
 from ...main.m2l_api import extract_basal_contacts

loopstructural/gui/map2loop_tools/dialogs.py

@@ -4,7 +4,7 @@
 instead of QGIS processing algorithms.
 """
 
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QVBoxLayout
+from qgis.PyQt.QtWidgets import QDialog, QDialogButtonBox, QVBoxLayout
 
 
 class SamplerDialog(QDialog):
@@ -23,7 +23,9 @@ def setup_ui(self):
         from .sampler_widget import SamplerWidget
 
         layout = QVBoxLayout(self)
-        self.widget = SamplerWidget(self, data_manager=self.data_manager, debug_manager=self.debug_manager)
+        self.widget = SamplerWidget(
+            self, data_manager=self.data_manager, debug_manager=self.debug_manager
+        )
         layout.addWidget(self.widget)
 
         # Replace the run button with dialog buttons

loopstructural/gui/map2loop_tools/fault_topology_widget.py

@@ -3,9 +3,9 @@
 import os
 
 import geopandas as gpd
-from PyQt5.QtWidgets import QDialog, QMessageBox
 from qgis.core import QgsMapLayerProxyModel
 from qgis.PyQt import uic
+from qgis.PyQt.QtWidgets import QDialog, QMessageBox
 
 
 class FaultTopologyWidget(QDialog):

loopstructural/gui/map2loop_tools/paint_stratigraphic_order_widget.py

@@ -2,10 +2,9 @@
 
 import os
 
-from PyQt5.QtWidgets import QMessageBox, QWidget
 from qgis.core import QgsMapLayerProxyModel
 from qgis.PyQt import uic
-
+from qgis.PyQt.QtWidgets import QMessageBox, QWidget
 
 from ...main.m2l_api import paint_stratigraphic_order
 
@@ -185,7 +184,6 @@ def _run_painter(self):
 
                 # Step 1: create a memory copy of the geology layer and copy attributes/geometry
                 try:
-                    from PyQt5.QtCore import QVariant
                     from qgis.core import (
                         QgsFeature,
                         QgsField,
@@ -198,6 +196,8 @@ def _run_painter(self):
                         QgsWkbTypes,
                     )
 
+                    from loopstructural.gui.compatibility import QVariantCompat
+
                     geom_type = QgsWkbTypes.displayString(geology_layer.wkbType())
                     crs_auth = (
                         geology_layer.crs().authid() if hasattr(geology_layer, 'crs') else None
@@ -240,7 +240,7 @@ def _run_painter(self):
                 try:
                     if field_name not in [f.name() for f in mem_layer.fields()]:
                         mem_layer.startEditing()
-                        mem_dp.addAttributes([QgsField(field_name, QVariant.Int)])
+                        mem_dp.addAttributes([QgsField(field_name, QVariantCompat.Int)])
                         mem_layer.updateFields()
                         mem_layer.commitChanges()
 

loopstructural/gui/map2loop_tools/sampler_widget.py

@@ -2,9 +2,9 @@
 
 import os
 
-from PyQt5.QtWidgets import QMessageBox, QWidget
 from qgis.core import QgsProject, QgsWkbTypes
 from qgis.PyQt import uic
+from qgis.PyQt.QtWidgets import QMessageBox, QWidget
 
 from loopstructural.toolbelt.preferences import PlgOptionsManager
 
@@ -226,7 +226,8 @@ def _run_sampler(self):
             QgsPointXY,
             QgsVectorLayer,
         )
-        from qgis.PyQt.QtCore import QVariant
+
+        from loopstructural.gui.compatibility import QVariantCompat
 
         from ...main.m2l_api import sample_contacts
 
@@ -293,11 +294,11 @@ def _run_sampler(self):
                     dtype_str = str(dtype)
 
                     if dtype_str in ['float16', 'float32', 'float64']:
-                        field_type = QVariant.Double
+                        field_type = QVariantCompat.Double
                     elif dtype_str in ['int8', 'int16', 'int32', 'int64']:
-                        field_type = QVariant.Int
+                        field_type = QVariantCompat.Int
                     else:
-                        field_type = QVariant.String
+                        field_type = QVariantCompat.String
 
                     fields.append(QgsField(column_name, field_type))
 

loopstructural/gui/map2loop_tools/sorter_widget.py

@@ -2,11 +2,9 @@
 
 import os
 
-from PyQt5.QtWidgets import QMessageBox, QWidget
-from qgis.core import QgsRasterLayer
-from qgis.core import QgsMapLayerProxyModel
-
+from qgis.core import QgsMapLayerProxyModel, QgsRasterLayer
 from qgis.PyQt import uic
+from qgis.PyQt.QtWidgets import QMessageBox, QWidget
 
 from loopstructural.main.helpers import get_layer_names
 from loopstructural.main.m2l_api import PARAMETERS_DICTIONARY, SORTER_LIST

loopstructural/gui/map2loop_tools/thickness_calculator_widget.py

@@ -3,9 +3,9 @@
 import os
 
 import pandas as pd
-from PyQt5.QtWidgets import QMessageBox, QWidget
 from qgis.core import QgsMapLayerProxyModel
 from qgis.PyQt import uic
+from qgis.PyQt.QtWidgets import QMessageBox, QWidget
 
 from loopstructural.toolbelt.preferences import PlgOptionsManager