Changeset 12024 for trunk/FACT++

Timestamp:

09/08/11 10:00:18 (13 years ago)

Author:

tbretz

Message:

Replaced updateGL by updateCamera; for the moment display deviation and correction values in bias tab.

File:

• trunk/FACT++/gui/FactGui.h (modified) (8 diffs)

trunk/FACT++/gui/FactGui.h

@@ -2468 +2468 @@
     void handleFeedbackDeviation(const DimData &d)
     {
+        if (!CheckSize(d, 2*416*sizeof(float)))
+            return;
+
+        const float *ptr = d.ptr<float>();
+
+        valarray<float> dev(1440);
+        valarray<float> ref(1440);
+
+        for (int i=0; i<1440; i++)
+        {
+            const PixelMapEntry &entry = fPixelMap.index(i);
+
+            dev[i] = ptr[entry.hv()];
+            ref[i] = ptr[entry.hv()+416];
+        }
+
+        fFeedbackDevCam->SetData(dev);
+        fFeedbackRefCam->SetData(ref);
+
+        fFeedbackDevCam->updateCamera();
+        fFeedbackRefCam->updateCamera();
+    }
+
+    void handleFeedbackReference(const DimData &d)
+    {
         if (!CheckSize(d, 416*sizeof(float)))
             return;
@@ -2473 +2498 @@
         const float *ptr = d.ptr<float>();
 
-        fFeedbackDevCam->SetData(valarray<float>(ptr, 416));
-        fFeedbackDevCam->updateGL();
-    }
-
-    void handleFeedbackReference(const DimData &d)
-    {
-        if (!CheckSize(d, 416*sizeof(float)))
-            return;
-
-        const float *ptr = d.ptr<float>();
-
-        fFeedbackRefCam->SetData(valarray<float>(ptr, 416));
-        fFeedbackRefCam->updateGL();
+//        fFeedbackRefCam->SetData(valarray<float>(ptr, 416));
+//        fFeedbackRefCam->updateCamera();
     }
 
@@ -2530 +2544 @@
 
         fBiasCamA->SetData(dat);
-        fBiasCamA->updateGL();
+        fBiasCamA->updateCamera();
 
         UpdateBiasValues();
@@ -3345 +3359 @@
         fBiasCamV->SetWhite(entry.index);
         fBiasCamA->SetWhite(entry.index);
-        fBiasCamV->updateGL();
-        fBiasCamA->updateGL();
+        fBiasCamV->updateCamera();
+        fBiasCamA->updateCamera();
 
         UpdateBiasCam(entry);
@@ -3376 +3390 @@
         fBiasCamV->SetWhite(entry.index);
         fBiasCamA->SetWhite(entry.index);
-        fBiasCamV->updateGL();
-        fBiasCamA->updateGL();
+        fBiasCamV->updateCamera();
+        fBiasCamA->updateCamera();
 
         UpdateBiasHv(entry);
@@ -3420 +3434 @@
         }
 
-        fBiasCamV->updateGL();
+        fBiasCamV->updateCamera();
     }
 
@@ -3830 +3844 @@
         fBiasCamV->SetMin(fBiasVoltMin->value());
         fBiasCamV->SetMax(fBiasVoltMax->value());
-        fBiasCamV->updateGL();
+        fBiasCamV->updateCamera();
 
         fBiasCamA->SetMin(fBiasCurrentMin->value());
         fBiasCamA->SetMax(fBiasCurrentMax->value());
-        fBiasCamA->updateGL();
+        fBiasCamA->updateCamera();
 
         // --------------------------------------------------------------------------
@@ -3840 +3854 @@
         fRatesCanv->SetMin(fRatesMin->value());
         fRatesCanv->SetMax(fRatesMax->value());
-        fRatesCanv->updateGL();
+        fRatesCanv->updateCamera();
         on_fPixelIdx_valueChanged(0);