diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-08-16 12:08:48 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-08-16 12:31:06 +0300 |
| commit | 4adf6812aa19781fc005bdb06958fdb3c051a3d5 (patch) | |
| tree | 4862427281c91129c63c08e7d9a1ea88e5523c61 /examples | |
| parent | bfcbf5d59277635a9c958cf47b540d32ee7f78dc (diff) | |
Implement value axis label formatting.
Change-Id: Ie657df264549e4277d3bd1eaf2ca48436c153717
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/barchart/main.cpp | 1 | ||||
| -rw-r--r-- | examples/qmlbarchart/qml/qmlbarchart/main.qml | 2 | ||||
| -rw-r--r-- | examples/rainfall/rainfallchart.cpp | 1 | ||||
| -rw-r--r-- | examples/widget/chart.cpp | 4 |
4 files changed, 6 insertions, 2 deletions
diff --git a/examples/barchart/main.cpp b/examples/barchart/main.cpp index 77230b5d..d5d138e4 100644 --- a/examples/barchart/main.cpp +++ b/examples/barchart/main.cpp @@ -187,6 +187,7 @@ void ChartDataGenerator::setupModel() m_chart->columnAxis()->setTitle("Day of week"); m_chart->valueAxis()->setTitle("Hours playing banjo"); m_chart->valueAxis()->setSegmentCount(5); + m_chart->valueAxis()->setLabelFormat("%.1f h"); m_chart->rowAxis()->setCategoryLabels(weeks); m_chart->columnAxis()->setCategoryLabels(days); diff --git a/examples/qmlbarchart/qml/qmlbarchart/main.qml b/examples/qmlbarchart/qml/qmlbarchart/main.qml index f10f98b9..d23113db 100644 --- a/examples/qmlbarchart/qml/qmlbarchart/main.qml +++ b/examples/qmlbarchart/qml/qmlbarchart/main.qml @@ -104,7 +104,7 @@ Item { id: valueAxis min: 0 max: 35 - labelFormat: "M\u20AC" + labelFormat: "%.1f M\u20AC" } Bars3D { id: testchart diff --git a/examples/rainfall/rainfallchart.cpp b/examples/rainfall/rainfallchart.cpp index f7bcd82b..8d7e0157 100644 --- a/examples/rainfall/rainfallchart.cpp +++ b/examples/rainfall/rainfallchart.cpp @@ -55,6 +55,7 @@ RainfallChart::RainfallChart(Q3DBars *rainfall) m_chart->rowAxis()->setTitle("Year"); m_chart->columnAxis()->setTitle("Month"); m_chart->valueAxis()->setTitle(QString("rainfall (in mm) in city %1").arg(m_city - 1)); + m_chart->valueAxis()->setLabelFormat("%d mm"); m_chart->rowAxis()->setCategoryLabels(m_years); m_chart->columnAxis()->setCategoryLabels(months); diff --git a/examples/widget/chart.cpp b/examples/widget/chart.cpp index a8c6c14a..637c140e 100644 --- a/examples/widget/chart.cpp +++ b/examples/widget/chart.cpp @@ -86,8 +86,9 @@ void ChartModifier::restart(bool dynamicData) // Set selection mode to full m_chart->setSelectionMode(QDataVis::ModeItemRowAndColumn); m_chart->valueAxis()->setSegmentCount(m_segments * 2); - m_chart->valueAxis()->setSubSegmentCount(0); + m_chart->valueAxis()->setSubSegmentCount(1); m_chart->valueAxis()->setAutoAdjustRange(true); + m_chart->valueAxis()->setLabelFormat(QString(QStringLiteral("%.3f"))); m_chart->rowAxis()->setTitle("Generic Row"); m_chart->columnAxis()->setTitle("Generic Column"); @@ -137,6 +138,7 @@ void ChartModifier::addDataSet() m_chart->valueAxis()->setSegmentCount(m_segments); m_chart->valueAxis()->setSubSegmentCount(m_subSegments); m_chart->valueAxis()->setRange(m_minval, m_maxval); + m_chart->valueAxis()->setLabelFormat(QString(QStringLiteral("%d ") + celsiusString)); // Create data rows QBarDataArray *dataSet = new QBarDataArray; |