Started rectFill

2 files changed, 27 insertions, 14 deletions

diff --git a/PunchingBag/src/PunchingBag.java b/PunchingBag/src/PunchingBag.java
index dee4769..dc4573f 100644
--- a/PunchingBag/src/PunchingBag.java
+++ b/PunchingBag/src/PunchingBag.java
@@ -2,8 +2,6 @@ import gnu.io.CommPortIdentifier;
 
 import javax.swing.event.EventListenerList;
 
-
-
 import java.awt.Rectangle;
 import java.awt.geom.Area;
 
@@ -100,7 +98,7 @@ public class PunchingBag implements Runnable {
 	void circleExpand(int x, int y, int intensity) {
 		runningEffects.add(new CircleExpand(x, y, 100));
 	}
-	
+
 	void squareExpand(int x, int y, int intensity, Colour colour) {
 		runningEffects.add(new SquareExpand(x, y, intensity, colour));
 	}
@@ -196,34 +194,31 @@ public class PunchingBag implements Runnable {
 		}
 
 	}
-	
+
 	class SquareExpand extends Effect {
 		final int x;
 		final int y;
 		final Colour colour;
 		int intensity;
 		boolean drawnSomething = true;
-		
+
 		int heightWidth = 2;
-		
-		
+
 		public SquareExpand(int x, int y, int intensity, Colour colour) {
 			this.x = x;
 			this.y = y;
 			this.intensity = intensity;
 			this.colour = colour;
-			
+
 		}
 
-		
 		public void draw() {
 			heightWidth += 0.1 + 0.1 + (heightWidth / 20);
 			if (!drawRectCenter(x, y, heightWidth, heightWidth, colour))
 				stop = true;
-			
-			
+
 		}
-		
+
 	}
 
 	class Noise extends Effect {
@@ -390,6 +385,24 @@ public class PunchingBag implements Runnable {
 		}
 		return doneSomething;
 	}
+	
+	public boolean rectfill(int x, int y, int height, int width, Colour colour) {
+		if (height < 0) {
+			height = 0;
+		}
+		if (width < 0) {
+			width = 0;
+		}
+		if (width == 0 && height == 0) {
+			return setLEDInternal(x, y, colour);
+			
+		}
+		
+		boolean doneSomething = false; 
+		
+		return doneSomething;
+		
+	}
 
 	private void calculateRawLeds() {
 		for (int y = 0; y <= 18; y++) {
diff --git a/PunchingBag/src/PunchingBagGUI.java b/PunchingBag/src/PunchingBagGUI.java
index 3aae146..cfe9706 100644
--- a/PunchingBag/src/PunchingBagGUI.java
+++ b/PunchingBag/src/PunchingBagGUI.java
@@ -535,9 +535,9 @@ public class PunchingBagGUI implements MouseListener, MouseMotionListener,
 	@Override

 	public void buttonPressed(int x, int y) {

 		System.out.println("Button Pressed: " + x + " " + y);

-		 //bag.circleExpand(x, y, 16);

+		bag.circleExpand(x, y, 16);

 		//bag.noise(new Rectangle(0, 0, 9, 20), 5000);

-		bag.squareExpand(x,y, 16, PunchingBag.Colour.Red);

+		//bag.squareExpand(x,y, 16, PunchingBag.Colour.Red);

 	}

 

 	@Override