Changeset 9785 in ntrip for trunk/BNC/src/ephemeris.cpp

Timestamp:

Jun 29, 2022, 12:03:05 PM (22 months ago)

Author:

stuerze

Message:

 

File:

• trunk/BNC/src/ephemeris.cpp (modified) (5 diffs)

trunk/BNC/src/ephemeris.cpp

@@ -1700 +1700 @@
     else if ( iLine == 5 ) {
       if ( readDbl(line, pos[0], fieldLen, _IDOT    ) ||
-           readDbl(line, pos[2], fieldLen, _TOEweek)) {
+           readDbl(line, pos[2], fieldLen, _BDTweek)) {
         _checkState = bad;
         return;
@@ -1732 +1732 @@
   }
 
-  _TOE.setBDS(int(_TOEweek), _TOEsec);
+  _TOE.setBDS(int(_BDTweek), _TOEsec);
 
   // remark: actually should be computed from second_tot
@@ -1940 +1940 @@
     .arg(_sqrt_A, 19, 'e', 12);
 
-  double toes = 0.0;
-  if (_TOEweek > -1.0) {// RINEX input
-    toes = _TOEsec;
-  }
-  else {// RTCM stream input
-    toes = _TOE.bdssec();
-  }
-  out << QString(fmt)
-    .arg(toes,    19, 'e', 12)
+  out << QString(fmt)
+    .arg(_TOEsec, 19, 'e', 12)
     .arg(_Cic,    19, 'e', 12)
     .arg(_OMEGA0, 19, 'e', 12)
@@ -1959 +1952 @@
     .arg(_OMEGADOT, 19, 'e', 12);
 
-  double toew = 0.0;
-  if (_TOEweek > -1.0) {// RINEX input
-    toew = _TOEweek;
-  }
-  else {// RTCM stream input
-    toew = double(_TOE.bdsw());
-  }
-  out << QString(fmt)
-    .arg(_IDOT, 19, 'e', 12)
-    .arg(0.0,   19, 'e', 12)
-    .arg(toew,  19, 'e', 12)
-    .arg(0.0,   19, 'e', 12);
+  out << QString(fmt)
+    .arg(_IDOT,    19, 'e', 12)
+    .arg(0.0,      19, 'e', 12)
+    .arg(_BDTweek, 19, 'e', 12)
+    .arg(0.0,      19, 'e', 12);
 
   out << QString(fmt)
@@ -1979 +1965 @@
 
   double tots = 0.0;
-  if (_TOEweek > -1.0) {// RINEX input
+  if (_receptDateTime.isValid()) {// RTCM stream input
+    tots = _TOE.bdssec();
+  }
+  else { // RINEX input
     tots = _TOT;
-  }
-  else {// RTCM stream input
-    tots = _TOE.bdssec();
   }
   out << QString(fmt)