Changeset 5877 in ntrip


Ignore:
Timestamp:
Aug 8, 2014, 12:11:00 PM (8 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/src/PPP
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/PPP/pppClient.cpp

    r5858 r5877  
    352352    _output->_xyzRover[1] = _staRover->xyzApr()[1] + _filter->x()[1];
    353353    _output->_xyzRover[2] = _staRover->xyzApr()[2] + _filter->x()[2];
     354
     355    xyz2neu(_staRover->ellApr().data(), _filter->x().data(), _output->_neu);
     356
    354357    copy(&_filter->Q().data()[0], &_filter->Q().data()[6], _output->_covMatrix);
     358
    355359    _output->_numSat     = _filter->numSat();
    356360    _output->_pDop       = _filter->PDOP();
  • trunk/BNC/src/PPP/pppFilter.cpp

    r5866 r5877  
    160160  }
    161161
    162   _parlist->printResult(_epoTime, _QFlt, _xFlt, 0);
     162  _parlist->printResult(_epoTime, _QFlt, _xFlt);
    163163
    164164  return success;
  • trunk/BNC/src/PPP/pppInclude.h

    r5849 r5877  
    2828  double       _xyzRover[3]; 
    2929  double       _covMatrix[6];
     30  double       _neu[3]; 
    3031  int          _numSat;       
    3132  double       _pDop;         
  • trunk/BNC/src/PPP/pppParlist.cpp

    r5828 r5877  
    382382////////////////////////////////////////////////////////////////////////////
    383383void t_pppParlist::printResult(const bncTime& epoTime, const SymmetricMatrix& QQ,
    384                             const ColumnVector& xx, double ambFixRate) const {
     384                               const ColumnVector& xx) const {
    385385
    386386  string epoTimeStr = string(epoTime);
     
    450450        << " dU = " << setprecision(4) << neu[2] << " +- "
    451451        << setprecision(4) << sqrt(QQneu[2][2]);
    452     if (ambFixRate > 0.0) {
    453       LOG << " fix ";
    454     }
    455     else {
    456       LOG << " flt ";
    457     }
    458     LOG << int(100*ambFixRate) << " %\n";
    459   }
    460 }
    461 
     452    LOG << endl;
     453  }
     454}
     455
  • trunk/BNC/src/PPP/pppParlist.h

    r5819 r5877  
    104104  std::vector<t_pppParam*>& params() {return _params;}
    105105  void printResult(const bncTime& epoTime, const SymmetricMatrix& QQ,
    106                    const ColumnVector& xx, double ambFixRate) const;
     106                   const ColumnVector& xx) const;
    107107 private:
    108108  std::vector<t_pppParam*> _params;
  • trunk/BNC/src/PPP/pppRunRealTime.cpp

    r5876 r5877  
    204204
    205205    if (!output._error && _opt->xyzAprRoverSet()) {
    206       ColumnVector dx(3);
    207       dx[0] = _opt->_xyzAprRover[0] - output._xyzRover[0];
    208       dx[1] = _opt->_xyzAprRover[1] - output._xyzRover[1];
    209       dx[2] = _opt->_xyzAprRover[2] - output._xyzRover[2];
    210       emit newPosition (output._epoTime, dx[0], dx[1], dx[2]);
     206      emit newPosition (output._epoTime, output._neu[0], output._neu[1], output._neu[2]);
    211207    }
    212208
Note: See TracChangeset for help on using the changeset viewer.