Changeset 51 in pacpussensors for trunk

Timestamp:

06/13/14 18:23:43 (10 years ago)

Author:

phudelai

Message:

New component added: FLEA3GRABBER_H
FLEA3COMPONENT corrected

Location:

trunk

Files:

• PtGreyCameras/CMakeLists.txt (modified) (2 diffs)
• PtGreyCameras/Flea3Component.cpp (modified) (7 diffs)
• PtGreyCameras/Flea3Component.h (modified) (1 diff)
• PtGreyCameras/Flea3Grabber.cpp (added)
• PtGreyCameras/Flea3Grabber.h (added)
• StereoVisionDisparity/DisparityMap.cpp (modified) (2 diffs)

trunk/PtGreyCameras/CMakeLists.txt

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

trunk/PtGreyCameras/Flea3Component.cpp

@@ -45 +45 @@
 
 const int kMaxFilepathLength = 512; // TODO: should be same for all images
-
-static const string Flea3MemoryName_img = "Flea3_";
 
 //////////////////////////////////////////////////////////////////////////
@@ -84 +82 @@
         // output data
         this->shmem_image = 0;                  // Shared memory control access to the image data
-
-        stereoVision = false;
-        cam_side = "";
-        
 }
 
@@ -279 +273 @@
                 this->save2dbt = config.getProperty("save2dbt").toInt();
         //---------------------------------------------------------------------------------------------------
-
-        if (config.getProperty("stereoVision") != QString::null)
-                stereoVision = config.getBoolProperty("stereoVision");
-
-        if (stereoVision)
-        {
-                if (config.getProperty("cam_side") != QString::null)
-                        cam_side = config.getProperty("cam_side");
-        }
 
         if (config.getProperty("showdebug") != QString::null)
@@ -596 +581 @@
                 //std::cout << "Grab new image\n";
                 // Retrieve an image
-        error = cam.RetrieveBuffer( &rawImage );
+        error = cam.RetrieveBuffer(&rawImage);
         if (error != FlyCapture2::PGRERROR_OK)
         {
@@ -630 +615 @@
                 {
                         // Convert the raw image
-                        error = rawImage.Convert( FlyCapture2::PIXEL_FORMAT_MONO8, &convertedImage );
+                        error = rawImage.Convert(FlyCapture2::PIXEL_FORMAT_MONO8, &convertedImage);
                         if (error != FlyCapture2::PGRERROR_OK)
                         {
@@ -640 +625 @@
                 {
                         // Convert the raw image
-                        error = rawImage.Convert( FlyCapture2::PIXEL_FORMAT_BGR, &convertedImage );
+                        error = rawImage.Convert(FlyCapture2::PIXEL_FORMAT_BGR, &convertedImage);
                         if (error != FlyCapture2::PGRERROR_OK)
                         {
-                                LOG_ERROR( error.GetDescription() );
+                                LOG_ERROR(error.GetDescription());
                                 exit(0);
                         }
@@ -666 +651 @@
                                 this->img_mem = malloc(this->img_mem_size); 
         
-                                if (this->cam_side == "right" || this->cam_side == "Right")
-                                        this->shmem_image = new ShMem(QString(Flea3MemoryName_img.c_str() + QString().setNum(camInfo.serialNumber) + "-right").toStdString().c_str(), this->img_mem_size);
-                                else if (this->cam_side == "left" || this->cam_side == "Left")
-                                        this->shmem_image = new ShMem(QString(Flea3MemoryName_img.c_str() + QString().setNum(camInfo.serialNumber) + "-left").toStdString().c_str(), this->img_mem_size);
+                                this->shmem_image = new ShMem((name() + QString().setNum(camInfo.serialNumber)).toStdString().c_str(), this->img_mem_size);
                                 //------------------------------------------------------------------------------------------------
 

trunk/PtGreyCameras/Flea3Component.h

@@ -118 +118 @@
 
         bool THREAD_ALIVE;
-        bool stereoVision;
-        QString cam_side;
 };
 

trunk/StereoVisionDisparity/DisparityMap.cpp

@@ -129 +129 @@
         if (this->img_source_left.size() != 0 &&  this->img_source_right.size() != 0)
         {
-                this->shmem_left = new ShMem((this->img_source_left + "-left").c_str(), this->left_mem_size);
-                this->shmem_right = new ShMem((this->img_source_right + "-right").c_str(), this->right_mem_size);
+                this->shmem_left = new ShMem((this->img_source_left).c_str(), this->left_mem_size);
+                this->shmem_right = new ShMem((this->img_source_right).c_str(), this->right_mem_size);
         }
         else
@@ -449 +449 @@
                         last_reading = this->LeftImage.time;
 
-                        //cout << "Left - Right = " << this->LeftImage.time - this->RightImage.time << endl;
+                        //cout << "Left - Right = " << (int64_t)this->LeftImage.time - (int64_t)this->RightImage.time << endl;
                 }