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/splinechart/main.cpp | 68 +++++++++++++++++++++++++++++ examples/charts/splinechart/splinechart.pro | 5 +++ 2 files changed, 73 insertions(+) create mode 100644 examples/charts/splinechart/main.cpp create mode 100644 examples/charts/splinechart/splinechart.pro (limited to 'examples/charts/splinechart') diff --git a/examples/charts/splinechart/main.cpp b/examples/charts/splinechart/main.cpp new file mode 100644 index 00000000..e6a40dd0 --- /dev/null +++ b/examples/charts/splinechart/main.cpp @@ -0,0 +1,68 @@ +/**************************************************************************** +** +** 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 +#include +#include +#include + +QT_CHARTS_USE_NAMESPACE + +int main(int argc, char *argv[]) +{ + QApplication a(argc, argv); + + //![1] + QSplineSeries *series = new QSplineSeries(); + series->setName("spline"); + //![1] + + //![2] + series->append(0, 6); + series->append(2, 4); + series->append(3, 8); + series->append(7, 4); + series->append(10, 5); + *series << QPointF(11, 1) << QPointF(13, 3) << QPointF(17, 6) << QPointF(18, 3) << QPointF(20, 2); + //![2] + + //![3] + QChart *chart = new QChart(); + chart->legend()->hide(); + chart->addSeries(series); + chart->setTitle("Simple spline chart example"); + chart->createDefaultAxes(); + chart->axisY()->setRange(0, 10); + //![3] + + //![4] + QChartView *chartView = new QChartView(chart); + chartView->setRenderHint(QPainter::Antialiasing); + //![4] + + //![5] + QMainWindow window; + window.setCentralWidget(chartView); + window.resize(400, 300); + window.show(); + //![5] + + return a.exec(); +} diff --git a/examples/charts/splinechart/splinechart.pro b/examples/charts/splinechart/splinechart.pro new file mode 100644 index 00000000..b2624f53 --- /dev/null +++ b/examples/charts/splinechart/splinechart.pro @@ -0,0 +1,5 @@ +!include( ../examples.pri ) { + error( "Couldn't find the examples.pri file!" ) +} +TARGET = splinechart +SOURCES += main.cpp -- cgit v1.2.3