Changeset 3b87474

Timestamp:

03/31/12 18:27:14 (15 months ago)

Author:

Martin Kolman <martin.kolman@…>

Branches:

master

Children:

0f1fff2

Parents:

7b60594

git-author:

Martin Kolman <martin.kolman@…> (03/31/12 18:27:14)

git-committer:

Martin Kolman <martin.kolman@…> (03/31/12 18:27:14)

Message:

enable centering on startup
disable centering by panning the map

Location:

modules/gui_modules/gui_qml/qml

Files:

• MapPage.qml (modified) (3 diffs)
• PinchMap.qml (modified) (5 diffs)

modules/gui_modules/gui_qml/qml/MapPage.qml

@@ -17 +17 @@
     }
 
+    property bool center : true
+
     PinchMap {
         id: pinchmap
@@ -27 +29 @@
             onLastGoodFixChanged: {
                 //console.log("fix changed")
-                if (tabMap.status == PageStatus.Active) {
-                    if (followPositionButton.checked && ! updateTimer.running) {
-                        //console.debug("Update from GPS position")
-                        pinchmap.setCenterLatLon(gps.lastGoodFix.lat, gps.lastGoodFix.lon);
-                        updateTimer.start();
-                    } else if (followPositionButton.checked) {
-                        console.debug("Update timer preventing another update.");
-                    }
+                if (tabMap.center && ! updateTimer.running) {
+                    //console.debug("Update from GPS position")
+                    pinchmap.setCenterLatLon(gps.lastGoodFix.lat, gps.lastGoodFix.lon);
+                    updateTimer.start();
+                } else if (tabMap.center) {
+                    console.debug("Update timer preventing another update.");
                 }
             }
+        }
+
+        onDrag : {
+            // disable map centering once drag is detected
+            tabMap.center = false
         }
 
@@ -175 +180 @@
             width: parent.parent.buttonSize
             height: parent.parent.buttonSize
+            checked : tabMap.center
             checkable: true
             onClicked: {
-                if (checked && gps.lastGoodFix) {
-                    pinchmap.setCenterLatLon(gps.lastGoodFix.lat, gps.lastGoodFix.lon);
+                // toggle map centering
+                if (tabMap.center) {
+                    tabMap.center = false // disable
+                } else {
+                    tabMap.center = true // enable
+                    if (gps.lastGoodFix) { // recenter at once
+                        pinchmap.setCenterLatLon(gps.lastGoodFix.lat, gps.lastGoodFix.lon);
+                    }
                 }
             }

modules/gui_modules/gui_qml/qml/PinchMap.qml

@@ -50 +50 @@
 
     property int tileserverPort : mapTiles.serverPort()
+
+    signal drag // signals that map-drag has been detected
 
     transform: Rotation {
@@ -555 +557 @@
 
         onPressed: {
+            console.log("PRESSED")
             __isPanning = true;
             __lastX = mouse.x;
@@ -563 +566 @@
         }
 
-        /* onReleased: {
+        onReleased: {
             __isPanning = false;
             if (! __wasClick) {
                 panEnd();
-            } else {
+            } /*else {
                 var n = mousearea.mapToItem(geocacheDisplayContainer, mouse.x, mouse.y)
                 var g = geocacheDisplayContainer.childAt(n.x, n.y)
@@ -574 +577 @@
                     controller.geocacheSelected(g.cache)
                 }
-            }
-
-        } */
+            }*/
+
+        }
 
         onPositionChanged: {
@@ -585 +588 @@
                 __lastX = mouse.x;
                 __lastY = mouse.y;
-                if (Math.pow(mouse.x - __firstX, 2) + Math.pow(mouse.y - __firstY, 2) > maxClickDistance) {
+                /*
+                once the pan threshold is reached,
+                additional checking is unnecessary
+                for the press duration as nothing sets
+                __wasClick back to true
+                */
+                if (__wasClick && Math.pow(mouse.x - __firstX, 2) + Math.pow(mouse.y - __firstY, 2) > maxClickDistance) {
                     __wasClick = false;
+                    pinchmap.drag() // send the drag-detected signal
+
                 }
             }