diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-06-05 23:22:19 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-06-11 13:55:41 -0700 |
| commit | 3b993fbaad0738efe54e797b60e4f49270951323 (patch) | |
| tree | c6192129119c37f51aac9481d40f059475e0defa | |
| parent | 2d8489158da2e049a89734d2a95434ffec005fee (diff) | |
| download | subsurface-3b993fbaad0738efe54e797b60e4f49270951323.tar.gz | |
QML UI: adjust to modified logging API
appendTextToLog prepends the elapsed time which can be useful, so let's
not remove that but instead have it log to qDebug() instead.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | mobile-widgets/qmlmanager.cpp | 5 | ||||
| -rw-r--r-- | mobile-widgets/qmlprofile.cpp | 19 |
2 files changed, 10 insertions, 14 deletions
diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp index 0332a218e..856dec03b 100644 --- a/mobile-widgets/qmlmanager.cpp +++ b/mobile-widgets/qmlmanager.cpp @@ -120,8 +120,6 @@ QMLManager::QMLManager() : m_locationServiceEnabled(false), m_instance = this; m_lastDevicePixelRatio = qApp->devicePixelRatio(); connect(qobject_cast<QApplication *>(QApplication::instance()), &QApplication::applicationStateChanged, this, &QMLManager::applicationStateChanged); - appendTextToLog(getUserAgent()); - appendTextToLog(QStringLiteral("build with Qt Version %1, runtime from Qt Version %2").arg(QT_VERSION_STR).arg(qVersion())); qDebug() << "Starting" << getUserAgent(); qDebug() << QStringLiteral("build with Qt Version %1, runtime from Qt Version %2").arg(QT_VERSION_STR).arg(qVersion()); setStartPageText(tr("Starting...")); @@ -1270,8 +1268,7 @@ void QMLManager::appendTextToLog(const QString &newText) { if (!timer.isValid()) timer.start(); - m_logText += "\n" + QString::number(timer.elapsed() / 1000.0,'f', 3) + ": " + newText; - emit logTextChanged(); + qDebug() << QString::number(timer.elapsed() / 1000.0,'f', 3) + ": " + newText; } bool QMLManager::locationServiceEnabled() const diff --git a/mobile-widgets/qmlprofile.cpp b/mobile-widgets/qmlprofile.cpp index d818c7f5c..768669094 100644 --- a/mobile-widgets/qmlprofile.cpp +++ b/mobile-widgets/qmlprofile.cpp @@ -60,17 +60,16 @@ void QMLProfile::paint(QPainter *painter) QTransform painterTransform = painter->transform(); painterTransform.translate(-painterRect.width() * magicShiftFactor ,-painterRect.height() * magicShiftFactor); -#if PROFILE_SCALING_DEBUG +#if defined(PROFILE_SCALING_DEBUG) // some debugging messages to help adjust this in case the magic above is insufficient - QMLManager::instance()->appendTextToLog(QString("dpr %1 profile viewport %2 %3 painter viewport %4 %5").arg(dpr).arg(profileRect.width()).arg(profileRect.height()) - .arg(painterRect.width()).arg(painterRect.height())); - QMLManager::instance()->appendTextToLog(QString("profile matrix %1 %2 %3 %4 %5 %6 %7 %8 %9").arg(profileTransform.m11()).arg(profileTransform.m12()).arg(profileTransform.m13()) - .arg(profileTransform.m21()).arg(profileTransform.m22()).arg(profileTransform.m23()) - .arg(profileTransform.m31()).arg(profileTransform.m32()).arg(profileTransform.m33())); - QMLManager::instance()->appendTextToLog(QString("painter matrix %1 %2 %3 %4 %5 %6 %7 %8 %9").arg(painterTransform.m11()).arg(painterTransform.m12()).arg(painterTransform.m13()) - .arg(painterTransform.m21()).arg(painterTransform.m22()).arg(painterTransform.m23()) - .arg(painterTransform.m31()).arg(painterTransform.m32()).arg(painterTransform.m33())); - qDebug() << "profile scaled by" << profileTransform.m11() << profileTransform.m22() << "and translated by" << profileTransform.m31() << profileTransform.m32(); + qDebug() << QString("dpr %1 profile viewport %2 %3 painter viewport %4 %5").arg(dpr).arg(profileRect.width()).arg(profileRect.height()) + .arg(painterRect.width()).arg(painterRect.height()); + qDebug() << QString("profile matrix %1 %2 %3 %4 %5 %6 %7 %8 %9").arg(profileTransform.m11()).arg(profileTransform.m12()).arg(profileTransform.m13()) + .arg(profileTransform.m21()).arg(profileTransform.m22()).arg(profileTransform.m23()) + .arg(profileTransform.m31()).arg(profileTransform.m32()).arg(profileTransform.m33())); + qDebug() << QString("painter matrix %1 %2 %3 %4 %5 %6 %7 %8 %9").arg(painterTransform.m11()).arg(painterTransform.m12()).arg(painterTransform.m13()) + .arg(painterTransform.m21()).arg(painterTransform.m22()).arg(painterTransform.m23()) + .arg(painterTransform.m31()).arg(painterTransform.m32()).arg(painterTransform.m33())); qDebug() << "exist profile transform" << m_profileWidget->transform() << "painter transform" << painter->transform(); #endif // apply the transformation |