Changeset 5838 in ntrip for trunk/BNC/src/t_prn.cpp

Timestamp:

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

Author:

mervart

Message:

 

File:

• trunk/BNC/src/t_prn.cpp (modified) (4 diffs)

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;
 }