Skip to content

Commit

Permalink
profile: remove force parameter from ProfileWidget2::plotDive()
Browse files Browse the repository at this point in the history
The last user was removed in 2789bb0.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
  • Loading branch information
bstoeger authored and dirkhh committed Apr 10, 2021
1 parent 4daf687 commit 8c72ac6
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions desktop-widgets/divelogexportdialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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?
}
8 changes: 4 additions & 4 deletions desktop-widgets/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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();
}

Expand All @@ -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();
}

Expand Down
4 changes: 2 additions & 2 deletions desktop-widgets/printer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions profile-widget/profilewidget2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion profile-widget/profilewidget2.h
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class ProfileWidget2 : public QGraphicsView {
~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);
Expand Down
4 changes: 2 additions & 2 deletions profile-widget/qmlprofile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 8c72ac6

Please sign in to comment.