adjusted gui for moench and proper 2d plots, which are not scans for 1ds

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@172 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d
2013-04-16 13:43:28 +00:00
parent 050bec703d
commit c605c77037
13 changed files with 224 additions and 130 deletions

View File

@ -125,8 +125,7 @@ public:
* and this is reset when the gui really starts/stops- to know when to return
*/
bool GetClientInitiated(){return clientInitiated;};
/** Unzoom plot 2d as it will affect scans */
void plot2DUnzoom();
public slots:
/** To select 1D or 2D plot
@ -460,7 +459,6 @@ bool isFrameEnabled;
bool isTriggerEnabled;
/** scan arguments*/
enum scanArgumentList{None,Level0,Level1,FileIndex,AllFrames};
int scanArgument;
/** enable angle plot */
@ -482,6 +480,10 @@ bool backwardScanPlot;
bool fileSaveEnable;
/** true of originally 2d */
bool originally2D;
//pedstal
/** Number of pedestal frames*/
static const int NUM_PEDESTAL_FRAMES = 20;