summaryrefslogtreecommitdiffstats
path: root/profile-widget
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2019-03-29 18:29:08 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2019-04-12 18:19:07 +0300
commit837ab6c90b7952095c0dadf2de18db883b0f5ecf (patch)
tree3e6a619cdda0b5cc06308887a2df265fa95fdf2f /profile-widget
parentbfb6a55707ffe1ffc36fddf2c98b9d5f91721317 (diff)
downloadsubsurface-837ab6c90b7952095c0dadf2de18db883b0f5ecf.tar.gz
Desktop: read tab-items from current_dive, not displayed_dive
The whole edit logic moved from displayed_dive to current_dive and it became more and more tedious to keep these in sync. Therefore, simply always display current_dive. The only exceptions are the equipment tab and the planner, as these are not yet integrated in the undo system. Once this is done, displayed_dive can be removed. Moreover, remove the clear parameter from updateDiveInfo(). Instead simply clear of there is no current_dive set. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'profile-widget')
-rw-r--r--profile-widget/profilewidget2.cpp4
-rw-r--r--profile-widget/profilewidget2.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp
index 236afb850..f9655127e 100644
--- a/profile-widget/profilewidget2.cpp
+++ b/profile-widget/profilewidget2.cpp
@@ -1696,7 +1696,7 @@ void ProfileWidget2::splitDive()
duration_t time;
time.seconds = lrint(timeAxis->valueAt(scenePos));
Command::splitDives(d, time);
- emit updateDiveInfo(false);
+ emit updateDiveInfo();
#endif
}
@@ -1742,7 +1742,7 @@ void ProfileWidget2::changeGas()
// FIXME - this no longer gets written to the dive list - so we need to enableEdition() here
- emit updateDiveInfo(false);
+ emit updateDiveInfo();
mark_divelist_changed(true);
replot();
}
diff --git a/profile-widget/profilewidget2.h b/profile-widget/profilewidget2.h
index 4cf69efa6..fbc43c623 100644
--- a/profile-widget/profilewidget2.h
+++ b/profile-widget/profilewidget2.h
@@ -97,7 +97,7 @@ signals:
void enableShortcuts();
void disableShortcuts(bool paste);
void refreshDisplay(bool recreateDivelist);
- void updateDiveInfo(bool clear);
+ void updateDiveInfo();
void editCurrentDive();
void dateTimeChangedItems();