commited

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

@@ -6,18 +6,55 @@ public class CalcEngine {
     }
 
     public double add(double v, double v1) {
-        return Double.NaN;
+
+        return v + v1;
     }
 
     public double subtract(double v, double v1) {
-        return Double.NaN;
+
+        return v - v1;
     }
 
     public double multiply(double v, double v1) {
-        return Double.NaN;
+
+        return v * v1;
     }
 
     public double divide(double v, double v1) {
-        return Double.NaN;
+
+        return v / v1;
+    }
+
+    public double sin(double v) {
+        return Math.sin(v);
+    }
+
+    public double cos(double v) {
+        return Math.cos(v);
+    }
+
+    public double tan(double v) {
+        return Math.tan(v);
+    }
+
+    public double inverse(double x) {
+        double v=(1/x);
+        return v;
+    }
+    public double sroot(double x)
+    {
+        return Math.sqrt(x) ;
+    }
+    public double xsqu(double x)
+    {
+        return x*x;
+    }
+    public double power(double x,double y)
+    {
+        return Math.pow(x,y) ;
+    }
+    public double mod(double x,double y)
+    {
+        return x%y;
     }
-}
+}

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

@@ -24,10 +24,11 @@ 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", "sin" ,"sroot","/"},
+            { "4", "5", "6", "cos","xsqu","*" },
+            { "1", "2", "3", "tan"," power","-" },
+            { "0", "c", "=", "inverse","Mod","+" }
+
     };
 
     private final Map<String, Button> accelerators = new HashMap<>();
@@ -36,7 +37,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,SIN,COS,TAN,INVERSE,SROOT,XSQU,POWER,MOD }
 
     private Op curOp   = Op.NOOP;
     private Op stackOp = Op.NOOP;
@@ -81,10 +82,10 @@ public class CalcSkin extends Application {
 
     private TextField createScreen() {
         final TextField screen = new TextField();
-        screen.setStyle("-fx-background-color: aquamarine;");
+        screen.setStyle("-fx-background-color: pink;");
         screen.setAlignment(Pos.CENTER_RIGHT);
         screen.setEditable(false);
-        screen.textProperty().bind(Bindings.format("%.0f", currentValue));
+            screen.textProperty().bind(Bindings.format("%.0f", currentValue));
         return screen;
     }
 
@@ -122,11 +123,21 @@ public class CalcSkin extends Application {
 
     private ObjectProperty<Op> determineOperand(String s) {
         final ObjectProperty<Op> triggerOp = new SimpleObjectProperty<>(Op.NOOP);
+        s = s.toLowerCase();
         switch (s) {
             case "+": triggerOp.set(Op.ADD);      break;
             case "-": triggerOp.set(Op.SUBTRACT); break;
             case "*": triggerOp.set(Op.MULTIPLY); break;
             case "/": triggerOp.set(Op.DIVIDE);   break;
+            case "sin": triggerOp.set(Op.SIN);    break;
+            case "cos": triggerOp.set(Op.COS);    break;
+            case "tan": triggerOp.set(Op.TAN);    break;
+            case "inverse": triggerOp.set(Op.INVERSE);   break;
+            case "sroot": triggerOp.set(Op.SROOT);       break;
+            case "xsqu": triggerOp.set(Op.XSQU );        break;
+            case "power": triggerOp.set(Op.POWER);       break;
+            case "mod": triggerOp.set(Op.MOD);           break;
+
         }
         return triggerOp;
     }
@@ -185,6 +196,14 @@ 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 SIN:   currentValue.set(calcEngine.sin( currentValue.get())); break;
+                    case COS:  currentValue.set(calcEngine.cos( currentValue.get()) ); break;
+                    case TAN:   currentValue.set(calcEngine.tan( currentValue.get())); break;
+                    case INVERSE :   currentValue.set(calcEngine.inverse(currentValue.get())); break;
+                    case SROOT :   currentValue.set(calcEngine.sroot(currentValue.get())); break;
+                    case XSQU :  currentValue.set(calcEngine.xsqu(currentValue.get())); break;
+                    case POWER :  currentValue.set(calcEngine.power(previousValue.get(),currentValue.get())); break;
+                    case MOD:   currentValue.set(calcEngine.mod(previousValue.get(),currentValue.get())); break;
                 }
             }
         });