Changeset 5246 in ntrip for trunk/BNC/src/map

Timestamp:

Jun 17, 2013, 10:29:51 AM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/map

Files:

• bncmapwin.cpp (modified) (1 diff)
• map_gm.html (modified) (2 diffs)

trunk/BNC/src/map/bncmapwin.cpp

@@ -115 +115 @@
     return;
   }
-  QString location = QString("%1, %2").arg(_currLat,0,'f',8).arg(_currLon,0,'f',8);
+  bncSettings settings;
+  int useTrace = (Qt::CheckState(settings.value("mapWinTrace").toInt()) == Qt::Checked) ? 1 : 0;
+  QString location = QString("%1, %2, %3").arg(_currLat,0,'f',8).arg(_currLon,0,'f',8).arg(useTrace);
   _webView->page()->mainFrame()->evaluateJavaScript(QString("initialize( %1 )").arg(location));
 }

trunk/BNC/src/map/map_gm.html

@@ -15 +15 @@
       var marker;
       var zoom;
+      var useTrace;
       
-      function initialize(lat, lon) {
+      function initialize(lat, lon, trace) {
       
+        useTrace = trace;
+
         var myOptions = {
           center:     new google.maps.LatLng(lat, lon),
@@ -49 +52 @@
         map.setCenter(position);
         marker.setPosition(position);
+
+        if (useTrace == 1) {
+          var trace = new google.maps.Marker({
+            map:      map,
+            position: new google.maps.LatLng(lat, lon),
+          });
+        }
       }
     </script>