HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1357:13ffac597ff0

Qml ChartView properties; legend to use Qt alignments

Tero Ahola -

r1357:13ffac597ff0

parent child

Context file:

r1357:13ffac597ff0

Collapse all files

tests/qmlchartproperties/qml/qmlchartproperties/ChartEditor.qml created 644 +94 0

@@ -0,0 +1,94
	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
	25	Flow {
	26	id: flow
	27	spacing: 5
	28	flow: Flow.TopToBottom
	29	property variant series // TODO: rename to chart
	30
	31	Connections {
	32	target: series
	33	onVisibleChanged: console.log("chart.onVisibleChanged: " + series.visible);
	34	onThemeChanged: console.log("chart.onThemeChanged: " + series.theme);
	35	onLegendChanged: console.log("chart.onLegendChanged: " + series.legend);
	36	onAnimationOptionsChanged: console.log("chart.onAnimationOptionsChanged: " + series.animationOptions);
	37	onTitleColorChanged: console.log("chart.onTitleColorChanged: " + series.titleColor);
	38	onBackgroundColorChanged: console.log("chart.onBackgroundColorChanged: " + series.backgroundColor);
	39	}
	40	Connections {
	41	target: series.legend
	42	onAlignmentChanged: console.log("legend.onAlignmentChanged: " + series.legend.alignment);
	43	onVisibleChanged: console.log("legend.onVisibleChanged: " + series.legend.visible);
	44	}
	45
	46	Button {
	47	text: "visible"
	48	onClicked: series.visible = !series.visible;
	49	}
	50	Button {
	51	text: "theme +"
	52	onClicked: series.theme++;
	53	}
	54	Button {
	55	text: "theme -"
	56	onClicked: series.theme--;
	57	}
	58	Button {
	59	text: "legend top"
	60	onClicked: series.legend.alignment ^= Qt.AlignTop;
	61	}
	62	Button {
	63	text: "legend bottom"
	64	onClicked: series.legend.alignment ^= Qt.AlignBottom;
	65	}
	66	Button {
	67	text: "legend left"
	68	onClicked: series.legend.alignment ^= Qt.AlignLeft;
	69	}
	70	Button {
	71	text: "legend right"
	72	onClicked: series.legend.alignment ^= Qt.AlignRight;
	73	}
	74	Button {
	75	text: "legend visible"
	76	onClicked: series.legend.visible = !series.legend.visible;
	77	}
	78	Button {
	79	text: "animation opt +"
	80	onClicked: series.animationOptions++;
	81	}
	82	Button {
	83	text: "animation opt -"
	84	onClicked: series.animationOptions--;
	85	}
	86	Button {
	87	text: "title color"
	88	onClicked: series.titleColor = main.nextColor();
	89	}
	90	Button {
	91	text: "background color"
	92	onClicked: series.backgroundColor = main.nextColor();
	93	}
	94	}

demos/chartthemes/themewidget.cpp +5 -5

             {
                 QComboBox* legendComboBox = new QComboBox();
                 legendComboBox->addItem("No Legend ", 0);
-                legendComboBox->addItem("Legend Top", QLegend::AlignmentTop);
+                legendComboBox->addItem("Legend Top", Qt::AlignTop);
-                legendComboBox->addItem("Legend Bottom", QLegend::AlignmentBottom);
+                legendComboBox->addItem("Legend Bottom", Qt::AlignBottom);
-                legendComboBox->addItem("Legend Left", QLegend::AlignmentLeft);
+                legendComboBox->addItem("Legend Left", Qt::AlignLeft);
-                legendComboBox->addItem("Legend Right", QLegend::AlignmentRight);
+                legendComboBox->addItem("Legend Right", Qt::AlignRight);
                 return legendComboBox;
             }
                         chartView->chart()->setAnimationOptions(options);
                 }
-                QLegend::Alignments alignment(m_legendComboBox->itemData(m_legendComboBox->currentIndex()).toInt());
+                Qt::Alignment alignment(m_legendComboBox->itemData(m_legendComboBox->currentIndex()).toInt());
                 if (!alignment) {
                     foreach (QChartView *chartView, m_charts) {

examples/barchart/main.cpp +1 -1

             //![4]
                 chart->legend()->setVisible(true);
-                chart->legend()->setAlignment(QLegend::AlignmentBottom);
+                chart->legend()->setAlignment(Qt::AlignBottom);
                 chart->axisY()->setNiceNumbersEnabled(true);
             //![4]

examples/groupedbarchart/main.cpp +1 -1

             //![5]
                 chart->legend()->setVisible(true);
-                chart->legend()->setAlignment(QLegend::AlignmentBottom);
+                chart->legend()->setAlignment(Qt::AlignBottom);
                 chart->axisY()->setNiceNumbersEnabled(true);
             //![5]

examples/legend/mainwidget.cpp +1 -1

                 m_chart->setTitle("Legend detach example");
                 m_chart->legend()->setVisible(true);
-                m_chart->legend()->setAlignment(QLegend::AlignmentBottom);
+                m_chart->legend()->setAlignment(Qt::AlignBottom);
                 m_chart->axisY()->setNiceNumbersEnabled(true);
                 m_chartView->setRenderHint(QPainter::Antialiasing);

examples/percentbarchart/main.cpp +1 -1

             //![5]
                 chart->legend()->setVisible(true);
-                chart->legend()->setAlignment(QLegend::AlignmentBottom);
+                chart->legend()->setAlignment(Qt::AlignBottom);
             //![5]
             //![6]

examples/piechartdrilldown/main.cpp +1 -1

                 chart->setTheme(QChart::ChartThemeLight);
                 chart->setAnimationOptions(QChart::AllAnimations);
                 chart->legend()->setVisible(true);
-                chart->legend()->setAlignment(QLegend::AlignmentRight);
+                chart->legend()->setAlignment(Qt::AlignRight);
                 QPieSeries* yearSeries = new QPieSeries(&window);
                 yearSeries->setName("Sales by year - All");

examples/stackedbarchart/main.cpp +1 -1

             //![5]
                 chart->legend()->setVisible(true);
-                chart->legend()->setAlignment(QLegend::AlignmentBottom);
+                chart->legend()->setAlignment(Qt::AlignBottom);
                 chart->axisY()->setNiceNumbersEnabled(true);
             //![5]

examples/stackedbarchartdrilldown/main.cpp +1 -1

                 drilldownChart->axisX()->setGridLineVisible(false);
                 drilldownChart->axisY()->setNiceNumbersEnabled(true);
                 drilldownChart->legend()->setVisible(true);
-                drilldownChart->legend()->setAlignment(QLegend::AlignmentBottom);
+                drilldownChart->legend()->setAlignment(Qt::AlignBottom);
             //! [7]
                 QChartView *chartView = new QChartView(drilldownChart);

plugins/declarative/declarativechart.cpp +53 -34

@@ -31,8 +31,7 QTCOMMERCIALCHART_BEGIN_NAMESPACE
31		31
32	DeclarativeChart::DeclarativeChart(QDeclarativeItem *parent)	32	DeclarativeChart::DeclarativeChart(QDeclarativeItem *parent)
33	: QDeclarativeItem(parent),	33	: QDeclarativeItem(parent),
34	m_chart(new QChart(this)),	34	m_chart(new QChart(this))
35	m_legend(LegendTop)
36	{	35	{
37	setFlag(QGraphicsItem::ItemHasNoContents, false);	36	setFlag(QGraphicsItem::ItemHasNoContents, false);
38	// m_chart->axisX()->setNiceNumbersEnabled(false);	37	// m_chart->axisX()->setNiceNumbersEnabled(false);
@@ -88,7 +87,11 void DeclarativeChart::paint(QPainter painter, const QStyleOptionGraphicsItem
88		87
89	void DeclarativeChart::setTheme(DeclarativeChart::Theme theme)	88	void DeclarativeChart::setTheme(DeclarativeChart::Theme theme)
90	{	89	{
91	~~m_chart~~->~~setTheme~~((QChart::ChartTheme) theme);	90	QChart::ChartTheme chartTheme = (QChart::ChartTheme) theme;
		91	if (chartTheme != m_chart->theme()) {
		92	m_chart->setTheme(chartTheme);
		93	themeChanged();
		94	}
92	}	95	}
93		96
94	DeclarativeChart::Theme DeclarativeChart::theme()	97	DeclarativeChart::Theme DeclarativeChart::theme()
@@ -98,7 +101,11 DeclarativeChart::Theme DeclarativeChart::theme()
98		101
99	void DeclarativeChart::setAnimationOptions(DeclarativeChart::Animation animations)	102	void DeclarativeChart::setAnimationOptions(DeclarativeChart::Animation animations)
100	{	103	{
101	~~m_chart~~->~~set~~AnimationOptions((QChart::AnimationOption) animations);	104	QChart::AnimationOption animationOptions = (QChart::AnimationOption) animations;
		105	if (animationOptions != m_chart->animationOptions()) {
		106	m_chart->setAnimationOptions(animationOptions);
		107	animationOptionsChanged();
		108	}
102	}	109	}
103		110
104	DeclarativeChart::Animation DeclarativeChart::animationOptions()	111	DeclarativeChart::Animation DeclarativeChart::animationOptions()
@@ -113,40 +120,16 DeclarativeChart::Animation DeclarativeChart::animationOptions()
113	return DeclarativeChart::NoAnimation;	120	return DeclarativeChart::NoAnimation;
114	}	121	}
115		122
116	void DeclarativeChart::set~~Legend~~(~~DeclarativeChart~~::~~Legend~~ le~~gend~~)	123	void DeclarativeChart::setTitle(QString title)
117	{	124	{
118	if (le~~gend~~ != m_~~legend~~) {	125	if (title != m_chart->title()) {
119	m_legend = legend;	126	m_chart->setTitle(title);
120	~~switch~~ (~~m_legend~~) {	127	emit titleChanged();
121	case LegendDisabled:
122	m_chart->legend()->setVisible(false);
123	break;
124	case LegendTop:
125	m_chart->legend()->setVisible(true);
126	m_chart->legend()->setAlignment(QLegend::AlignmentTop);
127	break;
128	case LegendBottom:
129	m_chart->legend()->setVisible(true);
130	m_chart->legend()->setAlignment(QLegend::AlignmentBottom);
131	break;
132	case LegendLeft:
133	m_chart->legend()->setVisible(true);
134	m_chart->legend()->setAlignment(QLegend::AlignmentLeft);
135	break;
136	case LegendRight:
137	m_chart->legend()->setVisible(true);
138	m_chart->legend()->setAlignment(QLegend::AlignmentRight);
139	break;
140	default:
141	m_chart->legend()->setVisible(false);
142	break;
143	}	128	}
144	}	129	}
145	}	130	QString DeclarativeChart::title()
146
147	DeclarativeChart::Legend DeclarativeChart::legend()
148	{	131	{
149	return m_~~legend~~;	132	return m_chart->title();
150	}	133	}
151		134
152	QAxis *DeclarativeChart::axisX()	135	QAxis *DeclarativeChart::axisX()
@@ -159,6 +142,11 QAxis *DeclarativeChart::axisY()
159	return m_chart->axisY();	142	return m_chart->axisY();
160	}	143	}
161		144
		145	QLegend *DeclarativeChart::legend()
		146	{
		147	return m_chart->legend();
		148	}
		149
162	QVariantList DeclarativeChart::axisXLabels()	150	QVariantList DeclarativeChart::axisXLabels()
163	{	151	{
164	QVariantList labels;	152	QVariantList labels;
@@ -181,6 +169,37 void DeclarativeChart::setAxisXLabels(QVariantList list)
181	value = element;	169	value = element;
182	}	170	}
183	}	171	}
		172	emit axisLabelsChanged();
		173	}
		174
		175	void DeclarativeChart::setTitleColor(QColor color)
		176	{
		177	QBrush b = m_chart->titleBrush();
		178	if (color != b.color()) {
		179	b.setColor(color);
		180	m_chart->setTitleBrush(b);
		181	emit titleColorChanged();
		182	}
		183	}
		184
		185	QColor DeclarativeChart::titleColor()
		186	{
		187	return m_chart->titleBrush().color();
		188	}
		189
		190	void DeclarativeChart::setBackgroundColor(QColor color)
		191	{
		192	QBrush b = m_chart->backgroundBrush();
		193	if (color != b.color()) {
		194	b.setColor(color);
		195	m_chart->setBackgroundBrush(b);
		196	emit backgroundColorChanged();
		197	}
		198	}
		199
		200	QColor DeclarativeChart::backgroundColor()
		201	{
		202	return m_chart->backgroundBrush().color();
184	}	203	}
185		204
186	int DeclarativeChart::count()	205	int DeclarativeChart::count()

plugins/declarative/declarativechart.h +22 -19

             //class DeclarativeChart : public QQuickPaintedItem, public Chart
             {
                 Q_OBJECT
-                Q_PROPERTY(Theme theme READ theme WRITE setTheme)
+                Q_PROPERTY(Theme theme READ theme WRITE setTheme NOTIFY themeChanged)
-                Q_PROPERTY(Animation animationOptions READ animationOptions WRITE setAnimationOptions)
+                Q_PROPERTY(Animation animationOptions READ animationOptions WRITE setAnimationOptions NOTIFY animationOptionsChanged)
-                Q_PROPERTY(QString title READ title WRITE setTitle)
+                Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged)
-                Q_PROPERTY(Legend legend READ legend WRITE setLegend)
                 Q_PROPERTY(QAxis *axisX READ axisX)
                 Q_PROPERTY(QAxis *axisY READ axisY)
+                Q_PROPERTY(QLegend *legend READ legend)
                 // TODO: how to define axis labels? This is not very convenient
-                Q_PROPERTY(QVariantList axisXLabels READ axisXLabels WRITE setAxisXLabels)
+                Q_PROPERTY(QVariantList axisXLabels READ axisXLabels WRITE setAxisXLabels NOTIFY axisLabelsChanged)
                 Q_PROPERTY(int count READ count)
+                Q_PROPERTY(QColor titleColor READ titleColor WRITE setTitleColor NOTIFY titleColorChanged)
+                Q_PROPERTY(QColor backgroundColor READ backgroundColor WRITE setBackgroundColor NOTIFY backgroundColorChanged)
                 Q_ENUMS(Animation)
                 Q_ENUMS(Theme)
-                Q_ENUMS(Legend)
                 Q_ENUMS(SeriesType)
             public:
                     AllAnimations = 0x3
                 };
-                enum Legend {
-                    LegendDisabled = 0,
-                    LegendTop,
-                    LegendBottom,
-                    LegendLeft,
-                    LegendRight
-                };
                 enum SeriesType {
                     SeriesTypeLine,
                     SeriesTypeArea,
                 DeclarativeChart::Theme theme();
                 void setAnimationOptions(DeclarativeChart::Animation animations);
                 DeclarativeChart::Animation animationOptions();
-                void setTitle(QString title) {m_chart->setTitle(title);}
+                void setTitle(QString title);
-                QString title() { return m_chart->title();}
+                QString title();
-                void setLegend(DeclarativeChart::Legend legend);
-                DeclarativeChart::Legend legend();
                 QAxis *axisX();
                 QAxis *axisY();
+                QLegend *legend();
                 QVariantList axisXLabels();
                 void setAxisXLabels(QVariantList list);
+                void setTitleColor(QColor color);
+                QColor titleColor();
+                void setBackgroundColor(QColor color);
+                QColor backgroundColor();
                 int count();
                 Q_INVOKABLE QAbstractSeries *series(int index);
                 Q_INVOKABLE QAbstractSeries *series(QString seriesName);
                 Q_INVOKABLE QAbstractSeries *createSeries(DeclarativeChart::SeriesType type, QString name = "");
+            Q_SIGNALS:
+                void themeChanged();
+                void animationOptionsChanged();
+                void titleChanged();
+                void axisLabelsChanged();
+                void titleColorChanged();
+                void backgroundColorChanged();
             public:
                 // Extending QChart with DeclarativeChart is not possible because QObject does not support
                 // multi inheritance, so we now have a QChart as a member instead
                 QChart *m_chart;
-                Legend m_legend;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

plugins/declarative/plugin.cpp +2 0

                     qmlRegisterType<QHBarModelMapper>(uri, 1, 0, "HBarModelMapper");
                     qmlRegisterType<QVBarModelMapper>(uri, 1, 0, "VBarModelMapper");
+                    qmlRegisterUncreatableType<QLegend>(uri, 1, 0, "Legend",
+                                                      QLatin1String("Trying to create uncreatable: Legend."));
                     qmlRegisterUncreatableType<QScatterSeries>(uri, 1, 0, "QScatterSeries",
                                                       QLatin1String("Trying to create uncreatable: QScatterSeries."));
                     qmlRegisterUncreatableType<QPieSeries>(uri, 1, 0, "QPieSeries",

src/chartpresenter.cpp +4 -4

                     // Reserve some space for legend
                     switch (legend->alignment()) {
-                    case QLegend::AlignmentTop: {
+                    case Qt::AlignTop: {
                         int ledgendSize = legend->minHeight();
                         int topPadding = 2*m_marginTiny + titleSize.height() + ledgendSize + m_marginTiny;
                         m_chartMargins = QRect(QPoint(m_chartMargins.left(),topPadding),QPoint(m_chartMargins.right(),m_chartMargins.bottom()));
                         titlePadding = m_marginTiny + m_marginTiny;
                         break;
                     }
-                    case QLegend::AlignmentBottom: {
+                    case Qt::AlignBottom: {
                         int ledgendSize = legend->minHeight();
                         int bottomPadding = m_marginTiny + m_marginSmall + ledgendSize + m_marginTiny + m_minBottomMargin;
                         m_chartMargins = QRect(QPoint(m_chartMargins.left(),m_chartMargins.top()),QPoint(m_chartMargins.right(),bottomPadding));
                         titlePadding = m_chartMargins.top()/2;
                         break;
                     }
-                    case QLegend::AlignmentLeft: {
+                    case Qt::AlignLeft: {
                         int ledgendSize = legend->minWidth();
                         int leftPadding = m_marginTiny + m_marginSmall + ledgendSize + m_marginTiny + m_minLeftMargin;
                         m_chartMargins = QRect(QPoint(leftPadding,m_chartMargins.top()),QPoint(m_chartMargins.right(),m_chartMargins.bottom()));
                         titlePadding = m_chartMargins.top()/2;
                         break;
                     }
-                    case QLegend::AlignmentRight: {
+                    case Qt::AlignRight: {
                         int ledgendSize = legend->minWidth();
                         int rightPadding = m_marginTiny + m_marginSmall + ledgendSize + m_marginTiny;
                         m_chartMargins = QRect(QPoint(m_chartMargins.left(),m_chartMargins.top()),QPoint(rightPadding,m_chartMargins.bottom()));

src/legend/qlegend.cpp +23 -20

             */
             /*!
-             \enum QLegend::Alignment
+                \fn void QLegend::alignmentChanged()
+                Emitted when the alignment of the legend changes.
-             This enum describes the possible position for legend inside chart.
-             \value AlignmentTop
-             \value AlignmentBottom
-             \value AlignmentLeft
-             \value AlignmentRight
             */
             /*!
             }
             /*!
-             Sets the \a alignment for legend. Legend tries to paint itself on the defined position in chart.
+                \property QLegend::alignment
+                \brief The alignment of the legend.
+            */
+            /*!
+                Sets the \a alignment for legend. Legend paints on the defined position in chart. The following alignments are
+                supported: Qt::AlignTop, Qt::AlignBottom, Qt::AlignLeft, Qt::AlignRight. If you set more than one flag the result
+                is undefined.
                 \sa QLegend::Alignment
              */
-            void QLegend::setAlignment(QLegend::Alignments alignment)
+            void QLegend::setAlignment(Qt::Alignment alignment)
             {
                 if(d_ptr->m_alignment!=alignment) {
                     d_ptr->m_alignment = alignment;
                     d_ptr->updateLayout();
+                    alignmentChanged();
                 }
             }
             /*!
              Returns the preferred layout for legend
              */
-            QLegend::Alignments QLegend::alignment() const
+            Qt::Alignment QLegend::alignment() const
             {
                 return d_ptr->m_alignment;
             }
                 m_presenter(presenter),
                 m_chart(chart),
                 m_markers(new QGraphicsItemGroup(q)),
-                m_alignment(QLegend::AlignmentTop),
+                m_alignment(Qt::AlignTop),
                 m_offsetX(0),
                 m_offsetY(0),
                 m_minWidth(0),
                 switch(m_alignment) {
-                    case QLegend::AlignmentTop:
+                    case Qt::AlignTop:
-                    case QLegend::AlignmentBottom: {
+                    case Qt::AlignBottom: {
                         if(m_width<=m_rect.width()) return;
                         if (x != m_offsetX) {
                         }
                         break;
                     }
-                    case QLegend::AlignmentLeft:
+                    case Qt::AlignLeft:
-                    case QLegend::AlignmentRight: {
+                    case Qt::AlignRight: {
                         if(m_height<=m_rect.height()) return;
                 switch(m_alignment) {
-                    case QLegend::AlignmentTop:
+                    case Qt::AlignTop:
-                    case QLegend::AlignmentBottom: {
+                    case Qt::AlignBottom: {
                         QPointF point = m_rect.topLeft();
                         m_width = 0;
                         foreach (QGraphicsItem *item, items) {
                         m_height=m_minHeight;
                     }
                     break;
-                    case QLegend::AlignmentLeft:
+                    case Qt::AlignLeft:
-                    case QLegend::AlignmentRight: {
+                    case Qt::AlignRight: {
                         QPointF point = m_rect.topLeft();
                         m_height = 0;
                         foreach (QGraphicsItem *item, items) {

src/legend/qlegend.h +6 -13

             class QTCOMMERCIALCHART_EXPORT QLegend : public QGraphicsWidget
             {
                 Q_OBJECT
-            public:
+                Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment NOTIFY alignmentChanged)
-                // We only support these alignments (for now)
-                enum Alignment {
-                    AlignmentTop = Qt::AlignTop,
-                    AlignmentBottom = Qt::AlignBottom,
-                    AlignmentLeft = Qt::AlignLeft,
-                    AlignmentRight = Qt::AlignRight
-                };
-                Q_DECLARE_FLAGS(Alignments, Alignment)
             private:
                 explicit QLegend(QChart *chart);
                 void setPen(const QPen &pen);
                 QPen pen() const;
-                void setAlignment(QLegend::Alignments alignment);
+                void setAlignment(Qt::Alignment alignment);
-                QLegend::Alignments alignment() const;
+                Qt::Alignment alignment() const;
                 void detachFromChart();
                 void attachToChart();
                 void hideEvent(QHideEvent *event);
                 void showEvent(QShowEvent *event);
+            Q_SIGNALS:
+                void alignmentChanged();
             private:
                 QScopedPointer<QLegendPrivate> d_ptr;
                 Q_DISABLE_COPY(QLegend);

src/legend/qlegend_p.h +1 -1

                 ChartPresenter *m_presenter;
                 QChart* m_chart;
                 QGraphicsItemGroup* m_markers;
-                QLegend::Alignments m_alignment;
+                Qt::Alignment m_alignment;
                 QBrush m_brush;
                 QPen m_pen;
                 QRectF m_rect;

tests/qmlchartproperties/qml/qmlchartproperties/Chart.qml ~~tests/qmlchartproperties/qml/qmlchartproperties/View1.qml~~ renamed +5 -18

@@ -21,16 +21,14
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 {
25	anchors.fill: parent
26
27	ChartView {	24	ChartView {
28	title: "spline series"	25	id: chartView
		26	title: "chart"
29	anchors.fill: parent	27	anchors.fill: parent
		28	property variant series: chartView
30		29
31	~~Spl~~ineSeries {	30	LineSeries {
32	id: daSeries	31	name: "line"
33	name: "spline 1"
34	XyPoint { x: 0; y: 0 }	32	XyPoint { x: 0; y: 0 }
35	XyPoint { x: 1.1; y: 2.1 }	33	XyPoint { x: 1.1; y: 2.1 }
36	XyPoint { x: 1.9; y: 3.3 }	34	XyPoint { x: 1.9; y: 3.3 }
@@ -39,15 +37,4 Rectangle {
39	XyPoint { x: 3.4; y: 3.0 }	37	XyPoint { x: 3.4; y: 3.0 }
40	XyPoint { x: 4.1; y: 3.3 }	38	XyPoint { x: 4.1; y: 3.3 }
41	}	39	}
42
43	SplineSeries {
44	name: "spline 2"
45	XyPoint { x: 1.1; y: 1.1 }
46	XyPoint { x: 1.9; y: 2.3 }
47	XyPoint { x: 2.1; y: 1.1 }
48	XyPoint { x: 2.9; y: 3.9 }
49	XyPoint { x: 3.4; y: 2.0 }
50	XyPoint { x: 4.1; y: 2.3 }
51	}
52	}
53	}	40	}

tests/qmlchartproperties/qml/qmlchartproperties/main.qml +14 -11

                 width: parent.width
                 height: parent.height
                 property int viewNumber: 0
-                property int viewCount: 9
+                property int viewCount: 10
                 property variant colors: ["#637D74", "#403D3A", "#8C3B3B", "#AB6937", "#D4A960"]
                 property int colorIndex: 0
                 onViewNumberChanged: {
                     if (viewNumber == 0) {
+                        chartLoader.source = "Chart.qml";
+                        editorLoader.source = "ChartEditor.qml";
+                    } else if (viewNumber == 1) {
                         chartLoader.source = "PieChart.qml";
                         editorLoader.source = "PieEditor.qml";
-                    } else if (viewNumber == 1) {
+                    } else if (viewNumber == 2) {
                         chartLoader.source = "LineChart.qml";
                         editorLoader.source = "LineEditor.qml";
-                    } else if (viewNumber == 2) {
+                    } else if (viewNumber == 3) {
                         chartLoader.source = "SplineChart.qml";
                         editorLoader.source = "LineEditor.qml";
-                    } else if (viewNumber == 3) {
+                    } else if (viewNumber == 4) {
                         chartLoader.source = "ScatterChart.qml";
                         editorLoader.source = "ScatterEditor.qml";
-                    } else if (viewNumber == 4) {
+                    } else if (viewNumber == 5) {
                         chartLoader.source = "AreaChart.qml";
                         editorLoader.source = "AreaEditor.qml";
-                    } else if (viewNumber == 5) {
+                    } else if (viewNumber == 6) {
                         chartLoader.source = "BarChart.qml";
                         editorLoader.source = "BarEditor.qml";
-                    } else if (viewNumber == 6) {
+                    } else if (viewNumber == 7) {
                         chartLoader.source = "GroupedBarChart.qml";
                         editorLoader.source = "BarEditor.qml";
-                    } else if (viewNumber == 7) {
+                    } else if (viewNumber == 8) {
                         chartLoader.source = "StackedBarChart.qml";
                         editorLoader.source = "BarEditor.qml";
-                    } else if (viewNumber == 8) {
+                    } else if (viewNumber == 9) {
                         chartLoader.source = "PercentBarChart.qml";
                         editorLoader.source = "BarEditor.qml";
                     } else {
                         id: chartLoader
                         width: main.width - editorLoader.width
                         height: parent.height
-                        source: "PieChart.qml"
+                        source: "Chart.qml"
                         onStatusChanged: {
                             console.log("chartLoader.status: " + status + " " + source);
                             if (status == Loader.Ready && editorLoader.status == Loader.Ready)
                         id: editorLoader
                         width: 280
                         height: parent.height
-                        source: "PieEditor.qml"
+                        source: "ChartEditor.qml"
                         onStatusChanged: {
                             console.log("editorLoader.status: " + status + " " + source);
                             if (status == Loader.Ready && chartLoader.status == Loader.Ready)

tests/qmlchartproperties/resources.qrc +2 0

                     <file>qml/qmlchartproperties/GroupedBarChart.qml</file>
                     <file>qml/qmlchartproperties/StackedBarChart.qml</file>
                     <file>qml/qmlchartproperties/PercentBarChart.qml</file>
+                    <file>qml/qmlchartproperties/Chart.qml</file>
+                    <file>qml/qmlchartproperties/ChartEditor.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