Changeset 17217

Timestamp:

10/12/13 11:50:09 (11 years ago)

Author:

tbretz

Message:

Updated the FTM_CONTROL service handling. It was broken since kValid was introduced.

File:

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

trunk/FACT++/gui/FactGui.h

@@ -2559 +2559 @@
             if (s.index==FTM::State::kConnected    ||
                 s.index==FTM::State::kIdle         ||
+                s.index==FTM::State::kValid        ||
                 configuring) // Dim connection / FTM connected
                 SetLedColor(fStatusFTMLed, kLedGreen, time);
@@ -2564 +2565 @@
                 SetLedColor(fStatusFTMLed, kLedGreenCheck, time);
             if (s.index==FTM::State::kConnected ||
-                s.index==FTM::State::kIdle) // Dim connection / FTM connected
+                s.index==FTM::State::kIdle ||
+                s.index==FTM::State::kValid) // Dim connection / FTM connected
                 enable = true;
             if (s.index>=FTM::State::kConfigError1) // Dim connection / FTM connected
                 SetLedColor(fStatusFTMLed, kLedGreenWarn, time);
 
-            fFtmStartRun->setEnabled(!configuring && enable);
-            fFtmStopRun->setEnabled(!configuring && (enable || s.index==FTM::State::kTriggerOn));
+            fFtmStartRun->setEnabled(!configuring && enable && s.index!=FTM::State::kTriggerOn);
+            fFtmStopRun->setEnabled(!configuring && !enable);
 
             fTriggerWidget->setEnabled(enable);