diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2014-05-26 15:17:34 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2014-05-26 15:18:15 -0700 |
| commit | 0d58cfb6411080053e99b0caa042278c19441b9d (patch) | |
| tree | 91f8e2f1d01d2f57a56379d942e02f0e4933c024 | |
| parent | 0f023791f8e47bae725629954454d7c623ca3c4d (diff) | |
| download | subsurface-0d58cfb6411080053e99b0caa042278c19441b9d.tar.gz | |
Planner: don't try to update the MainTab dive info while in plan mode
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | qt-ui/maintab.cpp | 4 | ||||
| -rw-r--r-- | qt-ui/profile/profilewidget2.cpp | 5 | ||||
| -rw-r--r-- | qt-ui/profile/profilewidget2.h | 1 |
3 files changed, 8 insertions, 2 deletions
diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp index 34be53a90..af8240ed2 100644 --- a/qt-ui/maintab.cpp +++ b/qt-ui/maintab.cpp @@ -383,8 +383,8 @@ bool MainTab::isEditing() void MainTab::updateDiveInfo(int dive) { - // don't execute this while adding a dive - if (editMode == ADD || editMode == MANUALLY_ADDED_DIVE) + // don't execute this while adding / planning a dive + if (editMode == ADD || editMode == MANUALLY_ADDED_DIVE || MainWindow::instance()->graphics()->isPlanner()) return; if (!isEnabled() && dive != -1) setEnabled(true); diff --git a/qt-ui/profile/profilewidget2.cpp b/qt-ui/profile/profilewidget2.cpp index f62299648..6cb258060 100644 --- a/qt-ui/profile/profilewidget2.cpp +++ b/qt-ui/profile/profilewidget2.cpp @@ -816,6 +816,11 @@ extern struct ev_select *ev_namelist; extern int evn_allocated; extern int evn_used; +bool ProfileWidget2::isPlanner() +{ + return currentState == PLAN; +} + void ProfileWidget2::contextMenuEvent(QContextMenuEvent *event) { if (currentState == ADD || currentState == PLAN) { diff --git a/qt-ui/profile/profilewidget2.h b/qt-ui/profile/profilewidget2.h index fbfd1947f..b1a415eb3 100644 --- a/qt-ui/profile/profilewidget2.h +++ b/qt-ui/profile/profilewidget2.h @@ -71,6 +71,7 @@ public: void setupItem(AbstractProfilePolygonItem *item, DiveCartesianAxis *hAxis, DiveCartesianAxis *vAxis, DivePlotDataModel *model, int vData, int hData, int zValue); void setPrintMode(bool mode, bool grayscale = false); bool isPointOutOfBoundaries(const QPointF &point) const; + bool isPlanner(); State currentState; public |