diff options
| author | Michal Klocek <michal.klocek@digia.com> | 2011-12-14 11:29:15 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-18 16:08:47 +0100 |
| commit | 24a7188845f36eebab208ab626803663d8168ac2 (patch) | |
| tree | c7e7d5ad80b412daf7ec875863d11271687a774b /tests/applications | |
| parent | bdc72e694036547417d6c5925584113721366c81 (diff) | |
| download | qtlocation-24a7188845f36eebab208ab626803663d8168ac2.tar.gz | |
Fix threading issue for map item
* restrict node access only to updatePaintNode
* add dirty flags
* move gemoetry calcualtion to declaratvie class
* fix missing first update call
Change-Id: Ie1a6e5e6fcde9d336d72783dfdf22e39bf53c285
Reviewed-by: Juha Vuolle <juha.vuolle@nokia.com>
Diffstat (limited to 'tests/applications')
| -rw-r--r-- | tests/applications/declarative_map/map3d.qml | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/tests/applications/declarative_map/map3d.qml b/tests/applications/declarative_map/map3d.qml index b0101651..40f56be2 100644 --- a/tests/applications/declarative_map/map3d.qml +++ b/tests/applications/declarative_map/map3d.qml @@ -90,6 +90,10 @@ Rectangle { onDoubleClicked: {console.log('+++++++++++++++ removing item 1'); map.removeMapItem(externalStaticMapItem1);} } } + Rectangle {color: "lightblue"; width: 80; height: 40; + Text {text: "Add\nitem"} + MouseArea{ anchors.fill: parent; onClicked: map.addMapItem(extMapCircle)} + } Rectangle {color: "lightblue"; width: 80; height: 80; Text {text: "Click:\nadd item2\nDouble-click:\nrm item2"} MouseArea{ anchors.fill: parent; @@ -180,10 +184,6 @@ Rectangle { MouseArea{ anchors.fill: parent; onClicked: map.height -= 10} } Rectangle {color: "lightblue"; width: 80; height: 40; - Text {text: "Add\nitem"} - MouseArea{ anchors.fill: parent; onClicked: map.addMapItem(extMapCircle)} - } - Rectangle {color: "lightblue"; width: 80; height: 40; Text {text: "toScrPos"} MouseArea{ anchors.fill: parent; onClicked: console.log('coordinate: ' + @@ -264,6 +264,8 @@ Rectangle { center: londonCoordinate radius: 10000 color: 'red' + border.color: 'darkcyan' + border.width: 15 MapMouseArea { id: mouseAreaOfMapCircle @@ -291,7 +293,8 @@ Rectangle { MapPolyline { id: mapPolyline z: 15 - color: 'red' + line.color: 'red' + line.width: 10 path: [ Coordinate { id: pathCoord1; latitude: 50.7; longitude: 0.1}, Coordinate { id: pathCoord2; latitude: 50.8; longitude: 0.4}, @@ -321,6 +324,8 @@ Rectangle { MapPolygon { id: mapPolygon color: 'pink' + border.color: 'darkmagenta' + border.width: 10 path: [ Coordinate { id: pathCoord_1; latitude: 51; longitude: 0.2}, Coordinate { id: pathCoord_2; latitude: 51.1; longitude: 0.6}, @@ -349,7 +354,8 @@ Rectangle { MapRoute { id: mapRoute - color: 'black' + line.color: 'green' + line.width: 7 // don't do this at home - route is not user instantiable, // use polyline instead route: Route { |