Changeset 6065 in ntrip for trunk/BNC/src/PPP_free/bncpppclient.cpp

Timestamp:

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

Author:

mervart

Message:

 

File:

• trunk/BNC/src/PPP_free/bncpppclient.cpp (modified) (7 diffs)

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