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

Merge pull request #2075 from SiboVG/issue-2069

Browse Source 
[#2069] Add motor type to motor details
This commit is contained in:
Joe Pfeiffer 2023-02-26 16:03:59 -07:00 committed by GitHub
commit 022a986130
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/resources/l10n/messages.properties
View File

@ -1382,6 +1382,7 @@ TCMotorSelPan.lbl.Maxthrust = Max. thrust:
TCMotorSelPan.lbl.Burntime = Burn time: TCMotorSelPan.lbl.Burntime = Burn time:
TCMotorSelPan.lbl.Launchmass = Launch mass: TCMotorSelPan.lbl.Launchmass = Launch mass:
TCMotorSelPan.lbl.Emptymass = Empty mass: TCMotorSelPan.lbl.Emptymass = Empty mass:
TCMotorSelPan.lbl.Motortype = Motor type:
TCMotorSelPan.lbl.Caseinfo = Case info: TCMotorSelPan.lbl.Caseinfo = Case info:
TCMotorSelPan.lbl.Propinfo = Propellant: TCMotorSelPan.lbl.Propinfo = Propellant:
TCMotorSelPan.lbl.CompatibleCases = Compatible Cases: TCMotorSelPan.lbl.CompatibleCases = Compatible Cases:

8
swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorInformationPanel.java
View File

@ -60,6 +60,7 @@ class MotorInformationPanel extends JPanel {
private final JLabel burnTimeLabel; private final JLabel burnTimeLabel;
private final JLabel launchMassLabel; private final JLabel launchMassLabel;
private final JLabel emptyMassLabel; private final JLabel emptyMassLabel;
private final JLabel motorTypeLabel;
private final JLabel caseInfoLabel; private final JLabel caseInfoLabel;
private final JLabel propInfoLabel; private final JLabel propInfoLabel;
private final JLabel dataPointsLabel; private final JLabel dataPointsLabel;
@ -123,6 +124,11 @@ class MotorInformationPanel extends JPanel {
emptyMassLabel = new JLabel(); emptyMassLabel = new JLabel();
this.add(emptyMassLabel, "wrap"); this.add(emptyMassLabel, "wrap");
//// Motor type
this.add(new JLabel(trans.get("TCMotorSelPan.lbl.Motortype")));
motorTypeLabel = new JLabel();
this.add(motorTypeLabel, "wrap");
//// case info: //// case info:
this.add(new JLabel(trans.get("TCMotorSelPan.lbl.Caseinfo"))); this.add(new JLabel(trans.get("TCMotorSelPan.lbl.Caseinfo")));
caseInfoLabel = new JLabel(); caseInfoLabel = new JLabel();
@ -246,6 +252,7 @@ class MotorInformationPanel extends JPanel {
burnTimeLabel.setText(""); burnTimeLabel.setText("");
launchMassLabel.setText(""); launchMassLabel.setText("");
emptyMassLabel.setText(""); emptyMassLabel.setText("");
motorTypeLabel.setText("");
caseInfoLabel.setText(""); caseInfoLabel.setText("");
propInfoLabel.setText(""); propInfoLabel.setText("");
compatibleCasesLabel.setText(""); compatibleCasesLabel.setText("");
@ -287,6 +294,7 @@ class MotorInformationPanel extends JPanel {
selectedMotor.getLaunchMass())); selectedMotor.getLaunchMass()));
emptyMassLabel.setText(UnitGroup.UNITS_MASS.getDefaultUnit().toStringUnit( emptyMassLabel.setText(UnitGroup.UNITS_MASS.getDefaultUnit().toStringUnit(
selectedMotor.getBurnoutMass())); selectedMotor.getBurnoutMass()));
motorTypeLabel.setText(selectedMotor.getMotorType().getName());
caseInfoLabel.setText(selectedMotor.getCaseInfo()); caseInfoLabel.setText(selectedMotor.getCaseInfo());
propInfoLabel.setText(selectedMotor.getPropellantInfo()); propInfoLabel.setText(selectedMotor.getPropellantInfo());
compatibleCasesLabel.setText("<html>" + StringUtils.join(", ",selectedMotor.getCompatibleCases()) + "<html>"); compatibleCasesLabel.setText("<html>" + StringUtils.join(", ",selectedMotor.getCompatibleCases()) + "<html>");