Changeset 5576 in ntrip

Timestamp:

Nov 25, 2013, 5:47:57 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• GPSS/hassDecoder.cpp (modified) (1 diff)
• RTCM3/RTCM3coDecoder.cpp (modified) (7 diffs)
• RTCM3/RTCM3coDecoder.h (modified) (2 diffs)
• bncephuser.cpp (modified) (2 diffs)
• bncephuser.h (modified) (2 diffs)
• bncpppclient.cpp (modified) (3 diffs)
• bncpppclient.h (modified) (2 diffs)
• combination/bnccomb.cpp (modified) (2 diffs)

trunk/BNC/src/GPSS/hassDecoder.cpp

@@ -141 +141 @@
     }
 
-    int SSRProviderID = 0;
-    int SSRSolutionID = 0;
-    int SSRIOD        = 0;
-
     corrLine.sprintf("%d %d %d %.1f %s"
                      "   %3d"
                      "   %8.3f %8.3f %8.3f %8.3f"
                      "   %10.5f %10.5f %10.5f %10.5f"
-                     "   %10.5f"
-                     "   %5d %2d %2d",
+                     "   %10.5f",
                      messageType, updateInterval, coTime.gpsw(), _GPSweeks,
                      prn.toAscii().data(), IOD, 
                      dClk, rao[0], rao[1], rao[2],
-                     0.0, dotRao[0], dotRao[1], dotRao[2], 0.0,
-                     SSRProviderID, SSRSolutionID, SSRIOD);
+                     0.0, dotRao[0], dotRao[1], dotRao[2], 0.0);
 
     RTCM3coDecoder::reopen(_fileNameSkl, _fileName, _out);    

trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp

@@ -82 +82 @@
   memset(&_co, 0, sizeof(_co));
   memset(&_bias, 0, sizeof(_bias));
+
+  _providerID[0] = -1;
+  _providerID[1] = -1;
+  _providerID[2] = -1;
 }
 
@@ -220 +224 @@
         }
 
+        checkProviderID();
+
         QStringList asciiLines = corrsToASCIIlines(GPSweek, _GPSweeks, 
                                                    _co, &_bias);
@@ -309 +315 @@
                      "   %8.3f %8.3f %8.3f %8.3f"
                      "   %10.5f %10.5f %10.5f %10.5f"
-                     "   %10.5f"
-                     "   %5d %2d %2d",
+                     "   %10.5f",
                      co.Sat[ii].IOD, 
                      co.Sat[ii].Clock.DeltaA0,
@@ -320 +325 @@
                      co.Sat[ii].Orbit.DotDeltaAlongTrack,
                      co.Sat[ii].Orbit.DotDeltaCrossTrack,
-                     co.Sat[ii].Clock.DeltaA2,
-                     co.SSRProviderID, co.SSRSolutionID, co.SSRIOD);
+                     co.Sat[ii].Clock.DeltaA2);
         retLines << linePart+line;
       }
@@ -332 +336 @@
         line.sprintf("   %3d"
                      "   %8.3f %8.3f %8.3f"
-                     "   %10.5f %10.5f %10.5f"
-                     "   %5d %2d %2d",
+                     "   %10.5f %10.5f %10.5f",
                      co.Sat[ii].IOD, 
                      co.Sat[ii].Orbit.DeltaRadial, 
@@ -340 +343 @@
                      co.Sat[ii].Orbit.DotDeltaRadial, 
                      co.Sat[ii].Orbit.DotDeltaAlongTrack,
-                     co.Sat[ii].Orbit.DotDeltaCrossTrack,
-                     co.SSRProviderID, co.SSRSolutionID, co.SSRIOD);
+                     co.Sat[ii].Orbit.DotDeltaCrossTrack);
         retLines << linePart+line;
       }
@@ -416 +418 @@
   return retLines;
 }
+
+// 
+////////////////////////////////////////////////////////////////////////////
+void RTCM3coDecoder::checkProviderID() {
+
+  if (_co.SSRProviderID == 0 && _co.SSRSolutionID == 0 && _co.SSRIOD == 0) {
+    return;
+  }
+
+  int newProviderID[3];
+  newProviderID[0] = _co.SSRProviderID;
+  newProviderID[1] = _co.SSRSolutionID;
+  newProviderID[2] = _co.SSRIOD;
+
+  bool alreadySet = false;
+  bool different  = false;
+
+  for (unsigned ii = 0; ii < 3; ii++) {
+    if (_providerID[ii] != -1) {
+      alreadySet = true;
+    }
+    if (_providerID[ii] != newProviderID[ii]) {
+      different = true;
+    }
+    _providerID[ii] = newProviderID[ii];
+  }
+    
+  if (alreadySet && different) {
+    emit newMessage("RTCM3coDecoder: Provider Changed\n", true);
+  }
+}

trunk/BNC/src/RTCM3/RTCM3coDecoder.h

@@ -55 +55 @@
  private:
   void printLine(const QString& line, int GPSweek, double GPSweeks);
+  void checkProviderID();
   std::ofstream* _out;
   QString        _staID;
@@ -63 +64 @@
   ClockOrbit     _co;
   Bias           _bias;
+  int            _providerID[3];
 };
 

trunk/BNC/src/bncephuser.cpp

@@ -217 +217 @@
        >> dClk       >> rao[0]       >> rao[1]       >> rao[2]
        >> dotDClk    >> dotRao[0]    >> dotRao[1]    >> dotRao[2]
-       >> dotDotDClk >> streamID[0]  >> streamID[1]  >> streamID[2];
+       >> dotDotDClk;
 
     dClk       /= t_CST::c;
@@ -232 +232 @@
     in >> iod 
        >> rao[0]       >> rao[1]       >> rao[2]
-       >> dotRao[0]    >> dotRao[1]    >> dotRao[2]
-       >> streamID[0]  >> streamID[1]  >> streamID[2];
+       >> dotRao[0]    >> dotRao[1]    >> dotRao[2];
 
     tRao.set(GPSweek, GPSweeks);

trunk/BNC/src/bncephuser.h

@@ -51 +51 @@
     dotRao      = 0.0;
     eph         = 0;
-    streamID[0] = -1;
-    streamID[1] = -1;
-    streamID[2] = -1;
   }
   
@@ -85 +82 @@
   ColumnVector dotRao;
   const t_eph* eph;
-  int          streamID[3];
 };
 

trunk/BNC/src/bncpppclient.cpp

@@ -70 +70 @@
   _model = new bncModel(this);
 
-  _streamID[0] = -1;
-  _streamID[1] = -1;
-  _streamID[2] = -1;
-
   if (connectSlots) {
     connect(this, SIGNAL(newMessage(QByteArray,bool)), 
@@ -299 +295 @@
       }
       cc->readLine(line);
-      checkProviderID(cc);
       _corr_tt = cc->tClk;
     }
@@ -533 +528 @@
 }
 
-// 
-////////////////////////////////////////////////////////////////////////////
-void bncPPPclient::checkProviderID(const t_corr* corr) {
-
-  bool alreadySet = false;
-  bool different  = false;
-
-  for (unsigned ii = 0; ii < 3; ii++) {
-    if (_streamID[ii] != -1) {
-      alreadySet = true;
-    }
-    if (corr->streamID[ii] != -1) {
-      if (_streamID[ii] != corr->streamID[ii]) {
-        different = true;
-      }
-      _streamID[ii] = corr->streamID[ii];
-    }
-  }
-    
-  if (alreadySet && different) {
-    delete _model;
-    _model = new bncModel(this);
-  }
-}

trunk/BNC/src/bncpppclient.h

@@ -158 +158 @@
   void processFrontEpoch();
   t_irc cmpToT(t_satData* satData);
-  void checkProviderID(const t_corr* corr);
 
   t_pppOpt*               _opt;
@@ -169 +168 @@
   bncModel*               _model;
   QMap<QString, slipInfo> _slips;
-  int                     _streamID[3];
 };
 

trunk/BNC/src/combination/bnccomb.cpp

@@ -709 +709 @@
     int messageType   = COTYPE_GPSCOMBINED;
     int updateInt     = 0;
-    int SSRProviderID = 0;
-    int SSRSolutionID = 0;
-    int SSRIOD        = 0;
     line.sprintf("%d %d %d %.1f %s"
                  "   %3d"
                  "   %8.3f %8.3f %8.3f %8.3f"
                  "   %10.5f %10.5f %10.5f %10.5f"
-                 "   %10.5f   %5d %2d %2d INTERNAL",
+                 "   %10.5f INTERNAL",
                  messageType, updateInt, _resTime.gpsw(), _resTime.gpssec(),
                  corr->prn.toAscii().data(),
@@ -728 +725 @@
                  corr->dotRao[1],
                  corr->dotRao[2],
-                 corr->dotDotDClk * t_CST::c,
-                 SSRProviderID, SSRSolutionID, SSRIOD);
+                 corr->dotDotDClk * t_CST::c);
     corrLines << line;