Changeset 169 in flair-src for trunk

Timestamp:

Apr 13, 2017, 11:52:54 AM (8 years ago)

Author:

Sanahuja Guillaume

Message:

cosmetic

Location:

trunk/lib

Files:

• FlairCore/src/IODevice.cpp (modified) (1 diff)
• FlairSensorActuator/src/Camera.cpp (modified) (2 diffs)
• FlairSensorActuator/src/V4LCamera.cpp (modified) (1 diff)

trunk/lib/FlairCore/src/IODevice.cpp

@@ -47 +47 @@
   }
 
-    if(data!=NULL) {
-        if(getFrameworkManager()->IsLogging()==true) pimpl_->WriteLog(data->DataTime());
-
+  if(data!=NULL) {
+    if(getFrameworkManager()->IsLogging()==true) pimpl_->WriteLog(data->DataTime());
     data->pimpl_->Circle();
   }

trunk/lib/FlairSensorActuator/src/Camera.cpp

@@ -143 +143 @@
 void Camera::SavePictureToFile(string filename) const {
         if(filename=="") filename="./"+ObjectName()+"_"+std::to_string(GetTime())+".jpg";
-    string::size_type idx = filename.rfind('.');
+  string::size_type idx = filename.rfind('.');
 
         if(idx != string::npos) {
@@ -158 +158 @@
                 }
                 output->ReleaseMutex();
+    Printf("saving %s ok\n", filename.c_str());
                         
         } else {

trunk/lib/FlairSensorActuator/src/V4LCamera.cpp

@@ -37 +37 @@
     : Thread(getFrameworkManager(), name, priority),
       Camera(name, width, height, format) {
-  capture = cvCaptureFromCAM(camera_index); // a mettre apres l'init dsp
-
+  capture = cvCaptureFromCAM(camera_index);
   if (capture < 0)
     Thread::Err("cvCaptureFromCAM error\n");