Changeset 11923 for trunk

Timestamp:

08/31/11 16:46:44 (13 years ago)

Author:

tbretz

Message:

Possibility to switch highlighting off was missing.

Location:

trunk/FACT++/gui

Files:

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

trunk/FACT++/gui/QCameraWidget.cc

@@ -288 +288 @@
 
 
-     void QCameraWidget::highlightPixel(int idx)
+     void QCameraWidget::highlightPixel(int idx, bool highlight)
      {
          if (idx < 0 || idx > ACTUAL_NUM_PIXELS)
@@ -295 +295 @@
            return;
          }
-         highlightedPixels.push_back(idx);
-         if (isVisible())
-             updateGL();
-     }
-     void QCameraWidget::highlightPatch(int idx)
+
+         const vector<int>::iterator v = ::find(highlightedPixels.begin(), highlightedPixels.end(), idx);
+         if (highlight)
+         {
+             if (v==highlightedPixels.end())
+                 highlightedPixels.push_back(idx);
+         }
+         else
+         {
+             if (v!=highlightedPixels.end())
+                 highlightedPixels.erase(v);
+         }
+
+         if (isVisible())
+             updateGL();
+     }
+     void QCameraWidget::highlightPatch(int idx, bool highlight)
      {
          if (idx < 0 || idx > NTMARK)
@@ -306 +318 @@
              return;
          }
-         highlightedPatches.push_back(idx);
+
+         const vector<int>::iterator v = ::find(highlightedPatches.begin(), highlightedPatches.end(), idx);
+         if (highlight)
+         {
+             if (v==highlightedPatches.end())
+                 highlightedPatches.push_back(idx);
+         }
+         else
+         {
+             if (v!=highlightedPatches.end())
+                 highlightedPatches.erase(v);
+         }
+
          if (isVisible())
              updateGL();

trunk/FACT++/gui/QCameraWidget.h

@@ -29 +29 @@
 
 public:
-    void highlightPixel(int idx);
-    void highlightPatch(int idx);
+    void highlightPixel(int idx, bool highlight=true);
+    void highlightPatch(int idx, bool highlight=true);
     void clearHighlightedPatches();
     void clearHighlightedPixels();