Merge branch 'master' of laurengreen/ZCW-MacroLabs-OOP-ScientificCalculator into master

Trig.java

@@ -0,0 +1,88 @@
+
+import java.util.Scanner;
+
+/**
+ * Trig class to perform trig function for our Graphing Calculator
+ * (sin, cos, tan, inverses, degree to radian)
+ * Lauren Green
+ * 10/19/18
+ */
+public class Trig
+{
+    int input = 0;
+    double answer;
+    
+    public Trig()
+    {
+        boolean validInput = false;
+        
+        while(!validInput) {
+        //Get input of type of function
+        Scanner in1 = new Scanner(System.in);
+        System.out.println("Which trignometric function would you like to run? \n sin, cos, tan, arcsin, arccos, arctan");
+        String operation = in1.nextLine(); 
+        operation = operation.toLowerCase();
+        
+        //Get input of number
+        Scanner in2 = new Scanner(System.in);
+        System.out.println("What number would you like to find the " + operation + " of?");
+        int input = in2.nextInt();
+        
+        //Do the math depending on the input.
+        if (operation.equals("sin")) {
+            answer = Math.sin(input);
+            System.out.println(answer);
+            validInput = true;
+            
+        } else if (operation.equals("cos")) {
+            answer = Math.cos(input);
+            System.out.println(answer);
+            validInput = true;
+            
+        } else if (operation.equals("tan")) {
+            answer = Math.tan(input);
+            System.out.println(answer);
+            validInput = true;
+            
+        } else if (operation.equals("arcsin")) {
+            answer = Math.asin(input);
+            System.out.println(answer);
+            validInput = true;
+            
+        } else if (operation.equals("arccos")) {
+            answer = Math.acos(input);
+            System.out.println(answer);
+            validInput = true;
+            
+        } else if (operation.equals("arctan")) {
+            answer = Math.atan(input);
+            System.out.println(answer);
+            validInput = true;
+            
+        } else {
+            System.out.println("Error, try again \n");
+            
+    }
+}
+        //Ask if they would like to convert.
+        System.out.println("Would you like to convert your answer from radian to degrees?  Y or N");
+        Scanner in3 = new Scanner(System.in);
+        String response = in3.nextLine();
+        response = response.toLowerCase();
+        if (response.equals("y")) {
+            toDegrees(answer);
+    } else {
+        System.out.println("Have a nice day!");
+        ///Return to Main Application
+}
+    }
+
+    public void toDegrees(double answer) 
+    {
+        double conversion = Math.toDegrees(answer);
+        System.out.println(conversion);
+        ///Return to Main Application
+    }
+}
+
+    

package.bluej

@@ -4,7 +4,7 @@ dependency1.to=Console
 dependency1.type=UsesDependency
 editor.fx.0.height=722
 editor.fx.0.width=800
-editor.fx.0.x=640
+editor.fx.0.x=801
 editor.fx.0.y=23
 objectbench.height=214
 objectbench.width=595
@@ -17,7 +17,7 @@ package.editor.y=60
 package.frame.height=759
 package.frame.width=619
 package.numDependencies=1
-package.numTargets=2
+package.numTargets=3
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -34,9 +34,16 @@ target1.width=80
 target1.x=80
 target1.y=200
 target2.height=50
-target2.name=MainApplication
+target2.name=Trig
 target2.showInterface=false
 target2.type=ClassTarget
-target2.width=120
-target2.x=70
+target2.width=80
+target2.x=320
 target2.y=70
+target3.height=50
+target3.name=MainApplication
+target3.showInterface=false
+target3.type=ClassTarget
+target3.width=120
+target3.x=70
+target3.y=70