Changeset 17217 for trunk/FACT++/gui


Ignore:
Timestamp:
Oct 12, 2013, 11:50:09 AM (6 years ago)
Author:
tbretz
Message:
Updated the FTM_CONTROL service handling. It was broken since kValid was introduced.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/FACT++/gui/FactGui.h

    r17211 r17217  
    25592559            if (s.index==FTM::State::kConnected    ||
    25602560                s.index==FTM::State::kIdle         ||
     2561                s.index==FTM::State::kValid        ||
    25612562                configuring) // Dim connection / FTM connected
    25622563                SetLedColor(fStatusFTMLed, kLedGreen, time);
     
    25642565                SetLedColor(fStatusFTMLed, kLedGreenCheck, time);
    25652566            if (s.index==FTM::State::kConnected ||
    2566                 s.index==FTM::State::kIdle) // Dim connection / FTM connected
     2567                s.index==FTM::State::kIdle ||
     2568                s.index==FTM::State::kValid) // Dim connection / FTM connected
    25672569                enable = true;
    25682570            if (s.index>=FTM::State::kConfigError1) // Dim connection / FTM connected
    25692571                SetLedColor(fStatusFTMLed, kLedGreenWarn, time);
    25702572
    2571             fFtmStartRun->setEnabled(!configuring && enable);
    2572             fFtmStopRun->setEnabled(!configuring && (enable || s.index==FTM::State::kTriggerOn));
     2573            fFtmStartRun->setEnabled(!configuring && enable && s.index!=FTM::State::kTriggerOn);
     2574            fFtmStopRun->setEnabled(!configuring && !enable);
    25732575
    25742576            fTriggerWidget->setEnabled(enable);
Note: See TracChangeset for help on using the changeset viewer.