Changeset 5246 in ntrip


Ignore:
Timestamp:
Jun 17, 2013, 10:29:51 AM (9 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/src/map
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/map/bncmapwin.cpp

    r5234 r5246  
    115115    return;
    116116  }
    117   QString location = QString("%1, %2").arg(_currLat,0,'f',8).arg(_currLon,0,'f',8);
     117  bncSettings settings;
     118  int useTrace = (Qt::CheckState(settings.value("mapWinTrace").toInt()) == Qt::Checked) ? 1 : 0;
     119  QString location = QString("%1, %2, %3").arg(_currLat,0,'f',8).arg(_currLon,0,'f',8).arg(useTrace);
    118120  _webView->page()->mainFrame()->evaluateJavaScript(QString("initialize( %1 )").arg(location));
    119121}
  • trunk/BNC/src/map/map_gm.html

    r5245 r5246  
    1515      var marker;
    1616      var zoom;
     17      var useTrace;
    1718     
    18       function initialize(lat, lon) {
     19      function initialize(lat, lon, trace) {
    1920     
     21        useTrace = trace;
     22
    2023        var myOptions = {
    2124          center:     new google.maps.LatLng(lat, lon),
     
    4952        map.setCenter(position);
    5053        marker.setPosition(position);
     54
     55        if (useTrace == 1) {
     56          var trace = new google.maps.Marker({
     57            map:      map,
     58            position: new google.maps.LatLng(lat, lon),
     59          });
     60        }
    5161      }
    5262    </script>
Note: See TracChangeset for help on using the changeset viewer.