diff options
Diffstat (limited to 'profile-widget/profilewidget2.cpp')
| -rw-r--r-- | profile-widget/profilewidget2.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp index 38276b235..e4b03ebcb 100644 --- a/profile-widget/profilewidget2.cpp +++ b/profile-widget/profilewidget2.cpp @@ -573,7 +573,7 @@ void ProfileWidget2::plotDive(struct dive *d, bool force) if (prefs.deco_mode == VPMB) decoModelParameters->setText(QString("VPM-B +%1").arg(prefs.conservatism_level)); else - decoModelParameters->setText(QString("GF %1/%2").arg(prefs.gflow).arg(prefs.gfhigh)); + decoModelParameters->setText(QString("GF %1/%2").arg(diveplan.gflow).arg(diveplan.gfhigh)); #endif } @@ -605,9 +605,9 @@ void ProfileWidget2::plotDive(struct dive *d, bool force) currentdc = fake_dc(currentdc, false); } +#ifndef SUBSURFACE_MOBILE bool setpointflag = (currentdc->divemode == CCR) && prefs.pp_graphs.po2 && current_dive; bool sensorflag = setpointflag && prefs.show_ccr_sensors; -#ifndef SUBSURFACE_MOBILE o2SetpointGasItem->setVisible(setpointflag && prefs.show_ccr_setpoint); ccrsensor1GasItem->setVisible(sensorflag); ccrsensor2GasItem->setVisible(sensorflag && (currentdc->no_o2sensors > 1)); @@ -723,8 +723,8 @@ void ProfileWidget2::plotDive(struct dive *d, bool force) event->setVisible(!event->shouldBeHidden()); } QString dcText = get_dc_nickname(currentdc->model, currentdc->deviceid); - int nr; #ifndef SUBSURFACE_MOBILE + int nr; if ((nr = number_of_computers(&displayed_dive)) > 1) dcText += tr(" (#%1 of %2)").arg(dc_number + 1).arg(nr); #endif @@ -1302,7 +1302,7 @@ struct plot_data *ProfileWidget2::getEntryFromPos(QPointF pos) for (int i = 0; i < plotInfo.nr; i++) { entry = plotInfo.entry + i; - if (entry->sec >= seconds) + if ((int)entry->sec >= seconds) break; } return entry; @@ -1674,6 +1674,9 @@ void ProfileWidget2::disconnectTemporaryConnections() #ifndef SUBSURFACE_MOBILE void ProfileWidget2::pointInserted(const QModelIndex &parent, int start, int end) { + Q_UNUSED(parent) + Q_UNUSED(start) + Q_UNUSED(end) DiveHandler *item = new DiveHandler(); scene()->addItem(item); handles << item; |