Changeset 6215 in ntrip for trunk/BNC/src/RTCM3

Timestamp:

Oct 9, 2014, 9:38:06 AM (10 years ago)

Author:

stuerze

Message:

minor changes

File:

• trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp (modified) (17 diffs)

trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp ¶

@@ -35 +35 @@
  * Created:    05-May-2008
  *
- * Changes:    
+ * Changes:
  *
  * -----------------------------------------------------------------------*/
@@ -72 +72 @@
 
   qRegisterMetaType<bncTime>("bncTime");
-  qRegisterMetaType< QList<t_orbCorr> >("QList:t_orbCorr");
-  qRegisterMetaType< QList<t_clkCorr> >("QList:t_clkCorr");
-
-  connect(this, SIGNAL(newOrbCorrections(QList<t_orbCorr>)), 
+  qRegisterMetaType< QList<t_orbCorr> >("QList<t_orbCorr>");
+  qRegisterMetaType< QList<t_clkCorr> >("QList<t_clkCorr>");
+
+  connect(this, SIGNAL(newOrbCorrections(QList<t_orbCorr>)),
           BNC_CORE, SLOT(slotNewOrbCorrections(QList<t_orbCorr>)));
 
-  connect(this, SIGNAL(newClkCorrections(QList<t_clkCorr>)), 
+  connect(this, SIGNAL(newClkCorrections(QList<t_clkCorr>)),
           BNC_CORE, SLOT(slotNewClkCorrections(QList<t_clkCorr>)));
 
-  connect(this, SIGNAL(providerIDChanged(QString)), 
+  connect(this, SIGNAL(providerIDChanged(QString)),
           BNC_CORE, SIGNAL(providerIDChanged(QString)));
 
-  connect(this, SIGNAL(newMessage(QByteArray,bool)), 
+  connect(this, SIGNAL(newMessage(QByteArray,bool)),
           BNC_CORE, SLOT(slotMessage(const QByteArray,bool)));
 
@@ -102 +102 @@
 
 // Reopen Output File
-//////////////////////////////////////////////////////////////////////// 
+////////////////////////////////////////////////////////////////////////
 void RTCM3coDecoder::reopen() {
 
@@ -114 +114 @@
                                       settings.value("corrIntr").toString());
 
-    QString fileNameHlp = _fileNameSkl 
+    QString fileNameHlp = _fileNameSkl
       + QString("%1").arg(datTim.date().dayOfYear(), 3, 10, QChar('0'))
       + hlpStr + datTim.toString(".yyC");
@@ -135 +135 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 t_irc RTCM3coDecoder::Decode(char* buffer, int bufLen, vector<string>& errmsg) {
@@ -168 +168 @@
       _buffer = _buffer.mid(bytesused);
 
-      if ( (irc == GCOBR_OK          || irc == GCOBR_MESSAGEFOLLOWS ) && 
+      if ( (irc == GCOBR_OK          || irc == GCOBR_MESSAGEFOLLOWS ) &&
            (_co.NumberOfSat[CLOCKORBIT_SATGPS]   > 0 || _co.NumberOfSat[CLOCKORBIT_SATGLONASS]   > 0 ||
             _bias.NumberOfSat[CLOCKORBIT_SATGPS] > 0 || _bias.NumberOfSat[CLOCKORBIT_SATGLONASS] > 0) ) {
@@ -183 +183 @@
         // ----------------------------------
         if (_co.NumberOfSat[CLOCKORBIT_SATGPS] > 0 || _bias.NumberOfSat[CLOCKORBIT_SATGPS] > 0) {
-          int GPSEpochTime = (_co.NumberOfSat[CLOCKORBIT_SATGPS] > 0) ? 
+          int GPSEpochTime = (_co.NumberOfSat[CLOCKORBIT_SATGPS] > 0) ?
                              _co.EpochTime[CLOCKORBIT_SATGPS] : _bias.EpochTime[CLOCKORBIT_SATGPS];
           if      (GPSweeksHlp > GPSEpochTime + 86400.0) {
@@ -197 +197 @@
         // -----------------------------------
         else if (_co.NumberOfSat[CLOCKORBIT_SATGLONASS] > 0 || _bias.NumberOfSat[CLOCKORBIT_SATGLONASS] > 0){
-          int GLONASSEpochTime = (_co.NumberOfSat[CLOCKORBIT_SATGLONASS] > 0) ? 
+          int GLONASSEpochTime = (_co.NumberOfSat[CLOCKORBIT_SATGLONASS] > 0) ?
                               _co.EpochTime[CLOCKORBIT_SATGLONASS] : _bias.EpochTime[CLOCKORBIT_SATGLONASS];
 
@@ -206 +206 @@
           int GPSDaySec  = GLONASSEpochTime - 3 * 3600 + leapSecond;
 
-          int weekDay      = int(GPSweeksHlp/86400.0); 
+          int weekDay      = int(GPSweeksHlp/86400.0);
           int GPSDaySecHlp = int(GPSweeksHlp) - weekDay * 86400;
 
@@ -224 +224 @@
               GPSweek -= 1;
             }
-          } 
+          }
           _lastTime.set(GPSweek, weekDay * 86400.0 + GPSDaySec);
         }
@@ -243 +243 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 void RTCM3coDecoder::sendResults() {
@@ -266 +266 @@
     // Orbit correction
     // ----------------
-    if ( _co.messageType == COTYPE_GPSCOMBINED     || 
+    if ( _co.messageType == COTYPE_GPSCOMBINED     ||
          _co.messageType == COTYPE_GLONASSCOMBINED ||
          _co.messageType == COTYPE_GPSORBIT        ||
@@ -280 +280 @@
       orbCorr._xr[1]    = _co.Sat[ii].Orbit.DeltaAlongTrack;
       orbCorr._xr[2]    = _co.Sat[ii].Orbit.DeltaCrossTrack;
-      orbCorr._dotXr[0] = _co.Sat[ii].Orbit.DotDeltaRadial; 
+      orbCorr._dotXr[0] = _co.Sat[ii].Orbit.DotDeltaRadial;
       orbCorr._dotXr[1] = _co.Sat[ii].Orbit.DotDeltaAlongTrack;
       orbCorr._dotXr[2] = _co.Sat[ii].Orbit.DotDeltaCrossTrack;
@@ -289 +289 @@
     }
 
-    if ( _co.messageType == COTYPE_GPSCOMBINED     || 
+    if ( _co.messageType == COTYPE_GPSCOMBINED     ||
          _co.messageType == COTYPE_GLONASSCOMBINED ||
          _co.messageType == COTYPE_GPSCLOCK        ||
@@ -311 +311 @@
     // High-Resolution Clocks
     // ----------------------
-    if ( _co.messageType == COTYPE_GPSHR     || 
+    if ( _co.messageType == COTYPE_GPSHR     ||
          _co.messageType == COTYPE_GLONASSHR ) {
     }
@@ -360 +360 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 void RTCM3coDecoder::checkProviderID() {
@@ -385 +385 @@
     _providerID[ii] = newProviderID[ii];
   }
-    
+
   if (alreadySet && different) {
     emit newMessage("RTCM3coDecoder: Provider Changed " + _staID.toAscii() + "\n", true);