Changeset 6086 in ntrip for trunk/BNC/src

Timestamp:

Sep 7, 2014, 6:47:31 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/PPP_free

Files:

• bncmodel.cpp (modified) (2 diffs)
• bncmodel.h (modified) (3 diffs)
• pppClient.cpp (modified) (4 diffs)

trunk/BNC/src/PPP_free/bncmodel.cpp

@@ -46 +46 @@
 #include "bncmodel.h"
 #include "pppClient.h"
-#include "bncpppclient.h"
-#include "bnccore.h"
-#include "bncpppclient.h"
 #include "bancroft.h"
 #include "bncutils.h"
@@ -152 +149 @@
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
-bncModel::bncModel(bncPPPclient* pppClient) {
+bncModel::bncModel(t_pppClient* pppClient) {
 
   _pppClient = pppClient;

trunk/BNC/src/PPP_free/bncmodel.h

@@ -37 +37 @@
 namespace BNC_PPP {
 
-class bncPPPclient;
+class t_pppClient;
 class t_pppOptions;
 class t_epoData;
@@ -63 +63 @@
 class bncModel {
  public:
-  bncModel(bncPPPclient* pppClient);
+  bncModel(t_pppClient* pppClient);
   ~bncModel();
   t_irc update(t_epoData* epoData);
@@ -145 +145 @@
   };
 
-  bncPPPclient*         _pppClient;
+  t_pppClient*          _pppClient;
   const t_pppOptions*   _opt;
   bncTime               _time;

trunk/BNC/src/PPP_free/pppClient.cpp

@@ -43 +43 @@
 #include <sstream>
 
-#include "bncpppclient.h"
-#include "bnccore.h"
+#include "pppClient.h"
+#include "pppOptions.h"
 #include "bncutils.h"
 #include "bncconst.h"
 #include "bncmodel.h"
-#include "pppOptions.h"
-#include "pppClient.h"
 
 using namespace BNC_PPP;
@@ -69 +67 @@
 
   _opt       = new t_pppOptions(*opt);
-  _staID     = QByteArray(_opt->_roverName.c_str())
   _model     = new bncModel(this);
   _epoData   = new t_epoData();
+  _staID     = QByteArray(_opt->_roverName.c_str());
   PPP_CLIENT = this;
 }
@@ -78 +76 @@
 ////////////////////////////////////////////////////////////////////////////
 t_pppClient::~t_pppClient() {
-  _epoData->clear();
-
-  QMapIterator<QString, t_corr*> ic(_corr);
-  while (ic.hasNext()) {
-    ic.next();
-    delete ic.value();
-  }
-
-  QMapIterator<QString, t_bias*> ib(_bias);
-  while (ib.hasNext()) {
-    ib.next();
-    delete ib.value();
-  }
-
   delete _model;
   delete _epoData;
@@ -246 +230 @@
 // 
 //////////////////////////////////////////////////////////////////////////////
+void t_pppClient::putBiases(const std::vector<t_satBias*>& /* satBias */) {
+}
+
+// 
+//////////////////////////////////////////////////////////////////////////////
 void t_pppClient::putEphemeris(const t_eph* eph) {
   const t_ephGPS* ephGPS = dynamic_cast<const t_ephGPS*>(eph);