Changeset 1305 in ntrip for trunk

Timestamp:

Dec 19, 2008, 11:19:41 AM (16 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• RTCM3/clock_orbit_rtcm.c (modified) (2 diffs)
• RTCM3/rtcm3torinex.c (modified) (3 diffs)
• bnc.pro (modified) (2 diffs)
• bncapp.cpp (modified) (2 diffs)
• bncnetrequest.cpp (modified) (1 diff)
• bnctabledlg.cpp (modified) (2 diffs)

trunk/BNC/RTCM3/clock_orbit_rtcm.c

@@ -3 +3 @@
         Name:           clock_orbit_rtcm.c
         Project:        RTCM3
-        Version:        $Id: clock_orbit_rtcm.c,v 1.3 2008/08/15 16:29:40 weber Exp $
+        Version:        $Id: clock_orbit_rtcm.c,v 1.4.2.3 2008/12/19 09:29:13 mervart Exp $
         Authors:        Dirk Stöcker
         Description:    state space approach for RTCM3
@@ -10 +10 @@
 #include <stdio.h>
 #include <string.h>
+
+#ifndef sparc
 #include <stdint.h>
+#endif
+
+#include <sys/types.h>
 #include "clock_orbit_rtcm.h"
 

trunk/BNC/RTCM3/rtcm3torinex.c

@@ -1 +1 @@
 /*
   Converter for RTCM3 data to RINEX.
-  $Id: rtcm3torinex.c,v 1.36 2008/12/03 08:33:16 stoecker Exp $
+  $Id: rtcm3torinex.c,v 1.21.2.1 2008/12/18 12:45:53 mervart Exp $
   Copyright (C) 2005-2008 by Dirk Stöcker <stoecker@alberding.eu>
 
@@ -48 +48 @@
 #endif
 
+#ifndef isinf
+#  define isinf(x) 0
+#endif
+
 #include "rtcm3torinex.h"
 
 /* CVS revision and version */
-static char revisionstr[] = "$Revision: 1.36 $";
+static char revisionstr[] = "$Revision: 1.21.2.1 $";
 
 #ifndef COMPILEDATE
@@ -1685 +1689 @@
 
 #ifndef NO_RTCM3_MAIN
-static char datestr[]     = "$Date: 2008/12/03 08:33:16 $";
+static char datestr[]     = "$Date: 2008/12/18 12:45:53 $";
 
 /* The string, which is send as agent in HTTP request */

trunk/BNC/bnc.pro

@@ -27 +27 @@
           bnccaster.h bncrinex.h bncapp.h bncutils.h   bnchlpdlg.h    \
           bncconst.h bnchtml.h bnctableitem.h bnczerodecoder.h        \
+          bncnetrequest.h \
           RTCM/GPSDecoder.h RTCM/RTCM2.h RTCM/RTCM2Decoder.h          \
           RTCM/RTCM2_2021.h RTCM/rtcm_utils.h                         \
@@ -39 +40 @@
           bncconst.cpp bnchtml.cpp bnchlpdlg.cpp bnctableitem.cpp     \
           bnczerodecoder.cpp                                          \
+          bncnetrequest.cpp \
           RTCM/RTCM2.cpp RTCM/RTCM2Decoder.cpp                        \
           RTCM/RTCM2_2021.cpp RTCM/rtcm_utils.cpp                     \

trunk/BNC/bncapp.cpp

@@ -437 +437 @@
   QByteArray allLines;
 
-  line.sprintf("    %18.11e %18.11e %18.11e %18.11e\n", (double)ep->IODE,
+  line.sprintf("     %18.11e %18.11e %18.11e %18.11e\n", (double)ep->IODE,
                ep->Crs, ep->Delta_n, ep->M0);
   allLines += line;
   
-  line.sprintf("    %18.11e %18.11e %18.11e %18.11e\n", ep->Cuc,
+  line.sprintf("     %18.11e %18.11e %18.11e %18.11e\n", ep->Cuc,
                ep->e, ep->Cus, ep->sqrt_A);
   allLines += line;
 
-  line.sprintf("    %18.11e %18.11e %18.11e %18.11e\n",
+  line.sprintf("     %18.11e %18.11e %18.11e %18.11e\n",
                (double) ep->TOE, ep->Cic, ep->OMEGA0, ep->Cis);
   allLines += line;
   
-  line.sprintf("    %18.11e %18.11e %18.11e %18.11e\n", ep->i0,
+  line.sprintf("     %18.11e %18.11e %18.11e %18.11e\n", ep->i0,
                ep->Crc, ep->omega, ep->OMEGADOT);
   allLines += line;
@@ -508 +508 @@
   QByteArray allLines;
 
-  line.sprintf("    %18.11e %18.11e %18.11e %18.11e\n", ep->x_pos,
+  line.sprintf("     %18.11e %18.11e %18.11e %18.11e\n", ep->x_pos,
                ep->x_velocity, ep->x_acceleration, 
                (ep->flags & GLOEPHF_UNHEALTHY) ? 1.0 : 0.0);
   allLines += line;
    
-  line.sprintf("    %18.11e %18.11e %18.11e %18.11e\n", ep->y_pos,
+  line.sprintf("     %18.11e %18.11e %18.11e %18.11e\n", ep->y_pos,
                ep->y_velocity, ep->y_acceleration, 
                (double) ep->frequency_number);
   allLines += line;
   
-  line.sprintf("    %18.11e %18.11e %18.11e %18.11e\n", ep->z_pos,
+  line.sprintf("     %18.11e %18.11e %18.11e %18.11e\n", ep->z_pos,
                ep->z_velocity, ep->z_acceleration, (double) ep->E);
   allLines += line;

trunk/BNC/bncnetrequest.cpp

@@ -71 +71 @@
   // Network Request
   // ---------------
-  QNetworkRequest request;
-  request.setUrl(mountPoint);
-  request.setRawHeader("User-Agent", "NTRIP BNC/" AGENTVERSION);
-  request.setRawHeader("Host", mountPoint.host().toAscii());
+///  QNetworkRequest request;
+///  request.setUrl(mountPoint);
+///  request.setRawHeader("User-Agent", "NTRIP BNC/" AGENTVERSION);
+///  request.setRawHeader("Host", mountPoint.host().toAscii());
+///
+///  QString uName = QUrl::fromPercentEncoding(mountPoint.userName().toAscii());
+///  QString passW = QUrl::fromPercentEncoding(mountPoint.password().toAscii());
+///  if (!uName.isEmpty() || !passW.isEmpty()) {
+///    QByteArray userAndPwd = "Basic " + (uName.toAscii() + ":" +
+///                                        passW.toAscii()).toBase64();
+///    request.setRawHeader("Authorization", userAndPwd);
+///  }
+///  
+///  if (!ggaStr.isEmpty()) {
+///    request.setRawHeader("", ggaStr);
+///  }
 
-  QString uName = QUrl::fromPercentEncoding(mountPoint.userName().toAscii());
-  QString passW = QUrl::fromPercentEncoding(mountPoint.password().toAscii());
-  if (!uName.isEmpty() || !passW.isEmpty()) {
-    QByteArray userAndPwd = "Basic " + (uName.toAscii() + ":" +
-                                        passW.toAscii()).toBase64();
-    request.setRawHeader("Authorization", userAndPwd);
-  }
-  
-  if (!ggaStr.isEmpty()) {
-    request.setRawHeader("", ggaStr);
+  QHttpRequestHeader header("GET", "/CBRU0", 1, 1);
+
+  header.addValue("User-Agent", "NTRIP BNC/1.7");
+
+  QByteArray userAndPwd = "Basic " + QByteArray("cvutlukes:monitoring").toBase64();
+  header.addValue("Authorization", userAndPwd);
+
+  QHttp* http = new QHttp("czeposr.cuzk.cz", 2101);
+
+  connect(http, SIGNAL(readyRead(const QHttpResponseHeader&)), 
+          this, SLOT(slotReadyRead()));
+
+  QBuffer buffer;
+  http->request(header, 0, &buffer);
+
+  while (true) {
+    if (buffer.bytesAvailable()) {
+      QByteArray arr = buffer.readAll();
+      cout << arr.data();
+    }
+    else {
+      buffer.waitForReadyRead(1000);
+    }
   }
 
-  // Submit Request
-  // --------------
-  _reply = _manager->get(request);
-
-  connect(_reply, SIGNAL(readyRead()), this, SLOT(slotReadyRead()));
-
-  connect(_reply, SIGNAL(error(QNetworkReply::NetworkError)),
-          this, SLOT(slotError(QNetworkReply::NetworkError)));
-
-  connect(_reply, SIGNAL(sslErrors(QList<QSslError>)),
-          this, SLOT(slotSslErrors(QList<QSslError>)));
 
   return success;

trunk/BNC/bnctabledlg.cpp

@@ -41 +41 @@
 #include "bnctabledlg.h"
 #include "bncgetthread.h"
+#include "bncnetrequest.h"
 
 // Constructor
@@ -154 +155 @@
   url.setHost(casterHost);
   url.setPort(casterPort);
+
+  //// beg test
+  bncNetRequest* req = new bncNetRequest;
+  req->request(url, "");
+  return success;
+  //// end test
 
   // Send the Request