Skip to content

Commit fc6693f

Browse files
apply new depth extractor
1 parent ec45c88 commit fc6693f

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

src/extended_object_detection_node/eod_node.cpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,8 @@ void EOD_ROS::rgbd_info_cb(const sensor_msgs::ImageConstPtr& rgb_image, const se
221221
}
222222
else if(depth_image->encoding == sensor_msgs::image_encodings::TYPE_32FC1){
223223
depth = cv_bridge::toCvCopy(depth_image, sensor_msgs::image_encodings::TYPE_32FC1)->image;
224+
//depth *= 1000;
225+
depth.convertTo(depth, CV_16UC1, 1000);
224226
}
225227
else{
226228
ROS_ERROR_THROTTLE(5, "Depth image has unsupported encoding [%s]", depth_image->encoding.c_str());
@@ -345,7 +347,7 @@ void EOD_ROS::detect(const eod::InfoImage& rgb, const eod::InfoImage& depth, std
345347
output_image_pub_.publish(detected_image_msg);
346348
}
347349
frame_sequence++;
348-
cv::waitKey(1);
350+
//cv::waitKey(1);
349351
}
350352

351353
extended_object_detection::BaseObject EOD_ROS::eoi_to_base_object( std::string name, int id, eod::ExtendedObjectInfo* eoi, const cv::Mat& K){
@@ -417,7 +419,10 @@ visualization_msgs::Marker EOD_ROS::base_object_to_marker_arrow(extended_object_
417419
mrk.color.r = color[0]/255;
418420
mrk.color.g = color[1]/255;
419421
mrk.color.b = color[2]/255;
420-
mrk.color.a = 1;
422+
if( base_object.transform.translation.z == 1)
423+
mrk.color.a = 0.1;
424+
else
425+
mrk.color.a = 1;
421426
return mrk;
422427
}
423428

0 commit comments

Comments
 (0)