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 @@ - + EnvironmentId 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 > *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 && rWork_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 && rWork_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 && rWork_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; };