Changeset 5742 in ntrip for trunk/BNC/src/rinex

Timestamp:

Aug 2, 2014, 4:23:36 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/rinex

Files:

• rnxobsfile.cpp (modified) (3 diffs)
• rnxobsfile.h (modified) (3 diffs)

trunk/BNC/src/rinex/rnxobsfile.cpp

@@ -59 +59 @@
   _version  = 0.0;
   _interval = 0.0;
-  for (unsigned iPrn = 1; iPrn <= MAXPRN_GPS; iPrn++) {
+  for (unsigned iPrn = 1; iPrn <= t_prn::MAXPRN_GPS; iPrn++) {
     _wlFactorsL1[iPrn] = 1;
     _wlFactorsL2[iPrn] = 1;
@@ -125 +125 @@
       in >> wlFactL1 >> wlFactL2 >> numSat;
       if (numSat == 0) {
-        for (unsigned iPrn = 1; iPrn <= MAXPRN_GPS; iPrn++) {
+        for (unsigned iPrn = 1; iPrn <= t_prn::MAXPRN_GPS; iPrn++) {
           _wlFactorsL1[iPrn] = wlFactL1;
           _wlFactorsL2[iPrn] = wlFactL2;
@@ -750 +750 @@
   _header._receiverVersion = header._receiverVersion;
 
-  for (unsigned iPrn = 1; iPrn <= MAXPRN_GPS; iPrn++) {
+  for (unsigned iPrn = 1; iPrn <= t_prn::MAXPRN_GPS; iPrn++) {
     _header._wlFactorsL1[iPrn] =  header._wlFactorsL1[iPrn]; 
     _header._wlFactorsL2[iPrn] =  header._wlFactorsL2[iPrn]; 

trunk/BNC/src/rinex/rnxobsfile.h

@@ -35 +35 @@
 #include "bncconst.h"
 #include "bnctime.h"
-
-#define MAXPRN_GPS 32
+#include "t_prn.h"
 
 class t_rnxObsHeader {
@@ -72 +71 @@
   QVector<QString>              _obsTypesV2;
   QMap<char, QVector<QString> > _obsTypesV3;
-  int                           _wlFactorsL1[MAXPRN_GPS+1];
-  int                           _wlFactorsL2[MAXPRN_GPS+1];
+  int                           _wlFactorsL1[t_prn::MAXPRN_GPS+1];
+  int                           _wlFactorsL2[t_prn::MAXPRN_GPS+1];
   bncTime                       _startTime;
 };
@@ -132 +131 @@
   t_rnxEpo* nextEpoch(); 
   int wlFactorL1(unsigned iPrn) {
-    return iPrn <= MAXPRN_GPS ? _header._wlFactorsL1[iPrn] : 1;
+    return iPrn <= t_prn::MAXPRN_GPS ? _header._wlFactorsL1[iPrn] : 1;
   }
   int wlFactorL2(unsigned iPrn) {
-    return iPrn <= MAXPRN_GPS ? _header._wlFactorsL2[iPrn] : 1;
+    return iPrn <= t_prn::MAXPRN_GPS ? _header._wlFactorsL2[iPrn] : 1;
   }