From ce8be058650076a791e0364edd0280b2af44effd Mon Sep 17 00:00:00 2001 From: Sibo Van Gool Date: Sun, 30 Jan 2022 01:27:06 +0100 Subject: [PATCH] [fixes #1088] Open motor selection upon new/copy config --- .../gui/main/flightconfigpanel/FlightConfigurationPanel.java | 2 ++ .../gui/main/flightconfigpanel/MotorConfigurationPanel.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurationPanel.java b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurationPanel.java index 20bd8f5c7..969086d28 100644 --- a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurationPanel.java +++ b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurationPanel.java @@ -82,6 +82,7 @@ public class FlightConfigurationPanel extends JPanel implements StateChangeListe motorConfigurationPanel.table.setColumnSelectionInterval(lastCol, lastCol); configurationChanged(ComponentChangeEvent.MOTOR_CHANGE); configurationChanged(ComponentChangeEvent.NONFUNCTIONAL_CHANGE); // Trigger select + motorConfigurationPanel.selectMotor(); } }); @@ -115,6 +116,7 @@ public class FlightConfigurationPanel extends JPanel implements StateChangeListe addOrCopyConfiguration(true); configurationChanged(ComponentChangeEvent.MOTOR_CHANGE); configurationChanged(ComponentChangeEvent.NONFUNCTIONAL_CHANGE); // Trigger select + motorConfigurationPanel.selectMotor(); } }); this.add(copyConfButton, "wrap"); diff --git a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/MotorConfigurationPanel.java b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/MotorConfigurationPanel.java index 1a86911db..774b01277 100644 --- a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/MotorConfigurationPanel.java +++ b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/MotorConfigurationPanel.java @@ -204,7 +204,7 @@ public class MotorConfigurationPanel extends FlightConfigurablePanel } } - private void selectMotor() { + public void selectMotor() { MotorMount curMount = getSelectedComponent(); FlightConfigurationId fcid= getSelectedConfigurationId(); if ( (null == fcid )||( null == curMount )){