From e0b538651300ba106c9079c96996c130c77ddf05 Mon Sep 17 00:00:00 2001 From: kruland2607 Date: Sat, 22 Dec 2012 14:01:47 -0600 Subject: [PATCH] Make the thrustcurve series labels unique which is required in jfreechart 1.0.14. --- .../thrustcurve/ThrustCurveMotorPlotDialog.java | 12 ++++++++---- .../thrustcurve/ThrustCurveMotorSelectionPanel.java | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorPlotDialog.java b/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorPlotDialog.java index c1ecb7cfb..e5099a8ea 100644 --- a/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorPlotDialog.java +++ b/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorPlotDialog.java @@ -79,7 +79,7 @@ public class ThrustCurveMotorPlotDialog extends JDialog { // Selected thrust curve int n = 0; if (selected >= 0) { - dataset.addSeries(generateSeries(motors.get(selected))); + dataset.addSeries(generateSeries(motors.get(selected),0)); renderer.setSeriesStroke(n, new BasicStroke(1.5f)); renderer.setSeriesPaint(n, ThrustCurveMotorSelectionPanel.getColor(selected)); } @@ -91,7 +91,7 @@ public class ThrustCurveMotorPlotDialog extends JDialog { continue; ThrustCurveMotor m = motors.get(i); - dataset.addSeries(generateSeries(m)); + dataset.addSeries(generateSeries(m, i)); renderer.setSeriesStroke(n, new BasicStroke(1.5f)); renderer.setSeriesPaint(n, ThrustCurveMotorSelectionPanel.getColor(i)); renderer.setSeriesShape(n, new Rectangle()); @@ -121,8 +121,12 @@ public class ThrustCurveMotorPlotDialog extends JDialog { } - private XYSeries generateSeries(ThrustCurveMotor motor) { - XYSeries series = new XYSeries(motor.getManufacturer() + " " + motor.getDesignation()); + private XYSeries generateSeries(ThrustCurveMotor motor, int i) { + String label = motor.getManufacturer() + " " + motor.getDesignation(); + if ( i> 0 ) { + label += " ("+i+")"; + } + XYSeries series = new XYSeries(label); double[] time = motor.getTimePoints(); double[] thrust = motor.getThrustPoints(); diff --git a/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java b/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java index b2f7ecb07..aaa19b633 100644 --- a/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java +++ b/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java @@ -713,7 +713,7 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec ThrustCurveMotor m = motors.get(i); //// Thrust - XYSeries series = new XYSeries(trans.get("TCMotorSelPan.title.Thrust")); + XYSeries series = new XYSeries(trans.get("TCMotorSelPan.title.Thrust") + " (" + i + ")"); double[] time = m.getTimePoints(); double[] thrust = m.getThrustPoints();