Explorar el Código

change src/ros/catkin for simulation in AGX.

yuchuli hace 3 años
padre
commit
49de90ceb2

+ 4 - 2
src/ros/catkin/src/pilottoros/CMakeLists.txt

@@ -6,14 +6,16 @@ message(STATUS  "Enter pilottoros")
 
 
 SET(QT_PATH  /opt/qt/5.13.2/gcc_64)
+SET(AGX_QT_PATH  /usr/include/aarch64-linux-gnu/qt5)
 
-
-find_path(QT_EXIST   QtCore   ${QT_PATH}/include/QtCore)
+find_path(QT_EXIST   QtCore   ${QT_PATH}/include/QtCore  ${AGX_QT_PATH}/QtCore)
 
 if(QT_EXIST)
 include_directories(
   ${QT_PATH}/include
   ${QT_PATH}/include/QtCore
+  ${AGX_QT_PATH}
+  ${AGX_QT_PATH}/QtCore
 )
 link_directories(
   ${QT_PATH}/lib

+ 1 - 1
src/ros/catkin/src/pilottoros/src/main.cpp

@@ -90,7 +90,7 @@ void Listenpic(const char * strdata,const unsigned int nSize,const unsigned int
     else
     {
         std::vector<unsigned char> buff(pic.picdata().data(),pic.picdata().data()+pic.picdata().size());
-        mat = cv::imdecode(buff,CV_LOAD_IMAGE_COLOR);
+        mat = cv::imdecode(buff,1);
     }
 
     sensor_msgs::ImagePtr msg;

+ 4 - 0
src/ros/catkin/src/rostopilot/src/main.cpp

@@ -77,6 +77,10 @@ static void points_callback(const sensor_msgs::PointCloud2::ConstPtr& input)
 }
 
 
+#ifndef CV_IMWRITE_JPEG_QUALITY
+#define CV_IMWRITE_JPEG_QUALITY 1
+#endif
+
 int gindex = 0;
 int gcompress = 1;
 void imageCalllback(const sensor_msgs::ImageConstPtr& msg)