Merge branch 'floor_removal_with_simple_extraction_option' of github.com:braincorp/rtabmap_ros into floor_removal_with_simple_extraction_option

Conflicts:
	src/nodelets/point_cloud_xyz.cpp
This commit is contained in:
Jean-Baptiste Passot
2015-07-13 14:54:04 -07:00
2 changed files with 3 additions and 2 deletions
+1
View File
@@ -224,6 +224,7 @@ private:
pcl::PointCloud<pcl::PointXYZ>::Ptr hypotheticalGroundCloud_back = rtabmap::util3d::passThrough(originalCloud_back, "z", std::numeric_limits<int>::min(), maxFloorHeight_);
obstaclesCloud = rtabmap::util3d::passThrough(originalCloud, "z", maxFloorHeight_, maxObstaclesHeight_);
obstaclesCloud = rtabmap::util3d::passThrough(obstaclesCloud, "x", 0.8, std::numeric_limits<int>::max());
//STEP 1.
rtabmap::util3d::segmentObstaclesFromGround<pcl::PointXYZ>(hypotheticalGroundCloud_front,
+2 -2
View File
@@ -168,8 +168,8 @@ private:
}
if (special_filter_close_object_){
//cv::Mat pRoi = image(cv::Rect(int(0.05*(float(cols))),int(0.05*(float(rows))),int(0.9*(float(cols))),int(0.9*float(rows))));
//cv::medianBlur(pRoi, pRoi, 3);
cv::Mat pRoi = image(cv::Rect(int(0.05*(float(cols))),int(0.05*(float(rows))),int(0.9*(float(cols))),int(0.9*float(rows))));
cv::medianBlur(pRoi, pRoi, 3);
//Do filter of close objects
pRoi = image(cv::Rect(int(cols/10),int(0.8*(float(rows))),int(0.8*(float(cols))),int(0.15*float(rows))));