Index: trunk/BNC/bncwindow.cpp
===================================================================
--- trunk/BNC/bncwindow.cpp	(revision 4171)
+++ trunk/BNC/bncwindow.cpp	(revision 4172)
@@ -559,30 +559,50 @@
     _uploadIntrComboBox->setCurrentIndex(ii);
   }
-  _uploadSamplSpinBox = new QSpinBox;
-  _uploadSamplSpinBox->setMinimum(5);
-  _uploadSamplSpinBox->setMaximum(60);
-  _uploadSamplSpinBox->setSingleStep(5);
-  _uploadSamplSpinBox->setMaximumWidth(9*ww);
-  _uploadSamplSpinBox->setValue(settings.value("uploadSampl").toInt());
-  _uploadSamplSpinBox->setSuffix(" sec");
-
-  _uploadSamplOrbSpinBox = new QSpinBox;
-  _uploadSamplOrbSpinBox->setMinimum(0);
-  _uploadSamplOrbSpinBox->setMaximum(60);
-  _uploadSamplOrbSpinBox->setSingleStep(5);
-  _uploadSamplOrbSpinBox->setMaximumWidth(9*ww);
-  _uploadSamplOrbSpinBox->setValue(settings.value("uploadSamplOrb").toInt());
-  _uploadSamplOrbSpinBox->setSuffix(" sec");
+  _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;
+  _uploadSamplRtcmEphCorrSpinBox->setMinimum(0);
+  _uploadSamplRtcmEphCorrSpinBox->setMaximum(60);
+  _uploadSamplRtcmEphCorrSpinBox->setSingleStep(5);
+  _uploadSamplRtcmEphCorrSpinBox->setMaximumWidth(9*ww);
+  _uploadSamplRtcmEphCorrSpinBox->setValue(settings.value("uploadSamplRtcmEphCorr").toInt());
+  _uploadSamplRtcmEphCorrSpinBox->setSuffix(" sec");
+
+  _uploadSamplSp3SpinBox = new QSpinBox;
+  _uploadSamplSp3SpinBox->setMinimum(0);
+  _uploadSamplSp3SpinBox->setMaximum(60);
+  _uploadSamplSp3SpinBox->setSingleStep(5);
+  _uploadSamplSp3SpinBox->setMaximumWidth(9*ww);
+  _uploadSamplSp3SpinBox->setValue(settings.value("uploadSamplSp3").toInt());
+  _uploadSamplSp3SpinBox->setSuffix(" sec");
+
+  _uploadSamplClkRnxSpinBox = new QSpinBox;
+  _uploadSamplClkRnxSpinBox->setMinimum(0);
+  _uploadSamplClkRnxSpinBox->setMaximum(60);
+  _uploadSamplClkRnxSpinBox->setSingleStep(5);
+  _uploadSamplClkRnxSpinBox->setMaximumWidth(9*ww);
+  _uploadSamplClkRnxSpinBox->setValue(settings.value("uploadSamplClkRnx").toInt());
+  _uploadSamplClkRnxSpinBox->setSuffix(" sec");
 
   int iRowT = _uploadTable->rowCount();
   if (iRowT > 0) {
     enableWidget(true, _uploadIntrComboBox);
-    enableWidget(true, _uploadSamplSpinBox);
-    enableWidget(true, _uploadSamplOrbSpinBox);
+    enableWidget(true, _uploadSamplRtcmClkCorrSpinBox);
+    enableWidget(true, _uploadSamplRtcmEphCorrSpinBox);
+    enableWidget(true, _uploadSamplSp3SpinBox);
+    enableWidget(true, _uploadSamplClkRnxSpinBox);
   } 
   else {
     enableWidget(false, _uploadIntrComboBox);
-    enableWidget(false, _uploadSamplSpinBox);
-    enableWidget(false, _uploadSamplOrbSpinBox);
+    enableWidget(false, _uploadSamplRtcmClkCorrSpinBox);
+    enableWidget(false, _uploadSamplRtcmEphCorrSpinBox);
+    enableWidget(false, _uploadSamplSp3SpinBox);
+    enableWidget(false, _uploadSamplClkRnxSpinBox);
   }
 
@@ -1106,13 +1126,17 @@
   connect(setUploadTrafoButton, SIGNAL(clicked()), this, SLOT(slotSetUploadTrafo()));
 
-  uploadHlpLayout->addWidget(addUploadRowButton,             0,0);
-  uploadHlpLayout->addWidget(delUploadRowButton,             0,1);
-  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(_uploadSamplSpinBox,            0,5);
-  uploadHlpLayout->addWidget(new QLabel("   Sampling (Orb)"),0,6, Qt::AlignRight);
-  uploadHlpLayout->addWidget(_uploadSamplOrbSpinBox,         0,7);
-  uploadHlpLayout->addWidget(setUploadTrafoButton,           0,8);
+  uploadHlpLayout->addWidget(addUploadRowButton,             0, 0);
+  uploadHlpLayout->addWidget(delUploadRowButton,             0, 1);
+  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);
 
   QBoxLayout* uploadLayout = new QBoxLayout(QBoxLayout::TopToBottom);
@@ -1268,6 +1292,8 @@
   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."));
-  _uploadSamplSpinBox->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."));
-  _uploadSamplOrbSpinBox->setWhatsThis(tr("Select the SP3 orbit file sampling interval in seconds. A value of zero '0' tells BNC to store all available samples into SP3 orbit 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."));
+  _uploadSamplSp3SpinBox->setWhatsThis(tr("Select the SP3 orbit file sampling interval in seconds. A value of zero '0' tells BNC to store all available samples into SP3 orbit files."));
   setUploadTrafoButton->setWhatsThis(tr("Hit 'Custom Trafo' to specify your own 14 parameter Helmert Transformation instead of selecting a predefined transformation through 'System' button."));
 
@@ -1726,7 +1752,9 @@
     settings.setValue("uploadMountpointsOut", "");
   }
-  settings.setValue("uploadIntr",     _uploadIntrComboBox->currentText());
-  settings.setValue("uploadSampl",    _uploadSamplSpinBox->value());
-  settings.setValue("uploadSamplOrb", _uploadSamplOrbSpinBox->value());
+  settings.setValue("uploadIntr",             _uploadIntrComboBox->currentText());
+  settings.setValue("uploadSamplRtcmClkCorr", _uploadSamplRtcmClkCorrSpinBox->value());
+  settings.setValue("uploadSamplRtcmEphCorr", _uploadSamplRtcmEphCorrSpinBox->value());
+  settings.setValue("uploadSamplSp3",         _uploadSamplSp3SpinBox->value());
+  settings.setValue("uploadSamplClkRnx",      _uploadSamplClkRnxSpinBox->value());
 // Upload (eph)
   settings.setValue("uploadEphHost",      _uploadEphHostLineEdit->text());
@@ -2209,11 +2237,15 @@
   if (iRow > 0) {
     enableWidget(true, _uploadIntrComboBox);
-    enableWidget(true, _uploadSamplSpinBox);
-    enableWidget(true, _uploadSamplOrbSpinBox);
+    enableWidget(true, _uploadSamplRtcmClkCorrSpinBox);
+    enableWidget(true, _uploadSamplRtcmEphCorrSpinBox);
+    enableWidget(true, _uploadSamplClkRnxSpinBox);
+    enableWidget(true, _uploadSamplSp3SpinBox);
   } 
   else {
     enableWidget(false, _uploadIntrComboBox);
-    enableWidget(false, _uploadSamplSpinBox);
-    enableWidget(false, _uploadSamplOrbSpinBox);
+    enableWidget(false, _uploadSamplRtcmClkCorrSpinBox);
+    enableWidget(false, _uploadSamplRtcmEphCorrSpinBox);
+    enableWidget(false, _uploadSamplClkRnxSpinBox);
+    enableWidget(false, _uploadSamplSp3SpinBox);
   }
 
@@ -2433,6 +2465,8 @@
   if (nRows < 1) {
     enableWidget(false, _uploadIntrComboBox);
-    enableWidget(false, _uploadSamplSpinBox);
-    enableWidget(false, _uploadSamplOrbSpinBox);
+    enableWidget(false, _uploadSamplRtcmClkCorrSpinBox);
+    enableWidget(false, _uploadSamplRtcmEphCorrSpinBox);
+    enableWidget(false, _uploadSamplSp3SpinBox);
+    enableWidget(false, _uploadSamplClkRnxSpinBox);
   }
 }
Index: trunk/BNC/bncwindow.h
===================================================================
--- trunk/BNC/bncwindow.h	(revision 4171)
+++ trunk/BNC/bncwindow.h	(revision 4172)
@@ -233,6 +233,8 @@
     QTableWidget* _uploadTable;
     QComboBox*    _uploadIntrComboBox;
-    QSpinBox*     _uploadSamplSpinBox;
-    QSpinBox*     _uploadSamplOrbSpinBox;
+    QSpinBox*     _uploadSamplRtcmClkCorrSpinBox;
+    QSpinBox*     _uploadSamplRtcmEphCorrSpinBox;
+    QSpinBox*     _uploadSamplSp3SpinBox;
+    QSpinBox*     _uploadSamplClkRnxSpinBox;
 
     QLineEdit*       _uploadEphHostLineEdit;