Changeset 158 in flair-src for trunk/lib/FlairSensorActuator/src/SimuCamera.cpp

Timestamp:

Mar 5, 2017, 10:50:56 AM (8 years ago)

Author:

Sanahuja Guillaume

Message:

corrected simu/device id for sensors

File:

• trunk/lib/FlairSensorActuator/src/SimuCamera.cpp (modified) (4 diffs)

trunk/lib/FlairSensorActuator/src/SimuCamera.cpp

@@ -33 +33 @@
 SimuCamera::SimuCamera(string name,
                        uint16_t width, uint16_t height, uint8_t channels,
-                       uint32_t dev_id, uint8_t priority)
+                       uint32_t modelId,uint32_t deviceId, uint8_t priority)
     : Thread(getFrameworkManager(), name, priority),
       Camera(name, width, height, cvimage::Type::Format::BGR) {
@@ -43 +43 @@
 
   ostringstream dev_name;
-  dev_name << "simu_cam_" << dev_id;
-  shmem = new SharedMem((Thread *)this, dev_name.str().c_str(), buf_size, SharedMem::Type::producerConsumer);
+  dev_name << "simu" <<  modelId << "_cam_" << deviceId;
+  shmem = new SharedMem((Thread *)this,ShMemName(modelId, deviceId), buf_size, SharedMem::Type::producerConsumer);
   
   SetIsReady(true);
@@ -51 +51 @@
 //simulation part
 SimuCamera::SimuCamera(const IODevice *parent, string name, uint16_t width,
-                       uint16_t height, uint8_t channels, uint32_t dev_id)
+                       uint16_t height, uint8_t channels, uint32_t modelId,uint32_t deviceId)
     : Thread(parent, name, 0), Camera(parent,name) {
 
   buf_size = width * height * channels+sizeof(Time);
   
-  ostringstream dev_name;
-  dev_name << "simu_cam_" << dev_id;
-  shmem = new SharedMem((Thread *)this, dev_name.str().c_str(),
+  shmem = new SharedMem((Thread *)this,ShMemName(modelId, deviceId),
                         buf_size, SharedMem::Type::producerConsumer);
   shmemReadBuf=NULL;
@@ -69 +67 @@
   Join();
   if(shmemReadBuf!=NULL) delete shmemReadBuf;
+}
+
+string SimuCamera::ShMemName(uint32_t modelId,uint32_t deviceId) {
+  ostringstream dev_name;
+  dev_name << "simu" <<  modelId << "_cam_" << deviceId;
+  return dev_name.str().c_str();
 }