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

Merge branch 'unstable' into SIMFAIL-flight-event

Browse Source
This commit is contained in:
JoePfeiffer 2024-01-10 08:29:50 -07:00
commit 6273c7a7be
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/net/sf/openrocket/rocketcomponent/DeploymentConfiguration.java
View File

@ -41,7 +41,7 @@ public class DeploymentConfiguration implements FlightConfigurableParameter<Depl
@SuppressWarnings("unchecked")
@Override
public boolean isActivationEvent(DeploymentConfiguration config, FlightEvent e, RocketComponent source) {
if (e.getType() != FlightEvent.Type.ALTITUDE)
if ((e.getType() != FlightEvent.Type.ALTITUDE) || (e.getData() == null))
return false;
double alt = config.deployAltitude;
@ -210,4 +210,4 @@ public class DeploymentConfiguration implements FlightConfigurableParameter<Depl
public List<DeploymentConfiguration> getConfigListeners() {
return configListeners;
}
}
}

2
core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java
View File

@ -423,7 +423,7 @@ public class BasicEventSimulationEngine implements SimulationEngine {
ThrustCurveMotor motor = (ThrustCurveMotor) motorState.getMotor();
double[] timePoints = motor.getTimePoints();
for (double point : timePoints) {
currentStatus.addEvent(new FlightEvent(FlightEvent.Type.ALTITUDE, point, event.getSource(), motorState));
currentStatus.addEvent(new FlightEvent(FlightEvent.Type.ALTITUDE, point, event.getSource(), null));
}
// and queue up the burnout for this motor, as well.