Changeset 6065 in ntrip for trunk/BNC

Timestamp:

Sep 7, 2014, 9:58:10 AM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/PPP_free

Files:

• bncmodel.cpp (modified) (3 diffs)
• bncpppclient.cpp (modified) (7 diffs)
• bncpppclient.h (modified) (2 diffs)

trunk/BNC/src/PPP_free/bncmodel.cpp

@@ -590 +590 @@
   // ----------------------
   if (update_p(epoData) != success) {
-    _pppClient->emitNewMessage(_log, false);
+    LOG << _log.data() << endl;
     return failure;
   }
@@ -642 +642 @@
   strB << '\n';
   _log += strB.str().c_str();
-  _pppClient->emitNewMessage(_log, false);
+  LOG << _log.data() << endl;
 
   // Final Message (both log file and screen)
@@ -675 +675 @@
   }
 
-  _pppClient->emitNewMessage(QByteArray(strC.str().c_str()), true);
+  LOG << strC.str() << endl;
 
   delete newPos;

trunk/BNC/src/PPP_free/bncpppclient.cpp

@@ -55 +55 @@
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
-bncPPPclient::bncPPPclient(QByteArray staID, t_pppOptions* opt, bool connectSlots) :
-  bncEphUser(connectSlots) {
-
-  if (opt) {
-    _opt      = opt;
-    _optOwner = false;
-  }
-  else {
-    _opt      = new t_pppOptions();
-    _optOwner = true;
-  }
-
+bncPPPclient::bncPPPclient(QByteArray staID, t_pppOptions* opt) : bncEphUser(false) {
+
+  _opt   = opt;
   _staID = staID;
-
   _model = new bncModel(this);
-
-  if (connectSlots) {
-    connect(this, SIGNAL(newMessage(QByteArray,bool)), 
-            BNC_CORE, SLOT(slotMessage(const QByteArray,bool)));
-
-    connect(BNC_CORE, SIGNAL(newCorrections(QList<QString>)),
-            this, SLOT(slotNewCorrections(QList<QString>)));
-
-    connect(BNC_CORE, SIGNAL(providerIDChanged(QString)),
-            this, SLOT(slotProviderIDChanged(QString)));
-  }
 }
 
@@ -86 +65 @@
 ////////////////////////////////////////////////////////////////////////////
 bncPPPclient::~bncPPPclient() {
-  delete _model;
   while (!_epoData.empty()) {
     delete _epoData.front();
@@ -101 +79 @@
     delete ib.value();
   }
-  if (_optOwner) {
-    delete _opt;
-  }
+  delete _model;
 }
 
@@ -257 +233 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void bncPPPclient::slotNewCorrections(QList<QString> corrList) {
+void bncPPPclient::putNewCorrections(QList<QString> corrList) {
   QMutexLocker locker(&_mutex);
 
@@ -472 +448 @@
   }
 
-  emit newMessage(msg.toAscii(), false);
+  LOG << msg.toAscii() << endl;
 #endif // BNC_DEBUG
 
@@ -493 +469 @@
   // ---------------
   if (_model->update(_epoData.front()) == success) {
-    emit newPosition(_model->time(), _model->x(), _model->y(), _model->z());
+    ///    emit newPosition(_model->time(), _model->x(), _model->y(), _model->z());
   }
 }
@@ -533 +509 @@
   }
 }
-
-// 
-////////////////////////////////////////////////////////////////////////////
-void bncPPPclient::slotProviderIDChanged(QString mountPoint) {
-  QMutexLocker locker(&_mutex);
-
-  if (mountPoint != QString(_opt->_corrMount.c_str())) {
-    return;
-  }
-  emit newMessage("bncPPPclient " + _staID + ": Provider Changed: " + mountPoint.toAscii() + "\n", true);
-
-  delete _model;
-  _model = new bncModel(this);
-
-  while (!_epoData.empty()) {
-    delete _epoData.front();
-    _epoData.pop();
-  }
-
-  QMapIterator<QString, t_corr*> ic(_corr);
-  while (ic.hasNext()) {
-    ic.next();
-    delete ic.value();
-  }
-  _corr.clear();
- 
-  QMapIterator<QString, t_bias*> ib(_bias);
-  while (ib.hasNext()) {
-    ib.next();
-    delete ib.value();
-  }
-  _bias.clear();
-}

trunk/BNC/src/PPP_free/bncpppclient.h

@@ -117 +117 @@
 
 class bncPPPclient : public bncEphUser {
- Q_OBJECT
+ public:
+  bncPPPclient(QByteArray staID, t_pppOptions* opt);
+  ~bncPPPclient();
+  void                putNewObs(const t_obs& pp);
+  void                putNewCorrections(QList<QString> corrList);
 
- public:
-  bncPPPclient(QByteArray staID, t_pppOptions* opt = 0, bool connectSlots = true);
-  ~bncPPPclient();
-  void putNewObs(const t_obs& pp);
-  static t_irc applyCorr(const bncTime& tt, const t_corr* cc, ColumnVector& xc, 
-                         ColumnVector& vv);
-  QByteArray staID() const {return _staID;}
+  QByteArray          staID() const {return _staID;}
   const t_pppOptions* opt() const {return _opt;}
-  void emitNewMessage(QByteArray msg, bool showOnScreen) {
-    emit newMessage(msg, showOnScreen);
-  }
-  void emitNewNMEAstr(QByteArray str) {
-    emit newNMEAstr(str);
-  }
 
- public slots:
-  void slotNewCorrections(QList<QString> corrList);
-  void slotProviderIDChanged(QString mountPoint);
+  static t_irc applyCorr(const bncTime& tt, const t_corr* cc, ColumnVector& xc, ColumnVector& vv);
 
- signals:
-  void newMessage(QByteArray msg, bool showOnScreen);
-  void newPosition(bncTime time, double x, double y, double z);
-  void newNMEAstr(QByteArray str);
 
  private:
@@ -163 +149 @@
   t_irc cmpToT(t_satData* satData);
 
-  t_pppOptions*           _opt;
-  bool                    _optOwner;
+  const t_pppOptions*     _opt;
   QByteArray              _staID;
   QMap<QString, t_corr*>  _corr;