More appropriate equality operator for QgsDoubleRange

qgis · Nov 25, 2020 · 928c969 · 928c969
1 parent 867dc85
commit 928c969
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/python/core/auto_generated/qgsrange.sip.in b/python/core/auto_generated/qgsrange.sip.in
@@ -121,6 +121,9 @@ Returns ``True`` if this range overlaps another range.
 
     bool operator!=( const QgsRange<T> &other ) const;
 
+  protected:
+
+
 };
 
 
@@ -179,6 +182,10 @@ Returns ``True`` if the range consists of all possible values.
     sipRes = PyUnicode_FromString( str.toUtf8().constData() );
 %End
 
+    bool operator==( const QgsDoubleRange &other ) const;
+
+    bool operator!=( const QgsDoubleRange &other ) const;
+
 };
 
 

diff --git a/src/core/qgsrange.h b/src/core/qgsrange.h
@@ -20,6 +20,7 @@
 
 #include "qgis_sip.h"
 #include "qgis_core.h"
+#include "qgis.h"
 
 #include <QDate>
 #include <QDateTime>
@@ -180,7 +181,7 @@ class QgsRange
       return ( ! operator==( other ) );
     }
 
-  private:
+  protected:
 
     T mLower;
     T mUpper;
@@ -259,6 +260,19 @@ class CORE_EXPORT QgsDoubleRange : public QgsRange< double >
     % End
 #endif
 
+    bool operator==( const QgsDoubleRange &other ) const
+    {
+      return qgsDoubleNear( mIncludeLower, other.mIncludeLower ) &&
+             qgsDoubleNear( mIncludeUpper, other.mIncludeUpper ) &&
+             mIncludeLower == other.includeLower() &&
+             mIncludeUpper == other.includeUpper();
+    }
+
+    bool operator!=( const QgsDoubleRange &other ) const
+    {
+      return ( ! operator==( other ) );
+    }
+
 };