From 606c83e484b0d7e5514a6d9c80df7cf156148717 Mon Sep 17 00:00:00 2001 From: f4exb Date: Mon, 7 May 2018 02:15:24 +0200 Subject: [PATCH] Scale engine: use +20% ratio (1.2) to ensure proper horizontal scale text spacing --- sdrgui/gui/scaleengine.cpp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/sdrgui/gui/scaleengine.cpp b/sdrgui/gui/scaleengine.cpp index 99a5bc3c8..20eab2fe8 100644 --- a/sdrgui/gui/scaleengine.cpp +++ b/sdrgui/gui/scaleengine.cpp @@ -297,7 +297,7 @@ int ScaleEngine::calcTickTextSize() calcMajorTickUnits((m_rangeMax - m_rangeMin) / m_scale, &decimalPlaces); - return tickLen + decimalPlaces + 2; + return tickLen + decimalPlaces + 1; } void ScaleEngine::forceTwoTicks() @@ -358,11 +358,16 @@ void ScaleEngine::reCalc() if(m_orientation == Qt::Vertical) { maxNumMajorTicks = (int)(m_size / (fontMetrics.lineSpacing() * 1.3f)); - } else { - majorTickSize = (calcTickTextSize() + 2) * m_charSize; - if(majorTickSize != 0.0) - maxNumMajorTicks = (int)(m_size / majorTickSize); - else maxNumMajorTicks = 20; + } + else + { + majorTickSize = (calcTickTextSize() + 2) * m_charSize * 1.2f; + + if(majorTickSize != 0.0) { + maxNumMajorTicks = (int)(m_size / majorTickSize); + } else { + maxNumMajorTicks = 20; + } } m_majorTickValueDistance = calcMajorTickUnits((rangeMaxScaled - rangeMinScaled) / maxNumMajorTicks, &m_decimalPlaces);