Changeset 5879 in ntrip for trunk/BNC/src/PPP

Timestamp:

Aug 8, 2014, 12:58:03 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/PPP

Files:

• pppRunPostProc.cpp (modified) (1 diff)
• pppRunPostProc.h (modified) (1 diff)
• pppRunRealTime.cpp (modified) (2 diffs)
• pppRunRealTime.h (modified) (1 diff)

trunk/BNC/src/PPP/pppRunPostProc.cpp

@@ -144 +144 @@
             this, SLOT(slotMessage(const QByteArray,bool)));
     qRegisterMetaType<bncTime>("bncTime");
-    connect(_pppClient, SIGNAL(newPosition(bncTime, double, double, double)), 
-            this, SIGNAL(newPosition(bncTime, double, double, double)));
+    connect(_pppClient, SIGNAL(newPosition(bncTime, QVector<double>)), 
+            this, SIGNAL(newPosition(bncTime, QVector<double>)));
   }
 

trunk/BNC/src/PPP/pppRunPostProc.h

@@ -49 +49 @@
   void progress(int);
   void finished();
-  void newPosition(bncTime time, double x, double y, double z);
+  void newPosition(bncTime time, QVector<double> xx);
    
  public slots:

trunk/BNC/src/PPP/pppRunRealTime.cpp

@@ -75 +75 @@
             this, SLOT(slotNewCorrections(QStringList)));
 
-    connect(this, SIGNAL(newPosition(bncTime, double, double, double)),
-            BNC_CORE, SIGNAL(newPosition(bncTime, double, double, double)));
+    connect(this, SIGNAL(newPosition(bncTime, QVector<double>)),
+            BNC_CORE, SIGNAL(newPosition(bncTime, QVector<double>)));
 
     for (unsigned iPrn = 0; iPrn <= t_prn::MAXPRN; iPrn++) {
@@ -204 +204 @@
 
     if (!output._error && _opt->xyzAprRoverSet()) {
-      emit newPosition (output._epoTime, output._neu[0], output._neu[1], output._neu[2]);
+      QVector<double> xx(6);
+      xx.data()[0] = output._xyzRover[0];
+      xx.data()[1] = output._xyzRover[1];
+      xx.data()[2] = output._xyzRover[2];
+      xx.data()[3] = output._neu[0];
+      xx.data()[4] = output._neu[1];
+      xx.data()[5] = output._neu[2];
+      emit newPosition(output._epoTime, xx);
     }
 

trunk/BNC/src/PPP/pppRunRealTime.h

@@ -20 +20 @@
  signals:
   void newMessage(QByteArray msg, bool showOnScreen);
-  void newPosition(bncTime time, double x, double y, double z);
+  void newPosition(bncTime time, QVector<double> xx);
   void newNMEAstr(QByteArray str);