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

Make the thrustcurve series labels unique which is required in

Browse Source 
jfreechart 1.0.14.
This commit is contained in:
kruland2607 2012-12-22 14:01:47 -06:00
parent 1c04713131
commit e0b5386513
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorPlotDialog.java
View File

@ -79,7 +79,7 @@ public class ThrustCurveMotorPlotDialog extends JDialog {
// Selected thrust curve // Selected thrust curve
int n = 0; int n = 0;
if (selected >= 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.setSeriesStroke(n, new BasicStroke(1.5f));
renderer.setSeriesPaint(n, ThrustCurveMotorSelectionPanel.getColor(selected)); renderer.setSeriesPaint(n, ThrustCurveMotorSelectionPanel.getColor(selected));
} }
@ -91,7 +91,7 @@ public class ThrustCurveMotorPlotDialog extends JDialog {
continue; continue;
ThrustCurveMotor m = motors.get(i); ThrustCurveMotor m = motors.get(i);
dataset.addSeries(generateSeries(m)); dataset.addSeries(generateSeries(m, i));
renderer.setSeriesStroke(n, new BasicStroke(1.5f)); renderer.setSeriesStroke(n, new BasicStroke(1.5f));
renderer.setSeriesPaint(n, ThrustCurveMotorSelectionPanel.getColor(i)); renderer.setSeriesPaint(n, ThrustCurveMotorSelectionPanel.getColor(i));
renderer.setSeriesShape(n, new Rectangle()); renderer.setSeriesShape(n, new Rectangle());
@ -121,8 +121,12 @@ public class ThrustCurveMotorPlotDialog extends JDialog {
} }
private XYSeries generateSeries(ThrustCurveMotor motor) { private XYSeries generateSeries(ThrustCurveMotor motor, int i) {
XYSeries series = new XYSeries(motor.getManufacturer() + " " + motor.getDesignation()); String label = motor.getManufacturer() + " " + motor.getDesignation();
if ( i> 0 ) {
label += " ("+i+")";
}
XYSeries series = new XYSeries(label);
double[] time = motor.getTimePoints(); double[] time = motor.getTimePoints();
double[] thrust = motor.getThrustPoints(); double[] thrust = motor.getThrustPoints();

2
core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java
View File

@ -713,7 +713,7 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec
ThrustCurveMotor m = motors.get(i); ThrustCurveMotor m = motors.get(i);
//// Thrust //// 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[] time = m.getTimePoints();
double[] thrust = m.getThrustPoints(); double[] thrust = m.getThrustPoints();