Allow notch labels

Author: cesarBLG

Source/Orts.Simulation/Common/Scripting/BrakeController.cs

@@ -277,6 +277,10 @@ public void SetDynamicBrakeIntervention(float value)
         /// </summary>
         /// <returns>The nullable state fraction</returns>
         public abstract float? GetStateFraction();
+        public virtual string GetStateName()
+        {
+            return ControllerStateDictionary.Dict[GetState()];
+        }
     }
 
     public enum BrakeControllerEvent

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/BrakeController.cs

@@ -313,8 +313,20 @@ public void Parse(string lowercasetoken, STFReader stf)
                             float value = stf.ReadFloat(STFReader.UNITS.None, null);
                             int smooth = stf.ReadInt(null);
                             string type = stf.ReadString();
-                            Notches.Add(new MSTSNotch(value, smooth, type, stf));
-                            if (type != ")") stf.SkipRestOfBlock();
+                            string name = null;
+                            while(type != ")" && !stf.EndOfBlock())
+                            {
+                                switch (stf.ReadItem().ToLower())
+                                {
+                                    case "(":
+                                        stf.SkipRestOfBlock();
+                                        break;
+                                    case "ortslabel":
+                                        name = stf.ReadStringBlock(null);
+                                        break;
+                                }
+                            }
+                            Notches.Add(new MSTSNotch(value, smooth, type, name, stf));
                         }),
                     });
                     break;
@@ -484,7 +496,7 @@ public string GetStatus()
         {
             if (Script != null)
             {
-                string state = ControllerStateDictionary.Dict[Script.GetState()];
+                string state = Script.GetStateName();
                 string fraction = GetStateFractionScripted();
 
                 if (String.IsNullOrEmpty(state) && String.IsNullOrEmpty(fraction))

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/MSTSBrakeController.cs

@@ -382,6 +382,19 @@ public override ControllerState GetState()
                 return ControllerState.Dummy;
         }
 
+        public override string GetStateName()
+        {
+            if (!EmergencyBrakingPushButton() && !TCSEmergencyBraking() && !TCSFullServiceBraking() &&
+                !OverchargeButtonPressed() && !QuickReleaseButtonPressed() &&
+                NotchController != null && NotchController.NotchCount() > 0)
+            {
+                var notch = NotchController.GetCurrentNotch();
+                if (!string.IsNullOrEmpty(notch.Name))
+                    return notch.Name;
+            }
+            return base.GetStateName();
+        }
+
         public override float? GetStateFraction()
         {
             if (EmergencyBrakingPushButton() || TCSEmergencyBraking() || TCSFullServiceBraking() || QuickReleaseButtonPressed() || OverchargeButtonPressed())

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/MSTSNotchController.cs

@@ -27,7 +27,8 @@ public class MSTSNotch {
         public float Value;
         public bool Smooth;
         public ControllerState Type;
-        public MSTSNotch(float v, int s, string type, STFReader stf)
+        public string Name;
+        public MSTSNotch(float v, int s, string type, string name, STFReader stf)
         {
             Value = v;
             Smooth = s == 0 ? false : true;
@@ -85,6 +86,7 @@ public MSTSNotch(float v, int s, string type, STFReader stf)
                     STFException.TraceInformation(stf, "Skipped unknown notch type " + type);
                     break;
             }
+            Name = name;
         }
         public MSTSNotch(float v, bool s, int t)
         {
@@ -98,13 +100,7 @@ public MSTSNotch(MSTSNotch other)
             Value = other.Value;
             Smooth = other.Smooth;
             Type = other.Type;
-        }
-
-        public MSTSNotch(BinaryReader inf)
-        {
-            Value = inf.ReadSingle();
-            Smooth = inf.ReadBoolean();
-            Type = (ControllerState)inf.ReadInt32();
+            Name = other.Name;
         }
 
         public MSTSNotch Clone()
@@ -114,15 +110,9 @@ public MSTSNotch Clone()
 
         public string GetName()
         {
+            if (!string.IsNullOrEmpty(Name)) return Name;
             return ControllerStateDictionary.Dict[Type];
         }
-
-        public void Save(BinaryWriter outf)
-        {
-            outf.Write(Value);
-            outf.Write(Smooth);
-            outf.Write((int)Type);
-        }
     }
 
     /**
@@ -229,8 +219,20 @@ public void Parse(STFReader stf)
                     float value = stf.ReadFloat(STFReader.UNITS.None, null);
                     int smooth = stf.ReadInt(null);
                     string type = stf.ReadString();
-                    Notches.Add(new MSTSNotch(value, smooth, type, stf));
-                    if (type != ")") stf.SkipRestOfBlock();
+                    string name = null;
+                    while(type != ")" && !stf.EndOfBlock())
+                    {
+                        switch (stf.ReadItem().ToLower())
+                        {
+                            case "(":
+                                stf.SkipRestOfBlock();
+                                break;
+                            case "ortslabel":
+                                name = stf.ReadStringBlock(null);
+                                break;
+                        }
+                    }
+                    Notches.Add(new MSTSNotch(value, smooth, type, name, stf));
                 }),
             });
             SetValue(CurrentValue);
@@ -541,33 +543,18 @@ protected virtual void SaveData(BinaryWriter outf)
             outf.Write(MinimumValue);
             outf.Write(MaximumValue);
             outf.Write(StepSize);
-            outf.Write(CurrentNotch);            
-            outf.Write(Notches.Count);
-            
-            foreach(MSTSNotch notch in Notches)
-            {
-                notch.Save(outf);                
-            }            
+            outf.Write(CurrentNotch);           
         }
 
         public virtual void Restore(BinaryReader inf)
         {
-            Notches.Clear();
-
             IntermediateValue = CurrentValue = inf.ReadSingle();            
             MinimumValue = inf.ReadSingle();
             MaximumValue = inf.ReadSingle();
             StepSize = inf.ReadSingle();
             CurrentNotch = inf.ReadInt32();
 
-            UpdateValue = 0;
-
-            int count = inf.ReadInt32();
-
-            for (int i = 0; i < count; ++i)
-            {
-                Notches.Add(new MSTSNotch(inf));
-            }           
+            UpdateValue = 0;         
         }
 
         public MSTSNotch GetCurrentNotch()