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 7b8fbc9..dd0e6a7 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/dot_coh.cpp b/data_process_class_dll/dot_coh.cpp index 9cce857..9a3a3fe 100644 --- a/data_process_class_dll/dot_coh.cpp +++ b/data_process_class_dll/dot_coh.cpp @@ -68,8 +68,8 @@ int Dot_Coh::dot_coh_process(QVector *data_input, float point_1_A=data_buffer[i].Amplitude; //凝聚条件: 距离、方位接近 -// if(Work_Parameter.work_mode == 0) -// { + if(Work_Parameter.work_mode == 0) + { if( (fabs(point_0_R-point_1_R)<=DOT_COH_RANGE && fabs(point_0_F-point_1_F) <=DOT_COH_AZI/180.0*PI && fabs(point_0_V-point_1_V)<=DOT_COH_V)// && point_0_A *data_input, { data_buffer[i].Use_Flag=1; } -// } -// else -// { -// if( (fabs(point_0_R-point_1_R)<=DOT_COH_RANGE && fabs(point_0_F-point_1_F) <=DOT_COH_AZI/180.0*PI )// -// && point_0_A = point_1_A)// -// { -// data_buffer[i].Use_Flag=1; -// } + } + else + { + if( (fabs(point_0_R-point_1_R)<=DOT_COH_RANGE && fabs(point_0_F-point_1_F) <=DOT_COH_AZI/180.0*PI )// + && point_0_A = point_1_A)// + { + data_buffer[i].Use_Flag=1; + } -// } + } } } }