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 <iostream>
#include <sstream>
#include <sstream>
#include <limits>
#include <limits>
//#include "pylon/Platform.h"
//#include "pylon/Platform.h"
//#include "pylon/api_autoconf.h"
//#include "pylon/api_autoconf.h"
#include "drivers/gigecam/
photonics
/BufferInformation.h"
#include "drivers/gigecam/
genericam
/BufferInformation.h"
#include "drivers/gigecam/
photonics
/DoubleBufferHandler.h"
#include "drivers/gigecam/
genericam
/DoubleBufferHandler.h"
// this function initializes the Baumer GAPI SDK and
// this function initializes the Baumer GAPI SDK and
// searches for connected cameras
// 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 <iostream>
#include <sstream>
#include <sstream>
#include "drivers/gigecam/
photonics
/BufferInformation.h"
#include "drivers/gigecam/
genericam
/BufferInformation.h"
CDoubleBufferHandler
::
CDoubleBufferHandler
()
CDoubleBufferHandler
::
CDoubleBufferHandler
()
:
buffer_read_
(
nullptr
)
:
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 @@
...
@@ -16,13 +16,13 @@
* limitations under the Licence.
* limitations under the Licence.
*/
*/
#ifndef
PHOTONICS
DEF_H
#ifndef
GENERICCAM
DEF_H
#define
PHOTONICS
DEF_H
#define
GENERICCAM
DEF_H
#include <string>
#include <string>
#include <common/base/PropertyType.h>
#include <common/base/PropertyType.h>
namespace
photonics
{
namespace
genericam
{
static
const
std
::
string
MILLISEC
=
"Millisec"
;
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 @@
...
@@ -16,33 +16,33 @@
* limitations under the Licence.
* limitations under the Licence.
*/
*/
#include "drivers/gigecam/
photonics/Photonics
Driver.h"
#include "drivers/gigecam/
genericam/GenericCam
Driver.h"
#include <math.h>
#include <math.h>
#include "drivers/gigecam/
photonics/PerfectPhotonics
Driver.h"
#include "drivers/gigecam/
genericam/PerfectGenericCam
Driver.h"
#include "drivers/gigecam/
photonics/Photonics
Def.h"
#include "drivers/gigecam/
genericam/GenericCam
Def.h"
#include "drivers/gigecam/
photonics/Photonics
State.h"
#include "drivers/gigecam/
genericam/GenericCam
State.h"
#include "drivers/gigecam/
photonics/RealPhotonics
Driver.h"
#include "drivers/gigecam/
genericam/RealGenericCam
Driver.h"
#include "drivers/gigecam/
photonics
/Simulated
Photonics
Driver.h"
#include "drivers/gigecam/
genericam
/Simulated
GenericCam
Driver.h"
using
namespace
std
;
using
namespace
std
;
namespace
photonics
{
namespace
genericam
{
const
std
::
string
Photonics
Driver
::
TYPE
=
"
photonics
"
;
const
std
::
string
GenericCam
Driver
::
TYPE
=
"
genericam
"
;
const
std
::
string
Photonics
Driver
::
MODE
[
4
]
=
{
"Standard"
,
"Average"
,
"Summation"
,
"Accumulation"
};
const
std
::
string
GenericCam
Driver
::
MODE
[
4
]
=
{
"Standard"
,
"Average"
,
"Summation"
,
"Accumulation"
};
/*
/*
* Constructor
* Constructor
*/
*/
PhotonicsDriver
::
Photonics
Driver
(
const
string
&
name
)
:
GenericCamDriver
::
GenericCam
Driver
(
const
string
&
name
)
:
acquisition
::
NoTofAcquisitionCommon
(
name
),
acquisition
::
KineticAcquisitionCommon
(
name
),
acquisition
::
NoTofAcquisitionCommon
(
name
),
acquisition
::
KineticAcquisitionCommon
(
name
),
acquisition
::
TimeGateCommon
(
name
),
acquisition
::
TimeGateCommon
(
name
),
acquisition
::
DetectorCommon
(
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
);
driver
::
SocketTcp
::
init
(
name
);
...
@@ -92,13 +92,13 @@ PhotonicsDriver::PhotonicsDriver(const string& name):
...
@@ -92,13 +92,13 @@ PhotonicsDriver::PhotonicsDriver(const string& name):
/*
/*
* Destructor
* Destructor
*/
*/
PhotonicsDriver
::~
Photonics
Driver
()
{
GenericCamDriver
::~
GenericCam
Driver
()
{
}
}
/*
/*
* refreshDataSizeProperty
* refreshDataSizeProperty
*/
*/
void
Photonics
Driver
::
refreshDataSizeProperty
(
int32
value
)
throw
(
CannotSetValue
)
{
void
GenericCam
Driver
::
refreshDataSizeProperty
(
int32
value
)
throw
(
CannotSetValue
)
{
if
(
m_DataShort
!=
NULL
)
{
if
(
m_DataShort
!=
NULL
)
{
delete
[]
m_DataShort
;
delete
[]
m_DataShort
;
}
}
...
@@ -113,7 +113,7 @@ void PhotonicsDriver::refreshDataSizeProperty(int32 value) throw (CannotSetValue
...
@@ -113,7 +113,7 @@ void PhotonicsDriver::refreshDataSizeProperty(int32 value) throw (CannotSetValue
/*
/*
* refreshModeProperty
* refreshModeProperty
*/
*/
void
Photonics
Driver
::
refreshModeProperty
(
int32
value
)
throw
(
CannotSetValue
)
{
void
GenericCam
Driver
::
refreshModeProperty
(
int32
value
)
throw
(
CannotSetValue
)
{
if
(
value
!=
acquisition
::
GateCommon
::
TIME_MODE
)
{
if
(
value
!=
acquisition
::
GateCommon
::
TIME_MODE
)
{
throw
CannotSetValue
();
throw
CannotSetValue
();
}
}
...
@@ -122,13 +122,13 @@ void PhotonicsDriver::refreshModeProperty(int32 value) throw (CannotSetValue) {
...
@@ -122,13 +122,13 @@ void PhotonicsDriver::refreshModeProperty(int32 value) throw (CannotSetValue) {
/*
/*
* execute
* 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
)
if
((
aCommand
!=
driver
::
PAUSE_COMMAND
)
&&
(
aCommand
!=
driver
::
STOP_COMMAND
)
&&
(
aCommand
!=
driver
::
STATUS_COMMAND
)
&&
(
aCommand
!=
driver
::
READ_COMMAND
))
{
&&
(
aCommand
!=
driver
::
READ_COMMAND
))
{
commandProgression
=
PROGRESSION_UNKNOWNSTATE_DEVICE_CONTAINER
;
commandProgression
=
PROGRESSION_UNKNOWNSTATE_DEVICE_CONTAINER
;
}
}
Photonics
State
*
currentState
=
dynamic_cast
<
Photonics
State
*>
(
getCurrentState
());
GenericCam
State
*
currentState
=
dynamic_cast
<
GenericCam
State
*>
(
getCurrentState
());
// Check command
// Check command
if
(
aCommand
==
driver
::
INIT_COMMAND
)
{
if
(
aCommand
==
driver
::
INIT_COMMAND
)
{
// Init command
// Init command
...
@@ -187,7 +187,7 @@ void PhotonicsDriver::execute(const std::string& aCommand) {
...
@@ -187,7 +187,7 @@ void PhotonicsDriver::execute(const std::string& aCommand) {
/*
/*
* calculateProgression
* calculateProgression
*/
*/
void
Photonics
Driver
::
calculateProgression
()
{
void
GenericCam
Driver
::
calculateProgression
()
{
int32
progression
=
0
;
int32
progression
=
0
;
float64
setpoint
=
0.0
;
float64
setpoint
=
0.0
;
float64
actual
=
0.0
;
float64
actual
=
0.0
;
...
@@ -210,9 +210,9 @@ void PhotonicsDriver::calculateProgression() {
...
@@ -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
;
int32
valueout
=
0
;
if
(
value
==
COUNTING
)
{
if
(
value
==
COUNTING
)
{
valueout
|=
GateCommon
::
RUNNING_STATUS
;
valueout
|=
GateCommon
::
RUNNING_STATUS
;
...
@@ -224,18 +224,18 @@ void PhotonicsDriver::computeGateStatus(int32 value) {
...
@@ -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
;
int32
valueout
=
0
;
detectorStatus
.
update
(
valueout
);
detectorStatus
.
update
(
valueout
);
}
}
/*
/*
*
Photonics
Driver
*
GenericCam
Driver
*/
*/
void
Photonics
Driver
::
computeAcquisitionStatus
(
int32
value
)
{
void
GenericCam
Driver
::
computeAcquisitionStatus
(
int32
value
)
{
int32
valueout
=
0
;
int32
valueout
=
0
;
acquisitionStatus
.
update
(
valueout
);
acquisitionStatus
.
update
(
valueout
);
}
}
...
...
src/drivers/gigecam/
photonics/Photonics
Driver.h
→
src/drivers/gigecam/
genericcam/GenericCam
Driver.h
View file @
a396116c
...
@@ -16,8 +16,8 @@
...
@@ -16,8 +16,8 @@
* limitations under the Licence.
* limitations under the Licence.
*/
*/
#ifndef
PHOTONICS
DRIVER_H
#ifndef
GENERICCAM
DRIVER_H
#define
PHOTONICS
DRIVER_H
#define
GENERICCAM
DRIVER_H
#define _GNULINUX
#define _GNULINUX
#include <Driver.h>
#include <Driver.h>
...
@@ -31,21 +31,21 @@
...
@@ -31,21 +31,21 @@
#include "drivers/legacy/def/DriverErrorDef.h"
#include "drivers/legacy/def/DriverErrorDef.h"
//#include "/usr/local/src/baumer/inc/"
//#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.
* 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
::
TimeGateCommon
,
public
acquisition
::
KineticAcquisitionCommon
,
public
acquisition
::
KineticAcquisitionCommon
,
public
acquisition
::
DetectorCommon
,
public
acquisition
::
DetectorCommon
,
public
driver
::
SocketTcp
public
driver
::
SocketTcp
{
{
friend
class
Real
Photonics
Driver
;
friend
class
Real
GenericCam
Driver
;
friend
class
Perfect
Photonics
Driver
;
friend
class
Perfect
GenericCam
Driver
;
friend
class
Simulated
Photonics
Driver
;
friend
class
Simulated
GenericCam
Driver
;
public:
public:
static
const
std
::
string
MODE
[
4
];
static
const
std
::
string
MODE
[
4
];
...
@@ -58,12 +58,12 @@ public:
...
@@ -58,12 +58,12 @@ public:
* \brief Constructor
* \brief Constructor
* \param[in] name the name of the device driver
* \param[in] name the name of the device driver
*/
*/
Photonics
Driver
(
const
std
::
string
&
name
);
GenericCam
Driver
(
const
std
::
string
&
name
);
/*!
/*!
* \brief Destructor
* \brief Destructor
*/
*/
virtual
~
Photonics
Driver
();
virtual
~
GenericCam
Driver
();
/*!
/*!
* \brief Method called for executing a command
* \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 @@
...
@@ -16,23 +16,23 @@
* limitations under the Licence.
* limitations under the Licence.
*/
*/
#ifndef
PHOTONICS
STATE_H
#ifndef
GENERICCAM
STATE_H
#define
PHOTONICS
STATE_H
#define
GENERICCAM
STATE_H
#include <Driver.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
* \brief Virtual class for implement State pattern
*
*
* Define all methods that perfect, simulated and real classes have to implement
* 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:
public:
...
@@ -40,13 +40,13 @@ public:
...
@@ -40,13 +40,13 @@ public:
* \brief Constructor
* \brief Constructor
* \param[in] owner The device driver main class link
* \param[in] owner The device driver main class link
*/
*/
PhotonicsState
(
Photonics
Driver
*
owner
)
:
GenericCamState
(
GenericCam
Driver
*
owner
)
:
DriverState
<
Photonics
Driver
>
(
owner
)
{
DriverState
<
GenericCam
Driver
>
(
owner
)
{
}
}
/*!
/*!
* \brief Destructor
* \brief Destructor
*/
*/
virtual
~
Photonics
State
()
{
virtual
~
GenericCam
State
()
{
}
}
/*!
/*!
...
@@ -107,4 +107,4 @@ public:
...
@@ -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
"
>
<module
name=
"
genericam
"
>
<driver
class=
"
photonics::Photonics
Driver"
/>
<driver
class=
"
genericam::GenericCam
Driver"
/>
<link
path=
"/usr/local/lib/baumer"
lib=
"bgapi2_genicam"
/>
<link
path=
"/usr/local/lib/baumer"
lib=
"bgapi2_genicam"
/>
<link
lib=
"opencv_core"
/>
<link
lib=
"opencv_core"
/>
<link
lib=
"opencv_calib3d"
/>
<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 @@
...
@@ -16,37 +16,37 @@
* limitations under the Licence.
* limitations under the Licence.
*/
*/
#include "drivers/gigecam/
photonics/PerfectPhotonics
Driver.h"
#include "drivers/gigecam/
genericam/PerfectGenericCam
Driver.h"
#include <stdlib.h>
#include <stdlib.h>
#include "drivers/gigecam/
photonics/Photonics
Def.h"
#include "drivers/gigecam/
genericam/GenericCam
Def.h"
#include "drivers/gigecam/
photonics/Photonics
Driver.h"
#include "drivers/gigecam/
genericam/GenericCam
Driver.h"
namespace
photonics
{
namespace
genericam
{
/*
/*
* Constructor
* Constructor
*/
*/
Perfect
Photonics
Driver
::
Perfect
PhotonicsDriver
(
Photonics
Driver
*
owner
)
:
Perfect
GenericCam
Driver
::
Perfect
GenericCamDriver
(
GenericCam
Driver
*
owner
)
:
Photonics
State
(
owner
)
{
GenericCam
State
(
owner
)
{
/* Empty */
/* Empty */
}
}
/*
/*
* Destructor
* Destructor
*/
*/
Perfect
Photonics
Driver
::~
Perfect
Photonics
Driver
()
{
Perfect
GenericCam
Driver
::~
Perfect
GenericCam
Driver
()
{
/* Empty */
/* 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
// Read command
owner
()
->
time
=
0
;
owner
()
->
time
=
0
;
owner
()
->
counts
=
0
;
owner
()
->
counts
=
0
;
...
@@ -57,13 +57,13 @@ void PerfectPhotonicsDriver::clear() {
...
@@ -57,13 +57,13 @@ void PerfectPhotonicsDriver::clear() {
/*
/*
* writeParam
* writeParam
*/
*/
void
Perfect
Photonics
Driver
::
writeParam
()
{
void
Perfect
GenericCam
Driver
::
writeParam
()
{
}
}
/*
/*
* synchroniseRead
* synchroniseRead
*/
*/
void
Perfect
Photonics
Driver
::
synchroniseRead
()
{
void
Perfect
GenericCam
Driver
::
synchroniseRead
()
{
read
();
read
();
owner
()
->
m_SynchroniseReadTerminated
=
true
;
owner
()
->
m_SynchroniseReadTerminated
=
true
;
}
}
...
@@ -71,7 +71,7 @@ void PerfectPhotonicsDriver::synchroniseRead() {
...
@@ -71,7 +71,7 @@ void PerfectPhotonicsDriver::synchroniseRead() {
///*
///*
// * regroup
// * regroup
// */
// */
//void Perfect
Photonics
Driver::regroup() {
//void Perfect
GenericCam
Driver::regroup() {
// std::cout << owner()->xSize() << std::endl;
// std::cout << owner()->xSize() << std::endl;
// std::cout << owner()->ySize() << std::endl;
// std::cout << owner()->ySize() << std::endl;
//}
//}
...
@@ -79,7 +79,7 @@ void PerfectPhotonicsDriver::synchroniseRead() {
...
@@ -79,7 +79,7 @@ void PerfectPhotonicsDriver::synchroniseRead() {
/*
/*
* read
* read
*/
*/
void
Perfect
Photonics
Driver
::
read
()
{
void
Perfect
GenericCam
Driver
::
read
()
{
// Read command
// Read command
int32
size
=
owner
()
->
dataSize
();
int32
size
=
owner
()
->
dataSize
();
...
@@ -109,35 +109,35 @@ void PerfectPhotonicsDriver::read() {
...
@@ -109,35 +109,35 @@ void PerfectPhotonicsDriver::read() {
/*
/*
* pause
* pause
*/
*/
void
Perfect
Photonics
Driver
::
pause
()
{
void
Perfect
GenericCam
Driver
::
pause
()
{
}
}
/*
/*
* continue
* continue
*/
*/
void
Perfect
Photonics
Driver
::
resume
()
{
void
Perfect
GenericCam
Driver
::
resume
()
{
}
}
/*
/*
* start
* start
*/
*/
void
Perfect
Photonics
Driver
::
start
()
{
void
Perfect
GenericCam
Driver
::
start
()
{
owner
()
->
time
=
owner
()
->
time
.
setpoint
();
owner
()
->
time
=
owner
()
->
time
.
setpoint
();
}
}
/*
/*
* stop
* stop
*/
*/
void
Perfect
Photonics
Driver
::
stop
()
{
void
Perfect
GenericCam
Driver
::
stop
()
{
}
}
/*
/*
* readStatus
* readStatus
*/
*/
void
Perfect
Photonics
Driver
::
readStatus
()
{
void
Perfect
GenericCam
Driver
::
readStatus
()
{
owner
()
->
startActivated
=
false
;
owner
()
->
startActivated
=
false
;
// Status command
// Status command
owner
()
->
computeGateStatus
(
photonics
::
READOUT_COMPLETE
);
owner
()
->
computeGateStatus
(
genericam
::
READOUT_COMPLETE
);
owner
()
->
computeAcquisitionStatus
(
0
);
owner
()
->
computeAcquisitionStatus
(
0
);
owner
()
->
computeDetectorStatus
(
0
);
owner
()
->
computeDetectorStatus
(
0
);
if
(
owner
()
->
m_SynchroniseReadActivated
==
true
)
{
if
(
owner
()
->
m_SynchroniseReadActivated
==
true
)
{
...
@@ -154,7 +154,7 @@ void PerfectPhotonicsDriver::readStatus() {
...
@@ -154,7 +154,7 @@ void PerfectPhotonicsDriver::readStatus() {
/*
/*
* readInfos
* readInfos
*/
*/
void
Perfect
Photonics
Driver
::
readInfos
()
{
void
Perfect
GenericCam
Driver
::
readInfos
()
{