mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

profile: merge plotDive() into draw() call

Browse source 
Rendering resets the size, which now recalculates the axes.
Therefore, plotDive() must be called. The callers were doing
the opposite: call plotDive() first, then draw().

To make it easier for the callers, present a single interface
that handles these subtleties.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2021-08-30 22:59:45 +02:00 • committed by Dirk Hohndel
parent d0beae59f9
commit 8046a05e95
7 changed files with 22 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

23
profile-widget/qmlprofile.cpp
View file

@ -1,4 +1,4 @@
// SPDX-License-Identifier: GPL-2.0
// SPDX-License-Identifier: GPL-2.
#include "qmlprofile.h"
#include "profilescene.h"
#include "mobile-widgets/qmlmanager.h"
@ -54,7 +54,12 @@ void QMLProfile::paint(QPainter *painter)
// let's look at the intended size of the content and scale our scene accordingly
QRect painterRect = painter->viewport();
m_profileWidget->draw(painter, painterRect);
if (m_diveId < 0)
return;
struct dive *d = get_dive_by_uniq_id(m_diveId);
if (!d)
return;
m_profileWidget->draw(painter, painterRect, d, dc_number, nullptr, false);
}
void QMLProfile::setMargin(int margin)
@ -67,22 +72,9 @@ int QMLProfile::diveId() const
return m_diveId;
}
void QMLProfile::updateProfile()
{
struct dive *d = get_dive_by_uniq_id(m_diveId);
if (!d)
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);
}
void QMLProfile::setDiveId(int diveId)
{
m_diveId = diveId;
if (m_diveId < 0)
return;
updateProfile();
}
qreal QMLProfile::devicePixelRatio() const
@ -129,7 +121,6 @@ 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);
triggerUpdate();
return;
}