Changeset 5491 in ntrip for trunk/GnssCenter

Timestamp:

Sep 18, 2013, 3:30:43 PM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/GnssCenter/monitor

Files:

• monitor.cpp (modified) (2 diffs)
• worldplot.cpp (modified) (3 diffs)
• worldplot.h (modified) (2 diffs)

trunk/GnssCenter/monitor/monitor.cpp

@@ -252 +252 @@
         double lonDeg = ell[1] * 180.0 / M_PI;
         QString str = QString().sprintf("%d/%d", result->_nGPS, result->_nGLO);
-        t_worldPlot::t_point* point  = new t_worldPlot::t_point(str, latDeg, lonDeg);
+        QColor color = result->_nGPS >= 4 ? Qt::black : Qt::red;
+        t_worldPlot::t_point* point  = new t_worldPlot::t_point(color, str, latDeg, lonDeg);
         points.append(point);
       }
@@ -284 +285 @@
         double lonDeg = ell[1] * 180.0 / M_PI;
         QString str   = sat->_prn.c_str();
-        t_worldPlot::t_point* point  = new t_worldPlot::t_point(str, latDeg, lonDeg);
+        QColor color = Qt::darkBlue;
+        t_worldPlot::t_point* point  = new t_worldPlot::t_point(color, str, latDeg, lonDeg);
         points.append(point);
       }

trunk/GnssCenter/monitor/worldplot.cpp

@@ -73 +73 @@
   _markers.clear();
 
-  QColor color(220,20,60);
-
   QListIterator<t_point*> ip(points);
   while (ip.hasNext()) {
@@ -81 +79 @@
     if (point->_lonDeg > 180.0) point->_lonDeg -= 360.0;
   
-    QwtSymbol* symbol = new QwtSymbol(QwtSymbol::Rect, QBrush(color), 
-                                      QPen(color), QSize(2,2));
+    QwtSymbol* symbol = new QwtSymbol(QwtSymbol::Rect, QBrush(point->_color), 
+                                      QPen(point->_color), QSize(2,2));
     QwtPlotMarker* marker = new QwtPlotMarker();
     marker->setValue(point->_lonDeg, point->_latDeg);
@@ -95 +93 @@
     font.setPointSize(font.pointSize()*0.8);
     text.setFont(font);
-    text.setColor(color);
+    text.setColor(point->_color);
     marker->setLabel(text);
     marker->setSymbol(symbol);

trunk/GnssCenter/monitor/worldplot.h

@@ -17 +17 @@
   class t_point {
    public:
-    t_point(const QString& name, double latDeg, double lonDeg) {
+    t_point(const QColor& color, const QString& name, double latDeg, double lonDeg) {
+      _color  = color;
       _name   = name;
       _latDeg = latDeg;
@@ -23 +24 @@
     }
     ~t_point() {}
+    QColor  _color;
     QString _name;
     double  _latDeg;