diff options
| author |  jan Iversen <jan@casacondor.com> | 2020-01-21 16:16:10 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2020-01-25 17:13:20 -0800 |
| commit | 86fd49f2d79f3e199de5261a80e01b34541b96f6 (patch) | |
| tree | 0a71311342424f0228e3850b86c5d4651b731d5b /tests/testplannershared.cpp | |
| parent | cd3c2266f9f687746770912bfc913c4f94bb124b (diff) | |
| download | subsurface-86fd49f2d79f3e199de5261a80e01b34541b96f6.tar.gz | |
diveplanner: adjust sac-factor calculation.
The real values are 1.0 to 10.0, but QML needs int so mobile
gets values 10.0 to 100.0
add sacfactor() to QMLInterface and update QML.
Signed-off-by: jan Iversen <jan@casacondor.com>
Diffstat (limited to 'tests/testplannershared.cpp')
| -rw-r--r-- | tests/testplannershared.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tests/testplannershared.cpp b/tests/testplannershared.cpp index f2655432c..da4de48fb 100644 --- a/tests/testplannershared.cpp +++ b/tests/testplannershared.cpp @@ -79,13 +79,13 @@ void TestPlannerShared::test_gas() { // test independent of metric/imperial plannerShared::set_sacfactor(4.2); - QCOMPARE(qPrefDivePlanner::sacfactor(), 420); + QCOMPARE(qPrefDivePlanner::sacfactor(), 42); plannerShared::set_sacfactor(3.5); - QCOMPARE(qPrefDivePlanner::sacfactor(), 350); + QCOMPARE(qPrefDivePlanner::sacfactor(), 35); qPrefDivePlanner::set_sacfactor(280); - QCOMPARE(plannerShared::sacfactor(), 2.8); + QCOMPARE(plannerShared::sacfactor(), 28); qPrefDivePlanner::set_sacfactor(200); - QCOMPARE(plannerShared::sacfactor(), 2.0); + QCOMPARE(plannerShared::sacfactor(), 20); // Set system to use meters qPrefUnits::set_unit_system(METRIC); @@ -139,26 +139,26 @@ void TestPlannerShared::test_gas() qPrefUnits::set_unit_system(IMPERIAL); plannerShared::set_bottomsac(0.9); - QCOMPARE(qPrefDivePlanner::bottomsac(), 25485); + QCOMPARE(qPrefDivePlanner::bottomsac(), 255); plannerShared::set_bottomsac(0.01); - QCOMPARE(qPrefDivePlanner::bottomsac(), 283); + QCOMPARE(qPrefDivePlanner::bottomsac(), 3); // Remark return will from qPref is in m / 1000. qPrefDivePlanner::set_bottomsac(2830); - QCOMPARE(int(plannerShared::bottomsac() * 1000), 99); + QCOMPARE(int(plannerShared::bottomsac()), 9); qPrefDivePlanner::set_bottomsac(16000); - QCOMPARE(int(plannerShared::bottomsac() * 1000), 565); + QCOMPARE(int(plannerShared::bottomsac()), 56); plannerShared::set_decosac(0.9); - QCOMPARE(qPrefDivePlanner::decosac(), 25485); + QCOMPARE(qPrefDivePlanner::decosac(), 255); plannerShared::set_decosac(0.01); - QCOMPARE(qPrefDivePlanner::decosac(), 283); + QCOMPARE(qPrefDivePlanner::decosac(), 3); // Remark return will from qPref is in m / 1000. qPrefDivePlanner::set_decosac(11500); - QCOMPARE(int(plannerShared::decosac() * 1000), 406); + QCOMPARE(int(plannerShared::decosac()), 40); qPrefDivePlanner::set_decosac(19800); - QCOMPARE(int(plannerShared::decosac() * 1000), 699); + QCOMPARE(int(plannerShared::decosac()), 69); // Remark bottompo2 is in BAR, even though unit system is // Imperial, the desktop version is like that. |