diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-10-03 14:26:46 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-10-04 08:19:30 +0300 |
commit | d879027ac73093e51d3470e9aea87aa5479a0ef1 (patch) | |
tree | a7be8452ce0908d3b7ed58413915b5072a83fd8c | |
parent | 7e35ce01ac38fea1d7c3ce51ab9c24fdf6e7453c (diff) |
Replace 'chart' with 'graph'
Task-number: QTRD-2369
Change-Id: Ic39bc03a0eee4fe75978e71af06ad7a655e958a9
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
-rw-r--r-- | examples/audiolevels/audiolevels.cpp | 4 | ||||
-rw-r--r-- | examples/audiolevels/audiolevels.h | 2 | ||||
-rw-r--r-- | examples/audiolevels/audiolevels.pro | 4 | ||||
-rw-r--r-- | examples/bars/bars.pro (renamed from examples/barchart/barchart.pro) | 3 | ||||
-rw-r--r-- | examples/bars/doc/images/bars-example.png (renamed from examples/barchart/doc/images/barchart-example.png) | bin | 163146 -> 163146 bytes | |||
-rw-r--r-- | examples/bars/doc/src/bars.qdoc (renamed from examples/barchart/doc/src/barchart.qdoc) | 8 | ||||
-rw-r--r-- | examples/bars/main.cpp (renamed from examples/barchart/main.cpp) | 86 | ||||
-rw-r--r-- | examples/examples.pro | 7 | ||||
-rw-r--r-- | examples/qmlbarchart/qmlbarchart.qrc | 7 | ||||
-rw-r--r-- | examples/qmlbars/doc/src/qmlbars.qdoc (renamed from examples/qmlbarchart/doc/src/qmlbarchart.qdoc) | 8 | ||||
-rw-r--r-- | examples/qmlbars/main.cpp (renamed from examples/qmlbarchart/main.cpp) | 0 | ||||
-rw-r--r-- | examples/qmlbars/qml/qmlbars/axes.qml (renamed from examples/qmlbarchart/qml/qmlbarchart/axes.qml) | 0 | ||||
-rw-r--r-- | examples/qmlbars/qml/qmlbars/data.qml (renamed from examples/qmlbarchart/qml/qmlbarchart/data.qml) | 0 | ||||
-rw-r--r-- | examples/qmlbars/qml/qmlbars/main.qml (renamed from examples/qmlbarchart/qml/qmlbarchart/main.qml) | 56 | ||||
-rw-r--r-- | examples/qmlbars/qmlbars.desktop (renamed from examples/qmlbarchart/qmlbarchart.desktop) | 6 | ||||
-rw-r--r-- | examples/qmlbars/qmlbars.pro (renamed from examples/qmlbarchart/qmlbarchart.pro) | 7 | ||||
-rw-r--r-- | examples/qmlbars/qmlbars.qrc | 7 | ||||
-rw-r--r-- | examples/qmlbars/qmlbars64.png (renamed from examples/qmlbarchart/qmlbarchart64.png) | bin | 3400 -> 3400 bytes | |||
-rw-r--r-- | examples/qmlbars/qtquick2applicationviewer/qtquick2applicationviewer.cpp (renamed from examples/qmlbarchart/qtquick2applicationviewer/qtquick2applicationviewer.cpp) | 0 | ||||
-rw-r--r-- | examples/qmlbars/qtquick2applicationviewer/qtquick2applicationviewer.h (renamed from examples/qmlbarchart/qtquick2applicationviewer/qtquick2applicationviewer.h) | 0 | ||||
-rw-r--r-- | examples/qmlbars/qtquick2applicationviewer/qtquick2applicationviewer.pri (renamed from examples/qmlbarchart/qtquick2applicationviewer/qtquick2applicationviewer.pri) | 0 | ||||
-rw-r--r-- | examples/qmlscatter/doc/src/qmlscatter.qdoc | 2 | ||||
-rw-r--r-- | examples/qmlscatter/qml/qmlscatter/main.qml | 4 | ||||
-rw-r--r-- | examples/qmlscatter/qmlscatter.pro | 3 | ||||
-rw-r--r-- | examples/qmlsurface/qmlsurface.pro | 3 | ||||
-rw-r--r-- | examples/rainfall/doc/src/rainfall.qdoc | 2 | ||||
-rw-r--r-- | examples/rainfall/main.cpp | 6 | ||||
-rw-r--r-- | examples/rainfall/rainfall.pro | 8 | ||||
-rw-r--r-- | examples/rainfall/rainfallgraph.cpp (renamed from examples/rainfall/rainfallchart.cpp) | 50 | ||||
-rw-r--r-- | examples/rainfall/rainfallgraph.h (renamed from examples/rainfall/rainfallchart.h) | 14 | ||||
-rw-r--r-- | examples/scatter/doc/src/scatter.qdoc (renamed from examples/scatterchart/doc/src/scatterchart.qdoc) | 8 | ||||
-rw-r--r-- | examples/scatter/main.cpp (renamed from examples/scatterchart/main.cpp) | 12 | ||||
-rw-r--r-- | examples/scatter/scatter.pro | 13 | ||||
-rw-r--r-- | examples/scatter/scatterdatamodifier.cpp (renamed from examples/scatterchart/scatterchart.cpp) | 62 | ||||
-rw-r--r-- | examples/scatter/scatterdatamodifier.h (renamed from examples/scatterchart/scatterchart.h) | 2 | ||||
-rw-r--r-- | examples/scatterchart/scatterchart.pro | 10 | ||||
-rw-r--r-- | examples/surfacechart/surfacechart.pro | 16 | ||||
-rw-r--r-- | examples/widget/doc/src/widget.qdoc | 2 | ||||
-rw-r--r-- | examples/widget/graphmodifier.cpp (renamed from examples/widget/chart.cpp) | 103 | ||||
-rw-r--r-- | examples/widget/graphmodifier.h (renamed from examples/widget/chart.h) | 12 | ||||
-rw-r--r-- | examples/widget/main.cpp | 34 | ||||
-rw-r--r-- | examples/widget/widget.pro | 8 | ||||
-rw-r--r-- | src/datavisualization/data/qitemmodelbardatamapping.cpp | 2 | ||||
-rw-r--r-- | src/datavisualization/data/qitemmodelscatterdatamapping.cpp | 2 | ||||
-rw-r--r-- | src/datavisualization/doc/src/qtdatavisualization-index.qdoc | 7 | ||||
-rw-r--r-- | src/datavisualization/doc/src/qtdatavisualization-qml-bars3d.qdoc | 2 | ||||
-rw-r--r-- | src/datavisualization/engine/abstract3dcontroller.cpp | 2 | ||||
-rw-r--r-- | src/datavisualization/engine/bars3dcontroller.cpp | 4 | ||||
-rw-r--r-- | src/datavisualization/engine/bars3drenderer.cpp | 8 | ||||
-rw-r--r-- | src/datavisualization/engine/q3dbars.cpp | 4 | ||||
-rw-r--r-- | src/datavisualization/engine/q3dscatter.cpp | 6 | ||||
-rw-r--r-- | src/datavisualization/engine/q3dsurface.cpp | 4 | ||||
-rw-r--r-- | src/datavisualization/engine/scatter3dcontroller.cpp | 2 | ||||
-rw-r--r-- | src/datavisualization/engine/surface3dcontroller.cpp | 2 | ||||
-rw-r--r-- | tests/barstest/chart.cpp | 80 | ||||
-rw-r--r-- | tests/barstest/chart.h | 6 | ||||
-rw-r--r-- | tests/barstest/main.cpp | 74 | ||||
-rw-r--r-- | tests/surfacetest/Heightmap.png (renamed from examples/surfacechart/Heightmap.png) | bin | 71764 -> 71764 bytes | |||
-rw-r--r-- | tests/surfacetest/graphmodifier.cpp (renamed from examples/surfacechart/chartmodifier.cpp) | 129 | ||||
-rw-r--r-- | tests/surfacetest/graphmodifier.h (renamed from examples/surfacechart/chartmodifier.h) | 14 | ||||
-rw-r--r-- | tests/surfacetest/main.cpp (renamed from examples/surfacechart/main.cpp) | 44 | ||||
-rw-r--r-- | tests/surfacetest/surfacetest.pro | 16 | ||||
-rw-r--r-- | tests/surfacetest/surfacetest.qrc (renamed from examples/surfacechart/surface.qrc) | 0 | ||||
-rw-r--r-- | tests/tests.pro | 3 |
64 files changed, 510 insertions, 480 deletions
diff --git a/examples/audiolevels/audiolevels.cpp b/examples/audiolevels/audiolevels.cpp index bfa419b4..0d227a31 100644 --- a/examples/audiolevels/audiolevels.cpp +++ b/examples/audiolevels/audiolevels.cpp @@ -27,10 +27,10 @@ QT_DATAVISUALIZATION_USE_NAMESPACE -AudioLevels::AudioLevels(Q3DBars *chart, QObject *parent) +AudioLevels::AudioLevels(Q3DBars *graph, QObject *parent) : QObject(parent), m_device(0), - m_graph(chart), + m_graph(graph), m_audioInput(0) { // Set up the graph diff --git a/examples/audiolevels/audiolevels.h b/examples/audiolevels/audiolevels.h index eafb799e..90141850 100644 --- a/examples/audiolevels/audiolevels.h +++ b/examples/audiolevels/audiolevels.h @@ -31,7 +31,7 @@ class AudioLevels : public QObject Q_OBJECT public: - AudioLevels(Q3DBars *chart, QObject *parent = 0); + AudioLevels(Q3DBars *graph, QObject *parent = 0); ~AudioLevels(); private: diff --git a/examples/audiolevels/audiolevels.pro b/examples/audiolevels/audiolevels.pro index 79356f18..7df4379b 100644 --- a/examples/audiolevels/audiolevels.pro +++ b/examples/audiolevels/audiolevels.pro @@ -14,3 +14,7 @@ HEADERS += audiolevels.h \ audiolevelsiodevice.h INSTALLS += target + +OTHER_FILES += doc/src/* \ + doc/images/* + diff --git a/examples/barchart/barchart.pro b/examples/bars/bars.pro index 12b296c5..f319f690 100644 --- a/examples/barchart/barchart.pro +++ b/examples/bars/bars.pro @@ -7,3 +7,6 @@ SOURCES += main.cpp INSTALLS += target QT += widgets + +OTHER_FILES += doc/src/* \ + doc/images/* diff --git a/examples/barchart/doc/images/barchart-example.png b/examples/bars/doc/images/bars-example.png Binary files differindex 0f321c95..0f321c95 100644 --- a/examples/barchart/doc/images/barchart-example.png +++ b/examples/bars/doc/images/bars-example.png diff --git a/examples/barchart/doc/src/barchart.qdoc b/examples/bars/doc/src/bars.qdoc index 0966bd29..8a9a4458 100644 --- a/examples/barchart/doc/src/barchart.qdoc +++ b/examples/bars/doc/src/bars.qdoc @@ -17,12 +17,12 @@ ****************************************************************************/ /*! - \example barchart - \title Barchart Example + \example bars + \title Bars Example - The barchart example shows how to make a simple 3D bar chart using Q3DBars. + The bars example shows how to make a simple 3D bar graph using Q3DBars. - \image barchart-example.png + \image bars-example.png TODO */ diff --git a/examples/barchart/main.cpp b/examples/bars/main.cpp index 5a69a5fb..42e7da57 100644 --- a/examples/barchart/main.cpp +++ b/examples/bars/main.cpp @@ -34,11 +34,11 @@ using namespace QtDataVisualization; -class ChartDataGenerator : public QObject +class GraphDataGenerator : public QObject { public: - explicit ChartDataGenerator(Q3DBars *barchart, QTableWidget *tableWidget); - ~ChartDataGenerator(); + explicit GraphDataGenerator(Q3DBars *bargraph, QTableWidget *tableWidget); + ~GraphDataGenerator(); void setupModel(); void addRow(); @@ -51,7 +51,7 @@ public: void fixTableSize(); private: - Q3DBars *m_chart; + Q3DBars *m_graph; QTimer *m_dataTimer; QTimer *m_styleTimer; QTimer *m_presetTimer; @@ -61,8 +61,8 @@ private: QTableWidget *m_tableWidget; // not owned }; -ChartDataGenerator::ChartDataGenerator(Q3DBars *barchart, QTableWidget *tableWidget) - : m_chart(barchart), +GraphDataGenerator::GraphDataGenerator(Q3DBars *bargraph, QTableWidget *tableWidget) + : m_graph(bargraph), m_dataTimer(0), m_styleTimer(0), m_presetTimer(0), @@ -73,67 +73,67 @@ ChartDataGenerator::ChartDataGenerator(Q3DBars *barchart, QTableWidget *tableWid { // Set up bar specifications; make the bars as wide as they are deep, // and add a small space between the bars - m_chart->setBarThickness(1.0); - m_chart->setBarSpacing(QSizeF(0.2, 0.2)); + m_graph->setBarThickness(1.0); + m_graph->setBarSpacing(QSizeF(0.2, 0.2)); // Set bar type to flat pyramids - m_chart->setBarType(QDataVis::MeshStylePyramids, false); + m_graph->setBarType(QDataVis::MeshStylePyramids, false); #ifndef USE_STATIC_DATA // Set up sample space; make it as deep as it's wide - m_chart->setDataWindow(m_rowCount, m_columnCount); + m_graph->setDataWindow(m_rowCount, m_columnCount); m_tableWidget->setColumnCount(m_columnCount); // Set selection mode to full - m_chart->setSelectionMode(QDataVis::SelectionModeItemRowAndColumn); + m_graph->setSelectionMode(QDataVis::SelectionModeItemRowAndColumn); // Hide axis labels by explicitly setting one empty string as label list - m_chart->rowAxis()->setCategoryLabels(QStringList(QString())); - m_chart->columnAxis()->setCategoryLabels(QStringList(QString())); + m_graph->rowAxis()->setCategoryLabels(QStringList(QString())); + m_graph->columnAxis()->setCategoryLabels(QStringList(QString())); - m_chart->activeDataProxy()->setItemLabelFormat(QStringLiteral("@valueLabel")); + m_graph->activeDataProxy()->setItemLabelFormat(QStringLiteral("@valueLabel")); #else // Set selection mode to zoom row - m_chart->setSelectionMode(QDataVis::SelectionModeSliceRow); - m_chart->setFont(QFont("Impact", 20)); + m_graph->setSelectionMode(QDataVis::SelectionModeSliceRow); + m_graph->setFont(QFont("Impact", 20)); #endif // Set theme - m_chart->setTheme(QDataVis::ThemeDigia); + m_graph->setTheme(QDataVis::ThemeDigia); // Set preset camera position - m_chart->setCameraPreset(QDataVis::CameraPresetFront); + m_graph->setCameraPreset(QDataVis::CameraPresetFront); } -ChartDataGenerator::~ChartDataGenerator() +GraphDataGenerator::~GraphDataGenerator() { if (m_dataTimer) { m_dataTimer->stop(); delete m_dataTimer; } - delete m_chart; + delete m_graph; } -void ChartDataGenerator::start() +void GraphDataGenerator::start() { #ifndef USE_STATIC_DATA m_dataTimer = new QTimer(); m_dataTimer->setTimerType(Qt::CoarseTimer); - QObject::connect(m_dataTimer, &QTimer::timeout, this, &ChartDataGenerator::addRow); + QObject::connect(m_dataTimer, &QTimer::timeout, this, &GraphDataGenerator::addRow); m_dataTimer->start(0); - m_tableWidget->setFixedWidth(m_chart->width()); + m_tableWidget->setFixedWidth(m_graph->width()); #else setupModel(); // Table needs to be shown before the size of its headers can be accurately obtained, // so we postpone it a bit m_dataTimer = new QTimer(); m_dataTimer->setSingleShot(true); - QObject::connect(m_dataTimer, &QTimer::timeout, this, &ChartDataGenerator::fixTableSize); + QObject::connect(m_dataTimer, &QTimer::timeout, this, &GraphDataGenerator::fixTableSize); m_dataTimer->start(0); #endif } -void ChartDataGenerator::setupModel() +void GraphDataGenerator::setupModel() { // Set up row and column names QStringList days; @@ -149,11 +149,11 @@ void ChartDataGenerator::setupModel() {3.0f, 3.0f, 6.0f, 2.0f, 2.0f, 1.0f, 1.0f}}; // week 5 // 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()->setSegmentCount(5); - m_chart->valueAxis()->setLabelFormat("%.1f h"); + m_graph->rowAxis()->setTitle("Week of year"); + m_graph->columnAxis()->setTitle("Day of week"); + m_graph->valueAxis()->setTitle("Hours playing banjo"); + m_graph->valueAxis()->setSegmentCount(5); + m_graph->valueAxis()->setLabelFormat("%.1f h"); m_tableWidget->setRowCount(5); m_tableWidget->setColumnCount(7); @@ -171,7 +171,7 @@ void ChartDataGenerator::setupModel() } } -void ChartDataGenerator::addRow() +void GraphDataGenerator::addRow() { m_tableWidget->model()->insertRow(0); if (m_tableWidget->model()->rowCount() > m_rowCount) @@ -184,21 +184,21 @@ void ChartDataGenerator::addRow() m_tableWidget->resizeColumnsToContents(); } -void ChartDataGenerator::selectFromTable(const QPoint &selection) +void GraphDataGenerator::selectFromTable(const QPoint &selection) { m_tableWidget->setFocus(); m_tableWidget->setCurrentCell(selection.x(), selection.y()); } -void ChartDataGenerator::selectedFromTable(int currentRow, int currentColumn, +void GraphDataGenerator::selectedFromTable(int currentRow, int currentColumn, int previousRow, int previousColumn) { Q_UNUSED(previousRow) Q_UNUSED(previousColumn) - m_chart->setSelectedBarPos(QPoint(currentRow, currentColumn)); + m_graph->setSelectedBarPos(QPoint(currentRow, currentColumn)); } -void ChartDataGenerator::fixTableSize() +void GraphDataGenerator::fixTableSize() { int width = m_tableWidget->horizontalHeader()->length(); width += m_tableWidget->verticalHeader()->width(); @@ -215,10 +215,10 @@ int main(int argc, char **argv) QWidget widget; QVBoxLayout *layout = new QVBoxLayout(&widget); - Q3DBars *chart = new Q3DBars(); - QSize screenSize = chart->screen()->size(); + Q3DBars *graph = new Q3DBars(); + QSize screenSize = graph->screen()->size(); - QWidget *container = QWidget::createWindowContainer(chart); + QWidget *container = QWidget::createWindowContainer(graph); container->setMinimumSize(QSize(screenSize.width() / 2, screenSize.height() / 2)); container->setMaximumSize(screenSize); container->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); @@ -238,14 +238,14 @@ int main(int argc, char **argv) QItemModelBarDataMapping *mapping = new QItemModelBarDataMapping; mapping->setUseModelCategories(true); QItemModelBarDataProxy *proxy = new QItemModelBarDataProxy(tableWidget->model(), mapping); - chart->setActiveDataProxy(proxy); + graph->setActiveDataProxy(proxy); - ChartDataGenerator generator(chart, tableWidget); + GraphDataGenerator generator(graph, tableWidget); - QObject::connect(chart, &Q3DBars::selectedBarPosChanged, &generator, - &ChartDataGenerator::selectFromTable); + QObject::connect(graph, &Q3DBars::selectedBarPosChanged, &generator, + &GraphDataGenerator::selectFromTable); QObject::connect(tableWidget, &QTableWidget::currentCellChanged, &generator, - &ChartDataGenerator::selectedFromTable); + &GraphDataGenerator::selectedFromTable); widget.show(); generator.start(); diff --git a/examples/examples.pro b/examples/examples.pro index aa2512c2..a76b95a7 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,13 +1,12 @@ TEMPLATE = subdirs -SUBDIRS += qmlbarchart \ +SUBDIRS += qmlbars \ qmlscatter \ qmlsurface !android: { - SUBDIRS += barchart \ + SUBDIRS += bars \ rainfall \ widget \ - surfacechart \ - scatterchart + scatter } qtHaveModule(multimedia):!android: SUBDIRS += audiolevels diff --git a/examples/qmlbarchart/qmlbarchart.qrc b/examples/qmlbarchart/qmlbarchart.qrc deleted file mode 100644 index a2c7d75b..00000000 --- a/examples/qmlbarchart/qmlbarchart.qrc +++ /dev/null @@ -1,7 +0,0 @@ -<RCC> - <qresource prefix="/qml"> - <file alias="main.qml">qml/qmlbarchart/main.qml</file> - <file alias="Data.qml">qml/qmlbarchart/data.qml</file> - <file alias="Axes.qml">qml/qmlbarchart/axes.qml</file> - </qresource> -</RCC> diff --git a/examples/qmlbarchart/doc/src/qmlbarchart.qdoc b/examples/qmlbars/doc/src/qmlbars.qdoc index b7b84c0e..e382bb6b 100644 --- a/examples/qmlbarchart/doc/src/qmlbarchart.qdoc +++ b/examples/qmlbars/doc/src/qmlbars.qdoc @@ -17,13 +17,13 @@ ****************************************************************************/ /*! - \example qmlbarchart - \title Qt Quick 2 Barchart Example + \example qmlbars + \title Qt Quick 2 Bars Example - The Qt Quick 2 barchart example shows how to make a simple 3D bar chart using Q3DBars and Qt + The Qt Quick 2 bars example shows how to make a simple 3D bar graph using Q3DBars and Qt Quick 2. - \image qmlbarchart-example.png + \image qmlbars-example.png TODO */ diff --git a/examples/qmlbarchart/main.cpp b/examples/qmlbars/main.cpp index 1a3fcddc..1a3fcddc 100644 --- a/examples/qmlbarchart/main.cpp +++ b/examples/qmlbars/main.cpp diff --git a/examples/qmlbarchart/qml/qmlbarchart/axes.qml b/examples/qmlbars/qml/qmlbars/axes.qml index b0ba3eb2..b0ba3eb2 100644 --- a/examples/qmlbarchart/qml/qmlbarchart/axes.qml +++ b/examples/qmlbars/qml/qmlbars/axes.qml diff --git a/examples/qmlbarchart/qml/qmlbarchart/data.qml b/examples/qmlbars/qml/qmlbars/data.qml index fff568cc..fff568cc 100644 --- a/examples/qmlbarchart/qml/qmlbarchart/data.qml +++ b/examples/qmlbars/qml/qmlbars/data.qml diff --git a/examples/qmlbarchart/qml/qmlbarchart/main.qml b/examples/qmlbars/qml/qmlbars/main.qml index a8bca564..aec3188c 100644 --- a/examples/qmlbarchart/qml/qmlbarchart/main.qml +++ b/examples/qmlbars/qml/qmlbars/main.qml @@ -28,11 +28,11 @@ Item { visible: true Data { - id: chartData + id: graphData } Axes { - id: chartAxes + id: graphAxes } Item { @@ -42,7 +42,7 @@ Item { anchors.right: parent.right; Bars3D { - id: testChart + id: testGraph width: dataView.width height: dataView.height shadowQuality: Bars3D.ShadowQualityMedium @@ -50,26 +50,26 @@ Item { font.pointSize: 35 theme: Bars3D.ThemeRetro labelStyle: Bars3D.LabelStyleFromTheme - dataProxy: chartData.proxy + dataProxy: graphData.proxy barThickness: 0.5 barSpacing: Qt.size(0.5, 0.5) barSpacingRelative: false cameraPreset: Bars3D.CameraPresetRight - columnAxis: chartAxes.column - valueAxis: chartAxes.expenses + columnAxis: graphAxes.column + valueAxis: graphAxes.expenses itemLabelFormat: "@valueTitle for @colLabel, @rowLabel: @valueLabel" onSelectedBarPosChanged: { // Set tableView current row to selected bar - var rowRole = chartData.proxy.rowLabels[position.x]; - var colRole = chartData.proxy.columnLabels[position.y]; + var rowRole = graphData.proxy.rowLabels[position.x]; + var colRole = graphData.proxy.columnLabels[position.y]; var currentRow = tableView.currentRow - if (currentRow === -1 || rowRole !== chartData.model.get(currentRow).year - || colRole !== chartData.model.get(currentRow).month) { + if (currentRow === -1 || rowRole !== graphData.model.get(currentRow).year + || colRole !== graphData.model.get(currentRow).month) { var totalRows = tableView.rowCount; for (var i = 0; i < totalRows; i++) { - var currentRowRole = chartData.model.get(i).year - var currentColRole = chartData.model.get(i).month + var currentRowRole = graphData.model.get(i).year + var currentColRole = graphData.model.get(i).month if (currentRowRole === rowRole && currentColRole === colRole) { tableView.currentRow = i break @@ -87,14 +87,14 @@ Item { height: 60 text: "Show Income" onClicked: { - if (chartData.mapping.valueRole === "expenses") { - chartData.mapping.valueRole = "income" + if (graphData.mapping.valueRole === "expenses") { + graphData.mapping.valueRole = "income" text = "Show Expenses" - testChart.valueAxis = chartAxes.income + testGraph.valueAxis = graphAxes.income } else { - chartData.mapping.valueRole = "expenses" + graphData.mapping.valueRole = "expenses" text = "Show Income" - testChart.valueAxis = chartAxes.expenses + testGraph.valueAxis = graphAxes.expenses } } } @@ -106,11 +106,11 @@ Item { height: 60 text: "Hide Shadows" onClicked: { - if (testChart.shadowQuality == Bars3D.ShadowQualityNone) { - testChart.shadowQuality = Bars3D.ShadowQualityMedium; + if (testGraph.shadowQuality == Bars3D.ShadowQualityNone) { + testGraph.shadowQuality = Bars3D.ShadowQualityMedium; text = "Hide Shadows" } else { - testChart.shadowQuality = Bars3D.ShadowQualityNone; + testGraph.shadowQuality = Bars3D.ShadowQualityNone; text = "Show Shadows" } } @@ -123,15 +123,15 @@ Item { height: 60 text: "Show 2010 - 2012" onClicked: { - if (testChart.rowAxis.max !== 6) { + if (testGraph.rowAxis.max !== 6) { text = "Show 2010 - 2012" - chartData.mapping.autoRowCategories = true + graphData.mapping.autoRowCategories = true } else { text = "Show all years" // Explicitly defining row categories, since we do not want to show data for // all years in the model, just for the selected ones. - chartData.mapping.autoRowCategories = false - chartData.mapping.rowCategories = ["2010", "2011", "2012"] + graphData.mapping.autoRowCategories = false + graphData.mapping.rowCategories = ["2010", "2011", "2012"] } } } @@ -146,12 +146,12 @@ Item { TableViewColumn{ role: "month" ; title: "Month" ; width: 80 } TableViewColumn{ role: "expenses" ; title: "Expenses" ; width: 60 } TableViewColumn{ role: "income" ; title: "Income" ; width: 60 } - model: chartData.model + model: graphData.model onCurrentRowChanged: { - var rowIndex = chartData.proxy.activeMapping.rowCategoryIndex(chartData.model.get(currentRow).year) - var colIndex = chartData.proxy.activeMapping.columnCategoryIndex(chartData.model.get(currentRow).month) - testChart.selectedBarPos = Qt.point(rowIndex, colIndex) + var rowIndex = graphData.proxy.activeMapping.rowCategoryIndex(graphData.model.get(currentRow).year) + var colIndex = graphData.proxy.activeMapping.columnCategoryIndex(graphData.model.get(currentRow).month) + testGraph.selectedBarPos = Qt.point(rowIndex, colIndex) } } } diff --git a/examples/qmlbarchart/qmlbarchart.desktop b/examples/qmlbars/qmlbars.desktop index c01705df..cf59c6b8 100644 --- a/examples/qmlbarchart/qmlbarchart.desktop +++ b/examples/qmlbars/qmlbars.desktop @@ -3,9 +3,9 @@ Encoding=UTF-8 Version=1.0 Type=Application Terminal=false -Name=qmlbarchart -Exec=/opt/qmlbarchart/bin/qmlbarchart -Icon=qmlbarchart64 +Name=qmlbars +Exec=/opt/qmlbars/bin/qmlbars +Icon=qmlbars64 X-Window-Icon= X-HildonDesk-ShowInToolbar=true X-Osso-Type=application/x-executable diff --git a/examples/qmlbarchart/qmlbarchart.pro b/examples/qmlbars/qmlbars.pro index b74b8558..758e7b76 100644 --- a/examples/qmlbarchart/qmlbarchart.pro +++ b/examples/qmlbars/qmlbars.pro @@ -5,7 +5,7 @@ QT += widgets # Add more folders to ship with the application, here -folder_01.source = qml/qmlbarchart +folder_01.source = qml/qmlbars folder_01.target = qml DEPLOYMENTFOLDERS = folder_01 @@ -19,4 +19,7 @@ SOURCES += main.cpp include(qtquick2applicationviewer/qtquick2applicationviewer.pri) qtcAddDeployment() -RESOURCES += qmlbarchart.qrc +RESOURCES += qmlbars.qrc + +OTHER_FILES += doc/src/* \ + doc/images/* diff --git a/examples/qmlbars/qmlbars.qrc b/examples/qmlbars/qmlbars.qrc new file mode 100644 index 00000000..7c291fd3 --- /dev/null +++ b/examples/qmlbars/qmlbars.qrc @@ -0,0 +1,7 @@ +<RCC> + <qresource prefix="/qml"> + <file alias="Axes.qml">qml/qmlbars/axes.qml</file> + <file alias="Data.qml">qml/qmlbars/data.qml</file> + <file alias="main.qml">qml/qmlbars/main.qml</file> + </qresource> +</RCC> diff --git a/examples/qmlbarchart/qmlbarchart64.png b/examples/qmlbars/qmlbars64.png Binary files differindex 707d5c4e..707d5c4e 100644 --- a/examples/qmlbarchart/qmlbarchart64.png +++ b/examples/qmlbars/qmlbars64.png diff --git a/examples/qmlbarchart/qtquick2applicationviewer/qtquick2applicationviewer.cpp b/examples/qmlbars/qtquick2applicationviewer/qtquick2applicationviewer.cpp index 10709d7a..10709d7a 100644 --- a/examples/qmlbarchart/qtquick2applicationviewer/qtquick2applicationviewer.cpp +++ b/examples/qmlbars/qtquick2applicationviewer/qtquick2applicationviewer.cpp diff --git a/examples/qmlbarchart/qtquick2applicationviewer/qtquick2applicationviewer.h b/examples/qmlbars/qtquick2applicationviewer/qtquick2applicationviewer.h index cf66f140..cf66f140 100644 --- a/examples/qmlbarchart/qtquick2applicationviewer/qtquick2applicationviewer.h +++ b/examples/qmlbars/qtquick2applicationviewer/qtquick2applicationviewer.h diff --git a/examples/qmlbarchart/qtquick2applicationviewer/qtquick2applicationviewer.pri b/examples/qmlbars/qtquick2applicationviewer/qtquick2applicationviewer.pri index a071e63d..a071e63d 100644 --- a/examples/qmlbarchart/qtquick2applicationviewer/qtquick2applicationviewer.pri +++ b/examples/qmlbars/qtquick2applicationviewer/qtquick2applicationviewer.pri diff --git a/examples/qmlscatter/doc/src/qmlscatter.qdoc b/examples/qmlscatter/doc/src/qmlscatter.qdoc index a014874e..590b9a30 100644 --- a/examples/qmlscatter/doc/src/qmlscatter.qdoc +++ b/examples/qmlscatter/doc/src/qmlscatter.qdoc @@ -20,7 +20,7 @@ \example qmlscatter \title Qt Quick 2 Scatter Example - The Qt Quick 2 scatter example shows how to make a simple scatter chart visualization using + The Qt Quick 2 scatter example shows how to make a simple scatter graph visualization using Q3DScatter and Qt Quick 2. \image qmlscatter-example.png diff --git a/examples/qmlscatter/qml/qmlscatter/main.qml b/examples/qmlscatter/qml/qmlscatter/main.qml index 9a600867..333dfadd 100644 --- a/examples/qmlscatter/qml/qmlscatter/main.qml +++ b/examples/qmlscatter/qml/qmlscatter/main.qml @@ -25,7 +25,7 @@ Item { visible: true Data { - id: chartData + id: graphData } Item { @@ -40,7 +40,7 @@ Item { height: dataView.height font.family: "Lucida Handwriting" font.pointSize: 40 - dataProxy: chartData.proxy + dataProxy: graphData.proxy theme: Scatter3D.ThemeIsabelle shadowQuality: Scatter3D.ShadowQualitySoftLow selectionMode: Scatter3D.SelectionModeItem diff --git a/examples/qmlscatter/qmlscatter.pro b/examples/qmlscatter/qmlscatter.pro index b42fd239..0c66c5ae 100644 --- a/examples/qmlscatter/qmlscatter.pro +++ b/examples/qmlscatter/qmlscatter.pro @@ -20,3 +20,6 @@ include(qtquick2applicationviewer/qtquick2applicationviewer.pri) qtcAddDeployment() RESOURCES += qmlscatter.qrc + +OTHER_FILES += doc/src/* \ + doc/images/* diff --git a/examples/qmlsurface/qmlsurface.pro b/examples/qmlsurface/qmlsurface.pro index 251619cf..64c72cf7 100644 --- a/examples/qmlsurface/qmlsurface.pro +++ b/examples/qmlsurface/qmlsurface.pro @@ -20,3 +20,6 @@ include(qtquick2applicationviewer/qtquick2applicationviewer.pri) qtcAddDeployment() RESOURCES += qmlsurface.qrc + +OTHER_FILES += doc/src/* \ + doc/images/* diff --git a/examples/rainfall/doc/src/rainfall.qdoc b/examples/rainfall/doc/src/rainfall.qdoc index 95050dff..c28029a4 100644 --- a/examples/rainfall/doc/src/rainfall.qdoc +++ b/examples/rainfall/doc/src/rainfall.qdoc @@ -20,7 +20,7 @@ \example rainfall \title Rainfall Example - The barchart example shows how to make a simple 3D bar chart using Q3DBars. + The bars example shows how to make a simple 3D bar graph using Q3DBars. \image rainfall-example.png diff --git a/examples/rainfall/main.cpp b/examples/rainfall/main.cpp index 638fb842..54ea63e9 100644 --- a/examples/rainfall/main.cpp +++ b/examples/rainfall/main.cpp @@ -16,7 +16,7 @@ ** ****************************************************************************/ -#include "rainfallchart.h" +#include "rainfallgraph.h" #include <QGuiApplication> using namespace QtDataVisualization; @@ -30,8 +30,8 @@ int main(int argc, char **argv) rainfall->setPosition(QPoint(10, 30)); rainfall->show(); - RainfallChart rainfallchart(rainfall); - rainfallchart.start(); + RainfallGraph rainfallgraph(rainfall); + rainfallgraph.start(); return app.exec(); } diff --git a/examples/rainfall/rainfall.pro b/examples/rainfall/rainfall.pro index af7f963b..0a2e1498 100644 --- a/examples/rainfall/rainfall.pro +++ b/examples/rainfall/rainfall.pro @@ -3,13 +3,13 @@ } SOURCES += main.cpp \ - rainfallchart.cpp \ + rainfallgraph.cpp \ variantdataset.cpp \ variantbardataproxy.cpp \ variantbardatamapping.cpp \ HEADERS += \ - rainfallchart.h \ + rainfallgraph.h \ variantdataset.h \ variantbardataproxy.h \ variantbardatamapping.h @@ -19,5 +19,7 @@ INSTALLS += target RESOURCES += \ rainfall.qrc -OTHER_FILES += data/raindata.txt +OTHER_FILES += data/raindata.txt \ + doc/src/* \ + doc/images/* diff --git a/examples/rainfall/rainfallchart.cpp b/examples/rainfall/rainfallgraph.cpp index 45e252bc..5cd70710 100644 --- a/examples/rainfall/rainfallchart.cpp +++ b/examples/rainfall/rainfallgraph.cpp @@ -16,7 +16,7 @@ ** ****************************************************************************/ -#include "rainfallchart.h" +#include "rainfallgraph.h" #include <QtDataVisualization/q3dcategoryaxis.h> #include <QtDataVisualization/q3dvalueaxis.h> #include <QGuiApplication> @@ -27,8 +27,8 @@ using namespace QtDataVisualization; -RainfallChart::RainfallChart(Q3DBars *rainfall) - : m_chart(rainfall) +RainfallGraph::RainfallGraph(Q3DBars *rainfall) + : m_graph(rainfall) { // In data file the months are in numeric format, so create custom list for (int i = 1; i <= 12; i++) @@ -37,63 +37,63 @@ RainfallChart::RainfallChart(Q3DBars *rainfall) m_columnCount = m_numericMonths.size(); m_proxy = new VariantBarDataProxy; - m_chart->setActiveDataProxy(m_proxy); + m_graph->setActiveDataProxy(m_proxy); updateYearsList(2000, 2012); // Set up bar specifications; make the bars as wide as they are deep, // and add a small space between the bars - m_chart->setBarThickness(1.0); - m_chart->setBarSpacing(QSizeF(0.2, 0.2)); + m_graph->setBarThickness(1.0); + m_graph->setBarSpacing(QSizeF(0.2, 0.2)); // Set axis labels and titles QStringList months; 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("rainfall"); - m_chart->valueAxis()->setLabelFormat("%d mm"); - m_chart->rowAxis()->setCategoryLabels(m_years); - m_chart->columnAxis()->setCategoryLabels(months); + m_graph->rowAxis()->setTitle("Year"); + m_graph->columnAxis()->setTitle("Month"); + m_graph->valueAxis()->setTitle("rainfall"); + m_graph->valueAxis()->setLabelFormat("%d mm"); + m_graph->rowAxis()->setCategoryLabels(m_years); + m_graph->columnAxis()->setCategoryLabels(months); // Set bar type to cylinder - m_chart->setBarType(QDataVis::MeshStyleCylinders, false); + m_graph->setBarType(QDataVis::MeshStyleCylinders, false); // Set shadows to medium - m_chart->setShadowQuality(QDataVis::ShadowQualityMedium); + m_graph->setShadowQuality(QDataVis::ShadowQualityMedium); // Set font - m_chart->setFont(QFont("Century Gothic", 30)); + m_graph->setFont(QFont("Century Gothic", 30)); // Set selection mode to bar and column - m_chart->setSelectionMode(QDataVis::SelectionModeSliceColumn); + m_graph->setSelectionMode(QDataVis::SelectionModeSliceColumn); // Set theme - m_chart->setTheme(QDataVis::ThemeArmyBlue); + m_graph->setTheme(QDataVis::ThemeArmyBlue); // Set preset camera position - m_chart->setCameraPreset(QDataVis::CameraPresetIsometricRightHigh); + m_graph->setCameraPreset(QDataVis::CameraPresetIsometricRightHigh); // Disable grid - m_chart->setGridVisible(false); + m_graph->setGridVisible(false); // Set window title - m_chart->setTitle(QStringLiteral("Monthly rainfall in Northern Finland")); + m_graph->setTitle(QStringLiteral("Monthly rainfall in Northern Finland")); } -RainfallChart::~RainfallChart() +RainfallGraph::~RainfallGraph() { delete m_mapping; delete m_dataSet; - delete m_chart; + delete m_graph; } -void RainfallChart::start() +void RainfallGraph::start() { addDataSet(); } -void RainfallChart::updateYearsList(int start, int end) +void RainfallGraph::updateYearsList(int start, int end) { m_years.clear(); for (int i = start; i <= end; i++) @@ -102,7 +102,7 @@ void RainfallChart::updateYearsList(int start, int end) m_rowCount = m_years.size(); } -void RainfallChart::addDataSet() +void RainfallGraph::addDataSet() { m_dataSet = new VariantDataSet; VariantDataItemList *itemList = new VariantDataItemList; diff --git a/examples/rainfall/rainfallchart.h b/examples/rainfall/rainfallgraph.h index 2c596f5c..6317ab71 100644 --- a/examples/rainfall/rainfallchart.h +++ b/examples/rainfall/rainfallgraph.h @@ -16,20 +16,20 @@ ** ****************************************************************************/ -#ifndef RAINFALLCHART_H -#define RAINFALLCHART_H +#ifndef RAINFALLGRAPH_H +#define RAINFALLGRAPH_H #include "variantbardataproxy.h" #include <QtDataVisualization/q3dbars.h> using namespace QtDataVisualization; -class RainfallChart : public QObject +class RainfallGraph : public QObject { Q_OBJECT public: - explicit RainfallChart(Q3DBars *rainfall); - ~RainfallChart(); + explicit RainfallGraph(Q3DBars *rainfall); + ~RainfallGraph(); void addDataSet(); void start(); @@ -37,7 +37,7 @@ public: private: void updateYearsList(int start, int end); - Q3DBars *m_chart; + Q3DBars *m_graph; int m_columnCount; int m_rowCount; QStringList m_years; @@ -48,4 +48,4 @@ private: }; -#endif // RAINFALLCHART_H +#endif diff --git a/examples/scatterchart/doc/src/scatterchart.qdoc b/examples/scatter/doc/src/scatter.qdoc index d6878ff9..7f4bda38 100644 --- a/examples/scatterchart/doc/src/scatterchart.qdoc +++ b/examples/scatter/doc/src/scatter.qdoc @@ -17,13 +17,13 @@ ****************************************************************************/ /*! - \example scatterchart - \title Scatter Chart Example + \example scatter + \title Scatter Example - The scatterchart example shows how to make a simple 3D scatter chart using Q3DScatter and + The scatter example shows how to make a simple 3D scatter graph using Q3DScatter and combining the use of widgets for adjusting several adjustable qualities. - \image scatterchart-example.png + \image scatter-example.png TODO */ diff --git a/examples/scatterchart/main.cpp b/examples/scatter/main.cpp index 9d66a9b9..961ed3db 100644 --- a/examples/scatterchart/main.cpp +++ b/examples/scatter/main.cpp @@ -16,7 +16,7 @@ ** ****************************************************************************/ -#include "scatterchart.h" +#include "scatterdatamodifier.h" #include <QApplication> #include <QWidget> @@ -38,10 +38,10 @@ int main(int argc, char **argv) QHBoxLayout *hLayout = new QHBoxLayout(widget); QVBoxLayout *vLayout = new QVBoxLayout(); - Q3DScatter *chart = new Q3DScatter(); - QSize screenSize = chart->screen()->size(); + Q3DScatter *graph = new Q3DScatter(); + QSize screenSize = graph->screen()->size(); - QWidget *container = QWidget::createWindowContainer(chart); + QWidget *container = QWidget::createWindowContainer(graph); container->setMinimumSize(QSize(screenSize.width() / 2, screenSize.height() / 1.5)); container->setMaximumSize(screenSize); container->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); @@ -115,7 +115,7 @@ int main(int argc, char **argv) widget->show(); - ScatterDataModifier *modifier = new ScatterDataModifier(chart); + ScatterDataModifier *modifier = new ScatterDataModifier(graph); QObject::connect(cameraButton, &QPushButton::clicked, modifier, &ScatterDataModifier::changePresetCamera); @@ -140,7 +140,7 @@ int main(int argc, char **argv) QObject::connect(modifier, &ScatterDataModifier::shadowQualityChanged, shadowQuality, &QComboBox::setCurrentIndex); - QObject::connect(chart, &Q3DScatter::shadowQualityChanged, modifier, + QObject::connect(graph, &Q3DScatter::shadowQualityChanged, modifier, &ScatterDataModifier::shadowQualityUpdatedByVisual); QObject::connect(fontList, &QFontComboBox::currentFontChanged, modifier, diff --git a/examples/scatter/scatter.pro b/examples/scatter/scatter.pro new file mode 100644 index 00000000..beff2164 --- /dev/null +++ b/examples/scatter/scatter.pro @@ -0,0 +1,13 @@ +!include( ../examples.pri ) { + error( "Couldn't find the examples.pri file!" ) +} + +SOURCES += main.cpp scatterdatamodifier.cpp +HEADERS += scatterdatamodifier.h + +QT += widgets + +INSTALLS += target + +OTHER_FILES += doc/src/* \ + doc/images/* diff --git a/examples/scatterchart/scatterchart.cpp b/examples/scatter/scatterdatamodifier.cpp index 879d8471..cf3296bb 100644 --- a/examples/scatterchart/scatterchart.cpp +++ b/examples/scatter/scatterdatamodifier.cpp @@ -16,7 +16,7 @@ ** ****************************************************************************/ -#include "scatterchart.h" +#include "scatterdatamodifier.h" #include <QtDataVisualization/qscatterdataproxy.h> #include <QtDataVisualization/q3dvalueaxis.h> #include <qmath.h> @@ -27,30 +27,32 @@ using namespace QtDataVisualization; const int numberOfItems = 10000; ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter) - : m_chart(scatter), + : m_graph(scatter), m_fontSize(40.0f), m_style(QDataVis::MeshStyleSpheres), m_smooth(true) { - QFont font = m_chart->font(); + QFont font = m_graph->font(); font.setPointSize(m_fontSize); - m_chart->setFont(font); - m_chart->setObjectType(QDataVis::MeshStyleSpheres, true); - m_chart->setTheme(QDataVis::ThemeEbony); - m_chart->setShadowQuality(QDataVis::ShadowQualityHigh); - m_chart->setCameraPreset(QDataVis::CameraPresetFront); - m_chart->setAxisX(new Q3DValueAxis); - m_chart->setAxisY(new Q3DValueAxis); - m_chart->setAxisZ(new Q3DValueAxis); + m_graph->setFont(font); + m_graph->setObjectType(QDataVis::MeshStyleSpheres, true); + m_graph->setTheme(QDataVis::ThemeEbony); + m_graph->setShadowQuality(QDataVis::ShadowQualityHigh); + m_graph->setCameraPreset(QDataVis::CameraPresetFront); + m_graph->setAxisX(new Q3DValueAxis); + m_graph->setAxisY(new Q3DValueAxis); + m_graph->setAxisZ(new Q3DValueAxis); QScatterDataProxy *proxy = new QScatterDataProxy; proxy->setItemLabelFormat("@xTitle: @xLabel @yTitle: @yLabel @zTitle: @zLabel"); - m_chart->setActiveDataProxy(proxy); + m_graph->setActiveDataProxy(proxy); + + changeLabelStyle(); } ScatterDataModifier::~ScatterDataModifier() { - delete m_chart; + delete m_graph; } void ScatterDataModifier::start() @@ -61,12 +63,12 @@ void ScatterDataModifier::start() void ScatterDataModifier::addData() { // Add labels - m_chart->axisX()->setTitle("X"); - m_chart->axisY()->setTitle("Y"); - m_chart->axisZ()->setTitle("Z"); - m_chart->axisX()->setRange(-50.0, 50.0); - m_chart->axisY()->setRange(-1.0, 1.0); - m_chart->axisZ()->setRange(-50.0, 50.0); + m_graph->axisX()->setTitle("X"); + m_graph->axisY()->setTitle("Y"); + m_graph->axisZ()->setTitle("Z"); + m_graph->axisX()->setRange(-50.0, 50.0); + m_graph->axisY()->setRange(-1.0, 1.0); + m_graph->axisZ()->setRange(-50.0, 50.0); QScatterDataArray *dataArray = new QScatterDataArray; dataArray->resize(numberOfItems); @@ -87,31 +89,31 @@ void ScatterDataModifier::addData() } #endif - static_cast<QScatterDataProxy *>(m_chart->activeDataProxy())->resetArray(dataArray); + static_cast<QScatterDataProxy *>(m_graph->activeDataProxy())->resetArray(dataArray); } void ScatterDataModifier::changeStyle(int style) { m_style = QDataVis::MeshStyle(style + 5); // skip unsupported mesh types - m_chart->setObjectType(m_style, m_smooth); + m_graph->setObjectType(m_style, m_smooth); } void ScatterDataModifier::setSmoothDots(int smooth) { m_smooth = bool(smooth); - m_chart->setObjectType(m_style, m_smooth); + m_graph->setObjectType(m_style, m_smooth); } void ScatterDataModifier::changeTheme(int theme) { - m_chart->setTheme((QDataVis::Theme)theme); + m_graph->setTheme((QDataVis::Theme)theme); } void ScatterDataModifier::changePresetCamera() { static int preset = QDataVis::CameraPresetFrontLow; - m_chart->setCameraPreset((QDataVis::CameraPreset)preset); + m_graph->setCameraPreset((QDataVis::CameraPreset)preset); if (++preset > QDataVis::CameraPresetDirectlyAboveCCW45) preset = QDataVis::CameraPresetFrontLow; @@ -119,9 +121,9 @@ void ScatterDataModifier::changePresetCamera() void ScatterDataModifier::changeLabelStyle() { - static int style = QDataVis::LabelStyleOpaque; + static int style = QDataVis::LabelStyleFromTheme; - m_chart->setLabelStyle((QDataVis::LabelStyle)style); + m_graph->setLabelStyle((QDataVis::LabelStyle)style); if (++style > QDataVis::LabelStyleTransparent) style = QDataVis::LabelStyleOpaque; @@ -131,7 +133,7 @@ void ScatterDataModifier::changeFont(const QFont &font) { QFont newFont = font; newFont.setPointSizeF(m_fontSize); - m_chart->setFont(newFont); + m_graph->setFont(newFont); } void ScatterDataModifier::shadowQualityUpdatedByVisual(QDataVis::ShadowQuality sq) @@ -144,18 +146,18 @@ void ScatterDataModifier::shadowQualityUpdatedByVisual(QDataVis::ShadowQuality s void ScatterDataModifier::changeShadowQuality(int quality) { QDataVis::ShadowQuality sq = QDataVis::ShadowQuality(quality); - m_chart->setShadowQuality(sq); + m_graph->setShadowQuality(sq); emit shadowQualityChanged(quality); } void ScatterDataModifier::setBackgroundEnabled(int enabled) { - m_chart->setBackgroundVisible((bool)enabled); + m_graph->setBackgroundVisible((bool)enabled); } void ScatterDataModifier::setGridEnabled(int enabled) { - m_chart->setGridVisible((bool)enabled); + m_graph->setGridVisible((bool)enabled); } QVector3D ScatterDataModifier::randVector() diff --git a/examples/scatterchart/scatterchart.h b/examples/scatter/scatterdatamodifier.h index f67a0e88..5cc9348b 100644 --- a/examples/scatterchart/scatterchart.h +++ b/examples/scatter/scatterdatamodifier.h @@ -53,7 +53,7 @@ signals: private: QVector3D randVector(); - Q3DScatter *m_chart; + Q3DScatter *m_graph; int m_fontSize; QDataVis::MeshStyle m_style; bool m_smooth; diff --git a/examples/scatterchart/scatterchart.pro b/examples/scatterchart/scatterchart.pro deleted file mode 100644 index 5dee59fd..00000000 --- a/examples/scatterchart/scatterchart.pro +++ /dev/null @@ -1,10 +0,0 @@ -!include( ../examples.pri ) { - error( "Couldn't find the examples.pri file!" ) -} - -SOURCES += main.cpp scatterchart.cpp -HEADERS += scatterchart.h - -QT += widgets - -INSTALLS += target diff --git a/examples/surfacechart/surfacechart.pro b/examples/surfacechart/surfacechart.pro deleted file mode 100644 index 2ebc90da..00000000 --- a/examples/surfacechart/surfacechart.pro +++ /dev/null @@ -1,16 +0,0 @@ -!include( ../examples.pri ) { - error( "Couldn't find the examples.pri file!" ) -} - -SOURCES += main.cpp \ - chartmodifier.cpp - -QT += widgets - -INSTALLS += target - -HEADERS += \ - chartmodifier.h - -RESOURCES += \ - surface.qrc diff --git a/examples/widget/doc/src/widget.qdoc b/examples/widget/doc/src/widget.qdoc index d76df2b5..e0c0f14b 100644 --- a/examples/widget/doc/src/widget.qdoc +++ b/examples/widget/doc/src/widget.qdoc @@ -20,7 +20,7 @@ \example widget \title Widget Example - The widget example shows how to make a 3D bar chart using Q3DBars and combining the use of + The widget example shows how to make a 3D bar graph using Q3DBars and combining the use of widgets for adjusting several adjustable qualities. \image widget-example.png diff --git a/examples/widget/chart.cpp b/examples/widget/graphmodifier.cpp index 50f2535a..7da3000b 100644 --- a/examples/widget/chart.cpp +++ b/examples/widget/graphmodifier.cpp @@ -16,7 +16,7 @@ ** ****************************************************************************/ -#include "chart.h" +#include "graphmodifier.h" #include <QtDataVisualization/q3dcategoryaxis.h> #include <QtDataVisualization/q3dvalueaxis.h> #include <QtDataVisualization/qbardataproxy.h> @@ -26,14 +26,14 @@ QT_DATAVISUALIZATION_USE_NAMESPACE const QString celsiusString = QString(QChar(0xB0)) + "C"; -ChartModifier::ChartModifier(Q3DBars *barchart) - : m_chart(barchart), +GraphModifier::GraphModifier(Q3DBars *bargraph) + : m_graph(bargraph), m_xRotation(0.0), m_yRotation(0.0), m_fontSize(20), m_segments(4), m_subSegments(3), - m_minval(-20.0), // TODO Barchart Y-axis currently only properly supports zero-centered ranges + m_minval(-20.0), // TODO Bargraph Y-axis currently only properly supports zero-centered ranges m_maxval(20.0), m_temperatureAxis(new Q3DValueAxis), m_yearAxis(new Q3DCategoryAxis), @@ -45,7 +45,7 @@ ChartModifier::ChartModifier(Q3DBars *barchart) m_months << "January" << "February" << "March" << "April" << "May" << "June" << "July" << "August" << "September" << "October" << "November" << "December"; m_years << "2006" << "2007" << "2008" << "2009" << "2010" << "2011" << "2012"; - m_chart->setBackgroundVisible(false); + m_graph->setBackgroundVisible(false); m_temperatureAxis->setTitle("Average temperature"); m_temperatureAxis->setSegmentCount(m_segments); @@ -57,40 +57,41 @@ ChartModifier::ChartModifier(Q3DBars *barchart) m_monthAxis->setTitle("Month"); - m_chart->addAxis(m_temperatureAxis); - m_chart->addAxis(m_yearAxis); - m_chart->addAxis(m_monthAxis); + m_graph->addAxis(m_temperatureAxis); + m_graph->addAxis(m_yearAxis); + m_graph->addAxis(m_monthAxis); - m_chart->setShadowQuality(QDataVis::ShadowQualitySoftMedium); + m_graph->setShadowQuality(QDataVis::ShadowQualitySoftMedium); m_temperatureData->setItemLabelFormat(QStringLiteral("@valueTitle for @colLabel @rowLabel: @valueLabel")); - m_chart->addDataProxy(m_temperatureData); + m_graph->addDataProxy(m_temperatureData); - m_chart->setFont(QFont("Times Roman", 20)); + m_graph->setFont(QFont("Times Roman", 20)); - m_chart->setSelectionMode(QDataVis::SelectionModeItem); + m_graph->setSelectionMode(QDataVis::SelectionModeItem); resetTemperatureData(); + changeLabelStyle(); } -ChartModifier::~ChartModifier() +GraphModifier::~GraphModifier() { - delete m_chart; + delete m_graph; } -void ChartModifier::start() +void GraphModifier::start() { - m_chart->setActiveDataProxy(m_temperatureData); + m_graph->setActiveDataProxy(m_temperatureData); - m_chart->setTitle(QStringLiteral("Average temperatures in Oulu, Finland (2006-2012)")); + m_graph->setTitle(QStringLiteral("Average temperatures in Oulu, Finland (2006-2012)")); - m_chart->setValueAxis(m_temperatureAxis); - m_chart->setRowAxis(m_yearAxis); - m_chart->setColumnAxis(m_monthAxis); + m_graph->setValueAxis(m_temperatureAxis); + m_graph->setRowAxis(m_yearAxis); + m_graph->setColumnAxis(m_monthAxis); } -void ChartModifier::resetTemperatureData() +void GraphModifier::resetTemperatureData() { // Set up data static const qreal temp[7][12] = { @@ -119,99 +120,99 @@ void ChartModifier::resetTemperatureData() dataSet->append(dataRow); } - // Add data to chart (chart assumes ownership) + // Add data to the graph (the graph assumes ownership) m_temperatureData->resetArray(dataSet, m_years, m_months); } -void ChartModifier::changeStyle(int style) +void GraphModifier::changeStyle(int style) { m_style = QDataVis::MeshStyle(style); - m_chart->setBarType(m_style, m_smooth); + m_graph->setBarType(m_style, m_smooth); } -void ChartModifier::changePresetCamera() +void GraphModifier::changePresetCamera() { static int preset = QDataVis::CameraPresetFrontLow; - m_chart->setCameraPreset((QDataVis::CameraPreset)preset); + m_graph->setCameraPreset((QDataVis::CameraPreset)preset); if (++preset > QDataVis::CameraPresetDirectlyBelow) preset = QDataVis::CameraPresetFrontLow; } -void ChartModifier::changeTheme(int theme) +void GraphModifier::changeTheme(int theme) { - m_chart->setTheme((QDataVis::Theme)theme); + m_graph->setTheme((QDataVis::Theme)theme); } -void ChartModifier::changeLabelStyle() +void GraphModifier::changeLabelStyle() { - static int style = QDataVis::LabelStyleOpaque; + static int style = QDataVis::LabelStyleFromTheme; - m_chart->setLabelStyle((QDataVis::LabelStyle)style); + m_graph->setLabelStyle((QDataVis::LabelStyle)style); if (++style > QDataVis::LabelStyleTransparent) style = QDataVis::LabelStyleOpaque; } -void ChartModifier::changeSelectionMode(int selectionMode) +void GraphModifier::changeSelectionMode(int selectionMode) { - m_chart->setSelectionMode((QDataVis::SelectionMode)selectionMode); + m_graph->setSelectionMode((QDataVis::SelectionMode)selectionMode); } -void ChartModifier::changeFont(const QFont &font) +void GraphModifier::changeFont(const QFont &font) { QFont newFont = font; newFont.setPointSize(m_fontSize); - m_chart->setFont(newFont); + m_graph->setFont(newFont); } -void ChartModifier::changeFontSize(int fontsize) +void GraphModifier::changeFontSize(int fontsize) { m_fontSize = fontsize; - QFont font = m_chart->font(); + QFont font = m_graph->font(); font.setPointSize(m_fontSize); - m_chart->setFont(font); + m_graph->setFont(font); } -void ChartModifier::shadowQualityUpdatedByVisual(QDataVis::ShadowQuality sq) +void GraphModifier::shadowQualityUpdatedByVisual(QDataVis::ShadowQuality sq) { int quality = int(sq); // Updates the UI component to show correct shadow quality emit shadowQualityChanged(quality); } -void ChartModifier::changeShadowQuality(int quality) +void GraphModifier::changeShadowQuality(int quality) { QDataVis::ShadowQuality sq = QDataVis::ShadowQuality(quality); - m_chart->setShadowQuality(sq); + m_graph->setShadowQuality(sq); emit shadowQualityChanged(quality); } -void ChartModifier::rotateX(int rotation) +void GraphModifier::rotateX(int rotation) { m_xRotation = rotation; - m_chart->setCameraPosition(m_xRotation, m_yRotation); + m_graph->setCameraPosition(m_xRotation, m_yRotation); } -void ChartModifier::rotateY(int rotation) +void GraphModifier::rotateY(int rotation) { m_yRotation = rotation; - m_chart->setCameraPosition(m_xRotation, m_yRotation); + m_graph->setCameraPosition(m_xRotation, m_yRotation); } -void ChartModifier::setBackgroundEnabled(int enabled) +void GraphModifier::setBackgroundEnabled(int enabled) { - m_chart->setBackgroundVisible((bool)enabled); + m_graph->setBackgroundVisible((bool)enabled); } -void ChartModifier::setGridEnabled(int enabled) +void GraphModifier::setGridEnabled(int enabled) { - m_chart->setGridVisible((bool)enabled); + m_graph->setGridVisible((bool)enabled); } -void ChartModifier::setSmoothBars(int smooth) +void GraphModifier::setSmoothBars(int smooth) { m_smooth = bool(smooth); - m_chart->setBarType(m_style, m_smooth); + m_graph->setBarType(m_style, m_smooth); } diff --git a/examples/widget/chart.h b/examples/widget/graphmodifier.h index 51a8d5e0..2e18ffd2 100644 --- a/examples/widget/chart.h +++ b/examples/widget/graphmodifier.h @@ -16,8 +16,8 @@ ** ****************************************************************************/ -#ifndef CHARTMODIFIER_H -#define CHARTMODIFIER_H +#ifndef GRAPHMODIFIER_H +#define GRAPHMODIFIER_H #include <QtDataVisualization/q3dbars.h> @@ -28,12 +28,12 @@ using namespace QtDataVisualization; -class ChartModifier : public QObject +class GraphModifier : public QObject { Q_OBJECT public: - explicit ChartModifier(Q3DBars *barchart); - ~ChartModifier(); + explicit GraphModifier(Q3DBars *bargraph); + ~GraphModifier(); void resetTemperatureData(); void changePresetCamera(); @@ -58,7 +58,7 @@ signals: void shadowQualityChanged(int quality); private: - Q3DBars *m_chart; + Q3DBars *m_graph; qreal m_xRotation; qreal m_yRotation; int m_fontSize; diff --git a/examples/widget/main.cpp b/examples/widget/main.cpp index 1a1645e5..c1bee4e5 100644 --- a/examples/widget/main.cpp +++ b/examples/widget/main.cpp @@ -16,7 +16,7 @@ ** ****************************************************************************/ -#include "chart.h" +#include "graphmodifier.h" #include <QApplication> #include <QWidget> @@ -38,10 +38,10 @@ int main(int argc, char **argv) QHBoxLayout *hLayout = new QHBoxLayout(widget); QVBoxLayout *vLayout = new QVBoxLayout(); - Q3DBars *widgetchart = new Q3DBars(); - QSize screenSize = widgetchart->screen()->size(); + Q3DBars *widgetgraph = new Q3DBars(); + QSize screenSize = widgetgraph->screen()->size(); - QWidget *container = QWidget::createWindowContainer(widgetchart); + QWidget *container = QWidget::createWindowContainer(widgetgraph); container->setMinimumSize(QSize(screenSize.width() / 2, screenSize.height() / 1.5)); container->setMaximumSize(screenSize); container->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); @@ -153,22 +153,22 @@ int main(int argc, char **argv) widget->show(); - ChartModifier *modifier = new ChartModifier(widgetchart); + GraphModifier *modifier = new GraphModifier(widgetgraph); - QObject::connect(rotationSliderX, &QSlider::valueChanged, modifier, &ChartModifier::rotateX); - QObject::connect(rotationSliderY, &QSlider::valueChanged, modifier, &ChartModifier::rotateY); + QObject::connect(rotationSliderX, &QSlider::valueChanged, modifier, &GraphModifier::rotateX); + QObject::connect(rotationSliderY, &QSlider::valueChanged, modifier, &GraphModifier::rotateY); QObject::connect(labelButton, &QPushButton::clicked, modifier, - &ChartModifier::changeLabelStyle); + &GraphModifier::changeLabelStyle); QObject::connect(cameraButton, &QPushButton::clicked, modifier, - &ChartModifier::changePresetCamera); + &GraphModifier::changePresetCamera); QObject::connect(backgroundCheckBox, &QCheckBox::stateChanged, modifier, - &ChartModifier::setBackgroundEnabled); + &GraphModifier::setBackgroundEnabled); QObject::connect(gridCheckBox, &QCheckBox::stateChanged, modifier, - &ChartModifier::setGridEnabled); + &GraphModifier::setGridEnabled); QObject::connect(smoothCheckBox, &QCheckBox::stateChanged, modifier, - &ChartModifier::setSmoothBars); + &GraphModifier::setSmoothBars); QObject::connect(barStyleList, SIGNAL(currentIndexChanged(int)), modifier, SLOT(changeStyle(int))); @@ -182,15 +182,15 @@ int main(int argc, char **argv) QObject::connect(shadowQuality, SIGNAL(currentIndexChanged(int)), modifier, SLOT(changeShadowQuality(int))); - QObject::connect(modifier, &ChartModifier::shadowQualityChanged, shadowQuality, + QObject::connect(modifier, &GraphModifier::shadowQualityChanged, shadowQuality, &QComboBox::setCurrentIndex); - QObject::connect(widgetchart, &Q3DBars::shadowQualityChanged, modifier, - &ChartModifier::shadowQualityUpdatedByVisual); + QObject::connect(widgetgraph, &Q3DBars::shadowQualityChanged, modifier, + &GraphModifier::shadowQualityUpdatedByVisual); QObject::connect(fontSizeSlider, &QSlider::valueChanged, modifier, - &ChartModifier::changeFontSize); + &GraphModifier::changeFontSize); QObject::connect(fontList, &QFontComboBox::currentFontChanged, modifier, - &ChartModifier::changeFont); + &GraphModifier::changeFont); modifier->start(); diff --git a/examples/widget/widget.pro b/examples/widget/widget.pro index 2b4078a4..c9feb187 100644 --- a/examples/widget/widget.pro +++ b/examples/widget/widget.pro @@ -2,9 +2,13 @@ error( "Couldn't find the examples.pri file!" ) } -SOURCES += main.cpp chart.cpp -HEADERS += chart.h +SOURCES += main.cpp graphmodifier.cpp +HEADERS += graphmodifier.h QT += widgets INSTALLS += target + +OTHER_FILES += doc/src/* \ + doc/images/* + diff --git a/src/datavisualization/data/qitemmodelbardatamapping.cpp b/src/datavisualization/data/qitemmodelbardatamapping.cpp index 83d6c784..54cb0708 100644 --- a/src/datavisualization/data/qitemmodelbardatamapping.cpp +++ b/src/datavisualization/data/qitemmodelbardatamapping.cpp @@ -46,7 +46,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * For example, assume that you have a custom QAbstractItemModel for storing various monthly values * related to a business. * Each item in the model has roles "year", "month", "income", and "expenses". - * You could do the following to display the data in a bar chart: + * You could do the following to display the data in a bar graph: * * \snippet doc_src_qtdatavisualization.cpp 3 * diff --git a/src/datavisualization/data/qitemmodelscatterdatamapping.cpp b/src/datavisualization/data/qitemmodelscatterdatamapping.cpp index 7ffd44f9..f9ef6d04 100644 --- a/src/datavisualization/data/qitemmodelscatterdatamapping.cpp +++ b/src/datavisualization/data/qitemmodelscatterdatamapping.cpp @@ -35,7 +35,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * * For example, assume that you have a custom QAbstractItemModel for storing various measurements * done on material samples, providing data for roles such as "density", "hardness" and - * "conductivity". You could visualize these properties on a scatter chart: + * "conductivity". You could visualize these properties on a scatter graph: * * \snippet doc_src_qtdatavisualization.cpp 4 * diff --git a/src/datavisualization/doc/src/qtdatavisualization-index.qdoc b/src/datavisualization/doc/src/qtdatavisualization-index.qdoc index 2a09dc68..7ec90eaa 100644 --- a/src/datavisualization/doc/src/qtdatavisualization-index.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization-index.qdoc @@ -75,12 +75,13 @@ Qt Data Visualization comes with the following examples: \list - \li \l{Barchart Example} - \li \l{Qt Quick 2 Barchart Example} + \li \l{Bars Example} + \li \l{Qt Quick 2 Bars Example} \li \l{Qt Quick 2 Scatter Example} \li \l{Qt Quick 2 Surface Example} \li \l{Rainfall Example} - \li \l{Scatter Chart Example} + \li \l{Scatter Example} + \li \l{Surface Example} \li \l{Audiolevels Example} \li \l{Widget Example} \endlist diff --git a/src/datavisualization/doc/src/qtdatavisualization-qml-bars3d.qdoc b/src/datavisualization/doc/src/qtdatavisualization-qml-bars3d.qdoc index f778cc92..213542b9 100644 --- a/src/datavisualization/doc/src/qtdatavisualization-qml-bars3d.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization-qml-bars3d.qdoc @@ -34,7 +34,7 @@ * * \snippet doc_src_qmldatavisualization.cpp 1 * - * See \l{Qt Quick 2 Barchart Example} for more thorough usage example. + * See \l{Qt Quick 2 Bars Example} for more thorough usage example. * * \sa ItemModelBarDataProxy, Scatter3D, Surface3D, {Qt Data Visualization C++ Classes} */ diff --git a/src/datavisualization/engine/abstract3dcontroller.cpp b/src/datavisualization/engine/abstract3dcontroller.cpp index 13bc8801..3631bad1 100644 --- a/src/datavisualization/engine/abstract3dcontroller.cpp +++ b/src/datavisualization/engine/abstract3dcontroller.cpp @@ -1015,7 +1015,7 @@ Q3DAbstractAxis *Abstract3DController::createDefaultAxis(Q3DAbstractAxis::AxisOr { Q_UNUSED(orientation) - // The default default axis is a value axis. If the chart type has a different default axis + // The default default axis is a value axis. If the graph type has a different default axis // for some orientation, this function needs to be overridden. Q3DAbstractAxis *defaultAxis = createDefaultValueAxis(); return defaultAxis; diff --git a/src/datavisualization/engine/bars3dcontroller.cpp b/src/datavisualization/engine/bars3dcontroller.cpp index 26014c12..abd09b55 100644 --- a/src/datavisualization/engine/bars3dcontroller.cpp +++ b/src/datavisualization/engine/bars3dcontroller.cpp @@ -43,7 +43,7 @@ Bars3DController::Bars3DController(QRect boundRect) setActiveDataProxy(0); - // Setting a null axis creates a new default axis according to orientation and chart type. + // Setting a null axis creates a new default axis according to orientation and graph type. // Note: These cannot be set in Abstract3DController constructor, as they will call virtual // functions implemented by subclasses. setAxisX(0); @@ -399,7 +399,7 @@ void Bars3DController::adjustAxisRanges() categoryAxisZ->min(), categoryAxisZ->max()); if (limits.first < 0) { - // TODO: Currently we only support symmetric y-axis for bar chart if there are negative values + // TODO: Currently we only support symmetric y-axis for bar graph if there are negative values qreal maxAbs = qMax(qFabs(limits.first), qFabs(limits.second)); // Call private implementation to avoid unsetting auto adjust flag valueAxis->dptr()->setRange(-maxAbs, maxAbs); diff --git a/src/datavisualization/engine/bars3drenderer.cpp b/src/datavisualization/engine/bars3drenderer.cpp index 2649fe85..360b346c 100644 --- a/src/datavisualization/engine/bars3drenderer.cpp +++ b/src/datavisualization/engine/bars3drenderer.cpp @@ -1526,9 +1526,11 @@ void Bars3DRenderer::updateAxisRange(Q3DAbstractAxis::AxisOrientation orientatio emit needRender(); } - // TODO Currently barchart only supports zero centered or zero minimum ranges - if (min > 0.0 || (min != 0.0 && (qFabs(min) != qFabs(max)))) - qWarning() << __FUNCTION__ << "Bar chart currently properly supports only zero-centered and zero minimum ranges for Y-axis."; + // TODO Currently bargraph only supports zero centered or zero minimum ranges + if (min > 0.0 || (min != 0.0 && (qFabs(min) != qFabs(max)))) { + qWarning() << __FUNCTION__ << "Bar graph currently properly supports only " + "zero-centered and zero minimum ranges for Y-axis."; + } } } diff --git a/src/datavisualization/engine/q3dbars.cpp b/src/datavisualization/engine/q3dbars.cpp index b1b74b93..660b046b 100644 --- a/src/datavisualization/engine/q3dbars.cpp +++ b/src/datavisualization/engine/q3dbars.cpp @@ -52,7 +52,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * Methods are provided for changing bar types, themes, bar selection modes and so on. See the * methods for more detailed descriptions. * - * \section1 How to construct a minimal Q3DBars chart + * \section1 How to construct a minimal Q3DBars graph * * After constructing Q3DBars, you can set the data window by changing the range on the row and * column axes. It is not mandatory, as data window will default to showing all of the data in @@ -73,7 +73,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * * \snippet doc_src_q3dbars_construction.cpp 2 * - * The complete code needed to create and display this chart is: + * The complete code needed to create and display this graph is: * * \snippet doc_src_q3dbars_construction.cpp 3 * diff --git a/src/datavisualization/engine/q3dscatter.cpp b/src/datavisualization/engine/q3dscatter.cpp index 78b60968..55e353bf 100644 --- a/src/datavisualization/engine/q3dscatter.cpp +++ b/src/datavisualization/engine/q3dscatter.cpp @@ -51,7 +51,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * Methods are provided for changing item styles, themes, item selection modes and so on. See the * methods for more detailed descriptions. * - * \section1 How to construct a minimal Q3DScatter chart + * \section1 How to construct a minimal Q3DScatter graph * * First, construct Q3DScatter: * @@ -65,7 +65,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * * \snippet doc_src_q3dscatter_construction.cpp 2 * - * The complete code needed to create and display this chart is: + * The complete code needed to create and display this graph is: * * \snippet doc_src_q3dscatter_construction.cpp 3 * @@ -75,7 +75,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * * The scene can be rotated and zoomed into, but no other interaction is included in this minimal * code example. You can learn more by familiarizing yourself with the examples provided, like - * the \l{Scatter Chart Example}. + * the \l{Scatter Example}. * * \sa Q3DBars, Q3DSurface, {Qt Data Visualization C++ Classes} */ diff --git a/src/datavisualization/engine/q3dsurface.cpp b/src/datavisualization/engine/q3dsurface.cpp index ff1e3113..8e32d5d7 100644 --- a/src/datavisualization/engine/q3dsurface.cpp +++ b/src/datavisualization/engine/q3dsurface.cpp @@ -55,7 +55,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * proxy. If any other proxy is set as active data proxy later, the default proxy and all data * added to it is destroyed. * - * \section1 How to construct a minimal Q3DSurface chart + * \section1 How to construct a minimal Q3DSurface graph * * First, construct Q3DSurface: * @@ -77,7 +77,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * * \snippet doc_src_q3dsurface_construction.cpp 4 * - * The complete code needed to create and display this chart is: + * The complete code needed to create and display this graph is: * * \snippet doc_src_q3dsurface_construction.cpp 5 * diff --git a/src/datavisualization/engine/scatter3dcontroller.cpp b/src/datavisualization/engine/scatter3dcontroller.cpp index e3b649db..e27c8b2b 100644 --- a/src/datavisualization/engine/scatter3dcontroller.cpp +++ b/src/datavisualization/engine/scatter3dcontroller.cpp @@ -39,7 +39,7 @@ Scatter3DController::Scatter3DController(QRect boundRect) setActiveDataProxy(new QScatterDataProxy); - // Setting a null axis creates a new default axis according to orientation and chart type. + // Setting a null axis creates a new default axis according to orientation and graph type. // Note: These cannot be set in Abstract3DController constructor, as they will call virtual // functions implemented by subclasses. setAxisX(0); diff --git a/src/datavisualization/engine/surface3dcontroller.cpp b/src/datavisualization/engine/surface3dcontroller.cpp index a68f919e..514c5d07 100644 --- a/src/datavisualization/engine/surface3dcontroller.cpp +++ b/src/datavisualization/engine/surface3dcontroller.cpp @@ -39,7 +39,7 @@ Surface3DController::Surface3DController(QRect rect) { setActiveDataProxy(0); - // Setting a null axis creates a new default axis according to orientation and chart type. + // Setting a null axis creates a new default axis according to orientation and graph type. // Note: These cannot be set in Abstract3DController constructor, as they will call virtual // functions implemented by subclasses. setAxisX(0); diff --git a/tests/barstest/chart.cpp b/tests/barstest/chart.cpp index cd41a6be..c1599b18 100644 --- a/tests/barstest/chart.cpp +++ b/tests/barstest/chart.cpp @@ -26,7 +26,7 @@ QT_DATAVISUALIZATION_USE_NAMESPACE const QString celsiusString = QString(QChar(0xB0)) + "C"; -ChartModifier::ChartModifier(Q3DBars *barchart) +GraphModifier::GraphModifier(Q3DBars *barchart) : m_chart(barchart), m_columnCount(21), m_rowCount(21), @@ -117,17 +117,17 @@ ChartModifier::ChartModifier(Q3DBars *barchart) resetTemperatureData(); } -ChartModifier::~ChartModifier() +GraphModifier::~GraphModifier() { delete m_chart; } -void ChartModifier::start() +void GraphModifier::start() { restart(false); } -void ChartModifier::restart(bool dynamicData) +void GraphModifier::restart(bool dynamicData) { m_static = !dynamicData; @@ -154,7 +154,7 @@ void ChartModifier::restart(bool dynamicData) } } -void ChartModifier::selectBar() +void GraphModifier::selectBar() { QPoint targetBar(5, 5); QPoint noSelection(-1, -1); @@ -164,7 +164,7 @@ void ChartModifier::selectBar() m_chart->setSelectedBarPos(noSelection); } -void ChartModifier::swapAxis() +void GraphModifier::swapAxis() { static int counter = 0; int state = ++counter % 3; @@ -183,7 +183,7 @@ void ChartModifier::swapAxis() m_chart->setValueAxis(m_currentAxis); } -void ChartModifier::releaseAxes() +void GraphModifier::releaseAxes() { // Releases all axes - results in default axes for all dimensions. // Axes reset when the graph is switched as set*Axis calls are made, which @@ -197,7 +197,7 @@ void ChartModifier::releaseAxes() m_chart->releaseAxis(m_genericColumnAxis); } -void ChartModifier::releaseProxies() +void GraphModifier::releaseProxies() { // Releases all proxies - results in default proxy. // Proxies will get readded back when graph is switched as setDataProxy call is made. @@ -205,7 +205,7 @@ void ChartModifier::releaseProxies() m_chart->releaseDataProxy(m_genericData); } -void ChartModifier::createMassiveArray() +void GraphModifier::createMassiveArray() { const int arrayDimension = 1000; QTime timer; @@ -241,7 +241,7 @@ void ChartModifier::createMassiveArray() qDebug() << "Created Massive Array (" << arrayDimension << "), time:" << timer.elapsed(); } -void ChartModifier::resetTemperatureData() +void GraphModifier::resetTemperatureData() { // Set up data @@ -281,7 +281,7 @@ static int addCounter = 0; static int insertCounter = 0; static int changeCounter = 0; -void ChartModifier::addRow() +void GraphModifier::addRow() { QBarDataRow *dataRow = new QBarDataRow(m_columnCount); for (qreal i = 0; i < m_columnCount; i++) @@ -292,7 +292,7 @@ void ChartModifier::addRow() m_chart->activeDataProxy()->addRow(dataRow, label); } -void ChartModifier::addRows() +void GraphModifier::addRows() { QBarDataArray dataArray; QStringList labels; @@ -308,7 +308,7 @@ void ChartModifier::addRows() m_chart->activeDataProxy()->addRows(dataArray, labels); } -void ChartModifier::insertRow() +void GraphModifier::insertRow() { QBarDataRow *dataRow = new QBarDataRow(m_columnCount); for (qreal i = 0; i < m_columnCount; i++) @@ -320,7 +320,7 @@ void ChartModifier::insertRow() m_chart->activeDataProxy()->insertRow(row, dataRow, label); } -void ChartModifier::insertRows() +void GraphModifier::insertRows() { QTime timer; timer.start(); @@ -340,7 +340,7 @@ void ChartModifier::insertRows() qDebug() << "Inserted" << m_rowCount << "rows, time:" << timer.elapsed(); } -void ChartModifier::changeItem() +void GraphModifier::changeItem() { // TODO Needs to be changed to account for data window offset once it is implemented. int row = m_selectedBarPos.x(); @@ -351,7 +351,7 @@ void ChartModifier::changeItem() } } -void ChartModifier::changeRow() +void GraphModifier::changeRow() { // TODO Needs to be changed to account for data window offset once it is implemented. int row = m_selectedBarPos.x(); @@ -364,7 +364,7 @@ void ChartModifier::changeRow() } } -void ChartModifier::changeRows() +void GraphModifier::changeRows() { // TODO Needs to be changed to account for data window offset once it is implemented. int row = m_selectedBarPos.x(); @@ -383,7 +383,7 @@ void ChartModifier::changeRows() } } -void ChartModifier::removeRow() +void GraphModifier::removeRow() { // TODO Needs to be changed to account for data window offset once it is implemented. int row = m_selectedBarPos.x(); @@ -391,7 +391,7 @@ void ChartModifier::removeRow() m_chart->activeDataProxy()->removeRows(row, 1); } -void ChartModifier::removeRows() +void GraphModifier::removeRows() { // TODO Needs to be changed to account for data window offset once it is implemented. int row = m_selectedBarPos.x(); @@ -401,7 +401,7 @@ void ChartModifier::removeRows() } } -void ChartModifier::changeStyle() +void GraphModifier::changeStyle() { static int model = 0; switch (model) { @@ -441,7 +441,7 @@ void ChartModifier::changeStyle() model = 0; } -void ChartModifier::changePresetCamera() +void GraphModifier::changePresetCamera() { static int preset = QDataVis::CameraPresetFrontLow; @@ -451,7 +451,7 @@ void ChartModifier::changePresetCamera() preset = QDataVis::CameraPresetFrontLow; } -void ChartModifier::changeTheme() +void GraphModifier::changeTheme() { static int theme = QDataVis::ThemeQt; @@ -461,7 +461,7 @@ void ChartModifier::changeTheme() theme = QDataVis::ThemeQt; } -void ChartModifier::changeLabelStyle() +void GraphModifier::changeLabelStyle() { static int style = QDataVis::LabelStyleOpaque; @@ -471,7 +471,7 @@ void ChartModifier::changeLabelStyle() style = QDataVis::LabelStyleOpaque; } -void ChartModifier::changeSelectionMode() +void GraphModifier::changeSelectionMode() { static int selectionMode = m_chart->selectionMode(); @@ -481,14 +481,14 @@ void ChartModifier::changeSelectionMode() m_chart->setSelectionMode((QDataVis::SelectionMode)selectionMode); } -void ChartModifier::changeFont(const QFont &font) +void GraphModifier::changeFont(const QFont &font) { QFont newFont = font; newFont.setPointSize(m_fontSize); m_chart->setFont(newFont); } -void ChartModifier::changeFontSize(int fontsize) +void GraphModifier::changeFontSize(int fontsize) { m_fontSize = fontsize; QFont font = m_chart->font(); @@ -496,83 +496,83 @@ void ChartModifier::changeFontSize(int fontsize) m_chart->setFont(font); } -void ChartModifier::shadowQualityUpdatedByVisual(QDataVis::ShadowQuality sq) +void GraphModifier::shadowQualityUpdatedByVisual(QDataVis::ShadowQuality sq) { int quality = int(sq); // Updates the UI component to show correct shadow quality emit shadowQualityChanged(quality); } -void ChartModifier::handleSelectionChange(const QPoint &position) +void GraphModifier::handleSelectionChange(const QPoint &position) { m_selectedBarPos = position; qDebug() << "Selected bar position:" << position; } -void ChartModifier::changeShadowQuality(int quality) +void GraphModifier::changeShadowQuality(int quality) { QDataVis::ShadowQuality sq = QDataVis::ShadowQuality(quality); m_chart->setShadowQuality(sq); emit shadowQualityChanged(quality); } -void ChartModifier::setBackgroundEnabled(int enabled) +void GraphModifier::setBackgroundEnabled(int enabled) { m_chart->setBackgroundVisible((bool)enabled); } -void ChartModifier::setGridEnabled(int enabled) +void GraphModifier::setGridEnabled(int enabled) { m_chart->setGridVisible((bool)enabled); } -void ChartModifier::rotateX(int rotation) +void GraphModifier::rotateX(int rotation) { m_xRotation = rotation; m_chart->setCameraPosition(m_xRotation, m_yRotation); } -void ChartModifier::rotateY(int rotation) +void GraphModifier::rotateY(int rotation) { m_yRotation = rotation; m_chart->setCameraPosition(m_xRotation, m_yRotation); } -void ChartModifier::setSpecsRatio(int barwidth) +void GraphModifier::setSpecsRatio(int barwidth) { m_chart->setBarThickness((qreal)barwidth / 30.0); } -void ChartModifier::setSpacingSpecsX(int spacing) +void GraphModifier::setSpacingSpecsX(int spacing) { m_barSpacingX = (qreal)spacing / 100.0; m_chart->setBarSpacing(QSizeF(m_barSpacingX, m_barSpacingZ)); } -void ChartModifier::setSpacingSpecsZ(int spacing) +void GraphModifier::setSpacingSpecsZ(int spacing) { m_barSpacingZ = (qreal)spacing / 100.0; m_chart->setBarSpacing(QSizeF(m_barSpacingX, m_barSpacingZ)); } -void ChartModifier::setSampleCountX(int samples) +void GraphModifier::setSampleCountX(int samples) { m_columnCount = samples; m_genericColumnAxis->setRange(m_genericRowAxis->min(), m_genericRowAxis->min() + samples - 1); } -void ChartModifier::setSampleCountZ(int samples) +void GraphModifier::setSampleCountZ(int samples) { m_rowCount = samples; m_genericRowAxis->setRange(m_genericColumnAxis->min(), m_genericColumnAxis->min() + samples - 1); } -void ChartModifier::setMinX(int min) +void GraphModifier::setMinX(int min) { m_genericRowAxis->setRange(min, min + m_rowCount - 1); } -void ChartModifier::setMinZ(int min) +void GraphModifier::setMinZ(int min) { m_genericColumnAxis->setRange(min, min + m_rowCount - 1); } diff --git a/tests/barstest/chart.h b/tests/barstest/chart.h index a2538b1c..e4e96ffb 100644 --- a/tests/barstest/chart.h +++ b/tests/barstest/chart.h @@ -28,12 +28,12 @@ using namespace QtDataVisualization; -class ChartModifier : public QObject +class GraphModifier : public QObject { Q_OBJECT public: - explicit ChartModifier(Q3DBars *barchart); - ~ChartModifier(); + explicit GraphModifier(Q3DBars *barchart); + ~GraphModifier(); void resetTemperatureData(); void addRow(); diff --git a/tests/barstest/main.cpp b/tests/barstest/main.cpp index ca98688c..850561a7 100644 --- a/tests/barstest/main.cpp +++ b/tests/barstest/main.cpp @@ -260,73 +260,73 @@ int main(int argc, char **argv) widget->show(); - ChartModifier *modifier = new ChartModifier(widgetchart); + GraphModifier *modifier = new GraphModifier(widgetchart); - QObject::connect(rotationSliderX, &QSlider::valueChanged, modifier, &ChartModifier::rotateX); - QObject::connect(rotationSliderY, &QSlider::valueChanged, modifier, &ChartModifier::rotateY); + QObject::connect(rotationSliderX, &QSlider::valueChanged, modifier, &GraphModifier::rotateX); + QObject::connect(rotationSliderY, &QSlider::valueChanged, modifier, &GraphModifier::rotateY); - QObject::connect(ratioSlider, &QSlider::valueChanged, modifier, &ChartModifier::setSpecsRatio); + QObject::connect(ratioSlider, &QSlider::valueChanged, modifier, &GraphModifier::setSpecsRatio); QObject::connect(spacingSliderX, &QSlider::valueChanged, modifier, - &ChartModifier::setSpacingSpecsX); + &GraphModifier::setSpacingSpecsX); QObject::connect(spacingSliderZ, &QSlider::valueChanged, modifier, - &ChartModifier::setSpacingSpecsZ); + &GraphModifier::setSpacingSpecsZ); QObject::connect(sampleSliderX, &QSlider::valueChanged, modifier, - &ChartModifier::setSampleCountX); + &GraphModifier::setSampleCountX); QObject::connect(sampleSliderZ, &QSlider::valueChanged, modifier, - &ChartModifier::setSampleCountZ); + &GraphModifier::setSampleCountZ); QObject::connect(minSliderX, &QSlider::valueChanged, modifier, - &ChartModifier::setMinX); + &GraphModifier::setMinX); QObject::connect(minSliderZ, &QSlider::valueChanged, modifier, - &ChartModifier::setMinZ); + &GraphModifier::setMinZ); QObject::connect(shadowQuality, SIGNAL(currentIndexChanged(int)), modifier, SLOT(changeShadowQuality(int))); - QObject::connect(modifier, &ChartModifier::shadowQualityChanged, shadowQuality, + QObject::connect(modifier, &GraphModifier::shadowQualityChanged, shadowQuality, &QComboBox::setCurrentIndex); QObject::connect(widgetchart, &Q3DBars::shadowQualityChanged, modifier, - &ChartModifier::shadowQualityUpdatedByVisual); + &GraphModifier::shadowQualityUpdatedByVisual); QObject::connect(widgetchart, &Q3DBars::selectedBarPosChanged, modifier, - &ChartModifier::handleSelectionChange); + &GraphModifier::handleSelectionChange); QObject::connect(fontSizeSlider, &QSlider::valueChanged, modifier, - &ChartModifier::changeFontSize); + &GraphModifier::changeFontSize); - QObject::connect(styleButton, &QPushButton::clicked, modifier, &ChartModifier::changeStyle); + QObject::connect(styleButton, &QPushButton::clicked, modifier, &GraphModifier::changeStyle); QObject::connect(cameraButton, &QPushButton::clicked, modifier, - &ChartModifier::changePresetCamera); - QObject::connect(themeButton, &QPushButton::clicked, modifier, &ChartModifier::changeTheme); + &GraphModifier::changePresetCamera); + QObject::connect(themeButton, &QPushButton::clicked, modifier, &GraphModifier::changeTheme); QObject::connect(labelButton, &QPushButton::clicked, modifier, - &ChartModifier::changeStyle); - QObject::connect(addDataButton, &QPushButton::clicked, modifier, &ChartModifier::addRow); - QObject::connect(addMultiDataButton, &QPushButton::clicked, modifier, &ChartModifier::addRows); - QObject::connect(insertDataButton, &QPushButton::clicked, modifier, &ChartModifier::insertRow); - QObject::connect(insertMultiDataButton, &QPushButton::clicked, modifier, &ChartModifier::insertRows); - QObject::connect(changeSingleDataButton, &QPushButton::clicked, modifier, &ChartModifier::changeItem); - QObject::connect(changeRowButton, &QPushButton::clicked, modifier, &ChartModifier::changeRow); - QObject::connect(changeRowsButton, &QPushButton::clicked, modifier, &ChartModifier::changeRows); - QObject::connect(removeRowButton, &QPushButton::clicked, modifier, &ChartModifier::removeRow); - QObject::connect(removeRowsButton, &QPushButton::clicked, modifier, &ChartModifier::removeRows); - QObject::connect(massiveArrayButton, &QPushButton::clicked, modifier, &ChartModifier::createMassiveArray); + &GraphModifier::changeStyle); + QObject::connect(addDataButton, &QPushButton::clicked, modifier, &GraphModifier::addRow); + QObject::connect(addMultiDataButton, &QPushButton::clicked, modifier, &GraphModifier::addRows); + QObject::connect(insertDataButton, &QPushButton::clicked, modifier, &GraphModifier::insertRow); + QObject::connect(insertMultiDataButton, &QPushButton::clicked, modifier, &GraphModifier::insertRows); + QObject::connect(changeSingleDataButton, &QPushButton::clicked, modifier, &GraphModifier::changeItem); + QObject::connect(changeRowButton, &QPushButton::clicked, modifier, &GraphModifier::changeRow); + QObject::connect(changeRowsButton, &QPushButton::clicked, modifier, &GraphModifier::changeRows); + QObject::connect(removeRowButton, &QPushButton::clicked, modifier, &GraphModifier::removeRow); + QObject::connect(removeRowsButton, &QPushButton::clicked, modifier, &GraphModifier::removeRows); + QObject::connect(massiveArrayButton, &QPushButton::clicked, modifier, &GraphModifier::createMassiveArray); QObject::connect(selectionButton, &QPushButton::clicked, modifier, - &ChartModifier::changeSelectionMode); + &GraphModifier::changeSelectionMode); QObject::connect(setSelectedBarButton, &QPushButton::clicked, modifier, - &ChartModifier::selectBar); + &GraphModifier::selectBar); QObject::connect(swapAxisButton, &QPushButton::clicked, modifier, - &ChartModifier::swapAxis); + &GraphModifier::swapAxis); QObject::connect(releaseAxesButton, &QPushButton::clicked, modifier, - &ChartModifier::releaseAxes); + &GraphModifier::releaseAxes); QObject::connect(releaseProxiesButton, &QPushButton::clicked, modifier, - &ChartModifier::releaseProxies); + &GraphModifier::releaseProxies); QObject::connect(fontList, &QFontComboBox::currentFontChanged, modifier, - &ChartModifier::changeFont); + &GraphModifier::changeFont); QObject::connect(backgroundCheckBox, &QCheckBox::stateChanged, modifier, - &ChartModifier::setBackgroundEnabled); + &GraphModifier::setBackgroundEnabled); QObject::connect(gridCheckBox, &QCheckBox::stateChanged, modifier, - &ChartModifier::setGridEnabled); + &GraphModifier::setGridEnabled); QObject::connect(rotationCheckBox, &QCheckBox::stateChanged, rotationSliderX, &QSlider::setEnabled); @@ -367,7 +367,7 @@ int main(int argc, char **argv) &QSlider::setEnabled); QObject::connect(staticCheckBox, &QCheckBox::stateChanged, swapAxisButton, &QSlider::setEnabled); - QObject::connect(staticCheckBox, &QCheckBox::stateChanged, modifier, &ChartModifier::restart); + QObject::connect(staticCheckBox, &QCheckBox::stateChanged, modifier, &GraphModifier::restart); modifier->start(); diff --git a/examples/surfacechart/Heightmap.png b/tests/surfacetest/Heightmap.png Binary files differindex 2a860111..2a860111 100644 --- a/examples/surfacechart/Heightmap.png +++ b/tests/surfacetest/Heightmap.png diff --git a/examples/surfacechart/chartmodifier.cpp b/tests/surfacetest/graphmodifier.cpp index b0115fd3..d4e99031 100644 --- a/examples/surfacechart/chartmodifier.cpp +++ b/tests/surfacetest/graphmodifier.cpp @@ -16,7 +16,7 @@ ** ****************************************************************************/ -#include "chartmodifier.h" +#include "graphmodifier.h" #include <QtDataVisualization/Q3DValueAxis> #include <QtDataVisualization/QSurfaceDataProxy> @@ -29,8 +29,8 @@ QT_DATAVISUALIZATION_USE_NAMESPACE //#define JITTER_PLANE //#define WONKY_PLANE -ChartModifier::ChartModifier(Q3DSurface *chart) - : m_chart(chart), +GraphModifier::GraphModifier(Q3DSurface *graph) + : m_graph(graph), m_gridSliderX(0), m_gridSliderZ(0), m_axisRangeSliderX(0), @@ -47,34 +47,34 @@ ChartModifier::ChartModifier(Q3DSurface *chart) m_minZ(-8.0), m_planeArray(0) { - m_chart->setAxisX(new Q3DValueAxis); - m_chart->setAxisY(new Q3DValueAxis); - m_chart->setAxisZ(new Q3DValueAxis); - m_chart->axisX()->setRange(m_minX, m_minX + m_rangeX); - m_chart->axisZ()->setRange(m_minZ, m_minZ + m_rangeZ); + m_graph->setAxisX(new Q3DValueAxis); + m_graph->setAxisY(new Q3DValueAxis); + m_graph->setAxisZ(new Q3DValueAxis); + m_graph->axisX()->setRange(m_minX, m_minX + m_rangeX); + m_graph->axisZ()->setRange(m_minZ, m_minZ + m_rangeZ); changeStyle(); - connect(&m_timer, &QTimer::timeout, this, &ChartModifier::timeout); + connect(&m_timer, &QTimer::timeout, this, &GraphModifier::timeout); } -ChartModifier::~ChartModifier() +GraphModifier::~GraphModifier() { - delete m_chart; + delete m_graph; } -void ChartModifier::toggleSmooth(bool enabled) +void GraphModifier::toggleSmooth(bool enabled) { - qDebug() << "ChartModifier::toggleSmooth " << enabled; - m_chart->setSmoothSurfaceEnabled(enabled); + qDebug() << "GraphModifier::toggleSmooth " << enabled; + m_graph->setSmoothSurfaceEnabled(enabled); } -void ChartModifier::toggleSurfaceGrid(bool enable) +void GraphModifier::toggleSurfaceGrid(bool enable) { - qDebug() << "ChartModifier::toggleSurfaceGrid" << enable; - m_chart->setSurfaceGridEnabled(enable); + qDebug() << "GraphModifier::toggleSurfaceGrid" << enable; + m_graph->setSurfaceGridEnabled(enable); } -void ChartModifier::toggleSqrtSin(bool enable) +void GraphModifier::toggleSqrtSin(bool enable) { if (enable) { qDebug() << "Create Sqrt&Sin surface, (" << m_xCount << ", " << m_zCount << ")"; @@ -96,26 +96,25 @@ void ChartModifier::toggleSqrtSin(bool enable) float R = qSqrt(x * x + z * z) + 0.01f; float y = (qSin(R) / R + 0.24f) * 1.61f + 1.0f; (*newRow)[j].setPosition(QVector3D(x, y, z)); - qDebug() << x << y << z; } *dataArray << newRow; } - m_chart->axisY()->setRange(1.0, 3.0); - m_chart->axisX()->setLabelFormat("%.2f"); - m_chart->axisZ()->setLabelFormat("%.2f"); + m_graph->axisY()->setRange(1.0, 3.0); + m_graph->axisX()->setLabelFormat("%.2f"); + m_graph->axisZ()->setLabelFormat("%.2f"); resetArrayAndSliders(dataArray, minZ, maxZ, minX, maxX); - m_activeSample = ChartModifier::SqrtSin; + m_activeSample = GraphModifier::SqrtSin; } else { qDebug() << "Remove surface"; } } -void ChartModifier::togglePlane(bool enable) +void GraphModifier::togglePlane(bool enable) { - qDebug() << "ChartModifier::togglePlane " << enable; + qDebug() << "GraphModifier::togglePlane " << enable; if (enable) { m_planeArray = new QSurfaceDataArray; @@ -123,9 +122,9 @@ void ChartModifier::togglePlane(bool enable) #ifdef JITTER_PLANE m_timer.start(0); #endif - m_chart->axisY()->setRange(0.0, 1.0); - m_chart->axisX()->setLabelFormat("%.2f"); - m_chart->axisZ()->setLabelFormat("%.2f"); + m_graph->axisY()->setRange(0.0, 1.0); + m_graph->axisX()->setLabelFormat("%.2f"); + m_graph->axisZ()->setLabelFormat("%.2f"); m_planeArray->reserve(m_zCount); float minX = -10.0; @@ -167,7 +166,7 @@ void ChartModifier::togglePlane(bool enable) resetArrayAndSliders(m_planeArray, minZ, maxZ, minX, maxX); #endif - m_activeSample = ChartModifier::Plane; + m_activeSample = GraphModifier::Plane; } #ifdef JITTER_PLANE else { @@ -176,7 +175,7 @@ void ChartModifier::togglePlane(bool enable) #endif } -void ChartModifier::setHeightMapData(bool enable) +void GraphModifier::setHeightMapData(bool enable) { if (enable) { // Do the height map the hard way. @@ -204,17 +203,17 @@ void ChartModifier::setHeightMapData(bool enable) *dataArray << newRow; } - m_chart->axisY()->setAutoAdjustRange(true); - m_chart->axisX()->setLabelFormat("%.1f N"); - m_chart->axisZ()->setLabelFormat("%.1f E"); + m_graph->axisY()->setAutoAdjustRange(true); + m_graph->axisX()->setLabelFormat("%.1f N"); + m_graph->axisZ()->setLabelFormat("%.1f E"); resetArrayAndSliders(dataArray, minZ, maxZ, minX, maxX); - m_activeSample = ChartModifier::Map; + m_activeSample = GraphModifier::Map; } } -void ChartModifier::toggleGridSliderLock(bool enable) +void GraphModifier::toggleGridSliderLock(bool enable) { m_gridSlidersLocked = enable; if (m_gridSlidersLocked) { @@ -225,7 +224,7 @@ void ChartModifier::toggleGridSliderLock(bool enable) } } -void ChartModifier::adjustXCount(int count) +void GraphModifier::adjustXCount(int count) { m_xCount = count; if (m_gridSlidersLocked) @@ -236,7 +235,7 @@ void ChartModifier::adjustXCount(int count) qDebug() << "X count =" << count; } -void ChartModifier::adjustZCount(int count) +void GraphModifier::adjustZCount(int count) { m_zCount = count; @@ -245,71 +244,71 @@ void ChartModifier::adjustZCount(int count) qDebug() << "Z count =" << count; } -void ChartModifier::adjustXRange(int range) +void GraphModifier::adjustXRange(int range) { m_rangeX = range; - m_chart->axisX()->setRange(m_minX, m_minX + m_rangeX); + m_graph->axisX()->setRange(m_minX, m_minX + m_rangeX); qDebug() << "X Range =" << range; } -void ChartModifier::adjustZRange(int range) +void GraphModifier::adjustZRange(int range) { m_rangeZ = range; - m_chart->axisZ()->setRange(m_minZ, m_minZ + m_rangeZ); + m_graph->axisZ()->setRange(m_minZ, m_minZ + m_rangeZ); qDebug() << "Z Range =" << range; } -void ChartModifier::adjustXMin(int min) +void GraphModifier::adjustXMin(int min) { m_minX = min; - m_chart->axisX()->setRange(m_minX, m_minX + m_rangeX); + m_graph->axisX()->setRange(m_minX, m_minX + m_rangeX); qDebug() << "X Minimum =" << min; } -void ChartModifier::adjustZMin(int min) +void GraphModifier::adjustZMin(int min) { m_minZ = min; - m_chart->axisZ()->setRange(m_minZ, m_minZ + m_rangeZ); + m_graph->axisZ()->setRange(m_minZ, m_minZ + m_rangeZ); qDebug() << "Z Minimum =" << min; } -void ChartModifier::gradientPressed() +void GraphModifier::gradientPressed() { QLinearGradient gradient; gradient.setColorAt(0.0, Qt::black); gradient.setColorAt(0.33, Qt::blue); gradient.setColorAt(0.67, Qt::red); gradient.setColorAt(1.0, Qt::yellow); - m_chart->setGradient(gradient); + m_graph->setGradient(gradient); } -void ChartModifier::changeFont(const QFont &font) +void GraphModifier::changeFont(const QFont &font) { QFont newFont = font; newFont.setPointSizeF(m_fontSize); - m_chart->setFont(newFont); + m_graph->setFont(newFont); } -void ChartModifier::changeStyle() +void GraphModifier::changeStyle() { static int style = QDataVis::LabelStyleFromTheme; - m_chart->setLabelStyle((QDataVis::LabelStyle)style); + m_graph->setLabelStyle((QDataVis::LabelStyle)style); if (++style > QDataVis::LabelStyleTransparent) style = QDataVis::LabelStyleOpaque; } -void ChartModifier::changeTheme(int theme) +void GraphModifier::changeTheme(int theme) { - m_chart->setTheme((QDataVis::Theme)theme); + m_graph->setTheme((QDataVis::Theme)theme); } -void ChartModifier::timeout() +void GraphModifier::timeout() { int rows = m_planeArray->size(); int columns = m_planeArray->at(0)->size(); @@ -327,43 +326,43 @@ void ChartModifier::timeout() } // Reset same array to make it redraw - m_chart->activeDataProxy()->resetArray(m_planeArray); + m_graph->activeDataProxy()->resetArray(m_planeArray); } -void ChartModifier::resetArrayAndSliders(QSurfaceDataArray *array, qreal minZ, qreal maxZ, qreal minX, qreal maxX) +void GraphModifier::resetArrayAndSliders(QSurfaceDataArray *array, qreal minZ, qreal maxZ, qreal minX, qreal maxX) { m_axisMinSliderX->setValue(minX); m_axisMinSliderZ->setValue(minZ); m_axisRangeSliderX->setValue(maxX - minX); m_axisRangeSliderZ->setValue(maxZ - minZ); - m_chart->activeDataProxy()->resetArray(array); + m_graph->activeDataProxy()->resetArray(array); } -void ChartModifier::changeShadowQuality(int quality) +void GraphModifier::changeShadowQuality(int quality) { QDataVis::ShadowQuality sq = QDataVis::ShadowQuality(quality); - m_chart->setShadowQuality(sq); + m_graph->setShadowQuality(sq); } -void ChartModifier::changeSelectionMode(int mode) +void GraphModifier::changeSelectionMode(int mode) { switch (mode) { case 0: qDebug() << "QDataVis::SelectionModeNone"; - m_chart->setSelectionMode(QDataVis::SelectionModeNone); + m_graph->setSelectionMode(QDataVis::SelectionModeNone); break; case 1: qDebug() << "QDataVis::SelectionModeItem"; - m_chart->setSelectionMode(QDataVis::SelectionModeItem); + m_graph->setSelectionMode(QDataVis::SelectionModeItem); break; case 2: qDebug() << "QDataVis::SelectionModeSliceRow"; - m_chart->setSelectionMode(QDataVis::SelectionModeSliceRow); + m_graph->setSelectionMode(QDataVis::SelectionModeSliceRow); break; case 3: qDebug() << "QDataVis::SelectionModeSliceColumn"; - m_chart->setSelectionMode(QDataVis::SelectionModeSliceColumn); + m_graph->setSelectionMode(QDataVis::SelectionModeSliceColumn); break; default: qDebug() << __FUNCTION__ << " Unsupported selection mode."; @@ -371,7 +370,7 @@ void ChartModifier::changeSelectionMode(int mode) } } -void ChartModifier::updateSamples() +void GraphModifier::updateSamples() { switch (m_activeSample) { case SqrtSin: diff --git a/examples/surfacechart/chartmodifier.h b/tests/surfacetest/graphmodifier.h index 083ceff7..83b1873b 100644 --- a/examples/surfacechart/chartmodifier.h +++ b/tests/surfacetest/graphmodifier.h @@ -16,8 +16,8 @@ ** ****************************************************************************/ -#ifndef CHARTMODIFIER_H -#define CHARTMODIFIER_H +#ifndef GRAPHMODIFIER_H +#define GRAPHMODIFIER_H #include <QtDataVisualization/Q3DSurface> #include <QtDataVisualization/QSurfaceDataProxy> @@ -26,7 +26,7 @@ using namespace QtDataVisualization; -class ChartModifier : public QObject +class GraphModifier : public QObject { Q_OBJECT public: @@ -36,8 +36,8 @@ public: Map }; - explicit ChartModifier(Q3DSurface *chart); - ~ChartModifier(); + explicit GraphModifier(Q3DSurface *graph); + ~GraphModifier(); void toggleSmooth(bool enabled); void toggleSurfaceGrid(bool enable); @@ -72,7 +72,7 @@ private: void resetArrayAndSliders(QSurfaceDataArray *array, qreal minZ, qreal maxZ, qreal minX, qreal maxX); - Q3DSurface *m_chart; + Q3DSurface *m_graph; QSlider *m_gridSliderX; QSlider *m_gridSliderZ; QSlider *m_axisRangeSliderX; @@ -92,4 +92,4 @@ private: QSurfaceDataArray *m_planeArray; }; -#endif // CHARTMODIFIER_H +#endif diff --git a/examples/surfacechart/main.cpp b/tests/surfacetest/main.cpp index 256f4e2d..19f30e5d 100644 --- a/examples/surfacechart/main.cpp +++ b/tests/surfacetest/main.cpp @@ -16,7 +16,7 @@ ** ****************************************************************************/ -#include "chartmodifier.h" +#include "graphmodifier.h" #include <QApplication> #include <QWidget> @@ -45,13 +45,13 @@ int main(int argc, char *argv[]) QVBoxLayout *vLayout = new QVBoxLayout(); vLayout->setAlignment(Qt::AlignTop); - Q3DSurface *surfaceChart = new Q3DSurface(); - QSize screenSize = surfaceChart->screen()->size(); + Q3DSurface *surfaceGraph = new Q3DSurface(); + QSize screenSize = surfaceGraph->screen()->size(); // Set to default, should be same as the initial on themeList - surfaceChart->setTheme(QDataVis::Theme(initialTheme)); + surfaceGraph->setTheme(QDataVis::Theme(initialTheme)); - QWidget *container = QWidget::createWindowContainer(surfaceChart); + QWidget *container = QWidget::createWindowContainer(surfaceGraph); container->setMinimumSize(QSize(screenSize.width() / 2, screenSize.height() / 2)); container->setMaximumSize(screenSize); container->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); @@ -64,7 +64,7 @@ int main(int argc, char *argv[]) QCheckBox *smoothCB = new QCheckBox(widget); smoothCB->setText(QStringLiteral("Smooth ")); - smoothCB->setChecked(surfaceChart->isSmoothSurfaceEnabled()); + smoothCB->setChecked(surfaceGraph->isSmoothSurfaceEnabled()); QCheckBox *surfaceGridCB = new QCheckBox(widget); surfaceGridCB->setText(QStringLiteral("Surface Grid")); @@ -203,39 +203,39 @@ int main(int argc, char *argv[]) widget->show(); - ChartModifier *modifier = new ChartModifier(surfaceChart); + GraphModifier *modifier = new GraphModifier(surfaceGraph); // Connect controls to slots on modifier QObject::connect(smoothCB, &QCheckBox::stateChanged, - modifier, &ChartModifier::toggleSmooth); + modifier, &GraphModifier::toggleSmooth); QObject::connect(surfaceGridCB, &QCheckBox::stateChanged, - modifier, &ChartModifier::toggleSurfaceGrid); + modifier, &GraphModifier::toggleSurfaceGrid); QObject::connect(sqrtSinCB, &QRadioButton::toggled, - modifier, &ChartModifier::toggleSqrtSin); + modifier, &GraphModifier::toggleSqrtSin); QObject::connect(planeCB, &QCheckBox::toggled, - modifier, &ChartModifier::togglePlane); + modifier, &GraphModifier::togglePlane); QObject::connect(heightMapCB, &QCheckBox::toggled, - modifier, &ChartModifier::setHeightMapData); + modifier, &GraphModifier::setHeightMapData); QObject::connect(gridSlidersLockCB, &QCheckBox::stateChanged, - modifier, &ChartModifier::toggleGridSliderLock); + modifier, &GraphModifier::toggleGridSliderLock); QObject::connect(gridSliderX, &QSlider::valueChanged, - modifier, &ChartModifier::adjustXCount); + modifier, &GraphModifier::adjustXCount); QObject::connect(gridSliderZ, &QSlider::valueChanged, - modifier, &ChartModifier::adjustZCount); + modifier, &GraphModifier::adjustZCount); QObject::connect(axisRangeSliderX, &QSlider::valueChanged, - modifier, &ChartModifier::adjustXRange); + modifier, &GraphModifier::adjustXRange); QObject::connect(axisRangeSliderZ, &QSlider::valueChanged, - modifier, &ChartModifier::adjustZRange); + modifier, &GraphModifier::adjustZRange); QObject::connect(axisMinSliderX, &QSlider::valueChanged, - modifier, &ChartModifier::adjustXMin); + modifier, &GraphModifier::adjustXMin); QObject::connect(axisMinSliderZ, &QSlider::valueChanged, - modifier, &ChartModifier::adjustZMin); + modifier, &GraphModifier::adjustZMin); QObject::connect(colorPB, &QPushButton::pressed, - modifier, &ChartModifier::gradientPressed); + modifier, &GraphModifier::gradientPressed); QObject::connect(fontList, &QFontComboBox::currentFontChanged, - modifier, &ChartModifier::changeFont); + modifier, &GraphModifier::changeFont); QObject::connect(labelButton, &QPushButton::clicked, - modifier, &ChartModifier::changeStyle); + modifier, &GraphModifier::changeStyle); QObject::connect(themeList, SIGNAL(currentIndexChanged(int)), modifier, SLOT(changeTheme(int))); // QObject::connect(shadowQuality, SIGNAL(currentIndexChanged(int)), diff --git a/tests/surfacetest/surfacetest.pro b/tests/surfacetest/surfacetest.pro new file mode 100644 index 00000000..9ab890a7 --- /dev/null +++ b/tests/surfacetest/surfacetest.pro @@ -0,0 +1,16 @@ +!include( ../tests.pri ) { + error( "Couldn't find the tests.pri file!" ) +} + +SOURCES += main.cpp \ + graphmodifier.cpp + +QT += widgets + +INSTALLS += target + +HEADERS += \ + graphmodifier.h + +RESOURCES += \ + surfacetest.qrc diff --git a/examples/surfacechart/surface.qrc b/tests/surfacetest/surfacetest.qrc index c18da2c4..c18da2c4 100644 --- a/examples/surfacechart/surface.qrc +++ b/tests/surfacetest/surfacetest.qrc diff --git a/tests/tests.pro b/tests/tests.pro index 61082096..a9462378 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -9,6 +9,7 @@ TEMPLATE = subdirs SUBDIRS += barstest \ scattertest \ - kinectsurface + kinectsurface \ + surfacetest qtHaveModule(multimedia):!android: SUBDIRS += spectrum |