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

Console.java

@@ -256,6 +256,9 @@ public class Console {
                         trigAnswer = trigMenu.calcArctan(trigInput);
 
                     } else if (trigMode.equals("7")) {
+                        trigAnswer = trigMenu.calcLog(trigInput);
+
+                    } else if (trigMode.equals("8")) {
                         break;
 
                     } else {

Trig.java

@@ -20,7 +20,8 @@ public class Trig
             + "\n4: arcsin"
             + "\n5: arccosin"
             + "\n6: arctan"
-            + "\n7: Cancel - returns to Main Menu");   
+            + "\n7: log"
+            + "\n8: Cancel - returns to Main Menu");   
 
         
     }
@@ -61,6 +62,12 @@ public class Trig
         return answer;
     }
 
+    //Log Method
+    public double calcLog(double x) {
+        answer = Math.log10(x);
+        return answer;
+    }
+    
     //Converting from Radians to Degrees
     public double toDegrees(double answer) 
     {
@@ -69,5 +76,7 @@ public class Trig
         return answer;
 
     }
+    
+    
 }
 

TrigTest.java

@@ -88,6 +88,13 @@ public class TrigTest
         Trig trig1 = new Trig();
         assertEquals(1.04719755, trig1.calcArccos(0.5), 0.1);
     }
+
+    @Test
+    public void testLog()
+    {
+        Trig trig1 = new Trig();
+        assertEquals(1, trig1.calcLog(10), 0.1);
+    }
 }
 
 
@@ -96,3 +103,4 @@ public class TrigTest
 
 
 
+

package.bluej

@@ -3,58 +3,61 @@ dependency1.from=Basic
 dependency1.to=Console
 dependency1.type=UsesDependency
 dependency10.from=Console
-dependency10.to=MainMenu
+dependency10.to=Basic
 dependency10.type=UsesDependency
 dependency11.from=Console
-dependency11.to=Basic
+dependency11.to=RealAdvanced
 dependency11.type=UsesDependency
 dependency12.from=Console
-dependency12.to=RealAdvanced
+dependency12.to=SciCalc
 dependency12.type=UsesDependency
 dependency13.from=Console
-dependency13.to=SciCalc
+dependency13.to=MemoryFunc
 dependency13.type=UsesDependency
 dependency14.from=Console
-dependency14.to=MemoryFunc
+dependency14.to=SwitchDisplay
 dependency14.type=UsesDependency
 dependency15.from=Console
 dependency15.to=SwitchDisplay
 dependency15.type=UsesDependency
-dependency16.from=Console
-dependency16.to=Trig
+dependency16.from=Trig
+dependency16.to=Console
 dependency16.type=UsesDependency
-dependency17.from=RealAdvancedTest
-dependency17.to=RealAdvanced
+dependency17.from=SwitchDisplay
+dependency17.to=Console
 dependency17.type=UsesDependency
+dependency18.from=MainApplication
+dependency18.to=Console
+dependency18.type=UsesDependency
 dependency2.from=TrigTest
 dependency2.to=Trig
 dependency2.type=UsesDependency
 dependency3.from=BasicTest
 dependency3.to=Basic
 dependency3.type=UsesDependency
-dependency4.from=MainMenu
-dependency4.to=Console
+dependency4.from=RealAdvancedTest
+dependency4.to=RealAdvanced
 dependency4.type=UsesDependency
-dependency5.from=SciCalc
+dependency5.from=MainMenu
 dependency5.to=Console
 dependency5.type=UsesDependency
-dependency6.from=MemoryFunc
+dependency6.from=SciCalc
 dependency6.to=Console
 dependency6.type=UsesDependency
-dependency7.from=Trig
+dependency7.from=RealAdvanced
 dependency7.to=Console
 dependency7.type=UsesDependency
-dependency8.from=SwitchDisplay
+dependency8.from=MemoryFunc
 dependency8.to=Console
 dependency8.type=UsesDependency
-dependency9.from=RealAdvanced
-dependency9.to=Console
+dependency9.from=Console
+dependency9.to=MainMenu
 dependency9.type=UsesDependency
-editor.fx.0.height=709
-editor.fx.0.width=1215
-editor.fx.0.x=60
-editor.fx.0.y=24
-objectbench.height=198
+editor.fx.0.height=0
+editor.fx.0.width=0
+editor.fx.0.x=0
+editor.fx.0.y=0
+objectbench.height=214
 objectbench.width=595
 package.divider.horizontal=0.6
 package.divider.vertical=0.685099846390169
@@ -64,7 +67,7 @@ package.editor.x=35
 package.editor.y=23
 package.frame.height=709
 package.frame.width=619
-package.numDependencies=17
+package.numDependencies=18
 package.numTargets=12
 package.showExtends=true
 package.showUses=true
@@ -74,6 +77,7 @@ readme.name=@README
 readme.width=47
 readme.x=10
 readme.y=10
+target1.association=BasicTest
 target1.height=50
 target1.name=Basic
 target1.showInterface=false
@@ -81,6 +85,7 @@ target1.type=ClassTarget
 target1.width=80
 target1.x=320
 target1.y=180
+target10.association=TrigTest
 target10.height=50
 target10.name=Trig
 target10.showInterface=false
@@ -107,15 +112,15 @@ target2.name=TrigTest
 target2.showInterface=false
 target2.type=UnitTestTargetJunit4
 target2.width=80
-target2.x=200
-target2.y=70
+target2.x=350
+target2.y=40
 target3.height=50
 target3.name=BasicTest
 target3.showInterface=false
 target3.type=UnitTestTargetJunit4
-target3.width=90
-target3.x=160
-target3.y=130
+target3.width=80
+target3.x=350
+target3.y=150
 target4.height=50
 target4.name=RealAdvancedTest
 target4.showInterface=false
@@ -145,16 +150,16 @@ target7.width=110
 target7.x=170
 target7.y=10
 target8.height=50
-target8.name=Console
+target8.name=MemoryFunc
 target8.showInterface=false
 target8.type=ClassTarget
-target8.width=80
-target8.x=70
-target8.y=170
+target8.width=110
+target8.x=210
+target8.y=350
 target9.height=50
-target9.name=MemoryFunc
+target9.name=Console
 target9.showInterface=false
 target9.type=ClassTarget
-target9.width=110
-target9.x=210
-target9.y=350
+target9.width=80
+target9.x=70
+target9.y=170