Changeset 3640 in ntrip


Ignore:
Timestamp:
Jan 24, 2012, 11:25:59 AM (12 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/BNC/bncephuser.cpp

    r3576 r3640  
    4848// Constructor
    4949////////////////////////////////////////////////////////////////////////////
    50 bncEphUser::bncEphUser() {
    51 
    52   connect(((bncApp*)qApp), SIGNAL(newEphGPS(gpsephemeris)),
    53           this, SLOT(slotNewEphGPS(gpsephemeris)), Qt::DirectConnection);
    54 
    55   connect(((bncApp*)qApp), SIGNAL(newEphGlonass(glonassephemeris)),
    56           this, SLOT(slotNewEphGlonass(glonassephemeris)), Qt::DirectConnection);
    57 
    58   connect(((bncApp*)qApp), SIGNAL(newEphGalileo(galileoephemeris)),
    59           this, SLOT(slotNewEphGalileo(galileoephemeris)), Qt::DirectConnection);
     50bncEphUser::bncEphUser(bool connectSlots) {
     51
     52  if (connectSlots) {
     53    connect(((bncApp*)qApp), SIGNAL(newEphGPS(gpsephemeris)),
     54            this, SLOT(slotNewEphGPS(gpsephemeris)), Qt::DirectConnection);
     55   
     56    connect(((bncApp*)qApp), SIGNAL(newEphGlonass(glonassephemeris)),
     57            this, SLOT(slotNewEphGlonass(glonassephemeris)), Qt::DirectConnection);
     58   
     59    connect(((bncApp*)qApp), SIGNAL(newEphGalileo(galileoephemeris)),
     60            this, SLOT(slotNewEphGalileo(galileoephemeris)), Qt::DirectConnection);
     61  }
    6062}
    6163

  • trunk/BNC/bncephuser.h

    r3521 r3640  
    7979
    8080 public:
    81   bncEphUser();
     81  bncEphUser(bool connectSlots = true);
    8282  virtual ~bncEphUser();
    8383

  • trunk/BNC/bncpppclient.cpp

    r3639 r3640  
    5454// Constructor
    5555////////////////////////////////////////////////////////////////////////////
    56 bncPPPclient::bncPPPclient(QByteArray staID, t_pppOpt* opt) {
     56bncPPPclient::bncPPPclient(QByteArray staID, t_pppOpt* opt, bool connectSlots) :
     57  bncEphUser(connectSlots) {
    5758
    5859  if (opt) {
    … …  
    6970  _model = new bncModel(this);
    7071
    71   connect(this, SIGNAL(newMessage(QByteArray,bool)),
    72           ((bncApp*)qApp), SLOT(slotMessage(const QByteArray,bool)));
    73 
    74   connect(((bncApp*)qApp), SIGNAL(newCorrections(QList<QString>)),
    75           this, SLOT(slotNewCorrections(QList<QString>)));
     72  if (connectSlots) {
     73    connect(this, SIGNAL(newMessage(QByteArray,bool)),
     74            ((bncApp*)qApp), SLOT(slotMessage(const QByteArray,bool)));
     75
     76    connect(((bncApp*)qApp), SIGNAL(newCorrections(QList<QString>)),
     77            this, SLOT(slotNewCorrections(QList<QString>)));
     78  }
    7679}
    7780

  • trunk/BNC/bncpppclient.h

    r3638 r3640  
    122122
    123123 public:
    124   bncPPPclient(QByteArray staID, t_pppOpt* opt = 0);
     124  bncPPPclient(QByteArray staID, t_pppOpt* opt = 0, bool connectSlots = true);
    125125  ~bncPPPclient();
    126126  void putNewObs(const t_obs& pp);
Note: See TracChangeset for help on using the changeset viewer.