Bars autoscaling fixed

Task-number: QTRD-2503

Change-Id: Ib4f621d33411168343540a51a505b4ece1679f77
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

3 files changed, 9 insertions, 5 deletions

diff --git a/examples/audiolevels/audiolevels.cpp b/examples/audiolevels/audiolevels.cpp
index e1788936..d95536d2 100644
--- a/examples/audiolevels/audiolevels.cpp
+++ b/examples/audiolevels/audiolevels.cpp
@@ -38,11 +38,14 @@ AudioLevels::AudioLevels(Q3DBars *graph, QObject *parent)
     // Set up the graph
     m_graph->setBarThickness(0.5);
     m_graph->setBarSpacing(QSizeF(0.0, 1.0));
-    m_graph->setGridVisible(false);
+    m_graph->setGridVisible(true);
     m_graph->setBackgroundVisible(false);
-    m_graph->valueAxis()->setRange(0.0, 2.0);
+    m_graph->valueAxis()->setRange(-100.0, 100.0);
+    m_graph->valueAxis()->setSegmentCount(20);
+    m_graph->valueAxis()->setLabelFormat(QStringLiteral("%d\%"));
     m_graph->setShadowQuality(QDataVis::ShadowQualityNone);
-    m_graph->scene()->activeCamera()->setCameraPosition(-20.0, 10.0, 20);
+    m_graph->setSelectionMode(QDataVis::SelectionModeNone);
+    m_graph->scene()->activeCamera()->setCameraPosition(-25.0, 10.0, 190.0);
     m_graph->setTheme(QDataVis::ThemeIsabelle);
     m_graph->setBarType(QDataVis::MeshStyleBars);
 
diff --git a/examples/audiolevels/audiolevelsiodevice.cpp b/examples/audiolevels/audiolevelsiodevice.cpp
index 11cba5aa..9fedd804 100644
--- a/examples/audiolevels/audiolevelsiodevice.cpp
+++ b/examples/audiolevels/audiolevelsiodevice.cpp
@@ -74,7 +74,8 @@ qint64 AudioLevelsIODevice::writeData(const char *data, qint64 maxSize)
     int index = 0;
     for (int i = newDataSize - 1; i >= newDataStartIndex; i--) {
         // Add 0.01 to the value to avoid gaps in the graph (i.e. zero height bars).
-        qreal value = qreal(quint8(data[resolution * i]) - 128) / 2.0 + 0.01;
+        // Also, scale to 0...100
+        qreal value = qreal(quint8(data[resolution * i]) - 128) / 1.28 + 0.01;
         (*m_array->at(middleRow))[index].setValue(value);
         // Insert a fractional value into front half of the rows.
         for (int j = 1; j <= middleRow; j++) {
diff --git a/examples/audiolevels/main.cpp b/examples/audiolevels/main.cpp
index 9d16610c..524c53b1 100644
--- a/examples/audiolevels/main.cpp
+++ b/examples/audiolevels/main.cpp
@@ -28,7 +28,7 @@ int main(int argc, char *argv[])
     QGuiApplication app(argc, argv);
 
     Q3DBars window;
-    window.resize(1024, 768);
+    window.resize(900, 1000);
     window.setTitle("Qt Data Visualization - Microphone audio levels visualizer");
     window.show();