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

fixed gui expecting more databytes from receiver, cuz of probes changing databytes

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@359 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2012-11-23 16:15:26 +00:00
parent 5236aa7cce
commit d0d7eac553
7 changed files with 83 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
slsDetectorSoftware/slsReceiver/slsReceiver.cpp
View File

@ -5,15 +5,24 @@
#include "MySocketTCP.h"
#include "slsReceiver_funcs.h"
#include <signal.h> //SIGINT
#include <iostream>
using namespace std;
//static MySocketTCP *mysocket = NULL;
void closeFile(int p){cout<<"in closefile in receiver"<<endl;
slsReceiverFuncs::closeFile(p);
//mysocket->Disconnect();
exit(0);
}
int main(int argc, char *argv[])
{
int ret = slsDetectorDefs::OK;
MySocketTCP *socket = NULL;
MySocketTCP *mysocket = NULL;
string fname = "";
bool shortfname = false;
@ -33,11 +42,15 @@ int main(int argc, char *argv[])
//reads config file, creates socket, assigns function table
slsReceiverFuncs *receiver = new slsReceiverFuncs(socket,fname,ret, shortfname);
slsReceiverFuncs *receiver = new slsReceiverFuncs(mysocket,fname,ret, shortfname);
if(ret==slsDetectorDefs::FAIL)
return -1;
//Catch signal SIGINT to close files properly
signal(SIGINT,closeFile);
#ifdef VERBOSE
cout << "Function table assigned." << endl;
#endif
@ -51,7 +64,7 @@ int main(int argc, char *argv[])
#ifdef VERY_VERBOSE
cout << "Waiting for client call" << endl;
#endif
if(socket->Connect()>=0){
if(mysocket->Connect()>=0){
#ifdef VERY_VERBOSE
cout << "Conenction accepted" << endl;
#endif
@ -59,14 +72,14 @@ int main(int argc, char *argv[])
#ifdef VERY_VERBOSE
cout << "function executed" << endl;
#endif
socket->Disconnect();
mysocket->Disconnect();
#ifdef VERY_VERBOSE
cout << "connection closed" << endl;
#endif
}
}
delete socket;
delete mysocket;
cout << "Goodbye!" << endl;
return 0;