Changeset 4174 in ntrip for trunk/BNC/upload/bncrtnetuploadcaster.cpp

Timestamp:

May 15, 2012, 10:27:42 AM (12 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/upload/bncrtnetuploadcaster.cpp (modified) (8 diffs)

trunk/BNC/upload/bncrtnetuploadcaster.cpp

@@ -48 +48 @@
   bncSettings settings;
   QString     intr  = settings.value("uploadIntr").toString();
-  int         sampl = settings.value("uploadSampl").toInt();
-  _samplOrb = settings.value("uploadSamplOrb").toDouble();
-  if (_samplOrb == 0.0) {
+
+  _samplRtcmEphCorr  = settings.value("uploadSamplRtcmEphCorr").toDouble();
+  double samplClkRnx = settings.value("uploadSamplClkRnx").toDouble();
+  double samplSp3    = settings.value("uploadSamplSp3").toDouble() * 60.0;
+
+  if (_samplRtcmEphCorr == 0.0) {
     _usedEph = 0;
   }
@@ -60 +63 @@
   // ----------
   if (!outFileName.isEmpty()) {
-    _outFile = new bncoutf(outFileName, intr, sampl);
+    _outFile = new bncoutf(outFileName, intr, 0);
   }
   else {
@@ -69 +72 @@
   // ------------
   if (!rnxFileName.isEmpty()) {
-    _rnx = new bncClockRinex(rnxFileName, intr, sampl);
+    _rnx = new bncClockRinex(rnxFileName, intr, samplClkRnx);
   }
   else {
@@ -78 +81 @@
   // ----------
   if (!sp3FileName.isEmpty()) {
-    _sp3 = new bncSP3(sp3FileName, intr, _samplOrb);
+    _sp3 = new bncSP3(sp3FileName, intr, samplSp3);
   }
   else {
@@ -298 +301 @@
       // ----------------------------------------------------------------
       if (_usedEph) {
-        if (fmod(epoTime.gpssec(), _samplOrb) == 0.0) {
+        if (fmod(epoTime.gpssec(), _samplRtcmEphCorr) == 0.0) {
           (*_usedEph)[prn] = eph;
         }
@@ -396 +399 @@
   // Orbit and Clock Corrections together
   // ------------------------------------
-  if (_samplOrb == 0.0) {
+  if (_samplRtcmEphCorr == 0.0) {
     if (co.NumberOfGPSSat > 0 || co.NumberOfGLONASSSat > 0) {
       char obuffer[CLOCKORBIT_BUFFERSIZE];
@@ -411 +414 @@
     if (co.NumberOfGPSSat > 0) {
       char obuffer[CLOCKORBIT_BUFFERSIZE];
-      if (fmod(epoTime.gpssec(), _samplOrb) == 0.0) {
+      if (fmod(epoTime.gpssec(), _samplRtcmEphCorr) == 0.0) {
         int len1 = MakeClockOrbit(&co, COTYPE_GPSORBIT, 1, obuffer, sizeof(obuffer));
         if (len1 > 0) {
@@ -425 +428 @@
     if (co.NumberOfGLONASSSat > 0) {
       char obuffer[CLOCKORBIT_BUFFERSIZE];
-      if (fmod(epoTime.gpssec(), _samplOrb) == 0.0) {
+      if (fmod(epoTime.gpssec(), _samplRtcmEphCorr) == 0.0) {
         int len1 = MakeClockOrbit(&co, COTYPE_GLONASSORBIT, 1, obuffer, sizeof(obuffer));
         if (len1 > 0) {