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

Timestamp:

Aug 23, 2022, 2:08:11 PM (2 years ago)

Author:

stuerze

Message:

minor changes

Location:

trunk/BNC/src/map

Files:

• bncmapwin.cpp (modified) (5 diffs)
• bncmapwin.h (modified) (1 diff)

trunk/BNC/src/map/bncmapwin.cpp

@@ -47 +47 @@
 bncMapWin::bncMapWin(QWidget* parent) : QDialog(parent) {
 
+  _initMap = false;
+
   const int ww = QFontMetrics(font()).width('w');
 
@@ -84 +86 @@
 
   show();
+
 }
 
@@ -114 +117 @@
     return;
   }
+  _initMap = true;
+
   bncSettings settings;
   int mapWinDotSize = settings.value("PPP/mapWinDotSize").toInt();
@@ -127 +132 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncMapWin::gotoLocation(double lat, double lon) {
+  if (!lat && !lon) {
+    return;
+  }
   _currLat = lat;
   _currLon = lon;
-
-  if (!_webView->page()) {
-    return;
-  }
 
   int    latDeg, latMin;
@@ -157 +161 @@
     return;
   }
-
+  if (!_initMap) {
+    return;
+  }
   double ell[3];
-  xyz2ell(xx.data(), ell);
+  if (xyz2ell(xx.data(), ell) == failure) {
+    return;
+  }
   gotoLocation(ell[0]*180.0/M_PI, ell[1]*180.0/M_PI);
 }

trunk/BNC/src/map/bncmapwin.h

@@ -62 +62 @@
   double           _currLon;
   QByteArray       _staID;
+  bool             _initMap;
 };