mirror of
https://github.com/subsurface/subsurface.git
synced 2024-12-01 06:30:26 +00:00
de46f2b37c
The QMLProfile height is specified as ~2/3 (actually 0.66) width in DiveDetailsView.qml. In order to produce an even margin around the profile, the scaling factor reduction for height needs to be 3/2 times that for width. MarginFactor is specified as 0.013 to approximate the margin calculated by commitsef653b4and7e2898dfor my Galaxy S6. MarginFactor = margin / width = 18 / 1365 = 0.132 Signed-off-by: Rick Walsh <rickmwalsh@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
75 lines
2.1 KiB
C++
75 lines
2.1 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;
|
|
double marginFactor = 0.013; // margin as proportion of profile display width
|
|
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
|
|
if (firstRun) {
|
|
firstRun = false;
|
|
m_profileWidget->setGeometry(QRect(x(), y(), width(), height()));
|
|
profileTransform.scale(width() / 100, height() / 100);
|
|
}
|
|
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);
|
|
// scale the profile to create a margin
|
|
// the profile height is ~2/3 the width, so to create an even margin,
|
|
// the scale reduction for height should be 3/2 the reduction for width
|
|
m_profileWidget->scale(1 - 2 * marginFactor, 1 - 3 * marginFactor);
|
|
}
|