Added motor name

diff --git a/src/com/billkuker/rocketry/motorsim/Motor.java b/src/com/billkuker/rocketry/motorsim/Motor.java
index 68a84acaa5d8bee45ba316fba61c53b139c2cbd5..267135130ddbbc9710105e3894f62e3945d30403 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/Motor.java
+++ b/src/com/billkuker/rocketry/motorsim/Motor.java
@@ -5,6 +5,8 @@ public class Motor {
        private Grain grain;\r
        private Nozzle nozzle;\r
        private Fuel fuel;\r
+       private String name;\r
+       \r
        \r
        public Chamber getChamber() {\r
                return chamber;\r
@@ -37,4 +39,12 @@ public class Motor {
        public void setFuel(Fuel fuel) {\r
                this.fuel = fuel;\r
        }\r
+\r
+       public String getName() {\r
+               return name;\r
+       }\r
+\r
+       public void setName(String name) {\r
+               this.name = name;\r
+       }\r
 }\r

diff --git a/src/com/billkuker/rocketry/motorsim/motors/kuker/PVC9.java b/src/com/billkuker/rocketry/motorsim/motors/kuker/PVC9.java
index ddac0b945a819149b2c45db6b076afc6e185495f..14fc57e1cb0606bc011ee665d7141bb93cd09e0c 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/motors/kuker/PVC9.java
+++ b/src/com/billkuker/rocketry/motorsim/motors/kuker/PVC9.java
@@ -15,6 +15,7 @@ import com.billkuker.rocketry.motorsim.visual.BurnPanel;
 \r
 public class PVC9 extends Motor {\r
        public PVC9() throws Exception{\r
+               setName("PVC9");\r
                setFuel(new KNSU());\r
                \r
                CylindricalChamber c = new CylindricalChamber();\r

diff --git a/src/com/billkuker/rocketry/motorsim/motors/nakka/KappaSB.java b/src/com/billkuker/rocketry/motorsim/motors/nakka/KappaSB.java
index eaaf5fa78c138ae2d0d514922b1f57504fc86208..7cbd7a92d9ed25cbe467187cec5b12669d84572e 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/motors/nakka/KappaSB.java
+++ b/src/com/billkuker/rocketry/motorsim/motors/nakka/KappaSB.java
@@ -15,6 +15,7 @@ import com.billkuker.rocketry.motorsim.visual.BurnPanel;
 \r
 public class KappaSB extends Motor{\r
        public KappaSB() throws Exception{\r
+               setName("Kappa-Sorbitol");\r
                setFuel(new KNSB());\r
                \r
                CylindricalChamber c = new CylindricalChamber();\r

diff --git a/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java b/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java
index 1edbbf4981ed2a2e70238a7cffdf66592bd677d0..a519b4657f8b98db947e675493f822c69c74e8f7 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java
+++ b/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java
@@ -133,7 +133,7 @@ public class BurnPanel extends JPanel {
        \r
        public void show(){\r
                JFrame f = new JFrame();\r
-               f.setTitle(burn.getMotor().getClass().getName());\r
+               f.setTitle(burn.getMotor().getName());\r
                f.setSize(1280,720);\r
                f.setLocation(0, 0);\r
                f.setContentPane(this);\r