Add linear fuel editor

diff --git a/gui/com/billkuker/rocketry/motorsim/visual/workbench/LinearFuelEditor.java b/gui/com/billkuker/rocketry/motorsim/visual/workbench/LinearFuelEditor.java
new file mode 100644 (file)
index 0000000..3a317c8
--- /dev/null
+++ b/gui/com/billkuker/rocketry/motorsim/visual/workbench/LinearFuelEditor.java
@@ -0,0 +1,192 @@
+package com.billkuker.rocketry.motorsim.visual.workbench;
+
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.beans.PropertyChangeEvent;
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
+import java.util.Collections;
+import java.util.Vector;
+
+import javax.measure.quantity.Pressure;
+import javax.measure.quantity.Velocity;
+import javax.measure.unit.SI;
+import javax.swing.ButtonGroup;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.JScrollPane;
+import javax.swing.JSplitPane;
+import javax.swing.JTable;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import javax.swing.table.AbstractTableModel;
+
+import org.jscience.physics.amount.Amount;
+
+import com.billkuker.rocketry.motorsim.RocketScience;
+import com.billkuker.rocketry.motorsim.fuel.PiecewiseLinearFuel;
+import com.billkuker.rocketry.motorsim.fuel.SaintRobertFuel;
+import com.billkuker.rocketry.motorsim.fuel.SaintRobertFuel.Type;
+
+public class LinearFuelEditor extends AbstractFuelEditor {
+       private static final long serialVersionUID = 1L;
+
+       private static final NumberFormat nf = new DecimalFormat("##########.###");
+
+       private class Entry implements Comparable<Entry> {
+               Amount<Pressure> p = Amount.valueOf(0, RocketScience.UnitPreference.getUnitPreference().getPreferredUnit(RocketScience.PSI));
+               Amount<Velocity> v = Amount.valueOf(0, RocketScience.UnitPreference.getUnitPreference().getPreferredUnit(SI.METERS_PER_SECOND));
+
+               @Override
+               public int compareTo(Entry o) {
+                       return p.compareTo(o.p);
+               }
+       }
+
+       private class TM extends AbstractTableModel {
+               private static final long serialVersionUID = 1L;
+
+               @Override
+               public int getColumnCount() {
+                       return 2;
+               }
+
+               @Override
+               public int getRowCount() {
+                       return entries.size();
+               }
+
+               @Override
+               public String getColumnName(int col) {
+                       switch (col) {
+                       case 0:
+                               return "Pressure";
+                       case 1:
+                               return "Burn Rate";
+                       }
+                       return null;
+               }
+
+               @Override
+               public Object getValueAt(int rowIndex, int columnIndex) {
+                       Entry e = entries.get(rowIndex);
+                       switch (columnIndex) {
+                       case 0:
+                               return RocketScience.ammountToString(e.p);
+                       case 1:
+                               return RocketScience.ammountToString(e.v);
+                       }
+                       return null;
+               }
+
+               public boolean isCellEditable(int row, int col) {
+                       return true;
+               }
+
+               @SuppressWarnings("unchecked")
+               public void setValueAt(Object value, int row, int col) {
+                       Entry e = entries.get(row);
+                       try {
+                               switch (col) {
+                               case 0:
+                                       try {
+                                               e.p = (Amount<Pressure>) Amount.valueOf((String) value);
+                                       } catch ( Exception ee ){
+                                               double d = Double.parseDouble((String)value);
+                                               e.p = (Amount<Pressure>)Amount.valueOf(d, e.p.getUnit());
+                                       }
+                                       break;
+                               case 1:
+                                       try {
+                                               e.v = (Amount<Velocity>) Amount.valueOf((String) value);
+                                       } catch ( Exception ee ){
+                                               double d = Double.parseDouble((String)value);
+                                               e.v = (Amount<Velocity>)Amount.valueOf(d, e.v.getUnit());
+                                       }
+                                       break;
+                               }
+                       } catch (Exception ex) {
+                               ex.printStackTrace();
+                       }
+                       Collections.sort(entries);
+                       fireTableDataChanged();
+                       //f = new EditablePSRFuel(SaintRobertFuel.Type.NONSI);
+                       f.clear();
+                       for (Entry en : entries) {
+                               f.add(en.p, en.v);
+                       }
+                       f.firePropertyChange(new PropertyChangeEvent(f,"entries", null, null));
+
+                       update();
+
+               }
+
+               @Override
+               public void fireTableDataChanged() {
+                       super.fireTableDataChanged();
+               }
+
+       };
+       
+       private Vector<Entry> entries = new Vector<Entry>();
+       JPanel controls;
+       final PiecewiseLinearFuel f;
+
+       public LinearFuelEditor() {
+               
+               super( new PiecewiseLinearFuel() );
+               
+               this.f = (PiecewiseLinearFuel)getFuel();
+               
+       }
+       
+       protected  Component getBurnrateEditComponent(){
+               final TM tm = new TM();
+
+               JSplitPane editBottom = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
+               
+
+               JTable table = new JTable(tm);
+               JScrollPane scrollpane = new JScrollPane(table);
+               scrollpane.setMinimumSize(new Dimension(200, 200));
+               editBottom.setTopComponent(scrollpane);
+
+               
+               JButton add = new JButton("Add Data");
+               add.addActionListener(new ActionListener() {
+                       @Override
+                       public void actionPerformed(ActionEvent e) {
+                               entries.add(new Entry());
+                               tm.fireTableDataChanged();
+                       }
+               });
+               controls = new JPanel();
+               controls.setPreferredSize(new Dimension(200, 50));
+               controls.setLayout(new FlowLayout());
+                       
+               controls.add(add);
+               
+               editBottom.setBottomComponent(controls);
+               
+               
+
+               editBottom.setDividerLocation(.8);
+               
+               return editBottom;
+       }
+
+       public static void main(String args[]) {
+               JFrame f = new JFrame();
+               f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+               f.setContentPane(new LinearFuelEditor());
+               f.setSize(800, 600);
+               f.setVisible(true);
+
+       }
+
+}

diff --git a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorWorkbench.java b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorWorkbench.java
index aa3b853b7c5c9695910a7a3fa84828781474fc69..fa7aa8e0875b0e6bab46e96385663bc443286b4f 100644 (file)
--- a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorWorkbench.java
+++ b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorWorkbench.java
@@ -245,7 +245,18 @@ public class MotorWorkbench extends JFrame implements TreeSelectionListener {
 \r
                                                                        }\r
                                                                });\r
-                                                               add(new JMenuItem("Linear"));\r
+                                                               add(new JMenuItem("Linear"){\r
+                                                                       private static final long serialVersionUID = 1L;\r
+                                                                       {\r
+                                                                               addActionListener(new ActionListener() {\r
+                                                                                       @Override\r
+                                                                                       public void actionPerformed(ActionEvent arg0) {\r
+                                                                                               newFuel(new LinearFuelEditor());\r
+                                                                                       }\r
+                                                                               });\r
+\r
+                                                                       }\r
+                                                               });\r
                                                        }\r
                                                });\r
 \r