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

Merge pull request #130 from kruland2607/jfreechart-1.0.15

Browse Source 
Fix for Issue #114
This commit is contained in:
kruland2607 2013-09-04 19:33:31 -07:00
commit 12847a1be9
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/.classpath
View File

@ -25,8 +25,6 @@
<classpathentry kind="lib" path="lib/guice-multibindings-3.0.jar"/> <classpathentry kind="lib" path="lib/guice-multibindings-3.0.jar"/>
<classpathentry kind="lib" path="lib/javax.inject.jar"/> <classpathentry kind="lib" path="lib/javax.inject.jar"/>
<classpathentry kind="lib" path="lib/aopalliance.jar"/> <classpathentry kind="lib" path="lib/aopalliance.jar"/>
<classpathentry kind="lib" path="lib/jcommon-1.0.17.jar"/>
<classpathentry kind="lib" path="lib/jfreechart-1.0.14.jar" sourcepath="reference/jfreechart-1.0.14-sources.jar"/>
<classpathentry kind="lib" path="lib/jogl/gluegen-rt.jar" sourcepath="reference/gluegen-v2.0-rc11-sources.jar"/> <classpathentry kind="lib" path="lib/jogl/gluegen-rt.jar" sourcepath="reference/gluegen-v2.0-rc11-sources.jar"/>
<classpathentry kind="lib" path="lib/jogl/jogl-all.jar" sourcepath="reference/jogl-v2.0-rc11-sources.jar"/> <classpathentry kind="lib" path="lib/jogl/jogl-all.jar" sourcepath="reference/jogl-v2.0-rc11-sources.jar"/>
<classpathentry kind="lib" path="lib-test/test-plugin.jar"/> <classpathentry kind="lib" path="lib-test/test-plugin.jar"/>
@ -34,5 +32,7 @@
<classpathentry kind="lib" path="lib/logback-classic-1.0.12.jar" sourcepath="reference/logback-classic-1.0.12-sources.jar"/> <classpathentry kind="lib" path="lib/logback-classic-1.0.12.jar" sourcepath="reference/logback-classic-1.0.12-sources.jar"/>
<classpathentry kind="lib" path="lib/logback-core-1.0.12.jar" sourcepath="reference/logback-core-1.0.12-sources.jar"/> <classpathentry kind="lib" path="lib/logback-core-1.0.12.jar" sourcepath="reference/logback-core-1.0.12-sources.jar"/>
<classpathentry kind="lib" path="lib/slf4j-api-1.7.5.jar"/> <classpathentry kind="lib" path="lib/slf4j-api-1.7.5.jar"/>
<classpathentry kind="lib" path="lib/jcommon-1.0.18.jar"/>
<classpathentry kind="lib" path="lib/jfreechart-1.0.15.jar" sourcepath="reference/jfreechart-1.0.15-sources.jar"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

BIN
core/lib/jcommon-1.0.17.jar
View File

Binary file not shown.

BIN
core/lib/jfreechart-1.0.14.jar
View File

Binary file not shown.

BIN
core/reference/jfreechart-1.0.14-sources.jar
View File

Binary file not shown.

6
core/src/net/sf/openrocket/gui/plot/SimulationPlot.java
View File

@ -145,6 +145,8 @@ public class SimulationPlot {
// Get plot length (ignore trailing NaN's) // Get plot length (ignore trailing NaN's)
int typeCount = filled.getTypeCount(); int typeCount = filled.getTypeCount();
int seriesCount = 0;
// Create the XYSeries objects from the flight data and store into the collections // Create the XYSeries objects from the flight data and store into the collections
String[] axisLabel = new String[2]; String[] axisLabel = new String[2];
for (int i = 0; i < typeCount; i++) { for (int i = 0; i < typeCount; i++) {
@ -165,7 +167,7 @@ public class SimulationPlot {
// Store data in provided units // Store data in provided units
List<Double> plotx = thisBranch.get(domainType); List<Double> plotx = thisBranch.get(domainType);
List<Double> ploty = thisBranch.get(type); List<Double> ploty = thisBranch.get(type);
XYSeries series = new XYSeries(seriesNames.get(branchIndex) + ": " + name, false, true); XYSeries series = new XYSeries(seriesCount++, false, true);
series.setDescription(name); series.setDescription(name);
int pointCount = plotx.size(); int pointCount = plotx.size();
for (int j = 0; j < pointCount; j++) { for (int j = 0; j < pointCount; j++) {
@ -181,7 +183,7 @@ public class SimulationPlot {
// Get first time index used in secondary branch; // Get first time index used in secondary branch;
double firstSampleTime = thisBranch.get(FlightDataType.TYPE_TIME).get(0); 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); series.setDescription(thisBranch.getBranchName() + ": " + name);
// Copy the first points from the primaryBranch. // Copy the first points from the primaryBranch.