diff options
Diffstat (limited to 'examples/customproxy')
-rw-r--r-- | examples/customproxy/doc/images/customproxy-example.png | bin | 121510 -> 125698 bytes | |||
-rw-r--r-- | examples/customproxy/doc/src/customproxy.qdoc | 2 | ||||
-rw-r--r-- | examples/customproxy/main.cpp | 2 | ||||
-rw-r--r-- | examples/customproxy/rainfallgraph.cpp | 20 | ||||
-rw-r--r-- | examples/customproxy/rainfallgraph.h | 2 | ||||
-rw-r--r-- | examples/customproxy/variantbardatamapping.cpp | 2 | ||||
-rw-r--r-- | examples/customproxy/variantbardatamapping.h | 5 | ||||
-rw-r--r-- | examples/customproxy/variantbardataproxy.cpp | 2 | ||||
-rw-r--r-- | examples/customproxy/variantbardataproxy.h | 2 | ||||
-rw-r--r-- | examples/customproxy/variantdataset.cpp | 2 | ||||
-rw-r--r-- | examples/customproxy/variantdataset.h | 5 |
11 files changed, 20 insertions, 24 deletions
diff --git a/examples/customproxy/doc/images/customproxy-example.png b/examples/customproxy/doc/images/customproxy-example.png Binary files differindex 3dc65bbb..753b8951 100644 --- a/examples/customproxy/doc/images/customproxy-example.png +++ b/examples/customproxy/doc/images/customproxy-example.png diff --git a/examples/customproxy/doc/src/customproxy.qdoc b/examples/customproxy/doc/src/customproxy.qdoc index dacedb80..8b506583 100644 --- a/examples/customproxy/doc/src/customproxy.qdoc +++ b/examples/customproxy/doc/src/customproxy.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/customproxy/main.cpp b/examples/customproxy/main.cpp index 58b43873..dd74721e 100644 --- a/examples/customproxy/main.cpp +++ b/examples/customproxy/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/customproxy/rainfallgraph.cpp b/examples/customproxy/rainfallgraph.cpp index ad45d016..e2f04923 100644 --- a/examples/customproxy/rainfallgraph.cpp +++ b/examples/customproxy/rainfallgraph.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 ** @@ -17,8 +17,8 @@ ****************************************************************************/ #include "rainfallgraph.h" -#include <QtDataVisualization/q3dcategoryaxis.h> -#include <QtDataVisualization/q3dvalueaxis.h> +#include <QtDataVisualization/qcategory3daxis.h> +#include <QtDataVisualization/qvalue3daxis.h> #include <QtDataVisualization/q3dscene.h> #include <QtDataVisualization/q3dcamera.h> #include <QtDataVisualization/qbar3dseries.h> @@ -66,20 +66,22 @@ RainfallGraph::RainfallGraph(Q3DBars *rainfall) series->setMesh(QAbstract3DSeries::MeshCylinder); // Set shadows to medium - m_graph->setShadowQuality(QDataVis::ShadowQualityMedium); + m_graph->setShadowQuality(QAbstract3DGraph::ShadowQualityMedium); // Set selection mode to bar and column - m_graph->setSelectionMode(QDataVis::SelectionItemAndColumn | QDataVis::SelectionSlice); + m_graph->setSelectionMode(QAbstract3DGraph::SelectionItemAndColumn | QAbstract3DGraph::SelectionSlice); // Set theme - m_graph->setTheme(new Q3DTheme(Q3DTheme::ThemeArmyBlue)); + m_graph->activeTheme()->setType(Q3DTheme::ThemeArmyBlue); - // Set font to theme - m_graph->theme()->setFont(QFont("Century Gothic", 30)); + // Override font in theme + m_graph->activeTheme()->setFont(QFont("Century Gothic", 30)); + + // Override label background for theme + m_graph->activeTheme()->setLabelBackgroundEnabled(false); // Set camera position and zoom m_graph->scene()->activeCamera()->setCameraPreset(Q3DCamera::CameraPresetIsometricRightHigh); - m_graph->scene()->activeCamera()->setZoomLevel(75); // Set window title m_graph->setTitle(QStringLiteral("Monthly rainfall in Northern Finland")); diff --git a/examples/customproxy/rainfallgraph.h b/examples/customproxy/rainfallgraph.h index 6317ab71..6116eb9b 100644 --- a/examples/customproxy/rainfallgraph.h +++ b/examples/customproxy/rainfallgraph.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/customproxy/variantbardatamapping.cpp b/examples/customproxy/variantbardatamapping.cpp index 0c2f146c..c8369b6e 100644 --- a/examples/customproxy/variantbardatamapping.cpp +++ b/examples/customproxy/variantbardatamapping.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/customproxy/variantbardatamapping.h b/examples/customproxy/variantbardatamapping.h index 9ccf1610..3a145d9a 100644 --- a/examples/customproxy/variantbardatamapping.h +++ b/examples/customproxy/variantbardatamapping.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 ** @@ -19,11 +19,8 @@ #ifndef VARIANTBARDATAMAPPING_H #define VARIANTBARDATAMAPPING_H -#include "qdatavisualizationenums.h" #include <QStringList> -using namespace QtDataVisualization; - class VariantBarDataMapping : public QObject { Q_OBJECT diff --git a/examples/customproxy/variantbardataproxy.cpp b/examples/customproxy/variantbardataproxy.cpp index 2997810f..cf1e1f90 100644 --- a/examples/customproxy/variantbardataproxy.cpp +++ b/examples/customproxy/variantbardataproxy.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/customproxy/variantbardataproxy.h b/examples/customproxy/variantbardataproxy.h index 6f6ba763..b83f8a71 100644 --- a/examples/customproxy/variantbardataproxy.h +++ b/examples/customproxy/variantbardataproxy.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/customproxy/variantdataset.cpp b/examples/customproxy/variantdataset.cpp index f73d83f8..3576aaab 100644 --- a/examples/customproxy/variantdataset.cpp +++ b/examples/customproxy/variantdataset.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/customproxy/variantdataset.h b/examples/customproxy/variantdataset.h index 6beb852f..f5eb5863 100644 --- a/examples/customproxy/variantdataset.h +++ b/examples/customproxy/variantdataset.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 ** @@ -19,12 +19,9 @@ #ifndef VARIANTDATASET_H #define VARIANTDATASET_H -#include "qdatavisualizationenums.h" #include <QScopedPointer> #include <QVariantList> -using namespace QtDataVisualization; - //! [1] typedef QVariantList VariantDataItem; typedef QList<VariantDataItem *> VariantDataItemList; |