Make matching to known page sizes less fussy

nyalldawson · nyalldawson · commit e8514be010a6 · 2017-07-25T13:57:57.000+10:00
Since all gui widgets for page sizes limit to 2 decimal places,
we need to allow this much tolerance when checking the setting
against known page sizes.
diff --git a/src/core/layout/qgspagesizeregistry.cpp b/src/core/layout/qgspagesizeregistry.cpp
@@ -97,8 +97,8 @@ QString QgsPageSizeRegistry::find( const QgsLayoutSize &size ) const
     QgsLayoutSize xSize = converter.convert( size, pageSize.size.units() );
 
     //consider width and height values may be exchanged
-    if ( ( qgsDoubleNear( xSize.width(), pageSize.size.width() ) && qgsDoubleNear( xSize.height(), pageSize.size.height() ) )
-         || ( qgsDoubleNear( xSize.height(), pageSize.size.width() ) && qgsDoubleNear( xSize.width(), pageSize.size.height() ) ) )
+    if ( ( qgsDoubleNear( xSize.width(), pageSize.size.width(), 0.01 ) && qgsDoubleNear( xSize.height(), pageSize.size.height(), 0.01 ) )
+         || ( qgsDoubleNear( xSize.height(), pageSize.size.width(), 0.01 ) && qgsDoubleNear( xSize.width(), pageSize.size.height(), 0.01 ) ) )
     {
       return pageSize.name;
     }
diff --git a/tests/src/core/testqgspagesizeregistry.cpp b/tests/src/core/testqgspagesizeregistry.cpp
@@ -131,7 +131,8 @@ void TestQgsPageSizeRegistry::findBySize()
   QCOMPARE( registry->find( QgsLayoutSize( 297, 210 ) ), QStringLiteral( "A4" ) );
   QCOMPARE( registry->find( QgsLayoutSize( 125, 176 ) ), QStringLiteral( "B6" ) );
   QCOMPARE( registry->find( QgsLayoutSize( 21, 29.7, QgsUnitTypes::LayoutCentimeters ) ), QStringLiteral( "A4" ) );
-
+  // must have allowance of 0.01 units - because we round to this precision in all page size widgets
+  QCOMPARE( registry->find( QgsLayoutSize( 125.009, 175.991 ) ), QStringLiteral( "B6" ) );
 }
 
 void TestQgsPageSizeRegistry::decodePageSize()

Original file line number	Diff line number	Diff line change
`@@ -97,8 +97,8 @@ QString QgsPageSizeRegistry::find( const QgsLayoutSize &size ) const`
`97`	`97`	`QgsLayoutSize xSize = converter.convert( size, pageSize.size.units() );`
`98`	`98`
`99`	`99`	`//consider width and height values may be exchanged`
`100`		`- if ( ( qgsDoubleNear( xSize.width(), pageSize.size.width() ) && qgsDoubleNear( xSize.height(), pageSize.size.height() ) )`
`101`		`- \|\| ( qgsDoubleNear( xSize.height(), pageSize.size.width() ) && qgsDoubleNear( xSize.width(), pageSize.size.height() ) ) )`
	`100`	`+ if ( ( qgsDoubleNear( xSize.width(), pageSize.size.width(), 0.01 ) && qgsDoubleNear( xSize.height(), pageSize.size.height(), 0.01 ) )`
	`101`	`+ \|\| ( qgsDoubleNear( xSize.height(), pageSize.size.width(), 0.01 ) && qgsDoubleNear( xSize.width(), pageSize.size.height(), 0.01 ) ) )`
`102`	`102`	`{`
`103`	`103`	`return pageSize.name;`
`104`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,8 @@ void TestQgsPageSizeRegistry::findBySize()`
`131`	`131`	`QCOMPARE( registry->find( QgsLayoutSize( 297, 210 ) ), QStringLiteral( "A4" ) );`
`132`	`132`	`QCOMPARE( registry->find( QgsLayoutSize( 125, 176 ) ), QStringLiteral( "B6" ) );`
`133`	`133`	`QCOMPARE( registry->find( QgsLayoutSize( 21, 29.7, QgsUnitTypes::LayoutCentimeters ) ), QStringLiteral( "A4" ) );`
`134`		`-`
	`134`	`+ // must have allowance of 0.01 units - because we round to this precision in all page size widgets`
	`135`	`+ QCOMPARE( registry->find( QgsLayoutSize( 125.009, 175.991 ) ), QStringLiteral( "B6" ) );`
`135`	`136`	`}`
`136`	`137`
`137`	`138`	`void TestQgsPageSizeRegistry::decodePageSize()`