diff --git a/data_process_class_dll/track_asso.cpp b/data_process_class_dll/track_asso.cpp index 44d1d1d..dbe9db6 100644 --- a/data_process_class_dll/track_asso.cpp +++ b/data_process_class_dll/track_asso.cpp @@ -467,61 +467,71 @@ void Track_Asso:: model_filter(QVector *trust_track,struct RadarP IMM_d_cal(v_track,X1,P1,X2,P2, X3,P3,Z,prt,freq_ind,delta_T,&d1,&d2,&d3,Work_Parameter); //计算高度门限 - double d_h; - if (r_track<1000) - { - if(abs(h_track-h_point)<=150) - { - d_h = 1; - } - else - { - d_h = 0; - } +// double d_h; +// if (r_track<1000) +// { +// if(abs(h_track-h_point)<=150) +// { +// d_h = 1; +// } +// else +// { +// d_h = 0; +// } - } - else if (r_track<2000 && r_track>=1000) - { - if(abs(h_track-h_point)<=200) - { - d_h = 1; - } - else - { - d_h = 0; - } +// } +// else if (r_track<2000 && r_track>=1000) +// { +// if(abs(h_track-h_point)<=200) +// { +// d_h = 1; +// } +// else +// { +// d_h = 0; +// } - } - else if(r_track>=2000 && r_track<3000 ) - { - if(abs(h_track-h_point)<=200) - { - d_h = 1; - } - else - { - d_h = 0; - } - } - else if(r_track>=3000 && r_track<5000) - { - if(abs(h_track-h_point)<=300) - { - d_h = 1; - } - else - { - d_h = 0; - } - } - else - { - d_h = 1; - } +// } +// else if(r_track>=2000 && r_track<3000 ) +// { +// if(abs(h_track-h_point)<=200) +// { +// d_h = 1; +// } +// else +// { +// d_h = 0; +// } +// } +// else if(r_track>=3000 && r_track<5000) +// { +// if(abs(h_track-h_point)<=300) +// { +// d_h = 1; +// } +// else +// { +// d_h = 0; +// } +// } +// else +// { +// d_h = 1; +// } - qDebug() << delta_T<<" "< *trust_track,struct RadarP //小于关联门限 保存关联信息 if( - ( r_track<=500 && (d1*d1500&&r_track<1000) && (d1*d1=1000 && (d1*d1500&&r_track<1000) && (d1*d1=1000 && (d1*d1