From c5f1f011ef03122efc14ed887d15ed04a8e3b9ab Mon Sep 17 00:00:00 2001
From: JoePfeiffer <joseph@pfeifferfamily.net>
Date: Tue, 2 Jan 2024 08:37:07 -0700
Subject: [PATCH] Add simulation abort to sim panel tooltip

---
 core/resources/l10n/messages.properties                  | 1 +
 .../src/net/sf/openrocket/gui/main/SimulationPanel.java  | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/core/resources/l10n/messages.properties b/core/resources/l10n/messages.properties
index bd2da08b5..6f96f8711 100644
--- a/core/resources/l10n/messages.properties
+++ b/core/resources/l10n/messages.properties
@@ -634,6 +634,7 @@ simpanel.ttip.notSimulated = <i>Not simulated yet</i><br>Click <i><b>Run simulat
 simpanel.ttip.noData = No simulation data available.
 simpanel.ttip.noWarnings = <font color=\"gray\">No warnings.</font>
 simpanel.ttip.warnings = <font color=\"red\">Warnings:</font>
+simpanel.ttip.simAbort = <font color=\"red\"><i><b>Simulation Abort</b></i></font><br />
 simpanel.msg.invalidCopySelection = Invalid copy selection
 
 ! SimulationRunDialog
diff --git a/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java b/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java
index 2f4f9b84a..291674ed7 100644
--- a/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java
+++ b/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java
@@ -78,6 +78,7 @@ import net.sf.openrocket.rocketcomponent.ComponentChangeListener;
 import net.sf.openrocket.rocketcomponent.FlightConfigurationId;
 import net.sf.openrocket.rocketcomponent.Rocket;
 import net.sf.openrocket.simulation.FlightData;
+import net.sf.openrocket.simulation.FlightEvent;
 import net.sf.openrocket.startup.Application;
 import net.sf.openrocket.startup.Preferences;
 import net.sf.openrocket.unit.UnitGroup;
@@ -779,8 +780,14 @@ public class SimulationPanel extends JPanel {
 			tip += trans.get("simpanel.ttip.noData");
 			return tip;
 		}
-		WarningSet warnings = data.getWarningSet();
 
+		for (int b = 0; b < data.getBranchCount(); b++) {
+			if (data.getBranch(b).getFirstEvent(FlightEvent.Type.SIM_ABORT) != null) {
+				tip += trans.get("simpanel.ttip.simAbort");
+			}
+		}
+		
+		WarningSet warnings = data.getWarningSet();
 		if (warnings.isEmpty()) {
 			tip += trans.get("simpanel.ttip.noWarnings");
 			return tip;