Calculator UI with update functionality

pom.xml

@@ -13,8 +13,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>8</source>
+                    <target>8</target>
                 </configuration>
             </plugin>
         </plugins>

src/main/java/rocks/zipcode/calcskin/CalcEngine.java

@@ -5,19 +5,68 @@ public class CalcEngine {
     CalcEngine() {
     }
 
-    public double add(double v, double v1) {
-        return Double.NaN;
+    public double add(double v, double v1)
+    {
+        return v + v1;
     }
 
-    public double subtract(double v, double v1) {
-        return Double.NaN;
+    public double subtract(double v, double v1)
+    {
+        return v - v1;
     }
 
-    public double multiply(double v, double v1) {
-        return Double.NaN;
+    public double multiply(double v, double v1)
+    {
+        return v * v1;
     }
 
-    public double divide(double v, double v1) {
-        return Double.NaN;
+    public double divide(double v, double v1)
+    {
+        return v / v1;
+    }
+
+    public double square(double v)
+    {
+        return Math.pow(v, 2.0);
+    }
+
+    public double root(double v) {
+        return Math.sqrt(v);
+    }
+
+    public double inverse(double v){
+        return 1.0 / v;
+    }
+
+    public double expo(double v, double v1) {
+        return Math.pow(v, v1);
+    }
+
+    public double tan(double v) {
+        return Math.tan(v);
+    }
+
+    public double log(double v) {
+        return Math.log10(v);
+    }
+
+    public double sin(double v) {
+        return Math.sin(v);
+    }
+
+    public double cos(double v) {
+        return Math.cos(v);
+    }
+
+    public double atan(double v) {
+        return Math.atan(v);
+    }
+
+    public double asin(double v) {
+        return Math.asin(v);
+    }
+
+    public double acos(double v) {
+        return Math.acos(v);
     }
 }

src/main/java/rocks/zipcode/calcskin/CalcSkin.java

@@ -17,6 +17,20 @@ import rocks.zipcode.calcskin.CalcEngine;
 import java.util.HashMap;
 import java.util.Map;
 
+/*
+
+- Making a simple 4-function calculator should be trivial for you at this stage.
+
+- BUT, how about adding a column of buttons for x-squared, square-root, inverse (1/x), and exponent (x^y).
+
+- Then you might add a column of buttons that do the Memory functions. (What should you add to the UI to make this easier??)
+
+Finally, work on adding the trig and log functions from the original lab.
+
+Feel free to work in your original groups, get everyone up to speed on this!
+
+ */
+
 // a simple JavaFX calculator.
 public class CalcSkin extends Application {
 
@@ -24,19 +38,24 @@ public class CalcSkin extends Application {
         launch(args);
     }
     private static final String[][] template = {
-            { "7", "8", "9", "/" },
-            { "4", "5", "6", "*" },
-            { "1", "2", "3", "-" },
-            { "0", "c", "=", "+" }
+            {    "7",   "8",    "9",     "/"  },
+            {    "4",   "5",    "6",     "*"  },
+            {    "1",   "2",    "3",     "-"  },
+            {    "0",   "c",    "=",     "+"  },
+            {  "x^2",  "rt",  "1/x",   "x^y"  },
+            {  "cos", "sin",  "tan", "log10"  },
+            { "acos","asin", "atan"           },
+            {"store", "use","reset"           }
     };
 
     private final Map<String, Button> accelerators = new HashMap<>();
 
     private DoubleProperty previousValue = new SimpleDoubleProperty();
     private DoubleProperty currentValue = new SimpleDoubleProperty();
+    private DoubleProperty memoryValue = new SimpleDoubleProperty();
     private CalcEngine calcEngine = new CalcEngine();
 
-    private enum Op { NOOP, ADD, SUBTRACT, MULTIPLY, DIVIDE }
+    private enum Op { NOOP, ADD, SUBTRACT, MULTIPLY, DIVIDE, SQUARE, ROOT, INVERSE, EXPO, COS, SIN, TAN, LOG, ACOS, ASIN, ATAN, STORE, USE, RESET }
 
     private Op curOp   = Op.NOOP;
     private Op stackOp = Op.NOOP;
@@ -73,6 +92,7 @@ public class CalcSkin extends Application {
             public void handle(KeyEvent keyEvent) {
                 Button activated = accelerators.get(keyEvent.getText());
                 if (activated != null) {
+                    System.out.println("line 94 fired");
                     activated.fire();
                 }
             }
@@ -84,7 +104,7 @@ public class CalcSkin extends Application {
         screen.setStyle("-fx-background-color: aquamarine;");
         screen.setAlignment(Pos.CENTER_RIGHT);
         screen.setEditable(false);
-        screen.textProperty().bind(Bindings.format("%.0f", currentValue));
+        screen.textProperty().bind(Bindings.format("%.2f", currentValue));
         return screen;
     }
 
@@ -109,14 +129,40 @@ public class CalcSkin extends Application {
         } else {
             final ObjectProperty<Op> triggerOp = determineOperand(s);
             if (triggerOp.get() != Op.NOOP) {
+                System.out.println(triggerOp.get());
                 makeOperandButton(button, triggerOp);
             } else if ("c".equals(s)) {
                 makeClearButton(button);
             } else if ("=".equals(s)) {
                 makeEqualsButton(button);
+            } else if("x^2".equals(s)) {
+                makeSquareBtn(button);
+            } else if("rt".equals(s)) {
+                makeSquareRtBtn(button);
+            } else if("1/x".equals(s)){
+                makeInverseBtn(button);
+            } else if("cos".equals(s)){
+                makeCOSBtn(button);
+            } else if("sin".equals(s)){
+                makeSINBtn(button);
+            } else if("tan".equals(s)){
+                makeTANBtn(button);
+            } else if("log10".equals(s)){
+                makeLOGBtn(button);
+            } else if("acos".equals(s)){
+                makeCOSBtn(button);
+            } else if("asin".equals(s)){
+                makeSINBtn(button);
+            } else if("atan".equals(s)){
+                makeTANBtn(button);
+            }else if("store".equals(s)){
+                makeStoreBtn(button);
+            } else if("use".equals(s)){
+                makeUseBtn(button);
+            } else if("reset".equals(s)) {
+                makeResetBtn(button);
             }
         }
-
         return button;
     }
 
@@ -127,6 +173,7 @@ public class CalcSkin extends Application {
             case "-": triggerOp.set(Op.SUBTRACT); break;
             case "*": triggerOp.set(Op.MULTIPLY); break;
             case "/": triggerOp.set(Op.DIVIDE);   break;
+            case "x^y" : triggerOp.set(Op.EXPO);  break;
         }
         return triggerOp;
     }
@@ -136,7 +183,9 @@ public class CalcSkin extends Application {
         button.setOnAction(new EventHandler<ActionEvent>() {
             @Override
             public void handle(ActionEvent actionEvent) {
+                System.out.println("Fire line: 169");
                 curOp = triggerOp.get();
+                System.out.println(curOp);
             }
         });
     }
@@ -180,15 +229,170 @@ public class CalcSkin extends Application {
         button.setOnAction(new EventHandler<ActionEvent>() {
             @Override
             public void handle(ActionEvent actionEvent) {
+                System.out.println("Fire line 221");
                 switch (stackOp) {
                     case ADD:      currentValue.set(calcEngine.add(previousValue.get(), currentValue.get())); break;
                     case SUBTRACT: currentValue.set(calcEngine.subtract(previousValue.get(), currentValue.get())); break;
                     case MULTIPLY: currentValue.set(calcEngine.multiply(previousValue.get(), currentValue.get())); break;
                     case DIVIDE:   currentValue.set(calcEngine.divide(previousValue.get(), currentValue.get())); break;
+                    case EXPO:     currentValue.set(calcEngine.expo(previousValue.get(), currentValue.get())); break;
                 }
             }
         });
     }
-}
 
+    //CREATE THE SQUARED FUNCTION FOR THE X^2 BUTTON
+    private void makeSquareBtn(Button button) {
+        button.setStyle("-fx-base: lightgray;");
+        button.setOnAction(new EventHandler<ActionEvent>() {
+            @Override
+            public void handle(ActionEvent actionEvent) {
+                currentValue.set(calcEngine.square(currentValue.get()));
+                stackOp = Op.SQUARE;
+            }
+        });
+    }
+
+    //CREATE THE SQUARED ROOT FUNCTION FOR THE RT BUTTON
+    private void makeSquareRtBtn(Button button) {
+        button.setStyle("-fx-base: lightgray;");
+        button.setOnAction(new EventHandler<ActionEvent>() {
+            @Override
+            public void handle(ActionEvent actionEvent) {
+                currentValue.set(calcEngine.root(currentValue.get()));
+                stackOp = Op.ROOT;
+            }
+        });
+    }
+
+    //CREATE THE INVERSE FUNCTION FOR THE INV BUTTON
+    private void makeInverseBtn(Button button) {
+        button.setStyle("-fx-base: lightgray;");
+        button.setOnAction(new EventHandler<ActionEvent>() {
+            @Override
+            public void handle(ActionEvent actionEvent) {
+                currentValue.set(calcEngine.inverse(currentValue.get()));
+                stackOp = Op.INVERSE;
+            }
+        });
+    }
 
+    //CREATE THE COS FUNCTION FOR THE COS BUTTON
+    private void makeCOSBtn(Button button) {
+        button.setStyle("-fx-base: lightgray;");
+        button.setOnAction(new EventHandler<ActionEvent>() {
+            @Override
+            public void handle(ActionEvent actionEvent) {
+                currentValue.set(calcEngine.cos(currentValue.get()));
+                stackOp = Op.COS;
+            }
+        });
+    }
+    //CREATE THE SIN FUNCTION FOR THE SIN BUTTON
+    private void makeSINBtn(Button button) {
+        button.setStyle("-fx-base: lightgray;");
+        button.setOnAction(new EventHandler<ActionEvent>() {
+            @Override
+            public void handle(ActionEvent actionEvent) {
+                currentValue.set(calcEngine.sin(currentValue.get()));
+                stackOp = Op.SIN;
+            }
+        });
+    }
+    //CREATE THE TAN FUNCTION FOR THE TAN BUTTON
+    private void makeTANBtn(Button button) {
+        button.setStyle("-fx-base: lightgray;");
+        button.setOnAction(new EventHandler<ActionEvent>() {
+            @Override
+            public void handle(ActionEvent actionEvent) {
+                currentValue.set(calcEngine.tan(currentValue.get()));
+                stackOp = Op.TAN;
+            }
+        });
+    }
+    //CREATE THE ACOS FUNCTION FOR THE ACOS BUTTON
+    private void makeACOSBtn(Button button) {
+        button.setStyle("-fx-base: lightgray;");
+        button.setOnAction(new EventHandler<ActionEvent>() {
+            @Override
+            public void handle(ActionEvent actionEvent) {
+                currentValue.set(calcEngine.acos(currentValue.get()));
+                stackOp = Op.ACOS;
+            }
+        });
+    }
+    //CREATE THE ASIN FUNCTION FOR THE ASIN BUTTON
+    private void makeASINBtn(Button button) {
+        button.setStyle("-fx-base: lightgray;");
+        button.setOnAction(new EventHandler<ActionEvent>() {
+            @Override
+            public void handle(ActionEvent actionEvent) {
+                currentValue.set(calcEngine.asin(currentValue.get()));
+                stackOp = Op.ASIN;
+            }
+        });
+    }
+    //CREATE THE ATAN FUNCTION FOR THE ATAN BUTTON
+    private void makeATANBtn(Button button) {
+        button.setStyle("-fx-base: lightgray;");
+        button.setOnAction(new EventHandler<ActionEvent>() {
+            @Override
+            public void handle(ActionEvent actionEvent) {
+                currentValue.set(calcEngine.atan(currentValue.get()));
+                stackOp = Op.ATAN;
+            }
+        });
+    }
+    //CREATE THE COS FUNCTION FOR THE COS BUTTON
+    private void makeLOGBtn(Button button) {
+        button.setStyle("-fx-base: lightgray;");
+        button.setOnAction(new EventHandler<ActionEvent>() {
+            @Override
+            public void handle(ActionEvent actionEvent) {
+                currentValue.set(calcEngine.log(currentValue.get()));
+                stackOp = Op.LOG;
+            }
+        });
+
+    }
+    //CREATE THE STORE FUNCTION FOR THE STORE BUTTON
+    private void makeStoreBtn(Button button) {
+        button.setStyle("-fx-base: lightgray;");
+        button.setOnAction(new EventHandler<ActionEvent>() {
+            @Override
+            public void handle(ActionEvent actionEvent) {
+                memoryValue.set(currentValue.get());
+                stackOp = Op.STORE;
+            }
+        });
+    }
+    //CREATE THE USE FUNCTION FOR THE USE BUTTON
+    private void makeUseBtn(Button button) {
+        button.setStyle("-fx-base: lightgray;");
+        button.setOnAction(new EventHandler<ActionEvent>() {
+            @Override
+            public void handle(ActionEvent actionEvent) {
+                if(curOp == Op.NOOP){
+                    currentValue.set(currentValue.get() * 10 + memoryValue.get());
+                } else {
+                    previousValue.set(currentValue.get());
+                    currentValue.set(memoryValue.get());
+                    stackOp = Op.USE;
+                    stackOp = curOp;
+                    curOp = Op.NOOP;
+                }
+            }
+        });
+    }
+    //CREATE THE COS FUNCTION FOR THE COS BUTTON
+    private void makeResetBtn(Button button) {
+        button.setStyle("-fx-base: lightgray;");
+        button.setOnAction(new EventHandler<ActionEvent>() {
+            @Override
+            public void handle(ActionEvent actionEvent) {
+                memoryValue.set(0);
+                stackOp = Op.RESET;
+            }
+        });
+    }
+}

src/main/java/rocks/zipcode/calcskin/MainApplication.java

@@ -2,11 +2,15 @@ package rocks.zipcode.calcskin;
 
 import rocks.zipcode.calcskin.CalcSkin;
 
-// You probably should make NO changes here. Keep it simple.
 public class MainApplication {
-    public static void main(String[] args){
 
+
+    public static void main(String[] args)
+    {
         CalcSkin.launchCalc(args);
     }
 
+    public void run(){
+
+    }
 }