Changeset 2113 in ntrip

Timestamp:

Dec 15, 2009, 10:02:11 AM (14 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncgetthread.cpp (modified) (1 diff)
• bncmodel.cpp (modified) (6 diffs)
• bncmodel.h (modified) (3 diffs)
• bncpppclient.cpp (modified) (3 diffs)
• bncpppclient.h (modified) (1 diff)

trunk/BNC/bncgetthread.cpp

@@ -288 +288 @@
   if (settings.value("pppMount").toString() == _staID) {
     _PPPclient = new bncPPPclient(_staID);
-    connect(((bncApp*)qApp), SIGNAL(newEphGPS(gpsephemeris)),
-            _PPPclient, SLOT(slotNewEphGPS(gpsephemeris)));
-    connect(((bncApp*)qApp), SIGNAL(newCorrections(QList<QString>)),
-            _PPPclient, SLOT(slotNewCorrections(QList<QString>)));
-    connect(_PPPclient, SIGNAL(newMessage(QByteArray,bool)), 
-            ((bncApp*)qApp), SLOT(slotMessage(const QByteArray,bool)));
   }
 

trunk/BNC/bncmodel.cpp

@@ -42 +42 @@
 #include <cmath>
 #include <newmatio.h>
+#include <sstream>
 
 #include "bncmodel.h"
+#include "bncapp.h"
 #include "bncpppclient.h"
 #include "bancroft.h"
@@ -51 +53 @@
 using namespace std;
 
-const unsigned MINOBS =    4;
-const double   MINELE = 10.0 * M_PI / 180.0;
-const double   sig_crd_0 =  100.0;
-const double   sig_crd_p =  100.0;
-const double   sig_clk_0 = 1000.0;
-const double   sig_trp_0 =    0.01;
-const double   sig_trp_p =    1e-6;
-const double   sig_amb_0 =  100.0;
-const double   sig_P3    =    1.0;
-const double   sig_L3    =    0.01;
+const unsigned MINOBS       =    4;
+const double   MINELE       = 10.0 * M_PI / 180.0;
+const double   MAXRES_CODE  = 10.0;
+const double   MAXRES_PHASE = 0.10;
+const double   sig_crd_0    =  100.0;
+const double   sig_crd_p    =  100.0;
+const double   sig_clk_0    = 1000.0;
+const double   sig_trp_0    =    0.01;
+const double   sig_trp_p    =    1e-6;
+const double   sig_amb_0    =  100.0;
+const double   sig_P3       =    1.0;
+const double   sig_L3       =    0.01;
 
 // Constructor
@@ -109 +113 @@
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
-bncModel::bncModel() {
+bncModel::bncModel(QByteArray staID) {
+
+  _staID   = staID;
+
+  connect(this, SIGNAL(newMessage(QByteArray,bool)), 
+          ((bncApp*)qApp), SLOT(slotMessage(const QByteArray,bool)));
 
   bncSettings settings;
@@ -394 +403 @@
   ColumnVector    vv;
 
+  // Loop over all outliers
+  // ----------------------
   do {
-
-    if (epoData->size() < MINOBS) {
-      return failure;
-    }
     
     // Bancroft Solution
@@ -470 +477 @@
   }
 
+  // Message (both log file and screen)
+  // ----------------------------------
+  ostringstream str;
+  str.setf(ios::fixed);
+  str << "    PPP " << _staID.data() << " " 
+      << epoData->tt.timestr(1) << " " << epoData->size() << " " 
+      << setw(14) << setprecision(3) << x()   << "  "
+      << setw(14) << setprecision(3) << y()   << "  "
+      << setw(14) << setprecision(3) << z();
+
+  emit newMessage(QString(str.str().c_str()).toAscii(), true);
+
   return success;
 }
@@ -478 +497 @@
                                const ColumnVector& vv,
                                QMap<QString, t_satData*>& satData) {
-
-  const static double MAXRES_CODE  = 10.0;
-  const static double MAXRES_PHASE = 0.10;
 
   double vvMaxCode  = 0.0;

trunk/BNC/bncmodel.h

@@ -50 +50 @@
 };
 
-class bncModel {
+class bncModel : public QObject {
+ Q_OBJECT
  public:
-  bncModel();
+  bncModel(QByteArray staID);
   ~bncModel();
   t_irc cmpBancroft(t_epoData* epoData);
@@ -62 +63 @@
   double trp() const {return _estTropo ? _params[4]->xx : 0.0;}
   
+ signals:
+  void newMessage(QByteArray msg, bool showOnScreen);
+
  private:
   double cmpValue(t_satData* satData);
@@ -70 +74 @@
                           QMap<QString, t_satData*>& satData);
 
+  QByteArray         _staID;
   QVector<bncParam*> _params;
   SymmetricMatrix    _QQ;

trunk/BNC/bncpppclient.cpp

@@ -39 +39 @@
  * -----------------------------------------------------------------------*/
 
-#include <iomanip>
-#include <newmatio.h>
-#include <sstream>
-
 #include "bncpppclient.h"
+#include "bncapp.h"
 #include "bncutils.h"
 #include "bncconst.h"
@@ -57 +54 @@
 ////////////////////////////////////////////////////////////////////////////
 bncPPPclient::bncPPPclient(QByteArray staID) {
+
+  connect(((bncApp*)qApp), SIGNAL(newEphGPS(gpsephemeris)),
+          this, SLOT(slotNewEphGPS(gpsephemeris)));
+  connect(((bncApp*)qApp), SIGNAL(newCorrections(QList<QString>)),
+          this, SLOT(slotNewCorrections(QList<QString>)));
+
   _staID   = staID;
   _epoData = 0;
-  _model   = new bncModel();
+  _model   = new bncModel(staID);
 }
 
@@ -333 +336 @@
     return;
   }
-
-  ostringstream str;
-  str.setf(ios::fixed);
-  str << "    PPP " << _staID.data() << " " 
-      << _epoData->tt.timestr(1) << " " << _epoData->size() << " " 
-      << setw(14) << setprecision(3) << _model->x()   << "  "
-      << setw(14) << setprecision(3) << _model->y()   << "  "
-      << setw(14) << setprecision(3) << _model->z()   << "  "
-      << setw(8)  << setprecision(3) << _model->clk() << "  "
-      << setw(8)  << setprecision(3) << _model->trp();
-
-  emit newMessage(QString(str.str().c_str()).toAscii(), true);
-}
-
+}
+

trunk/BNC/bncpppclient.h

@@ -88 +88 @@
   void putNewObs(p_obs pp);
 
- signals:
-  void newMessage(QByteArray msg, bool showOnScreen);
-
  public slots:
   void slotNewEphGPS(gpsephemeris gpseph);