fripon · ArkadiuszRaj · Oct 11, 2016 · Oct 11, 2016 · Oct 11, 2016
diff --git a/.gitignore b/.gitignore
@@ -1 +1,25 @@
 .travis.yml
+*.o
+aclocal.m4
+autom4te.cache/
+compile
+config.guess
+config.sub
+configure
+depcomp
+install-sh
+missing
+config.log
+INSTALL
+Makefile
+README
+config.h
+config.status
+doc/Makefile
+doc/freeture.1
+src/.deps/
+src/Makefile
+stamp-h1
+src/freeture
+
+
diff --git a/src/AcqThread.h b/src/AcqThread.h
@@ -74,7 +74,7 @@ class AcqThread {
         }initializer;
 
         bool                mMustStop;              // Signal to stop thread.
-        boost::mutex        mMustStopMutex;         
+        boost::mutex        mMustStopMutex;
         boost::thread       *mThread;               // Acquisition thread.
         bool                mThreadTerminated;      // Terminated status of the thread.
         Device              *mDevice;               // Device used for acquisition.

diff --git a/src/Camera.h b/src/Camera.h
@@ -3,7 +3,7 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 *
-*   This file is part of:	freeture
+*   This file is part of:   freeture
 *
 *   Copyright:      (C) 2014-2015 Yoan Audureau -- FRIPON-GEOPS-UPSUD
 *
@@ -231,7 +231,7 @@ class Camera {
         * @param value New exposure time value (us).
         * @return Success status to set new exposure time.
         */
-        virtual bool setExposureTime(double value)	{return false;};
+        virtual bool setExposureTime(double value)  {return false;};
 
         /**
         * Set device's gain value.

diff --git a/src/CameraFrames.h b/src/CameraFrames.h
@@ -90,7 +90,7 @@ class CameraFrames: public Camera {
 
     public:
 
-        CameraFrames(vector<string>	locationList, int numPos, bool verbose);
+        CameraFrames(vector<string> locationList, int numPos, bool verbose);
 
         ~CameraFrames();
 

diff --git a/src/CameraGigeAravis.cpp b/src/CameraGigeAravis.cpp
@@ -759,7 +759,7 @@
 
             arv_stream_get_statistics(stream, &nbCompletedBuffers, &nbFailures, &nbUnderruns);
 
-            cout << ">> Completed buffers = " << (unsigned long long) nbCompletedBuffers	<< endl;
+            cout << ">> Completed buffers = " << (unsigned long long) nbCompletedBuffers    << endl;
             cout << ">> Failures          = " << (unsigned long long) nbFailures           << endl;
             //cout << ">> Underruns         = " << (unsigned long long) nbUnderruns          << endl;
 

diff --git a/src/CameraGigePylon.cpp b/src/CameraGigePylon.cpp
@@ -50,7 +50,7 @@ CameraGigePylon::CameraGigePylon(){
     mExposureAvailable = true;
     mGainAvailable = true;
     mInputDeviceType = CAMERA;
-    
+
     // Enumerate GigE cameras
     pTlFactory = &CTlFactory::GetInstance();
     pTl = pTlFactory->CreateTl(CBaslerGigECamera ::DeviceClass());
@@ -93,7 +93,7 @@ vector<pair<int,string>> CameraGigePylon::getCamerasList() {
 
 CameraGigePylon::~CameraGigePylon(void){
 
-    if(pStreamGrabber != NULL){ 
+    if(pStreamGrabber != NULL){
         delete pStreamGrabber;
     }
 
@@ -102,7 +102,7 @@ CameraGigePylon::~CameraGigePylon(void){
         delete pCamera;
     }
 
-    if(pTlFactory != NULL) 
+    if(pTlFactory != NULL)
         pTlFactory->ReleaseTl(pTl);
 
 }
@@ -141,7 +141,7 @@ bool CameraGigePylon::listCameras() {
 bool CameraGigePylon::createDevice(int id){
 
     try {
-        
+
         if(!devices.empty()) {
 
             // Create a camera object
@@ -177,7 +177,7 @@ bool CameraGigePylon::getDeviceNameById(int id, string &device) {
         cout << " Name :        " << devices[id].GetModelName().c_str() << endl;
         return true;
     }
-    
+
     return false;
 
 }
@@ -369,11 +369,11 @@ void CameraGigePylon::grabCleanse(){
                         pCamera = NULL;
                     }
 
-                    if(pTlFactory != NULL) 
+                    if(pTlFactory != NULL)
                         pTlFactory->ReleaseTl(pTl);
                         pTlFactory = NULL;
                     }
- 
+
             }catch (GenICam::GenericException &e){
 
                 // Error handling.
@@ -611,7 +611,7 @@ bool CameraGigePylon::grabSingleImage(Frame &frame, int camID){
 
                 ExposureTimeRaw->SetValue(ExposureTimeRaw->GetMin());
                 cout << ">> Exposure has been setted with the minimum available value." << endl;
-                cout <<	">> The available exposure range is [" << ExposureTimeRaw->GetMin() << "-" << ExposureTimeRaw->GetMax() << "] (us)" << endl;
+                cout << ">> The available exposure range is [" << ExposureTimeRaw->GetMin() << "-" << ExposureTimeRaw->GetMax() << "] (us)" << endl;
             }
 
         }else {
@@ -641,7 +641,7 @@ bool CameraGigePylon::grabSingleImage(Frame &frame, int camID){
 
                 gainRaw->SetValue(gainRaw->GetMin());
                 cout << ">> Gain has been setted to the minimum available value." << endl;
-                cout <<	">> The available gain range is [" << gainRaw->GetMin() << "-" << gainRaw->GetMax() << "]" << endl;
+                cout << ">> The available gain range is [" << gainRaw->GetMin() << "-" << gainRaw->GetMax() << "]" << endl;
             }
         }
 

diff --git a/src/CameraV4l2.cpp b/src/CameraV4l2.cpp
@@ -1276,7 +1276,7 @@
 
             // ************************ DISABLE AUTO EXPOSURE *****************************
 
-	    struct v4l2_queryctrl queryctrl1;
+        struct v4l2_queryctrl queryctrl1;
             struct v4l2_control control1;
             memset(&queryctrl1, 0, sizeof(queryctrl1));
             queryctrl1.id = V4L2_CID_EXPOSURE_AUTO;
@@ -1315,7 +1315,7 @@
 
             // ************************ SET AUTO EXPOSURE *****************************
 
-	    struct v4l2_queryctrl queryctrl;
+        struct v4l2_queryctrl queryctrl;
             struct v4l2_control control;
             memset(&queryctrl, 0, sizeof(queryctrl));
             queryctrl.id = V4L2_CID_EXPOSURE_ABSOLUTE;
@@ -1507,8 +1507,8 @@
                 if (!tpf->denominator || !tpf->numerator)
                     printf("Invalid frame rate\n");
                 else
-				printf("Frame rate set to %.3f fps\n",
-					1.0 * tpf->denominator / tpf->numerator);
+                printf("Frame rate set to %.3f fps\n",
+                    1.0 * tpf->denominator / tpf->numerator);
             }
         }
 

diff --git a/src/CameraVideo.cpp b/src/CameraVideo.cpp
@@ -46,7 +46,7 @@ CameraVideo::CameraVideo(vector<string> videoList, bool verbose):mVideoID(0), mF
     // Open the video file for reading.
     if(mVideoList.size()>0)
         mCap = VideoCapture(videoList.front());
-    else 
+    else
         throw "No video path in input.";
 
     mExposureAvailable = false;

diff --git a/src/CfgParam.cpp b/src/CfgParam.cpp
@@ -1374,6 +1374,12 @@ void CfgParam::loadDetParam() {
         }
     }
 
+    if(!cfg.Get("DET_EVENT_USER_ACTION", param.det.DET_EVENT_USER_ACTION)) {
+        e = true;
+        param.det.errormsg.push_back("- DET_EVENT_USER_ACTION : Fail to load value.");
+    }
+
+
     // --------------------------------------------------------------------------------------
 
     if(!cfg.Get("DET_DOWNSAMPLE_ENABLED", param.det.DET_DOWNSAMPLE_ENABLED)) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -90,7 +90,7 @@ class CameraFrames: public Camera { @@
         public:
-            CameraFrames(vector<string>	locationList, int numPos, bool verbose);
+            CameraFrames(vector<string> locationList, int numPos, bool verbose);
             ~CameraFrames();
@@ Expand Down @@