Changeset 47 in flair-dev for trunk/include

Timestamp:

01/19/17 15:06:46 (7 years ago)

Author:

Sanahuja Guillaume

Message:

m

Location:

trunk/include

Files:

• FlairCore/Semaphore.h (modified) (2 diffs)
• FlairCore/cvimage.h (modified) (2 diffs)
• FlairSensorActuator/Camera.h (modified) (1 diff)
• FlairVisionFilter/CvtColor.h (modified) (1 diff)
• FlairVisionFilter/VisionFilter.h (modified) (1 diff)

trunk/include/FlairCore/Semaphore.h

@@ -51 +51 @@
   *
   * Lock the semaphore.
-  *
+  * 
+  * \param timeout The timeout, in nanoseconds.
   */
-  void GetSemaphore(void) const;
+  bool GetSemaphore(Time timeout = TIME_INFINITE) const;
 
   /*!
@@ -61 +62 @@
   *
   */
-  void ReleaseSemaphore(void) const;
+  bool ReleaseSemaphore(void) const;
 
 private:

trunk/include/FlairCore/cvimage.h

@@ -39 +39 @@
       UYVY, /*!< UYVY 16 bits */
       BGR,  /*!< BGR 24 bits */
-      GRAY, /*!< gray 8 bits */
+      Gray, /*!< gray 8 bits */
     };
     Type(uint16_t _width, uint16_t _height, Format _format)
@@ -47 +47 @@
       size_t pixelSize;
       switch (format) {
-      case Format::GRAY:
+      case Format::Gray:
         pixelSize = 1;
         break;

trunk/include/FlairSensorActuator/Camera.h

@@ -92 +92 @@
 
   /*!
-  * \brief Save picture to file
+  * \brief Save raw picture to file
   *
   * \param filename filename
   */
-  void SaveToFile(std::string filename) const;
+  void SaveRawPictureToFile(std::string filename) const;
+        
+        /*!
+  * \brief Save picture to file
+  *
+  * \param filename filename; if ommitted, current time is used and file is saved in current directory with jpg compression
+  */
+  void SavePictureToFile(std::string filename="") const;
 
   /*!

trunk/include/FlairVisionFilter/CvtColor.h

@@ -39 +39 @@
             */
             enum class Conversion_t {
-                BGR,/*!< BGR 24 bits */
-                GRAY,/*!< gray 8 bits */
+                ToBGR,/*!< BGR 24 bits */
+                ToGray,/*!< gray 8 bits */
                 } ;
 

trunk/include/FlairVisionFilter/VisionFilter.h

@@ -12 +12 @@
 void CloseVisionFilter(void);
 
-void saveToJpeg(IplImage* src_img,std::string filename,unsigned char compression_level=95);
+enum class PictureFormat_t {
+                Gray,/*!< gray 8 bits */
+                RGB,/*!< rgb 24 bits */
+                YUV_422ile,/*!< YUV 4:2:2 interleaved */
+                YUV_422p,/*!< YUV 4:2:2 planer */
+                } ;
+                                                                
+void saveToJpeg(IplImage* src_img,std::string filename,PictureFormat_t input_format,PictureFormat_t output_format,unsigned char compression_level=95);