Changeset 5873 in ntrip


Ignore:
Timestamp:
Aug 8, 2014, 11:42:16 AM (8 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/src
Files:
5 edited

Legend:

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

    r5870 r5873  
    7474    connect(BNC_CORE, SIGNAL(newCorrections(QStringList)),
    7575            this, SLOT(slotNewCorrections(QStringList)));
     76
     77    connect(this, SIGNAL(newPosition(bncTime, double, double, double)),
     78            BNC_CORE, SLOT(slotNewPosition(bncTime, double, double, double)));
    7679
    7780    for (unsigned iPrn = 0; iPrn <= t_prn::MAXPRN; iPrn++) {
     
    200203    _pppClient->processEpoch(satObs, &output);
    201204
     205    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]);
     211    }
     212
    202213    delete _epoData.front(); _epoData.pop_front();
    203214   
  • trunk/BNC/src/bnccore.cpp

    r5861 r5873  
    627627//
    628628////////////////////////////////////////////////////////////////////////////
     629void t_bncCore::slotNewPosition(bncTime time, double x, double y, double z) {
     630  emit newPosition(time, x, y, z);
     631}
     632
     633//
     634////////////////////////////////////////////////////////////////////////////
    629635void t_bncCore::slotQuit() {
    630636  cout << "t_bncCore::slotQuit" << endl;
  • trunk/BNC/src/bnccore.h

    r5861 r5873  
    7676  void slotNewGalileoEph(galileoephemeris* galileoeph);
    7777  void slotNewCorrLine(QString line, QString staID, bncTime coTime);
     78  void slotNewPosition(bncTime time, double x, double y, double z);
    7879  void slotQuit();
    7980
     
    8586  void newCorrections(QStringList);
    8687  void providerIDChanged(QString);
     88  void newPosition(bncTime time, double x, double y, double z);
    8789   
    8890 private slots:
  • trunk/BNC/src/bncgetthread.h

    r5861 r5873  
    8484   void newRTCMMessage(QByteArray staID, int msgID);
    8585   void getThreadFinished(QByteArray staID);
    86    void newPosition(bncTime time, double x, double y, double z);
    87    void newNMEAstr(QByteArray str);
    8886
    8987 public:
  • trunk/BNC/src/bncwindow.cpp

    r5865 r5873  
    9191  _casterEph = 0;
    9292
    93   _bncFigure = new bncFigure(this);
     93  _bncFigure     = new bncFigure(this);
    9494  _bncFigureLate = new bncFigureLate(this);
    95   _bncFigurePPP = new bncFigurePPP(this);
     95  _bncFigurePPP  = new bncFigurePPP(this);
     96  connect(BNC_CORE, SIGNAL(newPosition(bncTime, double, double, double)),
     97          _bncFigurePPP, SLOT(slotNewPosition(bncTime, double, double, double)));
    9698  _runningRealTime           = false;
    9799  _runningPostProcessingReqc = false;
     
    19001902        connect(thread, SIGNAL(newLatency(QByteArray, double)),
    19011903                _bncFigureLate, SLOT(slotNewLatency(QByteArray, double)));
    1902         if ( Qt::CheckState(settings.value("pppPlotCoordinates").toInt()) == Qt::Checked) {
    1903           disconnect(thread,
    1904                      SIGNAL(newPosition(bncTime, double, double, double)),
    1905                      _bncFigurePPP,
    1906                      SLOT(slotNewPosition(bncTime, double, double, double)));
    1907           connect(thread, SIGNAL(newPosition(bncTime, double, double, double)),
    1908                   _bncFigurePPP,
    1909                   SLOT(slotNewPosition(bncTime, double, double, double)));
    1910         }
    1911 #ifdef QT_WEBKIT
    1912         if (_mapWin) {
    1913           disconnect(thread, SIGNAL(newPosition(bncTime, double, double, double)),
    1914                      _mapWin, SLOT(slotNewPosition(bncTime, double, double, double)));
    1915           connect(thread, SIGNAL(newPosition(bncTime, double, double, double)),
    1916                   _mapWin, SLOT(slotNewPosition(bncTime, double, double, double)));
    1917         }
    1918 #endif
    19191904        break;
    19201905      }
     
    24972482    _mapWin = new bncMapWin(this);
    24982483    connect(_mapWin, SIGNAL(mapClosed()), this, SLOT(slotMapPPPClosed()));
    2499     QListIterator<bncGetThread*> it(_threads);
    2500     while (it.hasNext()) {
    2501       bncGetThread* thread = it.next();
    2502       connect(thread, SIGNAL(newPosition(bncTime, double, double, double)),
    2503               _mapWin, SLOT(slotNewPosition(bncTime, double, double, double)));
    2504     }
     2484    connect(BNC_CORE, SIGNAL(newPosition(bncTime, double, double, double)),
     2485            _mapWin, SLOT(slotNewPosition(bncTime, double, double, double)));
    25052486  }
    25062487  _mapWin->show();
Note: See TracChangeset for help on using the changeset viewer.