Handle enum values for data defined properties by converting to int

Author: nyalldawson

python/PyQt/PyQt/common.py.in

@@ -24,6 +24,10 @@ def _handle_extended_enum_values(v):
     in the Enum class.
     Otherwise returns v unchanged.
     """
+    if isinstance(v, list):
+       return [_handle_extended_enum_values(_item) for _item in v]
+    if isinstance(v, dict):
+       return {_key: _handle_extended_enum_values(_value) for _key, _value in v.items()}
     if isinstance(v, Enum):
        # v may be an Enum value which itself is an Enum value!
        # E.g. QNetworkRequest.Attribute(QgsNetworkRequestParameters.RequestAttributes.AttributeInitiatorClass)
@@ -56,3 +60,47 @@ def install_extended_enum_wrapper(f):
     """
     return _extended_enum_wrapper(f)
 
+
+def _convert_enum_values_to_int(v):
+    """
+    If v is an Enum, returns an integer representation of its value wrapped
+    in the Enum class.
+    Otherwise returns v unchanged.
+    """
+    if isinstance(v, list):
+       return [_convert_enum_values_to_int(_item) for _item in v]
+    if isinstance(v, dict):
+       return {_key: _convert_enum_values_to_int(_value) for _key, _value in v.items()}
+    if isinstance(v, Enum):
+       # v may be an Enum value which itself is an Enum value!
+       # E.g. QNetworkRequest.Attribute(QgsNetworkRequestParameters.RequestAttributes.AttributeInitiatorClass)
+       # in this case v is an Enum of the class QNetworkRequest.Attribute, while v.value is an Enum of the
+       # class QgsNetworkRequestParameters.RequestAttributes. For this to work, we need to extract the integer
+       # value from QgsNetworkRequestParameters.RequestAttributes.AttributeInitiatorClass and then convert it
+       # to a QNetworkRequest.Attribute enum value!
+       if isinstance(v.value, Enum):
+          return int(v.value.value)
+       return int(v.value)
+    return v
+
+
+def _enum_to_int_wrapper(method):
+    """
+    Calls a function, first converting all passed Enum arguments to integer
+    values.
+    """
+    @functools.wraps(method)
+    def wrapped(*args, **kwargs):
+        parsed_args = [_convert_enum_values_to_int(arg) for arg in args]
+        parsed_kwargs = {k: _convert_enum_values_to_int(v) for k, v in kwargs.items()}
+        return method(*parsed_args, **parsed_kwargs)
+
+    return wrapped
+
+
+def install_enum_to_int_wrapper(f):
+    """
+    Installs a wrapper on a function so that all passed Enum arguments are converted to integer values.
+    """
+    return _enum_to_int_wrapper(f)
+

python/PyQt6/core/__init__.py.in

@@ -21,6 +21,7 @@ __author__ = 'Nathan Woodrow'
 __date__ = 'May 2014'
 __copyright__ = '(C) 2014, Nathan Woodrow'
 
+from qgis.PyQt.common import install_enum_to_int_wrapper
 from qgis.PyQt.QtCore import NULL
 from qgis._core import *
 
@@ -159,3 +160,20 @@ PROJECT_SCALES = Qgis.defaultProjectScales()
 GEOPROJ4 = geoProj4()
 GEO_EPSG_CRS_AUTHID = geoEpsgCrsAuthId()
 GEO_NONE = geoNone()
+
+QgsPropertyCollection.setProperty = install_enum_to_int_wrapper(QgsPropertyCollection.setProperty)
+QgsPropertyCollection.property = install_enum_to_int_wrapper(QgsPropertyCollection.property)
+QgsPropertyCollection.hasProperty = install_enum_to_int_wrapper(QgsPropertyCollection.hasProperty)
+QgsPropertyCollection.isActive = install_enum_to_int_wrapper(QgsPropertyCollection.isActive)
+QgsAbstractPropertyCollection.value = install_enum_to_int_wrapper(QgsAbstractPropertyCollection.value)
+QgsAbstractPropertyCollection.valueAsDateTime = install_enum_to_int_wrapper(QgsAbstractPropertyCollection.valueAsDateTime)
+QgsAbstractPropertyCollection.valueAsString = install_enum_to_int_wrapper(QgsAbstractPropertyCollection.valueAsString)
+QgsAbstractPropertyCollection.valueAsColor = install_enum_to_int_wrapper(QgsAbstractPropertyCollection.valueAsColor)
+QgsAbstractPropertyCollection.valueAsDouble = install_enum_to_int_wrapper(QgsAbstractPropertyCollection.valueAsDouble)
+QgsAbstractPropertyCollection.valueAsInt = install_enum_to_int_wrapper(QgsAbstractPropertyCollection.valueAsInt)
+QgsAbstractPropertyCollection.valueAsBool = install_enum_to_int_wrapper(QgsAbstractPropertyCollection.valueAsBool)
+QgsSymbol.setDataDefinedProperty = install_enum_to_int_wrapper(QgsSymbol.setDataDefinedProperty)
+QgsSymbolLayer.setDataDefinedProperty = install_enum_to_int_wrapper(QgsSymbolLayer.setDataDefinedProperty)
+QgsHashedLineSymbolLayer.setDataDefinedProperty = install_enum_to_int_wrapper(QgsHashedLineSymbolLayer.setDataDefinedProperty)
+QgsMarkerLineSymbolLayer.setDataDefinedProperty = install_enum_to_int_wrapper(QgsMarkerLineSymbolLayer.setDataDefinedProperty)
+