Changeset 2753 in ntrip

Timestamp:

Dec 1, 2010, 2:02:27 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bnc.pro (modified) (2 diffs)
• bncmap.cpp (added)
• bncmap.h (added)
• bnctabledlg.cpp (modified) (9 diffs)
• bnctabledlg.h (modified) (3 diffs)
• worldmap.dat (added)

trunk/BNC/bnc.pro

@@ -41 +41 @@
           bncfigurelate.h bncpppclient.h bncversion.h                 \ 
           bancroft.h bncmodel.h bncfigureppp.h bncrawfile.h           \ 
-          bnctides.h                                                  \
+          bnctides.h bncmap.h                                         \
           RTCM/GPSDecoder.h RTCM/RTCM2.h RTCM/RTCM2Decoder.h          \
           RTCM/RTCM2_2021.h RTCM/rtcm_utils.h                         \
@@ -71 +71 @@
           bncfigurelate.cpp bncpppclient.cpp bnctime.cpp              \
           bancroft.cpp bncmodel.cpp bncfigureppp.cpp bncrawfile.cpp   \
-          bnctides.cpp                                                \
+          bnctides.cpp bncmap.cpp                                     \
           RTCM/RTCM2.cpp RTCM/RTCM2Decoder.cpp                        \
           RTCM/RTCM2_2021.cpp RTCM/rtcm_utils.cpp                     \

trunk/BNC/bnctabledlg.cpp

@@ -45 +45 @@
 #include "bncnetqueryv1.h"
 #include "bncsettings.h"
+#include "bncmap.h"
 
 using namespace std;
@@ -140 +141 @@
   connect(_buttonGet, SIGNAL(clicked()), this, SLOT(slotGetTable()));
  
+  _buttonMap = new QPushButton(tr("Map"), this);
+  _buttonMap->setEnabled(false);
+  connect(_buttonMap, SIGNAL(clicked()), this, SLOT(slotShowMap()));
+ 
   _buttonCancel = new QPushButton(tr("Cancel"), this);
   connect(_buttonCancel, SIGNAL(clicked()), this, SLOT(reject()));
@@ -149 +154 @@
   buttonLayout->addWidget(_buttonWhatsThis);
   buttonLayout->addStretch(1);
+  buttonLayout->addWidget(_buttonMap);
   buttonLayout->addWidget(_buttonGet);
   buttonLayout->addWidget(_buttonCancel);
@@ -219 +225 @@
 
   _buttonGet->setEnabled(false);
+  _buttonMap->setEnabled(true);
   _buttonCasterTable->setEnabled(false); 
 
@@ -228 +235 @@
     return;
   }
-
+  
   static const QStringList labels = QString("mountpoint,identifier,format,"
     "format-details,carrier,system,network,country,lat,long,"
@@ -291 +298 @@
 }
 
+// Show world map
+////////////////////////////////////////////////////////////////////////////
+void bncTableDlg::slotShowMap() {
+
+  bncMap* winMap = new bncMap(this);
+  winMap->setGeometry( x(), y()+height()*1.2, 860, 400 );
+
+  connect(this, SIGNAL(newPoint(QPointF, QString, QPen)),
+          winMap, SLOT(slotNewPoint(QPointF, QString, QPen)));
+  connect(this, SIGNAL(resetMap()), winMap, SLOT(slotResetMap()));
+      
+  _buttonMap->setEnabled(false);
+  showSourceTable();
+  winMap->exec();
+  _buttonMap->setEnabled(true);
+
+  disconnect(this, SIGNAL(newPoint(QPointF, QString, QPen)),
+             winMap, SLOT(slotNewPoint(QPointF, QString, QPen)));
+  disconnect(this, SIGNAL(resetMap()), winMap, SLOT(slotResetMap()));
+   
+  delete winMap;
+}
+
+// Show world map
+////////////////////////////////////////////////////////////////////////////
+void bncTableDlg::showSourceTable() {
+
+  for( int i = 0; i < _allLines.size(); i++ ){
+        
+    if( _allLines.at(i).startsWith("STR") == true ){
+             
+       QStringList tmp = _allLines.at(i).split(';');
+       if( tmp.size() > 0 ){
+                  
+         QPointF point;
+                 point.setY( tmp.at(9).toDouble() );
+                 point.setX( tmp.at(10).toDouble() );
+         QString site = tmp.at(1);
+                 site.resize(4);
+
+         emit newPoint(point, site, QPen(QBrush(QColor(0,0,255,180)), 5) );
+       }             
+     }
+   }
+}
+
+
 // Accept slot
 ////////////////////////////////////////////////////////////////////////////
@@ -306 +360 @@
 
   QStringList* mountPoints = new QStringList;
-
   if (_table) {
+//  emit resetMap();
     for (int ir = 0; ir < _table->rowCount(); ir++) {
       QTableWidgetItem* item   = _table->item(ir,0);
+      QString             site = _table->item(ir,0)->text();
       QString           format = _table->item(ir,2)->text();
       QString         latitude = _table->item(ir,8)->text();
@@ -320 +375 @@
         mountPoints->push_back(url.toString() + " " + format + " " + latitude 
                         + " " + longitude + " " + nmea + " " + ntripVersion);
+         
+        emit newPoint(QPointF(longitude.toDouble(),latitude.toDouble()), site,
+                      QPen(QBrush(QColor(255,0,0,180)), 13) );
+
       }
     }
@@ -564 +623 @@
   QDialog::accept();
 }
-

trunk/BNC/bnctabledlg.h

@@ -64 +64 @@
   signals:
     void newMountPoints(QStringList* mountPoints);
+    void newPoint(QPointF, QString, QPen);
+    void resetMap();
 
   private slots:
     virtual void accept();
     void slotGetTable();
+    void slotShowMap();
     void slotSelectionChanged();
     void slotWhatsThis();
@@ -76 +79 @@
   private:
     void addUrl(const QUrl& url);
+    void showSourceTable();
     QComboBox*   _casterHostComboBox;
     QLineEdit*   _casterPortLineEdit;
@@ -83 +87 @@
 
     QPushButton* _buttonGet;
+    QPushButton* _buttonMap;
     QPushButton* _buttonCancel;
     QPushButton* _buttonOK;