mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

profile: only show thumbnails in range

Browse source 
Hide thumbnails, which are out of the shown range. This became
necessary when converting to absolute scaling.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2021-10-26 15:07:51 +02:00 committed by Dirk Hohndel
parent 6cc6fe4d91
commit 7df0adef64
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
profile-widget/profilewidget2.cpp
View file

@ -1155,6 +1155,10 @@ void ProfileWidget2::calculatePictureYPositions()
const double xSpace = 18.0 * profileScene->dpr; // Horizontal range in which thumbnails are supposed to be overlapping (in pixels). const double xSpace = 18.0 * profileScene->dpr; // Horizontal range in which thumbnails are supposed to be overlapping (in pixels).
const int maxDepth = 14; // Maximal depth of thumbnail stack (in thumbnails). const int maxDepth = 14; // Maximal depth of thumbnail stack (in thumbnails).
for (PictureEntry &e: pictures) { for (PictureEntry &e: pictures) {
// Invisible items are outside of the shown range - ignore.
if (!e.thumbnail->isVisible())
continue;
// Let's put the picture at the correct time, but at a fixed "depth" on the profile // Let's put the picture at the correct time, but at a fixed "depth" on the profile
// not sure this is ideal, but it seems to look right. // not sure this is ideal, but it seems to look right.
double x = e.thumbnail->x(); double x = e.thumbnail->x();
@ -1178,8 +1182,15 @@ void ProfileWidget2::updateThumbnailXPos(PictureEntry &e)
{ {
// Here, we only set the x-coordinate of the picture. The y-coordinate // Here, we only set the x-coordinate of the picture. The y-coordinate
// will be set later in calculatePictureYPositions(). // will be set later in calculatePictureYPositions().
double x = profileScene->timeAxis->posAtValue(e.offset.seconds); // Thumbnails outside of the shown range are hidden.
e.thumbnail->setX(x); double time = e.offset.seconds;
if (time >= profileScene->timeAxis->minimum() && time <= profileScene->timeAxis->maximum()) {
double x = profileScene->timeAxis->posAtValue(time);
e.thumbnail->setX(x);
e.thumbnail->setVisible(true);
} else {
e.thumbnail->setVisible(false);
}
} }
// This function resets the picture thumbnails of the current dive. // This function resets the picture thumbnails of the current dive.