Changeset 11861 for trunk/FACT++/gui/QCameraWidget.cc

Timestamp:

08/09/11 16:09:33 (13 years ago)

Author:

lyard

Message:

bug fix

File:

• trunk/FACT++/gui/QCameraWidget.cc (modified) (2 diffs)

trunk/FACT++/gui/QCameraWidget.cc

@@ -133 +133 @@
          double dmin = fData[0];
           double dmax = fData[0];
+          if (fMin < 0 && fMax < 0)
           for (int i=0;i<1440;i++)
           {
@@ -144 +145 @@
           for (int i=0;i<ACTUAL_NUM_PIXELS;i++)
            {
+               if (fData[i] < dmin)
+               {
+                   pixelsColor[i][0] = pixelsColor[i][1] = pixelsColor[i][2] = 0;
+                   continue;
+               }
+               if (fData[i] > dmax)
+               {
+                   pixelsColor[i][0] = pixelsColor[i][1] = pixelsColor[i][2] = 1;
+                   continue;
+               }
                color = float((fData[i]-dmin)/(dmax-dmin));
                if (!fEnable[i])
                    color = 0;
                int index = 0;
-               while (ss[index] < color)
+               while (ss[index] < color && index < 4)
                    index++;
                index--;
                if (index < 0) index = 0;
-               if (index > 3) index = 3;
+//               if (index > 3) index = 3;
                float weight0 = (color-ss[index]) / (ss[index+1]-ss[index]);
                if (weight0 > 1.0f) weight0 = 1.0f;