[Jderobot-admin] jderobot-r1155 - in trunk/src/stable: components/cameraserver components/gazeboserver/plugins/kinect components/gazeboserver/plugins/pioneer components/naoserver/functions components/openni1Server components/openniServer components/pclRGBDServer components/replayer interfaces/slice/jderobot libs/parallelIce

rocapal en jderobot.org rocapal en jderobot.org
Mar Feb 4 11:00:19 CET 2014


Author: rocapal
Date: 2014-02-04 11:00:19 +0100 (Tue, 04 Feb 2014)
New Revision: 1155

Modified:
   trunk/src/stable/components/cameraserver/cameraserver.cpp
   trunk/src/stable/components/gazeboserver/plugins/kinect/kinectPlugin.cc
   trunk/src/stable/components/gazeboserver/plugins/pioneer/camera_dump.cc
   trunk/src/stable/components/naoserver/functions/NaoServerCamera.cpp
   trunk/src/stable/components/openni1Server/openni1Server.cpp
   trunk/src/stable/components/openniServer/openniServer.cfg
   trunk/src/stable/components/openniServer/openniServer.cpp
   trunk/src/stable/components/pclRGBDServer/cameraRGB.h
   trunk/src/stable/components/pclRGBDServer/cameradepth.h
   trunk/src/stable/components/replayer/replayer.cpp
   trunk/src/stable/interfaces/slice/jderobot/camera.ice
   trunk/src/stable/libs/parallelIce/cameraClient.cpp
   trunk/src/stable/libs/parallelIce/cameraClient.h
Log:
#154 Added reset() method in camera interface


Modified: trunk/src/stable/components/cameraserver/cameraserver.cpp
===================================================================
--- trunk/src/stable/components/cameraserver/cameraserver.cpp	2014-01-30 19:59:23 UTC (rev 1154)
+++ trunk/src/stable/components/cameraserver/cameraserver.cpp	2014-02-04 10:00:19 UTC (rev 1155)
@@ -141,6 +141,10 @@
         virtual void stopCameraStreaming(const Ice::Current&) {
         }
 
+    	virtual void reset(const Ice::Current&)
+    	{
+    	}
+
     private:
 
         class ReplyTask: public IceUtil::Thread {

Modified: trunk/src/stable/components/gazeboserver/plugins/kinect/kinectPlugin.cc
===================================================================
--- trunk/src/stable/components/gazeboserver/plugins/kinect/kinectPlugin.cc	2014-01-30 19:59:23 UTC (rev 1154)
+++ trunk/src/stable/components/gazeboserver/plugins/kinect/kinectPlugin.cc	2014-02-04 10:00:19 UTC (rev 1155)
@@ -327,6 +327,10 @@
 
 		}
 
+		virtual void reset(const Ice::Current&)
+		{
+		}
+
 	private:
 		class ReplyTask: public IceUtil::Thread  {
 			public:
@@ -476,6 +480,10 @@
 
 		}
 
+		virtual void reset(const Ice::Current&)
+		{
+		}
+
 	private:
 		class ReplyTask: public IceUtil::Thread {
 			public:

Modified: trunk/src/stable/components/gazeboserver/plugins/pioneer/camera_dump.cc
===================================================================
--- trunk/src/stable/components/gazeboserver/plugins/pioneer/camera_dump.cc	2014-01-30 19:59:23 UTC (rev 1154)
+++ trunk/src/stable/components/gazeboserver/plugins/pioneer/camera_dump.cc	2014-02-04 10:00:19 UTC (rev 1155)
@@ -135,6 +135,10 @@
 
 		}
 
+		virtual void reset(const Ice::Current&)
+		{
+		}
+
 	private:
 		class ReplyTask: public IceUtil::Thread {
 			public:

Modified: trunk/src/stable/components/naoserver/functions/NaoServerCamera.cpp
===================================================================
--- trunk/src/stable/components/naoserver/functions/NaoServerCamera.cpp	2014-01-30 19:59:23 UTC (rev 1154)
+++ trunk/src/stable/components/naoserver/functions/NaoServerCamera.cpp	2014-02-04 10:00:19 UTC (rev 1155)
@@ -111,6 +111,10 @@
 
 void NaoServerCamera::stopCameraStreaming ( const Ice::Current& ) {}
 
+virtual void NaoServerCamera::reset(const Ice::Current&)
+{
+}
+
 /*************************************************************
  * ANOTHER FUNCTIONS
  *************************************************************/

Modified: trunk/src/stable/components/openni1Server/openni1Server.cpp
===================================================================
--- trunk/src/stable/components/openni1Server/openni1Server.cpp	2014-01-30 19:59:23 UTC (rev 1154)
+++ trunk/src/stable/components/openni1Server/openni1Server.cpp	2014-02-04 10:00:19 UTC (rev 1155)
@@ -409,6 +409,10 @@
 		std::cout << "Should be made anything to stop camera streaming: " + cameraDescription->name << std::endl;
 	}
 
+	virtual void reset(const Ice::Current&)
+	{
+	}
+
 	virtual Ice::Int setCameraDescription(const jderobot::CameraDescriptionPtr&, const Ice::Current&){
 		return 0;
 	}
@@ -650,6 +654,10 @@
 		std::cout << "Should be made anything to stop camera streaming: " + cameraDescription->name << std::endl;
 	}
 	
+	virtual void reset(const Ice::Current&)
+	{
+	}
+
 	virtual Ice::Int setCameraDescription(const jderobot::CameraDescriptionPtr&, const Ice::Current&){
 		return 0;
 	}

Modified: trunk/src/stable/components/openniServer/openniServer.cfg
===================================================================
--- trunk/src/stable/components/openniServer/openniServer.cfg	2014-01-30 19:59:23 UTC (rev 1154)
+++ trunk/src/stable/components/openniServer/openniServer.cfg	2014-02-04 10:00:19 UTC (rev 1155)
@@ -43,6 +43,6 @@
 openniServer.Pose3DMotorsActive=0
 openniServer.KinectLedsActive=0
 openniServer.ExtraCalibration=0
-openniServer.Debug=2
+openniServer.Debug=1
 openniServer.Fps=20
 

Modified: trunk/src/stable/components/openniServer/openniServer.cpp
===================================================================
--- trunk/src/stable/components/openniServer/openniServer.cpp	2014-01-30 19:59:23 UTC (rev 1154)
+++ trunk/src/stable/components/openniServer/openniServer.cpp	2014-02-04 10:00:19 UTC (rev 1155)
@@ -521,6 +521,9 @@
 	virtual void stopCameraStreaming(const Ice::Current&) {
 		std::cout << "Should be made anything to stop camera streaming: " <<  cameraDescription->name << std::endl;
 	}
+	virtual void reset(const Ice::Current&)
+	{
+	}
 
 	virtual Ice::Int setCameraDescription(const jderobot::CameraDescriptionPtr&, const Ice::Current&){
 		return 0;
@@ -777,6 +780,9 @@
 	virtual void stopCameraStreaming(const Ice::Current&) {
 		std::cout << "Should be made anything to stop camera streaming: "  << cameraDescription->name << std::endl;
 	}
+	virtual void reset(const Ice::Current&)
+	{
+	}
 	
 	virtual Ice::Int setCameraDescription(const jderobot::CameraDescriptionPtr&, const Ice::Current&){
 		return 0;

Modified: trunk/src/stable/components/pclRGBDServer/cameraRGB.h
===================================================================
--- trunk/src/stable/components/pclRGBDServer/cameraRGB.h	2014-01-30 19:59:23 UTC (rev 1154)
+++ trunk/src/stable/components/pclRGBDServer/cameraRGB.h	2014-02-04 10:00:19 UTC (rev 1155)
@@ -51,6 +51,10 @@
 
 		}
 
+		virtual void reset(const Ice::Current&)
+		{
+		}
+
 	private:
 		class ReplyTask:  public IceUtil::Thread {
 			public:

Modified: trunk/src/stable/components/pclRGBDServer/cameradepth.h
===================================================================
--- trunk/src/stable/components/pclRGBDServer/cameradepth.h	2014-01-30 19:59:23 UTC (rev 1154)
+++ trunk/src/stable/components/pclRGBDServer/cameradepth.h	2014-02-04 10:00:19 UTC (rev 1155)
@@ -58,6 +58,10 @@
 
 		    }
 
+			virtual void reset(const Ice::Current&)
+			{
+			}
+
 	    private:
 		    class ReplyTask:  public IceUtil::Thread {
 			    public:

Modified: trunk/src/stable/components/replayer/replayer.cpp
===================================================================
--- trunk/src/stable/components/replayer/replayer.cpp	2014-01-30 19:59:23 UTC (rev 1154)
+++ trunk/src/stable/components/replayer/replayer.cpp	2014-02-04 10:00:19 UTC (rev 1155)
@@ -114,6 +114,11 @@
 		virtual void stopCameraStreaming(const Ice::Current&) {
 			std::cout << "Should be made anything to stop camera streaming: " << cameraDescription->name << std::endl;
 		}
+
+		virtual void reset(const Ice::Current&)
+		{
+		}
+
 		/*virtual void update(cv::Mat imageIn){
 		 imageIn.copyTo(this->image);
 		 //std::cout << "update" << endl;

Modified: trunk/src/stable/interfaces/slice/jderobot/camera.ice
===================================================================
--- trunk/src/stable/interfaces/slice/jderobot/camera.ice	2014-01-30 19:59:23 UTC (rev 1154)
+++ trunk/src/stable/interfaces/slice/jderobot/camera.ice	2014-02-04 10:00:19 UTC (rev 1155)
@@ -61,6 +61,8 @@
     
     void stopCameraStreaming();
     
+    void reset();
+    
   };
 
 }; /*module*/

Modified: trunk/src/stable/libs/parallelIce/cameraClient.cpp
===================================================================
--- trunk/src/stable/libs/parallelIce/cameraClient.cpp	2014-01-30 19:59:23 UTC (rev 1154)
+++ trunk/src/stable/libs/parallelIce/cameraClient.cpp	2014-02-04 10:00:19 UTC (rev 1155)
@@ -66,14 +66,18 @@
 }
 
 
+void cameraClient::reset(){
+	this->prx->reset();
+}
+
 void cameraClient::pause(){
 	this->pauseStatus=true;
 }
 
 void cameraClient::resume(){
 	this->controlMutex.lock();
-		this->pauseStatus=false;
-		this->sem.broadcast();
+	this->pauseStatus=false;
+	this->sem.broadcast();
 	this->controlMutex.unlock();
 }
 
@@ -134,7 +138,7 @@
 			iterIndex = 0;
 			std::cout << "*** Reinicio contador" << std::endl;
 		}
-		
+
 	}
 }
 

Modified: trunk/src/stable/libs/parallelIce/cameraClient.h
===================================================================
--- trunk/src/stable/libs/parallelIce/cameraClient.h	2014-01-30 19:59:23 UTC (rev 1154)
+++ trunk/src/stable/libs/parallelIce/cameraClient.h	2014-02-04 10:00:19 UTC (rev 1155)
@@ -45,6 +45,7 @@
 	int getRefreshRate(){return refreshRate;};
 	void pause();
 	void resume();
+	void reset();
 	bool getPause(){return pauseStatus;};
 	cv::Size getSize(){return size;};
 



More information about the Jderobot-admin mailing list