Changeset 6507 in ntrip

Timestamp:

Dec 29, 2014, 3:32:28 PM (9 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/satObs.cpp (modified) (14 diffs)

trunk/BNC/src/satObs.cpp

@@ -19 +19 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void t_clkCorr::writeEpoch(std::ostream* out, const QList<t_clkCorr>& corrList) {
+void t_clkCorr::writeEpoch(ostream* out, const QList<t_clkCorr>& corrList) {
   if (!out || corrList.size() == 0) {
     return;
@@ -43 +43 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void t_clkCorr::readEpoch(const string& epoLine, std::istream& in, QList<t_clkCorr>& corrList) {
+void t_clkCorr::readEpoch(const string& epoLine, istream& inStream, QList<t_clkCorr>& corrList) {
   bncTime epoTime;
   int     numCorr;
@@ -54 +54 @@
 
     string line;
-    getline(in, line);
+    getline(inStream, line);
     istringstream in(line.c_str());
     
@@ -74 +74 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void t_orbCorr::writeEpoch(std::ostream* out, const QList<t_orbCorr>& corrList) {
+void t_orbCorr::writeEpoch(ostream* out, const QList<t_orbCorr>& corrList) {
   if (!out || corrList.size() == 0) {
     return;
@@ -101 +101 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void t_orbCorr::readEpoch(const string& epoLine, std::istream& in, QList<t_orbCorr>& corrList) {
+void t_orbCorr::readEpoch(const string& epoLine, istream& inStream, QList<t_orbCorr>& corrList) {
   bncTime epoTime;
   int     numCorr;
@@ -112 +112 @@
 
     string line;
-    getline(in, line);
+    getline(inStream, line);
     istringstream in(line.c_str());
     
@@ -125 +125 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void t_satCodeBias::writeEpoch(std::ostream* out, const QList<t_satCodeBias>& biasList) {
+void t_satCodeBias::writeEpoch(ostream* out, const QList<t_satCodeBias>& biasList) {
   if (!out || biasList.size() == 0) {
     return;
@@ -152 +152 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void t_satCodeBias::readEpoch(const string& epoLine, std::istream& in, QList<t_satCodeBias>& biasList) {
+void t_satCodeBias::readEpoch(const string& epoLine, istream& inStream, QList<t_satCodeBias>& biasList) {
   bncTime epoTime;
   int     numSat;
@@ -163 +163 @@
 
     string line;
-    getline(in, line);
+    getline(inStream, line);
     istringstream in(line.c_str());
     
@@ -182 +182 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void t_satPhaseBias::writeEpoch(std::ostream* out, const QList<t_satPhaseBias>& biasList) {
+void t_satPhaseBias::writeEpoch(ostream* out, const QList<t_satPhaseBias>& biasList) {
   if (!out || biasList.size() == 0) {
     return;
@@ -214 +214 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void t_satPhaseBias::readEpoch(const string& epoLine, std::istream& in, QList<t_satPhaseBias>& biasList) {
+void t_satPhaseBias::readEpoch(const string& epoLine, istream& inStream, QList<t_satPhaseBias>& biasList) {
   bncTime epoTime;
   int     numSat;
@@ -225 +225 @@
 
     string line;
-    getline(in, line);
+    getline(inStream, line);
     istringstream in(line.c_str());
     
@@ -246 +246 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void t_vTec::write(std::ostream* out, const t_vTec& vTec) {
+void t_vTec::write(ostream* out, const t_vTec& vTec) {
   if (!out || vTec._layers.size() == 0) {
     return;
@@ -268 +268 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void t_vTec::read(const string& epoLine, std::istream& in, t_vTec& vTec) {
+void t_vTec::read(const string& epoLine, istream& inStream, t_vTec& vTec) {
+  bncTime epoTime;
+  int     numLayers;
+  string  staID;
+  if (t_corrSSR::readEpoLine(epoLine, epoTime, numLayers, staID) != t_corrSSR::vTec) {
+    return;
+  }
+  if (numLayers <= 0) {
+    return;
+  }
+  for (int ii = 0; ii < numLayers; ii++) {
+    t_vTecLayer layer;
+
+    string line;
+    getline(inStream, line);
+    istringstream in(line.c_str());
+
+    int dummy, maxDeg, maxOrd;
+    in >> dummy >> maxDeg >> maxOrd;
+
+    layer._C.ReSize(maxDeg, maxOrd);
+    layer._S.ReSize(maxDeg, maxOrd);
+
+    ////    inStream >> layer._C >> layer._S;
+
+    vTec._layers.push_back(layer);
+  }
 }