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

[fix] Fixed compile issues; Dialog now opens cleanly

Browse Source
This commit is contained in:
Daniel_M_Williams 2020-07-26 16:14:23 -04:00
parent 75c72806f9
commit 28ba049975
5 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/net/sf/openrocket/optimization/rocketoptimization/modifiers/FlightConfigurationModifier.java
View File

@ -70,8 +70,8 @@ public class FlightConfigurationModifier<E extends FlightConfigurableParameter<E
+ " with correct ID"); + " with correct ID");
} }
FlightConfigurableParameterSet<E> configs = (FlightConfigurableParameterSet<E>) configGetter.invoke(c); FlightConfigurableParameterSet<E> configSet = (FlightConfigurableParameterSet<E>) configGetter.invoke(c);
return configs.get(simulation.getRocket().getSelectedConfiguration().getFlightConfigurationID()); return configSet.get(simulation.getRocket().getSelectedConfiguration().getFlightConfigurationID());
} }
} }

10
core/src/net/sf/openrocket/optimization/services/DefaultSimulationModifierService.java
View File

@ -215,7 +215,7 @@ public class DefaultSimulationModifierService implements SimulationModifierServi
trans.get("optimization.modifier.internalcomponent.position"), trans.get("optimization.modifier.internalcomponent.position"),
trans.get("optimization.modifier.internalcomponent.position.desc"), trans.get("optimization.modifier.internalcomponent.position.desc"),
c, UnitGroup.UNITS_LENGTH, c, UnitGroup.UNITS_LENGTH,
1.0, c.getClass(), c.getID(), "AxialMethod"); 1.0, c.getClass(), c.getID(), "AxialOffset");
mod.setMinValue(0); mod.setMinValue(0);
mod.setMaxValue(parent.getLength()); mod.setMaxValue(parent.getLength());
modifiers.add(mod); modifiers.add(mod);
@ -229,7 +229,7 @@ public class DefaultSimulationModifierService implements SimulationModifierServi
trans.get("optimization.modifier.finset.position"), trans.get("optimization.modifier.finset.position"),
trans.get("optimization.modifier.finset.position.desc"), trans.get("optimization.modifier.finset.position.desc"),
c, UnitGroup.UNITS_LENGTH, c, UnitGroup.UNITS_LENGTH,
1.0, c.getClass(), c.getID(), "AxialMethod"); 1.0, c.getClass(), c.getID(), "AxialOffset");
mod.setMinValue(0); mod.setMinValue(0);
mod.setMaxValue(parent.getLength()); mod.setMaxValue(parent.getLength());
modifiers.add(mod); modifiers.add(mod);
@ -243,7 +243,7 @@ public class DefaultSimulationModifierService implements SimulationModifierServi
trans.get("optimization.modifier.launchlug.position"), trans.get("optimization.modifier.launchlug.position"),
trans.get("optimization.modifier.launchlug.position.desc"), trans.get("optimization.modifier.launchlug.position.desc"),
c, UnitGroup.UNITS_LENGTH, c, UnitGroup.UNITS_LENGTH,
1.0, c.getClass(), c.getID(), "AxialMethod"); 1.0, c.getClass(), c.getID(), "AxialOffset");
mod.setMinValue(0); mod.setMinValue(0);
mod.setMaxValue(parent.getLength()); mod.setMaxValue(parent.getLength());
modifiers.add(mod); modifiers.add(mod);
@ -260,7 +260,7 @@ public class DefaultSimulationModifierService implements SimulationModifierServi
1.0, 1.0,
c.getClass(), c.getClass(),
c.getID(), c.getID(),
"DeploymentConfiguration", "DeploymentConfigurations",
DeploymentConfiguration.class, DeploymentConfiguration.class,
"DeployDelay"); "DeployDelay");
@ -276,7 +276,7 @@ public class DefaultSimulationModifierService implements SimulationModifierServi
1.0, 1.0,
c.getClass(), c.getClass(),
c.getID(), c.getID(),
"DeploymentConfiguration", "DeploymentConfigurations",
DeploymentConfiguration.class, DeploymentConfiguration.class,
"DeployAltitude") { "DeployAltitude") {

2
core/src/net/sf/openrocket/rocketcomponent/RecoveryDevice.java
View File

@ -84,7 +84,7 @@ public abstract class RecoveryDevice extends MassObject implements FlightConfigu
clearPreset(); clearPreset();
fireComponentChangeEvent(ComponentChangeEvent.MASS_CHANGE); fireComponentChangeEvent(ComponentChangeEvent.MASS_CHANGE);
} }
public FlightConfigurableParameterSet<DeploymentConfiguration> getDeploymentConfigurations() { public FlightConfigurableParameterSet<DeploymentConfiguration> getDeploymentConfigurations() {
return deploymentConfigurations; return deploymentConfigurations;
} }

9
swing/src/net/sf/openrocket/gui/dialogs/optimization/GeneralOptimizationDialog.java
View File

@ -138,7 +138,7 @@ public class GeneralOptimizationDialog extends JDialog {
private final DescriptionArea selectedModifierDescription; private final DescriptionArea selectedModifierDescription;
private final SimulationModifierTree availableModifierTree; private final SimulationModifierTree availableModifierTree;
private final JComboBox<String> simulationSelectionCombo; private final JComboBox<Named<Simulation>> simulationSelectionCombo;
private final JComboBox<Named<OptimizableParameter>> optimizationParameterCombo; private final JComboBox<Named<OptimizableParameter>> optimizationParameterCombo;
private final JComboBox<?> optimizationGoalCombo; private final JComboBox<?> optimizationGoalCombo;
@ -378,7 +378,7 @@ public class GeneralOptimizationDialog extends JDialog {
disableComponents.add(label); disableComponents.add(label);
sub.add(label, ""); sub.add(label, "");
simulationSelectionCombo = new JComboBox<String>(); simulationSelectionCombo = new JComboBox<Named<Simulation>>();
simulationSelectionCombo.setToolTipText(tip); simulationSelectionCombo.setToolTipText(tip);
populateSimulations(); populateSimulations();
simulationSelectionCombo.addActionListener(clearHistoryActionListener); simulationSelectionCombo.addActionListener(clearHistoryActionListener);
@ -976,9 +976,8 @@ public class GeneralOptimizationDialog extends JDialog {
Simulation sim = new Simulation(rocket); Simulation sim = new Simulation(rocket);
String name = createSimulationName(trans.get("noSimulationName"), descriptor.format(rocket, null)); String name = createSimulationName(trans.get("noSimulationName"), descriptor.format(rocket, null));
simulations.add(new Named<Simulation>(sim, name)); simulations.add(new Named<Simulation>(sim, name));
simulationSelectionCombo.setModel(new DefaultComboBoxModel<Named<Simulation>>(new Vector<>(simulations)));
simulationSelectionCombo.setModel(new DefaultComboBoxModel<String>((String[])simulations.toArray()));
simulationSelectionCombo.setSelectedIndex(0); simulationSelectionCombo.setSelectedIndex(0);
if (current != null) { if (current != null) {
for (int i = 0; i < simulations.size(); i++) { for (int i = 0; i < simulations.size(); i++) {

23
swing/src/net/sf/openrocket/gui/main/BasicFrame.java
View File

@ -708,18 +708,17 @@ public class BasicFrame extends JFrame {
}); });
menu.add(item); menu.add(item);
// TODO: reimplement this dialog //// Optimize
// //// Optimize item = new JMenuItem(trans.get("main.menu.analyze.optimization"), KeyEvent.VK_O);
// item = new JMenuItem(trans.get("main.menu.analyze.optimization"), KeyEvent.VK_O); item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.analyze.optimization.desc"));
// item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.analyze.optimization.desc")); item.addActionListener(new ActionListener() {
// item.addActionListener(new ActionListener() { @Override
// @Override public void actionPerformed(ActionEvent e) {
// public void actionPerformed(ActionEvent e) { log.info(Markers.USER_MARKER, "Rocket optimization selected");
// log.info(Markers.USER_MARKER, "Rocket optimization selected"); new GeneralOptimizationDialog(document, BasicFrame.this).setVisible(true);
// new GeneralOptimizationDialog(document, BasicFrame.this).setVisible(true); }
// } });
// }); menu.add(item);
// menu.add(item);
//// Custom expressions //// Custom expressions
item = new JMenuItem(trans.get("main.menu.analyze.customExpressions"), KeyEvent.VK_E); item = new JMenuItem(trans.get("main.menu.analyze.customExpressions"), KeyEvent.VK_E);