Changeset 9237 in ntrip

Timestamp:

Nov 10, 2020, 11:53:58 AM (3 years ago)

Author:

stuerze

Message:

pppMap now with OSM only

Location:

trunk/BNC/src

Files:

• bnc.qrc (modified) (1 diff)
• bncmain.cpp (modified) (1 diff)
• bncwindow.cpp (modified) (4 diffs)
• map/bncmapwin.cpp (modified) (1 diff)
• map/map_gm.html (deleted)
• map/map_osb.html (deleted)
• pppWidgets.cpp (modified) (5 diffs)
• pppWidgets.h (modified) (1 diff)
• src.pri (modified) (1 diff)

trunk/BNC/src/bnc.qrc

@@ -54 +54 @@
 </qresource>
 <qresource>
-    <file>map/map_gm.html</file>
     <file>map/map_osm.html</file>
     <file>map/crosshair.png</file>

trunk/BNC/src/bncmain.cpp

@@ -245 +245 @@
       "   PPP/plotCoordinates  {Mountpoint for time series plot [character string]}\n"
       "   PPP/audioResponse    {Audio response threshold in meters [floating-point number]}\n"
-      "   PPP/useOpenStreetMap {OSM track map [character string: true|false]}\n"
-      "   PPP/useGoogleMap     {Google track map [character string: true|false]}\n"
       "   PPP/mapWinDotSize    {Size of dots on map [integer number: 0-10]}\n"
       "   PPP/mapWinDotColor   {Color of dots and cross hair on map [character string: red|yellow]}\n"

trunk/BNC/src/bncwindow.cpp

@@ -1060 +1060 @@
   pppLayout4->addWidget(_pppWidgets._audioResponse,                      ir, 4, Qt::AlignLeft);
   pppLayout4->addWidget(new QLabel("Audio response"),                    ir, 5, Qt::AlignRight);
-
   ++ir;
   pppLayout4->addWidget(new QLabel("Track map"),                         ir, 0, Qt::AlignLeft);
   pppLayout4->addWidget(_pppWidgets._mapWinButton,                       ir, 1, Qt::AlignLeft);
-  pppLayout4->addWidget(new QLabel("OSM"),                               ir, 2, Qt::AlignLeft);
-  pppLayout4->addWidget(_pppWidgets._useOpenStreetMap,                   ir, 3, Qt::AlignLeft);
-  pppLayout4->addWidget(new QLabel("Google"),                            ir, 3, Qt::AlignRight);
-  pppLayout4->addWidget(_pppWidgets._useGoogleMap,                       ir, 4, Qt::AlignLeft);
   ++ir;
   pppLayout4->addWidget(new QLabel("Dot-properties"),                    ir, 0, Qt::AlignLeft);
@@ -3054 +3049 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncWindow::slotMapPPP() {
-#ifdef QT_WEBKIT
+#ifdef QT_WEBENGINE
   saveOptions();
   enableWidget(false, _pppWidgets._mapWinButton);
-  enableWidget(false, _pppWidgets._useGoogleMap);
-  enableWidget(false, _pppWidgets._useOpenStreetMap);
   enableWidget(false, _pppWidgets._mapWinDotSize);
   enableWidget(false, _pppWidgets._mapWinDotColor);
@@ -3071 +3064 @@
 #else
   QMessageBox::information(this, "Information",
-                           "Qt Library compiled without QtWebKit");
+                           "Qt Library compiled without QT_WEBENGINE");
 #endif
 }
@@ -3080 +3073 @@
 #ifdef QT_WEBKIT
   enableWidget(true, _pppWidgets._mapWinButton);
-  enableWidget(true, _pppWidgets._useGoogleMap);
-  enableWidget(true, _pppWidgets._useOpenStreetMap);
   enableWidget(true, _pppWidgets._mapWinDotSize);
   enableWidget(true, _pppWidgets._mapWinDotColor);

trunk/BNC/src/map/bncmapwin.cpp

@@ -98 +98 @@
 
   QFile htmlFile;
-  if (settings.value("PPP/useOpenStreetMap").toBool()) {
-    htmlFile.setFileName(":/map/map_osm.html");
-  }
-  else {
-    htmlFile.setFileName(":/map/map_gm.html");
-  }
+  htmlFile.setFileName(":/map/map_osm.html");
   if (!htmlFile.open(QFile::ReadOnly)) {
     qDebug() << "bncMapWin:: cannot open html file";

trunk/BNC/src/pppWidgets.cpp

@@ -103 +103 @@
   _plotCoordinates  = new QLineEdit;    _plotCoordinates ->setObjectName("PPP/plotCoordinates");  _widgets << _plotCoordinates;
   _mapWinButton     = new QPushButton;  _mapWinButton    ->setObjectName("PPP/mapWinButton");     _widgets << _mapWinButton;
-  _useGoogleMap     = new QRadioButton; _useGoogleMap    ->setObjectName("PPP/useGoogleMap");     _widgets << _useGoogleMap;
-  _useOpenStreetMap = new QRadioButton; _useOpenStreetMap->setObjectName("PPP/useOpenStreetMap"); _widgets << _useOpenStreetMap;
   _audioResponse    = new QLineEdit;    _audioResponse   ->setObjectName("PPP/audioResponse");    _widgets << _audioResponse;
   _mapWinDotSize    = new QLineEdit;    _mapWinDotSize   ->setObjectName("PPP/mapWinDotSize");    _widgets << _mapWinDotSize;
@@ -218 +216 @@
   _audioResponse->setWhatsThis(tr("<p>Specify an 'Audio response' threshold in meters. A beep is produced by BNC whenever a horizontal PPP coordinate component differs by more than the threshold value from the a priori marker coordinate.</p><p>Default is an empty option field, meaning that you don't want BNC to produce alarm signals. <i>[key: PPP/audioResponse]</i></p>"));
   _mapWinButton->setWhatsThis(tr("<p>You may like to track your rover position using Google Maps or Open Street Map as a background map. A 'Track map' can be produced with BNC in 'Real-Time Streams' or 'RINEX files' PPP mode.</p><p>The 'Open Map' button opens a windows showing a map according to specified options.</p><p>Even in 'RINEX files' post processing mode you should not forget to specify a proxy under the 'Network' tab if that is operated in front of BNC because the program needs to download the map data.</p>"));
-  _useGoogleMap->setWhatsThis(tr("<p>Specify Google Maps as the background for your rover positions. <i>[key: PPP/useGoogleMap]</i></p>"));
-  _useOpenStreetMap->setWhatsThis(tr("<p>Specify Open Street Map as the background for your rover positions. <i>[key: PPP/useOpenStreetMap]</i></p>"));
   _mapWinDotSize->setWhatsThis(tr("<p>Specify the size of dots showing rover positions on the track map.</p><p>A dot size of '3' may be appropriate. The maximum possible dot size is '10'. An empty option field or a size of '0' would mean that you don't want BNC to show the rover's track on the map. <i>[key: PPP/mapWinDotSize]</i></p>"));
   _mapWinDotColor->setWhatsThis(tr("<p>Specify the color of dots showing the rover track on the map. <i>[key: PPP/mapWinDotColor]</i></p>"));
@@ -270 +266 @@
   delete _plotCoordinates;
   delete _mapWinButton;
-  delete _useGoogleMap;
-  delete _useOpenStreetMap;
   delete _audioResponse;
   delete _mapWinDotSize;
@@ -410 +404 @@
   _plotCoordinates ->setText(settings.value(_plotCoordinates->objectName()).toString());
   _audioResponse   ->setText(settings.value(_audioResponse->objectName()).toString());
-  _useGoogleMap    ->setChecked(settings.value(_useGoogleMap->objectName()).toBool());
-  _useOpenStreetMap->setChecked(settings.value(_useOpenStreetMap->objectName()).toBool());
   _mapWinDotSize   ->setText(settings.value(_mapWinDotSize->objectName()).toString());
 
@@ -479 +471 @@
   settings.setValue(_plotCoordinates ->objectName(), _plotCoordinates ->text());
   settings.setValue(_audioResponse   ->objectName(), _audioResponse   ->text());
-  settings.setValue(_useGoogleMap    ->objectName(), _useGoogleMap    ->isChecked());
-  settings.setValue(_useOpenStreetMap->objectName(), _useOpenStreetMap->isChecked());
   settings.setValue(_mapWinDotSize   ->objectName(), _mapWinDotSize   ->text());
   settings.setValue(_mapWinDotColor  ->objectName(), _mapWinDotColor  ->currentText());

trunk/BNC/src/pppWidgets.h

@@ -84 +84 @@
   QLineEdit*     _plotCoordinates;
   QPushButton*   _mapWinButton;
-  QRadioButton*  _useGoogleMap;
-  QRadioButton*  _useOpenStreetMap;
   QLineEdit*     _audioResponse;
   QLineEdit*     _mapWinDotSize;

trunk/BNC/src/src.pri

@@ -151 +151 @@
   HEADERS     += map/bncmapwin.h
   SOURCES     += map/bncmapwin.cpp
-  OTHER_FILES += map/map_gm.html map/map_osm.html
+  OTHER_FILES += map/map_osm.html
 }
 else {