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

Create default sim if no sims present

Browse Source
This commit is contained in:
SiboVG 2023-04-01 16:05:56 +02:00
parent d0102fde0e
commit 215080e0c9
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/net/sf/openrocket/file/rasaero/export/SimulationDTO.java
View File

@ -120,14 +120,16 @@ public class SimulationDTO {
*/ */
public SimulationDTO(Rocket rocket, Simulation simulation, Map<AxialStage, MotorMount> mounts, List<ThrustCurveMotor> motors, public SimulationDTO(Rocket rocket, Simulation simulation, Map<AxialStage, MotorMount> mounts, List<ThrustCurveMotor> motors,
WarningSet warnings, ErrorSet errors) { WarningSet warnings, ErrorSet errors) {
FlightConfigurationId fcid = simulation.getFlightConfigurationId(); String simulationName = simulation != null ? simulation.getName() : "DEFAULT";
if (fcid == null) { FlightConfigurationId fcid = simulation != null ? simulation.getFlightConfigurationId() : null;
warnings.add(String.format("Empty simulation '%s', ignoring.", simulation.getName()));
if (simulation != null && fcid == null) {
warnings.add(String.format("Empty simulation '%s', ignoring.", simulationName));
return; return;
} }
if (mounts.isEmpty()) { if (mounts.isEmpty()) {
warnings.add(String.format("No motors found in simulation '%s', ignoring.", simulation.getName())); warnings.add(String.format("No motors found in simulation '%s', ignoring.", simulationName));
return; return;
} }
@ -242,7 +244,7 @@ public class SimulationDTO {
// Invalid // Invalid
default: default:
errors.add(String.format("Invalid stage number '%d' for simulation '%s'", errors.add(String.format("Invalid stage number '%d' for simulation '%s'",
stageNr, simulation.getName())); stageNr, simulationName));
} }
} }
} }

6
core/src/net/sf/openrocket/file/rasaero/export/SimulationListDTO.java
View File

@ -78,10 +78,16 @@ public class SimulationListDTO {
// Load all RASAero motors // Load all RASAero motors
List<ThrustCurveMotor> motors = RASAeroMotorsLoader.loadAllRASAeroMotors(warnings); List<ThrustCurveMotor> motors = RASAeroMotorsLoader.loadAllRASAeroMotors(warnings);
// Add all the simulations
for (Simulation simulation : document.getSimulations()) { for (Simulation simulation : document.getSimulations()) {
addSimulation(new SimulationDTO(rocket, simulation, mounts, motors, warnings, errors)); addSimulation(new SimulationDTO(rocket, simulation, mounts, motors, warnings, errors));
} }
// If there are no simulations, add a default simulation (to have the mass/CG export)
if (document.getSimulations().size() == 0) {
addSimulation(new SimulationDTO(rocket, null, mounts, motors, warnings, errors));
}
motors.clear(); motors.clear();
} }