Changeset 64 in pacpussensors for trunk/PtGreyCameras

Timestamp:

Sep 4, 2014, 11:19:05 AM (10 years ago)

Author:

phudelai

Message:

Programme détection d'obstacles amélioré

Location:

trunk/PtGreyCameras

Files:

• CMakeLists.txt (modified) (1 diff)
• Flea3Grabber.cpp (modified) (3 diffs)
• Flea3Grabber.h (modified) (6 diffs)

trunk/PtGreyCameras/CMakeLists.txt

@@ -130 +130 @@
                 FILES_TO_MOC
                 Flea3Component.h
-                #Flea3Grabber.h
+                Flea3Grabber.h
         )       
 endif() 

trunk/PtGreyCameras/Flea3Grabber.cpp

@@ -43 +43 @@
         this->nbrCamera_ = 1;
         this->masterCamera_ = 0;
+        this->img2send_ = 0;
 }
 
@@ -951 +952 @@
                         //++imageCount;
                 }
-
-                // Has to change
-                this->img_sending_->write((void*)correctedImg[0].data, settings_[0].mMaxImageOutputSize);
-        }
+                
+                switch (img2send_)
+                {
+                case 0:
+                        this->img_sending_->write((void*)convertedImage[0].GetData(), settings_[0].mMaxImageOutputSize);
+                        break;
+                case 1:
+                        this->img_sending_->write((void*)correctedImg[0].data, settings_[0].mMaxImageOutputSize);
+                        break;
+                case 2:
+                        this->img_sending_->write((void*)convertedImage[1].GetData(), settings_[0].mMaxImageOutputSize);
+                        break;
+                case 3:
+                        this->img_sending_->write((void*)correctedImg[1].data, settings_[0].mMaxImageOutputSize);
+                        break;
+                default:
+                        // Should not happen
+                        break; 
+                }
+        }
                 
         for (int i = 0; i < this->nbrCamera_; i++)
@@ -989 +1006 @@
         }
 }
+
+
+////////////////////////////////////////////////////////////////////////////////
+/// Slot to change the image
+////////////////////////////////////////////////////////////////////////////////
+void Flea3Grabber::changeImage()
+{
+        img2send_ = ++img2send_ & 0x03;
+}

trunk/PtGreyCameras/Flea3Grabber.h

@@ -15 +15 @@
 
 #include <QThread>
-#include <QMutex>
 #include <QDir>
 
@@ -32 +31 @@
 #include <string>
 #include <vector>
-#include "../../StdDbtPlayerComponents/ImageBaseStructure.h"
+#include "../../../Pacpussensors/trunk/StdDbtPlayerComponents/ImageBaseStructure.h"
 
 namespace pacpus {
@@ -102 +101 @@
                                                                                 public ComponentBase
 {
+        Q_OBJECT
 public:
         //============================= DEFAULT ELEMENTS ===============================================
@@ -113 +113 @@
     virtual ComponentBase::COMPONENT_CONFIGURATION configureComponent(XmlComponentConfig config);
         //==============================================================================================
-                
+
+        /** 
+        * Initialize default values
+        */
+        void InitDefault(int indice);
+
+        int img2send_;  
+
 protected:
 
@@ -123 +130 @@
         bool THREAD_ALIVE;
 
-public:
-
-        /** 
-        * Initialize default values
-        */
-        void InitDefault(int indice);
 
 private:
@@ -139 +140 @@
         std::vector<camSetting> settings_;
         std::vector<ShMem*> shmem_images_;
+
+public Q_SLOTS:
+        void changeImage();
 };