mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

core/settings: make qPrefUnit accesable from QML

Browse source 
Use string literals to communicate with QML.

Instead of passing arounds enum/int value, it seems easier to pass string literals to QML and have that code respond to those

Signed-off-by: Jan Iversen <jani@apache.org>
This commit is contained in:
jan Iversen 2019-01-18 08:07:00 +01:00 • committed by Dirk Hohndel
parent 573a4a5e2d
commit fc7aec5402
3 changed files with 151 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

54
tests/testqPrefUnits.cpp
View file

@ -32,14 +32,14 @@ void TestQPrefUnits::test_struct_get()
prefs.units.weight = units::KG;
QCOMPARE(tst->coordinates_traditional(), true);
QCOMPARE(tst->duration_units(), units::MIXED);
QCOMPARE(tst->length(), units::METERS);
QCOMPARE(tst->pressure(), units::BAR);
QCOMPARE(tst->duration_units(), QStringLiteral("mixed"));
QCOMPARE(tst->length(), QStringLiteral("meters"));
QCOMPARE(tst->pressure(), QStringLiteral("bar"));
QCOMPARE(tst->show_units_table(), true);
QCOMPARE(tst->temperature(), units::CELSIUS);
QCOMPARE(tst->vertical_speed_time(), units::SECONDS);
QCOMPARE(tst->volume(), units::LITER);
QCOMPARE(tst->weight(), units::KG);
QCOMPARE(tst->temperature(), QStringLiteral("celcius"));
QCOMPARE(tst->vertical_speed_time(), QStringLiteral("seconds"));
QCOMPARE(tst->volume(), QStringLiteral("liter"));
QCOMPARE(tst->weight(), QStringLiteral("kg"));
}
void TestQPrefUnits::test_set_struct()
@ -157,9 +157,9 @@ void TestQPrefUnits::test_multiple()
auto tst = qPrefUnits::instance();
QCOMPARE(tst->length(), qPrefUnits::length());
QCOMPARE(tst->length(), units::METERS);
QCOMPARE(tst->length(), QStringLiteral("meters"));
QCOMPARE(tst->pressure(), qPrefUnits::pressure());
QCOMPARE(tst->pressure(), units::BAR);
QCOMPARE(tst->pressure(), QStringLiteral("meters"));
}
void TestQPrefUnits::test_unit_system()
@ -170,20 +170,20 @@ void TestQPrefUnits::test_unit_system()
tst->set_unit_system("metric");
QCOMPARE(prefs.unit_system, METRIC);
QCOMPARE(tst->unit_system(), QString("metric"));
QCOMPARE(tst->unit_system(), QStringLiteral("metric"));
tst->set_unit_system("imperial");
QCOMPARE(prefs.unit_system, IMPERIAL);
QCOMPARE(tst->unit_system(), QString("imperial"));
QCOMPARE(tst->unit_system(), QStringLiteral("imperial"));
tst->set_unit_system("personalized");
QCOMPARE(prefs.unit_system, PERSONALIZE);
QCOMPARE(tst->unit_system(), QString("personalized"));
QCOMPARE(tst->unit_system(), QStringLiteral("personalized"));
prefs.unit_system = METRIC;
QCOMPARE(tst->unit_system(), QString("metric"));
QCOMPARE(tst->unit_system(), QStringLiteral("metric"));
prefs.unit_system = IMPERIAL;
QCOMPARE(tst->unit_system(), QString("imperial"));
QCOMPARE(tst->unit_system(), QStringLiteral("imperial"));
prefs.unit_system = PERSONALIZE;
QCOMPARE(tst->unit_system(), QString("personalized"));
QCOMPARE(tst->unit_system(), QStringLiteral("personalized"));
}
#define TEST(METHOD, VALUE) \
@ -205,12 +205,12 @@ void TestQPrefUnits::test_oldPreferences()
units->set_coordinates_traditional(false);
units->set_vertical_speed_time(units::SECONDS);
TEST(units->length(), units::METERS);
TEST(units->pressure(), units::BAR);
TEST(units->volume(), units::LITER);
TEST(units->temperature(), units::CELSIUS);
TEST(units->weight(), units::KG);
TEST(units->vertical_speed_time(), units::SECONDS);
TEST(units->length(), QStringLiteral("meters"));
TEST(units->pressure(), QStringLiteral("bar"));
TEST(units->volume(), QStringLiteral("liter"));
TEST(units->temperature(), QStringLiteral("celcius"));
TEST(units->weight(), QStringLiteral("kg"));
TEST(units->vertical_speed_time(), QStringLiteral("seconds"));
TEST(units->unit_system(), QStringLiteral("metric"));
TEST(units->coordinates_traditional(), false);
@ -223,12 +223,12 @@ void TestQPrefUnits::test_oldPreferences()
units->set_unit_system(QStringLiteral("fake-metric-system"));
units->set_coordinates_traditional(true);
TEST(units->length(), units::FEET);
TEST(units->pressure(), units::PSI);
TEST(units->volume(), units::CUFT);
TEST(units->temperature(), units::FAHRENHEIT);
TEST(units->weight(), units::LBS);
TEST(units->vertical_speed_time(), units::MINUTES);
TEST(units->length(), QStringLiteral("feet"));
TEST(units->pressure(), QStringLiteral("psi"));
TEST(units->volume(), QStringLiteral("cuft"));
TEST(units->temperature(), QStringLiteral("fahrenheit"));
TEST(units->weight(), QStringLiteral("lbs"));
TEST(units->vertical_speed_time(), QStringLiteral("minutes"));
TEST(units->unit_system(), QStringLiteral("personalized"));
TEST(units->coordinates_traditional(), true);
}