Changeset 11876 for trunk/FACT++/gui

Timestamp:

08/10/11 16:33:30 (13 years ago)

Author:

lyard

Message:

fixed autoscale and median bugs

Location:

trunk/FACT++/gui

Files:

• QCameraWidget.cc (modified) (6 diffs)
• QCameraWidget.h (modified) (1 diff)

trunk/FACT++/gui/QCameraWidget.cc

@@ -323 +323 @@
      void QCameraWidget::SetMin(int64_t min)
      {
+         cout << "min: " << min << endl;
          fMin = min;
          pixelColorUpToDate = false;
@@ -330 +331 @@
      void QCameraWidget::SetMax(int64_t max)
      {
+         cout << "max: " << max << endl;
          fMax = max;
          pixelColorUpToDate = false;
@@ -356 +358 @@
          double dmin = fData[0];
           double dmax = fData[0];
-          if (fMin < 0 && fMax < 0)
-          for (int i=0;i<1440;i++)
+          if (fMin < 0 || fMax < 0)
           {
-              if (!fEnable[i]) continue;
-              if (fData[i] > dmax) dmax = fData[i];
-              if (fData[i] < dmin) dmin = fData[i];
+              for (int i=0;i<ACTUAL_NUM_PIXELS;i++)
+              {
+                  if (!fEnable[i]) continue;
+                  if (fData[i] > dmax) dmax = fData[i];
+                  if (fData[i] < dmin) dmin = fData[i];
+              }
           }
           if (fMin >= 0) dmin = fMin;
           if (fMax >= 0) dmax = fMax;
+//          cout << "min: " << dmin << " max: " << dmax << " fMin: " << fMin << " fMax: " << fMax << endl;
           float color;
           for (int i=0;i<ACTUAL_NUM_PIXELS;i++)
@@ -433 +438 @@
          rms = 0;
          median = 0;
-         set<float> medianSet;
+         multiset<double> medianSet;
          for (int i=0;i<ACTUAL_NUM_PIXELS;i++)
          {
@@ -442 +447 @@
              mean += fData[i];
              rms += fData[i]*fData[i];
-             medianSet.insert((float)(fData[i]));
+             medianSet.insert(fData[i]);
          }
          mean /= ACTUAL_NUM_PIXELS;
          rms /= ACTUAL_NUM_PIXELS;
          rms = sqrt(rms);
-         set<float>::iterator it = medianSet.begin();
+ //        cout << "Size of the set: " << medianSet.size() << endl;
+         multiset<double>::iterator it = medianSet.begin();
          for (int i=0;i<(ACTUAL_NUM_PIXELS/2)-1;i++)
              it++;
@@ -520 +526 @@
          glPopMatrix();
      }
-     void QCameraWidget::setUnits(string& units)
+     void QCameraWidget::setUnits(const string& units)
      {
          unitsText = units;
      }
-     void QCameraWidget::setTitle(string& title)
+     void QCameraWidget::setTitle(const string& title)
      {
          titleText = title;

trunk/FACT++/gui/QCameraWidget.h

@@ -41 +41 @@
 
 public:
-    void setUnits(string& units);
-    void setTitle(string& title);
+    void setUnits(const string& units);
+    void setTitle(const string& title);
     QCameraWidget(QWidget *pparent = 0);
     void paintGL();