diff --git a/data_process_class_dll/data_process.cpp b/data_process_class_dll/data_process.cpp index 7291b41..42b9b19 100644 --- a/data_process_class_dll/data_process.cpp +++ b/data_process_class_dll/data_process.cpp @@ -45,8 +45,6 @@ int Data_Process::data_preprocess(struct DataRev Data_Input[150]) std::memcpy(Data_buffer_temp.range_dim, Data_Input[i].range_dim, sizeof(Data_buffer_temp.range_dim)); Data_buffer.push_back(Data_buffer_temp); - - //qDebug() << "AZI: " < - + EnvironmentId @@ -64,7 +64,7 @@ Desktop Qt 5.7.0 MSVC2013 32bit Desktop Qt 5.7.0 MSVC2013 32bit qt.57.win32_msvc2013_kit - 1 + 4 0 0 @@ -229,7 +229,115 @@ 0 true - 3 + + E:/Demo/QT/simianzhen256-v1.5.5-ms/build/X256_PS + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + "DEFINES += PHASE_SCANNING" + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + 构建 + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + 清理 + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + X256_PS + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + E:/Demo/QT/simianzhen256-v1.5.5-ms/build/X256_MS + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + "DEFINES += MECHANICAL_SCANNING" + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + 构建 + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + 清理 + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + X256_MS + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 5 0 diff --git a/data_process_class_dll/dot_coh.cpp b/data_process_class_dll/dot_coh.cpp index 902151f..72be4c5 100644 --- a/data_process_class_dll/dot_coh.cpp +++ b/data_process_class_dll/dot_coh.cpp @@ -119,11 +119,21 @@ int Dot_Coh::dot_coh_process_buff( QVector *data_input, data_tmp[data_tmp.size()-1].point_section_asso = 1; } + + for (int i=0;isize();i++) { - data_tmp.push_back((*data_input)[i]); + data_tmp.push_back((*data_input)[i]); data_tmp[data_tmp.size()-1].point_section_asso = 2; } +// //去除点迹中，1km以内，SNR小于20dB的点 +// for (int i=0;isize();i++) +// { +// if((*data_input)[i].Range > 1000 || (*data_input)[i].snr >= 20){ +// data_tmp.push_back((*data_input)[i]); +// data_tmp[data_tmp.size()-1].point_section_asso = 2; +// } +// } //1.2 把data_input、data_input_buff清空 @@ -188,8 +198,6 @@ int Dot_Coh::dot_coh_process_buff( QVector *data_input, data_tmp[i].Use_Flag=1; } - - } } } diff --git a/data_process_class_dll/parameters.h b/data_process_class_dll/parameters.h index 861ed53..123360c 100644 --- a/data_process_class_dll/parameters.h +++ b/data_process_class_dll/parameters.h @@ -28,7 +28,7 @@ #define FREQ20 16.8 //#define MECHANICAL_SCANNING -#define PHASE_SCANNING +//#define PHASE_SCANNING #ifdef MECHANICAL_SCANNING /******************************数据处理参数**************************************/ @@ -68,8 +68,6 @@ #define TAS_QUEUE_LENGTH 1 //Tas调用的cpi数 #define MAX_TAS_NUM 1 -#define T_TAS_PRED DATA_RATE_TAS - #define UNCONF_TARGET 0 #define DIRECT_TRACKING_QUEUE_LENGTH 10 @@ -116,7 +114,6 @@ #define TAS_QUEUE_LENGTH 4 //Tas调用的cpi数 #define MAX_TAS_NUM 4 -#define T_TAS_PRED 0.7 #define UNCONF_TARGET 0 diff --git a/data_process_class_dll/tas_ctrl.cpp b/data_process_class_dll/tas_ctrl.cpp index 3adb586..3757be5 100644 --- a/data_process_class_dll/tas_ctrl.cpp +++ b/data_process_class_dll/tas_ctrl.cpp @@ -305,6 +305,8 @@ void TAS_Ctrl::tas_beam_output(QVector *trust_track, //跟踪波束开关开启 Tracking_beam->open_flag=1; + + qDebug() << "TAS: range: " <Range << "azi: " <Azi <<"pit: " <Elev; } else { diff --git a/data_process_class_dll/track_asso_tas.cpp b/data_process_class_dll/track_asso_tas.cpp index 49eaf98..f971cae 100644 --- a/data_process_class_dll/track_asso_tas.cpp +++ b/data_process_class_dll/track_asso_tas.cpp @@ -502,7 +502,7 @@ void Track_Asso_Tas::model_filter( QVector *trust for(int i=0;isize();i++) if((*trust_track)[i].Track_Index == tas_track_idx) { - double delta_T = DATA_RATE_TAS; + double delta_T = (point_process[0].CPI_Time - T_track)/1000.0; double F[6][6], Q1[6][6], Q2[6][6], Q3[6][6]; IMM_F_Q_gen( v_track, delta_T, F, Q1, Q2, Q3,Work_Parameter); diff --git a/data_process_class_dll/track_init.cpp b/data_process_class_dll/track_init.cpp index 6e5c43a..16ef4e9 100644 --- a/data_process_class_dll/track_init.cpp +++ b/data_process_class_dll/track_init.cpp @@ -542,14 +542,24 @@ void Track_Init::tmp_track_to_trust_track(QVector *trust_track, int L=(*Iter).size(); double range=(*Iter)[L-1].r; double azi=(*Iter)[L-1].azi/PI*180; - if( ( L==Work_Parameter.track_start_point_num)&& track_init_prohibit(range,azi,Work_Parameter)==0) //按长度查找TRUST_TRACK_POINT + + //1km以内，SNR小于20dB的临时航迹不转为可靠航迹 + bool snr_flag = true; + + for(int p_idx = 0; p_idx < L; p_idx++){ + if((*Iter)[p_idx].r < 1000 && (*Iter)[p_idx].snr < 20){ + snr_flag = false; + break; + } + } + + if( ( L==Work_Parameter.track_start_point_num)&& track_init_prohibit(range,azi,Work_Parameter)==0 && snr_flag) //按长度查找TRUST_TRACK_POINT { //加入Track_to_start中 Track_to_start.push_back(QVector ()); for (int i = 0; ierase(Iter); Iter=temp_track->begin();