From 03f5908f3d6b10567235da4b67277eb2e0c19fd4 Mon Sep 17 00:00:00 2001
From: fctom1215 <fctom1215@outlook.com>
Date: 星期一, 27 七月 2020 18:24:33 +0800
Subject: [PATCH] 坐标
---
lib/src/main/cpp/test_items2/road_exam.cpp | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/lib/src/main/cpp/test_items2/road_exam.cpp b/lib/src/main/cpp/test_items2/road_exam.cpp
index 1b77684..d67d5f2 100644
--- a/lib/src/main/cpp/test_items2/road_exam.cpp
+++ b/lib/src/main/cpp/test_items2/road_exam.cpp
@@ -710,13 +710,13 @@
int laneDirect = 0;
if (CurrentLane.lane > lane.lane) {
- laneDirect = 1;
- } else {
laneDirect = -1;
+ } else {
+ laneDirect = 1;
}
if (diff < CHANGE_LANE_MIN_INTERVAL && laneDirect == changeLaneDirect) {
- DEBUG("===================== 杩炵画鍙橀亾 ============!!");
+ DEBUG("===================== 杩炵画鍙橀亾 %d -> %d ============", CurrentLane.lane, lane.lane);
// 杩炵画鍙橀亾锛屼笉鍚堟牸
AddExamFault(15, rtkTime);
}
@@ -769,7 +769,7 @@
}
} else {
// 鍙橀亾瀹屾垚
- DEBUG("鍙橀亾瀹屾垚");
+ DEBUG("鍙橀亾瀹屾垚 %d -> %d", CurrentLane.lane, lane.lane);
if (currRoadItem != NULL && currRoadItem->active == ROAD_ITEM_CHANGE_LANE) {
DEBUG("鍙樻洿杞﹂亾椤圭洰瀹屾垚");
@@ -1612,7 +1612,7 @@
}
}
// 浜鸿閬撱�佸叕浜ょ珯鍒硅溅鐐癸紱瀛︽牎闄愰�熷尯
- DEBUG("琛ュ叏鐗规畩鍖哄煙 size = %d", map.specialAreas.size());
+// DEBUG("琛ュ叏鐗规畩鍖哄煙 size = %d", map.specialAreas.size());
for (int i = 0; i < map.specialAreas.size(); i++) {
if (map.specialAreas[i].type == GRID_AREA)
continue;
@@ -1626,17 +1626,17 @@
}
PointF vPoint = GetSELine(map.roads[road].leftEdge, map.specialAreas[i].area[0]);
- DEBUG("璁＄畻鍨傜偣1 (%f, %f)", vPoint.X, vPoint.Y);
+// DEBUG("璁＄畻鍨傜偣1 (%f, %f)", vPoint.X, vPoint.Y);
map.specialAreas[i].leftPoints.push_back(vPoint);
- vPoint = GetSELine(map.roads[road].leftEdge, map.specialAreas[i].area[0]);
- DEBUG("璁＄畻鍨傜偣2 (%f, %f)", vPoint.X, vPoint.Y);
+ vPoint = GetSELine(map.roads[road].leftEdge, map.specialAreas[i].area[1]);
+// DEBUG("璁＄畻鍨傜偣2 (%f, %f)", vPoint.X, vPoint.Y);
map.specialAreas[i].leftPoints.push_back(vPoint);
}
if (map.specialAreas[i].type == ZEBRA_CROSSING || map.specialAreas[i].type == BUS_STATION_AREA) {
- DEBUG("鏂戦┈绾�");
+// DEBUG("鏂戦┈绾�");
Line startLine;
MakeLine(&startLine, &map.specialAreas[i].area[0], &map.specialAreas[i].leftPoints[0]);
@@ -1667,7 +1667,7 @@
}
} else if (map.specialAreas[i].type == SCHOOL_AREA) {
Polygon school;
- DEBUG("瀛︽牎");
+// DEBUG("瀛︽牎");
school.num = 4;
school.point = (PointF *) malloc(school.num * sizeof(PointF));
@@ -1689,7 +1689,7 @@
free(school.point);
}
}
- DEBUG("琛ュ叏鐗规畩鍖哄煙 over");
+// DEBUG("琛ュ叏鐗规畩鍖哄煙 over");
}
#if 0
--
Gitblit v1.8.0