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

@ -142,9 +142,10 @@ void qTabPlot::SetupWidgetWindow(){
// Depending on whether the detector is 1d or 2d
switch(myDet->getDetectorsType()){
case slsDetectorDefs::MYTHEN: isOriginallyOneD = true; break;
case slsDetectorDefs::MYTHEN: isOriginallyOneD = true; break;
case slsDetectorDefs::EIGER: isOriginallyOneD = false; break;
case slsDetectorDefs::GOTTHARD: isOriginallyOneD = true; break;
case slsDetectorDefs::MOENCH: isOriginallyOneD = false; break;
default:
cout << "ERROR: Detector Type is Generic" << endl;
exit(-1);
@ -765,7 +766,7 @@ void qTabPlot::SetScanArgument(){
//histogram
if(histogram){
//allFrames
myPlot->SetScanArgument(4);
myPlot->SetScanArgument(qDefs::AllFrames);
//default titles for 2d scan
dispXAxis->setText("Channel Number");
@ -817,7 +818,7 @@ void qTabPlot::SetScanArgument(){
myPlot->Select2DPlot();
}else //done here so that it isnt set by default each time
myPlot->SetScanArgument(0);
myPlot->SetScanArgument(qDefs::None);
qDefs::checkErrorMessage(myDet);