Changeset 2909 in ntrip for trunk


Ignore:
Timestamp:
Jan 27, 2011, 2:31:39 PM (14 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/BNC/bnc.pro

    r2904 r2909  
    22# Switch to debug configuration
    33# -----------------------------
    4 CONFIG -= release
    5 CONFIG += debug
     4CONFIG -= debug
     5CONFIG += release
    66
    77

  • trunk/BNC/bncapp.cpp

    r2907 r2909  
    114114    _GLOFreq[ii] = 0;
    115115  }
    116 
    117 #ifdef USE_COMBINATION
    118   _bncComb = new bncComb();
    119   if (_bncComb->nStreams() < 2) {
    120     delete _bncComb;
    121     _bncComb = 0;
    122   }
    123 #endif
    124116}
    125117
    … …  
    876868  }
    877869}
     870
     871//
     872////////////////////////////////////////////////////////////////////////////
     873void bncApp::initCombination() {
     874#ifdef USE_COMBINATION
     875  _bncComb = new bncComb();
     876  if (_bncComb->nStreams() < 2) {
     877    delete _bncComb;
     878    _bncComb = 0;
     879  }
     880#endif
     881}

  • trunk/BNC/bncapp.h

    r2865 r2909  
    5151    void storeGlonassSlotNums(const int GLOFreq[]);
    5252    void getGlonassSlotNums(int GLOFreq[]);
     53    void initCombination();
    5354
    5455  public slots:

  • trunk/BNC/bncmain.cpp

    r2832 r2909  
    132132    app.setPort(settings.value("outEphPort").toInt());
    133133    app.setPortCorr(settings.value("corrPort").toInt());
     134    app.initCombination();
    134135
    135136    app.connect(caster, SIGNAL(getThreadsFinished()), &app, SLOT(quit()));
    … …  
    160161      caster->addGetThread(getThread, true);
    161162    }
     163
    162164  }
    163165

  • trunk/BNC/bncwindow.cpp

    r2907 r2909  
    13001300  ((bncApp*)qApp)->setPort(_outEphPortLineEdit->text().toInt());
    13011301  ((bncApp*)qApp)->setPortCorr(_corrPortLineEdit->text().toInt());
     1302  ((bncApp*)qApp)->initCombination();
    13021303
    13031304  connect(_caster, SIGNAL(getThreadsFinished()),
Note: See TracChangeset for help on using the changeset viewer.