[Issue 1147] Renamed several components

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)

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")
 

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")

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"
 
 

scripts/docker/jderobot/official/README.md

@@ -6,15 +6,15 @@ 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
 * Download and run: 
 ```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]
 ```

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
 

scripts/docker/jenkins/dev/packages/camserver.txt

@@ -0,0 +1,2 @@
+/opt/jderobot/bin/camserver
+/opt/jderobot/share/jderobot/conf/camserver.cfg

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

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

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

scripts/docker/jenkins/dev/packages/carViz.txt

@@ -0,0 +1,2 @@
+/opt/jderobot/bin/carViz
+/opt/jderobot/share/jderobot/conf/carViz.yml

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

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 <f.perez475@gmail.com>
 Homepage: http://jderobot.org
 Description: Metapackage that gathers all the drivers of JdeRobot framework.

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 <f.perez475@gmail.com>
 Homepage: http://jderobot.org
 Description: Metapackage that gathers all the tools of JdeRobot framework.

src/drivers/cameraserver/CMakeLists.txt → 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
 )

src/drivers/cameraserver/cameraserver.cpp → 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; i<nCameras; i++){//build camera objects
       std::stringstream objIdS;
       objIdS <<  i;
       std::string objId = objIdS.str();// should this be something unique??
       std::string objPrefix("CameraSrv.Camera." + objId + ".");
       std::string cameraName = prop->getProperty(objPrefix + "Name");
-      Ice::ObjectPtr object = new cameraserver::CameraI(objPrefix, ic);
+      Ice::ObjectPtr object = new camserver::CameraI(objPrefix, ic);
 
       adapter->add(object, ic->stringToIdentity(cameraName));
 

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)

src/drivers/cameraserver_py/cameraserver.py → 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]

src/drivers/camserver_py/camserver_py.in

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+python @CMAKE_INSTALL_PREFIX@/share/jderobot/python/camserver_py/camserver.py $*

src/drivers/cameraserver_py/cameraserver_py.yml → 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

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

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

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

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

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