Merge remote-tracking branch 'origin/aj500b_5' into aj500b

App/MissionUI/propertyui.cpp

@@ -298,20 +298,20 @@ propertyui::propertyui(QWidget *parent) :
 
 void propertyui::closeMissionDialog(bool flag)
 {
-    if(flag == true)
-    {
-        if(table)
-        {
-            table->hide();
-        }
+//    if(flag == true)
+//    {
+//        if(table)
+//        {
+//            table->hide();
+//        }
 
-        if(ruler)
-        {
-            emit exitRuler();
-            ruler->deleteLater();
-            ruler = nullptr;
-        }
-    }
+//        if(ruler)
+//        {
+//            emit exitRuler();
+//            ruler->deleteLater();
+//            ruler = nullptr;
+//        }
+//    }
 }
 
 void propertyui::clearLayout(QLayout *layout)
@@ -1138,10 +1138,10 @@ propertyui::~propertyui()
         table->deleteLater();
     }
 
-    if(ruler)
-    {
-        ruler->deleteLater();
-    }
+//    if(ruler)
+//    {
+//        ruler->deleteLater();
+//    }
 
 
     delete ui;
@@ -2325,6 +2325,7 @@ void propertyui::measureState(bool flag)
 
 void propertyui::on_pushButton_Ruler_clicked()
 {
+/*
     if(ruler)
     {
         ruler->deleteLater();
@@ -2357,7 +2358,7 @@ void propertyui::on_pushButton_Ruler_clicked()
     }
 
 
-
+*/
 }
 
 void propertyui::on_pushButton_Table_clicked()

App/MissionUI/propertyui.h

@@ -422,7 +422,7 @@ private:
     Ui::propertyui *ui;
 
     MissionUI *table = nullptr;
-    RuleDialog *ruler = nullptr;
+//    RuleDialog *ruler = nullptr;
 
 
     QByteArray allBytes;