Merge branch 'feature'
This commit is contained in:
@@ -964,11 +964,11 @@ YLT_REFL(RdpRecPointCohesionTAS, id,point_id,frame_id,circle_id,range,azimuth, v
|
|||||||
RDP_RECORD_DEFINE(RdpRecPointCohesionTAS);
|
RDP_RECORD_DEFINE(RdpRecPointCohesionTAS);
|
||||||
|
|
||||||
//临时航迹
|
//临时航迹
|
||||||
YLT_REFL(RdpRecTempTrack, id, temp_track_id,point_id,circle_id,X,P,r,azi,vr,height,SNR,RCS,amplitude, CPI_time,GNSS_time,d,buff_round,temp_track_section_idx,asso_flag,pitch_num);
|
YLT_REFL(RdpRecTempTrack, id, temp_track_id,point_id,circle_id,X,P,r,azi,vr,height,SNR,RCS,amplitude, quality, CPI_time,GNSS_time,d,buff_round,temp_track_section_idx,asso_flag,pitch_num);
|
||||||
RDP_RECORD_DEFINE(RdpRecTempTrack);
|
RDP_RECORD_DEFINE(RdpRecTempTrack);
|
||||||
|
|
||||||
//可靠航迹
|
//可靠航迹
|
||||||
YLT_REFL(RdpRecTrustTrack, id,track_id,point_id,circle_id,Track_Index,Range,Azimuth,Elevation,Velocity,Amplitude,Height,T_track,GNSS_time,Track_Sum,Point_Index,Track_Mode,
|
YLT_REFL(RdpRecTrustTrack, id,track_id,point_id,circle_id,Track_Index,Range,Azimuth,Elevation,Velocity,Amplitude,Height,Quality,T_track,GNSS_time,Track_Sum,Unupdated_time,Point_Index,Point_sum,Valid_point_sum,Track_Mode,
|
||||||
Track_Update_Flag,Extrapolate_round,point_flag,approach_flag,manual_delete_flag,manual_tracking_flag,
|
Track_Update_Flag,Extrapolate_round,point_flag,approach_flag,manual_delete_flag,manual_tracking_flag,
|
||||||
associate_point_number,primary_target_flag,Target_Type,Track_section_idx,
|
associate_point_number,primary_target_flag,Target_Type,Track_section_idx,
|
||||||
range_point,azi_point,elev_point,vr_point,prf_point,point_type,snr_point,
|
range_point,azi_point,elev_point,vr_point,prf_point,point_type,snr_point,
|
||||||
|
|||||||
@@ -225,7 +225,7 @@ struct RdpRecPointCohesionTAS
|
|||||||
};
|
};
|
||||||
RDP_RECORD_DECLARE(RdpRecPointCohesionTAS);
|
RDP_RECORD_DECLARE(RdpRecPointCohesionTAS);
|
||||||
|
|
||||||
// 零时航迹
|
// 临时航迹
|
||||||
struct RdpRecTempTrack
|
struct RdpRecTempTrack
|
||||||
{
|
{
|
||||||
int64_t id; //自增主键(写入时固定填 0)
|
int64_t id; //自增主键(写入时固定填 0)
|
||||||
@@ -243,6 +243,7 @@ struct RdpRecTempTrack
|
|||||||
double SNR; //信噪比
|
double SNR; //信噪比
|
||||||
double RCS; //RCS
|
double RCS; //RCS
|
||||||
double amplitude; //幅度
|
double amplitude; //幅度
|
||||||
|
double quality; //航迹质量
|
||||||
long long CPI_time; //时间戳
|
long long CPI_time; //时间戳
|
||||||
long long GNSS_time; //GNSS时间戳
|
long long GNSS_time; //GNSS时间戳
|
||||||
double d; //关联上的点的d(马氏距离)
|
double d; //关联上的点的d(马氏距离)
|
||||||
@@ -269,6 +270,7 @@ struct RdpRecTempTrack
|
|||||||
RCS = p.RCS;
|
RCS = p.RCS;
|
||||||
SNR = p.SNR;
|
SNR = p.SNR;
|
||||||
amplitude = p.amplitude;
|
amplitude = p.amplitude;
|
||||||
|
quality = p.quality;
|
||||||
CPI_time = p.CPI_time;
|
CPI_time = p.CPI_time;
|
||||||
GNSS_time = p.GNSS_time;
|
GNSS_time = p.GNSS_time;
|
||||||
d = p.d;
|
d = p.d;
|
||||||
@@ -294,10 +296,14 @@ struct RdpRecTrustTrack
|
|||||||
double Velocity; //航向速度
|
double Velocity; //航向速度
|
||||||
double Amplitude; //幅度
|
double Amplitude; //幅度
|
||||||
double Height; //高度
|
double Height; //高度
|
||||||
|
double Quality; //航迹质量
|
||||||
long long T_track; //航迹时间
|
long long T_track; //航迹时间
|
||||||
long long GNSS_time; //GNSS时间
|
long long GNSS_time; //GNSS时间
|
||||||
|
long long Unupdated_time; //航迹未更新时间
|
||||||
int Track_Sum; //航迹总数
|
int Track_Sum; //航迹总数
|
||||||
int Point_Index; //该航迹上的第几个点
|
int Point_Index; //该航迹上的第几个点
|
||||||
|
int Point_sum; //本条航迹更新点的数目
|
||||||
|
int Valid_point_sum; //本条航迹有效点的数目
|
||||||
int Track_Mode; //跟踪模式
|
int Track_Mode; //跟踪模式
|
||||||
int Track_Update_Flag; //航迹更新标志 1已更新/0未更新
|
int Track_Update_Flag; //航迹更新标志 1已更新/0未更新
|
||||||
int Extrapolate_round; //航迹持续外推时间
|
int Extrapolate_round; //航迹持续外推时间
|
||||||
@@ -347,10 +353,14 @@ struct RdpRecTrustTrack
|
|||||||
Velocity = p.Velocity;
|
Velocity = p.Velocity;
|
||||||
Amplitude = p.Amplitude;
|
Amplitude = p.Amplitude;
|
||||||
Height = p.Height;
|
Height = p.Height;
|
||||||
|
Quality = p.Quality;
|
||||||
T_track = p.T_track;
|
T_track = p.T_track;
|
||||||
GNSS_time = p.GNSS_time;
|
GNSS_time = p.GNSS_time;
|
||||||
Track_Sum = p.Track_Sum;
|
Track_Sum = p.Track_Sum;
|
||||||
|
Unupdated_time = p.Unupdated_time;
|
||||||
Point_Index = p.Point_Index;
|
Point_Index = p.Point_Index;
|
||||||
|
Point_sum = p.Point_sum;
|
||||||
|
Valid_point_sum = p.Valid_point_sum;
|
||||||
Track_Mode = p.Track_Mode;
|
Track_Mode = p.Track_Mode;
|
||||||
Track_Update_Flag = p.Track_Update_Flag;
|
Track_Update_Flag = p.Track_Update_Flag;
|
||||||
Extrapolate_round = p.Extrapolate_round;
|
Extrapolate_round = p.Extrapolate_round;
|
||||||
|
|||||||
Reference in New Issue
Block a user