Merge branch 'fix' into feature
This commit is contained in:
@@ -201,11 +201,11 @@
|
|||||||
|
|
||||||
#define TRACK_DIE_ROUND 6 // 航迹消亡圈数
|
#define TRACK_DIE_ROUND 6 // 航迹消亡圈数
|
||||||
#define TRACK_DIE_ROUND_PRIMARY 10 // 重点航迹消亡圈数
|
#define TRACK_DIE_ROUND_PRIMARY 10 // 重点航迹消亡圈数
|
||||||
#define TRACK_DIE_ROUND_TAS 10 //TAS航迹消亡圈数
|
#define TRACK_DIE_ROUND_TAS 20 //TAS航迹消亡圈数
|
||||||
|
|
||||||
#define ASSO_THORD 4
|
#define ASSO_THORD 4
|
||||||
|
|
||||||
#define H_F_WIN_LEN 3
|
#define H_F_WIN_LEN 6
|
||||||
|
|
||||||
#define TAS_QUEUE_LENGTH 4 //Tas调用的cpi数
|
#define TAS_QUEUE_LENGTH 4 //Tas调用的cpi数
|
||||||
#define MAX_TAS_NUM 4
|
#define MAX_TAS_NUM 4
|
||||||
|
|||||||
@@ -794,19 +794,19 @@ void Track_Asso_Tas::track_hight_update(int tas_
|
|||||||
int height_win_length;
|
int height_win_length;
|
||||||
if((*trust_track)[i].range_point <= 1000)
|
if((*trust_track)[i].range_point <= 1000)
|
||||||
{
|
{
|
||||||
height_win_length = H_F_WIN_LEN+2;
|
height_win_length = H_F_WIN_LEN+6;
|
||||||
}
|
}
|
||||||
else if((*trust_track)[i].range_point <= 2000 && (*trust_track)[i].range_point > 1000)
|
else if((*trust_track)[i].range_point <= 2000 && (*trust_track)[i].range_point > 1000)
|
||||||
{
|
{
|
||||||
height_win_length = H_F_WIN_LEN+3;
|
height_win_length = H_F_WIN_LEN+8;
|
||||||
}
|
}
|
||||||
else if((*trust_track)[i].range_point <= 4000 && (*trust_track)[i].range_point > 2000)
|
else if((*trust_track)[i].range_point <= 4000 && (*trust_track)[i].range_point > 2000)
|
||||||
{
|
{
|
||||||
height_win_length = H_F_WIN_LEN+4;
|
height_win_length = H_F_WIN_LEN+10;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
height_win_length = H_F_WIN_LEN+6;
|
height_win_length = H_F_WIN_LEN+12;
|
||||||
}
|
}
|
||||||
|
|
||||||
double sum=0;
|
double sum=0;
|
||||||
|
|||||||
Reference in New Issue
Block a user