Changeset 5873 in ntrip for trunk/BNC/src/bncwindow.cpp

Timestamp:

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

Author:

mervart

Message:

 

File:

• trunk/BNC/src/bncwindow.cpp (modified) (3 diffs)

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();