From 199ae3424052c8bf7b7ba36999300328cb06e845 Mon Sep 17 00:00:00 2001
From: Yang Jianchao <yangjianchao999@126.com>
Date: Wed, 1 Jun 2022 21:56:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=AE=E6=A0=87=E5=87=9D=E8=81=9A=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=20dot=5Fcoh=E6=A0=B9=E6=8D=AE=E4=B8=8D=E5=90=8C?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E8=AE=BE=E7=BD=AE=20=E8=BF=9B=E7=A8=8B?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=20=E8=B7=9D=E7=A6=BB=E3=80=81=E9=80=9F?=
 =?UTF-8?q?=E5=BA=A6=E3=80=81=E6=96=B9=E4=BD=8D=20=E4=B8=AD=E7=A8=8B?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=20=E8=B7=9D=E7=A6=BB=20=E6=96=B9=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Yang Jianchao <yangjianchao999@126.com>
---
 .../data_process_class_dll.pro.user           |  2 +-
 data_process_class_dll/dot_coh.cpp            | 40 +++++++++----------
 2 files changed, 21 insertions(+), 21 deletions(-)

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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.0.2, 2022-05-31T14:55:07. -->
+<!-- Written by QtCreator 4.0.2, 2022-06-01T21:51:14. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
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 <PointRecv>                *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 <point_1_A  )//
                             {
@@ -84,27 +84,27 @@ int Dot_Coh::dot_coh_process(QVector <PointRecv>                *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  )//
-//                            {
-//                                point_0_R=data_buffer[i].Range;
-//                                point_0_V=data_buffer[i].Velocity;
-//                                point_0_A=data_buffer[i].Amplitude;
-//                                point_0_F=data_buffer[i].Azimuth;
-//                                data_buffer[loop_of_point].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  )//
+                            {
+                                point_0_R=data_buffer[i].Range;
+                                point_0_V=data_buffer[i].Velocity;
+                                point_0_A=data_buffer[i].Amplitude;
+                                point_0_F=data_buffer[i].Azimuth;
+                                data_buffer[loop_of_point].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;
+                            }
 
 
 
-//                        }
+                        }
                     }
                 }
             }