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

Timestamp:

09/12/11 14:05:21 (13 years ago)

Author:

lyard

Message:

various small fixes and improvements

File:

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

trunk/FACT++/gui/QCameraWidget.cc

@@ -88 +88 @@
 
 
-        int textSize = (int)(height()*14/600);
-        setFont(QFont("Monospace", textSize));
+//        int textSize = (int)(width()*14/600);
+//        setFont(QFont("Monospace", textSize));
         qglColor(QColor(255, 223, 127));
 
         //first let's draw the usual data
         //title
-        renderText(-shownSizex/2.f + 0.01f, shownSizey/2.f - textSize*pixelSize - 0.01f, 0.f, QString(titleText.c_str()));
+        renderText(-shownSizex/2.f + 0.01f, shownSizey/2.f - fTextSize*pixelSize - 0.01f, 0.f, QString(titleText.c_str()));
         //stats
         ostringstream str;
@@ -100 +100 @@
         str.setf(ios::fixed,ios::floatfield);
         str << "Med " << fmedian;// << unitsText;
-        renderText(3, height()-3-4*textSize-35, QString(str.str().c_str()));
+        renderText(3, height()-3-4*fTextSize-35, QString(str.str().c_str()));
         str.str("");
         str << "Avg " << fmean;// <<  unitsText;
-        renderText(3, height()-3-3*textSize-27, QString(str.str().c_str()));
+        renderText(3, height()-3-3*fTextSize-27, QString(str.str().c_str()));
         str.str("");
         str << "RMS " << frms;// <<  unitsText;
-        renderText(3, height()-3-2*textSize-21, QString(str.str().c_str()));
+        renderText(3, height()-3-2*fTextSize-21, QString(str.str().c_str()));
         str.str("");
         str << "Min " << fmin;// << unitsText;
@@ -112 +112 @@
         str.str("");
         str << "Max " << fmax;// << unitsText;
-        renderText(3, height()-3-1*textSize-8, QString(str.str().c_str()));
+        renderText(3, height()-3-1*fTextSize-8, QString(str.str().c_str()));
         //then draw the values beside the scale
         //the difficulty here is to write the correct min/max besides the scale
@@ -119 +119 @@
         //real min/max are fmin and fmax (I know, quite confusing... sorry about that)
         //so. first let's see what is the span of one pixel
-        float min = (fMin < 0) ? fmin : fMin;
-        float max = (fMax < 0) ? fmax : fMax;
-        textSize = (int)(height()*12/600);
-        setFont(QFont("Monospace", textSize));
-        float pixelSpan = (height() - textSize - 1)/(max - min);
+        float min = (fMin < fScaleLimit || fMax < fScaleLimit) ? fmin : fMin;
+        float max = (fMin < fScaleLimit || fMax < fScaleLimit) ? fmax : fMax;
+//        textSize = (int)(height()*12/600);
+ //       setFont(QFont("Monospace", textSize));
+        float pixelSpan = (height() - fTextSize - 1)/(max - min);
 
         //draw the scale values
         float value = min;
-        int fontWidth = textSize;
-        if (textSize > 12) fontWidth-=3; else fontWidth -=2;
-        if (textSize < 7) fontWidth++;
+        int fontWidth = fTextSize;
+        if (fTextSize > 12) fontWidth--;
+        if (fTextSize > 10) fontWidth--;
+        if (fTextSize > 7) fontWidth--;//else fontWidth -=1;
+//        if (fTextSize < 7) fontWidth++;
         for (int i=0;i<11;i++)
         {
@@ -149 +151 @@
             int w = width() - (width()/50) - fontWidth*str.str().size();
             if (i==0 || i==10) w -= width()/50;
-            if (i!=0 && i!=10) h -= textSize/2;
+            if (i!=0 && i!=10) h -= fTextSize/2;
             renderText(w, h, QString(str.str().c_str()));
             value += (max - min)/10;
@@ -171 +173 @@
         glPopMatrix();
 
-        textSize = (int)(600*14/600);
-        setFont(QFont("Times", textSize));
+//        textSize = (int)(600*14/600);
+//        setFont(QFont("Times", textSize));
     }
     void QCameraWidget::drawPatches()
@@ -399 +401 @@
      void QCameraWidget::highlightPixel(int idx, bool highlight)
      {
-         if (idx < 0 || idx > ACTUAL_NUM_PIXELS)
+         if (idx < 0 || idx >= ACTUAL_NUM_PIXELS)
          {
            cout << "Error: requested pixel highlight out of bounds" << endl;
@@ -422 +424 @@
      void QCameraWidget::highlightPatch(int idx, bool highlight)
      {
-         if (idx < 0 || idx > NTMARK)
+         if (idx < 0 || idx >= NTMARK)
          {
              cout << "Error: requested patch highlight out of bounds" << endl;