From c544258484ff4fd5d2b88402fbaa5d154b89a3a2 Mon Sep 17 00:00:00 2001 From: Titta Heikkala Date: Tue, 1 Jul 2014 07:10:00 +0300 Subject: 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 --- examples/charts/dynamicspline/chart.cpp | 72 +++++++++++++++++++++++++ examples/charts/dynamicspline/chart.h | 56 +++++++++++++++++++ examples/charts/dynamicspline/dynamicspline.pro | 7 +++ examples/charts/dynamicspline/main.cpp | 42 +++++++++++++++ 4 files changed, 177 insertions(+) create mode 100644 examples/charts/dynamicspline/chart.cpp create mode 100644 examples/charts/dynamicspline/chart.h create mode 100644 examples/charts/dynamicspline/dynamicspline.pro create mode 100644 examples/charts/dynamicspline/main.cpp (limited to 'examples/charts/dynamicspline') diff --git a/examples/charts/dynamicspline/chart.cpp b/examples/charts/dynamicspline/chart.cpp new file mode 100644 index 00000000..4c7bc355 --- /dev/null +++ b/examples/charts/dynamicspline/chart.cpp @@ -0,0 +1,72 @@ +/**************************************************************************** +** +** 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 "chart.h" +#include +#include +#include +#include +#include + +Chart::Chart(QGraphicsItem *parent, Qt::WindowFlags wFlags): + QChart(QChart::ChartTypeCartesian, parent, wFlags), + m_series(0), + m_axis(new QValueAxis), + m_step(0), + m_x(5), + m_y(1) +{ + qsrand((uint) QTime::currentTime().msec()); + + QObject::connect(&m_timer, SIGNAL(timeout()), this, SLOT(handleTimeout())); + m_timer.setInterval(1000); + + m_series = new QSplineSeries(this); + QPen green(Qt::red); + green.setWidth(3); + m_series->setPen(green); + m_series->append(m_x, m_y); + + addSeries(m_series); + createDefaultAxes(); + setAxisX(m_axis, m_series); + m_axis->setTickCount(5); + axisX()->setRange(0, 10); + axisY()->setRange(-5, 10); + + m_timer.start(); +} + +Chart::~Chart() +{ + +} + +void Chart::handleTimeout() +{ + qreal x = plotArea().width() / m_axis->tickCount(); + qreal y = (m_axis->max() - m_axis->min()) / m_axis->tickCount(); + m_x += y; + m_y = qrand() % 5 - 2.5; + m_series->append(m_x, m_y); + scroll(x, 0); + if (m_x == 100) + m_timer.stop(); +} diff --git a/examples/charts/dynamicspline/chart.h b/examples/charts/dynamicspline/chart.h new file mode 100644 index 00000000..b6d5eb1c --- /dev/null +++ b/examples/charts/dynamicspline/chart.h @@ -0,0 +1,56 @@ +/**************************************************************************** +** +** 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 CHART_H +#define CHART_H + +#include +#include + +QT_CHARTS_BEGIN_NAMESPACE +class QSplineSeries; +class QValueAxis; +QT_CHARTS_END_NAMESPACE + +QT_CHARTS_USE_NAMESPACE + +//![1] +class Chart: public QChart +{ + Q_OBJECT +public: + Chart(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0); + virtual ~Chart(); + +public slots: + void handleTimeout(); + +private: + QTimer m_timer; + QSplineSeries *m_series; + QStringList m_titles; + QValueAxis *m_axis; + qreal m_step; + qreal m_x; + qreal m_y; +}; +//![1] + +#endif /* CHART_H */ diff --git a/examples/charts/dynamicspline/dynamicspline.pro b/examples/charts/dynamicspline/dynamicspline.pro new file mode 100644 index 00000000..feb26895 --- /dev/null +++ b/examples/charts/dynamicspline/dynamicspline.pro @@ -0,0 +1,7 @@ +!include( ../examples.pri ) { + error( "Couldn't find the examples.pri file!" ) +} + +TARGET = dynamicspline +HEADERS += chart.h +SOURCES += main.cpp chart.cpp diff --git a/examples/charts/dynamicspline/main.cpp b/examples/charts/dynamicspline/main.cpp new file mode 100644 index 00000000..00f18c2f --- /dev/null +++ b/examples/charts/dynamicspline/main.cpp @@ -0,0 +1,42 @@ +/**************************************************************************** +** +** 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 "chart.h" +#include +#include +#include + +QT_CHARTS_USE_NAMESPACE + +int main(int argc, char *argv[]) +{ + QApplication a(argc, argv); + QMainWindow window; + Chart *chart = new Chart; + chart->setTitle("Dynamic spline chart"); + chart->legend()->hide(); + chart->setAnimationOptions(QChart::AllAnimations); + QChartView chartView(chart); + chartView.setRenderHint(QPainter::Antialiasing); + window.setCentralWidget(&chartView); + window.resize(400, 300); + window.show(); + return a.exec(); +} -- cgit v1.2.3