Changeset 1352 in ntrip for trunk/BNC

Timestamp:

Dec 27, 2008, 1:41:36 PM (16 years ago)

Author:

mervart

Message:

* empty log message *

File:

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

trunk/BNC/bncwindow.cpp

@@ -60 +60 @@
   int ww = QFontMetrics(this->font()).width('w');
   
-  static const QStringList labels = QString("account,broadcaster:port / mountpoint,decoder,lat,long,nmea,bytes").split(",");
+  static const QStringList labels = QString("account,broadcaster:port / mountpoint,decoder,lat,long,nmea,ntrip,bytes").split(",");
 
   setMinimumSize(80*ww, 65*ww);
@@ -279 +279 @@
   }
 
-  _mountPointsTable   = new QTableWidget(0,7);
+  _mountPointsTable   = new QTableWidget(0,8);
 
   _mountPointsTable->horizontalHeader()->resizeSection(1,34*ww);
@@ -286 +286 @@
   _mountPointsTable->horizontalHeader()->resizeSection(4,7*ww); 
   _mountPointsTable->horizontalHeader()->resizeSection(5,5*ww); 
+  _mountPointsTable->horizontalHeader()->resizeSection(6,4*ww); 
   _mountPointsTable->horizontalHeader()->setResizeMode(QHeaderView::Interactive);
   _mountPointsTable->horizontalHeader()->setStretchLastSection(true);
@@ -552 +553 @@
     QString format(hlp[1]); QString latitude(hlp[2]); QString longitude(hlp[3]);
     QString nmea(hlp[4]);
+    QString ntripVersion = "1";
+    if (hlp.size() >= 6) {
+      ntripVersion = (hlp[5]);
+    }
 
     QTableWidgetItem* it;
@@ -583 +588 @@
     _mountPointsTable->setItem(iRow, 5, it);
 
+    it = new QTableWidgetItem(ntripVersion);
+    it->setFlags(it->flags() & ~Qt::ItemIsEditable);
+    _mountPointsTable->setItem(iRow, 6, it);
+
     bncTableItem* bncIt = new bncTableItem();
     bncIt->setFlags(bncIt->flags() & ~Qt::ItemIsEditable);
-    _mountPointsTable->setItem(iRow, 6, bncIt);
+    _mountPointsTable->setItem(iRow, 7, bncIt);
 
     iRow++;
@@ -658 +667 @@
     QString format(hlp[1]); QString latitude(hlp[2]); QString longitude(hlp[3]);
     QString nmea(hlp[4]);
+    QString ntripVersion = "1";
+    if (hlp.size() >= 6) {
+      ntripVersion = (hlp[5]);
+    }
 
     _mountPointsTable->insertRow(iRow);
@@ -691 +704 @@
     _mountPointsTable->setItem(iRow, 5, it);
 
+    it = new QTableWidgetItem(ntripVersion);
+    it->setFlags(it->flags() & ~Qt::ItemIsEditable);
+    _mountPointsTable->setItem(iRow, 6, it);
+
     bncTableItem* bncIt = new bncTableItem();
-    _mountPointsTable->setItem(iRow, 6, bncIt);
+    _mountPointsTable->setItem(iRow, 7, bncIt);
 
     iRow++;
@@ -759 +776 @@
                + " " + _mountPointsTable->item(iRow, 3)->text()
                + " " + _mountPointsTable->item(iRow, 4)->text()
-               + " " + _mountPointsTable->item(iRow, 5)->text());
+               + " " + _mountPointsTable->item(iRow, 5)->text()
+               + " " + _mountPointsTable->item(iRow, 6)->text());
   }
   settings.setValue("mountPoints", mountPoints);
@@ -921 +939 @@
           _mountPointsTable->item(iRow, 3)->text() == thread->latitude()   &&
           _mountPointsTable->item(iRow, 4)->text() == thread->longitude() ) {
-        ((bncTableItem*) _mountPointsTable->item(iRow, 6))->setGetThread(thread);
+        ((bncTableItem*) _mountPointsTable->item(iRow, 7))->setGetThread(thread);
         break;
       }