[Jderobot-admin] jderobot-r1224 - trunk/src/stable/components/replayer

[rocapal en jderobot.org]

Author: rocapal
Date: 2014-04-29 11:32:42 +0200 (Tue, 29 Apr 2014)
New Revision: 1224

Modified:
   trunk/src/stable/components/replayer/replayer.cpp
Log:
#216 supported DEPTH format



Modified: trunk/src/stable/components/replayer/replayer.cpp
===================================================================
--- trunk/src/stable/components/replayer/replayer.cpp	2014-04-04 09:15:17 UTC (rev 1223)
+++ trunk/src/stable/components/replayer/replayer.cpp	2014-04-29 09:32:42 UTC (rev 1224)
@@ -67,7 +67,7 @@
 		   this->height=prop->getPropertyAsIntWithDefault(propertyPrefix + "ImageHeight",240);
 		   this->dataPath=prop->getProperty(propertyPrefix+"Dir");
 		   this->fileFormat=prop->getProperty(propertyPrefix+"FileFormat");
-
+                   this->format = prop->getProperty(propertyPrefix+"Format");
 		   std::cout << "PATH " << this->dataPath << std::endl;
 		   std::cout << "FORMAT: " << this->fileFormat << std::endl;
 
@@ -262,7 +262,7 @@
 				   mycamera->imageDescription->width = this->mycamera->width;
 				   mycamera->imageDescription->height = this->mycamera->height;
 				   mycamera->imageDescription->size = this->mycamera->width*this->mycamera->height*3;
-				   mycamera->imageDescription->format = "RGB8";
+				   mycamera->imageDescription->format = this->mycamera->format;
 
 					jderobot::ImageDataPtr reply(new jderobot::ImageData);
 					reply->description = mycamera->imageDescription;
@@ -336,8 +336,8 @@
 		long long int initState;
 		std::string fileFormat;
 		std::string dataPath;
+		std::string format;
 
-
 	}; // end class CameraI
 
 	//BEGIN pointCloudI
@@ -1099,7 +1099,7 @@
 
 			adapter->add(cameras[i], ic->stringToIdentity(cameraName));
 			if (namingService)
-						namingService->bind(cameraName, Endpoints, cameras[i]->ice_staticId());
+						namingService->bind(cameraName, Endpoints, "::jderobot::Camera");
 			nProcs++;
 		}
 		int nPointClouds = prop->getPropertyAsIntWithDefault(componentPrefix+".nPointClouds",0);