Changeset 353 in flair-src for trunk/lib

Timestamp:

Feb 19, 2020, 5:29:19 PM (5 years ago)

Author:

Sanahuja Guillaume

Message:

cam

Location:

trunk/lib

Files:

• FlairCore/src/Image.h (modified) (1 diff)
• FlairSensorActuator/src/V4LCamera.cpp (modified) (1 diff)

trunk/lib/FlairCore/src/Image.h

@@ -69 +69 @@
       return pixelSize * width * height;
     }
-    std::string GetDescription() const { return "cv image"; };
+    std::string GetDescription() const { return "image"; };
 
     Format GetFormat() const { return format; };

trunk/lib/FlairSensorActuator/src/V4LCamera.cpp

@@ -43 +43 @@
 void V4LCamera::Run(void) {
   pimpl_->Run();
-  /*
-  Time cam_time, new_time, fpsNow, fpsPrev;
-  int fpsCounter = 0;
-
-  cam_time = GetTime();
-  fpsPrev = cam_time;
-
-  while (!ToBeStopped()) {
-    // fps counter
-    fpsCounter++;
-    if (fpsCounter == 100) {
-      fpsNow = GetTime();
-      fps->SetText("fps: %.1f",
-       fpsCounter / ((float)(fpsNow - fpsPrev) / 1000000000.));
-      fpsCounter = 0;
-      fpsPrev = fpsNow;
-    }
-
-    // cam properties
-    if (gain->ValueChanged() == true && autogain->Value() == false)
-      SetGain(gain->Value());
-    if (exposure->ValueChanged() == true && autoexposure->Value() == false)
-      SetExposure(exposure->Value());
-    if (bright->ValueChanged() == true)
-      SetBrightness(bright->Value());
-    if (sat->ValueChanged() == true)
-      SetSaturation(sat->Value());
-    if (contrast->ValueChanged() == true)
-      SetContrast(contrast->Value());
-    if (hue->ValueChanged() == true)
-      SetHue(hue->Value());
-    //if (sharpness->ValueChanged() == true)
-    //  cvSetCaptureProperty(capture, CV_CAP_PROP_SHARPNESS, sharpness->Value());
-    if (autogain->ValueChanged() == true) {
-      if (autogain->Value() == true) {
-        gain->setEnabled(false);
-      } else {
-        gain->setEnabled(true);
-        SetGain(gain->Value());
-      }
-      SetAutoGain(autogain->Value());
-    }
-    if (autoexposure->ValueChanged() == true) {
-      if (autoexposure->Value() == true) {
-        exposure->setEnabled(false);
-      } else {
-        exposure->setEnabled(true);
-        SetExposure(exposure->Value());
-      }
-      SetAutoExposure(autoexposure->Value());
-    }
-    //if (awb->ValueChanged() == true)
-    //  cvSetCaptureProperty(capture, CV_CAP_PROP_AWB, awb->Value());
-   
-    // cam pictures
-    if (!GrabFrame()) {
-      Printf("Could not grab a frame\n");
-    }
-        
-    //check for ps3eye deconnection in hds uav
-    new_time = GetTime();
-    if(new_time-cam_time>100*1000*1000) {
-      Thread::Warn("delta t trop grand\n");
-      hasProblems=true;
-    }
-
-    //select buffer
-    if(useMemoryUsrPtr) {//buffers are already in CMEM
-      imageData=(char*)buffers[dQueuedBuffer.index];
-      //dequeue it latter (buffer used by ProcessUpdate)
-    } else {//copy to CMEM allocated buffer 
-      memcpy(imageData,(char *)buffers[dQueuedBuffer.index],output->GetDataType().GetSize());
-      QueueBuffer(&dQueuedBuffer);//we can do it right now
-    }
-    
-    output->GetMutex();
-    output->buffer=imageData;
-    output->ReleaseMutex();
-   
-    output->SetDataTime(cam_time);
-    ProcessUpdate(output);
-    cam_time = new_time;
-    
-    if(useMemoryUsrPtr) {
-      QueueBuffer(&dQueuedBuffer);//now it is possible to dequeue
-    }
-  }
-   */
 }