Changeset 9237 in ntrip


Ignore:
Timestamp:
Nov 10, 2020, 11:53:58 AM (2 weeks ago)
Author:
stuerze
Message:

pppMap now with OSM only

Location:
trunk/BNC/src
Files:
2 deleted
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/bnc.qrc

    r8242 r9237  
    5454</qresource>
    5555<qresource>
    56     <file>map/map_gm.html</file>
    5756    <file>map/map_osm.html</file>
    5857    <file>map/crosshair.png</file>
  • trunk/BNC/src/bncmain.cpp

    r9191 r9237  
    245245      "   PPP/plotCoordinates  {Mountpoint for time series plot [character string]}\n"
    246246      "   PPP/audioResponse    {Audio response threshold in meters [floating-point number]}\n"
    247       "   PPP/useOpenStreetMap {OSM track map [character string: true|false]}\n"
    248       "   PPP/useGoogleMap     {Google track map [character string: true|false]}\n"
    249247      "   PPP/mapWinDotSize    {Size of dots on map [integer number: 0-10]}\n"
    250248      "   PPP/mapWinDotColor   {Color of dots and cross hair on map [character string: red|yellow]}\n"
  • trunk/BNC/src/bncwindow.cpp

    r9184 r9237  
    10601060  pppLayout4->addWidget(_pppWidgets._audioResponse,                      ir, 4, Qt::AlignLeft);
    10611061  pppLayout4->addWidget(new QLabel("Audio response"),                    ir, 5, Qt::AlignRight);
    1062 
    10631062  ++ir;
    10641063  pppLayout4->addWidget(new QLabel("Track map"),                         ir, 0, Qt::AlignLeft);
    10651064  pppLayout4->addWidget(_pppWidgets._mapWinButton,                       ir, 1, Qt::AlignLeft);
    1066   pppLayout4->addWidget(new QLabel("OSM"),                               ir, 2, Qt::AlignLeft);
    1067   pppLayout4->addWidget(_pppWidgets._useOpenStreetMap,                   ir, 3, Qt::AlignLeft);
    1068   pppLayout4->addWidget(new QLabel("Google"),                            ir, 3, Qt::AlignRight);
    1069   pppLayout4->addWidget(_pppWidgets._useGoogleMap,                       ir, 4, Qt::AlignLeft);
    10701065  ++ir;
    10711066  pppLayout4->addWidget(new QLabel("Dot-properties"),                    ir, 0, Qt::AlignLeft);
     
    30543049////////////////////////////////////////////////////////////////////////////
    30553050void bncWindow::slotMapPPP() {
    3056 #ifdef QT_WEBKIT
     3051#ifdef QT_WEBENGINE
    30573052  saveOptions();
    30583053  enableWidget(false, _pppWidgets._mapWinButton);
    3059   enableWidget(false, _pppWidgets._useGoogleMap);
    3060   enableWidget(false, _pppWidgets._useOpenStreetMap);
    30613054  enableWidget(false, _pppWidgets._mapWinDotSize);
    30623055  enableWidget(false, _pppWidgets._mapWinDotColor);
     
    30713064#else
    30723065  QMessageBox::information(this, "Information",
    3073                            "Qt Library compiled without QtWebKit");
     3066                           "Qt Library compiled without QT_WEBENGINE");
    30743067#endif
    30753068}
     
    30803073#ifdef QT_WEBKIT
    30813074  enableWidget(true, _pppWidgets._mapWinButton);
    3082   enableWidget(true, _pppWidgets._useGoogleMap);
    3083   enableWidget(true, _pppWidgets._useOpenStreetMap);
    30843075  enableWidget(true, _pppWidgets._mapWinDotSize);
    30853076  enableWidget(true, _pppWidgets._mapWinDotColor);
  • trunk/BNC/src/map/bncmapwin.cpp

    r8909 r9237  
    9898
    9999  QFile htmlFile;
    100   if (settings.value("PPP/useOpenStreetMap").toBool()) {
    101     htmlFile.setFileName(":/map/map_osm.html");
    102   }
    103   else {
    104     htmlFile.setFileName(":/map/map_gm.html");
    105   }
     100  htmlFile.setFileName(":/map/map_osm.html");
    106101  if (!htmlFile.open(QFile::ReadOnly)) {
    107102    qDebug() << "bncMapWin:: cannot open html file";
  • trunk/BNC/src/pppWidgets.cpp

    r9158 r9237  
    103103  _plotCoordinates  = new QLineEdit;    _plotCoordinates ->setObjectName("PPP/plotCoordinates");  _widgets << _plotCoordinates;
    104104  _mapWinButton     = new QPushButton;  _mapWinButton    ->setObjectName("PPP/mapWinButton");     _widgets << _mapWinButton;
    105   _useGoogleMap     = new QRadioButton; _useGoogleMap    ->setObjectName("PPP/useGoogleMap");     _widgets << _useGoogleMap;
    106   _useOpenStreetMap = new QRadioButton; _useOpenStreetMap->setObjectName("PPP/useOpenStreetMap"); _widgets << _useOpenStreetMap;
    107105  _audioResponse    = new QLineEdit;    _audioResponse   ->setObjectName("PPP/audioResponse");    _widgets << _audioResponse;
    108106  _mapWinDotSize    = new QLineEdit;    _mapWinDotSize   ->setObjectName("PPP/mapWinDotSize");    _widgets << _mapWinDotSize;
     
    218216  _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>"));
    219217  _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>"));
    220   _useGoogleMap->setWhatsThis(tr("<p>Specify Google Maps as the background for your rover positions. <i>[key: PPP/useGoogleMap]</i></p>"));
    221   _useOpenStreetMap->setWhatsThis(tr("<p>Specify Open Street Map as the background for your rover positions. <i>[key: PPP/useOpenStreetMap]</i></p>"));
    222218  _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>"));
    223219  _mapWinDotColor->setWhatsThis(tr("<p>Specify the color of dots showing the rover track on the map. <i>[key: PPP/mapWinDotColor]</i></p>"));
     
    270266  delete _plotCoordinates;
    271267  delete _mapWinButton;
    272   delete _useGoogleMap;
    273   delete _useOpenStreetMap;
    274268  delete _audioResponse;
    275269  delete _mapWinDotSize;
     
    410404  _plotCoordinates ->setText(settings.value(_plotCoordinates->objectName()).toString());
    411405  _audioResponse   ->setText(settings.value(_audioResponse->objectName()).toString());
    412   _useGoogleMap    ->setChecked(settings.value(_useGoogleMap->objectName()).toBool());
    413   _useOpenStreetMap->setChecked(settings.value(_useOpenStreetMap->objectName()).toBool());
    414406  _mapWinDotSize   ->setText(settings.value(_mapWinDotSize->objectName()).toString());
    415407
     
    479471  settings.setValue(_plotCoordinates ->objectName(), _plotCoordinates ->text());
    480472  settings.setValue(_audioResponse   ->objectName(), _audioResponse   ->text());
    481   settings.setValue(_useGoogleMap    ->objectName(), _useGoogleMap    ->isChecked());
    482   settings.setValue(_useOpenStreetMap->objectName(), _useOpenStreetMap->isChecked());
    483473  settings.setValue(_mapWinDotSize   ->objectName(), _mapWinDotSize   ->text());
    484474  settings.setValue(_mapWinDotColor  ->objectName(), _mapWinDotColor  ->currentText());
  • trunk/BNC/src/pppWidgets.h

    r9158 r9237  
    8484  QLineEdit*     _plotCoordinates;
    8585  QPushButton*   _mapWinButton;
    86   QRadioButton*  _useGoogleMap;
    87   QRadioButton*  _useOpenStreetMap;
    8886  QLineEdit*     _audioResponse;
    8987  QLineEdit*     _mapWinDotSize;
  • trunk/BNC/src/src.pri

    r9215 r9237  
    151151  HEADERS     += map/bncmapwin.h
    152152  SOURCES     += map/bncmapwin.cpp
    153   OTHER_FILES += map/map_gm.html map/map_osm.html
     153  OTHER_FILES += map/map_osm.html
    154154}
    155155else {
Note: See TracChangeset for help on using the changeset viewer.