From 59abff0d03403344619420aa0bcd9c2b28ff3522 Mon Sep 17 00:00:00 2001 From: yy1717 <fctom1215@outlook.com> Date: 星期三, 08 四月 2020 11:06:58 +0800 Subject: [PATCH] 坐标 --- lib/src/main/cpp/driver_test.h | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/lib/src/main/cpp/driver_test.h b/lib/src/main/cpp/driver_test.h index 0cc5aa0..acdb6c2 100644 --- a/lib/src/main/cpp/driver_test.h +++ b/lib/src/main/cpp/driver_test.h @@ -5,7 +5,7 @@ #ifndef RTKDRIVERTEST_DRIVER_TEST_H #define RTKDRIVERTEST_DRIVER_TEST_H -#include "Geometry.h" +#include "test_common/Geometry.h" #include "rtk_module/rtk.h" #include "test_items2/dummy_light.h" @@ -125,14 +125,26 @@ typedef vector<struct road_exam_map> LIST_ROAD_MAP; +struct area_exam_map { + int id; + int type; + Polygon map; + Polygon map2; +}; + +typedef vector<struct area_exam_map> LIST_AREA_MAP; + typedef list<car_model *> LIST_CAR_MODEL; //vector<ExamFault> ExamFaultList; void DriverTestInit(void); void ReadDriverExamPrimer(void); -void ClearMap(void); -void AddMap(int id, int type, const double (*map)[2], int pointNum, const double (*map2)[2], int pointNum2); + +void ClearAreaMap(void); +void AddAreaMap(int id, int type, const double (*map)[2], int pointNum, const double (*map2)[2], int pointNum2); + + void CleanRoadMap(void); void SetRoadMapPoints(vector<double> &mapPoints); void AddRoadMapParent(int id, int type, string tts, int stopFlag, vector<vector<int>> &redLines, @@ -145,11 +157,10 @@ int *body, int bodyNum, double (*point)[2], int pointNum, double antPitch, double antHeight, double groundHeight); void StartDriverExam(int start, int type); -void StartMapExam(int map_id, int exam); void UpdateRTKInfo(const rtk_info *s); void AddExamFault(int wrong, const struct RtkTime *rtkTime); -car_model_cache_t *GetCarModelCache(int node); + void SystemShutdown(int event, int timeout); void SetDummyLightExam(int n, struct dummy_light_exam *cfg);; -- Gitblit v1.8.0