Changeset 3174 in ntrip

Timestamp:

Mar 29, 2011, 5:14:09 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• RTCM3/ephemeris.h (modified) (3 diffs)
• bnc.pro (modified) (2 diffs)
• bncephuser.h (modified) (1 diff)
• bncoutf.cpp (added)
• bncoutf.h (added)
• upload/bncrtnetdecoder.cpp (modified) (8 diffs)
• upload/bncrtnetdecoder.h (modified) (2 diffs)
• upload/bncuploadcaster.cpp (modified) (2 diffs)
• upload/bncuploadcaster.h (modified) (3 diffs)

trunk/BNC/RTCM3/ephemeris.h

@@ -3 +3 @@
 
 #include <newmat.h>
-
+#include <QtCore>
 #include <stdio.h>
 #include <string>
@@ -16 +16 @@
   bool        isNewerThan(const t_eph* eph) const;
   std::string prn() const {return _prn;}
+  void    setReceptDateTime(const QDateTime& dateTime) {
+    _receptDateTime = dateTime;
+  }
+  const QDateTime& receptDateTime() const {return _receptDateTime;}
 
   int    GPSweek()  const { return _GPSweek; }
@@ -42 +46 @@
   int         _GPSweek;
   double      _GPSweeks;
+  QDateTime   _receptDateTime;
 };
 

trunk/BNC/bnc.pro

@@ -42 +42 @@
           bancroft.h bncmodel.h bncfigureppp.h bncrawfile.h           \ 
           bnctides.h bncmap.h bncmapview.h bncantex.h                 \
-          bncephuser.h                                                \
+          bncephuser.h bncoutf.h                                      \
           upload/bncrtnetdecoder.h upload/bncuploadcaster.h           \
+          upload/bncclockrinex.h                                      \
           RTCM/GPSDecoder.h RTCM/RTCM2.h RTCM/RTCM2Decoder.h          \
           RTCM/RTCM2_2021.h RTCM/rtcm_utils.h                         \
@@ -74 +75 @@
           bancroft.cpp bncmodel.cpp bncfigureppp.cpp bncrawfile.cpp   \
           bnctides.cpp bncmap.cpp bncmapview.cpp bncantex.cpp         \
-          bncephuser.cpp                                              \
+          bncephuser.cpp bncoutf.cpp                                  \
           upload/bncrtnetdecoder.cpp upload/bncuploadcaster.cpp       \
+          upload/bncclockrinex.cpp                                    \
           RTCM/RTCM2.cpp RTCM/RTCM2Decoder.cpp                        \
           RTCM/RTCM2_2021.cpp RTCM/rtcm_utils.cpp                     \

trunk/BNC/bncephuser.h

@@ -95 +95 @@
       delete prev;
     }
+    ColumnVector xx;
     t_eph* last;
     t_eph* prev;

trunk/BNC/upload/bncrtnetdecoder.cpp

@@ -125 +125 @@
           in >> prn;
           prns << prn;
-          if ( _ephList.contains(prn) ) {
+          if ( _eph.contains(prn) ) {
             in >> xx(1) >> xx(2) >> xx(3) >> xx(4) >> xx(5) 
                >> xx(6) >> xx(7) >> xx(8) >> xx(9) >> xx(10)
@@ -142 +142 @@
             xx(14) *= 1e3;         // z-crd at time + dT
 
-            pair     = _ephList[prn];
+            pair     = _eph[prn];
             pair->xx = xx;
           }
@@ -148 +148 @@
         else {
           prn = prns[ii];
-          if ( _ephList.contains(prn) ) {
-            pair = _ephList[prn];
+          if ( _eph.contains(prn) ) {
+            pair = _eph[prn];
             xx   = pair->xx;
           }
@@ -158 +158 @@
         t_eph* ep = 0;
         if (pair) {
-          ep = pair->eph;
-          if (pair->oldEph && ep && 
+          ep = pair->last;
+          if (pair->prev && ep && 
               ep->receptDateTime().secsTo(QDateTime::currentDateTime()) < 60) {
-            ep = pair->oldEph;
+            ep = pair->prev;
           }
         }
@@ -229 +229 @@
         int len = MakeClockOrbit(&co, COTYPE_AUTO, 0, obuffer, sizeof(obuffer));
         if (len > 0) {
-          if (_caster.at(ic)->ic() == 1)  { emit(newOutBytes1(len));}
-          if (_caster.at(ic)->ic() == 2)  { emit(newOutBytes2(len));}
-          if (_caster.at(ic)->ic() == 3)  { emit(newOutBytes3(len));}
-          if (_caster.at(ic)->ic() == 4)  { emit(newOutBytes4(len));}
-          if (_caster.at(ic)->ic() == 5)  { emit(newOutBytes5(len));}
-          if (_caster.at(ic)->ic() == 6)  { emit(newOutBytes6(len));}
-          if (_caster.at(ic)->ic() == 7)  { emit(newOutBytes7(len));}
-          if (_caster.at(ic)->ic() == 8)  { emit(newOutBytes8(len));}
-          if (_caster.at(ic)->ic() == 9)  { emit(newOutBytes9(len));}
-          if (_caster.at(ic)->ic() == 10) { emit(newOutBytes10(len));}
           _caster.at(ic)->write(obuffer, len);
         }
@@ -287 +277 @@
     ColumnVector vv(3);
 
-    ep->position(GPSweek12, GPSweeks12, xB, vv);
+    ep->position(GPSweek12, GPSweeks12, xB.data(), vv.data());
     
     ColumnVector xyz;
@@ -333 +323 @@
 
   outLine.sprintf("%d %.1f %s  %3d  %10.3f  %8.3f %8.3f %8.3f\n", 
-                  GPSweek, GPSweeks, ep->prn().toAscii().data(),
+                  GPSweek, GPSweeks, ep->prn().c_str(),
                   ep->IOD(), dClk, rsw(1), rsw(2), rsw(3));
 
@@ -351 +341 @@
                                const QString& trafo) {
 
-  bnsSettings settings;
+  bncSettings settings;
 
   if (trafo == "ETRF2000") {

trunk/BNC/upload/bncrtnetdecoder.h

@@ -29 +29 @@
 #include <QtCore>
 #include "bncephuser.h"
+#include "bncuploadcaster.h"
 #include "RTCM/GPSDecoder.h"
 
@@ -48 +49 @@
 
   QString _buffer;
-
+  QList<bncUploadCaster*> _caster;
   int    _GPSweek;
   double _GPSweeks;

trunk/BNC/upload/bncuploadcaster.cpp

@@ -27 +27 @@
 bncUploadCaster::bncUploadCaster(const QString& mountpoint,
                                  const QString& outHost, int outPort,
-                                 const QString& password,  
+                                 const QString& password, 
+                                 const QString& crdTrafo, bool  CoM, 
                                  const QString& outFileName) {
 
@@ -36 +37 @@
   _outPort    = outPort;
   _password   = password;
+  _crdTrafo   = crdTrafo;
+  _CoM        = CoM;
 
   _outSocket  = 0;

trunk/BNC/upload/bncuploadcaster.h

@@ -9 +9 @@
   bncUploadCaster(const QString& mountpoint,
                   const QString& outHost, int outPort,
-                  const QString& password,  
+                  const QString& password, 
+                  const QString& crdTrafo, bool  CoM, 
                   const QString& outFileName);
   virtual ~bncUploadCaster();
@@ -16 +17 @@
   void printAscii(const QString& line);
   bool usedSocket() const {return _outSocket;}
+  QString crdTrafo() const {return _crdTrafo;}
+  bool CoM() const {return _CoM;}
 
  signals:
@@ -26 +29 @@
   int          _outPort;
   QString      _password;
+  QString      _crdTrafo;
+  bool         _CoM;
   QTcpSocket*  _outSocket;
   int          _sOpenTrial;