Changeset 1698 in ntrip for trunk

Timestamp:

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

Author:

mervart

Message:

* empty log message *

Location:

trunk

Files:

• BNC/todo.txt (modified) (1 diff)
• BNS/bns.cpp (modified) (3 diffs)
• BNS/bnscaster.cpp (modified) (5 diffs)
• BNS/bnscaster.h (modified) (3 diffs)

trunk/BNC/todo.txt

@@ -3 +3 @@
 BNS
 =========================
-(1) Check transformation from earth-centered-earth-fixed to
-radial-tangential-normal frame in bnsutils.cpp. Should follow
-Gerhards paper 012-2009-SC104-528.
-
-(2) Zero Clock Corrections
-Loukis wishes to have one stream (for combination purposes)
-which provides the original clocks from the BE (no corrections).
-We also may need such a stream as soon as we start with the
-absolute clocks. Reason: At some point in time we may want
-to compare our clocks with the IGS clocks. If we have
-"BE clocks" (2nd order relativistic effect taken out) we could
-add our absolute clocks and end up with clocks we can compare
-with IGS clocks.
-I remember that we once implemented a hard-coded option
-for that in bns.cpp for Gerhard Wuebbena. I have added the solution
-for Gerhard as comment lines to bns.cpp, see lines 385 ff.
-To send zero clock corrections (BE clocks) I have added options
-"beClocks1" and "beClocks2" (for Broadcast Clocks) to BNS.
-Shall we discuss this on the phone if you are not convinced?
-
-
-BNC & BNS & RTNet
-=========================
-(1) Update to new version of clock_orbit_rtcm.c
-done in BNC and BNS. However, both run in
-"OLD" mode, see  DEFINES += OLD in bnc.pro and bns.pro.
-Main issue: Introduction of new messages for 
-URA and high-rate clocks.
-
 
 BNC

trunk/BNS/bns.cpp

@@ -75 +75 @@
   // -------------------------------------------
   for (int ic = 1; ic <= 2; ic++) {
-
     QString mountpoint  = settings.value(QString("mountpoint_%1").arg(ic)).toString();
     QString outFileName = settings.value(QString("outFile_%1").arg(ic)).toString();
     if (!mountpoint.isEmpty() || !outFileName.isEmpty()) {
-      QString refSys      = settings.value(QString("refSys_%1").arg(ic)).toString();
-
-      _caster.push_back(new t_bnscaster(mountpoint, outFileName, refSys, ic));
+      _caster.push_back(new t_bnscaster(mountpoint, outFileName, ic));
       connect(_caster.back(), SIGNAL(error(const QByteArray)),
               this, SLOT(slotError(const QByteArray)));
@@ -373 +370 @@
             prns << prn;
             if ( _ephList.contains(prn) ) {
-              in >> xx(1) >> xx(2) >> xx(3) >> xx(4);
+              in >> xx(1) >> xx(2) >> xx(3) >> xx(4) >> xx(5);
               xx(1) *= 1e3;
               xx(2) *= 1e3;
@@ -379 +376 @@
               xx(4) *= 1e-6;
 
-    //// in >> xx(1) >> xx(2) >> xx(3) >> xx(4) >> xx(5); xx(4) *= 1e-6;
-    ////
-    //// beg test (zero clock correction for Gerhard Wuebbena)
-    ////            xx(4) -= xx(5) / 299792458.0;
-    //// end test
-    ////
-    //// Falls Clocks aus den Broadcast Ephemeris gewuenscht:
-    //// (2nd order relativistic effect taken out for
-    //// compatibility with IGS products?)
-    ////
-    //// if ( Qt::CheckState(settings.value("beClocks1 oder beClocks2").toInt()) == Qt::Checked) {
-    ////  .....
-    //// }
+              // Clocks without corrections 
+              // --------------------------
+              if ( _caster.at(ic)->beClocks() ) {
+                xx(4) -= xx(5) / 299792458.0;
+              } 
       
               t_ephPair* pair = _ephList[prn];

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;
   }
 }

trunk/BNS/bnscaster.h

@@ -7 +7 @@
  Q_OBJECT
  public:
-  t_bnscaster(const QString& mountpoint, const QString& outFileName, 
-              const QString& refSys, int ic);
+  t_bnscaster(const QString& mountpoint, const QString& outFileName, int ic);
   virtual ~t_bnscaster();
   void open();
@@ -15 +14 @@
   bool usedSocket() const {return _outSocket;}
   bool crdTrafo() const {return _crdTrafo;}
+  bool beClocks() const {return _beClocks;}
   int  ic() const {return _ic;}
 
@@ -24 +24 @@
   QString      _mountpoint;
   QTcpSocket*  _outSocket;
-  int          _outSocketOpenTrial;
+  int          _sOpenTrial;
   QDateTime    _outSocketOpenTime;
   QFile*       _outFile;
   QTextStream* _outStream;
   bool         _crdTrafo;
+  bool         _beClocks;
   int          _ic;
 };