diff --git a/CMakeLists.txt b/CMakeLists.txt index ce33c96..d86f3a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,7 +58,7 @@ pkg_check_modules(JSONCPP jsoncpp) ## Generate messages in the 'msg' folder add_message_files( FILES - ObjDetected.msg + DetectedObj.msg DetectedObjsArray.msg ) diff --git a/msg/ObjDetected.msg b/msg/DetectedObj.msg similarity index 100% rename from msg/ObjDetected.msg rename to msg/DetectedObj.msg diff --git a/msg/DetectedObjsArray.msg b/msg/DetectedObjsArray.msg index 0d0e124..1146d25 100644 --- a/msg/DetectedObjsArray.msg +++ b/msg/DetectedObjsArray.msg @@ -1 +1 @@ -ObjDetected[] objects \ No newline at end of file +DetectedObj[] objects \ No newline at end of file diff --git a/src/object_detection.cpp b/src/object_detection.cpp index 7b042cd..ab5f95c 100755 --- a/src/object_detection.cpp +++ b/src/object_detection.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include #include @@ -28,7 +28,7 @@ class Image_Finder { // Subscribing to a camera topic to receive image data sub_img_ = nh_.subscribe("/camera/color/image_raw", 1, &Image_Finder::imageCallback, this); // Setting up a publisher for the detected objects - publisher = nh_.advertise("/Detected_Objects", 1); + publisher = nh_.advertise("/detected_objects", 1); } // Function to continue the life of the node @@ -124,7 +124,7 @@ class Image_Finder { } // Parsing each object in the JSON array for (const auto& obj : root) { - object_detection_pkg::ObjDetected detected_obj; + object_detection_pkg::DetectedObj detected_obj; detected_obj.class_name = obj["class_name"].asString(); detected_obj.confidence = obj["confidence"].asDouble(); detected_obj.x_min = obj["x_min"].asInt();