From 77ac34f3584bd4712c303cac7ec1486c1ef74b4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Thu, 12 Sep 2013 13:35:08 +0300 Subject: Added getters MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTRD-2243 Change-Id: I13ba560a853c2c39fc24c6dc373e50d56f8c33ef Reviewed-by: Tomi Korpipää --- tests/barstest/chart.cpp | 8 +++----- tests/barstest/chart.h | 1 - tests/spectrum/spectrumapp/main.cpp | 10 ++++++---- 3 files changed, 9 insertions(+), 10 deletions(-) (limited to 'tests') diff --git a/tests/barstest/chart.cpp b/tests/barstest/chart.cpp index e2d4bda4..b534f54c 100644 --- a/tests/barstest/chart.cpp +++ b/tests/barstest/chart.cpp @@ -33,7 +33,6 @@ ChartModifier::ChartModifier(Q3DBars *barchart) m_xRotation(0.0f), m_yRotation(0.0f), m_static(true), - m_barThicknessRatio(1.0), m_barSpacingX(0.1f), m_barSpacingZ(0.1f), m_fontSize(20), @@ -505,20 +504,19 @@ void ChartModifier::rotateY(int rotation) void ChartModifier::setSpecsRatio(int barwidth) { - m_barThicknessRatio = (float)barwidth / 30.0f; - m_chart->setBarSpecs(m_barThicknessRatio, QSizeF(m_barSpacingX, m_barSpacingZ)); + m_chart->setBarThickness((qreal)barwidth / 30.0); } void ChartModifier::setSpacingSpecsX(int spacing) { m_barSpacingX = (float)spacing / 100.0f; - m_chart->setBarSpecs(m_barThicknessRatio, QSizeF(m_barSpacingX, m_barSpacingZ)); + m_chart->setBarSpacing(QSizeF(m_barSpacingX, m_barSpacingZ)); } void ChartModifier::setSpacingSpecsZ(int spacing) { m_barSpacingZ = (float)spacing / 100.0f; - m_chart->setBarSpecs(m_barThicknessRatio, QSizeF(m_barSpacingX, m_barSpacingZ)); + m_chart->setBarSpacing(QSizeF(m_barSpacingX, m_barSpacingZ)); } void ChartModifier::setSampleCountX(int samples) diff --git a/tests/barstest/chart.h b/tests/barstest/chart.h index fcd861b7..65d404e0 100644 --- a/tests/barstest/chart.h +++ b/tests/barstest/chart.h @@ -84,7 +84,6 @@ private: float m_xRotation; float m_yRotation; bool m_static; - qreal m_barThicknessRatio; float m_barSpacingX; float m_barSpacingZ; int m_fontSize; diff --git a/tests/spectrum/spectrumapp/main.cpp b/tests/spectrum/spectrumapp/main.cpp index 6c264516..51e864e8 100644 --- a/tests/spectrum/spectrumapp/main.cpp +++ b/tests/spectrum/spectrumapp/main.cpp @@ -76,22 +76,24 @@ MainApp::MainApp(Q3DBars *window) #if USE_CONES // Set bar specifications; make them a bit wider than deep and make them be drawn 75% // inside each other - m_chart->setBarSpecs(1.25), QSizeF(0.2, -0.75)); + m_chart->setBarThickness(1.25); + m_chart->setBarSpacing(QSizeF(0.2, -0.75)); // Set bar type, smooth cones m_chart->setBarType(QDataVis::Cones, true); // Adjust zoom manually; automatic zoom level calculation does not work well with negative - // spacings (in setBarSpecs) + // spacings (in setBarSpacing) m_chart->setCameraPosition(10.0f, 5.0f, 70); #else // Set bar specifications; make them twice as wide as they're deep - m_chart->setBarSpecs(2.0, QSizeF(0.0, 0.0)); + m_chart->setBarThickness(2.0); + m_chart->setBarSpacing(QSizeF(0.0, 0.0)); // Set bar type, flat bars m_chart->setBarType(QDataVis::Bars, false); // Adjust camera position m_chart->setCameraPosition(10.0f, 7.5f, 75); #endif // Set color scheme - m_chart->setBarColor(QColor(Qt::black), QColor(Qt::red), QColor(Qt::darkYellow)); + m_chart->setBarColor(QColor(Qt::red), false); // Disable selection m_chart->setSelectionMode(QDataVis::ModeNone); QObject::connect(m_engine, &Engine::changedSpectrum, this, &MainApp::spectrumChanged); -- cgit v1.2.3