Changeset 5214 in ntrip for trunk

Timestamp:

Jun 16, 2013, 10:20:24 AM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• bncwindow.cpp (modified) (3 diffs)
• bncwindow.h (modified) (2 diffs)
• map/bncmapwin.cpp (modified) (1 diff)
• rinex/bncpostprocess.cpp (modified) (1 diff)
• rinex/bncpostprocess.h (modified) (2 diffs)

trunk/BNC/src/bncwindow.cpp

@@ -96 +96 @@
   _runningPostProcessingPPP  = false;
   _runningPostProcessingReqc = false;
+  _postProcessing            = 0;
 
   _pppSPPComboBox     = 0; // necessary for enableStartStop()
@@ -2729 +2730 @@
   enableStartStop();
 
-  t_postProcessing* postProcessing = new t_postProcessing(this);
-  connect(postProcessing, SIGNAL(finished()), this, SLOT(slotFinishedPostProcessingPPP()));
-  connect(postProcessing, SIGNAL(progress(int)), this, SLOT(slotPostProgress(int)));
-
-  postProcessing->start();
+  delete _postProcessing;
+  _postProcessing = new t_postProcessing(this);
+  connect(_postProcessing, SIGNAL(finished()), this, SLOT(slotFinishedPostProcessingPPP()));
+  connect(_postProcessing, SIGNAL(progress(int)), this, SLOT(slotPostProgress(int)));
+  bncSettings settings;
+  if ( Qt::CheckState(settings.value("pppPlotCoordinates").toInt()) == Qt::Checked) {
+    connect(_postProcessing, SIGNAL(newPosition(bncTime, double, double, double)),
+            _bncFigurePPP, SLOT(slotNewPosition(bncTime, double, double, double)));
+  }
+#ifdef QT_WEBKIT
+  if (_mapWin) {
+    connect(_postProcessing, SIGNAL(newPosition(bncTime, double, double, double)),
+            _mapWin, SLOT(slotNewPosition(bncTime, double, double, double)));
+  }
+#endif
+
+  _postProcessing->start();
 #else
   QMessageBox::information(this, "Information",
@@ -2875 +2888 @@
               _mapWin, SLOT(slotNewPosition(bncTime, double, double, double)));
     }
+    if (_postProcessing) {
+      connect(_postProcessing, SIGNAL(newPosition(bncTime, double, double, double)),
+              _mapWin, SLOT(slotNewPosition(bncTime, double, double, double)));
+    }
   }
   _mapWin->show();

trunk/BNC/src/bncwindow.h

@@ -54 +54 @@
 class qtFileChooser;
 class bncMapWin;
+class t_postProcessing;
 
 class bncWindow : public QMainWindow {
@@ -260 +261 @@
     bool _runningPostProcessingPPP;
     bool _runningPostProcessingReqc;
+    t_postProcessing* _postProcessing;
 
     bncMapWin*           _mapWin;

trunk/BNC/src/map/bncmapwin.cpp

@@ -158 +158 @@
   xyz2ell(xyz, ell);
   gotoLocation(ell[0]*180.0/M_PI, ell[1]*180.0/M_PI);
+  qDebug() << ell[0]*180.0/M_PI << ell[1]*180.0/M_PI;
 }

trunk/BNC/src/rinex/bncpostprocess.cpp

@@ -164 +164 @@
     connect(_pppClient, SIGNAL(newMessage(QByteArray,bool)), 
             this, SLOT(slotMessage(const QByteArray,bool)));
+    connect(_pppClient, SIGNAL(newPosition(bncTime, double, double, double)), 
+            this, SIGNAL(newPosition(bncTime, double, double, double)));
   }
 

trunk/BNC/src/rinex/bncpostprocess.h

@@ -49 +49 @@
                             t_obs& obs);
 
- protected:
   ~t_postProcessing();
 
@@ -55 +54 @@
   void progress(int);
   void finished();
+  void newPosition(bncTime time, double x, double y, double z);
    
  public slots: