From 84b1434f090409ec246a2dfa77598be2df13a0ed Mon Sep 17 00:00:00 2001 From: SiboVG Date: Sat, 24 Aug 2024 00:20:02 +0200 Subject: [PATCH] Set PlotPanel domain axis after selector change --- .../swing/gui/dialogs/componentanalysis/CAPlotPanel.java | 7 +++++++ .../ComponentAnalysisPlotExportDialog.java | 7 ++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/componentanalysis/CAPlotPanel.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/componentanalysis/CAPlotPanel.java index 2c6af08fc..6bf10d523 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/componentanalysis/CAPlotPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/componentanalysis/CAPlotPanel.java @@ -70,6 +70,13 @@ public class CAPlotPanel extends PlotPanel 0 || type == null) + return; + configuration.setDomainAxisType(type); + setToCustom(); + } + @Override protected void setDefaultConfiguration(CAPlotConfiguration newConfiguration) { super.setDefaultConfiguration(newConfiguration); diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/componentanalysis/ComponentAnalysisPlotExportDialog.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/componentanalysis/ComponentAnalysisPlotExportDialog.java index c2431256c..192eeb168 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/componentanalysis/ComponentAnalysisPlotExportDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/componentanalysis/ComponentAnalysisPlotExportDialog.java @@ -167,7 +167,8 @@ public class ComponentAnalysisPlotExportDialog extends JDialog { parameterSelector.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - updateModels(getSelectedParameter()); + CADomainDataType type = getSelectedParameter(); + updateModels(type); minSpinner.setModel(minModel.getSpinnerModel()); maxSpinner.setModel(maxModel.getSpinnerModel()); deltaSpinner.setModel(deltaModel.getSpinnerModel()); @@ -181,6 +182,10 @@ public class ComponentAnalysisPlotExportDialog extends JDialog { minUnitSelector.setSelectedUnit(minModel.getCurrentUnit()); maxUnitSelector.setSelectedUnit(maxModel.getCurrentUnit()); deltaUnitSelector.setSelectedUnit(deltaModel.getCurrentUnit()); + + if (plotTab != null) { + plotTab.setXAxis(type); + } } });