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

Ignore simulation time steps <= 0 when loading ork file.

Browse Source
This commit is contained in:
kruland2607 2012-10-05 16:10:42 -05:00
parent 372bcae9a7
commit d8edf41355
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/net/sf/openrocket/file/openrocket/importt/OpenRocketLoader.java
View File

@ -72,6 +72,7 @@ import net.sf.openrocket.simulation.FlightDataBranch;
import net.sf.openrocket.simulation.FlightDataType; import net.sf.openrocket.simulation.FlightDataType;
import net.sf.openrocket.simulation.FlightEvent; import net.sf.openrocket.simulation.FlightEvent;
import net.sf.openrocket.simulation.FlightEvent.Type; import net.sf.openrocket.simulation.FlightEvent.Type;
import net.sf.openrocket.simulation.RK4SimulationStepper;
import net.sf.openrocket.simulation.SimulationOptions; import net.sf.openrocket.simulation.SimulationOptions;
import net.sf.openrocket.simulation.customexpression.CustomExpression; import net.sf.openrocket.simulation.customexpression.CustomExpression;
import net.sf.openrocket.startup.Application; import net.sf.openrocket.startup.Application;
@ -1494,7 +1495,7 @@ class SimulationConditionsHandler extends AbstractElementHandler {
} else if (element.equals("atmosphere")) { } else if (element.equals("atmosphere")) {
atmosphereHandler.storeSettings(conditions, warnings); atmosphereHandler.storeSettings(conditions, warnings);
} else if (element.equals("timestep")) { } else if (element.equals("timestep")) {
if (Double.isNaN(d)) { if (Double.isNaN(d) || d <= 0 ) {
warnings.add("Illegal time step defined, ignoring."); warnings.add("Illegal time step defined, ignoring.");
} else { } else {
conditions.setTimeStep(d); conditions.setTimeStep(d);