change to generic name

src/drivers/gigecam/photonics/CameraHandler.cpp → src/drivers/gigecam/genericcam/CameraHandler.cpp

-#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/DoubleBufferHandler.cpp → src/drivers/gigecam/genericcam/DoubleBufferHandler.cpp

-#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/PhotonicsDef.h → src/drivers/gigecam/genericcam/GenericCamDef.h

@@ -16,13 +16,13 @@
  * limitations under the Licence.
  */
 
-#ifndef PHOTONICSDEF_H
-#define PHOTONICSDEF_H
+#ifndef GENERICCAMDEF_H
+#define GENERICCAMDEF_H
 #include <string>
 #include <common/base/PropertyType.h>
 
 
-namespace photonics {
+namespace genericam {
 
 
 static const std::string MILLISEC = "Millisec";

src/drivers/gigecam/photonics/PhotonicsDriver.cpp → src/drivers/gigecam/genericcam/GenericCamDriver.cpp

@@ -16,33 +16,33 @@
  * limitations under the Licence.
  */
 
-#include "drivers/gigecam/photonics/PhotonicsDriver.h"
+#include "drivers/gigecam/genericam/GenericCamDriver.h"
 
 #include <math.h>
-#include "drivers/gigecam/photonics/PerfectPhotonicsDriver.h"
-#include "drivers/gigecam/photonics/PhotonicsDef.h"
-#include "drivers/gigecam/photonics/PhotonicsState.h"
-#include "drivers/gigecam/photonics/RealPhotonicsDriver.h"
-#include "drivers/gigecam/photonics/SimulatedPhotonicsDriver.h"
+#include "drivers/gigecam/genericam/PerfectGenericCamDriver.h"
+#include "drivers/gigecam/genericam/GenericCamDef.h"
+#include "drivers/gigecam/genericam/GenericCamState.h"
+#include "drivers/gigecam/genericam/RealGenericCamDriver.h"
+#include "drivers/gigecam/genericam/SimulatedGenericCamDriver.h"
 
 
 using namespace std;
 
-namespace photonics {
+namespace genericam {
 
-const std::string PhotonicsDriver::TYPE = "photonics";
-const std::string PhotonicsDriver:: MODE[4] = {"Standard", "Average","Summation","Accumulation"};
+const std::string GenericCamDriver::TYPE = "genericam";
+const std::string GenericCamDriver:: MODE[4] = {"Standard", "Average","Summation","Accumulation"};
 
 /*
  * Constructor
  */
-PhotonicsDriver::PhotonicsDriver(const string& name):
+GenericCamDriver::GenericCamDriver(const string& name):
 						acquisition::NoTofAcquisitionCommon(name),acquisition::KineticAcquisitionCommon(name),
 						acquisition::TimeGateCommon(name),
 						acquisition::DetectorCommon(name)
 						{
 
-	registerStates(new RealPhotonicsDriver(this), new PerfectPhotonicsDriver(this), new SimulatedPhotonicsDriver(this));
+	registerStates(new RealGenericCamDriver(this), new PerfectGenericCamDriver(this), new SimulatedGenericCamDriver(this));
 
 	driver::SocketTcp::init(name);
 
@@ -92,13 +92,13 @@ PhotonicsDriver::PhotonicsDriver(const string& name):
 /*
  * Destructor
  */
-PhotonicsDriver::~PhotonicsDriver() {
+GenericCamDriver::~GenericCamDriver() {
 }
 
 /*
  * refreshDataSizeProperty
  */
-void PhotonicsDriver::refreshDataSizeProperty(int32 value) throw (CannotSetValue) {
+void GenericCamDriver::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 PhotonicsDriver::refreshModeProperty(int32 value) throw (CannotSetValue) {
+void GenericCamDriver::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 PhotonicsDriver::execute(const std::string& aCommand) {
+void GenericCamDriver::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;
 	}
-	PhotonicsState* currentState = dynamic_cast<PhotonicsState*>(getCurrentState());
+	GenericCamState* currentState = dynamic_cast<GenericCamState*>(getCurrentState());
 	// Check command
 	if (aCommand == driver::INIT_COMMAND) {
 		// Init command
@@ -187,7 +187,7 @@ void PhotonicsDriver::execute(const std::string& aCommand) {
 /*
  * calculateProgression
  */
-void PhotonicsDriver::calculateProgression() {
+void GenericCamDriver::calculateProgression() {
 	int32 progression = 0;
 	float64 setpoint = 0.0;
 	float64 actual = 0.0;
@@ -210,9 +210,9 @@ void PhotonicsDriver::calculateProgression() {
 }
 
 /*
- * PhotonicsDriver
+ * GenericCamDriver
  */
-void PhotonicsDriver::computeGateStatus(int32 value) {
+void GenericCamDriver::computeGateStatus(int32 value) {
 	int32 valueout = 0;
 	if (value == COUNTING) {
 		valueout |= GateCommon::RUNNING_STATUS;
@@ -224,18 +224,18 @@ void PhotonicsDriver::computeGateStatus(int32 value) {
 }
 
 /*
- * PhotonicsDriver
+ * GenericCamDriver
  */
-void PhotonicsDriver::computeDetectorStatus(int32 value) {
+void GenericCamDriver::computeDetectorStatus(int32 value) {
 	int32 valueout = 0;
 	detectorStatus.update(valueout);
 
 }
 
 /*
- * PhotonicsDriver
+ * GenericCamDriver
  */
-void PhotonicsDriver::computeAcquisitionStatus(int32 value) {
+void GenericCamDriver::computeAcquisitionStatus(int32 value) {
 	int32 valueout = 0;
 	acquisitionStatus.update(valueout);
 }

src/drivers/gigecam/photonics/PhotonicsDriver.h → src/drivers/gigecam/genericcam/GenericCamDriver.h

@@ -16,8 +16,8 @@
  * limitations under the Licence.
  */
 
-#ifndef PHOTONICSDRIVER_H
-#define PHOTONICSDRIVER_H
+#ifndef GENERICCAMDRIVER_H
+#define GENERICCAMDRIVER_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 PhotonicsDriver: public acquisition::NoTofAcquisitionCommon,
+class GenericCamDriver: public acquisition::NoTofAcquisitionCommon,
 public acquisition::TimeGateCommon,
 public acquisition::KineticAcquisitionCommon,
 public acquisition::DetectorCommon,
 public driver::SocketTcp
 {
 
-	friend class RealPhotonicsDriver;
-	friend class PerfectPhotonicsDriver;
-	friend class SimulatedPhotonicsDriver;
+	friend class RealGenericCamDriver;
+	friend class PerfectGenericCamDriver;
+	friend class SimulatedGenericCamDriver;
 
 public:
 	static const std::string MODE[4];
@@ -58,12 +58,12 @@ public:
 	 * \brief Constructor
 	 * \param[in] name the name of the device driver
 	 */
-	PhotonicsDriver(const std::string& name);
+	GenericCamDriver(const std::string& name);
 
 	/*!
 	 * \brief Destructor
 	 */
-	virtual ~PhotonicsDriver();
+	virtual ~GenericCamDriver();
 
 	/*!
 	 * \brief Method called for executing a command

src/drivers/gigecam/photonics/PhotonicsState.h → src/drivers/gigecam/genericcam/GenericCamState.h

@@ -16,23 +16,23 @@
  * limitations under the Licence.
  */
 
-#ifndef PHOTONICSSTATE_H
-#define PHOTONICSSTATE_H
+#ifndef GENERICCAMSTATE_H
+#define GENERICCAMSTATE_H
 
 #include <Driver.h>
-#include "drivers/gigecam/photonics/PhotonicsDriver.h"
+#include "drivers/gigecam/genericam/GenericCamDriver.h"
 
 
 
-namespace photonics {
+namespace genericam {
 
 /*!
- * \class PhotonicsState
+ * \class GenericCamState
  * \brief Virtual class for implement State pattern
  *
  * Define all methods that perfect, simulated and real classes have to implement
  */
-class PhotonicsState: public DriverState<PhotonicsDriver> {
+class GenericCamState: public DriverState<GenericCamDriver> {
 
 public:
 
@@ -40,13 +40,13 @@ public:
 	 * \brief Constructor
 	 * \param[in] owner The device driver main class link
 	 */
-	PhotonicsState(PhotonicsDriver* owner) :
-			DriverState<PhotonicsDriver>(owner) {
+	GenericCamState(GenericCamDriver* owner) :
+			DriverState<GenericCamDriver>(owner) {
 	}
 	/*!
 	 * \brief Destructor
 	 */
-	virtual ~PhotonicsState() {
+	virtual ~GenericCamState() {
 	}
 
 	/*!
@@ -107,4 +107,4 @@ public:
 };
 
 }
-#endif //PHOTONICSSTATE_H
+#endif //GENERICCAMSTATE_H

src/drivers/gigecam/photonics/Module.xml → src/drivers/gigecam/genericcam/Module.xml

-<module name="photonics">
-  <driver class="photonics::PhotonicsDriver"/>
+<module name="genericam">
+  <driver class="genericam::GenericCamDriver"/>
   <link path="/usr/local/lib/baumer" lib="bgapi2_genicam"/>
   <link lib="opencv_core"/>
   <link lib="opencv_calib3d"/>

src/drivers/gigecam/photonics/PerfectPhotonicsDriver.cpp → src/drivers/gigecam/genericcam/PerfectGenericCamDriver.cpp

@@ -16,37 +16,37 @@
  * limitations under the Licence.
  */
 
-#include "drivers/gigecam/photonics/PerfectPhotonicsDriver.h"
+#include "drivers/gigecam/genericam/PerfectGenericCamDriver.h"
 
 #include <stdlib.h>
-#include "drivers/gigecam/photonics/PhotonicsDef.h"
-#include "drivers/gigecam/photonics/PhotonicsDriver.h"
+#include "drivers/gigecam/genericam/GenericCamDef.h"
+#include "drivers/gigecam/genericam/GenericCamDriver.h"
 
 
-namespace photonics {
+namespace genericam {
 
 /*
  * Constructor
  */
-PerfectPhotonicsDriver::PerfectPhotonicsDriver(PhotonicsDriver* owner) :
-				PhotonicsState(owner) {
+PerfectGenericCamDriver::PerfectGenericCamDriver(GenericCamDriver* owner) :
+				GenericCamState(owner) {
 	/* Empty */
 }
 
 /*
  * Destructor
  */
-PerfectPhotonicsDriver::~PerfectPhotonicsDriver() {
+PerfectGenericCamDriver::~PerfectGenericCamDriver() {
 	/* Empty */
 }
 
-void PerfectPhotonicsDriver::init() {
+void PerfectGenericCamDriver::init() {
 }
 
 /*
- * clearvme/daugther/Photonics
+ * clearvme/daugther/GenericCam
  */
-void PerfectPhotonicsDriver::clear() {
+void PerfectGenericCamDriver::clear() {
 	// Read command
 	owner()->time = 0;
 	owner()->counts = 0;
@@ -57,13 +57,13 @@ void PerfectPhotonicsDriver::clear() {
 /*
  * writeParam
  */
-void PerfectPhotonicsDriver::writeParam() {
+void PerfectGenericCamDriver::writeParam() {
 }
 
 /*
  * synchroniseRead
  */
-void PerfectPhotonicsDriver::synchroniseRead() {
+void PerfectGenericCamDriver::synchroniseRead() {
 	read();
 	owner()->m_SynchroniseReadTerminated = true;
 }
@@ -71,7 +71,7 @@ void PerfectPhotonicsDriver::synchroniseRead() {
 ///*
 // * regroup
 // */
-//void PerfectPhotonicsDriver::regroup() {
+//void PerfectGenericCamDriver::regroup() {
 //	std::cout << owner()->xSize() << std::endl;
 //	std::cout << owner()->ySize() << std::endl;
 //}
@@ -79,7 +79,7 @@ void PerfectPhotonicsDriver::synchroniseRead() {
 /*
  * read
  */
-void PerfectPhotonicsDriver::read() {
+void PerfectGenericCamDriver::read() {
 	// Read command
 	int32 size = owner()->dataSize();
 
@@ -109,35 +109,35 @@ void PerfectPhotonicsDriver::read() {
 /*
  * pause 
  */
-void PerfectPhotonicsDriver::pause() {
+void PerfectGenericCamDriver::pause() {
 }
 
 /*
  * continue 
  */
-void PerfectPhotonicsDriver::resume() {
+void PerfectGenericCamDriver::resume() {
 }
 
 /*
  * start
  */
-void PerfectPhotonicsDriver::start() {
+void PerfectGenericCamDriver::start() {
 	owner()->time = owner()->time.setpoint();
 }
 
 /*
  * stop
  */
-void PerfectPhotonicsDriver::stop() {
+void PerfectGenericCamDriver::stop() {
 }
 
 /*
  * readStatus
  */
-void PerfectPhotonicsDriver::readStatus() {
+void PerfectGenericCamDriver::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 PerfectPhotonicsDriver::readInfos() {
+void PerfectGenericCamDriver::readInfos() {