Changeset 8177 in ntrip for trunk

Timestamp:

Oct 30, 2017, 1:17:02 PM (6 years ago)

Author:

stuerze

Message:

minor changes

File:

• trunk/BNC/src/bnctabledlg.cpp (modified) (16 diffs)

trunk/BNC/src/bnctabledlg.cpp

@@ -35 +35 @@
  * Created:    24-Dec-2005
  *
- * Changes:    
+ * Changes:
  *
  * -----------------------------------------------------------------------*/
@@ -145 +145 @@
   _buttonGet->setDefault(true);
   connect(_buttonGet, SIGNAL(clicked()), this, SLOT(slotGetTable()));
- 
+
   _buttonMap = new QPushButton(tr("Map"), this);
   _buttonMap->setEnabled(false);
   connect(_buttonMap, SIGNAL(clicked()), this, SLOT(slotShowMap()));
- 
+
   _buttonClose = new QPushButton(tr("Close"), this);
   connect(_buttonClose, SIGNAL(clicked()), this, SLOT(close()));
@@ -196 +196 @@
 // Read full caster table (static)
 ////////////////////////////////////////////////////////////////////////////
-t_irc bncTableDlg::getFullTable(const QString& ntripVersion, 
-                                const QString& casterHost, 
-                                int casterPort, QStringList& allLines, 
+t_irc bncTableDlg::getFullTable(const QString& ntripVersion,
+                                const QString& casterHost,
+                                int casterPort, QStringList& allLines,
                                 bool alwaysRead) {
 
@@ -243 +243 @@
       allLines.append(line);
       line = in.readLine();
-    } 
+    }
     allTables.insert(casterHost, allLines);
     delete query;
@@ -260 +260 @@
   _buttonGet->setEnabled(false);
   _buttonMap->setEnabled(true);
-  _buttonCasterTable->setEnabled(false); 
+  _buttonCasterTable->setEnabled(false);
 
   if ( getFullTable(_ntripVersionComboBox->currentText(),
@@ -270 +270 @@
     return;
   }
-  
+
   static const QStringList labels = QString("mountpoint,identifier,format,"
     "format-details,carrier,system,network,country,lat,long,"
@@ -297 +297 @@
       for (int ic = 1; ic < columns.size(); ic++) {
             if (ic == 11) {
-          if (columns[ic] == "0") { 
-            columns[ic] = "no"; 
-          } else { 
-            columns[ic] = "yes"; 
+          if (columns[ic] == "0") {
+            columns[ic] = "no";
+          } else {
+            columns[ic] = "yes";
           }
         }
@@ -413 +413 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncTableDlg::slotCasterTable() {
-        
+
   _buttonCasterTable->setEnabled(false);
   _casterHostComboBox->setEnabled(false);
@@ -425 +425 @@
   _buttonSelect->setEnabled(false);
 
-  bncCasterTableDlg* dlg = 
+  bncCasterTableDlg* dlg =
           new bncCasterTableDlg(_ntripVersionComboBox->currentText(), this);
   dlg->move(this->pos().x()+50, this->pos().y()+50);
@@ -468 +468 @@
   url.setPort(newCasterPort.toInt());
   addUrl(url);
-  
+
   _casterHostComboBox->setCurrentIndex(0);
 }
@@ -513 +513 @@
 ////////////////////////////////////////////////////////////////////////////
 bncCasterTableDlg::bncCasterTableDlg(const QString& ntripVersion,
-                                     QWidget* parent) : 
+                                     QWidget* parent) :
    QDialog(parent) {
 
-  static const QStringList labels = QString("host,port,identifier,operator,nmea,country,lat,long,link").split(",");
+  static const QStringList labels = QString("host,port,identifier,operator,nmea,country,lat,long,fallback host, fallback port,link").split(",");
 
   _casterTable = new QTableWidget(this);
@@ -574 +574 @@
       QStringList columns = lines[nRow].split(";");
       for (int ic = 1; ic < columns.size(); ic++) {
-         if (ic == 5) { 
-           if (columns[ic] == "0") { 
-             columns[ic] = "no"; 
-           } else { 
-             columns[ic] = "yes"; 
+         if (ic == 5) {
+           if (columns[ic] == "0") {
+             columns[ic] = "no";
+           } else {
+             columns[ic] = "yes";
            }
          }
@@ -586 +586 @@
       }
     }
-  } 
+  }
   _casterTable->setHorizontalHeaderLabels(labels);
   _casterTable->setSortingEnabled(true);
@@ -624 +624 @@
   dlgLayout->addWidget(_casterTable,     1, 0, 1, 3);
   dlgLayout->addWidget(_whatsThisButton, 2, 0);
-  dlgLayout->addWidget(_closeButton,     2, 1, Qt::AlignRight);  
+  dlgLayout->addWidget(_closeButton,     2, 1, Qt::AlignRight);
   dlgLayout->addWidget(_okButton,        2, 2);
 
@@ -631 +631 @@
   setLayout(dlgLayout);
   resize(68*ww, 50*ww);
+  _casterTable->hideColumn(8);
+  _casterTable->hideColumn(9);
   show();
 }
@@ -655 +657 @@
     for (int ir = _casterTable->rowCount() - 1; ir >= 0 ; ir--) {
       if (_casterTable->isItemSelected(_casterTable->item(ir,0))) {
-        emit newCaster(_casterTable->item(ir,0)->text(), 
+        emit newCaster(_casterTable->item(ir,0)->text(),
                        _casterTable->item(ir,1)->text());
       }