航线添加一个说明表格

opmap/mapwidget/geoFenceitem.cpp

@@ -72,21 +72,29 @@ void geoFenceitem::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti
 
     QPolygonF poly = polygon();
 
-    int count = 0;
+    int count = 1;
     for(QPointF p:poly)
     {
+        //画个小圆
         painter->save();
+        painter->setOpacity(0.8);
+        painter->setPen(Qt::NoPen);
+        painter->setBrush(QColor("#FFFFFF"));
+        painter->drawEllipse(p,10,10);
+        painter->restore();
 
+        //画字
+        painter->save();
+        painter->setOpacity(1);
         font.setWeight(QFont::ExtraBold);
         font.setFamily("Arial");//非衬线
         font.setPixelSize(15);
         painter->setFont(font);
 
         myPen.setWidth(1);
-        myPen.setColor(QColor("#FFFFFF"));
+        myPen.setColor(QColor("#000000"));
         painter->setPen(myPen);
         painter->drawText(QRect(p.x() - 20,p.y()-5,40,10),Qt::AlignCenter,QString::number(count++));
-
         painter->restore();
     }
 

opmap/mapwidget/opmapwidget.cpp

@@ -94,7 +94,8 @@ OPMapWidget::OPMapWidget(QWidget *parent, Configuration *config) : QGraphicsView
 
     waypointsetting = new WayPointSetting(map,QColor("#a39d9c"));
     mscene.addItem(waypointsetting);
-    waypointsetting->hide();
+    waypointsetting->setMode(1);
+    //waypointsetting->hide();
 
    // WPnearPoint
 

opmap/mapwidget/waypointsetting.cpp

@@ -18,8 +18,10 @@ WayPointSetting::WayPointSetting(MapGraphicItem *map, QColor background) : myMap
 
     showMode = 0;
 
-    rect.setX(0);
-    rect.setY(0);
+    rect.setLeft(0);
+    rect.setTop(0);
+    //rect.setX(0);
+    //rect.setY(0);
     rect.setWidth(100);
     rect.setHeight(370);
 
@@ -138,7 +140,7 @@ WayPointSetting::WayPointSetting(MapGraphicItem *map, QColor background) : myMap
     {
         if(btn_aircraft->Text() == tr("AirCraft"))
         {
-            btn_aircraft->setText(tr("ShowAirCraft"));
+            btn_aircraft->setText(tr("Show\nAirCraft"));
             emit UAVShowTip(true);
             emit showMessage(tr("show UAV Tip"));
         }
@@ -159,7 +161,7 @@ WayPointSetting::WayPointSetting(MapGraphicItem *map, QColor background) : myMap
     {
         if(btn_tip->Text() == tr("Tip"))
         {
-            btn_tip->setText(tr("ShowTip"));
+            btn_tip->setText(tr("Show\nTip"));
             emit WPShowTip(true);
             emit showMessage(tr("show mission Tip"));
         }
@@ -197,7 +199,10 @@ WayPointSetting::WayPointSetting(MapGraphicItem *map, QColor background) : myMap
 
 QRectF WayPointSetting::boundingRect() const //鼠标可以操作的大小
 {
+    qDebug() << rect;
     return rect;
+
+    //return QRectF(0,0,100,370);
 }
 
 void WayPointSetting::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)