calc skin

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

@@ -6,18 +6,46 @@ public class CalcEngine {
     }
 
     public double add(double v, double v1) {
-        return Double.NaN;
+        double added = v + v1;
+        return added;
     }
 
     public double subtract(double v, double v1) {
-        return Double.NaN;
+        double subtracted = v - v1;
+        return subtracted;
     }
 
     public double multiply(double v, double v1) {
-        return Double.NaN;
+        double multiplied = v * v1;
+        return multiplied;
     }
 
     public double divide(double v, double v1) {
-        return Double.NaN;
+        double divided = v/v1;
+        return divided;
+    }
+
+    public double squareRoot(double v)
+    {
+        double squareR  = Math.sqrt(v);
+        return squareR;
+    }
+
+    public double squareNumber(double v)
+    {
+        double numberSquared = v * v;
+        return numberSquared;
+    }
+
+    public double inverse(double v)
+    {
+        double inversed = 1/v;
+        return inversed;
+    }
+
+    public double exponent(double v, double v1)
+    {
+
+        return Math.pow(v,v1);
     }
 }

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

@@ -24,10 +24,10 @@ 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", "/", "x^2" },
+            { "4", "5", "6", "*", "√" },
+            { "1", "2", "3", "-",  "1/x"},
+            { "0", "c", "=", "+", "x^y" }
     };
 
     private final Map<String, Button> accelerators = new HashMap<>();
@@ -36,7 +36,7 @@ public class CalcSkin extends Application {
     private DoubleProperty currentValue = new SimpleDoubleProperty();
     private CalcEngine calcEngine = new CalcEngine();
 
-    private enum Op { NOOP, ADD, SUBTRACT, MULTIPLY, DIVIDE }
+    private enum Op { NOOP, ADD, SUBTRACT, MULTIPLY, DIVIDE, SQUAREROOT, SQUARENUMBER, INVERSE, EXPONENT }
 
     private Op curOp   = Op.NOOP;
     private Op stackOp = Op.NOOP;
@@ -84,7 +84,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("%.6f", currentValue));
         return screen;
     }
 
@@ -115,6 +115,7 @@ public class CalcSkin extends Application {
             } else if ("=".equals(s)) {
                 makeEqualsButton(button);
             }
+
         }
 
         return button;
@@ -127,6 +128,11 @@ public class CalcSkin extends Application {
             case "-": triggerOp.set(Op.SUBTRACT); break;
             case "*": triggerOp.set(Op.MULTIPLY); break;
             case "/": triggerOp.set(Op.DIVIDE);   break;
+            case "√": triggerOp.set(Op.SQUAREROOT); break;
+            case "x^2": triggerOp.set(Op.SQUARENUMBER); break;
+            case "1/x": triggerOp.set(Op.INVERSE); break;
+            case "x^y": triggerOp.set(Op.EXPONENT); break;
+
         }
         return triggerOp;
     }
@@ -185,10 +191,31 @@ public class CalcSkin extends Application {
                     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 SQUAREROOT:   currentValue.set(calcEngine.squareRoot(currentValue.getValue())); break;
+                    case SQUARENUMBER:   currentValue.set(calcEngine.squareNumber(currentValue.getValue())); break;
+                    case INVERSE:   currentValue.set(calcEngine.inverse(currentValue.getValue())); break;
+                    case EXPONENT:   currentValue.set(calcEngine.exponent(previousValue.get(), currentValue.get())); break;
                 }
             }
         });
     }
+
+//    private void sigleButton(Button button) {
+//        button.setStyle("-fx-base: ghostwhite;");
+//        button.setOnAction(new EventHandler<ActionEvent>() {
+//            @Override
+//            public void handle(ActionEvent actionEvent) {
+//                switch (stackOp) {
+//
+//
+//                    case SQUAREROOT:   currentValue.set(calcEngine.squareRoot(previousValue.get(), currentValue.get())); break;
+//                    case SQUARENUMBER:   currentValue.set(calcEngine.squareNumber(previousValue.get(), currentValue.get())); break;
+//                    case INVERSE:   currentValue.set(calcEngine.inverse(currentValue.get())); break;
+//                    case EXPONENT:   currentValue.set(calcEngine.exponent(previousValue.get(), currentValue.get())); break;
+//                }
+//            }
+//        });
+  //  }
 }
 
 

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

@@ -10,3 +10,4 @@ public class MainApplication {
     }
 
 }
+