summaryrefslogtreecommitdiffstats
path: root/examples/barchart
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2013-08-07 14:52:28 +0300
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2013-08-08 08:21:37 +0300
commitebee290095f9a32dbcf5956e9fed50d2610cbfe1 (patch)
treec9260232aa82517c12bbcd94ef3d004b29860959 /examples/barchart
parentb3e10fcc8403bc1a0d9d4c107b52eb10af0ecffa (diff)
Tickcount and both automatic and explicit range setting via axes
- Tick count moved to QValueAxis. - QValueAxis adjusts range to data by default on barcharts. - QValueaxis explicit range setting now works for barchart. Change-Id: I2c0afcab34b74a848144fda41d9135dcdb510354 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'examples/barchart')
-rw-r--r--examples/barchart/main.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/examples/barchart/main.cpp b/examples/barchart/main.cpp
index c55a13a6..55e87e4a 100644
--- a/examples/barchart/main.cpp
+++ b/examples/barchart/main.cpp
@@ -41,6 +41,7 @@
#include "q3dbars.h"
#include "qcategoryaxis.h"
#include "qitemmodelbardataproxy.h"
+#include "qvalueaxis.h"
#include <QApplication>
#include <QVBoxLayout>
@@ -197,19 +198,17 @@ void ChartDataGenerator::setupModel()
weeks << "week 1" << "week 2" << "week 3" << "week 4" << "week 5";
// Set up data Mon Tue Wed Thu Fri Sat Sun
- float hours[5][7] = {{2.0f, 1.0f, 3.0f, 0.2f, 1.0f, 5.0f, 7.0f}, // week 1
+ float hours[5][7] = {{2.0f, 1.0f, 3.0f, 0.2f, 1.0f, 5.0f, 10.0f}, // week 1
{0.5f, 1.0f, 3.0f, 1.0f, 2.0f, 2.0f, 3.0f}, // week 2
{1.0f, 1.0f, 2.0f, 1.0f, 4.0f, 4.0f, 4.0f}, // week 3
{0.0f, 1.0f, 0.0f, 0.0f, 2.0f, 2.0f, 0.3f}, // week 4
{3.0f, 3.0f, 6.0f, 2.0f, 2.0f, 1.0f, 1.0f}}; // week 5
- // Set tick count and step, we want a line every hour -> 7 ticks, step 1 hour
- m_chart->setTickCount(7, 1.0f);
-
// Add labels
m_chart->rowAxis()->setTitle("Week of year");
m_chart->columnAxis()->setTitle("Day of week");
m_chart->valueAxis()->setTitle("Hours playing banjo");
+ m_chart->valueAxis()->setTickCount(5);
m_chart->rowAxis()->setLabels(weeks);
m_chart->columnAxis()->setLabels(days);