Browse Source

change gps_typ.h. for add road width.

yuchuli 4 years ago
parent
commit
49ddf90ddc

+ 1 - 1
include/common.pri

@@ -1,6 +1,6 @@
 
 INCLUDEPATH += $$PWD/../include/
-LIBS += -L$$PWD/../bin/ -lxmlparam -lmodulecomm -livbacktrace -livlog -livfault -livexit
+LIBS += -L$$PWD/../bin/ -lxmlparam -lmodulecomm  -livlog -livfault -livexit -livbacktrace
 
 
 unix:LIBS += -lboost_system  -lbacktrace -ldl

+ 3 - 1
src/decition/common/common/gps_type.h

@@ -44,13 +44,15 @@ namespace iv {
 
         int speed_mode = 0;
         int mode2 = 0;
-        double speed = 0;			//速度  若导航点则为导航预设速度  若为当前点则为当前车速
+        double speed = 3.5;			//速度  若导航点则为导航预设速度  若为当前点则为当前车速
 
         int roadMode;
         int runMode;
         int roadSum;
         int roadOri;
 
+        double mfRoadWidth = 3.5; // Current Road Width
+
 
 
     };

+ 2 - 0
src/decition/common/common_sf/gps_type.h

@@ -51,6 +51,8 @@ namespace iv {
         int roadSum;
         int roadOri;
 
+	double mfRoadWidth = 3.5; // Current Road Width
+
 
 
     };

+ 2 - 0
src/decition/decition_external/gps_type.h

@@ -51,6 +51,8 @@ namespace iv {
         int roadSum;
         int roadOri;
 
+	double mfRoadWidth = 3.5; // Current Road Width
+
 
 
     };

+ 2 - 0
src/detection/detection_ndt_slam_hcp2/common/gps_type.h

@@ -51,6 +51,8 @@ struct GPS_INS
     int roadSum;
     int roadOri;
 
+	double mfRoadWidth = 3.5; // Current Road Width
+
 
 
 };

+ 2 - 0
src/driver/driver_map_trace/gps_type.h

@@ -51,6 +51,8 @@ namespace iv {
         int roadSum;
         int roadOri;
 
+        double mfRoadWidth = 3.5; // Current Road Width
+
 
 
     };

+ 2 - 0
src/driver/driver_map_xodrload/gps_type.h

@@ -51,6 +51,8 @@ namespace iv {
         int roadSum;
         int roadOri;
 
+	double mfRoadWidth = 3.5; // Current Road Width
+
 
 
     };

+ 2 - 0
src/driver/driver_radio_collision/gps_type.h

@@ -50,6 +50,8 @@ struct GPS_INS
     int runMode;
     int roadSum;
     int roadOri;
+	
+	double mfRoadWidth = 3.5; // Current Road Width
 };
 
 typedef boost::shared_ptr<iv::GPS_INS> GPSData;

+ 2 - 0
src/driver/driver_radio_p900/gps_type.h

@@ -50,6 +50,8 @@ struct GPS_INS
     int runMode;
     int roadSum;
     int roadOri;
+
+	double mfRoadWidth = 3.5; // Current Road Width
 };
 
 typedef boost::shared_ptr<iv::GPS_INS> GPSData;

+ 2 - 0
src/tool/data_serials/gps_type.h

@@ -51,6 +51,8 @@ struct GPS_INS
     int roadSum;
     int roadOri;
 
+	double mfRoadWidth = 3.5; // Current Road Width
+
 
 
 };

+ 2 - 0
src/tool/ivmapmake/common/gps_type.h

@@ -51,6 +51,8 @@ namespace iv {
         int roadSum;
         int roadOri;
 
+	double mfRoadWidth = 3.5; // Current Road Width
+
 
 
     };

+ 2 - 0
src/tool/ivmapmake_sharemem/common/gps_type.h

@@ -51,6 +51,8 @@ namespace iv {
         int roadSum;
         int roadOri;
 
+	double mfRoadWidth = 3.5; // Current Road Width
+
 
 
     };

+ 2 - 0
src/tool/map_lanetoxodr/gps_type.h

@@ -51,6 +51,8 @@ namespace iv {
         int roadSum;
         int roadOri;
 
+	double mfRoadWidth = 3.5; // Current Road Width
+
 
 
     };

+ 2 - 0
src/tool/map_lanetoxodr_graphscene/gps_type.h

@@ -51,6 +51,8 @@ namespace iv {
         int roadSum;
         int roadOri;
 
+	double mfRoadWidth = 3.5; // Current Road Width
+
 
 
     };

+ 2 - 0
src/tool/tool_mapcreate/gps_type.h

@@ -51,6 +51,8 @@ namespace iv {
         int roadSum;
         int roadOri;
 
+	double mfRoadWidth = 3.5; // Current Road Width
+
 
 
     };

+ 2 - 0
src/tool/tool_xodrobj/gps_type.h

@@ -51,6 +51,8 @@ namespace iv {
         int roadSum;
         int roadOri;
 
+	double mfRoadWidth = 3.5; // Current Road Width
+
 
 
     };

+ 2 - 0
src/tool/tracetoxodr/gps_type.h

@@ -51,6 +51,8 @@ namespace iv {
         int roadSum;
         int roadOri;
 
+	double mfRoadWidth = 3.5; // Current Road Width
+
 
 
     };

+ 2 - 0
src/ui/ui_ads_hmi/common/gps_type.h

@@ -51,6 +51,8 @@ struct GPS_INS
     int roadSum;
     int roadOri;
 
+	double mfRoadWidth = 3.5; // Current Road Width
+
 
 
 };

+ 2 - 0
src/v2x/platform/common/gps_type.h

@@ -51,6 +51,8 @@ namespace iv {
         int roadSum;
         int roadOri;
 
+	double mfRoadWidth = 3.5; // Current Road Width
+
 
 
     };