Changeset 11936 for trunk

Timestamp:

09/01/11 17:46:19 (13 years ago)

Author:

tbretz

Message:

Disable Bias tab by default; added some enumd for different LED images; changed bias control LED accordingly

File:

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

trunk/FACT++/gui/FactGui.h

@@ -503 +503 @@
         kLedYellow,
         kLedOrange,
-        kLedGray
+        kLedGray,
+        kLedWarnBorder,
+        kLedWarn,
+        kLedWarnTriangleBorder,
+        kLedWarnTriangle,
     };
 
@@ -529 +533 @@
             button->setIcon(QIcon(":/Resources/icons/gray circle 1.png"));
             break;
+
+        case kLedWarnBorder:
+            button->setIcon(QIcon(":/Resources/icons/warning 1.png"));
+            break;
+
+        case kLedWarn:
+            button->setIcon(QIcon(":/Resources/icons/warning 2.png"));
+            break;
+
+        case kLedWarnTriangle:
+            button->setIcon(QIcon(":/Resources/icons/warning 3.png"));
+            break;
+
+        case kLedWarnTriangleBorder:
+            button->setIcon(QIcon(":/Resources/icons/warning 4.png"));
+            break;
+
         }
 
@@ -2633 +2654 @@
             fStatusBiasLabel->setToolTip(s.comment.c_str());
 
-            bool enable = false;
-
             if (s.index<1) // No Dim connection
                 SetLedColor(fStatusBiasLed, kLedGray, time);
             if (s.index==1) // Dim connection / FTM disconnected
                 SetLedColor(fStatusBiasLed, kLedRed, time);
-            if (s.index>=2) // Dim connection / FTM disconnected
-            {
+            if (s.index==2 || s.index==3) // Connecting / Initializing
+                SetLedColor(fStatusBiasLed, kLedOrange, time);
+            if (s.index==4) // Connected
+                SetLedColor(fStatusBiasLed, kLedYellow, time);
+            if (s.index==5) // Ramping
+                SetLedColor(fStatusBiasLed, kLedWarn, time);
+            if (s.index==6) // Over current
+                SetLedColor(fStatusBiasLed, kLedWarnBorder, time);
+            if (s.index==7) // At reference
                 SetLedColor(fStatusBiasLed, kLedGreen, time);
-                enable = true;
-            }
-
-            fBiasWidget->setEnabled(enable);
+            if (s.index==8) // ExpertMode
+                SetLedColor(fStatusBiasLed, kLedWarnTriangleBorder, time);
+
+            fBiasWidget->setEnabled(s.index>=3);
         }
 
@@ -3280 +3306 @@
         if (fVecBiasVolt.size()>0)
         {
-            fBiasVoltDac->setValue(fVecBiasVolt[ihw]);
             fBiasVoltCur->setValue(fVecBiasVolt[ihw]*90./4096);
             fBiasVoltRef->setValue(fVecBiasVolt[ihw+416]*90./4096);
@@ -3579 +3604 @@
         fEvtBldWidget->setEnabled(false);
         fLoggerWidget->setEnabled(false);
+        fBiasWidget->setEnabled(false);
 
         fChatSend->setEnabled(false);