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

Merge pull request #2436 from JoePfeiffer/oops-in-2432

Browse Source 
Fix data field in thrustcurve events
This commit is contained in:
Joe Pfeiffer 2024-01-10 08:26:17 -07:00 committed by GitHub
commit ced11d9b6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

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