add obstacle log

autogen_lib.sh

@@ -1,11 +1,23 @@
-
 #qt_com=$(arch)
 qt_com=`arch`
-if [$qt_com = "aarch64" ];then
+if [ $qt_com = "aarch64" ];then
 qtmake="/usr/lib/aarch64-linux-gnu/qt5/bin/qmake"
 else
 qtmake="/opt/Qt5.10.1/5.10.1/gcc_64/bin/qmake"
 fi
+
+if [ ! $qtmake ];then
+	echo -e "\e[33m qtmake not set, auto find it\e[0m"
+	qtmake=`find /opt -name "qmake" 2>/dev/null | grep 'gcc_64'`
+fi
+
+if [ ! $qtmake ];then
+	echo -e "\e[33m can't find qmake \e[0m"
+	exit 1
+fi
+
+echo -e "\e[33m qtmake: $qtmake \e[0m"
+
 MAKEOPT=-j8
 
 mkdir bin

src/decition/decition_brain/decition/decide_gps_00.cpp

@@ -2788,9 +2788,9 @@ void iv::decition::DecideGps00::computeObsOnRoad(iv::LidarGridPtr lidarGridPtr,
         obsDisVector[roadNum]=obs;
     }
 
-    givlog->debug("obs_distance","obs: %f, lidar_obs: %f, Radar_obs: %f",
+    givlog->debug("obs_distance","obs: %f, lidar_obs: %f, Radar_obs: %f, lidar_obs_x: %f, lidar_obs_y: %f",
                   ServiceCarStatus.mObs, ServiceCarStatus.mLidarObs,
-                  ServiceCarStatus.mRadarObs);
+                  ServiceCarStatus.mRadarObs,obsPoint.x,lidarDistance);
 
     //   qDebug("time 3 is %d ",xTime.elapsed());