detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-24 23:30:03 +02:00
Code Issues Actions Packages Releases Activity

insignificant, renamed recieverInterface to have a capital letter in class name

Browse Source
This commit is contained in:
maliakal_d 2018-10-10 11:43:35 +02:00
parent 4b166b726e
commit 78bfc9d0a5
6 changed files with 30 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/CMakeLists.txt
View File

@ -4,7 +4,7 @@ set(SOURCES
slsDetector/slsDetectorUsers.cpp slsDetector/slsDetectorUsers.cpp
slsDetector/slsDetectorCommand.cpp slsDetector/slsDetectorCommand.cpp
slsDetector/slsDetector.cpp slsDetector/slsDetector.cpp
slsReceiverInterface/receiverInterface.cpp ReceiverInterface/ReceiverInterface.cpp
../slsSupportLib/include/utilities.cpp ../slsSupportLib/include/utilities.cpp
) )
@ -16,7 +16,7 @@ include_directories(
multiSlsDetector multiSlsDetector
sharedMemory sharedMemory
slsDetector slsDetector
slsReceiverInterface ReceiverInterface
../slsSupportLib/include ../slsSupportLib/include
) )
@ -52,7 +52,7 @@ set(PUBLICHEADERS
slsDetector/slsDetectorUsers.h slsDetector/slsDetectorUsers.h
slsDetector/detectorData.h slsDetector/detectorData.h
multiSlsDetector/multiSlsDetector.h multiSlsDetector/multiSlsDetector.h
slsReceiverInterface/receiverInterface.h ReceiverInterface/ReceiverInterface.h
) )
set_target_properties(slsDetectorShared PROPERTIES set_target_properties(slsDetectorShared PROPERTIES
LIBRARY_OUTPUT_NAME SlsDetector LIBRARY_OUTPUT_NAME SlsDetector

4
slsDetectorSoftware/Makefile
View File

@ -9,14 +9,14 @@ CFLAGS= -g -DC_ONLY -fPIC
DFLAGS= -g -DDACS_INT DFLAGS= -g -DDACS_INT
INCLUDES?= -I../slsSupportLib/include -IslsDetector -ImultiSlsDetector -IslsReceiverInterface -IsharedMemory I$(ASM) INCLUDES?= -I../slsSupportLib/include -IslsDetector -ImultiSlsDetector -IReceiverInterface -IsharedMemory I$(ASM)
#EPICSFLAGS=-D EPICS -I/usr/local/epics/base/include/ -I /usr/local/epics/base/include/os/Linux/ -L /usr/local/epics/base/lib/$(EPICS_HOST_ARCH) -Wl,-R/usr/local/epics/base/lib/$(EPICS_HOST_ARCH) -lca -lCom #EPICSFLAGS=-D EPICS -I/usr/local/epics/base/include/ -I /usr/local/epics/base/include/os/Linux/ -L /usr/local/epics/base/lib/$(EPICS_HOST_ARCH) -Wl,-R/usr/local/epics/base/lib/$(EPICS_HOST_ARCH) -lca -lCom
LIBZMQDIR = ../slsSupportLib/include LIBZMQDIR = ../slsSupportLib/include
LIBZMQ = -L$(LIBZMQDIR) -Wl,-rpath=$(LIBZMQDIR) -lzmq LIBZMQ = -L$(LIBZMQDIR) -Wl,-rpath=$(LIBZMQDIR) -lzmq
SRC_CLNT= slsDetector/slsDetectorCommand.cpp slsDetector/slsDetector.cpp multiSlsDetector/multiSlsDetector.cpp slsReceiverInterface/receiverInterface.cpp slsDetector/slsDetectorUsers.cpp sharedMemory/SharedMemory.cpp ../slsSupportLib/include/utilities.cpp SRC_CLNT= slsDetector/slsDetectorCommand.cpp slsDetector/slsDetector.cpp multiSlsDetector/multiSlsDetector.cpp ReceiverInterface/ReceiverInterface.cpp slsDetector/slsDetectorUsers.cpp sharedMemory/SharedMemory.cpp ../slsSupportLib/include/utilities.cpp
DEPSINCLUDES = ../slsSupportLib/include/sls_receiver_defs.h ../slsSupportLib/include/sls_receiver_funcs.h ../slsSupportLib/include/ansi.h ../slsSupportLib/include/sls_detector_defs.h ../slsSupportLib/include/sls_detector_funcs.h ../slsSupportLib/include/error_defs.h slsDetector/slsDetectorBase.h slsDetector/detectorData.h sharedMemory/SharedMemory.h ../slsSupportLib/include/sls_receiver_exceptions.h ../slsSupportLib/include/versionAPI.h ../slsSupportLib/include/utilities.h ../slsSupportLib/include/container_utils.h DEPSINCLUDES = ../slsSupportLib/include/sls_receiver_defs.h ../slsSupportLib/include/sls_receiver_funcs.h ../slsSupportLib/include/ansi.h ../slsSupportLib/include/sls_detector_defs.h ../slsSupportLib/include/sls_detector_funcs.h ../slsSupportLib/include/error_defs.h slsDetector/slsDetectorBase.h slsDetector/detectorData.h sharedMemory/SharedMemory.h ../slsSupportLib/include/sls_receiver_exceptions.h ../slsSupportLib/include/versionAPI.h ../slsSupportLib/include/utilities.h ../slsSupportLib/include/container_utils.h

28
slsDetectorSoftware/slsReceiverInterface/receiverInterface.cpp → slsDetectorSoftware/ReceiverInterface/ReceiverInterface.cpp
View File

@ -1,4 +1,4 @@
#include "receiverInterface.h" #include "ReceiverInterface.h"
#include <sys/types.h> #include <sys/types.h>
@ -11,15 +11,15 @@
receiverInterface::receiverInterface(MySocketTCP *socket):dataSocket(socket){} ReceiverInterface::ReceiverInterface(MySocketTCP *socket):dataSocket(socket){}
receiverInterface::~receiverInterface(){} ReceiverInterface::~ReceiverInterface(){}
int receiverInterface::sendString(int fnum, char retval[], char arg[]){ int ReceiverInterface::sendString(int fnum, char retval[], char arg[]){
int ret = slsDetectorDefs::FAIL; int ret = slsDetectorDefs::FAIL;
char mess[MAX_STR_LENGTH]; char mess[MAX_STR_LENGTH];
memset(mess, 0, MAX_STR_LENGTH); memset(mess, 0, MAX_STR_LENGTH);
@ -39,7 +39,7 @@ int receiverInterface::sendString(int fnum, char retval[], char arg[]){
int receiverInterface::sendUDPDetails(int fnum, char retval[], char arg[3][MAX_STR_LENGTH]){ int ReceiverInterface::sendUDPDetails(int fnum, char retval[], char arg[3][MAX_STR_LENGTH]){
char args[3][MAX_STR_LENGTH]; char args[3][MAX_STR_LENGTH];
int ret = slsDetectorDefs::FAIL; int ret = slsDetectorDefs::FAIL;
char mess[MAX_STR_LENGTH]; char mess[MAX_STR_LENGTH];
@ -59,7 +59,7 @@ int receiverInterface::sendUDPDetails(int fnum, char retval[], char arg[3][MAX_S
} }
int receiverInterface::sendInt(int fnum, int &retval, int arg){ int ReceiverInterface::sendInt(int fnum, int &retval, int arg){
int ret = slsDetectorDefs::FAIL; int ret = slsDetectorDefs::FAIL;
char mess[MAX_STR_LENGTH]; char mess[MAX_STR_LENGTH];
memset(mess, 0, MAX_STR_LENGTH); memset(mess, 0, MAX_STR_LENGTH);
@ -79,7 +79,7 @@ int receiverInterface::sendInt(int fnum, int &retval, int arg){
int receiverInterface::getInt(int fnum, int &retval){ int ReceiverInterface::getInt(int fnum, int &retval){
int ret = slsDetectorDefs::FAIL; int ret = slsDetectorDefs::FAIL;
char mess[MAX_STR_LENGTH]; char mess[MAX_STR_LENGTH];
memset(mess, 0, MAX_STR_LENGTH); memset(mess, 0, MAX_STR_LENGTH);
@ -98,7 +98,7 @@ int receiverInterface::getInt(int fnum, int &retval){
int receiverInterface::sendInt(int fnum, int64_t &retval, int64_t arg){ int ReceiverInterface::sendInt(int fnum, int64_t &retval, int64_t arg){
int ret = slsDetectorDefs::FAIL; int ret = slsDetectorDefs::FAIL;
char mess[MAX_STR_LENGTH]; char mess[MAX_STR_LENGTH];
memset(mess, 0, MAX_STR_LENGTH); memset(mess, 0, MAX_STR_LENGTH);
@ -118,7 +118,7 @@ int receiverInterface::sendInt(int fnum, int64_t &retval, int64_t arg){
int receiverInterface::sendIntArray(int fnum, int64_t &retval, int64_t arg[2], char mess[]){ int ReceiverInterface::sendIntArray(int fnum, int64_t &retval, int64_t arg[2], char mess[]){
int64_t args[2]; int64_t args[2];
int ret = slsDetectorDefs::FAIL; int ret = slsDetectorDefs::FAIL;
memset(mess, 0, MAX_STR_LENGTH); memset(mess, 0, MAX_STR_LENGTH);
@ -138,7 +138,7 @@ int receiverInterface::sendIntArray(int fnum, int64_t &retval, int64_t arg[2], c
int receiverInterface::sendIntArray(int fnum, int &retval, int arg[2]){ int ReceiverInterface::sendIntArray(int fnum, int &retval, int arg[2]){
int args[2]; int args[2];
int ret = slsDetectorDefs::FAIL; int ret = slsDetectorDefs::FAIL;
char mess[MAX_STR_LENGTH]; char mess[MAX_STR_LENGTH];
@ -159,7 +159,7 @@ int receiverInterface::sendIntArray(int fnum, int &retval, int arg[2]){
int receiverInterface::getInt(int fnum, int64_t &retval){ int ReceiverInterface::getInt(int fnum, int64_t &retval){
int ret = slsDetectorDefs::FAIL; int ret = slsDetectorDefs::FAIL;
dataSocket->SendDataOnly(&fnum,sizeof(fnum)); dataSocket->SendDataOnly(&fnum,sizeof(fnum));
@ -170,7 +170,7 @@ int receiverInterface::getInt(int fnum, int64_t &retval){
} }
int receiverInterface::getLastClientIP(int fnum, char retval[]){ int ReceiverInterface::getLastClientIP(int fnum, char retval[]){
int ret = slsDetectorDefs::FAIL; int ret = slsDetectorDefs::FAIL;
dataSocket->SendDataOnly(&fnum,sizeof(fnum)); dataSocket->SendDataOnly(&fnum,sizeof(fnum));
@ -182,7 +182,7 @@ int receiverInterface::getLastClientIP(int fnum, char retval[]){
int receiverInterface::executeFunction(int fnum,char mess[]){ int ReceiverInterface::executeFunction(int fnum,char mess[]){
int ret = slsDetectorDefs::FAIL; int ret = slsDetectorDefs::FAIL;
memset(mess, 0, MAX_STR_LENGTH); memset(mess, 0, MAX_STR_LENGTH);
@ -198,7 +198,7 @@ int receiverInterface::executeFunction(int fnum,char mess[]){
int receiverInterface::sendROI(int fnum, int n, slsReceiverDefs::ROI roiLimits[]) { int ReceiverInterface::sendROI(int fnum, int n, slsReceiverDefs::ROI roiLimits[]) {
int ret = slsDetectorDefs::FAIL; int ret = slsDetectorDefs::FAIL;
char mess[MAX_STR_LENGTH]; char mess[MAX_STR_LENGTH];
memset(mess, 0, MAX_STR_LENGTH); memset(mess, 0, MAX_STR_LENGTH);

21
slsDetectorSoftware/slsReceiverInterface/receiverInterface.h → slsDetectorSoftware/ReceiverInterface/ReceiverInterface.h
View File

@ -1,23 +1,16 @@
#pragma once
#ifndef SLS_RECEIVER_INTERFACE_H
#define SLS_RECEIVER_INTERFACE_H
#include "sls_detector_defs.h" #include "sls_detector_defs.h"
#include "MySocketTCP.h" #include "MySocketTCP.h"
/** /**
* * @short the ReceiverInterface class is the interface between the client and the receiver
* @short the slsReceiverInterface class is the interface between the sls detector and the sls receiver
* @author Dhanya Maliakal
* @version 0.1alpha
*/ */
class receiverInterface{ class ReceiverInterface{
public: public:
@ -25,13 +18,13 @@ public:
* (default) constructor * (default) constructor
* @param socket tcp socket between client and receiver * @param socket tcp socket between client and receiver
*/ */
receiverInterface(MySocketTCP *socket); ReceiverInterface(MySocketTCP *socket);
/** /**
* destructor * destructor
*/ */
virtual ~receiverInterface(); virtual ~ReceiverInterface();
/** /**
* Set the datasocket * Set the datasocket
@ -140,7 +133,7 @@ public:
*/ */
int sendROI(int fnum, int n, slsReceiverDefs::ROI roiLimits[]); int sendROI(int fnum, int n, slsReceiverDefs::ROI roiLimits[]);
//here one should implement the funcs listed in
private: private:
@ -151,4 +144,4 @@ private:
}; };
#endif

4
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -2,7 +2,7 @@
#include "multiSlsDetector.h" #include "multiSlsDetector.h"
#include "sls_receiver_exceptions.h" #include "sls_receiver_exceptions.h"
#include "SharedMemory.h" #include "SharedMemory.h"
#include "receiverInterface.h" #include "ReceiverInterface.h"
#include "gitInfoLib.h" #include "gitInfoLib.h"
#include "versionAPI.h" #include "versionAPI.h"
#include "slsDetectorCommand.h" #include "slsDetectorCommand.h"
@ -590,7 +590,7 @@ void slsDetector::initializeMembers() {
delete thisReceiver; delete thisReceiver;
thisReceiver = 0; thisReceiver = 0;
} }
thisReceiver = new receiverInterface(dataSocket); thisReceiver = new ReceiverInterface(dataSocket);
} }

4
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -14,7 +14,7 @@
class multiSlsDetector; class multiSlsDetector;
class SharedMemory; class SharedMemory;
class receiverInterface; class ReceiverInterface;
#define SLS_SHMVERSION 0x181005 #define SLS_SHMVERSION 0x181005
#define NCHIPSMAX 10 #define NCHIPSMAX 10
@ -1884,7 +1884,7 @@ private:
sharedSlsDetector *thisDetector; sharedSlsDetector *thisDetector;
/** receiver interface */ /** receiver interface */
receiverInterface *thisReceiver; ReceiverInterface *thisReceiver;
/** socket for control commands */ /** socket for control commands */
MySocketTCP *controlSocket; MySocketTCP *controlSocket;