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 79bfd96..7b8fbc9 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/track_init.cpp b/data_process_class_dll/track_init.cpp index e4ddcfa..10b03c8 100644 --- a/data_process_class_dll/track_init.cpp +++ b/data_process_class_dll/track_init.cpp @@ -426,7 +426,7 @@ void Track_Init::tmp_track_to_trust_track(QVector > *tru int L=(*Iter).size(); float range=(*Iter)[L-1].r; float azi=(*Iter)[L-1].azi/PI*180; - if( ( L==Work_Parameter.track_start_point_num)) //按长度查找TRUST_TRACK_POINT + if( ( L==Work_Parameter.track_start_point_num)&& track_init_prohibit(range,azi,Work_Parameter)==0) //按长度查找TRUST_TRACK_POINT { if(trust_track->size()> *temp_track) +int Track_Init::track_init_prohibit(float r, float azi, struct RadarPara Work_Parameter) +{ + + + for (int i=0;iWork_Parameter.R_min_track_prohibited[i] && aziWork_Parameter.Azimuth_min_track_prohibited[i]) + { + return 1; + } + } + + return 0; + + +} + Track_Init::Track_Init() diff --git a/data_process_class_dll/track_init.h b/data_process_class_dll/track_init.h index f641343..3d547a3 100644 --- a/data_process_class_dll/track_init.h +++ b/data_process_class_dll/track_init.h @@ -49,6 +49,8 @@ private: double alpha_cal_track_init(float x0,float y0,float x1,float y1,float x2,float y2); //计算夹角 + int track_init_prohibit(float r, float azi, struct RadarPara Work_Parameter); //判断目标是否位于航迹起始屏蔽区 是返回1 否返回0 + Track_Ind_Mangement track_index_mangement; };