Changeset 5911 in ntrip for trunk

Timestamp:

Aug 12, 2014, 3:34:51 PM (10 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/PPP/pppMain.cpp (modified) (3 diffs)

trunk/BNC/src/PPP/pppMain.cpp

@@ -43 +43 @@
 
 #include "pppMain.h"
+#include "pppCrdFile.h"
 #include "bncsettings.h"
 
@@ -211 +212 @@
     }
 
+    // Information from the coordinate file
+    // ------------------------------------
+    string crdFileName(settings.value("PPP/crdFile").toString().toAscii().data());
+    if (!crdFileName.empty()) {
+      vector<t_pppCrdFile::t_staInfo> staInfoVec;
+      t_pppCrdFile::readCrdFile(crdFileName, staInfoVec);
+      for (unsigned ii = 0; ii < staInfoVec.size(); ii++) {
+        const t_pppCrdFile::t_staInfo& staInfo = staInfoVec[ii];
+        if (staInfo._name == opt->_roverName) {
+          opt->_xyzAprRover[0] = staInfo._xyz[0];
+          opt->_xyzAprRover[1] = staInfo._xyz[1];
+          opt->_xyzAprRover[2] = staInfo._xyz[2];
+          opt->_neuEccRover[0] = staInfo._neuAnt[0];
+          opt->_neuEccRover[1] = staInfo._neuAnt[1];
+          opt->_neuEccRover[2] = staInfo._neuAnt[2];
+          opt->_antNameRover   = staInfo._antenna;
+          break;
+        }
+      }
+    }
+
     // Some default values
     // -------------------
@@ -220 +242 @@
     opt->_eleWgtPhase = false;
 
-    //// beg test
-    if (opt->_roverName == "FFMJ1") {
-      opt->_xyzAprRover[0] = 4053455.76;
-      opt->_xyzAprRover[1] =  617729.79;
-      opt->_xyzAprRover[2] = 4869395.80;
-      opt->_antNameRover   = "LEIAR25.R4      LEIT";
-    }
-    //// end test
-
     _options << opt;
   }