diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-06-27 12:58:12 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-06-30 08:14:38 +0300 |
commit | 600aa5708e9ee033c98561d6e44aa4e9901b63b1 (patch) | |
tree | 00cb57a0761a39a5c20932a6fb55970a303a53ce /examples | |
parent | a0196afc135d63f69aab5626424cc2e21ccac611 (diff) |
Adjust background margins based on angular labels and title
Also separated the vertical and horizontal background margins.
Task-number: QTRD-3184
Change-Id: I988217d4df7749585dd85b5ea8f3f50254dca6ad
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/datavisualization/qmlspectrogram/qml/qmlspectrogram/main.qml | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/examples/datavisualization/qmlspectrogram/qml/qmlspectrogram/main.qml b/examples/datavisualization/qmlspectrogram/qml/qmlspectrogram/main.qml index 66fa807f..f7e93827 100644 --- a/examples/datavisualization/qmlspectrogram/qml/qmlspectrogram/main.qml +++ b/examples/datavisualization/qmlspectrogram/qml/qmlspectrogram/main.qml @@ -99,6 +99,7 @@ Window { shadowQuality: AbstractGraph3D.ShadowQualityNone selectionMode: AbstractGraph3D.SelectionSlice | AbstractGraph3D.SelectionItemAndRow scene.activeCamera.cameraPreset: Camera3D.CameraPresetDirectlyAbove + scene.activeCamera.zoomLevel: 85 axisX: xAxis axisY: yAxis axisZ: zAxis @@ -166,6 +167,7 @@ Window { } else { surfaceGraph.orthoProjection = true; surfaceGraph.scene.activeCamera.cameraPreset = Camera3D.CameraPresetDirectlyAbove + surfaceSeries.drawMode &= ~Surface3DSeries.DrawWireframe; xAxis.labelAutoRotation = 0 yAxis.labelAutoRotation = 0 zAxis.labelAutoRotation = 0 @@ -175,20 +177,6 @@ Window { } NewButton { - id: surfaceGridToggle - Layout.fillWidth: true - Layout.fillHeight: true - text: "Toggle surface grid" - onClicked: { - if (surfaceSeries.drawMode & Surface3DSeries.DrawWireframe) { - surfaceSeries.drawMode &= ~Surface3DSeries.DrawWireframe; - } else { - surfaceSeries.drawMode |= Surface3DSeries.DrawWireframe; - } - } - } - - NewButton { id: flipGridToggle Layout.fillWidth: true Layout.fillHeight: true @@ -211,13 +199,29 @@ Window { text: "Toggle radial label position" visible: surfaceGraph.polar onClicked: { - if (surfaceGraph.radialLabelOffset > 1.0) { + if (surfaceGraph.radialLabelOffset >= 1.0) { surfaceGraph.radialLabelOffset = 0.01 } else { - surfaceGraph.radialLabelOffset = 1.06 + surfaceGraph.radialLabelOffset = 1.0 } } } + + NewButton { + id: surfaceGridToggle + Layout.fillWidth: true + Layout.fillHeight: true + text: "Toggle surface grid" + visible: !surfaceGraph.orthoProjection + onClicked: { + if (surfaceSeries.drawMode & Surface3DSeries.DrawWireframe) { + surfaceSeries.drawMode &= ~Surface3DSeries.DrawWireframe; + } else { + surfaceSeries.drawMode |= Surface3DSeries.DrawWireframe; + } + } + } + } Rectangle { |