detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-15 22:31:32 +01:00
Code Issues Actions Packages Releases Activity

moved client interface to common folder as receiver wills tart using it as well

Browse Source
This commit is contained in:
maliakal_d
2018-10-10 12:00:47 +02:00
parent 78bfc9d0a5
commit 5e7e7d3c33
6 changed files with 34 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@@ -2,7 +2,7 @@
#include "multiSlsDetector.h"
#include "sls_receiver_exceptions.h"
#include "SharedMemory.h"
#include "ReceiverInterface.h"
#include "ClientInterface.h"
#include "gitInfoLib.h"
#include "versionAPI.h"
#include "slsDetectorCommand.h"
@@ -590,7 +590,7 @@ void slsDetector::initializeMembers() {
delete thisReceiver;
thisReceiver = 0;
}
thisReceiver = new ReceiverInterface(dataSocket);
thisReceiver = new ClientInterface(dataSocket);
}
@@ -3928,7 +3928,7 @@ std::string slsDetector::setReceiverStreamingIP(std::string sourceIP) {
std::endl;
#endif
if (connectData() == OK){
ret=thisReceiver->sendString(fnum,retval,arg);
ret=thisReceiver->SendString(fnum,retval,arg);
disconnectData();
}
if(ret==FAIL) {
@@ -3960,7 +3960,7 @@ std::string slsDetector::setAdditionalJsonHeader(std::string jsonheader) {
std::cout << "Sending additional json header " << arg << std::endl;
#endif
if (connectData() == OK){
ret=thisReceiver->sendString(fnum,retval,arg);
ret=thisReceiver->SendString(fnum,retval,arg);
disconnectData();
}
if(ret==FAIL) {
@@ -5894,7 +5894,7 @@ int slsDetector::setReceiverTCPSocket(std::string const name, int const receiver
//check if it connects
if (retval!=FAIL) {
checkReceiverOnline();
thisReceiver->setSocket(dataSocket);
thisReceiver->SetSocket(dataSocket);
// check for version compatibility
switch (thisDetector->myDetectorType) {
case EIGER:
@@ -6168,7 +6168,7 @@ void slsDetector::setDetectorHostname() {
thisDetector->hostname << std::endl;
#endif
if (connectData() == OK){
ret=thisReceiver->sendString(fnum,retval,thisDetector->hostname);
ret=thisReceiver->SendString(fnum,retval,thisDetector->hostname);
disconnectData();
}
if((ret==FAIL) || (strcmp(retval,thisDetector->hostname)))
@@ -6199,7 +6199,7 @@ std::string slsDetector::setFilePath(std::string s) {
std::cout << "Sending file path to receiver " << arg << std::endl;
#endif
if (connectData() == OK){
ret=thisReceiver->sendString(fnum,retval,arg);
ret=thisReceiver->SendString(fnum,retval,arg);
disconnectData();
}
if(ret!=FAIL){
@@ -6240,7 +6240,7 @@ std::string slsDetector::setFileName(std::string s) {
std::cout << "Sending file name to receiver " << arg << std::endl;
#endif
if (connectData() == OK){
ret=thisReceiver->sendString(fnum,retval,arg);
ret=thisReceiver->SendString(fnum,retval,arg);
disconnectData();
}
if (ret == FAIL)

4
slsDetectorSoftware/slsDetector/slsDetector.h
View File

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