[Jderobot-admin] jderobot-r1190 - in trunk/src: stable/components stable/components/cameraview_icestorm testing/components

[frivas en jderobot.org]

Author: frivas
Date: 2014-03-12 20:23:43 +0100 (Wed, 12 Mar 2014)
New Revision: 1190

Added:
   trunk/src/stable/components/cameraview_icestorm/
Removed:
   trunk/src/testing/components/cameraview_icestorm/
Modified:
   trunk/src/stable/components/cameraview_icestorm/CMakeLists.txt
   trunk/src/stable/components/cameraview_icestorm/cameraview_icestorm.cpp
   trunk/src/stable/components/cameraview_icestorm/viewer.h
Log:
#192 moved cameraview_icestorm from testing to stable


Modified: trunk/src/stable/components/cameraview_icestorm/CMakeLists.txt
===================================================================
--- trunk/src/testing/components/cameraview_icestorm/CMakeLists.txt	2014-03-10 15:31:26 UTC (rev 1187)
+++ trunk/src/stable/components/cameraview_icestorm/CMakeLists.txt	2014-03-12 19:23:43 UTC (rev 1190)
@@ -4,8 +4,9 @@
     ${INTERFACES_CPP_DIR}
     ${LIBS_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}
-    ${INTERFACES_CPP_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/cameras
+    ${gtkmm_INCLUDE_DIRS}
+    ${libglademm_INCLUDE_DIRS}
+    ${gtkglextmm_INCLUDE_DIRS}
 )
 
 add_executable (cameraview_icestorm ${SOURCE_FILES})
@@ -13,17 +14,10 @@
 TARGET_LINK_LIBRARIES(cameraview_icestorm
     ${CMAKE_THREAD_LIBS_INIT} 
     ${OpenCV_LIBRARIES}
+    ${OpenCVGUI_LIBRARIES}
     ${gtkmm_LIBRARIES}
     ${libglademm_LIBRARIES}
-#    ${gthread_LIBRARIES}
-#    ${libgnomecanvas_LIBRARIES}
-#    ${libgnomecanvasmm_LIBRARIES}
-#    ${gtkglextmm_LIBRARIES}
-    ${OpenCV_LIBRARIES}
-    ${ZeroCIceCore_LIBRARY}
-    ${ZeroCIceStorm_LIBRARY}
-    ${ZeroCIce_LIBRARIES}
-    ${LIBS_DIR}/colorspaces/libcolorspacesmm.so
-    ${INTERFACES_CPP_DIR}/jderobot/libJderobotInterfaces.so
-    ${Gearbox_LIBRARIES}
+    colorspacesmm
+    JderobotInterfaces
+   ${ZeroCIce_LIBRARIES}
 )

Modified: trunk/src/stable/components/cameraview_icestorm/cameraview_icestorm.cpp
===================================================================
--- trunk/src/testing/components/cameraview_icestorm/cameraview_icestorm.cpp	2014-03-10 15:31:26 UTC (rev 1187)
+++ trunk/src/stable/components/cameraview_icestorm/cameraview_icestorm.cpp	2014-03-12 19:23:43 UTC (rev 1190)
@@ -26,7 +26,7 @@
 #include <IceStorm/IceStorm.h>
 #include <jderobot/camera.h>
 #include <jderobot/image.h>
-#include <colorspaces/colorspacesmm.h>
+#include <visionlib/colorspaces/colorspacesmm.h>
 #include "viewer.h"
 
 class ImageConsumerI: virtual public jderobot::ImageConsumer {
@@ -58,6 +58,8 @@
     ic = Ice::initialize(argc,argv);
     std::string topicName = ic->getProperties()->getProperty("Cameraview_icestorm.Camera.TopicName");
 
+	std::cout << "Trying to conect to: " << topicName << std::endl;
+
     Ice::ObjectPrx obj=ic->propertyToProxy("Cameraview_icestorm.Camera.TopicManager");
     IceStorm::TopicManagerPrx topicManager=IceStorm::TopicManagerPrx::checkedCast(obj);
 

Modified: trunk/src/stable/components/cameraview_icestorm/viewer.h
===================================================================
--- trunk/src/testing/components/cameraview_icestorm/viewer.h	2014-03-10 15:31:26 UTC (rev 1187)
+++ trunk/src/stable/components/cameraview_icestorm/viewer.h	2014-03-12 19:23:43 UTC (rev 1190)
@@ -28,7 +28,7 @@
 #include <IceUtil/Thread.h>
 #include <IceUtil/Time.h>
 #include <string>
-#include <colorspaces/colorspacesmm.h>
+#include <visionlib/colorspaces/colorspacesmm.h>
 
 namespace cameraview_icestorm{