diff --git a/slsDetectorGui/forms/form_tab_plot.ui b/slsDetectorGui/forms/form_tab_plot.ui
index c6848218c..a1a2bb915 100644
--- a/slsDetectorGui/forms/form_tab_plot.ui
+++ b/slsDetectorGui/forms/form_tab_plot.ui
@@ -99,7 +99,7 @@
- 3
+ 4
@@ -542,6 +542,44 @@
+
+
+
+
+ 25
+ 5
+ 128
+ 26
+
+
+
+
+ 0
+
+ -
+
+
+ true
+
+
+
+ 0
+ 0
+
+
+
+ <nobr>
+Displays minimum, maximum and sum of values for each plot.
+<nobr>
+
+
+ Display Statistics
+
+
+
+
+
+
@@ -572,7 +610,7 @@
- 4
+ 0
@@ -1100,6 +1138,44 @@
+
+
+
+
+ 25
+ 5
+ 128
+ 26
+
+
+
+
+ 0
+
+ -
+
+
+ true
+
+
+
+ 0
+ 0
+
+
+
+ <nobr>
+Displays minimum, maximum and sum of values for each plot.
+<nobr>
+
+
+ Display Statistics
+
+
+
+
+
+
diff --git a/slsDetectorGui/src/qDetectorMain.cpp b/slsDetectorGui/src/qDetectorMain.cpp
index fd9bc11c3..29509def3 100644
--- a/slsDetectorGui/src/qDetectorMain.cpp
+++ b/slsDetectorGui/src/qDetectorMain.cpp
@@ -107,11 +107,11 @@ void qDetectorMain::SetUpWidgetWindow(){
tab_plot = new qTabPlot (this, myDet,myPlot); cout<<"Plot ready"<setLayout(layout);
- histFrameIndexTitle= histFrameIndexTitle = new QLabel("");
+ histFrameIndexTitle= histFrameIndexTitle = new QLabel("");
boxPlot = new QGroupBox("");
layout->addWidget(boxPlot,1,0);
@@ -264,7 +264,7 @@ void qDrawPlot::SetupWidgetWindow(){
plotLayout->addWidget(plot2D,0,0,1,1);
- //callbacks
+//callbacks
// Setting the callback function to get data from detector class
myDet->registerDataCallback(&(GetDataCallBack),this);
diff --git a/slsDetectorGui/src/qTabMeasurement.cpp b/slsDetectorGui/src/qTabMeasurement.cpp
index dab5f6e11..6bb6275fc 100644
--- a/slsDetectorGui/src/qTabMeasurement.cpp
+++ b/slsDetectorGui/src/qTabMeasurement.cpp
@@ -69,7 +69,8 @@ void qTabMeasurement::SetupWidgetWindow(){
//gates
spinNumGates->setValue((int)myDet->setTimer(slsDetectorDefs::GATES_NUMBER,-1));
//probes
- spinNumProbes->setValue((int)myDet->setTimer(slsDetectorDefs::PROBES_NUMBER,-1));
+ if(myDet->getDetectorsType() == slsDetectorDefs::MYTHEN)
+ spinNumProbes->setValue((int)myDet->setTimer(slsDetectorDefs::PROBES_NUMBER,-1));
//File Name
dispFileName->setText(QString(myDet->getFileName().c_str()));
//File Index
@@ -820,11 +821,12 @@ void qTabMeasurement::Refresh(){
#endif
//probes
- spinNumProbes->setValue((int)myDet->setTimer(slsDetectorDefs::PROBES_NUMBER,-1));
+ if(myDet->getDetectorsType() == slsDetectorDefs::MYTHEN){
+ spinNumProbes->setValue((int)myDet->setTimer(slsDetectorDefs::PROBES_NUMBER,-1));
#ifdef VERBOSE
cout << "Getting number of probes" << endl;
#endif
-
+ }
//File Name
dispFileName->setText(QString(myDet->getFileName().c_str()));
#ifdef VERBOSE
@@ -889,7 +891,8 @@ void qTabMeasurement::EnableProbes(){
return;
}
cout << "Probes not enabled" << endl;
- spinNumProbes->setValue(0);
+ if(myDet->getDetectorsType()==slsDetectorDefs::MYTHEN)
+ spinNumProbes->setValue(0);
lblNumProbes->setEnabled(false);
spinNumProbes->setEnabled(false);
}
diff --git a/slsDetectorGui/src/qTabSettings.cpp b/slsDetectorGui/src/qTabSettings.cpp
index 4415aa333..a0d2fb3f7 100644
--- a/slsDetectorGui/src/qTabSettings.cpp
+++ b/slsDetectorGui/src/qTabSettings.cpp
@@ -46,7 +46,8 @@ void qTabSettings::SetupWidgetWindow(){
comboSettings->setCurrentIndex(sett);
//threshold
- spinThreshold->setValue(myDet->getThresholdEnergy());
+ if((detType == slsDetectorDefs::MYTHEN) || (detType == slsDetectorDefs::EIGER))
+ spinThreshold->setValue(myDet->getThresholdEnergy());
//expert mode is not enabled initially
lblThreshold->setEnabled(false);