diff --git a/data_process_class_dll/track_asso.cpp b/data_process_class_dll/track_asso.cpp index e2dbc65..53004d7 100644 --- a/data_process_class_dll/track_asso.cpp +++ b/data_process_class_dll/track_asso.cpp @@ -124,7 +124,7 @@ int Track_Asso:: track_asso_process(std::vector *point_ // Trust_Track_Output[*Trust_track_num_Output-1][0].Flag_Direction=Trust_Track_Output[*Trust_track_num_Output-1][0].vr_point>0?1:0; - if(acos((-x * (*trust_track)[i].X[1] - y * (*trust_track)[i].X[4]) / r / Trust_Track_Output[*Trust_track_num_Output-1][0].Range_V) < PI / 4) + if(acos((-x * cos(Direction_Angle) - y * sin(Direction_Angle)) / r ) < PI / 2) { Trust_Track_Output[*Trust_track_num_Output-1][0].Flag_Direction=1; // if(r*abs(sin(azi - Direction_Angle))<500) diff --git a/data_process_class_dll/track_asso_tas.cpp b/data_process_class_dll/track_asso_tas.cpp index 6f74c68..8432c37 100644 --- a/data_process_class_dll/track_asso_tas.cpp +++ b/data_process_class_dll/track_asso_tas.cpp @@ -90,7 +90,7 @@ long long latest_timestamp //最新时间戳 Trust_Track_Output[*Trust_track_num_Output-1][0].pitch_num = (*trust_track)[i].pitch_num; // Trust_Track_Output[*Trust_track_num_Output-1][0].Flag_Direction=Trust_Track_Output[*Trust_track_num_Output-1][0].vr_point>0?1:0; - if(acos((-x * (*trust_track)[i].X[1] - y * (*trust_track)[i].X[4]) / r / Trust_Track_Output[*Trust_track_num_Output-1][0].Range_V) < PI / 4) + if(acos((-x * cos(Direction_Angle) - y * sin(Direction_Angle)) / r ) < PI / 2) { Trust_Track_Output[*Trust_track_num_Output-1][0].Flag_Direction=1; // if(r*abs(sin(azi - Direction_Angle))<500)