HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1157:bad1d525be80

Initial support for x-axis labels in QML api

Tero Ahola -

r1157:bad1d525be80

parent child

Context file:

r1157:bad1d525be80

Collapse all files

demos/qmlchart/qml/qmlchart/View3.qml +2 0

             /****************************************************************************
             **
             ** 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
             import QtCommercial.Chart 1.0
             Rectangle {
                 anchors.fill: parent
                 ChartView {
                     title: "NHL All-Star Team Players"
                     anchors.fill: parent
                     theme: ChartView.ChartThemeHighContrast
                     legend: ChartView.LegendTop
+                    axisXLabels: ["0", "2000", "1", "2001", "2", "2002", "3", "2003", "4", "2004", "5", "2005",
+                        "6", "2006", "7", "2007", "8", "2008", "9", "2009", "10", "2010", "11", "2011"]
                     AreaSeries {
                         name: "Swedish"
                         points: [
                             XyPoint { x: 0; y: 1 },
                             XyPoint { x: 1; y: 1 },
                             XyPoint { x: 2; y: 3 },
                             XyPoint { x: 3; y: 3 },
                             XyPoint { x: 4; y: 2 },
                             XyPoint { x: 5; y: 0 },
                             XyPoint { x: 6; y: 2 },
                             XyPoint { x: 7; y: 1 },
                             XyPoint { x: 8; y: 2 },
                             XyPoint { x: 9; y: 1 },
                             XyPoint { x: 10; y: 3 },
                             XyPoint { x: 11; y: 3 }
                         ]
                         lowerPoints: [
                             XyPoint { x: 0; y: 0 },
                             XyPoint { x: 1; y: 0 },
                             XyPoint { x: 2; y: 0 },
                             XyPoint { x: 3; y: 0 },
                             XyPoint { x: 4; y: 0 },
                             XyPoint { x: 5; y: 0 },
                             XyPoint { x: 6; y: 0 },
                             XyPoint { x: 7; y: 0 },
                             XyPoint { x: 8; y: 0 },
                             XyPoint { x: 9; y: 0 },
                             XyPoint { x: 10; y: 0 },
                             XyPoint { x: 11; y: 0 }
                         ]
                     }
                     AreaSeries {
                         name: "Russian"
                         points: [
                             XyPoint { x: 0; y: 1 },
                             XyPoint { x: 1; y: 1 },
                             XyPoint { x: 2; y: 1 },
                             XyPoint { x: 3; y: 1 },
                             XyPoint { x: 4; y: 1 },
                             XyPoint { x: 5; y: 0 },
                             XyPoint { x: 6; y: 1 },
                             XyPoint { x: 7; y: 1 },
                             XyPoint { x: 8; y: 4 },
                             XyPoint { x: 9; y: 3 },
                             XyPoint { x: 10; y: 2 },
                             XyPoint { x: 11; y: 1 }
                         ]
                         lowerPoints: [
                             XyPoint { x: 0; y: 0 },
                             XyPoint { x: 1; y: 0 },
                             XyPoint { x: 2; y: 0 },
                             XyPoint { x: 3; y: 0 },
                             XyPoint { x: 4; y: 0 },
                             XyPoint { x: 5; y: 0 },
                             XyPoint { x: 6; y: 0 },
                             XyPoint { x: 7; y: 0 },
                             XyPoint { x: 8; y: 0 },
                             XyPoint { x: 9; y: 0 },
                             XyPoint { x: 10; y: 0 },
                             XyPoint { x: 11; y: 0 }
                         ]
                     }
                     AreaSeries {
                         name: "Finnish"
                         points: [
                             XyPoint { x: 0; y: 0 },
                             XyPoint { x: 1; y: 0 },
                             XyPoint { x: 2; y: 0 },
                             XyPoint { x: 3; y: 0 },
                             XyPoint { x: 4; y: 0 },
                             XyPoint { x: 5; y: 0 },
                             XyPoint { x: 6; y: 1 },
                             XyPoint { x: 7; y: 0 },
                             XyPoint { x: 8; y: 0 },
                             XyPoint { x: 9; y: 0 },
                             XyPoint { x: 10; y: 0 },
                             XyPoint { x: 11; y: 1 }
                         ]
                         lowerPoints: [
                             XyPoint { x: 0; y: 0 },
                             XyPoint { x: 1; y: 0 },
                             XyPoint { x: 2; y: 0 },
                             XyPoint { x: 3; y: 0 },
                             XyPoint { x: 4; y: 0 },
                             XyPoint { x: 5; y: 0 },
                             XyPoint { x: 6; y: 0 },
                             XyPoint { x: 7; y: 0 },
                             XyPoint { x: 8; y: 0 },
                             XyPoint { x: 9; y: 0 },
                             XyPoint { x: 10; y: 0 },
                             XyPoint { x: 11; y: 0 }
                         ]
                     }
                 }
             }

demos/qmlweather/main.cpp +10 -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$
             **
             ****************************************************************************/
             #include <QApplication>
+            #include <QDeclarativeContext>
+            #include <QDebug>
             #include "qmlapplicationviewer.h"
             Q_DECL_EXPORT int main(int argc, char *argv[])
             {
                 QScopedPointer<QApplication> app(createApplication(argc, argv));
                 QmlApplicationViewer viewer;
                 viewer.setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
+                QString appKey;
+                if (argc > 1) {
+                    appKey = argv[1];
+                    qDebug() << "App key for worldweatheronline.com:" << appKey;
+                } else {
+                    qWarning() << "No app key for worldweatheronline.com given. Using static test data instead of live data.";
+                }
+                viewer.rootContext()->setContextProperty("weatherAppKey", appKey);
                 viewer.setSource(QUrl("qrc:/qml/qmlweather/main.qml"));
                 viewer.showExpanded();
                 return app->exec();
             }

demos/qmlweather/qml/qmlweather/main.qml +45 -34

             /****************************************************************************
             **
             ** 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.1
             import QtCommercial.Chart 1.0
             Rectangle {
                 width: 360
                 height: 360
                 ChartView {
                     id: chartView
                     anchors.top: parent.top
                     anchors.bottom: weatherImageRow.top
                     anchors.left: parent.left
                     anchors.right: parent.right
+                    title: "Weather forecast"
                     axisX.min: 0
-                    axisX.max: 6
+                    axisX.max: 4
                     axisY.min: 0
-                    axisY.max: 50
+                    axisY.max: 0
+                    legend: ChartView.LegendTop
-                    // TODO: implement categories
-            //        AxisCategory { axis: AxisCategory.AxisX; value: 0.0; label: "" }
-            //        AxisCategory { axis: AxisCategory.AxisX; value: 1.0; label: "Today" }
-            //        AxisCategory { axis: AxisCategory.AxisX; value: 2.0; label: "Tomorrow" }
-            //        AxisCategory { axis: AxisCategory.AxisX; value: 3.0; label: "Day after tomorrow" }
                     LineSeries {
                         model: maxModel
+                        name: "Max. temperature"
                     }
                     LineSeries {
                         model: minModel
+                        name: "Min. temperature"
                     }
                     // TODO: use a single base model with mappings instead of two separate xy models
             //        LineSeries {
             //            model: chartModel
             //            modelMapping: XyModelMapping {
             //                xColumn: 0
             //                yColumn: 1
             //            }
             //        }
             //        LineSeries {
             //            model: chartModel
             //            modelMapping: XyModelMapping {
             //                xColumn: 0
             //                yColumn: 2
             //            }
             //        }
                 }
             //    ChartModel {
             //        id: chartModel
             //    }
                 XYModel {
                     id: maxModel
                 }
                 XYModel {
                     id: minModel
                 }
                 Component.onCompleted: {
-                    // TODO: use live data instead of hard coded example data
+                    if (weatherAppKey != "") {
-                    // in case an application key was defined for this demo app
+                        var xhr = new XMLHttpRequest;
-            //            var xhr = new XMLHttpRequest;
+                        xhr.open("GET", "http://free.worldweatheronline.com/feed/weather.ashx?q=Jyv%c3%a4skyl%c3%a4,Finland&format=json&num_of_days=5&key=" + weatherAppKey);
-            //            var appKey = "";
+                        xhr.onreadystatechange = function() {
-            //            xhr.open("GET", "http://free.worldweatheronline.com/feed/weather.ashx?q=Jyv%c3%a4skyl%c3%a4,Finland&format=json&num_of_days=5&key=" + appKey");
+                            if (xhr.readyState == XMLHttpRequest.DONE) {
-            //            xhr.onreadystatechange = function() {
+                                var a = JSON.parse(xhr.responseText);
-            //                        if (xhr.readyState == XMLHttpRequest.DONE) {
+                                parseWeatherData(a);
-            //                            var a = JSON.parse(xhr.responseText);
-            //                            console.log("a: " + a);
-            //                            console.log("response: " + xhr.responseText);
+                        xhr.send();
-            //                            for (var b in a) {
+                    } else {
-            //                                var o = a[b];
+                        // No app key for worldweatheronline.com given by the user -> use static data
-            //                                console.log("o: " + o);
+                        var responseText = "{ \"data\": { \"current_condition\": [ {\"cloudcover\": \"10\", \"humidity\": \"61\", \"observation_time\": \"06:26 AM\", \"precipMM\": \"0.0\", \"pressure\": \"1022\", \"temp_C\": \"6\", \"temp_F\": \"43\", \"visibility\": \"10\", \"weatherCode\": \"113\",  \"weatherDesc\": [ {\"value\": \"Sunny\" } ],  \"weatherIconUrl\": [ {\"value\": \"http:\/\/www.worldweatheronline.com\/images\/wsymbols01_png_64\/wsymbol_0001_sunny.png\" } ], \"winddir16Point\": \"SE\", \"winddirDegree\": \"140\", \"windspeedKmph\": \"7\", \"windspeedMiles\": \"4\" } ],  \"request\": [ {\"query\": \"Jyvaskyla, Finland\", \"type\": \"City\" } ],  \"weather\": [ {\"date\": \"2012-05-09\", \"precipMM\": \"0.4\", \"tempMaxC\": \"14\", \"tempMaxF\": \"57\", \"tempMinC\": \"7\", \"tempMinF\": \"45\", \"weatherCode\": \"116\",  \"weatherDesc\": [ {\"value\": \"Partly Cloudy\" } ],  \"weatherIconUrl\": [ {\"value\": \"http:\/\/www.worldweatheronline.com\/images\/wsymbols01_png_64\/wsymbol_0002_sunny_intervals.png\" } ], \"winddir16Point\": \"S\", \"winddirDegree\": \"179\", \"winddirection\": \"S\", \"windspeedKmph\": \"20\", \"windspeedMiles\": \"12\" }, {\"date\": \"2012-05-10\", \"precipMM\": \"2.4\", \"tempMaxC\": \"13\", \"tempMaxF\": \"55\", \"tempMinC\": \"8\", \"tempMinF\": \"46\", \"weatherCode\": \"266\",  \"weatherDesc\": [ {\"value\": \"Light drizzle\" } ],  \"weatherIconUrl\": [ {\"value\": \"http:\/\/www.worldweatheronline.com\/images\/wsymbols01_png_64\/wsymbol_0017_cloudy_with_light_rain.png\" } ], \"winddir16Point\": \"SW\", \"winddirDegree\": \"219\", \"winddirection\": \"SW\", \"windspeedKmph\": \"21\", \"windspeedMiles\": \"13\" }, {\"date\": \"2012-05-11\", \"precipMM\": \"11.1\", \"tempMaxC\": \"15\", \"tempMaxF\": \"59\", \"tempMinC\": \"7\", \"tempMinF\": \"44\", \"weatherCode\": \"266\",  \"weatherDesc\": [ {\"value\": \"Light drizzle\" } ],  \"weatherIconUrl\": [ {\"value\": \"http:\/\/www.worldweatheronline.com\/images\/wsymbols01_png_64\/wsymbol_0017_cloudy_with_light_rain.png\" } ], \"winddir16Point\": \"SSW\", \"winddirDegree\": \"200\", \"winddirection\": \"SSW\", \"windspeedKmph\": \"20\", \"windspeedMiles\": \"12\" }, {\"date\": \"2012-05-12\", \"precipMM\": \"2.8\", \"tempMaxC\": \"7\", \"tempMaxF\": \"44\", \"tempMinC\": \"2\", \"tempMinF\": \"35\", \"weatherCode\": \"317\",  \"weatherDesc\": [ {\"value\": \"Light sleet\" } ],  \"weatherIconUrl\": [ {\"value\": \"http:\/\/www.worldweatheronline.com\/images\/wsymbols01_png_64\/wsymbol_0021_cloudy_with_sleet.png\" } ], \"winddir16Point\": \"NW\", \"winddirDegree\": \"311\", \"winddirection\": \"NW\", \"windspeedKmph\": \"24\", \"windspeedMiles\": \"15\" }, {\"date\": \"2012-05-13\", \"precipMM\": \"0.4\", \"tempMaxC\": \"6\", \"tempMaxF\": \"42\", \"tempMinC\": \"2\", \"tempMinF\": \"35\", \"weatherCode\": \"116\",  \"weatherDesc\": [ {\"value\": \"Partly Cloudy\" } ],  \"weatherIconUrl\": [ {\"value\": \"http:\/\/www.worldweatheronline.com\/images\/wsymbols01_png_64\/wsymbol_0002_sunny_intervals.png\" } ], \"winddir16Point\": \"WNW\", \"winddirDegree\": \"281\", \"winddirection\": \"WNW\", \"windspeedKmph\": \"21\", \"windspeedMiles\": \"13\" } ] }}";
-            ////                                model.append({id: o.id, name: o.name, duration: o.duration});
+                        var a = JSON.parse(responseText);
-            //                            }
+                        parseWeatherData(a);
-            //                        }
-            //                    }
-            //            xhr.send();
+                function parseWeatherData(weatherData) {
-                    var responseText = "{ \"data\": { \"current_condition\": [ {\"cloudcover\": \"10\", \"humidity\": \"61\", \"observation_time\": \"06:26 AM\", \"precipMM\": \"0.0\", \"pressure\": \"1022\", \"temp_C\": \"6\", \"temp_F\": \"43\", \"visibility\": \"10\", \"weatherCode\": \"113\",  \"weatherDesc\": [ {\"value\": \"Sunny\" } ],  \"weatherIconUrl\": [ {\"value\": \"http:\/\/www.worldweatheronline.com\/images\/wsymbols01_png_64\/wsymbol_0001_sunny.png\" } ], \"winddir16Point\": \"SE\", \"winddirDegree\": \"140\", \"windspeedKmph\": \"7\", \"windspeedMiles\": \"4\" } ],  \"request\": [ {\"query\": \"Jyvaskyla, Finland\", \"type\": \"City\" } ],  \"weather\": [ {\"date\": \"2012-05-09\", \"precipMM\": \"0.4\", \"tempMaxC\": \"14\", \"tempMaxF\": \"57\", \"tempMinC\": \"7\", \"tempMinF\": \"45\", \"weatherCode\": \"116\",  \"weatherDesc\": [ {\"value\": \"Partly Cloudy\" } ],  \"weatherIconUrl\": [ {\"value\": \"http:\/\/www.worldweatheronline.com\/images\/wsymbols01_png_64\/wsymbol_0002_sunny_intervals.png\" } ], \"winddir16Point\": \"S\", \"winddirDegree\": \"179\", \"winddirection\": \"S\", \"windspeedKmph\": \"20\", \"windspeedMiles\": \"12\" }, {\"date\": \"2012-05-10\", \"precipMM\": \"2.4\", \"tempMaxC\": \"13\", \"tempMaxF\": \"55\", \"tempMinC\": \"8\", \"tempMinF\": \"46\", \"weatherCode\": \"266\",  \"weatherDesc\": [ {\"value\": \"Light drizzle\" } ],  \"weatherIconUrl\": [ {\"value\": \"http:\/\/www.worldweatheronline.com\/images\/wsymbols01_png_64\/wsymbol_0017_cloudy_with_light_rain.png\" } ], \"winddir16Point\": \"SW\", \"winddirDegree\": \"219\", \"winddirection\": \"SW\", \"windspeedKmph\": \"21\", \"windspeedMiles\": \"13\" }, {\"date\": \"2012-05-11\", \"precipMM\": \"11.1\", \"tempMaxC\": \"15\", \"tempMaxF\": \"59\", \"tempMinC\": \"7\", \"tempMinF\": \"44\", \"weatherCode\": \"266\",  \"weatherDesc\": [ {\"value\": \"Light drizzle\" } ],  \"weatherIconUrl\": [ {\"value\": \"http:\/\/www.worldweatheronline.com\/images\/wsymbols01_png_64\/wsymbol_0017_cloudy_with_light_rain.png\" } ], \"winddir16Point\": \"SSW\", \"winddirDegree\": \"200\", \"winddirection\": \"SSW\", \"windspeedKmph\": \"20\", \"windspeedMiles\": \"12\" }, {\"date\": \"2012-05-12\", \"precipMM\": \"2.8\", \"tempMaxC\": \"7\", \"tempMaxF\": \"44\", \"tempMinC\": \"2\", \"tempMinF\": \"35\", \"weatherCode\": \"317\",  \"weatherDesc\": [ {\"value\": \"Light sleet\" } ],  \"weatherIconUrl\": [ {\"value\": \"http:\/\/www.worldweatheronline.com\/images\/wsymbols01_png_64\/wsymbol_0021_cloudy_with_sleet.png\" } ], \"winddir16Point\": \"NW\", \"winddirDegree\": \"311\", \"winddirection\": \"NW\", \"windspeedKmph\": \"24\", \"windspeedMiles\": \"15\" }, {\"date\": \"2012-05-13\", \"precipMM\": \"0.4\", \"tempMaxC\": \"6\", \"tempMaxF\": \"42\", \"tempMinC\": \"2\", \"tempMinF\": \"35\", \"weatherCode\": \"116\",  \"weatherDesc\": [ {\"value\": \"Partly Cloudy\" } ],  \"weatherIconUrl\": [ {\"value\": \"http:\/\/www.worldweatheronline.com\/images\/wsymbols01_png_64\/wsymbol_0002_sunny_intervals.png\" } ], \"winddir16Point\": \"WNW\", \"winddirDegree\": \"281\", \"winddirection\": \"WNW\", \"windspeedKmph\": \"21\", \"windspeedMiles\": \"13\" } ] }}";
+                    for (var i in weatherData.data.weather) {
-                    var a = JSON.parse(responseText);
+                        var weatherObj = weatherData.data.weather[i];
-                    for (var i in a.data.weather) {
+                        // Add min and max temperature values into models used by series
-                        var weatherObj = a.data.weather[i];
+                        maxModel.append([Number(i), weatherObj.tempMaxC]);
-                        maxModel.append([Number(i) + 1, weatherObj.tempMaxC]);
+                        minModel.append([Number(i), weatherObj.tempMinC]);
-                        minModel.append([Number(i) + 1, weatherObj.tempMinC]);
                         weatherImageModel.append({"imageSource":weatherObj.weatherIconUrl[0].value});
+                        // Update scale of the chart
+                        while (chartView.axisY.min >= Number(weatherObj.tempMinC))
+                            chartView.axisY.min = chartView.axisY.min - 10;
+                        while (chartView.axisY.max <= Number(weatherObj.tempMaxC))
+                            chartView.axisY.max = chartView.axisY.max + 10;
+                        // Set the x-axis labels to the dates of the forecast
+                        // TODO: the API could probably be more intuitive..
+                        // Now it takes an array of strings: chartView.axisXLabels = ["value1", "label1", "value2", "label2", ...]
+                        var xLabels = chartView.axisXLabels;
+                        xLabels[Number(i) * 2] = i;
+                        xLabels[(Number(i) * 2) + 1] = weatherObj.date.substring(5, 10);
+                        chartView.axisXLabels = xLabels;
                     }
                 }
                 ListModel {
                     id: weatherImageModel
                 }
                 Row {
                     id: weatherImageRow
                     anchors.bottom: parent.bottom
                     anchors.bottomMargin: 10
                     anchors.left: parent.left
                     anchors.leftMargin: 25
                     anchors.right: parent.right
                     anchors.rightMargin: 25
                     Repeater {
                         id: repeater
                         model: weatherImageModel
                         delegate: Image {
                             source: imageSource
                             width: weatherImageRow.width / weatherImageModel.count
                             height: width
                             fillMode: Image.PreserveAspectCrop
                         }
                     }
                 }
             }

qmlplugin/declarativechart.cpp +25 0

             /****************************************************************************
             **
             ** 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 "declarativechart.h"
             #include <QPainter>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             DeclarativeChart::DeclarativeChart(QDeclarativeItem *parent)
                 : QDeclarativeItem(parent),
                   m_chart(new QChart(this)),
                   m_legend(LegendDisabled)
             {
                 setFlag(QGraphicsItem::ItemHasNoContents, false);
                 m_chart->axisX()->setNiceNumbersEnabled(false);
             }
             DeclarativeChart::~DeclarativeChart()
             {
                 delete m_chart;
             }
             void DeclarativeChart::childEvent(QChildEvent *event)
             {
                 if (event->type() == QEvent::ChildAdded) {
                     if (qobject_cast<QAbstractSeries *>(event->child())) {
                         m_chart->addSeries(qobject_cast<QAbstractSeries *>(event->child()));
                     }
                 }
             }
             void DeclarativeChart::componentComplete()
             {
             //    qDebug() << "DeclarativeChart::componentComplete(), maxX: " << axisX()->max();
                 foreach(QObject *child, children()) {
                     if (qobject_cast<QAbstractSeries *>(child)) {
                         m_chart->addSeries(qobject_cast<QAbstractSeries *>(child));
                     }
                 }
             //    qDebug() << "DeclarativeChart::componentComplete(), maxX: " << axisX()->max();
                 QDeclarativeItem::componentComplete();
             }
             void DeclarativeChart::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
             {
             //    qDebug() << "DeclarativeChart::geometryChanged" << newGeometry.width() << newGeometry.height();
                 Q_UNUSED(oldGeometry)
                 if (newGeometry.isValid()) {
                     if (newGeometry.width() > 0 && newGeometry.height() > 0) {
                         m_chart->resize(newGeometry.width(), newGeometry.height());
                     }
                 }
             }
             void DeclarativeChart::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
                 Q_UNUSED(option)
                 Q_UNUSED(widget)
                 // TODO: optimized?
                 painter->setRenderHint(QPainter::Antialiasing, true);
             }
             void DeclarativeChart::setAnimationOptions(QChart::AnimationOption animations)
             {
                 m_chart->setAnimationOptions(animations);
             }
             QChart::AnimationOption DeclarativeChart::animationOptions()
             {
                 if (m_chart->animationOptions().testFlag(QChart::AllAnimations))
                     return QChart::AllAnimations;
                 else if (m_chart->animationOptions().testFlag(QChart::GridAxisAnimations))
                     return QChart::GridAxisAnimations;
                 else if (m_chart->animationOptions().testFlag(QChart::SeriesAnimations))
                     return QChart::SeriesAnimations;
                 else
                     return QChart::NoAnimation;
             }
             void DeclarativeChart::setLegend(ChartLegend legend)
             {
                 if (legend != m_legend) {
                     m_legend = legend;
                     switch (m_legend) {
                     case LegendDisabled:
                         m_chart->legend()->setVisible(false);
                         break;
                     case LegendTop:
                         m_chart->legend()->setVisible(true);
                         m_chart->legend()->setAlignment(QLegend::AlignmentTop);
                         break;
                     case LegendBottom:
                         m_chart->legend()->setVisible(true);
                         m_chart->legend()->setAlignment(QLegend::AlignmentBottom);
                         break;
                     case LegendLeft:
                         m_chart->legend()->setVisible(true);
                         m_chart->legend()->setAlignment(QLegend::AlignmentLeft);
                         break;
                     case LegendRight:
                         m_chart->legend()->setVisible(true);
                         m_chart->legend()->setAlignment(QLegend::AlignmentRight);
                         break;
                     default:
                         m_chart->legend()->setVisible(false);
                         break;
                     }
                 }
             }
             DeclarativeChart::ChartLegend DeclarativeChart::legend()
             {
                 return m_legend;
             }
             QAxis *DeclarativeChart::axisX()
             {
                 return m_chart->axisX();
             }
             QAxis *DeclarativeChart::axisY()
             {
                 return m_chart->axisY();
             }
+            QVariantList DeclarativeChart::axisXLabels()
+            {
+                QVariantList labels;
+                foreach (qreal value, m_chart->axisX()->categories()->values()) {
+            //        qDebug() << "Label for" << value << "is" << m_chart->axisX()->categories()->label(value);
+                    labels.append(value);
+                    labels.append(m_chart->axisX()->categories()->label(value));
+                }
+                return labels;
+            }
+            void DeclarativeChart::setAxisXLabels(QVariantList list)
+            {
+                QVariant value(QVariant::Invalid);
+                foreach (QVariant element, list) {
+                    if (value.isValid() && element.type() == QVariant::String) {
+                        m_chart->axisX()->categories()->insert(value.toDouble(), element.toString());
+                        value = QVariant(QVariant::Invalid);
+                    } else {
+                        if (element.canConvert(QVariant::Double))
+                            value = element;
+                    }
+                }
+            }
             #include "moc_declarativechart.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

qmlplugin/declarativechart.h +4 0

             /****************************************************************************
             **
             ** 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$
             **
             ****************************************************************************/
             #ifndef DECLARATIVECHART_H
             #define DECLARATIVECHART_H
             #include <QtCore/QtGlobal>
             #include <QDeclarativeItem>
             #include <qchart.h>
             #include <QAxis>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             // TODO: Derive from QChart for easier definition of properties?
             class DeclarativeChart : public QDeclarativeItem
             // TODO: for QTQUICK2: extend QQuickPainterItem instead
             //class DeclarativeChart : public QQuickPaintedItem, public Chart
             {
                 Q_OBJECT
                 Q_PROPERTY(QChart::ChartTheme theme READ theme WRITE setTheme)
                 Q_PROPERTY(QChart::AnimationOption animationOptions READ animationOptions WRITE setAnimationOptions)
                 Q_PROPERTY(QString title READ title WRITE setTitle)
                 Q_PROPERTY(ChartLegend legend READ legend WRITE setLegend)
                 Q_PROPERTY(QAxis *axisX READ axisX)
                 Q_PROPERTY(QAxis *axisY READ axisY)
+                // TODO: how to define axis labels? This is not very convenient
+                Q_PROPERTY(QVariantList axisXLabels READ axisXLabels WRITE setAxisXLabels)
                 Q_ENUMS(ChartLegend)
             public:
                 enum ChartLegend {
                     LegendDisabled = 0,
                     LegendTop,
                     LegendBottom,
                     LegendLeft,
                     LegendRight
                 };
             public:
                 DeclarativeChart(QDeclarativeItem *parent = 0);
                 ~DeclarativeChart();
             public: // From QDeclarativeItem/QGraphicsItem
                 void childEvent(QChildEvent *event);
                 void componentComplete();
                 void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry);
                 void paint (QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
             public:
                 void setTheme(QChart::ChartTheme theme) {m_chart->setTheme(theme);}
                 QChart::ChartTheme theme() {return m_chart->theme();}
                 void setAnimationOptions(QChart::AnimationOption animations);
                 QChart::AnimationOption animationOptions();
                 void setTitle(QString title) {m_chart->setTitle(title);}
                 QString title() { return m_chart->title();}
                 void setLegend(ChartLegend legend);
                 ChartLegend legend();
                 QAxis *axisX();
                 QAxis *axisY();
+                QVariantList axisXLabels();
+                void setAxisXLabels(QVariantList list);
             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;
                 ChartLegend m_legend;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVECHART_H

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