diff options
| -rw-r--r-- | desktop-widgets/divelogexportdialog.cpp | 4 | ||||
| -rw-r--r-- | desktop-widgets/mainwindow.cpp | 8 | ||||
| -rw-r--r-- | desktop-widgets/printer.cpp | 4 | ||||
| -rw-r--r-- | profile-widget/profilewidget2.cpp | 4 | ||||
| -rw-r--r-- | profile-widget/profilewidget2.h | 2 | ||||
| -rw-r--r-- | profile-widget/qmlprofile.cpp | 4 |
6 files changed, 13 insertions, 13 deletions
diff --git a/desktop-widgets/divelogexportdialog.cpp b/desktop-widgets/divelogexportdialog.cpp index 30e389dde..a685fb414 100644 --- a/desktop-widgets/divelogexportdialog.cpp +++ b/desktop-widgets/divelogexportdialog.cpp @@ -229,7 +229,7 @@ void exportProfile(const struct dive *dive, const QString filename) profile->setPrintMode(true); double scale = profile->getFontPrintScale(); profile->setFontPrintScale(4 * scale); - profile->plotDive(dive, 0, true, false, true); + profile->plotDive(dive, 0, false, true); QImage image = QImage(profile->size() * 4, QImage::Format_RGB32); QPainter paint; paint.begin(&image); @@ -238,5 +238,5 @@ void exportProfile(const struct dive *dive, const QString filename) profile->setToolTipVisibile(true); profile->setFontPrintScale(scale); profile->setPrintMode(false); - profile->plotDive(dive, 0, true); // TODO: Shouldn't this plot the current dive? + profile->plotDive(dive, 0); // TODO: Shouldn't this plot the current dive? } diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp index f01d3ea48..900c1f7ae 100644 --- a/desktop-widgets/mainwindow.cpp +++ b/desktop-widgets/mainwindow.cpp @@ -432,7 +432,7 @@ void MainWindow::selectionChanged() configureToolbar(); enableDisableOtherDCsActions(); } - graphics->plotDive(current_dive, dc_number, false); + graphics->plotDive(current_dive, dc_number); MapWidget::instance()->selectionChanged(); } @@ -736,7 +736,7 @@ void MainWindow::refreshProfile() { showProfile(); configureToolbar(); - graphics->plotDive(current_dive, dc_number, true); + graphics->plotDive(current_dive, dc_number); } void MainWindow::planCanceled() @@ -921,7 +921,7 @@ void MainWindow::on_actionPreviousDC_triggered() unsigned nrdc = number_of_computers(current_dive); dc_number = (dc_number + nrdc - 1) % nrdc; configureToolbar(); - graphics->plotDive(current_dive, dc_number, false); + graphics->plotDive(current_dive, dc_number); mainTab->updateDiveInfo(); } @@ -930,7 +930,7 @@ void MainWindow::on_actionNextDC_triggered() unsigned nrdc = number_of_computers(current_dive); dc_number = (dc_number + 1) % nrdc; configureToolbar(); - graphics->plotDive(current_dive, dc_number, false); + graphics->plotDive(current_dive, dc_number); mainTab->updateDiveInfo(); } diff --git a/desktop-widgets/printer.cpp b/desktop-widgets/printer.cpp index 022db1a07..5a26ad66d 100644 --- a/desktop-widgets/printer.cpp +++ b/desktop-widgets/printer.cpp @@ -38,7 +38,7 @@ void Printer::putProfileImage(const QRect &profilePlaceholder, const QRect &view int y = profilePlaceholder.y() - viewPort.y(); // use the placeHolder and the viewPort position to calculate the relative position of the dive profile. QRect pos(x, y, profilePlaceholder.width(), profilePlaceholder.height()); - profile->plotDive(dive, 0, true, true); + profile->plotDive(dive, 0, true); if (!printOptions.color_selected) { QImage image(pos.width(), pos.height(), QImage::Format_ARGB32); @@ -193,7 +193,7 @@ void Printer::render(int pages) qPrefDisplay::set_animation_speed(animationOriginal); //replot the dive after returning the settings - profile->plotDive(current_dive, dc_number, true, true); + profile->plotDive(current_dive, dc_number, true); } //value: ranges from 0 : 100 and shows the progress of the templating engine diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp index 8e71c391a..9f6158659 100644 --- a/profile-widget/profilewidget2.cpp +++ b/profile-widget/profilewidget2.cpp @@ -360,7 +360,7 @@ void ProfileWidget2::setupItemOnScene() void ProfileWidget2::replot() { - plotDive(d, dc, true, false); + plotDive(d, dc, false); } PartialPressureGasItem *ProfileWidget2::createPPGas(int column, color_index_t color, color_index_t colorAlert, @@ -521,7 +521,7 @@ void ProfileWidget2::resetZoom() } // Currently just one dive, but the plan is to enable All of the selected dives. -void ProfileWidget2::plotDive(const struct dive *dIn, int dcIn, bool force, bool doClearPictures, bool instant) +void ProfileWidget2::plotDive(const struct dive *dIn, int dcIn, bool doClearPictures, bool instant) { d = dIn; dc = dcIn; diff --git a/profile-widget/profilewidget2.h b/profile-widget/profilewidget2.h index c45bbc611..1b7fcb7c8 100644 --- a/profile-widget/profilewidget2.h +++ b/profile-widget/profilewidget2.h @@ -80,7 +80,7 @@ public: ~ProfileWidget2(); void resetZoom(); void scale(qreal sx, qreal sy); - void plotDive(const struct dive *d, int dc, bool force = false, bool clearPictures = false, bool instant = false); + void plotDive(const struct dive *d, int dc, bool clearPictures = false, bool instant = false); void setProfileState(const struct dive *d, int dc); void setPlanState(const struct dive *d, int dc); void setAddState(const struct dive *d, int dc); diff --git a/profile-widget/qmlprofile.cpp b/profile-widget/qmlprofile.cpp index 388b1e731..a0f68f0db 100644 --- a/profile-widget/qmlprofile.cpp +++ b/profile-widget/qmlprofile.cpp @@ -135,7 +135,7 @@ void QMLProfile::updateProfile() return; if (verbose) qDebug() << "update profile for dive #" << d->number << "offeset" << QString::number(m_xOffset, 'f', 1) << "/" << QString::number(m_yOffset, 'f', 1); - m_profileWidget->plotDive(d, dc_number, true); + m_profileWidget->plotDive(d, dc_number); } void QMLProfile::setDiveId(int diveId) @@ -189,7 +189,7 @@ void QMLProfile::divesChanged(const QVector<dive *> &dives, DiveField) for (struct dive *d: dives) { if (d->id == m_diveId) { qDebug() << "dive #" << d->number << "changed, trigger profile update"; - m_profileWidget->plotDive(d, dc_number, true); + m_profileWidget->plotDive(d, dc_number); triggerUpdate(); return; } |