Changeset 1387 in ntrip

Timestamp:

Dec 29, 2008, 10:27:05 AM (15 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncgetthread.cpp (modified) (9 diffs)
• bncnetquery.h (modified) (1 diff)
• bncrinex.cpp (modified) (2 diffs)
• bncrinex.h (modified) (2 diffs)
• bnctabledlg.cpp (modified) (2 diffs)
• bncutils.cpp (modified) (2 diffs)
• bncutils.h (modified) (1 diff)

trunk/BNC/bncgetthread.cpp

@@ -54 +54 @@
 #include "bncrinex.h"
 #include "bnczerodecoder.h"
-#include "bncnetquery.h"
+#include "bncnetqueryv1.h"
+#include "bncnetqueryv2.h"
 
 #include "RTCM/RTCM2Decoder.h"
@@ -188 +189 @@
   else {
     _rnx = new bncRinex(_staID, _mountPoint, _format, _latitude, 
-                        _longitude, _nmea, _ntripVersion);
+                        _longitude, _nmea);
   }
   _rnx_set_position = false;
 
   connect(((bncApp*)qApp), SIGNAL(newEphGPS(gpsephemeris)),
-          this, SLOT(slotNewEphGPS(gpsephemeris)));
+          this, SLOT(slotNewEphGPS(gpsephemeris)));
 
   if (settings.value("serialMountPoint").toString() == _staID) {
@@ -304 +305 @@
   if (!_rawInpFile) {
     delete _query;
-    _query = new bncNetQuery();
-    _query->startRequest(_mountPoint);
+    if (_ntripVersion == "2") {
+      _query = new bncNetQueryV2();
+    }
+    else {
+      _query = new bncNetQueryV1();
+    }
+    if (_nmea == "yes") {
+      QByteArray gga = ggaString(_latitude, _longitude);
+      _query->startRequest(_mountPoint, gga);
+    }
+    else {
+      _query->startRequest(_mountPoint, "");
+    }
   }
 
@@ -554 +566 @@
         }
 
-        // RTCM scan output
-        // ----------------
+        // RTCM scan output
+        // ----------------
         if ( _checkMountPoint == _staID || _checkMountPoint == "ALL" ) {
           QSettings settings;
@@ -589 +601 @@
                 ant3 = QString("%1 ").arg(_decoder->_antList[ii].zz,0,'f',4).toAscii();
                 switch (_decoder->_antList[ii].type) {
-                case GPSDecoder::t_antInfo::ARP: antT = "ARP"; break;
-                case GPSDecoder::t_antInfo::APC: antT = "APC"; break;
-                }
+                case GPSDecoder::t_antInfo::ARP: antT = "ARP"; break;
+                case GPSDecoder::t_antInfo::APC: antT = "APC"; break;
+                }
                 emit(newMessage(_staID + ": " + antT + " (ITRF) X " + ant1 + "m", true));
                 emit(newMessage(_staID + ": " + antT + " (ITRF) Y " + ant2 + "m", true));
                 emit(newMessage(_staID + ": " + antT + " (ITRF) Z " + ant3 + "m", true));
-                if (_decoder->_antList[ii].height_f) {
-                  QByteArray ant4 = QString("%1 ").arg(_decoder->_antList[ii].height,0,'f',4).toAscii();
-                  emit(newMessage(_staID + ": Antenna height above marker "  + ant4 + "m", true));
-                }
-                emit(newAntCrd(_staID, 
-                             _decoder->_antList[ii].xx, _decoder->_antList[ii].yy, _decoder->_antList[ii].zz, 
-                             antT));
+                if (_decoder->_antList[ii].height_f) {
+                  QByteArray ant4 = QString("%1 ").arg(_decoder->_antList[ii].height,0,'f',4).toAscii();
+                  emit(newMessage(_staID + ": Antenna height above marker "  + ant4 + "m", true));
+                }
+                emit(newAntCrd(_staID, 
+                             _decoder->_antList[ii].xx, _decoder->_antList[ii].yy, _decoder->_antList[ii].zz, 
+                             antT));
               }
             }
           }
           if ( _checkMountPoint == "ANTCRD_ONLY" && _decoder->_antList.size() ) {
-            for (int ii=0;ii<_decoder->_antList.size();++ii) {
-              QByteArray antT;
-              switch (_decoder->_antList[ii].type) {
-              case GPSDecoder::t_antInfo::ARP: antT = "ARP"; break;
-              case GPSDecoder::t_antInfo::APC: antT = "APC"; break;
-              }
-              emit(newAntCrd(_staID, 
-                           _decoder->_antList[ii].xx, _decoder->_antList[ii].yy, _decoder->_antList[ii].zz, 
-                           antT));
-            }
+            for (int ii=0;ii<_decoder->_antList.size();++ii) {
+              QByteArray antT;
+              switch (_decoder->_antList[ii].type) {
+              case GPSDecoder::t_antInfo::ARP: antT = "ARP"; break;
+              case GPSDecoder::t_antInfo::APC: antT = "APC"; break;
+              }
+              emit(newAntCrd(_staID, 
+                           _decoder->_antList[ii].xx, _decoder->_antList[ii].yy, _decoder->_antList[ii].zz, 
+                           antT));
+            }
           }
         }
-        
+        
         _decoder->_typeList.clear();
         _decoder->_antType.clear();
         _decoder->_antList.clear();
 
-        // Loop over all observations (observations output)
-        // ------------------------------------------------
+        // Loop over all observations (observations output)
+        // ------------------------------------------------
         QListIterator<p_obs> it(_decoder->_obsList);
         while (it.hasNext()) {
@@ -720 +732 @@
           // ------------
           if (_rnx) {
-            bool dump = true;
+            bool dump = true;
 
             //// // RTCMv2 XYZ
@@ -726 +738 @@
             //// RTCM2Decoder* decoder2 = dynamic_cast<RTCM2Decoder*>(_decoder);
             //// if ( decoder2 && !_rnx_set_position ) {
-            ////   double stax, stay, staz;
-            ////   double dL1[3], dL2[3];
-            ////   if ( decoder2->getStaCrd(stax, stay, staz,
+            ////   double stax, stay, staz;
+            ////   double dL1[3], dL2[3];
+            ////   if ( decoder2->getStaCrd(stax, stay, staz,
             ////                            dL1[0], dL1[1], dL1[2], 
             ////                            dL2[0], dL2[1], dL2[2]) == success ) {
-            //// 
+            //// 
             ////     if ( _checkMountPoint == _staID || _checkMountPoint == "ALL" ) {
             ////       QString ant1;
@@ -753 +765 @@
             ////       emit(newMessage(_staID + ": L2 APC DZ " + ant1.toAscii() + "m" ));
             ////     }
-            ////        _rnx_set_position = true;
+            ////        _rnx_set_position = true;
             ////   }
             //// }  
 
-            if ( dump ) {
-              long iSec    = long(floor(obs->_o.GPSWeeks+0.5));
-              long newTime = obs->_o.GPSWeek * 7*24*3600 + iSec;
-              if (_samplingRate == 0 || iSec % _samplingRate == 0) {
-                _rnx->deepCopy(obs);
-              }
-              _rnx->dumpEpoch(newTime);
+            if ( dump ) {
+              long iSec    = long(floor(obs->_o.GPSWeeks+0.5));
+              long newTime = obs->_o.GPSWeek * 7*24*3600 + iSec;
+              if (_samplingRate == 0 || iSec % _samplingRate == 0) {
+                _rnx->deepCopy(obs);
+              }
+              _rnx->dumpEpoch(newTime);
             }
           }
 
-          // Emit new observation signal
-          // ---------------------------
+          // Emit new observation signal
+          // ---------------------------
           bool firstObs = (obs == _decoder->_obsList.first());
           obs->_status = t_obs::posted;
@@ -881 +893 @@
   }
 }
-

trunk/BNC/bncnetquery.h

@@ -16 +16 @@
             (bncApp*) qApp, SLOT(slotMessage(const QByteArray,bool)));
   }
-  virtual ~bncNetQuery();
+  virtual ~bncNetQuery() {};
 
   virtual void waitForRequestResult(const QUrl& url, QByteArray& outData) = 0;

trunk/BNC/bncrinex.cpp

@@ -63 +63 @@
 bncRinex::bncRinex(const QByteArray& statID, const QUrl& mountPoint, 
                    const QByteArray& format, const QByteArray& latitude,
-                   const QByteArray& longitude, const QByteArray& nmea,
-                   const QByteArray& ntripVersion) {
+                   const QByteArray& longitude, const QByteArray& nmea) {
+
   _statID        = statID;
   _mountPoint    = mountPoint;
@@ -71 +71 @@
   _longitude     = longitude;
   _nmea          = nmea;
-  _ntripVersion  = ntripVersion;
   _headerWritten = false;
   _reconnectFlag = false;

trunk/BNC/bncrinex.h

@@ -40 +40 @@
    bncRinex(const QByteArray& statID, const QUrl& mountPoint, 
             const QByteArray& format, const QByteArray& latitude,
-            const QByteArray& longitude, const QByteArray& nmea,
-            const QByteArray& ntripVersion);
+            const QByteArray& longitude, const QByteArray& nmea);
    ~bncRinex();
    void deepCopy(const p_obs obs);
@@ -82 +81 @@
    QByteArray    _longitude;
    QByteArray    _nmea;
-   QByteArray    _ntripVersion;
    bool          _reconnectFlag;
    QDate         _skeletonDate;

trunk/BNC/bnctabledlg.cpp

@@ -43 +43 @@
 #include "bnctabledlg.h"
 #include "bncgetthread.h"
-#include "bncnetquery.h"
+#include "bncnetqueryv2.h"
 
 using namespace std;
@@ -171 +171 @@
   url.setPath("/");
 
-  bncNetQuery query;
+  bncNetQueryV2 query;
   QByteArray outData;
   query.waitForRequestResult(url, outData);

trunk/BNC/bncutils.cpp

@@ -129 +129 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-QString ggaString(const QByteArray& latitude, const QByteArray& longitude) {
+QByteArray ggaString(const QByteArray& latitude, const QByteArray& longitude) {
 
   double lat = strtod(latitude,NULL);
@@ -166 +166 @@
   gga += QString("*%1").arg(XOR, 2, 16, QLatin1Char('0'));
 
-  return gga;
+  return gga.toAscii();
 }

trunk/BNC/bncutils.h

@@ -37 +37 @@
 QDateTime currentDateAndTimeGPS();
 
-QString ggaString(const QByteArray& latitude, const QByteArray& longitude);
+QByteArray ggaString(const QByteArray& latitude, const QByteArray& longitude);
 
 #endif