Changeset 10153 in ntrip


Ignore:
Timestamp:
Aug 9, 2023, 1:41:23 PM (11 months ago)
Author:
stuerze
Message:

some changes regarding the combination

Location:
trunk/BNC/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/bncwindow.cpp

    r10127 r10153  
    495495  _cmbSamplSpinBox->setMinimum(0);
    496496  _cmbSamplSpinBox->setMaximum(60);
    497   _cmbSamplSpinBox->setSingleStep(10);
     497  _cmbSamplSpinBox->setSingleStep(5);
    498498  _cmbSamplSpinBox->setMaximumWidth(9*ww);
    499499  _cmbSamplSpinBox->setValue(settings.value("cmbSampl").toInt());
  • trunk/BNC/src/combination/bnccomb.cpp

    r10116 r10153  
    486486    // ----------------------------
    487487    if ((newClk->_time >= currentTime) ||        // future time stamp
    488         (currentTime - newClk->_time) > 120.0) { // very old data sets
     488        (currentTime - newClk->_time) > 60.0) { // very old data sets
    489489#ifdef BNC_DEBUG_CMB
    490490      emit newMessage("bncComb: very old data sets: " + acName.toLatin1() + " " + newClk->_prn.toString().c_str() +
     
    494494      delete newClk;
    495495      continue;
    496     }
    497 
    498 
    499     // Set the last time
    500     // -----------------
    501     if (_lastClkCorrTime.undef() || newClk->_time > _lastClkCorrTime) {
    502       _lastClkCorrTime = newClk->_time;
    503496    }
    504497
     
    515508    }
    516509
     510    // Set the last time
     511    // -----------------
     512    if (_lastClkCorrTime.undef() || newClk->_time > _lastClkCorrTime) {
     513      _lastClkCorrTime = newClk->_time;
     514    }
     515
    517516    // Find the corresponding data epoch or create a new one
    518517    // -----------------------------------------------------
     
    545544  // Make sure the buffer does not grow beyond any limit
    546545  // ---------------------------------------------------
    547   const unsigned MAX_EPODATA_SIZE = 25;
     546  const unsigned MAX_EPODATA_SIZE = 12;
    548547  if (_epoClkData.size() > MAX_EPODATA_SIZE) {
    549548    delete _epoClkData.front();
     
    563562    bncTime epoTime = _epoClkData.front()->_time;
    564563
    565     if ((currentTime - epoTime) > 120.0) {
     564    if ((currentTime - epoTime) > 60.0) {
    566565      delete _epoClkData.front();
    567566      _epoClkData.pop_front();
     
    10671066    // -------------------------------
    10681067
    1069     ColumnVector dx(3); dx = 0.0;
     1068    ColumnVector dx(3);   dx = 0.0;
    10701069    ColumnVector apc(3); apc = 0.0;
    10711070    ColumnVector com(3); com = 0.0;
     
    13921391t_irc bncComb::checkOrbits(bncTime epoTime, char sys, QTextStream& out) {
    13931392
    1394   const double MAX_DISPLACEMENT = 0.20;
     1393  const double MAX_DISPLACEMENT_INIT = 0.50;
     1394
     1395  double MAX_DISPLACEMENT = MAX_DISPLACEMENT_INIT;
     1396  if (sys == 'C') {
     1397    MAX_DISPLACEMENT *= 10.0;
     1398  }
     1399  if (sys == 'R') {
     1400    MAX_DISPLACEMENT *= 2.0;
     1401  }
    13951402
    13961403  // Switch to last ephemeris (if possible)
Note: See TracChangeset for help on using the changeset viewer.