Changeset 6175 in ntrip

Timestamp:

Sep 14, 2014, 2:17:38 PM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• RTCM3/RTCM3coDecoder.cpp (modified) (1 diff)
• bnccore.cpp (modified) (2 diffs)
• satObs.cpp (modified) (2 diffs)
• satObs.h (modified) (2 diffs)

trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp

@@ -349 +349 @@
     while (itOrb.hasNext()) {
       const t_orbCorr& orbCorr = itOrb.next();
-      *_out << "O " << orbCorr.toString() << endl;
+      *_out << orbCorr.toLine() << endl;
     }
     QListIterator<t_clkCorr> itClk(clkCorrections);
     while (itClk.hasNext()) {
       const t_clkCorr& clkCorr = itClk.next();
-      *_out << "C " << clkCorr.toString() << endl;
+      *_out << clkCorr.toLine() << endl;
     }
     _out->flush();

trunk/BNC/src/bnccore.cpp

@@ -640 +640 @@
         QTcpSocket* sock = is.next();
         if (sock->state() == QAbstractSocket::ConnectedState) {
-          if (sock->write(corr.toString().c_str()) == -1) {
+          if (sock->write(corr.toLine().c_str()) == -1) {
             delete sock;
             is.remove();
@@ -667 +667 @@
         QTcpSocket* sock = is.next();
         if (sock->state() == QAbstractSocket::ConnectedState) {
-          if (sock->write(corr.toString().c_str()) == -1) {
+          if (sock->write(corr.toLine().c_str()) == -1) {
             delete sock;
             is.remove();

trunk/BNC/src/satObs.cpp

@@ -15 +15 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-t_clkCorr::t_clkCorr(const string& str) {
+t_clkCorr::t_clkCorr(const string& line) {
 }
 
 // 
 ////////////////////////////////////////////////////////////////////////////
-string t_clkCorr::toString() const {
+string t_clkCorr::toLine() const {
   return "CLK";
 }
@@ -35 +35 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-t_orbCorr::t_orbCorr(const string& str) {
+t_orbCorr::t_orbCorr(const string& line) {
 }
 
 // 
 ////////////////////////////////////////////////////////////////////////////
-string t_orbCorr::toString() const {
+string t_orbCorr::toLine() const {
   return "ORB";
 }

trunk/BNC/src/satObs.h

@@ -60 +60 @@
  public:
   t_orbCorr();
-  t_orbCorr(const std::string& str);
+  t_orbCorr(const std::string& line);
   t_prn          prn() const {return _prn;}
   unsigned short IOD() const {return _iod;}
-  std::string    toString() const;
+  std::string    toLine() const;
   std::string    _staID;
   t_prn          _prn;
@@ -76 +76 @@
  public:
   t_clkCorr();
-  t_clkCorr(const std::string& str);
+  t_clkCorr(const std::string& line);
   t_prn          prn() const {return _prn;}
   unsigned short IOD() const {return _iod;}
-  std::string    toString() const;
+  std::string    toLine() const;
   std::string    _staID;
   t_prn          _prn;