Changeset 9036 in ntrip for branches/BNC_2.12/src/combination

Timestamp:

Aug 27, 2020, 9:36:18 AM (4 years ago)

Author:

stuerze

Message:

some modification to allow encoding and decoding of SSR corrections in RTCM-SSR and IGS-SSR formats

Location:

branches/BNC_2.12/src/combination

Files:

• bnccomb.cpp (modified) (6 diffs)
• bnccomb.h (modified) (2 diffs)

branches/BNC_2.12/src/combination/bnccomb.cpp

@@ -162 +162 @@
   }
 
+  QString ssrFormat;
+  QListIterator<QString> it(settings.value("uploadMountpointsOut").toStringList());
+  while (it.hasNext()) {
+    QStringList hlp = it.next().split(",");
+    if (hlp.size() > 7) {
+      ssrFormat = hlp[7];
+    }
+  }
+  _ssrCorr = 0;
+  if      (ssrFormat == "IGS-SSR") {
+    _ssrCorr = new SsrCorrIgs();
+  }
+  else if (ssrFormat == "RTCM-SSR") {
+    _ssrCorr = new SsrCorrRtcm();
+  }
+
   _rtnetDecoder = 0;
 
@@ -266 +282 @@
   }
   delete _rtnetDecoder;
+  if (_ssrCorr) {
+    delete _ssrCorr;
+  }
   delete _antex;
   for (int iPar = 1; iPar <= _params.size(); iPar++) {
@@ -714 +733 @@
 
   QString     outLines;
-  QStringList corrLines;
+  //QStringList corrLines;
 
   unsigned year, month, day, hour, minute;
@@ -770 +789 @@
 
     QString line;
-    int messageType   = COTYPE_GPSCOMBINED;
+    int messageType   = _ssrCorr->COTYPE_GPSCOMBINED;
     int updateInt     = 0;
     line.sprintf("%d %d %d %.1f %s"
@@ -789 +808 @@
                  corr->_orbCorr._dotXr[2],
                  0.0);
-    corrLines << line;
+    //corrLines << line;
 
     delete corr;
@@ -883 +902 @@
     }
 //    if (_useGlonass) {
-//      for (int iGlo = 1; iGlo <= t_prn::MAXPRN_GLONASS; iGlo++) {
+//      for (unsigned iGlo = 1; iGlo <= t_prn::MAXPRN_GLONASS; iGlo++) {
 //        QString prn = QString("R%1_0").arg(iGlo, 2, 10, QChar('0'));
 //        ++iCond;

branches/BNC_2.12/src/combination/bnccomb.h

@@ -7 +7 @@
 #include "bncephuser.h"
 #include "satObs.h"
+#include "../RTCM3/clock_and_orbit/clock_orbit_rtcm.h"
+#include "../RTCM3/clock_and_orbit/clock_orbit_igs.h"
 
 class bncRtnetDecoder;
@@ -126 +128 @@
   QMap<QString, QMap<t_prn, t_orbCorr> > _orbCorrections;
   bncEphUser                             _ephUser;
+  SsrCorr*                               _ssrCorr;
 };