summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2014-02-18 14:55:25 +0200
committerTomi Korpipää <tomi.korpipaa@digia.com>2014-02-19 06:18:02 +0200
commit0e56c8f873e31bc0a8c7d5c0b954ec8d14f0495a (patch)
tree3d93033888b3f02049a17e4aac24e10245cd2c53 /examples
parent5bd455cbd04a61b251c466dd641e3ef31fcbe93b (diff)
Fix scene coordinates in qml indirect rendering
+Rename enums +Remove unnecessary update loop +Fudge qmlmultigraphs example data so that shadows are not borked in bar graph +Remove unnecessary border from around buttons in qmlmultigraphs Change-Id: I6c24f33912d29b7954c82f17becd342aea66b0e1 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/Data.qml4
-rw-r--r--examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/main.qml2
-rw-r--r--examples/datavisualization/qmlsurfacelayers/qml/qmlsurfacelayers/main.qml6
3 files changed, 5 insertions, 7 deletions
diff --git a/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/Data.qml b/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/Data.qml
index 998e4be3..43152e50 100644
--- a/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/Data.qml
+++ b/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/Data.qml
@@ -41,8 +41,8 @@ Item {
ListElement{ row: "3"; col: "3"; longitude: "23.2"; latitude: "13.4"; pop_density: "6.67"; }
ListElement{ row: "0"; col: "4"; longitude: "20.6"; latitude: "15.0"; pop_density: "6.01"; }
ListElement{ row: "1"; col: "4"; longitude: "21.3"; latitude: "14.6"; pop_density: "5.83"; }
- ListElement{ row: "2"; col: "4"; longitude: "22.5"; latitude: "14.8"; pop_density: "5.90"; }
- ListElement{ row: "3"; col: "4"; longitude: "23.7"; latitude: "14.3"; pop_density: "7.32"; }
+ ListElement{ row: "2"; col: "4"; longitude: "22.5"; latitude: "14.8"; pop_density: "7.32"; }
+ ListElement{ row: "3"; col: "4"; longitude: "23.7"; latitude: "14.3"; pop_density: "6.90"; }
}
}
diff --git a/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/main.qml b/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/main.qml
index 7691563a..45fdc9c0 100644
--- a/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/main.qml
+++ b/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/main.qml
@@ -78,8 +78,6 @@ Item {
Rectangle {
Layout.fillHeight: true
Layout.fillWidth: true
- border.color: surfaceGraph.theme.gridLineColor // Let's use neighbor's border color
- border.width: 2
GridLayout {
anchors.right: parent.right
diff --git a/examples/datavisualization/qmlsurfacelayers/qml/qmlsurfacelayers/main.qml b/examples/datavisualization/qmlsurfacelayers/qml/qmlsurfacelayers/main.qml
index 65378660..2c425a57 100644
--- a/examples/datavisualization/qmlsurfacelayers/qml/qmlsurfacelayers/main.qml
+++ b/examples/datavisualization/qmlsurfacelayers/qml/qmlsurfacelayers/main.qml
@@ -238,11 +238,11 @@ Item {
Layout.minimumHeight: 40
visible: false
onClicked: {
- if (surfaceLayers.renderingMode === AbstractGraph3D.Indirect_NoAA) {
- surfaceLayers.renderingMode = AbstractGraph3D.DirectToBackground
+ if (surfaceLayers.renderingMode === AbstractGraph3D.RenderIndirect_NoAA) {
+ surfaceLayers.renderingMode = AbstractGraph3D.RenderDirectToBackground
text = "Disable Antialiasing"
} else {
- surfaceLayers.renderingMode = AbstractGraph3D.Indirect_NoAA
+ surfaceLayers.renderingMode = AbstractGraph3D.RenderIndirect_NoAA
text = "Enable Antialiasing"
}
}