mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 21:20:19 +00:00
53024ca76d
Different approach here: - profile gets a bit higher, this was requested on the mailinglist, and seems to behave much better with the painted profile, we'd otherwise get it magically clipped on the right hand side. - Make the scaling dpi aware, this fixes scaling for me on the Nexus7, I haven't been able to test it properly on other devices, so this needs some more testing. The result is visually quite close to what we can do, although I'm still getting a somewhat larger margin on the right. To get at the devicePixelRatio without too much custom code, I've added a property to the QMLProfile to retrieve it from the theme engine. Signed-off-by: Sebastian Kügler <sebas@kde.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
92 lines
2.5 KiB
C++
92 lines
2.5 KiB
C++
#include "qmlprofile.h"
|
|
#include "profile-widget/profilewidget2.h"
|
|
#include "subsurface-core/dive.h"
|
|
#include <QTransform>
|
|
|
|
QMLProfile::QMLProfile(QQuickItem *parent) :
|
|
QQuickPaintedItem(parent),
|
|
m_margin(0)
|
|
{
|
|
setAntialiasing(true);
|
|
m_profileWidget = new ProfileWidget2(0);
|
|
m_profileWidget->setProfileState();
|
|
m_profileWidget->setPrintMode(true);
|
|
m_profileWidget->setFontPrintScale(0.8);
|
|
//m_profileWidget->setGeometry(this->geometry());
|
|
}
|
|
|
|
QMLProfile::~QMLProfile()
|
|
{
|
|
m_profileWidget->deleteLater();
|
|
}
|
|
|
|
void QMLProfile::paint(QPainter *painter)
|
|
{
|
|
m_profileWidget->render(painter);
|
|
}
|
|
|
|
void QMLProfile::setMargin(int margin)
|
|
{
|
|
m_margin = margin;
|
|
}
|
|
|
|
QString QMLProfile::diveId() const
|
|
{
|
|
return m_diveId;
|
|
}
|
|
|
|
void QMLProfile::setDiveId(const QString &diveId)
|
|
{
|
|
static bool firstRun = true;
|
|
static QTransform profileTransform;
|
|
m_diveId = diveId;
|
|
struct dive *d = get_dive_by_uniq_id(m_diveId.toInt());
|
|
if (m_diveId.toInt() < 1)
|
|
return;
|
|
if (!d)
|
|
return;
|
|
//qDebug() << "setDiveId called with pos/size" << x() << y() << width() << height();
|
|
// set the profile widget's geometry and scale the viewport so
|
|
// the scene fills it, then plot the dive on that widget
|
|
// the profile widget doesn't handle subsequent geometry changes well,
|
|
// so only do it once, then scale the image to the item's dimension.
|
|
if (firstRun) {
|
|
firstRun = false;
|
|
m_profileWidget->setGeometry(QRect(x(), y(), width(), height()));
|
|
}
|
|
// scale the profile widget's image to devicePixelRatio and a magic number
|
|
qreal dpr = (80 * (m_devicePixelRatio > 2 ? m_devicePixelRatio : 1.0));
|
|
qreal sx = width() / dpr;
|
|
qreal sy = height() / dpr;
|
|
// don't forget to reset, otherwise we're
|
|
// scaling scaled items, growing it bigger and bigger with every pass
|
|
profileTransform.reset();
|
|
profileTransform.scale(sx, sy);
|
|
//qDebug() << "scale:" << sx << sy;
|
|
|
|
m_profileWidget->setTransform(profileTransform);
|
|
qDebug() << "effective transformation:" <<
|
|
m_profileWidget->transform().m11() <<
|
|
m_profileWidget->transform().m12() <<
|
|
m_profileWidget->transform().m13() <<
|
|
m_profileWidget->transform().m21() <<
|
|
m_profileWidget->transform().m22() <<
|
|
m_profileWidget->transform().m23() <<
|
|
m_profileWidget->transform().m31() <<
|
|
m_profileWidget->transform().m32() <<
|
|
m_profileWidget->transform().m33();
|
|
m_profileWidget->plotDive(d);
|
|
}
|
|
|
|
qreal QMLProfile::devicePixelRatio() const
|
|
{
|
|
return m_devicePixelRatio;
|
|
}
|
|
|
|
void QMLProfile::setDevicePixelRatio(qreal dpr)
|
|
{
|
|
if (dpr != m_devicePixelRatio) {
|
|
m_devicePixelRatio = dpr;
|
|
emit devicePixelRatioChanged();
|
|
}
|
|
}
|