Streamlined paint function.

ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/uavitem.cpp

@@ -50,6 +50,8 @@ namespace mapcontrol
         mapfollowtype=UAVMapFollowType::None;
         trailtype=UAVTrailType::ByDistance;
         timer.start();
+
+        generateArrowhead();
     }
     UAVItem::~UAVItem()
     {
@@ -64,7 +66,7 @@ namespace mapcontrol
         //Draw plane
         painter->drawPixmap(-pic.width()/2,-pic.height()/2,pic);
 
-        //Return if context menu switch for UAV info is off
+        //Return if UAV Info context menu is turned off
         if(!showUAVInfo){
             showJustChanged=false;
             return;
@@ -75,46 +77,19 @@ namespace mapcontrol
         //Turn on anti-aliasing so the fonts don't look terrible
         painter->setRenderHint(QPainter::Antialiasing, true);
 
-        qreal arrowSize = 10;
-
         //Set pen attributes
         QColor myColor(Qt::red);
         myPen.setWidth(3);
         myPen.setColor(myColor);
         painter->setPen(myPen);
-
-        //Create line from (0,0), to (1,1). Later, we'll scale and rotate it
-        QLineF line(0,0,1.0,1.0);
-
-        //Set the starting point to (0,0)
-        line.setP1(QPointF(0,0));
-
-        //Set angle and length
-        line.setLength(60.0);
-        line.setAngle(90.0);
-
-        //Form arrowhead
-        double angle = ::acos(line.dx() / line.length());
-        if (line.dy() <= 0)
-            angle = (M_PI * 2) - angle;
-
-        QPointF arrowP1 = line.pointAt(1) + QPointF(sin(angle + M_PI / 3) * arrowSize,
-                                                      cos(angle + M_PI / 3) * arrowSize);
-        QPointF arrowP2 = line.pointAt(1) + QPointF(sin(angle + M_PI - M_PI / 3) * arrowSize,
-                                                      cos(angle + M_PI - M_PI / 3) * arrowSize);
-
-        //Generate arrowhead
-        arrowHead.clear();
-        arrowHead << line.pointAt(1) << arrowP1 << arrowP2;
         painter->drawPolygon(arrowHead);
         painter->setPen(myPen);
-        painter->drawLine(line);
+        painter->drawLine(arrowShaft);
 
         //*********** Create trend arc
         double radius;
         double spanAngle = yawRate_dps * 5; //Forecast 5 seconds into the future
 
-
         //Find the scale factor between meters and pixels
         double pixels2meters = map->Projection()->GetGroundResolution(map->ZoomTotal(),coord.Lat());
         float meters2pixels=1.0 / pixels2meters;
@@ -164,9 +139,7 @@ namespace mapcontrol
 
         //***** Text info overlay. The font is a "glow" font, so that it's easier to use on the map
 
-        //Rotate the text back to vertical
+        if (refreshPaint_flag==true){
-        qreal rot=this->rotation();
-        painter->rotate(-1*rot);
 
             //Define font
             QFont borderfont( "Arial", 14, QFont::Normal, false );
@@ -190,7 +163,8 @@ namespace mapcontrol
 
             //Add the uavo info text to the path
             //NOTE: We must use QPainterPath for the outlined text font. QPaint does not support this.
-        QPainterPath path;
+            path = QPainterPath();
+
             path.addText(textAnchorX, textAnchorY+16*0, borderfont, uavoInfoStrLine1);
             path.addText(textAnchorX, textAnchorY+16*1, borderfont, uavoInfoStrLine2);
             path.addText(textAnchorX, textAnchorY+16*2, borderfont, uavoInfoStrLine3);
@@ -215,6 +189,17 @@ namespace mapcontrol
                 }
             }
 
+            //Last thing to do: set bound rectangle as function of largest object
+            boundingRectSize=groundspeed_mps_filt*ringTime*4*meters2pixels+20; //Largest object is currently the biggest ring + a little bit of margin for the text
+
+            refreshPaint_flag=false;
+        }
+
+        //Rotate the text back to vertical
+        qreal rot=this->rotation();
+        painter->rotate(-1*rot);
+
+
         //Now draw the text. First pass is the outline...
         myPen.setWidth(4);
         myPen.setColor(Qt::black);
@@ -229,9 +214,6 @@ namespace mapcontrol
         painter->setPen(myPen);
         painter->drawPath(path);
 
-
-        //Last thing to do: set bound rectangle as function of largest object
-        boundingRectSize=groundspeed_mps_filt*ringTime*4*meters2pixels+20; //Largest object is currently the biggest ring + a little bit of margin for the text
     }
 
     QRectF UAVItem::boundingRect()const
@@ -254,6 +236,8 @@ namespace mapcontrol
         this->NED[0] = NED[0];
         this->NED[1] = NED[1];
         this->NED[2] = NED[2];
+
+        refreshPaint_flag=true;
     }
 
     void UAVItem::SetYawRate(double yawRate_dps){
@@ -266,10 +250,13 @@ namespace mapcontrol
             this->yawRate_dps=5e-1;
         }
 
+        refreshPaint_flag=true;
     }
 
     void UAVItem::SetCAS(double CAS_mps){
         this->CAS_mps=CAS_mps;
+
+        refreshPaint_flag=true;
     }
 
     void UAVItem::SetGroundspeed(double vNED[3], int m_maxUpdateRate_ms){
@@ -371,6 +358,8 @@ namespace mapcontrol
 
             }
         }
+
+        refreshPaint_flag=true;
     }
 
     /**
@@ -387,6 +376,8 @@ namespace mapcontrol
             if (this->rotation() != value)
                 this->setRotation(value);
         }
+
+        refreshPaint_flag=true;
     }
 
 
@@ -413,7 +404,9 @@ namespace mapcontrol
                 ww->setLine(map->FromLatLngToLocal(ww->coord1).X(),map->FromLatLngToLocal(ww->coord1).Y(),map->FromLatLngToLocal(ww->coord2).X(),map->FromLatLngToLocal(ww->coord2).Y());
         }
 
+        refreshPaint_flag=true;
     }
+
     void UAVItem::SetTrailType(const UAVTrailType::Types &value)
     {
         trailtype=value;
@@ -455,4 +448,32 @@ namespace mapcontrol
         update();
     }
 
+    void UAVItem::generateArrowhead(){
+        qreal arrowSize = 10;
+
+        //Create line from (0,0), to (1,1). Later, we'll scale and rotate it
+        arrowShaft=QLineF(0,0,1.0,1.0);
+
+        //Set the starting point to (0,0)
+        arrowShaft.setP1(QPointF(0,0));
+
+        //Set angle and length
+        arrowShaft.setLength(60.0);
+        arrowShaft.setAngle(90.0);
+
+        //Form arrowhead
+        double angle = ::acos(arrowShaft.dx() / arrowShaft.length());
+        if (arrowShaft.dy() <= 0)
+            angle = (M_PI * 2) - angle;
+
+        QPointF arrowP1 = arrowShaft.pointAt(1) + QPointF(sin(angle + M_PI / 3) * arrowSize,
+                                                      cos(angle + M_PI / 3) * arrowSize);
+        QPointF arrowP2 = arrowShaft.pointAt(1) + QPointF(sin(angle + M_PI - M_PI / 3) * arrowSize,
+                                                      cos(angle + M_PI - M_PI / 3) * arrowSize);
+
+        //Assemble arrowhead
+        arrowHead.clear();
+        arrowHead << arrowShaft.pointAt(1) << arrowP1 << arrowP2;
+
+    }
 }

ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/uavitem.h

@@ -221,8 +221,11 @@ namespace mapcontrol
         void SetShowUAVInfo(bool const& value);
 
     private:
+        void generateArrowhead();
+
         MapGraphicItem* map;
         QPolygonF arrowHead;
+        QLineF arrowShaft;
         int altitude;
         UAVMapFollowType::Types mapfollowtype;
         UAVTrailType::Types trailtype;
@@ -252,6 +255,11 @@ namespace mapcontrol
         float boundingRectSize;
         bool showJustChanged;
 
+        bool refreshPaint_flag;
+
+        QPainterPath path;
+
+
     public slots:
 
     signals: