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

Merge pull request #1810 from SiboVG/issue-1809

Browse Source 
[#1809] Ignore stages with no sim data in plots
This commit is contained in:
Joe Pfeiffer 2022-11-13 16:09:09 -07:00 committed by GitHub
commit 5ba619c8bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swing/src/net/sf/openrocket/gui/plot/PlotConfiguration.java
View File

@ -458,6 +458,10 @@ public class PlotConfiguration implements Cloneable {
double max = unit.toUnit(data.get(0).getMaximum(type));
for (int j = 1; j < data.size(); j++) {
// Ignore empty data
if (data.get(j).getLength() == 0) {
continue;
}
min = Math.min(min, unit.toUnit(data.get(j).getMinimum(type)));
max = Math.max(max, unit.toUnit(data.get(j).getMaximum(type)));
}

9
swing/src/net/sf/openrocket/gui/plot/SimulationPlot.java
View File

@ -193,6 +193,15 @@ public class SimulationPlot {
FlightDataBranch primaryBranch = simulation.getSimulatedData().getBranch(0);
FlightDataBranch thisBranch = simulation.getSimulatedData().getBranch(branchIndex);
// Ignore empty branches
if (thisBranch.getLength() == 0) {
// Add an empty series to keep the series count consistent
XYSeries series = new XYSeries(seriesCount++, false, true);
series.setDescription(thisBranch.getBranchName() + ": " + name);
data[axis].addSeries(series);
continue;
}
// Get first time index used in secondary branch;
double firstSampleTime = thisBranch.get(FlightDataType.TYPE_TIME).get(0);