Index: trunk/BNC/bncgetthread.cpp =================================================================== --- trunk/BNC/bncgetthread.cpp (revision 1306) +++ trunk/BNC/bncgetthread.cpp (revision 1307) @@ -173,5 +173,5 @@ // RTCM message types // ------------------ - _checkMountPoint = settings.value("messTypes").toString(); + _checkMountPoint = settings.value("miscMount").toString(); // RINEX writer @@ -667,62 +667,65 @@ // ---------------- if ( _checkMountPoint == _staID || _checkMountPoint == "ALL" ) { - - // RTCMv3 message types - // -------------------- - if (0<_decoder->_typeList.size()) { - QString type; - for (int ii=0;ii<_decoder->_typeList.size();ii++) { - type = QString("%1 ").arg(_decoder->_typeList[ii]); - emit(newMessage(_staID + ": Received message type " + type.toAscii(), true)); - } - } - - // RTCMv3 antenna descriptor - // ------------------------- - if (0<_decoder->_antType.size()) { - QString ant1; - for (int ii=0;ii<_decoder->_antType.size();ii++) { - ant1 = QString("%1 ").arg(_decoder->_antType[ii]); - emit(newMessage(_staID + ": Antenna descriptor " + ant1.toAscii(), true)); - } - } - - // antenna XYZ - // ------------------ - if (0<_decoder->_antList.size()) { - for (int ii=0;ii<_decoder->_antList.size();++ii) { - QByteArray ant1,ant2,ant3, antT; - ant1 = QString("%1 ").arg(_decoder->_antList[ii].xx,0,'f',4).toAscii(); - ant2 = QString("%1 ").arg(_decoder->_antList[ii].yy,0,'f',4).toAscii(); - ant3 = QString("%1 ").arg(_decoder->_antList[ii].zz,0,'f',4).toAscii(); + QSettings settings; + if ( Qt::CheckState(settings.value("scanRTCM").toInt()) == Qt::Checked) { + + // RTCMv3 message types + // -------------------- + if (0<_decoder->_typeList.size()) { + QString type; + for (int ii=0;ii<_decoder->_typeList.size();ii++) { + type = QString("%1 ").arg(_decoder->_typeList[ii]); + emit(newMessage(_staID + ": Received message type " + type.toAscii(), true)); + } + } + + // RTCMv3 antenna descriptor + // ------------------------- + if (0<_decoder->_antType.size()) { + QString ant1; + for (int ii=0;ii<_decoder->_antType.size();ii++) { + ant1 = QString("%1 ").arg(_decoder->_antType[ii]); + emit(newMessage(_staID + ": Antenna descriptor " + ant1.toAscii(), true)); + } + } + + // Antenna XYZ + // ------------------ + if (0<_decoder->_antList.size()) { + for (int ii=0;ii<_decoder->_antList.size();++ii) { + QByteArray ant1,ant2,ant3, antT; + ant1 = QString("%1 ").arg(_decoder->_antList[ii].xx,0,'f',4).toAscii(); + ant2 = QString("%1 ").arg(_decoder->_antList[ii].yy,0,'f',4).toAscii(); + ant3 = QString("%1 ").arg(_decoder->_antList[ii].zz,0,'f',4).toAscii(); + switch (_decoder->_antList[ii].type) { + case GPSDecoder::t_antInfo::ARP: antT = "ARP"; break; + case GPSDecoder::t_antInfo::APC: antT = "APC"; break; + } + emit(newMessage(_staID + ": " + antT + " (ITRF) X " + ant1 + "m", true)); + emit(newMessage(_staID + ": " + antT + " (ITRF) Y " + ant2 + "m", true)); + emit(newMessage(_staID + ": " + antT + " (ITRF) Z " + ant3 + "m", true)); + if (_decoder->_antList[ii].height_f) { + QByteArray ant4 = QString("%1 ").arg(_decoder->_antList[ii].height,0,'f',4).toAscii(); + emit(newMessage(_staID + ": Antenna height above marker " + ant4 + "m", true)); + } + emit(newAntCrd(_staID, + _decoder->_antList[ii].xx, _decoder->_antList[ii].yy, _decoder->_antList[ii].zz, + antT)); + } + } + } + if ( _checkMountPoint == "ANTCRD_ONLY" && _decoder->_antList.size() ) { + for (int ii=0;ii<_decoder->_antList.size();++ii) { + QByteArray antT; switch (_decoder->_antList[ii].type) { case GPSDecoder::t_antInfo::ARP: antT = "ARP"; break; case GPSDecoder::t_antInfo::APC: antT = "APC"; break; } - emit(newMessage(_staID + ": " + antT + " (ITRF) X " + ant1 + "m", true)); - emit(newMessage(_staID + ": " + antT + " (ITRF) Y " + ant2 + "m", true)); - emit(newMessage(_staID + ": " + antT + " (ITRF) Z " + ant3 + "m", true)); - if (_decoder->_antList[ii].height_f) { - QByteArray ant4 = QString("%1 ").arg(_decoder->_antList[ii].height,0,'f',4).toAscii(); - emit(newMessage(_staID + ": Antenna height above marker " + ant4 + "m", true)); - } emit(newAntCrd(_staID, - _decoder->_antList[ii].xx, _decoder->_antList[ii].yy, _decoder->_antList[ii].zz, - antT)); - } - } - } - if ( _checkMountPoint == "ANTCRD_ONLY" && _decoder->_antList.size() ) { - for (int ii=0;ii<_decoder->_antList.size();++ii) { - QByteArray antT; - switch (_decoder->_antList[ii].type) { - case GPSDecoder::t_antInfo::ARP: antT = "ARP"; break; - case GPSDecoder::t_antInfo::APC: antT = "APC"; break; - } - emit(newAntCrd(_staID, _decoder->_antList[ii].xx, _decoder->_antList[ii].yy, _decoder->_antList[ii].zz, antT)); - } - } + } + } + } _decoder->_typeList.clear(); @@ -767,54 +770,56 @@ // ------------------------ if (_perfIntr>0) { - newSecGPS = static_cast(obs->_o.GPSWeeks); - if (newSecGPS != oldSecGPS) { - if (newSecGPS % _perfIntr < oldSecGPS % _perfIntr) { - if (numLat>0) { + if ( _checkMountPoint == _staID || _checkMountPoint == "ALL" ) { + newSecGPS = static_cast(obs->_o.GPSWeeks); + if (newSecGPS != oldSecGPS) { + if (newSecGPS % _perfIntr < oldSecGPS % _perfIntr) { + if (numLat>0) { + if (meanDiff>0.) { + emit( newMessage(QString("%1: Mean latency %2 sec, min %3, max %4, rms %5, %6 epochs, %7 gaps") + .arg(_staID.data()) + .arg(int(sumLat/numLat*100)/100.) + .arg(int(minLat*100)/100.) + .arg(int(maxLat*100)/100.) + .arg(int((sqrt((sumLatQ - sumLat * sumLat / numLat)/numLat))*100)/100.) + .arg(numLat) + .arg(numGaps) + .toAscii(), true) ); + } else { + emit( newMessage(QString("%1: Mean latency %2 sec, min %3, max %4, rms %5, %6 epochs") + .arg(_staID.data()) + .arg(int(sumLat/numLat*100)/100.) + .arg(int(minLat*100)/100.) + .arg(int(maxLat*100)/100.) + .arg(int((sqrt((sumLatQ - sumLat * sumLat / numLat)/numLat))*100)/100.) + .arg(numLat) + .toAscii(), true) ); + } + } + meanDiff = diffSecGPS/numLat; + diffSecGPS = 0; + numGaps = 0; + sumLat = 0.; + sumLatQ = 0.; + numLat = 0; + minLat = maxDt; + maxLat = -maxDt; + } + if (followSec) { + diffSecGPS += newSecGPS - oldSecGPS; if (meanDiff>0.) { - emit( newMessage(QString("%1: Mean latency %2 sec, min %3, max %4, rms %5, %6 epochs, %7 gaps") - .arg(_staID.data()) - .arg(int(sumLat/numLat*100)/100.) - .arg(int(minLat*100)/100.) - .arg(int(maxLat*100)/100.) - .arg(int((sqrt((sumLatQ - sumLat * sumLat / numLat)/numLat))*100)/100.) - .arg(numLat) - .arg(numGaps) - .toAscii(), true) ); - } else { - emit( newMessage(QString("%1: Mean latency %2 sec, min %3, max %4, rms %5, %6 epochs") - .arg(_staID.data()) - .arg(int(sumLat/numLat*100)/100.) - .arg(int(minLat*100)/100.) - .arg(int(maxLat*100)/100.) - .arg(int((sqrt((sumLatQ - sumLat * sumLat / numLat)/numLat))*100)/100.) - .arg(numLat) - .toAscii(), true) ); + if (newSecGPS - oldSecGPS > 1.5 * meanDiff) { + numGaps += 1; + } } } - meanDiff = diffSecGPS/numLat; - diffSecGPS = 0; - numGaps = 0; - sumLat = 0.; - sumLatQ = 0.; - numLat = 0; - minLat = maxDt; - maxLat = -maxDt; + curLat = sec - obs->_o.GPSWeeks; + sumLat += curLat; + sumLatQ += curLat * curLat; + if (curLat < minLat) minLat = curLat; + if (curLat >= maxLat) maxLat = curLat; + numLat += 1; + oldSecGPS = newSecGPS; + followSec = true; } - if (followSec) { - diffSecGPS += newSecGPS - oldSecGPS; - if (meanDiff>0.) { - if (newSecGPS - oldSecGPS > 1.5 * meanDiff) { - numGaps += 1; - } - } - } - curLat = sec - obs->_o.GPSWeeks; - sumLat += curLat; - sumLatQ += curLat * curLat; - if (curLat < minLat) minLat = curLat; - if (curLat >= maxLat) maxLat = curLat; - numLat += 1; - oldSecGPS = newSecGPS; - followSec = true; } } Index: trunk/BNC/bnchelp.html =================================================================== --- trunk/BNC/bnchelp.html (revision 1306) +++ trunk/BNC/bnchelp.html (revision 1307) @@ -104,5 +104,5 @@       3.8.3. Port
      3.8.4. Wait for Full Epoch
-3.9. Monitor
+3.9. Outages
      3.9.1. Observation Rate
      3.9.2. Failure Threshold
@@ -110,7 +110,8 @@       3.9.4. Pause
      3.9.5. Script
-      3.9.6. Performance Log
-3.10. RTCM Scan
-      3.10.1. Mountpoint
+3.10. Miscellaneous
+      3.10.1. Mountpoint
+      3.10.2. Log Latency
+      3.10.3. Scan RTCM
3.11. Mountpoints
      3.11.1. Add Mountpoints
@@ -519,5 +520,5 @@

-

3.9. Monitor

+

3.9. Outages

@@ -592,5 +593,18 @@

-

3.9.6 Performance Log - optional

+

3.10. Miscellaneous

+

+This section describes a number of miscellaneous options which can be applied per stream (mountpoint) or for all configured streams. +

+ +

3.10.1 Mountpoint - optional

+

+Specify a mountpoint to apply one or several of the 'Miscellaneous' options to the corresponding stream. Enter 'ALL' if you want to apply these options to all configured streams. An empty option field (default) means that you don't want BNC to apply any of these options. +

+ +

3.10.2 Log Latency - optional

+

+ BNC can average latencies per stream over a certain period of GPS time, the 'Performance log' interval. Mean latencies are calculated from the individual latencies of at most one (first incoming) observation or correction to Broadcast Ephemeris per second. Note that computing correct latencies requires the clock of the host computer to be properly synchronized. +

Latency: Latency is defined in BNC by the following equation: @@ -604,7 +618,4 @@

- BNC can average the latencies per stream over a certain period of GPS time, the 'Performance log' interval. Mean latencies are calculated from the individual latencies of at most one (first incoming) observation or correction to Broadcast Ephemeris per second. Note that computing correct latencies requires the clock of the host computer to be properly synchronized. -

-

Statistics: BNC counts the number of GPS seconds covered by at least one observation. It also estimates an observation rate (independent from the a priory specified 'Observation rate') from all observations received throughout the first full 'Performance log' interval. Based on this rate, BNC estimates the number of data gaps when appearing in subsequent intervals.

@@ -619,12 +630,11 @@

-

3.10. RTCM Scan

+ +

3.10.3 Scan RTCM - optional

When configuring a GNSS receiver for RTCM stream generation, the setup interface may not provide details about RTCM message types. As reliable information concerning stream contents should be available i.e. for NTRIP broadcaster operators to maintain the broadcaster's sourcetable, BNC allows to scan RTCM streams for incoming message types and printout some of the contained meta-data. The idea for this option arose from 'InspectRTCM', a comprehensive stream analyzing tool written by D. Stoecker.

- -

3.10.1 Mountpoint - optional

-

-Specify the mountpoint of an RTCM Version 2.x or 3.x stream to scan it and log all contained +

+Tick 'Scan RTCM' to scan RTCM Version 2.x or 3.x streams and log all contained

    Index: trunk/BNC/bncmain.cpp =================================================================== --- trunk/BNC/bncmain.cpp (revision 1306) +++ trunk/BNC/bncmain.cpp (revision 1307) @@ -122,5 +122,5 @@ settings.setValue("perfIntr", ""); settings.setValue("corrTime", "5"); - settings.setValue("messTypes", ""); + settings.setValue("miscMount", ""); } Index: trunk/BNC/bncwindow.cpp =================================================================== --- trunk/BNC/bncwindow.cpp (revision 1306) +++ trunk/BNC/bncwindow.cpp (revision 1307) @@ -113,6 +113,9 @@ _proxyPortLineEdit = new QLineEdit(settings.value("proxyPort").toString()); _proxyPortLineEdit->setMaximumWidth(9*ww); - _messTypesLineEdit = new QLineEdit(settings.value("messTypes").toString()); - _messTypesLineEdit->setMaximumWidth(20*ww); + _miscMountLineEdit = new QLineEdit(settings.value("miscMount").toString()); + _miscMountLineEdit->setMaximumWidth(20*ww); + _scanRTCMCheckBox = new QCheckBox(); + _scanRTCMCheckBox->setCheckState(Qt::CheckState( + settings.value("scanRTCM").toInt())); _waitTimeSpinBox = new QSpinBox(); _waitTimeSpinBox->setMinimum(1); @@ -288,10 +291,11 @@ _logFileLineEdit->setWhatsThis(tr("Records of BNC's activities are shown in the Log section on the bottom of this window. They can be saved into a file when a valid path is specified in the 'Logfile (full path)' field.")); _adviseScriptLineEdit->setWhatsThis(tr("

    Specify the full path to a script or batch file to handle advisory notes generated in the event of corrupted streams or stream outages. The affected mountpoint and one of the comments 'Begin_Outage', 'End_Outage', 'Begin_Corrupted', or 'End_Corrupted' are passed on to the script as command line parameters.

    The script can be configured to send an email to BNC's operator and/or to the affected stream provider. An empty option field (default) or invalid path means that you don't want to use this option.

    Note that for using this function you need to specify the 'Observation rate'.

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

    BNC can average latencies per stream over a certain period of GPS time. The resulting mean latencies are recorded in the Log file/section at the end of each 'Performance log' interval together with results of a statistical evaluation (approximate number of covered epochs, data gaps).

    Select a 'Performance log' interval or select the empty option field if you do not want BNC to log latencies and statistical information.

    ")); + _perfIntrComboBox->setWhatsThis(tr("

    BNC can average latencies per stream over a certain period of GPS time. The resulting mean latencies are recorded in the Log file/section at the end of each 'Log latency' interval together with results of a statistical evaluation (approximate number of covered epochs, data gaps).

    Select a 'Log latency' interval or select the empty option field if you do not want BNC to log latencies and statistical information.

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

    Streams selected for retrieval are listed in the 'Mountpoints' section. Clicking on 'Add Mountpoints' button will open a window that allows the user to select data streams from an NTRIP broadcaster according to their mountpoints. To remove a stream from the 'Mountpoints' list, highlight it by clicking on it and hit the 'Delete Mountpoints' button. You can also remove multiple mountpoints by highlighting them using +Shift and +Ctrl.

    BNC automatically allocates one of its internal decoders to a stream based on the stream's 'format' and 'format-details' as given in the sourcetable. However, there might be cases where you need to override the automatic selection due to incorrect sourcetable for example. BNC allows users to manually select the required decoder by editing the decoder string. Double click on the 'decoder' field, enter your preferred decoder and then hit Enter. The accepted decoder strings are 'RTCM_2.x', 'RTCM_3.x', and 'RTIGS'.

    In case you need to log the raw data as is, BNC allows users to by-pass its decoders and and directly save the input in daily log files. To do this specify the decoder string as 'ZERO'.

    BNC can also retrieve streams from virtual reference stations (VRS). To initiate these streams, an approximate rover position needs to be sent in NMEA GGA message to the NTRIP broadcaster. In return, a user-specific data stream is generated, typically by a Network-RTK software. This stream is customized to the exact latitude and longitude as shown in the 'lat' and 'long' columns under 'Mountpoints'. These VRS streams are indicated by a 'yes' in the 'nmea' column under 'Mountpoints' as well as in the sourcetable. The default 'lat' and 'long' values are taken from the sourcetable. However, in most cases you would probably want to change this according to your requirement. Double click on 'lat' and 'long' fields, enter the values you wish to send and then hit Enter. The format is in positive north latitude degrees (e.g. for northern hemisphere: 52.436, for southern hemisphere: -24.567) and eastern longitude degrees (e.g.: 358.872 or -1.128). Only mountpoints with a 'yes' in its 'nmea' column can be edited. The position should preferably be a point within the coverage of the network.

    ")); _log->setWhatsThis(tr("Records of BNC's activities are shown in the Log section. The message log covers the communication status between BNC and the NTRIP broadcaster as well as any problems that occur in the communication link, stream availability, stream delay, stream conversion etc.")); _ephV3CheckBox->setWhatsThis(tr("The default format for RINEX Navigation files containing Broadcast Ephemeris is RINEX Version 2.11. Select 'Version 3' if you want to save the ephemeris in RINEX Version 3 format.")); _rnxV3CheckBox->setWhatsThis(tr("The default format for RINEX Observation files is RINEX Version 2.11. Select 'Version 3' if you want to save the observations in RINEX Version 3 format.")); - _messTypesLineEdit->setWhatsThis(tr("

    Specify the mountpoint of an RTCM Version 2.x or 3.x stream to log the numbers of incoming message types as well as contained antenna coordinates, antenna height, and antenna descriptor.

    An empty option field (default) means that you don't want BNC to log such information.

    ")); + _miscMountLineEdit->setWhatsThis(tr("

    Specify a mountpoint to apply the options shown below. Enter 'ALL' if you want to apply the options to all configured streams.

    An empty option field (default) means that you don't want BNC to apply any of these options.

    ")); + _scanRTCMCheckBox->setWhatsThis(tr("

    Tick 'Scan RTCM' to log the numbers of incomming message types as well as contained antenna coordinates, antenna heigt, and antenna descriptor.

    An empty option field (default) means that you don't want BNC to log such information.

    ")); // Canvas with Editable Fields @@ -315,6 +319,6 @@ aogroup->addTab(cgroup,tr("Ephemeris Corrections")); aogroup->addTab(sgroup,tr("Feed Engine")); - aogroup->addTab(agroup,tr("Monitor")); - aogroup->addTab(rgroup,tr("RTCM Scan")); + aogroup->addTab(agroup,tr("Outages")); + aogroup->addTab(rgroup,tr("Miscellaneous")); QGridLayout* pLayout = new QGridLayout; @@ -385,7 +389,5 @@ aLayout->addWidget(new QLabel("Script (full path)"), 3, 0); aLayout->addWidget(_adviseScriptLineEdit, 3, 1,1,10); - aLayout->addWidget(new QLabel("Performance log"), 4, 0); - aLayout->addWidget(_perfIntrComboBox, 4, 1); - aLayout->addWidget(new QLabel("Network monitoring, outages, handling of corrupted streams, latencies, statistics."),5,0,1,10,Qt::AlignLeft); + aLayout->addWidget(new QLabel("Outage report, handling of corrupted streams."),5,0,1,10,Qt::AlignLeft); agroup->setLayout(aLayout); @@ -393,8 +395,10 @@ rLayout->setColumnMinimumWidth(0,14*ww); rLayout->addWidget(new QLabel("Mountpoint"), 0, 0, Qt::AlignLeft); - rLayout->addWidget(_messTypesLineEdit, 0, 1,1,15,Qt::AlignLeft); - rLayout->addWidget(new QLabel("Scan RTCM stream to log numbers of message types and antenna information."),1, 0, 1, 4, Qt::AlignLeft); - rLayout->addWidget(new QLabel(" "), 2, 0); - rLayout->addWidget(new QLabel(" "), 3, 0); + rLayout->addWidget(_miscMountLineEdit, 0, 1,1,15,Qt::AlignLeft); + rLayout->addWidget(new QLabel("Log latency"), 1, 0); + rLayout->addWidget(_perfIntrComboBox, 1, 1); + rLayout->addWidget(new QLabel("Scan RTCM"), 2, 0); + rLayout->addWidget(_scanRTCMCheckBox, 2, 1); + rLayout->addWidget(new QLabel("Log latencies or scan RTCM streams for numbers of message types and antenna information."),3, 0, 1, 4, Qt::AlignLeft); rLayout->addWidget(new QLabel(" "), 4, 0); rLayout->addWidget(new QLabel(" "), 5, 0); @@ -658,5 +662,6 @@ settings.setValue("logFile", _logFileLineEdit->text()); settings.setValue("adviseScript",_adviseScriptLineEdit->text()); - settings.setValue("messTypes", _messTypesLineEdit->text()); + settings.setValue("miscMount", _miscMountLineEdit->text()); + settings.setValue("scanRTCM", _scanRTCMCheckBox->checkState()); QStringList mountPoints; Index: trunk/BNC/bncwindow.h =================================================================== --- trunk/BNC/bncwindow.h (revision 1306) +++ trunk/BNC/bncwindow.h (revision 1307) @@ -108,5 +108,5 @@ QLineEdit* _ephPathLineEdit; QLineEdit* _corrPathLineEdit; - QLineEdit* _messTypesLineEdit; + QLineEdit* _miscMountLineEdit; QCheckBox* _rnxV3CheckBox; QCheckBox* _ephV3CheckBox; @@ -120,4 +120,5 @@ QSpinBox* _binSamplSpinBox; QCheckBox* _rnxAppendCheckBox; + QCheckBox* _scanRTCMCheckBox; QCheckBox* _makePauseCheckBox; QSpinBox* _waitTimeSpinBox;