Changeset 3335 in ntrip

Timestamp:

Jul 19, 2011, 4:23:19 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bncrinex.cpp (modified) (1 diff)
• bnctabledlg.cpp (modified) (12 diffs)
• bnctabledlg.h (modified) (2 diffs)

trunk/BNC/bncrinex.cpp

@@ -122 +122 @@
 
   QStringList table;
-  bncTableDlg::getFullTable(_mountPoint.host(), _mountPoint.port(), 
-                            table, _reloadTable);
+  bncTableDlg::getFullTable(_ntripVersion, _mountPoint.host(), 
+                            _mountPoint.port(), table, _reloadTable);
   QString net;
   QStringListIterator it(table);

trunk/BNC/bnctabledlg.cpp

@@ -44 +44 @@
 #include "bncgetthread.h"
 #include "bncnetqueryv1.h"
+#include "bncnetqueryv2.h"
 #include "bncsettings.h"
 #include "bncmap.h"
@@ -91 +92 @@
 
   _ntripVersionComboBox = new QComboBox();
-  _ntripVersionComboBox->addItems(QString("1,2,R,U").split(","));
+  _ntripVersionComboBox->addItems(QString("1,2,2s,R,U").split(","));
   int kk = _ntripVersionComboBox->findText(settings.value("ntripVersion").toString());
   if (kk != -1) {
@@ -180 +181 @@
 // Read full caster table (static)
 ////////////////////////////////////////////////////////////////////////////
-t_irc bncTableDlg::getFullTable(const QString& casterHost, 
+t_irc bncTableDlg::getFullTable(const QString& ntripVersion, 
+                                const QString& casterHost, 
                                 int casterPort, QStringList& allLines, 
                                 bool alwaysRead) {
@@ -196 +198 @@
   allLines.clear();
 
+  bncNetQuery* query = 0;
+  if (ntripVersion == "2" || ntripVersion == "2s") {
+    query = new bncNetQueryV2();
+  }
+  else {
+    query = new bncNetQueryV1();
+  }
+
   QUrl url;
   url.setHost(casterHost);
   url.setPort(casterPort);
-  url.setScheme("http");
   url.setPath("/");
-
-  bncNetQueryV1 query;
+  if (ntripVersion == "2s") {
+    url.setScheme("https");
+  }
+  else {
+    url.setScheme("http");
+  }
+
   QByteArray outData;
-  query.waitForRequestResult(url, outData);
-  if (query.status() == bncNetQuery::finished) {
+  query->waitForRequestResult(url, outData);
+  if (query->status() == bncNetQuery::finished) {
     QTextStream in(outData);
     QString line = in.readLine();
@@ -213 +227 @@
     } 
     allTables.insert(casterHost, allLines);
+    delete query;
     return success;
   }
   else {
+    delete query;
     return failure;
   }
@@ -228 +244 @@
   _buttonCasterTable->setEnabled(false); 
 
-  if ( getFullTable(_casterHostComboBox->currentText(),
+  if ( getFullTable(_ntripVersionComboBox->currentText(),
+                    _casterHostComboBox->currentText(),
                     _casterPortLineEdit->text().toInt(),
                     _allLines, true) != success ) {
@@ -362 +379 @@
 
   bncSettings settings;
-  settings.setValue("ntripVersion", _ntripVersionComboBox->currentText());
+  QString ntripVersion = _ntripVersionComboBox->currentText();
+  settings.setValue("ntripVersion", ntripVersion);
   QUrl url;
-  url.setScheme("http");
+  if (ntripVersion == "2s") {
+    url.setScheme("https");
+  }
+  else {
+    url.setScheme("http");
+  }
   url.setHost(_casterHostComboBox->currentText());
   url.setPort(_casterPortLineEdit->text().toInt());
@@ -380 +403 @@
       QString        longitude = _table->item(ir,9)->text();
       QString             nmea = _table->item(ir,10)->text();
-      QString     ntripVersion = _ntripVersionComboBox->currentText();
       format.replace(" ", "_");
       if (_table->isItemSelected(item)) {
@@ -424 +446 @@
   _buttonSelect->setEnabled(false);
 
-  bncCasterTableDlg* dlg = new bncCasterTableDlg(this);
+  bncCasterTableDlg* dlg = 
+          new bncCasterTableDlg(_ntripVersionComboBox->currentText(), this);
   dlg->move(this->pos().x()+50, this->pos().y()+50);
   connect(dlg, SIGNAL(newCaster(QString, QString)),
@@ -504 +527 @@
 // Caster table
 ////////////////////////////////////////////////////////////////////////////
-bncCasterTableDlg::bncCasterTableDlg(QWidget* parent) : 
+bncCasterTableDlg::bncCasterTableDlg(const QString& ntripVersion,
+                                     QWidget* parent) : 
    QDialog(parent) {
 
@@ -517 +541 @@
   url.setPath("/");
 
-  bncNetQueryV1 query;
+  bncNetQuery* query = 0;
+  if (ntripVersion == "2" || ntripVersion == "2s") {
+    query = new bncNetQueryV2();
+  }
+  else {
+    query = new bncNetQueryV1();
+  }
+
   QByteArray outData;
-  query.waitForRequestResult(url, outData);
+  query->waitForRequestResult(url, outData);
 
   QStringList lines;
-  if (query.status() == bncNetQuery::finished) {
+  if (query->status() == bncNetQuery::finished) {
     QTextStream in(outData);
     QString line = in.readLine();
@@ -535 +566 @@
     }
   }
+
+  delete query;
 
   if (lines.size() > 0) {

trunk/BNC/bnctabledlg.h

@@ -36 +36 @@
 
   public:
-    bncCasterTableDlg(QWidget* parent);
+    bncCasterTableDlg(const QString& ntripVersion, QWidget* parent);
     ~bncCasterTableDlg();
 
@@ -59 +59 @@
     bncTableDlg(QWidget* parent);
     ~bncTableDlg();
-    static t_irc getFullTable(const QString& casterHost, int casterPort,
+    static t_irc getFullTable(const QString& ntripVersion, 
+                              const QString& casterHost, int casterPort,
                               QStringList& allLines, bool alwaysRead = true);