Index: trunk/FACT++/gui/FactGui.h
===================================================================
--- trunk/FACT++/gui/FactGui.h	(revision 11675)
+++ trunk/FACT++/gui/FactGui.h	(revision 11682)
@@ -1190,12 +1190,12 @@
 
 	for (int i=0; i<fEventData->Roi; i++)
-	    h->SetBinContent(i+1, fEventData->Adc_Data[p*fEventData->Roi+i]*0.5);
-
-        if (fAdcAutoScale->isChecked())
+	    h->SetBinContent(i+1, reinterpret_cast<float*>(fEventData->Adc_Data)[p*fEventData->Roi+i]);
+
+        if (fAdcDynamicScale->isChecked())
         {
             h->SetMinimum(-1111);
             h->SetMaximum(-1111);
-	}
-	else
+        }
+        if (fAdcManualScale->isChecked())
 	{
             if (h->GetMinimumStored()==-1111)
@@ -1204,4 +1204,16 @@
                 h->SetMaximum(1025);
         }
+        if (fAdcAutoScale->isChecked())
+        {
+            const double min = h->GetMinimumStored();
+            const double max = h->GetMaximumStored();
+
+            h->SetMinimum();
+            h->SetMaximum();
+
+            h->SetMinimum(h->GetMinimum()<min ? h->GetMinimum() : min);
+            h->SetMaximum(h->GetMaximum()>max ? h->GetMaximum() : max);
+
+        }
 
 	c->Modified();
@@ -1226,7 +1238,7 @@
         }
 
-        if (d.size()!=sizeof(EVENT)+dat.Roi*2*1440)
-        {
-            cout << "Size mismatch in " << d.name << ": Found=" << d.size() << " Expected=" << dat.Roi*2*1440+sizeof(EVENT) << endl;
+        if (d.size()!=sizeof(EVENT)+dat.Roi*4*1440)
+        {
+            cout << "Size mismatch in " << d.name << ": Found=" << d.size() << " Expected=" << dat.Roi*4*1440+sizeof(EVENT) << " [roi=" << dat.Roi << "]" << endl;
             return;
         }
@@ -2073,6 +2085,7 @@
                 SetLedColor(fStatusFADLed, kLedGray, time);
 
-                for (int i=0; i<40; i++)
-                    SetLedColor(fFadLED[i], kLedGray, time);
+                // Timing problem - sometimes they stay gray :(
+                //for (int i=0; i<40; i++)
+                //    SetLedColor(fFadLED[i], kLedGray, time);
 
                 /*
Index: trunk/FACT++/gui/design.ui
===================================================================
--- trunk/FACT++/gui/design.ui	(revision 11675)
+++ trunk/FACT++/gui/design.ui	(revision 11682)
@@ -6846,7 +6846,40 @@
               </item>
               <item>
-               <widget class="QCheckBox" name="fAdcAutoScale">
+               <spacer name="verticalSpacer_51">
+                <property name="orientation">
+                 <enum>Qt::Vertical</enum>
+                </property>
+                <property name="sizeType">
+                 <enum>QSizePolicy::Fixed</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>20</width>
+                  <height>10</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+              <item>
+               <widget class="QRadioButton" name="fAdcManualScale">
                 <property name="text">
-                 <string>AutoScale</string>
+                 <string>Manual scale</string>
+                </property>
+                <property name="checked">
+                 <bool>true</bool>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QRadioButton" name="fAdcDynamicScale">
+                <property name="text">
+                 <string>Dynamic scale</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QRadioButton" name="fAdcAutoScale">
+                <property name="text">
+                 <string>Auto min/max</string>
                 </property>
                </widget>
@@ -7221,16 +7254,4 @@
                <enum>QAbstractSpinBox::NoButtons</enum>
               </property>
-              <property name="currentSection">
-               <enum>QDateTimeEdit::HourSection</enum>
-              </property>
-              <property name="displayFormat">
-               <string>hh:mm:ss</string>
-              </property>
-              <property name="calendarPopup">
-               <bool>false</bool>
-              </property>
-              <property name="timeSpec">
-               <enum>Qt::OffsetFromUTC</enum>
-              </property>
               <property name="time">
                <time>
@@ -7239,4 +7260,16 @@
                 <second>0</second>
                </time>
+              </property>
+              <property name="currentSection">
+               <enum>QDateTimeEdit::HourSection</enum>
+              </property>
+              <property name="displayFormat">
+               <string>hh:mm:ss</string>
+              </property>
+              <property name="calendarPopup">
+               <bool>false</bool>
+              </property>
+              <property name="timeSpec">
+               <enum>Qt::OffsetFromUTC</enum>
               </property>
              </widget>
@@ -7363,16 +7396,4 @@
                <enum>QAbstractSpinBox::NoButtons</enum>
               </property>
-              <property name="currentSection">
-               <enum>QDateTimeEdit::HourSection</enum>
-              </property>
-              <property name="displayFormat">
-               <string>hh:mm:ss</string>
-              </property>
-              <property name="calendarPopup">
-               <bool>false</bool>
-              </property>
-              <property name="timeSpec">
-               <enum>Qt::OffsetFromUTC</enum>
-              </property>
               <property name="time">
                <time>
@@ -7381,4 +7402,16 @@
                 <second>0</second>
                </time>
+              </property>
+              <property name="currentSection">
+               <enum>QDateTimeEdit::HourSection</enum>
+              </property>
+              <property name="displayFormat">
+               <string>hh:mm:ss</string>
+              </property>
+              <property name="calendarPopup">
+               <bool>false</bool>
+              </property>
+              <property name="timeSpec">
+               <enum>Qt::OffsetFromUTC</enum>
               </property>
              </widget>