HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r646:a47b376c6f77

Added QML api for bar series

Tero Ahola -

r646:a47b376c6f77

parent child

Context file:

r646:a47b376c6f77

Collapse all files

qmlplugin/declarativebarseries.cpp created 644 +50 0

@@ -0,0 +1,50
	1	#include "declarativebarseries.h"
	2	#include "declarativechart.h"
	3	#include "qchart.h"
	4	#include "qbarseries.h"
	5	#include "qbarset.h"
	6
	7	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	8
	9	DeclarativeBarSeries::DeclarativeBarSeries(QDeclarativeItem *parent) :
	10	QDeclarativeItem(parent)
	11	{
	12	setFlag(QGraphicsItem::ItemHasNoContents, false);
	13	connect(this, SIGNAL(parentChanged()),
	14	this, SLOT(setParentForSeries()));
	15	}
	16
	17	void DeclarativeBarSeries::setParentForSeries()
	18	{
	19	if (!m_series) {
	20	DeclarativeChart declarativeChart = qobject_cast<DeclarativeChart >(parent());
	21
	22	if (declarativeChart) {
	23	QChart chart = qobject_cast<QChart >(declarativeChart->m_chart);
	24	Q_ASSERT(chart);
	25
	26	QStringList categories;
	27	categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun";
	28	m_series = new QBarSeries(categories);
	29
	30	// TODO: use data from model
	31	QBarSet *set0 = new QBarSet("Bub");
	32	QBarSet *set1 = new QBarSet("Bob");
	33	QBarSet *set2 = new QBarSet("Guybrush");
	34
	35	*set0 << 1 << 2 << 3 << 4 << 5 << 6;
	36	*set1 << 5 << 0 << 0 << 4 << 0 << 7;
	37	*set2 << 3 << 5 << 8 << 13 << 8 << 5;
	38
	39	m_series->addBarSet(set0);
	40	m_series->addBarSet(set1);
	41	m_series->addBarSet(set2);
	42
	43	chart->addSeries(m_series);
	44	}
	45	}
	46	}
	47
	48	#include "moc_declarativebarseries.cpp"
	49
	50	QTCOMMERCIALCHART_END_NAMESPACE

qmlplugin/declarativebarseries.h created 644 +34 0

@@ -0,0 +1,34
	1	#ifndef DECLARATIVEBARSERIES_H
	2	#define DECLARATIVEBARSERIES_H
	3
	4	#include "qchartglobal.h"
	5	#include "scatterelement.h" // TODO: rename header
	6	#include <QDeclarativeItem>
	7
	8	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	9
	10	class QChart;
	11	class QBarSeries;
	12
	13	class DeclarativeBarSeries : public QDeclarativeItem
	14	{
	15	Q_OBJECT
	16
	17	public:
	18	explicit DeclarativeBarSeries(QDeclarativeItem *parent = 0);
	19
	20	signals:
	21
	22	public slots:
	23
	24	private slots:
	25	void setParentForSeries();
	26
	27	private:
	28	QChart *m_chart;
	29	QBarSeries *m_series;
	30	};
	31
	32	QTCOMMERCIALCHART_END_NAMESPACE
	33
	34	#endif // DECLARATIVEBARSERIES_H

qmlplugin/declarativechart.cpp +12 0

             #include "declarativechart.h"
+            #include <QPainter>s
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             DeclarativeChart::DeclarativeChart(QDeclarativeItem *parent)
                 : QDeclarativeItem(parent),
                   m_chart(new QChart(this))
             {
                 setFlag(QGraphicsItem::ItemHasNoContents, false);
             }
             DeclarativeChart::ChartTheme DeclarativeChart::theme()
             {
                 return (ChartTheme) m_chart->chartTheme();
             }
             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);
+            }
             #include "moc_declarativechart.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

qmlplugin/declarativechart.h +3 -1

             #ifndef DECLARATIVECHART_H
             #define DECLARATIVECHART_H
             #include <QtCore/QtGlobal>
             #include <QDeclarativeItem>
             #include <qchart.h>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class DeclarativeChart : public QDeclarativeItem
             // TODO: for QTQUICK2: extend QQuickPainterItem instead
             //class DeclarativeChart : public QQuickPaintedItem, public Chart
             {
                 Q_OBJECT
                 Q_ENUMS(ChartTheme)
                 Q_PROPERTY(ChartTheme theme READ theme WRITE setTheme)
             public:
                 enum ChartTheme {
                     ThemeDefault,
                     ThemeVanilla,
                     ThemeIcy,
                     ThemeGrayscale,
                     ThemeScientific,
-                    ThemeUnnamed1
+                    ThemeBlueCerulean,
+                    ThemeLight
                 };
                 DeclarativeChart(QDeclarativeItem *parent = 0);
             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(ChartTheme theme) {m_chart->setChartTheme((QChart::ChartTheme) theme);}
                 ChartTheme theme();
             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;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVECHART_H

qmlplugin/plugin.cpp +2 0

             #include <QtDeclarative/qdeclarativeextensionplugin.h>
             #include <QtDeclarative/qdeclarative.h>
             #include "declarativechart.h"
             #include "scatterelement.h"
             #include "declarativescatterseries.h"
             #include "declarativelineseries.h"
+            #include "declarativebarseries.h"
             #include "declarativepieseries.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartQmlPlugin : public QDeclarativeExtensionPlugin
             {
                 Q_OBJECT
             public:
                 virtual void registerTypes(const char *uri)
                 {
                     Q_ASSERT(QLatin1String(uri) == QLatin1String("QtCommercial.Chart"));
                     qmlRegisterType<DeclarativeChart>(uri, 1, 0, "Chart");
                     qmlRegisterType<DeclarativeScatterSeries>(uri, 1, 0, "ScatterSeries");
                     qmlRegisterType<DeclarativeLineSeries>(uri, 1, 0, "LineSeries");
+                    qmlRegisterType<DeclarativeBarSeries>(uri, 1, 0, "BarSeries");
                     qmlRegisterType<DeclarativePieSeries>(uri, 1, 0, "PieSeries");
                     qmlRegisterType<QPieSlice>(uri, 1, 0, "ChartPieElement");
                     // TODO: rename ScatterElement class to something like "PointElement"
                     qmlRegisterType<ScatterElement>(uri, 1, 0, "ChartPointElement");
                 }
             };
             #include "plugin.moc"
             QTCOMMERCIALCHART_END_NAMESPACE
             QTCOMMERCIALCHART_USE_NAMESPACE
             Q_EXPORT_PLUGIN2(qtcommercialchartqml, QT_PREPEND_NAMESPACE(ChartQmlPlugin))

qmlplugin/qmlplugin.pro +4 -2

             TEMPLATE = lib
             TARGET = qtcommercialchartqml
             CONFIG += qt plugin
             QT += declarative
             !include( ../common.pri ) {
                 error( "Couldn't find the common.pri file!" )
             }
             !include( ../integrated.pri ) {
                 error( "Couldn't find the integrated.pri file !")
             }
             DESTDIR = $$CHART_BUILD_PLUGIN_DIR
             contains(QT_MAJOR_VERSION, 5) {
                 # TODO: QtQuick2 not supported by the implementation currently
                 DEFINES += QTQUICK2
             }
             OBJECTS_DIR = $$CHART_BUILD_DIR/plugin
             MOC_DIR = $$CHART_BUILD_DIR/plugin
             UI_DIR = $$CHART_BUILD_DIR/plugin
             RCC_DIR = $$CHART_BUILD_DIR/plugin
             SOURCES += \
                 plugin.cpp \
                 declarativechart.cpp \
                 declarativescatterseries.cpp \
                 scatterelement.cpp \
                 declarativepieseries.cpp \
-                declarativelineseries.cpp
+                declarativelineseries.cpp \
+                declarativebarseries.cpp
             HEADERS += \
                 declarativechart.h \
                 declarativescatterseries.h \
                 scatterelement.h \
                 declarativepieseries.h \
-                declarativelineseries.h
+                declarativelineseries.h \
+                declarativebarseries.h
             TARGETPATH = QtCommercial/Chart
             target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
             qmldir.files += $$PWD/qmldir
             qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
             INSTALLS += target qmldir

test/qmlchart/qml/qmlchart/main.qml +17 -27

             import QtQuick 1.0
             import QtCommercial.Chart 1.0
             Rectangle {
                 width: parent.width
                 height: parent.height
                 // Another option for QML data api:
             //    ListModel {
             //        id: listModelForPie
             //        // PieDataElement
             //        ListElement {
             //            label: "Apple"
             //            value: 4.3
             //        }
             //        ListElement {
             //            label: "Blackberry"
             //            value: 15.1
             //        }
             //    }
                 Component.onCompleted: {
-            //        console.log("Component.onCompleted: " + ChartPointElement.x);
-            //        console.log("Component.onCompleted: " + ChartPointElement.y);
-            //        console.log("Component.onCompleted: " + ChartPointElement.dataX);
-            //        console.log("Component.onCompleted: " + ChartPointElement.dataY);
-                    //console.log("Component.onCompleted: " + chartModel.get(0).x);
-                    //console.log("Component.onCompleted: " + chartModel.ChartPointElements);
-            //        console.log("Component.onCompleted: " + elementt.dataX);
             //        console.log("Component.onCompleted: " + chartModel.get(0).dataX);
-                    //ChartPointElement { x: 0.3; y: 0.3 }
                 }
+            //    ChartModel {
+            //        id: dynamicData
+            //    }
                 Chart {
                     id: chart1
                     anchors.top: parent.top
                     anchors.left: parent.left
                     anchors.right: parent.right
                     height: parent.height / 2
-                    theme: Chart.ThemeVanilla
+                    theme: Chart.ThemeBlueCerulean
-                    PieSeries {
+                    BarSeries {
-                        data: [
-                            // TODO: "NnElement" matches the naming convention of for example ListModel...
-                            // But PieSlice would match the naming of QtCommercial Charts C++ api
-                            ChartPieElement { label: "Volkswagen"; value: 13.5 },
-                            ChartPieElement { label: "Toyota"; value: 10.9 },
-                            ChartPieElement { label: "Ford"; value: 8.6 },
-                            ChartPieElement { label: "Skoda"; value: 8.2 },
-                            ChartPieElement { label: "Volvo"; value: 6.8 },
-                            ChartPieElement { label: "Others"; value: 52.0 }
                     }
-            //        Series {
+            //        PieSeries {
-            //            seriesType: Series.SeriesTypeLine
+            //            data: [
-            //        }
+            //                // TODO: "NnElement" matches the naming convention of for example ListModel...
-                    // TODO:
+            //                // But PieSlice would match the naming of QtCommercial Charts C++ api
-            //        Series {
+            //                ChartPieElement { label: "Volkswagen"; value: 13.5 },
-            //            seriesType: Series.SeriesTypeBar
+            //                ChartPieElement { label: "Toyota"; value: 10.9 },
+            //                ChartPieElement { label: "Ford"; value: 8.6 },
+            //                ChartPieElement { label: "Skoda"; value: 8.2 },
+            //                ChartPieElement { label: "Volvo"; value: 6.8 },
+            //                ChartPieElement { label: "Others"; value: 52.0 }
+            //            ]
             //        }
                 }
                 Chart {
                     id: chart2
                     anchors.top: chart1.bottom
                     anchors.bottom: parent.bottom
                     anchors.left: parent.left
                     anchors.right: parent.right
                     theme: Chart.ThemeScientific
                     LineSeries {
                         data: [
                             ChartPointElement { x: 0.0; y: 0.0 },
                             ChartPointElement { x: 1.1; y: 2.1 },
                             ChartPointElement { x: 2.9; y: 4.9 },
                             ChartPointElement { x: 3.2; y: 3.0 }
                         ]
                     }
                     ScatterSeries {
                         data: [
                             ChartPointElement { x: 1.1; y: 1.1 },
                             ChartPointElement { x: 1.1; y: 1.2 },
                             ChartPointElement { x: 1.17; y: 1.15 }
                         ]
                     }
                     ScatterSeries {
                         data: [
                             ChartPointElement { x: 1.5; y: 1.5 },
                             ChartPointElement { x: 1.5; y: 1.6 },
                             ChartPointElement { x: 1.57; y: 1.55 }
                         ]
                     }
                     ScatterSeries {
                         data: [
                             ChartPointElement { x: 2.0; y: 2.0 },
                             ChartPointElement { x: 2.0; y: 2.1 },
                             ChartPointElement { x: 2.07; y: 2.05 }
                         ]
                     }
                     ScatterSeries {
-                        id: scatter4
                         data: [
                             ChartPointElement { x: 2.6; y: 2.6 },
                             ChartPointElement { x: 2.6; y: 2.7 },
                             ChartPointElement { x: 2.67; y: 2.65 }
                         ]
                     }
                 }
             }

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