From 5c1574ec903bb96e999e06164d2b4b70457c8efc Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Mon, 25 Nov 2013 16:57:57 +0000 Subject: [PATCH] updated binary of 2d to be negative an update the label enabling before each acquisition if disabled git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@248 af1100a4-978c-4157-bff7-07162d2ba061 --- slsDetectorGui/forms/form_tab_plot.ui | 8 ++++---- slsDetectorGui/src/qTabPlot.cpp | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/slsDetectorGui/forms/form_tab_plot.ui b/slsDetectorGui/forms/form_tab_plot.ui index d15305e55..1a5404f05 100644 --- a/slsDetectorGui/forms/form_tab_plot.ui +++ b/slsDetectorGui/forms/form_tab_plot.ui @@ -99,7 +99,7 @@ - 5 + 3 @@ -482,7 +482,7 @@ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - 0 + -16777215 16777215 @@ -529,7 +529,7 @@ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - 0 + -16777215 16777215 @@ -771,7 +771,7 @@ Displays minimum, maximum and sum of values for each plot. - 6 + 4 diff --git a/slsDetectorGui/src/qTabPlot.cpp b/slsDetectorGui/src/qTabPlot.cpp index e51eee995..cef2f6b38 100644 --- a/slsDetectorGui/src/qTabPlot.cpp +++ b/slsDetectorGui/src/qTabPlot.cpp @@ -841,6 +841,7 @@ void qTabPlot::EnableScanBox(bool Histo){ connect(btnGroupPlotType,SIGNAL(buttonClicked(int)),this, SLOT(SetPlot())); connect(boxScan, SIGNAL(toggled(bool)), this, SLOT(EnableScanBox())); + } @@ -917,6 +918,9 @@ void qTabPlot::SetScanArgument(){ }else myPlot->SetScanArgument(qDefs::None); + //update the from and to labels to be enabled + SetBinary(); + qDefs::checkErrorMessage(myDet,"qTabPlot::SetScanArgument"); }