More changes suggested in PR review.

Show total (max) and continuous tractive effort.

Use trailing tons for all calculated ratings.

Author: rwf-rr

Source/RunActivity/Viewer3D/Popups/HelpWindow.cs

@@ -1194,10 +1194,12 @@ private void AddAggregatedTrainInfo(Train playerTrain, ControlLayout scrollbox,
             int numCars = 0;
             int numAxles = 0;
             var totMassKg = playerTrain.MassKg;
+            float trailingMassKg = 0f;
             string sectionMass = ""; // using "  +  " between wagon sets
             var lengthM = playerTrain.Length;
             var maxSpeedMps = playerTrain.TrainMaxSpeedMpS;
             float totPowerW = 0f;
+            float totMaxTractiveEffortN = 0f;
             float totMaxContTractiveEffortN = 0f;
             string sectionMaxContTractiveForce = ""; // using "  +  " between DPU sets
             float totMaxDynamicBrakeForceN = 0f;
@@ -1209,8 +1211,8 @@ private void AddAggregatedTrainInfo(Train playerTrain, ControlLayout scrollbox,
             int engCount = 0; string countSeparator = ""; // when set, indicates that subsequent engines are in a separate block
             float engMaxContTractiveForceN = 0f; float engMaxDynBrakeForceN = 0f; string forceSeparator = "";  // when set, indicates that subsequent engines are in a separate block
 
-            float wagMassKg = 0f; string massSeparator = ""; // when set, indicates that subsequent engines are in a separate block
-            float trailingMassKg = 0f; int numOperativeBrakes = 0;
+            float wagSectionMassKg = 0f; string massSeparator = ""; // when set, indicates that subsequent engines are in a separate block
+            int numOperativeBrakes = 0;
             bool isMetric = false; bool isUK = false;  // isImperial* does not seem to be used in simulation
 
             if (TrainInfoSpriteSheet == null) { TrainInfoSpriteSheet = SharedTextureManager.Get(Owner.Viewer.RenderProcess.GraphicsDevice, Path.Combine(Owner.Viewer.ContentPath, "TrainInfoSprites.png")); }
@@ -1234,23 +1236,24 @@ private void AddAggregatedTrainInfo(Train playerTrain, ControlLayout scrollbox,
                     engCount++;
                     numAxles += eng.LocoNumDrvAxles + eng.GetWagonNumAxles();
                     totPowerW += eng.MaxPowerW;
+                    totMaxTractiveEffortN += eng.MaxForceN;
                     totMaxContTractiveEffortN += eng.MaxContinuousForceN > 0 ? eng.MaxContinuousForceN : eng.MaxForceN;
                     engMaxContTractiveForceN += eng.MaxContinuousForceN > 0 ? eng.MaxContinuousForceN : eng.MaxForceN;
                     totMaxDynamicBrakeForceN += eng.MaxDynamicBrakeForceN;
                     engMaxDynBrakeForceN += eng.MaxDynamicBrakeForceN;
 
                     // hanlde transition from wagons to engines
-                    if (wagMassKg > 0)
+                    if (wagSectionMassKg > 0)
                     {
-                        sectionMass += massSeparator + FormatStrings.FormatLargeMass(wagMassKg, isMetric, isUK);
-                        wagMassKg = 0f; massSeparator = "  +  ";
+                        sectionMass += massSeparator + FormatStrings.FormatLargeMass(wagSectionMassKg, isMetric, isUK);
+                        wagSectionMassKg = 0f; massSeparator = "  +  ";
                     }
                 }
                 else if (wag != null)
                 {
                     numCars++;
                     numAxles += wag.GetWagonNumAxles();
-                    wagMassKg += wag.MassKG;
+                    wagSectionMassKg += wag.MassKG;
                     trailingMassKg += wag.MassKG;
                     if (wag.MaxBrakeForceN > 0 && car.BrakeSystem != null && !(car.BrakeSystem is SingleTransferPipe) && !(car.BrakeSystem is ManualBraking)) { numOperativeBrakes++; }
 
@@ -1282,7 +1285,7 @@ private void AddAggregatedTrainInfo(Train playerTrain, ControlLayout scrollbox,
             if (String.IsNullOrEmpty(numEngines)) { numEngines = "0"; }
             if (engMaxContTractiveForceN > 0) { sectionMaxContTractiveForce += forceSeparator + FormatStrings.FormatForce(engMaxContTractiveForceN, isMetric); }
             if (engMaxDynBrakeForceN > 0) { sectionMaxDynamicBrakeForce += forceSeparator + FormatStrings.FormatForce(engMaxDynBrakeForceN, isMetric); }
-            if (wagMassKg > 0) { sectionMass += massSeparator + FormatStrings.FormatLargeMass(wagMassKg, isMetric, isUK); }
+            if (wagSectionMassKg > 0) { sectionMass += massSeparator + FormatStrings.FormatLargeMass(wagSectionMassKg, isMetric, isUK); }
 
             var line = scrollbox.AddLayoutHorizontalLineOfText();
             line.Add(new Label(labelWidth, line.RemainingHeight, Viewer.Catalog.GetString("Number of Engines:"), LabelAlignment.Left));
@@ -1312,9 +1315,13 @@ private void AddAggregatedTrainInfo(Train playerTrain, ControlLayout scrollbox,
             scrollbox.AddHorizontalSeparator();
 
             line = scrollbox.AddLayoutHorizontalLineOfText();
-            line.Add(new Label(labelWidth, line.RemainingHeight, Viewer.Catalog.GetString("Total Power:"), LabelAlignment.Left));
+            line.Add(new Label(labelWidth, line.RemainingHeight, Viewer.Catalog.GetString("Max Power:"), LabelAlignment.Left));
             line.Add(new Label(line.RemainingWidth, line.RemainingHeight, FormatStrings.FormatPower(totPowerW, isMetric, false, false), LabelAlignment.Left));
 
+            line = scrollbox.AddLayoutHorizontalLineOfText();
+            line.Add(new Label(labelWidth, line.RemainingHeight, Viewer.Catalog.GetString("Max Tractive Effort:"), LabelAlignment.Left));
+            line.Add(new Label(line.RemainingWidth, line.RemainingHeight, FormatStrings.FormatForce(totMaxTractiveEffortN, isMetric), LabelAlignment.Left));
+
             line = scrollbox.AddLayoutHorizontalLineOfText();
             line.Add(new Label(labelWidth, line.RemainingHeight, Viewer.Catalog.GetString("Max Continuous Tractive Effort:"), LabelAlignment.Left));
             line.Add(new Label(line.RemainingWidth, line.RemainingHeight, sectionMaxContTractiveForce, LabelAlignment.Left));
@@ -1325,7 +1332,7 @@ private void AddAggregatedTrainInfo(Train playerTrain, ControlLayout scrollbox,
 
             if (!isMetric)
             {
-                float hpt = totMassKg > 0f ? W.ToHp(totPowerW) / Kg.ToTUS(totMassKg) : 0f;
+                float hpt = trailingMassKg > 0f ? W.ToHp(totPowerW) / Kg.ToTUS(trailingMassKg) : 0f;
                 line = scrollbox.AddLayoutHorizontalLineOfText();
                 line.Add(new Label(labelWidth, line.RemainingHeight, Viewer.Catalog.GetString("Horespower per Ton:"), LabelAlignment.Left));
                 line.Add(new Label(line.RemainingWidth, line.RemainingHeight, string.Format("{0:0.0}", hpt), LabelAlignment.Left));
@@ -1342,13 +1349,13 @@ private void AddAggregatedTrainInfo(Train playerTrain, ControlLayout scrollbox,
                 //       and should really be defined in the path file.
 
                 // tons per equivalent powered axle (TPA or TpEPA)
-                float tpepa = totMaxContTractiveEffortN > 0 ? Kg.ToTUS(totMassKg) / (N.ToLbf(totMaxContTractiveEffortN) / 10000f) : 0;
+                float tpepa = totMaxContTractiveEffortN > 0 ? Kg.ToTUS(trailingMassKg) / (N.ToLbf(totMaxContTractiveEffortN) / 10000f) : 0;
                 line = scrollbox.AddLayoutHorizontalLineOfText();
                 line.Add(new Label(labelWidth, line.RemainingHeight, Viewer.Catalog.GetString("Tons per EPA:"), LabelAlignment.Left));
                 line.Add(new Label(line.RemainingWidth, line.RemainingHeight, string.Format("{0:0}", tpepa), LabelAlignment.Left));
 
                 // tons per equivalent dynamic brake axle (TpEDBA)
-                float tpedba = totMaxDynamicBrakeForceN > 0 ? Kg.ToTUS(totMassKg) / (N.ToLbf(totMaxDynamicBrakeForceN) / 10000f) : 0;
+                float tpedba = totMaxDynamicBrakeForceN > 0 ? Kg.ToTUS(trailingMassKg) / (N.ToLbf(totMaxDynamicBrakeForceN) / 10000f) : 0;
                 line = scrollbox.AddLayoutHorizontalLineOfText();
                 line.Add(new Label(labelWidth, line.RemainingHeight, Viewer.Catalog.GetString("Tons per EDBA:"), LabelAlignment.Left));
                 line.Add(new Label(line.RemainingWidth, line.RemainingHeight, string.Format("{0:0}", tpedba), LabelAlignment.Left));