fix dox and switch to classic enum

scope based enum is causing troubles from Python depending on sip version
qgis · Dec 6, 2019 · 84d6bbe · 84d6bbe
1 parent 9e216b4
commit 84d6bbe
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 12 deletions.
diff --git a/python/core/auto_additions/qgsclassificationlogarithmic.py b/python/core/auto_additions/qgsclassificationlogarithmic.py
diff --git a/python/core/auto_generated/classification/qgsclassificationlogarithmic.sip.in b/python/core/auto_generated/classification/qgsclassificationlogarithmic.sip.in
@@ -22,7 +22,7 @@ Implementation of a logarithmic scale method
 %End
   public:
 
-    enum class NegativeValueHandling
+    enum NegativeValueHandling
     {
       NoHandling,
       Discard,

diff --git a/src/core/classification/qgsclassificationlogarithmic.h b/src/core/classification/qgsclassificationlogarithmic.h
@@ -29,7 +29,11 @@ class CORE_EXPORT QgsClassificationLogarithmic : public QgsClassificationMethod
 {
   public:
 
-    enum class NegativeValueHandling : int
+    /**
+       * Handling of negative and 0 values in the method
+       * \since QGIS 3.12
+       */
+    enum NegativeValueHandling
     {
       NoHandling = 0, //!< No handling
       Discard,        //!< Negative values are discarded - this will require all values

diff --git a/src/core/classification/qgsclassificationmethod.cpp b/src/core/classification/qgsclassificationmethod.cpp
@@ -185,7 +185,7 @@ const QgsProcessingParameterDefinition *QgsClassificationMethod::parameterDefini
     if ( def->name() == parameterName )
       return def;
   }
-  QgsMessageLog::logMessage( QStringLiteral( "No parameter defintion found for %1 in %2 method." ).arg( parameterName ).arg( name() ) );
+  QgsMessageLog::logMessage( QStringLiteral( "No parameter definition found for %1 in %2 method." ).arg( parameterName ).arg( name() ) );
   return nullptr;
 }
 

diff --git a/tests/src/python/test_qgsclassificationmethod.py b/tests/src/python/test_qgsclassificationmethod.py
@@ -74,13 +74,13 @@ def testQgsClassificationLogarithmic_FilterZeroNeg(self):
         vl = createMemoryLayer(values)
         m = QgsClassificationLogarithmic()
 
-        m.setParameterValues({'ZERO_NEG_VALUES_HANDLE': int(QgsClassificationLogarithmic.NegativeValueHandling.Discard)})
+        m.setParameterValues({'ZERO_NEG_VALUES_HANDLE': QgsClassificationLogarithmic.NegativeValueHandling.Discard})
         r = m.classes(vl, 'value', 4)
         self.assertEqual(len(r), 4)
         self.assertEqual(r[0].label(), '1 - 10^1')
         self.assertEqual(QgsClassificationMethod.rangesToBreaks(r), [10.0, 100.0, 1000.0, 10000.0])
 
-        m.setParameterValues({'ZERO_NEG_VALUES_HANDLE': int(QgsClassificationLogarithmic.NegativeValueHandling.PrependBreak)})
+        m.setParameterValues({'ZERO_NEG_VALUES_HANDLE': QgsClassificationLogarithmic.NegativeValueHandling.PrependBreak})
         r = m.classes(vl, 'value', 4)
         self.assertEqual(r[0].label(), '-2 - 10^0')
         self.assertEqual(QgsClassificationMethod.rangesToBreaks(r), [1.0, 10.0, 100.0, 1000.0, 10000.0])