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

Disable delay box when no motor selected

Browse Source
This commit is contained in:
SiboVG 2023-03-08 19:25:07 +01:00
parent da15c59673
commit fcb77082c6
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java
View File

@ -99,6 +99,7 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec
private final JLabel curveSelectionLabel; private final JLabel curveSelectionLabel;
private final JComboBox<MotorHolder> curveSelectionBox; private final JComboBox<MotorHolder> curveSelectionBox;
private final DefaultComboBoxModel<MotorHolder> curveSelectionModel; private final DefaultComboBoxModel<MotorHolder> curveSelectionModel;
private final JLabel ejectionChargeDelayLabel;
private final JComboBox<String> delayBox; private final JComboBox<String> delayBox;
private final JLabel nrOfMotorsLabel; private final JLabel nrOfMotorsLabel;
@ -172,7 +173,8 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec
// Ejection charge delay: // 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<String>(); delayBox = new JComboBox<String>();
delayBox.setEditable(true); delayBox.setEditable(true);
@ -511,11 +513,16 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec
curveSelectionModel.removeAllElements(); curveSelectionModel.removeAllElements();
curveSelectionBox.setEnabled(false); curveSelectionBox.setEnabled(false);
curveSelectionLabel.setEnabled(false); curveSelectionLabel.setEnabled(false);
ejectionChargeDelayLabel.setEnabled(false);
delayBox.setEnabled(false);
motorInformationPanel.clearData(); motorInformationPanel.clearData();
table.clearSelection(); table.clearSelection();
return; return;
} }
ejectionChargeDelayLabel.setEnabled(true);
delayBox.setEnabled(true);
// Check which thrust curves to display // Check which thrust curves to display
List<ThrustCurveMotor> motors = getFilteredCurves(); List<ThrustCurveMotor> motors = getFilteredCurves();
final int index = motors.indexOf(selectedMotor); final int index = motors.indexOf(selectedMotor);
@ -666,9 +673,8 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec
*/ */
private void setDelays(boolean reset) { private void setDelays(boolean reset) {
if (selectedMotor == null) { if (selectedMotor == null) {
//// Plugged //// Display nothing
delayBox.setModel(new DefaultComboBoxModel<String>(new String[] { trans.get("TCMotorSelPan.delayBox.Plugged") })); delayBox.setModel(new DefaultComboBoxModel<>(new String[] {}));
delayBox.setSelectedIndex(0);
} else { } else {
List<Double> delays = selectedMotorSet.getDelays(); List<Double> delays = selectedMotorSet.getDelays();
boolean containsPlugged = delays.contains(Motor.PLUGGED_DELAY); boolean containsPlugged = delays.contains(Motor.PLUGGED_DELAY);