Changeset 8909 in ntrip for trunk/BNC/src/map/bncmapwin.cpp

Timestamp:

Mar 22, 2020, 1:28:42 PM (4 years ago)

Author:

stuerze

Message:

try to reanimate map view using QWebEngineWidgets only

File:

• trunk/BNC/src/map/bncmapwin.cpp (modified) (5 diffs)

trunk/BNC/src/map/bncmapwin.cpp

@@ -35 +35 @@
  * Created:    08-Jun-2013
  *
- * Changes:
+ * Changes:    A. Stuerze
  *
  * -----------------------------------------------------------------------*/
@@ -56 +56 @@
   _currLon =  8.66496871; // BKG longitude
 
-#ifdef QT_WEBENGINE
   _webView = new QWebEngineView(this);
-#else
-  _webView = new QWebView(this);
-#endif
 
   connect(_webView, SIGNAL(loadFinished(bool)), this, SLOT(slotInitMap(bool)));
@@ -68 +64 @@
   bncSettings settings;
   _staID = settings.value("PPP/plotCoordinates").toByteArray();
-
-  // Proxy Settings
-  // --------------
-  QString proxyHost = settings.value("proxyHost").toString();
-  int     proxyPort = settings.value("proxyPort").toInt();
-  if (!proxyHost.isEmpty()) {
-    QNetworkProxy proxy(QNetworkProxy::HttpProxy, proxyHost, proxyPort);
-    _webView->page()->networkAccessManager()->setProxy(proxy);
-  }
 
   loadHtmlPage();
@@ -141 +128 @@
   }
   QString location = QString("%1, %2, %3, %4").arg(_currLat,0,'f',8).arg(_currLon,0,'f',8).arg(mapWinDotSize).arg(mapWinDotColor);
-  _webView->page()->mainFrame()->evaluateJavaScript(QString("initialize( %1 )").arg(location));
+  _webView->page()->runJavaScript(QString("gotoLocation( %1 )").arg(location));
 }
 
@@ -168 +155 @@
 
   QString location = QString("%1, %2").arg(_currLat,0,'f',8).arg(_currLon,0,'f',8);
-  _webView->page()->mainFrame()->evaluateJavaScript(QString("gotoLocation( %1 )").arg(location));
+  _webView->page()->runJavaScript(QString("gotoLocation( %1 )").arg(location));
 }