Merge branch 'master' into bugfix/Fix-F9-CarId-bug

Author: mbm-OR

Source/Contrib/ContentManager/ContentManagerGUI.cs

@@ -286,7 +286,8 @@ void searchBox_TextChanged(object sender, EventArgs e)
                         finds.Add(new SearchResult(content, path));
 
                     foreach (var child in ((ContentType[])Enum.GetValues(typeof(ContentType))).SelectMany(ct => content.Get(ct)))
-                        pending.Add(path + " / " + child.Name, child);
+                        if (!pending.ContainsKey(path + " / " + child.Name))
+                            pending.Add(path + " / " + child.Name, child);
 
                     foreach (var child in ContentLink.Matches(ContentInfo.GetText(content)).Cast<Match>().Select(linkMatch => content.Get(linkMatch.Groups[1].Value, (ContentType)Enum.Parse(typeof(ContentType), linkMatch.Groups[2].Value))).Where(linkContent => linkContent != null))
                         if (!pending.ContainsKey(path + " -> " + child.Name))

Source/Contrib/TrackViewer/Drawing/DrawTrackDB.cs

@@ -107,37 +107,14 @@ public RouteData(string routePath, MessageDelegate messageDelegate)
                 //sigcfgFile = null; // default initialization
             }
 
-            // read the activity location events and store them in the TrackDB.TrItemTable
+            // read the activity location events and add them to the TrackDB.TrItemTable
 
             ActivityNames.Clear();
             var directory = System.IO.Path.Combine(routePath, "ACTIVITIES");
             if (System.IO.Directory.Exists(directory))
             {
-                // counting
-                int cnt = 0;
-
-                foreach (var file in Directory.GetFiles(directory, "*.act"))
-                {
-                    try
-                    {
-                        var activityFile = new ActivityFile(file);
-                        Events events = activityFile.Tr_Activity.Tr_Activity_File.Events;
-                        if (events != null)
-                        {
-                            for (int i = 0; i < events.EventList.Count; i++)
-                            {
-                                if (events.EventList[i].GetType() == typeof(EventCategoryLocation))
-                                {
-                                    cnt++;
-                                }
-                            }
-                        }
-                    }
-                    catch { }
-                }
-
-                // adding
-                uint index = 0;
+                int index = TrackDB.TrItemTable.Length;
+                List<TrItem> eventItems = new List<TrItem>();
                 foreach (var file in Directory.GetFiles(directory, "*.act"))
                 {
                     try
@@ -157,8 +134,8 @@ public RouteData(string routePath, MessageDelegate messageDelegate)
                                         eventCategoryLocation.Outcomes.DisplayMessage,
                                         eventCategoryLocation.TileX, eventCategoryLocation.TileZ,
                                         eventCategoryLocation.X, 0, eventCategoryLocation.Z,
-                                        index);
-                                    TrackDB.TrItemTable[index] = eventItem;
+                                        (uint)index);
+                                    eventItems.Add(eventItem);
                                     index++;
                                     found = true;
                                 }
@@ -168,9 +145,18 @@ public RouteData(string routePath, MessageDelegate messageDelegate)
                             ActivityNames.Add(activityFile.Tr_Activity.Tr_Activity_Header.Name);
                         }
                     }
-                    catch { }
+                    catch { /* just ignore activity files with problems */ }
                 }
 
+                // extend the track items array and append the event items
+                if (eventItems.Count > 0)
+                {
+                    int oldSize = TrackDB.TrItemTable.Length;
+                    Array.Resize<TrItem>(ref TrackDB.TrItemTable, index);
+                    int newSize = TrackDB.TrItemTable.Length;
+                    int eventSize = eventItems.Count;
+                    for (int toIdx = oldSize, fromIdx = 0; toIdx < newSize && fromIdx < eventSize; toIdx++, fromIdx++) { TrackDB.TrItemTable[toIdx] = eventItems[fromIdx]; }
+                }
             }
         }
 

Source/Contrib/TrackViewer/Editing/Charts/DrawPathChart.cs

@@ -54,6 +54,9 @@ public class DrawPathChart
 
         private bool ChartWindowIsOpen { get { return chartWindow.Visibility == Visibility.Visible; } }
 
+        // save window title from properies, so that the window's title can be changed when the selected path is changed
+        private readonly String WindowTitle;
+
         /// <summary>
         /// Constructor
         /// </summary>
@@ -64,6 +67,7 @@ public DrawPathChart()
                 OnJsonSaveClick = OnJsonSave
             };
             TrackViewer.Localize(chartWindow);
+            if (WindowTitle == null) WindowTitle = chartWindow.Title;
         }
 
         /// <summary>
@@ -113,6 +117,7 @@ public void Open()
             {   // it path is broken, OnPathChanged performed a close
                 return;
             }
+            chartWindow.Title = String.Format("{0}: {1}", WindowTitle, pathEditor.CurrentTrainPath.PathName);
             chartWindow.Show();
 
         }
@@ -160,6 +165,7 @@ private void OnPathChanged()
                 return;
             }
             pathData.Update(trainpath);
+            chartWindow.Title = String.Format("{0}: {1}", WindowTitle, pathEditor.CurrentTrainPath.PathName);
             chartWindow.Draw();
         }
 

Source/Documentation/Manual/features-rollingstock.rst

@@ -345,7 +345,7 @@ Detailed spec
    no changes are done to the .eng file.
 2) In such folder there is also an ``ORTSLightGlow.png``, which is maybe more realistic.
 3) adding a line within the .eng file it is possible to select either ORTSLightGlow.png or any other picture
-   with extension ``.png, .jpg, bmp, .gif, .ace, or .dds``.
+   with extension ``.ace`` or ``.dds``.
 
 
    Here an example for the legacy Acela loco::
@@ -357,13 +357,13 @@ Detailed spec
 			      Type	( 1 )
 			      Conditions	(...
 
-  The code first searches for the .png file by building its directory starting from the directory of 
+  The code first searches for the file by building its directory starting from the directory of 
   the .eng file; in this case the line could be e.g.::
 
-           ORTSGraphic ( "ORTSAcelaLightGlow.png" )
+           ORTSGraphic ( "ORTSAcelaLightGlow.dds" )
 
 4) The ``ORTSGraphic`` line can be added also for one or more ``Light()`` blocks. In that case the 
-   .png file is used only for the related Light block. Here an example::
+   file is used only for the related Light block. Here an example::
 
     Light	(
 			comment( Head light outer right bright )
@@ -386,7 +386,7 @@ Detailed spec
 					Elevation ( -50 -50 -50 )
 					)
 				)
-			ORTSGraphic (BigLightGlow.png)
+			ORTSGraphic (BigLightGlow.dds)
     )
 
   OR searches for the file as it does for the general file for all lights, as explained above.

Source/Documentation/Manual/options.rst

@@ -863,21 +863,23 @@ are a problem for OR, which has a more sophisticated braking model. The
 problem usually is that the train brakes require a long time to release,
 and in some times do not release at all.
 
-.. index::
-   single: AirBrakesAirCompressorPowerRating
-
 The following checks and corrections are performed if the option is
-checked (only for single-pipe brake system):
+checked:
 
 - if the compressor restart pressure is smaller or very near to the max
   system pressure, the compressor restart pressure and if necessary the max
-  main reservoir pressure are increased;
+  main reservoir pressure are increased (single pipe air brakes only)
 - if the main reservoir volume is smaller than 0.3 m\ :sup:`3` and the
   engine mass is higher than 20 tons, the reservoir volume is raised to 0.78
-  m\ :sup:`3`;
-- the charging rate of the reservoir is derived from the .eng parameter
-  ``AirBrakesAirCompressorPowerRating`` (if this generates a value greater
-  than 0.5 psi/s) instead of using a default value.
+  m\ :sup:`3`
+- the maximum brake cylinder pressure will be reduced to the maximum pressure
+  possible from a full service train brake application if it was set above this
+  amount
+- any brake pipe leakage specified by ``TrainPipeLeakRate`` is limited to 2.5 psi/minute
+- the dynamic brake delay on electric locomotives is reduced to 2 seconds
+  if it was defined to be above 4 seconds
+- dynamic brake force left at the default value of 20kN will be increased to
+  half the locomotive's continuous force, or 150kN, whichever is lower
 
 For a full list of parameters, see :ref:`Developing ORTS Content - Parameters and Tokens<parameters_and_tokens>`