From f5c0ee5b17413de8e2a1ca5ec3c9151171f726bc Mon Sep 17 00:00:00 2001
From: JoePfeiffer <joseph@pfeifferfamily.net>
Date: Sat, 28 Sep 2024 13:00:01 -0600
Subject: [PATCH] Make sure lower branch numbered icons are on top of higher
 numbered, so tooltips show correct title

---
 .../info/openrocket/swing/gui/plot/SimulationPlot.java   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/swing/src/main/java/info/openrocket/swing/gui/plot/SimulationPlot.java b/swing/src/main/java/info/openrocket/swing/gui/plot/SimulationPlot.java
index 687d710db..5a9a38031 100644
--- a/swing/src/main/java/info/openrocket/swing/gui/plot/SimulationPlot.java
+++ b/swing/src/main/java/info/openrocket/swing/gui/plot/SimulationPlot.java
@@ -123,8 +123,9 @@ public class SimulationPlot extends Plot<FlightDataType, FlightDataBranch, Simul
 		} else {	// Other domains are plotted as image annotations
 			if (branch == -1) {
 				// For icon markers, we need to do the plotting separately, otherwise you can have icon markers from e.g.
-				// branch 1 be plotted on branch 0
-				for (int b = 0; b < simulation.getSimulatedData().getBranchCount(); b++) {
+				// branch 1 be plotted on branch 0.  Also, need to take the branches in reverse order so lower number
+				// branches get their icons put on top of higher number and the tooltip headings are correct.
+				for (int b = simulation.getSimulatedData().getBranchCount() - 1; b >= 0; b--) {
 					fillEventLists(b, eventColors, eventImages, eventSets);
 					dataBranch = simulation.getSimulatedData().getBranch(b);
 					plotIconMarkers(plot, simulation, b, eventImages, eventSets);
@@ -157,9 +158,9 @@ public class SimulationPlot extends Plot<FlightDataType, FlightDataBranch, Simul
 			double separationTime = allBranches.get(i).getSeparationTime();
 			int separationIdx = allBranches.get(i).getDataIndexOfTime(separationTime);
 
-			// If the separation time is after the current data index, the stage is still attached, so add the
+			// If the separation time is at or after the current data index, the stage is still attached, so add the
 			// stage name to the series name
-			if (separationIdx != -1 && separationIdx > dataIdx) {
+			if (separationIdx != -1 && separationIdx >= dataIdx) {
 				newBranchName.append(" + ").append(allBranches.get(i).getName());
 			}
 		}