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

Merge pull request #1589 from SiboVG/issue-411

Browse Source 
[#411] Improvements to scale dialog
This commit is contained in:
SiboVG 2022-08-14 22:54:14 +02:00 committed by GitHub
commit 8b91342f55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
swing/src/net/sf/openrocket/gui/dialogs/ScaleDialog.java
View File

@ -193,6 +193,7 @@ public class ScaleDialog extends JDialog {
private final DoubleModel multiplier = new DoubleModel(1.0, UnitGroup.UNITS_RELATIVE, SCALE_MIN, SCALE_MAX);
private UnitSelector multiplierUnit;
private final DoubleModel fromField = new DoubleModel(0, UnitGroup.UNITS_LENGTH, 0);
private final DoubleModel toField = new DoubleModel(0, UnitGroup.UNITS_LENGTH, 0);
@ -382,11 +383,11 @@ public class ScaleDialog extends JDialog {
JSpinner spin = new JSpinner(multiplier.getSpinnerModel());
spin.setEditor(new SpinnerEditor(spin));
spin.setToolTipText(tip);
panel.add(spin, "w :30lp:65lp");
panel.add(spin, "wmin 40lp, growx 1000");
UnitSelector unit = new UnitSelector(multiplier);
unit.setToolTipText(tip);
panel.add(unit, "w 30lp");
multiplierUnit = new UnitSelector(multiplier);
multiplierUnit.setToolTipText(tip);
panel.add(multiplierUnit, "w 30lp");
BasicSlider slider = new BasicSlider(multiplier.getSliderModel(0.25, 1.0, 4.0));
slider.setToolTipText(tip);
panel.add(slider, "w 100lp, growx, wrap para");
@ -401,9 +402,9 @@ public class ScaleDialog extends JDialog {
spin = new JSpinner(fromField.getSpinnerModel());
spin.setEditor(new SpinnerEditor(spin));
spin.setToolTipText(tip);
panel.add(spin, "span, split, w :30lp:65lp");
unit = new UnitSelector(fromField);
panel.add(spin, "span, split, wmin 40lp, growx 1000");
UnitSelector unit = new UnitSelector(fromField);
unit.setToolTipText(tip);
panel.add(unit, "w 30lp");
@ -414,7 +415,7 @@ public class ScaleDialog extends JDialog {
spin = new JSpinner(toField.getSpinnerModel());
spin.setEditor(new SpinnerEditor(spin));
spin.setToolTipText(tip);
panel.add(spin, "w :30lp:65lp");
panel.add(spin, "wmin 40lp, growx 1000");
unit = new UnitSelector(toField);
unit.setToolTipText(tip);
@ -481,7 +482,11 @@ public class ScaleDialog extends JDialog {
private void doScale() {
double mul = multiplier.getValue();
if (!(SCALE_MIN <= mul && mul <= SCALE_MAX)) {
Application.getExceptionHandler().handleErrorCondition("Illegal multiplier value, mul=" + mul);
if (multiplierUnit == null) {
Application.getExceptionHandler().handleErrorCondition("Illegal multiplier value, mul=" + mul);
} else {
Application.getExceptionHandler().handleErrorCondition("Illegal multiplier value, mul=" + multiplierUnit.getSelectedUnit().toStringUnit(mul));
}
return;
}