Changeset 366 in ntrip for trunk/BNC/bncgetthread.cpp

Timestamp:

Jan 17, 2007, 4:17:20 PM (17 years ago)

Author:

mervart

Message:

* empty log message *

File:

• trunk/BNC/bncgetthread.cpp (modified) (6 diffs)

trunk/BNC/bncgetthread.cpp

@@ -61 +61 @@
 ////////////////////////////////////////////////////////////////////////////
 bncGetThread::bncGetThread(const QUrl& mountPoint, 
-                           const QByteArray& format, int iMount) {
+                           const QByteArray& format,
+                           const QByteArray& latitude,
+                           const QByteArray& longitude,
+                           const QByteArray& nmea, int iMount) {
   _decoder    = 0;
   _mountPoint = mountPoint;
@@ -67 +70 @@
   _staID_orig = _staID;
   _format     = format;
+  _latitude   = latitude;
+  _longitude  = longitude;
+  _nmea       = nmea;
   _socket     = 0;
   _timeOut    = 20*1000;  // 20 seconds
@@ -105 +111 @@
 // Connect to Caster, send the Request (static)
 ////////////////////////////////////////////////////////////////////////////
-QTcpSocket* bncGetThread::request(const QUrl& mountPoint, int timeOut, 
+QTcpSocket* bncGetThread::request(const QUrl& mountPoint,
+                                  QByteArray& latitude, QByteArray& longitude,
+                                  QByteArray& nmea, int timeOut, 
                                   QString& msg) {
 
@@ -160 +168 @@
 
   double lat, lon;
-  lat = settings.value("approxLat", 0).toDouble();
-  lon = settings.value("approxLon", 0).toDouble();
-  if ((lat != 0.0) && (lon != 0.0) && (hlp.path().length() > 2) && (hlp.path().indexOf(".skl") < 0)) {
+
+  lat = strtod(latitude,NULL);
+  lon = strtod(longitude,NULL);
+
+  if ((nmea == "VRS") && (hlp.path().length() > 2) && (hlp.path().indexOf(".skl") < 0)) {
     const char* flagN="N";
     const char* flagE="E";
@@ -221 +231 @@
   QString msg;
 
-  _socket = bncGetThread::request(_mountPoint, _timeOut, msg);
+  _socket = bncGetThread::request(_mountPoint, _latitude, _longitude, _nmea, _timeOut, msg);
 
   ////  emit(newMessage(msg.toAscii()));
@@ -361 +371 @@
           emit newObs(_staID, *it);
           bool firstObs = (it == _decoder->_obsList.begin());
-          _global_caster->newObs(_staID, _mountPoint, firstObs, *it, _format);
+          _global_caster->newObs(_staID, _mountPoint, firstObs, *it, _format, _latitude, _longitude, _nmea);
         }
         _decoder->_obsList.clear();