Changeset 8710 in ntrip for branches

Timestamp:

Apr 30, 2019, 12:57:56 PM (6 years ago)

Author:

stuerze

Message:

minor changes

File:

• branches/BNC_2.12/src/upload/bncrtnetuploadcaster.cpp (modified) (6 diffs)

branches/BNC_2.12/src/upload/bncrtnetuploadcaster.cpp

@@ -107 +107 @@
     _dy  =  0.0512;
     _dz  = -0.0551;
+
     _dxr =  0.0001;
     _dyr =  0.0001;
     _dzr = -0.0019;
+
     _ox  = -0.000891;
     _oy  = -0.005390;
     _oz  =  0.008712;
+
     _oxr = -0.000081;
     _oyr = -0.000490;
-    _ozr = +0.000792;
-    _sc  =  1.02;
-    _scr =  0.11;
+    _ozr =  0.000792;
+
+    _sc  =  0.00102;
+    _scr =  0.00011;
+
     _t0  =  2000.0;
   }
@@ -125 +130 @@
     _dy  = 0.0;
     _dz  = 0.0;
+
     _dxr = 0.0;
     _dyr = 0.0;
     _dzr = 0.0;
+
     _ox  = 0.0;
     _oy  = 0.0;
     _oz  = 0.0;
+
     _oxr = 0.00150379;
     _oyr = 0.00118346;
     _ozr = 0.00120716;
+
     _sc  = 0.0;
     _scr = 0.0;
+
     _t0  = 2020.0;
   }
@@ -143 +153 @@
     _dy  =  0.0018;
     _dz  = -0.0061;
+
     _dxr =  0.0000;
     _dyr =  0.0000;
     _dzr =  0.0000;
-    _ox  =  0.000170;
-    _oy  = -0.000030;
-    _oz  =  0.000070;
+
+    _ox  =  0.000000;
+    _oy  =  0.000000;
+    _oz  =  0.000000;
+
     _oxr =  0.000000;
     _oyr =  0.000000;
     _ozr =  0.000000;
-    _sc  = -1.000;
-    _scr =  0.000;
-    _t0  =  2000.4;
+
+    _sc  = -0.00100;
+    _scr =  0.00000;
+    _t0  =  2000.0;
   }
   // Transformation Parameters from ITRF2014 to DREF91
@@ -161 +175 @@
     _dy  =  0.0512;
     _dz  = -0.0551;
+
     _dxr =  0.0001;
     _dyr =  0.0001;
     _dzr = -0.0019;
+
     _ox  = -0.000233;
     _oy  = -0.005598;
     _oz  =  0.009467;
+
     _oxr = -0.000081;
     _oyr = -0.000490;
     _ozr =  0.000792;
-    _sc  =  1.02;
-    _scr =  0.11;
+
+    _sc  =  0.00102;
+    _scr =  0.00011;
+
     _t0  =  2000.0;
   }
@@ -223 +242 @@
     return;
   }
-  int iEpoBegEarlier = _rtnetStreamBuffer.indexOf('*');
-  if (iEpoBegEarlier != -1 && iEpoBegEarlier < iEpoBeg) { // are there more epoch lines in buffer?
-    _rtnetStreamBuffer = _rtnetStreamBuffer.mid(iEpoBegEarlier);
-  }
-  else {
+    else {
     _rtnetStreamBuffer = _rtnetStreamBuffer.mid(iEpoBeg);
   }
 
-  int iEpoEnd = _rtnetStreamBuffer.indexOf("EOE"); // end of first epoch
+  int iEpoEnd = _rtnetStreamBuffer.indexOf("EOE"); // end of last epoch
   if (iEpoEnd == -1) {
     return;
   }
   else {
-    lines = _rtnetStreamBuffer.left(iEpoEnd).split('\n',
+    lines = _rtnetStreamBuffer.left(iEpoEnd).split('\n', 
         QString::SkipEmptyParts);
     _rtnetStreamBuffer = _rtnetStreamBuffer.mid(iEpoEnd + 3);
@@ -2447 +2462 @@
   double oz = (_oz + dt * _ozr) / arcSec;
 
-  double sc = 1.0 + _sc * 1e-9 + dt * _scr * 1e-9;
+  double sc = 1.0 + _sc * 1e-6 + dt * _scr * 1e-6;
 
   // Specify approximate center of area