去掉自动转TAS的功能, 只能手动转TAS

Signed-off-by: Yang Jianchao <yangjianchao999@126.com>
This commit is contained in:
Yang Jianchao
2022-06-12 12:36:59 +08:00
parent 6008959338
commit 2b1293a123
2 changed files with 2 additions and 2 deletions
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.0.2, 2022-06-03T11:30:54. -->
<!-- Written by QtCreator 4.0.2, 2022-06-12T12:33:33. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
+1 -1
View File
@@ -61,7 +61,7 @@ void TAS_Ctrl::tas_target_add(QVector <QVector<Trust_Track>> *trust_track,
azi=azi/PI*180;
//进入跟踪的条件: 1.手动跟踪的目标 或 满足速度、距离、高度条件满足 关联点数大于2 2.不在禁止跟踪区域
if( ( (*trust_track)[i][k].manual_tracking_flag == 1|| (tas_auto_start( v, r, h, Work_Parameter)==1 && (*trust_track)[i][k].associate_point_number>=2))//
if( ( (*trust_track)[i][k].manual_tracking_flag == 1)//|| (tas_auto_start( v, r, h, Work_Parameter)==1 && (*trust_track)[i][k].associate_point_number>=2)
&& tas_target_num < MAX_TAS_NUM
&& (*trust_track)[i][k].Track_Mode == 0
&& tas_prohibite_area( r, azi, v, h, Work_Parameter) == 0)