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

In statistics, ignore gas use of planned dives

Browse source 
When merged with real dives, those would double count otherwise.

Signed-off-by: Robert C. Helling <helling@atdotde.de>
This commit is contained in:
Robert C. Helling 2017-02-02 20:29:44 +01:00 • committed by Dirk Hohndel
parent a031dbbbd8
commit 1d8662006c
8 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
qt-models/cylindermodel.cpp
View file

@ -451,7 +451,7 @@ void CylindersModel::updateDive()
for (int i = 0; i < MAX_CYLINDERS; i++) {
if (!cylinder_none(&displayed_dive.cylinder[i]) &&
(prefs.display_unused_tanks ||
is_cylinder_used(&displayed_dive, i) ||
is_cylinder_used(&displayed_dive, i, false) ||
displayed_dive.cylinder[i].manually_added))
rows = i + 1;
}
@ -468,7 +468,7 @@ void CylindersModel::copyFromDive(dive *d)
rows = 0;
for (int i = 0; i < MAX_CYLINDERS; i++) {
if (!cylinder_none(&d->cylinder[i]) &&
(is_cylinder_used(d, i) || prefs.display_unused_tanks)) {
(is_cylinder_used(d, i, false) || prefs.display_unused_tanks)) {
rows = i + 1;
}
}
@ -517,7 +517,7 @@ void CylindersModel::remove(const QModelIndex &index)
((DivePlannerPointsModel::instance()->currentMode() != DivePlannerPointsModel::NOTHING &&
DivePlannerPointsModel::instance()->tankInUse(index.row())) ||
(DivePlannerPointsModel::instance()->currentMode() == DivePlannerPointsModel::NOTHING &&
is_cylinder_used(&displayed_dive, index.row())))) {
is_cylinder_used(&displayed_dive, index.row(), false)))) {
emit warningMessage(TITLE_OR_TEXT(
tr("Cylinder cannot be removed"),
tr("This gas is in use. Only cylinders that are not used in the dive can be removed.")));