更新：修改扫描一周完成的判断逻辑，改成用波位号变小来判断。

Signed-off-by: waiwaylee <waiwaylee@foxmail.com>

data_process_class_dll/data_process.cpp

@@ -19,7 +19,7 @@ int Data_Process::data_preprocess(struct DataRev    Data_Input[150])
 	if(Data_Input[0].point_type == 0)        //tws数据
 	{
 		data_num=min(Data_Input[0].Point_Sum, 150);
-		TAS_track_idx = Data_Input[0].TAS_track_index;
+		//qDebug() << "TARGET azi beam idx:" <<Data_Input[0].Beam_index_aiz;
 		for (int i=0; i<data_num;i++)
 		{
 			PointRecv Data_buffer_temp;
@@ -42,13 +42,15 @@ int Data_Process::data_preprocess(struct DataRev    Data_Input[150])
 
 			Data_buffer.push_back(Data_buffer_temp);
 		}
-		if(Data_Input[0].Beam_index_aiz % 16 == 0)              //TWS
+		if(Data_Input[0].Beam_index_aiz < last_beam_num)              //TWS
 		{
-			 return 1;
+			last_beam_num = Data_Input[0].Beam_index_aiz;
+			return 1;
 		}
 		else
 		{
-			 return 2;
+			last_beam_num = Data_Input[0].Beam_index_aiz;
+			return 2;
 		}
 	}
 
@@ -112,6 +114,7 @@ int Data_Process::track_process(struct Track Trust_Track_Output[MAX_TRACK_NUM][1
 	{
 
 		 dot_coh.dot_coh_process_buff(&Data_buffer,&point_recv,Work_Parameter);
+		 //qDebug() << "point_recv :" <<point_recv.size();
 		 QVector<PointRecv>().swap(Data_buffer);
 	}
 
@@ -139,7 +142,11 @@ int Data_Process::track_process(struct Track Trust_Track_Output[MAX_TRACK_NUM][1
 											 Trust_Track_Output,
 											 Trust_track_num_Output,
 											 Work_Parameter);
-
+//		qDebug() << "point_recv: " <<point_recv.size();
+//		qDebug() << "trust_track: " <<trust_track.size();
+//		qDebug() << "temp_track: " <<temp_track.size();
+//		qDebug() << "Trust_track_num_Output: " <<*Trust_track_num_Output;
+//		qDebug() << "Track_die_num_Output: " <<*Track_die_num_Output;
 
 	}
 

data_process_class_dll/data_process.h

@@ -88,6 +88,8 @@ private:
 
 	int     Track_Mode;                             //跟踪模式 1TAS 0TWS
 
+	int		last_beam_num = INT_MIN;							//上一个波位号，用于判断是否搜索完一圈
+
 
 	struct  RadarPara Work_Parameter;               //工作参数  参数设置函数外部输入
 

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, 2026-06-30T13:50:16. -->
+<!-- Written by QtCreator 4.0.2, 2026-07-06T14:25:51. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -122,7 +122,7 @@
     <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
    </valuemap>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">E:/Demo/QT/simianzhen256-v1.5.5/release</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">E:/Demo/QT/simianzhen256-v1.5.5-ms/build</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>

data_process_class_dll/track_asso.cpp

@@ -564,7 +564,7 @@ void Track_Asso:: model_filter(QVector <Trust_Track> *trust_track,struct  RadarP
 			||(  r_track>=1000              && (d1*d1<ASSO_THORD*ASSO_THORD || d2*d2<ASSO_THORD*ASSO_THORD || d3*d3<ASSO_THORD*ASSO_THORD) && d_p && d_r)//
 				)
 				{
-					 qDebug() << "asooooooooooo";
+					 //qDebug() << "asooooooooooo";
 
 					struct asso_info associated_info_tmp;
 					associated_info_tmp.d1=d1;

data_process_class_dll/track_init.cpp

@@ -246,6 +246,7 @@ void Track_Init::point_temp_track_asso(QVector <QVector<Temp_track>>     *temp_t
 						asso_info.push_back(asso_info_tmp);
 						(*temp_track)[j][L-1].asso_flag = 1;
 						point_process[i].Use_Flag = 1;
+						//qDebug() << "v_temp_track : " << v_temp_track << "vr_point : "<< vr_point;
 					}
 				}
 			}
@@ -434,6 +435,7 @@ void Track_Init::point_track_head_asso( QVector <QVector<Temp_track>>     *temp_
 					asso_info.push_back(asso_info_tmp);
 					(*temp_track)[j][0].asso_flag = 1;
 					point_process[i].Use_Flag = 1;
+					//qDebug() << "v_track_head: " << v_track_head << "vr_point: " << vr_point;
 				 }