diff options
| -rw-r--r-- | qt-mobile/qmlprofile.cpp | 28 | ||||
| -rw-r--r-- | subsurface-mobile-main.cpp | 1 |
2 files changed, 14 insertions, 15 deletions
diff --git a/qt-mobile/qmlprofile.cpp b/qt-mobile/qmlprofile.cpp index a4ff8a9d6..a55bf8d32 100644 --- a/qt-mobile/qmlprofile.cpp +++ b/qt-mobile/qmlprofile.cpp @@ -19,24 +19,10 @@ QMLProfile::~QMLProfile() void QMLProfile::paint(QPainter *painter) { - if (m_diveId.toInt() < 1) - return; - - struct dive *d; - d = get_dive_by_uniq_id(m_diveId.toInt()); - if (!d) - return; - - int old_animation_speed = prefs.animation_speed; - prefs.animation_speed = 0; // no animations while rendering the QGraphicsView - - m_profileWidget->setGeometry(QRect(x(), y(), width(), height())); - m_profileWidget->plotDive(d); QTransform profileTransform; - profileTransform.scale(this->height() / 100, this->height() / 100); + profileTransform.scale(width() / 100, height() / 100); m_profileWidget->setTransform(profileTransform); m_profileWidget->render(painter); - prefs.animation_speed = old_animation_speed; } QString QMLProfile::diveId() const @@ -47,4 +33,16 @@ QString QMLProfile::diveId() const void QMLProfile::setDiveId(const QString &diveId) { m_diveId = diveId; + int no = -1; + struct dive *d = get_dive_by_uniq_id(m_diveId.toInt()); + if (d) + no = d->number; + if (m_diveId.toInt() < 1) + return; + + if (!d) + return; + + m_profileWidget->setGeometry(QRect(x(), y(), width(), height())); + m_profileWidget->plotDive(d); } diff --git a/subsurface-mobile-main.cpp b/subsurface-mobile-main.cpp index 079dbcc0a..279255ace 100644 --- a/subsurface-mobile-main.cpp +++ b/subsurface-mobile-main.cpp @@ -58,6 +58,7 @@ int main(int argc, char **argv) taglist_init_global(); init_ui(); loadPreferences(); + prefs.animation_speed = 0; init_proxy(); if (no_filenames) { if (prefs.default_file_behavior == LOCAL_DEFAULT_FILE) { |