summaryrefslogtreecommitdiffstats
path: root/tests/manual
diff options
context:
space:
mode:
authorTitta Heikkala <titta.heikkala@theqtcompany.com>2015-09-22 09:54:20 +0300
committerTitta Heikkala <titta.heikkala@theqtcompany.com>2015-09-22 08:38:25 +0000
commit4c1d3bc34edbea5f7ed8f145d4c11198b7610a53 (patch)
tree21b3d4cc180226833508f1a8d2b198f151513417 /tests/manual
parent79dc9c599f412117d04cb1ba8c0c9af93bb0b9de (diff)
Added option to set labels clipping
It's now possible to enable and disable the point label clipping. The clipping is enabled by default. Clipping cuts the point labels on the edge of the plot area. Change-Id: Ifaa6017b4c6d55fe030effeec8b336a7fc317adf Task-number: QTRD-3520 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Diffstat (limited to 'tests/manual')
-rw-r--r--tests/manual/qmlchartproperties/qml/qmlchartproperties/AreaChart.qml2
-rw-r--r--tests/manual/qmlchartproperties/qml/qmlchartproperties/AreaEditor.qml4
-rw-r--r--tests/manual/qmlchartproperties/qml/qmlchartproperties/LineChart.qml2
-rw-r--r--tests/manual/qmlchartproperties/qml/qmlchartproperties/LineEditor.qml4
-rw-r--r--tests/manual/qmlchartproperties/qml/qmlchartproperties/ScatterChart.qml2
-rw-r--r--tests/manual/qmlchartproperties/qml/qmlchartproperties/ScatterEditor.qml8
-rw-r--r--tests/manual/qmlchartproperties/qml/qmlchartproperties/SplineChart.qml2
7 files changed, 24 insertions, 0 deletions
diff --git a/tests/manual/qmlchartproperties/qml/qmlchartproperties/AreaChart.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/AreaChart.qml
index 3f2a87bf..020cbdeb 100644
--- a/tests/manual/qmlchartproperties/qml/qmlchartproperties/AreaChart.qml
+++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/AreaChart.qml
@@ -79,6 +79,8 @@ ChartView {
+ font.family);
onPointLabelsColorChanged: console.log(name + ".onPointLabelsColorChanged: "
+ color);
+ onPointLabelsClippingChanged: console.log(name + ".onPointLabelsClippingChanged: "
+ + clipping);
onPressed: console.log(name + ".onPressed: " + point.x + ", " + point.y);
onReleased: console.log(name + ".onReleased: " + point.x + ", " + point.y);
onDoubleClicked: console.log(name + ".onDoubleClicked: " + point.x + ", " + point.y);
diff --git a/tests/manual/qmlchartproperties/qml/qmlchartproperties/AreaEditor.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/AreaEditor.qml
index 79cc84d9..23ed70ea 100644
--- a/tests/manual/qmlchartproperties/qml/qmlchartproperties/AreaEditor.qml
+++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/AreaEditor.qml
@@ -79,6 +79,10 @@ Flow {
onClicked: series.pointLabelsColor = main.nextColor();
}
Button {
+ text: "point labels clipping"
+ onClicked: series.pointLabelsClipping = !series.pointLabelsClipping;
+ }
+ Button {
id: upperButton
text: "upper series"
unpressedColor: "#79bd8f"
diff --git a/tests/manual/qmlchartproperties/qml/qmlchartproperties/LineChart.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/LineChart.qml
index f1eaaa45..784a575c 100644
--- a/tests/manual/qmlchartproperties/qml/qmlchartproperties/LineChart.qml
+++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/LineChart.qml
@@ -60,6 +60,8 @@ ChartView {
+ font.family);
onPointLabelsColorChanged: console.log("lineSeries.onPointLabelsColorChanged: "
+ color);
+ onPointLabelsClippingChanged: console.log("lineSeries.onPointLabelsClippingChanged: "
+ + clipping);
onPressed: console.log(name + ".onPressed: " + point.x + ", " + point.y);
onReleased: console.log(name + ".onReleased: " + point.x + ", " + point.y);
onDoubleClicked: console.log(name + ".onDoubleClicked: " + point.x + ", " + point.y);
diff --git a/tests/manual/qmlchartproperties/qml/qmlchartproperties/LineEditor.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/LineEditor.qml
index a6390cb5..c44f63e3 100644
--- a/tests/manual/qmlchartproperties/qml/qmlchartproperties/LineEditor.qml
+++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/LineEditor.qml
@@ -96,6 +96,10 @@ Flow {
onClicked: series.pointLabelsColor = main.nextColor();
}
Button {
+ text: "point labels clipping"
+ onClicked: series.pointLabelsClipping = !series.pointLabelsClipping;
+ }
+ Button {
text: "append point"
onClicked: series.append(series.count - 1, series.count - 1);
}
diff --git a/tests/manual/qmlchartproperties/qml/qmlchartproperties/ScatterChart.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/ScatterChart.qml
index eada1aa7..f957f02d 100644
--- a/tests/manual/qmlchartproperties/qml/qmlchartproperties/ScatterChart.qml
+++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/ScatterChart.qml
@@ -57,6 +57,8 @@ ChartView {
+ font.family);
onPointLabelsColorChanged: console.log("scatterSeries.onPointLabelsColorChanged: "
+ color);
+ onPointLabelsClippingChanged: console.log("scatterSeries.onPointLabelsClippingChanged: "
+ + clipping);
onPressed: console.log(name + ".onPressed: " + point.x + ", " + point.y);
onReleased: console.log(name + ".onReleased: " + point.x + ", " + point.y);
onDoubleClicked: console.log(name + ".onDoubleClicked: " + point.x + ", " + point.y);
diff --git a/tests/manual/qmlchartproperties/qml/qmlchartproperties/ScatterEditor.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/ScatterEditor.qml
index ce95cf59..4eca23ca 100644
--- a/tests/manual/qmlchartproperties/qml/qmlchartproperties/ScatterEditor.qml
+++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/ScatterEditor.qml
@@ -69,6 +69,10 @@ Flow {
onClicked: series.pointLabelsVisible = !series.pointLabelsVisible;
}
Button {
+ text: "point labels clipping"
+ onClicked: series.pointLabelsClipping = !series.pointLabelsClipping;
+ }
+ Button {
text: "point labels format"
onClicked: {
if (series.pointLabelsFormat === "@xPoint, @yPoint")
@@ -91,6 +95,10 @@ Flow {
onClicked: series.pointLabelsColor = main.nextColor();
}
Button {
+ text: "point labels clipping"
+ onClicked: series.pointLabelsClipping = !series.pointLabelsClipping;
+ }
+ Button {
text: "append point"
onClicked: series.append(series.count - 1, series.count - 1);
}
diff --git a/tests/manual/qmlchartproperties/qml/qmlchartproperties/SplineChart.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/SplineChart.qml
index fe21688f..0eaa47ca 100644
--- a/tests/manual/qmlchartproperties/qml/qmlchartproperties/SplineChart.qml
+++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/SplineChart.qml
@@ -59,6 +59,8 @@ ChartView {
+ font.family);
onPointLabelsColorChanged: console.log("splineSeries.onPointLabelsColorChanged: "
+ color);
+ onPointLabelsClippingChanged: console.log("splineSeries.onPointLabelsClippingChanged: "
+ + clipping);
onPressed: console.log(name + ".onPressed: " + point.x + ", " + point.y);
onReleased: console.log(name + ".onReleased: " + point.x + ", " + point.y);
onDoubleClicked: console.log(name + ".onDoubleClicked: " + point.x + ", " + point.y);