HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r887:1270a0b0cca2

Refactored QML example to multiple views

Tero Ahola -

r887:1270a0b0cca2

parent child

Context file:

r887:1270a0b0cca2

Collapse all files

test/qmlchart/qml/qmlchart/View1.qml created 644 +74 0

@@ -0,0 +1,74
	1	/****************************************************************************
	2	**
	3	** Copyright (C) 2012 Digia Plc
	4	** All rights reserved.
	5	** For any questions to Digia, please use contact form at http://qt.digia.com
	6	**
	7	** This file is part of the Qt Commercial Charts Add-on.
	8	**
	9	** $QT_BEGIN_LICENSE$
	10	** Licensees holding valid Qt Commercial licenses may use this file in
	11	** accordance with the Qt Commercial License Agreement provided with the
	12	** Software or, alternatively, in accordance with the terms contained in
	13	** a written agreement between you and Digia.
	14	**
	15	** If you have questions regarding the use of this file, please use
	16	** contact form at http://qt.digia.com
	17	** $QT_END_LICENSE$
	18	**
	19	****************************************************************************/
	20
	21	import QtQuick 1.0
	22	import QtCommercial.Chart 1.0
	23
	24	Rectangle {
	25	width: parent.width
	26	height: parent.height
	27
	28	// Another option for QML data api:
	29	// ListModel {
	30	// id: listModelForPie
	31	// // PieDataElement
	32	// ListElement {
	33	// label: "Apple"
	34	// value: 4.3
	35	// }
	36	// ListElement {
	37	// label: "Blackberry"
	38	// value: 15.1
	39	// }
	40	// }
	41
	42	Component.onCompleted: {
	43	// console.log("model:" + myModel.item(0));
	44	// myModel.insert(1, {"time":1.4; "speed":41.1 });
	45	// scatter.appendData();
	46	// chart1.theme = Chart.ThemeHighContrast;
	47	// chart2.theme = Chart.ThemeHighContrast;
	48	}
	49
	50	Chart {
	51	id: chart1
	52	anchors.fill: parent
	53	theme: Chart.ChartThemeDark
	54
	55	BarSeries {
	56	barCategories: [ "2008", "2009", "2010", "2011", "2012" ]
	57	// TBD: data
	58	}
	59
	60	PieSeries {
	61	horizontalPosition: 0.2
	62	verticalPosition: 0.3
	63	size: 0.4
	64	endAngle: 0.52 * 360 // The share of "others" is 52%
	65	slices: [
	66	PieSlice { label: "Volkswagen"; value: 13.5 },
	67	PieSlice { label: "Toyota"; value: 10.9 },
	68	PieSlice { label: "Ford"; value: 8.6 },
	69	PieSlice { label: "Skoda"; value: 8.2 },
	70	PieSlice { label: "Volvo"; value: 6.8 }
	71	]
	72	}
	73	}
	74	}

test/qmlchart/qml/qmlchart/View2.qml created 644 +51 0

@@ -0,0 +1,51
	1	/****************************************************************************
	2	**
	3	** Copyright (C) 2012 Digia Plc
	4	** All rights reserved.
	5	** For any questions to Digia, please use contact form at http://qt.digia.com
	6	**
	7	** This file is part of the Qt Commercial Charts Add-on.
	8	**
	9	** $QT_BEGIN_LICENSE$
	10	** Licensees holding valid Qt Commercial licenses may use this file in
	11	** accordance with the Qt Commercial License Agreement provided with the
	12	** Software or, alternatively, in accordance with the terms contained in
	13	** a written agreement between you and Digia.
	14	**
	15	** If you have questions regarding the use of this file, please use
	16	** contact form at http://qt.digia.com
	17	** $QT_END_LICENSE$
	18	**
	19	****************************************************************************/
	20
	21	import QtQuick 1.0
	22	import QtCommercial.Chart 1.0
	23
	24	Rectangle {
	25	anchors.fill: parent
	26
	27	Chart {
	28	anchors.fill: parent
	29	theme: Chart.ChartThemeBrownSand
	30
	31	LineSeries {
	32	name: "Line"
	33	points: [
	34	XyPoint { x: 0.0; y: 0.0 },
	35	XyPoint { x: 1.1; y: 2.1 },
	36	XyPoint { x: 2.9; y: 4.9 },
	37	XyPoint { x: 3.2; y: 3.0 }
	38	]
	39	}
	40
	41	SplineSeries {
	42	name: "Spline"
	43	points: [
	44	XyPoint { x: 0.0; y: 0.3 },
	45	XyPoint { x: 1.1; y: 3.2 },
	46	XyPoint { x: 2.17; y: 2.15 },
	47	XyPoint { x: 4.17; y: 3.15 }
	48	]
	49	}
	50	}
	51	}

test/qmlchart/qml/qmlchart/View3.qml created 644 +70 0

@@ -0,0 +1,70
	1	/****************************************************************************
	2	**
	3	** Copyright (C) 2012 Digia Plc
	4	** All rights reserved.
	5	** For any questions to Digia, please use contact form at http://qt.digia.com
	6	**
	7	** This file is part of the Qt Commercial Charts Add-on.
	8	**
	9	** $QT_BEGIN_LICENSE$
	10	** Licensees holding valid Qt Commercial licenses may use this file in
	11	** accordance with the Qt Commercial License Agreement provided with the
	12	** Software or, alternatively, in accordance with the terms contained in
	13	** a written agreement between you and Digia.
	14	**
	15	** If you have questions regarding the use of this file, please use
	16	** contact form at http://qt.digia.com
	17	** $QT_END_LICENSE$
	18	**
	19	****************************************************************************/
	20
	21	import QtQuick 1.0
	22	import QtCommercial.Chart 1.0
	23
	24	Rectangle {
	25	anchors.fill: parent
	26
	27	Chart {
	28	anchors.fill: parent
	29	theme: Chart.ChartThemeHighContrast
	30
	31	AreaSeries {
	32	name: "Area"
	33	points: [
	34	XyPoint { x: 0.0; y: 1.1 },
	35	XyPoint { x: 2.5; y: 3.6 },
	36	XyPoint { x: 3.57; y: 2.55 }
	37	]
	38	lowerPoints: [
	39	XyPoint { x: 0.0; y: 0.0 },
	40	XyPoint { x: 2.5; y: 0.0 },
	41	XyPoint { x: 3.57; y: 0.0 }
	42	]
	43	}
	44
	45	ScatterSeries {
	46	name: "Scatter1"
	47	points: [
	48	XyPoint { x: 1.5; y: 1.5 },
	49	XyPoint { x: 1.5; y: 1.6 },
	50	XyPoint { x: 1.57; y: 1.55 }
	51	]
	52	}
	53	ScatterSeries {
	54	name: "Scatter2"
	55	points: [
	56	XyPoint { x: 2.0; y: 2.0 },
	57	XyPoint { x: 2.0; y: 2.1 },
	58	XyPoint { x: 2.07; y: 2.05 }
	59	]
	60	}
	61	ScatterSeries {
	62	name: "Scatter3"
	63	points: [
	64	XyPoint { x: 2.6; y: 2.6 },
	65	XyPoint { x: 2.6; y: 2.7 },
	66	XyPoint { x: 2.67; y: 2.65 }
	67	]
	68	}
	69	}
	70	}

examples/tablemodelchart/tablewidget.cpp +6 -3

             /****************************************************************************
             **
             ** Copyright (C) 2012 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 Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial 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 "tablewidget.h"
             #include <QGridLayout>
             #include <QTableView>
             #include <QStyledItemDelegate>
             #include <QLineSeries>
             #include <QSplineSeries>
             #include <QScatterSeries>
             #include "customtablemodel.h"
             #include <QPieSeries>
             #include <QPieSlice>
             #include <QAreaSeries>
             #include <QBarSeries>
             #include <QBarSet>
             #include <QPushButton>
             #include <QRadioButton>
             #include <QLabel>
             #include <QSpinBox>
             #include <QTime>
             TableWidget::TableWidget(QWidget *parent)
                 : QWidget(parent)
             {
                 setGeometry(100, 100, 1000, 600);
                 qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
                 // create simple model for storing data
                 // user's table data model
                 m_model = new CustomTableModel;
                 m_tableView = new QTableView;
                 m_tableView->setModel(m_model);
                 m_tableView->setMinimumHeight(300);
                 //    tableView->setMinimumSize(340, 480);
                 //    tableView->setItemDelegate(new QStyledItemDelegate);
                 m_chart = new QChart;
                 m_chartView = new QChartView(m_chart);
                 m_chartView->setRenderHint(QPainter::Antialiasing);
                 m_chartView->setMinimumSize(640, 480);
                 // add, remove data buttons
                 QPushButton* addRowAboveButton = new QPushButton("Add row above");
                 connect(addRowAboveButton, SIGNAL(clicked()), this, SLOT(addRowAbove()));
                 QPushButton* addRowBelowButton = new QPushButton("Add row below");
                 connect(addRowBelowButton, SIGNAL(clicked()), this, SLOT(addRowBelow()));
                 QPushButton* removeRowButton = new QPushButton("Remove row");
                 connect(removeRowButton, SIGNAL(clicked()), this, SLOT(removeRow()));
                 QLabel *spinBoxLabel = new QLabel("Rows affected:");
                 // spin box for setting number of affected items (add, remove)
                 m_linesCountSpinBox = new QSpinBox;
                 m_linesCountSpinBox->setRange(1, 10);
                 m_linesCountSpinBox->setValue(1);
                 // buttons layout
                 QVBoxLayout* buttonsLayout = new QVBoxLayout;
                 buttonsLayout->addWidget(spinBoxLabel);
                 buttonsLayout->addWidget(m_linesCountSpinBox);
                 buttonsLayout->addWidget(addRowAboveButton);
                 buttonsLayout->addWidget(addRowBelowButton);
                 buttonsLayout->addWidget(removeRowButton);
                 buttonsLayout->addStretch();
                 // chart type radio buttons
                 m_lineRadioButton = new QRadioButton("Line");
                 m_splineRadioButton = new QRadioButton("Spline");
                 m_scatterRadioButton = new QRadioButton("Scatter");
                 m_pieRadioButton = new QRadioButton("Pie");
                 m_areaRadioButton = new QRadioButton("Area");
                 m_barRadioButton = new QRadioButton("Bar");
                 connect(m_lineRadioButton, SIGNAL(toggled(bool)), this, SLOT(updateChartType(bool)));
                 connect(m_splineRadioButton, SIGNAL(toggled(bool)), this, SLOT(updateChartType(bool)));
                 connect(m_scatterRadioButton, SIGNAL(toggled(bool)), this, SLOT(updateChartType(bool)));
                 connect(m_pieRadioButton, SIGNAL(toggled(bool)), this, SLOT(updateChartType(bool)));
                 connect(m_areaRadioButton, SIGNAL(toggled(bool)), this, SLOT(updateChartType(bool)));
                 connect(m_barRadioButton, SIGNAL(toggled(bool)), this, SLOT(updateChartType(bool)));
                 m_lineRadioButton->setChecked(true);
                 // radio buttons layout
                 QVBoxLayout* radioLayout = new QVBoxLayout;
                 radioLayout->addWidget(m_lineRadioButton);
                 radioLayout->addWidget(m_splineRadioButton);
                 radioLayout->addWidget(m_scatterRadioButton);
                 radioLayout->addWidget(m_pieRadioButton);
                 radioLayout->addWidget(m_areaRadioButton);
                 radioLayout->addWidget(m_barRadioButton);
                 radioLayout->addStretch();
                 // create main layout
                 QGridLayout* mainLayout = new QGridLayout;
                 mainLayout->addLayout(buttonsLayout, 1, 1);
                 mainLayout->addLayout(radioLayout, 2, 1);
                 mainLayout->addWidget(m_tableView, 1, 0);
                 mainLayout->addWidget(m_chartView, 2, 0);
                 setLayout(mainLayout);
                 m_lineRadioButton->setFocus();
             }
             void TableWidget::addRowAbove()
             {
                 m_model->insertRows(m_tableView->currentIndex().row(), m_linesCountSpinBox->value());
             }
             void TableWidget::addRowBelow()
             {
                 m_model->insertRows(m_tableView->currentIndex().row() + 1, m_linesCountSpinBox->value());
             }
             void TableWidget::removeRow()
             {
                 m_model->removeRows(m_tableView->currentIndex().row(), qMin(m_model->rowCount() - m_tableView->currentIndex().row(), m_linesCountSpinBox->value()));
             }
             void TableWidget::updateChartType(bool toggle)
             {
                 // this if is needed, so that the function is only called once.
                 // For the radioButton that was enabled.
                 if (toggle) {
                     m_chart->removeAllSeries();
                     // renable axes of the chart (pie hides them)
                     // x axis
                     QChartAxis *axis = m_chart->axisX();
                     axis->setAxisVisible(true);
                     axis->setGridLineVisible(true);
                     axis->setLabelsVisible(true);
                     // y axis
                     axis = m_chart->axisY();
                     axis->setAxisVisible(true);
                     axis->setGridLineVisible(true);
                     axis->setLabelsVisible(true);
                     m_model->clearMapping();
                     QString seriesColorHex = "#000000";
                     QPen pen;
                     pen.setWidth(2);
                     if (m_lineRadioButton->isChecked())
                     {
                         // series 1
                         m_series = new QLineSeries;
                         m_series->setModel(m_model);
                         m_series->setModelMapping(0,1, Qt::Vertical);
                         m_series->setModelMappingRange(1, 4);
                         m_chart->addSeries(m_series);
                         seriesColorHex = "#" + QString::number(m_series->pen().color().rgb(), 16).right(6).toUpper();
                         m_model->addMapping(seriesColorHex, QRect(0, 1, 2, 4));
                         // series 2
                         m_series = new QLineSeries;
                         m_series->setModel(m_model);
                         m_series->setModelMapping(2,3, Qt::Vertical);
                         m_chart->addSeries(m_series);
                         seriesColorHex = "#" + QString::number(m_series->pen().color().rgb(), 16).right(6).toUpper();
                         m_model->addMapping(seriesColorHex, QRect(2, 0, 2, 1000));
                         // series 3
                         m_series = new QLineSeries;
                         m_series->setModel(m_model);
                         m_series->setModelMapping(4,5, Qt::Vertical);
                         m_series->setModelMappingRange(2, 0);
                         m_chart->addSeries(m_series);
                         seriesColorHex = "#" + QString::number(m_series->pen().color().rgb(), 16).right(6).toUpper();
                         m_model->addMapping(seriesColorHex, QRect(4, 2, 2, 1000));
                     }
                     else if (m_splineRadioButton->isChecked())
                     {
                         // series 1
                         m_series = new QSplineSeries;
                         m_series->setModel(m_model);
                         m_series->setModelMapping(0,1, Qt::Vertical);
                         m_series->setModelMappingRange(1, 4);
                         //        series->setModelMapping(0,1, Qt::Horizontal);
                         m_chart->addSeries(m_series);
                         seriesColorHex = "#" + QString::number(m_series->pen().color().rgb(), 16).right(6).toUpper();
                         m_model->addMapping(seriesColorHex, QRect(0, 1, 2, 4));
                         // series 2
                         m_series = new QSplineSeries;
                         m_series->setModel(m_model);
                         m_series->setModelMapping(2,3, Qt::Vertical);
                         m_series->setModelMappingRange(0, 0);
                         //        series->setModelMapping(2,3, Qt::Horizontal);
                         m_chart->addSeries(m_series);
                         seriesColorHex = "#" + QString::number(m_series->pen().color().rgb(), 16).right(6).toUpper();
                         m_model->addMapping(seriesColorHex, QRect(2, 0, 2, 1000));
                         // series 3
                         m_series = new QSplineSeries;
                         m_series->setModel(m_model);
                         m_series->setModelMapping(4,5, Qt::Vertical);
                         m_series->setModelMappingRange(2, 0);
                         //        series->setModelMapping(4,5, Qt::Horizontal);
                         m_chart->addSeries(m_series);
                         seriesColorHex = "#" + QString::number(m_series->pen().color().rgb(), 16).right(6).toUpper();
                         m_model->addMapping(seriesColorHex, QRect(4, 2, 2, 1000));
                     }
                     else if (m_scatterRadioButton->isChecked())
                     {
                         // series 1
                         m_series = new QScatterSeries;
                         m_series->setModel(m_model);
                         m_series->setModelMapping(0,1, Qt::Vertical);
                         m_series->setModelMappingRange(2, 0);
                         //        series->setModelMapping(0,1, Qt::Horizontal);
                         m_chart->addSeries(m_series);
                         seriesColorHex = "#" + QString::number(m_series->brush().color().rgb(), 16).right(6).toUpper();
                         m_model->addMapping(seriesColorHex, QRect(0, 2, 2, 1000));
                         // series 2
                         m_series = new QScatterSeries;
                         m_series->setModel(m_model);
                         m_series->setModelMapping(2,3, Qt::Vertical);
                         m_series->setModelMappingRange(1, 6);
                         //        series->setModelMapping(2,3, Qt::Horizontal);
                         m_chart->addSeries(m_series);
                         seriesColorHex = "#" + QString::number(m_series->brush().color().rgb(), 16).right(6).toUpper();
                         m_model->addMapping(seriesColorHex, QRect(2, 1, 2, 6));
                         // series 3
                         m_series = new QScatterSeries;
                         m_series->setModel(m_model);
                         m_series->setModelMapping(4,5, Qt::Vertical);
                         //        series->setModelMapping(4,5, Qt::Horizontal);
                         m_chart->addSeries(m_series);
                         seriesColorHex = "#" + QString::number(m_series->brush().color().rgb(), 16).right(6).toUpper();
                         m_model->addMapping(seriesColorHex, QRect(4, 0, 2, 1000));
                     }
                     else if (m_pieRadioButton->isChecked())
                     {
                         // pie 1
                         QPieSeries* pieSeries = new QPieSeries;
                         pieSeries->setModel(m_model);
                         pieSeries->setModelMapping(0,0, Qt::Vertical);
                         pieSeries->setLabelsVisible(true);
                         pieSeries->setPieSize(0.4);
-                        pieSeries->setPiePosition(0.2, 0.35);
+                        pieSeries->setHorizontalPosition(0.2);
+                        pieSeries->setVerticalPosition(0.35);
                         m_chart->addSeries(pieSeries);
                         seriesColorHex = "#" + QString::number(pieSeries->slices().at(pieSeries->slices().count()/2)->brush().color().rgb(), 16).right(6).toUpper();
                         m_model->addMapping(seriesColorHex, QRect(0, 0, 1, 1000));
                         // pie 2
                         pieSeries = new QPieSeries;
                         pieSeries->setModel(m_model);
                         pieSeries->setModelMapping(1,1, Qt::Vertical);
                         pieSeries->setLabelsVisible(true);
                         pieSeries->setPieSize(0.4);
-                        pieSeries->setPiePosition(0.8, 0.35);
+                        pieSeries->setHorizontalPosition(0.8);
+                        pieSeries->setVerticalPosition(0.35);
                         m_chart->addSeries(pieSeries);
                         seriesColorHex = "#" + QString::number(pieSeries->slices().at(pieSeries->slices().count()/2)->brush().color().rgb(), 16).right(6).toUpper();
                         m_model->addMapping(seriesColorHex, QRect(1, 0, 1, 1000));
                         // pie 3
                         pieSeries = new QPieSeries;
                         pieSeries->setModel(m_model);
                         pieSeries->setModelMapping(2,2, Qt::Vertical);
                         pieSeries->setLabelsVisible(true);
                         pieSeries->setPieSize(0.4);
-                        pieSeries->setPiePosition(0.5, 0.65);
+                        pieSeries->setHorizontalPosition(0.5);
+                        pieSeries->setVerticalPosition(0.65);
                         m_chart->addSeries(pieSeries);
                         seriesColorHex = "#" + QString::number(pieSeries->slices().at(pieSeries->slices().count()/2)->brush().color().rgb(), 16).right(6).toUpper();
                         m_model->addMapping(seriesColorHex, QRect(2, 0, 1, 1000));
                     }
                     else if (m_areaRadioButton->isChecked())
                     {
                         QLineSeries* upperLineSeries = new QLineSeries;
                         upperLineSeries->setModel(m_model);
                         upperLineSeries->setModelMapping(0, 1, Qt::Vertical);
                         upperLineSeries->setModelMappingRange(1, 5);
                         QLineSeries* lowerLineSeries = new QLineSeries;
                         lowerLineSeries->setModel(m_model);
                         lowerLineSeries->setModelMapping(2, 3, Qt::Vertical);
                         QAreaSeries* areaSeries = new QAreaSeries(upperLineSeries, lowerLineSeries);
                         m_chart->addSeries(areaSeries);
                         seriesColorHex = "#" + QString::number(areaSeries->brush().color().rgb(), 16).right(6).toUpper();
                         m_model->addMapping(seriesColorHex, QRect(0, 1, 2, 5));
                         m_model->addMapping(seriesColorHex, QRect(2, 0, 2, 1000));
                     }
                     else if (m_barRadioButton->isChecked())
                     {
                         QBarSeries* barSeries = new QBarSeries(QStringList());
                         barSeries->setModel(m_model);
                         barSeries->setModelMapping(5, 2, 4, Qt::Vertical);
                         barSeries->setToolTipEnabled(true);
                         m_chart->addSeries(barSeries);
                         for (int i = 0; i < barSeries->barsetCount(); i++) {
                             seriesColorHex = "#" + QString::number(barSeries->barsetAt(i)->brush().color().rgb(), 16).right(6).toUpper();
                             m_model->addMapping(seriesColorHex, QRect(2 + i, 0, 1, 1000));
                         }
                     }
                     m_chart->axisX()->setRange(0, 500);
                     m_chart->axisY()->setRange(0, 120);
                     // repaint table view colors
                     m_tableView->repaint();
                     m_tableView->setFocus();
                 }
             }
             TableWidget::~TableWidget()
             {
             }

test/qmlchart/qml/qmlchart/loader.qml +1 -1

             /****************************************************************************
             **
             ** Copyright (C) 2012 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 Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial 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$
             **
             ****************************************************************************/
             import QtQuick 1.0
             Item {
                 id: container
                 width: 400
-                height: 500
+                height: 300
                 Component.onCompleted: {
                 var co = Qt.createComponent("main.qml")
                 if (co.status == Component.Ready) {
                         var o = co.createObject(container)
                     } else {
                         console.log(co.errorString())
                         console.log("QtCommercial.Chart 1.1 not available")
                         console.log("Please use correct QML_IMPORT_PATH export")
                      }
                 }
             }

test/qmlchart/qml/qmlchart/main.qml +19 -112

@@ -1,147 +1,54
1	/****************************************************************************	1	/****************************************************************************
2	**	2	**
3	** Copyright (C) 2012 Digia Plc	3	** Copyright (C) 2012 Digia Plc
4	** All rights reserved.	4	** All rights reserved.
5	** For any questions to Digia, please use contact form at http://qt.digia.com	5	** For any questions to Digia, please use contact form at http://qt.digia.com
6	**	6	**
7	** This file is part of the Qt Commercial Charts Add-on.	7	** This file is part of the Qt Commercial Charts Add-on.
8	**	8	**
9	** $QT_BEGIN_LICENSE$	9	** $QT_BEGIN_LICENSE$
10	** Licensees holding valid Qt Commercial licenses may use this file in	10	** Licensees holding valid Qt Commercial licenses may use this file in
11	** accordance with the Qt Commercial License Agreement provided with the	11	** accordance with the Qt Commercial License Agreement provided with the
12	** Software or, alternatively, in accordance with the terms contained in	12	** Software or, alternatively, in accordance with the terms contained in
13	** a written agreement between you and Digia.	13	** a written agreement between you and Digia.
14	**	14	**
15	** If you have questions regarding the use of this file, please use	15	** If you have questions regarding the use of this file, please use
16	** contact form at http://qt.digia.com	16	** contact form at http://qt.digia.com
17	** $QT_END_LICENSE$	17	** $QT_END_LICENSE$
18	**	18	**
19	****************************************************************************/	19	****************************************************************************/
20		20
21	import QtQuick 1.0	21	import QtQuick 1.0
22	import QtCommercial.Chart 1.0	22	import QtCommercial.Chart 1.0
23		23
24	Rectangle {	24	Rectangle {
25	width: parent.width	25	width: parent.width
26	height: parent.height	26	height: parent.height
		27	property int __viewNumber: 0
27		28
28	// Another option for QML data api:	29	Timer {
29	// ListModel {	30	id: timer
30	// id: listModelForPie	31	running: true
31	// // PieDataElement	32	repeat: true
32	// ListElement {	33	interval: 5000
33	// label: "Apple"	34	triggeredOnStart: true
34	// value: 4.3	35	onTriggered: {
35	// }	36	loader.source = "View" + (__viewNumber % 3 + 1) + ".qml";
36	// ListElement {	37	__viewNumber++;
37	// label: "Blackberry"
38	// value: 15.1
39	// }
40	// }
41
42	Component.onCompleted: {
43	// console.log("model:" + myModel.item(0));
44	// myModel.insert(1, {"time":1.4; "speed":41.1 });
45	// scatter.appendData();
46	// chart1.theme = Chart.ThemeHighContrast;
47	// chart2.theme = Chart.ThemeHighContrast;
48	}	38	}
49
50
51	Chart {
52	id: chart1
53	anchors.top: parent.top
54	anchors.left: parent.left
55	anchors.right: parent.right
56	height: parent.height / 2
57	theme: Chart.ChartThemeDark
58
59	BarSeries {
60	barCategories: [ "2008", "2009", "2010", "2011", "2012" ]
61	// TBD: data
62	}	39	}
63		40
64	PieSeries {	41	Loader {
65	horizontalPosition: 0.2	42	id: loader
66	verticalPosition: 0.3	43	anchors.fill: parent
67	size: 0.4
68	endAngle: 0.52 * 360 // The share of "others" is 52%
69	slices: [
70	PieSlice { label: "Volkswagen"; value: 13.5 },
71	PieSlice { label: "Toyota"; value: 10.9 },
72	PieSlice { label: "Ford"; value: 8.6 },
73	PieSlice { label: "Skoda"; value: 8.2 },
74	PieSlice { label: "Volvo"; value: 6.8 }
75	]
76	}	44	}
77	}
78
79		45
80	Chart {	46	MouseArea {
81	~~id: chart2~~	47	anchors.fill: parent
82	anchors.top: chart1.bottom	48	onClicked: {
83	anchors.bottom: parent.bottom	49	timer.restart();
84	anchors.left: parent.left	50	loader.source = "View" + (__viewNumber % 3 + 1) + ".qml";
85	anchors.right: parent.right	51	__viewNumber++;
86	theme: Chart.ChartThemeBrownSand
87
88	LineSeries {
89	name: "Line"
90	points: [
91	XyPoint { x: 0.0; y: 0.0 },
92	XyPoint { x: 1.1; y: 2.1 },
93	XyPoint { x: 2.9; y: 4.9 },
94	XyPoint { x: 3.2; y: 3.0 }
95	]
96	}
97
98	SplineSeries {
99	name: "Spline"
100	points: [
101	XyPoint { x: 0.0; y: 0.3 },
102	XyPoint { x: 1.1; y: 3.2 },
103	XyPoint { x: 2.17; y: 2.15 },
104	XyPoint { x: 4.17; y: 3.15 }
105	]
106	}
107
108	AreaSeries {
109	name: "Area"
110	points: [
111	XyPoint { x: 0.0; y: 1.1 },
112	XyPoint { x: 2.5; y: 3.6 },
113	XyPoint { x: 3.57; y: 2.55 }
114	]
115	lowerPoints: [
116	XyPoint { x: 0.0; y: 0.0 },
117	XyPoint { x: 2.5; y: 0.0 },
118	XyPoint { x: 3.57; y: 0.0 }
119	]
120	}
121
122	ScatterSeries {
123	name: "Scatter1"
124	points: [
125	XyPoint { x: 1.5; y: 1.5 },
126	XyPoint { x: 1.5; y: 1.6 },
127	XyPoint { x: 1.57; y: 1.55 }
128	]
129	}
130	ScatterSeries {
131	name: "Scatter2"
132	points: [
133	XyPoint { x: 2.0; y: 2.0 },
134	XyPoint { x: 2.0; y: 2.1 },
135	XyPoint { x: 2.07; y: 2.05 }
136	]
137	}
138	ScatterSeries {
139	name: "Scatter3"
140	points: [
141	XyPoint { x: 2.6; y: 2.6 },
142	XyPoint { x: 2.6; y: 2.7 },
143	XyPoint { x: 2.67; y: 2.65 }
144	]
145	}	52	}
146	}	53	}
147	}	54	}

test/qmlchart/resources.qrc +3 0

             <RCC>
                 <qresource prefix="/">
                     <file>qml/qmlchart/loader.qml</file>
                     <file>qml/qmlchart/main.qml</file>
+                    <file>qml/qmlchart/View1.qml</file>
+                    <file>qml/qmlchart/View2.qml</file>
+                    <file>qml/qmlchart/View3.qml</file>
                 </qresource>
             </RCC>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages