Add methods to construct layout size/point from QSizeF/QPointF

nyalldawson · nyalldawson · commit 19a7863ea49c · 2017-07-18T12:42:06.000+10:00
diff --git a/python/core/layout/qgslayoutpoint.sip b/python/core/layout/qgslayoutpoint.sip
@@ -36,6 +36,11 @@ class QgsLayoutPoint
  Constructor for QgsLayoutPoint.
 %End
 
+    explicit QgsLayoutPoint( const QPointF point, const QgsUnitTypes::LayoutUnit units = QgsUnitTypes::LayoutMillimeters );
+%Docstring
+ Constructor for QgsLayoutPoint.
+%End
+
     explicit QgsLayoutPoint( const QgsUnitTypes::LayoutUnit units = QgsUnitTypes::LayoutMillimeters );
 %Docstring
  Constructor for an empty point, where both x and y are set to 0.
diff --git a/python/core/layout/qgslayoutsize.sip b/python/core/layout/qgslayoutsize.sip
@@ -40,6 +40,11 @@ class QgsLayoutSize
  \param units units for width and height
 %End
 
+    explicit QgsLayoutSize( const QSizeF size, const QgsUnitTypes::LayoutUnit units = QgsUnitTypes::LayoutMillimeters );
+%Docstring
+ Constructor for QgsLayoutSize.
+%End
+
     explicit QgsLayoutSize( const QgsUnitTypes::LayoutUnit units = QgsUnitTypes::LayoutMillimeters );
 %Docstring
  Constructor for an empty layout size
diff --git a/src/core/layout/qgslayoutpoint.cpp b/src/core/layout/qgslayoutpoint.cpp
@@ -28,6 +28,14 @@ QgsLayoutPoint::QgsLayoutPoint( const double x, const double y, const QgsUnitTyp
 
 }
 
+QgsLayoutPoint::QgsLayoutPoint( const QPointF point, const QgsUnitTypes::LayoutUnit units )
+  : mX( point.x() )
+  , mY( point.y() )
+  , mUnits( units )
+{
+
+}
+
 QgsLayoutPoint::QgsLayoutPoint( const QgsUnitTypes::LayoutUnit units )
   : mUnits( units )
 {
diff --git a/src/core/layout/qgslayoutpoint.h b/src/core/layout/qgslayoutpoint.h
@@ -45,6 +45,11 @@ class CORE_EXPORT QgsLayoutPoint
     */
     QgsLayoutPoint( const double x, const double y, const QgsUnitTypes::LayoutUnit units = QgsUnitTypes::LayoutMillimeters );
 
+    /**
+     * Constructor for QgsLayoutPoint.
+    */
+    explicit QgsLayoutPoint( const QPointF point, const QgsUnitTypes::LayoutUnit units = QgsUnitTypes::LayoutMillimeters );
+
     /**
      * Constructor for an empty point, where both x and y are set to 0.
      * \param units units for measurement
diff --git a/src/core/layout/qgslayoutsize.cpp b/src/core/layout/qgslayoutsize.cpp
@@ -26,6 +26,13 @@ QgsLayoutSize::QgsLayoutSize( const double width, const double height, const Qgs
 {
 }
 
+QgsLayoutSize::QgsLayoutSize( const QSizeF size, const QgsUnitTypes::LayoutUnit units )
+  : mWidth( size.width() )
+  , mHeight( size.height() )
+  , mUnits( units )
+{
+}
+
 QgsLayoutSize::QgsLayoutSize( const QgsUnitTypes::LayoutUnit units )
   : mUnits( units )
 {
diff --git a/src/core/layout/qgslayoutsize.h b/src/core/layout/qgslayoutsize.h
@@ -49,6 +49,11 @@ class CORE_EXPORT QgsLayoutSize
     */
     QgsLayoutSize( const double width, const double height, const QgsUnitTypes::LayoutUnit units = QgsUnitTypes::LayoutMillimeters );
 
+    /**
+     * Constructor for QgsLayoutSize.
+    */
+    explicit QgsLayoutSize( const QSizeF size, const QgsUnitTypes::LayoutUnit units = QgsUnitTypes::LayoutMillimeters );
+
     /**
      * Constructor for an empty layout size
      * \param units units for measurement
diff --git a/tests/src/core/testqgslayoutunits.cpp b/tests/src/core/testqgslayoutunits.cpp
@@ -259,6 +259,12 @@ void TestQgsLayoutUnits::createSize()
   QCOMPARE( empty.units(), QgsUnitTypes::LayoutPixels );
   QCOMPARE( empty.width(), 0.0 );
   QCOMPARE( empty.height(), 0.0 );
+
+  //test constructing from QSizeF
+  QgsLayoutSize fromQSizeF( QSizeF( 17.0, 18.0 ), QgsUnitTypes::LayoutInches );
+  QCOMPARE( fromQSizeF.units(), QgsUnitTypes::LayoutInches );
+  QCOMPARE( fromQSizeF.width(), 17.0 );
+  QCOMPARE( fromQSizeF.height(), 18.0 );
 }
 
 void TestQgsLayoutUnits::sizeGettersSetters()
@@ -393,6 +399,12 @@ void TestQgsLayoutUnits::createPoint()
   QCOMPARE( empty.units(), QgsUnitTypes::LayoutPixels );
   QCOMPARE( empty.x(), 0.0 );
   QCOMPARE( empty.y(), 0.0 );
+
+  //test constructing from QPointF
+  QgsLayoutPoint fromQPointF( QPointF( 17.0, 18.0 ), QgsUnitTypes::LayoutInches );
+  QCOMPARE( fromQPointF.units(), QgsUnitTypes::LayoutInches );
+  QCOMPARE( fromQPointF.x(), 17.0 );
+  QCOMPARE( fromQPointF.y(), 18.0 );
 }
 
 void TestQgsLayoutUnits::pointGettersSetters()

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,14 @@ QgsLayoutPoint::QgsLayoutPoint( const double x, const double y, const QgsUnitTyp`
`28`	`28`
`29`	`29`	`}`
`30`	`30`
	`31`	`+QgsLayoutPoint::QgsLayoutPoint( const QPointF point, const QgsUnitTypes::LayoutUnit units )`
	`32`	`+ : mX( point.x() )`
	`33`	`+ , mY( point.y() )`
	`34`	`+ , mUnits( units )`
	`35`	`+{`
	`36`	`+`
	`37`	`+}`
	`38`	`+`
`31`	`39`	`QgsLayoutPoint::QgsLayoutPoint( const QgsUnitTypes::LayoutUnit units )`
`32`	`40`	`: mUnits( units )`
`33`	`41`	`{`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,13 @@ QgsLayoutSize::QgsLayoutSize( const double width, const double height, const Qgs`
`26`	`26`	`{`
`27`	`27`	`}`
`28`	`28`
	`29`	`+QgsLayoutSize::QgsLayoutSize( const QSizeF size, const QgsUnitTypes::LayoutUnit units )`
	`30`	`+ : mWidth( size.width() )`
	`31`	`+ , mHeight( size.height() )`
	`32`	`+ , mUnits( units )`
	`33`	`+{`
	`34`	`+}`
	`35`	`+`
`29`	`36`	`QgsLayoutSize::QgsLayoutSize( const QgsUnitTypes::LayoutUnit units )`
`30`	`37`	`: mUnits( units )`
`31`	`38`	`{`