diff options
| -rw-r--r-- | examples/datavis3d/widget/main.cpp | 4 | ||||
| -rw-r--r-- | src/datavis3d/engine/q3dbars.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/datavis3d/widget/main.cpp b/examples/datavis3d/widget/main.cpp index e1aaa03e..cbcce66c 100644 --- a/examples/datavis3d/widget/main.cpp +++ b/examples/datavis3d/widget/main.cpp @@ -115,12 +115,12 @@ int main(int argc, char **argv) sizeSliderX->setTickInterval(1); sizeSliderX->setMinimum(1); sizeSliderX->setValue(100); - sizeSliderX->setMaximum(200); + sizeSliderX->setMaximum(100); QSlider *sizeSliderZ = new QSlider(Qt::Horizontal); sizeSliderZ->setTickInterval(1); sizeSliderZ->setMinimum(1); sizeSliderZ->setValue(100); - sizeSliderZ->setMaximum(200); + sizeSliderZ->setMaximum(100); QSlider *spacingSliderX = new QSlider(Qt::Horizontal); spacingSliderX->setTickInterval(1); 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; |