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

Timestamp:

12/22/16 17:32:58 (7 years ago)

Author:

Sanahuja Guillaume

Message:

modifs camera

Location:

trunk/lib/FlairSensorActuator/src

Files:

• Camera.cpp (modified) (6 diffs)
• Camera.h (modified) (3 diffs)

trunk/lib/FlairSensorActuator/src/Camera.cpp

@@ -24 +24 @@
 #include <DataPlot1D.h>
 #include <Picture.h>
+#include <Buffer.h>
 #include <highgui.h>
 #include <fstream>
@@ -38 +39 @@
     : IODevice(parent, name) {
   plot_tab = NULL;
+        jpgBuffer=NULL;
+        logFormat=LogFormat::NONE;
 
   // do not allocate imagedata, allocation is done by the camera
   output = new cvimage((IODevice *)this, width, height, format, "out", false);
-
+        
   // station sol
   main_tab = new Tab(parent->GetTabWidget(), name);
@@ -50 +53 @@
 }
 
+//This contructor must only be called for a simulated device.
 Camera::Camera(const IODevice *parent, std::string name)
     : IODevice(parent, name) {
@@ -59 +63 @@
 
   output = NULL;
+        jpgBuffer=NULL;
+        logFormat=LogFormat::NONE;
 }
 
@@ -64 +70 @@
   if (main_tab != NULL)
     delete main_tab;
+}
+
+void Camera::SetLogFormat(LogFormat logFormat) {
+        this->logFormat=logFormat;
+        switch(logFormat) {
+                case LogFormat::RAW:
+                        AddDataToLog(output);
+                        Warn("raw log of cvimage is not yet implemented\n");
+                        break;
+                case LogFormat::JPG:
+                        if(jpgBuffer==NULL) {
+                                jpgBuffer=new Buffer(this,"jpg_bufer");
+                                AddDataToLog(jpgBuffer);
+                        }else{
+                                Warn("log format already defined\n");
+                        }
+                        break;
+        }
 }
 
@@ -94 +118 @@
 core::cvimage *Camera::Output(void) { return output; }
 
+void Camera::ProcessUpdate(core::io_data* data) {
+        switch(logFormat) {
+                case LogFormat::JPG:
+                                ajouter compression jpg
+                        break;
+        }
+        IODevice::ProcessUpdate(data);
+}
+
 void Camera::SaveToFile(string filename) const {
   Printf("saving %s, size %i\n", filename.c_str(), output->img->imageSize);

trunk/lib/FlairSensorActuator/src/Camera.h

@@ -19 +19 @@
 
 namespace flair {
-namespace gui {
-class GroupBox;
-class Tab;
-class TabWidget;
-class Picture;
-class GridLayout;
-}
+        namespace gui {
+                class GroupBox;
+                class Tab;
+                class TabWidget;
+                class Picture;
+                class GridLayout;
+        }
+        namespace core {
+                class Buffer;
+        }
 }
 
@@ -122 +125 @@
 
   core::DataType const &GetOutputDataType() const;
-
+        
+        /*!
+        \enum LogFormat
+        \brief log formats
+        */
+        enum class LogFormat {
+                NONE, /*!< by default, no logging */
+                RAW, /*!< raw format */
+                JPG, /*!< jpg format */
+        };
+        
+        /*!
+        * \brief Set log format
+        *
+        * Set the log format. \n
+        * Logging of the camera will be disabled if this method is not called. \n
+        * Calling this method enables logging of camera.
+        *
+        * \param LogFormat log format
+        */
+  void SetLogFormat(LogFormat logFormat);
+void ProcessUpdate(core::io_data* data);
 protected:
   /*!
@@ -138 +162 @@
   gui::GroupBox *setup_groupbox;
   gui::GridLayout *setup_layout;
+        LogFormat logFormat;
+        core::Buffer *jpgBuffer;
 };
 } // end namespace sensor