Changeset 2142 in ntrip

Timestamp:

Dec 31, 2009, 10:39:30 AM (14 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncfigureppp.cpp (modified) (2 diffs)
• bncfigureppp.h (modified) (3 diffs)
• bncgetthread.cpp (modified) (1 diff)
• bncgetthread.h (modified) (2 diffs)
• bncpppclient.h (modified) (1 diff)
• bncwindow.cpp (modified) (1 diff)

trunk/BNC/bncfigureppp.cpp

@@ -61 +61 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void bncFigurePPP::slotNewPosition(const double* xyz) {
+void bncFigurePPP::slotNewPosition(const bncTime& time, const double* xyz) {
 
   const static int MAXNUMPOS = 1000;
@@ -67 +67 @@
   QMutexLocker locker(&_mutex);
 
-  double* newPos = new double [3];
+  pppPos* newPos = new pppPos;
 
-  newPos[0] = xyz[0];
-  newPos[1] = xyz[1];
-  newPos[2] = xyz[2];
+  newPos->time   = time;
+  newPos->xyz[0] = xyz[0];
+  newPos->xyz[1] = xyz[1];
+  newPos->xyz[2] = xyz[2];
 
   _pos.push_back(newPos);

trunk/BNC/bncfigureppp.h

@@ -27 +27 @@
 
 #include <QtGui>
+#include "bnctime.h"
 
 class bncFigurePPP : public QWidget {
@@ -35 +36 @@
 
  public slots:
-  void slotNewPosition(const double* xyz);
+  void slotNewPosition(const bncTime& time, const double* xyz);
 
  protected:
@@ -41 +42 @@
 
  private:
+  class pppPos {
+   public:
+    bncTime time;
+    double  xyz[3];
+  };
+
   QMutex           _mutex;
-  QVector<double*> _pos;
+  QVector<pppPos*> _pos;
 };
 

trunk/BNC/bncgetthread.cpp

@@ -288 +288 @@
   if (settings.value("pppMount").toString() == _staID) {
     _PPPclient = new bncPPPclient(_staID);
-    connect(_PPPclient, SIGNAL(newPosition(const double*)), 
-            this, SIGNAL(newPosition(const double*)));
+    connect(_PPPclient, SIGNAL(newPosition(const bncTime&, const double*)), 
+            this, SIGNAL(newPosition(const bncTime&, const double*)));
   }
 

trunk/BNC/bncgetthread.h

@@ -35 +35 @@
 #include "bncconst.h"
 #include "bncnetquery.h"
+#include "bnctime.h"
 
 class bncRinex;
@@ -81 +82 @@
    void newMessage(QByteArray msg, bool showOnScreen);
    void getThreadFinished(QByteArray staID);
-   void newPosition(const double*);
+   void newPosition(const bncTime& time, const double*);
 
  protected:

trunk/BNC/bncpppclient.h

@@ -92 +92 @@
   void slotNewCorrections(QList<QString> corrList);
 
+ signals:
+   void newPosition(const bncTime& time, const double*);
+
  private:
   t_irc getSatPos(const bncTime& tt, const QString& prn, 

trunk/BNC/bncwindow.cpp

@@ -1222 +1222 @@
         connect(thread, SIGNAL(newLatency(QByteArray, double)),
                 _bncFigureLate, SLOT(slotNewLatency(QByteArray, double)));
-        disconnect(thread, SIGNAL(newPosition(const double*)),
-                   _bncFigurePPP, SLOT(slotNewPosition(const double*)));
-        connect(thread, SIGNAL(newPosition(const double*)),
-                _bncFigurePPP, SLOT(slotNewPosition(const double*)));
+        disconnect(thread, SIGNAL(newPosition(const bncTime&, const double*)),
+                   _bncFigurePPP, SLOT(slotNewPosition(const bncTime&, const double*)));
+        connect(thread, SIGNAL(newPosition(const bncTime&, const double*)),
+                _bncFigurePPP, SLOT(slotNewPosition(const bncTime&, const double*)));
         break;
       }