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

Ignore empty simulations in sim table export

Browse Source
This commit is contained in:
SiboVG 2023-03-14 00:14:21 +01:00
parent 14db274d42
commit 1b7213e21f
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/net/sf/openrocket/document/Simulation.java
View File

@ -459,7 +459,7 @@ public class Simulation implements ChangeSource, Cloneable {
/**
* Return true if this simulation contains plottable flight data.
*
* @return
* @return true if this simulation contains plottable flight data.
*/
public boolean hasSimulationData() {
FlightData data = getSimulatedData();
@ -472,6 +472,15 @@ public class Simulation implements ChangeSource, Cloneable {
return true;
}
/**
* Return true if this simulation contains summary flight data.
* @return true if this simulation contains summary flight data.
*/
public boolean hasSummaryData() {
FlightData data = getSimulatedData();
return data != null;
}
/**
* Returns a copy of this simulation suitable for cut/copy/paste operations.
* The rocket refers to the same instance as the original simulation.

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

@ -118,6 +118,11 @@ public class SimulationTableCSVExport {
// Account for sorting... resulting CSV file will be in the same order as shown in the table thanks to this gem.
int idx = simulationTable.convertRowIndexToModel(i);
// Ignore empty simulation
if (!document.getSimulation(idx).hasSummaryData()) {
continue;
}
int nullCnt = 0;
rowColumnElement.clear();