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
This commit is contained in:
l_maliakal_d 2013-10-14 08:33:40 +00:00
parent c32acebc35
commit d421c0c9fe
2 changed files with 8 additions and 8 deletions

View File

@ -634,7 +634,7 @@ Displays minimum, maximum and sum of values for each plot.
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property> </property>
<property name="minimum"> <property name="minimum">
<number>0</number> <number>-16777215</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>16777215</number> <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> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property> </property>
<property name="minimum"> <property name="minimum">
<number>0</number> <number>-16777215</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>16777215</number> <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> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property> </property>
<property name="minimum"> <property name="minimum">
<number>0</number> <number>-16777215</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>16777215</number> <number>16777215</number>
@ -771,7 +771,7 @@ Displays minimum, maximum and sum of values for each plot.
</rect> </rect>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>4</number> <number>6</number>
</property> </property>
<widget class="QWidget" name="page"> <widget class="QWidget" name="page">
<widget class="QWidget" name="gridLayoutWidget_2"> <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> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property> </property>
<property name="minimum"> <property name="minimum">
<number>0</number> <number>-16777215</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>16777215</number> <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> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property> </property>
<property name="minimum"> <property name="minimum">
<number>0</number> <number>-16777215</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>16777215</number> <number>16777215</number>

View File

@ -985,7 +985,7 @@ int qDrawPlot::GetData(detectorData *data,int fIndex){
} }
//normal data //normal data
if(((!pedestal)&(!accumulate)) || (resetAccumulate)){ if(((!pedestal)&(!accumulate)&(!binary)) || (resetAccumulate)){
memcpy(histYAxis[0],data->values,nPixelsX*sizeof(double)); memcpy(histYAxis[0],data->values,nPixelsX*sizeof(double));
resetAccumulate = false; resetAccumulate = false;
} }
@ -1034,7 +1034,7 @@ int qDrawPlot::GetData(detectorData *data,int fIndex){
} }
//normal data //normal data
if(((!pedestal)&(!accumulate)) || (resetAccumulate)){ if(((!pedestal)&(!accumulate)&(!binary)) || (resetAccumulate)){
memcpy(lastImageArray,data->values,nPixelsX*nPixelsY*sizeof(double)); memcpy(lastImageArray,data->values,nPixelsX*nPixelsY*sizeof(double));
resetAccumulate = false; resetAccumulate = false;
} }