diff options
Diffstat (limited to 'profile-widget')
| -rw-r--r-- | profile-widget/profilewidget2.cpp | 14 | ||||
| -rw-r--r-- | profile-widget/profilewidget2.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp index 85109875f..c8dd6df57 100644 --- a/profile-widget/profilewidget2.cpp +++ b/profile-widget/profilewidget2.cpp @@ -827,7 +827,7 @@ void ProfileWidget2::plotDive(const struct dive *d, bool force, bool doClearPict if (doClearPictures) clearPictures(); else - plotPicturesInternal(plotPicturesSynchronously); + plotPicturesInternal(d, plotPicturesSynchronously); toolTipItem->refresh(mapToScene(mapFromGlobal(QCursor::pos()))); #endif @@ -2228,21 +2228,21 @@ void ProfileWidget2::updateThumbnailXPos(PictureEntry &e) // This function resets the picture thumbnails of the current dive. void ProfileWidget2::plotPictures() { - plotPicturesInternal(false); + plotPicturesInternal(current_dive, false); } -void ProfileWidget2::plotPicturesInternal(bool synchronous) +void ProfileWidget2::plotPicturesInternal(struct dive *d, bool synchronous) { pictures.clear(); if (currentState == ADD || currentState == PLAN) return; - // Fetch all pictures of the current dive, but consider only those that are within the dive time. + // Fetch all pictures of the dive, but consider only those that are within the dive time. // For each picture, create a PictureEntry object in the pictures-vector. // emplace_back() constructs an object at the end of the vector. The parameters are passed directly to the constructor. - // Note that FOR_EACH_PICTURE handles current_dive being null gracefully. - FOR_EACH_PICTURE(current_dive) { - if (picture->offset.seconds > 0 && picture->offset.seconds <= current_dive->duration.seconds) + // Note that FOR_EACH_PICTURE handles d being null gracefully. + FOR_EACH_PICTURE(d) { + if (picture->offset.seconds > 0 && picture->offset.seconds <= d->duration.seconds) pictures.emplace_back(picture->offset, QString(picture->filename), scene(), synchronous); } if (pictures.empty()) diff --git a/profile-widget/profilewidget2.h b/profile-widget/profilewidget2.h index 300e46e39..dc02ef55c 100644 --- a/profile-widget/profilewidget2.h +++ b/profile-widget/profilewidget2.h @@ -173,7 +173,7 @@ private: /*methods*/ void createPPGas(PartialPressureGasItem *item, int verticalColumn, color_index_t color, color_index_t colorAlert, const double *thresholdSettingsMin, const double *thresholdSettingsMax); void clearPictures(); - void plotPicturesInternal(bool synchronous); + void plotPicturesInternal(struct dive *d, bool synchronous); private: DivePlotDataModel *dataModel; int zoomLevel; |