Changeset 3199 in ntrip

Timestamp:

Mar 30, 2011, 3:44:48 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bncsettings.cpp (modified) (1 diff)
• bncwindow.cpp (modified) (8 diffs)
• bncwindow.h (modified) (1 diff)

trunk/BNC/bncsettings.cpp

@@ -105 +105 @@
     setValue("nmeaPort",         "");
     setValue("combineStreams",   "");
-    setValue("cmbOutHost",       "");
-    setValue("cmbOutPort",       "");
-    setValue("cmbMountpoint",    "");
-    setValue("cmbPassword",      "");
-    setValue("cmbOutPath",       "");
-    setValue("cmbSP3Path",       "");
     setValue("uploadMountpointsOut",   "");
     sync();

trunk/BNC/bncwindow.cpp

@@ -459 +459 @@
   QPushButton* addCmbRowButton = new QPushButton("Add Row");
   QPushButton* delCmbRowButton = new QPushButton("Delete");
-  _cmbOutHostLineEdit    = new QLineEdit(settings.value("cmbOutHost").toString());
-  _cmbOutPortLineEdit    = new QLineEdit(settings.value("cmbOutPort").toString());
-  _cmbMountpointLineEdit = new QLineEdit(settings.value("cmbMountpoint").toString());
-  _cmbPasswordLineEdit   = new QLineEdit(settings.value("cmbPassword").toString());
-  _cmbOutPathLineEdit = new QLineEdit(settings.value("cmbOutPath").toString());
-  _cmbSP3PathLineEdit = new QLineEdit(settings.value("cmbSP3Path").toString());
 
   connect(_cmbTable, SIGNAL(itemSelectionChanged()), 
           SLOT(slotBncTextChanged()));
-  connect(_cmbMountpointLineEdit, SIGNAL(textChanged(const QString &)),
-          this, SLOT(slotBncTextChanged()));
 
   // Upload Results
@@ -597 +589 @@
   addCmbRowButton->setWhatsThis(tr("Hit 'Add Row' button to add another line to the mountpoints table."));
   delCmbRowButton->setWhatsThis(tr("Hit 'Delete' button to delete the highlighted line from the mountpoints table."));
-  _cmbOutHostLineEdit->setWhatsThis(tr("Specify the domain name or IP number of an Ntrip Broadcaster for uploading the combination stream."));
-  _cmbOutPortLineEdit->setWhatsThis(tr("Enter the listening IP port of the specified Ntrip Broadcaster for uploading the combination stream."));
-  _cmbMountpointLineEdit->setWhatsThis(tr("<p>Enter a mountpoint for the combination stream. If 'Host', 'Port' and 'Password' are set, the combination stream will be uploaded to the specified Ntrip Broadcaster.</p><p>Note that the mountpoint defined here can be introduce as 'Obs Mountpoint' under the 'PPP (1)' tab to carry out a Precise Point Positioning through directly using the combination stream without prior upload to the Ntrip Broadcaster."));
-  _cmbPasswordLineEdit->setWhatsThis(tr("Enter the password for uploading the combination stream to the specified Ntrip Broadcaster."));
-  _cmbOutPathLineEdit->setWhatsThis(tr("<p>Specify a directory for saving the combined Broadcast Ephemeris corrections in a plain ASCII format on disk.</p><p>The length of the Broadcast Ephemeris corrections files is defined through option 'Interval' under the 'Broadcast Corrections' tab.</p>"));
-  _cmbSP3PathLineEdit->setWhatsThis(tr("<p>Specify a directory for saving the combination of Broadcast Ephemeris and Broadcast Ephemeris corrections in SP3 format on disk. The SP3 file output already works with only one corrections stream specified for combination.</p><p>Note that this normally requires to also specify the full path to an 'ANTEX File' under the 'PPP (2)' tab.</p>"));
 
   // Canvas with Editable Fields
@@ -938 +924 @@
   populateCmbTable();
   cmbLayout->addWidget(_cmbTable,0,0,6,3);
-  cmbLayout->setColumnStretch(0,1);
-  cmbLayout->setColumnStretch(1,1);
-  cmbLayout->setColumnStretch(2,1);
 
   cmbLayout->addWidget(addCmbRowButton,1,3);
@@ -947 +930 @@
   connect(delCmbRowButton, SIGNAL(clicked()), this, SLOT(slotDelCmbRow()));
 
-  cmbLayout->setColumnStretch(4,1);
-
-  cmbLayout->addWidget(new QLabel("    Host"), 0, 4);
-  cmbLayout->addWidget(_cmbOutHostLineEdit, 0, 5);
-  cmbLayout->addWidget(new QLabel("    Port"), 0, 6);
-  _cmbOutPortLineEdit->setMaximumWidth(9*ww);
-  cmbLayout->addWidget(_cmbOutPortLineEdit, 0, 7);
-  cmbLayout->addWidget(new QLabel("    Mountpoint"), 1, 4);
-  _cmbMountpointLineEdit->setMaximumWidth(9*ww);
-  cmbLayout->addWidget(_cmbMountpointLineEdit, 1, 5);
-  cmbLayout->addWidget(new QLabel("    Password"), 1, 6);
-  _cmbPasswordLineEdit->setEchoMode(QLineEdit::PasswordEchoOnEdit);
-  _cmbPasswordLineEdit->setMaximumWidth(9*ww);
-  cmbLayout->addWidget(_cmbPasswordLineEdit, 1, 7);
-  cmbLayout->addWidget(new QLabel("    Directory, ASCII"), 2, 4);
-  cmbLayout->addWidget(_cmbOutPathLineEdit, 2, 5, 1, 3);
-  cmbLayout->addWidget(new QLabel("    Directory, SP3"), 3, 4);
-  cmbLayout->addWidget(_cmbSP3PathLineEdit, 3, 5, 1, 3);
-  cmbLayout->addWidget(new QLabel(" Combine Broadcast Ephemeris corrections streams."),5,3,1,5);
+  cmbLayout->addWidget(new QLabel(" Combine Broadcast Ephemeris corrections streams."),5,3,1,3);
 
   cmbgroup->setLayout(cmbLayout);
@@ -973 +938 @@
   QGridLayout* uploadHlpLayout = new QGridLayout();
 
-  uploadHlpLayout->addWidget(new QLabel("Upload RTNet results to NTRIP caster"),0,0);
+  uploadHlpLayout->addWidget(new QLabel("Upload RTNet or Combination Results"),0,0);
 
   uploadHlpLayout->addWidget(addUploadRowButton,0,1);
@@ -1410 +1375 @@
     settings.setValue("combineStreams", "");
   }
-  settings.setValue("cmbOutHost",    _cmbOutHostLineEdit->text());
-  settings.setValue("cmbOutPort",    _cmbOutPortLineEdit->text());
-  settings.setValue("cmbMountpoint", _cmbMountpointLineEdit->text());
-  settings.setValue("cmbPassword",   _cmbPasswordLineEdit->text());
-  settings.setValue("cmbOutPath",    _cmbOutPathLineEdit->text());
-  settings.setValue("cmbSP3Path",    _cmbSP3PathLineEdit->text());
 
   if (!uploadMountpointsOut.isEmpty()) {
@@ -1495 +1454 @@
     if (!anxfile.exists()) ((bncApp*)qApp)->slotMessage("Cannot find IGS ANTEX file", true);
   }
-
-  QDir cmbOutDir(settings.value("cmbOutPath").toString());
-  if (!cmbOutDir.exists()) ((bncApp*)qApp)->slotMessage("Cannot find directory for saving combination results in ASCII format", true);
-
-  QDir cmbSP3dir(settings.value("cmbSP3Path").toString());
-  if (!cmbSP3dir.exists()) ((bncApp*)qApp)->slotMessage("Cannot find directory for saving combination results in SP3 format", true);
 
   _caster->slotReadMountPoints();
@@ -2123 +2076 @@
     } 
   }
-
-  // Combination
-  // ----------
-  if (sender() == 0 
-     || sender() == _cmbTable
-     || sender() == _cmbMountpointLineEdit) {
-    if (_cmbTable->rowCount() > 0) {
-      _cmbMountpointLineEdit->setPalette(palette_white);
-      _cmbSP3PathLineEdit->setPalette(palette_white);
-      _cmbMountpointLineEdit->setEnabled(true);
-      _cmbSP3PathLineEdit->setEnabled(true);
-      if (!_cmbMountpointLineEdit->text().isEmpty()) {
-        _cmbOutHostLineEdit->setPalette(palette_white);
-        _cmbOutPortLineEdit->setPalette(palette_white);
-        _cmbPasswordLineEdit->setPalette(palette_white);
-        _cmbOutPathLineEdit->setPalette(palette_white);
-        _cmbOutHostLineEdit->setEnabled(true);
-        _cmbOutPortLineEdit->setEnabled(true);
-        _cmbPasswordLineEdit->setEnabled(true);
-        _cmbOutPathLineEdit->setEnabled(true);
-      } else {
-      _cmbOutHostLineEdit->setPalette(palette_gray);
-      _cmbOutPortLineEdit->setPalette(palette_gray);
-      _cmbPasswordLineEdit->setPalette(palette_gray);
-      _cmbOutPathLineEdit->setPalette(palette_gray);
-      _cmbOutHostLineEdit->setEnabled(false);
-      _cmbOutPortLineEdit->setEnabled(false);
-      _cmbPasswordLineEdit->setEnabled(false);
-      _cmbOutPathLineEdit->setEnabled(false);
-      }
-    } else {
-      _cmbMountpointLineEdit->setPalette(palette_gray);
-      _cmbOutHostLineEdit->setPalette(palette_gray);
-      _cmbOutPortLineEdit->setPalette(palette_gray);
-      _cmbPasswordLineEdit->setPalette(palette_gray);
-      _cmbOutPathLineEdit->setPalette(palette_gray);
-      _cmbSP3PathLineEdit->setPalette(palette_gray);
-      _cmbMountpointLineEdit->setEnabled(false);
-      _cmbOutHostLineEdit->setEnabled(false);
-      _cmbOutPortLineEdit->setEnabled(false);
-      _cmbPasswordLineEdit->setEnabled(false);
-      _cmbOutPathLineEdit->setEnabled(false);
-      _cmbSP3PathLineEdit->setEnabled(false);
-    }
-  }
 }
 

trunk/BNC/bncwindow.h

@@ -196 +196 @@
 
     QTableWidget* _cmbTable;
-    QLineEdit*    _cmbOutHostLineEdit;
-    QLineEdit*    _cmbOutPortLineEdit;
-    QLineEdit*    _cmbMountpointLineEdit;
-    QLineEdit*    _cmbPasswordLineEdit;
-    QLineEdit*    _cmbOutPathLineEdit;
-    QLineEdit*    _cmbSP3PathLineEdit;
 
     QTableWidget* _uploadTable;