final

SciCalculator.java

@@ -12,6 +12,7 @@ public class SciCalculator{
 
     Memory memNumber = new Memory();
     DisplayVal val = new DisplayVal();
+    Units unit = new Units();
 
     while(isOn){
         //display prompt
@@ -27,7 +28,7 @@ public class SciCalculator{
       System.out.println("(2) Execute calculation");
       System.out.println("(3) Access memory functions (M+, MC, MRC)");
       System.out.println("(4) Change number system "); //may link to class
-      System.out.println("(5) Change units (maybe)"); //may link to class
+      System.out.println("(5) Change units"); //may link to class
       System.out.println("(6) Clear display");
       System.out.println("------------------------------------------");
       System.out.println("(7)Quit program");
@@ -80,7 +81,7 @@ public class SciCalculator{
                 }
               break;
         case 5:
-                System.out.println("units func");;//clear display
+                val.setValue(unit.choice(val.getValue()));//clear display
               break;
         case 6:
                 val.setValue(0.0);

Units.java

@@ -0,0 +1,74 @@
+import java.util.Scanner;
+
+public class Units
+{
+
+Scanner units = new Scanner(System.in);
+
+    public double choice (double num) {
+
+        boolean isValid = false;
+        int modechoice = 0;
+        double result = 0;
+
+    while(!isValid){
+    System.out.println("\n-------------------------------------------------");
+    System.out.println(num);
+    System.out.println("-------------------------------------------------");
+    System.out.println("Select which unit you would like to convert to (enter #1 or #2)");
+    System.out.println("(1) Degrees");
+    System.out.println("(2) Radians");
+    System.out.println("--------------------------------------------");
+    System.out.print("> ");
+    modechoice = units.nextInt();
+
+    switch(modechoice){
+        case 1: result = this.degrees(num);
+        isValid = true;
+        break;
+        case 2: result = this.radians(num);
+        isValid = true;
+        break; }
+    }
+    return result;
+    }
+
+    public double degrees (double num) {
+
+        System.out.println("Please enter your value for degree conversion");
+
+          boolean isValid = false;
+          double output = 0;
+          double input = units.nextInt();
+
+          if (!Double.isNaN(num)) {
+              System.out.println("Calculating degrees of " + input);
+              num = Math.toDegrees(input);
+              System.out.println(num);}
+          else {
+              System.out.println("Please enter your value");
+                      }
+          return num;
+    };
+    public double radians (double num) {
+
+        System.out.println("Please enter your value for radian conversion");
+
+    boolean isValid = true;
+    double output = 0;
+    double input = units.nextInt();
+
+        if (!Double.isNaN(num)) {
+              System.out.println("Calculating radians of " + input);
+              num = Math.toRadians(input);
+              System.out.println(num);}
+        else {
+            System.out.println("Please enter your value");
+        }
+        return num;
+
+}
+
+
+
+}

displayVal.java

@@ -8,6 +8,8 @@ public class DisplayVal{
   private String disVal = "0";
   Scanner stdin = new Scanner(System.in);
 
+  NumSystemsConverter conv = new NumSystemsConverter();
+
 
   //Scanner stdin = new Scanner(System.in);
 
@@ -41,6 +43,7 @@ public class DisplayVal{
               this.numSys = "Hexadecimal";
             break;
   }
+  this.setDisVal(conv.updateDisplayNumber(this.value,num)); //not working
 }
 
 public void toggleNumSys(){
@@ -62,6 +65,10 @@ public String getNumSys(){
   return this.numSys;
 }
 
+public void setDisVal(String value){
+  this.disVal = value;
+}
+
 
   public String valToString(double num){
     String displayStr = new String();