fixed save image counter

orbbec · Jan 30, 2024 · 754e2ea · 754e2ea
1 parent 3dc1080
commit 754e2ea
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 12 deletions.
diff --git a/orbbec_camera/include/orbbec_camera/ob_camera_node.h b/orbbec_camera/include/orbbec_camera/ob_camera_node.h
@@ -397,6 +397,7 @@ class OBCameraNode {
   std::unique_ptr<D2CViewer> d2c_viewer_ = nullptr;
   std::map<stream_index_pair, std::atomic_bool> save_images_;
   std::map<stream_index_pair, int> save_images_count_;
+  int max_save_images_count_ = 10;
   std::atomic_bool save_point_cloud_{false};
   std::atomic_bool save_colored_point_cloud_{false};
   rclcpp::Service<std_srvs::srv::Empty>::SharedPtr save_images_srv_;

diff --git a/orbbec_camera/src/ob_camera_node.cpp b/orbbec_camera/src/ob_camera_node.cpp
@@ -603,6 +603,7 @@ void OBCameraNode::getParameters() {
   setAndGetNodeParameter<double>(liner_accel_cov_, "linear_accel_cov", 0.0003);
   setAndGetNodeParameter<double>(angular_vel_cov_, "angular_vel_cov", 0.02);
   setAndGetNodeParameter<bool>(ordered_pc_, "ordered_pc", false);
+  setAndGetNodeParameter<int>(max_save_images_count_, "max_save_images_count", 10);
 }
 
 void OBCameraNode::setupTopics() {
@@ -1182,15 +1183,14 @@ void OBCameraNode::onNewFrameCallback(const std::shared_ptr<ob::Frame> &frame,
 
 void OBCameraNode::saveImageToFile(const stream_index_pair &stream_index, const cv::Mat &image,
                                    const sensor_msgs::msg::Image::SharedPtr &image_msg) {
-  if (save_images_[stream_index] && save_images_count_[stream_index] > 0) {
+  if (save_images_[stream_index]) {
     auto now = time(nullptr);
     std::stringstream ss;
     ss << std::put_time(localtime(&now), "%Y%m%d_%H%M%S");
     auto current_path = std::filesystem::current_path().string();
     auto fps = fps_[stream_index];
-    int index = 10 - save_images_count_[stream_index];
-    --save_images_count_[stream_index];
-    std::string file_suffix = stream_index == DEPTH ? ".raw" : ".png";
+    int index = save_images_count_[stream_index];
+    std::string file_suffix = stream_index == COLOR ? ".png" : ".raw";
     std::string filename = current_path + "/image/" + stream_name_[stream_index] + "_" +
                            std::to_string(image_msg->width) + "x" +
                            std::to_string(image_msg->height) + "_" + std::to_string(fps) + "hz_" +
@@ -1199,20 +1199,33 @@ void OBCameraNode::saveImageToFile(const stream_index_pair &stream_index, const
       std::filesystem::create_directory(current_path + "/image");
     }
     RCLCPP_INFO_STREAM(logger_, "Saving image to " << filename);
-    if (stream_index.first == OB_STREAM_DEPTH) {
-      std::ofstream ofs(filename, std::ios::binary);
-      ofs.write(reinterpret_cast<const char *>(image.data), image.total() * image.elemSize());
-      ofs.close();
-    } else if (stream_index.first == OB_STREAM_COLOR) {
+    if (stream_index.first == OB_STREAM_COLOR) {
       auto image_to_save =
           cv_bridge::toCvCopy(image_msg, sensor_msgs::image_encodings::BGR8)->image;
       cv::imwrite(filename, image_to_save);
     } else if (stream_index.first == OB_STREAM_IR || stream_index.first == OB_STREAM_IR_LEFT ||
-               stream_index.first == OB_STREAM_IR_RIGHT) {
-      cv::imwrite(filename, image);
+               stream_index.first == OB_STREAM_IR_RIGHT || stream_index.first == OB_STREAM_DEPTH) {
+      std::ofstream ofs(filename, std::ios::out | std::ios::binary);
+      if (!ofs.is_open()) {
+        RCLCPP_ERROR_STREAM(logger_, "Failed to open file: " << filename);
+        return;
+      }
+      if (image.isContinuous()) {
+        ofs.write(reinterpret_cast<const char *>(image.data), image.total() * image.elemSize());
+      } else {
+        int rows = image.rows;
+        int cols = image.cols * image.channels();
+        for (int r = 0; r < rows; ++r) {
+          ofs.write(reinterpret_cast<const char *>(image.ptr<uchar>(r)), cols);
+        }
+      }
+      ofs.close();
     } else {
       RCLCPP_ERROR_STREAM(logger_, "Unsupported stream type: " << stream_index.first);
     }
+    if (++save_images_count_[stream_index] >= max_save_images_count_) {
+      save_images_[stream_index] = false;
+    }
   }
 }
 

diff --git a/orbbec_camera/src/ros_service.cpp b/orbbec_camera/src/ros_service.cpp
@@ -645,7 +645,7 @@ void OBCameraNode::saveImageCallback(const std::shared_ptr<std_srvs::srv::Empty:
   for (const auto& stream_index : IMAGE_STREAMS) {
     if (enable_stream_[stream_index]) {
       save_images_[stream_index] = true;
-      save_images_count_[stream_index] = 10;
+      save_images_count_[stream_index] = 0;
     }
   }
 }