From d421c0c9fed53368b23e78a581e94c5971875a4f Mon Sep 17 00:00:00 2001
From: l_maliakal_d <l_maliakal_d@af1100a4-978c-4157-bff7-07162d2ba061>
Date: Mon, 14 Oct 2013 08:33:40 +0000
Subject: [PATCH] checked in threshold changes to binary

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@245 af1100a4-978c-4157-bff7-07162d2ba061
---
 slsDetectorGui/forms/form_tab_plot.ui | 12 ++++++------
 slsDetectorGui/src/qDrawPlot.cpp      |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/slsDetectorGui/forms/form_tab_plot.ui b/slsDetectorGui/forms/form_tab_plot.ui
index 8502dcd5b..d15305e55 100644
--- a/slsDetectorGui/forms/form_tab_plot.ui
+++ b/slsDetectorGui/forms/form_tab_plot.ui
@@ -634,7 +634,7 @@ Displays minimum, maximum and sum of values for each plot.
           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
          </property>
          <property name="minimum">
-          <number>0</number>
+          <number>-16777215</number>
          </property>
          <property name="maximum">
           <number>16777215</number>
@@ -681,7 +681,7 @@ Displays minimum, maximum and sum of values for each plot.
           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
          </property>
          <property name="minimum">
-          <number>0</number>
+          <number>-16777215</number>
          </property>
          <property name="maximum">
           <number>16777215</number>
@@ -728,7 +728,7 @@ Displays minimum, maximum and sum of values for each plot.
           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
          </property>
          <property name="minimum">
-          <number>0</number>
+          <number>-16777215</number>
          </property>
          <property name="maximum">
           <number>16777215</number>
@@ -771,7 +771,7 @@ Displays minimum, maximum and sum of values for each plot.
      </rect>
     </property>
     <property name="currentIndex">
-     <number>4</number>
+     <number>6</number>
     </property>
     <widget class="QWidget" name="page">
      <widget class="QWidget" name="gridLayoutWidget_2">
@@ -1448,7 +1448,7 @@ Displays minimum, maximum and sum of values for each plot.
           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
          </property>
          <property name="minimum">
-          <number>0</number>
+          <number>-16777215</number>
          </property>
          <property name="maximum">
           <number>16777215</number>
@@ -1495,7 +1495,7 @@ Displays minimum, maximum and sum of values for each plot.
           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
          </property>
          <property name="minimum">
-          <number>0</number>
+          <number>-16777215</number>
          </property>
          <property name="maximum">
           <number>16777215</number>
diff --git a/slsDetectorGui/src/qDrawPlot.cpp b/slsDetectorGui/src/qDrawPlot.cpp
index c08f1cc65..d33a51ce7 100644
--- a/slsDetectorGui/src/qDrawPlot.cpp
+++ b/slsDetectorGui/src/qDrawPlot.cpp
@@ -985,7 +985,7 @@ int qDrawPlot::GetData(detectorData *data,int fIndex){
 					}
 
 					//normal data
-					if(((!pedestal)&(!accumulate))	|| (resetAccumulate)){
+					if(((!pedestal)&(!accumulate)&(!binary))	|| (resetAccumulate)){
 						memcpy(histYAxis[0],data->values,nPixelsX*sizeof(double));
 						resetAccumulate = false;
 					}
@@ -1034,7 +1034,7 @@ int qDrawPlot::GetData(detectorData *data,int fIndex){
 				}
 
 				//normal data
-				if(((!pedestal)&(!accumulate))	|| (resetAccumulate)){
+				if(((!pedestal)&(!accumulate)&(!binary))	|| (resetAccumulate)){
 					memcpy(lastImageArray,data->values,nPixelsX*nPixelsY*sizeof(double));
 					resetAccumulate = false;
 				}