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

[#2345] Reintroduce motor ignition delay optimization

Browse Source
This commit is contained in:
SiboVG 2023-11-19 03:40:41 +01:00
parent 6c89a3c601
commit 8f4ccd747a
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,6 +10,7 @@ import java.util.Map;
import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.document.OpenRocketDocument;
import net.sf.openrocket.document.Simulation; import net.sf.openrocket.document.Simulation;
import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.motor.MotorConfiguration;
import net.sf.openrocket.optimization.general.OptimizationException; import net.sf.openrocket.optimization.general.OptimizationException;
import net.sf.openrocket.optimization.rocketoptimization.SimulationModifier; import net.sf.openrocket.optimization.rocketoptimization.SimulationModifier;
import net.sf.openrocket.optimization.rocketoptimization.modifiers.FlightConfigurationModifier; import net.sf.openrocket.optimization.rocketoptimization.modifiers.FlightConfigurationModifier;
@ -181,6 +182,7 @@ public class DefaultSimulationModifierService implements SimulationModifierServi
MotorMount mount = (MotorMount) c; MotorMount mount = (MotorMount) c;
if (mount.isMotorMount()) { if (mount.isMotorMount()) {
// Motor overhang
SimulationModifier mod = new GenericComponentModifier( SimulationModifier mod = new GenericComponentModifier(
trans.get("optimization.modifier.motormount.overhang"), trans.get("optimization.modifier.motormount.overhang"),
trans.get("optimization.modifier.motormount.overhang.desc"), trans.get("optimization.modifier.motormount.overhang.desc"),
@ -189,21 +191,17 @@ public class DefaultSimulationModifierService implements SimulationModifierServi
setDefaultMinMax(mod, simulation); setDefaultMinMax(mod, simulation);
modifiers.add(mod); modifiers.add(mod);
// TODO: reimplement motor ignition optimization // Motor ignition delay
// mod = new FlightConfigurationModifier<MotorInstance>( mod = new FlightConfigurationModifier<MotorConfiguration>(
// trans.get("optimization.modifier.motormount.delay"), trans.get("optimization.modifier.motormount.delay"),
// trans.get("optimization.modifier.motormount.delay.desc"), trans.get("optimization.modifier.motormount.delay.desc"),
// c, UnitGroup.UNITS_SHORT_TIME, c, UnitGroup.UNITS_SHORT_TIME,
// 1.0, 1.0, c.getClass(), c.getID(), "MotorConfigurationSet",
// c.getClass(), MotorConfiguration.class,
// c.getID(), "IgnitionDelay");
// "IgnitionConfiguration", mod.setMinValue(0);
// IgnitionConfiguration.class, mod.setMaxValue(5);
// "IgnitionDelay"); modifiers.add(mod);
//
// mod.setMinValue(0);
// mod.setMaxValue(5);
// modifiers.add(mod);
} }
} }