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

slsdet clear errormask fixed, qmessage not printing and displog fixed

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@155 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d 2013-03-13 15:36:37 +00:00
parent ab41ffb6bf
commit 3e4f76ed07
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorGui/include/qDebugStream.h
View File

@ -29,7 +29,9 @@ using namespace std;
class qStreamEvent:public QEvent{ class qStreamEvent:public QEvent{
public: public:
qStreamEvent(QString s):QEvent(static_cast<QEvent::Type>(STREAMEVENT)),str(s){} qStreamEvent(QString s):QEvent(static_cast<QEvent::Type>(STREAMEVENT)),str(s){
printf("%s\n",str.toAscii().constData());
}
/** \returns the progress index */ /** \returns the progress index */
QString getString() {return str;} QString getString() {return str;}
private: private:

5
slsDetectorGui/include/qDefs.h
View File

@ -226,9 +226,10 @@ static const int64_t GUI_VERSION=0x20121213;
int errorLevel= (int)WARNING; int errorLevel= (int)WARNING;
string retval=""; string retval="";
size_t pos; size_t pos;
int64_t emask=0;
emask = myDet->getErrorMask();
retval = myDet->getErrorMessage(errorLevel); retval = myDet->getErrorMessage(emask);
if(!retval.empty()){ if(!retval.empty()){

4
slsDetectorGui/include/qServer.h
View File

@ -27,7 +27,7 @@ class qServer: public virtual slsDetectorDefs{
public: public:
/** \short The constructor */ /** \short The constructor */
qServer(multiSlsDetector*& detector, qDetectorMain *t); qServer(qDetectorMain *t);
/** Destructor */ /** Destructor */
~qServer(); ~qServer();
@ -78,8 +78,6 @@ private:
/** The multi detector object */
multiSlsDetector *myDet;
/**The measurement tab object*/ /**The measurement tab object*/
qDetectorMain *myMainTab; qDetectorMain *myMainTab;