Changeset 12072 for trunk

Timestamp:

09/12/11 16:44:48 (13 years ago)

Author:

lyard

Message:

forgot a line in the upate

File:

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

trunk/FACT++/gui/QCameraWidget.cc

@@ -230 +230 @@
         int face = PixelAtPosition(cEvent->pos());
         if (face != -1) {
- //           fWhite = face;
-   //         fWhitePatch = pixelsPatch[fWhite];
+            fWhite = face;
+            fWhitePatch = pixelsPatch[fWhite];
  //           CalculatePatchColor();
             emit signalCurrentPixel(face);
@@ -237 +237 @@
         else
         {
- //           fWhite = -1;
- //           fWhitePatch = -1;
-        }
-//        updateGL();
+            fWhite = -1;
+            fWhitePatch = -1;
+        }
+        updateGL();
    }
     void QCameraWidget::mouseMoveEvent(QMouseEvent* cEvent)
@@ -255 +255 @@
         if (face != -1) {
  //           cout << "Event !" << endl;
- //           fWhite = face;
- //            fWhitePatch = pixelsPatch[fWhite];
+            fWhite = face;
+             fWhitePatch = pixelsPatch[fWhite];
  //          highlightPixel(face);
  //           highlightPatch(fWhitePatch);
@@ -264 +264 @@
         else
         {
- //           fWhite = -1;
- //           fWhitePatch = -1;
+            fWhite = -1;
+            fWhitePatch = -1;
  //           clearHighlightedPixels();
  //           clearHighlightedPatches();
         }
- //       updateGL();
+        updateGL();
 
     }
@@ -303 +303 @@
          double dmin = fData[0];
           double dmax = fData[0];
-          if (fMin < 0 || fMax < 0)
+          if (fMin < fScaleLimit || fMax < fScaleLimit)
           {
               for (int i=0;i<ACTUAL_NUM_PIXELS;i++)
@@ -312 +312 @@
               }
           }
-          if (fMin >= 0) dmin = fMin;
-          if (fMax >= 0) dmax = fMax;
+          if (fMin > fScaleLimit) dmin = fMin;
+          if (fMax > fScaleLimit) dmax = fMax;
 //          cout << "min: " << dmin << " max: " << dmax << " fMin: " << fMin << " fMax: " << fMax << endl;
           float color;