[Jderobot-admin] jderobot-r918 - in trunk/src: interfaces/slice/jderobot libs libs/parallelIce

[frivas en jderobot.org]

Author: frivas
Date: 2013-05-27 16:54:12 +0200 (Mon, 27 May 2013)
New Revision: 918

Added:
   trunk/src/interfaces/slice/jderobot/replayControl.ice
   trunk/src/libs/parallelIce/
Removed:
   trunk/src/libs/paralellIce/
Modified:
   trunk/src/libs/parallelIce/CMakeLists.txt
Log:
modificado nombre de interfaces paralelos y a?\195?\177adido interfaz de control para reproduccion enlatada


Added: trunk/src/interfaces/slice/jderobot/replayControl.ice
===================================================================
--- trunk/src/interfaces/slice/jderobot/replayControl.ice	                        (rev 0)
+++ trunk/src/interfaces/slice/jderobot/replayControl.ice	2013-05-27 14:54:12 UTC (rev 918)
@@ -0,0 +1,35 @@
+/*
+ *  Copyright (C) 1997-2013 JDE Developers Team
+ *
+ *  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
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see http://www.gnu.org/licenses/.
+ *  Authors : 
+ *            Francisco Miguel Rivas Montero <franciscomiguel.rivas en urjc.es>	
+ */
+
+#ifndef REPLAYCONTROL_ICE
+#define REPLAYCONTROL_ICE
+
+module jderobot{  
+
+	interface replayControl{
+		
+		bool pause();
+		bool resume();
+		void setReplay(bool replay);
+		bool setStep(int step);
+		long getTime();
+		bool goTo(long seek);
+	};
+};
+#endif 

Modified: trunk/src/libs/parallelIce/CMakeLists.txt
===================================================================
--- trunk/src/libs/paralellIce/CMakeLists.txt	2013-05-27 13:14:44 UTC (rev 917)
+++ trunk/src/libs/parallelIce/CMakeLists.txt	2013-05-27 14:54:12 UTC (rev 918)
@@ -5,14 +5,14 @@
     ${CMAKE_CURRENT_SOURCE_DIR}/cameras
 )
 
-add_library (paralellIce STATIC cameraClient.cpp  cameraClient.h  pointcloudClient.cpp  pointcloudClient.h)
+add_library (parallelIce STATIC cameraClient.cpp  cameraClient.h  pointcloudClient.cpp  pointcloudClient.h)
 TARGET_LINK_LIBRARIES(paralellIce 
    	${OpenCV_LIBRARIES}
     ${LIBS_DIR}/colorspaces/libcolorspacesmm.so
     ${ZeroCIce_LIBRARIES}
 )
 
-add_library (paralellIceshare SHARED cameraClient.cpp  cameraClient.h  pointcloudClient.cpp  pointcloudClient.h)
+add_library (parallelIceshare SHARED cameraClient.cpp  cameraClient.h  pointcloudClient.cpp  pointcloudClient.h)
 TARGET_LINK_LIBRARIES(paralellIceshare 
    	${OpenCV_LIBRARIES}
     ${LIBS_DIR}/colorspaces/libcolorspacesmm.so
@@ -20,5 +20,5 @@
 )
 
 
-set_target_properties(paralellIceshare PROPERTIES OUTPUT_NAME paralellIce)
+set_target_properties(parallelIceshare PROPERTIES OUTPUT_NAME parallelIce)