made advanced tab detector dependent. each set mac adress etc is done via slsdetector and not multi

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@147 af1100a4-978c-4157-bff7-07162d2ba061

slsDetectorGui/include/icons.qrc

@@ -16,5 +16,7 @@
 	<file>../images/leftArrow.png</file>
 	<file>../images/rightArrow.png</file>
 	<file>../images/upload.png</file>
+	<file>../images/setup.png</file>
+	<file>../images/calculate.png</file>
     </qresource>
 </RCC>

slsDetectorGui/include/qDefs.h

@@ -213,6 +213,44 @@ static const int64_t GUI_VERSION=0x20121213;
 	};
 
 
+//-------------------------------------------------------------------------------------------------------------------------------------------------
+
+	/**gets error mask and displays the message if it exists
+	 * @param myDet is the slsdetector object
+		 /returns error message else an empty string
+	 * */
+	static string checkErrorMessage(slsDetector*& myDet){
+
+
+		int errorLevel= (int)WARNING;
+		string retval="";
+		size_t pos;
+
+
+		retval = myDet->getErrorMessage(errorLevel);
+
+		if(!retval.empty()){
+
+			//replace all \n with <br>
+			pos = 0;
+			while((pos = retval.find("\n", pos)) != string::npos){
+				retval.replace(pos, 1, "<br>");
+				pos += 1;
+			}
+
+			retval.insert(0,"<font color=\"darkBlue\">");
+			retval.append("</font></nobr>");
+
+			//display message
+			qDefs::Message((MessageIndex)errorLevel,retval,"Main");
+		}
+
+		myDet->clearErrorMask();
+
+		return retval;
+	};
+
+
 //-------------------------------------------------------------------------------------------------------------------------------------------------
 
 };

slsDetectorGui/include/qTabAdvanced.h

@@ -58,6 +58,7 @@ private:
 	 */
 	void AddROIInput(int num);
 
+
 private slots:
 
 	/** Enable/Disable Energy and Calibration Logs
@@ -142,10 +143,6 @@ private slots:
 	 */
 	void SetReceiver();
 
-	/** Configures mac
-	 */
-	void Configuremac();
-
 	/** Add ROI Input if the value changed in the last slot
 	 */
 	void AddROIInputSlot(){AddROIInput(1);};
@@ -166,10 +163,17 @@ private slots:
 	 */
 	void clearROIinDetector();
 
+	/** Clears ROI in detector
+	 */
+	void SetDetector(int index);
+
 private:
-	/** The sls detector object */
+	/** The multi detector object */
 	multiSlsDetector *myDet;
 
+	/** The sls detector object */
+	slsDetector *det;
+
 	/** detector type */
 	slsDetectorDefs::detectorType detType;
 
@@ -192,10 +196,6 @@ private:
 	bool isEnergy;
 	bool isAngular;
 
-	/**sls detector obejct*/
-	slsDetector *det;
-
-
 	/** ROI */
 	vector <QLabel*> 	lblFromX;
 	vector <QSpinBox*> 	spinFromX;

slsDetectorGui/include/svnInfoGui.h

@@ -2,10 +2,10 @@
 #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui"
 //#define SVNREPPATH ""
 #define SVNREPUUID "af1100a4-978c-4157-bff7-07162d2ba061"
-//#define SVNREV 0x137
+//#define SVNREV 0x146
 //#define SVNKIND ""
 //#define SVNSCHED ""
 #define SVNAUTH "l_maliakal_d"
-#define SVNREV 0x137
-#define SVNDATE 0x20130116
+#define SVNREV 0x146
+#define SVNDATE 0x20130222
 //