From b857da940a996a5ccf88eca9a668245288c9dfdb Mon Sep 17 00:00:00 2001 From: Sibo Van Gool Date: Fri, 3 Sep 2021 00:12:53 +0200 Subject: [PATCH] [fixes #1001] Set 'Separation' tab as first tab + use 'ignition of next stage' as default separation event --- .../rocketcomponent/StageSeparationConfiguration.java | 2 +- .../net/sf/openrocket/gui/configdialog/AxialStageConfig.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/net/sf/openrocket/rocketcomponent/StageSeparationConfiguration.java b/core/src/net/sf/openrocket/rocketcomponent/StageSeparationConfiguration.java index 7ccf99901..91b287347 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/StageSeparationConfiguration.java +++ b/core/src/net/sf/openrocket/rocketcomponent/StageSeparationConfiguration.java @@ -94,7 +94,7 @@ public class StageSeparationConfiguration implements FlightConfigurableParameter private static final Translator trans = Application.getTranslator(); - private SeparationEvent separationEvent = SeparationEvent.NEVER; + private SeparationEvent separationEvent = SeparationEvent.UPPER_IGNITION; private double separationDelay = 0; public SeparationEvent getSeparationEvent() { diff --git a/swing/src/net/sf/openrocket/gui/configdialog/AxialStageConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/AxialStageConfig.java index e932bda52..7c7de6431 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/AxialStageConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/AxialStageConfig.java @@ -31,7 +31,8 @@ public class AxialStageConfig extends ComponentAssemblyConfig { if (component.getStageNumber() > 0) { JPanel tab = separationTab((AxialStage) component); tabbedPane.insertTab(trans.get("StageConfig.tab.Separation"), null, tab, - trans.get("StageConfig.tab.Separation.ttip"), 2); + trans.get("StageConfig.tab.Separation.ttip"), 0); + tabbedPane.setSelectedIndex(0); } }