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

Timestamp:

Mar 7, 2017, 8:26:53 PM (8 years ago)

Author:

Sanahuja Guillaume

Message:

modifs

Location:

trunk/lib/FlairSensorActuator/src

Files:

• V4LCamera.cpp (modified) (5 diffs)
• V4LCamera.h (modified) (3 diffs)

trunk/lib/FlairSensorActuator/src/V4LCamera.cpp

@@ -75 +75 @@
   awb = new CheckBox(GetGroupBox()->LastRowLastCol(), "awb:");
   fps = new Label(GetGroupBox()->NewRow(), "fps");
+  
+  hasProblems=false;
 }
 
@@ -95 +97 @@
 
   while (!ToBeStopped()) {
+    //check for ps3eye deconnection in hds uav
+    if(cvGetCaptureProperty(capture, CV_CAP_PROP_FRAME_WIDTH)<0) {
+      Thread::Warn("camera disconnected\n");
+      hasProblems=true;
+    }
+    
     // fps counter
     fpsCounter++;
@@ -100 +108 @@
       fpsNow = GetTime();
       fps->SetText("fps: %.1f",
-                   fpsCounter / ((float)(fpsNow - fpsPrev) / 1000000000.));
+       fpsCounter / ((float)(fpsNow - fpsPrev) / 1000000000.));
       fpsCounter = 0;
       fpsPrev = fpsNow;
@@ -147 +155 @@
     }
     new_time = GetTime();
+    
+    //check for ps3eye deconnection in hds uav
+    if(new_time-cam_time>100*1000*1000) {
+      Thread::Warn("delta trop grand\n");
+      hasProblems=true;
+    }
 
     output->GetMutex();
@@ -161 +175 @@
 }
 
+bool V4LCamera::HasProblems(void) {
+  return hasProblems;
+}
+
 void V4LCamera::SetAutoGain(bool value) {
   cvSetCaptureProperty(capture, CV_CAP_PROP_AUTOGAIN, value);

trunk/lib/FlairSensorActuator/src/V4LCamera.h

@@ -59 +59 @@
   */
   ~V4LCamera();
+  
+    //hack for ps3eye in hds uav
+  //TODO: put this in ps3eye class
+  bool HasProblems(void);
 
 protected:
@@ -116 +120 @@
   */
   virtual void SetContrast(float value);
-
+  
 private:
   /*!
@@ -138 +142 @@
 
   gui::Tab *sensor_tab;
-  gui::DoubleSpinBox *bright, *exposure, *gain, *contrast, *hue, *sharpness,
-      *sat;
+  gui::DoubleSpinBox *bright, *exposure, *gain, *contrast, *hue, *sharpness,*sat;
   gui::CheckBox *autogain, *awb, *autoexposure;
   gui::Label *fps;
+  bool hasProblems;
 };
 } // end namespace sensor