Changeset 3273 in ntrip

Timestamp:

Apr 10, 2011, 12:05:47 PM (14 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/upload

Files:

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

trunk/BNC/upload/bncephuploadcaster.cpp

@@ -32 +32 @@
   }
   else {
-    QString outHost    = settings.value("uploadEphHost").toString();
-    int     outPort    = settings.value("uploadEphPort").toInt();
-    QString password   = settings.value("uploadEphPassword").toString();
+    QString outHost  = settings.value("uploadEphHost").toString();
+    int     outPort  = settings.value("uploadEphPort").toInt();
+    QString password = settings.value("uploadEphPassword").toString();
+    int     sampl    = settings.value("uploadSampl").toInt();
 
     _ephUploadCaster = new bncUploadCaster(mountpoint, outHost, outPort, 
-                                         password, -1);
+                                           password, -1, sampl);
 
     connect(_ephUploadCaster, SIGNAL(newBytes(QByteArray,double)), 

trunk/BNC/upload/bncrtnetuploadcaster.cpp

@@ -33 +33 @@
                                  const QString& rnxFileName,
                                  const QString& outFileName, int iRow) :
-               bncUploadCaster(mountpoint, outHost, outPort, password, iRow) {
+  bncUploadCaster(mountpoint, outHost, outPort, password, iRow, 0) {
 
   _crdTrafo   = crdTrafo;

trunk/BNC/upload/bncuploadcaster.cpp

@@ -27 +27 @@
 bncUploadCaster::bncUploadCaster(const QString& mountpoint,
                                  const QString& outHost, int outPort,
-                                 const QString& password, int iRow) {
+                                 const QString& password, int iRow, 
+                                 int rate) {
   _mountpoint    = mountpoint;
   _outHost       = outHost;
@@ -35 +36 @@
   _sOpenTrial    = 0;
   _iRow          = iRow;
+  _rate          = rate;
+  if      (_rate < 5) {
+    _rate = 5;
+  }
+  else if (_rate > 60) {
+    _rate = 60;
+  }
   _isToBeDeleted = false;
 
@@ -81 +89 @@
       emit newBytes(_mountpoint.toAscii(), _outBuffer.size());
     }
-    sleep(5);
+    sleep(_rate);
   }
 }

trunk/BNC/upload/bncuploadcaster.h

@@ -9 +9 @@
   bncUploadCaster(const QString& mountpoint,
                   const QString& outHost, int outPort,
-                  const QString& password, int iRow);
+                  const QString& password, int iRow, int rate);
   virtual void deleteSafely();
   void setOutBuffer(const QByteArray& outBuffer) {
@@ -37 +37 @@
   QDateTime   _outSocketOpenTime;
   int         _iRow;
+  int         _rate;
 };