merging refactor (replacing)

slsDetectorGui/include/qTabDataOutput.h

@@ -1,21 +1,11 @@
-/*
- * qTabDataOutput.h
- *
- *  Created on: May 10, 2012
- *      Author: l_maliakal_d
- */
-
-#ifndef QTABDATAOUTPUT_H_
-#define QTABDATAOUTPUT_H_
+#pragma once
 
 #include "qDefs.h"
 
-
-/** Form Header */
 #include "ui_form_tab_dataoutput.h"
-/** Project Class Headers */
+
 class multiSlsDetector;
-/** Qt Include Headers */
+
 #include <QString>
 
 
@@ -26,35 +16,132 @@ class qTabDataOutput:public QWidget, private Ui::TabDataOutputObject{
 	Q_OBJECT
 
 public:
-	/** \short The constructor
-	 *    @param parent is the parent tab widget
-	 *    @param detector is the detector returned from the detector tab
+	/**
+	 * The constructor
+	 * @param parent is the parent tab widget
+	 * @param detector is the detector returned from the detector tab
 	 */
-	qTabDataOutput(QWidget *parent,multiSlsDetector*& detector);
+	qTabDataOutput(QWidget *parent,multiSlsDetector* detector);
 
-	/** Destructor
+	/**
+	 * Destructor
 	 */
 	~qTabDataOutput();
 
-	/** To refresh and update widgets
+	/**
+	 * To refresh and update widgets
 	 */
 	void Refresh();
 
-	/** verify output directories
-	 *  /returns success or fail
+	/**
+	 * Verify output directories
+	 * @returns success or fail
 	 */
 	int VerifyOutputDirectory();
 
-private:
+
+	private slots:
+
+	/**
+	 * Open dialog to choose the output directory
+	 */
+	void BrowseOutputDir();
+
+	/**
+	 * Set output directory
+	 */
+	void SetOutputDir();
+
+	/**
+	 * Get output directory
+	 */
+	void GetOutputDir();
+
+	/**
+	 * Set rate correction
+	 */
+	void SetRateCorrection(int deadtime=0);
+
+	/**
+	 * Set default rate correction
+	 */
+	void SetDefaultRateCorrection();
+
+	/**
+	 * Set update rate correction from server
+	 */
+	void UpdateRateCorrectionFromServer();
+
+	/**
+	 * Enable/Disable 10GbE
+	 */
+	void EnableTenGigabitEthernet(bool enable, int get=0);
+
+	/**
+	 * Set speed
+	 */
+	void SetSpeed();
+
+	/**
+	 * Set flags
+	 */
+	void SetFlags();
+
+	/**
+	 * Set file format
+	 */
+	void SetFileFormat(int format);
+
+	/**
+	 * Set overwrite enable
+	 */
+	void SetOverwriteEnable(bool enable);
+
+
+	private:
+
+	/**
+	 * Sets up the widget
+	 */
+	void SetupWidgetWindow();
+
+	/**
+	 * Sets up all the slots and signals
+	 */
+	void Initialization();
+
+	/**
+	 * Populate the readouts
+	 */
+	void PopulateDetectors();
+
+	/**
+	 * Update speed
+	 */
+	void UpdateSpeedFromServer();
+
+	/**
+	 * Update flags
+	 */
+	void UpdateFlagsFromServer();
+
+	/**
+	 * Update file format
+	 */
+	void UpdateFileFormatFromServer();
+
+	/**
+	 * Update overwrite enable
+	 */
+	void UpdateFileOverwriteFromServer();
+
+
 	/** The sls detector object */
 	multiSlsDetector *myDet;
 
 	/** detector type */
 	slsDetectorDefs::detectorType detType;
 
-
-	QString 	flatFieldTip;
-	QString 	errFlatFieldTip;
 	QString 	outDirTip;
 	QPalette	red;
 	QPalette	black;
@@ -62,95 +149,11 @@ private:
 	QPalette	*black1;
 
 	/** enum for the Eiger clock divider */
-	enum {FullSpeed, HalfSpeed, QuarterSpeed, SuperSlowSpeed, NumberofSpeeds};
+	enum {FULLSPEED, HALFSPEED, QUARTERSPEED, SUPERSLOWSPEED, NUMBEROFSPEEDS};
 	/** enum for the Eiger readout flags1 */
-	enum {Continous, Storeinram};
+	enum {CONTINUOUS, STOREINRAM};
 	/** enum for the Eiger readout flags2 */
-	enum {Parallel, NonParallel, Safe};
+	enum {PARALLEL, NONPARALLEL, SAFE};
 
-
-/** methods */
-	/** Sets up the widget */
-	void SetupWidgetWindow();
-
-	/** Sets up all the slots and signals */
-	void Initialization();
-
-	/** Populate the readouts
-	 */
-	void PopulateDetectors();
-
-	/** update speed */
-	void UpdateSpeedFromServer();
-
-	/** update flags */
-	void UpdateFlagsFromServer();
-
-	/** update flags */
-	void SetupFileFormat();
-
-	/** update file format */
-	void UpdateFileFormatFromServer();
-
-	/** update overwrite enable */
-	void UpdateFileOverwriteFromServer();
-
-
-private slots:
-
-/** Open dialog to choose the output directory */
-void BrowseOutputDir();
-
-/**set flat field file*/
-void SetFlatField();
-
-/** update flat field correction from server */
-void UpdateFlatFieldFromServer();
-
-/**browse flat field*/
-void BrowseFlatFieldPath();
-
-/**rate correction*/
-void SetRateCorrection(int deadtime=0);
-
-/** default rate correction */
-void SetDefaultRateCorrection();
-
-/** update rate correction from server */
-void UpdateRateCorrectionFromServer();
-
-/**angular correction*/
-void SetAngularCorrection();
-
-/**discard bad channels*/
-void DiscardBadChannels();
-
-/** set output directory*/
-void SetOutputDir();
-
-/** set output directory*/
-void GetOutputDir();
-
-/** enable 10GbE */
-void EnableTenGigabitEthernet(bool enable, int get=0);
-
-/** set speed */
-void SetSpeed();
-
-/** set flags */
-void SetFlags();
-
-/** set file format */
-void SetFileFormat(int format);
-
-/** set overwrite enable */
-void SetOverwriteEnable(bool enable);
-
-signals:
-/**signal to enable/disable positions in Actions*/
-void AngularConversionSignal(bool);
 };
 
-
-
-#endif /* QTABDATAOUTPUT_H_ */