detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-19 00:07:13 +02:00
Code Issues Actions Packages Releases Activity

refactored client interface (client ot receiveR)

Browse Source
This commit is contained in:
maliakal_d
2018-10-10 18:09:14 +02:00
parent e1d570e8ce
commit f69e9d0df4
4 changed files with 151 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -185,7 +185,7 @@ int slsDetector::checkVersionCompatibility(portType t) {
if (connectData() == OK){
// ignoring retval
int64_t retval = -1;
ret=thisReceiver->SendInt(fnum,retval,arg);
ret=thisReceiver->Client_Send(fnum, &arg, sizeof(arg), &retval, sizeof(retval));
if (ret==FAIL){
setErrorMask((getErrorMask())|(VERSION_COMPATIBILITY));
if(strstr(mess,"Unrecognized Function")!=NULL)
@ -222,7 +222,7 @@ int64_t slsDetector::getId( idMode mode) {
} else if (mode==RECEIVER_VERSION) {
if (thisDetector->receiverOnlineFlag==ONLINE_FLAG) {
if (connectData() == OK){
ret=thisReceiver->GetInt(fnum2,retval);
ret=thisReceiver->Client_Send(fnum2, NULL, 0, &retval, sizeof(retval));
disconnectData();
}
if(ret==FORCE_UPDATE)
@ -957,10 +957,11 @@ int slsDetector::setDetectorType(detectorType const type) {
(int)thisDetector->myDetectorType << std::endl;
#endif
if (connectData() == OK){
int arg = 0;
ret=thisReceiver->SendInt(fnum2,arg,(int)thisDetector->myDetectorType);
int arg = (int)thisDetector->myDetectorType;
int retval2 = 0;
ret=thisReceiver->Client_Send(fnum2, &arg, sizeof(arg), &retval2, sizeof(retval2));
disconnectData();
retval = (detectorType)arg;
retval = (detectorType)retval2;
}
if(ret==FAIL){
std::cout << "ERROR: Could not send detector type to receiver" << std::endl;
@ -2761,7 +2762,7 @@ int64_t slsDetector::setTimer(timerIndex index, int64_t t) {
char mess[MAX_STR_LENGTH]="";
if (connectData() == OK){
ret=thisReceiver->SendIntArray(fnum2,retval,args,mess);
ret=thisReceiver->Client_Send(fnum2, &args, sizeof(args), &retval, sizeof(retval), mess);
disconnectData();
}
if((args[1] != retval)|| (ret==FAIL)){
@ -2951,7 +2952,7 @@ int slsDetector::setDynamicRange(int n) {
n << std::endl;
#endif
if (connectData() == OK){
ret=thisReceiver->SendInt(fnum2,retval1,n);
ret=thisReceiver->Client_Send(fnum2, &n, sizeof(n), &retval1, sizeof(retval1));
disconnectData();
}
if ((ret==FAIL) || (retval1 != retval)){
@ -3531,7 +3532,7 @@ std::string slsDetector::getReceiverRealUDPSocketBufferSize() {
std::cout << "Getting real UDP Socket Buffer size to receiver " << std::endl;
#endif
if (connectData() == OK){
ret=thisReceiver->GetInt(fnum,retval);
ret=thisReceiver->Client_Send(fnum, NULL, 0, &retval, sizeof(retval));
disconnectData();
}
if(ret==FAIL) {
@ -3841,7 +3842,7 @@ std::string slsDetector::setReceiverStreamingPort(std::string port) {
std::cout << "Sending receiver streaming port to receiver " << arg << std::endl;
#endif
if (connectData() == OK){
ret=thisReceiver->SendInt(fnum,retval,arg);
ret=thisReceiver->Client_Send(fnum, &arg, sizeof(arg), &retval, sizeof(retval));
disconnectData();
}
if (ret==FAIL) {
@ -3928,7 +3929,7 @@ std::string slsDetector::setReceiverStreamingIP(std::string sourceIP) {
std::endl;
#endif
if (connectData() == OK){
ret=thisReceiver->SendString(fnum,retval,arg);
ret=thisReceiver->Client_Send(fnum, arg, MAX_STR_LENGTH, retval, MAX_STR_LENGTH);
disconnectData();
}
if(ret==FAIL) {
@ -3960,7 +3961,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->Client_Send(fnum, arg, MAX_STR_LENGTH, retval, MAX_STR_LENGTH);
disconnectData();
}
if(ret==FAIL) {
@ -3988,7 +3989,7 @@ std::string slsDetector::setReceiverUDPSocketBufferSize(int udpsockbufsize) {
std::cout << "Sending UDP Socket Buffer size to receiver " << arg << std::endl;
#endif
if (connectData() == OK){
ret=thisReceiver->SendInt(fnum,retval,arg);
ret=thisReceiver->Client_Send(fnum, &arg, sizeof(arg), &retval, sizeof(retval));
disconnectData();
}
if(ret==FAIL) {
@ -4101,7 +4102,7 @@ int slsDetector::setUDPConnection() {
std::cout << "Setting up UDP Connection for Receiver " << args[0] << "\t" << args[1] << std::endl;
#endif
if (connectData() == OK){
ret=thisReceiver->SendUDPDetails(fnum,retval,args);
ret=thisReceiver->Client_Send(fnum, &args, sizeof(args), &retval, sizeof(retval));
disconnectData();
}
if(ret!=FAIL){
@ -4472,7 +4473,9 @@ int slsDetector::sendROI(int n,ROI roiLimits[]) {
std::cout << "Sending ROI to receiver " << thisDetector->nROI << std::endl;
#endif
if (connectData() == OK){
ret=thisReceiver->SendROI(fnum, thisDetector->nROI, thisDetector->roiLimits);
ret=thisReceiver->Client_Send(fnum,
&thisDetector->nROI, sizeof(thisDetector->nROI),
thisDetector->roiLimits, thisDetector->nROI * sizeof(ROI));
disconnectData();
}
if(ret==FAIL)
@ -4586,7 +4589,7 @@ int slsDetector::activate(int const enable) {
std::cout << "Activating/Deactivating Receiver: " << arg << std::endl;
#endif
if (connectData() == OK){
ret=thisReceiver->SendInt(fnum2,retval,arg);
ret=thisReceiver->Client_Send(fnum2, &arg, sizeof(arg), &retval, sizeof(retval));
disconnectData();
}
if(ret==FAIL)
@ -4626,7 +4629,7 @@ int slsDetector::setDeactivatedRxrPaddingMode(int padding) {
std::cout << "Deactivated Receiver Padding Enable: " << arg << std::endl;
#endif
if (connectData() == OK){
ret=thisReceiver->SendInt(fnum,retval,arg);
ret=thisReceiver->Client_Send(fnum, &arg, sizeof(arg), &retval, sizeof(retval));
disconnectData();
}
if(ret==FAIL)
@ -4675,7 +4678,7 @@ int slsDetector::setFlippedData(dimension d, int value) {
if (thisDetector->receiverOnlineFlag==ONLINE_FLAG) {
if (connectData() == OK){
ret=thisReceiver->SendIntArray(fnum,retval,args);
ret=thisReceiver->Client_Send(fnum, args, sizeof(args), &retval, sizeof(retval));
disconnectData();
}
@ -4745,7 +4748,7 @@ int slsDetector::enableGapPixels(int val) {
int arg=val;
if (thisDetector->receiverOnlineFlag==ONLINE_FLAG) {
if (connectData() == OK){
ret=thisReceiver->SendInt(fnum,retval,arg);
ret=thisReceiver->Client_Send(fnum, &arg, sizeof(arg), &retval, sizeof(retval));
disconnectData();
}
if((arg != retval) || (ret==FAIL)){
@ -5932,7 +5935,7 @@ int slsDetector::lockReceiver(int lock) {
std::cout << "Locking or Unlocking Receiver " << std::endl;
#endif
if (connectData() == OK){
ret=thisReceiver->SendInt(fnum,retval,arg);
ret=thisReceiver->Client_Send(fnum, &arg, sizeof(arg), &retval, sizeof(retval));
disconnectData();
}
if(ret==FORCE_UPDATE)
@ -5957,7 +5960,7 @@ std::string slsDetector::getReceiverLastClientIP() {
std::cout << "Geting Last Client IP connected to Receiver " << std::endl;
#endif
if (connectData() == OK){
ret=thisReceiver->GetLastClientIP(fnum,retval);
ret=thisReceiver->Client_Send(fnum, NULL, 0, retval, INET_ADDRSTRLEN);
disconnectData();
}
if(ret==FORCE_UPDATE)
@ -6006,7 +6009,7 @@ int slsDetector::execReceiverCommand(std::string cmd) {
std::cout << "Sending to receiver the command: " << arg << std::endl;
#endif
if (connectData() == OK){
ret=thisReceiver->SendString(fnum,retval,arg);
ret=thisReceiver->Client_Send(fnum, arg, MAX_STR_LENGTH, retval, MAX_STR_LENGTH);
disconnectData();
}
}
@ -6147,7 +6150,7 @@ void slsDetector::sendMultiDetectorSize() {
<< thisDetector->multiSize[1] << ")" << std::endl;
#endif
if (connectData() == OK){
ret=thisReceiver->SendIntArray(fnum,retval,thisDetector->multiSize);
ret=thisReceiver->Client_Send(fnum, thisDetector->multiSize, sizeof(thisDetector->multiSize), &retval, sizeof(retval));
disconnectData();
}
if((ret==FAIL)){
@ -6169,7 +6172,7 @@ void slsDetector::setDetectorId() {
std::cout << "Sending detector pos id to Receiver " << detId << std::endl;
#endif
if (connectData() == OK){
ret=thisReceiver->SendInt(fnum,retval,arg);
ret=thisReceiver->Client_Send(fnum, &arg, sizeof(arg), &retval, sizeof(retval));
disconnectData();
}
if((ret==FAIL) || (retval != arg)){
@ -6192,7 +6195,7 @@ void slsDetector::setDetectorHostname() {
thisDetector->hostname << std::endl;
#endif
if (connectData() == OK){
ret=thisReceiver->SendString(fnum,retval,thisDetector->hostname);
ret=thisReceiver->Client_Send(fnum, thisDetector->hostname, MAX_STR_LENGTH, retval, MAX_STR_LENGTH);
disconnectData();
}
if((ret==FAIL) || (strcmp(retval,thisDetector->hostname)))
@ -6223,7 +6226,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->Client_Send(fnum, arg, MAX_STR_LENGTH, retval, MAX_STR_LENGTH);
disconnectData();
}
if(ret!=FAIL){
@ -6264,7 +6267,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->Client_Send(fnum, arg, MAX_STR_LENGTH, retval, MAX_STR_LENGTH);
disconnectData();
}
if (ret == FAIL)
@ -6295,7 +6298,7 @@ int slsDetector::setReceiverFramesPerFile(int f) {
std::cout << "Sending frames per file to receiver " << arg << std::endl;
#endif
if (connectData() == OK){
ret=thisReceiver->SendInt(fnum,retval,arg);
ret=thisReceiver->Client_Send(fnum, &arg, sizeof(arg), &retval, sizeof(retval));
disconnectData();
}
if (ret == FAIL)
@ -6322,7 +6325,7 @@ slsReceiverDefs::frameDiscardPolicy slsDetector::setReceiverFramesDiscardPolicy(
std::cout << "Sending frames discard policy to receiver " << arg << std::endl;
#endif
if (connectData() == OK){
ret=thisReceiver->SendInt(fnum,retval,arg);
ret=thisReceiver->Client_Send(fnum, &arg, sizeof(arg), &retval, sizeof(retval));
disconnectData();
}
if(ret==FAIL)
@ -6349,7 +6352,7 @@ int slsDetector::setReceiverPartialFramesPadding(int f) {
std::cout << "Sending partial frames enable to receiver " << arg << std::endl;
#endif
if (connectData() == OK){
ret=thisReceiver->SendInt(fnum,retval,arg);
ret=thisReceiver->Client_Send(fnum, &arg, sizeof(arg), &retval, sizeof(retval));
disconnectData();
}
if(ret==FAIL)
@ -6379,7 +6382,7 @@ slsReceiverDefs::fileFormat slsDetector::setFileFormat(fileFormat f) {
std::cout << "Sending file format to receiver " << arg << std::endl;
#endif
if (connectData() == OK){
ret=thisReceiver->SendInt(fnum,retval,arg);
ret=thisReceiver->Client_Send(fnum, &arg, sizeof(arg), &retval, sizeof(retval));
disconnectData();
}
if (ret == FAIL)
@ -6417,7 +6420,7 @@ int slsDetector::setFileIndex(int i) {
std::cout << "Sending file index to receiver " << arg << std::endl;
#endif
if (connectData() == OK){
ret=thisReceiver->SendInt(fnum,retval,arg);
ret=thisReceiver->Client_Send(fnum, &arg, sizeof(arg), &retval, sizeof(retval));
disconnectData();
}
if (ret == FAIL)
@ -6452,7 +6455,7 @@ int slsDetector::startReceiver() {
#endif
if (connectData() == OK){
ret=thisReceiver->ExecuteFunction(fnum,mess);
ret=thisReceiver->Client_Send(fnum, NULL, 0, NULL, 0, mess);
disconnectData();
}
if(ret==FORCE_UPDATE)
@ -6483,7 +6486,7 @@ int slsDetector::stopReceiver() {
std::cout << "Stopping Receiver " << std::endl;
#endif
if (connectData() == OK){
ret=thisReceiver->ExecuteFunction(fnum,mess);
ret=thisReceiver->Client_Send(fnum, NULL, 0, NULL, 0, mess);
disconnectData();
}
if(ret==FORCE_UPDATE)
@ -6510,7 +6513,7 @@ slsDetectorDefs::runStatus slsDetector::getReceiverStatus() {
std::cout << "Getting Receiver Status" << std::endl;
#endif
if (connectData() == OK){
ret=thisReceiver->GetInt(fnum,retval);
ret=thisReceiver->Client_Send(fnum, NULL, 0, &retval, sizeof(retval));
disconnectData();
}
if(retval!=-1)
@ -6535,7 +6538,7 @@ int slsDetector::getFramesCaughtByReceiver() {
std::cout << "Getting Frames Caught by Receiver " << std::endl;
#endif
if (connectData() == OK){
ret=thisReceiver->GetInt(fnum,retval);
ret=thisReceiver->Client_Send(fnum, NULL, 0, &retval, sizeof(retval));
disconnectData();
}
if(ret==FORCE_UPDATE)
@ -6563,7 +6566,7 @@ int slsDetector::getReceiverCurrentFrameIndex() {
std::cout << "Getting Current Frame Index of Receiver " << std::endl;
#endif
if (connectData() == OK){
ret=thisReceiver->GetInt(fnum,retval);
ret=thisReceiver->Client_Send(fnum, NULL, 0, &retval, sizeof(retval));
disconnectData();
}
if(ret==FORCE_UPDATE)
@ -6586,7 +6589,7 @@ int slsDetector::resetFramesCaught() {
std::cout << "Reset Frames Caught by Receiver" << std::endl;
#endif
if (connectData() == OK){
ret=thisReceiver->ExecuteFunction(fnum,mess);
ret=thisReceiver->Client_Send(fnum, NULL, 0, NULL, 0, mess);
disconnectData();
}
if(ret==FORCE_UPDATE)
@ -6621,7 +6624,7 @@ int slsDetector::enableWriteToFile(int enable) {
std::cout << "Sending enable file write to receiver " << arg << std::endl;
#endif
if (connectData() == OK){
ret=thisReceiver->SendInt(fnum,retval,arg);
ret=thisReceiver->Client_Send(fnum, &arg, sizeof(arg), &retval, sizeof(retval));
disconnectData();
}
if (ret == FAIL)
@ -6655,7 +6658,7 @@ int slsDetector::overwriteFile(int enable) {
std::cout << "Sending enable file write to receiver " << arg << std::endl;
#endif
if (connectData() == OK){
ret=thisReceiver->SendInt(fnum,retval,arg);
ret=thisReceiver->Client_Send(fnum, &arg, sizeof(arg), &retval, sizeof(retval));
disconnectData();
}
if (ret == FAIL)
@ -6690,7 +6693,7 @@ int slsDetector::setReceiverStreamingFrequency(int freq) {
std::cout << "Sending read frequency to receiver " << arg << std::endl;
#endif
if (connectData() == OK){
ret=thisReceiver->SendInt(fnum,retval,arg);
ret=thisReceiver->Client_Send(fnum, &arg, sizeof(arg), &retval, sizeof(retval));
disconnectData();
}
if((ret == FAIL) || (retval != freq)) {
@ -6720,7 +6723,7 @@ int slsDetector::setReceiverStreamingTimer(int time_in_ms) {
std::cout << "Sending read timer to receiver " << arg << std::endl;
#endif
if (connectData() == OK){
ret=thisReceiver->SendInt(fnum,retval,arg);
ret=thisReceiver->Client_Send(fnum, &arg, sizeof(arg), &retval, sizeof(retval));
disconnectData();
}
if(ret==FORCE_UPDATE)
@ -6760,7 +6763,7 @@ int slsDetector::enableDataStreamingFromReceiver(int enable) {
<< arg << std::endl;
#endif
if (connectData() == OK){
ret=thisReceiver->SendInt(fnum,retval,arg);
ret=thisReceiver->Client_Send(fnum, &arg, sizeof(arg), &retval, sizeof(retval));
disconnectData();
}
if(ret==FAIL) {
@ -6822,7 +6825,7 @@ int slsDetector::enableTenGigabitEthernet(int i) {
<< i << std::endl;
#endif
if (connectData() == OK){
ret=thisReceiver->SendInt(fnum2,retval,i);
ret=thisReceiver->Client_Send(fnum2, &i, sizeof(i), &retval, sizeof(retval));
disconnectData();
}
if(ret==FAIL)
@ -6853,7 +6856,7 @@ int slsDetector::setReceiverFifoDepth(int i) {
std::cout<< "Setting Receiver Fifo Depth to " << i << std::endl;
#endif
if (connectData() == OK){
ret=thisReceiver->SendInt(fnum,retval,i);
ret=thisReceiver->Client_Send(fnum, &i, sizeof(i), &retval, sizeof(retval));
disconnectData();
}
if(ret==FAIL)
@ -6878,7 +6881,7 @@ int slsDetector::setReceiverSilentMode(int i) {
std::cout<< "Setting Receiver Silent Mode to " << i << std::endl;
#endif
if (connectData() == OK){
ret=thisReceiver->SendInt(fnum,retval,i);
ret=thisReceiver->Client_Send(fnum, &i, sizeof(i), &retval, sizeof(retval));
disconnectData();
}
if(ret==FAIL)
@ -6903,7 +6906,7 @@ int slsDetector::restreamStopFromReceiver() {
#endif
if (connectData() == OK){
ret=thisReceiver->ExecuteFunction(fnum,mess);
ret=thisReceiver->Client_Send(fnum, NULL, 0, NULL, 0, mess);
disconnectData();
}
if(ret==FORCE_UPDATE)