diff options
author | Titta Heikkala <titta.heikkala@digia.com> | 2014-07-01 07:10:00 +0300 |
---|---|---|
committer | Titta Heikkala <titta.heikkala@theqtcompany.com> | 2014-10-14 13:04:52 +0300 |
commit | c544258484ff4fd5d2b88402fbaa5d154b89a3a2 (patch) | |
tree | 7659625abb566dec55d3783ed820b928542d9b2b /examples/scatterinteractions | |
parent | 76339f714f088645e911cee65bdb66055fe029aa (diff) |
Qt Charts project file structure change
Charts repository structure is changed to follow the structure of a
Qt Add-On module. The task includes following changes:
- All macros and definitions named 'commercial' have been renamed.
- Compile errors related to QString and qSort usage have been fixed.
- Old demos are moved under examples. The QML examples now support only
Qt Quick 2.0, the support for Qt Quick 1 is removed.
- The QML examples with multiple views are updated so that they are
usable also with touch devices.
- Unnecessary version checks are removed from examples.
- The build stamp has been removed as it was only meant for Charts
development purposes and it's no longer needed. Also development
build related debug prints are removed as __DATE__ can't be used
for all OS thus it doesn't make much sense.
- Documentation structure has been updated based on the new module
structure. The raw HTML files have been removed. Demos are
combined to examples.
- Unnecessary .qdocinc files are no longer needed. The content is
moved to the corresponding .cpp files.
- The Charts widget designer plugin is updated according to the module
change.
- The test cases updated according to the project structure change.
Tests are added also for version 2.0.
- cmake modules generation is not needed with Qt 5.4 and Qt Charts
so it's disabled.
- The new module name and version are updated to the plugin.qmltypes
file.
Task-number: QTRD-2844, QTRD-3217, QTRD-3218, QTRD-3277, QTRD-3228,
QTRD-2526, QTRD-3233, QTRD-3222
Change-Id: Ib7fb26057cde710ffaf6bc780c8bf52a16f45160
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Diffstat (limited to 'examples/scatterinteractions')
-rw-r--r-- | examples/scatterinteractions/chartview.cpp | 79 | ||||
-rw-r--r-- | examples/scatterinteractions/chartview.h | 46 | ||||
-rw-r--r-- | examples/scatterinteractions/main.cpp | 35 | ||||
-rw-r--r-- | examples/scatterinteractions/scatterinteractions.pro | 9 |
4 files changed, 0 insertions, 169 deletions
diff --git a/examples/scatterinteractions/chartview.cpp b/examples/scatterinteractions/chartview.cpp deleted file mode 100644 index e7ccd5c4..00000000 --- a/examples/scatterinteractions/chartview.cpp +++ /dev/null @@ -1,79 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc -** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com -** -** This file is part of the Qt Enterprise Charts Add-on. -** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. -** -** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "chartview.h" -#include <qmath.h> -#include <QDebug> - -QTCOMMERCIALCHART_USE_NAMESPACE - -ChartView::ChartView(QWidget *parent) - : QChartView(new QChart(), parent), - m_scatter(0), - m_scatter2(0) -{ - setRenderHint(QPainter::Antialiasing); - - chart()->setTitle("Click to interact with scatter points"); - - m_scatter = new QScatterSeries(); - m_scatter->setName("scatter1"); - for (qreal x(0.5); x <= 4.0; x += 0.5) { - for (qreal y(0.5); y <= 4.0; y += 0.5) { - *m_scatter << QPointF(x, y); - } - } - m_scatter2 = new QScatterSeries(); - m_scatter2->setName("scatter2"); - - chart()->addSeries(m_scatter2); - chart()->addSeries(m_scatter); - chart()->createDefaultAxes(); - chart()->axisX()->setRange(0, 4.5); - chart()->axisY()->setRange(0, 4.5); - - connect(m_scatter, SIGNAL(clicked(QPointF)), this, SLOT(handleClickedPoint(QPointF))); -} - -ChartView::~ChartView() -{ -} - -void ChartView::handleClickedPoint(const QPointF &point) -{ - QPointF clickedPoint = point; - // Find the closest point from series 1 - QPointF closest(INT_MAX, INT_MAX); - qreal distance(INT_MAX); - foreach (QPointF currentPoint, m_scatter->points()) { - qreal currentDistance = qSqrt((currentPoint.x() - clickedPoint.x()) - * (currentPoint.x() - clickedPoint.x()) - + (currentPoint.y() - clickedPoint.y()) - * (currentPoint.y() - clickedPoint.y())); - if (currentDistance < distance) { - distance = currentDistance; - closest = currentPoint; - } - } - - // Remove the closes point from series 1 and append it to series 2 - m_scatter->remove(closest); - m_scatter2->append(closest); -} diff --git a/examples/scatterinteractions/chartview.h b/examples/scatterinteractions/chartview.h deleted file mode 100644 index d84ec6f5..00000000 --- a/examples/scatterinteractions/chartview.h +++ /dev/null @@ -1,46 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc -** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com -** -** This file is part of the Qt Enterprise Charts Add-on. -** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. -** -** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef CHARTVIEW_H -#define CHARTVIEW_H - -#include <QChartGlobal> -#include <QChartView> -#include <QScatterSeries> - -QTCOMMERCIALCHART_USE_NAMESPACE - -class ChartView : public QChartView -{ - Q_OBJECT - -public: - ChartView(QWidget *parent = 0); - ~ChartView(); - -private Q_SLOTS: - void handleClickedPoint(const QPointF &point); - -private: - QScatterSeries *m_scatter; - QScatterSeries *m_scatter2; -}; - -#endif // CHARTVIEW_H diff --git a/examples/scatterinteractions/main.cpp b/examples/scatterinteractions/main.cpp deleted file mode 100644 index fb5dd8fc..00000000 --- a/examples/scatterinteractions/main.cpp +++ /dev/null @@ -1,35 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc -** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com -** -** This file is part of the Qt Enterprise Charts Add-on. -** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. -** -** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <QApplication> -#include <QMainWindow> -#include "chartview.h" - -int main(int argc, char *argv[]) -{ - QApplication a(argc, argv); - QMainWindow window; - ChartView chartView(&window); - window.setCentralWidget(&chartView); - window.resize(400, 300); - window.show(); - - return a.exec(); -} diff --git a/examples/scatterinteractions/scatterinteractions.pro b/examples/scatterinteractions/scatterinteractions.pro deleted file mode 100644 index 596fe020..00000000 --- a/examples/scatterinteractions/scatterinteractions.pro +++ /dev/null @@ -1,9 +0,0 @@ -!include( ../examples.pri ) { - error( "Couldn't find the examples.pri file!" ) -} - -TARGET = scatterinteractions -SOURCES += main.cpp \ - chartview.cpp -HEADERS += \ - chartview.h |