HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1930:54618a4a89cc

Improving QML chart properties tester usability

Tero Ahola -

r1930:54618a4a89cc

parent child

Context file:

r1930:54618a4a89cc

Collapse all files

tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorTitle.qml created 644 +35 0

@@ -0,0 +1,35
	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
	23	Flow {
	24	property variant chart
	25	anchors.fill: parent
	26	flow: Flow.TopToBottom
	27	spacing: 5
	28
	29	FontEditor {
	30	fontDescription: "title"
	31	function editedFont() {
	32	return chart.titleFont;
	33	}
	34	}
	35	}

tests/qmlchartproperties/qml/qmlchartproperties/ChartEditor.qml +32 -23

             /****************************************************************************
             **
             ** 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: chartEditor
                 property variant series // TODO: rename to chart
-                onSeriesChanged: loader.item.chart = series;
+                onSeriesChanged: {
+                    if (loader.item != undefined)
+                        loader.item.chart = series;
+                }
+                function selectButton(button) {
+                    chartButton.color = "#79bd8f";
+                    titleButton.color = "#79bd8f";
+                    legendButton.color = "#79bd8f";
+                    axisXButton.color = "#79bd8f";
+                    axisYButton.color = "#79bd8f";
+                    button.color = "#00a388";
+                }
                 Flow {
                     id: selectorFlow
                     anchors.top: parent.top
-                    height: 60
+                    height: 90
                     anchors.left: parent.left
                     anchors.right: parent.right
                     spacing: 5
                     flow: Flow.TopToBottom
                     Button {
                         id: chartButton
                         text: "Chart properties"
                         unpressedColor: "#79bd8f"
                         onClicked: {
-                            color = "#00a388";
+                            selectButton(chartButton);
-                            legendButton.color = "#79bd8f";
+                            loader.source = "ChartEditorProperties.qml";
-                            axisXButton.color = "#79bd8f";
+                            loader.item.chart = series;
-                            axisYButton.color = "#79bd8f";
-                            loader.source = "ChartEditor1.qml";
+                    Button {
+                        id: titleButton
+                        text: "Title properties"
+                        unpressedColor: "#79bd8f"
+                        onClicked: {
+                            selectButton(titleButton);
+                            loader.source = "ChartEditorTitle.qml";
                             loader.item.chart = series;
                         }
                     }
                     Button {
                         id: legendButton
                         text: "Legend properties"
                         unpressedColor: "#79bd8f"
                         onClicked: {
-                            color = "#00a388";
+                            selectButton(legendButton);
-                            chartButton.color = "#79bd8f";
+                            loader.source = "ChartEditorLegend.qml";
-                            axisXButton.color = "#79bd8f";
-                            axisYButton.color = "#79bd8f";
-                            loader.source = "ChartEditor2.qml";
                             loader.item.chartLegend = series.legend;
                         }
                     }
                     Button {
                         id: axisXButton
                         text: "Axis X properties"
                         unpressedColor: "#79bd8f"
                         onClicked: {
-                            color = "#00a388";
+                            selectButton(axisXButton);
-                            chartButton.color = "#79bd8f";
+                            loader.source = "ChartEditorAxis.qml";
-                            legendButton.color = "#79bd8f";
-                            axisYButton.color = "#79bd8f";
-                            loader.source = "ChartEditor3.qml";
                             loader.item.axis = series.axisX;
                         }
                     }
                     Button {
                         id: axisYButton
                         text: "Axis Y properties"
                         unpressedColor: "#79bd8f"
                         onClicked: {
-                            color = "#00a388";
+                            selectButton(axisYButton);
-                            chartButton.color = "#79bd8f";
+                            loader.source = "ChartEditorAxis.qml";
-                            legendButton.color = "#79bd8f";
-                            axisXButton.color = "#79bd8f";
-                            loader.source = "ChartEditor3.qml";
                             loader.item.axis = series.axisY;
                         }
                     }
                 }
                 Loader {
                     id: loader
                     anchors.top: selectorFlow.bottom
                     anchors.bottom: parent.bottom
                     anchors.left: parent.left
                     anchors.right: parent.right
                 }
             }

tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorAxis.qml ~~tests/qmlchartproperties/qml/qmlchartproperties/ChartEditor3.qml~~ renamed 0 -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
             Row {
                 anchors.fill: parent
                 spacing: 5
                 property variant axis
                 Flow {
-                    id: flow
                     spacing: 5
                     flow: Flow.TopToBottom
                     Button {
                         text: "axis visible"
                         onClicked: axis.visible = !axis.visible;
                     }
                     Button {
                         text: "axis grid visible"
                         onClicked: axis.gridVisible = !axis.gridVisible;
                     }
                     Button {
                         text: "axis color"
                         onClicked: axis.color = main.nextColor();
                     }
                     Button {
                         text: "axis labels color"
                         onClicked: axis.labelsColor = main.nextColor();
                     }
                     Button {
                         text: "axis labels angle +"
                         onClicked: axis.labelsAngle += 5;
                     }
                     Button {
                         text: "axis labels angle -"
                         onClicked: axis.labelsAngle -= 5;
                     }
                     Button {
                         text: "axis shades visible"
                         onClicked: axis.shadesVisible = !axis.shadesVisible;
                     }
                     Button {
                         text: "axis shades color"
                         onClicked: axis.shadesColor = main.nextColor();
                     }
                     Button {
                         text: "axis shades bcolor"
                         onClicked: axis.shadesBorderColor = main.nextColor();
                     }
                     Button {
                         text: "axis max +"
                         onClicked: axis.max += 0.1;
                     }
                     Button {
                         text: "axis max -"
                         onClicked: axis.max -= 0.1;
                     }
                     Button {
                         text: "axis min +"
                         onClicked: axis.min += 0.1;
                     }
                     Button {
                         text: "axis min -"
                         onClicked: axis.min -= 0.1;
                     }
                     Button {
                         text: "axis ticks count +"
                         onClicked: axis.ticksCount++;
                     }
                     Button {
                         text: "axis ticks count -"
                         onClicked: axis.ticksCount--;
                     }
                     Button {
                         text: "axis nice nmb"
                         onClicked: axis.niceNumbersEnabled = !axis.niceNumbersEnabled;
                     }
                 }
                 FontEditor {
                     id: fontEditor
                     fontDescription: "axis"
                     function editedFont() {
                         return axis.labelsFont;
                     }
                 }
             }

tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorLegend.qml ~~tests/qmlchartproperties/qml/qmlchartproperties/ChartEditor2.qml~~ renamed 0 0

NO CONTENT: file renamed from tests/qmlchartproperties/qml/qmlchartproperties/ChartEditor2.qml to tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorLegend.qml

tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorProperties.qml ~~tests/qmlchartproperties/qml/qmlchartproperties/ChartEditor1.qml~~ renamed +93 -105

@@ -1,132 +1,120
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		22
23	Row {	23	Flow {
24	anchors.fill: parent	24	anchors.fill: parent
25	spacing: 5
26	property variant chart	25	property variant chart
27		26	flow: Flow.TopToBottom
28	Flow {	27	spacing: 5
29	flow: Flow.TopToBottom	28	Button {
30	spacing: 5	29	text: "visible"
31	Button {	30	onClicked: chart.visible = !chart.visible;
32	text: "visible"
33	onClicked: chart.visible = !chart.visible;
34	}
35	Button {
36	text: "theme +"
37	onClicked: chart.theme++;
38	}
39	Button {
40	text: "theme -"
41	onClicked: chart.theme--;
42	}
43	Button {
44	text: "animation opt +"
45	onClicked: chart.animationOptions++;
46	}
47	Button {
48	text: "animation opt -"
49	onClicked: chart.animationOptions--;
50	}
51	Button {
52	text: "background color"
53	onClicked: chart.backgroundColor = main.nextColor();
54	}
55	Button {
56	text: "drop shadow enabled"
57	onClicked: chart.dropShadowEnabled = !chart.dropShadowEnabled;
58	}
59	Button {
60	text: "zoom +"
61	onClicked: chart.zoom(2);
62	}
63	Button {
64	text: "zoom -"
65	onClicked: chart.zoom(0.5);
66	}
67	Button {
68	text: "scroll left"
69	onClicked: chart.scrollLeft(10);
70	}
71	Button {
72	text: "scroll right"
73	onClicked: chart.scrollRight(10);
74	}
75	Button {
76	text: "scroll up"
77	onClicked: chart.scrollUp(10);
78	}
79	Button {
80	text: "scroll down"
81	onClicked: chart.scrollDown(10);
82	}
83	Button {
84	text: "title color"
85	onClicked: chart.titleColor = main.nextColor();
86	}
87	Button {
88	text: "zoom -"
89	onClicked: chart.zoom(0.5);
90	}
91	Button {
92	text: "top min margin +"
93	onClicked: chart.minimumMargins.top += 5;
94	}
95	Button {
96	text: "top min margin -"
97	onClicked: chart.minimumMargins.top -= 5;
98	}
99	Button {
100	text: "bottom min margin +"
101	onClicked: chart.minimumMargins.bottom += 5;
102	}
103	Button {
104	text: "bottom min margin -"
105	onClicked: chart.minimumMargins.bottom -= 5;
106	}
107	Button {
108	text: "left min margin +"
109	onClicked: chart.minimumMargins.left += 5;
110	}
111	Button {
112	text: "left min margin -"
113	onClicked: chart.minimumMargins.left -= 5;
114	}
115	Button {
116	text: "right min margin +"
117	onClicked: chart.minimumMargins.right += 5;
118	}
119	Button {
120	text: "right min margin -"
121	onClicked: chart.minimumMargins.right -= 5;
122	}
123	}	31	}
124		32	Button {
125	FontEditor {	33	text: "theme +"
126	id: fontEditor	34	onClicked: chart.theme++;
127	fontDescription: "title"	35	}
128	function editedFont() {	36	Button {
129	return chart.titleFont;	37	text: "theme -"
130	}	38	onClicked: chart.theme--;
		39	}
		40	Button {
		41	text: "animation opt +"
		42	onClicked: chart.animationOptions++;
		43	}
		44	Button {
		45	text: "animation opt -"
		46	onClicked: chart.animationOptions--;
		47	}
		48	Button {
		49	text: "background color"
		50	onClicked: chart.backgroundColor = main.nextColor();
		51	}
		52	Button {
		53	text: "drop shadow enabled"
		54	onClicked: chart.dropShadowEnabled = !chart.dropShadowEnabled;
		55	}
		56	Button {
		57	text: "zoom +"
		58	onClicked: chart.zoom(2);
		59	}
		60	Button {
		61	text: "zoom -"
		62	onClicked: chart.zoom(0.5);
		63	}
		64	Button {
		65	text: "scroll left"
		66	onClicked: chart.scrollLeft(10);
		67	}
		68	Button {
		69	text: "scroll right"
		70	onClicked: chart.scrollRight(10);
		71	}
		72	Button {
		73	text: "scroll up"
		74	onClicked: chart.scrollUp(10);
		75	}
		76	Button {
		77	text: "scroll down"
		78	onClicked: chart.scrollDown(10);
		79	}
		80	Button {
		81	text: "title color"
		82	onClicked: chart.titleColor = main.nextColor();
		83	}
		84	Button {
		85	text: "zoom -"
		86	onClicked: chart.zoom(0.5);
		87	}
		88	Button {
		89	text: "top min margin +"
		90	onClicked: chart.minimumMargins.top += 5;
		91	}
		92	Button {
		93	text: "top min margin -"
		94	onClicked: chart.minimumMargins.top -= 5;
		95	}
		96	Button {
		97	text: "bottom min margin +"
		98	onClicked: chart.minimumMargins.bottom += 5;
		99	}
		100	Button {
		101	text: "bottom min margin -"
		102	onClicked: chart.minimumMargins.bottom -= 5;
		103	}
		104	Button {
		105	text: "left min margin +"
		106	onClicked: chart.minimumMargins.left += 5;
		107	}
		108	Button {
		109	text: "left min margin -"
		110	onClicked: chart.minimumMargins.left -= 5;
		111	}
		112	Button {
		113	text: "right min margin +"
		114	onClicked: chart.minimumMargins.right += 5;
		115	}
		116	Button {
		117	text: "right min margin -"
		118	onClicked: chart.minimumMargins.right -= 5;
131	}	119	}
132	}	120	}

tests/qmlchartproperties/qml/qmlchartproperties/FontEditor.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
             Flow {
                 flow: Flow.TopToBottom
                 spacing: 5
                 property string fontDescription: ""
                 Button {
                     text: fontDescription + " bold"
                     onClicked: editedFont().bold = !editedFont().bold;
                 }
                 Button {
                     text: fontDescription + " capitalization"
                     onClicked: editedFont().capitalization++;
                 }
                 Button {
-                    text: fontDescription + " family"
+                    text: fontDescription + " font family"
                     onClicked: editedFont().family = "courier";
                 }
                 Button {
                     text: fontDescription + " font italic"
                     onClicked: editedFont().italic = !editedFont().italic;
                 }
                 Button {
                     text: fontDescription + " letterSpacing +"
                     onClicked: editedFont().letterSpacing++;
                 }
                 Button {
                     text: fontDescription + " letterSpacing -"
                     onClicked: editedFont().letterSpacing--;
                 }
                 Button {
                     text: fontDescription + " pixelSize +"
                     onClicked: editedFont().pixelSize++;
                 }
                 Button {
                     text: fontDescription + " pixelSize -"
                     onClicked: editedFont().pixelSize--;
                 }
                 Button {
                     text: fontDescription + " pointSize +"
                     onClicked: editedFont().pointSize++;
                 }
                 Button {
                     text: fontDescription + " pointSize -"
                     onClicked: editedFont().pointSize--;
                 }
                 Button {
                     text: fontDescription + " strikeout"
                     onClicked: editedFont().strikeout = !editedFont().strikeout;
                 }
                 Button {
                     text: fontDescription + " underline"
                     onClicked: editedFont().underline = !editedFont().underline;
                 }
                 Button {
                     text: fontDescription + " weight +"
                     onClicked: editedFont().weight++;
                 }
                 Button {
                     text: fontDescription + " weight -"
                     onClicked: editedFont().weight--;
                 }
                 Button {
                     text: fontDescription + " wordSpacing +"
                     onClicked: editedFont().wordSpacing++;
                 }
                 Button {
                     text: fontDescription + " wordSpacing -"
                     onClicked: editedFont().wordSpacing--;
                 }
             }

tests/qmlchartproperties/resources.qrc +4 -3

             <RCC>
                 <qresource prefix="/">
                     <file>qml/qmlchartproperties/loader.qml</file>
                     <file>qml/qmlchartproperties/main.qml</file>
                     <file>qml/qmlchartproperties/Button.qml</file>
                     <file>qml/qmlchartproperties/PieChart.qml</file>
                     <file>qml/qmlchartproperties/PieEditor.qml</file>
                     <file>qml/qmlchartproperties/LineChart.qml</file>
                     <file>qml/qmlchartproperties/LineEditor.qml</file>
                     <file>qml/qmlchartproperties/SplineChart.qml</file>
                     <file>qml/qmlchartproperties/ScatterChart.qml</file>
                     <file>qml/qmlchartproperties/AreaChart.qml</file>
                     <file>qml/qmlchartproperties/BarChart.qml</file>
                     <file>qml/qmlchartproperties/BarEditor.qml</file>
                     <file>qml/qmlchartproperties/ScatterEditor.qml</file>
                     <file>qml/qmlchartproperties/AreaEditor.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>
-                    <file>qml/qmlchartproperties/ChartEditor1.qml</file>
-                    <file>qml/qmlchartproperties/ChartEditor2.qml</file>
-                    <file>qml/qmlchartproperties/ChartEditor3.qml</file>
                     <file>qml/qmlchartproperties/FontEditor.qml</file>
                     <file>qml/qmlchartproperties/HorizontalBarChart.qml</file>
                     <file>qml/qmlchartproperties/HorizontalPercentBarChart.qml</file>
                     <file>qml/qmlchartproperties/HorizontalStackedBarChart.qml</file>
+                    <file>qml/qmlchartproperties/ChartEditorAxis.qml</file>
+                    <file>qml/qmlchartproperties/ChartEditorLegend.qml</file>
+                    <file>qml/qmlchartproperties/ChartEditorProperties.qml</file>
+                    <file>qml/qmlchartproperties/ChartEditorTitle.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