diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-07-09 10:02:00 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-07-09 10:38:41 +0300 |
| commit | 93b5a6af81a7c719f63870b3e9c5ce071b113970 (patch) | |
| tree | 5edbb41b556b4dc859734a3d2b3616020efea3c4 /examples | |
| parent | 24275c551f0a10df022f037962d1678b7213ef09 (diff) | |
Misc fixes:
- Prettied up widget example dynamic data axes a bit by only
generating label for each fifth row/column.
- Category axes clear labelitem when label string is empty.
- Inlined most render item functions.
- Cache bar height into render items.
- Fix building of rainfall example.
Change-Id: Ia945e2253bd31bf3f6b3ac4856ab6bbcc18e2d59
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/rainfall/main.cpp | 2 | ||||
| -rw-r--r-- | examples/widget/chart.cpp | 20 |
2 files changed, 15 insertions, 7 deletions
diff --git a/examples/rainfall/main.cpp b/examples/rainfall/main.cpp index a13e91f9..db736903 100644 --- a/examples/rainfall/main.cpp +++ b/examples/rainfall/main.cpp @@ -45,7 +45,7 @@ #include <QGuiApplication> #include <QFont> -//#include <QDebug> +#include <QDebug> using namespace QtDataVis3D; diff --git a/examples/widget/chart.cpp b/examples/widget/chart.cpp index 8d6c5f99..39e19d4c 100644 --- a/examples/widget/chart.cpp +++ b/examples/widget/chart.cpp @@ -66,11 +66,18 @@ ChartModifier::ChartModifier(Q3DBars *barchart) { // Don't set any styles or specifications, start from defaults // Generate generic labels - for (int i = 0; i < 200; i++) - m_genericRowLabels << QStringLiteral("Row %1").arg(i); - for (int i = 0; i < 200; i++) - m_genericColumnLabels << QStringLiteral("Column %1").arg(i); - + for (int i = 0; i < 200; i++) { + if (i % 5) + m_genericRowLabels << QString(); + else + m_genericRowLabels << QStringLiteral("Row %1").arg(i); + } + for (int i = 0; i < 200; i++) { + if (i % 5) + m_genericColumnLabels << QString(); + else + m_genericColumnLabels << QStringLiteral("Column %1").arg(i); + } } ChartModifier::~ChartModifier() @@ -199,9 +206,10 @@ void ChartModifier::addRows() dataArray->append(dataRow); } m_chart->dataProxy()->insertRows(0, dataArray); + qDebug() << "Added" << m_rowCount << "rows, time:" << timer.elapsed(); if (oldCount < m_rowCount) m_chart->rowAxis()->setLabels(m_genericRowLabels.mid(0, m_rowCount)); - qDebug() << "Added" << m_rowCount << "rows, time:" << timer.elapsed(); + qDebug() << "... Including Label creation, time:" << timer.elapsed(); } void ChartModifier::changeStyle() |