Changeset 2333 in ntrip for trunk/BNS

Timestamp:

Feb 24, 2010, 5:49:03 PM (14 years ago)

Author:

weber

Message:

* empty log message *

Location:

trunk/BNS

Files:

• bns.cpp (modified) (2 diffs)
• bnswindow.cpp (modified) (6 diffs)

trunk/BNS/bns.cpp

@@ -645 +645 @@
 
   if (trafo == "ETRF2000") {
-    _dx  =  0.0541;
-    _dy  =  0.0502;
-    _dz  = -0.0538;
-    _dxr = -0.0002;
-    _dyr =  0.0001;
-    _dzr = -0.0018;
+    _dx  =    0.0541;
+    _dy  =    0.0502;
+    _dz  =   -0.0538;
+    _dxr =   -0.0002;
+    _dyr =    0.0001;
+    _dzr =   -0.0018;
     _ox  =  0.000891;
     _oy  =  0.005390;
@@ -657 +657 @@
     _oyr =  0.000490;
     _ozr = -0.000792;
-    _sc  =  0.40;
-    _scr =  0.08;
-    _t0  =  2000.0;
+    _sc  =      0.40;
+    _scr =      0.08;
+    _t0  =    2000.0;
   }
   else if (trafo == "NAD83") {
-    _dx  =  0.9956;
-    _dy  = -1.9013;
-    _dz  = -0.5215;
-    _dxr =  0.0007;
-    _dyr = -0.0007;
-    _dzr =  0.0005;
-    _ox  =  25.915;
-    _oy  =   9.426;
-    _oz  =  11.599;
-    _oxr =  0.067;
-    _oyr = -0.757;
-    _ozr = -0.051;
-    _sc  =  0.62;
-    _scr = -0.18;
-    _t0  =  1997.0;
+    _dx  =    0.9956;
+    _dy  =   -1.9013;
+    _dz  =   -0.5215;
+    _dxr =    0.0007;
+    _dyr =   -0.0007;
+    _dzr =    0.0005;
+    _ox  =  0.025915;
+    _oy  =  0.009426;
+    _oz  =  0.011599;
+    _oxr =  0.000067;
+    _oyr = -0.000757;
+    _ozr = -0.000051;
+    _sc  =      0.62;
+    _scr =     -0.18;
+    _t0  =    1997.0;
+  }
+  else if (trafo == "GDA94") {
+    _dx  =   -0.0761;
+    _dy  =   -0.0101;
+    _dz  =    0.0444;
+    _dxr =    0.0110;
+    _dyr =   -0.0045;
+    _dzr =   -0.0174;
+    _ox  =  0.008765;
+    _oy  =  0.009361;
+    _oz  =  0.009325;
+    _oxr =  0.001034;
+    _oyr =  0.000671;
+    _ozr =  0.001039;
+    _sc  =     7.935;
+    _scr =    -0.538;
+    _t0  =    2000.0;
   }
   else if (trafo == "Custom") {

trunk/BNS/bnswindow.cpp

@@ -177 +177 @@
   _refSys_1_ComboBox = new QComboBox;
   _refSys_1_ComboBox->setEditable(false);
-  _refSys_1_ComboBox->addItems(QString("IGS05,ETRF2000,NAD83,Custom").split(","));
+  _refSys_1_ComboBox->addItems(QString("IGS05,ETRF2000,NAD83,GDA94,Custom").split(","));
   int ii = _refSys_1_ComboBox->findText(settings.value("refSys_1").toString());
   if (ii != -1) {
@@ -195 +195 @@
   _refSys_2_ComboBox = new QComboBox;
   _refSys_2_ComboBox->setEditable(false);
-  _refSys_2_ComboBox->addItems(QString("IGS05,ETRF2000,NAD83,Custom").split(","));
+  _refSys_2_ComboBox->addItems(QString("IGS05,ETRF2000,NAD83,GDA94,Custom").split(","));
   ii = _refSys_2_ComboBox->findText(settings.value("refSys_2").toString());
   if (ii != -1) {
@@ -213 +213 @@
   _refSys_3_ComboBox = new QComboBox;
   _refSys_3_ComboBox->setEditable(false);
-  _refSys_3_ComboBox->addItems(QString("IGS05,ETRF2000,NAD83,Custom").split(","));
+  _refSys_3_ComboBox->addItems(QString("IGS05,ETRF2000,NAD83,GDA94,Custom").split(","));
   ii = _refSys_3_ComboBox->findText(settings.value("refSys_3").toString());
   if (ii != -1) {
@@ -231 +231 @@
   _refSys_4_ComboBox = new QComboBox;
   _refSys_4_ComboBox->setEditable(false);
-  _refSys_4_ComboBox->addItems(QString("IGS05,ETRF2000,NAD83,Custom").split(","));
+  _refSys_4_ComboBox->addItems(QString("IGS05,ETRF2000,NAD83,GDA94,Custom").split(","));
   ii = _refSys_4_ComboBox->findText(settings.value("refSys_4").toString());
   if (ii != -1) {
@@ -249 +249 @@
   _refSys_5_ComboBox = new QComboBox;
   _refSys_5_ComboBox->setEditable(false);
-  _refSys_5_ComboBox->addItems(QString("IGS05,ETRF2000,NAD83,Custom").split(","));
+  _refSys_5_ComboBox->addItems(QString("IGS05,ETRF2000,NAD83,GDA94,Custom").split(","));
   ii = _refSys_5_ComboBox->findText(settings.value("refSys_5").toString());
   if (ii != -1) {
@@ -267 +267 @@
   _refSys_6_ComboBox = new QComboBox;
   _refSys_6_ComboBox->setEditable(false);
-  _refSys_6_ComboBox->addItems(QString("IGS05,ETRF2000,NAD83,Custom").split(","));
+  _refSys_6_ComboBox->addItems(QString("IGS05,ETRF2000,NAD83,GDA94,Custom").split(","));
   ii = _refSys_6_ComboBox->findText(settings.value("refSys_6").toString());
   if (ii != -1) {