Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
White-space cleanup, gitignore update
  • Loading branch information
ArkadiuszRaj committed Oct 11, 2016
1 parent 3182bd2 commit 59d734c
Show file tree
Hide file tree
Showing 17 changed files with 98 additions and 74 deletions.
24 changes: 24 additions & 0 deletions .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


2 changes: 1 addition & 1 deletion src/AcqThread.h
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions src/Camera.h
Expand Up @@ -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
*
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/CameraFrames.h
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
2 changes: 1 addition & 1 deletion src/CameraGigeAravis.cpp
Expand Up @@ -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;

Expand Down
18 changes: 9 additions & 9 deletions src/CameraGigePylon.cpp
Expand Up @@ -50,7 +50,7 @@ CameraGigePylon::CameraGigePylon(){
mExposureAvailable = true;
mGainAvailable = true;
mInputDeviceType = CAMERA;

// Enumerate GigE cameras
pTlFactory = &CTlFactory::GetInstance();
pTl = pTlFactory->CreateTl(CBaslerGigECamera ::DeviceClass());
Expand Down Expand Up @@ -93,7 +93,7 @@ vector<pair<int,string>> CameraGigePylon::getCamerasList() {

CameraGigePylon::~CameraGigePylon(void){

if(pStreamGrabber != NULL){
if(pStreamGrabber != NULL){
delete pStreamGrabber;
}

Expand All @@ -102,7 +102,7 @@ CameraGigePylon::~CameraGigePylon(void){
delete pCamera;
}

if(pTlFactory != NULL)
if(pTlFactory != NULL)
pTlFactory->ReleaseTl(pTl);

}
Expand Down Expand Up @@ -141,7 +141,7 @@ bool CameraGigePylon::listCameras() {
bool CameraGigePylon::createDevice(int id){

try {

if(!devices.empty()) {

// Create a camera object
Expand Down Expand Up @@ -177,7 +177,7 @@ bool CameraGigePylon::getDeviceNameById(int id, string &device) {
cout << " Name : " << devices[id].GetModelName().c_str() << endl;
return true;
}

return false;

}
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
}
}

Expand Down
8 changes: 4 additions & 4 deletions src/CameraV4l2.cpp
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/CameraVideo.cpp
Expand Up @@ -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;
Expand Down

0 comments on commit 59d734c

Please sign in to comment.