Changeset 2145 in ntrip

Timestamp:

Dec 31, 2009, 11:15:50 AM (14 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

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

trunk/BNC/bncfigureppp.cpp

@@ -61 +61 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void bncFigurePPP::slotNewPosition(const bncTime& time, const double* xyz) {
+void bncFigurePPP::slotNewPosition(bncTime time, double x, double y, double z){
 
   const static int MAXNUMPOS = 1000;
@@ -70 +70 @@
 
   newPos->time   = time;
-  newPos->xyz[0] = xyz[0];
-  newPos->xyz[1] = xyz[1];
-  newPos->xyz[2] = xyz[2];
+  newPos->xyz[0] = x;
+  newPos->xyz[1] = y;
+  newPos->xyz[2] = z;
 
   _pos.push_back(newPos);
+
+  //// beg test
+  cout << newPos->time.timestr(1) << " "
+       << newPos->xyz[0]          << " "
+       << newPos->xyz[1]          << " "
+       << newPos->xyz[2]          << endl;
+  //// end test
 
   if (_pos.size() > MAXNUMPOS) {
@@ -87 +94 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncFigurePPP::paintEvent(QPaintEvent *) {
+
+  cout << "paintEvent" << endl;
 
   int xMin =   0;

trunk/BNC/bncfigureppp.h

@@ -36 +36 @@
 
  public slots:
-  void slotNewPosition(const bncTime& time, const double* xyz);
+  void slotNewPosition(bncTime time, double x, double y, double z);
 
  protected:

trunk/BNC/bncgetthread.cpp

@@ -289 +289 @@
     _PPPclient = new bncPPPclient(_staID);
     qRegisterMetaType<bncTime>("bncTime");
-    connect(_PPPclient, SIGNAL(newPosition(const bncTime&, const double*)), 
-            this, SIGNAL(newPosition(const bncTime&, const double*)));
+    connect(_PPPclient, SIGNAL(newPosition(bncTime, double, double, double)), 
+            this, SIGNAL(newPosition(bncTime, double, double, double)));
   }
 

trunk/BNC/bncgetthread.h

@@ -82 +82 @@
    void newMessage(QByteArray msg, bool showOnScreen);
    void getThreadFinished(QByteArray staID);
-   void newPosition(const bncTime& time, const double*);
+   void newPosition(bncTime time, double x, double y, double z);
 
  protected:

trunk/BNC/bncpppclient.cpp

@@ -334 +334 @@
   // ---------------
   if (_model->update(_epoData) == success) {
-    double xyz[3];
-    xyz[0] = _model->x();
-    xyz[1] = _model->y();
-    xyz[2] = _model->z();
-    emit newPosition(_model->time(), xyz);    
-  }
-}
-
+    emit newPosition(_model->time(), _model->x(), _model->y(), _model->z());
+  }
+}
+

trunk/BNC/bncpppclient.h

@@ -93 +93 @@
 
  signals:
-   void newPosition(const bncTime& time, const double*);
+  void newPosition(bncTime time, double x, double y, double z);
 
  private:

trunk/BNC/bncwindow.cpp

@@ -1222 +1222 @@
         connect(thread, SIGNAL(newLatency(QByteArray, double)),
                 _bncFigureLate, SLOT(slotNewLatency(QByteArray, 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*)));
+        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)));
         break;
       }