Changeset 5187 in ntrip for trunk

Timestamp:

Jun 9, 2013, 10:48:43 AM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

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

trunk/BNC/src/bncwindow.cpp

@@ -2137 +2137 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncWindow::slotMountPointsRead(QList<bncGetThread*> threads) {
+  _threads = threads;
+
   _bncFigure->updateMountPoints();
   _bncFigureLate->updateMountPoints();
@@ -2171 +2173 @@
                   SLOT(slotNewPosition(bncTime, double, double, double)));
         }
+
+        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)));
+        }
+
         break;
       }
@@ -2859 +2869 @@
   if (!_mapWin) {
     _mapWin = new bncMapWin(this);
+    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)));
+    }
   }
   _mapWin->show();

trunk/BNC/src/bncwindow.h

@@ -261 +261 @@
     bool _runningPostProcessingReqc;
 
-    bncMapWin* _mapWin;
+    bncMapWin*           _mapWin;
+    QList<bncGetThread*> _threads;
 
 #ifdef RTROVER_INTERFACE

trunk/BNC/src/map/bncmapwin.cpp

@@ -116 +116 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void bncMapWin::slotGotoLocation(double lat, double lon) {
+void bncMapWin::gotoLocation(double lat, double lon) {
   _currLat = lat;
   _currLon = lon;
@@ -142 +142 @@
     _currLat += 0.00001;
     _currLon += 0.00001;
-    slotGotoLocation(_currLat, _currLon);
+    gotoLocation(_currLat, _currLon);
     QTimer::singleShot(100, this, SLOT(slotTest()));
   }
 }
+
+// 
+////////////////////////////////////////////////////////////////////////////
+void bncMapWin::slotNewPosition(bncTime time, double xx, double yy, double zz) {
+
+}

trunk/BNC/src/map/bncmapwin.h

@@ -28 +28 @@
 #include <QtGui>
 #include <QtWebKit>
+#include "bnctime.h"
 
 class bncMapWin : public QDialog {
@@ -39 +40 @@
 
  public slots:
-  void slotGotoLocation(double lat, double lon);
+  void slotNewPosition(bncTime time, double xx, double yy, double zz);
 
  private slots:
@@ -48 +49 @@
   enum e_mode {mode_test, mode_ppp};
   void loadHtmlPage();
+  void gotoLocation(double lat, double lon);
   QWebView*    _webView;
   QPushButton* _testButton;