From 22fd01d7fcd378f1a9731ef7df16892cce70c096 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Sat, 25 Feb 2023 01:02:03 +0100 Subject: [PATCH] [#2069] Add motor type to motor details --- core/resources/l10n/messages.properties | 1 + .../dialogs/motor/thrustcurve/MotorInformationPanel.java | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/core/resources/l10n/messages.properties b/core/resources/l10n/messages.properties index 8088c874e..12c64ad7c 100644 --- a/core/resources/l10n/messages.properties +++ b/core/resources/l10n/messages.properties @@ -1384,6 +1384,7 @@ TCMotorSelPan.lbl.Maxthrust = Max. thrust: TCMotorSelPan.lbl.Burntime = Burn time: TCMotorSelPan.lbl.Launchmass = Launch mass: TCMotorSelPan.lbl.Emptymass = Empty mass: +TCMotorSelPan.lbl.Motortype = Motor type: TCMotorSelPan.lbl.Caseinfo = Case info: TCMotorSelPan.lbl.Propinfo = Propellant: TCMotorSelPan.lbl.CompatibleCases = Compatible Cases: diff --git a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorInformationPanel.java b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorInformationPanel.java index 95f7ba0b7..ed0b0806b 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorInformationPanel.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorInformationPanel.java @@ -59,6 +59,7 @@ class MotorInformationPanel extends JPanel { private final JLabel burnTimeLabel; private final JLabel launchMassLabel; private final JLabel emptyMassLabel; + private final JLabel motorTypeLabel; private final JLabel caseInfoLabel; private final JLabel propInfoLabel; private final JLabel dataPointsLabel; @@ -117,6 +118,11 @@ class MotorInformationPanel extends JPanel { emptyMassLabel = new JLabel(); this.add(emptyMassLabel, "wrap"); + //// Motor type + this.add(new JLabel(trans.get("TCMotorSelPan.lbl.Motortype"))); + motorTypeLabel = new JLabel(); + this.add(motorTypeLabel, "wrap"); + //// case info: this.add(new JLabel(trans.get("TCMotorSelPan.lbl.Caseinfo"))); caseInfoLabel = new JLabel(); @@ -239,6 +245,7 @@ class MotorInformationPanel extends JPanel { burnTimeLabel.setText(""); launchMassLabel.setText(""); emptyMassLabel.setText(""); + motorTypeLabel.setText(""); caseInfoLabel.setText(""); propInfoLabel.setText(""); compatibleCasesLabel.setText(""); @@ -279,6 +286,7 @@ class MotorInformationPanel extends JPanel { selectedMotor.getLaunchMass())); emptyMassLabel.setText(UnitGroup.UNITS_MASS.getDefaultUnit().toStringUnit( selectedMotor.getBurnoutMass())); + motorTypeLabel.setText(selectedMotor.getMotorType().getName()); caseInfoLabel.setText(selectedMotor.getCaseInfo()); propInfoLabel.setText(selectedMotor.getPropellantInfo()); compatibleCasesLabel.setText("" + StringUtils.join(", ",selectedMotor.getCompatibleCases()) + "");