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

Replace global in_planner variable by helper function

Browse source 
as promised earlier

Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Robert C. Helling 2015-08-18 10:03:51 +02:00 committed by Dirk Hohndel
parent 4e89a6020e
commit 72806e42bc
4 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
planner.c
View file

@ -33,14 +33,6 @@ int decostoplevels_imperial[] = { 0, 3048, 6096, 9144, 12192, 15240, 18288, 2133
double plangflow, plangfhigh;
bool plan_verbatim, plan_display_runtime, plan_display_duration, plan_display_transitions;
/* This is a bit round about: Currently, we only support VPM-B in the planner,
* so, when we compute ceilings we have to know if we are in planning mode since
* the maximally allowed gradient in the tissues is determined by the critical volume algorithm for
* which we currently have no version for logged dives. But the information about the application state
* is only available in the C++/Qt part. So this global variable is a way to leak this info. */
bool in_planner = false;
const char *disclaimer;
#if DEBUG_PLAN

6
qt-ui/mainwindow.cpp
View file

@ -1716,7 +1716,6 @@ void MainWindow::setApplicationState(const QByteArray& state) {
return;
currentApplicationState = state;
in_planner = (state == "PlanDive" || state == "EditPlannedDive");
#define SET_CURRENT_INDEX( X ) \
if (applicationState[state].X) { \
@ -1732,3 +1731,8 @@ void MainWindow::setApplicationState(const QByteArray& state) {
SET_CURRENT_INDEX( bottomRight )
#undef SET_CURRENT_INDEX
}
bool MainWindow::inPlanner()
{
return (currentApplicationState == "PlanDive" || currentApplicationState == "EditPlannedDive");
}

1
qt-ui/mainwindow.h
View file

@ -89,6 +89,7 @@ public:
void printPlan();
void checkSurvey(QSettings *s);
void setApplicationState(const QByteArray& state);
bool inPlanner();
QUndoStack *undoStack;
NotificationWidget *getNotificationWidget();
void enableDisableCloudActions();

6
qthelper.cpp
View file

@ -12,6 +12,7 @@
#include <exif.h>
#include "file.h"
#include "prefs-macros.h"
#include "mainwindow.h"
#include <QFile>
#include <QRegExp>
#include <QDir>
@ -1272,3 +1273,8 @@ extern "C" void parse_display_units(char *line)
{
qDebug() << line;
}
extern "C" bool in_planner()
{
return MainWindow::instance()->inPlanner();
}