Changeset 10564 in ntrip

Timestamp:

Oct 9, 2024, 5:30:29 PM (2 weeks ago)

Author:

stuerze

Message:

minor changes

File:

• trunk/BNC/src/bncgetthread.cpp (modified) (2 diffs)

trunk/BNC/src/bncgetthread.cpp

@@ -870 +870 @@
             str << " " << rnxTypes[iType];
           }
-          emit(newMessage(_staID + ": Observation Types: " + msg.toLatin1(),
-              true));
+          emit(newMessage(_staID + ": Observation Types: " + msg.toLatin1(),  true));
         }
       }
@@ -941 +940 @@
         }
       }
-      // Service CRS
-      // -----------
-      for (int ii = 0; ii < decoder()->_serviceCrs.size(); ii++) {
-        QString servicecrsname  = QString(": Service CRS Name: %1 ").arg(decoder()->_serviceCrs[ii]._name);
-        QString coordinateEpoch = QString(": Service CRS Coordinate Epoch: %1 ").arg(decoder()->_serviceCrs[ii]._coordinateEpoch);
-        //QString ce = QString(": CE: %1 ").arg(decoder()->_serviceCrs[ii]._CE);
-        emit(newMessage(_staID + servicecrsname.toLatin1(), true));
-        emit(newMessage(_staID + coordinateEpoch.toLatin1(), true));
-        //emit(newMessage(_staID + ce.toLatin1(), true));
-      }
-
-      // RTCM CRS
-      // -----------
-      for (int ii = 0; ii < decoder()->_rtcmCrs.size(); ii++) {
-        QString rtcmcrsname = QString(": RTCM CRS Name: %1 ").arg(decoder()->_rtcmCrs[ii]._name);
-        QString anchor      = QString(": RTCM CRS Anchor: %1 ").arg(decoder()->_rtcmCrs[ii]._anchor);
-        QString platenumber = QString(": RTCM CRS Plate Number: %1 ").arg(decoder()->_rtcmCrs[ii]._plateNumber);
-        emit(newMessage(_staID + rtcmcrsname.toLatin1(), true));
-        emit(newMessage(_staID + anchor.toLatin1(), true));
-        emit(newMessage(_staID + platenumber.toLatin1(), true));
-        for (int i = 0; i<decoder()->_rtcmCrs[ii]._databaseLinks.size(); i++) {
-          QString dblink = QString(": Database Link: %1 ").arg(decoder()->_rtcmCrs[ii]._databaseLinks[i]);
-          emit(newMessage(_staID + dblink.toLatin1(), true));
-        }
-      }
-
-      // Helmert Parameters
-      //-------------------
-      for (int ii = 0; ii < decoder()->_helmertPar.size(); ii++) {
-        t_helmertPar& helmertPar = decoder()->_helmertPar[ii];
-        bncTime t; t.setmjd(0, helmertPar._mjd); QString dateStr = QString::fromStdString(t.datestr());
-        QString sourcename  = QString(": MT1301 Source Name: %1 ").arg(helmertPar._sourceName);
-        QString targetname  = QString(": MT1301 Target Name: %1 ").arg(helmertPar._targetName);
-        QString sysidentnum = QString(": MT1301 Sys Ident Num: %1 ").arg(helmertPar._sysIdentNum);
-        QString trafomessageind = QString(": MT1301 Trafo Ident Num: %1 ").arg(helmertPar.IndtoString());
-        QString epoch = QString(": MT1301 t0: MJD %1 (%2) ").arg(helmertPar._mjd).arg(dateStr);
-        QString partrans = QString(": MT1301 Helmert Par Trans: dx = %1, dy = %2, dz = %3, dxr = %4, dyr = %5, dzr = %6")
-            .arg(helmertPar._dx).arg(helmertPar._dy).arg(helmertPar._dz)
-            .arg(helmertPar._dxr).arg(helmertPar._dyr).arg(helmertPar._dzr);
-        QString parrot = QString(": MT1301 Helmert Par Rot: ox = %1, oy = %2, oz = %3, oxr = %4, oyr = %5, ozr = %6")
-            .arg(helmertPar._ox).arg(helmertPar._oy).arg(helmertPar._oz)
-            .arg(helmertPar._oxr).arg(helmertPar._oyr).arg(helmertPar._ozr);
-        QString parscale = QString(": MT1301 Helmert Par Scale: sc = %1, scr = %2").arg(helmertPar._sc).arg(helmertPar._scr);
-        emit(newMessage(_staID + sourcename.toLatin1(), true));
-        emit(newMessage(_staID + targetname.toLatin1(), true));
-        emit(newMessage(_staID + sysidentnum.toLatin1(), true));
-        emit(newMessage(_staID + trafomessageind.toLatin1(), true));
-        emit(newMessage(_staID + epoch.toLatin1(), true));
-        emit(newMessage(_staID + partrans.toLatin1(), true));
-        emit(newMessage(_staID + parrot.toLatin1(), true));
-        emit(newMessage(_staID + parscale.toLatin1(), true));
+      if (fmod(decoder()->corrGPSEpochTime(), 60.0) == 0.0) {
+        // Service CRS
+        // -----------
+        for (int ii = 0; ii < decoder()->_serviceCrs.size(); ii++) {
+          QString servicecrsname  = QString(": Service CRS Name: %1 ").arg(decoder()->_serviceCrs[ii]._name);
+          QString coordinateEpoch = QString(": Service CRS Coordinate Epoch: %1 ").arg(decoder()->_serviceCrs[ii]._coordinateEpoch);
+          //QString ce = QString(": CE: %1 ").arg(decoder()->_serviceCrs[ii]._CE);
+          emit(newMessage(_staID + servicecrsname.toLatin1(), true));
+          emit(newMessage(_staID + coordinateEpoch.toLatin1(), true));
+          //emit(newMessage(_staID + ce.toLatin1(), true));
+        }
+
+        // RTCM CRS
+        // -----------
+        for (int ii = 0; ii < decoder()->_rtcmCrs.size(); ii++) {
+          QString rtcmcrsname = QString(": RTCM CRS Name: %1 ").arg(decoder()->_rtcmCrs[ii]._name);
+          QString anchor      = QString(": RTCM CRS Anchor: %1 ").arg(decoder()->_rtcmCrs[ii]._anchor);
+          QString platenumber = QString(": RTCM CRS Plate Number: %1 ").arg(decoder()->_rtcmCrs[ii]._plateNumber);
+          emit(newMessage(_staID + rtcmcrsname.toLatin1(), true));
+          emit(newMessage(_staID + anchor.toLatin1(), true));
+          emit(newMessage(_staID + platenumber.toLatin1(), true));
+          for (int i = 0; i<decoder()->_rtcmCrs[ii]._databaseLinks.size(); i++) {
+            QString dblink = QString(": Database Link: %1 ").arg(decoder()->_rtcmCrs[ii]._databaseLinks[i]);
+            emit(newMessage(_staID + dblink.toLatin1(), true));
+          }
+        }
+
+        // Helmert Parameters
+        //-------------------
+        for (int ii = 0; ii < decoder()->_helmertPar.size(); ii++) {
+          t_helmertPar& helmertPar = decoder()->_helmertPar[ii];
+          bncTime t; t.setmjd(0, helmertPar._mjd); QString dateStr = QString::fromStdString(t.datestr());
+          QString sourcename  = QString(": MT1301 Source Name: %1 ").arg(helmertPar._sourceName);
+          QString targetname  = QString(": MT1301 Target Name: %1 ").arg(helmertPar._targetName);
+          QString sysidentnum = QString(": MT1301 Sys Ident Num: %1 ").arg(helmertPar._sysIdentNum);
+          QString trafomessageind = QString(": MT1301 Trafo Ident Num: %1 ").arg(helmertPar.IndtoString());
+          QString epoch = QString(": MT1301 t0: MJD %1 (%2) ").arg(helmertPar._mjd).arg(dateStr);
+          QString partrans = QString(": MT1301 Helmert Par Trans: dx = %1, dy = %2, dz = %3, dxr = %4, dyr = %5, dzr = %6")
+              .arg(helmertPar._dx).arg(helmertPar._dy).arg(helmertPar._dz)
+              .arg(helmertPar._dxr).arg(helmertPar._dyr).arg(helmertPar._dzr);
+          QString parrot = QString(": MT1301 Helmert Par Rot: ox = %1, oy = %2, oz = %3, oxr = %4, oyr = %5, ozr = %6")
+              .arg(helmertPar._ox).arg(helmertPar._oy).arg(helmertPar._oz)
+              .arg(helmertPar._oxr).arg(helmertPar._oyr).arg(helmertPar._ozr);
+          QString parscale = QString(": MT1301 Helmert Par Scale: sc = %1, scr = %2").arg(helmertPar._sc).arg(helmertPar._scr);
+          emit(newMessage(_staID + sourcename.toLatin1(), true));
+          emit(newMessage(_staID + targetname.toLatin1(), true));
+          emit(newMessage(_staID + sysidentnum.toLatin1(), true));
+          emit(newMessage(_staID + trafomessageind.toLatin1(), true));
+          emit(newMessage(_staID + epoch.toLatin1(), true));
+          emit(newMessage(_staID + partrans.toLatin1(), true));
+          emit(newMessage(_staID + parrot.toLatin1(), true));
+          emit(newMessage(_staID + parscale.toLatin1(), true));
+        }
       }
     }