diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-04-24 10:45:50 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-04-24 11:04:10 +0300 |
| commit | fd65c84544f29b955755f9aab35931b590349d57 (patch) | |
| tree | 14ec34616a082cf86162a12fdbc05f60636564ed /src | |
| parent | 673dac570692cbd8b1c6180682e4b2f36dd61a02 (diff) | |
Fixed bar scaling
Change-Id: I509deb13c24b59f329524825e77216e9e76b7820
Change-Id: I509deb13c24b59f329524825e77216e9e76b7820
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/datavis3d/engine/q3dbars.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/datavis3d/engine/q3dbars.cpp b/src/datavis3d/engine/q3dbars.cpp index 6170f8eb..90c5ad81 100644 --- a/src/datavis3d/engine/q3dbars.cpp +++ b/src/datavis3d/engine/q3dbars.cpp @@ -1599,10 +1599,10 @@ void Q3DBarsPrivate::calculateSceneScalingFactors() m_rowWidth = ((m_sampleCount.first + 1) * m_barSpacing.width()) / 2.0f; m_columnDepth = ((m_sampleCount.second + 1) * m_barSpacing.height()) / 2.0f; m_maxDimension = qMax(m_rowWidth, m_columnDepth); - m_scaleX = m_barThickness.width() / m_sampleCount.first * (m_maxSceneSize / m_maxDimension); - m_scaleZ = m_barThickness.height() / m_sampleCount.first * (m_maxSceneSize / m_maxDimension); m_scaleFactor = qMin((m_sampleCount.first * (m_maxDimension / m_maxSceneSize)), (m_sampleCount.second * (m_maxDimension / m_maxSceneSize))); + m_scaleX = m_barThickness.width() / m_scaleFactor; + m_scaleZ = m_barThickness.height() / m_scaleFactor; //qDebug() << "m_scaleX" << m_scaleX << "m_scaleFactor" << m_scaleFactor; //qDebug() << "m_scaleZ" << m_scaleZ << "m_scaleFactor" << m_scaleFactor; //qDebug() << "m_rowWidth:" << m_rowWidth << "m_columnDepth:" << m_columnDepth << "m_maxDimension:" << m_maxDimension; |