Changeset 7478 in ntrip for trunk/BNC/src/rinex

Timestamp:

Sep 29, 2015, 1:08:33 PM (9 years ago)

Author:

stuerze

Message:

minor changes regarding rinexV3 writing

File:

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

trunk/BNC/src/rinex/rnxobsfile.cpp

@@ -1349 +1349 @@
   QString dateStr;
   QTextStream(&dateStr) << QString("> %1 %2 %3 %4 %5%6")
-    .arg(year,  4)
-    .arg(month, 2, 10, QChar('0'))
-    .arg(day,   2, 10, QChar('0'))
-    .arg(hour,  2, 10, QChar('0'))
-    .arg(min,   2, 10, QChar('0'))
-    .arg(sec,  11, 'f', 7);
+      .arg(year, 4)
+      .arg(month, 2, 10, QChar('0'))
+      .arg(day, 2, 10, QChar('0'))
+      .arg(hour, 2, 10, QChar('0'))
+      .arg(min, 2, 10, QChar('0'))
+      .arg(sec, 11, 'f', 7);
 
   int flag = 0;
@@ -1361 +1361 @@
   for (unsigned iSat = 0; iSat < epo->rnxSat.size(); iSat++) {
     const t_rnxSat& rnxSat = epo->rnxSat[iSat];
-    char            sys    = rnxSat.prn.system();
+    char sys = rnxSat.prn.system();
 
     const t_rnxObs* hlp[header.nTypes(sys)];
@@ -1373 +1373 @@
       while (itObs.hasNext()) {
         itObs.next();
-        const QString&  type   = itObs.key();
+        const QString& type = itObs.key();
         const t_rnxObs& rnxObs = itObs.value();
         if (typeV3 == type2to3(sys, type) && rnxObs.value != 0.0) {
@@ -1385 +1385 @@
       while (itObs.hasNext()) {
         itObs.next();
-        const QString&  type   = itObs.key();
+        const QString& type = itObs.key();
         const t_rnxObs& rnxObs = itObs.value();
         if (hlp[iTypeV3] == 0 && typeV3 == type2to3(sys, type).left(2) && rnxObs.value != 0.0) {
@@ -1393 +1393 @@
     }
 
-    *stream << rnxSat.prn.toString().c_str();
-
-    for (int iTypeV3 = 0; iTypeV3 < header.nTypes(sys); iTypeV3++) {
-      const t_rnxObs* rnxObs = hlp[iTypeV3];
-      if (rnxObs == 0) {
-        *stream << QString().leftJustified(16);
-      }
-      else {
-        *stream << QString("%1").arg(rnxObs->value, 14, 'f', 3);
-        if (rnxObs->lli != 0.0) {
-          *stream << QString("%1").arg(rnxObs->lli,1);
+    if (header.nTypes(sys)) {
+      *stream << rnxSat.prn.toString().c_str();
+      for (int iTypeV3 = 0; iTypeV3 < header.nTypes(sys); iTypeV3++) {
+        const t_rnxObs* rnxObs = hlp[iTypeV3];
+        if (rnxObs == 0) {
+          *stream << QString().leftJustified(16);
         }
         else {
-          *stream << ' ';
-        }
-        if (rnxObs->snr != 0.0) {
-          *stream << QString("%1").arg(rnxObs->snr,1);
-        }
-        else {
-          *stream << ' ';
-        }
-      }
-    }
-    *stream << endl;
+          *stream << QString("%1").arg(rnxObs->value, 14, 'f', 3);
+          if (rnxObs->lli != 0.0) {
+            *stream << QString("%1").arg(rnxObs->lli, 1);
+          }
+          else {
+            *stream << ' ';
+          }
+          if (rnxObs->snr != 0.0) {
+            *stream << QString("%1").arg(rnxObs->snr, 1);
+          }
+          else {
+            *stream << ' ';
+          }
+        }
+      }
+      *stream << endl;
+    }
   }
 }