summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--examples/datavisualization/bars/doc/images/bars-example.pngbin188289 -> 238712 bytes
-rw-r--r--examples/datavisualization/bars/graphmodifier.cpp5
-rw-r--r--examples/datavisualization/bars/graphmodifier.h1
-rw-r--r--examples/datavisualization/bars/main.cpp8
-rw-r--r--examples/datavisualization/customproxy/doc/images/customproxy-example.pngbin125698 -> 173744 bytes
-rw-r--r--examples/datavisualization/customproxy/rainfallgraph.cpp5
-rw-r--r--examples/datavisualization/texturesurface/doc/images/texturesurface-example.pngbin71994 -> 157373 bytes
-rw-r--r--examples/datavisualization/texturesurface/surfacegraph.cpp2
8 files changed, 19 insertions, 2 deletions
diff --git a/examples/datavisualization/bars/doc/images/bars-example.png b/examples/datavisualization/bars/doc/images/bars-example.png
index fb79668d..c06fe2c1 100644
--- a/examples/datavisualization/bars/doc/images/bars-example.png
+++ b/examples/datavisualization/bars/doc/images/bars-example.png
Binary files differ
diff --git a/examples/datavisualization/bars/graphmodifier.cpp b/examples/datavisualization/bars/graphmodifier.cpp
index 656cee90..587bc1d6 100644
--- a/examples/datavisualization/bars/graphmodifier.cpp
+++ b/examples/datavisualization/bars/graphmodifier.cpp
@@ -420,3 +420,8 @@ void GraphModifier::setReverseValueAxis(int enabled)
{
m_graph->valueAxis()->setReversed(enabled);
}
+
+void GraphModifier::setReflection(bool enabled)
+{
+ m_graph->setReflection(enabled);
+}
diff --git a/examples/datavisualization/bars/graphmodifier.h b/examples/datavisualization/bars/graphmodifier.h
index 252af1b8..22b00923 100644
--- a/examples/datavisualization/bars/graphmodifier.h
+++ b/examples/datavisualization/bars/graphmodifier.h
@@ -50,6 +50,7 @@ public:
void setSmoothBars(int smooth);
void setSeriesVisibility(int enabled);
void setReverseValueAxis(int enabled);
+ void setReflection(bool enabled);
public slots:
void changeRange(int range);
diff --git a/examples/datavisualization/bars/main.cpp b/examples/datavisualization/bars/main.cpp
index 0173f81c..a7df14e0 100644
--- a/examples/datavisualization/bars/main.cpp
+++ b/examples/datavisualization/bars/main.cpp
@@ -72,6 +72,7 @@ int main(int argc, char **argv)
smoothCheckBox->setText(QStringLiteral("Smooth bars"));
smoothCheckBox->setChecked(false);
+
QComboBox *barStyleList = new QComboBox(widget);
barStyleList->addItem(QStringLiteral("Bar"), int(QAbstract3DSeries::MeshBar));
barStyleList->addItem(QStringLiteral("Pyramid"), int(QAbstract3DSeries::MeshPyramid));
@@ -139,6 +140,10 @@ int main(int argc, char **argv)
reverseValueAxisCheckBox->setText(QStringLiteral("Reverse value axis"));
reverseValueAxisCheckBox->setChecked(false);
+ QCheckBox *reflectionCheckBox = new QCheckBox(widget);
+ reflectionCheckBox->setText(QStringLiteral("Show reflections"));
+ reflectionCheckBox->setChecked(false);
+
//! [4]
QSlider *rotationSliderX = new QSlider(Qt::Horizontal, widget);
rotationSliderX->setTickInterval(30);
@@ -213,6 +218,7 @@ int main(int argc, char **argv)
vLayout->addWidget(backgroundCheckBox);
vLayout->addWidget(gridCheckBox);
vLayout->addWidget(smoothCheckBox);
+ vLayout->addWidget(reflectionCheckBox);
vLayout->addWidget(seriesCheckBox);
vLayout->addWidget(reverseValueAxisCheckBox);
vLayout->addWidget(axisTitlesVisibleCB);
@@ -260,6 +266,8 @@ int main(int argc, char **argv)
&GraphModifier::setSeriesVisibility);
QObject::connect(reverseValueAxisCheckBox, &QCheckBox::stateChanged, modifier,
&GraphModifier::setReverseValueAxis);
+ QObject::connect(reflectionCheckBox, &QCheckBox::stateChanged, modifier,
+ &GraphModifier::setReflection);
QObject::connect(modifier, &GraphModifier::backgroundEnabledChanged,
backgroundCheckBox, &QCheckBox::setChecked);
diff --git a/examples/datavisualization/customproxy/doc/images/customproxy-example.png b/examples/datavisualization/customproxy/doc/images/customproxy-example.png
index 753b8951..4f82943a 100644
--- a/examples/datavisualization/customproxy/doc/images/customproxy-example.png
+++ b/examples/datavisualization/customproxy/doc/images/customproxy-example.png
Binary files differ
diff --git a/examples/datavisualization/customproxy/rainfallgraph.cpp b/examples/datavisualization/customproxy/rainfallgraph.cpp
index 024fc2a1..bcd67acc 100644
--- a/examples/datavisualization/customproxy/rainfallgraph.cpp
+++ b/examples/datavisualization/customproxy/rainfallgraph.cpp
@@ -49,7 +49,7 @@ RainfallGraph::RainfallGraph(Q3DBars *rainfall)
// Set up bar specifications; make the bars as wide as they are deep,
// and add a small space between the bars
m_graph->setBarThickness(1.0f);
- m_graph->setBarSpacing(QSizeF(0.2, 0.2));
+ m_graph->setBarSpacing(QSizeF(1.1, 1.1));
// Set axis labels and titles
QStringList months;
@@ -85,6 +85,9 @@ RainfallGraph::RainfallGraph(Q3DBars *rainfall)
// Set window title
m_graph->setTitle(QStringLiteral("Monthly rainfall in Northern Finland"));
+
+ // Set reflections on
+ m_graph->setReflection(true);
}
RainfallGraph::~RainfallGraph()
diff --git a/examples/datavisualization/texturesurface/doc/images/texturesurface-example.png b/examples/datavisualization/texturesurface/doc/images/texturesurface-example.png
index 384552b4..76819607 100644
--- a/examples/datavisualization/texturesurface/doc/images/texturesurface-example.png
+++ b/examples/datavisualization/texturesurface/doc/images/texturesurface-example.png
Binary files differ
diff --git a/examples/datavisualization/texturesurface/surfacegraph.cpp b/examples/datavisualization/texturesurface/surfacegraph.cpp
index 785cf576..e01a329d 100644
--- a/examples/datavisualization/texturesurface/surfacegraph.cpp
+++ b/examples/datavisualization/texturesurface/surfacegraph.cpp
@@ -43,7 +43,7 @@ SurfaceGraph::SurfaceGraph(Q3DSurface *surface)
m_graph->axisX()->setLabelAutoRotation(30);
m_graph->axisY()->setLabelAutoRotation(90);
m_graph->axisZ()->setLabelAutoRotation(30);
- m_graph->activeTheme()->setType(Q3DTheme::ThemeStoneMoss);
+ m_graph->activeTheme()->setType(Q3DTheme::ThemePrimaryColors);
QFont font = m_graph->activeTheme()->font();
font.setPointSize(20);