Changeset 1698 in ntrip for trunk/BNS/bnscaster.cpp

Timestamp:

Mar 4, 2009, 11:15:46 AM (15 years ago)

Author:

mervart

Message:

* empty log message *

File:

• trunk/BNS/bnscaster.cpp (modified) (5 diffs)

trunk/BNS/bnscaster.cpp

@@ -24 +24 @@
 ////////////////////////////////////////////////////////////////////////////
 t_bnscaster::t_bnscaster(const QString& mountpoint, const QString& outFileName,
-                         const QString& refSys, const int ic) {
-
-  _mountpoint         = mountpoint;
-  _outSocket          = 0;
-  _outSocketOpenTrial = 0;
-  _ic = ic;
+                         int ic) {
 
   bnsSettings settings;
 
-  QIODevice::OpenMode oMode;
-  if (Qt::CheckState(settings.value("fileAppend").toInt()) == Qt::Checked) {
-    oMode = QIODevice::WriteOnly | QIODevice::Unbuffered | QIODevice::Append;
-  }
-  else {
-    oMode = QIODevice::WriteOnly | QIODevice::Unbuffered;
-  }
+  _mountpoint = mountpoint;
+  _ic         = ic;
+  _outSocket  = 0;
+  _sOpenTrial = 0;
 
   if (outFileName.isEmpty()) {
@@ -47 +39 @@
   else {
     _outFile = new QFile(outFileName);
+
+    QIODevice::OpenMode oMode;
+    if (Qt::CheckState(settings.value("fileAppend").toInt()) == Qt::Checked) {
+      oMode = QIODevice::WriteOnly | QIODevice::Unbuffered | QIODevice::Append;
+    }
+    else {
+      oMode = QIODevice::WriteOnly | QIODevice::Unbuffered;
+    }
+
     if (_outFile->open(oMode)) {
       _outStream = new QTextStream(_outFile);
@@ -54 +55 @@
   // Reference frame
   // ---------------
-  _crdTrafo = false;
-  if (refSys == "ETRF2000") {
+  if (settings.value(QString("refSys_%1").arg(_ic)).toString() == "ETRF2000") {
     _crdTrafo = true;
+  }
+  else {
+    _crdTrafo = false;
+  }
+
+  if ( Qt::CheckState(settings.value(QString("beClocks%1").arg(_ic)).toInt()) 
+       == Qt::Checked ) {
+    _beClocks = true;
+  }
+  else {
+    _beClocks = false;
   }
 }
@@ -83 +94 @@
   delete _outSocket; _outSocket = 0;
 
-  double minDt = pow(2.0,_outSocketOpenTrial);
-  if (++_outSocketOpenTrial > 8) {
-    _outSocketOpenTrial = 8;
+  double minDt = pow(2.0,_sOpenTrial);
+  if (++_sOpenTrial > 8) {
+    _sOpenTrial = 8;
   }
   if (_outSocketOpenTime.isValid() &&
@@ -130 +141 @@
     delete _outSocket;
     _outSocket = 0;
-//  emit(newMessage("t_bnscaster::open  socket deleted"));
-    emit(newMessage("Broadcaster: Connection broken")); // weber
+    emit(newMessage("Broadcaster: Connection broken"));
   }
   else {
-//  emit(newMessage("t_bnscaster::open  socket OK"));
-    emit(newMessage("Broadcaster: Connection opened")); // weber
-    _outSocketOpenTrial = 0;
+    emit(newMessage("Broadcaster: Connection opened"));
+    _sOpenTrial = 0;
   }
 }