From 372a19c1d211df12626eb5d567696ecf342d0402 Mon Sep 17 00:00:00 2001 From: Francisco Perez Date: Thu, 3 May 2018 07:09:44 -0700 Subject: [PATCH 1/6] [issue #1147] Renamed cameraview to camViz --- src/tools/{cameraview => camViz}/CMakeLists.txt | 14 +++++++------- .../cameraview.cpp => camViz/camViz.cpp} | 4 ++-- .../cameraview.glade => camViz/camViz.glade} | 2 +- .../cameraview.yml => camViz/camViz.yml} | 6 +++--- src/tools/{cameraview => camViz}/viewer.cpp | 4 ++-- src/tools/{cameraview => camViz}/viewer.h | 8 ++++---- 6 files changed, 19 insertions(+), 19 deletions(-) rename src/tools/{cameraview => camViz}/CMakeLists.txt (68%) rename src/tools/{cameraview/cameraview.cpp => camViz/camViz.cpp} (94%) rename src/tools/{cameraview/cameraview.glade => camViz/camViz.glade} (95%) rename src/tools/{cameraview/cameraview.yml => camViz/camViz.yml} (68%) rename src/tools/{cameraview => camViz}/viewer.cpp (98%) rename src/tools/{cameraview => camViz}/viewer.h (93%) diff --git a/src/tools/cameraview/CMakeLists.txt b/src/tools/camViz/CMakeLists.txt similarity index 68% rename from src/tools/cameraview/CMakeLists.txt rename to src/tools/camViz/CMakeLists.txt index c848705eb..400df3e57 100644 --- a/src/tools/cameraview/CMakeLists.txt +++ b/src/tools/camViz/CMakeLists.txt @@ -1,4 +1,4 @@ -SET( SOURCE_FILES cameraview.cpp viewer.cpp) +SET( SOURCE_FILES camViz.cpp viewer.cpp) add_definitions(-DGLADE_DIR="${gladedir}") @@ -22,9 +22,9 @@ link_directories( ${config_LIBRARY_DIRS} ) -add_executable (cameraview ${SOURCE_FILES}) +add_executable (camViz ${SOURCE_FILES}) -TARGET_LINK_LIBRARIES(cameraview +TARGET_LINK_LIBRARIES(camViz ${CMAKE_THREAD_LIBS_INIT} ${OpenCV_LIBRARIES} ${OpenCVGUI_LIBRARIES} @@ -43,11 +43,11 @@ TARGET_LINK_LIBRARIES(cameraview jderobotutil ) -install(TARGETS cameraview +install(TARGETS camViz DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ - COMPONENT cameraview + COMPONENT camviz ) -INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/cameraview.glade DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade COMPONENT cameraview) -INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/cameraview.yml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf COMPONENT cameraview) +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/camViz.glade DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade COMPONENT camviz) +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/camViz.yml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf COMPONENT camviz) diff --git a/src/tools/cameraview/cameraview.cpp b/src/tools/camViz/camViz.cpp similarity index 94% rename from src/tools/cameraview/cameraview.cpp rename to src/tools/camViz/camViz.cpp index 7cd807bf3..ae9266bca 100644 --- a/src/tools/cameraview/cameraview.cpp +++ b/src/tools/camViz/camViz.cpp @@ -31,7 +31,7 @@ int main(int argc, char** argv){ - cameraview::Viewer viewer; + camViz::Viewer viewer; Comm::CameraClient* camRGB; @@ -39,7 +39,7 @@ int main(int argc, char** argv){ Config::Properties cfg = Config::load(argc, argv); Comm::Communicator* jdrc = new Comm::Communicator(cfg); - camRGB = Comm::getCameraClient(jdrc, "Cameraview.Camera"); + camRGB = Comm::getCameraClient(jdrc, "camViz.Camera"); JdeRobotTypes::Image rgb; diff --git a/src/tools/cameraview/cameraview.glade b/src/tools/camViz/camViz.glade similarity index 95% rename from src/tools/cameraview/cameraview.glade rename to src/tools/camViz/camViz.glade index 7472b4450..ec11346f2 100644 --- a/src/tools/cameraview/cameraview.glade +++ b/src/tools/camViz/camViz.glade @@ -4,7 +4,7 @@ True - Cameraview + CamViz True diff --git a/src/tools/cameraview/cameraview.yml b/src/tools/camViz/camViz.yml similarity index 68% rename from src/tools/cameraview/cameraview.yml rename to src/tools/camViz/camViz.yml index 5c13ae470..f45a7c33d 100644 --- a/src/tools/cameraview/cameraview.yml +++ b/src/tools/camViz/camViz.yml @@ -1,10 +1,10 @@ -Cameraview: +camViz: Camera: Server: Ice # Deactivate, Ice , ROS Proxy: "cameraA:tcp -h localhost -p 9999" Format: RGB8 - Topic: "/cameraserver/rgb" + Topic: "/camserver/rgb" Name: cameraA Fps: 30 - NodeName: cameraview + NodeName: camViz diff --git a/src/tools/cameraview/viewer.cpp b/src/tools/camViz/viewer.cpp similarity index 98% rename from src/tools/cameraview/viewer.cpp rename to src/tools/camViz/viewer.cpp index 978e1d0f6..704adccc4 100644 --- a/src/tools/cameraview/viewer.cpp +++ b/src/tools/camViz/viewer.cpp @@ -25,8 +25,8 @@ #include #include -namespace cameraview { - const std::string gladepath = resourcelocator::findGladeFile("cameraview.glade"); +namespace camViz { + const std::string gladepath = resourcelocator::findGladeFile("camViz.glade"); Viewer::Viewer() : gtkmain(0, 0), frameCount(0) { diff --git a/src/tools/cameraview/viewer.h b/src/tools/camViz/viewer.h similarity index 93% rename from src/tools/cameraview/viewer.h rename to src/tools/camViz/viewer.h index 49e04129d..c9c8a3d59 100644 --- a/src/tools/cameraview/viewer.h +++ b/src/tools/camViz/viewer.h @@ -19,8 +19,8 @@ * */ -#ifndef CAMERAVIEW_VIEWER_H -#define CAMERAVIEW_VIEWER_H +#ifndef CAMVIZ_VIEWER_H +#define CAMVIZ_VIEWER_H #include #include @@ -29,7 +29,7 @@ #include #include -namespace cameraview{ +namespace camViz{ class Viewer { @@ -61,4 +61,4 @@ namespace cameraview{ }//namespace -#endif //CAMERAVIEW_VIEWER_H +#endif //CAMVIZ_VIEWER_H From d29cb11d11b5da1da849c50f3a9cdc0d1182afea Mon Sep 17 00:00:00 2001 From: Francisco Perez Date: Thu, 3 May 2018 07:11:03 -0700 Subject: [PATCH 2/6] [issue #1147] Renamed cameraview_py to camViz_py --- src/tools/camViz_py/CMakeLists.txt | 24 +++++++++++++++++++ .../cameraview.py => camViz_py/camviz.py} | 0 .../camviz_py.cfg} | 0 src/tools/camViz_py/camviz_py.in | 3 +++ src/tools/cameraview_py/CMakeLists.txt | 24 ------------------- src/tools/cameraview_py/cameraview_py.in | 3 --- 6 files changed, 27 insertions(+), 27 deletions(-) create mode 100644 src/tools/camViz_py/CMakeLists.txt rename src/tools/{cameraview_py/cameraview.py => camViz_py/camviz.py} (100%) rename src/tools/{cameraview_py/cameraview_py.cfg => camViz_py/camviz_py.cfg} (100%) create mode 100644 src/tools/camViz_py/camviz_py.in delete mode 100644 src/tools/cameraview_py/CMakeLists.txt delete mode 100644 src/tools/cameraview_py/cameraview_py.in diff --git a/src/tools/camViz_py/CMakeLists.txt b/src/tools/camViz_py/CMakeLists.txt new file mode 100644 index 000000000..0457527ab --- /dev/null +++ b/src/tools/camViz_py/CMakeLists.txt @@ -0,0 +1,24 @@ +configure_file( + camviz_py.in + camviz_py + @ONLY +) + +## INSTALL ## + +# install Launcher +install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/camviz_py + PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ + DESTINATION bin + COMPONENT camviz-python +) + +# Install .py +FILE(GLOB_RECURSE HEADERS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*py) +FOREACH(header ${HEADERS_FILES}) + INSTALL(FILES ${header} DESTINATION share/jderobot/python/camViz_py/ COMPONENT camviz-python) +ENDFOREACH(header) + +# Install resources +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/camviz_py.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf COMPONENT camviz-python) diff --git a/src/tools/cameraview_py/cameraview.py b/src/tools/camViz_py/camviz.py similarity index 100% rename from src/tools/cameraview_py/cameraview.py rename to src/tools/camViz_py/camviz.py diff --git a/src/tools/cameraview_py/cameraview_py.cfg b/src/tools/camViz_py/camviz_py.cfg similarity index 100% rename from src/tools/cameraview_py/cameraview_py.cfg rename to src/tools/camViz_py/camviz_py.cfg diff --git a/src/tools/camViz_py/camviz_py.in b/src/tools/camViz_py/camviz_py.in new file mode 100644 index 000000000..1ae720bde --- /dev/null +++ b/src/tools/camViz_py/camviz_py.in @@ -0,0 +1,3 @@ +#!/bin/bash + +python @CMAKE_INSTALL_PREFIX@/share/jderobot/python/camViz_py/camviz.py $* diff --git a/src/tools/cameraview_py/CMakeLists.txt b/src/tools/cameraview_py/CMakeLists.txt deleted file mode 100644 index 0facd0e2d..000000000 --- a/src/tools/cameraview_py/CMakeLists.txt +++ /dev/null @@ -1,24 +0,0 @@ -configure_file( - cameraview_py.in - cameraview_py - @ONLY -) - -## INSTALL ## - -# install Launcher -install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/cameraview_py - PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ - DESTINATION bin - COMPONENT cameraview-python -) - -# Install .py -FILE(GLOB_RECURSE HEADERS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*py) -FOREACH(header ${HEADERS_FILES}) - INSTALL(FILES ${header} DESTINATION share/jderobot/python/cameraview_py/ COMPONENT cameraview-python) -ENDFOREACH(header) - -# Install resources -INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/cameraview_py.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf COMPONENT cameraview-python) diff --git a/src/tools/cameraview_py/cameraview_py.in b/src/tools/cameraview_py/cameraview_py.in deleted file mode 100644 index 53ec3a4af..000000000 --- a/src/tools/cameraview_py/cameraview_py.in +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -python @CMAKE_INSTALL_PREFIX@/share/jderobot/python/cameraview_py/cameraview.py $* From 91434d6110bebb4daef8375f5f2eb94f72f9bd68 Mon Sep 17 00:00:00 2001 From: Francisco Perez Date: Thu, 3 May 2018 07:12:36 -0700 Subject: [PATCH 3/6] [issue #1147] Renamed kobukiViewer to carViz --- src/tools/{kobukiViewer => carViz}/CMakeLists.txt | 10 +++++----- .../kobukiViewer.yml => carViz/carViz.yml} | 14 +++++++------- .../carVizReal.yml} | 14 +++++++------- src/tools/{kobukiViewer => carViz}/gui/gui.cpp | 0 src/tools/{kobukiViewer => carViz}/gui/gui.h | 0 .../gui/threadupdategui.cpp | 0 .../gui/threadupdategui.h | 0 .../gui/widget/cameraswidget.cpp | 0 .../gui/widget/cameraswidget.h | 0 .../gui/widget/controlvw.cpp | 4 ++-- .../gui/widget/controlvw.h | 0 .../gui/widget/laserwidget.cpp | 0 .../gui/widget/laserwidget.h | 0 .../{kobukiViewer => carViz}/images/pelota.png | Bin .../{kobukiViewer => carViz}/images/play.png | Bin .../{kobukiViewer => carViz}/images/stop.png | Bin src/tools/{kobukiViewer => carViz}/main.cpp | 0 src/tools/{kobukiViewer => carViz}/resources.qrc | 0 .../{kobukiViewer => carViz}/robot/actuators.cpp | 2 +- .../{kobukiViewer => carViz}/robot/actuators.h | 0 .../{kobukiViewer => carViz}/robot/robot.cpp | 0 src/tools/{kobukiViewer => carViz}/robot/robot.h | 0 .../{kobukiViewer => carViz}/robot/sensors.cpp | 8 ++++---- .../{kobukiViewer => carViz}/robot/sensors.h | 0 24 files changed, 26 insertions(+), 26 deletions(-) rename src/tools/{kobukiViewer => carViz}/CMakeLists.txt (86%) rename src/tools/{kobukiViewer/kobukiViewer.yml => carViz/carViz.yml} (81%) rename src/tools/{kobukiViewer/kobukiViewerReal.yml => carViz/carVizReal.yml} (81%) rename src/tools/{kobukiViewer => carViz}/gui/gui.cpp (100%) rename src/tools/{kobukiViewer => carViz}/gui/gui.h (100%) rename src/tools/{kobukiViewer => carViz}/gui/threadupdategui.cpp (100%) rename src/tools/{kobukiViewer => carViz}/gui/threadupdategui.h (100%) rename src/tools/{kobukiViewer => carViz}/gui/widget/cameraswidget.cpp (100%) rename src/tools/{kobukiViewer => carViz}/gui/widget/cameraswidget.h (100%) rename src/tools/{kobukiViewer => carViz}/gui/widget/controlvw.cpp (97%) rename src/tools/{kobukiViewer => carViz}/gui/widget/controlvw.h (100%) rename src/tools/{kobukiViewer => carViz}/gui/widget/laserwidget.cpp (100%) rename src/tools/{kobukiViewer => carViz}/gui/widget/laserwidget.h (100%) rename src/tools/{kobukiViewer => carViz}/images/pelota.png (100%) rename src/tools/{kobukiViewer => carViz}/images/play.png (100%) rename src/tools/{kobukiViewer => carViz}/images/stop.png (100%) rename src/tools/{kobukiViewer => carViz}/main.cpp (100%) rename src/tools/{kobukiViewer => carViz}/resources.qrc (100%) rename src/tools/{kobukiViewer => carViz}/robot/actuators.cpp (92%) rename src/tools/{kobukiViewer => carViz}/robot/actuators.h (100%) rename src/tools/{kobukiViewer => carViz}/robot/robot.cpp (100%) rename src/tools/{kobukiViewer => carViz}/robot/robot.h (100%) rename src/tools/{kobukiViewer => carViz}/robot/sensors.cpp (81%) rename src/tools/{kobukiViewer => carViz}/robot/sensors.h (100%) diff --git a/src/tools/kobukiViewer/CMakeLists.txt b/src/tools/carViz/CMakeLists.txt similarity index 86% rename from src/tools/kobukiViewer/CMakeLists.txt rename to src/tools/carViz/CMakeLists.txt index 67fa587e0..c8a263783 100644 --- a/src/tools/kobukiViewer/CMakeLists.txt +++ b/src/tools/carViz/CMakeLists.txt @@ -46,9 +46,9 @@ if (${QT5_COMPILE} AND ${roscpp_FOUND}) ${comm_LIBRARY_DIRS} ) - add_executable( kobukiViewer ${SOURCE} ${INTERFACES_CPP_DIR}) + add_executable( carViz ${SOURCE} ${INTERFACES_CPP_DIR}) - target_link_libraries(kobukiViewer + target_link_libraries(carViz ${Qt5Widgets_LIBRARIES} ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES} @@ -65,10 +65,10 @@ if (${QT5_COMPILE} AND ${roscpp_FOUND}) ${ZLIB_LIBRARIES} colorspacesmm ) - install(TARGETS kobukiViewer + install(TARGETS carViz DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ - COMPONENT kobukiviewer + COMPONENT carviz ) - INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/kobukiViewer.yml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf COMPONENT kobukiviewer) + INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/carViz.yml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf COMPONENT carviz) ENDIF() diff --git a/src/tools/kobukiViewer/kobukiViewer.yml b/src/tools/carViz/carViz.yml similarity index 81% rename from src/tools/kobukiViewer/kobukiViewer.yml rename to src/tools/carViz/carViz.yml index 95dd26dbb..053f4e88a 100644 --- a/src/tools/kobukiViewer/kobukiViewer.yml +++ b/src/tools/carViz/carViz.yml @@ -1,9 +1,9 @@ -kobukiViewer: +carViz: Motors: Server: ROS # Deactivate, Ice , ROS Proxy: "Motors:default -h localhost -p 9001" Topic: "/turtlebotROS/mobile_base/commands/velocity" - Name: kobukiViewerMotors + Name: carVizMotors maxV: 3 maxW: 0.7 @@ -12,27 +12,27 @@ kobukiViewer: Proxy: "CameraL:default -h localhost -p 9001" Format: RGB8 Topic: "/TurtlebotROS/cameraL/image_raw" - Name: kobukiViewerCamera1 + Name: carVizCamera1 Camera2: Server: ROS # Deactivate, Ice , ROS Proxy: "CameraR:default -h localhost -p 9001" Format: RGB8 Topic: "/TurtlebotROS/cameraR/image_raw" - Name: kobukiViewerCamera2 + Name: carVizCamera2 Pose3D: Server: ROS # Deactivate, Ice , ROS Proxy: "Pose3D:default -h localhost -p 9001" Topic: "//turtlebotROS/odom" - Name: kobukiViewerPose3d + Name: carVizPose3d Laser: Server: ROS # Deactivate, Ice , ROS Proxy: "Laser:default -h localhost -p 9001" Topic: "/turtlebotROS/laser/scan" - Name: kobukiViewerLaser + Name: carVizLaser Vmax: 3 Wmax: 0.7 - NodeName: kobukiViewer + NodeName: carViz diff --git a/src/tools/kobukiViewer/kobukiViewerReal.yml b/src/tools/carViz/carVizReal.yml similarity index 81% rename from src/tools/kobukiViewer/kobukiViewerReal.yml rename to src/tools/carViz/carVizReal.yml index 64aedde22..8449a3b48 100644 --- a/src/tools/kobukiViewer/kobukiViewerReal.yml +++ b/src/tools/carViz/carVizReal.yml @@ -1,9 +1,9 @@ -kobukiViewer: +carViz: Motors: Server: 2 # 0 -> Deactivate, 1 -> Ice , 2 -> ROS Proxy: "Motors:default -h localhost -p 9999" Topic: "/mobile_base/commands/velocity" - Name: kobukiViewerMotors + Name: carVizMotors maxV: 3 maxW: 0.7 @@ -12,26 +12,26 @@ kobukiViewer: Proxy: "CameraL:default -h localhost -p 9001" Format: RGB8 Topic: "/camera/rgb/image_raw" - Name: kobukiViewerCamera1 + Name: carVizCamera1 Camera2: Server: 2 # 0 -> Deactivate, 1 -> Ice , 2 -> ROS Proxy: "CameraR:default -h localhost -p 9001" Format: RGB8 Topic: "/camera/rgb/image_raw" - Name: kobukiViewerCamera2 + Name: carVizCamera2 Pose3D: Server: 2 # 0 -> Deactivate, 1 -> Ice , 2 -> ROS Proxy: "Pose3D:default -h localhost -p 9001" Topic: "/odom" - Name: kobukiViewerPose3d + Name: carVizPose3d Laser: Server: 2 # 0 -> Deactivate, 1 -> Ice , 2 -> ROS Proxy: "Laser:default -h localhost -p 9001" Topic: "/scan" - Name: kobukiViewerLaser + Name: carVizLaser Vmax: 3 Wmax: 0.7 - NodeName: kobukiViewer + NodeName: carViz diff --git a/src/tools/kobukiViewer/gui/gui.cpp b/src/tools/carViz/gui/gui.cpp similarity index 100% rename from src/tools/kobukiViewer/gui/gui.cpp rename to src/tools/carViz/gui/gui.cpp diff --git a/src/tools/kobukiViewer/gui/gui.h b/src/tools/carViz/gui/gui.h similarity index 100% rename from src/tools/kobukiViewer/gui/gui.h rename to src/tools/carViz/gui/gui.h diff --git a/src/tools/kobukiViewer/gui/threadupdategui.cpp b/src/tools/carViz/gui/threadupdategui.cpp similarity index 100% rename from src/tools/kobukiViewer/gui/threadupdategui.cpp rename to src/tools/carViz/gui/threadupdategui.cpp diff --git a/src/tools/kobukiViewer/gui/threadupdategui.h b/src/tools/carViz/gui/threadupdategui.h similarity index 100% rename from src/tools/kobukiViewer/gui/threadupdategui.h rename to src/tools/carViz/gui/threadupdategui.h diff --git a/src/tools/kobukiViewer/gui/widget/cameraswidget.cpp b/src/tools/carViz/gui/widget/cameraswidget.cpp similarity index 100% rename from src/tools/kobukiViewer/gui/widget/cameraswidget.cpp rename to src/tools/carViz/gui/widget/cameraswidget.cpp diff --git a/src/tools/kobukiViewer/gui/widget/cameraswidget.h b/src/tools/carViz/gui/widget/cameraswidget.h similarity index 100% rename from src/tools/kobukiViewer/gui/widget/cameraswidget.h rename to src/tools/carViz/gui/widget/cameraswidget.h diff --git a/src/tools/kobukiViewer/gui/widget/controlvw.cpp b/src/tools/carViz/gui/widget/controlvw.cpp similarity index 97% rename from src/tools/kobukiViewer/gui/widget/controlvw.cpp rename to src/tools/carViz/gui/widget/controlvw.cpp index 2e6500c2b..074443ead 100644 --- a/src/tools/kobukiViewer/gui/widget/controlvw.cpp +++ b/src/tools/carViz/gui/widget/controlvw.cpp @@ -31,8 +31,8 @@ void controlVW::setProps(Config::Properties props) { this->props = props; - QString svmax = QString::fromUtf8(props.asStringWithDefault("kobukiViewer.Vmax", "5").c_str()); - QString swmax = QString::fromUtf8(props.asStringWithDefault("kobukiViewer.Wmax", "0.5").c_str()); + QString svmax = QString::fromUtf8(props.asStringWithDefault("carViz.Vmax", "5").c_str()); + QString swmax = QString::fromUtf8(props.asStringWithDefault("carViz.Wmax", "0.5").c_str()); this->v_max = svmax.toFloat(); this->w_max = swmax.toFloat(); diff --git a/src/tools/kobukiViewer/gui/widget/controlvw.h b/src/tools/carViz/gui/widget/controlvw.h similarity index 100% rename from src/tools/kobukiViewer/gui/widget/controlvw.h rename to src/tools/carViz/gui/widget/controlvw.h diff --git a/src/tools/kobukiViewer/gui/widget/laserwidget.cpp b/src/tools/carViz/gui/widget/laserwidget.cpp similarity index 100% rename from src/tools/kobukiViewer/gui/widget/laserwidget.cpp rename to src/tools/carViz/gui/widget/laserwidget.cpp diff --git a/src/tools/kobukiViewer/gui/widget/laserwidget.h b/src/tools/carViz/gui/widget/laserwidget.h similarity index 100% rename from src/tools/kobukiViewer/gui/widget/laserwidget.h rename to src/tools/carViz/gui/widget/laserwidget.h diff --git a/src/tools/kobukiViewer/images/pelota.png b/src/tools/carViz/images/pelota.png similarity index 100% rename from src/tools/kobukiViewer/images/pelota.png rename to src/tools/carViz/images/pelota.png diff --git a/src/tools/kobukiViewer/images/play.png b/src/tools/carViz/images/play.png similarity index 100% rename from src/tools/kobukiViewer/images/play.png rename to src/tools/carViz/images/play.png diff --git a/src/tools/kobukiViewer/images/stop.png b/src/tools/carViz/images/stop.png similarity index 100% rename from src/tools/kobukiViewer/images/stop.png rename to src/tools/carViz/images/stop.png diff --git a/src/tools/kobukiViewer/main.cpp b/src/tools/carViz/main.cpp similarity index 100% rename from src/tools/kobukiViewer/main.cpp rename to src/tools/carViz/main.cpp diff --git a/src/tools/kobukiViewer/resources.qrc b/src/tools/carViz/resources.qrc similarity index 100% rename from src/tools/kobukiViewer/resources.qrc rename to src/tools/carViz/resources.qrc diff --git a/src/tools/kobukiViewer/robot/actuators.cpp b/src/tools/carViz/robot/actuators.cpp similarity index 92% rename from src/tools/kobukiViewer/robot/actuators.cpp rename to src/tools/carViz/robot/actuators.cpp index 8af861fef..befe38bd0 100755 --- a/src/tools/kobukiViewer/robot/actuators.cpp +++ b/src/tools/carViz/robot/actuators.cpp @@ -4,7 +4,7 @@ Actuators::Actuators(Comm::Communicator* jdrc) { this->jdrc = jdrc; - this->motorsClient = Comm::getMotorsClient(jdrc, "kobukiViewer.Motors"); + this->motorsClient = Comm::getMotorsClient(jdrc, "carViz.Motors"); } diff --git a/src/tools/kobukiViewer/robot/actuators.h b/src/tools/carViz/robot/actuators.h similarity index 100% rename from src/tools/kobukiViewer/robot/actuators.h rename to src/tools/carViz/robot/actuators.h diff --git a/src/tools/kobukiViewer/robot/robot.cpp b/src/tools/carViz/robot/robot.cpp similarity index 100% rename from src/tools/kobukiViewer/robot/robot.cpp rename to src/tools/carViz/robot/robot.cpp diff --git a/src/tools/kobukiViewer/robot/robot.h b/src/tools/carViz/robot/robot.h similarity index 100% rename from src/tools/kobukiViewer/robot/robot.h rename to src/tools/carViz/robot/robot.h diff --git a/src/tools/kobukiViewer/robot/sensors.cpp b/src/tools/carViz/robot/sensors.cpp similarity index 81% rename from src/tools/kobukiViewer/robot/sensors.cpp rename to src/tools/carViz/robot/sensors.cpp index 99911950a..9ed9f0fcd 100755 --- a/src/tools/kobukiViewer/robot/sensors.cpp +++ b/src/tools/carViz/robot/sensors.cpp @@ -5,20 +5,20 @@ Sensors::Sensors(Comm::Communicator* jdrc) this-> jdrc = jdrc; - this->poseClient = Comm::getPose3dClient(jdrc, "kobukiViewer.Pose3D"); + this->poseClient = Comm::getPose3dClient(jdrc, "carViz.Pose3D"); ////////////////////////////// CAMERA1 ///////////////////////////// - this->camera1 = Comm::getCameraClient(jdrc, "kobukiViewer.Camera1"); + this->camera1 = Comm::getCameraClient(jdrc, "carViz.Camera1"); ////////////////////////////// CAMERA2 ///////////////////////////// - this->camera2 = Comm::getCameraClient(jdrc, "kobukiViewer.Camera2"); + this->camera2 = Comm::getCameraClient(jdrc, "carViz.Camera2"); ////////////////////////////// LASER ////////////////////////////// // Contact to LASER interface - this->laserClient = Comm::getLaserClient(jdrc, "kobukiViewer.Laser"); + this->laserClient = Comm::getLaserClient(jdrc, "carViz.Laser"); } JdeRobotTypes::Image Sensors::getImage1() diff --git a/src/tools/kobukiViewer/robot/sensors.h b/src/tools/carViz/robot/sensors.h similarity index 100% rename from src/tools/kobukiViewer/robot/sensors.h rename to src/tools/carViz/robot/sensors.h From 22388e63483b26552cc275eef218f0c990072f68 Mon Sep 17 00:00:00 2001 From: Francisco Perez Date: Thu, 3 May 2018 07:13:42 -0700 Subject: [PATCH 4/6] [issue #1147] Renamed rgbdViewer to rgbdViz --- .../{rgbdViewer => rgbdViz}/CMakeLists.txt | 16 ++-- .../{rgbdViewer => rgbdViz}/camera-0.cfg | 0 .../{rgbdViewer => rgbdViz}/config/camAlicia | 0 .../{rgbdViewer => rgbdViz}/config/camIR | 0 .../config/lambecom.cfg | 0 .../{rgbdViewer => rgbdViz}/drawarea.cpp | 28 +++--- src/tools/{rgbdViewer => rgbdViz}/drawarea.h | 2 +- .../{rgbdViewer => rgbdViz}/freenect_ros.yml | 4 +- .../{rgbdViewer => rgbdViz}/myprogeo.cpp | 4 +- src/tools/{rgbdViewer => rgbdViz}/myprogeo.h | 10 +- .../rgbdViewer.cpp => rgbdViz/rgbdViz.cpp} | 62 ++++++------- .../rgbdViewer.yml => rgbdViz/rgbdViz.yml} | 4 +- .../rgbdVizKinect2.yml} | 4 +- .../rgbdVizgui.cpp} | 92 +++++++++---------- .../rgbdVizgui.glade} | 4 +- .../rgbdViewergui.h => rgbdViz/rgbdVizgui.h} | 16 ++-- src/tools/{rgbdViewer => rgbdViz}/util3d.cpp | 2 +- src/tools/{rgbdViewer => rgbdViz}/util3d.h | 2 +- 18 files changed, 125 insertions(+), 125 deletions(-) rename src/tools/{rgbdViewer => rgbdViz}/CMakeLists.txt (60%) rename src/tools/{rgbdViewer => rgbdViz}/camera-0.cfg (100%) rename src/tools/{rgbdViewer => rgbdViz}/config/camAlicia (100%) rename src/tools/{rgbdViewer => rgbdViz}/config/camIR (100%) rename src/tools/{rgbdViewer => rgbdViz}/config/lambecom.cfg (100%) rename src/tools/{rgbdViewer => rgbdViz}/drawarea.cpp (95%) rename src/tools/{rgbdViewer => rgbdViz}/drawarea.h (99%) rename src/tools/{rgbdViewer => rgbdViz}/freenect_ros.yml (97%) rename src/tools/{rgbdViewer => rgbdViz}/myprogeo.cpp (97%) rename src/tools/{rgbdViewer => rgbdViz}/myprogeo.h (90%) rename src/tools/{rgbdViewer/rgbdViewer.cpp => rgbdViz/rgbdViz.cpp} (74%) rename src/tools/{rgbdViewer/rgbdViewer.yml => rgbdViz/rgbdViz.yml} (97%) rename src/tools/{rgbdViewer/rgbdViewerKinect2.yml => rgbdViz/rgbdVizKinect2.yml} (97%) rename src/tools/{rgbdViewer/rgbdViewergui.cpp => rgbdViz/rgbdVizgui.cpp} (89%) rename src/tools/{rgbdViewer/rgbdViewergui.glade => rgbdViz/rgbdVizgui.glade} (99%) rename src/tools/{rgbdViewer/rgbdViewergui.h => rgbdViz/rgbdVizgui.h} (90%) rename src/tools/{rgbdViewer => rgbdViz}/util3d.cpp (98%) rename src/tools/{rgbdViewer => rgbdViz}/util3d.h (98%) diff --git a/src/tools/rgbdViewer/CMakeLists.txt b/src/tools/rgbdViz/CMakeLists.txt similarity index 60% rename from src/tools/rgbdViewer/CMakeLists.txt rename to src/tools/rgbdViz/CMakeLists.txt index dc011eec0..04fb9e649 100644 --- a/src/tools/rgbdViewer/CMakeLists.txt +++ b/src/tools/rgbdViz/CMakeLists.txt @@ -1,4 +1,4 @@ -SET(SOURCE_FILES rgbdViewer.cpp drawarea.cpp rgbdViewergui.cpp myprogeo.cpp) +SET(SOURCE_FILES rgbdViz.cpp drawarea.cpp rgbdVizgui.cpp myprogeo.cpp) include_directories( ${INTERFACES_CPP_DIR} @@ -21,10 +21,10 @@ link_directories( ${config_LIBRARY_DIRS} ) -add_executable (rgbdViewer ${SOURCE_FILES}) +add_executable (rgbdViz ${SOURCE_FILES}) -TARGET_LINK_LIBRARIES(rgbdViewer +TARGET_LINK_LIBRARIES(rgbdViz ${CMAKE_THREAD_LIBS_INIT} ${GLUT_LIBRARIES} ${OpenCV_LIBRARIES} @@ -46,8 +46,8 @@ TARGET_LINK_LIBRARIES(rgbdViewer jderobotutil ) -INSTALL (TARGETS rgbdViewer DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ COMPONENT rgbdViewer) -INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/rgbdViewergui.glade DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade COMPONENT rgbdViewer) -INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/rgbdViewer.yml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf COMPONENT rgbdViewer) -INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/rgbdViewerKinect2.yml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf COMPONENT rgbdViewer) -INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/camera-0.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf COMPONENT rgbdViewer) +INSTALL (TARGETS rgbdViz DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ COMPONENT rgbdViz) +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/rgbdVizgui.glade DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/glade COMPONENT rgbdViz) +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/rgbdViz.yml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf COMPONENT rgbdViz) +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/rgbdVizKinect2.yml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf COMPONENT rgbdViz) +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/camera-0.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf COMPONENT rgbdViz) diff --git a/src/tools/rgbdViewer/camera-0.cfg b/src/tools/rgbdViz/camera-0.cfg similarity index 100% rename from src/tools/rgbdViewer/camera-0.cfg rename to src/tools/rgbdViz/camera-0.cfg diff --git a/src/tools/rgbdViewer/config/camAlicia b/src/tools/rgbdViz/config/camAlicia similarity index 100% rename from src/tools/rgbdViewer/config/camAlicia rename to src/tools/rgbdViz/config/camAlicia diff --git a/src/tools/rgbdViewer/config/camIR b/src/tools/rgbdViz/config/camIR similarity index 100% rename from src/tools/rgbdViewer/config/camIR rename to src/tools/rgbdViz/config/camIR diff --git a/src/tools/rgbdViewer/config/lambecom.cfg b/src/tools/rgbdViz/config/lambecom.cfg similarity index 100% rename from src/tools/rgbdViewer/config/lambecom.cfg rename to src/tools/rgbdViz/config/lambecom.cfg diff --git a/src/tools/rgbdViewer/drawarea.cpp b/src/tools/rgbdViz/drawarea.cpp similarity index 95% rename from src/tools/rgbdViewer/drawarea.cpp rename to src/tools/rgbdViz/drawarea.cpp index 496f6d51d..be9a3efcd 100644 --- a/src/tools/rgbdViewer/drawarea.cpp +++ b/src/tools/rgbdViz/drawarea.cpp @@ -27,7 +27,7 @@ #define eval2(N) (N*N) -namespace rgbdViewer { +namespace rgbdViz { const float DrawArea::MAXWORLD = 50.; const float DrawArea::PI = 3.141592654; @@ -534,11 +534,11 @@ DrawArea::load_line(FILE *myfile) numlines++; } else{ - printf("rgbdViewer: error, too much lines in the world file configuration.\n"); + printf("rgbdViz: error, too much lines in the world file configuration.\n"); } } else{ - printf("rgbdViewer: error, worldfile line not valid: %s\n",buffer_file); + printf("rgbdViz: error, worldfile line not valid: %s\n",buffer_file); } } else if (strcmp(word1, "post")==0){ @@ -557,11 +557,11 @@ DrawArea::load_line(FILE *myfile) post_p++; } else{ - printf("rgbdViewer: error, too much posts in the world file configuration.\n"); + printf("rgbdViz: error, too much posts in the world file configuration.\n"); } } else{ - printf("rgbdViewer: error, post line not valid: %s\n",buffer_file); + printf("rgbdViz: error, post line not valid: %s\n",buffer_file); } } else if (strcmp(word1, "jamb")==0){ @@ -580,11 +580,11 @@ DrawArea::load_line(FILE *myfile) jamb_p++; } else{ - printf("rgbdViewer: error, too much jambs in the world file configuration.\n"); + printf("rgbdViz: error, too much jambs in the world file configuration.\n"); } } else{ - printf("rgbdViewer: error, post line not valid: %s\n",buffer_file); + printf("rgbdViz: error, post line not valid: %s\n",buffer_file); } } else if (strcmp(word1, "circle")==0){ @@ -596,11 +596,11 @@ DrawArea::load_line(FILE *myfile) circle_p++; } else{ - printf("rgbdViewer: error, too much circles in the world file configuration.\n"); + printf("rgbdViz: error, too much circles in the world file configuration.\n"); } } else{ - printf("rgbdViewer: error, circle line not valid: %s\n",buffer_file); + printf("rgbdViz: error, circle line not valid: %s\n",buffer_file); } } else if (strcmp(word1, "triangle")==0){ @@ -612,11 +612,11 @@ DrawArea::load_line(FILE *myfile) triangle_p++; } else{ - printf("rgbdViewer: error, too much triangles in the world file configuration.\n"); + printf("rgbdViz: error, too much triangles in the world file configuration.\n"); } } else{ - printf("rgbdViewer: error, triangle line not valid: %s\n",buffer_file); + printf("rgbdViz: error, triangle line not valid: %s\n",buffer_file); } } else if (strcmp(word1, "sq")==0){ @@ -628,11 +628,11 @@ DrawArea::load_line(FILE *myfile) sq_p++; } else{ - printf("rgbdViewer: error, too much sqs in the world file configuration.\n"); + printf("rgbdViz: error, too much sqs in the world file configuration.\n"); } } else{ - printf("rgbdViewer: error, sq line not valid: %s\n",buffer_file); + printf("rgbdViz: error, sq line not valid: %s\n",buffer_file); } } } @@ -648,7 +648,7 @@ DrawArea::read_world_file(char* worldfile){ int i; if ((myfile=fopen(worldfile,"r"))==NULL){ - std::cout << "rgbdViewer: cannot find world file" << std::endl; + std::cout << "rgbdViz: cannot find world file" << std::endl; return -1; } diff --git a/src/tools/rgbdViewer/drawarea.h b/src/tools/rgbdViz/drawarea.h similarity index 99% rename from src/tools/rgbdViewer/drawarea.h rename to src/tools/rgbdViz/drawarea.h index a85520bd0..b5a33ab39 100644 --- a/src/tools/rgbdViewer/drawarea.h +++ b/src/tools/rgbdViz/drawarea.h @@ -64,7 +64,7 @@ typedef struct SoRtype { float roll; } SofReference; -namespace rgbdViewer { +namespace rgbdViz { class DrawArea : public Gtk::DrawingArea, public Gtk::GL::Widget { public: diff --git a/src/tools/rgbdViewer/freenect_ros.yml b/src/tools/rgbdViz/freenect_ros.yml similarity index 97% rename from src/tools/rgbdViewer/freenect_ros.yml rename to src/tools/rgbdViz/freenect_ros.yml index cc3dfbd08..04621ecbb 100644 --- a/src/tools/rgbdViewer/freenect_ros.yml +++ b/src/tools/rgbdViz/freenect_ros.yml @@ -1,4 +1,4 @@ -rgbdViewer: +rgbdViz: CameraRGB: Server: 2 # 0 -> Deactivate, 1 -> Ice , 2 -> ROS Proxy: "cameraA:tcp -h localhost -p 9998" @@ -42,7 +42,7 @@ rgbdViewer: Name: KinectLeds - NodeName: rgbdViewer + NodeName: rgbdViz Width: 640 Height: 480 Fps: 15 diff --git a/src/tools/rgbdViewer/myprogeo.cpp b/src/tools/rgbdViz/myprogeo.cpp similarity index 97% rename from src/tools/rgbdViewer/myprogeo.cpp rename to src/tools/rgbdViz/myprogeo.cpp index 4eab71b61..aa5848038 100644 --- a/src/tools/rgbdViewer/myprogeo.cpp +++ b/src/tools/rgbdViz/myprogeo.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 1997-2013 JDE Developers TeamrgbdViewer.camRGB + * Copyright (C) 1997-2013 JDE Developers TeamrgbdViz.camRGB * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,7 +23,7 @@ -namespace rgbdViewer { +namespace rgbdViz { myprogeo::myprogeo(int nCam, int w, int h){ for (int i=0; i< nCam; i++){ diff --git a/src/tools/rgbdViewer/myprogeo.h b/src/tools/rgbdViz/myprogeo.h similarity index 90% rename from src/tools/rgbdViewer/myprogeo.h rename to src/tools/rgbdViz/myprogeo.h index d35e85ffb..99cf700e5 100644 --- a/src/tools/rgbdViewer/myprogeo.h +++ b/src/tools/rgbdViz/myprogeo.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1997-2013 JDE Developers TeamrgbdViewer.camRGB + * Copyright (C) 1997-2013 JDE Developers TeamrgbdViz.camRGB * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,8 +19,8 @@ */ -#ifndef rgbdViewer_MYPROGEO_H -#define rgbdViewer_MYPROGEO_H +#ifndef rgbdViz_MYPROGEO_H +#define rgbdViz_MYPROGEO_H #include #include @@ -35,7 +35,7 @@ #define MAX_CAMERAS 8 #define MAX_BUFFER 1024 -namespace rgbdViewer { +namespace rgbdViz { class myprogeo { public: myprogeo(int nCam, int w, int h); @@ -59,4 +59,4 @@ namespace rgbdViewer { }; } // namespace -#endif /*rgbdViewer_MYPROGEO_H*/ +#endif /*rgbdViz_MYPROGEO_H*/ diff --git a/src/tools/rgbdViewer/rgbdViewer.cpp b/src/tools/rgbdViz/rgbdViz.cpp similarity index 74% rename from src/tools/rgbdViewer/rgbdViewer.cpp rename to src/tools/rgbdViz/rgbdViz.cpp index 795b464e7..b87906d4a 100644 --- a/src/tools/rgbdViewer/rgbdViewer.cpp +++ b/src/tools/rgbdViz/rgbdViz.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 1997-2013 JDE Developers TeamrgbdViewer.camRGB + * Copyright (C) 1997-2013 JDE Developers TeamrgbdViz.camRGB * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,7 +29,7 @@ #include #include #include -#include "rgbdViewergui.h" +#include "rgbdVizgui.h" #include "pthread.h" #include #include @@ -45,7 +45,7 @@ #define MAX_COMPONENTS 20 -rgbdViewer::rgbdViewergui* rgbdViewergui_ptx; +rgbdViz::rgbdVizgui* rgbdVizgui_ptx; //jderobot::PointcloudClientPtr pcClient; @@ -69,7 +69,7 @@ void *gui_thread(void* arg){ IceUtil::Time lastIT; lastIT=IceUtil::Time::now(); - while(rgbdViewergui_ptx->isVisible() && ! rgbdViewergui_ptx->isClosed()){ + while(rgbdVizgui_ptx->isVisible() && ! rgbdVizgui_ptx->isClosed()){ if (cameraRGBDActive) { JdeRobotTypes::Rgbd data = rgbClient->getRgbd(); @@ -93,23 +93,23 @@ void *gui_thread(void* arg){ */ if ((rgb.rows!=0)&&(depth.rows!=0)){ - rgbdViewergui_ptx->updateAll(rgb,depth, cloud); + rgbdVizgui_ptx->updateAll(rgb,depth, cloud); } else if (rgb.rows!=0){ - rgbdViewergui_ptx->updateRGB(rgb); + rgbdVizgui_ptx->updateRGB(rgb); } else if (depth.rows!=0){ - rgbdViewergui_ptx->updateDEPTH(depth); + rgbdVizgui_ptx->updateDEPTH(depth); } else{ - rgbdViewergui_ptx->updatePointCloud(cloud); + rgbdVizgui_ptx->updatePointCloud(cloud); } - if (((IceUtil::Time::now().toMicroSeconds() - lastIT.toMicroSeconds()) > rgbdViewergui_ptx->getCycle() )){ + if (((IceUtil::Time::now().toMicroSeconds() - lastIT.toMicroSeconds()) > rgbdVizgui_ptx->getCycle() )){ if (debug) - ;//std::cout<<"-------- rgbdViewer: timeout-" << std::endl; + ;//std::cout<<"-------- rgbdViz: timeout-" << std::endl; } else{ - usleep(rgbdViewergui_ptx->getCycle() - (IceUtil::Time::now().toMicroSeconds() - lastIT.toMicroSeconds())); + usleep(rgbdVizgui_ptx->getCycle() - (IceUtil::Time::now().toMicroSeconds() - lastIT.toMicroSeconds())); } lastIT=IceUtil::Time::now(); @@ -169,9 +169,9 @@ int main(int argc, char** argv){ } - cameraRGBActive=(bool)Comm::server2int(cfg.asStringWithDefault("rgbdViewer.CameraRGB.Server","0")); - cameraDepthActive=(bool)Comm::server2int(cfg.asStringWithDefault("rgbdViewer.CameraDEPTH.Server","0")); - cameraRGBDActive=(bool)Comm::server2int(cfg.asStringWithDefault("rgbdViewer.RGBD.Server","0")); + cameraRGBActive=(bool)Comm::server2int(cfg.asStringWithDefault("rgbdViz.CameraRGB.Server","0")); + cameraDepthActive=(bool)Comm::server2int(cfg.asStringWithDefault("rgbdViz.CameraDEPTH.Server","0")); + cameraRGBDActive=(bool)Comm::server2int(cfg.asStringWithDefault("rgbdViz.RGBD.Server","0")); if (cameraRGBDActive && (cameraRGBActive || cameraDepthActive)){ LOG(ERROR) << "RGBD and single cameras cannot be selected at the same time"; @@ -180,47 +180,47 @@ int main(int argc, char** argv){ if (cameraRGBDActive) { - rgbClient = Comm::getRgbdClient(jdrc, "rgbdViewer.RGBD"); + rgbClient = Comm::getRgbdClient(jdrc, "rgbdViz.RGBD"); if (rgbClient != NULL) { rgbCamSelected = true; create_gui = true; depthCamSelected=true; } else { - throw "rgbdViewer: failed to load RGBD interface"; + throw "rgbdViz: failed to load RGBD interface"; } } else{ if (cameraRGBActive) { - camRGB = Comm::getCameraClient(jdrc, "rgbdViewer.CameraRGB"); + camRGB = Comm::getCameraClient(jdrc, "rgbdViz.CameraRGB"); if (camRGB != NULL) { rgbCamSelected = true; create_gui = true; } else { - throw "rgbdViewer: failed to load RGB Camera"; + throw "rgbdViz: failed to load RGB Camera"; } } if (cameraDepthActive) { - camDEPTH =Comm::getCameraClient(jdrc, "rgbdViewer.CameraDEPTH"); + camDEPTH =Comm::getCameraClient(jdrc, "rgbdViz.CameraDEPTH"); if (camDEPTH != NULL) { depthCamSelected = true; create_gui = true; } else { - throw "rgbdViewer: failed to load DEPTH Camera"; + throw "rgbdViz: failed to load DEPTH Camera"; } } } - /*if (prop->getPropertyAsIntWithDefault("rgbdViewer.pointCloudActive",0)){ - pcClient = jderobot::PointcloudClientPtr(new jderobot::pointcloudClient(ic,"rgbdViewer.pointCloud.")); + /*if (prop->getPropertyAsIntWithDefault("rgbdViz.pointCloudActive",0)){ + pcClient = jderobot::PointcloudClientPtr(new jderobot::pointcloudClient(ic,"rgbdViz.pointCloud.")); if (pcClient!= NULL){ pcClient->start(); pointCloudSelected=true; create_gui=true; } else{ - throw "rgbdViewer: failed to load pointCloud"; + throw "rgbdViz: failed to load pointCloud"; } } */ @@ -257,16 +257,16 @@ int main(int argc, char** argv){ - debug=cfg.asIntWithDefault("rgbdViewer.Debug",320); - int fps=cfg.asIntWithDefault("rgbdViewer.Fps",0); + debug=cfg.asIntWithDefault("rgbdViz.Debug",320); + int fps=cfg.asIntWithDefault("rgbdViz.Fps",0); float cycle=(float)(1/(float)fps)*1000000; - std::string worldfile = cfg.asStringWithDefault("rgbdViewer.WorldFile", ""); - std::string camRGBFile = cfg.asStringWithDefault("rgbdViewer.camRGB", ""); - std::string camIRFile = cfg.asStringWithDefault("rgbdViewer.camIR", ""); + std::string worldfile = cfg.asStringWithDefault("rgbdViz.WorldFile", ""); + std::string camRGBFile = cfg.asStringWithDefault("rgbdViz.camRGB", ""); + std::string camIRFile = cfg.asStringWithDefault("rgbdViz.camIR", ""); - rgbdViewergui_ptx = new rgbdViewer::rgbdViewergui(rgbCamSelected,depthCamSelected, pointCloudSelected, worldfile, camRGBFile, camIRFile,rgbSize,depthSize, cycle); + rgbdVizgui_ptx = new rgbdViz::rgbdVizgui(rgbCamSelected,depthCamSelected, pointCloudSelected, worldfile, camRGBFile, camIRFile,rgbSize,depthSize, cycle); std::cout << create_gui << std::endl; if (create_gui){ @@ -275,8 +275,8 @@ int main(int argc, char** argv){ } - if (rgbdViewergui_ptx == NULL) - throw "rgbdViewer: Could not create the grafic interface"; + if (rgbdVizgui_ptx == NULL) + throw "rgbdViz: Could not create the grafic interface"; for (i = 0; i < n_components; i++) { pthread_join(threads[i], NULL); } diff --git a/src/tools/rgbdViewer/rgbdViewer.yml b/src/tools/rgbdViz/rgbdViz.yml similarity index 97% rename from src/tools/rgbdViewer/rgbdViewer.yml rename to src/tools/rgbdViz/rgbdViz.yml index 166c889f4..324e102d5 100644 --- a/src/tools/rgbdViewer/rgbdViewer.yml +++ b/src/tools/rgbdViz/rgbdViz.yml @@ -1,4 +1,4 @@ -rgbdViewer: +rgbdViz: CameraRGB: Server: Ice # Deactivate, Ice , ROS Proxy: "cameraA:tcp -h localhost -p 9999" @@ -42,7 +42,7 @@ rgbdViewer: Name: KinectLeds - NodeName: rgbdViewer + NodeName: rgbdViz #camRGB: "./config/joseMaria/CameraAEsquina.xml" #camIR: "./config/joseMaria/CameraAEsquina.xml" #WorldFile: "./config/fempsa/fempsa.cfg" diff --git a/src/tools/rgbdViewer/rgbdViewerKinect2.yml b/src/tools/rgbdViz/rgbdVizKinect2.yml similarity index 97% rename from src/tools/rgbdViewer/rgbdViewerKinect2.yml rename to src/tools/rgbdViz/rgbdVizKinect2.yml index 2deed0251..4cae746ec 100644 --- a/src/tools/rgbdViewer/rgbdViewerKinect2.yml +++ b/src/tools/rgbdViz/rgbdVizKinect2.yml @@ -1,4 +1,4 @@ -rgbdViewer: +rgbdViz: CameraRGB: Server: ROS # Deactivate, Ice , ROS Proxy: "cameraA:tcp -h localhost -p 9999" @@ -42,7 +42,7 @@ rgbdViewer: Name: KinectLeds - NodeName: rgbdViewer + NodeName: rgbdViz #camRGB: "./config/joseMaria/CameraAEsquina.xml" #camIR: "./config/joseMaria/CameraAEsquina.xml" #WorldFile: "./config/fempsa/fempsa.cfg" diff --git a/src/tools/rgbdViewer/rgbdViewergui.cpp b/src/tools/rgbdViz/rgbdVizgui.cpp similarity index 89% rename from src/tools/rgbdViewer/rgbdViewergui.cpp rename to src/tools/rgbdViz/rgbdVizgui.cpp index 0d05d2c5b..942caa167 100644 --- a/src/tools/rgbdViewer/rgbdViewergui.cpp +++ b/src/tools/rgbdViz/rgbdVizgui.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 1997-2013 JDE Developers TeamrgbdViewer.camRGB + * Copyright (C) 1997-2013 JDE Developers TeamrgbdViz.camRGB * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ */ -#include "rgbdViewergui.h" +#include "rgbdVizgui.h" #include #include #include @@ -27,8 +27,8 @@ #include #include -namespace rgbdViewer { -rgbdViewergui::rgbdViewergui(bool rgb, bool depth,bool pointCloud , std::string path, std::string path_rgb, std::string path_ir, cv::Size sizeRGB, cv::Size sizeDEPTH, float cycle): gtkmain(0,0) { +namespace rgbdViz { +rgbdVizgui::rgbdVizgui(bool rgb, bool depth,bool pointCloud , std::string path, std::string path_rgb, std::string path_ir, cv::Size sizeRGB, cv::Size sizeDEPTH, float cycle): gtkmain(0,0) { /*Init OpenGL*/ if(!Gtk::GL::init_check(NULL, NULL)) { @@ -72,7 +72,7 @@ rgbdViewergui::rgbdViewergui(bool rgb, bool depth,bool pointCloud , std::string lines_depth_active=false; lines_rgb_active=false; std::cout << "Loading glade\n"; - const std::string gladepath = resourcelocator::findGladeFile("rgbdViewergui.glade"); + const std::string gladepath = resourcelocator::findGladeFile("rgbdVizgui.glade"); refXml = Gnome::Glade::Xml::create(gladepath); myDepthSize=sizeDEPTH; myRGBSize=sizeRGB; @@ -81,7 +81,7 @@ rgbdViewergui::rgbdViewergui(bool rgb, bool depth,bool pointCloud , std::string /*Get widgets*/ - refXml->get_widget("rgbdViewer", mainwindow); + refXml->get_widget("rgbdViz", mainwindow); refXml->get_widget("imageRGB", w_imageRGB); refXml->get_widget("imageDEPTH", w_imageDEPTH); refXml->get_widget("eventboxRGB", w_event_rgb); @@ -117,19 +117,19 @@ rgbdViewergui::rgbdViewergui(bool rgb, bool depth,bool pointCloud , std::string w_toggle_depth->hide(); } - w_event_rgb->signal_button_press_event().connect(sigc::mem_fun(this,&rgbdViewergui::on_clicked_event_rgb)); - w_event_depth->signal_button_press_event().connect(sigc::mem_fun(this,&rgbdViewergui::on_clicked_event_depth)); - w_reconstruct->signal_toggled().connect(sigc::mem_fun(this,&rgbdViewergui::on_reconstruct_depth)); - w_camera_pos->signal_toggled().connect(sigc::mem_fun(this,&rgbdViewergui::add_camera_position)); - w_lines_rgb->signal_toggled().connect(sigc::mem_fun(this,&rgbdViewergui::on_w_lines_rgb_toggled)); - w_lines_depth->signal_toggled().connect(sigc::mem_fun(this,&rgbdViewergui::on_w_lines_depth_toggled)); - w_tg_gl->signal_toggled().connect(sigc::mem_fun(this,&rgbdViewergui::on_w_tg_gl_toggled)); - w_view_controller->signal_activate().connect(sigc::mem_fun(this,&rgbdViewergui::on_w_view_controller_activate)); - w_radio_depth->signal_toggled().connect(sigc::mem_fun(this,&rgbdViewergui::on_w_radio_depth_activate)); - w_radio_rgb->signal_toggled().connect(sigc::mem_fun(this,&rgbdViewergui::on_w_radio_rgb_activate)); - w_radio_mode_pointcloud->signal_toggled().connect(sigc::mem_fun(this,&rgbdViewergui::on_w_radio_mode_pointcloud_activate)); - w_radio_mode_image->signal_toggled().connect(sigc::mem_fun(this,&rgbdViewergui::on_w_radio_mode_image_activate)); - w_button_clear_lines->signal_clicked().connect(sigc::mem_fun(this,&rgbdViewergui::on_clicked_clear_lines)); + w_event_rgb->signal_button_press_event().connect(sigc::mem_fun(this,&rgbdVizgui::on_clicked_event_rgb)); + w_event_depth->signal_button_press_event().connect(sigc::mem_fun(this,&rgbdVizgui::on_clicked_event_depth)); + w_reconstruct->signal_toggled().connect(sigc::mem_fun(this,&rgbdVizgui::on_reconstruct_depth)); + w_camera_pos->signal_toggled().connect(sigc::mem_fun(this,&rgbdVizgui::add_camera_position)); + w_lines_rgb->signal_toggled().connect(sigc::mem_fun(this,&rgbdVizgui::on_w_lines_rgb_toggled)); + w_lines_depth->signal_toggled().connect(sigc::mem_fun(this,&rgbdVizgui::on_w_lines_depth_toggled)); + w_tg_gl->signal_toggled().connect(sigc::mem_fun(this,&rgbdVizgui::on_w_tg_gl_toggled)); + w_view_controller->signal_activate().connect(sigc::mem_fun(this,&rgbdVizgui::on_w_view_controller_activate)); + w_radio_depth->signal_toggled().connect(sigc::mem_fun(this,&rgbdVizgui::on_w_radio_depth_activate)); + w_radio_rgb->signal_toggled().connect(sigc::mem_fun(this,&rgbdVizgui::on_w_radio_rgb_activate)); + w_radio_mode_pointcloud->signal_toggled().connect(sigc::mem_fun(this,&rgbdVizgui::on_w_radio_mode_pointcloud_activate)); + w_radio_mode_image->signal_toggled().connect(sigc::mem_fun(this,&rgbdVizgui::on_w_radio_mode_image_activate)); + w_button_clear_lines->signal_clicked().connect(sigc::mem_fun(this,&rgbdVizgui::on_clicked_clear_lines)); if (modesAvalables==0) { w_reconstruct->hide(); @@ -140,11 +140,11 @@ rgbdViewergui::rgbdViewergui(bool rgb, bool depth,bool pointCloud , std::string world->setCamerasResolution(myDepthSize.width,myDepthSize.height); std::cout << "Creating Progeos Virtual Cameras" << std::endl; - mypro= new rgbdViewer::myprogeo(2,myRGBSize.width,myRGBSize.height); + mypro= new rgbdViz::myprogeo(2,myRGBSize.width,myRGBSize.height); mypro->load_cam((char*)path_rgb.c_str(),0,myRGBSize.width, myRGBSize.height); mypro->load_cam((char*)path_ir.c_str(),1,myDepthSize.width, myDepthSize.height); - //util = new rgbdViewer::util3d(mypro); + //util = new rgbdViz::util3d(mypro); /*Show window. Note: Set window visibility to false in Glade, otherwise opengl won't work*/ world->readFile(path); @@ -156,13 +156,13 @@ rgbdViewergui::rgbdViewergui(bool rgb, bool depth,bool pointCloud , std::string }*/ } -rgbdViewergui::~rgbdViewergui() { +rgbdVizgui::~rgbdVizgui() { //delete this->controller; } void -rgbdViewergui::updateAll( cv::Mat imageRGB, cv::Mat imageDEPTH, std::vector cloud ) +rgbdVizgui::updateAll( cv::Mat imageRGB, cv::Mat imageDEPTH, std::vector cloud ) { imageRGBlocal=imageRGB; @@ -229,7 +229,7 @@ rgbdViewergui::updateAll( cv::Mat imageRGB, cv::Mat imageDEPTH, std::vectorget_active()) { @@ -256,7 +256,7 @@ rgbdViewergui::updateRGB(cv::Mat imageRGB) } void -rgbdViewergui::updateDEPTH(cv::Mat imageDEPTH ) +rgbdVizgui::updateDEPTH(cv::Mat imageDEPTH ) { imageDEPTHlocal=imageDEPTH; CvPoint pt1,pt2; @@ -280,7 +280,7 @@ rgbdViewergui::updateDEPTH(cv::Mat imageDEPTH ) } void -rgbdViewergui::updatePointCloud(std::vector cloud ) +rgbdVizgui::updatePointCloud(std::vector cloud ) { displayFrameRate(); while (gtkmain.events_pending()) @@ -296,15 +296,15 @@ rgbdViewergui::updatePointCloud(std::vector cloud ) } -bool rgbdViewergui::isClosed() { +bool rgbdVizgui::isClosed() { return false; } -bool rgbdViewergui::isVisible() { +bool rgbdVizgui::isVisible() { return mainwindow->is_visible(); } -void rgbdViewergui::displayFrameRate() +void rgbdVizgui::displayFrameRate() { double diff; IceUtil::Time diffT; @@ -324,7 +324,7 @@ void rgbdViewergui::displayFrameRate() } } -bool rgbdViewergui::on_clicked_event_rgb(GdkEventButton* event) { +bool rgbdVizgui::on_clicked_event_rgb(GdkEventButton* event) { int x,y; float xp,yp,zp,camx,camy,camz; float xu,yu,zu; @@ -394,7 +394,7 @@ bool rgbdViewergui::on_clicked_event_rgb(GdkEventButton* event) { } -bool rgbdViewergui::on_clicked_event_depth(GdkEventButton* event) { +bool rgbdVizgui::on_clicked_event_depth(GdkEventButton* event) { int x,y; float xp,yp,zp,camx,camy,camz; float xu,yu,zu; @@ -467,7 +467,7 @@ bool rgbdViewergui::on_clicked_event_depth(GdkEventButton* event) { return true; } -void rgbdViewergui::add_cameras_position() { +void rgbdVizgui::add_cameras_position() { int x,y; float xp,yp,zp,camx,camy,camz; float xu,yu,zu; @@ -486,7 +486,7 @@ void rgbdViewergui::add_cameras_position() { } void -rgbdViewergui::on_reconstruct_depth() { +rgbdVizgui::on_reconstruct_depth() { std::cout << std::endl<< std::endl<< std::endl<< w_reconstruct->get_active() << std::endl<< std::endl<< std::endl<< std::endl; if (w_reconstruct->get_active()) { reconstruct_depth_activate=true; @@ -503,7 +503,7 @@ rgbdViewergui::on_reconstruct_depth() { } void -rgbdViewergui::add_depth_pointsImage(cv::Mat imageRGB, cv::Mat distance) { +rgbdVizgui::add_depth_pointsImage(cv::Mat imageRGB, cv::Mat distance) { float d; world->clear_points(); @@ -578,7 +578,7 @@ rgbdViewergui::add_depth_pointsImage(cv::Mat imageRGB, cv::Mat distance) { } void -rgbdViewergui::add_depth_pointsCloud(std::vector cloud) { +rgbdVizgui::add_depth_pointsCloud(std::vector cloud) { world->clear_points(); for (std::vector::iterator it = cloud.begin(); it != cloud.end(); ++it) { world->add_kinect_point(it->x,it->y,it->z,(int)it->r,(int)it->g,(int)it->b); @@ -586,7 +586,7 @@ rgbdViewergui::add_depth_pointsCloud(std::vector cloud) { } void -rgbdViewergui::add_camera_position() { +rgbdVizgui::add_camera_position() { float c1x, c1y, c1z, c2x, c2y, c2z, c3x, c3y, c3z, c4x, c4y,c4z; float camx, camy, camz; float w,h; @@ -665,7 +665,7 @@ rgbdViewergui::add_camera_position() { } void -rgbdViewergui::on_w_lines_rgb_toggled() { +rgbdVizgui::on_w_lines_rgb_toggled() { if (w_lines_rgb->get_active()) { lines_rgb_active=true; } @@ -674,7 +674,7 @@ rgbdViewergui::on_w_lines_rgb_toggled() { } void -rgbdViewergui::on_w_lines_depth_toggled() { +rgbdVizgui::on_w_lines_depth_toggled() { if (w_lines_depth->get_active()) { lines_depth_active=true; } @@ -683,18 +683,18 @@ rgbdViewergui::on_w_lines_depth_toggled() { } void -rgbdViewergui::on_w_view_controller_activate() { +rgbdVizgui::on_w_view_controller_activate() { w_window_controller->show(); } void -rgbdViewergui::on_w_radio_depth_activate() { +rgbdVizgui::on_w_radio_depth_activate() { if (w_radio_depth->get_active()) world->draw_kinect_with_color=false; } void -rgbdViewergui::on_w_radio_mode_pointcloud_activate() { +rgbdVizgui::on_w_radio_mode_pointcloud_activate() { if (w_radio_mode_pointcloud->get_active()){ reconstructMode=1; w_images_tool->hide(); @@ -702,7 +702,7 @@ rgbdViewergui::on_w_radio_mode_pointcloud_activate() { } void -rgbdViewergui::on_w_radio_mode_image_activate() { +rgbdVizgui::on_w_radio_mode_image_activate() { if (w_radio_mode_image->get_active()){ reconstructMode=0; w_images_tool->show(); @@ -710,18 +710,18 @@ rgbdViewergui::on_w_radio_mode_image_activate() { } void -rgbdViewergui::on_w_radio_rgb_activate() { +rgbdVizgui::on_w_radio_rgb_activate() { if (w_radio_rgb->get_active()) world->draw_kinect_with_color=true; } void -rgbdViewergui::on_clicked_clear_lines() { +rgbdVizgui::on_clicked_clear_lines() { world->clearExtraLines(); } void -rgbdViewergui::on_w_tg_gl_toggled() { +rgbdVizgui::on_w_tg_gl_toggled() { if (w_tg_gl->get_active()) { w_window_gl->show(); w_vbox_gl->show(); @@ -733,7 +733,7 @@ rgbdViewergui::on_w_tg_gl_toggled() { } float -rgbdViewergui::getCycle() { +rgbdVizgui::getCycle() { return this->cycle; } diff --git a/src/tools/rgbdViewer/rgbdViewergui.glade b/src/tools/rgbdViz/rgbdVizgui.glade similarity index 99% rename from src/tools/rgbdViewer/rgbdViewergui.glade rename to src/tools/rgbdViz/rgbdVizgui.glade index f02a01f2e..8019f3e9c 100644 --- a/src/tools/rgbdViewer/rgbdViewergui.glade +++ b/src/tools/rgbdViz/rgbdVizgui.glade @@ -2,9 +2,9 @@ - + False - rgbdViewer + rgbdViz True diff --git a/src/tools/rgbdViewer/rgbdViewergui.h b/src/tools/rgbdViz/rgbdVizgui.h similarity index 90% rename from src/tools/rgbdViewer/rgbdViewergui.h rename to src/tools/rgbdViz/rgbdVizgui.h index 388c3af40..ac4cc03bb 100644 --- a/src/tools/rgbdViewer/rgbdViewergui.h +++ b/src/tools/rgbdViz/rgbdVizgui.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1997-2013 JDE Developers TeamrgbdViewer.camRGB + * Copyright (C) 1997-2013 JDE Developers TeamrgbdViz.camRGB * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,8 +19,8 @@ */ -#ifndef rgbdViewer_VIEW_H -#define rgbdViewer_VIEW_H +#ifndef rgbdViz_VIEW_H +#define rgbdViz_VIEW_H #include #include @@ -36,12 +36,12 @@ #include //#include "util3d.h" -namespace rgbdViewer { - class rgbdViewergui { +namespace rgbdViz { + class rgbdVizgui { public: - rgbdViewergui(bool rgb, bool depth,bool pointCloud , std::string path, std::string path_rgb, std::string path_ir, cv::Size sizeRGB, cv::Size sizeDEPTH, float cycle); - virtual ~rgbdViewergui(); + rgbdVizgui(bool rgb, bool depth,bool pointCloud , std::string path, std::string path_rgb, std::string path_ir, cv::Size sizeRGB, cv::Size sizeDEPTH, float cycle); + virtual ~rgbdVizgui(); /*Return true if the windows is visible*/ bool isVisible(); @@ -139,4 +139,4 @@ namespace rgbdViewer { }; } // namespace -#endif /*rgbdViewer_VIEW_H*/ +#endif /*rgbdViz_VIEW_H*/ diff --git a/src/tools/rgbdViewer/util3d.cpp b/src/tools/rgbdViz/util3d.cpp similarity index 98% rename from src/tools/rgbdViewer/util3d.cpp rename to src/tools/rgbdViz/util3d.cpp index 9b5a828ac..b02d09634 100644 --- a/src/tools/rgbdViewer/util3d.cpp +++ b/src/tools/rgbdViz/util3d.cpp @@ -22,7 +22,7 @@ #include "util3d.h" -namespace rgbdViewer{ +namespace rgbdViz{ util3d::util3d(myprogeo* p){ mypro = p; diff --git a/src/tools/rgbdViewer/util3d.h b/src/tools/rgbdViz/util3d.h similarity index 98% rename from src/tools/rgbdViewer/util3d.h rename to src/tools/rgbdViz/util3d.h index a51851ed2..47c3d4c1c 100644 --- a/src/tools/rgbdViewer/util3d.h +++ b/src/tools/rgbdViz/util3d.h @@ -31,7 +31,7 @@ -namespace rgbdViewer { +namespace rgbdViz { class util3d { public: util3d(myprogeo* p); From 1e3fbe65b92fcfcbfa2e9e3c496828fcaebb9eb6 Mon Sep 17 00:00:00 2001 From: Francisco Perez Date: Thu, 3 May 2018 07:14:27 -0700 Subject: [PATCH 5/6] [issue #1147] Renamed rgbdViewer_py to rgbdViz_py --- src/tools/rgbdViewer_py/rgbdViewer_py.cfg | 5 ----- .../{rgbdViewer_py => rgbdViz_py}/interfaces/__init__.py | 0 .../{rgbdViewer_py => rgbdViz_py}/interfaces/cameraClient.py | 0 .../{rgbdViewer_py => rgbdViz_py}/interfaces/threadSensor.py | 0 .../{rgbdViewer_py/rgbdViewer.py => rgbdViz_py/rgbdViz.py} | 4 ++-- src/tools/rgbdViz_py/rgbdViz_py.cfg | 5 +++++ 6 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 src/tools/rgbdViewer_py/rgbdViewer_py.cfg rename src/tools/{rgbdViewer_py => rgbdViz_py}/interfaces/__init__.py (100%) rename src/tools/{rgbdViewer_py => rgbdViz_py}/interfaces/cameraClient.py (100%) rename src/tools/{rgbdViewer_py => rgbdViz_py}/interfaces/threadSensor.py (100%) rename src/tools/{rgbdViewer_py/rgbdViewer.py => rgbdViz_py/rgbdViz.py} (85%) create mode 100644 src/tools/rgbdViz_py/rgbdViz_py.cfg diff --git a/src/tools/rgbdViewer_py/rgbdViewer_py.cfg b/src/tools/rgbdViewer_py/rgbdViewer_py.cfg deleted file mode 100644 index f03bc235d..000000000 --- a/src/tools/rgbdViewer_py/rgbdViewer_py.cfg +++ /dev/null @@ -1,5 +0,0 @@ -rgbdViewer.CameraRGB.Fps=10 -rgbdViewer.CameraRGB.Proxy=cameraA:tcp -h localhost -p 9999 - -rgbdViewer.CameraDEPTH.Fps=10 -rgbdViewer.CameraDEPTH.Proxy=cameraB:tcp -h localhost -p 9999 diff --git a/src/tools/rgbdViewer_py/interfaces/__init__.py b/src/tools/rgbdViz_py/interfaces/__init__.py similarity index 100% rename from src/tools/rgbdViewer_py/interfaces/__init__.py rename to src/tools/rgbdViz_py/interfaces/__init__.py diff --git a/src/tools/rgbdViewer_py/interfaces/cameraClient.py b/src/tools/rgbdViz_py/interfaces/cameraClient.py similarity index 100% rename from src/tools/rgbdViewer_py/interfaces/cameraClient.py rename to src/tools/rgbdViz_py/interfaces/cameraClient.py diff --git a/src/tools/rgbdViewer_py/interfaces/threadSensor.py b/src/tools/rgbdViz_py/interfaces/threadSensor.py similarity index 100% rename from src/tools/rgbdViewer_py/interfaces/threadSensor.py rename to src/tools/rgbdViz_py/interfaces/threadSensor.py diff --git a/src/tools/rgbdViewer_py/rgbdViewer.py b/src/tools/rgbdViz_py/rgbdViz.py similarity index 85% rename from src/tools/rgbdViewer_py/rgbdViewer.py rename to src/tools/rgbdViz_py/rgbdViz.py index 10637bcf3..ac6224f77 100644 --- a/src/tools/rgbdViewer_py/rgbdViewer.py +++ b/src/tools/rgbdViz_py/rgbdViz.py @@ -11,8 +11,8 @@ if __name__ == "__main__": ic = EasyIce.initialize(sys.argv) properties = ic.getProperties() - cameraRGB = CameraClient(ic, "rgbdViewer.CameraRGB") - cameraDepth = CameraClient(ic, "rgbdViewer.CameraDEPTH") + cameraRGB = CameraClient(ic, "rgbdViz.CameraRGB") + cameraDepth = CameraClient(ic, "rgbdViz.CameraDEPTH") key=-1 while key != 1048689: diff --git a/src/tools/rgbdViz_py/rgbdViz_py.cfg b/src/tools/rgbdViz_py/rgbdViz_py.cfg new file mode 100644 index 000000000..b11d34853 --- /dev/null +++ b/src/tools/rgbdViz_py/rgbdViz_py.cfg @@ -0,0 +1,5 @@ +rgbdViz.CameraRGB.Fps=10 +rgbdViz.CameraRGB.Proxy=cameraA:tcp -h localhost -p 9999 + +rgbdViz.CameraDEPTH.Fps=10 +rgbdViz.CameraDEPTH.Proxy=cameraB:tcp -h localhost -p 9999 From 20b9319857fdf7f38afafe2e7de9aa8343c64f51 Mon Sep 17 00:00:00 2001 From: Francisco Perez Date: Thu, 3 May 2018 07:15:28 -0700 Subject: [PATCH 6/6] [issue #1147] Renamed components in several directories of jderobot --- buildpresets.cmake | 4 +- cmake/cpack_metainfo/drivers.cmake | 12 ++--- cmake/cpack_metainfo/tools.cmake | 24 +++++----- scripts/docker/jderobot/official/Dockerfile | 2 +- scripts/docker/jderobot/official/README.md | 4 +- .../jderobot/official/jderobot_entrypoint.sh | 2 +- .../jenkins/dev/packages/cameraserver.txt | 2 - .../jenkins/dev/packages/cameraserver_py.txt | 5 --- .../jenkins/dev/packages/cameraview.txt | 3 -- .../jenkins/dev/packages/cameraview_py.txt | 3 -- .../docker/jenkins/dev/packages/camserver.txt | 2 + .../jenkins/dev/packages/camserver_py.txt | 5 +++ .../docker/jenkins/dev/packages/camviz.txt | 3 ++ .../docker/jenkins/dev/packages/camviz_py.txt | 3 ++ .../docker/jenkins/dev/packages/carViz.txt | 2 + .../jenkins/dev/packages/kobukiViewer.txt | 2 - .../jenkins/dev/packages/rgbdViewer.txt | 4 -- .../docker/jenkins/dev/packages/rgbdViz.txt | 4 ++ scripts/metapackages/jderobot-drivers.info.in | 2 +- scripts/metapackages/jderobot-tools.info.in | 2 +- src/drivers/cameraserver_py/CMakeLists.txt | 22 --------- .../cameraserver_py/cameraserver_py.in | 3 -- .../CMakeLists.txt | 14 +++--- .../camserver.cfg} | 0 .../camserver.cpp} | 8 ++-- src/drivers/camserver_py/CMakeLists.txt | 22 +++++++++ .../camserver.py} | 8 ++-- src/drivers/camserver_py/camserver_py.in | 3 ++ .../camserver_py.yml} | 6 +-- .../serverImage.py | 0 .../include/jderobot/comm/bumperClient.hpp | 2 +- .../include/jderobot/comm/cameraClient.hpp | 2 +- .../include/jderobot/comm/laserClient.hpp | 2 +- .../include/jderobot/comm/motorsClient.hpp | 2 +- .../include/jderobot/comm/navdataClient.hpp | 2 +- .../include/jderobot/comm/pose3dClient.hpp | 2 +- .../include/jderobot/comm/rgbdClient.hpp | 2 +- .../include/jderobot/config/properties.hpp | 16 +++---- test/packages/cameraserver/cameraserver.txt | 2 - test/packages/cameraserver_py/Dockerfile | 45 ------------------- .../cameraserver_py/cameraserver_py.txt | 5 --- test/packages/cameraview/files.txt | 3 -- test/packages/cameraview_py/cameraview_py.txt | 3 -- .../{rgbdViewer => camserver}/Dockerfile | 6 +-- test/packages/camserver/camserver.txt | 2 + .../search_file.sh | 0 test/packages/camserver_py/Dockerfile | 45 +++++++++++++++++++ test/packages/camserver_py/camserver_py.txt | 5 +++ .../search_file.sh | 0 .../{cameraview => camviz}/Dockerfile | 2 +- test/packages/camviz/files.txt | 3 ++ .../{cameraview => camviz}/search_file.sh | 0 .../{cameraview_py => camviz_py}/Dockerfile | 2 +- test/packages/camviz_py/camviz_py.txt | 3 ++ .../search_file.sh | 0 .../{cameraserver => carViz}/Dockerfile | 6 +-- test/packages/carViz/carViz.txt | 2 + .../{kobukiViewer => carViz}/search_file.sh | 0 test/packages/kobukiViewer/kobukiViewer.txt | 2 - test/packages/make_text.sh | 4 +- test/packages/rgbdViewer/rgbdViewer.txt | 4 -- .../{kobukiViewer => rgbdViz}/Dockerfile | 6 +-- test/packages/rgbdViz/rgbdViz.txt | 4 ++ .../{rgbdViewer => rgbdViz}/search_file.sh | 0 test/packages/test_list.yml | 24 +++++----- 65 files changed, 192 insertions(+), 192 deletions(-) delete mode 100644 scripts/docker/jenkins/dev/packages/cameraserver.txt delete mode 100644 scripts/docker/jenkins/dev/packages/cameraserver_py.txt delete mode 100644 scripts/docker/jenkins/dev/packages/cameraview.txt delete mode 100644 scripts/docker/jenkins/dev/packages/cameraview_py.txt create mode 100644 scripts/docker/jenkins/dev/packages/camserver.txt create mode 100644 scripts/docker/jenkins/dev/packages/camserver_py.txt create mode 100644 scripts/docker/jenkins/dev/packages/camviz.txt create mode 100644 scripts/docker/jenkins/dev/packages/camviz_py.txt create mode 100644 scripts/docker/jenkins/dev/packages/carViz.txt delete mode 100644 scripts/docker/jenkins/dev/packages/kobukiViewer.txt delete mode 100644 scripts/docker/jenkins/dev/packages/rgbdViewer.txt create mode 100644 scripts/docker/jenkins/dev/packages/rgbdViz.txt delete mode 100644 src/drivers/cameraserver_py/CMakeLists.txt delete mode 100644 src/drivers/cameraserver_py/cameraserver_py.in rename src/drivers/{cameraserver => camserver}/CMakeLists.txt (69%) rename src/drivers/{cameraserver/cameraserver.cfg => camserver/camserver.cfg} (100%) rename src/drivers/{cameraserver/cameraserver.cpp => camserver/camserver.cpp} (97%) create mode 100644 src/drivers/camserver_py/CMakeLists.txt rename src/drivers/{cameraserver_py/cameraserver.py => camserver_py/camserver.py} (85%) create mode 100644 src/drivers/camserver_py/camserver_py.in rename src/drivers/{cameraserver_py/cameraserver_py.yml => camserver_py/camserver_py.yml} (63%) rename src/drivers/{cameraserver_py => camserver_py}/serverImage.py (100%) delete mode 100644 test/packages/cameraserver/cameraserver.txt delete mode 100644 test/packages/cameraserver_py/Dockerfile delete mode 100644 test/packages/cameraserver_py/cameraserver_py.txt delete mode 100644 test/packages/cameraview/files.txt delete mode 100644 test/packages/cameraview_py/cameraview_py.txt rename test/packages/{rgbdViewer => camserver}/Dockerfile (94%) create mode 100644 test/packages/camserver/camserver.txt rename test/packages/{cameraserver => camserver}/search_file.sh (100%) create mode 100644 test/packages/camserver_py/Dockerfile create mode 100644 test/packages/camserver_py/camserver_py.txt rename test/packages/{cameraserver_py => camserver_py}/search_file.sh (100%) rename test/packages/{cameraview => camviz}/Dockerfile (98%) create mode 100644 test/packages/camviz/files.txt rename test/packages/{cameraview => camviz}/search_file.sh (100%) rename test/packages/{cameraview_py => camviz_py}/Dockerfile (97%) create mode 100644 test/packages/camviz_py/camviz_py.txt rename test/packages/{cameraview_py => camviz_py}/search_file.sh (100%) rename test/packages/{cameraserver => carViz}/Dockerfile (94%) create mode 100644 test/packages/carViz/carViz.txt rename test/packages/{kobukiViewer => carViz}/search_file.sh (100%) delete mode 100644 test/packages/kobukiViewer/kobukiViewer.txt delete mode 100644 test/packages/rgbdViewer/rgbdViewer.txt rename test/packages/{kobukiViewer => rgbdViz}/Dockerfile (94%) create mode 100644 test/packages/rgbdViz/rgbdViz.txt rename test/packages/{rgbdViewer => rgbdViz}/search_file.sh (100%) diff --git a/buildpresets.cmake b/buildpresets.cmake index f3895bdcd..d03298cf5 100644 --- a/buildpresets.cmake +++ b/buildpresets.cmake @@ -125,7 +125,7 @@ if (test_flyingKinect) build_component(flyingKinect2 ON) build_component(quadrotor2 ON) # dependency build_component(navigatorCamera ON) - build_component(rgbdViewer ON) + build_component(rgbdViz ON) build_component(core ON "ONLY_ON") endif() @@ -146,7 +146,7 @@ if (build_drivers) # core drivers build_component(ardrone_server ON) build_component(basic_server ON) - build_component(cameraserver ON) + build_component(camserver ON) build_component(gazebo ON) build_component(car ON) build_component(flyingKinect ON) diff --git a/cmake/cpack_metainfo/drivers.cmake b/cmake/cpack_metainfo/drivers.cmake index e4e71c843..851854e0a 100644 --- a/cmake/cpack_metainfo/drivers.cmake +++ b/cmake/cpack_metainfo/drivers.cmake @@ -9,15 +9,15 @@ SET(CPACK_COMPONENT_BASIC-SERVER_DESCRIPTION "An example of the most basic server made for JdeRobot based on ICE communications. Home page https://jderobot.org") -SET(CPACK_DEBIAN_CAMERASERVER_DEPENDS "jderobot-easyice, jderobot-util, jderobot-interfaces, jderobot-logger, jderobot-ns, jderobot-colorspaces") -SET(CPACK_COMPONENT_CAMERASERVER_DESCRIPTION +SET(CPACK_DEBIAN_CAMSERVER_DEPENDS "jderobot-easyice, jderobot-util, jderobot-interfaces, jderobot-logger, jderobot-ns, jderobot-colorspaces") +SET(CPACK_COMPONENT_CAMSERVER_DESCRIPTION "Generic server for RGB cameras. - Manual Page http://jderobot.org/index.php/Drivers#cameraserver + Manual Page http://jderobot.org/index.php/Drivers#camserver Home page https://jderobot.org") -SET(CPACK_DEBIAN_CAMERASERVER-PYTHON_PACKAGE_DEPENDS "jderobot-config-python, jderobot-interfaces") -SET(CPACK_COMPONENT_CAMERASERVER-PYTHON_DESCRIPTION -"Example of cameraserver driver in python +SET(CPACK_DEBIAN_CAMSERVER-PYTHON_PACKAGE_DEPENDS "jderobot-config-python, jderobot-interfaces") +SET(CPACK_COMPONENT_CAMSERVER-PYTHON_DESCRIPTION +"Example of camserver driver in python Manual Page http://jderobot.org/ Home page https://jderobot.org") diff --git a/cmake/cpack_metainfo/tools.cmake b/cmake/cpack_metainfo/tools.cmake index bd26c010c..a9d457ea5 100644 --- a/cmake/cpack_metainfo/tools.cmake +++ b/cmake/cpack_metainfo/tools.cmake @@ -22,16 +22,16 @@ SET(CPACK_COMPONENT_COLORTUNER-PYTHON_DESCRIPTION Manual page http://jderobot.org/index.php/Tools#ColorTuner_.28Python.29 Home page https://jderobot.org") -SET(CPACK_DEBIAN_CAMERAVIEW_PACKAGE_DEPENDS "jderobot-config, jderobot-comm, jderobot-util, jderobot-interfaces, jderobot-resourcelocator, jderobot-colorspaces") -SET(CPACK_COMPONENT_CAMERAVIEW_DESCRIPTION +SET(CPACK_DEBIAN_CAMVIZ_PACKAGE_DEPENDS "jderobot-config, jderobot-comm, jderobot-util, jderobot-interfaces, jderobot-resourcelocator, jderobot-colorspaces") +SET(CPACK_COMPONENT_CAMVIZ_DESCRIPTION "Generic viewer for cameras - Manual Page http://jderobot.org/index.php/Tools#CameraView + Manual Page http://jderobot.org/index.php/Tools#CamViz Home page https://jderobot.org") -SET(CPACK_DEBIAN_CAMERAVIEW-PYTHON_PACKAGE_DEPENDS "jderobot-easyice, jderobot-comm, jderobot-util, jderobot-interfaces, jderobot-resourcelocator, jderobot-colorspaces") -SET(CPACK_COMPONENT_CAMERAVIEW-PYTHON_DESCRIPTION +SET(CPACK_DEBIAN_CAMVIZ-PYTHON_PACKAGE_DEPENDS "jderobot-easyice, jderobot-comm, jderobot-util, jderobot-interfaces, jderobot-resourcelocator, jderobot-colorspaces") +SET(CPACK_COMPONENT_CAMVIZ-PYTHON_DESCRIPTION "Generic viewer for cameras in python - Manual Page http://jderobot.org/index.php/Tools#CameraView + Manual Page http://jderobot.org/index.php/Tools#CamViz Home page https://jderobot.org") SET(CPACK_DEBIAN_GIRAFFECLIENT_PACKAGE_DEPENDS "jderobot-easyice, jderobot-progeo, jderobot-util, jderobot-interfaces, jderobot-colorspaces") @@ -40,10 +40,10 @@ SET(CPACK_COMPONENT_GIRAFFECLIENT_DESCRIPTION Manual Page Home page https://jderobot.org") -SET(CPACK_DEBIAN_KOBUKIVIEWER_PACKAGE_DEPENDS "jderobot-config, jderobot-comm") -SET(CPACK_COMPONENT_KOBUKIVIEWER_DESCRIPTION +SET(CPACK_DEBIAN_CARVIZ_PACKAGE_DEPENDS "jderobot-config, jderobot-comm") +SET(CPACK_COMPONENT_CARVIZ_DESCRIPTION "Teleoperator for vehicle-type robots, such as kobuki, pioneer, cars, etc. - Manual page http://jderobot.org/index.php/Tools#KobukiViewer + Manual page http://jderobot.org/index.php/Tools#carViz Home page https://jderobot.org") SET(CPACK_DEBIAN_NAMINGSERVICE_PACKAGE_DEPENDS "jderobot-easyice") @@ -100,10 +100,10 @@ SET(CPACK_COMPONENT_RGBDMANUALCALIBRATOR_DESCRIPTION Manual Page Home page https://jderobot.org") -SET(CPACK_DEBIAN_RGBDVIEWER_PACKAGE_DEPENDS "jderobot-easyice, jderobot-geometry, jderobot-util, jderobot-interfaces, jderobot-parallelice, jderobot-progeo, jderobot-resourcelocator, jderobot-colorspaces") -SET(CPACK_COMPONENT_RGBDVIEWER_DESCRIPTION +SET(CPACK_DEBIAN_RGBDVIZ_PACKAGE_DEPENDS "jderobot-easyice, jderobot-geometry, jderobot-util, jderobot-interfaces, jderobot-parallelice, jderobot-progeo, jderobot-resourcelocator, jderobot-colorspaces") +SET(CPACK_COMPONENT_RGBDVIZ_DESCRIPTION "Generic viewer for RGBD cameras. Included an openGL viewer for pointcloud representation. - Manual Page http://jderobot.org/index.php/Tools#RGBDViewer + Manual Page http://jderobot.org/index.php/Tools#RGBDViz Home page https://jderobot.org") SET(CPACK_DEBIAN_SCRACTCH2JDEROBOT_PACKAGE_DEPENDS "python-parse, python-termcolor, python-pyqt5, python-pip, python-numpy, python-pyqt5.qtsvg, jderobot-parallelice-python, jderobot-comm-python, kurt-jderobot") diff --git a/scripts/docker/jderobot/official/Dockerfile b/scripts/docker/jderobot/official/Dockerfile index 336a58eae..61d7fb18f 100644 --- a/scripts/docker/jderobot/official/Dockerfile +++ b/scripts/docker/jderobot/official/Dockerfile @@ -6,7 +6,7 @@ LABEL manteiner Aitor Martínez Fernández+aitor.martinez.fernandez@gmail.com ########## USAGE ############## LABEL Usage.run="docker run -itP --rm -p 7681:7681 jderobot/jderobot" -LABEL Usage.cameraserver="docker run -itP --rm jderobot/jderobot video [video_name]" +LABEL Usage.camserver="docker run -itP --rm jderobot/jderobot video [video_name]" LABEL Usage.listVideos="docker run --rm jderobot/jderobot lsvideo" diff --git a/scripts/docker/jderobot/official/README.md b/scripts/docker/jderobot/official/README.md index 658c33e98..dbb7b5611 100644 --- a/scripts/docker/jderobot/official/README.md +++ b/scripts/docker/jderobot/official/README.md @@ -6,7 +6,7 @@ This is the official Docker image of [JdeRobot project](http://jderobot.org), a It contains all the necessary components to be used with [Teaching Robotics](http://jderobot.org/Teaching_robotics_with_JdeRobot): * JdeRobot package installed * Gzweb prepare to use -* Videos for be used with cameraserver component +* Videos for be used with camserver component * Nano TextEditor installed ... # Usage @@ -14,7 +14,7 @@ It contains all the necessary components to be used with [Teaching Robotics](htt ```sh docker run -tiP --rm -p 7681:7681 jderobot/jderobot ``` -* Cameraserver with video: +* Camserver with video: ```sh docker run -tiP --rm -p 9000:9000 jderobot/jderobot video [video_name] ``` diff --git a/scripts/docker/jderobot/official/jderobot_entrypoint.sh b/scripts/docker/jderobot/official/jderobot_entrypoint.sh index f68777542..38fc15f47 100755 --- a/scripts/docker/jderobot/official/jderobot_entrypoint.sh +++ b/scripts/docker/jderobot/official/jderobot_entrypoint.sh @@ -6,7 +6,7 @@ source /opt/ros/kinetic/setup.bash if [ "$1" = 'video' ]; then cd /cfg - cameraserver $2 + camserver $2 elif [ "$1" = 'lsvideos' ]; then diff --git a/scripts/docker/jenkins/dev/packages/cameraserver.txt b/scripts/docker/jenkins/dev/packages/cameraserver.txt deleted file mode 100644 index aba0cc807..000000000 --- a/scripts/docker/jenkins/dev/packages/cameraserver.txt +++ /dev/null @@ -1,2 +0,0 @@ -/opt/jderobot/bin/cameraserver -/opt/jderobot/share/jderobot/conf/cameraserver.cfg \ No newline at end of file diff --git a/scripts/docker/jenkins/dev/packages/cameraserver_py.txt b/scripts/docker/jenkins/dev/packages/cameraserver_py.txt deleted file mode 100644 index d1ad21976..000000000 --- a/scripts/docker/jenkins/dev/packages/cameraserver_py.txt +++ /dev/null @@ -1,5 +0,0 @@ -/opt/jderobot/bin/cameraserver_py -/opt/jderobot/share/jderobot/python/cameraserver_py/cameraserver.py -/opt/jderobot/share/jderobot/python/cameraserver_py/ImageProviderI.py -/opt/jderobot/share/jderobot/python/cameraserver_py/threadImage.py -/opt/jderobot/share/jderobot/conf/cameraserver_py.yml \ No newline at end of file diff --git a/scripts/docker/jenkins/dev/packages/cameraview.txt b/scripts/docker/jenkins/dev/packages/cameraview.txt deleted file mode 100644 index bb03102ec..000000000 --- a/scripts/docker/jenkins/dev/packages/cameraview.txt +++ /dev/null @@ -1,3 +0,0 @@ -/opt/jderobot/share/jderobot/glade/cameraview.glade -/opt/jderobot/share/jderobot/conf/cameraview.yml -/opt/jderobot/bin/cameraview \ No newline at end of file diff --git a/scripts/docker/jenkins/dev/packages/cameraview_py.txt b/scripts/docker/jenkins/dev/packages/cameraview_py.txt deleted file mode 100644 index 28a45698f..000000000 --- a/scripts/docker/jenkins/dev/packages/cameraview_py.txt +++ /dev/null @@ -1,3 +0,0 @@ -/opt/jderobot/bin/cameraview_py -/opt/jderobot/share/jderobot/python/cameraview_py/cameraview.py -/opt/jderobot/share/jderobot/conf/cameraview_py.cfg \ No newline at end of file diff --git a/scripts/docker/jenkins/dev/packages/camserver.txt b/scripts/docker/jenkins/dev/packages/camserver.txt new file mode 100644 index 000000000..4ce168c57 --- /dev/null +++ b/scripts/docker/jenkins/dev/packages/camserver.txt @@ -0,0 +1,2 @@ +/opt/jderobot/bin/camserver +/opt/jderobot/share/jderobot/conf/camserver.cfg diff --git a/scripts/docker/jenkins/dev/packages/camserver_py.txt b/scripts/docker/jenkins/dev/packages/camserver_py.txt new file mode 100644 index 000000000..1e77f5fd5 --- /dev/null +++ b/scripts/docker/jenkins/dev/packages/camserver_py.txt @@ -0,0 +1,5 @@ +/opt/jderobot/bin/camserver_py +/opt/jderobot/share/jderobot/python/camserver_py/camserver.py +/opt/jderobot/share/jderobot/python/camserver_py/ImageProviderI.py +/opt/jderobot/share/jderobot/python/camserver_py/threadImage.py +/opt/jderobot/share/jderobot/conf/camserver_py.yml diff --git a/scripts/docker/jenkins/dev/packages/camviz.txt b/scripts/docker/jenkins/dev/packages/camviz.txt new file mode 100644 index 000000000..74d295152 --- /dev/null +++ b/scripts/docker/jenkins/dev/packages/camviz.txt @@ -0,0 +1,3 @@ +/opt/jderobot/share/jderobot/glade/camviz.glade +/opt/jderobot/share/jderobot/conf/camviz.yml +/opt/jderobot/bin/camviz diff --git a/scripts/docker/jenkins/dev/packages/camviz_py.txt b/scripts/docker/jenkins/dev/packages/camviz_py.txt new file mode 100644 index 000000000..f70bade67 --- /dev/null +++ b/scripts/docker/jenkins/dev/packages/camviz_py.txt @@ -0,0 +1,3 @@ +/opt/jderobot/bin/camviz_py +/opt/jderobot/share/jderobot/python/camviz_py/camviz.py +/opt/jderobot/share/jderobot/conf/camviz_py.cfg diff --git a/scripts/docker/jenkins/dev/packages/carViz.txt b/scripts/docker/jenkins/dev/packages/carViz.txt new file mode 100644 index 000000000..5546bc54f --- /dev/null +++ b/scripts/docker/jenkins/dev/packages/carViz.txt @@ -0,0 +1,2 @@ +/opt/jderobot/bin/carViz +/opt/jderobot/share/jderobot/conf/carViz.yml diff --git a/scripts/docker/jenkins/dev/packages/kobukiViewer.txt b/scripts/docker/jenkins/dev/packages/kobukiViewer.txt deleted file mode 100644 index 34a191d4c..000000000 --- a/scripts/docker/jenkins/dev/packages/kobukiViewer.txt +++ /dev/null @@ -1,2 +0,0 @@ -/opt/jderobot/bin/kobukiViewer -/opt/jderobot/share/jderobot/conf/kobukiViewer.yml \ No newline at end of file diff --git a/scripts/docker/jenkins/dev/packages/rgbdViewer.txt b/scripts/docker/jenkins/dev/packages/rgbdViewer.txt deleted file mode 100644 index e639d52a0..000000000 --- a/scripts/docker/jenkins/dev/packages/rgbdViewer.txt +++ /dev/null @@ -1,4 +0,0 @@ -/opt/jderobot/bin/rgbdViewer -/opt/jderobot/share/jderobot/glade/rgbdViewergui.glade -/opt/jderobot/share/jderobot/conf/rgbdViewer.cfg -/opt/jderobot/share/jderobot/conf/camera-0.cfg diff --git a/scripts/docker/jenkins/dev/packages/rgbdViz.txt b/scripts/docker/jenkins/dev/packages/rgbdViz.txt new file mode 100644 index 000000000..acf203daa --- /dev/null +++ b/scripts/docker/jenkins/dev/packages/rgbdViz.txt @@ -0,0 +1,4 @@ +/opt/jderobot/bin/rgbdViz +/opt/jderobot/share/jderobot/glade/rgbdVizgui.glade +/opt/jderobot/share/jderobot/conf/rgbdViz.cfg +/opt/jderobot/share/jderobot/conf/camera-0.cfg diff --git a/scripts/metapackages/jderobot-drivers.info.in b/scripts/metapackages/jderobot-drivers.info.in index 3c663ca41..88c977650 100644 --- a/scripts/metapackages/jderobot-drivers.info.in +++ b/scripts/metapackages/jderobot-drivers.info.in @@ -8,7 +8,7 @@ Section: net Priority: extra Size: 0 Installed-Size: 0 -Depends: jderobot-ardrone-server, jderobot-cameraserver, jderobot-gazebo, jderobot-mavlinkserver, jderobot-openni1server, jderobot-openniserver, jderobot-pclrgbdserver,jderobot-evicamdriver, jderobot-cameraserver-python, jderobot-youtubeserver-python +Depends: jderobot-ardrone-server, jderobot-camserver, jderobot-gazebo, jderobot-mavlinkserver, jderobot-openni1server, jderobot-openniserver, jderobot-pclrgbdserver,jderobot-evicamdriver, jderobot-camserver-python, jderobot-youtubeserver-python Maintainer: Francisco Perez Homepage: http://jderobot.org Description: Metapackage that gathers all the drivers of JdeRobot framework. diff --git a/scripts/metapackages/jderobot-tools.info.in b/scripts/metapackages/jderobot-tools.info.in index babae4a3c..2dd31171e 100644 --- a/scripts/metapackages/jderobot-tools.info.in +++ b/scripts/metapackages/jderobot-tools.info.in @@ -8,7 +8,7 @@ Section: net Priority: extra Size: 0 Installed-Size: 0 -Depends: jderobot-cameracalibrator, jderobot-cameraview, jderobot-cameraview-python, jderobot-colortuner-python, jderobot-giraffeclient, jderobot-kobukiviewer, jderobot-namingservice, jderobot-navigatorcamera, jderobot-pantiltteleop-python, jderobot-recorder2, jderobot-replaycontroller, jderobot-replayer2, jderobot-rgbdcalibrator, jderobot-rgbdmanualcalibrator, jderobot-rgbdviewer, jderobot-uav-viewer, jderobot-uav-viewer-python, jderobot-scratch2jderobot, jderobot-visualstates-python, jderobot-webtools +Depends: jderobot-cameracalibrator, jderobot-camviz, jderobot-camviz-python, jderobot-colortuner-python, jderobot-giraffeclient, jderobot-carviz, jderobot-namingservice, jderobot-navigatorcamera, jderobot-pantiltteleop-python, jderobot-recorder2, jderobot-replaycontroller, jderobot-replayer2, jderobot-rgbdcalibrator, jderobot-rgbdmanualcalibrator, jderobot-rgbdviz, jderobot-uav-viewer, jderobot-uav-viewer-python, jderobot-scratch2jderobot, jderobot-visualstates-python, jderobot-webtools Maintainer: Francisco Perez Homepage: http://jderobot.org Description: Metapackage that gathers all the tools of JdeRobot framework. diff --git a/src/drivers/cameraserver_py/CMakeLists.txt b/src/drivers/cameraserver_py/CMakeLists.txt deleted file mode 100644 index f66bce304..000000000 --- a/src/drivers/cameraserver_py/CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -configure_file( - cameraserver_py.in - cameraserver_py - @ONLY -) -## INSTALL ## - -install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/cameraserver_py - PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ - DESTINATION bin - COMPONENT cameraserver-python -) - -# Install .py -FILE(GLOB_RECURSE HEADERS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*py) -FOREACH(header ${HEADERS_FILES}) - INSTALL(FILES ${header} DESTINATION share/jderobot/python/cameraserver_py/ COMPONENT cameraserver-python) -ENDFOREACH(header) - - -INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/cameraserver_py.yml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf COMPONENT cameraserver-python) diff --git a/src/drivers/cameraserver_py/cameraserver_py.in b/src/drivers/cameraserver_py/cameraserver_py.in deleted file mode 100644 index 2845713d2..000000000 --- a/src/drivers/cameraserver_py/cameraserver_py.in +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -python @CMAKE_INSTALL_PREFIX@/share/jderobot/python/cameraserver_py/cameraserver.py $* \ No newline at end of file diff --git a/src/drivers/cameraserver/CMakeLists.txt b/src/drivers/camserver/CMakeLists.txt similarity index 69% rename from src/drivers/cameraserver/CMakeLists.txt rename to src/drivers/camserver/CMakeLists.txt index a51e574cb..36552bbb1 100644 --- a/src/drivers/cameraserver/CMakeLists.txt +++ b/src/drivers/camserver/CMakeLists.txt @@ -1,5 +1,5 @@ -SET( SOURCE_FILES cameraserver.cpp) +SET( SOURCE_FILES camserver.cpp) add_definitions(-DGLADE_DIR="${gladedir}") @@ -14,9 +14,9 @@ link_directories( ${easyiceconfig_LIBRARY_DIRS} ) -add_executable (cameraserver ${SOURCE_FILES}) +add_executable (camserver ${SOURCE_FILES}) -TARGET_LINK_LIBRARIES(cameraserver +TARGET_LINK_LIBRARIES(camserver jderobotutil ${OpenCV_LIBRARIES} ${OpenCVGUI_LIBRARIES} @@ -32,12 +32,12 @@ TARGET_LINK_LIBRARIES(cameraserver ${GLOG_LIBRARIES} ) -INSTALL(TARGETS cameraserver +INSTALL(TARGETS camserver DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ - COMPONENT cameraserver + COMPONENT camserver ) -INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/cameraserver.cfg +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/camserver.cfg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf - COMPONENT cameraserver + COMPONENT camserver ) diff --git a/src/drivers/cameraserver/cameraserver.cfg b/src/drivers/camserver/camserver.cfg similarity index 100% rename from src/drivers/cameraserver/cameraserver.cfg rename to src/drivers/camserver/camserver.cfg diff --git a/src/drivers/cameraserver/cameraserver.cpp b/src/drivers/camserver/camserver.cpp similarity index 97% rename from src/drivers/cameraserver/cameraserver.cpp rename to src/drivers/camserver/camserver.cpp index 3d7744bd2..74800a414 100644 --- a/src/drivers/cameraserver/cameraserver.cpp +++ b/src/drivers/camserver/camserver.cpp @@ -52,7 +52,7 @@ bool flag=false; /** boolean to keep a check on signal */ -namespace cameraserver{ +namespace camserver{ class CameraI: public jderobot::CameraHandler { public: @@ -205,7 +205,7 @@ int main(int argc, char** argv) if(obj==0){ // no service mode configuration - std::cerr << "Error: cameraserver needs server configuration mode\n" << std::endl; + std::cerr << "Error: camserver needs server configuration mode\n" << std::endl; fflush(NULL); exit(0); @@ -233,14 +233,14 @@ int main(int argc, char** argv) int nCameras = prop->getPropertyAsInt("CameraSrv.NCameras"); cameras.resize(nCameras); - Ice::ObjectAdapterPtr adapter =ic->createObjectAdapterWithEndpoints("CameraServer", Endpoints); + Ice::ObjectAdapterPtr adapter =ic->createObjectAdapterWithEndpoints("CamServer", Endpoints); for (int i=0; igetProperty(objPrefix + "Name"); - Ice::ObjectPtr object = new cameraserver::CameraI(objPrefix, ic); + Ice::ObjectPtr object = new camserver::CameraI(objPrefix, ic); adapter->add(object, ic->stringToIdentity(cameraName)); diff --git a/src/drivers/camserver_py/CMakeLists.txt b/src/drivers/camserver_py/CMakeLists.txt new file mode 100644 index 000000000..17d90cbec --- /dev/null +++ b/src/drivers/camserver_py/CMakeLists.txt @@ -0,0 +1,22 @@ +configure_file( + camserver_py.in + camserver_py + @ONLY +) +## INSTALL ## + +install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/camserver_py + PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ + DESTINATION bin + COMPONENT camserver-python +) + +# Install .py +FILE(GLOB_RECURSE HEADERS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*py) +FOREACH(header ${HEADERS_FILES}) + INSTALL(FILES ${header} DESTINATION share/jderobot/python/camserver_py/ COMPONENT camserver-python) +ENDFOREACH(header) + + +INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/camserver_py.yml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jderobot/conf COMPONENT camserver-python) diff --git a/src/drivers/cameraserver_py/cameraserver.py b/src/drivers/camserver_py/camserver.py similarity index 85% rename from src/drivers/cameraserver_py/cameraserver.py rename to src/drivers/camserver_py/camserver.py index 641db0b50..5342acbeb 100644 --- a/src/drivers/cameraserver_py/cameraserver.py +++ b/src/drivers/camserver_py/camserver.py @@ -14,10 +14,10 @@ if __name__== "__main__": cfg = config.load(sys.argv[1]) - topic = cfg.getProperty("cameraServer.Topic") - fps = cfg.getPropertyWithDefault("cameraServer.FrameRate",12) - uri = cfg.getProperty("cameraServer.Uri") - name = cfg.getProperty("cameraServer.Name") + topic = cfg.getProperty("camServer.Topic") + fps = cfg.getPropertyWithDefault("camServer.FrameRate",12) + uri = cfg.getProperty("camServer.Uri") + name = cfg.getProperty("camServer.Name") if type(uri) == str and "." in uri and uri.split(".")[-1] in img_formats: print "loading image: ", uri.split("/")[-1] diff --git a/src/drivers/camserver_py/camserver_py.in b/src/drivers/camserver_py/camserver_py.in new file mode 100644 index 000000000..086579874 --- /dev/null +++ b/src/drivers/camserver_py/camserver_py.in @@ -0,0 +1,3 @@ +#!/bin/bash + +python @CMAKE_INSTALL_PREFIX@/share/jderobot/python/camserver_py/camserver.py $* \ No newline at end of file diff --git a/src/drivers/cameraserver_py/cameraserver_py.yml b/src/drivers/camserver_py/camserver_py.yml similarity index 63% rename from src/drivers/cameraserver_py/cameraserver_py.yml rename to src/drivers/camserver_py/camserver_py.yml index dfa90899f..39479472f 100644 --- a/src/drivers/cameraserver_py/cameraserver_py.yml +++ b/src/drivers/camserver_py/camserver_py.yml @@ -1,5 +1,5 @@ -cameraServer: - Topic: "cameraserver/rgb" +camServer: + Topic: "camserver/rgb" Uri: 0 #0 corresponds to /dev/video0, 1 to /dev/video1, and so on... FrameRate: 12 #FPS readed from device - Name: cameraserver + Name: camserver diff --git a/src/drivers/cameraserver_py/serverImage.py b/src/drivers/camserver_py/serverImage.py similarity index 100% rename from src/drivers/cameraserver_py/serverImage.py rename to src/drivers/camserver_py/serverImage.py diff --git a/src/libs/comm_cpp/include/jderobot/comm/bumperClient.hpp b/src/libs/comm_cpp/include/jderobot/comm/bumperClient.hpp index 11755e770..86aa8ea3c 100644 --- a/src/libs/comm_cpp/include/jderobot/comm/bumperClient.hpp +++ b/src/libs/comm_cpp/include/jderobot/comm/bumperClient.hpp @@ -40,7 +40,7 @@ namespace Comm { * * * @param communicator that contains properties - * @param prefix of client Propierties (example: "kobukiViewer.Bumper") + * @param prefix of client Propierties (example: "carViz.Bumper") * * * @return null if propierties are wrong diff --git a/src/libs/comm_cpp/include/jderobot/comm/cameraClient.hpp b/src/libs/comm_cpp/include/jderobot/comm/cameraClient.hpp index 961ec0d9f..15937bed7 100644 --- a/src/libs/comm_cpp/include/jderobot/comm/cameraClient.hpp +++ b/src/libs/comm_cpp/include/jderobot/comm/cameraClient.hpp @@ -41,7 +41,7 @@ namespace Comm { * * * @param communicator that contains properties - * @param prefix of client Propierties (example: "kobukiViewer.Camera") + * @param prefix of client Propierties (example: "carViz.Camera") * * * @return null if propierties are wrong diff --git a/src/libs/comm_cpp/include/jderobot/comm/laserClient.hpp b/src/libs/comm_cpp/include/jderobot/comm/laserClient.hpp index ab2d0db66..b2c17cbf2 100644 --- a/src/libs/comm_cpp/include/jderobot/comm/laserClient.hpp +++ b/src/libs/comm_cpp/include/jderobot/comm/laserClient.hpp @@ -40,7 +40,7 @@ namespace Comm { * * * @param communicator that contains properties - * @param prefix of client Propierties (example: "kobukiViewer.Laser") + * @param prefix of client Propierties (example: "carViz.Laser") * * * @return null if propierties are wrong diff --git a/src/libs/comm_cpp/include/jderobot/comm/motorsClient.hpp b/src/libs/comm_cpp/include/jderobot/comm/motorsClient.hpp index cfb5ed465..5122e9134 100644 --- a/src/libs/comm_cpp/include/jderobot/comm/motorsClient.hpp +++ b/src/libs/comm_cpp/include/jderobot/comm/motorsClient.hpp @@ -42,7 +42,7 @@ namespace Comm { * * * @param communicator that contains properties - * @param prefix of client Propierties (example: "kobukiViewer.Motors") + * @param prefix of client Propierties (example: "carViz.Motors") * * * @return null if propierties are wrong diff --git a/src/libs/comm_cpp/include/jderobot/comm/navdataClient.hpp b/src/libs/comm_cpp/include/jderobot/comm/navdataClient.hpp index 2d5fabcd4..616c265d0 100644 --- a/src/libs/comm_cpp/include/jderobot/comm/navdataClient.hpp +++ b/src/libs/comm_cpp/include/jderobot/comm/navdataClient.hpp @@ -40,7 +40,7 @@ namespace Comm { * * * @param communicator that contains properties - * @param prefix of client Propierties (example: "kobukiViewer.Navdata") + * @param prefix of client Propierties (example: "carViz.Navdata") * * * @return null if propierties are wrong diff --git a/src/libs/comm_cpp/include/jderobot/comm/pose3dClient.hpp b/src/libs/comm_cpp/include/jderobot/comm/pose3dClient.hpp index b10bb8555..fc378dc2c 100644 --- a/src/libs/comm_cpp/include/jderobot/comm/pose3dClient.hpp +++ b/src/libs/comm_cpp/include/jderobot/comm/pose3dClient.hpp @@ -41,7 +41,7 @@ namespace Comm { * * * @param communicator that contains properties - * @param prefix of client Propierties (example: "kobukiViewer.Pose3d") + * @param prefix of client Propierties (example: "carViz.Pose3d") * * * @return null if propierties are wrong diff --git a/src/libs/comm_cpp/include/jderobot/comm/rgbdClient.hpp b/src/libs/comm_cpp/include/jderobot/comm/rgbdClient.hpp index 0bbfda494..be5a6c305 100644 --- a/src/libs/comm_cpp/include/jderobot/comm/rgbdClient.hpp +++ b/src/libs/comm_cpp/include/jderobot/comm/rgbdClient.hpp @@ -41,7 +41,7 @@ namespace Comm { * * * @param communicator that contains properties - * @param prefix of client Propierties (example: "kobukiViewer.Rgbd") + * @param prefix of client Propierties (example: "carViz.Rgbd") * * * @return null if propierties are wrong diff --git a/src/libs/config_cpp/include/jderobot/config/properties.hpp b/src/libs/config_cpp/include/jderobot/config/properties.hpp index 187c142f5..cacc2c331 100644 --- a/src/libs/config_cpp/include/jderobot/config/properties.hpp +++ b/src/libs/config_cpp/include/jderobot/config/properties.hpp @@ -46,7 +46,7 @@ class Properties { /** * @brief returns as string the propery given * - * @param route to element separated by dots (example: "kobukiViewer.Camera.proxy") + * @param route to element separated by dots (example: "carViz.Camera.proxy") * */ std::string asString(std::string element); @@ -55,7 +55,7 @@ class Properties { /** * @brief returns as string the propery given * - * @param route to element separated by dots (example: "kobukiViewer.Camera.proxy") + * @param route to element separated by dots (example: "carViz.Camera.proxy") * @param default value * */ @@ -64,7 +64,7 @@ class Properties { /** * @brief returns as float the propery given * - * @param route to element separated by dots (example: "kobukiViewer.Camera.proxy") + * @param route to element separated by dots (example: "carViz.Camera.proxy") * */ float asFloat(std::string element); @@ -72,7 +72,7 @@ class Properties { /** * @brief returns as float the propery given * - * @param route to element separated by dots (example: "kobukiViewer.Camera.proxy") + * @param route to element separated by dots (example: "carViz.Camera.proxy") * @param default value * */ @@ -81,7 +81,7 @@ class Properties { /** * @brief returns as integer the propery given * - * @param route to element separated by dots (example: "kobukiViewer.Camera.proxy") + * @param route to element separated by dots (example: "carViz.Camera.proxy") * */ int asInt(std::string element); @@ -89,7 +89,7 @@ class Properties { /** * @brief returns as integer the propery given * - * @param route to element separated by dots (example: "kobukiViewer.Camera.proxy") + * @param route to element separated by dots (example: "carViz.Camera.proxy") * @param default value * */ @@ -98,7 +98,7 @@ class Properties { /** * @brief returns as double the propery given * - * @param route to element separated by dots (example: "kobukiViewer.Camera.proxy") + * @param route to element separated by dots (example: "carViz.Camera.proxy") * */ double asDouble(std::string element); @@ -106,7 +106,7 @@ class Properties { /** * @brief returns as double the propery given * - * @param route to element separated by dots (example: "kobukiViewer.Camera.proxy") + * @param route to element separated by dots (example: "carViz.Camera.proxy") * @param default value * */ diff --git a/test/packages/cameraserver/cameraserver.txt b/test/packages/cameraserver/cameraserver.txt deleted file mode 100644 index aba0cc807..000000000 --- a/test/packages/cameraserver/cameraserver.txt +++ /dev/null @@ -1,2 +0,0 @@ -/opt/jderobot/bin/cameraserver -/opt/jderobot/share/jderobot/conf/cameraserver.cfg \ No newline at end of file diff --git a/test/packages/cameraserver_py/Dockerfile b/test/packages/cameraserver_py/Dockerfile deleted file mode 100644 index 7afa667f3..000000000 --- a/test/packages/cameraserver_py/Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -FROM jderobot/jderobot - - -LABEL manteiner Aitor Martínez Fernández+aitor.martinez.fernandez@gmail.com - -RUN apt-get update && apt-get -y install \ - wget \ - && rm -rf /var/lib/apt/lists/* - -########## setup Repositories ############## -## ROS ## -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-key 421C365BD9FF1F717815A3895523BAEEB01FA116 -RUN echo "deb http://packages.ros.org/ros/ubuntu xenial main" > /etc/apt/sources.list.d/ros-latest.list - -## ZeroC ## -RUN sh -c 'echo deb http://zeroc.com/download/apt/ubuntu16.04 stable main > /etc/apt/sources.list.d/zeroc.list' -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv 5E6DA83306132997 - -## Gazebo ## -RUN echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable xenial main" > /etc/apt/sources.list.d/gazebo-stable.list -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-key 67170598AF249743 - - -## JdeRobot Test ## -RUN sh -c 'echo "deb http://jderobot.org/aptest xenial main" > /etc/apt/sources.list.d/jderobot.list' -RUN wget -qO - www.jderobot.org/aptest/aptest.key | apt-key add - - - -## JdeRobot ## -#RUN sh -c 'echo "deb http://jderobot.org/apt xenial main" > /etc/apt/sources.list.d/jderobot.list' -#RUN apt-key adv --keyserver keyserver.ubuntu.com --recv B0E7F58E82C8091DF945A0453DA08892EE69A25C - -########## Install JdeRobot ############## -RUN apt-get update && apt-get -y install --only-upgrade\ - jderobot-cameraserver-python \ - && rm -rf /var/lib/apt/lists/* - -COPY ./search_file.sh / -COPY ./cameraserver_py.txt / - -RUN ./search_file.sh cameraserver_py.txt - - - - diff --git a/test/packages/cameraserver_py/cameraserver_py.txt b/test/packages/cameraserver_py/cameraserver_py.txt deleted file mode 100644 index d1ad21976..000000000 --- a/test/packages/cameraserver_py/cameraserver_py.txt +++ /dev/null @@ -1,5 +0,0 @@ -/opt/jderobot/bin/cameraserver_py -/opt/jderobot/share/jderobot/python/cameraserver_py/cameraserver.py -/opt/jderobot/share/jderobot/python/cameraserver_py/ImageProviderI.py -/opt/jderobot/share/jderobot/python/cameraserver_py/threadImage.py -/opt/jderobot/share/jderobot/conf/cameraserver_py.yml \ No newline at end of file diff --git a/test/packages/cameraview/files.txt b/test/packages/cameraview/files.txt deleted file mode 100644 index bb03102ec..000000000 --- a/test/packages/cameraview/files.txt +++ /dev/null @@ -1,3 +0,0 @@ -/opt/jderobot/share/jderobot/glade/cameraview.glade -/opt/jderobot/share/jderobot/conf/cameraview.yml -/opt/jderobot/bin/cameraview \ No newline at end of file diff --git a/test/packages/cameraview_py/cameraview_py.txt b/test/packages/cameraview_py/cameraview_py.txt deleted file mode 100644 index 28a45698f..000000000 --- a/test/packages/cameraview_py/cameraview_py.txt +++ /dev/null @@ -1,3 +0,0 @@ -/opt/jderobot/bin/cameraview_py -/opt/jderobot/share/jderobot/python/cameraview_py/cameraview.py -/opt/jderobot/share/jderobot/conf/cameraview_py.cfg \ No newline at end of file diff --git a/test/packages/rgbdViewer/Dockerfile b/test/packages/camserver/Dockerfile similarity index 94% rename from test/packages/rgbdViewer/Dockerfile rename to test/packages/camserver/Dockerfile index 48c23a8df..403f12661 100644 --- a/test/packages/rgbdViewer/Dockerfile +++ b/test/packages/camserver/Dockerfile @@ -32,13 +32,13 @@ RUN wget -qO - www.jderobot.org/aptest/aptest.key | apt-key add - ########## Install JdeRobot ############## RUN apt-get update && apt-get -y install --only-upgrade\ - jderobot-rgbdViewer \ + jderobot-camserver \ && rm -rf /var/lib/apt/lists/* COPY ./search_file.sh / -COPY ./rgbdViewer.txt / +COPY ./camserver.txt / -RUN ./search_file.sh rgbdViewer.txt +RUN ./search_file.sh camserver.txt diff --git a/test/packages/camserver/camserver.txt b/test/packages/camserver/camserver.txt new file mode 100644 index 000000000..4ce168c57 --- /dev/null +++ b/test/packages/camserver/camserver.txt @@ -0,0 +1,2 @@ +/opt/jderobot/bin/camserver +/opt/jderobot/share/jderobot/conf/camserver.cfg diff --git a/test/packages/cameraserver/search_file.sh b/test/packages/camserver/search_file.sh similarity index 100% rename from test/packages/cameraserver/search_file.sh rename to test/packages/camserver/search_file.sh diff --git a/test/packages/camserver_py/Dockerfile b/test/packages/camserver_py/Dockerfile new file mode 100644 index 000000000..fc6b05e63 --- /dev/null +++ b/test/packages/camserver_py/Dockerfile @@ -0,0 +1,45 @@ +FROM jderobot/jderobot + + +LABEL manteiner Aitor Martínez Fernández+aitor.martinez.fernandez@gmail.com + +RUN apt-get update && apt-get -y install \ + wget \ + && rm -rf /var/lib/apt/lists/* + +########## setup Repositories ############## +## ROS ## +RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-key 421C365BD9FF1F717815A3895523BAEEB01FA116 +RUN echo "deb http://packages.ros.org/ros/ubuntu xenial main" > /etc/apt/sources.list.d/ros-latest.list + +## ZeroC ## +RUN sh -c 'echo deb http://zeroc.com/download/apt/ubuntu16.04 stable main > /etc/apt/sources.list.d/zeroc.list' +RUN apt-key adv --keyserver keyserver.ubuntu.com --recv 5E6DA83306132997 + +## Gazebo ## +RUN echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable xenial main" > /etc/apt/sources.list.d/gazebo-stable.list +RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-key 67170598AF249743 + + +## JdeRobot Test ## +RUN sh -c 'echo "deb http://jderobot.org/aptest xenial main" > /etc/apt/sources.list.d/jderobot.list' +RUN wget -qO - www.jderobot.org/aptest/aptest.key | apt-key add - + + +## JdeRobot ## +#RUN sh -c 'echo "deb http://jderobot.org/apt xenial main" > /etc/apt/sources.list.d/jderobot.list' +#RUN apt-key adv --keyserver keyserver.ubuntu.com --recv B0E7F58E82C8091DF945A0453DA08892EE69A25C + +########## Install JdeRobot ############## +RUN apt-get update && apt-get -y install --only-upgrade\ + jderobot-camserver-python \ + && rm -rf /var/lib/apt/lists/* + +COPY ./search_file.sh / +COPY ./camserver_py.txt / + +RUN ./search_file.sh camserver_py.txt + + + + diff --git a/test/packages/camserver_py/camserver_py.txt b/test/packages/camserver_py/camserver_py.txt new file mode 100644 index 000000000..1e77f5fd5 --- /dev/null +++ b/test/packages/camserver_py/camserver_py.txt @@ -0,0 +1,5 @@ +/opt/jderobot/bin/camserver_py +/opt/jderobot/share/jderobot/python/camserver_py/camserver.py +/opt/jderobot/share/jderobot/python/camserver_py/ImageProviderI.py +/opt/jderobot/share/jderobot/python/camserver_py/threadImage.py +/opt/jderobot/share/jderobot/conf/camserver_py.yml diff --git a/test/packages/cameraserver_py/search_file.sh b/test/packages/camserver_py/search_file.sh similarity index 100% rename from test/packages/cameraserver_py/search_file.sh rename to test/packages/camserver_py/search_file.sh diff --git a/test/packages/cameraview/Dockerfile b/test/packages/camviz/Dockerfile similarity index 98% rename from test/packages/cameraview/Dockerfile rename to test/packages/camviz/Dockerfile index 9d46813f2..5a39d9704 100644 --- a/test/packages/cameraview/Dockerfile +++ b/test/packages/camviz/Dockerfile @@ -32,7 +32,7 @@ RUN wget -qO - www.jderobot.org/aptest/aptest.key | apt-key add - ########## Install JdeRobot ############## RUN apt-get update && apt-get -y install --only-upgrade\ - jderobot-cameraview \ + jderobot-camviz \ && rm -rf /var/lib/apt/lists/* COPY ./search_file.sh / diff --git a/test/packages/camviz/files.txt b/test/packages/camviz/files.txt new file mode 100644 index 000000000..74d295152 --- /dev/null +++ b/test/packages/camviz/files.txt @@ -0,0 +1,3 @@ +/opt/jderobot/share/jderobot/glade/camviz.glade +/opt/jderobot/share/jderobot/conf/camviz.yml +/opt/jderobot/bin/camviz diff --git a/test/packages/cameraview/search_file.sh b/test/packages/camviz/search_file.sh similarity index 100% rename from test/packages/cameraview/search_file.sh rename to test/packages/camviz/search_file.sh diff --git a/test/packages/cameraview_py/Dockerfile b/test/packages/camviz_py/Dockerfile similarity index 97% rename from test/packages/cameraview_py/Dockerfile rename to test/packages/camviz_py/Dockerfile index 3222ac9b0..c1e2f38d1 100644 --- a/test/packages/cameraview_py/Dockerfile +++ b/test/packages/camviz_py/Dockerfile @@ -32,7 +32,7 @@ RUN wget -qO - www.jderobot.org/aptest/aptest.key | apt-key add - ########## Install JdeRobot ############## RUN apt-get update && apt-get -y install --only-upgrade\ - jderobot-cameraview-python \ + jderobot-camviz-python \ && rm -rf /var/lib/apt/lists/* COPY ./search_file.sh / diff --git a/test/packages/camviz_py/camviz_py.txt b/test/packages/camviz_py/camviz_py.txt new file mode 100644 index 000000000..f70bade67 --- /dev/null +++ b/test/packages/camviz_py/camviz_py.txt @@ -0,0 +1,3 @@ +/opt/jderobot/bin/camviz_py +/opt/jderobot/share/jderobot/python/camviz_py/camviz.py +/opt/jderobot/share/jderobot/conf/camviz_py.cfg diff --git a/test/packages/cameraview_py/search_file.sh b/test/packages/camviz_py/search_file.sh similarity index 100% rename from test/packages/cameraview_py/search_file.sh rename to test/packages/camviz_py/search_file.sh diff --git a/test/packages/cameraserver/Dockerfile b/test/packages/carViz/Dockerfile similarity index 94% rename from test/packages/cameraserver/Dockerfile rename to test/packages/carViz/Dockerfile index 50adf9f31..2c412140a 100644 --- a/test/packages/cameraserver/Dockerfile +++ b/test/packages/carViz/Dockerfile @@ -32,13 +32,13 @@ RUN wget -qO - www.jderobot.org/aptest/aptest.key | apt-key add - ########## Install JdeRobot ############## RUN apt-get update && apt-get -y install --only-upgrade\ - jderobot-cameraserver \ + jderobot-carViz \ && rm -rf /var/lib/apt/lists/* COPY ./search_file.sh / -COPY ./cameraserver.txt / +COPY ./carViz.txt / -RUN ./search_file.sh cameraserver.txt +RUN ./search_file.sh carViz.txt diff --git a/test/packages/carViz/carViz.txt b/test/packages/carViz/carViz.txt new file mode 100644 index 000000000..5546bc54f --- /dev/null +++ b/test/packages/carViz/carViz.txt @@ -0,0 +1,2 @@ +/opt/jderobot/bin/carViz +/opt/jderobot/share/jderobot/conf/carViz.yml diff --git a/test/packages/kobukiViewer/search_file.sh b/test/packages/carViz/search_file.sh similarity index 100% rename from test/packages/kobukiViewer/search_file.sh rename to test/packages/carViz/search_file.sh diff --git a/test/packages/kobukiViewer/kobukiViewer.txt b/test/packages/kobukiViewer/kobukiViewer.txt deleted file mode 100644 index 34a191d4c..000000000 --- a/test/packages/kobukiViewer/kobukiViewer.txt +++ /dev/null @@ -1,2 +0,0 @@ -/opt/jderobot/bin/kobukiViewer -/opt/jderobot/share/jderobot/conf/kobukiViewer.yml \ No newline at end of file diff --git a/test/packages/make_text.sh b/test/packages/make_text.sh index d4d64dadd..144ceb735 100755 --- a/test/packages/make_text.sh +++ b/test/packages/make_text.sh @@ -3,9 +3,9 @@ for f in $files; do name="${f%.*}" echo "$name" mkdir $name - cp cameraview/Dockerfile cameraview/search_file.sh packages/$f $name + cp camviz/Dockerfile camviz/search_file.sh packages/$f $name cd $name sed -i.back s:files:$name:g Dockerfile rm Dockerfile.back cd .. -done \ No newline at end of file +done diff --git a/test/packages/rgbdViewer/rgbdViewer.txt b/test/packages/rgbdViewer/rgbdViewer.txt deleted file mode 100644 index e639d52a0..000000000 --- a/test/packages/rgbdViewer/rgbdViewer.txt +++ /dev/null @@ -1,4 +0,0 @@ -/opt/jderobot/bin/rgbdViewer -/opt/jderobot/share/jderobot/glade/rgbdViewergui.glade -/opt/jderobot/share/jderobot/conf/rgbdViewer.cfg -/opt/jderobot/share/jderobot/conf/camera-0.cfg diff --git a/test/packages/kobukiViewer/Dockerfile b/test/packages/rgbdViz/Dockerfile similarity index 94% rename from test/packages/kobukiViewer/Dockerfile rename to test/packages/rgbdViz/Dockerfile index f2f92df82..935e1896e 100644 --- a/test/packages/kobukiViewer/Dockerfile +++ b/test/packages/rgbdViz/Dockerfile @@ -32,13 +32,13 @@ RUN wget -qO - www.jderobot.org/aptest/aptest.key | apt-key add - ########## Install JdeRobot ############## RUN apt-get update && apt-get -y install --only-upgrade\ - jderobot-kobukiviewer \ + jderobot-rgbdViz \ && rm -rf /var/lib/apt/lists/* COPY ./search_file.sh / -COPY ./kobukiViewer.txt / +COPY ./rgbdViz.txt / -RUN ./search_file.sh kobukiViewer.txt +RUN ./search_file.sh rgbdViz.txt diff --git a/test/packages/rgbdViz/rgbdViz.txt b/test/packages/rgbdViz/rgbdViz.txt new file mode 100644 index 000000000..acf203daa --- /dev/null +++ b/test/packages/rgbdViz/rgbdViz.txt @@ -0,0 +1,4 @@ +/opt/jderobot/bin/rgbdViz +/opt/jderobot/share/jderobot/glade/rgbdVizgui.glade +/opt/jderobot/share/jderobot/conf/rgbdViz.cfg +/opt/jderobot/share/jderobot/conf/camera-0.cfg diff --git a/test/packages/rgbdViewer/search_file.sh b/test/packages/rgbdViz/search_file.sh similarity index 100% rename from test/packages/rgbdViewer/search_file.sh rename to test/packages/rgbdViz/search_file.sh diff --git a/test/packages/test_list.yml b/test/packages/test_list.yml index 103e23d7a..70ee1633f 100644 --- a/test/packages/test_list.yml +++ b/test/packages/test_list.yml @@ -10,8 +10,8 @@ pantilt_teleop: path: pantilt_teleop run: True -kobukiViewer: - path: kobukiViewer +carViz: + path: carViz run: True easyiceconfig: @@ -30,12 +30,12 @@ logger: path: logger run: True -cameraserver: - path: cameraserver +camserver: + path: camserver run: True -rgbdViewer: - path: rgbdViewer +rgbdViz: + path: rgbdViz run: True easyiceconfig_py: @@ -94,8 +94,8 @@ recorder2: path: recorder2 run: True -cameraserver_py: - path: cameraserver_py +camserver_py: + path: camserver_py run: True jderobotHandlers: @@ -198,16 +198,16 @@ youtubeserver: path: youtubeserver run: True -cameraview_py: - path: cameraview_py +camviz_py: + path: camviz_py run: True kinect2Server: path: kinect2Server run: True -cameraview: - path: cameraview +camviz: + path: camviz run: True config: