Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Instrument Control
NomadSpecialModules
Commits
a396116c
Commit
a396116c
authored
Mar 17, 2020
by
ics
Browse files
change to generic name
parent
4a031c49
Changes
20
Hide whitespace changes
Inline
Side-by-side
src/drivers/gigecam/
photonics
/BufferInformation.h
→
src/drivers/gigecam/
genericcam
/BufferInformation.h
View file @
a396116c
File moved
src/drivers/gigecam/
photonics
/CameraHandler.cpp
→
src/drivers/gigecam/
genericcam
/CameraHandler.cpp
View file @
a396116c
#include "drivers/gigecam/
photonics
/CameraHandler.h"
#include "drivers/gigecam/
genericam
/CameraHandler.h"
#include <iostream>
#include <sstream>
#include <limits>
//#include "pylon/Platform.h"
//#include "pylon/api_autoconf.h"
#include "drivers/gigecam/
photonics
/BufferInformation.h"
#include "drivers/gigecam/
photonics
/DoubleBufferHandler.h"
#include "drivers/gigecam/
genericam
/BufferInformation.h"
#include "drivers/gigecam/
genericam
/DoubleBufferHandler.h"
// this function initializes the Baumer GAPI SDK and
// searches for connected cameras
...
...
src/drivers/gigecam/
photonics
/CameraHandler.h
→
src/drivers/gigecam/
genericcam
/CameraHandler.h
View file @
a396116c
File moved
src/drivers/gigecam/
photonics
/DoubleBufferHandler.cpp
→
src/drivers/gigecam/
genericcam
/DoubleBufferHandler.cpp
View file @
a396116c
#include "drivers/gigecam/
photonics
/DoubleBufferHandler.h"
#include "drivers/gigecam/
genericam
/DoubleBufferHandler.h"
#include <iostream>
#include <sstream>
#include "drivers/gigecam/
photonics
/BufferInformation.h"
#include "drivers/gigecam/
genericam
/BufferInformation.h"
CDoubleBufferHandler
::
CDoubleBufferHandler
()
:
buffer_read_
(
nullptr
)
...
...
src/drivers/gigecam/
photonics
/DoubleBufferHandler.h
→
src/drivers/gigecam/
genericcam
/DoubleBufferHandler.h
View file @
a396116c
File moved
src/drivers/gigecam/
photonics/Photonics
Def.h
→
src/drivers/gigecam/
genericcam/GenericCam
Def.h
View file @
a396116c
...
...
@@ -16,13 +16,13 @@
* limitations under the Licence.
*/
#ifndef
PHOTONICS
DEF_H
#define
PHOTONICS
DEF_H
#ifndef
GENERICCAM
DEF_H
#define
GENERICCAM
DEF_H
#include <string>
#include <common/base/PropertyType.h>
namespace
photonics
{
namespace
genericam
{
static
const
std
::
string
MILLISEC
=
"Millisec"
;
...
...
src/drivers/gigecam/
photonics/Photonics
Driver.cpp
→
src/drivers/gigecam/
genericcam/GenericCam
Driver.cpp
View file @
a396116c
...
...
@@ -16,33 +16,33 @@
* limitations under the Licence.
*/
#include "drivers/gigecam/
photonics/Photonics
Driver.h"
#include "drivers/gigecam/
genericam/GenericCam
Driver.h"
#include <math.h>
#include "drivers/gigecam/
photonics/PerfectPhotonics
Driver.h"
#include "drivers/gigecam/
photonics/Photonics
Def.h"
#include "drivers/gigecam/
photonics/Photonics
State.h"
#include "drivers/gigecam/
photonics/RealPhotonics
Driver.h"
#include "drivers/gigecam/
photonics
/Simulated
Photonics
Driver.h"
#include "drivers/gigecam/
genericam/PerfectGenericCam
Driver.h"
#include "drivers/gigecam/
genericam/GenericCam
Def.h"
#include "drivers/gigecam/
genericam/GenericCam
State.h"
#include "drivers/gigecam/
genericam/RealGenericCam
Driver.h"
#include "drivers/gigecam/
genericam
/Simulated
GenericCam
Driver.h"
using
namespace
std
;
namespace
photonics
{
namespace
genericam
{
const
std
::
string
Photonics
Driver
::
TYPE
=
"
photonics
"
;
const
std
::
string
Photonics
Driver
::
MODE
[
4
]
=
{
"Standard"
,
"Average"
,
"Summation"
,
"Accumulation"
};
const
std
::
string
GenericCam
Driver
::
TYPE
=
"
genericam
"
;
const
std
::
string
GenericCam
Driver
::
MODE
[
4
]
=
{
"Standard"
,
"Average"
,
"Summation"
,
"Accumulation"
};
/*
* Constructor
*/
PhotonicsDriver
::
Photonics
Driver
(
const
string
&
name
)
:
GenericCamDriver
::
GenericCam
Driver
(
const
string
&
name
)
:
acquisition
::
NoTofAcquisitionCommon
(
name
),
acquisition
::
KineticAcquisitionCommon
(
name
),
acquisition
::
TimeGateCommon
(
name
),
acquisition
::
DetectorCommon
(
name
)
{
registerStates
(
new
Real
Photonics
Driver
(
this
),
new
Perfect
Photonics
Driver
(
this
),
new
Simulated
Photonics
Driver
(
this
));
registerStates
(
new
Real
GenericCam
Driver
(
this
),
new
Perfect
GenericCam
Driver
(
this
),
new
Simulated
GenericCam
Driver
(
this
));
driver
::
SocketTcp
::
init
(
name
);
...
...
@@ -92,13 +92,13 @@ PhotonicsDriver::PhotonicsDriver(const string& name):
/*
* Destructor
*/
PhotonicsDriver
::~
Photonics
Driver
()
{
GenericCamDriver
::~
GenericCam
Driver
()
{
}
/*
* refreshDataSizeProperty
*/
void
Photonics
Driver
::
refreshDataSizeProperty
(
int32
value
)
throw
(
CannotSetValue
)
{
void
GenericCam
Driver
::
refreshDataSizeProperty
(
int32
value
)
throw
(
CannotSetValue
)
{
if
(
m_DataShort
!=
NULL
)
{
delete
[]
m_DataShort
;
}
...
...
@@ -113,7 +113,7 @@ void PhotonicsDriver::refreshDataSizeProperty(int32 value) throw (CannotSetValue
/*
* refreshModeProperty
*/
void
Photonics
Driver
::
refreshModeProperty
(
int32
value
)
throw
(
CannotSetValue
)
{
void
GenericCam
Driver
::
refreshModeProperty
(
int32
value
)
throw
(
CannotSetValue
)
{
if
(
value
!=
acquisition
::
GateCommon
::
TIME_MODE
)
{
throw
CannotSetValue
();
}
...
...
@@ -122,13 +122,13 @@ void PhotonicsDriver::refreshModeProperty(int32 value) throw (CannotSetValue) {
/*
* execute
*/
void
Photonics
Driver
::
execute
(
const
std
::
string
&
aCommand
)
{
void
GenericCam
Driver
::
execute
(
const
std
::
string
&
aCommand
)
{
if
((
aCommand
!=
driver
::
PAUSE_COMMAND
)
&&
(
aCommand
!=
driver
::
STOP_COMMAND
)
&&
(
aCommand
!=
driver
::
STATUS_COMMAND
)
&&
(
aCommand
!=
driver
::
READ_COMMAND
))
{
commandProgression
=
PROGRESSION_UNKNOWNSTATE_DEVICE_CONTAINER
;
}
Photonics
State
*
currentState
=
dynamic_cast
<
Photonics
State
*>
(
getCurrentState
());
GenericCam
State
*
currentState
=
dynamic_cast
<
GenericCam
State
*>
(
getCurrentState
());
// Check command
if
(
aCommand
==
driver
::
INIT_COMMAND
)
{
// Init command
...
...
@@ -187,7 +187,7 @@ void PhotonicsDriver::execute(const std::string& aCommand) {
/*
* calculateProgression
*/
void
Photonics
Driver
::
calculateProgression
()
{
void
GenericCam
Driver
::
calculateProgression
()
{
int32
progression
=
0
;
float64
setpoint
=
0.0
;
float64
actual
=
0.0
;
...
...
@@ -210,9 +210,9 @@ void PhotonicsDriver::calculateProgression() {
}
/*
*
Photonics
Driver
*
GenericCam
Driver
*/
void
Photonics
Driver
::
computeGateStatus
(
int32
value
)
{
void
GenericCam
Driver
::
computeGateStatus
(
int32
value
)
{
int32
valueout
=
0
;
if
(
value
==
COUNTING
)
{
valueout
|=
GateCommon
::
RUNNING_STATUS
;
...
...
@@ -224,18 +224,18 @@ void PhotonicsDriver::computeGateStatus(int32 value) {
}
/*
*
Photonics
Driver
*
GenericCam
Driver
*/
void
Photonics
Driver
::
computeDetectorStatus
(
int32
value
)
{
void
GenericCam
Driver
::
computeDetectorStatus
(
int32
value
)
{
int32
valueout
=
0
;
detectorStatus
.
update
(
valueout
);
}
/*
*
Photonics
Driver
*
GenericCam
Driver
*/
void
Photonics
Driver
::
computeAcquisitionStatus
(
int32
value
)
{
void
GenericCam
Driver
::
computeAcquisitionStatus
(
int32
value
)
{
int32
valueout
=
0
;
acquisitionStatus
.
update
(
valueout
);
}
...
...
src/drivers/gigecam/
photonics/Photonics
Driver.h
→
src/drivers/gigecam/
genericcam/GenericCam
Driver.h
View file @
a396116c
...
...
@@ -16,8 +16,8 @@
* limitations under the Licence.
*/
#ifndef
PHOTONICS
DRIVER_H
#define
PHOTONICS
DRIVER_H
#ifndef
GENERICCAM
DRIVER_H
#define
GENERICCAM
DRIVER_H
#define _GNULINUX
#include <Driver.h>
...
...
@@ -31,21 +31,21 @@
#include "drivers/legacy/def/DriverErrorDef.h"
//#include "/usr/local/src/baumer/inc/"
namespace
photonics
{
namespace
genericam
{
/**
* Global Implementation of the vme card called Psl made in Ill. It needs a board called Men A201.
*/
class
Photonics
Driver
:
public
acquisition
::
NoTofAcquisitionCommon
,
class
GenericCam
Driver
:
public
acquisition
::
NoTofAcquisitionCommon
,
public
acquisition
::
TimeGateCommon
,
public
acquisition
::
KineticAcquisitionCommon
,
public
acquisition
::
DetectorCommon
,
public
driver
::
SocketTcp
{
friend
class
Real
Photonics
Driver
;
friend
class
Perfect
Photonics
Driver
;
friend
class
Simulated
Photonics
Driver
;
friend
class
Real
GenericCam
Driver
;
friend
class
Perfect
GenericCam
Driver
;
friend
class
Simulated
GenericCam
Driver
;
public:
static
const
std
::
string
MODE
[
4
];
...
...
@@ -58,12 +58,12 @@ public:
* \brief Constructor
* \param[in] name the name of the device driver
*/
Photonics
Driver
(
const
std
::
string
&
name
);
GenericCam
Driver
(
const
std
::
string
&
name
);
/*!
* \brief Destructor
*/
virtual
~
Photonics
Driver
();
virtual
~
GenericCam
Driver
();
/*!
* \brief Method called for executing a command
...
...
src/drivers/gigecam/
photonics/Photonics
State.h
→
src/drivers/gigecam/
genericcam/GenericCam
State.h
View file @
a396116c
...
...
@@ -16,23 +16,23 @@
* limitations under the Licence.
*/
#ifndef
PHOTONICS
STATE_H
#define
PHOTONICS
STATE_H
#ifndef
GENERICCAM
STATE_H
#define
GENERICCAM
STATE_H
#include <Driver.h>
#include "drivers/gigecam/
photonics/Photonics
Driver.h"
#include "drivers/gigecam/
genericam/GenericCam
Driver.h"
namespace
photonics
{
namespace
genericam
{
/*!
* \class
Photonics
State
* \class
GenericCam
State
* \brief Virtual class for implement State pattern
*
* Define all methods that perfect, simulated and real classes have to implement
*/
class
Photonics
State
:
public
DriverState
<
Photonics
Driver
>
{
class
GenericCam
State
:
public
DriverState
<
GenericCam
Driver
>
{
public:
...
...
@@ -40,13 +40,13 @@ public:
* \brief Constructor
* \param[in] owner The device driver main class link
*/
PhotonicsState
(
Photonics
Driver
*
owner
)
:
DriverState
<
Photonics
Driver
>
(
owner
)
{
GenericCamState
(
GenericCam
Driver
*
owner
)
:
DriverState
<
GenericCam
Driver
>
(
owner
)
{
}
/*!
* \brief Destructor
*/
virtual
~
Photonics
State
()
{
virtual
~
GenericCam
State
()
{
}
/*!
...
...
@@ -107,4 +107,4 @@ public:
};
}
#endif //
PHOTONICS
STATE_H
#endif //
GENERICCAM
STATE_H
src/drivers/gigecam/
photonics
/Module.xml
→
src/drivers/gigecam/
genericcam
/Module.xml
View file @
a396116c
<module
name=
"
photonics
"
>
<driver
class=
"
photonics::Photonics
Driver"
/>
<module
name=
"
genericam
"
>
<driver
class=
"
genericam::GenericCam
Driver"
/>
<link
path=
"/usr/local/lib/baumer"
lib=
"bgapi2_genicam"
/>
<link
lib=
"opencv_core"
/>
<link
lib=
"opencv_calib3d"
/>
...
...
src/drivers/gigecam/
photonics/PerfectPhotonics
Driver.cpp
→
src/drivers/gigecam/
genericcam/PerfectGenericCam
Driver.cpp
View file @
a396116c
...
...
@@ -16,37 +16,37 @@
* limitations under the Licence.
*/
#include "drivers/gigecam/
photonics/PerfectPhotonics
Driver.h"
#include "drivers/gigecam/
genericam/PerfectGenericCam
Driver.h"
#include <stdlib.h>
#include "drivers/gigecam/
photonics/Photonics
Def.h"
#include "drivers/gigecam/
photonics/Photonics
Driver.h"
#include "drivers/gigecam/
genericam/GenericCam
Def.h"
#include "drivers/gigecam/
genericam/GenericCam
Driver.h"
namespace
photonics
{
namespace
genericam
{
/*
* Constructor
*/
Perfect
Photonics
Driver
::
Perfect
PhotonicsDriver
(
Photonics
Driver
*
owner
)
:
Photonics
State
(
owner
)
{
Perfect
GenericCam
Driver
::
Perfect
GenericCamDriver
(
GenericCam
Driver
*
owner
)
:
GenericCam
State
(
owner
)
{
/* Empty */
}
/*
* Destructor
*/
Perfect
Photonics
Driver
::~
Perfect
Photonics
Driver
()
{
Perfect
GenericCam
Driver
::~
Perfect
GenericCam
Driver
()
{
/* Empty */
}
void
Perfect
Photonics
Driver
::
init
()
{
void
Perfect
GenericCam
Driver
::
init
()
{
}
/*
* clearvme/daugther/
Photonics
* clearvme/daugther/
GenericCam
*/
void
Perfect
Photonics
Driver
::
clear
()
{
void
Perfect
GenericCam
Driver
::
clear
()
{
// Read command
owner
()
->
time
=
0
;
owner
()
->
counts
=
0
;
...
...
@@ -57,13 +57,13 @@ void PerfectPhotonicsDriver::clear() {
/*
* writeParam
*/
void
Perfect
Photonics
Driver
::
writeParam
()
{
void
Perfect
GenericCam
Driver
::
writeParam
()
{
}
/*
* synchroniseRead
*/
void
Perfect
Photonics
Driver
::
synchroniseRead
()
{
void
Perfect
GenericCam
Driver
::
synchroniseRead
()
{
read
();
owner
()
->
m_SynchroniseReadTerminated
=
true
;
}
...
...
@@ -71,7 +71,7 @@ void PerfectPhotonicsDriver::synchroniseRead() {
///*
// * regroup
// */
//void Perfect
Photonics
Driver::regroup() {
//void Perfect
GenericCam
Driver::regroup() {
// std::cout << owner()->xSize() << std::endl;
// std::cout << owner()->ySize() << std::endl;
//}
...
...
@@ -79,7 +79,7 @@ void PerfectPhotonicsDriver::synchroniseRead() {
/*
* read
*/
void
Perfect
Photonics
Driver
::
read
()
{
void
Perfect
GenericCam
Driver
::
read
()
{
// Read command
int32
size
=
owner
()
->
dataSize
();
...
...
@@ -109,35 +109,35 @@ void PerfectPhotonicsDriver::read() {
/*
* pause
*/
void
Perfect
Photonics
Driver
::
pause
()
{
void
Perfect
GenericCam
Driver
::
pause
()
{
}
/*
* continue
*/
void
Perfect
Photonics
Driver
::
resume
()
{
void
Perfect
GenericCam
Driver
::
resume
()
{
}
/*
* start
*/
void
Perfect
Photonics
Driver
::
start
()
{
void
Perfect
GenericCam
Driver
::
start
()
{
owner
()
->
time
=
owner
()
->
time
.
setpoint
();
}
/*
* stop
*/
void
Perfect
Photonics
Driver
::
stop
()
{
void
Perfect
GenericCam
Driver
::
stop
()
{
}
/*
* readStatus
*/
void
Perfect
Photonics
Driver
::
readStatus
()
{
void
Perfect
GenericCam
Driver
::
readStatus
()
{
owner
()
->
startActivated
=
false
;
// Status command
owner
()
->
computeGateStatus
(
photonics
::
READOUT_COMPLETE
);
owner
()
->
computeGateStatus
(
genericam
::
READOUT_COMPLETE
);
owner
()
->
computeAcquisitionStatus
(
0
);
owner
()
->
computeDetectorStatus
(
0
);
if
(
owner
()
->
m_SynchroniseReadActivated
==
true
)
{
...
...
@@ -154,7 +154,7 @@ void PerfectPhotonicsDriver::readStatus() {
/*
* readInfos
*/
void
Perfect
Photonics
Driver
::
readInfos
()
{
void
Perfect
GenericCam
Driver
::
readInfos
()
{
}
}
src/drivers/gigecam/
photonics/PerfectPhotonics
Driver.h
→
src/drivers/gigecam/
genericcam/PerfectGenericCam
Driver.h
View file @
a396116c
...
...
@@ -16,21 +16,21 @@
* limitations under the Licence.
*/
#ifndef PERFECT
PHOTONICS
DRIVER_H
#define PERFECT
PHOTONICS
DRIVER_H
#ifndef PERFECT
GENERICCAM
DRIVER_H
#define PERFECT
GENERICCAM
DRIVER_H
#include "drivers/gigecam/
photonics/Photonics
State.h"
#include "drivers/gigecam/
genericam/GenericCam
State.h"
namespace
photonics
{
namespace
genericam
{
/*!
* \class Perfect
Photonics
Driver
* \brief Perfect implementation class for the
Photonics
device driver
* \class Perfect
GenericCam
Driver
* \brief Perfect implementation class for the
GenericCam
device driver
*
* This class is a perfect implementation of
Photonics
device driver.
* This class is a perfect implementation of
GenericCam
device driver.
* On start command, all actual values become target's ones.
*/
class
Perfect
Photonics
Driver
:
public
Photonics
State
{
class
Perfect
GenericCam
Driver
:
public
GenericCam
State
{
public:
...
...
@@ -38,12 +38,12 @@ public:
* \brief Constructor
* \param[in] owner The device driver main class link
*/
Perfect
PhotonicsDriver
(
Photonics
Driver
*
owner
);
Perfect
GenericCamDriver
(
GenericCam
Driver
*
owner
);
/*!
* \brief Destructor
*/
virtual
~
Perfect
Photonics
Driver
();
virtual
~
Perfect
GenericCam
Driver
();
/*!
* \brief Init command implementation
...
...
@@ -108,4 +108,4 @@ public:
};
}
#endif //PERFECT
PHOTONICS
DRIVER_H
#endif //PERFECT
GENERICCAM
DRIVER_H
src/drivers/gigecam/
photonics/RealPhotonics
Driver.cpp
→
src/drivers/gigecam/
genericcam/RealGenericCam
Driver.cpp
View file @
a396116c
...
...
@@ -16,7 +16,7 @@
* limitations under the Licence.
*/
#include "drivers/gigecam/
photonics/RealPhotonics
Driver.h"
#include "drivers/gigecam/
genericam/RealGenericCam
Driver.h"
// Namespace for using pylon objects.
...
...
@@ -24,24 +24,24 @@
#include "CImg.h"
#include "drivers/gigecam/
photonics/Photonics
Def.h"
#include "drivers/gigecam/
photonics/Photonics
Driver.h"
#include "drivers/gigecam/
genericam/GenericCam
Def.h"
#include "drivers/gigecam/
genericam/GenericCam
Driver.h"
using
namespace
cimg_library
;
// Setting for using Basler GigE cameras.
using
namespace
std
;
///
/// \namespace
photonics
/// \namespace
genericam
/// \brief camera namespace
///
namespace
photonics
{
namespace
genericam
{
/*
* Constructor
*/
Real
Photonics
Driver
::
Real
PhotonicsDriver
(
Photonics
Driver
*
owner
)
:
Photonics
State
(
owner
)
{
Real
GenericCam
Driver
::
Real
GenericCamDriver
(
GenericCam
Driver
*
owner
)
:
GenericCam
State
(
owner
)
{
m_return_code
=
0
;
m_finish_console_threads
=
false
;
m_command_status
=
false
;
...
...
@@ -50,7 +50,7 @@ RealPhotonicsDriver::RealPhotonicsDriver(PhotonicsDriver* owner) :
/*
* Destructor
*/
Real
Photonics
Driver
::~
Real
Photonics
Driver
()
{
Real
GenericCam
Driver
::~
Real
GenericCam
Driver
()
{
if
(
m_return_code
==
0
)
{
// set the cancel flag of status thread
m_finish_console_threads
=
true
;
...
...
@@ -61,7 +61,7 @@ RealPhotonicsDriver::~RealPhotonicsDriver() {
}
}
//string Real
Photonics
Driver::getConfigFile(BGAPI2::Device* device) {
//string Real
GenericCam
Driver::getConfigFile(BGAPI2::Device* device) {
// std::string confgFile;
// // BGAPI2::Node * pNode = NULL;
// // BGAPI2::NodeMap * pNodeTree = NULL;
...
...
@@ -85,7 +85,7 @@ RealPhotonicsDriver::~RealPhotonicsDriver() {
/*
* init
*/
void
Real
Photonics
Driver
::
init
()
{
void
Real
GenericCam
Driver
::
init
()
{
// configure the camera handler to work the double buffer handler
// at this point it is possible to implement other buffer exchange strategies
m_camera_handler
.
Start
(
m_double_buffer
);
...
...
@@ -123,7 +123,7 @@ void RealPhotonicsDriver::init() {
m_return_code
=
0
;
}
//void Real
Photonics
Driver::InitCurrentBufferStruct(CCameraHandler *camera_handler, std::list<std::thread::id> thread_id_list) {
//void Real
GenericCam
Driver::InitCurrentBufferStruct(CCameraHandler *camera_handler, std::list<std::thread::id> thread_id_list) {
// const std::vector<CCameraControl*>* camera_vector = camera_handler->GetCameraControlVector();
// for (std::vector<CCameraControl*>::const_iterator camera_iter = camera_vector->begin();
// camera_iter != camera_vector->end();
...
...
@@ -137,7 +137,7 @@ void RealPhotonicsDriver::init() {
//// the StatusThreadRoutine is left and the status thread finished, if the finish flag was set
//// the StatusThreadRoutine starts working if the status command was activated from within the main loop
//// the StatusThreadRoutine works with polling to detect an activated status command
//void Real
Photonics
Driver::StatusThreadRoutine(CCameraHandler* camera_handler) {
//void Real
GenericCam
Driver::StatusThreadRoutine(CCameraHandler* camera_handler) {
// // abort condition of the thread routine
// while (!m_finish_console_threads) {
// // check if the user activated the status command
...
...
@@ -163,7 +163,7 @@ void RealPhotonicsDriver::init() {
//// and print this information to the console output
//// the PrintCameraStatus use the synchronisation functions for a synchronized buffer access
//// the PrintCameraStatus works only once on the same camera buffer on a camera (see HasDoubleBufferHandlerNewData)
//void Real
Photonics
Driver::PrintCameraStatus(CCameraControl * camera_control) {
//void Real
GenericCam
Driver::PrintCameraStatus(CCameraControl * camera_control) {
// std::cout << "status of camera " << camera_control->camera_pointer_->GetDisplayName() << std::endl;
// // check for a new camera buffer
// if (HasDoubleBufferHandlerNewData(&camera_control->buffer_handler_)) {
...
...
@@ -213,7 +213,7 @@ void RealPhotonicsDriver::init() {
//// this function sets the new data flag for all connected cameras to true, if the buffer_ pointer is nullptr,
//// that means if all application threads have returned their camera buffer
//// and a new camera buffer is served by the buffer handler
//bool Real
Photonics
Driver::HasDoubleBufferHandlerNewData(CDoubleBufferHandler* buffer_handler) {
//bool Real
GenericCam
Driver::HasDoubleBufferHandlerNewData(CDoubleBufferHandler* buffer_handler) {
// std::lock_guard<std::mutex> lock(m_current_buffer[buffer_handler].lock_);
// if (m_current_buffer[buffer_handler].buffer_ == nullptr) {
// if (buffer_handler->HasNewData()) {
...
...
@@ -226,7 +226,7 @@ void RealPhotonicsDriver::init() {
// return m_current_buffer[buffer_handler].new_data[std::this_thread::get_id()];
//}
//
//void Real
Photonics
Driver::PrintLoggingInformation(CCameraControl * camera_control) {
//void Real
GenericCam
Driver::PrintLoggingInformation(CCameraControl * camera_control) {
// while (!camera_control->LoggingListEmpty()) {
// std::cout << camera_control->LoggingString() << std::endl;
// };
...
...
@@ -237,7 +237,7 @@ void RealPhotonicsDriver::init() {
//// the mutex is entered, when this function is called and when the lock is not
//// entered from FreeBufferToDoubleBufferHandler, in this case the current thread
//// stops execution on the mutex object until FreeBufferToDoubleBufferHandler was left
//BGAPI2::Buffer* Real
Photonics
Driver::PullBufferFromDoubleBufferHandler(CDoubleBufferHandler* buffer_handler) {
//BGAPI2::Buffer* Real
GenericCam
Driver::PullBufferFromDoubleBufferHandler(CDoubleBufferHandler* buffer_handler) {
// std::lock_guard<std::mutex> lock(m_current_buffer[buffer_handler].lock_);
// if (m_current_buffer[buffer_handler].buffer_ == nullptr) {
// m_current_buffer[buffer_handler].buffer_ = buffer_handler->PullBuffer();
...
...
@@ -251,7 +251,7 @@ void RealPhotonicsDriver::init() {
//
//
//// vise versa to function PullBufferFromDoubleBufferHandler
//void Real
Photonics
Driver::FreeBufferToDoubleBufferHandler(CDoubleBufferHandler* buffer_handler, BGAPI2::Buffer* buffer) {
//void Real
GenericCam
Driver::FreeBufferToDoubleBufferHandler(CDoubleBufferHandler* buffer_handler, BGAPI2::Buffer* buffer) {
// std::lock_guard<std::mutex> lock(m_current_buffer[buffer_handler].lock_);
// if (buffer == m_current_buffer[buffer_handler].buffer_) {
// if (m_current_buffer[buffer_handler].ref_counter_ > 0) {
...
...
@@ -267,13 +267,13 @@ void RealPhotonicsDriver::init() {
/*
* clear
*/
void
Real
Photonics
Driver
::
clear
()
{
void
Real
GenericCam
Driver
::
clear
()
{
}
/*
* writeParam
*/
void
Real
Photonics
Driver
::
writeParam
()
{
void
Real
GenericCam
Driver
::
writeParam
()
{
ostringstream
buf_conf
;
std
::
size_t
found
;
...
...
@@ -286,7 +286,7 @@ void RealPhotonicsDriver::writeParam() {