Changeset 214 in ntrip for trunk/BNC

Timestamp:

Oct 6, 2006, 5:12:52 PM (18 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• RTCM/RTCM2.cpp (modified) (3 diffs)
• RTCM/RTCM2.h (modified) (2 diffs)
• bncgetthread.cpp (modified) (1 diff)
• bncutils.cpp (modified) (1 diff)

trunk/BNC/RTCM/RTCM2.cpp

@@ -1059 +1059 @@
 void RTCM2::Decode(char* buffer, int bufLen) {
 
-  rtcm2::RTCM2packet PP;
-  rtcm2::RTCM2_Obs   ObsBlock;
-  
   _buffer.append(buffer, bufLen);
 
@@ -1069 +1066 @@
 
   while(true) {
-    PP.getPacket(_buffer);
-    if (!PP.valid()) break;
-
-    if ( PP.ID()==18 || PP.ID()==19 ) {   
-      ObsBlock.extract(PP);
-      if (!ObsBlock.valid()) continue;
+    _PP.getPacket(_buffer);
+    if (!_PP.valid()) break;
+
+    if ( _PP.ID()==18 || _PP.ID()==19 ) {   
+      _ObsBlock.extract(_PP);
+      if (!_ObsBlock.valid()) continue;
 
       int    epochWeek;
       double epochSecs;
-      ObsBlock.resolveEpoch(refWeek, refSecs, epochWeek, epochSecs);
+      _ObsBlock.resolveEpoch(refWeek, refSecs, epochWeek, epochSecs);
         
-      for (int iSat=0; iSat < ObsBlock.nSat; iSat++) {
-        if (ObsBlock.PRN[iSat] <= 32) {
+      for (int iSat=0; iSat < _ObsBlock.nSat; iSat++) {
+        if (_ObsBlock.PRN[iSat] <= 32) {
           Observation* obs = new Observation();
 
-          obs->SVPRN          = ObsBlock.PRN[iSat];
+          obs->SVPRN          = _ObsBlock.PRN[iSat];
           obs->GPSWeek        = epochWeek;
           obs->GPSWeeks       = (int) epochSecs;
-          obs->sec            = ObsBlock.secs;
+          obs->sec            = _ObsBlock.secs;
           obs->pCodeIndicator = 0;
-          obs->C1 = ObsBlock.rng_C1[iSat];
-          obs->P2 = ObsBlock.rng_P2[iSat];
-          obs->L1 = ObsBlock.resolvedPhase_L1(iSat);
-          obs->L2 = ObsBlock.resolvedPhase_L2(iSat);
+          obs->C1 = _ObsBlock.rng_C1[iSat];
+          obs->P2 = _ObsBlock.rng_P2[iSat];
+          obs->L1 = _ObsBlock.resolvedPhase_L1(iSat);
+          obs->L2 = _ObsBlock.resolvedPhase_L2(iSat);
 
           m_lObsList.push_back(obs);
@@ -1098 +1095 @@
       }
 
-      ObsBlock.clear();
+      _ObsBlock.clear();
     }
   }

trunk/BNC/RTCM/RTCM2.h

@@ -38 +38 @@
 #include <vector>
 
-// ---------------- begin added by LM --------------------------------------
-#include "GPSDecoder.h"
-class RTCM2 : public GPSDecoder {
-  public:
-    RTCM2();
-    ~RTCM2();
-    void Decode(char* buffer = 0, int bufLen = 0);
-  private:
-    string _buffer;
-};
-// ----------------- end added by LM ---------------------------------------
-
 //
 // namespace rtcm2
@@ -337 +325 @@
 }; // End of namespace rtcm2
 
+// ---------------- begin added by LM --------------------------------------
+#include "GPSDecoder.h"
+class RTCM2 : public GPSDecoder {
+  public:
+    RTCM2();
+    ~RTCM2();
+    void Decode(char* buffer = 0, int bufLen = 0);
+  private:
+    string _buffer;
+    rtcm2::RTCM2_Obs   _ObsBlock;
+    rtcm2::RTCM2packet _PP;
+};
+// ----------------- end added by LM ---------------------------------------
+
 #endif  // include blocker

trunk/BNC/bncgetthread.cpp

@@ -83 +83 @@
   hlp.setPath(mountPoint.path());
 
-  if (hlp.path().isEmpty()) {
-    hlp.setPath("/");
-  }
-
-  QByteArray  reqStr = "GET " + hlp.path().toAscii() + 
-                       " HTTP/1.0\r\n"
-                       "User-Agent: NTRIP BNC 1.0\r\n"
-                       "Authorization: Basic " +
-                       userAndPwd.toBase64() + "\r\n\r\n";
+  QByteArray reqStr;
+  if ( proxyHost.isEmpty() ) {
+   if (hlp.path().indexOf("/") != 0) hlp.setPath("/");
+   reqStr = "GET " + hlp.path().toAscii() + 
+            " HTTP/1.0\r\n"
+            "User-Agent: NTRIP BNC 1.0\r\n"
+            "Authorization: Basic " +
+            userAndPwd.toBase64() + "\r\n\r\n";
+   } else {
+   reqStr = "GET " + hlp.toEncoded() + 
+            " HTTP/1.0\r\n"
+            "User-Agent: NTRIP BNC 1.0\r\n"
+            "Authorization: Basic " +
+            userAndPwd.toBase64() + "\r\n\r\n";
+  }
 
   msg += reqStr;

trunk/BNC/bncutils.cpp

@@ -60 +60 @@
   QTime time = QTime::currentTime();
 
-  double deltat = date.toJulianDay() - 2400000.5 - 44244.0 +
+  double deltat = double(date.toJulianDay()) - 2444244.0 +
            ((( time.msec() / 1000.0 
              + time.second() ) / 60.0