Changeset 787 in ntrip

Timestamp:

Apr 8, 2008, 2:45:41 PM (16 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNS

Files:

• bns.cpp (modified) (3 diffs)
• bnswindow.cpp (modified) (2 diffs)
• bnswindow.h (modified) (1 diff)

trunk/BNS/bns.cpp

@@ -27 +27 @@
   this->setTerminationEnabled(true);
  
+  // Thread that handles broadcast ephemeris
+  // ---------------------------------------
   _bnseph = new t_bnseph(parent);
 
   connect(_bnseph, SIGNAL(newEph(gpsEph*)), this, SLOT(slotNewEph(gpsEph*)));
-
   connect(_bnseph, SIGNAL(newMessage(QByteArray)),
           this, SLOT(slotMessage(const QByteArray)));
-
   connect(_bnseph, SIGNAL(error(QByteArray)),
           this, SLOT(slotError(const QByteArray)));
 
-  // Start listening for rtnet results
-  // ---------------------------------
+  // Server listening for rtnet results
+  // ----------------------------------
   QSettings settings;
   _clkSocket = 0;
   _clkServer = new QTcpServer;
-  /////  _clkServer->listen(QHostAddress::Any, settings.value("clkPort").toInt());
-  _clkServer->listen(QHostAddress::Any, 5555);
+  _clkServer->listen(QHostAddress::Any, settings.value("clkPort").toInt());
   connect(_clkServer, SIGNAL(newConnection()),this, SLOT(slotNewConnection()));
 
+  // Socket for outputting the results
+  // ---------------------------------
   _outSocket = 0;
 }
@@ -54 +55 @@
   deleteBnsEph();
   delete _clkServer;
+  delete _clkSocket;
   delete _outSocket;
   QMapIterator<QString, t_ephPair*> it(_ephList);
@@ -92 +94 @@
 void t_bns::slotNewConnection() {
   slotMessage("t_bns::slotNewConnection");
+  delete _clkSocket;
   _clkSocket = _clkServer->nextPendingConnection();
 }

trunk/BNS/bnswindow.cpp

@@ -112 +112 @@
   setCentralWidget(_canvas);
 
-  _ephHostLineEdit  = new QLineEdit(settings.value("ephHost").toString());
-  _ephHostLineEdit->setWhatsThis(tr("Host for broadcast ephemeris (from BNC)"));
   _ephPortLineEdit  = new QLineEdit(settings.value("ephPort").toString());
   _ephPortLineEdit->setWhatsThis(tr("Port for broadcast ephemeris (from BNC)"));
   _ephPortLineEdit->setMaximumWidth(9*ww);
 
-  _proxyHostLineEdit  = new QLineEdit(settings.value("proxyHost").toString());
-  _proxyHostLineEdit->setWhatsThis(tr("<p>If you are running BNS within a protected Local Area Network (LAN), you might need to use a proxy server to access the Internet. Enter your proxy server IP and port number in case one is operated in front of BNC. If you do not know the IP and port of your proxy server, check the proxy server settings in your Internet browser or ask your network administrator.</p><p>Note that IP streaming is sometimes not allowed in a LAN. In this case you need to ask your network administrator for an appropriate modification of the local security policy or for the installation of a TCP relay to the NTRIP broadcasters. If these are not possible, you might need to run BNC outside your LAN on a network that has unobstructed connection to the Internet.</p>"));
-  _proxyPortLineEdit  = new QLineEdit(settings.value("proxyPort").toString());
-  _proxyPortLineEdit->setWhatsThis(tr("<p>If you are running BNS within a protected Local Area Network (LAN), you might need to use a proxy server to access the Internet. Enter your proxy server IP and port number in case one is operated in front of BNC. If you do not know the IP and port of your proxy server, check the proxy server settings in your Internet browser or ask your network administrator.</p><p>Note that IP streaming is sometimes not allowed in a LAN. In this case you need to ask your network administrator for an appropriate modification of the local security policy or for the installation of a TCP relay to the NTRIP broadcasters. If these are not possible, you might need to run BNC outside your LAN on a network that has unobstructed connection to the Internet.</p>"));
-  _proxyPortLineEdit->setMaximumWidth(9*ww);
+  _clkPortLineEdit  = new QLineEdit(settings.value("clkPort").toString());
+  _clkPortLineEdit->setWhatsThis(tr("Port for clock results (from RTNET)"));
+  _clkPortLineEdit->setMaximumWidth(9*ww);
 
   // TabWidget
   // ---------
   QTabWidget* tabs = new QTabWidget();
-  QWidget* tab_inp   = new QWidget();
-  QWidget* tab_out   = new QWidget();
-  QWidget* tab_proxy = new QWidget();
-  tabs->addTab(tab_inp,  tr("Input"));
-  tabs->addTab(tab_out,  tr("Output"));
-  tabs->addTab(tab_proxy,tr("Proxy"));
+  QWidget* tab_inp = new QWidget();
+  QWidget* tab_out = new QWidget();
+  tabs->addTab(tab_inp,  tr("INPUT"));
+  tabs->addTab(tab_out,  tr("OUTPUT"));
 
   // Input-Tab
   // ---------
   QGridLayout* iLayout = new QGridLayout;
-  ///  iLayout->setColumnMinimumWidth(0,12*ww);
-  iLayout->addWidget(new QLabel("Input Options"),0, 0, 1, 2, Qt::AlignLeft);
-  iLayout->addWidget(new QLabel("Host (Ephemeris)"),1,0, Qt::AlignLeft);
-  iLayout->addWidget(_ephHostLineEdit,1, 1);
-  iLayout->addWidget(new QLabel("Port (Ephemeris)"),2,0, Qt::AlignLeft);
-  iLayout->addWidget(_ephPortLineEdit,2, 1);
+  iLayout->addWidget(new QLabel("Port (Ephemeris)"), 0, 0, Qt::AlignLeft);
+  iLayout->addWidget(_ephPortLineEdit, 0, 1);
+  iLayout->addWidget(new QLabel("Port (Clocks)"), 1, 0, Qt::AlignLeft);
+  iLayout->addWidget(_clkPortLineEdit, 1, 1);
   tab_inp->setLayout(iLayout);
-
-  // Proxy-Tab
-  // ---------
-  QGridLayout* pLayout = new QGridLayout;
-  pLayout->setColumnMinimumWidth(0,12*ww);
-  pLayout->addWidget(new QLabel("Settings for the proxy in protected networks, leave the boxes blank if none."),0, 0, 1, 2, Qt::AlignLeft);
-  pLayout->addWidget(new QLabel("Proxy host"),1,0, Qt::AlignLeft);
-  pLayout->addWidget(_proxyHostLineEdit,1, 1);
-  pLayout->addWidget(new QLabel("Proxy port"),2,0, Qt::AlignLeft);
-  pLayout->addWidget(_proxyPortLineEdit,2,1);
-  tab_proxy->setLayout(pLayout);
 
   // Log
@@ -262 +243 @@
 void bnsWindow::slotSaveOptions() {
   QSettings settings;
-  settings.setValue("ephHost",     _ephHostLineEdit->text());
   settings.setValue("ephPort",     _ephPortLineEdit->text());
-  settings.setValue("proxyHost",   _proxyHostLineEdit->text());
-  settings.setValue("proxyPort",   _proxyPortLineEdit->text());
+  settings.setValue("clkPort",     _clkPortLineEdit->text());
 }
 

trunk/BNS/bnswindow.h

@@ -56 +56 @@
   QWidget*   _canvas;
 
-  QLineEdit* _ephHostLineEdit;
   QLineEdit* _ephPortLineEdit;
-  QLineEdit* _proxyHostLineEdit;
-  QLineEdit* _proxyPortLineEdit;
+  QLineEdit* _clkPortLineEdit;
 
   QTextEdit*  _log;