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 81a2d43..01a6506 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 9cf6395..30a1c7a 100644 --- a/data_process_class_dll/tas_ctrl.cpp +++ b/data_process_class_dll/tas_ctrl.cpp @@ -61,7 +61,7 @@ void TAS_Ctrl::tas_target_add(QVector > *trust_track, azi=azi/PI*180; //进入跟踪的条件: 1.手动跟踪的目标 或 满足速度、距离、高度条件满足 关联点数大于2 2.不在禁止跟踪区域 - if( ( (*trust_track)[i][k].manual_tracking_flag == 1|| (tas_auto_start( v, r, h, Work_Parameter)==1 && (*trust_track)[i][k].associate_point_number>=2))// + if( ( (*trust_track)[i][k].manual_tracking_flag == 1)//|| (tas_auto_start( v, r, h, Work_Parameter)==1 && (*trust_track)[i][k].associate_point_number>=2) && tas_target_num < MAX_TAS_NUM && (*trust_track)[i][k].Track_Mode == 0 && tas_prohibite_area( r, azi, v, h, Work_Parameter) == 0)