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

Merge branch 'issue-2003' into issue-875

Browse Source
This commit is contained in:
SiboVG 2023-02-12 07:23:46 +00:00
commit 79090ee009
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/net/sf/openrocket/unit/TemperatureUnit.java
View File

@ -4,8 +4,8 @@ public class TemperatureUnit extends FixedPrecisionUnit {
protected final double addition;
public TemperatureUnit(double multiplier, double addition, String unit) {
super(unit, 1, multiplier);
public TemperatureUnit(double multiplier, double addition, double precision, String unit) {
super(unit, precision, multiplier);
this.addition = addition;
}

14
core/src/net/sf/openrocket/unit/UnitGroup.java
View File

@ -257,17 +257,17 @@ public class UnitGroup {
UNITS_ROLL.addUnit(new GeneralUnit(2 * Math.PI / 60, "rpm"));
UNITS_TEMPERATURE = new UnitGroup();
UNITS_TEMPERATURE.addUnit(new FixedPrecisionUnit("K", 1));
UNITS_TEMPERATURE.addUnit(new TemperatureUnit(1, 273.15, DEGREE + "C"));
UNITS_TEMPERATURE.addUnit(new TemperatureUnit(5.0 / 9.0, 459.67, DEGREE + "F"));
UNITS_TEMPERATURE.addUnit(new FixedPrecisionUnit("K", 0.01));
UNITS_TEMPERATURE.addUnit(new TemperatureUnit(1, 273.15, 0.01, DEGREE + "C"));
UNITS_TEMPERATURE.addUnit(new TemperatureUnit(5.0 / 9.0, 459.67, 0.01, DEGREE + "F"));
UNITS_PRESSURE = new UnitGroup();
UNITS_PRESSURE.addUnit(new FixedPrecisionUnit("mbar", 1, 1.0e2));
UNITS_PRESSURE.addUnit(new FixedPrecisionUnit("mbar", 0.01, 1.0e2));
UNITS_PRESSURE.addUnit(new FixedPrecisionUnit("bar", 0.001, 1.0e5));
UNITS_PRESSURE.addUnit(new FixedPrecisionUnit("atm", 0.001, 1.01325e5));
UNITS_PRESSURE.addUnit(new GeneralUnit(101325.0 / 760.0, "mmHg"));
UNITS_PRESSURE.addUnit(new GeneralUnit(3386.389, "inHg"));
UNITS_PRESSURE.addUnit(new GeneralUnit(6894.75729, "psi"));
UNITS_PRESSURE.addUnit(new FixedPrecisionUnit("mmHg", 0.01, 101325.0 / 760.0));
UNITS_PRESSURE.addUnit(new FixedPrecisionUnit("inHg", 0.01, 3386.389));
UNITS_PRESSURE.addUnit(new FixedPrecisionUnit("psi", 0.01, 6894.75729));
UNITS_PRESSURE.addUnit(new GeneralUnit(1, "Pa"));
UNITS_RELATIVE = new UnitGroup();

18
swing/src/net/sf/openrocket/gui/dialogs/preferences/LaunchPreferencesPanel.java
View File

@ -179,7 +179,7 @@ public class LaunchPreferencesPanel extends PreferencesPanel {
// // Temperature and pressure
sub = new JPanel(new MigLayout("fill, gap rel unrel",
"[grow][65lp!][30lp!][75lp!]", ""));
"[grow][75lp!][35lp!][75lp!]", ""));
// // Atmospheric preferences
sub.setBorder(BorderFactory.createTitledBorder(trans
.get("simedtdlg.border.Atmoscond")));
@ -222,7 +222,7 @@ public class LaunchPreferencesPanel extends PreferencesPanel {
spin.setEditor(new SpinnerEditor(spin));
spin.setToolTipText(tip);
isa.addEnableComponent(spin, false);
sub.add(spin, "w 65lp!");
sub.add(spin, "growx");
unit = new UnitSelector(m);
unit.setToolTipText(tip);
@ -249,7 +249,7 @@ public class LaunchPreferencesPanel extends PreferencesPanel {
spin.setEditor(new SpinnerEditor(spin));
spin.setToolTipText(tip);
isa.addEnableComponent(spin, false);
sub.add(spin, "w 65lp!");
sub.add(spin, "growx");
unit = new UnitSelector(m);
unit.setToolTipText(tip);
@ -284,7 +284,7 @@ public class LaunchPreferencesPanel extends PreferencesPanel {
spin = new JSpinner(m.getSpinnerModel());
spin.setEditor(new SpinnerEditor(spin));
spin.setToolTipText(tip);
sub.add(spin, "w 65lp!");
sub.add(spin, "growx");
label = new JLabel(Chars.DEGREE + " " + trans.get("CompassRose.lbl.north"));
label.setToolTipText(tip);
@ -305,7 +305,7 @@ public class LaunchPreferencesPanel extends PreferencesPanel {
spin = new JSpinner(m.getSpinnerModel());
spin.setEditor(new SpinnerEditor(spin));
spin.setToolTipText(tip);
sub.add(spin, "w 65lp!");
sub.add(spin, "growx");
label = new JLabel(Chars.DEGREE + " " + trans.get("CompassRose.lbl.east"));
label.setToolTipText(tip);
@ -328,7 +328,7 @@ public class LaunchPreferencesPanel extends PreferencesPanel {
spin = new JSpinner(m.getSpinnerModel());
spin.setEditor(new SpinnerEditor(spin));
spin.setToolTipText(tip);
sub.add(spin, "w 65lp!");
sub.add(spin, "growx");
unit = new UnitSelector(m);
unit.setToolTipText(tip);
@ -358,7 +358,7 @@ public class LaunchPreferencesPanel extends PreferencesPanel {
spin = new JSpinner(m.getSpinnerModel());
spin.setEditor(new SpinnerEditor(spin));
spin.setToolTipText(tip);
sub.add(spin, "w 65lp!");
sub.add(spin, "growx");
unit = new UnitSelector(m);
unit.setToolTipText(tip);
@ -393,7 +393,7 @@ public class LaunchPreferencesPanel extends PreferencesPanel {
spin = new JSpinner(m.getSpinnerModel());
spin.setEditor(new SpinnerEditor(spin));
spin.setToolTipText(tip);
sub.add(spin, "w 65lp!");
sub.add(spin, "growx");
unit = new UnitSelector(m);
unit.setToolTipText(tip);
@ -421,7 +421,7 @@ public class LaunchPreferencesPanel extends PreferencesPanel {
JSpinner directionSpin = new JSpinner(m.getSpinnerModel());
directionSpin.setEditor(new SpinnerEditor(directionSpin));
directionSpin.setToolTipText(tip);
sub.add(directionSpin, "w 65lp!");
sub.add(directionSpin, "growx");
unit = new UnitSelector(m);
unit.setToolTipText(tip);

6
swing/src/net/sf/openrocket/gui/simulation/SimulationConditionsPanel.java
View File

@ -169,7 +169,7 @@ public class SimulationConditionsPanel extends JPanel {
//// Temperature and pressure
sub = new JPanel(new MigLayout("fill, gap rel unrel",
"[grow][65lp!][30lp!][75lp!]", ""));
"[grow][75lp!][35lp!][75lp!]", ""));
//// Atmospheric conditions
sub.setBorder(BorderFactory.createTitledBorder(trans.get("simedtdlg.border.Atmoscond")));
this.add(sub, "growx, aligny 0, gapright para");
@ -204,7 +204,7 @@ public class SimulationConditionsPanel extends JPanel {
spin.setEditor(new SpinnerEditor(spin));
spin.setToolTipText(tip);
isa.addEnableComponent(spin, false);
sub.add(spin, "w 65lp!");
sub.add(spin, "growx");
unit = new UnitSelector(m);
unit.setToolTipText(tip);
@ -231,7 +231,7 @@ public class SimulationConditionsPanel extends JPanel {
spin.setEditor(new SpinnerEditor(spin));
spin.setToolTipText(tip);
isa.addEnableComponent(spin, false);
sub.add(spin, "w 65lp!");
sub.add(spin, "growx");
unit = new UnitSelector(m);
unit.setToolTipText(tip);