diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-06-05 12:47:18 +0300 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-06-05 12:47:18 +0300 |
commit | 05364a4204a5ec4c16156ebcad12dd8944c48155 (patch) | |
tree | f27bdfeef5699efcb6abc70654d840e1662a3496 | |
parent | cfbfbea7d932f98c3f541bb4fc3e975ffb7a5658 (diff) | |
parent | 133838d7440bbafe25a9cbdee581547f14013894 (diff) |
Merge branch 'develop'
Change-Id: I9ebc050dc2c80b819f08e7e65000a9be709e9d59
-rw-r--r-- | src/datavisualizationqml2/plugins.qmltypes | 79 |
1 files changed, 76 insertions, 3 deletions
diff --git a/src/datavisualizationqml2/plugins.qmltypes b/src/datavisualizationqml2/plugins.qmltypes index 99fa53de..71decd74 100644 --- a/src/datavisualizationqml2/plugins.qmltypes +++ b/src/datavisualizationqml2/plugins.qmltypes @@ -78,6 +78,20 @@ Module { "RenderIndirect": 2 } } + Enum { + name: "OptimizationHint" + values: { + "OptimizationDefault": 0, + "OptimizationStatic": 1 + } + } + Enum { + name: "OptimizationHints" + values: { + "OptimizationDefault": 0, + "OptimizationStatic": 1 + } + } Property { name: "selectionMode"; type: "SelectionFlags" } Property { name: "shadowQuality"; type: "ShadowQuality" } Property { name: "shadowsSupported"; type: "bool"; isReadonly: true } @@ -98,6 +112,7 @@ Module { Property { name: "orthoProjection"; revision: 1; type: "bool" } Property { name: "selectedElement"; revision: 1; type: "ElementType"; isReadonly: true } Property { name: "aspectRatio"; revision: 1; type: "double" } + Property { name: "optimizationHints"; revision: 1; type: "OptimizationHints" } Signal { name: "selectionModeChanged" Parameter { name: "mode"; type: "AbstractDeclarative::SelectionFlags" } @@ -155,6 +170,11 @@ Module { revision: 1 Parameter { name: "ratio"; type: "double" } } + Signal { + name: "optimizationHintsChanged" + revision: 1 + Parameter { name: "hints"; type: "QAbstract3DGraph::OptimizationHints" } + } Method { name: "handleAxisXChanged" Parameter { name: "axis"; type: "QAbstract3DAxis"; isPointer: true } @@ -845,6 +865,8 @@ Module { Property { name: "max"; type: "double" } Property { name: "autoAdjustRange"; type: "bool" } Property { name: "labelAutoRotation"; revision: 1; type: "double" } + Property { name: "titleVisible"; revision: 1; type: "bool" } + Property { name: "titleFixed"; revision: 1; type: "bool" } Signal { name: "titleChanged" Parameter { name: "newTitle"; type: "string" } @@ -875,6 +897,16 @@ Module { revision: 1 Parameter { name: "angle"; type: "double" } } + Signal { + name: "titleVisibilityChanged" + revision: 1 + Parameter { name: "visible"; type: "bool" } + } + Signal { + name: "titleFixedChanged" + revision: 1 + Parameter { name: "fixed"; type: "bool" } + } } Component { name: "QtDataVisualization::QAbstract3DInputHandler" @@ -1173,6 +1205,47 @@ Module { } } Component { + name: "QtDataVisualization::QCustom3DLabel" + prototype: "QtDataVisualization::QCustom3DItem" + exports: ["QtDataVisualization/Custom3DLabel 1.1"] + exportMetaObjectRevisions: [0] + Property { name: "text"; type: "string" } + Property { name: "font"; type: "QFont" } + Property { name: "textColor"; type: "QColor" } + Property { name: "backgroundColor"; type: "QColor" } + Property { name: "borderEnabled"; type: "bool" } + Property { name: "backgroundEnabled"; type: "bool" } + Property { name: "facingCamera"; type: "bool" } + Signal { + name: "textChanged" + Parameter { name: "text"; type: "string" } + } + Signal { + name: "fontChanged" + Parameter { name: "font"; type: "QFont" } + } + Signal { + name: "textColorChanged" + Parameter { name: "color"; type: "QColor" } + } + Signal { + name: "backgroundColorChanged" + Parameter { name: "color"; type: "QColor" } + } + Signal { + name: "borderEnabledChanged" + Parameter { name: "enabled"; type: "bool" } + } + Signal { + name: "backgroundEnabledChanged" + Parameter { name: "enabled"; type: "bool" } + } + Signal { + name: "facingCameraChanged" + Parameter { name: "enabled"; type: "bool" } + } + } + Component { name: "QtDataVisualization::QHeightMapSurfaceDataProxy" prototype: "QtDataVisualization::QSurfaceDataProxy" exports: ["QtDataVisualization/HeightMapSurfaceDataProxy 1.0"] @@ -1225,7 +1298,7 @@ Module { "MMBCumulative": 3 } } - Property { name: "itemModel"; type: "const QAbstractItemModel"; isPointer: true } + Property { name: "itemModel"; type: "QAbstractItemModel"; isPointer: true } Property { name: "rowRole"; type: "string" } Property { name: "columnRole"; type: "string" } Property { name: "valueRole"; type: "string" } @@ -1340,7 +1413,7 @@ Module { "QtDataVisualization/ItemModelScatterDataProxy 1.1" ] exportMetaObjectRevisions: [0, 1] - Property { name: "itemModel"; type: "const QAbstractItemModel"; isPointer: true } + Property { name: "itemModel"; type: "QAbstractItemModel"; isPointer: true } Property { name: "xPosRole"; type: "string" } Property { name: "yPosRole"; type: "string" } Property { name: "zPosRole"; type: "string" } @@ -1431,7 +1504,7 @@ Module { "MMBCumulativeY": 3 } } - Property { name: "itemModel"; type: "const QAbstractItemModel"; isPointer: true } + Property { name: "itemModel"; type: "QAbstractItemModel"; isPointer: true } Property { name: "rowRole"; type: "string" } Property { name: "columnRole"; type: "string" } Property { name: "xPosRole"; type: "string" } |