From 64417ca93c129ee5192b7e3b3d55cbd831dea086 Mon Sep 17 00:00:00 2001 From: Daniel_M_Williams Date: Fri, 23 Oct 2015 16:21:54 -0400 Subject: [PATCH] [minor] Fixed length filter options in Motor Dialog --- .../motor/thrustcurve/MotorFilterPanel.java | 39 +++++++++++-------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorFilterPanel.java b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorFilterPanel.java index e54f686ce..9971c6e19 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorFilterPanel.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorFilterPanel.java @@ -22,6 +22,8 @@ import javax.swing.event.ChangeListener; import javax.swing.event.ListDataEvent; import javax.swing.event.ListDataListener; +import com.itextpdf.text.Font; + import net.miginfocom.swing.MigLayout; import net.sf.openrocket.gui.SpinnerEditor; import net.sf.openrocket.gui.adaptors.DoubleModel; @@ -37,8 +39,6 @@ import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.startup.Application; import net.sf.openrocket.unit.UnitGroup; -import com.itextpdf.text.Font; - public abstract class MotorFilterPanel extends JPanel { private static final Translator trans = Application.getTranslator(); @@ -283,10 +283,28 @@ public abstract class MotorFilterPanel extends JPanel { JSpinner spin = new JSpinner(minimumLength.getSpinnerModel()); spin.setEditor(new SpinnerEditor(spin)); + minimumLength.addChangeListener( new ChangeListener() { + @Override + public void stateChanged(ChangeEvent e) { + lengthSlider.setValueAt(0, (int)(1000* minimumLength.getValue())); + } + }); sub.add(spin, "split 5, growx"); sub.add(new UnitSelector(minimumLength), ""); + + spin = new JSpinner(maximumLength.getSpinnerModel()); + spin.setEditor(new SpinnerEditor(spin)); + maximumLength.addChangeListener( new ChangeListener() { + @Override + public void stateChanged(ChangeEvent e) { + lengthSlider.setValueAt(1, (int) (1000* maximumLength.getValue())); + } + }); + sub.add(spin, "growx"); + sub.add(new UnitSelector(maximumLength), "wrap"); + lengthSlider = new MultiSlider(MultiSlider.HORIZONTAL,0, 1000, 0, 1000); lengthSlider.setBounded(true); // thumbs cannot cross lengthSlider.setMajorTickSpacing(100); @@ -303,22 +321,9 @@ public abstract class MotorFilterPanel extends JPanel { } }); - minimumLength.addChangeListener( new ChangeListener() { - @Override - public void stateChanged(ChangeEvent e) { - lengthSlider.setValueAt(0, (int)(1000* minimumLength.getValue())); - lengthSlider.setValueAt(1, (int) (1000* maximumLength.getValue())); - } + sub.add( lengthSlider, "growx,wrap"); - }); - - sub.add( lengthSlider, "growx"); - - spin = new JSpinner(maximumLength.getSpinnerModel()); - spin.setEditor(new SpinnerEditor(spin)); - sub.add(spin, "growx"); - - sub.add(new UnitSelector(maximumLength), "wrap"); + } this.add(sub, "grow,wrap");