add constructor to QgsBox3d with a QgsRectangle

qgis · Dec 15, 2017 · abdd875 · abdd875
1 parent d0475cb
commit abdd875
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 0 deletions.
diff --git a/python/core/geometry/qgsbox3d.sip b/python/core/geometry/qgsbox3d.sip
@@ -37,6 +37,12 @@ class QgsBox3d
  The box is normalized after construction.
 %End
 
+    QgsBox3d( const QgsRectangle &rect );
+%Docstring
+ Constructs a QgsBox3D from a rectangle.
+ Z Minimum and Z Maximum are set to 0.0.
+%End
+
     void setXMinimum( double x );
 %Docstring
  Sets the minimum ``x`` value.

diff --git a/src/core/geometry/qgsbox3d.cpp b/src/core/geometry/qgsbox3d.cpp
@@ -32,6 +32,10 @@ QgsBox3d::QgsBox3d( const QgsPoint &p1, const QgsPoint &p2 )
   mBounds2d.normalize();
 }
 
+QgsBox3d::QgsBox3d( const QgsRectangle &rect )
+  : mBounds2d( rect )
+{}
+
 void QgsBox3d::setXMinimum( double x )
 {
   mBounds2d.setXMinimum( x );

diff --git a/src/core/geometry/qgsbox3d.h b/src/core/geometry/qgsbox3d.h
@@ -47,6 +47,12 @@ class CORE_EXPORT QgsBox3d
      */
     QgsBox3d( const QgsPoint &p1, const QgsPoint &p2 );
 
+    /**
+     * Constructs a QgsBox3D from a rectangle.
+     * Z Minimum and Z Maximum are set to 0.0.
+     */
+    QgsBox3d( const QgsRectangle &rect );
+
     /**
      * Sets the minimum \a x value.
      * \see xMinimum()

diff --git a/tests/src/python/test_qgsbox3d.py b/tests/src/python/test_qgsbox3d.py
@@ -52,6 +52,14 @@ def testCtor(self):
         self.assertEqual(box.yMaximum(), 11.0)
         self.assertEqual(box.zMaximum(), 12.0)
 
+        box = QgsBox3d(QgsRectangle(5, 6, 11, 13))
+        self.assertEqual(box.xMinimum(), 5.0)
+        self.assertEqual(box.yMinimum(), 6.0)
+        self.assertEqual(box.zMinimum(), 0.0)
+        self.assertEqual(box.xMaximum(), 11.0)
+        self.assertEqual(box.yMaximum(), 13.0)
+        self.assertEqual(box.zMaximum(), 0.0)
+
     def testSetters(self):
         box = QgsBox3d(5.0, 6.0, 7.0, 10.0, 11.0, 12.0)