From 912e1faaf21afbfac0cec07db036d97b13ed847c Mon Sep 17 00:00:00 2001 From: "Robert C. Helling" Date: Sat, 11 Jul 2020 13:15:21 +0200 Subject: Make MND display depend on O2 narcotic preference A while ago, we introduced a preference whether O2 should be considered narcotic. We used this when computing best mix or when entering the He content via MND. But we forgot to make the displayed MND depend on this preference. This patch add this. Fixes #2895 Signed-off-by: Robert C. Helling --- qt-models/cylindermodel.cpp | 6 +++++- qt-models/cylindermodel.h | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'qt-models') diff --git a/qt-models/cylindermodel.cpp b/qt-models/cylindermodel.cpp index 0055849ff..84e9b063f 100644 --- a/qt-models/cylindermodel.cpp +++ b/qt-models/cylindermodel.cpp @@ -663,10 +663,14 @@ bool CylindersModel::updateBestMixes() /* This slot is called when the bottom pO2 and END preferences are updated, we want to * emit dataChanged so MOD and MND are refreshed, even if the gas mix hasn't been changed */ if (gasUpdated) - emit dataChanged(createIndex(0, 0), createIndex(d->cylinders.nr - 1, COLUMNS - 1)); + emitDataChanged(); return gasUpdated; } +void CylindersModel::emitDataChanged() { + emit dataChanged(createIndex(0, 0), createIndex(d->cylinders.nr - 1, COLUMNS - 1)); +} + void CylindersModel::cylindersReset(const QVector &dives) { // This model only concerns the currently displayed dive. If this is not among the diff --git a/qt-models/cylindermodel.h b/qt-models/cylindermodel.h index b8ed7e0eb..e7477193e 100644 --- a/qt-models/cylindermodel.h +++ b/qt-models/cylindermodel.h @@ -49,6 +49,7 @@ public: void moveAtFirst(int cylid); QVariant headerData(int section, Qt::Orientation orientation, int role) const override; bool updateBestMixes(); + void emitDataChanged(); bool cylinderUsed(int i) const; signals: -- cgit v1.2.3-70-g09d2