diff options
Diffstat (limited to 'examples')
-rw-r--r-- | examples/qmlbarchart/qml/qmlbarchart/main.qml | 4 | ||||
-rw-r--r-- | examples/qmlscatter/qml/qmlscatter/main.qml | 1 | ||||
-rw-r--r-- | examples/rainfall/rainfallchart.cpp | 5 | ||||
-rw-r--r-- | examples/scatterchart/scatterchart.cpp | 8 | ||||
-rw-r--r-- | examples/widget/chart.cpp | 5 |
5 files changed, 15 insertions, 8 deletions
diff --git a/examples/qmlbarchart/qml/qmlbarchart/main.qml b/examples/qmlbarchart/qml/qmlbarchart/main.qml index 67d9aad0..1fbd4682 100644 --- a/examples/qmlbarchart/qml/qmlbarchart/main.qml +++ b/examples/qmlbarchart/qml/qmlbarchart/main.qml @@ -105,6 +105,7 @@ Item { min: 0 max: 35 labelFormat: "%.1f M\u20AC" + title: "Annual expenses" } Bars3D { id: testchart @@ -124,6 +125,7 @@ Item { axisX: rowAxis axisY: valueAxis axisZ: columnAxis + itemLabelFormat: "@valueTitle for @colLabel, @rowLabel: @valueLabel" } } @@ -195,9 +197,11 @@ Item { if (valueMapping.valueRole == "expenses") { valueMapping.valueRole = "income" mappingButtonText.text = "Show Expenses" + valueAxis.title = "Annual income" } else { valueMapping.valueRole = "expenses" mappingButtonText.text = "Show Income" + valueAxis.title = "Annual expenses" } } } diff --git a/examples/qmlscatter/qml/qmlscatter/main.qml b/examples/qmlscatter/qml/qmlscatter/main.qml index 6238529d..33ee6303 100644 --- a/examples/qmlscatter/qml/qmlscatter/main.qml +++ b/examples/qmlscatter/qml/qmlscatter/main.qml @@ -79,6 +79,7 @@ Item { shadowQuality: Scatter3D.ShadowNone selectionMode: Scatter3D.ModeItem labelTransparency: Scatter3D.TransparencyNoBackground + itemLabelFormat: "X:@xLabel Y:@yLabel Z:@zLabel" Component.onCompleted: { console.log("testscatter complete"); diff --git a/examples/rainfall/rainfallchart.cpp b/examples/rainfall/rainfallchart.cpp index 1b3c574f..05b9119c 100644 --- a/examples/rainfall/rainfallchart.cpp +++ b/examples/rainfall/rainfallchart.cpp @@ -40,7 +40,6 @@ RainfallChart::RainfallChart(Q3DBars *rainfall) m_columnCount = m_numericMonths.size(); m_proxy = new VariantBarDataProxy; - m_proxy->setItemLabelFormat(QStringLiteral(" mm")); m_chart->setDataProxy(m_proxy); updateYearsList(2000, 2012); @@ -54,7 +53,7 @@ RainfallChart::RainfallChart(Q3DBars *rainfall) months << "January" << "February" << "March" << "April" << "May" << "June" << "July" << "August" << "September" << "October" << "November" << "December"; 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()->setTitle(QString("rainfall in city %1").arg(m_city - 1)); m_chart->valueAxis()->setLabelFormat("%d mm"); m_chart->rowAxis()->setCategoryLabels(m_years); m_chart->columnAxis()->setCategoryLabels(months); @@ -108,7 +107,7 @@ void RainfallChart::timeout() m_city = 2; m_proxy->mapping()->setValueIndex(m_city); - m_chart->valueAxis()->setTitle(QString("rainfall (in mm) in city %1").arg(m_city - 1)); + m_chart->valueAxis()->setTitle(QString("rainfall in city %1").arg(m_city - 1)); } void RainfallChart::updateYearsList(int start, int end) diff --git a/examples/scatterchart/scatterchart.cpp b/examples/scatterchart/scatterchart.cpp index c4cb6d15..8655898b 100644 --- a/examples/scatterchart/scatterchart.cpp +++ b/examples/scatterchart/scatterchart.cpp @@ -34,8 +34,10 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter) m_chart->setObjectType(QDataVis::Spheres, true); m_chart->setTheme(QDataVis::ThemeBrownSand); m_chart->setShadowQuality(QDataVis::ShadowHigh); + m_chart->setCameraPreset(QDataVis::PresetFront); QScatterDataProxy *proxy = new QScatterDataProxy; + proxy->setItemLabelFormat("@xTitle: @xLabel @yTitle: @yLabel @zTitle: @zLabel"); m_chart->setDataProxy(proxy); connect(&m_timer, &QTimer::timeout, this, &ScatterDataModifier::timeout); @@ -54,9 +56,9 @@ void ScatterDataModifier::start() void ScatterDataModifier::addData() { // Add labels - m_chart->valueAxisX()->setTitle("Somethings"); - m_chart->valueAxisY()->setTitle("Values"); - m_chart->valueAxisZ()->setTitle("Others"); + m_chart->valueAxisX()->setTitle("X"); + m_chart->valueAxisY()->setTitle("Y"); + m_chart->valueAxisZ()->setTitle("Z"); m_chart->valueAxisX()->setRange(-50.0, 50.0); m_chart->valueAxisY()->setRange(-1.0, 1.0); m_chart->valueAxisZ()->setRange(-50.0, 50.0); diff --git a/examples/widget/chart.cpp b/examples/widget/chart.cpp index 558ea755..68feb2fe 100644 --- a/examples/widget/chart.cpp +++ b/examples/widget/chart.cpp @@ -80,6 +80,7 @@ void ChartModifier::restart(bool dynamicData) m_chart->setFont(QFont("Times Roman", 20)); } else { m_chart->dataProxy()->resetArray(0); + m_chart->dataProxy()->setItemLabelFormat(QStringLiteral("@valueTitle for (@rowIdx, @colIdx): @valueLabel")); // Set up sample space m_chart->setDataWindow(m_rowCount, m_columnCount); // Set selection mode to full @@ -126,12 +127,11 @@ void ChartModifier::addDataSet() // Use default data proxy to feed data directly in expected format QBarDataProxy *proxy = m_chart->dataProxy(); - proxy->setItemLabelFormat(celsiusString); // Add labels m_chart->rowAxis()->setTitle("Year"); m_chart->columnAxis()->setTitle("Month"); - m_chart->valueAxis()->setTitle("Average temperature (" + celsiusString + ")"); + m_chart->valueAxis()->setTitle("Average temperature"); m_chart->rowAxis()->setCategoryLabels(years); m_chart->columnAxis()->setCategoryLabels(months); m_chart->valueAxis()->setSegmentCount(m_segments); @@ -160,6 +160,7 @@ void ChartModifier::addDataSet() // Add data to chart (chart assumes ownership) proxy->resetArray(dataSet); + proxy->setItemLabelFormat(QStringLiteral("@valueTitle for @colLabel @rowLabel: @valueLabel")); } void ChartModifier::addRow() |