HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1095:746114f1a345

Legend to QML API

Tero Ahola -

r1095:746114f1a345

parent child

Context file:

r1095:746114f1a345

Collapse all files

demos/qmlchart/qml/qmlchart/View1.qml +1 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
                 Chart {
                     title: "Car brand shares in Finland"
                     anchors.fill: parent
                     theme: Chart.ChartThemeLight
+                    legend: Chart.LegendBottom
                     PieSeries {
                         horizontalPosition: 0.2
                         verticalPosition: 0.3
                         size: 0.4
                         slices: [
                             PieSlice { label: "Volkswagen"; value: 13.5 },
                             PieSlice { label: "Toyota"; value: 10.9 },
                             PieSlice { label: "Ford"; value: 8.6 },
                             PieSlice { label: "Skoda"; value: 8.2 },
                             PieSlice { label: "Volvo"; value: 6.8 },
                             PieSlice { label: "Others"; value: 52.0 }
                         ]
                     }
                     BarSeries {
                         barCategories: [ "2008", "2009", "2010", "2011", "2012" ]
                         // data implementation missing
                     }
                 }
             }

demos/qmlchart/qml/qmlchart/View3.qml +1 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
                 Chart {
                     title: "NHL All-Star Team Players"
                     anchors.fill: parent
                     theme: Chart.ChartThemeHighContrast
+                    legend: Chart.LegendTop
                     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 }
                         ]
                     }
                     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: "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 }
                         ]
                     }
                 }
             }

qmlplugin/declarativechart.cpp +38 -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 "declarativechart.h"
             #include <QPainter>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             DeclarativeChart::DeclarativeChart(QDeclarativeItem *parent)
                 : QDeclarativeItem(parent),
-                  m_chart(new QChart(this))
+                  m_chart(new QChart(this)),
+                  m_legend(LegendDisabled)
             {
                 m_chart->setAnimationOptions(QChart::SeriesAnimations);
                 setFlag(QGraphicsItem::ItemHasNoContents, false);
             }
             DeclarativeChart::~DeclarativeChart()
             {
                 delete m_chart;
             }
             void DeclarativeChart::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
             {
                 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;
+            }
             #include "moc_declarativechart.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

qmlplugin/declarativechart.h +14 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>
             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_ENUMS(ChartLegend)
+            public:
+                enum ChartLegend {
+                    LegendDisabled = 0,
+                    LegendTop,
+                    LegendBottom,
+                    LegendLeft,
+                    LegendRight
+                };
             public:
                 DeclarativeChart(QDeclarativeItem *parent = 0);
                 ~DeclarativeChart();
             public: // From QDeclarativeItem/QGraphicsItem
                 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();
             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