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

Merge branch 'openrocket:unstable' into fix-2278

Browse Source
This commit is contained in:
Joe Pfeiffer 2023-10-15 06:42:21 -06:00 committed by GitHub
commit d8434e8550
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/net/sf/openrocket/simulation/FlightData.java
View File

@ -89,7 +89,6 @@ public class FlightData {
this.launchRodVelocity = launchRodVelocity; this.launchRodVelocity = launchRodVelocity;
this.deploymentVelocity = deploymentVelocity; this.deploymentVelocity = deploymentVelocity;
this.optimumDelay = optimumDelay; this.optimumDelay = optimumDelay;
System.out.println("optimum delay " + optimumDelay);
} }

6
swing/src/net/sf/openrocket/file/SimulationTableCSVExport.java
View File

@ -166,10 +166,8 @@ public class SimulationTableCSVExport {
} }
} }
// Current "unstable" will have a populated sim table EXCEPT for the optimum delay column on a restart // If there are any null columns, need to run the simulation before we can export it
// after a save. That means any row that WAS simulated will have exactly one null column in it... so we'll if (nullCnt > 0) { // ignore rows that have null column fields 1 through 8...
// skip row export for the case where there are MORE than one nulls. Either way the user should run sims.
if (nullCnt > 1) { // ignore rows that have null column fields 1 through 8...
continue; continue;
} }