Changeset 6086 in ntrip for trunk/BNC/src


Ignore:
Timestamp:
Sep 7, 2014, 6:47:31 PM (10 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/src/PPP_free
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/PPP_free/bncmodel.cpp

    r6065 r6086  
    4646#include "bncmodel.h"
    4747#include "pppClient.h"
    48 #include "bncpppclient.h"
    49 #include "bnccore.h"
    50 #include "bncpppclient.h"
    5148#include "bancroft.h"
    5249#include "bncutils.h"
     
    152149// Constructor
    153150////////////////////////////////////////////////////////////////////////////
    154 bncModel::bncModel(bncPPPclient* pppClient) {
     151bncModel::bncModel(t_pppClient* pppClient) {
    155152
    156153  _pppClient = pppClient;
  • trunk/BNC/src/PPP_free/bncmodel.h

    r6060 r6086  
    3737namespace BNC_PPP {
    3838
    39 class bncPPPclient;
     39class t_pppClient;
    4040class t_pppOptions;
    4141class t_epoData;
     
    6363class bncModel {
    6464 public:
    65   bncModel(bncPPPclient* pppClient);
     65  bncModel(t_pppClient* pppClient);
    6666  ~bncModel();
    6767  t_irc update(t_epoData* epoData);
     
    145145  };
    146146
    147   bncPPPclient*         _pppClient;
     147  t_pppClient*          _pppClient;
    148148  const t_pppOptions*   _opt;
    149149  bncTime               _time;
  • trunk/BNC/src/PPP_free/pppClient.cpp

    r6085 r6086  
    4343#include <sstream>
    4444
    45 #include "bncpppclient.h"
    46 #include "bnccore.h"
     45#include "pppClient.h"
     46#include "pppOptions.h"
    4747#include "bncutils.h"
    4848#include "bncconst.h"
    4949#include "bncmodel.h"
    50 #include "pppOptions.h"
    51 #include "pppClient.h"
    5250
    5351using namespace BNC_PPP;
     
    6967
    7068  _opt       = new t_pppOptions(*opt);
    71   _staID     = QByteArray(_opt->_roverName.c_str())
    7269  _model     = new bncModel(this);
    7370  _epoData   = new t_epoData();
     71  _staID     = QByteArray(_opt->_roverName.c_str());
    7472  PPP_CLIENT = this;
    7573}
     
    7876////////////////////////////////////////////////////////////////////////////
    7977t_pppClient::~t_pppClient() {
    80   _epoData->clear();
    81 
    82   QMapIterator<QString, t_corr*> ic(_corr);
    83   while (ic.hasNext()) {
    84     ic.next();
    85     delete ic.value();
    86   }
    87 
    88   QMapIterator<QString, t_bias*> ib(_bias);
    89   while (ib.hasNext()) {
    90     ib.next();
    91     delete ib.value();
    92   }
    93 
    9478  delete _model;
    9579  delete _epoData;
     
    246230//
    247231//////////////////////////////////////////////////////////////////////////////
     232void t_pppClient::putBiases(const std::vector<t_satBias*>& /* satBias */) {
     233}
     234
     235//
     236//////////////////////////////////////////////////////////////////////////////
    248237void t_pppClient::putEphemeris(const t_eph* eph) {
    249238  const t_ephGPS* ephGPS = dynamic_cast<const t_ephGPS*>(eph);
Note: See TracChangeset for help on using the changeset viewer.