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

Fix broken plot when selecting a specific stage

Browse Source
This commit is contained in:
NickC25 2024-08-12 21:30:26 -05:00
parent 1fbbea5736
commit 928f56e308
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
swing/src/main/java/info/openrocket/swing/gui/plot/SimulationPlot.java
View File

@ -113,13 +113,14 @@ public class SimulationPlot {
} }
void setShowBranch(int branch) { void setShowBranch(int branch) {
int series = branch + branchCount-1;
XYPlot plot = (XYPlot) chart.getPlot(); XYPlot plot = (XYPlot) chart.getPlot();
int datasetcount = plot.getDatasetCount(); int datasetcount = plot.getDatasetCount();
for (int i = 0; i < datasetcount; i++) { for (int i = 0; i < datasetcount; i++) {
int seriescount = ((XYSeriesCollection) plot.getDataset(i)).getSeriesCount(); int seriescount = ((XYSeriesCollection) plot.getDataset(i)).getSeriesCount();
XYItemRenderer r = ((XYPlot) chart.getPlot()).getRenderer(i); XYItemRenderer r = ((XYPlot) chart.getPlot()).getRenderer(i);
for (int j = 0; j < seriescount; j++) { for (int j = 0; j < seriescount; j++) {
boolean show = (branch < 0) || (j % branchCount == branch); boolean show = (branch < 0) || (j % (2*branchCount-1) == series);
r.setSeriesVisible(j, show); r.setSeriesVisible(j, show);
} }
} }
@ -246,6 +247,9 @@ public class SimulationPlot {
if (numStages > 1) { if (numStages > 1) {
plotyNext = simulation.getSimulatedData().getBranch(numStages - 1).get(type); plotyNext = simulation.getSimulatedData().getBranch(numStages - 1).get(type);
} }
else {
breakpoint = 0; // Start sustainer stage-plotting from the beginning
}
for (int j = breakpoint; j < pointCount; j++) { for (int j = breakpoint; j < pointCount; j++) {
if ( plotyNext != null && !ploty.get(j).equals(plotyNext.get(j)) ) { if ( plotyNext != null && !ploty.get(j).equals(plotyNext.get(j)) ) {