Changeset 7848 in ntrip

Timestamp:

Mar 18, 2016, 5:46:42 PM (8 years ago)

Author:

stuerze

Message:

minor format changes regarding PCO info in sinex tro header

Location:

trunk/BNC/src

Files:

• bncantex.cpp (modified) (1 diff)
• bncsinextro.cpp (modified) (2 diffs)

trunk/BNC/src/bncantex.cpp

@@ -95 +95 @@
 
   if (antName.find("NULLANTENNA") != string::npos) {
-    return QString();
+    return QString(" ------ ------ ------");
   }
 
   QString antNameQ = antName.c_str();
-
   if (_maps.find(antNameQ) == _maps.end()) {
-    return QString();
+    return QString(" ------ ------ ------");
   }
 
   t_antMap* map = _maps[antNameQ];
   if (map->frqMap.find(frqType) == map->frqMap.end()) {
-    return QString();
+    return QString(" ------ ------ ------");
   }
 
   t_frqMap* frqMap = map->frqMap[frqType];
 
-  return QString(" %1 %2 %3").arg(frqMap->neu[2], 6, 'f', 4)
-                             .arg(frqMap->neu[0], 6, 'f', 4)
-                             .arg(frqMap->neu[1], 6, 'f', 4);
+  QString u, n,e;
+  u.sprintf("%+6.4f" ,frqMap->neu[2]); if (u.mid(1,1) == "0") {u.remove(1,1);}
+  n.sprintf("%+6.4f" ,frqMap->neu[0]); if (n.mid(1,1) == "0") {n.remove(1,1);}
+  e.sprintf("%+6.4f" ,frqMap->neu[1]); if (e.mid(1,1) == "0") {e.remove(1,1);}
+
+  return QString(" %1 %2 %3").arg(u).arg(n).arg(e);
 }
 

trunk/BNC/src/bncsinextro.cpp

@@ -158 +158 @@
            << _antex->pcoSinexString(_opt->_antNameRover, t_frequency::G1).toStdString()
            << _antex->pcoSinexString(_opt->_antNameRover, t_frequency::G2).toStdString()
+           <<  " ---------"
         << endl;
       _out << "-SITE/GPS_PHASE_CENTER" << endl << endl;
@@ -169 +170 @@
            << _antex->pcoSinexString(_opt->_antNameRover, t_frequency::R1).toStdString()
            << _antex->pcoSinexString(_opt->_antNameRover, t_frequency::R2).toStdString()
+           <<  " ---------"
         << endl;
       _out << "-SITE/GLONASS_PHASE_CENTER" << endl << endl;