update API in other methods

qgis · Dec 4, 2019 · 576e81d · 576e81d
1 parent a6e1920
commit 576e81d
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 16 deletions.
diff --git a/src/core/classification/qgsclassificationcustom.cpp b/src/core/classification/qgsclassificationcustom.cpp
@@ -19,7 +19,7 @@ const QString QgsClassificationCustom::METHOD_ID = QStringLiteral( "Custom" );
 
 
 QgsClassificationCustom::QgsClassificationCustom()
-  : QgsClassificationMethod( ValuesNotRequired,
+  : QgsClassificationMethod( NoFlag,
                              0 /*codeComplexity*/ )
 {
 }
@@ -42,7 +42,7 @@ QString QgsClassificationCustom::id() const
   return METHOD_ID;
 }
 
-QList<double> QgsClassificationCustom::calculateBreaks( double minimum, double maximum,
+QList<double> QgsClassificationCustom::calculateBreaks( double &minimum, double &maximum,
     const QList<double> &values, int nclasses )
 {
   Q_UNUSED( minimum )

diff --git a/src/core/classification/qgsclassificationcustom.h b/src/core/classification/qgsclassificationcustom.h
@@ -34,10 +34,12 @@ class CORE_EXPORT QgsClassificationCustom : public QgsClassificationMethod
     QString name() const override;
     QString id() const override;
 
+    bool valuesRequired() const override {return false;}
+
     static const QString METHOD_ID;
 
   private:
-    QList<double> calculateBreaks( double minimum, double maximum,
+    QList<double> calculateBreaks( double &minimum, double &maximum,
                                    const QList<double> &values, int nclasses ) override;
 };
 

diff --git a/src/core/classification/qgsclassificationequalinterval.cpp b/src/core/classification/qgsclassificationequalinterval.cpp
@@ -21,7 +21,7 @@
 const QString QgsClassificationEqualInterval::METHOD_ID = QStringLiteral( "EqualInterval" );
 
 QgsClassificationEqualInterval::QgsClassificationEqualInterval()
-  : QgsClassificationMethod( ValuesNotRequired | SymmetricModeAvailable, 0 /*codeComplexity*/ )
+  : QgsClassificationMethod( SymmetricModeAvailable, 0 /*codeComplexity*/ )
 {
 }
 
@@ -35,7 +35,7 @@ QString QgsClassificationEqualInterval::id() const
   return METHOD_ID;
 }
 
-QList<double> QgsClassificationEqualInterval::calculateBreaks( double minimum, double maximum,
+QList<double> QgsClassificationEqualInterval::calculateBreaks( double &minimum, double &maximum,
     const QList<double> &values, int nclasses )
 {
   Q_UNUSED( values )
@@ -101,3 +101,4 @@ QIcon QgsClassificationEqualInterval::icon() const
 {
   return QgsApplication::getThemeIcon( "classification_methods/mClassificationEqualInterval.svg" );
 }
+
diff --git a/src/core/classification/qgsclassificationequalinterval.h b/src/core/classification/qgsclassificationequalinterval.h
@@ -35,13 +35,14 @@ class CORE_EXPORT QgsClassificationEqualInterval : public QgsClassificationMetho
     QgsClassificationMethod *clone() const override;
     QIcon icon() const override;
 
+    bool valuesRequired() const override {return false;}
+
     static const QString METHOD_ID;
 
   private:
-    QList<double> calculateBreaks( double minimum, double maximum,
+    QList<double> calculateBreaks( double &minimum, double &maximum,
                                    const QList<double> &values, int nclasses ) override;
 
-
 };
 
 #endif // QGSCLASSIFICATIONEQUALINTERVAL_H
diff --git a/src/core/classification/qgsclassificationjenks.cpp b/src/core/classification/qgsclassificationjenks.cpp
@@ -46,7 +46,7 @@ QIcon QgsClassificationJenks::icon() const
 }
 
 
-QList<double> QgsClassificationJenks::calculateBreaks( double minimum, double maximum,
+QList<double> QgsClassificationJenks::calculateBreaks( double &minimum, double &maximum,
     const QList<double> &values, int nclasses )
 {
   // Jenks Optimal (Natural Breaks) algorithm

diff --git a/src/core/classification/qgsclassificationjenks.h b/src/core/classification/qgsclassificationjenks.h
@@ -36,7 +36,7 @@ class CORE_EXPORT QgsClassificationJenks : public QgsClassificationMethod
     QIcon icon() const override;
 
   private:
-    QList<double> calculateBreaks( double minimum, double maximum,
+    QList<double> calculateBreaks( double &minimum, double &maximum,
                                    const QList<double> &values, int nclasses ) override;
 
     int mMaximumSize = 3000;

diff --git a/src/core/classification/qgsclassificationprettybreaks.cpp b/src/core/classification/qgsclassificationprettybreaks.cpp
@@ -21,7 +21,7 @@
 
 
 QgsClassificationPrettyBreaks::QgsClassificationPrettyBreaks()
-  : QgsClassificationMethod( ValuesNotRequired | SymmetricModeAvailable )
+  : QgsClassificationMethod( SymmetricModeAvailable )
 {
 
 }
@@ -36,7 +36,7 @@ QString QgsClassificationPrettyBreaks::id() const
   return QStringLiteral( "Pretty" );
 }
 
-QList<double> QgsClassificationPrettyBreaks::calculateBreaks( double minimum, double maximum, const QList<double> &values, int nclasses )
+QList<double> QgsClassificationPrettyBreaks::calculateBreaks( double &minimum, double &maximum, const QList<double> &values, int nclasses )
 {
   Q_UNUSED( values );
   QList<double> breaks = QgsSymbolLayerUtils::prettyBreaks( minimum, maximum, nclasses );

diff --git a/src/core/classification/qgsclassificationprettybreaks.h b/src/core/classification/qgsclassificationprettybreaks.h
@@ -35,8 +35,10 @@ class CORE_EXPORT QgsClassificationPrettyBreaks : public QgsClassificationMethod
     QgsClassificationMethod *clone() const override;
     QIcon icon() const override;
 
+    bool valuesRequired() const override {return false;}
+
   private:
-    QList<double> calculateBreaks( double minimum, double maximum,
+    QList<double> calculateBreaks( double &minimum, double &maximum,
                                    const QList<double> &values, int nclasses ) override;
 };
 

diff --git a/src/core/classification/qgsclassificationquantile.cpp b/src/core/classification/qgsclassificationquantile.cpp
@@ -45,7 +45,7 @@ QIcon QgsClassificationQuantile::icon() const
 }
 
 
-QList<double> QgsClassificationQuantile::calculateBreaks( double minimum, double maximum,
+QList<double> QgsClassificationQuantile::calculateBreaks( double &minimum, double &maximum,
     const QList<double> &values, int nclasses )
 {
   Q_UNUSED( minimum )

diff --git a/src/core/classification/qgsclassificationquantile.h b/src/core/classification/qgsclassificationquantile.h
@@ -37,7 +37,7 @@ class CORE_EXPORT QgsClassificationQuantile : public QgsClassificationMethod
     QIcon icon() const override;
 
   private:
-    QList<double> calculateBreaks( double minimum, double maximum,
+    QList<double> calculateBreaks( double &minimum, double &maximum,
                                    const QList<double> &values, int nclasses ) override;
 };
 

diff --git a/src/core/classification/qgsclassificationstandarddeviation.cpp b/src/core/classification/qgsclassificationstandarddeviation.cpp
@@ -52,7 +52,7 @@ QIcon QgsClassificationStandardDeviation::icon() const
 }
 
 
-QList<double> QgsClassificationStandardDeviation::calculateBreaks( double minimum, double maximum,
+QList<double> QgsClassificationStandardDeviation::calculateBreaks( double &minimum, double &maximum,
     const QList<double> &values, int nclasses )
 {
   // C++ implementation of the standard deviation class interval algorithm

diff --git a/src/core/classification/qgsclassificationstandarddeviation.h b/src/core/classification/qgsclassificationstandarddeviation.h
@@ -41,7 +41,7 @@ class CORE_EXPORT QgsClassificationStandardDeviation : public QgsClassificationM
     static const QString METHOD_ID;
 
   private:
-    QList<double> calculateBreaks( double minimum, double maximum,
+    QList<double> calculateBreaks( double &minimum, double &maximum,
                                    const QList<double> &values, int nclasses ) override;
 
     QString valueToLabel( double value ) const override;