Changeset 3313 in ntrip for trunk

Timestamp:

Jun 21, 2011, 7:06:25 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bncmodel.cpp (modified) (7 diffs)
• bncmodel.h (modified) (1 diff)

trunk/BNC/bncmodel.cpp

@@ -959 +959 @@
     // --------------
     if (irc == 0) {
-      findMaxRes(vv,satDataGPS, prnCode, maxResCode, prnPhase, maxResPhase);
+      findMaxRes(iPhase, vv,satDataGPS, prnCode, maxResCode, prnPhase, maxResPhase);
       if (maxResCode > MAXRES_CODE_GPS) {
         satDataGPS.remove(prnCode);
@@ -971 +971 @@
     // ------------------
     if (irc == 0) {
-      findMaxRes(vv,satDataGal, prnCode, maxResCode, prnPhase, maxResPhase);
+      findMaxRes(iPhase, vv,satDataGal, prnCode, maxResCode, prnPhase, maxResPhase);
       if (maxResCode > MAXRES_CODE_GAL) {
         satDataGal.remove(prnCode);
@@ -986 +986 @@
     // -------------------
     if (irc == 0) {
-      findMaxRes(vv,satDataGlo, prnCode, maxResCode, prnPhase, maxResPhase);
+      findMaxRes(iPhase, vv,satDataGlo, prnCode, maxResCode, prnPhase, maxResPhase);
       if (maxResPhase > MAXRES_PHASE_GLO) {
         satDataGlo.remove(prnPhase);
@@ -998 +998 @@
     // -------------------
     if (irc == 0) {
-      findMaxRes(vv,satDataGal, prnCode, maxResCode, prnPhase, maxResPhase);
+      findMaxRes(iPhase, vv,satDataGal, prnCode, maxResCode, prnPhase, maxResPhase);
       if      (maxResPhase > MAXRES_PHASE_GAL) {
         satDataGal.remove(prnPhase);
@@ -1010 +1010 @@
     // ---------------
     if (irc == 0) {
-      findMaxRes(vv,satDataGPS, prnCode, maxResCode, prnPhase, maxResPhase);
+      findMaxRes(iPhase, vv,satDataGPS, prnCode, maxResCode, prnPhase, maxResPhase);
       if      (maxResPhase > MAXRES_PHASE_GPS) {
         satDataGPS.remove(prnPhase);
@@ -1264 +1264 @@
 // 
 ///////////////////////////////////////////////////////////////////////////
-void bncModel::findMaxRes(const ColumnVector& vv,
+void bncModel::findMaxRes(int iPhase, const ColumnVector& vv,
                           const QMap<QString, t_satData*>& satData,
                           QString& prnCode,  double& maxResCode, 
@@ -1276 +1276 @@
     it.next();
     t_satData* satData = it.value();
-    if (satData->indexCode) {
-      if (fabs(vv(satData->indexCode)) > maxResCode) {
-        maxResCode = fabs(vv(satData->indexCode));
-        prnCode    = satData->prn;
-      }
-    }
-    if (satData->indexPhase) {
-      if (fabs(vv(satData->indexPhase)) > maxResPhase) {
-        maxResPhase = fabs(vv(satData->indexPhase));
-        prnPhase    = satData->prn;
+    if (iPhase == 0) {
+      if (satData->indexCode) {
+        if (fabs(vv(satData->indexCode)) > maxResCode) {
+          maxResCode = fabs(vv(satData->indexCode));
+          prnCode    = satData->prn;
+        }
+      }
+    }
+    else {
+      if (satData->indexPhase) {
+        if (fabs(vv(satData->indexPhase)) > maxResPhase) {
+          maxResPhase = fabs(vv(satData->indexPhase));
+          prnPhase    = satData->prn;
+        }
       }
     }

trunk/BNC/bncmodel.h

@@ -100 +100 @@
   void   printRes(int iPhase, const ColumnVector& vv, 
                   std::ostringstream& str, t_satData* satData);
-  void   findMaxRes(const ColumnVector& vv,
+  void   findMaxRes(int iPhase, const ColumnVector& vv,
                     const QMap<QString, t_satData*>& satData,
                     QString& prnCode,  double& maxResCode,