Merge branch 'experimental' of github.com:pixhawk/qgroundcontrol into experimental

src/ui/MapWidget.cc

@@ -593,21 +593,12 @@ void MapWidget::updateGlobalPosition(UASInterface* uas, double lat, double lon,
             uasTrails.value(uas->getUASID())->addPoint(new qmapcontrol::Point(lat, lon, QString("lat: %1 lon: %2").arg(lat, lon)));
         }
 
-        //    points.append(new CirclePoint(8.275145, 50.016992, 15, "Wiesbaden-Mainz-Kastel, Johannes-Goßner-Straße", Point::Middle, pointpen));
-        //    points.append(new CirclePoint(8.270476, 50.021426, 15, "Wiesbaden-Mainz-Kastel, Ruthof", Point::Middle, pointpen));
-        //    // "Blind" Points
-        //    points.append(new Point(8.266445, 50.025913, "Wiesbaden-Mainz-Kastel, Mudra Kaserne"));
-        //    points.append(new Point(8.260378, 50.030345, "Wiesbaden-Mainz-Amoneburg, Dyckerhoffstraße"));
 
         // Connect click events of the layer to this object
         // connect(osmLayer, SIGNAL(geometryClicked(Geometry*, QPoint)),
         //                  this, SLOT(geometryClicked(Geometry*, QPoint)));
 
         // Sets the view to the interesting area
-        //QList<QPointF> view;
-        //view.append(QPointF(8.24764, 50.0319));
-        //view.append(QPointF(8.28412, 49.9998));
-        // mc->setView(view);
         updatePosition(0, lat, lon);
     }
 }

src/ui/map/MAV2DIcon.cc

@@ -14,8 +14,11 @@ MAV2DIcon::MAV2DIcon(qreal x, qreal y, QString name, Alignment alignment, QPen*
 {
     int radius = 10;
     size = QSize(radius, radius);
+    if (pen)
+    {
         drawIcon(pen);
     }
+}
 
 MAV2DIcon::~MAV2DIcon()
 {
@@ -24,9 +27,12 @@ MAV2DIcon::~MAV2DIcon()
 
 void MAV2DIcon::setPen(QPen* pen)
 {
+    if (pen)
+    {
         mypen = pen;
         drawIcon(pen);
     }
+}
 
 /**
  * @param yaw in radians, 0 = north, positive = clockwise
@@ -38,6 +44,8 @@ void MAV2DIcon::setYaw(float yaw)
 
 void MAV2DIcon::drawIcon(QPen* pen)
 {
+    if (pen)
+    {
         mypixmap = new QPixmap(radius+1, radius+1);
         mypixmap->fill(Qt::transparent);
         QPainter painter(mypixmap);
@@ -81,3 +89,4 @@ void MAV2DIcon::drawIcon(QPen* pen)
         painter.setBrush(Qt::NoBrush);
         painter.drawPolygon(poly);
     }
+}