From fcb77082c60cfa4b98f226cadb555cbee6f725d9 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Wed, 8 Mar 2023 19:25:07 +0100 Subject: [PATCH] Disable delay box when no motor selected --- .../ThrustCurveMotorSelectionPanel.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java index 129f01816..eebbbe927 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java @@ -99,6 +99,7 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec private final JLabel curveSelectionLabel; private final JComboBox curveSelectionBox; private final DefaultComboBoxModel curveSelectionModel; + private final JLabel ejectionChargeDelayLabel; private final JComboBox delayBox; private final JLabel nrOfMotorsLabel; @@ -172,7 +173,8 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec // Ejection charge delay: { - panel.add(new JLabel(trans.get("TCMotorSelPan.lbl.Ejectionchargedelay"))); + ejectionChargeDelayLabel = new JLabel(trans.get("TCMotorSelPan.lbl.Ejectionchargedelay")); + panel.add(ejectionChargeDelayLabel); delayBox = new JComboBox(); delayBox.setEditable(true); @@ -511,11 +513,16 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec curveSelectionModel.removeAllElements(); curveSelectionBox.setEnabled(false); curveSelectionLabel.setEnabled(false); + ejectionChargeDelayLabel.setEnabled(false); + delayBox.setEnabled(false); motorInformationPanel.clearData(); table.clearSelection(); return; } + ejectionChargeDelayLabel.setEnabled(true); + delayBox.setEnabled(true); + // Check which thrust curves to display List motors = getFilteredCurves(); final int index = motors.indexOf(selectedMotor); @@ -666,9 +673,8 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec */ private void setDelays(boolean reset) { if (selectedMotor == null) { - //// Plugged - delayBox.setModel(new DefaultComboBoxModel(new String[] { trans.get("TCMotorSelPan.delayBox.Plugged") })); - delayBox.setSelectedIndex(0); + //// Display nothing + delayBox.setModel(new DefaultComboBoxModel<>(new String[] {})); } else { List delays = selectedMotorSet.getDelays(); boolean containsPlugged = delays.contains(Motor.PLUGGED_DELAY);