[Jderobot-admin] jderobot-r1092 - in trunk/src/stable: components/rgbdViewer libs/parallelIce

[frivas en jderobot.org]

Author: frivas
Date: 2013-11-08 10:40:08 +0100 (Fri, 08 Nov 2013)
New Revision: 1092

Modified:
   trunk/src/stable/components/rgbdViewer/rgbdViewer.cfg
   trunk/src/stable/libs/parallelIce/cameraClient.h
   trunk/src/stable/libs/parallelIce/pointcloudClient.h
Log:
#110 renamed function to get the refresh rate


Modified: trunk/src/stable/components/rgbdViewer/rgbdViewer.cfg
===================================================================
--- trunk/src/stable/components/rgbdViewer/rgbdViewer.cfg	2013-11-08 08:46:35 UTC (rev 1091)
+++ trunk/src/stable/components/rgbdViewer/rgbdViewer.cfg	2013-11-08 09:40:08 UTC (rev 1092)
@@ -1,8 +1,8 @@
 rgbdViewer.CameraRGBActive=1
-rgbdViewer.CameraRGB.Proxy=cameraA:tcp -h 127.0.0.1 -p 9998
-rgbdViewer.CameraDEPTHActive=1
+rgbdViewer.CameraRGB.Proxy=cameraA:tcp -h 127.0.0.1 -p 9999
+rgbdViewer.CameraDEPTHActive=0
 rgbdViewer.CameraDEPTH.Proxy=cameraB:tcp -h 127.0.0.1 -p 9998
-rgbdViewer.pointCloudActive=1
+rgbdViewer.pointCloudActive=0
 rgbdViewer.pointCloud.Proxy=pointcloud1:tcp -h 127.0.0.1 -p 9998
 rgbdViewer.Pose3DMotorsActive=0
 rgbdViewer.Pose3DMotors.Proxy=Pose3DMotors1:tcp -h 127.0.0.1 -p 9998

Modified: trunk/src/stable/libs/parallelIce/cameraClient.h
===================================================================
--- trunk/src/stable/libs/parallelIce/cameraClient.h	2013-11-08 08:46:35 UTC (rev 1091)
+++ trunk/src/stable/libs/parallelIce/cameraClient.h	2013-11-08 09:40:08 UTC (rev 1092)
@@ -42,7 +42,7 @@
 
 	//callbacks
 	cv::Mat getImage();
-	int getRfreshRate(){return refreshRate;};
+	int getRefreshRate(){return refreshRate;};
 private:
 	cv::Mat data;
 	jderobot::CameraPrx prx;

Modified: trunk/src/stable/libs/parallelIce/pointcloudClient.h
===================================================================
--- trunk/src/stable/libs/parallelIce/pointcloudClient.h	2013-11-08 08:46:35 UTC (rev 1091)
+++ trunk/src/stable/libs/parallelIce/pointcloudClient.h	2013-11-08 09:40:08 UTC (rev 1092)
@@ -40,7 +40,7 @@
 	virtual void run();
 
 	std::vector<jderobot::RGBPoint>  getData();
-	int getRfreshRate(){return refreshRate;};
+	int getRefreshRate(){return refreshRate;};
 
 
 private: