Merge pull request #1143 from sweiland-openrails/WorkOrdersStatusDoneFix

Status in Work Orders popup set too fast

Author: sweiland-openrails

Source/Orts.Simulation/Simulation/Activity.cs

@@ -1325,13 +1325,16 @@ override public Boolean Triggered(Activity activity)
                     }
                     break;
                 case EventType.DropOffWagonsAtLocation:
-                    // Dropping off of wagons should only count once disconnected from player train.
-                    // A better name than DropOffWagonsAtLocation would be ArriveAtSidingWithWagons.
-                    // To recognize the dropping off of the cars before the event is activated, this method is used.
-                    if (atSiding(OriginalPlayerTrain.FrontTDBTraveller, OriginalPlayerTrain.RearTDBTraveller, this.SidingEnd1, this.SidingEnd2))
+                    consistTrain = matchesConsistNoOrder(ChangeWagonIdList);
+                    if (consistTrain != null)
                     {
-                        consistTrain = matchesConsistNoOrder(ChangeWagonIdList);
-                        triggered = consistTrain != null;
+                        if (consistTrain.TrainType == Train.TRAINTYPE.STATIC)
+                        {
+                            if (atSiding(consistTrain.FrontTDBTraveller, consistTrain.RearTDBTraveller, this.SidingEnd1, this.SidingEnd2))
+                            {
+                                triggered = true;
+                            }
+                        }
                     }
                     break;
                 case EventType.PickUpPassengers:
@@ -1377,33 +1380,30 @@ private Train matchesConsist(List<string> wagonIdList)
             return null;
         }
         /// <summary>
-        /// Finds the train that contains exactly the wagons (and maybe loco) in the list. Exact order is not required.
+        /// Finds the train that contains the wagons in the list. 
+        /// Exact order is not required.
+        /// Some lists may only contain the first and last wagon. Check that first and last wagon match with those two wagons in the activity list.
         /// </summary>
         /// <param name="wagonIdList"></param>
         /// <returns>train or null</returns>
         private Train matchesConsistNoOrder(List<string> wagonIdList)
         {
             foreach (var trainItem in Simulator.Trains)
             {
-                int nCars = 0;//all cars other than WagonIdList.
-                int nWagonListCars = 0;//individual wagon drop.
+                int nWagonListCars = 0;
                 foreach (var item in trainItem.Cars)
                 {
-                    if (!wagonIdList.Contains(item.CarID)) nCars++;
-                    if (wagonIdList.Contains(item.CarID)) nWagonListCars++;
-                }
-                // Compare two lists to make sure wagons are present.
-                bool listsMatch = true;
-                //support individual wagonIdList drop
-                if (trainItem.Cars.Count - nCars == (wagonIdList.Count == nWagonListCars ? wagonIdList.Count : nWagonListCars))
-                {
-                    if (excludesWagons(trainItem, wagonIdList)) listsMatch = false;//all wagons dropped
-                    
-                    if (listsMatch) return trainItem;
-                    
+                    if (wagonIdList.Contains(item.CarID))
+                    {
+                        nWagonListCars++;
+                    }
+                    if (nWagonListCars == wagonIdList.Count)
+                    {
+                        return trainItem;
+                    }
                 }
-               
             }
+
             return null;
         }
         /// <summary>

Source/RunActivity/Viewer3D/Popups/HelpWindow.cs

@@ -1419,6 +1419,18 @@ public override void TabAction()
 
         protected override ControlLayout Layout(ControlLayout layout)
         {
+            int scrollPosition = 0;
+            if (Tabs[ActiveTab].Vbox != null)
+            {
+                foreach (var control in Tabs[ActiveTab].Vbox.Controls)
+                {
+                    if (control is ControlLayoutScrollboxVertical controlLayoutScrollboxVertical)
+                    {
+                        scrollPosition = controlLayoutScrollboxVertical.GetScrollPosition();
+                    }
+                }
+            }
+
             var vbox = base.Layout(layout).AddLayoutVertical();
 
             if (Tabs.Count > 0)
@@ -1434,8 +1446,17 @@ protected override ControlLayout Layout(ControlLayout layout)
                 }
                 vbox.AddHorizontalSeparator();
                 Tabs[ActiveTab].Layout(vbox);
+
+                foreach (var control in vbox.Controls)
+                {
+                    if (control is ControlLayoutScrollboxVertical controlLayoutScrollboxVertical)
+                    {
+                        controlLayoutScrollboxVertical.SetScrollPosition(scrollPosition);
+                    }
+                }
             }
 
+            Tabs[ActiveTab].Vbox = vbox;
             return vbox;
         }
 
@@ -1462,12 +1483,14 @@ class TabData
             public readonly Tab Tab;
             public readonly string TabLabel;
             public readonly Action<ControlLayout> Layout;
+            public Orts.Viewer3D.Popups.ControlLayoutVertical Vbox;
 
             public TabData(Tab tab, string tabLabel, Action<ControlLayout> layout)
             {
                 Tab = tab;
                 TabLabel = tabLabel;
                 Layout = layout;
+                Vbox = null;
             }
         }
 

Source/RunActivity/Viewer3D/Popups/WindowControls.cs

@@ -587,6 +587,7 @@ protected ControlLayoutScrollbox(int width, int height)
 
         public abstract int ScrollSize { get; }
 
+        public abstract int GetScrollPosition();
         public abstract void SetScrollPosition(int position);
 
         internal RasterizerState ScissorTestEnable = new RasterizerState { ScissorTestEnable = true };
@@ -707,6 +708,11 @@ public override int ScrollSize
             }
         }
 
+        public override int GetScrollPosition()
+        {
+            return ScrollPosition;
+        }
+
         public override void SetScrollPosition(int position)
         {
             position = Math.Max(0, Math.Min(Math.Max(0, ScrollSize), position));
@@ -841,6 +847,11 @@ public override int ScrollSize
             }
         }
 
+        public override int GetScrollPosition()
+        {
+            return(ScrollPosition);
+        }
+
         public override void SetScrollPosition(int position)
         {
             position = Math.Max(0, Math.Min(Math.Max(0, ScrollSize), position));