Changeset 5879 in ntrip for trunk


Ignore:
Timestamp:
Aug 8, 2014, 12:58:03 PM (10 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/src
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/BNC/src/PPP/pppRunPostProc.cpp

    r5863 r5879  
    144144            this, SLOT(slotMessage(const QByteArray,bool)));
    145145    qRegisterMetaType<bncTime>("bncTime");
    146     connect(_pppClient, SIGNAL(newPosition(bncTime, double, double, double)),
    147             this, SIGNAL(newPosition(bncTime, double, double, double)));
     146    connect(_pppClient, SIGNAL(newPosition(bncTime, QVector<double>)),
     147            this, SIGNAL(newPosition(bncTime, QVector<double>)));
    148148  }
    149149

  • trunk/BNC/src/PPP/pppRunPostProc.h

    r5863 r5879  
    4949  void progress(int);
    5050  void finished();
    51   void newPosition(bncTime time, double x, double y, double z);
     51  void newPosition(bncTime time, QVector<double> xx);
    5252   
    5353 public slots:

  • trunk/BNC/src/PPP/pppRunRealTime.cpp

    r5878 r5879  
    7575            this, SLOT(slotNewCorrections(QStringList)));
    7676
    77     connect(this, SIGNAL(newPosition(bncTime, double, double, double)),
    78             BNC_CORE, SIGNAL(newPosition(bncTime, double, double, double)));
     77    connect(this, SIGNAL(newPosition(bncTime, QVector<double>)),
     78            BNC_CORE, SIGNAL(newPosition(bncTime, QVector<double>)));
    7979
    8080    for (unsigned iPrn = 0; iPrn <= t_prn::MAXPRN; iPrn++) {
    … …  
    204204
    205205    if (!output._error && _opt->xyzAprRoverSet()) {
    206       emit newPosition (output._epoTime, output._neu[0], output._neu[1], output._neu[2]);
     206      QVector<double> xx(6);
     207      xx.data()[0] = output._xyzRover[0];
     208      xx.data()[1] = output._xyzRover[1];
     209      xx.data()[2] = output._xyzRover[2];
     210      xx.data()[3] = output._neu[0];
     211      xx.data()[4] = output._neu[1];
     212      xx.data()[5] = output._neu[2];
     213      emit newPosition(output._epoTime, xx);
    207214    }
    208215

  • trunk/BNC/src/PPP/pppRunRealTime.h

    r5860 r5879  
    2020 signals:
    2121  void newMessage(QByteArray msg, bool showOnScreen);
    22   void newPosition(bncTime time, double x, double y, double z);
     22  void newPosition(bncTime time, QVector<double> xx);
    2323  void newNMEAstr(QByteArray str);
    2424

  • trunk/BNC/src/bnccore.h

    r5875 r5879  
    8585  void newCorrections(QStringList);
    8686  void providerIDChanged(QString);
    87   void newPosition(bncTime time, double x, double y, double z);
     87  void newPosition(bncTime time, QVector<double> xx);
    8888   
    8989 private slots:

  • trunk/BNC/src/bncfigureppp.cpp

    r4980 r5879  
    107107//
    108108////////////////////////////////////////////////////////////////////////////
    109 void bncFigurePPP::slotNewPosition(bncTime time, double x, double y, double z){
     109void bncFigurePPP::slotNewPosition(bncTime time, QVector<double> xx){
    110110
    111111  QMutexLocker locker(&_mutex);
    … …  
    114114
    115115  newPos->time   = time;
    116   newPos->xyz[0] = x;
    117   newPos->xyz[1] = y;
    118   newPos->xyz[2] = z;
     116  newPos->xyz[0] = xx.data()[0];
     117  newPos->xyz[1] = xx.data()[1];
     118  newPos->xyz[2] = xx.data()[2];
    119119
    120120  _pos.push_back(newPos);

  • trunk/BNC/src/bncfigureppp.h

    r4975 r5879  
    3737
    3838 public slots:
    39   void slotNewPosition(bncTime time, double x, double y, double z);
     39  void slotNewPosition(bncTime time, QVector<double> xx);
    4040
    4141 protected:

  • trunk/BNC/src/bncwindow.cpp

    r5873 r5879  
    9494  _bncFigureLate = new bncFigureLate(this);
    9595  _bncFigurePPP  = new bncFigurePPP(this);
    96   connect(BNC_CORE, SIGNAL(newPosition(bncTime, double, double, double)),
    97           _bncFigurePPP, SLOT(slotNewPosition(bncTime, double, double, double)));
     96  connect(BNC_CORE, SIGNAL(newPosition(bncTime, QVector<double>)),
     97          _bncFigurePPP, SLOT(slotNewPosition(bncTime, QVector<double>)));
    9898  _runningRealTime           = false;
    9999  _runningPostProcessingReqc = false;
    … …  
    24822482    _mapWin = new bncMapWin(this);
    24832483    connect(_mapWin, SIGNAL(mapClosed()), this, SLOT(slotMapPPPClosed()));
    2484     connect(BNC_CORE, SIGNAL(newPosition(bncTime, double, double, double)),
    2485             _mapWin, SLOT(slotNewPosition(bncTime, double, double, double)));
     2484    connect(BNC_CORE, SIGNAL(newPosition(bncTime, QVector<double>)),
     2485            _mapWin, SLOT(slotNewPosition(bncTime, QVector<double>)));
    24862486  }
    24872487  _mapWin->show();

  • trunk/BNC/src/map/bncmapwin.cpp

    r5323 r5879  
    164164//
    165165////////////////////////////////////////////////////////////////////////////
    166 void bncMapWin::slotNewPosition(bncTime /* time */, double xx, double yy, double zz) {
    167   double xyz[3];
    168   xyz[0] = xx;
    169   xyz[1] = yy;
    170   xyz[2] = zz;
     166void bncMapWin::slotNewPosition(bncTime /* time */, QVector<double> xx) {
    171167  double ell[3];
    172   xyz2ell(xyz, ell);
     168  xyz2ell(xx.data(), ell);
    173169  gotoLocation(ell[0]*180.0/M_PI, ell[1]*180.0/M_PI);
    174170}

  • trunk/BNC/src/map/bncmapwin.h

    r5323 r5879  
    4141
    4242 public slots:
    43   void slotNewPosition(bncTime time, double xx, double yy, double zz);
     43  void slotNewPosition(bncTime time, QVector<double> xx);
    4444
    4545 private slots:
Note: See TracChangeset for help on using the changeset viewer.