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

Move drop_stone_mode setting to prefs

Browse source 
There is no reason to treat drop_stone_mode different from the rest of
the planner settings, so move it to our prefs structure.

Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Anton Lundin 2014-07-09 23:37:30 +02:00 • committed by Dirk Hohndel
parent f940ebcf74
commit 2ff2daebd7
4 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
pref.h
View file

@ -62,6 +62,7 @@ struct preferences {
char *proxy_user; char *proxy_user;
char *proxy_pass; char *proxy_pass;
bool doo2breaks; bool doo2breaks;
bool drop_stone_mode;
}; };
enum unit_system_values { enum unit_system_values {
METRIC, METRIC,

10
qt-ui/diveplanner.cpp
View file

@ -76,7 +76,7 @@ void DivePlannerPointsModel::createSimpleDive()
// If we're in drop_stone_mode, don't add a first point. // If we're in drop_stone_mode, don't add a first point.
// It will be added implicit. // It will be added implicit.
if (!drop_stone_mode) if (!prefs.drop_stone_mode)
plannerModel->addStop(M_OR_FT(15, 45), 1 * 60, &gas, 0, true); plannerModel->addStop(M_OR_FT(15, 45), 1 * 60, &gas, 0, true);
plannerModel->addStop(M_OR_FT(15, 45), 40 * 60, &gas, 0, true); plannerModel->addStop(M_OR_FT(15, 45), 40 * 60, &gas, 0, true);
@ -612,7 +612,7 @@ int DivePlannerPointsModel::rowCount(const QModelIndex &parent) const
return divepoints.count(); return divepoints.count();
} }
DivePlannerPointsModel::DivePlannerPointsModel(QObject *parent) : QAbstractTableModel(parent), mode(NOTHING), drop_stone_mode(false) DivePlannerPointsModel::DivePlannerPointsModel(QObject *parent) : QAbstractTableModel(parent), mode(NOTHING)
{ {
memset(&diveplan, 0, sizeof(diveplan)); memset(&diveplan, 0, sizeof(diveplan));
startTime = QDateTime::currentDateTimeUtc(); startTime = QDateTime::currentDateTimeUtc();
@ -691,8 +691,8 @@ void DivePlannerPointsModel::setDisplayTransitions(bool value)
void DivePlannerPointsModel::setDropStoneMode(bool value) void DivePlannerPointsModel::setDropStoneMode(bool value)
{ {
drop_stone_mode = value; prefs.drop_stone_mode = value;
if (drop_stone_mode) { if (prefs.drop_stone_mode) {
/* Remove the first entry if we enable drop_stone_mode */ /* Remove the first entry if we enable drop_stone_mode */
if (rowCount() >= 2) { if (rowCount() >= 2) {
beginRemoveRows(QModelIndex(), 0, 0); beginRemoveRows(QModelIndex(), 0, 0);
@ -986,7 +986,7 @@ void DivePlannerPointsModel::createTemporaryPlan()
divedatapoint p = at(i); divedatapoint p = at(i);
int deltaT = lastIndex != -1 ? p.time - at(lastIndex).time : p.time; int deltaT = lastIndex != -1 ? p.time - at(lastIndex).time : p.time;
lastIndex = i; lastIndex = i;
if (i == 0 && drop_stone_mode) { if (i == 0 && prefs.drop_stone_mode) {
/* Okay, we add a fist segment where we go down to depth */ /* Okay, we add a fist segment where we go down to depth */
plan_add_segment(&diveplan, p.depth / prefs.descrate, p.depth, p.gasmix, p.po2, false); plan_add_segment(&diveplan, p.depth / prefs.descrate, p.depth, p.gasmix, p.po2, false);
deltaT -= p.depth / prefs.descrate; deltaT -= p.depth / prefs.descrate;

1
qt-ui/diveplanner.h
View file

@ -101,7 +101,6 @@ private:
void deleteTemporaryPlan(struct divedatapoint *dp); void deleteTemporaryPlan(struct divedatapoint *dp);
QVector<sample> backupSamples; // For editing added dives. QVector<sample> backupSamples; // For editing added dives.
QVector<QPair<int, int> > oldGases; QVector<QPair<int, int> > oldGases;
bool drop_stone_mode;
QDateTime startTime; QDateTime startTime;
}; };

3
subsurfacestartup.c
View file

@ -40,7 +40,8 @@ struct preferences default_prefs = {
.descrate = 18000 / 60, .descrate = 18000 / 60,
.bottompo2 = 1400, .bottompo2 = 1400,
.decopo2 = 1600, .decopo2 = 1600,
.doo2breaks = false .doo2breaks = false,
.drop_stone_mode = false
}; };
int run_survey; int run_survey;