Selaa lähdekoodia

change gps_type.h in ui_ads_hmi.

yuchuli 3 vuotta sitten
vanhempi
commit
a957920b49

+ 2 - 0
src/decition/decition_brain/decition/decide_gps_00.h

@@ -21,6 +21,8 @@
 #include "ivlog.h"
 #include <memory>
 
+#include "common/tracepointstation.h"
+
 namespace iv {
 namespace decition {
 //根据传感器传输来的信息作出决策

+ 17 - 14
src/ui/ui_ads_hmi/common/gps_type.h

@@ -80,24 +80,27 @@ namespace iv {
     };
 
     typedef boost::shared_ptr<iv::GPS_INS> GPSData;
-     class Point2D
-    {
-      public:
-          double x = 0, y = 0, speed=0;
-         int v1 = 0, v2 = 0;
+    class Point2D
+   {
+     public:
+        double x = 0, y = 0, speed=0,obs_speed_x=0,obs_speed_y=0;
+        int v1 = 0, v2 = 0;
+        int roadMode = 0;
+        int obs_type=0;
+
 
-         Point2D()
-        {
-            x = y = v1 = 0;
-        }
+        Point2D()
+       {
+           x = y = v1 = 0;
+       }
 
-         Point2D(double _x, double _y)
-        {
-            x = _x; y = _y;
-        }
+        Point2D(double _x, double _y)
+       {
+           x = _x; y = _y;
+       }
 
 
-     };
+    };