diff --git a/bin/Cockpitd.dll b/bin/Cockpitd.dll
index d74d2e0..b9432d8 100644
Binary files a/bin/Cockpitd.dll and b/bin/Cockpitd.dll differ
diff --git a/bin/Cockpitd.pdb b/bin/Cockpitd.pdb
index c194351..2d5e228 100644
Binary files a/bin/Cockpitd.pdb and b/bin/Cockpitd.pdb differ
diff --git a/bin/Dlinkd.dll b/bin/Dlinkd.dll
index 67209b4..9729660 100644
Binary files a/bin/Dlinkd.dll and b/bin/Dlinkd.dll differ
diff --git a/bin/Dlinkd.pdb b/bin/Dlinkd.pdb
index 6d553b3..fb6ea56 100644
Binary files a/bin/Dlinkd.pdb and b/bin/Dlinkd.pdb differ
diff --git a/bin/GCS_debug.exe b/bin/GCS_debug.exe
index 97aa82b..82417d1 100644
Binary files a/bin/GCS_debug.exe and b/bin/GCS_debug.exe differ
diff --git a/bin/GCS_debug.exp b/bin/GCS_debug.exp
index 4113ff1..d9a54a3 100644
Binary files a/bin/GCS_debug.exp and b/bin/GCS_debug.exp differ
diff --git a/bin/GCS_debug.lib b/bin/GCS_debug.lib
index 304980e..b0261e5 100644
Binary files a/bin/GCS_debug.lib and b/bin/GCS_debug.lib differ
diff --git a/bin/GCS_debug.pdb b/bin/GCS_debug.pdb
index 12c6058..e5efa8b 100644
Binary files a/bin/GCS_debug.pdb and b/bin/GCS_debug.pdb differ
diff --git a/bin/MavLinkNoded.dll b/bin/MavLinkNoded.dll
index a6a3141..1f9411b 100644
Binary files a/bin/MavLinkNoded.dll and b/bin/MavLinkNoded.dll differ
diff --git a/bin/MavLinkNoded.pdb b/bin/MavLinkNoded.pdb
index e367a76..5a1576e 100644
Binary files a/bin/MavLinkNoded.pdb and b/bin/MavLinkNoded.pdb differ
diff --git a/bin/cored.lib b/bin/cored.lib
index 5a4280e..453f077 100644
Binary files a/bin/cored.lib and b/bin/cored.lib differ
diff --git a/bin/include/opmapwidget.h b/bin/include/opmapwidget.h
index ac90516..ab2d43d 100644
--- a/bin/include/opmapwidget.h
+++ b/bin/include/opmapwidget.h
@@ -56,8 +56,8 @@
 
 #include "waypointbutton.h"
 #include "waypointsetting.h"
-#include "missiondialog.h"
-#include "ruledialog.h"
+//#include "missiondialog.h"
+//#include "ruledialog.h"
 #include "QDialog"
 
 #include "measureline.h"
@@ -394,8 +394,6 @@ public:
 
     MeasureLine *measureline = nullptr;
 
-    //MissionDialog *missiontable;
-    //RuleDialog *ruler;
 
 
     void SetShowUAV(bool const & value);
diff --git a/bin/internalsd.lib b/bin/internalsd.lib
index 9dcbb2b..ef7c593 100644
Binary files a/bin/internalsd.lib and b/bin/internalsd.lib differ
diff --git a/bin/maps/Data.qmdb b/bin/maps/Data.qmdb
index efcb475..865ac5a 100644
Binary files a/bin/maps/Data.qmdb and b/bin/maps/Data.qmdb differ
diff --git a/bin/opmapwidgetd.dll b/bin/opmapwidgetd.dll
index 825c644..382bb98 100644
Binary files a/bin/opmapwidgetd.dll and b/bin/opmapwidgetd.dll differ
diff --git a/bin/opmapwidgetd.lib b/bin/opmapwidgetd.lib
index 51f6c5f..b009e7c 100644
Binary files a/bin/opmapwidgetd.lib and b/bin/opmapwidgetd.lib differ
diff --git a/bin/opmapwidgetd.pdb b/bin/opmapwidgetd.pdb
index 7bf5b04..65df889 100644
Binary files a/bin/opmapwidgetd.pdb and b/bin/opmapwidgetd.pdb differ
diff --git a/opmap/mapwidget/mapwidget.pro b/opmap/mapwidget/mapwidget.pro
index 265d1a3..faf4739 100644
--- a/opmap/mapwidget/mapwidget.pro
+++ b/opmap/mapwidget/mapwidget.pro
@@ -49,8 +49,6 @@ SOURCES +=  $$PWD/mapgraphicitem.cpp \
             $$PWD/waypointline.cpp \
             $$PWD/waypointcircle.cpp \
             $$PWD/AltitudeItem.cpp \
-            $$PWD/missiondialog.cpp \
-            $$PWD/ruledialog.cpp \
             $$PWD/waypointbutton.cpp \
             $$PWD/waypointsetting.cpp \
             measureline.cpp
@@ -72,8 +70,6 @@ HEADERS +=  $$PWD/mapgraphicitem.h \
             $$PWD/waypointcircle.h \
             $$PWD/mapwidgetglobal.h \
             $$PWD/AltitudeItem.h \
-            $$PWD/missiondialog.h \
-            $$PWD/ruledialog.h \
             $$PWD/waypointbutton.h \
             $$PWD/waypointsetting.h \
             measureline.h
@@ -81,9 +77,7 @@ HEADERS +=  $$PWD/mapgraphicitem.h \
 RESOURCES += mapresources.qrc
 
 FORMS += \
-    $$PWD/mapripform.ui \
-    $$PWD/missiondialog.ui \
-    $$PWD/ruledialog.ui
+    $$PWD/mapripform.ui
 
 INCLUDEPATH += $$DESTDIR/include
 
diff --git a/opmap/mapwidget/measureline.cpp b/opmap/mapwidget/measureline.cpp
index c6216f9..be1c3b4 100644
--- a/opmap/mapwidget/measureline.cpp
+++ b/opmap/mapwidget/measureline.cpp
@@ -35,12 +35,12 @@ MeasureLine::MeasureLine(internals::PointLatLng from, internals::PointLatLng to,
 
 
     this->setLine(map->FromLatLngToLocal(from).X(), map->FromLatLngToLocal(from).Y(), map->FromLatLngToLocal(to).X(), map->FromLatLngToLocal(to).Y());
-    /*
-    connect(from, SIGNAL(localPositionChanged(QPointF, WayPointItem *)), this, SLOT(refreshLocations()));
-    connect(to, SIGNAL(localPositionChanged(QPointF, WayPointItem *)), this, SLOT(refreshLocations()));
-    connect(from, SIGNAL(aboutToBeDeleted(WayPointItem *)), this, SLOT(waypointdeleted()));
-    connect(to, SIGNAL(aboutToBeDeleted(WayPointItem *)), this, SLOT(waypointdeleted()));
-    */
+
+    connect(map, SIGNAL(childRefreshPosition()), this, SLOT(refreshLocations()));
+    connect(map, SIGNAL(childRefreshPosition()), this, SLOT(refreshLocations()));
+    //connect(from, SIGNAL(aboutToBeDeleted(WayPointItem *)), this, SLOT(waypointdeleted()));
+    //connect(to, SIGNAL(aboutToBeDeleted(WayPointItem *)), this, SLOT(waypointdeleted()));
+
 
     this->setZValue(5);
 
@@ -101,6 +101,12 @@ void MeasureLine::paint(QPainter *painter, const QStyleOptionGraphicsItem *optio
     }
     painter->setPen(myPen);
     painter->drawLine(line());
+
+    QFont font;
+    font.setPixelSize(15);//不随着屏幕分辨率改变而改变
+    font.setFamily("黑体");//非衬线
+    painter->setFont(font);
+    painter->drawText(line().p2().x(),line().p2().y() - 5,QString("%1km %2°").arg(QString::number(distance * 0.001,'f',3)).arg(QString::number(bearing * 57.3,'f',1)));
 }
 
 
diff --git a/opmap/mapwidget/opmapwidget.cpp b/opmap/mapwidget/opmapwidget.cpp
index 0fd02af..feffbd3 100644
--- a/opmap/mapwidget/opmapwidget.cpp
+++ b/opmap/mapwidget/opmapwidget.cpp
@@ -145,17 +145,20 @@ OPMapWidget::OPMapWidget(QWidget *parent, Configuration *config) : QGraphicsView
 
 
 
-    MissionDialog *missiontable = new MissionDialog();
+    //missiontable = new MissionDialog();
 
-    missiontable->hide();
+    //missiontable->hide();
 
+    point_begin.SetLat(0);
+    point_begin.SetLng(0);
+
+    point_end.SetLat(0);
+    point_end.SetLng(0);
 
     measureline = new MeasureLine(point_begin, point_end, map, QColor("#FFFF00"));
     mscene.addItem(measureline);
     measureline->hide();
 
-    //ruler = new RuleDialog();
-
 
     NoOperationTimer = new QTimer(this);
     connect(NoOperationTimer,SIGNAL(timeout()),
@@ -623,6 +626,14 @@ void OPMapWidget::mouseMoveEvent(QMouseEvent *event)
     }
 
     emit EmitCurrentMousePosition(currentmouseposition);
+
+    if(isMeasure)
+    {
+        QPixmap pix(":/markers/images/ruler.png");
+        this->setCursor(QCursor(pix.scaled(QSize(50,50), Qt::KeepAspectRatio)));
+    }
+
+
 }
 
 
@@ -690,6 +701,14 @@ void OPMapWidget::mousePressEvent(QMouseEvent *event)
     isLNOP = false;
 
     emit MousePressEvent(event);
+
+    if(isMeasure)
+    {
+        QPixmap pix(":/markers/images/ruler.png");
+        this->setCursor(QCursor(pix.scaled(QSize(50,50), Qt::KeepAspectRatio)));
+    }
+
+
 }
 
 void OPMapWidget::mouseReleaseEvent(QMouseEvent *event)
@@ -698,12 +717,25 @@ void OPMapWidget::mouseReleaseEvent(QMouseEvent *event)
 
     QGraphicsView::mouseReleaseEvent(event);
     emit MouseReleaseEvent(event);
+
+    if(isMeasure)
+    {
+        QPixmap pix(":/markers/images/ruler.png");
+        this->setCursor(QCursor(pix.scaled(QSize(50,50), Qt::KeepAspectRatio)));
+    }
+
+    qDebug() << "relea";
 }
 
 void OPMapWidget::mouseDoubleClickEvent(QMouseEvent *event)
 {
     QGraphicsView::mouseDoubleClickEvent(event);
 
+    if(isMeasure)
+    {
+        QPixmap pix(":/markers/images/ruler.png");
+        this->setCursor(QCursor(pix.scaled(QSize(50,50), Qt::KeepAspectRatio)));
+    }
 
     if(isMeasure)
     {
diff --git a/opmap/mapwidget/opmapwidget.h b/opmap/mapwidget/opmapwidget.h
index 691f4c0..fa9b66a 100644
--- a/opmap/mapwidget/opmapwidget.h
+++ b/opmap/mapwidget/opmapwidget.h
@@ -56,8 +56,8 @@
 
 #include "waypointbutton.h"
 #include "waypointsetting.h"
-#include "missiondialog.h"
-#include "ruledialog.h"
+//#include "missiondialog.h"
+//#include "ruledialog.h"
 #include "QDialog"
 
 #include "measureline.h"
@@ -394,8 +394,6 @@ public:
 
     MeasureLine *measureline = nullptr;
 
-    //MissionDialog *missiontable;
-    //RuleDialog *ruler;
 
 
     void SetShowUAV(bool const & value);
diff --git a/opmap/mapwidget/waypointbutton.cpp b/opmap/mapwidget/waypointbutton.cpp
index 0eb7a26..2da2454 100644
--- a/opmap/mapwidget/waypointbutton.cpp
+++ b/opmap/mapwidget/waypointbutton.cpp
@@ -142,6 +142,20 @@ QString WayPointButton::Text(void)
     return text;
 }
 
+void WayPointButton::setHighLight(bool flag)
+{
+    highlight = flag;
+
+    if(highlight)
+    {
+        opacity = 1;
+    }
+    else
+    {
+        opacity = 0.5;
+    }
+}
+
 
 
 
@@ -209,6 +223,9 @@ void WayPointButton::hoverMoveEvent(QGraphicsSceneHoverEvent *event)
     event->accept();
 }
 
+
+
+
 }
 
 
diff --git a/opmap/mapwidget/waypointbutton.h b/opmap/mapwidget/waypointbutton.h
index 16264c5..4e208ab 100644
--- a/opmap/mapwidget/waypointbutton.h
+++ b/opmap/mapwidget/waypointbutton.h
@@ -43,6 +43,8 @@ private:
 
     QString text;
 
+    bool highlight = false;
+
 signals:
 
     void doubleclicked(void);
@@ -74,6 +76,12 @@ public slots:
     void setOpacitySlot(qreal opacity);
 
 
+    void setHighLight(bool flag);
+    bool HighLight(void)
+    {
+        return highlight;
+    }
+
     void setText(QString t);
     QString Text(void);
 
diff --git a/opmap/mapwidget/waypointsetting.cpp b/opmap/mapwidget/waypointsetting.cpp
index 21a638f..eb54560 100644
--- a/opmap/mapwidget/waypointsetting.cpp
+++ b/opmap/mapwidget/waypointsetting.cpp
@@ -120,7 +120,7 @@ void WayPointSetting::paint(QPainter *painter, const QStyleOptionGraphicsItem *o
 
     QFont font;
     font.setPixelSize(15);//不随着屏幕分辨率改变而改变
-    font.setFamily("Arial");//非衬线
+    font.setFamily("黑体");//非衬线
     painter->setFont(font);
 
     //画底部
@@ -261,11 +261,13 @@ void WayPointSetting::next_clicked(void)
 
 void WayPointSetting::ruler_clicked(void)
 {
+     btn_ruler->setHighLight((btn_ruler->HighLight())?(false):(true));
      emit WPRuler();
 }
 
 void WayPointSetting::table_clicked(void)
 {
+     btn_table->setHighLight((btn_table->HighLight())?(false):(true));
      emit WPTable();
 }