Changeset 4627 in ntrip

Timestamp:

Sep 1, 2012, 2:19:52 PM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• bncmap.h (modified) (1 diff)
• bncmap_svg.cpp (modified) (1 diff)
• bnctabledlg.cpp (modified) (4 diffs)
• bnctabledlg.h (modified) (1 diff)

trunk/BNC/src/bncmap.h

@@ -15 +15 @@
    
  public slots:
-  void slotNewPoint(QPointF, QString, QPen, double);
+  void slotNewPoint(const QString& name, double latDeg, double lonDeg);
    
  private:

trunk/BNC/src/bncmap_svg.cpp

@@ -43 +43 @@
 // 
 /////////////////////////////////////////////////////////////////////////////
-void t_bncMap::slotNewPoint(QPointF point, QString name, QPen, double) {
+void t_bncMap::slotNewPoint(const QString& name, double latDeg, double lonDeg) {
   QwtPlotMarker* marker = new QwtPlotMarker();
-  marker->setValue(point.x(), point.y());
+  marker->setValue(lonDeg, latDeg);
   marker->setLabel(QwtText(name));
   marker->attach(_mapPlot);

trunk/BNC/src/bnctabledlg.cpp

@@ -327 +327 @@
   bncMap->setGeometry( x(), int(y()+height()*1.3), 880, 440 );
 
-  connect(this, SIGNAL(newPoint(QPointF, QString, QPen, double)),
-          bncMap, SLOT(slotNewPoint(QPointF, QString, QPen, double)));
+  connect(this, SIGNAL(newPoint(const QString&, double, double)),
+          bncMap, SLOT(slotNewPoint(const QString&, double, double)));
       
   _buttonMap->setEnabled(false);
@@ -334 +334 @@
   bncMap->exec();
   _buttonMap->setEnabled(true);
-
-  disconnect(this, SIGNAL(newPoint(QPointF, QString, QPen, double)),
-             bncMap, SLOT(slotNewPoint(QPointF, QString, QPen, double)));
-   
   delete bncMap;
 }
@@ -344 +340 @@
 ////////////////////////////////////////////////////////////////////////////
 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,200)), 1.5), 1.5 );
-       }
-     }
-   }
-   emit fitMap();
-}
-
+  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) {
+        double  latDeg = tmp.at(9).toDouble();
+        double  lonDeg = tmp.at(10).toDouble();
+        QString name   = tmp.at(1);
+        emit newPoint(name, latDeg, lonDeg);
+      }
+    }
+  }
+}
 
 // Select slot
@@ -400 +386 @@
         mountPoints->push_back(url.toString() + " " + format + " " + latitude
                         + " " + longitude + " " + nmea + " " + ntripVersion);
-         
+         
         site.resize(4);
-        emit newPoint(QPointF(longitude.toDouble(),latitude.toDouble()), site,
-                      QPen(QBrush(QColor(255,0,0,200)), 3.0), 3.0 );
       }
     }
   }
   emit newMountPoints(mountPoints);
-  emit fitFont();
 }
 

trunk/BNC/src/bnctabledlg.h

@@ -65 +65 @@
   signals:
     void newMountPoints(QStringList* mountPoints);
-    void newPoint(QPointF, QString, QPen, double);
-    void fitMap();
-    void fitFont();
+    void newPoint(const QString& name, double latDeg, double lonDeg);
 
   private slots: