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

error when file path doesnt exist

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@547 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-05-08 17:31:37 +00:00
parent 5e7d22357e
commit 1e7dfcb6ad
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/commonFiles/error_defs.h
View File

@ -32,6 +32,7 @@ using namespace std;
#define COULD_NOT_CONFIGURE_MAC 0x0000000000000001ULL #define COULD_NOT_CONFIGURE_MAC 0x0000000000000001ULL
#define COULDNOT_SET_NETWORK_PARAMETER 0x0000000000000002ULL #define COULDNOT_SET_NETWORK_PARAMETER 0x0000000000000002ULL
#define COULDNOT_SET_ROI 0x0000000000000004ULL #define COULDNOT_SET_ROI 0x0000000000000004ULL
#define FILE_PATH_DOES_NOT_EXIST 0x0000000000000008ULL
/** @short class returning all error messages for error mask */ /** @short class returning all error messages for error mask */
@ -77,6 +78,9 @@ public:
if(slsErrorMask&COULDNOT_SET_ROI) if(slsErrorMask&COULDNOT_SET_ROI)
retval.append("Could not set the exact region of interest. Verify ROI set by detector.\n"); retval.append("Could not set the exact region of interest. Verify ROI set by detector.\n");
if(slsErrorMask&FILE_PATH_DOES_NOT_EXIST)
retval.append("File Path does not exist.\n");
return retval; return retval;
} }

15
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -5793,9 +5793,10 @@ string slsDetector::setFilePath(string s) {
if(thisDetector->receiverOnlineFlag==OFFLINE_FLAG){ if(thisDetector->receiverOnlineFlag==OFFLINE_FLAG){
if(!s.empty()){ if(!s.empty()){
if(stat(s.c_str(),&st)) if(stat(s.c_str(),&st)){
std::cout << "path does not exist" << endl; std::cout << "path does not exist" << endl;
else setErrorMask((getErrorMask())|(FILE_PATH_DOES_NOT_EXIST));
}else
fileIO::setFilePath(s); fileIO::setFilePath(s);
} }
} }
@ -5809,6 +5810,10 @@ string slsDetector::setFilePath(string s) {
ret=thisReceiver->sendString(fnum,retval,arg); ret=thisReceiver->sendString(fnum,retval,arg);
if(ret!=FAIL) if(ret!=FAIL)
fileIO::setFilePath(string(retval)); fileIO::setFilePath(string(retval));
else if(!s.empty()){
std::cout << "path does not exist" << endl;
setErrorMask((getErrorMask())|(FILE_PATH_DOES_NOT_EXIST));
}
if(ret==FORCE_UPDATE) if(ret==FORCE_UPDATE)
updateReceiver(); updateReceiver();
} }
@ -6350,7 +6355,9 @@ int slsDetector::setReadReceiverFrequency(int i){
void slsDetector::waitForReceiverReadToFinish(){ void slsDetector::waitForReceiverReadToFinish(){
if(dataSocket) if(dataSocket){
while(dataSocket->getsocketDescriptor() >= 0) while(dataSocket->Connect() < 0)
usleep(1000); usleep(1000);
dataSocket->Disconnect();
}
} }