Changeset 1361 in ntrip

Timestamp:

Dec 27, 2008, 9:35:35 PM (16 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncnetrequest.cpp (modified) (2 diffs)
• bncsocket.cpp (modified) (10 diffs)

trunk/BNC/bncnetrequest.cpp

@@ -92 +92 @@
   cout << "slotReadyRead" << endl;
   QByteArray buffer = _reply->readAll();
+<<<<<<< bncnetrequest.cpp
+  cerr << buffer.data();
+=======
 
   vector<string> errmsg;
@@ -111 +114 @@
   }
   _decoder->_obsList.clear();
+>>>>>>> 1.9
 }
 

trunk/BNC/bncsocket.cpp

@@ -47 +47 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void bncSocket::connectToHost(const QString &hostName, quint16 port, 
-                              QIODevice::OpenMode mode) {
-  if (_socket) {
-    _socket->connectToHost(hostName, port, mode);
-  }
-}
-
-// 
-////////////////////////////////////////////////////////////////////////////
-bool bncSocket::waitForConnected(int msecs) {
-  if (_socket) {
-    return _socket->waitForConnected(msecs);
-  }
-  else {
-    return false;
-  }
-}
-
-// 
-////////////////////////////////////////////////////////////////////////////
 QAbstractSocket::SocketState bncSocket::state() const {
   if (_socket) {
@@ -88 +68 @@
 qint64 bncSocket::bytesAvailable() const {
   if      (_http) { 
-    for (int ii = 1; ii < 10; ii++) {
-      cout << "bytesAvailable " << _http->bytesAvailable() << endl;
-      msleep(100);
-    }
     return _http->bytesAvailable();
   }
@@ -133 +109 @@
 ////////////////////////////////////////////////////////////////////////////
 bool bncSocket::waitForReadyRead(int msecs) {
-  if      (_http) {
-    msleep(10);
-  }
-  else if (_socket) {
+  if (_socket) {
     return _socket->waitForReadyRead(msecs);
   }
@@ -152 +125 @@
   else {
     return -1;
-  }
-}
-
-// 
-////////////////////////////////////////////////////////////////////////////
-qint64 bncSocket::write(const char* data, qint64 len) {
-  if (_socket) {
-    return _socket->write(data, len);
-  } 
-  else {
-    return -1;
-  }
-}
-
-// 
-////////////////////////////////////////////////////////////////////////////
-bool bncSocket::waitForBytesWritten(int msecs) {
-  if (_socket) {
-    return _socket->waitForBytesWritten(msecs);
-  }
-  else {
-    return false;
   }
 }
@@ -315 +266 @@
          << _http->errorString().toAscii().data() << endl;
   }
+  cout << _buffer->data().data();
 }
 
@@ -321 +273 @@
 void bncSocket::slotReadyRead() {
   cout << "slotReadyRead " << _buffer->size() << endl;
-}
-
-// 
-////////////////////////////////////////////////////////////////////////////
-void bncSocket::slotSslErrors(const QList<QSslError>&) {
-  cout << "slotSslError" << endl;
 }
 
@@ -337 +283 @@
          << _http->errorString().toAscii().data() << endl;
   }
+  emit quitEventLoop();
 }
 
@@ -344 +291 @@
                          const QByteArray& longitude, const QByteArray& nmea,
                          int timeOut, QString& msg) {
+
+  _eventLoop = new QEventLoop();
+  connect(this, SIGNAL(quitEventLoop()), _eventLoop, SLOT(quit()));
 
   delete _http;
@@ -370 +320 @@
   connect(_http, SIGNAL(requestFinished(int, bool)), 
           this, SLOT(slotRequestFinished(int, bool)));
-  connect(_http, SIGNAL(sslErrors(const QList<QSslError>&)), 
-          this, SLOT(slotSslErrors(const QList<QSslError>&)));
 
   _buffer = new QBuffer();
@@ -379 +327 @@
   _http->request(request, 0, _buffer);
 
+  ///  _eventLoop->exec(QEventLoop::ExcludeUserInputEvents);
+
+  cout << "before return" << endl;
   return success;
 }
-
-// void startQuery(...)
-// {
-//      m_eventLoop = new QEventLoop(this);
-//      connect(this, SIGNAL(singleQueryDone()), m_eventLoop, SLOT(quit()));
-//      connect( qHttp, SIGNAL( requestFinished(int,bool) ), this,
-//              SLOT( dataDone(int, bool) ) );
-//      qHttp->request( header, QByteArray(), m_buffer );
-// }
-// 
-// void dataDone( int, bool )
-// {
-//      emit singleQueryDone();
-// }
-// 
-// void blockingThing()
-// {
-//         startQuery( );
-//         m_eventLoop->exec(QEventLoop::ExcludeUserInputEvents);
-// }
-//