Changeset 366 in ntrip for trunk/BNC/bncwindow.cpp

Timestamp:

Jan 17, 2007, 4:17:20 PM (17 years ago)

Author:

mervart

Message:

* empty log message *

File:

• trunk/BNC/bncwindow.cpp (modified) (13 diffs)

trunk/BNC/bncwindow.cpp

@@ -47 +47 @@
 #include "bnchlpdlg.h" 
 #include "bnchtml.h" 
-#include "bnctableitem.h" 
+#include "bnctableitem.h"
 
 using namespace std;
@@ -57 +57 @@
   int ww = QFontMetrics(this->font()).width('w');
   
-  static const QStringList labels = QString("account,mountpoint,"
-    "decoder,bytes").split(",");
-
-  setMinimumSize(60*ww, 60*ww);
+  static const QStringList labels = QString("account,mountpoint,decoder,lat,long,type,bytes").split(",");
+
+  setMinimumSize(77*ww, 60*ww);
   setWindowTitle(tr("BKG Ntrip Client (BNC), Version 1.1b"));
 
@@ -163 +162 @@
   _rnxSamplSpinBox->setSuffix(" sec");
   _logFileLineEdit    = new QLineEdit(settings.value("logFile").toString());
-  _LatLineEdit     = new QLineEdit(settings.value("approxLat").toString());
-  _LatLineEdit->setMaximumWidth(9*ww);
-  _LonLineEdit     = new QLineEdit(settings.value("approxLon").toString());
-  _LonLineEdit->setMaximumWidth(9*ww);
-  _mountPointsTable   = new QTableWidget(0,4);
+  _mountPointsTable   = new QTableWidget(0,7);
   _mountPointsTable->horizontalHeader()->resizeSection(1,25*ww);
+  _mountPointsTable->horizontalHeader()->resizeSection(2,9*ww);
+  _mountPointsTable->horizontalHeader()->resizeSection(3,7*ww); 
+  _mountPointsTable->horizontalHeader()->resizeSection(4,7*ww); 
+  _mountPointsTable->horizontalHeader()->resizeSection(5,5*ww); 
   _mountPointsTable->horizontalHeader()->setResizeMode(QHeaderView::Interactive);
   _mountPointsTable->horizontalHeader()->setStretchLastSection(true);
@@ -186 +185 @@
     QStringList hlp = it.next().split(" ");
     if (hlp.size() <= 1) continue;
+    if (hlp.size() == 2) continue; // For downward compatibility
     _mountPointsTable->insertRow(iRow);
 
@@ -191 +191 @@
 
     QString fullPath = url.host() + QString(":%1").arg(url.port()) + url.path();
-    QString format(hlp[1]);
+    QString format(hlp[1]); QString latitude(hlp[2]); QString longitude(hlp[3]);
+    QString nmea(hlp[4]);
 
     QTableWidgetItem* it;
@@ -205 +206 @@
     _mountPointsTable->setItem(iRow, 2, it);
 
+    if      (nmea == "VRS") {
+    it = new QTableWidgetItem(latitude);
+    _mountPointsTable->setItem(iRow, 3, it);
+    it = new QTableWidgetItem(longitude);
+    _mountPointsTable->setItem(iRow, 4, it);
+    } else {
+    it = new QTableWidgetItem(latitude);
+    it->setFlags(it->flags() & ~Qt::ItemIsEditable);
+    _mountPointsTable->setItem(iRow, 3, it);
+    it = new QTableWidgetItem(longitude);
+    it->setFlags(it->flags() & ~Qt::ItemIsEditable);
+    _mountPointsTable->setItem(iRow, 4, it);
+    }
+
+    it = new QTableWidgetItem(nmea);
+    it->setFlags(it->flags() & ~Qt::ItemIsEditable);
+    _mountPointsTable->setItem(iRow, 5, it);
+
     bncTableItem* bncIt = new bncTableItem();
     bncIt->setFlags(bncIt->flags() & ~Qt::ItemIsEditable);
-    _mountPointsTable->setItem(iRow, 3, bncIt);
+    _mountPointsTable->setItem(iRow, 6, bncIt);
 
     iRow++;
@@ -252 +271 @@
 
   layout->addWidget(new QLabel("Mountpoints"),                   8, 0, 1, 2);
-
-  layout->addWidget(new QLabel(tr("Approx. Lat./Lon.")),         8, 2);
-  layout->addWidget(_LatLineEdit,                                8, 3);
-  layout->addWidget(_LonLineEdit,                                8, 4);
 
   layout->addWidget(_mountPointsTable,                           9, 0, 1, 5);
@@ -332 +347 @@
     QUrl    url(hlp[0]);
     QString fullPath = url.host() + QString(":%1").arg(url.port()) + url.path();
-    QString format(hlp[1]);
+    QString format(hlp[1]); QString latitude(hlp[2]); QString longitude(hlp[3]);
+    QString nmea(hlp[4]);
 
     _mountPointsTable->insertRow(iRow);
@@ -348 +364 @@
     _mountPointsTable->setItem(iRow, 2, it);
 
+    if      (nmea == "VRS") {
+    it = new QTableWidgetItem(latitude);
+    _mountPointsTable->setItem(iRow, 3, it);
+    it = new QTableWidgetItem(longitude);
+    _mountPointsTable->setItem(iRow, 4, it);
+    } else {
+    it = new QTableWidgetItem(latitude);
+    it->setFlags(it->flags() & ~Qt::ItemIsEditable);
+    _mountPointsTable->setItem(iRow, 3, it);
+    it = new QTableWidgetItem(longitude);
+    it->setFlags(it->flags() & ~Qt::ItemIsEditable);
+    _mountPointsTable->setItem(iRow, 4, it);
+    }
+
+    it = new QTableWidgetItem(nmea);
+    it->setFlags(it->flags() & ~Qt::ItemIsEditable);
+    _mountPointsTable->setItem(iRow, 5, it);
+
     bncTableItem* bncIt = new bncTableItem();
-    _mountPointsTable->setItem(iRow, 3, bncIt);
+    _mountPointsTable->setItem(iRow, 6, bncIt);
 
     iRow++;
@@ -377 +411 @@
   settings.setValue("rnxAppend",   _rnxAppendCheckBox->checkState());
   settings.setValue("logFile",     _logFileLineEdit->text());
-  settings.setValue("approxLat",   _LatLineEdit->text());
-  settings.setValue("approxLon",   _LonLineEdit->text());
   
 QStringList mountPoints;
@@ -387 +419 @@
 
     mountPoints.append(url.toString() + " " + 
-                       _mountPointsTable->item(iRow, 2)->text());
+                       _mountPointsTable->item(iRow, 2)->text()
+               + " " + _mountPointsTable->item(iRow, 3)->text()
+               + " " + _mountPointsTable->item(iRow, 4)->text()
+               + " " + _mountPointsTable->item(iRow, 5)->text());
   }
   settings.setValue("mountPoints", mountPoints);
@@ -431 +466 @@
     QByteArray format = _mountPointsTable->item(iRow, 2)->text().toAscii();
 
-    bncGetThread* getThread = new bncGetThread(url, format, iRow);
+    QByteArray latitude = _mountPointsTable->item(iRow, 3)->text().toAscii();
+    QByteArray longitude = _mountPointsTable->item(iRow, 4)->text().toAscii();
+    QByteArray nmea = _mountPointsTable->item(iRow, 5)->text().toAscii();
+
+    bncGetThread* getThread = new bncGetThread(url, format, latitude, longitude, nmea, iRow);
 
     connect(getThread, SIGNAL(newMessage(const QByteArray&)), 
@@ -439 +478 @@
 
     connect(getThread, SIGNAL(newObs(const QByteArray&, Observation*)),
-            (bncTableItem*) _mountPointsTable->item(iRow, 3), 
+            (bncTableItem*) _mountPointsTable->item(iRow, 6), 
             SLOT(slotNewObs(const QByteArray&, Observation*)));