Changeset 6067 in ntrip

Timestamp:

Sep 7, 2014, 10:10:02 AM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/PPP_free

Files:

• bncpppclient.cpp (modified) (1 diff)
• bncpppclient.h (modified) (1 diff)
• pppClient.cpp (modified) (3 diffs)
• pppClient.h (modified) (2 diffs)

trunk/BNC/src/PPP_free/bncpppclient.cpp

@@ -55 +55 @@
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
-bncPPPclient::bncPPPclient(QByteArray staID, t_pppOptions* opt) : bncEphUser(false) {
+bncPPPclient::bncPPPclient(QByteArray staID, const t_pppOptions* opt) : bncEphUser(false) {
 
   _opt   = opt;

trunk/BNC/src/PPP_free/bncpppclient.h

@@ -40 +40 @@
 class bncPPPclient : public bncEphUser {
  public:
-  bncPPPclient(QByteArray staID, t_pppOptions* opt);
+  bncPPPclient(QByteArray staID, const t_pppOptions* opt);
   ~bncPPPclient();
   void                putNewObs(const t_obs& pp);

trunk/BNC/src/PPP_free/pppClient.cpp

@@ -58 +58 @@
 // Global variable holding thread-specific pointers
 //////////////////////////////////////////////////////////////////////////////
-t_pppClient* CLIENT = 0;
+t_pppClient* PPP_CLIENT = 0;
 
 // Static function returning thread-specific pointer
 //////////////////////////////////////////////////////////////////////////////
 t_pppClient* t_pppClient::instance() {
-  return CLIENT;
+  return PPP_CLIENT;
 }
 
@@ -69 +69 @@
 //////////////////////////////////////////////////////////////////////////////
 t_pppClient::t_pppClient(const t_pppOptions* opt) {
-  _opt      = new t_pppOptions(*opt);
-  _log      = new ostringstream();
-  CLIENT = this;
+  _opt       = new t_pppOptions(*opt);
+  _log       = new ostringstream();
+  _client    = new bncPPPclient(QByteArray(_opt->_roverName.c_str()), _opt);
+  PPP_CLIENT = this;
 }
 
@@ -79 +80 @@
   delete _log;
   delete _opt;
+  delete _client;
 }
 

trunk/BNC/src/PPP_free/pppClient.h

@@ -7 +7 @@
 #include "ephemeris.h"
 #include "pppOptions.h"
-
-class bncAntex;
+#include "bncpppclient.h"
 
 namespace BNC_PPP {
@@ -23 +22 @@
   void processEpoch(const std::vector<t_satObs*>& satObs, t_output* output);
 
+  static t_pppClient* instance();
   std::ostringstream& log() {return *_log;}
-  const t_pppOptions* opt() const {return _opt;}
-
-  static t_pppClient* instance();
 
  private:
-  std::ostringstream*       _log; 
-  t_pppOptions*             _opt; 
+  std::ostringstream* _log; 
+  t_pppOptions*       _opt;
+  bncPPPclient*       _client;
 };
 
 }; // namespace BNC_PPP
 
-#define PPP_CLIENT (BNC_PPP::t_pppClient::instance())
-#define LOG        (BNC_PPP::t_pppClient::instance()->log())
-#define OPT        (BNC_PPP::t_pppClient::instance()->opt())
+#define LOG (BNC_PPP::t_pppClient::instance()->log())
 
 #endif