Changeset 1243 in ntrip

Timestamp:

Nov 28, 2008, 4:19:06 PM (16 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNS

Files:

• bns.cpp (modified) (2 diffs)
• bnscaster.cpp (modified) (1 diff)
• bnswindow.cpp (modified) (2 diffs)

trunk/BNS/bns.cpp

@@ -491 +491 @@
 void t_bns::crdTrafo(int GPSWeek, ColumnVector& xyz) {
 
+  // Current epoch minus 2000.0 in years
+  // ------------------------------------
+  double dt = (GPSWeek - (1042.0+6.0/7.0)) / 365.2422 * 7.0;
+
   ColumnVector dx(3);
-  dx(1) =  0.054;
-  dx(2) =  0.051;
-  dx(3) = -0.048;
+  dx(1) =  0.0541 - dt * 0.0002;
+  dx(2) =  0.0502 + dt * 0.0001;
+  dx(3) = -0.0538 - dt * 0.0018;
+
   static const double arcSec = 180.0 * 3600.0 / M_PI;
-  static const double ox =  0.000081 / arcSec;
-  static const double oy =  0.000490 / arcSec;
-  static const double oz = -0.000792 / arcSec;
+
+  static const double ox = ( 0.000891 + dt * 0.000081) / arcSec;
+  static const double oy = ( 0.005390 + dt * 0.000490) / arcSec;
+  static const double oz = (-0.008712 - dt * 0.000792) / arcSec;
 
   Matrix rMat(3,3); rMat = 0.0;
@@ -508 +514 @@
   rMat(3,2) =  ox;
 
-  // Current epoch minus 1989.0 in years
-  // ------------------------------------
-  double dt = (GPSWeek - 469.0) / 365.2422 * 7.0;
-
-  xyz += dx + dt * rMat * xyz;
-}
+
+  xyz += dx + rMat * xyz;
+}

trunk/BNS/bnscaster.cpp

@@ -53 +53 @@
   // ---------------
   _crdTrafo = false;
-  if (refSys == "ETRS89") {
+  if (refSys == "ETRF2000") {
     _crdTrafo = true;
   }

trunk/BNS/bnswindow.cpp

@@ -185 +185 @@
   _refSys_1_ComboBox->setMaximumWidth(10*ww);
   _refSys_1_ComboBox->setEditable(false);
-  _refSys_1_ComboBox->addItems(QString("IGS05,ETRS89").split(","));
+  _refSys_1_ComboBox->addItems(QString("IGS05,ETRF2000").split(","));
   int ii = _refSys_1_ComboBox->findText(settings.value("refSys_1").toString());
   if (ii != -1) {
@@ -194 +194 @@
   _refSys_2_ComboBox->setMaximumWidth(10*ww);
   _refSys_2_ComboBox->setEditable(false);
-  _refSys_2_ComboBox->addItems(QString("IGS05,ETRS89").split(","));
+  _refSys_2_ComboBox->addItems(QString("IGS05,ETRF2000").split(","));
   ii = _refSys_2_ComboBox->findText(settings.value("refSys_2").toString());
   if (ii != -1) {