From f1ff7e339eca91b114497d3e847fa1fc33baccc4 Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期一, 21 九月 2020 10:58:58 +0800
Subject: [PATCH] 坐标
---
lib/src/main/cpp/test_items2/road_exam.cpp | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/lib/src/main/cpp/test_items2/road_exam.cpp b/lib/src/main/cpp/test_items2/road_exam.cpp
index 8a1c97f..0a3f627 100644
--- a/lib/src/main/cpp/test_items2/road_exam.cpp
+++ b/lib/src/main/cpp/test_items2/road_exam.cpp
@@ -1012,13 +1012,18 @@
return CROSSING_NOT_HINT;
}
-static void ResetCrossingStatus(int roadIndex)
+/*****************************************************
+ * 浠ユ甯搁�氳繃璺彛鎴栬嚜鐢遍┚椹剁寮�璺鍚�
+ * @param roadIndex
+ */
+static void ResetCrossingStatus(road_exam_map &RoadMap, int roadIndex)
{
while (true) {
bool w = false;
for (auto it = CrossingHint.begin(); it != CrossingHint.end(); ++it) {
if (it->first / 100 == roadIndex && it->second != CROSSING_NOT_HINT) {
ChangeCrossingStatus(it->first / 100, it->first % 100, CROSSING_NOT_HINT);
+ CrossingChange(RoadMap.roads[roadIndex].id, it->first % 100, 0);
w = true;
break;
}
@@ -1485,9 +1490,8 @@
DEBUG("閬撹矾ID鍒囨崲 %d ======> %d", oldid, currExamMapIndex);
if (oldid >= 0) {
- ResetCrossingStatus(oldid);
+ ResetCrossingStatus(RoadMap, oldid);
ResetErrorLaneRpt(oldid);
-
}
if (RoadMap.calibrate) {
@@ -1705,6 +1709,14 @@
}
}
+/*******************************************************************
+ * 杞﹁締瓒婅繃鍋滄绾跨殑鏂瑰紡閫氳繃璺彛
+ * @param RoadMap
+ * @param road
+ * @param stop_line
+ * @param active
+ * @param car
+ */
void CrossRoadCallback(road_exam_map &RoadMap, int road, int stop_line, int active, const car_model *car)
{
if (RoadMap.calibrate) {
--
Gitblit v1.8.0