BNC OpenStreetMap View

Index: trunk/BNC/src/bnc.qrc =================================================================== --- trunk/BNC/src/bnc.qrc (revision 9236) +++ trunk/BNC/src/bnc.qrc (revision 9237) @@ -54,5 +54,4 @@ - map/map_gm.html map/map_osm.html map/crosshair.png Index: trunk/BNC/src/bncmain.cpp =================================================================== --- trunk/BNC/src/bncmain.cpp (revision 9236) +++ trunk/BNC/src/bncmain.cpp (revision 9237) @@ -245,6 +245,4 @@ " 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" Index: trunk/BNC/src/bncwindow.cpp =================================================================== --- trunk/BNC/src/bncwindow.cpp (revision 9236) +++ trunk/BNC/src/bncwindow.cpp (revision 9237) @@ -1060,12 +1060,7 @@ 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,9 +3049,7 @@ //////////////////////////////////////////////////////////////////////////// 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,5 +3064,5 @@ #else QMessageBox::information(this, "Information", - "Qt Library compiled without QtWebKit"); + "Qt Library compiled without QT_WEBENGINE"); #endif } @@ -3080,6 +3073,4 @@ #ifdef QT_WEBKIT enableWidget(true, _pppWidgets._mapWinButton); - enableWidget(true, _pppWidgets._useGoogleMap); - enableWidget(true, _pppWidgets._useOpenStreetMap); enableWidget(true, _pppWidgets._mapWinDotSize); enableWidget(true, _pppWidgets._mapWinDotColor); Index: trunk/BNC/src/map/bncmapwin.cpp =================================================================== --- trunk/BNC/src/map/bncmapwin.cpp (revision 9236) +++ trunk/BNC/src/map/bncmapwin.cpp (revision 9237) @@ -98,10 +98,5 @@ 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"; Index: trunk/BNC/src/map/map_gm.html =================================================================== --- trunk/BNC/src/map/map_gm.html (revision 9236) +++ (revision ) @@ -1,96 +1,0 @@ - - - - - - - - - - - - - -

Waiting for data...

- - Index: trunk/BNC/src/map/map_osb.html =================================================================== --- trunk/BNC/src/map/map_osb.html (revision 9236) +++ (revision ) @@ -1,110 +1,0 @@ - - - - - BNC OpenStreetMap View - - - - - - - - - -

- - - Index: trunk/BNC/src/pppWidgets.cpp =================================================================== --- trunk/BNC/src/pppWidgets.cpp (revision 9236) +++ trunk/BNC/src/pppWidgets.cpp (revision 9237) @@ -103,6 +103,4 @@ _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,6 +216,4 @@ _audioResponse->setWhatsThis(tr("

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.

Default is an empty option field, meaning that you don't want BNC to produce alarm signals. [key: PPP/audioResponse]

")); _mapWinButton->setWhatsThis(tr("

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.

The 'Open Map' button opens a windows showing a map according to specified options.

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.

")); - _useGoogleMap->setWhatsThis(tr("

Specify Google Maps as the background for your rover positions. [key: PPP/useGoogleMap]

")); - _useOpenStreetMap->setWhatsThis(tr("

Specify Open Street Map as the background for your rover positions. [key: PPP/useOpenStreetMap]

")); _mapWinDotSize->setWhatsThis(tr("

Specify the size of dots showing rover positions on the track map.

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. [key: PPP/mapWinDotSize]

")); _mapWinDotColor->setWhatsThis(tr("

Specify the color of dots showing the rover track on the map. [key: PPP/mapWinDotColor]

")); @@ -270,6 +266,4 @@ delete _plotCoordinates; delete _mapWinButton; - delete _useGoogleMap; - delete _useOpenStreetMap; delete _audioResponse; delete _mapWinDotSize; @@ -410,6 +404,4 @@ _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,6 +471,4 @@ 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()); Index: trunk/BNC/src/pppWidgets.h =================================================================== --- trunk/BNC/src/pppWidgets.h (revision 9236) +++ trunk/BNC/src/pppWidgets.h (revision 9237) @@ -84,6 +84,4 @@ QLineEdit* _plotCoordinates; QPushButton* _mapWinButton; - QRadioButton* _useGoogleMap; - QRadioButton* _useOpenStreetMap; QLineEdit* _audioResponse; QLineEdit* _mapWinDotSize; Index: trunk/BNC/src/src.pri =================================================================== --- trunk/BNC/src/src.pri (revision 9236) +++ trunk/BNC/src/src.pri (revision 9237) @@ -151,5 +151,5 @@ 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 {