From be714f9eb3418843607a4927b7aeaf511c85ec6c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michal=20Mal=C3=BD?= <madcatxster@devoid-pointer.net> Date: Fri, 10 Oct 2014 23:07:28 +0200 Subject: [PATCH] - Improve rendering of numeric cues on VALUES axis - Remove leftover debugging output --- signaldrawer.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/signaldrawer.cpp b/signaldrawer.cpp index 54fa098..b42cbf5 100644 --- a/signaldrawer.cpp +++ b/signaldrawer.cpp @@ -268,7 +268,6 @@ void SignalDrawer::drawScaleByTicks(const RulerDrawData& rd, std::function<void { double absVal = rd.firstTickAbs; for (double rel = rd.firstTickRel; rel <= relMax; rel += rd.relStep) { - Logger::log(Logger::Level::DEBUG, ME_SENDER_STR, __QFUNC__ + QString(" rel %1 abs %2").arg(rel).arg(absVal)); drawFunc(rel, absVal, TickType::BIGTICK); /* Draw subticks ticks */ @@ -357,13 +356,13 @@ void SignalDrawer::renderTimeScaleText(QPainter* const p, const double rel, cons void SignalDrawer::renderValueScaleText(QPainter* const p, int& maxCueWidth, const double rel, const double value, const TickType tt) { Q_UNUSED(tt); - const int yPix = relToYPix(rel); + const int yPix = relToYPix(rel) + (p->fontMetrics().ascent() / 2); const QString text = m_locale.toString(value, 'f', 2); /* Do not draw labels that would overflow */ QRect br = p->fontMetrics().boundingRect(text); -/* if (yPix - (br.height() / 2) < 0) - return;*/ + if (yPix - p->fontMetrics().ascent() < 0) + return; if (maxCueWidth < br.width()) maxCueWidth = br.width(); -- 2.43.5