Changeset 14561 for trunk/FACT++


Ignore:
Timestamp:
11/05/12 12:04:11 (12 years ago)
Author:
tbretz
Message:
Imporved naming of states; changed offset in SetSection accordingly.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/FACT++/src/StateMachineDimControl.cc

    r14551 r14561  
    3535    switch (qos)
    3636    {
    37     case -3: msg = "End";   break;
    38     case -2: msg = "Load";  break;
    39     case -1: msg = "Start"; break;
     37    case -4: msg = "End";       break;
     38    case -3: msg = "Loading";   break;
     39    case -2: msg = "Compiling"; break;
     40    case -1: msg = "Running";   break;
    4041    default:
    4142        {
     
    5556    //Write(time, Line(msg, qos<-1 ? '=' :'-'), MessageImp::kInternal);
    5657
    57     if (qos==-3)
     58    if (qos==-4)
    5859        fScriptUser = fUser;
    5960
    60     SetCurrentState(qos+3, msg.c_str());
    61     //SetCurrentState(qos+3, Line(msg, qos<-1 ? '=' :'-').c_str());
    62     return GetCurrentState();
    63 
    64     //return qos+3;
     61    SetCurrentState(qos+4, msg.c_str());
     62    //SetCurrentState(qos+4, Line(msg, qos<-1 ? '=' :'-').c_str());
     63    return GetCurrentState();
     64
     65    //return qos+4;
    6566}
    6667
     
    459460
    460461    // State names
    461     AddStateName(0, "Idle",    "No script currently in processing.");
    462     AddStateName(1, "Load",    "Script being loaded.");
    463     AddStateName(2, "Started", "Script execution started.");
     462    AddStateName(0, "Idle",      "No script currently in processing.");
     463    AddStateName(1, "Loading",   "Script is loading.");
     464    AddStateName(2, "Compiling", "JavaScript is compiling.");
     465    AddStateName(3, "Running",   "Script is running.");
    464466
    465467    AddEvent("START", "C", 0)
Note: See TracChangeset for help on using the changeset viewer.