Changeset 12115 for trunk/FACT++

Timestamp:

09/16/11 19:19:21 (13 years ago)

Author:

tbretz

Message:

Some more updates to the Slow control values and some fixes to the MCP status.

File:

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

trunk/FACT++/gui/FactGui.h

@@ -806 +806 @@
 
         SetLedColor(fStatusDNSLed, version==0 ? kLedRed : kLedGreen, Time());
+
+        fShutdown->setEnabled(version!=0);
+        fShutdownAll->setEnabled(version!=0);
     }
 
@@ -2370 +2373 @@
     void SetFscValue(QDoubleSpinBox *box, const DimData &d, int idx, bool enable)
     {
-        box->setEnabled(enable);
+        //box->setEnabled(enable);
         if (!enable)
         {
@@ -2388 +2391 @@
     {
         const bool enable = d.size()>0 && CheckSize(d, 60*sizeof(float));
+        if (!enable)
+            return;
 
         QDoubleSpinBox *boxes[] = {
@@ -2441 +2446 @@
     {
         const bool enable = d.size()>0 && CheckSize(d, 31*sizeof(float));
+        if (!enable)
+            return;
 
         QDoubleSpinBox *boxes[] = {
@@ -2461 +2468 @@
     {
         const bool enable = d.size()>0 && CheckSize(d, 31*sizeof(float));
+        if (!enable)
+            return;
 
         QDoubleSpinBox *boxes[] = {
@@ -2648 +2657 @@
                 SetLedColor(fStatusMCPLed, kLedRed, time);
             if (s.index==3) // Connecting
-                SetLedColor(fStatusFTMLed, kLedOrange, time);
+                SetLedColor(fStatusMCPLed, kLedOrange, time);
             if (s.index==4) // Connected
-                SetLedColor(fStatusFTMLed, kLedYellow, time);
+                SetLedColor(fStatusMCPLed, kLedYellow, time);
             if (s.index==5) // Idle
-                SetLedColor(fStatusFTMLed, kLedGreen, time);
+                SetLedColor(fStatusMCPLed, kLedGreen, time);
 
             const bool configuring = s.index>=7 && s.index<=10;
 
             if (configuring) // Idle
-                SetLedColor(fStatusFTMLed, kLedGreen, time);
+                SetLedColor(fStatusMCPLed, kLedGreen, time);
 
             fMcpStartRun->setEnabled(s.index==5);
@@ -2686 +2695 @@
                 SetLedColor(fStatusFTMLed, kLedGreen, time);
 
-            fFtmStartRun->setEnabled(!configuring);
-            fFtmStopRun->setEnabled(!configuring);
+            fFtmStartRun->setEnabled(!configuring && enable);
+            fFtmStopRun->setEnabled(!configuring && enable);
 
             if (s.index==FTM::StateMachine::kConnected ||
@@ -2750 +2759 @@
 
             const bool configuring = s.index>=FAD::kConfiguring1;
-            fFadStart->setEnabled(!configuring);
-            fFadStop->setEnabled(!configuring);
-            fFadAbort->setEnabled(!configuring);
+            fFadStart->setEnabled(!configuring && enable);
+            fFadStop->setEnabled(!configuring && enable);
+            fFadAbort->setEnabled(!configuring && enable);
         }
 
@@ -2841 +2850 @@
 
             fLoggerWidget->setEnabled(enable);
+            fLoggerStart->setEnabled(enable);
+            fLoggerStop->setEnabled(enable);
         }
 
@@ -3759 +3770 @@
         fLoggerWidget->setEnabled(false);
         fBiasWidget->setEnabled(false);
+        fAuxWidget->setEnabled(false);
 
         fChatSend->setEnabled(false);