Changeset 150 in flair-src for trunk/lib/FlairSensorActuator/src

Timestamp:

Mar 1, 2017, 2:37:00 PM (8 years ago)

Author:

Bayard Gildas

Message:

SimuCamera thread is now working at simulated camera frequency

File:

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

trunk/lib/FlairSensorActuator/src/SimuCamera.cpp

@@ -37 +37 @@
     : Thread(getFrameworkManager(), name, priority),
       Camera(name, width, height, cvimage::Type::Format::BGR) {
-  data_rate =
-      new SpinBox(GetGroupBox()->NewRow(), "data rate", " Hz", 1, 200, 1, 50);
+//  data_rate =
+//      new SpinBox(GetGroupBox()->NewRow(), "data rate", " Hz", 1, 200, 1, 50);
 
   buf_size = width * height * channels;
@@ -47 +47 @@
   ostringstream dev_name;
   dev_name << "simu_cam_" << dev_id;
-  shmem = new SharedMem((Thread *)this, dev_name.str().c_str(), buf_size);
+  shmem = new SharedMem((Thread *)this, dev_name.str().c_str(), buf_size, SharedMem::Type::producerConsumer);
 }
 
@@ -53 +53 @@
                        uint16_t height, uint8_t channels, uint32_t dev_id)
     : Thread(parent, name, 0), Camera(parent,name) {
-  data_rate = NULL;
+//  data_rate = NULL;
 
   ostringstream dev_name;
   dev_name << "simu_cam_" << dev_id;
   shmem = new SharedMem((Thread *)this, dev_name.str().c_str(),
-                        width * height * channels);
+                        width * height * channels, SharedMem::Type::producerConsumer);
 }
 
@@ -67 +67 @@
 
 void SimuCamera::Run(void) {
-  if (data_rate == NULL) {
-    Thread::Err("not applicable for simulation part.\n");
-    return;
-  }
+//  if (data_rate == NULL) {
+//    Thread::Err("not applicable for simulation part.\n");
+//    return;
+//  }
 
-  SetPeriodUS((uint32_t)(1000000. / data_rate->Value()));
+//  SetPeriodUS((uint32_t)(1000000. / data_rate->Value()));
+  shmem->ReaderReady();
 
   while (!ToBeStopped()) {
-    WaitPeriod();
+//    WaitPeriod();
 
-    if (data_rate->ValueChanged() == true) {
-      SetPeriodUS((uint32_t)(1000000. / data_rate->Value()));
-    }
+//    if (data_rate->ValueChanged() == true) {
+//      SetPeriodUS((uint32_t)(1000000. / data_rate->Value()));
+//    }
 
     output->GetMutex();