Changeset 9235 in ntrip for branches/BNC_2.12


Ignore:
Timestamp:
Nov 10, 2020, 11:00:43 AM (3 years ago)
Author:
stuerze
Message:

pppMap now with OSM only

Location:
branches/BNC_2.12
Files:
2 deleted
27 edited
1 moved

Legend:

Unmodified
Added
Removed

  • branches/BNC_2.12/Example_Configs/01_RinexObs.bnc

    r9207 r9235  
    158158snxtroSol=
    159159staTable=",,"
    160 useGoogleMap=false
    161 useOpenStreetMap=false
    162160v3filenames=0

  • branches/BNC_2.12/Example_Configs/02_RinexEph.bnc

    r9207 r9235  
    158158snxtroSol=
    159159staTable=","
    160 useGoogleMap=false
    161 useOpenStreetMap=false
    162160v3filenames=0

  • branches/BNC_2.12/Example_Configs/03_BrdcCorr.bnc

    r9207 r9235  
    157157snxtroSol=
    158158staTable=
    159 useGoogleMap=false
    160 useOpenStreetMap=false
    161159v3filenames=0

  • branches/BNC_2.12/Example_Configs/04_RinexConcat.bnc

    r9207 r9235  
    158158snxtroSol=
    159159staTable=",,"
    160 useGoogleMap=false
    161 useOpenStreetMap=false
    162160v3filenames=0

  • branches/BNC_2.12/Example_Configs/05_RinexQC.bnc

    r9207 r9235  
    157157snxtroSol=
    158158staTable=
    159 useGoogleMap=false
    160 useOpenStreetMap=false
    161159v3filenames=0

  • branches/BNC_2.12/Example_Configs/06_RTK.bnc

    r9207 r9235  
    158158snxtroSol=
    159159staTable=",,"
    160 useGoogleMap=false
    161 useOpenStreetMap=false
    162160v3filenames=0

  • branches/BNC_2.12/Example_Configs/07_FeedEngine.bnc

    r9207 r9235  
    158158snxtroSol=
    159159staTable=",,,,,,,,,,"
    160 useGoogleMap=false
    161 useOpenStreetMap=false
    162160v3filenames=0

  • branches/BNC_2.12/Example_Configs/08_PPP.bnc

    r9207 r9235  
    158158snxtroSol=
    159159staTable="FFMJ00DEU0,100.0,100.0,100.0,100.0,100.0,100.0,0.1,3e-6,,"
    160 useGoogleMap=false
    161 useOpenStreetMap=true
    162160v3filenames=0

  • branches/BNC_2.12/Example_Configs/09_PPPNet.bnc

    r9207 r9235  
    158158snxtroSol=
    159159staTable="FFMJ00DEU0,100.0,100.0,100.0,100.0,100.0,100.0,0.1,3e-6,,", "CUT000AUS0,100.0,100.0,100.0,100.0,100.0,100.0,0.1,3e-6,,"
    160 useGoogleMap=false
    161 useOpenStreetMap=true
    162160v3filenames=0

  • branches/BNC_2.12/Example_Configs/10_PPPQuickStart.bnc

    r9207 r9235  
    158158snxtroSol=
    159159staTable="FFMJ00DEU0,0.01,0.01,0.01,100.0,100.0,100.0,0.1,3e-6,7777,"
    160 useGoogleMap=true
    161 useOpenStreetMap=false
    162160v3filenames=0

  • branches/BNC_2.12/Example_Configs/11_PPPPostProc.bnc

    r9207 r9235  
    158158snxtroSol=
    159159staTable="CUT07,0.01,0.01,0.01,100.0,100.0,100.0,0.1,3e-6,,"
    160 useGoogleMap=false
    161 useOpenStreetMap=true
    162160v3filenames=0

  • branches/BNC_2.12/Example_Configs/12_PPPOsm.bnc

    r9210 r9235  
    158158snxtroSol=
    159159staTable="VM01,100,100,100,100,100,100,0.1,3e-6,,"
    160 useGoogleMap=false
    161 useOpenStreetMap=true
    162160v3filenames=0

  • branches/BNC_2.12/Example_Configs/13_SPPQuickStart.bnc

    r9207 r9235  
    158158snxtroSol=
    159159staTable="CUT000AUS0,0.01,0.01,0.01,100.0,100.0,100.0,0.1,3e-6,,"
    160 useGoogleMap=false
    161 useOpenStreetMap=true
    162160v3filenames=0

  • branches/BNC_2.12/Example_Configs/14_SaveSp3.bnc

    r9207 r9235  
    158158snxtroSol=
    159159staTable=",,,,,,,,,,"
    160 useGoogleMap=false
    161 useOpenStreetMap=false
    162160v3filenames=0

  • branches/BNC_2.12/Example_Configs/15_Sp3ETRFPPP.bnc

    r9207 r9235  
    158158snxtroSol=
    159159staTable="FFMJ00DEU0,0.01,0.01,0.01,100.0,100.0,100.0,0.1,3e-6,,"
    160 useGoogleMap=false
    161 useOpenStreetMap=true
    162160v3filenames=0

  • branches/BNC_2.12/Example_Configs/16_Upload.bnc

    r9207 r9235  
    158158snxtroSol=
    159159staTable=",,,,,,"
    160 useGoogleMap=false
    161 useOpenStreetMap=false
    162160v3filenames=0

  • branches/BNC_2.12/Example_Configs/17_Combi.bnc

    r9207 r9235  
    158158snxtroSol=
    159159staTable=",,,,,"
    160 useGoogleMap=false
    161 useOpenStreetMap=false
    162160v3filenames=0

  • branches/BNC_2.12/Example_Configs/18_CombiPPP.bnc

    r9207 r9235  
    158158snxtroSol=
    159159staTable="FFMJ00DEU0,0.01,0.01,0.01,100.0,100.0,100.0,0.1,3e-6,,"
    160 useGoogleMap=true
    161 useOpenStreetMap=false
    162160v3filenames=0

  • branches/BNC_2.12/Example_Configs/19_UploadEph.bnc

    r9207 r9235  
    158158snxtroSol=
    159159staTable=",,,,"
    160 useGoogleMap=false
    161 useOpenStreetMap=false
    162160v3filenames=0

  • branches/BNC_2.12/Example_Configs/20_CompareSp3.bnc

    r9207 r9235  
    157157snxtroSol=
    158158staTable=",,"
    159 useGoogleMap=false
    160 useOpenStreetMap=false
    161159v3filenames=0

  • branches/BNC_2.12/Example_Configs/21_Empty.bnc

    r9207 r9235  
    158158snxtroSol=
    159159staTable=
    160 useGoogleMap=false
    161 useOpenStreetMap=false
    162160v3filenames=0

  • branches/BNC_2.12/src/bnc.qrc

    r7758 r9235  
    5555</qresource>
    5656<qresource>
    57     <file>map/map_gm.html</file>
    5857    <file>map/map_osm.html</file>
    5958    <file>map/crosshair.png</file>

  • branches/BNC_2.12/src/bncmain.cpp

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

  • branches/BNC_2.12/src/bncwindow.cpp

    r9108 r9235  
    985985  pppLayout4->addWidget(_pppWidgets._audioResponse,                      ir, 4, Qt::AlignLeft);
    986986  pppLayout4->addWidget(new QLabel("Audio response"),                    ir, 5, Qt::AlignRight);
    987 
    988987  ++ir;
    989988  pppLayout4->addWidget(new QLabel("Track map"),                         ir, 0, Qt::AlignLeft);
    990989  pppLayout4->addWidget(_pppWidgets._mapWinButton,                       ir, 1, Qt::AlignLeft);
    991   pppLayout4->addWidget(new QLabel("OSM"),                               ir, 2, Qt::AlignLeft);
    992   pppLayout4->addWidget(_pppWidgets._useOpenStreetMap,                   ir, 3, Qt::AlignLeft);
    993   pppLayout4->addWidget(new QLabel("Google"),                            ir, 3, Qt::AlignRight);
    994   pppLayout4->addWidget(_pppWidgets._useGoogleMap,                       ir, 4, Qt::AlignLeft);
    995990  ++ir;
    996991  pppLayout4->addWidget(new QLabel("Dot-properties"),                    ir, 0, Qt::AlignLeft);
    … …  
    27992794  saveOptions();
    28002795  enableWidget(false, _pppWidgets._mapWinButton);
    2801   enableWidget(false, _pppWidgets._useGoogleMap);
    2802   enableWidget(false, _pppWidgets._useOpenStreetMap);
    28032796  enableWidget(false, _pppWidgets._mapWinDotSize);
    28042797  enableWidget(false, _pppWidgets._mapWinDotColor);
    … …  
    28222815#ifdef QT_WEBKIT
    28232816  enableWidget(true, _pppWidgets._mapWinButton);
    2824   enableWidget(true, _pppWidgets._useGoogleMap);
    2825   enableWidget(true, _pppWidgets._useOpenStreetMap);
    28262817  enableWidget(true, _pppWidgets._mapWinDotSize);
    28272818  enableWidget(true, _pppWidgets._mapWinDotColor);

  • branches/BNC_2.12/src/map/bncmapwin.cpp

    r6446 r9235  
    3535 * Created:    08-Jun-2013
    3636 *
    37  * Changes:   
     37 * Changes:
    3838 *
    3939 * -----------------------------------------------------------------------*/
    … …  
    7575  loadHtmlPage();
    7676
    77   _webView->show(); 
     77  _webView->show();
    7878
    7979  _statusLabel = new QLabel;
    … …  
    9999}
    100100
    101 // 
     101//
    102102////////////////////////////////////////////////////////////////////////////
    103103void bncMapWin::loadHtmlPage() {
    … …  
    106106
    107107  QFile htmlFile;
    108   if (settings.value("PPP/useOpenStreetMap").toBool()) {
    109     htmlFile.setFileName(":/map/map_osm.html");
    110   }
    111   else {
    112     htmlFile.setFileName(":/map/map_gm.html");
    113   }
     108  htmlFile.setFileName(":/map/map_osm.html");
    114109  if (!htmlFile.open(QFile::ReadOnly)) {
    115110    qDebug() << "bncMapWin:: cannot open html file";
    … …  
    123118}
    124119
    125 // 
     120//
    126121////////////////////////////////////////////////////////////////////////////
    127122void bncMapWin::slotInitMap(bool isOk) {
    … …  
    139134}
    140135
    141 // 
     136//
    142137////////////////////////////////////////////////////////////////////////////
    143138void bncMapWin::gotoLocation(double lat, double lon) {
    … …  
    166161}
    167162
    168 // 
     163//
    169164////////////////////////////////////////////////////////////////////////////
    170165void bncMapWin::slotNewPosition(QByteArray staID, bncTime /* time */, QVector<double> xx) {

  • branches/BNC_2.12/src/pppWidgets.cpp

    r8413 r9235  
    9191  _plotCoordinates  = new QLineEdit;    _plotCoordinates ->setObjectName("PPP/plotCoordinates");  _widgets << _plotCoordinates;
    9292  _mapWinButton     = new QPushButton;  _mapWinButton    ->setObjectName("PPP/mapWinButton");     _widgets << _mapWinButton;
    93   _useGoogleMap     = new QRadioButton; _useGoogleMap    ->setObjectName("PPP/useGoogleMap");     _widgets << _useGoogleMap;
    94   _useOpenStreetMap = new QRadioButton; _useOpenStreetMap->setObjectName("PPP/useOpenStreetMap"); _widgets << _useOpenStreetMap;
    9593  _audioResponse    = new QLineEdit;    _audioResponse   ->setObjectName("PPP/audioResponse");    _widgets << _audioResponse;
    9694  _mapWinDotSize    = new QLineEdit;    _mapWinDotSize   ->setObjectName("PPP/mapWinDotSize");    _widgets << _mapWinDotSize;
    … …  
    199197  _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.</p>"));
    200198  _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>"));
    201   _useGoogleMap->setWhatsThis(tr("<p>Specify Google Maps as the background for your rover positions.</p>"));
    202   _useOpenStreetMap->setWhatsThis(tr("<p>Specify Open Street Map as the background for your rover positions.</p>"));
    203199  _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.</p>"));
    204200  _mapWinDotColor->setWhatsThis(tr("<p>Specify the color of dots showing the rover track on the map.</p>"));
    … …  
    248244  delete _plotCoordinates;
    249245  delete _mapWinButton;
    250   delete _useGoogleMap;
    251   delete _useOpenStreetMap;
    252246  delete _audioResponse;
    253247  delete _mapWinDotSize;
    … …  
    378372  _plotCoordinates ->setText(settings.value(_plotCoordinates->objectName()).toString());
    379373  _audioResponse   ->setText(settings.value(_audioResponse->objectName()).toString());
    380   _useGoogleMap    ->setChecked(settings.value(_useGoogleMap->objectName()).toBool());
    381   _useOpenStreetMap->setChecked(settings.value(_useOpenStreetMap->objectName()).toBool());
    382374  _mapWinDotSize   ->setText(settings.value(_mapWinDotSize->objectName()).toString());
    383375
    … …  
    444436  settings.setValue(_plotCoordinates ->objectName(), _plotCoordinates ->text());
    445437  settings.setValue(_audioResponse   ->objectName(), _audioResponse   ->text());
    446   settings.setValue(_useGoogleMap    ->objectName(), _useGoogleMap    ->isChecked());
    447   settings.setValue(_useOpenStreetMap->objectName(), _useOpenStreetMap->isChecked());
    448438  settings.setValue(_mapWinDotSize   ->objectName(), _mapWinDotSize   ->text());
    449439  settings.setValue(_mapWinDotColor  ->objectName(), _mapWinDotColor  ->currentText());

  • branches/BNC_2.12/src/pppWidgets.h

    r8404 r9235  
    7474  QLineEdit*     _plotCoordinates;
    7575  QPushButton*   _mapWinButton;
    76   QRadioButton*  _useGoogleMap;
    77   QRadioButton*  _useOpenStreetMap;
    7876  QLineEdit*     _audioResponse;
    7977  QLineEdit*     _mapWinDotSize;

  • branches/BNC_2.12/src/src.pri

    r9216 r9235  
    162162  HEADERS     += map/bncmapwin.h
    163163  SOURCES     += map/bncmapwin.cpp
    164   OTHER_FILES += map/map_gm.html map/map_osm.html
     164  OTHER_FILES += map/map_osm.html
    165165}
    166166else {
Note: See TracChangeset for help on using the changeset viewer.