Changeset 12121 for trunk

Timestamp:

09/16/11 22:24:16 (13 years ago)

Author:

tbretz

Message:

Some more small improvements and fixes to status, camera displays and others.

File:

• trunk/FACT++/gui/FactGui.h (modified) (8 diffs)

trunk/FACT++/gui/FactGui.h

@@ -1092 +1092 @@
         fFadRunNoNext->setValue(runs[1]);
         fFadRunNoCur->setEnabled(runs[0]>=0);
-        fMcpStopRun->setEnabled(runs[0]>=0);
+        //fMcpStopRun->setEnabled(runs[0]>=0);
 
     }
@@ -2660 +2660 @@
             if (s.index==4) // Connected
                 SetLedColor(fStatusMCPLed, kLedYellow, time);
-            if (s.index==5) // Idle
+            if (s.index==5 || s.index==10) // Idle
                 SetLedColor(fStatusMCPLed, kLedGreen, time);
 
-            const bool configuring = s.index>=7 && s.index<=10;
-
-            if (configuring) // Idle
-                SetLedColor(fStatusMCPLed, kLedGreen, time);
-
-            fMcpStartRun->setEnabled(s.index==5);
-            fMcpReset->setEnabled(configuring);
+            if (s.index>=7 && s.index<=9)
+                SetLedColor(fStatusMCPLed, kLedGreenBar, time);
+
+            fMcpStartRun->setEnabled(s.index>=5);
+            fMcpStopRun->setEnabled(s.index>=5);
+            fMcpReset->setEnabled(s.index>=7 && s.index<=10);
         }
 
@@ -2758 +2757 @@
             fFadWidget->setEnabled(enable);
 
-            const bool configuring = s.index>=FAD::kConfiguring1;
-            fFadStart->setEnabled(!configuring && enable);
-            fFadStop->setEnabled(!configuring && enable);
-            fFadAbort->setEnabled(!configuring && enable);
+            fFadStart->setEnabled(s.index==FAD::kOffline);
+            fFadStop->setEnabled(s.index>FAD::kOffline);
+            fFadAbort->setEnabled(s.index>FAD::kOffline);
+            fFadSoftReset->setEnabled(s.index>FAD::kOffline);
+            fFadHardReset->setEnabled(s.index>FAD::kOffline);
         }
 
@@ -2837 +2837 @@
             bool enable = true;
 
-            if (s.index<=30)   // Ready/Waiting
+            if (s.index<30)   // Ready/Waiting
                 SetLedColor(fStatusLoggerLed, kLedYellow, time);
+            if (s.index==30)   // Ready/Waiting
+                SetLedColor(fStatusLoggerLed, kLedGreen, time);
             if (s.index<-1)     // Offline
             {
@@ -2850 +2852 @@
 
             fLoggerWidget->setEnabled(enable);
-            fLoggerStart->setEnabled(enable);
-            fLoggerStop->setEnabled(enable);
+            fLoggerStart->setEnabled(s.index>-1 && s.index<30);
+            fLoggerStop->setEnabled(s.index>=30);
         }
 
@@ -3577 +3579 @@
                 dat[i] = fVecBiasVolt[entry.hv()+offset]*90./4096;
 
-                fBiasCamV->highlightPixel(i, fVecBiasVolt[entry.hv()]==fVecBiasVolt[entry.hv()+416]);
+                fBiasCamV->highlightPixel(i, fVecBiasVolt[entry.hv()]!=fVecBiasVolt[entry.hv()+416]);
             }
 
@@ -4091 +4093 @@
         fAdcDataCanv->EnableSignalEvents(kMouseMoveEvent);
 
-        fRatesCanv->setMouseTracking(true);
+        //fRatesCanv->setMouseTracking(true);
+        fEventCanv1->setMouseTracking(true);
+        fEventCanv2->setMouseTracking(true);
+        fEventCanv3->setMouseTracking(true);
+        fEventCanv4->setMouseTracking(true);
+
+        fFeedbackDevCam->setMouseTracking(true);
+        fFeedbackCmdCam->setMouseTracking(true);
 
         connect(fRatesCanv, SIGNAL(signalPixelMoveOver(int)),
@@ -4104 +4113 @@
                 this, SLOT(slot_CameraMouseMove(int)));
 
+        connect(fFeedbackDevCam, SIGNAL(signalPixelMoveOver(int)),
+                this, SLOT(slot_CameraMouseMove(int)));
+        connect(fFeedbackCmdCam, SIGNAL(signalPixelMoveOver(int)),
+                this, SLOT(slot_CameraMouseMove(int)));
+
         connect(fRatesCanv, SIGNAL(signalPixelDoubleClick(int)),
                 this, SLOT(slot_CameraDoubleClick(int)));