Changeset 11877

Timestamp:

08/10/11 16:48:46 (13 years ago)

Author:

lyard

Message:

fixed autoscale and median bugs

File:

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

trunk/FACT++/gui/QCameraWidget.cc

@@ -323 +323 @@
      void QCameraWidget::SetMin(int64_t min)
      {
-         cout << "min: " << min << endl;
+ //        cout << "min: " << min << endl;
          fMin = min;
          pixelColorUpToDate = false;
@@ -331 +331 @@
      void QCameraWidget::SetMax(int64_t max)
      {
-         cout << "max: " << max << endl;
+ //        cout << "max: " << max << endl;
          fMax = max;
          pixelColorUpToDate = false;
@@ -388 +388 @@
                    color *= 9;
                    color += 1;
-                   color = log(color);
+                   color = log10(color);
                }
                if (!fEnable[i])
@@ -521 +521 @@
          glVertex2f(twoX, fiveY);
          glVertex2f(oneX, fiveY);
-
+         glEnd();
+         //draw linear/log tick marks
+         glColor3f(0.f,0.f,0.f);
+         glBegin(GL_LINES);
+         float value;
+         for (int i=1;i<10;i++)
+         {
+             if (logScale)
+                 value = log10(i);
+             else
+                 value = (float)(i)/10.f;
+             float y = -shownSizey/2.f + value*shownSizey;
+             glVertex2f(oneX, y);
+             glVertex2f(twoX, y);
+         }
          glEnd();
          glPopAttrib();