Changeset 3255 in ntrip for trunk/BNC/upload

Timestamp:

Apr 3, 2011, 1:18:26 PM (14 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/upload

Files:

• bncephuploadcaster.cpp (modified) (3 diffs)
• bncrtnetuploadcaster.cpp (modified) (1 diff)

trunk/BNC/upload/bncephuploadcaster.cpp ¶

@@ -27 +27 @@
 
   QString mountpoint = settings.value("uploadEphMountpoint").toString();
-  QString outHost    = settings.value("uploadEphHost").toString();
-  int     outPort    = settings.value("uploadEphPort").toInt();
-  QString password   = settings.value("uploadEphPassword").toString();
+  if (mountpoint.isEmpty()) {
+    _ephUploadCaster = 0;
+  }
+  else {
+    QString outHost    = settings.value("uploadEphHost").toString();
+    int     outPort    = settings.value("uploadEphPort").toInt();
+    QString password   = settings.value("uploadEphPassword").toString();
 
-  _ephUploadCaster = new bncUploadCaster(mountpoint, outHost, outPort, 
+    _ephUploadCaster = new bncUploadCaster(mountpoint, outHost, outPort, 
                                          password, -1);
 
-  connect(_ephUploadCaster, SIGNAL(newBytes(QByteArray,double)), 
+    connect(_ephUploadCaster, SIGNAL(newBytes(QByteArray,double)), 
           this, SIGNAL(newBytes(QByteArray,double)));
 
-  _ephUploadCaster->start();
+    _ephUploadCaster->start();
+  }
 }
 
@@ -43 +48 @@
 ////////////////////////////////////////////////////////////////////////////
 bncEphUploadCaster::~bncEphUploadCaster() {
-  _ephUploadCaster->deleteSafely();
+  if (_ephUploadCaster) {
+    _ephUploadCaster->deleteSafely();
+  }
 }
 
@@ -49 +56 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncEphUploadCaster::ephBufferChanged() {
-
+  if (_ephUploadCaster) {
+    QByteArray dummy = "from bncEphUploadCaster";
+    _ephUploadCaster->setOutBuffer(dummy);
+  }
 }

trunk/BNC/upload/bncrtnetuploadcaster.cpp ¶

@@ -444 +444 @@
 
   outLine.sprintf("%d %.1f %s  %3d  %10.3f  %8.3f %8.3f %8.3f\n", 
-                  GPSweek, GPSweeks, eph->prn().c_str(),
+                  GPSweek, GPSweeks, eph->prn().toAscii().data(),
                   eph->IOD(), dClk, rsw(1), rsw(2), rsw(3));