From 61b96125473c146c2cfef66500674166d1e913d5 Mon Sep 17 00:00:00 2001
From: Yang Jianchao <yangjianchao999@126.com>
Date: Wed, 25 May 2022 22:35:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9TAS=5FCtrl::=20tas=5Fauto=5Fs?=
 =?UTF-8?q?tart=E5=87=BD=E6=95=B0=EF=BC=8C=E5=88=A4=E6=96=AD=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E5=86=99=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Yang Jianchao <yangjianchao999@126.com>
---
 data_process_class_dll/data_process_class_dll.pro.user | 2 +-
 data_process_class_dll/tas_ctrl.cpp                    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/data_process_class_dll/data_process_class_dll.pro.user b/data_process_class_dll/data_process_class_dll.pro.user
index 7f32362..50ca292 100644
--- a/data_process_class_dll/data_process_class_dll.pro.user
+++ b/data_process_class_dll/data_process_class_dll.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.0.2, 2022-05-24T16:20:58. -->
+<!-- Written by QtCreator 4.0.2, 2022-05-25T21:55:42. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
diff --git a/data_process_class_dll/tas_ctrl.cpp b/data_process_class_dll/tas_ctrl.cpp
index 6001c91..9cf6395 100644
--- a/data_process_class_dll/tas_ctrl.cpp
+++ b/data_process_class_dll/tas_ctrl.cpp
@@ -114,9 +114,9 @@ void TAS_Ctrl::tas_target_add(QVector <QVector<Trust_Track>> *trust_track,
 int TAS_Ctrl:: tas_auto_start(float v, float r, float h, struct  RadarPara		Work_Parameter)
 {
 
-    if(r>Work_Parameter.R_TAS_min && r<Work_Parameter.R_TAS_max && v<Work_Parameter.V_TAS_max && v>Work_Parameter.V_TAS_min
-        && ( (r<=1000 && h>=Work_Parameter.TAS_Height_1) || (r<=2000 && r>1000 && h>=Work_Parameter.TAS_Height_2) || (r<=3000 && r>2000 && h>=Work_Parameter.TAS_Height_3)  || (r<=4000 && r>3000 && h>=Work_Parameter.TAS_Height_4) || (r>4000 && h>=Work_Parameter.TAS_Height_5)  )
-       )
+//    if(r>Work_Parameter.R_TAS_min && r<Work_Parameter.R_TAS_max && v<Work_Parameter.V_TAS_max && v>Work_Parameter.V_TAS_min
+//        && ( (r<=1000 && h>=Work_Parameter.TAS_Height_1) || (r<=2000 && r>1000 && h>=Work_Parameter.TAS_Height_2) || (r<=3000 && r>2000 && h>=Work_Parameter.TAS_Height_3)  || (r<=4000 && r>3000 && h>=Work_Parameter.TAS_Height_4) || (r>4000 && h>=Work_Parameter.TAS_Height_5)  )
+//       )
     if( r>Work_Parameter.R_TAS_min  && r<Work_Parameter.R_TAS_max && v<Work_Parameter.V_TAS_max && v>Work_Parameter.V_TAS_min
         && ( (r<=1000 && h>=Work_Parameter.TAS_Height_1) || (r<=2000 && r>1000 && h>=Work_Parameter.TAS_Height_2) || (r<=3000 && r>2000 && h>=Work_Parameter.TAS_Height_3)  || (r<=4000 && r>3000 && h>=Work_Parameter.TAS_Height_4) || (r>4000 && h>=Work_Parameter.TAS_Height_5)  ) )
     {
@@ -127,7 +127,7 @@ int TAS_Ctrl:: tas_auto_start(float v, float r, float h, struct  RadarPara		Work
         return 0;
     }
 
-    return 0;
+//    return 0;
 
 };