- Timestamp:
- Nov 10, 2020, 11:00:43 AM (2 years ago)
- 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 158 158 snxtroSol= 159 159 staTable=",," 160 useGoogleMap=false161 useOpenStreetMap=false162 160 v3filenames=0 -
branches/BNC_2.12/Example_Configs/02_RinexEph.bnc
r9207 r9235 158 158 snxtroSol= 159 159 staTable="," 160 useGoogleMap=false161 useOpenStreetMap=false162 160 v3filenames=0 -
branches/BNC_2.12/Example_Configs/03_BrdcCorr.bnc
r9207 r9235 157 157 snxtroSol= 158 158 staTable= 159 useGoogleMap=false160 useOpenStreetMap=false161 159 v3filenames=0 -
branches/BNC_2.12/Example_Configs/04_RinexConcat.bnc
r9207 r9235 158 158 snxtroSol= 159 159 staTable=",," 160 useGoogleMap=false161 useOpenStreetMap=false162 160 v3filenames=0 -
branches/BNC_2.12/Example_Configs/05_RinexQC.bnc
r9207 r9235 157 157 snxtroSol= 158 158 staTable= 159 useGoogleMap=false160 useOpenStreetMap=false161 159 v3filenames=0 -
branches/BNC_2.12/Example_Configs/06_RTK.bnc
r9207 r9235 158 158 snxtroSol= 159 159 staTable=",," 160 useGoogleMap=false161 useOpenStreetMap=false162 160 v3filenames=0 -
branches/BNC_2.12/Example_Configs/07_FeedEngine.bnc
r9207 r9235 158 158 snxtroSol= 159 159 staTable=",,,,,,,,,," 160 useGoogleMap=false161 useOpenStreetMap=false162 160 v3filenames=0 -
branches/BNC_2.12/Example_Configs/08_PPP.bnc
r9207 r9235 158 158 snxtroSol= 159 159 staTable="FFMJ00DEU0,100.0,100.0,100.0,100.0,100.0,100.0,0.1,3e-6,," 160 useGoogleMap=false161 useOpenStreetMap=true162 160 v3filenames=0 -
branches/BNC_2.12/Example_Configs/09_PPPNet.bnc
r9207 r9235 158 158 snxtroSol= 159 159 staTable="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=false161 useOpenStreetMap=true162 160 v3filenames=0 -
branches/BNC_2.12/Example_Configs/10_PPPQuickStart.bnc
r9207 r9235 158 158 snxtroSol= 159 159 staTable="FFMJ00DEU0,0.01,0.01,0.01,100.0,100.0,100.0,0.1,3e-6,7777," 160 useGoogleMap=true161 useOpenStreetMap=false162 160 v3filenames=0 -
branches/BNC_2.12/Example_Configs/11_PPPPostProc.bnc
r9207 r9235 158 158 snxtroSol= 159 159 staTable="CUT07,0.01,0.01,0.01,100.0,100.0,100.0,0.1,3e-6,," 160 useGoogleMap=false161 useOpenStreetMap=true162 160 v3filenames=0 -
branches/BNC_2.12/Example_Configs/12_PPPOsm.bnc
r9210 r9235 158 158 snxtroSol= 159 159 staTable="VM01,100,100,100,100,100,100,0.1,3e-6,," 160 useGoogleMap=false161 useOpenStreetMap=true162 160 v3filenames=0 -
branches/BNC_2.12/Example_Configs/13_SPPQuickStart.bnc
r9207 r9235 158 158 snxtroSol= 159 159 staTable="CUT000AUS0,0.01,0.01,0.01,100.0,100.0,100.0,0.1,3e-6,," 160 useGoogleMap=false161 useOpenStreetMap=true162 160 v3filenames=0 -
branches/BNC_2.12/Example_Configs/14_SaveSp3.bnc
r9207 r9235 158 158 snxtroSol= 159 159 staTable=",,,,,,,,,," 160 useGoogleMap=false161 useOpenStreetMap=false162 160 v3filenames=0 -
branches/BNC_2.12/Example_Configs/15_Sp3ETRFPPP.bnc
r9207 r9235 158 158 snxtroSol= 159 159 staTable="FFMJ00DEU0,0.01,0.01,0.01,100.0,100.0,100.0,0.1,3e-6,," 160 useGoogleMap=false161 useOpenStreetMap=true162 160 v3filenames=0 -
branches/BNC_2.12/Example_Configs/16_Upload.bnc
r9207 r9235 158 158 snxtroSol= 159 159 staTable=",,,,,," 160 useGoogleMap=false161 useOpenStreetMap=false162 160 v3filenames=0 -
branches/BNC_2.12/Example_Configs/17_Combi.bnc
r9207 r9235 158 158 snxtroSol= 159 159 staTable=",,,,," 160 useGoogleMap=false161 useOpenStreetMap=false162 160 v3filenames=0 -
branches/BNC_2.12/Example_Configs/18_CombiPPP.bnc
r9207 r9235 158 158 snxtroSol= 159 159 staTable="FFMJ00DEU0,0.01,0.01,0.01,100.0,100.0,100.0,0.1,3e-6,," 160 useGoogleMap=true161 useOpenStreetMap=false162 160 v3filenames=0 -
branches/BNC_2.12/Example_Configs/19_UploadEph.bnc
r9207 r9235 158 158 snxtroSol= 159 159 staTable=",,,," 160 useGoogleMap=false161 useOpenStreetMap=false162 160 v3filenames=0 -
branches/BNC_2.12/Example_Configs/20_CompareSp3.bnc
r9207 r9235 157 157 snxtroSol= 158 158 staTable=",," 159 useGoogleMap=false160 useOpenStreetMap=false161 159 v3filenames=0 -
branches/BNC_2.12/Example_Configs/21_Empty.bnc
r9207 r9235 158 158 snxtroSol= 159 159 staTable= 160 useGoogleMap=false161 useOpenStreetMap=false162 160 v3filenames=0 -
branches/BNC_2.12/src/bnc.qrc
r7758 r9235 55 55 </qresource> 56 56 <qresource> 57 <file>map/map_gm.html</file>58 57 <file>map/map_osm.html</file> 59 58 <file>map/crosshair.png</file> -
branches/BNC_2.12/src/bncmain.cpp
r9160 r9235 238 238 " PPP/plotCoordinates {Mountpoint for time series plot [character string]}\n" 239 239 " 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"242 240 " PPP/mapWinDotSize {Size of dots on map [integer number: 0-10]}\n" 243 241 " PPP/mapWinDotColor {Color of dots and cross hair on map [character string: red|yellow]}\n" -
branches/BNC_2.12/src/bncwindow.cpp
r9108 r9235 985 985 pppLayout4->addWidget(_pppWidgets._audioResponse, ir, 4, Qt::AlignLeft); 986 986 pppLayout4->addWidget(new QLabel("Audio response"), ir, 5, Qt::AlignRight); 987 988 987 ++ir; 989 988 pppLayout4->addWidget(new QLabel("Track map"), ir, 0, Qt::AlignLeft); 990 989 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);995 990 ++ir; 996 991 pppLayout4->addWidget(new QLabel("Dot-properties"), ir, 0, Qt::AlignLeft); … … 2799 2794 saveOptions(); 2800 2795 enableWidget(false, _pppWidgets._mapWinButton); 2801 enableWidget(false, _pppWidgets._useGoogleMap);2802 enableWidget(false, _pppWidgets._useOpenStreetMap);2803 2796 enableWidget(false, _pppWidgets._mapWinDotSize); 2804 2797 enableWidget(false, _pppWidgets._mapWinDotColor); … … 2822 2815 #ifdef QT_WEBKIT 2823 2816 enableWidget(true, _pppWidgets._mapWinButton); 2824 enableWidget(true, _pppWidgets._useGoogleMap);2825 enableWidget(true, _pppWidgets._useOpenStreetMap);2826 2817 enableWidget(true, _pppWidgets._mapWinDotSize); 2827 2818 enableWidget(true, _pppWidgets._mapWinDotColor); -
branches/BNC_2.12/src/map/bncmapwin.cpp
r6446 r9235 35 35 * Created: 08-Jun-2013 36 36 * 37 * Changes: 37 * Changes: 38 38 * 39 39 * -----------------------------------------------------------------------*/ … … 75 75 loadHtmlPage(); 76 76 77 _webView->show(); 77 _webView->show(); 78 78 79 79 _statusLabel = new QLabel; … … 99 99 } 100 100 101 // 101 // 102 102 //////////////////////////////////////////////////////////////////////////// 103 103 void bncMapWin::loadHtmlPage() { … … 106 106 107 107 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"); 114 109 if (!htmlFile.open(QFile::ReadOnly)) { 115 110 qDebug() << "bncMapWin:: cannot open html file"; … … 123 118 } 124 119 125 // 120 // 126 121 //////////////////////////////////////////////////////////////////////////// 127 122 void bncMapWin::slotInitMap(bool isOk) { … … 139 134 } 140 135 141 // 136 // 142 137 //////////////////////////////////////////////////////////////////////////// 143 138 void bncMapWin::gotoLocation(double lat, double lon) { … … 166 161 } 167 162 168 // 163 // 169 164 //////////////////////////////////////////////////////////////////////////// 170 165 void bncMapWin::slotNewPosition(QByteArray staID, bncTime /* time */, QVector<double> xx) { -
branches/BNC_2.12/src/pppWidgets.cpp
r8413 r9235 91 91 _plotCoordinates = new QLineEdit; _plotCoordinates ->setObjectName("PPP/plotCoordinates"); _widgets << _plotCoordinates; 92 92 _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;95 93 _audioResponse = new QLineEdit; _audioResponse ->setObjectName("PPP/audioResponse"); _widgets << _audioResponse; 96 94 _mapWinDotSize = new QLineEdit; _mapWinDotSize ->setObjectName("PPP/mapWinDotSize"); _widgets << _mapWinDotSize; … … 199 197 _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>")); 200 198 _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>"));203 199 _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>")); 204 200 _mapWinDotColor->setWhatsThis(tr("<p>Specify the color of dots showing the rover track on the map.</p>")); … … 248 244 delete _plotCoordinates; 249 245 delete _mapWinButton; 250 delete _useGoogleMap;251 delete _useOpenStreetMap;252 246 delete _audioResponse; 253 247 delete _mapWinDotSize; … … 378 372 _plotCoordinates ->setText(settings.value(_plotCoordinates->objectName()).toString()); 379 373 _audioResponse ->setText(settings.value(_audioResponse->objectName()).toString()); 380 _useGoogleMap ->setChecked(settings.value(_useGoogleMap->objectName()).toBool());381 _useOpenStreetMap->setChecked(settings.value(_useOpenStreetMap->objectName()).toBool());382 374 _mapWinDotSize ->setText(settings.value(_mapWinDotSize->objectName()).toString()); 383 375 … … 444 436 settings.setValue(_plotCoordinates ->objectName(), _plotCoordinates ->text()); 445 437 settings.setValue(_audioResponse ->objectName(), _audioResponse ->text()); 446 settings.setValue(_useGoogleMap ->objectName(), _useGoogleMap ->isChecked());447 settings.setValue(_useOpenStreetMap->objectName(), _useOpenStreetMap->isChecked());448 438 settings.setValue(_mapWinDotSize ->objectName(), _mapWinDotSize ->text()); 449 439 settings.setValue(_mapWinDotColor ->objectName(), _mapWinDotColor ->currentText()); -
branches/BNC_2.12/src/pppWidgets.h
r8404 r9235 74 74 QLineEdit* _plotCoordinates; 75 75 QPushButton* _mapWinButton; 76 QRadioButton* _useGoogleMap;77 QRadioButton* _useOpenStreetMap;78 76 QLineEdit* _audioResponse; 79 77 QLineEdit* _mapWinDotSize; -
branches/BNC_2.12/src/src.pri
r9216 r9235 162 162 HEADERS += map/bncmapwin.h 163 163 SOURCES += map/bncmapwin.cpp 164 OTHER_FILES += map/map_ gm.html map/map_osm.html164 OTHER_FILES += map/map_osm.html 165 165 } 166 166 else {
Note:
See TracChangeset
for help on using the changeset viewer.