diff options
Diffstat (limited to 'examples/custominput')
-rw-r--r-- | examples/custominput/custominputhandler.cpp | 2 | ||||
-rw-r--r-- | examples/custominput/custominputhandler.h | 2 | ||||
-rw-r--r-- | examples/custominput/doc/images/custominput-example.png | bin | 108178 -> 62422 bytes | |||
-rw-r--r-- | examples/custominput/doc/src/custominput.qdoc | 2 | ||||
-rw-r--r-- | examples/custominput/main.cpp | 2 | ||||
-rw-r--r-- | examples/custominput/scatterdatamodifier.cpp | 20 | ||||
-rw-r--r-- | examples/custominput/scatterdatamodifier.h | 4 |
7 files changed, 16 insertions, 16 deletions
diff --git a/examples/custominput/custominputhandler.cpp b/examples/custominput/custominputhandler.cpp index 3b050fda..a5734e16 100644 --- a/examples/custominput/custominputhandler.cpp +++ b/examples/custominput/custominputhandler.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/examples/custominput/custominputhandler.h b/examples/custominput/custominputhandler.h index 1fecb8d8..60c88ef7 100644 --- a/examples/custominput/custominputhandler.h +++ b/examples/custominput/custominputhandler.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/examples/custominput/doc/images/custominput-example.png b/examples/custominput/doc/images/custominput-example.png Binary files differindex 083bac58..b2656b69 100644 --- a/examples/custominput/doc/images/custominput-example.png +++ b/examples/custominput/doc/images/custominput-example.png diff --git a/examples/custominput/doc/src/custominput.qdoc b/examples/custominput/doc/src/custominput.qdoc index 9bb5607f..88c53b4d 100644 --- a/examples/custominput/doc/src/custominput.qdoc +++ b/examples/custominput/doc/src/custominput.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/examples/custominput/main.cpp b/examples/custominput/main.cpp index 8b1aa033..069a5b0a 100644 --- a/examples/custominput/main.cpp +++ b/examples/custominput/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/examples/custominput/scatterdatamodifier.cpp b/examples/custominput/scatterdatamodifier.cpp index aabb1b3a..a2a5bea9 100644 --- a/examples/custominput/scatterdatamodifier.cpp +++ b/examples/custominput/scatterdatamodifier.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** @@ -19,7 +19,7 @@ #include "scatterdatamodifier.h" #include <QtDataVisualization/QScatterDataProxy> -#include <QtDataVisualization/Q3DValueAxis> +#include <QtDataVisualization/QValue3DAxis> #include <QtDataVisualization/Q3DScene> #include <QtDataVisualization/Q3DCamera> #include <QtDataVisualization/QScatter3DSeries> @@ -32,20 +32,20 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter) : m_graph(scatter), m_inputHandler(new CustomInputHandler()) { - m_graph->setTheme(new Q3DTheme(Q3DTheme::ThemeDigia)); - m_graph->setShadowQuality(QDataVis::ShadowQualityMedium); + m_graph->activeTheme()->setType(Q3DTheme::ThemeDigia); + m_graph->setShadowQuality(QAbstract3DGraph::ShadowQualityMedium); m_graph->scene()->activeCamera()->setCameraPreset(Q3DCamera::CameraPresetFront); - m_graph->setAxisX(new Q3DValueAxis); - m_graph->setAxisY(new Q3DValueAxis); - m_graph->setAxisZ(new Q3DValueAxis); + m_graph->setAxisX(new QValue3DAxis); + m_graph->setAxisY(new QValue3DAxis); + m_graph->setAxisZ(new QValue3DAxis); m_graph->axisX()->setRange(-10.0f, 10.0f); m_graph->axisY()->setRange(-5.0f, 5.0f); m_graph->axisZ()->setRange(-5.0f, 5.0f); QScatter3DSeries *series = new QScatter3DSeries; - series->setItemLabelFormat("@xLabel, @yLabel, @zLabel"); + series->setItemLabelFormat(QStringLiteral("@xLabel, @yLabel, @zLabel")); series->setMesh(QAbstract3DSeries::MeshCube); series->setItemSize(0.15f); m_graph->addSeries(series); @@ -159,7 +159,7 @@ void ScatterDataModifier::triggerSelection() m_graph->scene()->setSelectionQueryPosition(m_inputHandler->inputPosition()); } -void ScatterDataModifier::shadowQualityUpdatedByVisual(QDataVis::ShadowQuality sq) +void ScatterDataModifier::shadowQualityUpdatedByVisual(QAbstract3DGraph::ShadowQuality sq) { int quality = int(sq); emit shadowQualityChanged(quality); // connected to a checkbox in main.cpp @@ -167,6 +167,6 @@ void ScatterDataModifier::shadowQualityUpdatedByVisual(QDataVis::ShadowQuality s void ScatterDataModifier::changeShadowQuality(int quality) { - QDataVis::ShadowQuality sq = QDataVis::ShadowQuality(quality); + QAbstract3DGraph::ShadowQuality sq = QAbstract3DGraph::ShadowQuality(quality); m_graph->setShadowQuality(sq); } diff --git a/examples/custominput/scatterdatamodifier.h b/examples/custominput/scatterdatamodifier.h index fc0bc789..9ea6a5c8 100644 --- a/examples/custominput/scatterdatamodifier.h +++ b/examples/custominput/scatterdatamodifier.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** @@ -43,7 +43,7 @@ public: public slots: void changeShadowQuality(int quality); - void shadowQualityUpdatedByVisual(QDataVis::ShadowQuality shadowQuality); + void shadowQualityUpdatedByVisual(QAbstract3DGraph::ShadowQuality shadowQuality); void triggerSelection(); signals: |