GET BOTH TOOLS WORKING SIMULTANEOUSLY

Author: doct0rX

SoftwareConstruction_DataAbstraction/finalProject/SimpleDrawingPlayer-starter/.idea/workspace.xml

@@ -10,4 +10,41 @@ public Oval(Point topLeft, MidiSynth midiSynth) {
         super(topLeft, midiSynth);
         PLAYING_COLOR = new Color(231, 22, 229);
     }
+
+    // EFFECTS: return true if this Oval contains the given Point point, else return false
+    @Override
+    public boolean contains(Point point) {
+        final double TOL = 1.0e-6;
+        double halfWidth = width / 2.0;
+        double halfHeight = height / 2.0;
+        double diff = 0.0;
+
+        if (halfWidth > 0.0) {
+            diff = diff + sqrDiff(x + halfWidth, point.x) / (halfWidth * halfWidth);
+        } else {
+            diff = diff + sqrDiff(x + halfWidth, point.x);
+        }
+        if (halfHeight > 0.0) {
+            diff = diff + sqrDiff(y + halfHeight, point.y) / (halfHeight * halfHeight);
+        } else {
+            diff = diff + sqrDiff(y + halfHeight, point.y);
+        }
+        return  diff <= 1.0 + TOL;
+    }
+
+    @Override
+    protected void drawGraphics(Graphics g) {
+        g.drawOval(x, y, width, height);
+    }
+
+    @Override
+    protected void fillGraphics(Graphics g) {
+        g.fillOval(x, y, width, height);
+    }
+
+    // Compute square of difference
+    // EFFECTS: returns the square of the difference of num1 and num2
+    private double sqrDiff(double num1, int num2) {
+        return (num1 - num2) * (num1 - num2);
+    }
 }

SoftwareConstruction_DataAbstraction/finalProject/SimpleDrawingPlayer-starter/out/production/SimpleDrawingPlayer/model/Oval.class

@@ -9,4 +9,22 @@ public class Rectangle extends Shape {
     public Rectangle(Point topLeft, MidiSynth midiSynth) {
         super(topLeft, midiSynth);
     }
+
+    @Override
+    public boolean contains(Point point) {
+        int point_x = point.x;
+        int point_y = point.y;
+
+        return containsX(point_x) && containsY(point_y);
+    }
+
+    @Override
+    protected void drawGraphics(Graphics g) {
+        g.drawRect(x, y, width, height);
+    }
+
+    @Override
+    protected void fillGraphics(Graphics g) {
+        g.fillRect(x, y, width, height);
+    }
 }

SoftwareConstruction_DataAbstraction/finalProject/SimpleDrawingPlayer-starter/out/production/SimpleDrawingPlayer/model/Rectangle.class

@@ -1,18 +1,16 @@
 package model;
 
-
 import sound.MidiSynth;
 
 import java.awt.*;
 
-
 public abstract class Shape {
-    protected static Color PLAYING_COLOR;
+    protected Color PLAYING_COLOR;
 
-    private int x;
-    private int y;
-    private int width;
-    private int height;
+    protected int x;
+    protected int y;
+    protected int width;
+    protected int height;
 
     private boolean selected;
 
@@ -57,12 +55,7 @@ public boolean containsY(int y) {
     }
 
     // EFFECTS: return true if the given Point (x,y) is contained within the bounds of this Shape
-    public boolean contains(Point point) {
-        int point_x = point.x;
-        int point_y = point.y;
-
-        return containsX(point_x) && containsY(point_y);
-    }
+    protected abstract boolean contains(Point point);
 
     // REQUIRES: the x,y coordinates of the Point are larger than the x,y coordinates of the shape
     // MODIFIES: this
@@ -129,15 +122,10 @@ public void unselectAndStopPlaying() {
     }
 
     //EFFECTS: draws the shape
-    private void drawGraphics(Graphics g) {
-        g.drawRect(x, y, width, height);
-    }
+    protected abstract void drawGraphics(Graphics g);
 
     //EFFECTS: fills the shape
-    private void fillGraphics(Graphics g) {
-        g.fillRect(x, y, width, height);
-    }
-
+    protected abstract void fillGraphics(Graphics g);
 
     // EFFECTS: starts playing this Shape, where sound is dependent on the area/coordinates of the Shape
     private void play(){

SoftwareConstruction_DataAbstraction/finalProject/SimpleDrawingPlayer-starter/out/production/SimpleDrawingPlayer/model/Shape.class

@@ -1,8 +1,5 @@
 package ui.tools;
 
-
-import model.Oval;
-import model.Rectangle;
 import model.Shape;
 import ui.DrawingEditor;