- Improve rendering of numeric cues on VALUES axis

- Remove leftover debugging output

diff --git a/signaldrawer.cpp b/signaldrawer.cpp
index 54fa098ec2a11363dcfff77f14185489e4008c42..b42cbf5cb5299c4ed167da64e5e4f6514b955c27 100644 (file)
--- 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();