Changeset 9865 in ntrip for trunk/BNC/src

Timestamp:

Oct 31, 2022, 9:49:34 PM (2 years ago)

Author:

stuerze

Message:

minor changes

Location:

trunk/BNC/src

Files:

• bncgetthread.cpp (modified) (2 diffs)
• orbComp/sp3Comp.cpp (modified) (6 diffs)

trunk/BNC/src/bncgetthread.cpp

@@ -796 +796 @@
       for (int ii = 0; ii < decoder()->_typeList.size(); ii++) {
         QString type = QString("%1 ").arg(decoder()->_typeList[ii]);
-        emit(newMessage(_staID + ": Received message type " + type.toLatin1(),
-            true));
+        emit(newMessage(_staID + ": Received message type " + type.toLatin1(), true));
       }
 
@@ -803 +802 @@
       // -----------------------
       for (int ii = 0; ii < decoder()->_obsList.size(); ii++) {
-        t_satObs& obs = decoder()->_obsList[ii];
+        t_satObs& obs = decoder()->_obsList[ii]; 
         QVector<QString>& rnxTypes = _rnxTypes[obs._prn.system()];
         bool allFound = true;

trunk/BNC/src/orbComp/sp3Comp.cpp

@@ -84 +84 @@
   }
   if (!_log) {
-    *_log  << "ERROR: SP3Comp requires logfile specification" << endl;
+    *_log  << "ERROR: SP3Comp requires logfile specification" << "\n";
     goto exit;
   }
 
   for (int ii = 0; ii < _sp3FileNames.size(); ii++) {
-    *_log << "! SP3 File " << ii+1 << ": " << _sp3FileNames[ii] << endl;
+    *_log << "! SP3 File " << ii+1 << ": " << _sp3FileNames[ii] << "\n";
   }
   if (_sp3FileNames.size() != 2) {
-    *_log << "ERROR: sp3Comp requires two input SP3 files" << endl;
+    *_log << "ERROR: sp3Comp requires two input SP3 files" << "\n";
     goto end;
   }
@@ -102 +102 @@
   }
   catch (const string& error) {
-    *_log << "ERROR: " << error.c_str() << endl;
+    *_log << "ERROR: " << error.c_str() << "\n";
   }
   catch (const char* error) {
-    *_log << "ERROR: " << error << endl;
+    *_log << "ERROR: " << error << "\n";
   }
   catch (Exception& exc) {
-    *_log << "ERROR: " << exc.what() << endl;
+    *_log << "ERROR: " << exc.what() << "\n";
   }
   catch (std::exception& exc) {
-    *_log << "ERROR: " << exc.what() << endl;
+    *_log << "ERROR: " << exc.what() << "\n";
   }
   catch (QString error) {
-    *_log << "ERROR: " << error << endl;
+    *_log << "ERROR: " << error << "\n";
   }
   catch (...) {
-    *_log << "ERROR: " << "unknown exception" << endl;
+    *_log << "ERROR: " << "unknown exception" << "\n";
   }
 
@@ -347 +347 @@
 
   out.setf(ios::fixed);
-  out << "!\n!  MJD       PRN  radial   along   out        clk    clkRed   iPRN"
-           "\n! ----------------------------------------------------------------\n";
+  out << "!\n!  Epoch                PRN  radial   along   out        clk    clkRed   iPRN"
+          "\n! ----------------------------------------------------------------------------\n";
   for (unsigned ii = 0; ii < epochs.size(); ii++) {
     const t_epoch* epo = epochs[ii];
@@ -357 +357 @@
       if (!excludeSat(prn)) {
         const ColumnVector& rao = it->second;
-        out << setprecision(6) << epo->_tt.mjddec() << ' ' << prn.toString() << ' '
+        out << setprecision(6) << string(epo->_tt) << ' ' << prn.toString() << ' '
             << setw(7) << setprecision(4) << rao[0] << ' '
             << setw(7) << setprecision(4) << rao[1] << ' '
@@ -380 +380 @@
           out << "  .       .    ";
         }
-        out << "    " << setw(2) << int(prn) << endl;
+        out << "    " << setw(2) << int(prn) << "\n";
       }
     }
@@ -421 +421 @@
         out << "  .       .    ";
       }
-      out << endl;
+      out << "\n";
     }
   }