From fd65c84544f29b955755f9aab35931b590349d57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Wed, 24 Apr 2013 10:45:50 +0300 Subject: Fixed bar scaling Change-Id: I509deb13c24b59f329524825e77216e9e76b7820 Change-Id: I509deb13c24b59f329524825e77216e9e76b7820 Reviewed-by: Miikka Heikkinen --- src/datavis3d/engine/q3dbars.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') 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; -- cgit v1.2.3