Changeset 8351 in ntrip

Timestamp:

May 18, 2018, 9:56:20 AM (7 years ago)

Author:

stuerze

Message:

individual satellite system will be considerred now during concatenation of ephemeris files

Location:

branches/BNC_2.12/src

Files:

• bnccore.cpp (modified) (1 diff)
• bncmain.cpp (modified) (2 diffs)
• bncrinex.cpp (modified) (9 diffs)
• bncrinex.h (modified) (2 diffs)
• bncsettings.cpp (modified) (4 diffs)
• bncwindow.cpp (modified) (11 diffs)
• bncwindow.h (modified) (1 diff)
• rinex/reqcedit.cpp (modified) (2 diffs)
• rinex/rnxnavfile.cpp (modified) (1 diff)
• rinex/rnxnavfile.h (modified) (3 diffs)

branches/BNC_2.12/src/bnccore.cpp

@@ -305 +305 @@
     QString ephFileNameGPS = _ephPath + "BRDC";
 
-    bool ephV3filenames = settings.value("ephV3filenames").toBool();
+    bool ephV3 = (_rinexVers == 3) ? true : false;
 
     QString hlpStr = bncRinex::nextEpochStr(datTim,
-                         settings.value("ephIntr").toString(), ephV3filenames);
+                         settings.value("ephIntr").toString(), ephV3);
 
     if (_rinexVers == 3) {
-      if (ephV3filenames) {
-        QString country = "WRD"; // WORLD
-        QString monNum = "0";
-        QString recNum = "0";
-        ephFileNameGPS += QString("%1").arg(monNum, 1, 10) +
-                          QString("%1").arg(recNum, 1, 10) +
-                          country +
-                          "_S_" +     // stream
-                          QString("%1").arg(datTim.date().year()) +
-                          QString("%1").arg(datTim.date().dayOfYear(), 3, 10, QChar('0')) +
-                          hlpStr +   // HM_period
-                          "_MN.rnx"; // mixed BRDC
-      }
-      else { // RNX v3 with old filenames
-        ephFileNameGPS +=  QString("%1").arg(datTim.date().dayOfYear(), 3, 10, QChar('0')) +
-                           hlpStr + datTim.toString(".yyP");
-      }
+      QString country = "WRD"; // WORLD
+      QString monNum = "0";
+      QString recNum = "0";
+      ephFileNameGPS += QString("%1").arg(monNum, 1, 10) +
+                        QString("%1").arg(recNum, 1, 10) +
+                        country +
+                        "_S_" +     // stream
+                        QString("%1").arg(datTim.date().year()) +
+                        QString("%1").arg(datTim.date().dayOfYear(), 3, 10, QChar('0')) +
+                        hlpStr +   // HM_period
+                        "_MN.rnx"; // mixed BRDC
     }
     else { // RNX v2.11

branches/BNC_2.12/src/bncmain.cpp

@@ -109 +109 @@
       "   rnxV2Priority  {Priority of signal attributes [character string, list separated by blank character, example: G:12&PWCSLXYN G:5&IQX C:IQX]}\n"
       "   rnxV3          {Produce version 3 file contents [integer number: 0=no,2=yes]}\n"
-      "   rnxV3filenames {Produce version 3 filenames [integer number: 0=no,2=yes]}\n"
       "\n"
       "RINEX Ephemeris Panel keys:\n"
@@ -116 +115 @@
       "   ephOutPort     {Output port [integer number]}\n"
       "   ephV3          {Produce version 3 file contents [integer number: 0=no,2=yes]}\n"
-      "   ephV3filenames {Produce version 3 filenames [integer number: 0=no,2=yes]}\n"
       "\n"
       "RINEX Editing and QC Panel keys:\n"

branches/BNC_2.12/src/bncrinex.cpp

@@ -94 +94 @@
   _writeRinexFileOnlyWithSkl = settings.value("rnxOnlyWithSKL").toBool();
 
-  _rnxV3filenames = settings.value("rnxV3filenames").toBool();
+  _rnxV3 = (Qt::CheckState(settings.value("rnxV3").toInt()) == Qt::Checked) ? true : false;
 }
 
@@ -209 +209 @@
 ////////////////////////////////////////////////////////////////////////////
 QString bncRinex::nextEpochStr(const QDateTime& datTim,
-                               const QString& intStr, bool rnxV3filenames,
+                               const QString& intStr, bool rnxV3,
                                QDateTime* nextEpoch) {
 
@@ -221 +221 @@
   if ( indHlp != -1) {
     int step = intStr.left(indHlp-1).toInt();
-    if (rnxV3filenames) {
+    if (rnxV3) {
       epoStr +=  QString("%1").arg(datTim.time().hour(), 2, 10, QChar('0')); // H
     } else {
@@ -248 +248 @@
       }
     }
-    if (rnxV3filenames) {
+    if (rnxV3) {
       epoStr += QString("_%1M").arg(step, 2, 10, QChar('0'));                // period
     }
@@ -254 +254 @@
   else if (intStr == "1 hour") {
     int step = intStr.left(indHlp-1).toInt();
-    if (rnxV3filenames) {
+    if (rnxV3) {
       epoStr += QString("%1").arg(datTim.time().hour(), 2, 10, QChar('0'));  // H
       epoStr += QString("%1").arg(0, 2, 10, QChar('0'));                     // M
@@ -272 +272 @@
   else {
     int step = intStr.left(indHlp-1).toInt();
-    if (rnxV3filenames) {
+    if (rnxV3) {
       epoStr += QString("%1").arg(0, 2, 10, QChar('0'));                    // H
       epoStr += QString("%1").arg(0, 2, 10, QChar('0'));                    // M
@@ -303 +303 @@
 
   QString hlpStr = nextEpochStr(datTim, settings.value("rnxIntr").toString(),
-                                _rnxV3filenames, &_nextCloseEpoch);
+                                _rnxV3, &_nextCloseEpoch);
 
   int statIDlength = _statID.size() -1;
@@ -335 +335 @@
   }
 
-  if (_rnxV3filenames) {
+  if (_rnxV3) {
     QString country;
     QString monNum = "0";
@@ -362 +362 @@
             "_MO" + // mixed OBS
             distStr +
-            ".rnx"; 
+            ".rnx";
   }
   else {

branches/BNC_2.12/src/bncrinex.h

@@ -47 +47 @@
    static QString nextEpochStr(const QDateTime& datTim,
                                const QString& intStr, 
-                               bool rnxV3filenames,
+                               bool rnxV3,
                                QDateTime* nextEpoch = 0);
    static std::string asciiSatLine(const t_satObs& obs);
@@ -70 +70 @@
    QString         _sklName;
    bool            _writeRinexFileOnlyWithSkl;
-   bool            _rnxV3filenames;
+   bool            _rnxV3;
    QByteArray      _latitude;
    QByteArray      _longitude;

branches/BNC_2.12/src/bncsettings.cpp

@@ -92 +92 @@
     setValue_p("rnxScript",           "");
     setValue_p("rnxV3",               "0");
-    setValue_p("rnxV3filenames",      "0");
     // RINEX Ephemeris
     setValue_p("ephPath",             "");
@@ -98 +97 @@
     setValue_p("ephOutPort",          "");
     setValue_p("ephV3",               "0");
-    setValue_p("ephV3filenames",      "0");
     // Reqc
     setValue_p("reqcAction",          "");
@@ -110 +108 @@
     setValue_p("reqcRnxVersion",      "");
     setValue_p("reqcSampling",        "");
-    setValue_p("reqcStartDateTime",   "");
-    setValue_p("reqcEndDateTime",     "");
+    setValue_p("reqcStartDateTime",   "1967-11-02T00:00:00");
+    setValue_p("reqcEndDateTime",     "2099-01-01T00:00:00");
     setValue_p("reqcLogSummaryOnly",  "");
     setValue_p("reqcRunBy",           "");
@@ -121 +119 @@
     setValue_p("reqcOldReceiverName", "");
     setValue_p("reqcNewReceiverName", "");
+   setValue_p("reqcOldAntennaNumber", "");
     setValue_p("reqcNewAntennaNumber","");
+    setValue_p("reqcOldAntennadE",    "");
     setValue_p("reqcNewAntennadE",    "");
+    setValue_p("reqcOldAntennadN",    "");
     setValue_p("reqcNewAntennadN",    "");
+    setValue_p("reqcOldAntennadU",    "");
     setValue_p("reqcNewAntennadU",    "");
+    setValue_p("reqcOldReceiverNumber", "");
     setValue_p("reqcNewReceiverNumber", "");
-    setValue_p("reqcOldAntennaNumber", "");
-    setValue_p("reqcOldAntennadE",    "");
-    setValue_p("reqcOldAntennadN",    "");
-    setValue_p("reqcOldAntennadU",    "");
-    setValue_p("reqcOldReceiverNumber", "");
+
     setValue_p("reqcUseObsTypes",     "");
     setValue_p("reqcV2Priority",      "G:12&PWCSLXYN_ G:5&IQX_ R:12&PC_ R:3&IQX_ E:16&BCX_ E:578&IQX_ J:1&SLXCZ_ J:26&SLX_ J:5&IQX_ C:IQX_ I:ABCX_ S:1&C_ S:5&IQX_");

branches/BNC_2.12/src/bncwindow.cpp

@@ -219 +219 @@
   _rnxV3CheckBox      = new QCheckBox();
   _rnxV3CheckBox->setCheckState(Qt::CheckState(settings.value("rnxV3").toInt()));
-  _rnxV3filenameCheckBox = new QCheckBox();
-  _rnxV3filenameCheckBox->setCheckState(Qt::CheckState(settings.value("rnxV3filenames").toInt()));
   QString hlp = settings.value("rnxV2Priority").toString();
   if (hlp.isEmpty()) {
@@ -245 +243 @@
   _ephV3CheckBox = new QCheckBox();
   _ephV3CheckBox->setCheckState(Qt::CheckState(settings.value("ephV3").toInt()));
-
-  _ephV3filenameCheckBox = new QCheckBox();
-  _ephV3filenameCheckBox->setCheckState(Qt::CheckState(settings.value("ephV3filenames").toInt()));
 
   connect(_ephOutPortLineEdit, SIGNAL(textChanged(const QString &)),
@@ -698 +693 @@
   oLayout->addWidget(new QLabel("Version 3"),                      6, 0);
   oLayout->addWidget(_rnxV3CheckBox,                               6, 1);
-  oLayout->addWidget(new QLabel("Version 3 filenames"),            6, 2);
-  oLayout->addWidget(_rnxV3filenameCheckBox,                       6, 3);
   oLayout->addWidget(new QLabel(""),                               7, 1);
   oLayout->setRowStretch(8, 999);
@@ -721 +714 @@
   eLayout->addWidget(new QLabel("Version 3"),                     4, 0);
   eLayout->addWidget(_ephV3CheckBox,                              4, 1);
-  eLayout->addWidget(new QLabel("Version 3 filenames"),           4, 2);
-  eLayout->addWidget(_ephV3filenameCheckBox,                      4, 3);
   eLayout->setRowStretch(5, 999);
 
@@ -1251 +1242 @@
   _rnxV2Priority->setWhatsThis(tr("<p>Specify a priority list of characters defining signal attributes as defined in RINEX Version 3. Priorities will be used to map observations with RINEX Version 3 attributes from incoming streams to Version 2. The underscore character '_' stands for undefined attributes. A question mark '?' can be used as wildcard which represents any one character.</p><p>Signal priorities can be specified as equal for all systems, as system specific or as system and freq. specific. For example: </li><ul><li>'CWPX_?' (General signal priorities valid for all GNSS) </li><li>'C:IQX I:ABCX' (System specific signal priorities for BDS and IRNSS) </li><li>'G:12&PWCSLXYN G:5&IQX R:12&PC R:3&IQX' (System and frequency specific signal priorities) </li></ul>Default is the following priority list 'G:12&PWCSLXYN_ G:5&IQX_ R:12&PC_ R:3&IQX_ E:16&BCX_ E:578&IQX_ J:1&SLXCZ_ J:26&SLX_ J:5&IQX_ C:IQX_ I:ABCX_ S:1&C_ S:5&IQX_'.</p>"));
   _rnxV3CheckBox->setWhatsThis(tr("<p>The default format for RINEX Observation files is RINEX Version 2.</p><p>Select 'Version 3' if you want to save observations in RINEX Version 3 format.</p>"));
-  _rnxV3filenameCheckBox->setWhatsThis(tr("<p>Tick 'Version 3 filenames' to let BNC create so-called extended filenames following the RINEX Version 3 standard.</p><p>Default is an empty check box, meaning to create filenames following the RINEX Version 2 standard although the file content is saved in RINEX Version 3 format.</p>"));
 
   // WhatsThis, RINEX Ephemeris
@@ -1259 +1249 @@
   _ephOutPortLineEdit->setWhatsThis(tr("<p>BNC can produce ephemeris data in RINEX Navigation ASCII format on your local host through an IP port.</p><p>Specify a port number here to activate this function.</p>"));
   _ephV3CheckBox->setWhatsThis(tr("<p>The default format for output of RINEX Navigation data containing Broadcast Ephemeris is RINEX Version 2.</p><p>Select 'Version 3' if you want to output ephemeris in RINEX Version 3 format.</p>"));
-  _ephV3filenameCheckBox->setWhatsThis(tr("<p>Tick 'Version 3 filenames' to let BNC create so-called extended filenames following the RINEX Version 3 standard.</p><p>Default is an empty check box, meaning to create filenames following the RINEX Version 2 standard although the file content is saved in RINEX Version 3 format.</p>"));
 
   // WhatsThis, RINEX Editing & QC
@@ -1455 +1444 @@
   delete _rnxScrpLineEdit;
   delete _rnxV3CheckBox;
-  delete _rnxV3filenameCheckBox;
   delete _rnxV2Priority;
   delete _ephPathLineEdit;
@@ -1461 +1449 @@
   delete _ephOutPortLineEdit;
   delete _ephV3CheckBox;
-  delete _ephV3filenameCheckBox;
   delete _corrPathLineEdit;
   delete _corrIntrComboBox;
@@ -1869 +1856 @@
   settings.setValue("rnxSkel",     _rnxSkelLineEdit->text());
   settings.setValue("rnxOnlyWithSKL",_rnxFileCheckBox->checkState());
-  settings.setValue("rnxV3filenames",_rnxV3filenameCheckBox->checkState());
   settings.setValue("rnxScript",   _rnxScrpLineEdit->text());
-  (_rnxV3filenameCheckBox->checkState()) ?
-    settings.setValue("rnxV3",       _rnxV3filenameCheckBox->checkState()) :
-    settings.setValue("rnxV3",       _rnxV3CheckBox->checkState());
   settings.setValue("rnxV2Priority",_rnxV2Priority->text());
 // RINEX Ephemeris
@@ -1879 +1862 @@
   settings.setValue("ephIntr",       _ephIntrComboBox->currentText());
   settings.setValue("ephOutPort",    _ephOutPortLineEdit->text());
-  settings.setValue("ephV3filenames", _ephV3filenameCheckBox->checkState());
-  (_ephV3filenameCheckBox->checkState()) ?
-    settings.setValue("ephV3",       _ephV3filenameCheckBox->checkState()) :
-    settings.setValue("ephV3",       _ephV3CheckBox->checkState());
 // Broadcast Corrections
   settings.setValue("corrPath",    _corrPathLineEdit->text());
@@ -2393 +2372 @@
     enableWidget(enable, _ephIntrComboBox);
     enableWidget(enable, _ephV3CheckBox);
-    enableWidget(enable, _ephV3filenameCheckBox);
   }
 

branches/BNC_2.12/src/bncwindow.h

@@ -158 +158 @@
     QLineEdit* _rnxV2Priority;
     QCheckBox* _ephV3CheckBox;
-    QCheckBox* _ephV3filenameCheckBox;
     QLineEdit* _rnxSkelLineEdit;
     QCheckBox* _rnxFileCheckBox;
-    QCheckBox* _rnxV3filenameCheckBox;
     QLineEdit* _rnxScrpLineEdit;
     QLineEdit* _logFileLineEdit;

branches/BNC_2.12/src/rinex/reqcedit.cpp

@@ -561 +561 @@
   bool haveGPS     = false;
   bool haveGlonass = false;
+  QMap<t_eph::e_type, bool> haveGnss;
   for (int ii = 0; ii < _ephs.size(); ii++) {
     const t_eph* eph = _ephs[ii];
-    if      (eph->type() == t_eph::GPS) {
-      haveGPS = true;
-    }
-    else if (eph->type() == t_eph::GLONASS) {
-      haveGlonass = true;
+    switch (eph->type()) {
+      case t_eph::GPS:
+        haveGPS = true;
+        haveGnss[t_eph::GLONASS] = true;
+        break;
+      case t_eph::GLONASS:
+        haveGlonass = true;
+        haveGnss[t_eph::GPS] = true;
+        break;
+      case t_eph::Galileo:
+        haveGnss[t_eph::Galileo] = true;
+        break;
+      case t_eph::BDS:
+        haveGnss[t_eph::BDS] = true;
+        break;
+      case t_eph::QZSS:
+        haveGnss[t_eph::QZSS] = true;
+        break;
+      case t_eph::IRNSS:
+        haveGnss[t_eph::IRNSS] = true;
+        break;
+      case t_eph::SBAS:
+        haveGnss[t_eph::SBAS] = true;
+        break;
+      default:
+        haveGnss[t_eph::unknown] = true;
     }
   }
@@ -582 +604 @@
   else {
     outNavFile.setVersion(defaultRnxNavVersion2);
+  }
+
+  if (outNavFile.version() > 3.0) {
+    if (haveGnss.size() > 1) {
+      outNavFile.setGnssTypeV3(t_eph::unknown);
+    }
+    else if (haveGnss.size() == 1){
+      outNavFile.setGnssTypeV3(haveGnss.keys().first());
+    }
   }
 

branches/BNC_2.12/src/rinex/rnxnavfile.cpp

@@ -294 +294 @@
   }
   else {
-    *_stream << QString("%1           N: GNSS NAV DATA    M: MIXED")
+        QString fmt;
+    t_eph::e_type sys = satSystem();
+    switch(sys) {
+      case t_eph::e_type::GPS:
+        fmt.append("%1           N: GNSS NAV DATA    G: GPS");
+        break;
+      case t_eph::e_type::GLONASS:
+        fmt.append("%1           N: GNSS NAV DATA    R: GLONASS");
+        break;
+      case t_eph::e_type::Galileo:
+        fmt.append("%1           N: GNSS NAV DATA    E: Galileo");
+        break;
+      case t_eph::e_type::QZSS:
+        fmt.append("%1           N: GNSS NAV DATA    J: QZSS");
+        break;
+      case t_eph::e_type::BDS:
+        fmt.append("%1           N: GNSS NAV DATA    C: BDS");
+        break;
+      case t_eph::e_type::IRNSS:
+        fmt.append("%1           N: GNSS NAV DATA    I: IRNSS");
+        break;
+      case t_eph::e_type::SBAS:
+        fmt.append("%1           N: GNSS NAV DATA    S: SBAS");
+        break;
+      case t_eph::e_type::unknown:
+        fmt.append("%1           N: GNSS NAV DATA    M: MIXED");
+        break;
+    }
+    *_stream << fmt
       .arg(_header._version, 9, 'f', 2)
       .leftJustified(60)

branches/BNC_2.12/src/rinex/rnxnavfile.h

@@ -30 +30 @@
 #include "bncconst.h"
 #include "bnctime.h"
+#include "ephemeris.h"
 
 class t_pppOpt;
@@ -50 +51 @@
     double _version;
     bool   _glonass;
+    t_eph::e_type _satSys;
     QStringList _comments;
   };
@@ -62 +64 @@
   bool   glonass() const {return _header._glonass;}
   QStringList comments() const {return _header._comments;}
+  t_eph::e_type satSystem() const {return _header._satSys;}
   void   setGlonass(bool glo) {_header._glonass = glo;}
+  void   setGnssTypeV3(t_eph::e_type sys) {_header._satSys = sys;}
   void   writeHeader(const QMap<QString, QString>* txtMap = 0);
   void   writeEph(const t_eph* eph);