From 995fc15a695e5c60bf31b7c538d333202b32d8a9 Mon Sep 17 00:00:00 2001
From: asantamaria <asantamaria@iri.upc.edu>
Date: Wed, 4 Oct 2017 09:10:43 +0200
Subject: [PATCH] modifications to askUser
---
src/CMakeLists.txt | 2 +-
src/sensors/usb_cam/usb_cam.cpp | 9 +++++++++
src/sensors/usb_cam/usb_cam.h | 2 ++
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 049443c..8525bbb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -253,7 +253,7 @@ INSTALL(TARGETS ${PROJECT_NAME}
INSTALL(FILES ${headers_main} DESTINATION include/${PROJECT_NAME})
INSTALL(FILES ${headers_com} DESTINATION include/${PROJECT_NAME}/common_class)
INSTALL(FILES ${headers_sen} DESTINATION include/${PROJECT_NAME}/sensors)
-INSTALL(FILES ${headers_sen_usb} DESTINATION include/${PROJECT_NAME}/sensors/usb)
+INSTALL(FILES ${headers_sen_usb} DESTINATION include/${PROJECT_NAME}/sensors/usb_cam)
INSTALL(FILES ${headers_det} DESTINATION include/${PROJECT_NAME}/detectors)
INSTALL(FILES ${headers_det_orb} DESTINATION include/${PROJECT_NAME}/detectors/orb)
INSTALL(FILES ${headers_det_fast} DESTINATION include/${PROJECT_NAME}/detectors/fast)
diff --git a/src/sensors/usb_cam/usb_cam.cpp b/src/sensors/usb_cam/usb_cam.cpp
index 09d4753..1f2cbdf 100644
--- a/src/sensors/usb_cam/usb_cam.cpp
+++ b/src/sensors/usb_cam/usb_cam.cpp
@@ -10,6 +10,15 @@ SensorCamera::~SensorCamera(void)
release();
}
+vision_utils::SensorCameraPtr askUserSource(int argc, char** argv)
+{
+ vision_utils::SensorCameraPtr sen = std::make_shared<vision_utils::SensorCamera>();
+ if (vision_utils::askUserSource(sen, argc, argv))
+ return sen;
+ else
+ return NULL;
+}
+
int askUserSource(const vision_utils::SensorCameraPtr& _sen, int argc, char** argv)
{
// parsing input params
diff --git a/src/sensors/usb_cam/usb_cam.h b/src/sensors/usb_cam/usb_cam.h
index 12bf946..306bd84 100644
--- a/src/sensors/usb_cam/usb_cam.h
+++ b/src/sensors/usb_cam/usb_cam.h
@@ -152,6 +152,8 @@ inline SensorBasePtr SensorCamera::create(const std::string& _unique_name, const
int askUserSource(const vision_utils::SensorCameraPtr& _sen, int argc, char** argv);
+vision_utils::SensorCameraPtr askUserSource(int argc, char** argv);
+
} /* namespace vision_utils */
#endif /* _USB_CAM_H_ */
--
GitLab