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

Planner: don't try to update the MainTab dive info while in plan mode

Browse source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-05-26 15:17:34 -07:00
parent 0f023791f8
commit 0d58cfb641
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
qt-ui/maintab.cpp
View file

@ -383,8 +383,8 @@ bool MainTab::isEditing()
void MainTab::updateDiveInfo(int dive) void MainTab::updateDiveInfo(int dive)
{ {
// don't execute this while adding a dive // don't execute this while adding / planning a dive
if (editMode == ADD || editMode == MANUALLY_ADDED_DIVE) if (editMode == ADD || editMode == MANUALLY_ADDED_DIVE || MainWindow::instance()->graphics()->isPlanner())
return; return;
if (!isEnabled() && dive != -1) if (!isEnabled() && dive != -1)
setEnabled(true); setEnabled(true);

5
qt-ui/profile/profilewidget2.cpp
View file

@ -816,6 +816,11 @@ extern struct ev_select *ev_namelist;
extern int evn_allocated; extern int evn_allocated;
extern int evn_used; extern int evn_used;
bool ProfileWidget2::isPlanner()
{
return currentState == PLAN;
}
void ProfileWidget2::contextMenuEvent(QContextMenuEvent *event) void ProfileWidget2::contextMenuEvent(QContextMenuEvent *event)
{ {
if (currentState == ADD || currentState == PLAN) { if (currentState == ADD || currentState == PLAN) {

1
qt-ui/profile/profilewidget2.h
View file

@ -71,6 +71,7 @@ public:
void setupItem(AbstractProfilePolygonItem *item, DiveCartesianAxis *hAxis, DiveCartesianAxis *vAxis, DivePlotDataModel *model, int vData, int hData, int zValue); void setupItem(AbstractProfilePolygonItem *item, DiveCartesianAxis *hAxis, DiveCartesianAxis *vAxis, DivePlotDataModel *model, int vData, int hData, int zValue);
void setPrintMode(bool mode, bool grayscale = false); void setPrintMode(bool mode, bool grayscale = false);
bool isPointOutOfBoundaries(const QPointF &point) const; bool isPointOutOfBoundaries(const QPointF &point) const;
bool isPlanner();
State currentState; State currentState;
public public