diff --git a/core/.classpath b/core/.classpath index dd7a75cf8..7407b2ce2 100644 --- a/core/.classpath +++ b/core/.classpath @@ -25,8 +25,6 @@ - - @@ -34,5 +32,7 @@ + + diff --git a/core/lib/jcommon-1.0.17.jar b/core/lib/jcommon-1.0.17.jar deleted file mode 100644 index f1bd165a9..000000000 Binary files a/core/lib/jcommon-1.0.17.jar and /dev/null differ diff --git a/core/lib/jfreechart-1.0.14.jar b/core/lib/jfreechart-1.0.14.jar deleted file mode 100644 index 0e4d020ad..000000000 Binary files a/core/lib/jfreechart-1.0.14.jar and /dev/null differ diff --git a/core/reference/jfreechart-1.0.14-sources.jar b/core/reference/jfreechart-1.0.14-sources.jar deleted file mode 100644 index 1c7f43756..000000000 Binary files a/core/reference/jfreechart-1.0.14-sources.jar and /dev/null differ diff --git a/core/src/net/sf/openrocket/gui/plot/SimulationPlot.java b/core/src/net/sf/openrocket/gui/plot/SimulationPlot.java index 043617a51..1079bdce4 100644 --- a/core/src/net/sf/openrocket/gui/plot/SimulationPlot.java +++ b/core/src/net/sf/openrocket/gui/plot/SimulationPlot.java @@ -145,6 +145,8 @@ public class SimulationPlot { // Get plot length (ignore trailing NaN's) int typeCount = filled.getTypeCount(); + int seriesCount = 0; + // Create the XYSeries objects from the flight data and store into the collections String[] axisLabel = new String[2]; for (int i = 0; i < typeCount; i++) { @@ -165,7 +167,7 @@ public class SimulationPlot { // Store data in provided units List plotx = thisBranch.get(domainType); List ploty = thisBranch.get(type); - XYSeries series = new XYSeries(seriesNames.get(branchIndex) + ": " + name, false, true); + XYSeries series = new XYSeries(seriesCount++, false, true); series.setDescription(name); int pointCount = plotx.size(); for (int j = 0; j < pointCount; j++) { @@ -181,7 +183,7 @@ public class SimulationPlot { // Get first time index used in secondary branch; double firstSampleTime = thisBranch.get(FlightDataType.TYPE_TIME).get(0); - XYSeries series = new XYSeries(seriesNames.get(branchIndex) + ": " + name, false, true); + XYSeries series = new XYSeries(seriesCount++, false, true); series.setDescription(thisBranch.getBranchName() + ": " + name); // Copy the first points from the primaryBranch.