Changeset 73 in ntrip

Timestamp:

Aug 27, 2006, 8:40:06 AM (18 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• RTCM/m_date.h (modified) (2 diffs)
• RTIGS/rtigs.cpp (modified) (2 diffs)
• bnc.pro (modified) (2 diffs)
• bnccaster.cpp (modified) (1 diff)
• bnccaster.h (modified) (2 diffs)
• bncrinex.cpp (added)
• bncrinex.h (added)

trunk/BNC/RTCM/m_date.h

@@ -1 +1 @@
 // -*- C++ -*-
 //
-// $Id: m_date.h,v 1.1.1.1 2006/01/11 09:34:31 mervart Exp $
+// $Id: m_date.h,v 1.1.1.1 2006/05/30 11:05:27 mervart Exp $
 //
 
@@ -175 +175 @@
     return tms.tm_mon+1; 
   }
-  const static char *_monthNames[];
+  static const char *_monthNames[];
   const char *monthStr();
 

trunk/BNC/RTIGS/rtigs.cpp

@@ -77 +77 @@
     short numObs = _GPSTrans.Decode_RTIGS_Obs(p_buf, numbytes, rtigs_obs);
 
-////    if (numObs > 0) {
-////      _GPSTrans.print_CMEAS();
-////    }
-
     for (short ii = 0; ii < numObs; ii++) {
       Observation* obs = new Observation();
 
-////  obs->statID         =
       obs->SVPRN          = _GPSTrans.DecObs.Obs[ii].sat_prn;
       obs->GPSWeek        = _GPSTrans.DecObs.Obs[ii].GPSTime / (7 * 86400);
       obs->GPSWeeks       = _GPSTrans.DecObs.Obs[ii].GPSTime % (7 * 86400);
       obs->sec            = _GPSTrans.DecObs.Obs[ii].GPSTime % 3600;
-      obs->C1             = _GPSTrans.DecObs.Obs[ii].l1_pseudo_range;
-////  obs->P1             = _GPSTrans.DecObs.Obs[ii].p1_pseudo_range;
+////  obs->C1             = _GPSTrans.DecObs.Obs[ii].l1_pseudo_range;
+      obs->C1             = _GPSTrans.DecObs.Obs[ii].p1_pseudo_range;
+      obs->pCodeIndicator = 1;
       obs->P2             = _GPSTrans.DecObs.Obs[ii].p2_pseudo_range;
       obs->L1             = _GPSTrans.DecObs.Obs[ii].p1_phase;
@@ -96 +92 @@
       obs->SNR1           = (short) _GPSTrans.DecObs.Obs[ii].l1_sn * 10;
       obs->SNR2           = (short) _GPSTrans.DecObs.Obs[ii].l2_sn * 10;
-////  obs->pCodeIndicator =
-////  obs->cumuLossOfCont =
+      obs->cumuLossOfCont = 0;
 
       m_lObsList.push_back(obs);

trunk/BNC/bnc.pro

@@ -1 +1 @@
 
 HEADERS =             bncgetthread.h    bncwindow.h   bnctabledlg.h   \
-          bnccaster.h                                                 \
+          bnccaster.h bncrinex.h                                      \
           RTCM/format.h RTCM/GPSDecoder.h RTCM/m_data.h RTCM/RTCM.h   \
           RTCM3/rtcm3.h RTCM3/rtcm3torinex.h                          \
@@ -9 +9 @@
 
 SOURCES = bncmain.cpp bncgetthread.cpp  bncwindow.cpp bnctabledlg.cpp \
-          bnccaster.cpp                                               \
+          bnccaster.cpp bncrinex.cpp                                  \
           RTCM/m_date.cpp RTCM/RTCM.cpp                               \
           RTCM3/rtcm3.cpp RTCM3/rtcm3torinex.cpp                      \

trunk/BNC/bnccaster.cpp

@@ -183 +183 @@
       }
 
+      // Prepare RINEX Output
+      // --------------------
+      if (1) {
+        if (_rinexWriters.find(obs->StatID) == _rinexWriters.end()) {
+          _rinexWriters.insert(obs->StatID, new bncRinex(obs->StatID));
+        }
+        bncRinex* rnx = _rinexWriters.find(obs->StatID).value();
+        rnx->deepCopy(obs);
+      }
+
       delete obs;
       _epochs->remove(sec);
       first = false;
     }
-  }
-}
+
+    // Write RINEX Files
+    // -----------------
+    QMapIterator<QString, bncRinex*> ir(_rinexWriters);
+    while (ir.hasNext()) {
+      bncRinex* rnx = ir.next().value();
+      rnx->dumpEpoch();
+    }
+  }
+}

trunk/BNC/bnccaster.h

@@ -9 +9 @@
 
 #include "RTCM/GPSDecoder.h"
+#include "bncrinex.h"
 
 class bncGetThread;
@@ -44 +45 @@
    QList<QTcpSocket*>*            _sockets;
    QList<QByteArray>              _mountPoints;
+   QMap<QString, bncRinex*>       _rinexWriters;
 };