From 06c473d9dfe162a1e55a1ebbc68ff89f4cd9a8ea Mon Sep 17 00:00:00 2001 From: Nico Vertriest Date: Mon, 13 Mar 2017 14:34:58 +0100 Subject: Doc: corrected link to Models and Views in Qt Quick MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I8a6e6a34ea22b5ba96b46f05e970cdaa91dbc6b4 Reviewed-by: Topi Reiniö --- examples/location/mapviewer/doc/src/mapviewer.qdoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'examples') diff --git a/examples/location/mapviewer/doc/src/mapviewer.qdoc b/examples/location/mapviewer/doc/src/mapviewer.qdoc index 1fe0411c..2836ae0e 100644 --- a/examples/location/mapviewer/doc/src/mapviewer.qdoc +++ b/examples/location/mapviewer/doc/src/mapviewer.qdoc @@ -155,8 +155,8 @@ This is all that is required to display a Route on the Map. However, it is also useful to be able to retrieve the written directions and explanation of the travel route. In the example, these are displayed in a \l {ListView} element. - To create this content, we use a standard \l {Models and Views in Qt Quick#ListModel}{ListModel} and - \l {ListView} pair. The data in the \l {Models and Views in Qt Quick#ListModel}{ListModel} is + To create this content, we use a standard \l {Models and Views in Qt Quick#Models}{ListModel} and + \l {ListView} pair. The data in the \l {Models and Views in Qt Quick#Models}{ListModel} is built from the routeModel's output: \snippet mapviewer/forms/RouteList.qml routeinfomodel0 -- cgit v1.2.3 From 64cf6d6a7ca445d511760fbf07d924f6519f6779 Mon Sep 17 00:00:00 2001 From: "Thiago Marcos P. Santos" Date: Thu, 6 Apr 2017 17:30:48 +0300 Subject: Update location screenshots Better rendering using Mapbox GL plugin. Change-Id: I3ef1862988e652c1caad62920c2f3b5775f18552 Reviewed-by: Paolo Angelelli Reviewed-by: Bruno de Oliveira Abinader --- .../location/mapviewer/doc/images/mapviewer.png | Bin 359712 -> 176944 bytes .../minimal_map/doc/images/minimal_map.png | Bin 156053 -> 229975 bytes examples/location/minimal_map/main.qml | 8 ++++---- examples/location/places/doc/images/places.png | Bin 151611 -> 233430 bytes .../location/places_map/doc/images/places_map.png | Bin 167995 -> 157761 bytes examples/location/places_map/places_map.qml | 2 +- .../planespotter/doc/images/planespotter.png | Bin 139390 -> 135872 bytes examples/location/planespotter/planespotter.qml | 2 +- 8 files changed, 6 insertions(+), 6 deletions(-) (limited to 'examples') diff --git a/examples/location/mapviewer/doc/images/mapviewer.png b/examples/location/mapviewer/doc/images/mapviewer.png index 4dc13f72..b55d7ff3 100644 Binary files a/examples/location/mapviewer/doc/images/mapviewer.png and b/examples/location/mapviewer/doc/images/mapviewer.png differ diff --git a/examples/location/minimal_map/doc/images/minimal_map.png b/examples/location/minimal_map/doc/images/minimal_map.png index 31ad0f8b..73a16fd5 100644 Binary files a/examples/location/minimal_map/doc/images/minimal_map.png and b/examples/location/minimal_map/doc/images/minimal_map.png differ diff --git a/examples/location/minimal_map/main.qml b/examples/location/minimal_map/main.qml index 26f24986..58b1c54f 100644 --- a/examples/location/minimal_map/main.qml +++ b/examples/location/minimal_map/main.qml @@ -49,8 +49,8 @@ Window { visible: true Plugin { - id: osmPlugin - name: "osm" + id: mapPlugin + name: "osm" // "mapboxgl", "esri", ... // specify plugin parameters if necessary // PluginParameter { // name: @@ -60,8 +60,8 @@ Window { Map { anchors.fill: parent - plugin: osmPlugin + plugin: mapPlugin center: QtPositioning.coordinate(59.91, 10.75) // Oslo - zoomLevel: 10 + zoomLevel: 14 } } diff --git a/examples/location/places/doc/images/places.png b/examples/location/places/doc/images/places.png index 0b1ac8b7..c8ada27d 100644 Binary files a/examples/location/places/doc/images/places.png and b/examples/location/places/doc/images/places.png differ diff --git a/examples/location/places_map/doc/images/places_map.png b/examples/location/places_map/doc/images/places_map.png index 4982df23..72317e2d 100644 Binary files a/examples/location/places_map/doc/images/places_map.png and b/examples/location/places_map/doc/images/places_map.png differ diff --git a/examples/location/places_map/places_map.qml b/examples/location/places_map/places_map.qml index e7d20e7b..467a31de 100644 --- a/examples/location/places_map/places_map.qml +++ b/examples/location/places_map/places_map.qml @@ -51,7 +51,7 @@ Rectangle { //! [Initialize Plugin] Plugin { id: myPlugin - name: "osm" + name: "osm" // "mapboxgl", "esri", ... //specify plugin parameters if necessary //PluginParameter {...} //PluginParameter {...} diff --git a/examples/location/planespotter/doc/images/planespotter.png b/examples/location/planespotter/doc/images/planespotter.png index dcfd55fe..f68f6f22 100644 Binary files a/examples/location/planespotter/doc/images/planespotter.png and b/examples/location/planespotter/doc/images/planespotter.png differ diff --git a/examples/location/planespotter/planespotter.qml b/examples/location/planespotter/planespotter.qml index 624a015e..62930ba7 100644 --- a/examples/location/planespotter/planespotter.qml +++ b/examples/location/planespotter/planespotter.qml @@ -62,7 +62,7 @@ Window { anchors.centerIn: parent; anchors.fill: parent plugin: Plugin { - name: "osm" + name: "osm" // "mapboxgl", "esri", ... } Plane { -- cgit v1.2.3 From 0023c72390d7055a1446f8fb38e0415be134f501 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Tue, 27 Sep 2016 13:07:28 +0200 Subject: example: use the compiler Change-Id: I18e750713befae9a30b052cc001cec8577349479 Reviewed-by: Paolo Angelelli Reviewed-by: Alex Blasche --- examples/location/mapviewer/mapviewer.pro | 1 + 1 file changed, 1 insertion(+) (limited to 'examples') diff --git a/examples/location/mapviewer/mapviewer.pro b/examples/location/mapviewer/mapviewer.pro index 65ac2d16..5f463c85 100644 --- a/examples/location/mapviewer/mapviewer.pro +++ b/examples/location/mapviewer/mapviewer.pro @@ -2,6 +2,7 @@ TARGET = qml_location_mapviewer TEMPLATE = app QT += qml network quick positioning location +CONFIG += qtquickcompiler SOURCES += main.cpp RESOURCES += \ -- cgit v1.2.3 From 34ff8eacba855db6527e564a6674a6b554f232bf Mon Sep 17 00:00:00 2001 From: Paolo Angelelli Date: Tue, 11 Apr 2017 11:43:39 +0200 Subject: MapViewer example: make double clicks zoom to integral zoom levels In this way there's a way to easily get to a zoom level where the map is sharp Change-Id: I176cf3870d9c3fe970191d46c804e13daab674fa Reviewed-by: Alex Blasche --- examples/location/mapviewer/map/MapComponent.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'examples') diff --git a/examples/location/mapviewer/map/MapComponent.qml b/examples/location/mapviewer/map/MapComponent.qml index c450a150..570505a0 100644 --- a/examples/location/mapviewer/map/MapComponent.qml +++ b/examples/location/mapviewer/map/MapComponent.qml @@ -604,9 +604,9 @@ Map { var mouseGeoPos = map.toCoordinate(Qt.point(mouse.x, mouse.y)); var preZoomPoint = map.fromCoordinate(mouseGeoPos, false); if (mouse.button === Qt.LeftButton) { - map.zoomLevel++; + map.zoomLevel = Math.floor(map.zoomLevel + 1) } else if (mouse.button === Qt.RightButton) { - map.zoomLevel--; + map.zoomLevel = Math.floor(map.zoomLevel - 1) } var postZoomPoint = map.fromCoordinate(mouseGeoPos, false); var dx = postZoomPoint.x - preZoomPoint.x; -- cgit v1.2.3