diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-10-11 08:38:57 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-10-11 09:10:55 +0300 |
commit | a4e9246ab8ac23b40984c65e55f2aa2184fc28f8 (patch) | |
tree | 2c8f5762b933ea74f3e81c860fadc30ee7813cd8 /examples | |
parent | d52b1938dcfdb3a111ce1e0db1510ef87996a0be (diff) |
Fix enum usage in qml examples
+remove some qdebugs
Change-Id: Icf4e152958c4038d8586ecd2d07c1204f8ca635b
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/qmlbars/qml/qmlbars/main.qml | 16 | ||||
-rw-r--r-- | examples/qmlscatter/qml/qmlscatter/main.qml | 22 | ||||
-rw-r--r-- | examples/qmlsurface/qml/qmlsurface/main.qml | 8 |
3 files changed, 23 insertions, 23 deletions
diff --git a/examples/qmlbars/qml/qmlbars/main.qml b/examples/qmlbars/qml/qmlbars/main.qml index 9f3a3484..6f44fe63 100644 --- a/examples/qmlbars/qml/qmlbars/main.qml +++ b/examples/qmlbars/qml/qmlbars/main.qml @@ -45,16 +45,16 @@ Item { id: testGraph width: dataView.width height: dataView.height - shadowQuality: Bars3D.ShadowQualityMedium - selectionMode: Bars3D.SelectionModeItem + shadowQuality: AbstractGraph3D.ShadowQualityMedium + selectionMode: AbstractGraph3D.SelectionModeItem font.pointSize: 35 - theme: Bars3D.ThemeRetro - labelStyle: Bars3D.LabelStyleFromTheme + theme: AbstractGraph3D.ThemeRetro + labelStyle: AbstractGraph3D.LabelStyleFromTheme dataProxy: graphData.proxy barThickness: 0.5 barSpacing: Qt.size(0.5, 0.5) barSpacingRelative: false - scene.activeCamera.cameraPreset: Bars3D.CameraPresetRight + scene.activeCamera.cameraPreset: AbstractGraph3D.CameraPresetRight columnAxis: graphAxes.column valueAxis: graphAxes.expenses itemLabelFormat: "@valueTitle for @colLabel, @rowLabel: @valueLabel" @@ -108,11 +108,11 @@ Item { height: 60 text: "Hide Shadows" onClicked: { - if (testGraph.shadowQuality == Bars3D.ShadowQualityNone) { - testGraph.shadowQuality = Bars3D.ShadowQualityMedium; + if (testGraph.shadowQuality == AbstractGraph3D.ShadowQualityNone) { + testGraph.shadowQuality = AbstractGraph3D.ShadowQualityMedium; text = "Hide Shadows" } else { - testGraph.shadowQuality = Bars3D.ShadowQualityNone; + testGraph.shadowQuality = AbstractGraph3D.ShadowQualityNone; text = "Show Shadows" } } diff --git a/examples/qmlscatter/qml/qmlscatter/main.qml b/examples/qmlscatter/qml/qmlscatter/main.qml index c8aebcc7..e5f1de62 100644 --- a/examples/qmlscatter/qml/qmlscatter/main.qml +++ b/examples/qmlscatter/qml/qmlscatter/main.qml @@ -53,8 +53,8 @@ Item { //! [3] font.family: "Lucida Handwriting" font.pointSize: 40 - theme: Scatter3D.ThemeIsabelle - shadowQuality: Scatter3D.ShadowQualitySoftLow + theme: AbstractGraph3D.ThemeIsabelle + shadowQuality: AbstractGraph3D.ShadowQualitySoftLow //! [3] //! [5] dataProxy: graphData.proxy @@ -80,11 +80,11 @@ Item { width: parent.width / 6 // We're adding 6 buttons and want to divide them equally text: "Hide Shadows" onClicked: { - if (scatterGraph.shadowQuality === Scatter3D.ShadowQualityNone) { - scatterGraph.shadowQuality = Scatter3D.ShadowQualitySoftLow; + if (scatterGraph.shadowQuality === AbstractGraph3D.ShadowQualityNone) { + scatterGraph.shadowQuality = AbstractGraph3D.ShadowQualitySoftLow; text = "Hide Shadows"; } else { - scatterGraph.shadowQuality = Scatter3D.ShadowQualityNone; + scatterGraph.shadowQuality = AbstractGraph3D.ShadowQualityNone; text = "Show Shadows"; } } @@ -113,10 +113,10 @@ Item { text: "Change Camera Placement" anchors.left: smoothToggle.right onClicked: { - if (scatterGraph.scene.activeCamera.cameraPreset === Scatter3D.CameraPresetFront) { - scatterGraph.scene.activeCamera.cameraPreset = Scatter3D.CameraPresetIsometricRightHigh; + if (scatterGraph.scene.activeCamera.cameraPreset === AbstractGraph3D.CameraPresetFront) { + scatterGraph.scene.activeCamera.cameraPreset = AbstractGraph3D.CameraPresetIsometricRightHigh; } else { - scatterGraph.scene.activeCamera.cameraPreset = Scatter3D.CameraPresetFront; + scatterGraph.scene.activeCamera.cameraPreset = AbstractGraph3D.CameraPresetFront; } } } @@ -127,10 +127,10 @@ Item { text: "Change Theme" anchors.left: cameraToggle.right onClicked: { - if (scatterGraph.theme === Scatter3D.ThemeArmyBlue) { - scatterGraph.theme = Scatter3D.ThemeIsabelle; + if (scatterGraph.theme === AbstractGraph3D.ThemeArmyBlue) { + scatterGraph.theme = AbstractGraph3D.ThemeIsabelle; } else { - scatterGraph.theme = Scatter3D.ThemeArmyBlue; + scatterGraph.theme = AbstractGraph3D.ThemeArmyBlue; } } } diff --git a/examples/qmlsurface/qml/qmlsurface/main.qml b/examples/qmlsurface/qml/qmlsurface/main.qml index f66e623b..3f69ce95 100644 --- a/examples/qmlsurface/qml/qmlsurface/main.qml +++ b/examples/qmlsurface/qml/qmlsurface/main.qml @@ -47,14 +47,14 @@ Item { id: surfaceplot width: surfaceView.width height: surfaceView.height - theme: Surface3D.ThemeStoneMoss - shadowQuality: Surface3D.ShadowQualityMedium - selectionMode: Bars3D.SelectionModeSliceRow + theme: AbstractGraph3D.ThemeStoneMoss + shadowQuality: AbstractGraph3D.ShadowQualityMedium + selectionMode: AbstractGraph3D.SelectionModeSliceRow smoothSurfaceEnabled: true surfaceGridEnabled: false font.family: "STCaiyun" font.pointSize: 35 - scene.activeCamera.cameraPreset: Surface3D.CameraPresetIsometricLeft + scene.activeCamera.cameraPreset: AbstractGraph3D.CameraPresetIsometricLeft dataProxy: surfaceData.heightProxy axisY.min: 0.0 axisY.max: 250.0 |