Changeset 12103

Timestamp:

09/15/11 12:44:14 (13 years ago)

Author:

lyard

Message:

added auto highlight of pixels

Location:

trunk/FACT++/gui

Files:

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

trunk/FACT++/gui/QCameraWidget.cc

@@ -12 +12 @@
         fEnable.assign(1440, true);
         lastFace = -1;
+        fShowPixelMoveOver = true;
+        fShowPatchMoveOver = true;
 
         CalculatePixelsColor();
@@ -252 +254 @@
     {
         int face = PixelAtPosition(cEvent->pos());
+//        cout << face << endl;
         if (face != -1 && lastFace != face) {
             emit signalPixelMoveOver(face);
         }
+        if (lastFace != face)
+        {
+            if (fShowPixelMoveOver)
+                fWhite = face;
+
+            if (fShowPatchMoveOver)
+                if (face != -1)
+                    fWhitePatch = pixelsPatch[face];
+                else
+                    fWhitePatch = -1;
+        }
+
+        if (fShowPixelMoveOver || fShowPatchMoveOver)
+            if (lastFace != face && isVisible())
+                updateGL();
+
         lastFace = face;
     }
@@ -279 +298 @@
 
     }
-
+    void QCameraWidget::ShowPixelCursor(bool on)
+    {
+        fShowPixelMoveOver = on;
+        if (isVisible() && autoRefresh)
+            updateGL();
+    }
+    void QCameraWidget::ShowPatchCursor(bool on)
+    {
+        fShowPatchMoveOver = on;
+        if (isVisible() && autoRefresh)
+            updateGL();
+    }
     void QCameraWidget::SetEnable(int idx, bool b)
      {

trunk/FACT++/gui/QCameraWidget.h

@@ -24 +24 @@
 
     int lastFace;
-
+    bool fShowPixelMoveOver;
+    bool fShowPatchMoveOver;
 
 public:
@@ -51 +52 @@
 
 
+     void ShowPixelCursor(bool);
+     void ShowPatchCursor(bool);
+
 private:
      void CalculatePixelsColor();

trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc

@@ -1037 +1037 @@
     }
 
-    if (calibInputFile->HasKey("NROI"))
-    {
-        cout << "Looks like you're trying to load a regular raw data file as DRS calib. aborting." << endl;
-        delete calibInputFile;
-        calibInputFile = NULL;
-        return;
-    }
+//    if (calibInputFile->HasKey("NROI"))
+//    {
+//        cout << "Looks like you're trying to load a regular raw data file as DRS calib. aborting." << endl;
+//        delete calibInputFile;
+//        calibInputFile = NULL;
+//        return;
+//    }
 
     if (!calibInputFile->SetPtrAddress("BaselineMean", baseLineMean)){