Changeset 5873 in ntrip for trunk

Timestamp:

Aug 8, 2014, 11:42:16 AM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• PPP/pppRunRealTime.cpp (modified) (2 diffs)
• bnccore.cpp (modified) (1 diff)
• bnccore.h (modified) (2 diffs)
• bncgetthread.h (modified) (1 diff)
• bncwindow.cpp (modified) (3 diffs)

trunk/BNC/src/PPP/pppRunRealTime.cpp

@@ -74 +74 @@
     connect(BNC_CORE, SIGNAL(newCorrections(QStringList)),
             this, SLOT(slotNewCorrections(QStringList)));
+
+    connect(this, SIGNAL(newPosition(bncTime, double, double, double)),
+            BNC_CORE, SLOT(slotNewPosition(bncTime, double, double, double)));
 
     for (unsigned iPrn = 0; iPrn <= t_prn::MAXPRN; iPrn++) {
@@ -200 +203 @@
     _pppClient->processEpoch(satObs, &output);
 
+    if (!output._error && _opt->xyzAprRoverSet()) {
+      ColumnVector dx(3);
+      dx[0] = _opt->_xyzAprRover[0] - output._xyzRover[0];
+      dx[1] = _opt->_xyzAprRover[1] - output._xyzRover[1];
+      dx[2] = _opt->_xyzAprRover[2] - output._xyzRover[2];
+      emit newPosition (output._epoTime, dx[0], dx[1], dx[2]);
+    }
+
     delete _epoData.front(); _epoData.pop_front();
     

trunk/BNC/src/bnccore.cpp

@@ -627 +627 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
+void t_bncCore::slotNewPosition(bncTime time, double x, double y, double z) {
+  emit newPosition(time, x, y, z);
+}
+
+// 
+////////////////////////////////////////////////////////////////////////////
 void t_bncCore::slotQuit() {
   cout << "t_bncCore::slotQuit" << endl;

trunk/BNC/src/bnccore.h

@@ -76 +76 @@
   void slotNewGalileoEph(galileoephemeris* galileoeph);
   void slotNewCorrLine(QString line, QString staID, bncTime coTime);
+  void slotNewPosition(bncTime time, double x, double y, double z);
   void slotQuit();
 
@@ -85 +86 @@
   void newCorrections(QStringList);
   void providerIDChanged(QString);
+  void newPosition(bncTime time, double x, double y, double z);
     
  private slots:

trunk/BNC/src/bncgetthread.h

@@ -84 +84 @@
    void newRTCMMessage(QByteArray staID, int msgID);
    void getThreadFinished(QByteArray staID);
-   void newPosition(bncTime time, double x, double y, double z);
-   void newNMEAstr(QByteArray str);
 
  public:

trunk/BNC/src/bncwindow.cpp

@@ -91 +91 @@
   _casterEph = 0;
 
-  _bncFigure = new bncFigure(this);
+  _bncFigure     = new bncFigure(this);
   _bncFigureLate = new bncFigureLate(this);
-  _bncFigurePPP = new bncFigurePPP(this);
+  _bncFigurePPP  = new bncFigurePPP(this);
+  connect(BNC_CORE, SIGNAL(newPosition(bncTime, double, double, double)),
+          _bncFigurePPP, SLOT(slotNewPosition(bncTime, double, double, double)));
   _runningRealTime           = false;
   _runningPostProcessingReqc = false;
@@ -1900 +1902 @@
         connect(thread, SIGNAL(newLatency(QByteArray, double)),
                 _bncFigureLate, SLOT(slotNewLatency(QByteArray, double)));
-        if ( Qt::CheckState(settings.value("pppPlotCoordinates").toInt()) == Qt::Checked) {
-          disconnect(thread, 
-                     SIGNAL(newPosition(bncTime, double, double, double)),
-                     _bncFigurePPP, 
-                     SLOT(slotNewPosition(bncTime, double, double, double)));
-          connect(thread, SIGNAL(newPosition(bncTime, double, double, double)),
-                  _bncFigurePPP, 
-                  SLOT(slotNewPosition(bncTime, double, double, double)));
-        }
-#ifdef QT_WEBKIT
-        if (_mapWin) {
-          disconnect(thread, SIGNAL(newPosition(bncTime, double, double, double)),
-                     _mapWin, SLOT(slotNewPosition(bncTime, double, double, double)));
-          connect(thread, SIGNAL(newPosition(bncTime, double, double, double)),
-                  _mapWin, SLOT(slotNewPosition(bncTime, double, double, double)));
-        }
-#endif
         break;
       }
@@ -2497 +2482 @@
     _mapWin = new bncMapWin(this);
     connect(_mapWin, SIGNAL(mapClosed()), this, SLOT(slotMapPPPClosed()));
-    QListIterator<bncGetThread*> it(_threads);
-    while (it.hasNext()) {
-      bncGetThread* thread = it.next();
-      connect(thread, SIGNAL(newPosition(bncTime, double, double, double)),
-              _mapWin, SLOT(slotNewPosition(bncTime, double, double, double)));
-    }
+    connect(BNC_CORE, SIGNAL(newPosition(bncTime, double, double, double)),
+            _mapWin, SLOT(slotNewPosition(bncTime, double, double, double)));
   }
   _mapWin->show();