summaryrefslogtreecommitdiffstats
path: root/desktop-widgets
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2020-05-06 22:25:48 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2020-05-07 08:46:15 -0700
commit7a443423bc633d8ea085879f9ad675cb134cc93c (patch)
tree6c2d0025273594257530a63a54f3cf3c1990af22 /desktop-widgets
parent2ff459c35691f1548cc8a587cd437f5215f8ccc1 (diff)
downloadsubsurface-7a443423bc633d8ea085879f9ad675cb134cc93c.tar.gz
cleanup: generalize ExtraDataModel to display data of any dc
The goal here is to remove a dependency on displayed_dive. While doing so, make the model more general and display any dc. Pass in the dc of the current dive instead of displayed dive, since all other tabs are already converted to show data of the current dive. The QStrings are cached since we generate them anyway, so we may just keep them. Thus, there is no danger of the dc becoming invalid. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'desktop-widgets')
-rw-r--r--desktop-widgets/tab-widgets/TabDiveExtraInfo.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/desktop-widgets/tab-widgets/TabDiveExtraInfo.cpp b/desktop-widgets/tab-widgets/TabDiveExtraInfo.cpp
index caf7c99bf..c078b7e40 100644
--- a/desktop-widgets/tab-widgets/TabDiveExtraInfo.cpp
+++ b/desktop-widgets/tab-widgets/TabDiveExtraInfo.cpp
@@ -1,12 +1,13 @@
// SPDX-License-Identifier: GPL-2.0
#include "TabDiveExtraInfo.h"
#include "ui_TabDiveExtraInfo.h"
+#include "core/dive.h"
#include "qt-models/divecomputerextradatamodel.h"
TabDiveExtraInfo::TabDiveExtraInfo(QWidget *parent) :
TabBase(parent),
ui(new Ui::TabDiveExtraInfo()),
- extraDataModel(new ExtraDataModel())
+ extraDataModel(new ExtraDataModel(this))
{
ui->setupUi(this);
ui->extraData->setModel(extraDataModel);
@@ -19,11 +20,10 @@ TabDiveExtraInfo::~TabDiveExtraInfo()
void TabDiveExtraInfo::updateData()
{
- extraDataModel->updateDive();
+ extraDataModel->updateDiveComputer(current_dc);
}
void TabDiveExtraInfo::clear()
{
- extraDataModel->updateDive();
+ extraDataModel->clear();
}
-