diff --git a/slsDetectorGui/include/qDefs.h b/slsDetectorGui/include/qDefs.h index 614115073..bf5d29634 100644 --- a/slsDetectorGui/include/qDefs.h +++ b/slsDetectorGui/include/qDefs.h @@ -9,7 +9,6 @@ #define QDEFS_H #include "sls_detector_defs.h" -#include "error_defs.h" #include "slsDetector.h" #include "multiSlsDetector.h" #include @@ -179,55 +178,36 @@ static const int64_t GUI_VERSION=0x20121213; //------------------------------------------------------------------------------------------------------------------------------------------------- - /**checks error mask and displays the message if it exists + /**gets error mask and displays the message if it exists * @param myDet is the multidetector object /returns error message else an empty string * */ static string checkErrorMessage(multiSlsDetector*& myDet){ - int multiMask,slsMask=0; - MessageIndex errorLevel= WARNING; - slsDetector *det; + + int errorLevel= (int)WARNING; string retval=""; - char sNumber[100]; size_t pos; - //multidetector error mask - multiMask = myDet->getErrorMask(); - if(multiMask){ - retval.append(""); - //check every sls detector - for(int i=0;igetNumberOfDetectors();i++){ - slsMask=0; - //if the detector has error - if(multiMask&(1<")); - //get sls det error mask - det = myDet->getSlsDetector(i); - slsMask=det->getErrorMask(); -#ifdef VERYVERBOSE - //append sls det error mask - sprintf(sNumber,"0x%x",slsMask); - retval.append("Error Mask " + string(sNumber)+string("\n")); -#endif - //get the error critical level - if((slsMask>0xFFFF)|errorLevel) - errorLevel = CRITICAL; - //append error message - retval.append(string("") + errorDefs::getErrorMessage(slsMask)+string("")); - //replace all \n with
- pos = 0; - while((pos = retval.find("\n", pos)) != string::npos){ - retval.replace(pos, 1, "
"); - pos += 1; - } - } + + retval = myDet->getErrorMessage(errorLevel); + + if(!retval.empty()){ + + //replace all \n with
+ pos = 0; + while((pos = retval.find("\n", pos)) != string::npos){ + retval.replace(pos, 1, "
"); + pos += 1; } - retval.append("
"); - qDefs::Message(errorLevel,retval,"Main"); + + retval.insert(0,""); + retval.append(""); + + //display message + qDefs::Message((MessageIndex)errorLevel,retval,"Main"); } + return retval; }; diff --git a/slsDetectorGui/src/qDetectorMain.cpp b/slsDetectorGui/src/qDetectorMain.cpp index a4aa73381..833d58980 100644 --- a/slsDetectorGui/src/qDetectorMain.cpp +++ b/slsDetectorGui/src/qDetectorMain.cpp @@ -19,7 +19,6 @@ #include "multiSlsDetector.h" #include "sls_detector_defs.h" #include "svnInfoGui.h" -#include "error_defs.h" // Qt Include Headers #include #include @@ -234,9 +233,9 @@ void qDetectorMain::SetUpDetector(const string fName){ } setWindowTitle("SLS Detector GUI : "+ QString(slsDetectorBase::getDetectorType(detType).c_str())+ " - "+QString(host.c_str())); -#ifdef VERBOSE +//#ifdef VERBOSE cout << endl << "Type : " << slsDetectorBase::getDetectorType(detType) << "\nDetector : " << host << endl; -#endif +//#endif myDet->setOnline(slsDetectorDefs::ONLINE_FLAG); }