Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix test
  • Loading branch information
@elpaso @nyalldawson
elpaso authored and nyalldawson committed May 11, 2023
1 parent f63dd2c commit edf47ef
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions tests/src/gui/testqgsadvanceddigitizingdockwidget.cpp
View file
Expand Up @@ -67,66 +67,66 @@ void TestQgsAdvancedDigitizingDockWidget::parseUserInput()

QLocale::setDefault( QLocale::English );

result = widget.parseUserInput( QStringLiteral( "1.2345" ), QgsAdvancedDigitizingDockWidget::CadConstraint::ConstraintType::Generic, ok );
result = widget.parseUserInput( QStringLiteral( "1.2345" ), Qgis::CadConstraintType::Generic, ok );
QCOMPARE( result, 1.2345 );
QVERIFY( ok );

result = widget.parseUserInput( QStringLiteral( "1,234.5" ), QgsAdvancedDigitizingDockWidget::CadConstraint::ConstraintType::Generic, ok );
result = widget.parseUserInput( QStringLiteral( "1,234.5" ), Qgis::CadConstraintType::Generic, ok );
QCOMPARE( result, 1234.5 );
QVERIFY( ok );

result = widget.parseUserInput( QStringLiteral( "1,200.6/2" ), QgsAdvancedDigitizingDockWidget::CadConstraint::ConstraintType::Generic, ok );
result = widget.parseUserInput( QStringLiteral( "1,200.6/2" ), Qgis::CadConstraintType::Generic, ok );
QCOMPARE( result, 600.3 );
QVERIFY( ok );

result = widget.parseUserInput( QStringLiteral( "1200.6/2" ), QgsAdvancedDigitizingDockWidget::CadConstraint::ConstraintType::Generic, ok );
result = widget.parseUserInput( QStringLiteral( "1200.6/2" ), Qgis::CadConstraintType::Generic, ok );
QCOMPARE( result, 600.3 );
QVERIFY( ok );

// Italian locale (comma as decimal separator)
QLocale::setDefault( QLocale::Italian );

result = widget.parseUserInput( QStringLiteral( "1,2345" ), QgsAdvancedDigitizingDockWidget::CadConstraint::ConstraintType::Generic, ok );
result = widget.parseUserInput( QStringLiteral( "1,2345" ), Qgis::CadConstraintType::Generic, ok );
QCOMPARE( result, 1.2345 );
QVERIFY( ok );

result = widget.parseUserInput( QStringLiteral( "1.234,5" ), QgsAdvancedDigitizingDockWidget::CadConstraint::ConstraintType::Generic, ok );
result = widget.parseUserInput( QStringLiteral( "1.234,5" ), Qgis::CadConstraintType::Generic, ok );
QCOMPARE( result, 1234.5 );
QVERIFY( ok );

result = widget.parseUserInput( QStringLiteral( "1.200,6/2" ), QgsAdvancedDigitizingDockWidget::CadConstraint::ConstraintType::Generic, ok );
result = widget.parseUserInput( QStringLiteral( "1.200,6/2" ), Qgis::CadConstraintType::Generic, ok );
QCOMPARE( result, 600.3 );
QVERIFY( ok );

result = widget.parseUserInput( QStringLiteral( "1200,6/2" ), QgsAdvancedDigitizingDockWidget::CadConstraint::ConstraintType::Generic, ok );
result = widget.parseUserInput( QStringLiteral( "1200,6/2" ), Qgis::CadConstraintType::Generic, ok );
QCOMPARE( result, 600.3 );
QVERIFY( ok );

// Test UOMs for angles and distance
QLocale::setDefault( QLocale::English );
result = widget.parseUserInput( QStringLiteral( "120.123" ), QgsAdvancedDigitizingDockWidget::CadConstraint::ConstraintType::Angle, ok );
result = widget.parseUserInput( QStringLiteral( "120.123" ), Qgis::CadConstraintType::Angle, ok );
QCOMPARE( result, 120.123 );
QVERIFY( ok );

result = widget.parseUserInput( QStringLiteral( "120.123°" ), QgsAdvancedDigitizingDockWidget::CadConstraint::ConstraintType::Angle, ok );
result = widget.parseUserInput( QStringLiteral( "120.123°" ), Qgis::CadConstraintType::Angle, ok );
QCOMPARE( result, 120.123 );
QVERIFY( ok );

result = widget.parseUserInput( QStringLiteral( "120.123 °" ), QgsAdvancedDigitizingDockWidget::CadConstraint::ConstraintType::Angle, ok );
result = widget.parseUserInput( QStringLiteral( "120.123 °" ), Qgis::CadConstraintType::Angle, ok );
QCOMPARE( result, 120.123 );
QVERIFY( ok );

QgsProject::instance()->setDistanceUnits( Qgis::DistanceUnit::NauticalMiles );

result = widget.parseUserInput( QStringLiteral( "120.123" ), QgsAdvancedDigitizingDockWidget::CadConstraint::ConstraintType::Distance, ok );
result = widget.parseUserInput( QStringLiteral( "120.123" ), Qgis::CadConstraintType::Distance, ok );
QCOMPARE( result, 222467.796 );
QVERIFY( ok );

result = widget.parseUserInput( QStringLiteral( "120.123 NM" ), QgsAdvancedDigitizingDockWidget::CadConstraint::ConstraintType::Distance, ok );
result = widget.parseUserInput( QStringLiteral( "120.123 NM" ), Qgis::CadConstraintType::Distance, ok );
QCOMPARE( result, 222467.796 );
QVERIFY( ok );

result = widget.parseUserInput( QStringLiteral( "120.123NM" ), QgsAdvancedDigitizingDockWidget::CadConstraint::ConstraintType::Distance, ok );
result = widget.parseUserInput( QStringLiteral( "120.123NM" ), Qgis::CadConstraintType::Distance, ok );
QCOMPARE( result, 222467.796 );
QVERIFY( ok );

Expand Down

0 comments on commit edf47ef

Please sign in to comment.