Changeset 1327 in ntrip

Timestamp:

Dec 22, 2008, 4:04:04 PM (16 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncgetthread.cpp (modified) (1 diff)
• bncwindow.cpp (modified) (5 diffs)
• bncwindow.h (modified) (1 diff)

trunk/BNC/bncgetthread.cpp

@@ -192 +192 @@
           this, SLOT(slotNewEphGPS(gpsephemeris)));
 
-  if (settings.value("serial_staID").toString() == _staID) {
-    _serialPort = new QextSerialPort( settings.value("serial_name").toString() );
+  if (settings.value("serialMountPoint").toString() == _staID) {
+    _serialPort = new QextSerialPort( 
+                               settings.value("serialPortName").toString() );
     _serialPort->setBaudRate(BAUD9600);   
     _serialPort->setParity(PAR_NONE);    

trunk/BNC/bncwindow.cpp

@@ -230 +230 @@
   _logFileLineEdit    = new QLineEdit(settings.value("logFile").toString());
   _adviseScriptLineEdit    = new QLineEdit(settings.value("adviseScript").toString());
+  _serialPortNameLineEdit = new QLineEdit(settings.value("serialPortName").toString());
+  _serialMountPointLineEdit = new QLineEdit(settings.value("serialMountPoint").toString());
 
   _perfIntrComboBox    = new QComboBox();
@@ -313 +315 @@
   QWidget* ogroup = new QWidget();
   QWidget* rgroup = new QWidget();
+  QWidget* sergroup = new QWidget();
   aogroup->addTab(pgroup,tr("Proxy"));
   aogroup->addTab(ggroup,tr("General"));
@@ -321 +324 @@
   aogroup->addTab(agroup,tr("Outages"));
   aogroup->addTab(rgroup,tr("Miscellaneous"));
+  aogroup->addTab(sergroup,tr("Serial"));
 
   QGridLayout* pLayout = new QGridLayout;
@@ -436 +440 @@
   cLayout->addWidget(new QLabel("    "),5,0);
   cgroup->setLayout(cLayout);
+
+  QGridLayout* serLayout = new QGridLayout;
+  serLayout->addWidget(new QLabel("Port Name"),0,0, Qt::AlignLeft);
+  serLayout->addWidget(_serialPortNameLineEdit,0, 1);
+  serLayout->addWidget(new QLabel("MountPoint"),1,0, Qt::AlignLeft);
+  serLayout->addWidget(_serialMountPointLineEdit,1, 1);
+  sergroup->setLayout(serLayout);
 
   QVBoxLayout* mLayout = new QVBoxLayout;
@@ -664 +675 @@
   settings.setValue("miscMount",   _miscMountLineEdit->text());
   settings.setValue("scanRTCM",    _scanRTCMCheckBox->checkState());
+  settings.setValue("serialPortName", _serialPortNameLineEdit->text());
+  settings.setValue("serialMountPoint", _serialMountPointLineEdit->text());
   
-QStringList mountPoints;
+  QStringList mountPoints;
 
   for (int iRow = 0; iRow < _mountPointsTable->rowCount(); iRow++) {

trunk/BNC/bncwindow.h

@@ -130 +130 @@
     QComboBox* _perfIntrComboBox;
     QTableWidget* _mountPointsTable;
+    QLineEdit* _serialPortNameLineEdit;
+    QLineEdit* _serialMountPointLineEdit;
 
     QLineEdit*   _LatLineEdit;