hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add simulation abort to sim panel tooltip

Browse Source
This commit is contained in:
JoePfeiffer 2024-01-02 08:37:07 -07:00
parent eb4b02bda4
commit c5f1f011ef
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/resources/l10n/messages.properties
View File

@ -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.noData = No simulation data available.
simpanel.ttip.noWarnings = <font color=\"gray\">No warnings.</font> simpanel.ttip.noWarnings = <font color=\"gray\">No warnings.</font>
simpanel.ttip.warnings = <font color=\"red\">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 simpanel.msg.invalidCopySelection = Invalid copy selection
! SimulationRunDialog ! SimulationRunDialog

9
swing/src/net/sf/openrocket/gui/main/SimulationPanel.java
View File

@ -78,6 +78,7 @@ import net.sf.openrocket.rocketcomponent.ComponentChangeListener;
import net.sf.openrocket.rocketcomponent.FlightConfigurationId; import net.sf.openrocket.rocketcomponent.FlightConfigurationId;
import net.sf.openrocket.rocketcomponent.Rocket; import net.sf.openrocket.rocketcomponent.Rocket;
import net.sf.openrocket.simulation.FlightData; import net.sf.openrocket.simulation.FlightData;
import net.sf.openrocket.simulation.FlightEvent;
import net.sf.openrocket.startup.Application; import net.sf.openrocket.startup.Application;
import net.sf.openrocket.startup.Preferences; import net.sf.openrocket.startup.Preferences;
import net.sf.openrocket.unit.UnitGroup; import net.sf.openrocket.unit.UnitGroup;
@ -779,8 +780,14 @@ public class SimulationPanel extends JPanel {
tip += trans.get("simpanel.ttip.noData"); tip += trans.get("simpanel.ttip.noData");
return tip; 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()) { if (warnings.isEmpty()) {
tip += trans.get("simpanel.ttip.noWarnings"); tip += trans.get("simpanel.ttip.noWarnings");
return tip; return tip;