Changeset 5954 in ntrip

Timestamp:

Aug 16, 2014, 3:41:47 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• PPP/pppRun.cpp (modified) (2 diffs)
• PPP/pppRun.h (modified) (1 diff)
• bnccore.h (modified) (1 diff)
• bncfigureppp.cpp (modified) (1 diff)
• bncfigureppp.h (modified) (1 diff)
• bncwindow.cpp (modified) (2 diffs)
• map/bncmapwin.cpp (modified) (1 diff)
• map/bncmapwin.h (modified) (1 diff)

trunk/BNC/src/PPP/pppRun.cpp

@@ -67 +67 @@
           BNC_CORE, SLOT(slotMessage(const QByteArray,bool)));
 
-  connect(this, SIGNAL(newPosition(bncTime, QVector<double>)),
-          BNC_CORE, SIGNAL(newPosition(bncTime, QVector<double>)));
+  connect(this, SIGNAL(newPosition(QByteArray, bncTime, QVector<double>)),
+          BNC_CORE, SIGNAL(newPosition(QByteArray, bncTime, QVector<double>)));
 
   for (unsigned iPrn = 0; iPrn <= t_prn::MAXPRN; iPrn++) {
@@ -233 +233 @@
       xx.data()[4] = output._neu[1];
       xx.data()[5] = output._neu[2];
-      emit newPosition(output._epoTime, xx);
+      emit newPosition(staID, output._epoTime, xx);
     }
 

trunk/BNC/src/PPP/pppRun.h

@@ -26 +26 @@
  signals:
   void newMessage(QByteArray msg, bool showOnScreen);
-  void newPosition(bncTime time, QVector<double> xx);
-  void newNMEAstr(QByteArray str);
+  void newPosition(QByteArray staID, bncTime time, QVector<double> xx);
+  void newNMEAstr(QByteArray staID, QByteArray str);
   void progressRnxPPP(int);
   void finishedRnxPPP();

trunk/BNC/src/bnccore.h

@@ -91 +91 @@
   void newCorrections(QStringList);
   void providerIDChanged(QString);
-  void newPosition(bncTime time, QVector<double> xx);
+  void newPosition(QByteArray staID, bncTime time, QVector<double> xx);
   void progressRnxPPP(int);
   void finishedRnxPPP();

trunk/BNC/src/bncfigureppp.cpp

@@ -75 +75 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void bncFigurePPP::slotNewPosition(bncTime time, QVector<double> xx){
+void bncFigurePPP::slotNewPosition(QByteArray staID, bncTime time, QVector<double> xx){
 
   QMutexLocker locker(&_mutex);
+
+  bncSettings settings;
+  if (settings.value("PPP/plotCoordinates").toByteArray() != staID) {
+    return;
+  }
 
   pppPos* newPos = new pppPos;

trunk/BNC/src/bncfigureppp.h

@@ -37 +37 @@
 
  public slots:
-  void slotNewPosition(bncTime time, QVector<double> xx);
+  void slotNewPosition(QByteArray staID, bncTime time, QVector<double> xx);
 
  protected:

trunk/BNC/src/bncwindow.cpp

@@ -91 +91 @@
   _bncFigurePPP  = new bncFigurePPP(this);
 
-  connect(BNC_CORE, SIGNAL(newPosition(bncTime, QVector<double>)),
-          _bncFigurePPP, SLOT(slotNewPosition(bncTime, QVector<double>)));
+  connect(BNC_CORE, SIGNAL(newPosition(QByteArray, bncTime, QVector<double>)),
+          _bncFigurePPP, SLOT(slotNewPosition(QByteArray, bncTime, QVector<double>)));
 
   connect(BNC_CORE, SIGNAL(progressRnxPPP(int)), this, SLOT(slotPostProgress(int)));
@@ -2436 +2436 @@
     _mapWin = new bncMapWin(this);
     connect(_mapWin, SIGNAL(mapClosed()), this, SLOT(slotMapPPPClosed()));
-    connect(BNC_CORE, SIGNAL(newPosition(bncTime, QVector<double>)),
-            _mapWin, SLOT(slotNewPosition(bncTime, QVector<double>)));
+    connect(BNC_CORE, SIGNAL(newPosition(QByteArray, bncTime, QVector<double>)),
+            _mapWin, SLOT(slotNewPosition(QByteArray, bncTime, QVector<double>)));
   }
   _mapWin->show();

trunk/BNC/src/map/bncmapwin.cpp

@@ -164 +164 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void bncMapWin::slotNewPosition(bncTime /* time */, QVector<double> xx) {
+void bncMapWin::slotNewPosition(QByteArray /* staID */, bncTime /* time */, QVector<double> xx) {
   double ell[3];
   xyz2ell(xx.data(), ell);

trunk/BNC/src/map/bncmapwin.h

@@ -41 +41 @@
 
  public slots:
-  void slotNewPosition(bncTime time, QVector<double> xx);
+  void slotNewPosition(QByteArray staID, bncTime time, QVector<double> xx);
 
  private slots: