Changeset 12328 for trunk

Timestamp:

10/30/11 22:31:01 (13 years ago)

Author:

tbretz

Message:

Renamed FTM::kTakingData to FTM::kTriggerOn

File:

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

trunk/FACT++/gui/FactGui.h

@@ -2795 +2795 @@
                 s.index==FTM::StateMachine::kConfiguring2 ||
                 s.index==FTM::StateMachine::kConfigured;
-                
 
             if (s.index<FTM::StateMachine::kDisconnected) // No Dim connection
@@ -2803 +2802 @@
             if (s.index==FTM::StateMachine::kConnected    ||
                 s.index==FTM::StateMachine::kIdle         ||
-                configuring                               ||
-                s.index==FTM::StateMachine::kTakingData) // Dim connection / FTM connected
+                configuring) // Dim connection / FTM connected
                 SetLedColor(fStatusFTMLed, kLedGreen, time);
-
+            if (s.index==FTM::StateMachine::kTriggerOn) // Dim connection / FTM connected
+                SetLedColor(fStatusFTMLed, kLedGreenCheck, time);
             if (s.index==FTM::StateMachine::kConnected ||
                 s.index==FTM::StateMachine::kIdle) // Dim connection / FTM connected
@@ -2812 +2811 @@
 
             fFtmStartRun->setEnabled(!configuring && enable);
-            fFtmStopRun->setEnabled(!configuring && (enable || s.index==FTM::StateMachine::kTakingData));
+            fFtmStopRun->setEnabled(!configuring && (enable || s.index==FTM::StateMachine::kTriggerOn));
 
             fTriggerWidget->setEnabled(enable);