From 3e4f76ed077eac082bd79ab0bec203c63ab4e867 Mon Sep 17 00:00:00 2001
From: l_maliakal_d <l_maliakal_d@af1100a4-978c-4157-bff7-07162d2ba061>
Date: Wed, 13 Mar 2013 15:36:37 +0000
Subject: [PATCH] slsdet clear errormask fixed, qmessage not printing and
 displog fixed

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@155 af1100a4-978c-4157-bff7-07162d2ba061
---
 slsDetectorGui/include/qDebugStream.h | 4 +++-
 slsDetectorGui/include/qDefs.h        | 5 +++--
 slsDetectorGui/include/qServer.h      | 4 +---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/slsDetectorGui/include/qDebugStream.h b/slsDetectorGui/include/qDebugStream.h
index bfbdf0524..93f32acc8 100644
--- a/slsDetectorGui/include/qDebugStream.h
+++ b/slsDetectorGui/include/qDebugStream.h
@@ -29,7 +29,9 @@ using namespace std;
 
 class qStreamEvent:public QEvent{
 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 */
 	QString getString() {return str;}
 private:
diff --git a/slsDetectorGui/include/qDefs.h b/slsDetectorGui/include/qDefs.h
index 1ed8ff2a4..610488bf6 100644
--- a/slsDetectorGui/include/qDefs.h
+++ b/slsDetectorGui/include/qDefs.h
@@ -226,9 +226,10 @@ static const int64_t GUI_VERSION=0x20121213;
 		int errorLevel= (int)WARNING;
 		string retval="";
 		size_t pos;
+		int64_t emask=0;
 
-
-		retval = myDet->getErrorMessage(errorLevel);
+		emask = myDet->getErrorMask();
+		retval = myDet->getErrorMessage(emask);
 
 		if(!retval.empty()){
 
diff --git a/slsDetectorGui/include/qServer.h b/slsDetectorGui/include/qServer.h
index 63044f6eb..ed2b38fa5 100644
--- a/slsDetectorGui/include/qServer.h
+++ b/slsDetectorGui/include/qServer.h
@@ -27,7 +27,7 @@ class qServer: public virtual slsDetectorDefs{
 
 public:
 	/** \short The constructor	 */
-	qServer(multiSlsDetector*& detector, qDetectorMain *t);
+	qServer(qDetectorMain *t);
 	/** Destructor	 */
 	~qServer();
 
@@ -78,8 +78,6 @@ private:
 
 
 
-	/** The multi detector object */
-	multiSlsDetector *myDet;
 	/**The measurement tab object*/
 	qDetectorMain *myMainTab;