HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2705:fbb76bf1bd36

Add QVBoxPlotModelMapper and QBoxPlotModelMapper as types for QtQuick 2...

Andy Shaw -

r2705:fbb76bf1bd36

parent child

Context file:

r2705:fbb76bf1bd36

Collapse all files

plugins/declarative/plugin.cpp +11 0

             #include "qbarlegendmarker.h"
             #include "qpielegendmarker.h"
             #include "qxylegendmarker.h"
+            #include "qboxplotmodelmapper.h"
+            #include "qvboxplotmodelmapper.h"
             #ifndef QT_ON_ARM
                 #include "qdatetimeaxis.h"
             #endif
             Q_DECLARE_METATYPE(QVXYModelMapper *)
             Q_DECLARE_METATYPE(QXYLegendMarker *)
             Q_DECLARE_METATYPE(QXYModelMapper *)
+            Q_DECLARE_METATYPE(QBoxPlotModelMapper *)
+            Q_DECLARE_METATYPE(QVBoxPlotModelMapper *)
             Q_DECLARE_METATYPE(QAbstractSeries *)
             Q_DECLARE_METATYPE(QXYSeries *)
                     qmlRegisterType<QVPieModelMapper>(uri, 1, 0, "VPieModelMapper");
                     qmlRegisterType<QHBarModelMapper>(uri, 1, 0, "HBarModelMapper");
                     qmlRegisterType<QVBarModelMapper>(uri, 1, 0, "VBarModelMapper");
                     qmlRegisterType<QValueAxis>(uri, 1, 0, "ValuesAxis");
                     qmlRegisterType<QBarCategoryAxis>(uri, 1, 0, "BarCategoriesAxis");
                     qmlRegisterUncreatableType<QLegend>(uri, 1, 0, "Legend",
                     qmlRegisterType<DeclarativeBoxSet, 1>(uri, 1, 4, "BoxSet");
                     qmlRegisterType<DeclarativePieSlice>(uri, 1, 4, "PieSlice");
                     qmlRegisterType<DeclarativeScatterSeries, 4>(uri, 1, 4, "ScatterSeries");
+                    // QtCommercial.Chart 2.0
+                    qmlRegisterType<QVBoxPlotModelMapper>(uri, 2, 0, "VBoxPlotModelMapper");
+                    qmlRegisterUncreatableType<QBoxPlotModelMapper>(uri, 2, 0, "BoxPlotModelMapper",
+                        QLatin1String("Trying to create uncreatable: BoxPlotModelMapper."));
                 }
             };

plugins/quick2/plugins.qmltypes +34 -1

             // It is used for QML tooling purposes only.
             //
             // This file was auto-generated by:
-            // 'qmlplugindump -nonrelocatable QtCommercial.Chart 1.4'
+            // 'qmlplugindump -nonrelocatable QtCommercial.Chart 2.0'
             Module {
                 Component {
                     name: "QtCommercialChart::DeclarativeAxes"
                     prototype: "QObject"
                     exports: ["QtCommercial.Chart/DeclarativeAxes 1.0"]
+                    isCreatable: false
                     exportMetaObjectRevisions: [0]
                     Property { name: "axisX"; type: "QAbstractAxis"; isPointer: true }
                     Property { name: "axisY"; type: "QAbstractAxis"; isPointer: true }
                     name: "QtCommercialChart::DeclarativeMargins"
                     prototype: "QObject"
                     exports: ["QtCommercial.Chart/Margins 1.1"]
+                    isCreatable: false
                     exportMetaObjectRevisions: [0]
                     Property { name: "top"; type: "int" }
                     Property { name: "bottom"; type: "int" }
                     name: "QtCommercialChart::QAbstractAxis"
                     prototype: "QObject"
                     exports: ["QtCommercial.Chart/AbstractAxis 1.0"]
+                    isCreatable: false
                     exportMetaObjectRevisions: [0]
                     Property { name: "visible"; type: "bool" }
                     Property { name: "lineVisible"; type: "bool" }
                     name: "QtCommercialChart::QAbstractBarSeries"
                     prototype: "QtCommercialChart::QAbstractSeries"
                     exports: ["QtCommercial.Chart/AbstractBarSeries 1.0"]
+                    isCreatable: false
                     exportMetaObjectRevisions: [0]
                     Enum {
                         name: "LabelsPosition"
                     name: "QtCommercialChart::QAbstractSeries"
                     prototype: "QObject"
                     exports: ["QtCommercial.Chart/AbstractSeries 1.0"]
+                    isCreatable: false
                     exportMetaObjectRevisions: [0]
                     Enum {
                         name: "SeriesType"
                     name: "QtCommercialChart::QBarModelMapper"
                     prototype: "QObject"
                     exports: ["QtCommercial.Chart/BarModelMapper 1.0"]
+                    isCreatable: false
                     exportMetaObjectRevisions: [0]
                 }
                 Component {
                     name: "QtCommercialChart::QBarSet"
                     prototype: "QObject"
                     exports: ["QtCommercial.Chart/BarSetBase 1.0"]
+                    isCreatable: false
                     exportMetaObjectRevisions: [0]
                     Property { name: "label"; type: "string" }
                     Property { name: "pen"; type: "QPen" }
                     }
                 }
                 Component {
+                    name: "QtCommercialChart::QBoxPlotModelMapper"
+                    prototype: "QObject"
+                    exports: ["QtCommercial.Chart/BoxPlotModelMapper 2.0"]
+                    isCreatable: false
+                    exportMetaObjectRevisions: [0]
+                }
+                Component {
                     name: "QtCommercialChart::QBoxPlotSeries"
                     prototype: "QtCommercialChart::QAbstractSeries"
                     Property { name: "boxOutlineVisible"; type: "bool" }
                     defaultProperty: "children"
                     prototype: "QGraphicsWidget"
                     exports: ["QtCommercial.Chart/Legend 1.0"]
+                    isCreatable: false
                     exportMetaObjectRevisions: [0]
                     Property { name: "alignment"; type: "Qt::Alignment" }
                     Property { name: "backgroundVisible"; type: "bool" }
                     name: "QtCommercialChart::QPieModelMapper"
                     prototype: "QObject"
                     exports: ["QtCommercial.Chart/PieModelMapper 1.0"]
+                    isCreatable: false
                     exportMetaObjectRevisions: [0]
                 }
                 Component {
                     name: "QtCommercialChart::QPieSeries"
                     prototype: "QtCommercialChart::QAbstractSeries"
                     exports: ["QtCommercial.Chart/QPieSeries 1.0"]
+                    isCreatable: false
                     exportMetaObjectRevisions: [0]
                     Property { name: "horizontalPosition"; type: "double" }
                     Property { name: "verticalPosition"; type: "double" }
                     Signal { name: "modelReplaced" }
                 }
                 Component {
+                    name: "QtCommercialChart::QVBoxPlotModelMapper"
+                    prototype: "QtCommercialChart::QBoxPlotModelMapper"
+                    exports: ["QtCommercial.Chart/VBoxPlotModelMapper 2.0"]
+                    exportMetaObjectRevisions: [0]
+                    Property { name: "series"; type: "QBoxPlotSeries"; isPointer: true }
+                    Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }
+                    Property { name: "firstBoxSetColumn"; type: "int" }
+                    Property { name: "lastBoxSetColumn"; type: "int" }
+                    Property { name: "firstRow"; type: "int" }
+                    Property { name: "rowCount"; type: "int" }
+                    Signal { name: "seriesReplaced" }
+                    Signal { name: "modelReplaced" }
+                }
+                Component {
                     name: "QtCommercialChart::QVPieModelMapper"
                     prototype: "QtCommercialChart::QPieModelMapper"
                     exports: ["QtCommercial.Chart/VPieModelMapper 1.0"]
                     name: "QtCommercialChart::QXYModelMapper"
                     prototype: "QObject"
                     exports: ["QtCommercial.Chart/XYModelMapper 1.0"]
+                    isCreatable: false
                     exportMetaObjectRevisions: [0]
                 }
                 Component {
                     name: "QtCommercialChart::QXYSeries"
                     prototype: "QtCommercialChart::QAbstractSeries"
                     exports: ["QtCommercial.Chart/XYSeries 1.0"]
+                    isCreatable: false
                     exportMetaObjectRevisions: [0]
                     Property { name: "pointsVisible"; type: "bool" }
                     Property { name: "color"; type: "QColor" }

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