From 354887bf074190d4007890c3912d6ae0511ec3c6 Mon Sep 17 00:00:00 2001
From: fctom1215 <fctom1215@outlook.com>
Date: 星期日, 26 七月 2020 22:46:34 +0800
Subject: [PATCH] 坐标
---
lib/src/main/cpp/test_items2/road_exam.cpp | 10 +++++++---
1 files changed, 7 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 4b9a859..f0b3010 100644
--- a/lib/src/main/cpp/test_items2/road_exam.cpp
+++ b/lib/src/main/cpp/test_items2/road_exam.cpp
@@ -911,7 +911,7 @@
if (odoGraph > EXAM_RANGE && currRoadItem == NULL && AllCmp(RoadMap) && stopCar == STOP_CAR_NOT_DO) {
// 鍦ㄥ悎閫傛潯浠朵笅鍋滆溅缁撴潫鑰冭瘯
- StartStopCarExam("");
+ StartStopCarExam("璇烽潬杈瑰仠杞�");
stopCar = STOP_CAR_DOING;
} else if (stopCar == STOP_CAR_DOING) {
if (ExecuteStopCarExam(RoadMap.roads[currExamMapIndex], car, CarModelList, speed, moveDirect, rtkTime) < 0)
@@ -1932,7 +1932,7 @@
static trigger_line_t * EntryItem(int index, road_exam_map &RoadMap, const car_model *car, LIST_CAR_MODEL &CarModelList)
{
for (int i = 0; i < RoadMap.triggerLines.size(); ++i) {
- if (RoadMap.triggerLines[i].road == RoadMap.roads[index].id) {
+ /*if (RoadMap.triggerLines[i].road == RoadMap.roads[index].id)*/ {
Line triggerLine;
if (RoadMap.triggerLines[i].leftPoints.size() != RoadMap.triggerLines[i].points.size()) {
@@ -1946,6 +1946,7 @@
MakeLine(&triggerLine, &RoadMap.triggerLines[i].points[0], &RoadMap.triggerLines[i].leftPoints[0]);
if (CrashTheLine(triggerLine, car, CarModelList)) {
+ DEBUG("瑙﹀彂椤圭洰 %d %s", RoadMap.triggerLines[i].active, RoadMap.triggerLines[i].tts.c_str());
return &RoadMap.triggerLines[i];
}
}
@@ -2035,6 +2036,7 @@
}
}
// 浜鸿閬撱�佸叕浜ょ珯鍒硅溅鐐癸紱瀛︽牎闄愰�熷尯
+ DEBUG("琛ュ叏鐗规畩鍖哄煙 size = %d", map.specialAreas.size());
for (int i = 0; i < map.specialAreas.size(); i++) {
if (map.specialAreas[i].type == GRID_AREA)
continue;
@@ -2058,6 +2060,7 @@
}
if (map.specialAreas[i].type == ZEBRA_CROSSING || map.specialAreas[i].type == BUS_STATION_AREA) {
+ DEBUG("鏂戦┈绾�");
Line startLine;
MakeLine(&startLine, &map.specialAreas[i].area[0], &map.specialAreas[i].leftPoints[0]);
@@ -2088,7 +2091,7 @@
}
} else if (map.specialAreas[i].type == SCHOOL_AREA) {
Polygon school;
-
+ DEBUG("瀛︽牎");
school.num = 4;
school.point = (PointF *) malloc(school.num * sizeof(PointF));
@@ -2110,6 +2113,7 @@
free(school.point);
}
}
+ DEBUG("琛ュ叏鐗规畩鍖哄煙 over");
}
#if 0
--
Gitblit v1.8.0