included images

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

slsDetectorGui/include/icons.qrc

@@ -1,5 +1,17 @@
 <RCC version="1.0">
     <qresource prefix="/icons">
 	<file>../images/mountain.png</file>
+	<file>../images/refresh.png</file>
+	<file>../images/save.png</file>
+	<file>../images/saveAll.png</file>
+	<file>../images/close.png</file>
+	<file>../images/add.png</file>
+	<file>../images/new.png</file>
+	<file>../images/download.png</file>
+	<file>../images/browse.png</file>
+	<file>../images/start.png</file>
+	<file>../images/erase.png</file>
+	<file>../images/remove.png</file>
+	<file>../images/stop.png</file>
     </qresource>
 </RCC>

slsDetectorGui/include/qActionsWidget.h

@@ -35,6 +35,7 @@ public:
 	/**to update the widgets*/
 	void Refresh();
 
+
 	/**number of action widgets*/
 	static int NUM_ACTION_WIDGETS;
 
@@ -46,7 +47,6 @@ private:
 	/**id of the action widget*/
 	int id;
 
-
 	/** Sets up the widget
 	 */
 	void SetupWidgetWindow();

slsDetectorGui/include/qScanWidget.h

@@ -35,6 +35,7 @@ public:
 	/**to update the widgets*/
 	void Refresh();
 
+
 	/**number of scan widgets*/
 	static int NUM_SCAN_WIDGETS;
 

slsDetectorGui/include/qTabActions.h

@@ -48,6 +48,7 @@ public:
 	 */
 	void Refresh();
 
+
 public slots:
 /** Disable Positions
  * @param enable true if to disable
@@ -83,6 +84,7 @@ private:
 
 	slsDetectorDefs::detectorType detType;
 
+
 	enum actionIndex{Scan0=1, Scan1, NumPositions=4, NumTotalActions=9};
 
 	QGridLayout		*gridLayout;
@@ -109,6 +111,8 @@ private:
 
 	double		*positions;
 	QPalette	normal;
+	QIcon		*iconPlus;
+	QIcon		*iconMinus;
 
 private slots:
 /** To Expand the Action Widget

slsDetectorGui/include/qTabAdvanced.h

@@ -90,6 +90,10 @@ private slots:
 	 */
 	void StartTrimming();
 
+	/**Updates plot from shared memory
+	 */
+	void UpdatePlot();
+
 private:
 	/** The sls detector object */
 	multiSlsDetector *myDet;

slsDetectorGui/include/qTabDataOutput.h

@@ -27,9 +27,8 @@ public:
 	/** \short The constructor
 	 *    @param parent is the parent tab widget
 	 *    @param detector is the detector returned from the detector tab
-	 *    @param detID is the id of the detector
 	 */
-	qTabDataOutput(QWidget *parent,multiSlsDetector*& detector,int detID);
+	qTabDataOutput(QWidget *parent,multiSlsDetector*& detector);
 
 	/** Destructor
 	 */
@@ -45,9 +44,6 @@ private:
 	/** The sls detector object */
 	multiSlsDetector *myDet;
 
-	/**detector id */
-	int detID;
-
 	/** detector type */
 	slsDetectorDefs::detectorType detType;
 

slsDetectorGui/include/qTabMeasurement.h

@@ -173,7 +173,8 @@ private:
 	QPalette	red;
 	/** expert mode */
 	bool expertMode;
-
+	QIcon	*iconStart;
+	QIcon	*iconStop;
 
 
 signals:

slsDetectorGui/include/qTabSettings.h

@@ -26,9 +26,8 @@ public:
 	/** \short The constructor
 	 *    @param parent is the parent tab widget
 	 *    @param detector is the detector returned from the detector tab
-	 *    @param detID is the id of the detector
 	 */
-	qTabSettings(QWidget *parent,multiSlsDetector*& detector,int detID);
+	qTabSettings(QWidget *parent,multiSlsDetector*& detector);
 
 	/** Destructor
 	 */
@@ -43,9 +42,6 @@ private:
 	/** The sls detector object */
 	multiSlsDetector *myDet;
 
-	/**detector id */
-	int detID;
-
 	/** detector type */
 	slsDetectorDefs::detectorType detType;