Changeset 7850 in ntrip

Timestamp:

Mar 29, 2016, 5:05:04 PM (8 years ago)

Author:

stuerze

Message:

minor changes regareding string processing

Location:

trunk/BNC/src

Files:

• RTCM3/RTCM3Decoder.cpp (modified) (5 diffs)
• RTCM3/RTCM3coDecoder.cpp (modified) (2 diffs)
• pppCrdFile.cpp (modified) (1 diff)
• pppMain.cpp (modified) (2 diffs)

trunk/BNC/src/RTCM3/RTCM3Decoder.cpp

@@ -134 +134 @@
     /* L1 */
     GETBITS(code, 1);
-    frqObs->_rnxType2ch = code ? "1W" : "1C";
+    (code) ? frqObs->_rnxType2ch.assign("1W") : frqObs->_rnxType2ch.assign("1C");
     GETBITS(l1range, 24);
     GETBITSSIGN(i, 20);
@@ -168 +168 @@
       switch(code)
       {
-      case 3: frqObs->_rnxType2ch = "2W"; /* or "2Y"? */ break;
-      case 2: frqObs->_rnxType2ch = "2W"; break;
-      case 1: frqObs->_rnxType2ch = "2P"; break;
-      case 0: frqObs->_rnxType2ch = "2X"; /* or "2S" or "2L"? */ break;
+      case 3: frqObs->_rnxType2ch.assign("2W"); /* or "2Y"? */ break;
+      case 2: frqObs->_rnxType2ch.assign("2W"); break;
+      case 1: frqObs->_rnxType2ch.assign("2P"); break;
+      case 0: frqObs->_rnxType2ch.assign("2X"); /* or "2S" or "2L"? */ break;
       }
       GETBITSSIGN(i,14);
@@ -702 +702 @@
           {
             t_frqObs *frqObs = new t_frqObs;
-            frqObs->_rnxType2ch = cd.code;
+            frqObs->_rnxType2ch.assign(cd.code);
 
             switch(type % 10)
@@ -894 +894 @@
     t_frqObs *frqObs = new t_frqObs;
     /* L1 */
-    frqObs->_rnxType2ch = code ? "1P" : "1C";
+    (code) ? frqObs->_rnxType2ch.assign("1P") : frqObs->_rnxType2ch.assign("1C");
     GETBITS(l1range, 25);
     GETBITSSIGN(i, 20);
@@ -928 +928 @@
       switch(code)
       {
-      case 3: frqObs->_rnxType2ch = "2P"; break;
-      case 2: frqObs->_rnxType2ch = "2P"; break;
-      case 1: frqObs->_rnxType2ch = "2P"; break;
-      case 0: frqObs->_rnxType2ch = "2C"; break;
+      case 3: frqObs->_rnxType2ch.assign("2P"); break;
+      case 2: frqObs->_rnxType2ch.assign("2P"); break;
+      case 1: frqObs->_rnxType2ch.assign("2P"); break;
+      case 0: frqObs->_rnxType2ch.assign("2C"); break;
       }
       GETBITSSIGN(i,14);

trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp

@@ -393 +393 @@
       const CodeBias::BiasSat::CodeBiasEntry& biasEntry = _codeBias.Sat[ii].Biases[jj];
       t_frqCodeBias frqCodeBias;
-      frqCodeBias._rnxType2ch = codeTypeToRnxType(sysCh, biasEntry.Type);
+      frqCodeBias._rnxType2ch.assign(codeTypeToRnxType(sysCh, biasEntry.Type));
       frqCodeBias._value      = biasEntry.Bias;
       if (!frqCodeBias._rnxType2ch.empty()) {
@@ -450 +450 @@
       const PhaseBias::PhaseBiasSat::PhaseBiasEntry& biasEntry = _phaseBias.Sat[ii].Biases[jj];
       t_frqPhaseBias frqPhaseBias;
-      frqPhaseBias._rnxType2ch           = codeTypeToRnxType(sysCh, biasEntry.Type);
+      frqPhaseBias._rnxType2ch.assign(codeTypeToRnxType(sysCh, biasEntry.Type));
       frqPhaseBias._value                = biasEntry.Bias;
       frqPhaseBias._fixIndicator         = biasEntry.SignalIntegerIndicator;

trunk/BNC/src/pppCrdFile.cpp

@@ -90 +90 @@
       getline(in, hlp);
       stripWhiteSpace(hlp);
-      staInfo._antenna = hlp.substr(0,20);
+      staInfo._antenna.assign( hlp.substr(0,20));
       hlp = hlp.erase(0, 20);
       if (hlp.length()) {

trunk/BNC/src/pppMain.cpp

@@ -156 +156 @@
 
     if (_realTime) {
-      opt->_corrMount = settings.value("PPP/corrMount").toString().toAscii().data();
+      opt->_corrMount.assign(settings.value("PPP/corrMount").toString().toStdString());
     }
     else {
-      opt->_rinexObs = settings.value("PPP/rinexObs").toString().toAscii().data();
-      opt->_rinexNav = settings.value("PPP/rinexNav").toString().toAscii().data();
-      opt->_corrFile = settings.value("PPP/corrFile").toString().toAscii().data();
-    }
-
-    opt->_crdFile       = settings.value("PPP/crdFile").toString().toAscii().data();
-    opt->_antexFileName = settings.value("PPP/antexFile").toString().toAscii().data();
+      opt->_rinexObs.assign(settings.value("PPP/rinexObs").toString().toStdString());
+      opt->_rinexNav.assign(settings.value("PPP/rinexNav").toString().toStdString());
+      opt->_corrFile.assign(settings.value("PPP/corrFile").toString().toStdString());
+    }
+
+    opt->_crdFile.assign(settings.value("PPP/crdFile").toString().toStdString());
+    opt->_antexFileName.assign(settings.value("PPP/antexFile").toString().toStdString());
 
     opt->_sigmaC1      = settings.value("PPP/sigmaC1").toDouble(); if (opt->_sigmaC1 <= 0.0) opt->_sigmaC1 =  2.0;
@@ -353 +353 @@
     // Information from the coordinate file
     // ------------------------------------
-    string crdFileName(settings.value("PPP/crdFile").toString().toAscii().data());
+    string crdFileName(settings.value("PPP/crdFile").toString().toStdString());
     if (!crdFileName.empty()) {
       vector<t_pppCrdFile::t_staInfo> staInfoVec;