Changeset 14561

Timestamp:

11/05/12 12:04:11 (12 years ago)

Author:

tbretz

Message:

Imporved naming of states; changed offset in SetSection accordingly.

File:

• trunk/FACT++/src/StateMachineDimControl.cc (modified) (3 diffs)

trunk/FACT++/src/StateMachineDimControl.cc

@@ -35 +35 @@
     switch (qos)
     {
-    case -3: msg = "End";   break;
-    case -2: msg = "Load";  break;
-    case -1: msg = "Start"; break;
+    case -4: msg = "End";       break;
+    case -3: msg = "Loading";   break;
+    case -2: msg = "Compiling"; break;
+    case -1: msg = "Running";   break;
     default:
         {
@@ -55 +56 @@
     //Write(time, Line(msg, qos<-1 ? '=' :'-'), MessageImp::kInternal);
 
-    if (qos==-3)
+    if (qos==-4)
         fScriptUser = fUser;
 
-    SetCurrentState(qos+3, msg.c_str());
-    //SetCurrentState(qos+3, Line(msg, qos<-1 ? '=' :'-').c_str());
-    return GetCurrentState();
-
-    //return qos+3;
+    SetCurrentState(qos+4, msg.c_str());
+    //SetCurrentState(qos+4, Line(msg, qos<-1 ? '=' :'-').c_str());
+    return GetCurrentState();
+
+    //return qos+4;
 }
 
@@ -459 +460 @@
 
     // State names
-    AddStateName(0, "Idle",    "No script currently in processing.");
-    AddStateName(1, "Load",    "Script being loaded.");
-    AddStateName(2, "Started", "Script execution started.");
+    AddStateName(0, "Idle",      "No script currently in processing.");
+    AddStateName(1, "Loading",   "Script is loading.");
+    AddStateName(2, "Compiling", "JavaScript is compiling.");
+    AddStateName(3, "Running",   "Script is running.");
 
     AddEvent("START", "C", 0)