Changeset 5838 in ntrip

Timestamp:

Aug 6, 2014, 3:42:49 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• PPP/pppThread.cpp (modified) (1 diff)
• t_prn.cpp (modified) (4 diffs)
• t_prn.h (modified) (2 diffs)

trunk/BNC/src/PPP/pppThread.cpp

@@ -278 +278 @@
       if      (messageType == COTYPE_GPSCOMBINED || messageType == COTYPE_GLONASSCOMBINED ||
                messageType == COTYPE_GPSORBIT    || messageType == COTYPE_GLONASSORBIT    ) {
-        orbCorr.push_back(new t_orbCorr());        
+        t_orbCorr* cc = new t_orbCorr();
+        orbCorr.push_back(cc);
+        cc->_prn.set(corr.prn.toAscii().data());
+        cc->_iod       = corr.iod;
+        cc->_time      = corr.tRao;
+        cc->_system    = 'R';
+        cc->_xr[0]     = corr.rao[0]; 
+        cc->_xr[1]     = corr.rao[1]; 
+        cc->_xr[2]     = corr.rao[2]; 
+        cc->_dotXr[0]  = corr.dotRao[0]; 
+        cc->_dotXr[0]  = corr.dotRao[1]; 
+        cc->_dotXr[0]  = corr.dotRao[2]; 
       }
       else if (messageType == COTYPE_GPSCOMBINED || messageType == COTYPE_GLONASSCOMBINED ||
                messageType == COTYPE_GPSCLOCK    || messageType == COTYPE_GLONASSCLOCK    ) {
-        clkCorr.push_back(new t_clkCorr());        
+        t_clkCorr* cc = new t_clkCorr();
+        clkCorr.push_back(cc);        
+        cc->_prn.set(corr.prn.toAscii().data());
+        cc->_iod         = corr.iod;
+        cc->_time        = corr.tRao;
+        cc->_dClk        = corr.dClk;
+        cc->_dotDClk     = corr.dotDClk;
+        cc->_dotDotDClk  = corr.dotDotDClk;
+        cc->_clkPartial  = 0.0;
       }
     }

trunk/BNC/src/t_prn.cpp

@@ -29 +29 @@
 // Set from string
 ////////////////////////////////////////////////////////////////////////////
-void t_prn::setValue(const std::string& str) {
+void t_prn::set(const std::string& str) {
   unsigned    prn    = 0;
   char        system = '\x0';
@@ -42 +42 @@
   }
   else {
-    throw "t_prn::setValue: wrong satellite ID: " + str;
+    throw "t_prn::set: wrong satellite ID: " + str;
   }
 
@@ -48 +48 @@
   prn = strtol(number, &tmpc, 10);
   if ( tmpc == number || *tmpc != '\x0' ) {
-    throw "t_prn::setValue: wrong satellite ID: " + str;
+    throw "t_prn::set: wrong satellite ID: " + str;
   }
 
   try {
-    this->setValue(system, prn);
+    this->set(system, prn);
   }
   catch (string exc) {
-    throw "t_prn::setValue: wrong satellite ID: " + str;
-  }
-}
-
-void t_prn::setValue(char system, unsigned prn) {
-  _system = system;
-  _number = prn;
-  int maxprn = 0;
-  switch (system) {
-  case 'G': 
-    maxprn = MAXPRN_GPS;     
-    break;
-  case 'R': 
-    maxprn = MAXPRN_GLONASS;    
-    break;
-  default: 
-    throw "t_prn::setValue: wrong satellite system identifier"; 
-    break;
-  }
-  if (_number > maxprn) {
-    ostringstream msg;
-    msg << "wrong satellite ID, system ID: " << system << " number: " << prn;
-    throw "t_prn::setValue: " + msg.str();
+    throw "t_prn::set: wrong satellite ID: " + str;
   }
 }
@@ -97 +75 @@
     str += str2;
   }
-  prn.setValue(str);
+  prn.set(str);
   return in;
 }

trunk/BNC/src/t_prn.h

@@ -16 +16 @@
 
   void        set(char system, int number) {_system = system; _number = number;} 
+  void        set(const std::string& str);
 
   char        system() const {return _system;}
@@ -36 +37 @@
 
  private:
-  void setValue(const std::string& str);
-  void setValue(char system, unsigned prn);
   char _system;
   int  _number;