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

Fix unit changes

Browse Source
This commit is contained in:
SiboVG 2024-08-24 01:11:06 +02:00
parent 84b1434f09
commit ebcdc6048b
1 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,8 +2,6 @@ package info.openrocket.swing.gui.dialogs.componentanalysis;
import info.openrocket.core.aerodynamics.AerodynamicCalculator; import info.openrocket.core.aerodynamics.AerodynamicCalculator;
import info.openrocket.core.l10n.Translator; import info.openrocket.core.l10n.Translator;
import info.openrocket.core.rocketcomponent.ComponentAssembly;
import info.openrocket.core.rocketcomponent.FinSet;
import info.openrocket.core.rocketcomponent.Rocket; import info.openrocket.core.rocketcomponent.Rocket;
import info.openrocket.core.rocketcomponent.RocketComponent; import info.openrocket.core.rocketcomponent.RocketComponent;
import info.openrocket.core.startup.Application; import info.openrocket.core.startup.Application;
@ -169,6 +167,8 @@ public class ComponentAnalysisPlotExportDialog extends JDialog {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
CADomainDataType type = getSelectedParameter(); CADomainDataType type = getSelectedParameter();
updateModels(type); updateModels(type);
// Update spinners and unit selectors
minSpinner.setModel(minModel.getSpinnerModel()); minSpinner.setModel(minModel.getSpinnerModel());
maxSpinner.setModel(maxModel.getSpinnerModel()); maxSpinner.setModel(maxModel.getSpinnerModel());
deltaSpinner.setModel(deltaModel.getSpinnerModel()); deltaSpinner.setModel(deltaModel.getSpinnerModel());
@ -176,12 +176,18 @@ public class ComponentAnalysisPlotExportDialog extends JDialog {
maxUnitSelector.setModel(maxModel); maxUnitSelector.setModel(maxModel);
deltaUnitSelector.setModel(deltaModel); deltaUnitSelector.setModel(deltaModel);
minSpinner.setValue(minModel.getValue()); // Ensure the unit selectors show the correct unit
maxSpinner.setValue(maxModel.getValue()); minUnitSelector.invalidate();
deltaSpinner.setValue(deltaModel.getValue()); maxUnitSelector.invalidate();
minUnitSelector.setSelectedUnit(minModel.getCurrentUnit()); deltaUnitSelector.invalidate();
maxUnitSelector.setSelectedUnit(maxModel.getCurrentUnit());
deltaUnitSelector.setSelectedUnit(deltaModel.getCurrentUnit()); // Update the displayed values
minSpinner.setValue(minUnitSelector.getSelectedUnit().toValue(type.getMin()));
maxSpinner.setValue(minUnitSelector.getSelectedUnit().toValue(type.getMax()));
deltaSpinner.setValue(minUnitSelector.getSelectedUnit().toValue(type.getDelta()));
minSpinner.invalidate();
maxSpinner.invalidate();
deltaSpinner.invalidate();
if (plotTab != null) { if (plotTab != null) {
plotTab.setXAxis(type); plotTab.setXAxis(type);
@ -233,11 +239,20 @@ 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.getUnitGroup(), type.getMin());
this.maxModel = new DoubleModel(type, "Max", type.getUnitGroup(), minModel, type.getMax()); // Create new models
this.minModel.setMaxModel(maxModel); this.minModel = new DoubleModel(type, "Min", type.getUnitGroup(), type.getMin(), type.getMax());
this.maxModel = new DoubleModel(type, "Max", type.getUnitGroup(), type.getMin(), type.getMax());
this.deltaModel = new DoubleModel(type, "Delta", type.getUnitGroup(), type.getMinDelta()); this.deltaModel = new DoubleModel(type, "Delta", type.getUnitGroup(), type.getMinDelta());
this.deltaModel.setValue(type.getDelta());
// Set the values and units
minModel.setValue(type.getMin());
maxModel.setValue(type.getMax());
deltaModel.setValue(type.getDelta());
// Set the mutual dependencies
this.minModel.setMaxModel(maxModel);
this.maxModel.setMinModel(minModel);
} }
private void invalidateCache() { private void invalidateCache() {