[Jderobot-admin] jderobot-r1075 - in trunk/src: stable/components stable/components/colorTuner testing/components

[rocapal en jderobot.org]

Author: rocapal
Date: 2013-10-23 15:55:53 +0200 (Wed, 23 Oct 2013)
New Revision: 1075

Added:
   trunk/src/stable/components/colorTuner/
Removed:
   trunk/src/stable/components/colorTuner/build/
   trunk/src/stable/components/colorTuner/colortuner2.3.1/
   trunk/src/testing/components/colortuner/
Modified:
   trunk/src/stable/components/colorTuner/CMakeLists.txt
   trunk/src/stable/components/colorTuner/colorTuner.cfg
   trunk/src/stable/components/colorTuner/colorTuner.cpp
   trunk/src/stable/components/colorTuner/viewer.cpp
   trunk/src/stable/components/colorTuner/viewer.h
Log:
#84 added colorTuner component


Modified: trunk/src/stable/components/colorTuner/CMakeLists.txt
===================================================================
--- trunk/src/testing/components/colortuner/CMakeLists.txt	2013-10-22 17:16:24 UTC (rev 1072)
+++ trunk/src/stable/components/colorTuner/CMakeLists.txt	2013-10-23 13:55:53 UTC (rev 1075)
@@ -4,21 +4,21 @@
     ${INTERFACES_CPP_DIR}
     ${LIBS_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}
-    ${INTERFACES_CPP_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/cameras
+    ${gtkmm_INCLUDE_DIRS}
+    ${libglademm_INCLUDE_DIRS}
 )
 
-add_executable (colortuner ${SOURCE_FILES})
+add_executable (colorTuner ${SOURCE_FILES})
 
-TARGET_LINK_LIBRARIES(colortuner 
+TARGET_LINK_LIBRARIES(colorTuner 
     ${CMAKE_THREAD_LIBS_INIT}
     ${opencv_LIBRARIES}
     ${OpenCV_LIBRARIES}
     ${gtkmm_LIBRARIES}
-    ${LIBS_DIR}/colorspaces/libcolorspacesmm.so
-    ${INTERFACES_CPP_DIR}/jderobot/libJderobotInterfaces.so
-    ${LIBS_DIR}/jderobotutil/libjderobotutil.so
-    ${LIBS_DIR}/colorspaces/libcolorspaces.so
+    colorspacesmm
+    colorspaces
+    JderobotInterfaces
+    jderobotutil
     ${Gearbox_LIBRARIES}
     ${ZeroCIce_LIBRARIES}
 

Modified: trunk/src/stable/components/colorTuner/colorTuner.cfg
===================================================================
--- trunk/src/testing/components/colortuner/colorTuner.cfg	2013-10-22 17:16:24 UTC (rev 1072)
+++ trunk/src/stable/components/colorTuner/colorTuner.cfg	2013-10-23 13:55:53 UTC (rev 1075)
@@ -1 +1 @@
-Cameraview.Camera.Proxy=cameraA:tcp -h localhost -p 9999
+Cameraview.Camera.Proxy=cameraA:tcp -h localhost -p 9998

Modified: trunk/src/stable/components/colorTuner/colorTuner.cpp
===================================================================
--- trunk/src/testing/components/colortuner/colorTuner.cpp	2013-10-22 17:16:24 UTC (rev 1072)
+++ trunk/src/stable/components/colorTuner/colorTuner.cpp	2013-10-23 13:55:53 UTC (rev 1075)
@@ -23,7 +23,7 @@
 #include <Ice/Ice.h>
 #include <IceUtil/IceUtil.h>
 #include <jderobot/camera.h>
-#include <colorspaces/colorspacesmm.h>
+#include <visionlib/colorspaces/colorspacesmm.h>
 #include "viewer.h"
 #include <cv.h>
 #include <highgui.h>

Modified: trunk/src/stable/components/colorTuner/viewer.cpp
===================================================================
--- trunk/src/testing/components/colortuner/viewer.cpp	2013-10-22 17:16:24 UTC (rev 1072)
+++ trunk/src/stable/components/colorTuner/viewer.cpp	2013-10-23 13:55:53 UTC (rev 1075)
@@ -24,7 +24,7 @@
 #include <cmath>
 #include <cv.h>
 #include <highgui.h>
-#include <colorspaces/colorspaces.h>
+#include <visionlib/colorspaces/colorspaces.h>
 
 namespace cameraview{
 

Modified: trunk/src/stable/components/colorTuner/viewer.h
===================================================================
--- trunk/src/testing/components/colortuner/viewer.h	2013-10-22 17:16:24 UTC (rev 1072)
+++ trunk/src/stable/components/colorTuner/viewer.h	2013-10-23 13:55:53 UTC (rev 1075)
@@ -27,7 +27,7 @@
 #include <IceUtil/Thread.h>
 #include <IceUtil/Time.h>
 #include <string>
-#include <colorspaces/colorspacesmm.h>
+#include <visionlib/colorspaces/colorspacesmm.h>
 #include <highgui.h>
 
 #define PI 3.141592654