From 92ee7767f81f7a15b8773ed97356f01ecac68d0c Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Fri, 16 May 2014 15:26:14 +0300
Subject: Implement axis label autorotation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Task-number: QTRD-2857
Change-Id: I158abb75272813cf7eb5d4b419e24325389d940e
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
---
 examples/datavisualization/qmlbars/qml/qmlbars/Axes.qml | 15 +++++++++++----
 examples/datavisualization/qmlbars/qml/qmlbars/main.qml |  1 +
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'examples/datavisualization/qmlbars/qml/qmlbars')

diff --git a/examples/datavisualization/qmlbars/qml/qmlbars/Axes.qml b/examples/datavisualization/qmlbars/qml/qmlbars/Axes.qml
index a8257995..f316eef5 100644
--- a/examples/datavisualization/qmlbars/qml/qmlbars/Axes.qml
+++ b/examples/datavisualization/qmlbars/qml/qmlbars/Axes.qml
@@ -17,33 +17,40 @@
 ****************************************************************************/
 
 import QtQuick 2.1
-import QtDataVisualization 1.0
+import QtDataVisualization 1.1
 
 Item {
     property alias column: columnAxis
+    property alias row: rowAxis
     property alias value: valueAxis
     property alias total: totalAxis
 
-    // For row labels we can use row labels from data proxy, so default axis
-    // suffices for rows.
-
     // Custom labels for columns, since the data contains abbreviated month names.
     //! [0]
     CategoryAxis3D {
         id: columnAxis
         labels: ["January", "February", "March", "April", "May", "June",
             "July", "August", "September", "October", "November", "December"]
+        labelAutoRotation: 30
     }
     //! [0]
     CategoryAxis3D {
         id: totalAxis
         labels: ["Yearly total"]
+        labelAutoRotation: 30
+    }
+    CategoryAxis3D {
+        // For row labels we can use row labels from data proxy, no labels defined for rows.
+        id: rowAxis
+        labelAutoRotation: 30
     }
+
     ValueAxis3D {
         id: valueAxis
         min: 0
         max: 35
         labelFormat: "%.2f M\u20AC"
         title: "Monthly income"
+        labelAutoRotation: 90
     }
 }
diff --git a/examples/datavisualization/qmlbars/qml/qmlbars/main.qml b/examples/datavisualization/qmlbars/qml/qmlbars/main.qml
index cc15dd50..6b9efeca 100644
--- a/examples/datavisualization/qmlbars/qml/qmlbars/main.qml
+++ b/examples/datavisualization/qmlbars/qml/qmlbars/main.qml
@@ -103,6 +103,7 @@ Rectangle {
             barSpacingRelative: false
             scene.activeCamera.cameraPreset: Camera3D.CameraPresetIsometricLeftHigh
             columnAxis: graphAxes.column
+            rowAxis: graphAxes.row
             valueAxis: graphAxes.value
 
             //! [4]
-- 
cgit v1.2.3