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

Add unit selectors

Browse Source
This commit is contained in:
SiboVG 2024-08-24 00:07:56 +02:00
parent ae32fa8de2
commit ff56d40583
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
swing/src/main/java/info/openrocket/swing/gui/dialogs/componentanalysis/ComponentAnalysisPlotExportDialog.java
View File

@ -9,6 +9,7 @@ import info.openrocket.core.rocketcomponent.RocketComponent;
import info.openrocket.core.startup.Application; import info.openrocket.core.startup.Application;
import info.openrocket.swing.gui.adaptors.DoubleModel; import info.openrocket.swing.gui.adaptors.DoubleModel;
import info.openrocket.swing.gui.components.EditableSpinner; import info.openrocket.swing.gui.components.EditableSpinner;
import info.openrocket.swing.gui.components.UnitSelector;
import info.openrocket.swing.gui.util.GUIUtil; import info.openrocket.swing.gui.util.GUIUtil;
import net.miginfocom.swing.MigLayout; import net.miginfocom.swing.MigLayout;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -140,13 +141,17 @@ public class ComponentAnalysisPlotExportDialog extends JDialog {
minMaxPanel.add(new JLabel(trans.get("CAPlotExportDialog.lbl.MinValue"))); minMaxPanel.add(new JLabel(trans.get("CAPlotExportDialog.lbl.MinValue")));
final EditableSpinner minSpinner = new EditableSpinner(minModel.getSpinnerModel()); final EditableSpinner minSpinner = new EditableSpinner(minModel.getSpinnerModel());
minSpinner.setToolTipText(trans.get("CAPlotExportDialog.lbl.MinValue.ttip")); minSpinner.setToolTipText(trans.get("CAPlotExportDialog.lbl.MinValue.ttip"));
minMaxPanel.add(minSpinner, "growx, wrap"); minMaxPanel.add(minSpinner, "growx");
final UnitSelector minUnitSelector = new UnitSelector(minModel);
minMaxPanel.add(minUnitSelector, "wrap");
// Max value // Max value
minMaxPanel.add(new JLabel(trans.get("CAPlotExportDialog.lbl.MaxValue"))); minMaxPanel.add(new JLabel(trans.get("CAPlotExportDialog.lbl.MaxValue")));
final EditableSpinner maxSpinner = new EditableSpinner(maxModel.getSpinnerModel()); final EditableSpinner maxSpinner = new EditableSpinner(maxModel.getSpinnerModel());
maxSpinner.setToolTipText(trans.get("CAPlotExportDialog.lbl.MaxValue.ttip")); maxSpinner.setToolTipText(trans.get("CAPlotExportDialog.lbl.MaxValue.ttip"));
minMaxPanel.add(maxSpinner, "growx, wrap"); minMaxPanel.add(maxSpinner, "growx");
final UnitSelector maxUnitSelector = new UnitSelector(maxModel);
minMaxPanel.add(maxUnitSelector, "wrap");
topPanel.add(minMaxPanel, "growx"); topPanel.add(minMaxPanel, "growx");
@ -155,6 +160,8 @@ public class ComponentAnalysisPlotExportDialog extends JDialog {
final EditableSpinner deltaSpinner = new EditableSpinner(deltaModel.getSpinnerModel()); final EditableSpinner deltaSpinner = new EditableSpinner(deltaModel.getSpinnerModel());
deltaSpinner.setToolTipText(trans.get("CAPlotExportDialog.lbl.Delta.ttip")); deltaSpinner.setToolTipText(trans.get("CAPlotExportDialog.lbl.Delta.ttip"));
topPanel.add(deltaSpinner, "top, growx"); topPanel.add(deltaSpinner, "top, growx");
final UnitSelector deltaUnitSelector = new UnitSelector(deltaModel);
topPanel.add(deltaUnitSelector, "top");
// Update the models and spinners when the parameter selector changes // Update the models and spinners when the parameter selector changes
parameterSelector.addActionListener(new ActionListener() { parameterSelector.addActionListener(new ActionListener() {
@ -164,9 +171,16 @@ public class ComponentAnalysisPlotExportDialog extends JDialog {
minSpinner.setModel(minModel.getSpinnerModel()); minSpinner.setModel(minModel.getSpinnerModel());
maxSpinner.setModel(maxModel.getSpinnerModel()); maxSpinner.setModel(maxModel.getSpinnerModel());
deltaSpinner.setModel(deltaModel.getSpinnerModel()); deltaSpinner.setModel(deltaModel.getSpinnerModel());
minUnitSelector.setModel(minModel);
maxUnitSelector.setModel(maxModel);
deltaUnitSelector.setModel(deltaModel);
minSpinner.setValue(minModel.getValue()); minSpinner.setValue(minModel.getValue());
maxSpinner.setValue(maxModel.getValue()); maxSpinner.setValue(maxModel.getValue());
deltaSpinner.setValue(deltaModel.getValue()); deltaSpinner.setValue(deltaModel.getValue());
minUnitSelector.setSelectedUnit(minModel.getCurrentUnit());
maxUnitSelector.setSelectedUnit(maxModel.getCurrentUnit());
deltaUnitSelector.setSelectedUnit(deltaModel.getCurrentUnit());
} }
}); });
@ -214,10 +228,10 @@ public class ComponentAnalysisPlotExportDialog extends JDialog {
if (type == null) { if (type == null) {
throw new IllegalArgumentException("CADomainDataType cannot be null"); throw new IllegalArgumentException("CADomainDataType cannot be null");
} }
this.minModel = new DoubleModel(type, "Min", type.getMin()); this.minModel = new DoubleModel(type, "Min", type.getUnitGroup(), type.getMin());
this.maxModel = new DoubleModel(type, "Max", minModel, type.getMax()); this.maxModel = new DoubleModel(type, "Max", type.getUnitGroup(), minModel, type.getMax());
this.minModel.setMaxModel(maxModel); this.minModel.setMaxModel(maxModel);
this.deltaModel = new DoubleModel(type, "Delta", type.getMinDelta()); this.deltaModel = new DoubleModel(type, "Delta", type.getUnitGroup(), type.getMinDelta());
this.deltaModel.setValue(type.getDelta()); this.deltaModel.setValue(type.getDelta());
} }