Changeset 1716 in ntrip for trunk/BNC

Timestamp:

Mar 4, 2009, 6:13:06 PM (15 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncnetquery.h (modified) (1 diff)
• bncnetqueryrtp.cpp (modified) (1 diff)
• bncnetqueryrtp.h (modified) (1 diff)
• bncnetqueryv0.cpp (modified) (1 diff)
• bncnetqueryv0.h (modified) (1 diff)
• bncnetqueryv1.cpp (modified) (1 diff)
• bncnetqueryv1.h (modified) (1 diff)
• bncnetqueryv2.cpp (modified) (2 diffs)
• bncnetqueryv2.h (modified) (2 diffs)

trunk/BNC/bncnetquery.h

@@ -22 +22 @@
   virtual void startRequest(const QUrl& url, const QByteArray& gga) = 0;
   virtual void waitForReadyRead(QByteArray& outData) = 0;
-  virtual void sendNMEA(const QByteArray& gga) = 0;
+  
+  void sendNMEA(const QByteArray& gga) {
+    stop();
+    startRequest(_url, gga);
+  }
 
   queryStatus status() const {return _status;}

trunk/BNC/bncnetqueryrtp.cpp

@@ -238 +238 @@
 }
 
-// Send NMEA String
-////////////////////////////////////////////////////////////////////////////
-void bncNetQueryRtp::sendNMEA(const QByteArray& gga) {
-  startRequest(_url, gga);
-}

trunk/BNC/bncnetqueryrtp.h

@@ -14 +14 @@
   virtual void startRequest(const QUrl& url, const QByteArray& gga);
   virtual void waitForReadyRead(QByteArray& outData);
-  virtual void sendNMEA(const QByteArray& gga);
 
  private slots:

trunk/BNC/bncnetqueryv0.cpp

@@ -130 +130 @@
 }
 
-// Send NMEA String
-////////////////////////////////////////////////////////////////////////////
-void bncNetQueryV0::sendNMEA(const QByteArray& /* gga */) {
-  emit newMessage(_url.path().toAscii().replace(0,1,"") 
-                  + ": sending NMEA not impelmented for NTRIP v0", true);
-}

trunk/BNC/bncnetqueryv0.h

@@ -13 +13 @@
   virtual void startRequest(const QUrl& url, const QByteArray& gga);
   virtual void waitForReadyRead(QByteArray& outData);
-  virtual void sendNMEA(const QByteArray& gga);
 
  private:

trunk/BNC/bncnetqueryv1.cpp

@@ -219 +219 @@
 }
 
-// Send NMEA String
-////////////////////////////////////////////////////////////////////////////
-void bncNetQueryV1::sendNMEA(const QByteArray& gga) {
-  startRequest(_url, gga);
-}

trunk/BNC/bncnetqueryv1.h

@@ -13 +13 @@
   virtual void startRequest(const QUrl& url, const QByteArray& gga);
   virtual void waitForReadyRead(QByteArray& outData);
-  virtual void sendNMEA(const QByteArray& gga);
 
  private:

trunk/BNC/bncnetqueryv2.cpp

@@ -113 +113 @@
   // Network Request
   // ---------------
-  _request.setUrl(_url);
-  _request.setRawHeader("Host"         , _url.host().toAscii());
-  _request.setRawHeader("Ntrip-Version", "Ntrip/2.0");
-  _request.setRawHeader("User-Agent"   , "NTRIP BNC/1.7");
+  QNetworkRequest request;
+  request.setUrl(_url);
+  request.setRawHeader("Host"         , _url.host().toAscii());
+  request.setRawHeader("Ntrip-Version", "Ntrip/2.0");
+  request.setRawHeader("User-Agent"   , "NTRIP BNC/1.7");
   if (!_url.userName().isEmpty()) {
     QString uName = QUrl::fromPercentEncoding(_url.userName().toAscii());
     QString passW = QUrl::fromPercentEncoding(_url.password().toAscii());
-    _request.setRawHeader("Authorization", "Basic " + 
+    request.setRawHeader("Authorization", "Basic " + 
                          (uName + ":" + passW).toAscii().toBase64());
   } 
   if (!gga.isEmpty()) {
-    _request.setRawHeader("Ntrip-GGA", gga);
+    request.setRawHeader("Ntrip-GGA", gga);
   }
-  _request.setRawHeader("Connection"   , "close");
+  request.setRawHeader("Connection"   , "close");
 
-  this->startGet(full);
-}
-
-// Start Get HTTP Method
-////////////////////////////////////////////////////////////////////////////
-void bncNetQueryV2::startGet(bool full) {
-
-  if (_reply) {
-    _reply->abort();
-    delete _reply;
-  }
-
-  _reply = _manager->get(_request);
+  delete _reply;
+  _reply = _manager->get(request);
 
   // Connect Signals
@@ -191 +181 @@
 }
 
-// Send NMEA String
-////////////////////////////////////////////////////////////////////////////
-void bncNetQueryV2::sendNMEA(const QByteArray& gga) {
-  if (!gga.isEmpty()) {
-    _request.setRawHeader("Ntrip-GGA", gga);
-  }
-  this->startGet(false);
-}

trunk/BNC/bncnetqueryv2.h

@@ -15 +15 @@
   virtual void startRequest(const QUrl& url, const QByteArray& gga);
   virtual void waitForReadyRead(QByteArray& outData);
-  virtual void sendNMEA(const QByteArray& gga);
 
  private slots:
@@ -23 +22 @@
  private:
   void startRequestPrivate(const QUrl& url, const QByteArray& gga, bool full);
-  void startGet(bool full);
 
   QNetworkAccessManager* _manager;
   QNetworkReply*         _reply;
-  QNetworkRequest        _request;
   QEventLoop*            _eventLoop;
   bool                   _firstData;