From 46f56f26bfcc6ce26ffd8132ee11bf019eef3289 Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期一, 13 四月 2020 11:48:28 +0800
Subject: [PATCH] 计算边距
---
lib/src/main/cpp/test_items/stop_and_start.cpp | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/lib/src/main/cpp/test_items/stop_and_start.cpp b/lib/src/main/cpp/test_items/stop_and_start.cpp
index 3b904d6..81e1b92 100644
--- a/lib/src/main/cpp/test_items/stop_and_start.cpp
+++ b/lib/src/main/cpp/test_items/stop_and_start.cpp
@@ -13,6 +13,7 @@
#include "../utils/xconvert.h"
#include "../test_common/car_sensor.h"
#include "../master/comm_if.h"
+#include "area_exam.h"
#define DEBUG(fmt, args...) LOGD("<stop_and_start> <%s>: " fmt, __func__, ##args)
@@ -87,10 +88,16 @@
testing = false;
}
+ // 璺濈妫�娴�
{
- double dis2 = DistanceOfTire2Edge(map, car);
+ vector<double> dtox;
+ vector<Line> line_set;
+ Line distance_line;
- MA_SendDistance(DistanceOf(map->point[8], map->point[7]) - dis2, dis2);
+ MakeLine(&distance_line, &map->point[0], &map->point[8]);
+ line_set.push_back(distance_line);
+ DistanceOfTire2X(dtox, car, line_set);
+ MA_SendDistance(dtox[0], dtox[1]);
}
if (prevMoveDirect != moveDirect) {
--
Gitblit v1.8.0