Index: /trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc
===================================================================
--- /trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc	(revision 11921)
+++ /trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc	(revision 11922)
@@ -1047,4 +1047,5 @@
 
     calibrationLoaded = true;
+
     emit newFileLoaded();
     if (drawCalibrationLoaded)
@@ -1236,4 +1237,5 @@
     currentFile = "none";
     currentCalibFile = "none";
+
 }
 void UIConnector::slicesPlusPlus()
@@ -1596,4 +1598,9 @@
     str << "NB Evts Bad: " << viewer->nbBad << '\n';
     extraInfoLabel->setText(QString(str.str().c_str()));
+
+    if (viewer->calibrationLoaded)
+    {
+        drawCalibrationCheckBox->setEnabled(true);
+    }
 
 
@@ -2120,5 +2127,5 @@
     pixelValueCurveItem.attach(pixelValueCurve);
 //    aMeanCurveItem.attach(pixelValueCurve);
-    vCorrCurveItem.attach(pixelValueCurve);
+ //   vCorrCurveItem.attach(pixelValueCurve);
 //    meanCurveItem.attach(pixelValueCurve);
 
@@ -2159,15 +2166,15 @@
     }
 
-    viewer->computePulsesStatistics();
+  //  viewer->computePulsesStatistics();
 #if QWT_VERSION < 0x060000
     pixelValueCurveItem.setData(xval, yval, viewer->nRoi);
-    aMeanCurveItem.setData(xval, viewer->aMeas, viewer->nRoi);
-    meanCurveItem.setData(xval, viewer->n1mean, viewer->nRoi);
-    vCorrCurveItem.setData(xval, viewer->vCorr, viewer->nRoi-3);
+////    aMeanCurveItem.setData(xval, viewer->aMeas, viewer->nRoi);
+ //   meanCurveItem.setData(xval, viewer->n1mean, viewer->nRoi);
+ //   vCorrCurveItem.setData(xval, viewer->vCorr, viewer->nRoi-3);
 #else
        pixelValueCurveItem.setSamples(xval, yval, viewer->nRoi);
-       aMeanCurveItem.setSamples(xval, viewer->aMeas, viewer->nRoi);
-       meanCurveItem.setSamples(xval, viewer->n1mean, viewer->nRoi);
-       vCorrCurveItem.setSamples(xval, viewer->vCorr, viewer->nRoi-3);
+//       aMeanCurveItem.setSamples(xval, viewer->aMeas, viewer->nRoi);
+ //      meanCurveItem.setSamples(xval, viewer->n1mean, viewer->nRoi);
+ //      vCorrCurveItem.setSamples(xval, viewer->vCorr, viewer->nRoi-3);
 #endif
 
@@ -2201,4 +2208,5 @@
     qstr = qstr.fromStdString(str.str());
     emit updateCurrentPixelSliceValue(qstr);
+    autoScalePressed();
 
 }
@@ -2286,5 +2294,17 @@
 {
     if (!autoScaleColor->isChecked())
+    {
+        viewer->ss[0] = 0;
+        viewer->ss[1] = 0.25;
+        viewer->ss[2] = 0.5;
+        viewer->ss[3] = 0.75;
+        viewer->ss[4] = 1;
+        range0->setValue(viewer->ss[0]);
+        range1->setValue(viewer->ss[1]);
+        range2->setValue(viewer->ss[2]);
+        range3->setValue(viewer->ss[3]);
+        range4->setValue(viewer->ss[4]);
         return;
+    }
     if (!viewer->nRoi)
         return;
@@ -2361,4 +2381,5 @@
         currentPixelScale->setChecked(true);
     }
+    autoScalePressed();
 }
 void UIConnector::currentPixelChanged(bool state)
@@ -2375,4 +2396,5 @@
         entireCameraScale->setChecked(true);
     }
+    autoScalePressed();
 }
 
@@ -2546,4 +2568,5 @@
     connector.range4 = myUi.colorRange4;
     connector.drawCalibrationCheckBox = myUi.calibratedCheckBox;
+    connector.drawCalibrationCheckBox->setEnabled(false);
 
     connector.initHistograms();