更新:1、修复全部C4819 / C4018 / C4244警告;
2、更新项目文档;
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
#include "dot_coh.h"
|
||||
#include "dot_coh.h"
|
||||
#include <cmath>
|
||||
#include <cstring>
|
||||
#include <vector>
|
||||
@@ -16,18 +16,18 @@ int Dot_Coh::dot_coh_process(std::vector <PointRecv> *data_input,
|
||||
{
|
||||
if( (*data_input)[loop_of_point].Use_Flag!=1)
|
||||
{
|
||||
float point_0_R=(*data_input)[loop_of_point].Range;
|
||||
float point_0_V=(*data_input)[loop_of_point].Velocity;
|
||||
float point_0_F=(*data_input)[loop_of_point].Azimuth;
|
||||
float point_0_A=(*data_input)[loop_of_point].Amplitude;
|
||||
float point_0_R=static_cast<float>((*data_input)[loop_of_point].Range);
|
||||
float point_0_V=static_cast<float>((*data_input)[loop_of_point].Velocity);
|
||||
float point_0_F=static_cast<float>((*data_input)[loop_of_point].Azimuth);
|
||||
float point_0_A=static_cast<float>((*data_input)[loop_of_point].Amplitude);
|
||||
for (unsigned int i=loop_of_point+1;i<data_input->size();i++)
|
||||
{
|
||||
if((*data_input)[loop_of_point].Use_Flag!=1 && (*data_input)[i].Use_Flag!=1)
|
||||
{
|
||||
float point_1_R=(*data_input)[i].Range;
|
||||
float point_1_V=(*data_input)[i].Velocity;
|
||||
float point_1_F=(*data_input)[i].Azimuth;
|
||||
float point_1_A=(*data_input)[i].Amplitude;
|
||||
float point_1_R=static_cast<float>((*data_input)[i].Range);
|
||||
float point_1_V=static_cast<float>((*data_input)[i].Velocity);
|
||||
float point_1_F=static_cast<float>((*data_input)[i].Azimuth);
|
||||
float point_1_A=static_cast<float>((*data_input)[i].Amplitude);
|
||||
|
||||
//凝聚条件: 距离、方位接近
|
||||
if(Work_Parameter.work_mode == 0)
|
||||
@@ -36,10 +36,10 @@ int Dot_Coh::dot_coh_process(std::vector <PointRecv> *data_input,
|
||||
if( (fabs(point_0_R-point_1_R)<=DOT_COH_RANGE && delta_F <=DOT_COH_AZI/180.0*PI && fabs(point_0_V-point_1_V)<=DOT_COH_V)//
|
||||
&& point_0_A <point_1_A )//
|
||||
{
|
||||
point_0_R=(*data_input)[i].Range;
|
||||
point_0_V=(*data_input)[i].Velocity;
|
||||
point_0_A=(*data_input)[i].Amplitude;
|
||||
point_0_F=(*data_input)[i].Azimuth;
|
||||
point_0_R=static_cast<float>((*data_input)[i].Range);
|
||||
point_0_V=static_cast<float>((*data_input)[i].Velocity);
|
||||
point_0_A=static_cast<float>((*data_input)[i].Amplitude);
|
||||
point_0_F=static_cast<float>((*data_input)[i].Azimuth);
|
||||
(*data_input)[loop_of_point].Use_Flag=1;
|
||||
}
|
||||
else if( (fabs(point_0_R-point_1_R)<=DOT_COH_RANGE && delta_F <=DOT_COH_AZI/180.0*PI && fabs(point_0_V-point_1_V)<=DOT_COH_V)//
|
||||
@@ -54,10 +54,10 @@ int Dot_Coh::dot_coh_process(std::vector <PointRecv> *data_input,
|
||||
if( (fabs(point_0_R-point_1_R)<=DOT_COH_RANGE && delta_F <=DOT_COH_AZI/180.0*PI )//
|
||||
&& point_0_A <point_1_A )//
|
||||
{
|
||||
point_0_R=(*data_input)[i].Range;
|
||||
point_0_V=(*data_input)[i].Velocity;
|
||||
point_0_A=(*data_input)[i].Amplitude;
|
||||
point_0_F=(*data_input)[i].Azimuth;
|
||||
point_0_R=static_cast<float>((*data_input)[i].Range);
|
||||
point_0_V=static_cast<float>((*data_input)[i].Velocity);
|
||||
point_0_A=static_cast<float>((*data_input)[i].Amplitude);
|
||||
point_0_F=static_cast<float>((*data_input)[i].Azimuth);
|
||||
(*data_input)[loop_of_point].Use_Flag=1;
|
||||
}
|
||||
else if( (fabs(point_0_R-point_1_R)<=DOT_COH_RANGE && delta_F <=DOT_COH_AZI/180.0*PI )//
|
||||
@@ -88,7 +88,7 @@ int Dot_Coh::dot_coh_process(std::vector <PointRecv> *data_input,
|
||||
}
|
||||
}
|
||||
|
||||
for (int i=0;i<data_input->size();i++) //data_buffer_2 ---> point_recv
|
||||
for (size_t i=0;i<data_input->size();i++) //data_buffer_2 ---> point_recv
|
||||
{
|
||||
(*point_recv).push_back((*data_input)[i]);
|
||||
}
|
||||
@@ -106,20 +106,20 @@ int Dot_Coh::dot_coh_process_buff( std::vector <PointRecv> *data_input,
|
||||
|
||||
//1.1 data_input、data_input_buff中的数据放在一起
|
||||
std::vector <PointRecv> data_tmp;
|
||||
for (int i=0;i<data_input_buff.size();i++)
|
||||
for (size_t i=0;i<data_input_buff.size();i++)
|
||||
{
|
||||
data_tmp.push_back(data_input_buff[i]);
|
||||
data_tmp[data_tmp.size()-1].point_section_asso = 1;
|
||||
|
||||
}
|
||||
|
||||
for (int i=0;i<data_input->size();i++)
|
||||
for (size_t i=0;i<data_input->size();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;i<data_input->size();i++)
|
||||
// for (size_t i=0;i<data_input->size();i++)
|
||||
// {
|
||||
// if((*data_input)[i].Range > 1000 || (*data_input)[i].snr >= 20){
|
||||
// data_tmp.push_back((*data_input)[i]);
|
||||
@@ -140,18 +140,18 @@ int Dot_Coh::dot_coh_process_buff( std::vector <PointRecv> *data_input,
|
||||
{
|
||||
if( data_tmp[loop_of_point].Use_Flag!=1)
|
||||
{
|
||||
float point_0_R=data_tmp[loop_of_point].Range;
|
||||
float point_0_V=data_tmp[loop_of_point].Velocity;
|
||||
float point_0_F=data_tmp[loop_of_point].Azimuth;
|
||||
float point_0_A=data_tmp[loop_of_point].Amplitude;
|
||||
float point_0_R=static_cast<float>(data_tmp[loop_of_point].Range);
|
||||
float point_0_V=static_cast<float>(data_tmp[loop_of_point].Velocity);
|
||||
float point_0_F=static_cast<float>(data_tmp[loop_of_point].Azimuth);
|
||||
float point_0_A=static_cast<float>(data_tmp[loop_of_point].Amplitude);
|
||||
for (unsigned int i=loop_of_point+1;i<data_tmp.size();i++)
|
||||
{
|
||||
if(data_tmp[loop_of_point].Use_Flag!=1 && data_tmp[i].Use_Flag!=1)
|
||||
{
|
||||
float point_1_R=data_tmp[i].Range;
|
||||
float point_1_V=data_tmp[i].Velocity;
|
||||
float point_1_F=data_tmp[i].Azimuth;
|
||||
float point_1_A=data_tmp[i].Amplitude;
|
||||
float point_1_R=static_cast<float>(data_tmp[i].Range);
|
||||
float point_1_V=static_cast<float>(data_tmp[i].Velocity);
|
||||
float point_1_F=static_cast<float>(data_tmp[i].Azimuth);
|
||||
float point_1_A=static_cast<float>(data_tmp[i].Amplitude);
|
||||
|
||||
//凝聚条件: 距离、方位接近
|
||||
if(Work_Parameter.work_mode == 0)
|
||||
@@ -160,10 +160,10 @@ int Dot_Coh::dot_coh_process_buff( std::vector <PointRecv> *data_input,
|
||||
if( (fabs(point_0_R-point_1_R)<=DOT_COH_RANGE && delta_F <=DOT_COH_AZI/180.0*PI && fabs(point_0_V-point_1_V)<=DOT_COH_V)//
|
||||
&& point_0_A <point_1_A )//
|
||||
{
|
||||
point_0_R=data_tmp[i].Range;
|
||||
point_0_V=data_tmp[i].Velocity;
|
||||
point_0_A=data_tmp[i].Amplitude;
|
||||
point_0_F=data_tmp[i].Azimuth;
|
||||
point_0_R=static_cast<float>(data_tmp[i].Range);
|
||||
point_0_V=static_cast<float>(data_tmp[i].Velocity);
|
||||
point_0_A=static_cast<float>(data_tmp[i].Amplitude);
|
||||
point_0_F=static_cast<float>(data_tmp[i].Azimuth);
|
||||
data_tmp[loop_of_point].Use_Flag=1;
|
||||
}
|
||||
else if( (fabs(point_0_R-point_1_R)<=DOT_COH_RANGE && delta_F <=DOT_COH_AZI/180.0*PI && fabs(point_0_V-point_1_V)<=DOT_COH_V)//
|
||||
@@ -178,10 +178,10 @@ int Dot_Coh::dot_coh_process_buff( std::vector <PointRecv> *data_input,
|
||||
if( (fabs(point_0_R-point_1_R)<=DOT_COH_RANGE && delta_F <=DOT_COH_AZI/180.0*PI )//
|
||||
&& point_0_A <point_1_A )//
|
||||
{
|
||||
point_0_R=data_tmp[i].Range;
|
||||
point_0_V=data_tmp[i].Velocity;
|
||||
point_0_A=data_tmp[i].Amplitude;
|
||||
point_0_F=data_tmp[i].Azimuth;
|
||||
point_0_R=static_cast<float>(data_tmp[i].Range);
|
||||
point_0_V=static_cast<float>(data_tmp[i].Velocity);
|
||||
point_0_A=static_cast<float>(data_tmp[i].Amplitude);
|
||||
point_0_F=static_cast<float>(data_tmp[i].Azimuth);
|
||||
data_tmp[loop_of_point].Use_Flag=1;
|
||||
}
|
||||
else if( (fabs(point_0_R-point_1_R)<=DOT_COH_RANGE && delta_F <=DOT_COH_AZI/180.0*PI )//
|
||||
@@ -213,7 +213,7 @@ int Dot_Coh::dot_coh_process_buff( std::vector <PointRecv> *data_input,
|
||||
}
|
||||
|
||||
//1.5 将data_tmp中凝聚后的点再分到 data_input_buff和data_input中
|
||||
for (int i=0;i<data_tmp.size();i++)
|
||||
for (size_t i=0;i<data_tmp.size();i++)
|
||||
{
|
||||
if(data_tmp[i].point_section_asso==1)
|
||||
{
|
||||
@@ -229,7 +229,7 @@ int Dot_Coh::dot_coh_process_buff( std::vector <PointRecv> *data_input,
|
||||
|
||||
//2.data_input_buff数据输出给point_recv
|
||||
|
||||
for (int i=0;i<data_input_buff.size();i++)
|
||||
for (size_t i=0;i<data_input_buff.size();i++)
|
||||
{
|
||||
(*point_recv).push_back(data_input_buff[i]);
|
||||
}
|
||||
@@ -237,7 +237,7 @@ int Dot_Coh::dot_coh_process_buff( std::vector <PointRecv> *data_input,
|
||||
std::vector<PointRecv>().swap(data_input_buff);
|
||||
|
||||
//3.data_input数据输出给data_input_buff
|
||||
for (int i=0;i<data_input->size();i++)
|
||||
for (size_t i=0;i<data_input->size();i++)
|
||||
{
|
||||
data_input_buff.push_back((*data_input)[i]);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user