motor selection enhancements

[debian/openrocket] / src / net / sf / openrocket / gui / dialogs / motor / thrustcurve / ThrustCurveMotorPlotDialog.java

diff --git a/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorPlotDialog.java b/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorPlotDialog.java
index da6fb51658911d55aedd36357bfc2dda5561d2f2..314219a3396bb751bdf1708702eaae0931bacde4 100644 (file)
--- a/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorPlotDialog.java
+++ b/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorPlotDialog.java
@@ -13,7 +13,6 @@ import javax.swing.JDialog;
 import javax.swing.JPanel;
 
 import net.miginfocom.swing.MigLayout;
-import net.sf.openrocket.database.ThrustCurveMotorSet;
 import net.sf.openrocket.motor.ThrustCurveMotor;
 import net.sf.openrocket.unit.UnitGroup;
 import net.sf.openrocket.util.GUIUtil;
@@ -29,7 +28,7 @@ import org.jfree.data.xy.XYSeriesCollection;
 
 public class ThrustCurveMotorPlotDialog extends JDialog {
        
-       public ThrustCurveMotorPlotDialog(ThrustCurveMotorSet motorSet, ThrustCurveMotor selectedMotor, Window parent) {
+       public ThrustCurveMotorPlotDialog(List<ThrustCurveMotor> motors, int selected, Window parent) {
                super(parent, "Motor thrust curves", ModalityType.APPLICATION_MODAL);
                
                JPanel panel = new JPanel(new MigLayout("fill"));
@@ -73,21 +72,19 @@ public class ThrustCurveMotorPlotDialog extends JDialog {
 
                // Create the plot data set
                XYSeriesCollection dataset = new XYSeriesCollection();
-               List<ThrustCurveMotor> motors = motorSet.getMotors();
                
                // Selected thrust curve
-               int index = motors.indexOf(selectedMotor);
                int n = 0;
-               dataset.addSeries(generateSeries(selectedMotor));
-               renderer.setSeriesStroke(n, new BasicStroke(1.5f));
-               if (index >= 0) {
-                       renderer.setSeriesPaint(n, ThrustCurveMotorSelectionPanel.getColor(index));
+               if (selected >= 0) {
+                       dataset.addSeries(generateSeries(motors.get(selected)));
+                       renderer.setSeriesStroke(n, new BasicStroke(1.5f));
+                       renderer.setSeriesPaint(n, ThrustCurveMotorSelectionPanel.getColor(selected));
                }
                n++;
                
                // Other thrust curves
                for (int i = 0; i < motors.size(); i++) {
-                       if (i == index)
+                       if (i == selected)
                                continue;
                        
                        ThrustCurveMotor m = motors.get(i);