Changeset 5435 in ntrip for trunk/GnssCenter

Timestamp:

Sep 12, 2013, 6:43:22 PM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/GnssCenter/map_stations

Files:

• map_stations.cpp (modified) (1 diff)
• worldplot.cpp (modified) (1 diff)
• worldplot.h (modified) (2 diffs)

trunk/GnssCenter/map_stations/map_stations.cpp

@@ -132 +132 @@
     }
   }
-  _plot->slotNewPoint("AAAA", 50.0, 15.0);
+  ///  _plot->slotNewPoint("AAAA", 50.0, 15.0);
   // end test
   if (_thriftClient) {

trunk/GnssCenter/map_stations/worldplot.cpp

@@ -61 +61 @@
 // 
 /////////////////////////////////////////////////////////////////////////////
-void t_worldPlot::slotNewPoint(const QString& name, double latDeg, double lonDeg) {
+void t_worldPlot::slotNewPoints(const QList<t_point*>& points) {
 
-  if (lonDeg > 180.0) lonDeg -= 360.0;
+  // Remove old markers
+  // ------------------
+  QListIterator<QwtPlotMarker*> im(_markers);
+  while (im.hasNext()) {
+    QwtPlotMarker* marker = im.next();
+    marker->detach();
+    delete marker;
+  }
+  _markers.clear();
 
   QColor red(220,20,60);
-  QwtSymbol* symbol = new QwtSymbol(QwtSymbol::Rect, QBrush(red), 
-                                    QPen(red), QSize(2,2));
-  QwtPlotMarker* marker = new QwtPlotMarker();
-  marker->setValue(lonDeg, latDeg);
-  if (lonDeg > 170.0) {
-    marker->setLabelAlignment(Qt::AlignLeft);
+
+  QListIterator<t_point*> ip(points);
+  while (ip.hasNext()) {
+    t_point* point = ip.next();
+
+    if (point->_lonDeg > 180.0) point->_lonDeg -= 360.0;
+  
+    QwtSymbol* symbol = new QwtSymbol(QwtSymbol::Rect, QBrush(red), 
+                                      QPen(red), QSize(2,2));
+    QwtPlotMarker* marker = new QwtPlotMarker();
+    marker->setValue(point->_lonDeg, point->_latDeg);
+    if (point->_lonDeg > 170.0) {
+      marker->setLabelAlignment(Qt::AlignLeft);
+    }
+    else {
+      marker->setLabelAlignment(Qt::AlignRight);
+    }
+    QwtText text(point->_name.left(4));
+    QFont   font = text.font();
+    font.setPointSize(font.pointSize()*0.8);
+    text.setFont(font);
+    marker->setLabel(text);
+    marker->setSymbol(symbol);
+    marker->attach(this);
+    _markers.append(marker);
   }
-  else {
-    marker->setLabelAlignment(Qt::AlignRight);
-  }
-  QwtText text(name.left(4));
-  QFont   font = text.font();
-  font.setPointSize(font.pointSize()*0.8);
-  text.setFont(font);
-  marker->setLabel(text);
-  marker->setSymbol(symbol);
-  marker->attach(this);
 
   replot();

trunk/GnssCenter/map_stations/worldplot.h

@@ -5 +5 @@
 
 class QwtPlotZoomer;
+class QwtPlotMarker;
 
 namespace GnssCenter {
@@ -13 +14 @@
   t_worldPlot();
   ~t_worldPlot();
+  
+  class t_point {
+   public:
+    t_point(const QString& name, double latDeg, double lonDeg) {
+      _name   = name;
+      _latDeg = latDeg;
+      _lonDeg = lonDeg;
+    }
+    ~t_point() {}
+    QString _name;
+    double  _latDeg;
+    double  _lonDeg;
+  };
 
  public slots:
-  void slotNewPoint(const QString& name, double latDeg, double lonDeg);
+  void slotNewPoints(const QList<t_point*>& points);
   void slotPrint();
 
  private:
-  QwtPlotZoomer* _zoomer;
+  QwtPlotZoomer*        _zoomer;
+  QList<QwtPlotMarker*> _markers;
+  
 };