Changeset 1737 in ntrip

Timestamp:

Mar 6, 2009, 1:19:07 PM (16 years ago)

Author:

weber

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bnc.pro (modified) (2 diffs)
• bncserialport.cpp (added)
• bncserialport.h (added)
• bncwindow.cpp (modified) (4 diffs)

trunk/BNC/bnc.pro

@@ -32 +32 @@
           bncnetqueryrtp.h bncsettings.h latencychecker.h             \
           bncipport.h bncnetqueryv0.h bncnetqueryudp.h                \ 
+          bncserialport.h                                             \ 
           RTCM/GPSDecoder.h RTCM/RTCM2.h RTCM/RTCM2Decoder.h          \
           RTCM/RTCM2_2021.h RTCM/rtcm_utils.h                         \
@@ -52 +53 @@
           bncnetqueryrtp.cpp bncsettings.cpp latencychecker.cpp       \
           bncipport.cpp bncnetqueryv0.cpp bncnetqueryudp.cpp          \
+          bncserialport.cpp                                           \
           RTCM/RTCM2.cpp RTCM/RTCM2Decoder.cpp                        \
           RTCM/RTCM2_2021.cpp RTCM/rtcm_utils.cpp                     \

trunk/BNC/bncwindow.cpp

@@ -47 +47 @@
 #include "bnctabledlg.h" 
 #include "bncipport.h" 
+#include "bncserialport.h" 
 #include "bnchlpdlg.h" 
 #include "bnchtml.h" 
@@ -62 +63 @@
   int ww = QFontMetrics(this->font()).width('w');
   
-  static const QStringList labels = QString("account, Streams:     broadcaster:port/mountpoint,decoder,lat,long,nmea,ntrip,bytes").split(",");
+  static const QStringList labels = QString("account, Streams:     resource loader / mountpoint,decoder,lat,long,nmea,ntrip,bytes").split(",");
 
   setMinimumSize(85*ww, 65*ww);
@@ -825 +826 @@
   QPushButton *buttonNtrip = msgBox.addButton(tr("Caster"), QMessageBox::ActionRole);
   QPushButton *buttonIP = msgBox.addButton(tr("TCP/IP port"), QMessageBox::ActionRole);
+  QPushButton *buttonSerial = msgBox.addButton(tr("Serial port"), QMessageBox::ActionRole);
   QPushButton *buttonCancel = msgBox.addButton(tr("Cancel"), QMessageBox::ActionRole);
 
@@ -830 +832 @@
 
   if (msgBox.clickedButton() == buttonNtrip) {
-    bncTableDlg* dlg = new bncTableDlg(this); 
+    bncTableDlg* dlg = new bncTableDlg(this);
     dlg->move(this->pos().x()+50, this->pos().y()+50);
-    connect(dlg, SIGNAL(newMountPoints(QStringList*)), 
+    connect(dlg, SIGNAL(newMountPoints(QStringList*)),
           this, SLOT(slotNewMountPoints(QStringList*)));
     dlg->exec();
     delete dlg;
   } else if (msgBox.clickedButton() == buttonIP) {
-    bncIpPort* ipp = new bncIpPort(this); 
-    connect(ipp, SIGNAL(newMountPoints(QStringList*)), 
+    bncIpPort* ipp = new bncIpPort(this);
+    connect(ipp, SIGNAL(newMountPoints(QStringList*)),
           this, SLOT(slotNewMountPoints(QStringList*)));
     ipp->exec();
     delete ipp;
+  } else if (msgBox.clickedButton() == buttonSerial) {
+    bncSerialPort* sep = new bncSerialPort(this);
+    connect(sep, SIGNAL(newMountPoints(QStringList*)),
+          this, SLOT(slotNewMountPoints(QStringList*)));
+    sep->exec();
+    delete sep;
   } else if (msgBox.clickedButton() == buttonCancel) {
     // Cancel