Merge branch 'master' of https://git.zipcode.rocks/cdunni/ZCW-MacroLabs-OOP-ScientificCalculator

jacobs files

MainApplication.java

@@ -5,13 +5,21 @@
  */
 public class MainApplication {
     public static void main(String[] args) {
+        
+        double Display = 0;
+        int num_system = 1;
+        double memory = 0;
+        
         Console.println("Welcome to my calculator!");
+        Console.println("Choose your option : ");
+        
         String s = Console.getStringInput("Enter a string");
+        
+        while (s != "quit") {
+            
         Integer i = Console.getIntegerInput("Enter an integer");
         Double d = Console.getDoubleInput("Enter a double.");
+    }
 
-        Console.println("The user input %s as a string", s);
-        Console.println("The user input %s as a integer", i);
-        Console.println("The user input %s as a d", d);
     }
 }

NumSystemsConverter.java

@@ -0,0 +1,29 @@
+public class NumSystemsConverter
+{
+    // display mode is sent along with displayNumber, could also be defined globally)
+    public String updateDisplayNumber(double displayNumber,int mode){
+        String str="";
+        switch(mode) {
+            case 1:{
+                str=Double.toString(displayNumber);
+                break;
+            }
+            case 2:{
+                str=Long.toBinaryString(Double.doubleToRawLongBits(displayNumber));
+                break;
+            }
+            case 3:{
+                str=Double.toHexString(displayNumber);
+                break;
+            }
+            case 4:{
+                double fraction = (displayNumber%1);
+                double integral = (displayNumber-fraction);
+                str=Integer.toOctalString((int)integral)+"."+Integer.toOctalString((int)(fraction+.5));
+                break;
+            }
+        }
+        return str;
+    }
+}
+

SwitchModes.java

@@ -0,0 +1,104 @@
+
+/**
+ * Write a description of class SwitchModes here.
+ *
+ * @author (your name)
+ * @version (a version number or a date)
+ */
+public class SwitchModes
+{
+    // instance variables - replace the example below with your own
+    private int displayMode=1;
+    private int unitMode=1;
+
+    SwitchModes sm = new SwitchModes();
+
+    public int getDisplayMode(){
+        return displayMode;
+    }
+
+    public void setDisplayMode(int mode){
+        displayMode=mode;
+    }
+
+    public int getUnitMode(){
+        return unitMode;
+    }
+
+    public void setUnitMode(int mode){
+        unitMode=mode;
+    }
+
+    /**
+     * Constructor for objects of class SwitchModes
+     */
+    public SwitchModes()
+    {
+        // initialise instance variables
+    }
+
+    /**
+     * An example of a method - replace this comment with your own
+     *
+     * @param  y  a sample parameter for a method
+     * @return    the sum of x and y
+     */
+
+    public void switchDisplayMode (String mode){
+        mode.toLowerCase();
+        switch (mode) {
+            case "hex": { 
+                displayMode=1;
+                // call update display
+                break;
+            }
+            case "bin": { 
+                displayMode=2;
+                // call update display
+                break;
+            }
+            case "dec": { 
+                displayMode=3;
+                // call update display
+                break;
+            }case "oct": { 
+                displayMode=4;
+                // call update display
+                break;
+            }
+        }
+    }
+
+    public void switchDisplayMode(){
+        if (displayMode==4){
+            displayMode=1;
+            // call update display
+        } 
+        else {
+            displayMode++;
+            // call update display
+        }
+
+    }
+
+    public void switchUnitsMode (String mode){
+        if (mode.toLowerCase()=="degrees") {
+            unitMode=1;
+
+        } else if(mode.toLowerCase()=="radians")
+            unitMode=2;
+
+    }
+    public void switchUnitsMode(){
+        if (unitMode==2){
+            unitMode=1;
+            // call update display
+        } 
+        else {
+            unitMode++;
+            // call update display
+        }
+
+    }
+
+}

UpdateDisplay.java

@@ -0,0 +1,45 @@
+
+/**
+ * Write a description of class UpdateDisplay here.
+ *
+ * @author (your name)
+ * @version (a version number or a date)
+ */
+public class UpdateDisplay
+{
+    // instance variables - replace the example below with your own
+    private int x;
+
+    /**
+     * Constructor for objects of class UpdateDisplay
+     */
+    public UpdateDisplay(Double displayNumber)
+    {
+       
+        // initialise instance variables
+        //x = 0;
+    }
+
+    /**
+     * An example of a method - replace this comment with your own
+     *
+     * @param  y  a sample parameter for a method
+     * @return    the sum of x and y
+     */
+    
+    SwitchModes sm = new SwitchModes();
+    
+    public String UpdateDisplay(Double displayNumber)
+    {
+     String str="";
+     
+     
+     // update number system based on display mode variable (see SwitchModes class)
+     
+     
+     
+     return str;   
+    }
+}
+
+

package.bluej

@@ -2,22 +2,25 @@
 dependency1.from=MainApplication
 dependency1.to=Console
 dependency1.type=UsesDependency
-editor.fx.0.height=722
-editor.fx.0.width=800
-editor.fx.0.x=640
+dependency2.from=UpdateDisplay
+dependency2.to=SwitchModes
+dependency2.type=UsesDependency
+editor.fx.0.height=717
+editor.fx.0.width=1280
+editor.fx.0.x=0
 editor.fx.0.y=23
-objectbench.height=214
-objectbench.width=595
+objectbench.height=92
+objectbench.width=1256
 package.divider.horizontal=0.6
-package.divider.vertical=0.6847360912981455
-package.editor.height=473
-package.editor.width=493
-package.editor.x=35
-package.editor.y=60
-package.frame.height=759
-package.frame.width=619
-package.numDependencies=1
-package.numTargets=2
+package.divider.vertical=0.8495440729483282
+package.editor.height=552
+package.editor.width=1154
+package.editor.x=0
+package.editor.y=23
+package.frame.height=716
+package.frame.width=1280
+package.numDependencies=2
+package.numTargets=7
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -27,16 +30,51 @@ readme.width=47
 readme.x=10
 readme.y=10
 target1.height=50
-target1.name=Console
+target1.name=UpdateDisplay
 target1.showInterface=false
 target1.type=ClassTarget
-target1.width=80
-target1.x=80
-target1.y=200
+target1.width=120
+target1.x=130
+target1.y=130
 target2.height=50
-target2.name=MainApplication
+target2.name=Memory
 target2.showInterface=false
 target2.type=ClassTarget
-target2.width=120
-target2.x=70
-target2.y=70
+target2.width=80
+target2.x=190
+target2.y=10
+target3.height=50
+target3.name=Console
+target3.showInterface=false
+target3.type=ClassTarget
+target3.width=80
+target3.x=80
+target3.y=200
+target4.height=50
+target4.name=SwitchModes
+target4.showInterface=false
+target4.type=ClassTarget
+target4.width=110
+target4.x=10
+target4.y=130
+target5.height=50
+target5.name=NumSystemsConverter
+target5.showInterface=false
+target5.type=ClassTarget
+target5.width=170
+target5.x=10
+target5.y=320
+target6.height=50
+target6.name=SciCalculator
+target6.showInterface=false
+target6.type=ClassTarget
+target6.width=110
+target6.x=70
+target6.y=10
+target7.height=50
+target7.name=MainApplication
+target7.showInterface=false
+target7.type=ClassTarget
+target7.width=120
+target7.x=70
+target7.y=70