Changeset 5214 in ntrip


Ignore:
Timestamp:
Jun 16, 2013, 10:20:24 AM (9 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/src
Files:
5 edited

Legend:

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

    r5189 r5214  
    9696  _runningPostProcessingPPP  = false;
    9797  _runningPostProcessingReqc = false;
     98  _postProcessing            = 0;
    9899
    99100  _pppSPPComboBox     = 0; // necessary for enableStartStop()
     
    27292730  enableStartStop();
    27302731
    2731   t_postProcessing* postProcessing = new t_postProcessing(this);
    2732   connect(postProcessing, SIGNAL(finished()), this, SLOT(slotFinishedPostProcessingPPP()));
    2733   connect(postProcessing, SIGNAL(progress(int)), this, SLOT(slotPostProgress(int)));
    2734 
    2735   postProcessing->start();
     2732  delete _postProcessing;
     2733  _postProcessing = new t_postProcessing(this);
     2734  connect(_postProcessing, SIGNAL(finished()), this, SLOT(slotFinishedPostProcessingPPP()));
     2735  connect(_postProcessing, SIGNAL(progress(int)), this, SLOT(slotPostProgress(int)));
     2736  bncSettings settings;
     2737  if ( Qt::CheckState(settings.value("pppPlotCoordinates").toInt()) == Qt::Checked) {
     2738    connect(_postProcessing, SIGNAL(newPosition(bncTime, double, double, double)),
     2739            _bncFigurePPP, SLOT(slotNewPosition(bncTime, double, double, double)));
     2740  }
     2741#ifdef QT_WEBKIT
     2742  if (_mapWin) {
     2743    connect(_postProcessing, SIGNAL(newPosition(bncTime, double, double, double)),
     2744            _mapWin, SLOT(slotNewPosition(bncTime, double, double, double)));
     2745  }
     2746#endif
     2747
     2748  _postProcessing->start();
    27362749#else
    27372750  QMessageBox::information(this, "Information",
     
    28752888              _mapWin, SLOT(slotNewPosition(bncTime, double, double, double)));
    28762889    }
     2890    if (_postProcessing) {
     2891      connect(_postProcessing, SIGNAL(newPosition(bncTime, double, double, double)),
     2892              _mapWin, SLOT(slotNewPosition(bncTime, double, double, double)));
     2893    }
    28772894  }
    28782895  _mapWin->show();
  • trunk/BNC/src/bncwindow.h

    r5187 r5214  
    5454class qtFileChooser;
    5555class bncMapWin;
     56class t_postProcessing;
    5657
    5758class bncWindow : public QMainWindow {
     
    260261    bool _runningPostProcessingPPP;
    261262    bool _runningPostProcessingReqc;
     263    t_postProcessing* _postProcessing;
    262264
    263265    bncMapWin*           _mapWin;
  • trunk/BNC/src/map/bncmapwin.cpp

    r5213 r5214  
    158158  xyz2ell(xyz, ell);
    159159  gotoLocation(ell[0]*180.0/M_PI, ell[1]*180.0/M_PI);
     160  qDebug() << ell[0]*180.0/M_PI << ell[1]*180.0/M_PI;
    160161}
  • trunk/BNC/src/rinex/bncpostprocess.cpp

    r5072 r5214  
    164164    connect(_pppClient, SIGNAL(newMessage(QByteArray,bool)),
    165165            this, SLOT(slotMessage(const QByteArray,bool)));
     166    connect(_pppClient, SIGNAL(newPosition(bncTime, double, double, double)),
     167            this, SIGNAL(newPosition(bncTime, double, double, double)));
    166168  }
    167169
  • trunk/BNC/src/rinex/bncpostprocess.h

    r4261 r5214  
    4949                            t_obs& obs);
    5050
    51  protected:
    5251  ~t_postProcessing();
    5352
     
    5554  void progress(int);
    5655  void finished();
     56  void newPosition(bncTime time, double x, double y, double z);
    5757   
    5858 public slots:
Note: See TracChangeset for help on using the changeset viewer.