WIP datatoutput

slsDetectorGui/include/qDefs.h

@@ -246,7 +246,7 @@ class qDefs : public QWidget {
 
     // executing multiSlsDetector funtion and using return value to set QWidget function 
     // (handling -1 for comboboxes)
-    template <class W, typename WRT, typename RT, typename... CT>
+    /*template <class W, typename WRT, typename RT, typename... CT>
     static void IgnoreNonCriticalExceptionsandMinus1(multiSlsDetector* det, 
             const std::string message, const std::string source,
             W* wid, void (W::*someQfunc)(WRT), 
@@ -265,7 +265,7 @@ class qDefs : public QWidget {
             ExceptionMessage(message, e.what(), source);
         }
     };
-
+*/
 
     // executing multiSlsDetector funtion and returning its value (integers, where value cannot be -1)
     /*  can easily get out of hand

slsDetectorGui/include/qTabDataOutput.h

@@ -7,7 +7,7 @@
 class multiSlsDetector;
 
 #include <QString>
-
+#include <QButtonGroup>
 
 /**
  *@short sets up the DataOutput parameters
@@ -69,20 +69,20 @@ public:
 	void SetTenGigaEnable(bool enable);
 
 	/**
-	 * Set rate correction
-	 * @param deadtime dead time
+	 * Enable rate correction
 	 */
-	void SetRateCorrection(int deadtime = 0);
+	void EnableRateCorrection();
 
 	/**
-	 * Set default rate correction
+	 * Set rate correction
 	 */
-	void SetDefaultRateCorrection();
+	void SetRateCorrection();
 
 	/**
 	 * Set speed
+	 * @param speed speed chosen
 	 */
-	void SetSpeed();
+	void SetSpeed(int speed);
 
 	/**
 	 * Set flags
@@ -144,15 +144,14 @@ public:
 	/** The sls detector object */
 	multiSlsDetector *myDet;
 
-	/** Palette */
-	QPalette red;
+	/** Button group for radiobuttons for rate*/
+	QButtonGroup *btnGroupRate;
 
 	/** enum for the Eiger clock divider */
 	enum {
 		FULLSPEED,
 		HALFSPEED,
 		QUARTERSPEED,
-		SUPERSLOWSPEED,
 		NUMBEROFSPEEDS
 	};