Changeset 338 in flair-src for trunk/lib/FlairSensorActuator/src/Camera.cpp

Timestamp:

10/17/19 14:49:35 (5 years ago)

Author:

Sanahuja Guillaume

Message:

remove opencv dep

Location:

trunk

Files:

• . (modified) (1 prop)
• lib/FlairSensorActuator/src/Camera.cpp (modified) (9 diffs)

trunk/lib/FlairSensorActuator/src/Camera.cpp

@@ -24 +24 @@
 #include <DataPlot1D.h>
 #include <Picture.h>
-#include <VisionFilter.h>
-#include <highgui.h>
 #include <fstream>
 
@@ -36 +34 @@
 
 Camera::Camera(string name, uint16_t width,
-               uint16_t height, cvimage::Type::Format format)
+               uint16_t height, Image::Type::Format format)
     : IODevice(getFrameworkManager(), name) {
   plot_tab = NULL;
@@ -42 +40 @@
 
   // do not allocate imagedata, allocation is done by the camera
-  output = new cvimage((IODevice *)this, width, height, format, "out", false);
+  output = new Image((IODevice *)this, width, height, format, "out", false);
         
   // station sol
@@ -76 +74 @@
                 case LogFormat::RAW:
                         AddDataToLog(output);
-                        Warn("raw log of cvimage is not yet implemented\n");
+                        Warn("raw log of Image is not yet implemented\n");
                         break;
                 case LogFormat::JPG:
-                                Warn("logging cvimage to jpeg\n");
+                                Warn("logging Image to jpeg\n");
                                 Warn("jpeg are not included in classical dbt file, as dbt does not handle variable length\n");
                         break;
@@ -95 +93 @@
 GridLayout *Camera::GetLayout(void) const { return setup_layout; }
 
-void Camera::UseDefaultPlot(const core::cvimage *image) {
+void Camera::UseDefaultPlot(const core::Image *image) {
   if (tab == NULL) {
     Err("not applicable for simulation part.\n");
@@ -113 +111 @@
 }
 
-core::cvimage *Camera::Output(void) { return output; }
+core::Image *Camera::Output(void) { return output; }
 
 void Camera::ProcessUpdate(core::io_data* data) {
@@ -121 +119 @@
                 if(logFormat==LogFormat::JPG) {
                         data->GetMutex();
-      //IplImage *img=((cvimage*)data)->img;
-      const cvimage* input = dynamic_cast<const cvimage*>(data);
+      //IplImage *img=((Image*)data)->img;
+      const Image* input = dynamic_cast<const Image*>(data);
       if (!input) {
-          Warn("casting %s to cvimage failed\n",data->ObjectName().c_str());
+          Warn("casting %s to Image failed\n",data->ObjectName().c_str());
           return;
       }
@@ -130 +128 @@
      
                         string filename=getFrameworkManager()->GetLogPath()+"/"+ObjectName()+"_"+std::to_string(data->DataTime())+".jpg";
-                        switch(((cvimage*)data)->GetDataType().GetFormat()) {
-                                case cvimage::Type::Format::Gray:
+                        switch(((Image*)data)->GetDataType().GetFormat()) {
+                                case Image::Type::Format::Gray:
                                         saveToJpeg(img,filename,PictureFormat_t::Gray,PictureFormat_t::Gray);
                                         break;
-                                case cvimage::Type::Format::BGR:
+                                case Image::Type::Format::BGR:
                                         saveToJpeg(img,filename,PictureFormat_t::RGB,PictureFormat_t::RGB);
                                         break;
-                                case cvimage::Type::Format::UYVY:
+                                case Image::Type::Format::UYVY:
                                         saveToJpeg(img,filename,PictureFormat_t::YUV_422ile,PictureFormat_t::YUV_422p);
                                         break;
@@ -160 +158 @@
                 output->GetMutex();
                 if(extension=="jpg") {
-                        if(output->GetDataType().GetFormat()==cvimage::Type::Format::Gray) saveToJpeg(output->img,filename,PictureFormat_t::Gray,PictureFormat_t::Gray);
-                        if(output->GetDataType().GetFormat()==cvimage::Type::Format::BGR) saveToJpeg(output->img,filename,PictureFormat_t::RGB,PictureFormat_t::RGB);
-                        if(output->GetDataType().GetFormat()==cvimage::Type::Format::UYVY) saveToJpeg(output->img,filename,PictureFormat_t::YUV_422ile,PictureFormat_t::YUV_422p);
+                        if(output->GetDataType().GetFormat()==Image::Type::Format::Gray) saveToJpeg(output->img,filename,PictureFormat_t::Gray,PictureFormat_t::Gray);
+                        if(output->GetDataType().GetFormat()==Image::Type::Format::BGR) saveToJpeg(output->img,filename,PictureFormat_t::RGB,PictureFormat_t::RGB);
+                        if(output->GetDataType().GetFormat()==Image::Type::Format::UYVY) saveToJpeg(output->img,filename,PictureFormat_t::YUV_422ile,PictureFormat_t::YUV_422p);
                 } else {
                         cvSaveImage(filename.c_str(),output->img);