summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
Diffstat (limited to 'examples')
-rw-r--r--examples/audiolevels/audiolevels.cpp5
-rw-r--r--examples/bars/graphmodifier.cpp21
-rw-r--r--examples/bars/graphmodifier.h4
-rw-r--r--examples/bars/main.cpp11
-rw-r--r--examples/custominput/scatterdatamodifier.cpp4
-rw-r--r--examples/customproxy/rainfallgraph.cpp2
-rw-r--r--examples/itemmodel/main.cpp5
-rw-r--r--examples/qmlcustominput/qml/qmlcustominput/main.qml2
-rw-r--r--examples/qmlscatter/qml/qmlscatter/main.qml6
-rw-r--r--examples/scatter/main.cpp15
-rw-r--r--examples/scatter/scatterdatamodifier.cpp17
-rw-r--r--examples/scatter/scatterdatamodifier.h3
12 files changed, 59 insertions, 36 deletions
diff --git a/examples/audiolevels/audiolevels.cpp b/examples/audiolevels/audiolevels.cpp
index 9f6658b9..5b2c16ba 100644
--- a/examples/audiolevels/audiolevels.cpp
+++ b/examples/audiolevels/audiolevels.cpp
@@ -46,11 +46,12 @@ AudioLevels::AudioLevels(Q3DBars *graph, QObject *parent)
m_graph->setShadowQuality(QDataVis::ShadowQualityNone);
m_graph->setSelectionMode(QDataVis::SelectionNone);
m_graph->scene()->activeCamera()->setCameraPosition(-25.0f, 10.0f, 190.0f);
- m_graph->setBarType(QDataVis::MeshStyleBars);
m_graph->setTheme(new Q3DTheme(QDataVis::ThemeIsabelle));
m_graph->theme()->setGridEnabled(true);
m_graph->theme()->setBackgroundEnabled(false);
- m_graph->addSeries(new QBar3DSeries);
+ QBar3DSeries *series = new QBar3DSeries;
+ series->setMesh(QAbstract3DSeries::MeshBar);
+ m_graph->addSeries(series);
//! [0]
QAudioFormat formatAudio;
diff --git a/examples/bars/graphmodifier.cpp b/examples/bars/graphmodifier.cpp
index 6a35b1b1..23cefeb4 100644
--- a/examples/bars/graphmodifier.cpp
+++ b/examples/bars/graphmodifier.cpp
@@ -48,7 +48,8 @@ GraphModifier::GraphModifier(Q3DBars *bargraph)
m_primaryData(new QBarDataProxy),
m_secondaryData(new QBarDataProxy),
//! [1]
- m_style(QDataVis::MeshStyleBevelBars),
+ m_primaryStyle(QAbstract3DSeries::MeshBevelBar),
+ m_secondaryStyle(QAbstract3DSeries::MeshSphere),
m_smooth(false)
{
//! [2]
@@ -78,8 +79,13 @@ GraphModifier::GraphModifier(Q3DBars *bargraph)
QBar3DSeries *series = new QBar3DSeries(m_primaryData);
series->setItemLabelFormat(QStringLiteral("Oulu - @colLabel @rowLabel: @valueLabel"));
+ series->setMesh(m_primaryStyle);
+ series->setMeshSmooth(m_smooth);
+
QBar3DSeries *series2 = new QBar3DSeries(m_secondaryData);
series2->setItemLabelFormat(QStringLiteral("Helsinki - @colLabel @rowLabel: @valueLabel"));
+ series2->setMesh(m_secondaryStyle);
+ series2->setMeshSmooth(m_smooth);
series2->setVisible(false);
//! [4]
@@ -159,8 +165,12 @@ void GraphModifier::resetTemperatureData()
void GraphModifier::changeStyle(int style)
{
- m_style = QDataVis::MeshStyle(style);
- m_graph->setBarType(m_style, m_smooth);
+ QComboBox *comboBox = qobject_cast<QComboBox *>(sender());
+ if (comboBox) {
+ m_primaryStyle = QAbstract3DSeries::Mesh(comboBox->itemData(style).toInt());
+ if (m_graph->seriesList().size())
+ m_graph->seriesList().at(0)->setMesh(m_primaryStyle);
+ }
}
void GraphModifier::changePresetCamera()
@@ -251,7 +261,10 @@ void GraphModifier::setGridEnabled(int enabled)
void GraphModifier::setSmoothBars(int smooth)
{
m_smooth = bool(smooth);
- m_graph->setBarType(m_style, m_smooth);
+ if (m_graph->seriesList().size()) {
+ m_graph->seriesList().at(0)->setMeshSmooth(m_smooth);
+ m_graph->seriesList().at(1)->setMeshSmooth(m_smooth);
+ }
}
void GraphModifier::setSeriesVisibility(int enabled)
diff --git a/examples/bars/graphmodifier.h b/examples/bars/graphmodifier.h
index 6887a54b..e361bb87 100644
--- a/examples/bars/graphmodifier.h
+++ b/examples/bars/graphmodifier.h
@@ -21,6 +21,7 @@
#include <QtDataVisualization/q3dbars.h>
#include <QtDataVisualization/qbardataproxy.h>
+#include <QtDataVisualization/qabstract3dseries.h>
#include <QFont>
#include <QDebug>
@@ -79,7 +80,8 @@ private:
Q3DCategoryAxis *m_monthAxis;
QBarDataProxy *m_primaryData;
QBarDataProxy *m_secondaryData;
- QDataVis::MeshStyle m_style;
+ QAbstract3DSeries::Mesh m_primaryStyle;
+ QAbstract3DSeries::Mesh m_secondaryStyle;
bool m_smooth;
};
diff --git a/examples/bars/main.cpp b/examples/bars/main.cpp
index 7cf4381d..e4a05401 100644
--- a/examples/bars/main.cpp
+++ b/examples/bars/main.cpp
@@ -73,11 +73,12 @@ int main(int argc, char **argv)
smoothCheckBox->setChecked(false);
QComboBox *barStyleList = new QComboBox(widget);
- barStyleList->addItem(QStringLiteral("Bars"));
- barStyleList->addItem(QStringLiteral("Pyramids"));
- barStyleList->addItem(QStringLiteral("Cones"));
- barStyleList->addItem(QStringLiteral("Cylinders"));
- barStyleList->addItem(QStringLiteral("Beveled Bars"));
+ barStyleList->addItem(QStringLiteral("Bar"), int(QAbstract3DSeries::MeshBar));
+ barStyleList->addItem(QStringLiteral("Pyramid"), int(QAbstract3DSeries::MeshPyramid));
+ barStyleList->addItem(QStringLiteral("Cone"), int(QAbstract3DSeries::MeshCone));
+ barStyleList->addItem(QStringLiteral("Cylinder"), int(QAbstract3DSeries::MeshCylinder));
+ barStyleList->addItem(QStringLiteral("Bevel bar"), int(QAbstract3DSeries::MeshBevelBar));
+ barStyleList->addItem(QStringLiteral("Sphere"), int(QAbstract3DSeries::MeshSphere));
barStyleList->setCurrentIndex(4);
QPushButton *cameraButton = new QPushButton(widget);
diff --git a/examples/custominput/scatterdatamodifier.cpp b/examples/custominput/scatterdatamodifier.cpp
index a1e7e55f..fbe44f58 100644
--- a/examples/custominput/scatterdatamodifier.cpp
+++ b/examples/custominput/scatterdatamodifier.cpp
@@ -32,7 +32,6 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter)
: m_graph(scatter),
m_inputHandler(new CustomInputHandler())
{
- m_graph->setObjectType(QDataVis::MeshStyleCubes, false);
m_graph->setTheme(new Q3DTheme(QDataVis::ThemeDigia));
m_graph->setShadowQuality(QDataVis::ShadowQualitySoftLow);
m_graph->scene()->activeCamera()->setCameraPreset(QDataVis::CameraPresetFront);
@@ -42,7 +41,8 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter)
m_graph->setAxisZ(new Q3DValueAxis);
QScatter3DSeries *series = new QScatter3DSeries;
- series->setItemLabelFormat("@xTitle: @xLabel @yTitle: @yLabel @zTitle: @zLabel");
+ series->setItemLabelFormat("@xLabel, @yLabel, @zLabel");
+ series->setMesh(QAbstract3DSeries::MeshCube);
m_graph->addSeries(series);
m_animationCameraX = new QPropertyAnimation(m_graph->scene()->activeCamera(), "xRotation");
diff --git a/examples/customproxy/rainfallgraph.cpp b/examples/customproxy/rainfallgraph.cpp
index 1be61440..6556a296 100644
--- a/examples/customproxy/rainfallgraph.cpp
+++ b/examples/customproxy/rainfallgraph.cpp
@@ -63,7 +63,7 @@ RainfallGraph::RainfallGraph(Q3DBars *rainfall)
m_graph->columnAxis()->setCategoryLabels(months);
// Set bar type to cylinder
- m_graph->setBarType(QDataVis::MeshStyleCylinders, false);
+ series->setMesh(QAbstract3DSeries::MeshCylinder);
// Set shadows to medium
m_graph->setShadowQuality(QDataVis::ShadowQualityMedium);
diff --git a/examples/itemmodel/main.cpp b/examples/itemmodel/main.cpp
index 1ee6ca25..708fd723 100644
--- a/examples/itemmodel/main.cpp
+++ b/examples/itemmodel/main.cpp
@@ -80,10 +80,6 @@ GraphDataGenerator::GraphDataGenerator(Q3DBars *bargraph, QTableWidget *tableWid
// and add a small space between them
m_graph->setBarThickness(1.0f);
m_graph->setBarSpacing(QSizeF(0.2, 0.2));
-
- // Set bar type to flat pyramids
- m_graph->setBarType(QDataVis::MeshStylePyramids, false);
-
//! [5]
#ifndef USE_STATIC_DATA
@@ -270,6 +266,7 @@ int main(int argc, char **argv)
QItemModelBarDataProxy *proxy = new QItemModelBarDataProxy(tableWidget->model());
proxy->setUseModelCategories(true);
QBar3DSeries *series = new QBar3DSeries(proxy);
+ series->setMesh(QAbstract3DSeries::MeshPyramid);
graph->addSeries(series);
//! [2]
diff --git a/examples/qmlcustominput/qml/qmlcustominput/main.qml b/examples/qmlcustominput/qml/qmlcustominput/main.qml
index fb95f09f..005b40a0 100644
--- a/examples/qmlcustominput/qml/qmlcustominput/main.qml
+++ b/examples/qmlcustominput/qml/qmlcustominput/main.qml
@@ -45,7 +45,6 @@ Item {
theme: Theme3D { type: AbstractGraph3D.ThemeDigia }
shadowQuality: AbstractGraph3D.ShadowQualitySoftMedium
scene.activeCamera.yRotation: 30.0
- objectType: AbstractGraph3D.MeshStyleCubes
//! [1]
inputHandler: null
//! [1]
@@ -53,6 +52,7 @@ Item {
Scatter3DSeries {
id: scatterSeries
itemLabelFormat: "X:@xLabel Y:@yLabel Z:@zLabel"
+ mesh: Abstract3DSeries.MeshCube
ItemModelScatterDataProxy {
itemModel: graphData.model
diff --git a/examples/qmlscatter/qml/qmlscatter/main.qml b/examples/qmlscatter/qml/qmlscatter/main.qml
index 7893ae56..e4f95d09 100644
--- a/examples/qmlscatter/qml/qmlscatter/main.qml
+++ b/examples/qmlscatter/qml/qmlscatter/main.qml
@@ -109,12 +109,12 @@ Item {
text: "Use Smooth Dots"
anchors.left: shadowToggle.right
onClicked: {
- if (scatterGraph.objectSmoothingEnabled === false) {
+ if (scatterSeries.meshSmooth === false) {
text = "Use Flat Dots";
- scatterGraph.objectSmoothingEnabled = true;
+ scatterSeries.meshSmooth = true;
} else {
text = "Use Smooth Dots"
- scatterGraph.objectSmoothingEnabled = false;
+ scatterSeries.meshSmooth = false;
}
}
}
diff --git a/examples/scatter/main.cpp b/examples/scatter/main.cpp
index 40027a40..d981620c 100644
--- a/examples/scatter/main.cpp
+++ b/examples/scatter/main.cpp
@@ -73,10 +73,12 @@ int main(int argc, char **argv)
smoothCheckBox->setText(QStringLiteral("Smooth dots"));
smoothCheckBox->setChecked(true);
- QComboBox *barStyleList = new QComboBox(widget);
- barStyleList->addItem(QStringLiteral("Sphere"));
- barStyleList->addItem(QStringLiteral("Tetrahedron"));
- barStyleList->setCurrentIndex(0);
+ QComboBox *itemStyleList = new QComboBox(widget);
+ itemStyleList->addItem(QStringLiteral("Sphere"), int(QAbstract3DSeries::MeshSphere));
+ itemStyleList->addItem(QStringLiteral("Cube"), int(QAbstract3DSeries::MeshCube));
+ itemStyleList->addItem(QStringLiteral("Minimal"), int(QAbstract3DSeries::MeshMinimal));
+ itemStyleList->addItem(QStringLiteral("Point"), int(QAbstract3DSeries::MeshPoint));
+ itemStyleList->setCurrentIndex(0);
QPushButton *cameraButton = new QPushButton(widget);
cameraButton->setText(QStringLiteral("Change camera preset"));
@@ -110,7 +112,7 @@ int main(int argc, char **argv)
vLayout->addWidget(gridCheckBox);
vLayout->addWidget(smoothCheckBox, 0, Qt::AlignTop);
vLayout->addWidget(new QLabel(QStringLiteral("Change dot style")));
- vLayout->addWidget(barStyleList);
+ vLayout->addWidget(itemStyleList);
vLayout->addWidget(new QLabel(QStringLiteral("Change theme")));
vLayout->addWidget(themeList);
vLayout->addWidget(new QLabel(QStringLiteral("Adjust shadow quality")));
@@ -140,8 +142,7 @@ int main(int argc, char **argv)
backgroundCheckBox, &QCheckBox::setChecked);
QObject::connect(modifier, &ScatterDataModifier::gridEnabledChanged,
gridCheckBox, &QCheckBox::setChecked);
-
- QObject::connect(barStyleList, SIGNAL(currentIndexChanged(int)), modifier,
+ QObject::connect(itemStyleList, SIGNAL(currentIndexChanged(int)), modifier,
SLOT(changeStyle(int)));
QObject::connect(themeList, SIGNAL(currentIndexChanged(int)), modifier,
diff --git a/examples/scatter/scatterdatamodifier.cpp b/examples/scatter/scatterdatamodifier.cpp
index fea50992..ee49402a 100644
--- a/examples/scatter/scatterdatamodifier.cpp
+++ b/examples/scatter/scatterdatamodifier.cpp
@@ -24,6 +24,8 @@
#include <QtDataVisualization/qscatter3dseries.h>
#include <QtDataVisualization/q3dtheme.h>
#include <qmath.h>
+#include <QComboBox>
+
using namespace QtDataVisualization;
//#define RANDOM_SCATTER // Uncomment this to switch to random scatter
@@ -33,7 +35,7 @@ const int numberOfItems = 3600;
ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter)
: m_graph(scatter),
m_fontSize(40.0f),
- m_style(QDataVis::MeshStyleSpheres),
+ m_style(QAbstract3DSeries::MeshSphere),
m_smooth(true)
{
//! [0]
@@ -41,7 +43,6 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter)
QFont font = m_graph->theme()->font();
font.setPointSize(m_fontSize);
m_graph->theme()->setFont(font);
- m_graph->setObjectType(QDataVis::MeshStyleSpheres, true);
m_graph->setShadowQuality(QDataVis::ShadowQualitySoftLow);
m_graph->scene()->activeCamera()->setCameraPreset(QDataVis::CameraPresetFront);
//! [0]
@@ -56,6 +57,7 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter)
QScatterDataProxy *proxy = new QScatterDataProxy;
QScatter3DSeries *series = new QScatter3DSeries(proxy);
series->setItemLabelFormat("@xTitle: @xLabel @yTitle: @yLabel @zTitle: @zLabel");
+ series->setMesh(QAbstract3DSeries::MeshSphere);
m_graph->addSeries(series);
//! [2]
@@ -117,14 +119,19 @@ void ScatterDataModifier::addData()
//! [8]
void ScatterDataModifier::changeStyle(int style)
{
- m_style = QDataVis::MeshStyle(style + 5); // skip unsupported mesh types
- m_graph->setObjectType(m_style, m_smooth);
+ QComboBox *comboBox = qobject_cast<QComboBox *>(sender());
+ if (comboBox) {
+ m_style = QAbstract3DSeries::Mesh(comboBox->itemData(style).toInt());
+ if (m_graph->seriesList().size())
+ m_graph->seriesList().at(0)->setMesh(m_style);
+ }
}
void ScatterDataModifier::setSmoothDots(int smooth)
{
m_smooth = bool(smooth);
- m_graph->setObjectType(m_style, m_smooth);
+ QScatter3DSeries *series = m_graph->seriesList().at(0);
+ series->setMeshSmooth(m_smooth);
}
void ScatterDataModifier::changeTheme(int theme)
diff --git a/examples/scatter/scatterdatamodifier.h b/examples/scatter/scatterdatamodifier.h
index 43c58fd9..78dd45e3 100644
--- a/examples/scatter/scatterdatamodifier.h
+++ b/examples/scatter/scatterdatamodifier.h
@@ -20,6 +20,7 @@
#define SCATTERDATAMODIFIER_H
#include <QtDataVisualization/q3dscatter.h>
+#include <QtDataVisualization/qabstract3dseries.h>
#include <QtGui/QFont>
using namespace QtDataVisualization;
@@ -58,7 +59,7 @@ private:
QVector3D randVector();
Q3DScatter *m_graph;
int m_fontSize;
- QDataVis::MeshStyle m_style;
+ QAbstract3DSeries::Mesh m_style;
bool m_smooth;
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 04:30:33 +0000