mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-11 19:41:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

testing: prepare diveplannermodel to be used in testing

Browse source 
In order to make tests for plannerShared, some qt-models must
be linked, and due to the fact that commands are currently not
available for mobile (which also makes the tests) and #ifdef must
be added.

The test version of diveplannermodel will be specially compiled in
(SUBSURFACE_TESTING set) in the tests directory.

Signed-off-by: Jan Iversen <jan@casacondor.com>
This commit is contained in:
jan Iversen 2019-12-25 11:56:44 +01:00 committed by Dirk Hohndel
parent fc7aec5402
commit 1fc54e907f
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
qt-models/diveplannermodel.cpp
View file

@ -7,9 +7,9 @@
#include "core/device.h" #include "core/device.h"
#include "core/qthelper.h" #include "core/qthelper.h"
#include "core/settings/qPrefDivePlanner.h" #include "core/settings/qPrefDivePlanner.h"
#ifndef SUBSURFACE_MOBILE #if not defined(SUBSURFACE_MOBILE) && not defined(SUBSURFACE_TESTING)
#include "commands/command.h" #include "commands/command.h"
#endif // SUBSURFACE_MOBILE #endif // SUBSURFACE_MOBILE SUBSURFACE_TESTING
#include "core/gettextfromc.h" #include "core/gettextfromc.h"
#include "core/deco.h" #include "core/deco.h"
#include <QApplication> #include <QApplication>
@ -1171,20 +1171,20 @@ void DivePlannerPointsModel::createPlan(bool replanCopy)
if (!current_dive || displayed_dive.id != current_dive->id) { if (!current_dive || displayed_dive.id != current_dive->id) {
// we were planning a new dive, not re-planning an existing one // we were planning a new dive, not re-planning an existing one
displayed_dive.divetrip = nullptr; // Should not be necessary, just in case! displayed_dive.divetrip = nullptr; // Should not be necessary, just in case!
#ifndef SUBSURFACE_MOBILE #if not defined(SUBSURFACE_MOBILE) && not defined(SUBSURFACE_TESTING)
Command::addDive(&displayed_dive, autogroup, true); Command::addDive(&displayed_dive, autogroup, true);
#endif // SUBSURFACE_MOBILE #endif // SUBSURFACE_MOBILE SUBSURFACE_TESTING
} else if (replanCopy) { } else if (replanCopy) {
// we were planning an old dive and save as a new dive // we were planning an old dive and save as a new dive
displayed_dive.id = dive_getUniqID(); // Things will break horribly if we create dives with the same id. displayed_dive.id = dive_getUniqID(); // Things will break horribly if we create dives with the same id.
#ifndef SUBSURFACE_MOBILE #if not defined(SUBSURFACE_MOBILE) && not defined(SUBSURFACE_TESTING)
Command::addDive(&displayed_dive, false, false); Command::addDive(&displayed_dive, false, false);
#endif // SUBSURFACE_MOBILE #endif // SUBSURFACE_MOBILE SUBSURFACE_TESTING
} else { } else {
// we were planning an old dive and rewrite the plan // we were planning an old dive and rewrite the plan
#ifndef SUBSURFACE_MOBILE #if not defined(SUBSURFACE_MOBILE) && not defined(SUBSURFACE_TESTING)
Command::replanDive(&displayed_dive); Command::replanDive(&displayed_dive);
#endif // SUBSURFACE_MOBILE #endif // SUBSURFACE_MOBILE SUBSURFACE_TESTING
} }
// Remove and clean the diveplan, so we don't delete // Remove and clean the diveplan, so we don't delete