Changeset 4174 in ntrip

Timestamp:

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

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bncsettings.cpp (modified) (1 diff)
• bncwindow.cpp (modified) (9 diffs)
• bncwindow.h (modified) (1 diff)
• upload/bncrtnetuploadcaster.cpp (modified) (8 diffs)
• upload/bncrtnetuploadcaster.h (modified) (1 diff)

trunk/BNC/bncsettings.cpp

@@ -170 +170 @@
       setValue_p("uploadMountpointsOut","");
       setValue_p("uploadIntr",          "1 day");
-      setValue_p("uploadSamplRtcmClkCorr", "5");
       setValue_p("uploadSamplRtcmEphCorr", "0");
       setValue_p("uploadSamplSp3",         "1");
-      setValue_p("uploadSamplClkRnx",      "5");
+      setValue_p("uploadSamplClkRnx",     "10");
       setValue_p("trafo_dx",            "");
       setValue_p("trafo_dy",            "");

trunk/BNC/bncwindow.cpp

@@ -559 +559 @@
     _uploadIntrComboBox->setCurrentIndex(ii);
   }
-  _uploadSamplRtcmClkCorrSpinBox = new QSpinBox;
-  _uploadSamplRtcmClkCorrSpinBox->setMinimum(5);
-  _uploadSamplRtcmClkCorrSpinBox->setMaximum(60);
-  _uploadSamplRtcmClkCorrSpinBox->setSingleStep(5);
-  _uploadSamplRtcmClkCorrSpinBox->setMaximumWidth(9*ww);
-  _uploadSamplRtcmClkCorrSpinBox->setValue(settings.value("uploadSamplRtcmClkCorr").toInt());
-  _uploadSamplRtcmClkCorrSpinBox->setSuffix(" sec");
 
   _uploadSamplRtcmEphCorrSpinBox = new QSpinBox;
@@ -594 +587 @@
   if (iRowT > 0) {
     enableWidget(true, _uploadIntrComboBox);
-    enableWidget(true, _uploadSamplRtcmClkCorrSpinBox);
     enableWidget(true, _uploadSamplRtcmEphCorrSpinBox);
     enableWidget(true, _uploadSamplSp3SpinBox);
@@ -601 +593 @@
   else {
     enableWidget(false, _uploadIntrComboBox);
-    enableWidget(false, _uploadSamplRtcmClkCorrSpinBox);
     enableWidget(false, _uploadSamplRtcmEphCorrSpinBox);
     enableWidget(false, _uploadSamplSp3SpinBox);
@@ -1130 +1121 @@
   uploadHlpLayout->addWidget(new QLabel("Interval"),         0, 2, Qt::AlignRight);
   uploadHlpLayout->addWidget(_uploadIntrComboBox,            0, 3);
-  uploadHlpLayout->addWidget(new QLabel("   Sampling: Clk"), 0, 4, Qt::AlignRight);
-  uploadHlpLayout->addWidget(_uploadSamplRtcmClkCorrSpinBox, 0, 5);
-  uploadHlpLayout->addWidget(new QLabel("Orb"),              0, 6, Qt::AlignRight);
-  uploadHlpLayout->addWidget(_uploadSamplRtcmEphCorrSpinBox, 0, 7);
-  uploadHlpLayout->addWidget(new QLabel("SP3"),              0, 8, Qt::AlignRight);
-  uploadHlpLayout->addWidget(_uploadSamplSp3SpinBox,         0, 9);
-  uploadHlpLayout->addWidget(new QLabel("RNX"),              0,10, Qt::AlignRight);
-  uploadHlpLayout->addWidget(_uploadSamplClkRnxSpinBox,      0,11);
-  uploadHlpLayout->addWidget(setUploadTrafoButton,           0,12);
+  uploadHlpLayout->addWidget(new QLabel("Sampling: Orb"),    0, 4, Qt::AlignRight);
+  uploadHlpLayout->addWidget(_uploadSamplRtcmEphCorrSpinBox, 0, 5);
+  uploadHlpLayout->addWidget(new QLabel("SP3"),              0, 6, Qt::AlignRight);
+  uploadHlpLayout->addWidget(_uploadSamplSp3SpinBox,         0, 7);
+  uploadHlpLayout->addWidget(new QLabel("RNX"),              0, 8, Qt::AlignRight);
+  uploadHlpLayout->addWidget(_uploadSamplClkRnxSpinBox,      0, 9);
+  uploadHlpLayout->addWidget(setUploadTrafoButton,           0,10);
 
   QBoxLayout* uploadLayout = new QBoxLayout(QBoxLayout::TopToBottom);
@@ -1292 +1281 @@
   delUploadRowButton->setWhatsThis(tr("Hit 'Del Row' button to delete the highlighted line from the stream upload table."));
   _uploadIntrComboBox->setWhatsThis(tr("Select the length of the SP3 and Clock RINEX files."));
-  _uploadSamplRtcmClkCorrSpinBox->setWhatsThis(tr("Select the Clock Correction sampling interval in seconds. A value of zero '0' tells BNC to upload all available samples."));
   _uploadSamplRtcmEphCorrSpinBox->setWhatsThis(tr("Select the Ephemeris Correction sampling interval in seconds. A value of zero '0' tells BNC to upload all available samples."));
   _uploadSamplClkRnxSpinBox->setWhatsThis(tr("Select the Clock RINEX file sampling interval in seconds. A value of zero '0' tells BNC to store all available samples into Clock RINEX files."));
@@ -1753 +1741 @@
   }
   settings.setValue("uploadIntr",             _uploadIntrComboBox->currentText());
-  settings.setValue("uploadSamplRtcmClkCorr", _uploadSamplRtcmClkCorrSpinBox->value());
   settings.setValue("uploadSamplRtcmEphCorr", _uploadSamplRtcmEphCorrSpinBox->value());
   settings.setValue("uploadSamplSp3",         _uploadSamplSp3SpinBox->value());
@@ -2237 +2224 @@
   if (iRow > 0) {
     enableWidget(true, _uploadIntrComboBox);
-    enableWidget(true, _uploadSamplRtcmClkCorrSpinBox);
     enableWidget(true, _uploadSamplRtcmEphCorrSpinBox);
     enableWidget(true, _uploadSamplClkRnxSpinBox);
@@ -2244 +2230 @@
   else {
     enableWidget(false, _uploadIntrComboBox);
-    enableWidget(false, _uploadSamplRtcmClkCorrSpinBox);
     enableWidget(false, _uploadSamplRtcmEphCorrSpinBox);
     enableWidget(false, _uploadSamplClkRnxSpinBox);
@@ -2465 +2450 @@
   if (nRows < 1) {
     enableWidget(false, _uploadIntrComboBox);
-    enableWidget(false, _uploadSamplRtcmClkCorrSpinBox);
     enableWidget(false, _uploadSamplRtcmEphCorrSpinBox);
     enableWidget(false, _uploadSamplSp3SpinBox);

trunk/BNC/bncwindow.h

@@ -233 +233 @@
     QTableWidget* _uploadTable;
     QComboBox*    _uploadIntrComboBox;
-    QSpinBox*     _uploadSamplRtcmClkCorrSpinBox;
     QSpinBox*     _uploadSamplRtcmEphCorrSpinBox;
     QSpinBox*     _uploadSamplSp3SpinBox;

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) {

trunk/BNC/upload/bncrtnetuploadcaster.h

@@ -44 +44 @@
   int            _SID;
   int            _IOD;
-  double         _samplOrb;
+  double         _samplRtcmEphCorr;
   double         _dx;
   double         _dy;