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

profile: detect dive-mode change in profile

Browse source 
The profile must be replotted when the dive mode changes.
Weirdly, this was routed via the dive-information tab
(making it inherently non-mobile compatible). Detect
such a change directly in the profile.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2021-01-27 23:41:51 +01:00 • committed by Dirk Hohndel
parent aefbde93ce
commit 0b0e6672d5
3 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
desktop-widgets/tab-widgets/TabDiveInformation.cpp
View file

@ -316,7 +316,6 @@ void TabDiveInformation::divesChanged(const QVector<dive *> &dives, DiveField fi
if (!current_dive || !dives.contains(current_dive)) if (!current_dive || !dives.contains(current_dive))
return; return;
bool replot = false;
if (field.visibility) if (field.visibility)
ui->visibility->setCurrentStars(current_dive->visibility); ui->visibility->setCurrentStars(current_dive->visibility);
if (field.wavesize) if (field.wavesize)
@ -327,10 +326,8 @@ void TabDiveInformation::divesChanged(const QVector<dive *> &dives, DiveField fi
ui->surge->setCurrentStars(current_dive->surge); ui->surge->setCurrentStars(current_dive->surge);
if (field.chill) if (field.chill)
ui->chill->setCurrentStars(current_dive->chill); ui->chill->setCurrentStars(current_dive->chill);
if (field.mode) { if (field.mode)
updateMode(current_dive); updateMode(current_dive);
replot = true;
}
if (field.duration || field.depth || field.mode) if (field.duration || field.depth || field.mode)
updateProfile(); updateProfile();
if (field.air_temp) if (field.air_temp)
@ -347,10 +344,6 @@ void TabDiveInformation::divesChanged(const QVector<dive *> &dives, DiveField fi
salinity_value = current_dive->salinity; salinity_value = current_dive->salinity;
ui->waterTypeCombo->setCurrentIndex(updateSalinityComboIndex(salinity_value)); ui->waterTypeCombo->setCurrentIndex(updateSalinityComboIndex(salinity_value));
ui->salinityText->setText(QString("%L1g/ℓ").arg(salinity_value / 10.0)); ui->salinityText->setText(QString("%L1g/ℓ").arg(salinity_value / 10.0));
// TODO: The profile should recognize itself when the dive mode changed.
// It seem awkward to route this via the dive-information tab.
if (replot)
MainWindow::instance()->graphics->plotDive(current_dive, true);
} }
void TabDiveInformation::on_visibility_valueChanged(int value) void TabDiveInformation::on_visibility_valueChanged(int value)

12
profile-widget/profilewidget2.cpp
View file

@ -32,7 +32,6 @@
#include "core/gettextfromc.h" #include "core/gettextfromc.h"
#include "core/imagedownloader.h" #include "core/imagedownloader.h"
#endif #endif
#include "core/subsurface-qt/divelistnotifier.h"
#include <libdivecomputer/parser.h> #include <libdivecomputer/parser.h>
#include <QScrollBar> #include <QScrollBar>
@ -174,6 +173,7 @@ ProfileWidget2::ProfileWidget2(QWidget *parent) : QGraphicsView(parent),
connect(&diveListNotifier, &DiveListNotifier::cylinderEdited, this, &ProfileWidget2::profileChanged); connect(&diveListNotifier, &DiveListNotifier::cylinderEdited, this, &ProfileWidget2::profileChanged);
connect(&diveListNotifier, &DiveListNotifier::eventsChanged, this, &ProfileWidget2::profileChanged); connect(&diveListNotifier, &DiveListNotifier::eventsChanged, this, &ProfileWidget2::profileChanged);
connect(&diveListNotifier, &DiveListNotifier::pictureOffsetChanged, this, &ProfileWidget2::pictureOffsetChanged); connect(&diveListNotifier, &DiveListNotifier::pictureOffsetChanged, this, &ProfileWidget2::pictureOffsetChanged);
connect(&diveListNotifier, &DiveListNotifier::divesChanged, this, &ProfileWidget2::divesChanged);
#endif // SUBSURFACE_MOBILE #endif // SUBSURFACE_MOBILE
#if !defined(QT_NO_DEBUG) && defined(SHOW_PLOT_INFO_TABLE) #if !defined(QT_NO_DEBUG) && defined(SHOW_PLOT_INFO_TABLE)
@ -814,6 +814,16 @@ void ProfileWidget2::plotDive(const struct dive *d, bool force, bool doClearPict
} }
} }
void ProfileWidget2::divesChanged(const QVector<dive *> &dives, DiveField field)
{
// If the mode of the currently displayed dive changed, replot
if (field.mode &&
std::any_of(dives.begin(), dives.end(),
[id = displayed_dive.id] (const dive *d)
{ return d->id == id; } ))
replot();
}
void ProfileWidget2::actionRequestedReplot(bool) void ProfileWidget2::actionRequestedReplot(bool)
{ {
settingsChanged(); settingsChanged();

2
profile-widget/profilewidget2.h
View file

@ -22,6 +22,7 @@
#include "core/color.h" #include "core/color.h"
#include "core/pictureobj.h" #include "core/pictureobj.h"
#include "core/units.h" #include "core/units.h"
#include "core/subsurface-qt/divelistnotifier.h"
class RulerItem2; class RulerItem2;
struct dive; struct dive;
@ -102,6 +103,7 @@ public
slots: // Necessary to call from QAction's signals. slots: // Necessary to call from QAction's signals.
void settingsChanged(); void settingsChanged();
void actionRequestedReplot(bool triggered); void actionRequestedReplot(bool triggered);
void divesChanged(const QVector<dive *> &dives, DiveField field);
void setEmptyState(); void setEmptyState();
void setProfileState(); void setProfileState();
#ifndef SUBSURFACE_MOBILE #ifndef SUBSURFACE_MOBILE