Changeset 7523 in ntrip

Timestamp:

Oct 19, 2015, 3:01:57 PM (9 years ago)

Author:

stuerze

Message:

minor changes to add receiver information in sinex troposphere file header

Location:

trunk/BNC/src

Files:

• bncsinextro.cpp (modified) (2 diffs)
• pppCrdFile.cpp (modified) (4 diffs)
• pppCrdFile.h (modified) (1 diff)
• pppMain.cpp (modified) (1 diff)

trunk/BNC/src/bncsinextro.cpp

@@ -85 +85 @@
 
 
-  QString numberOfEpochs = QString("%1").arg(intr/_sampl, 5, 10, QLatin1Char('0'));
+  QString numberOfEpochs = QString("%1").arg(1, 5, 10, QLatin1Char('0'));
   _out << "%=TRO 2.00 BNC " << creationTime.toStdString() << " BNC "
        << startTime.toStdString() << " " << endTime.toStdString() << " P "
@@ -102 +102 @@
   _out << "-SITE/ID" << endl << endl;
 
-
-  _out << "+SITE/RECEIVER" << endl;
-  _out << "*SITE PT SOLN T DATA_START__ DATA_END____ DESCRIPTION_________ S/N__ FIRMWARE___" << endl;
-  _out << " " << _opt->_roverName.substr(0,4) << "  A    1 P "
-       << startTime.toStdString() << " " << endTime.toStdString() << " " << _opt->_recNameRover << endl;
-  _out << "-SITE/RECEIVER" << endl << endl;
-
+  if (!_opt->_recNameRover.empty()) {
+    _out << "+SITE/RECEIVER" << endl;
+    _out << "*SITE PT SOLN T DATA_START__ DATA_END____ DESCRIPTION_________ S/N__ FIRMWARE___" << endl;
+    _out << " " << _opt->_roverName.substr(0,4) << "  A    1 P "
+         << startTime.toStdString() << " " << endTime.toStdString() << " " << _opt->_recNameRover << endl;
+    _out << "-SITE/RECEIVER" << endl << endl;
+  }
 
   _out << "+SITE/ANTENNA" << endl;

trunk/BNC/src/pppCrdFile.cpp

@@ -36 +36 @@
  * Created:    29-Jul-2014
  *
- * Changes:    
+ * Changes:
  *
  * -----------------------------------------------------------------------*/
@@ -48 +48 @@
 using namespace BNC_PPP;
 
-// 
+//
 //////////////////////////////////////////////////////////////////////////////
 void t_pppCrdFile::readCrdFile(const string& fileName, vector<t_staInfo>& staInfoVec) {
@@ -61 +61 @@
       continue;
     }
-    
+
     istringstream in;
 
@@ -87 +87 @@
 
     if (!in.eof()) {
-      getline(in, staInfo._antenna);
-      stripWhiteSpace(staInfo._antenna);
+      std::string hlp;
+      getline(in, hlp);
+      stripWhiteSpace(hlp);
+      staInfo._antenna = hlp.substr(0,20);
+      hlp = hlp.erase(0, 20);
+      if (hlp.length()) {
+        stripWhiteSpace(hlp);
+        staInfo._receiver = hlp;
+      }
     }
 

trunk/BNC/src/pppCrdFile.h

@@ -18 +18 @@
     std::string  _name;
     std::string  _antenna;
+    std::string  _receiver;
     ColumnVector _xyz;
     ColumnVector _neuAnt;

trunk/BNC/src/pppMain.cpp

@@ -367 +367 @@
           opt->_neuEccRover[2] = staInfo._neuAnt[2];
           opt->_antNameRover   = staInfo._antenna;
+          opt->_recNameRover   = staInfo._receiver;
           break;
         }