VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-05-30 05:52:24 -04:00
Code Issues Projects Releases Wiki Activity

Scale engine: use +20% ratio (1.2) to ensure proper horizontal scale text spacing

Browse Source
This commit is contained in:
f4exb 2018-05-07 02:15:24 +02:00
parent c9e14d1f2d
commit 606c83e484
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sdrgui/gui/scaleengine.cpp
View File

@ -297,7 +297,7 @@ int ScaleEngine::calcTickTextSize()
calcMajorTickUnits((m_rangeMax - m_rangeMin) / m_scale, &decimalPlaces); calcMajorTickUnits((m_rangeMax - m_rangeMin) / m_scale, &decimalPlaces);
return tickLen + decimalPlaces + 2; return tickLen + decimalPlaces + 1;
} }
void ScaleEngine::forceTwoTicks() void ScaleEngine::forceTwoTicks()
@ -358,11 +358,16 @@ void ScaleEngine::reCalc()
if(m_orientation == Qt::Vertical) { if(m_orientation == Qt::Vertical) {
maxNumMajorTicks = (int)(m_size / (fontMetrics.lineSpacing() * 1.3f)); maxNumMajorTicks = (int)(m_size / (fontMetrics.lineSpacing() * 1.3f));
} else { }
majorTickSize = (calcTickTextSize() + 2) * m_charSize; else
if(majorTickSize != 0.0) {
majorTickSize = (calcTickTextSize() + 2) * m_charSize * 1.2f;
if(majorTickSize != 0.0) {
maxNumMajorTicks = (int)(m_size / majorTickSize); maxNumMajorTicks = (int)(m_size / majorTickSize);
else maxNumMajorTicks = 20; } else {
maxNumMajorTicks = 20;
}
} }
m_majorTickValueDistance = calcMajorTickUnits((rangeMaxScaled - rangeMinScaled) / maxNumMajorTicks, &m_decimalPlaces); m_majorTickValueDistance = calcMajorTickUnits((rangeMaxScaled - rangeMinScaled) / maxNumMajorTicks, &m_decimalPlaces);