Add line Width, modified contians function: Individual components can override contains method

Author: UltimatePea

src/actions/ConstructLineSegmentAction.java

@@ -25,6 +25,8 @@ public boolean canPerformAction() {
 				return false;
 			}
 		}
+		//TODO If line segment already exists, do not add again!!!
+		//TODO Do not allow adding two line segments connecting the same point
 		return true;
 
 	}

src/icons/LeftArrow.java

@@ -42,9 +42,11 @@ protected void paintNotSelected(Graphics g) {
 				g.fillPolygon(poly);
 			}
 
+			
+
 			@Override
-			public Rectangle getBounds() {
-				return poly.getBounds();
+			public boolean contains(int x2, int y2) {
+				return poly.getBounds().contains(x2, y2);
 			}
 		};
 

src/paintcomponents/LineSegment.java

@@ -18,6 +18,7 @@ public class LineSegment extends PaintComponent {
 	private Color defaultColor;
 	private Color selectColor;
 	private Stroke stroke;
+	private double strokeWidth;
 
 	/**
 	 * @return the toPoint
@@ -57,6 +58,7 @@ public LineSegment(SimplePoint fromPoint, SimplePoint toPoint,
 		this.defaultColor = defaultColor;
 		this.selectColor = selectColor;
 		this.stroke = new BasicStroke(strokeWidth);
+		this.strokeWidth = strokeWidth;
 	}
 
 	public LineSegment(SimplePoint fromPoint, SimplePoint toPoint) {
@@ -70,7 +72,7 @@ public LineSegment(SimplePoint fromPoint, SimplePoint toPoint) {
 	@Override
 	protected void paintNotSelected(Graphics g) {
 		g.setColor(defaultColor);
-		((Graphics2D)g).setStroke(stroke);
+		((Graphics2D) g).setStroke(stroke);
 		g.drawLine(fromPoint.getX(), fromPoint.getY(), toPoint.getX(),
 				toPoint.getY());
 
@@ -79,16 +81,50 @@ protected void paintNotSelected(Graphics g) {
 	@Override
 	protected void paintSelected(Graphics g) {
 		g.setColor(selectColor);
-		((Graphics2D)g).setStroke(stroke);
+		((Graphics2D) g).setStroke(stroke);
 		g.drawLine(fromPoint.getX(), fromPoint.getY(), toPoint.getX(),
 				toPoint.getY());
 	}
 
 	@Override
-	public Rectangle getBounds() {
-		return new Rectangle(fromPoint.getX(), fromPoint.getY(),
-				toPoint.getX() - fromPoint.getX(),
-				toPoint.getY() - fromPoint.getY());
+	public boolean contains(int x, int y) {
+		// if either end points contains, I do not contain
+		if (fromPoint.contains(x, y) || toPoint.contains(x, y)) {
+			return false;
+		}
+		// else return the D(curPoint , fromPoint) + D(curPoint, toPoint) ==
+		// D(fromPoint, toPoint)
+		double distanceBetweenXYandFrom = Math
+				.sqrt(Math.pow(fromPoint.getX() - x, 2)
+						+ Math.pow(fromPoint.getY() - y, 2));
+		double distanceBetweenXYandTo = Math
+				.sqrt(Math.pow(toPoint.getX() - x, 2)
+						+ Math.pow(toPoint.getY() - y, 2));
+		double distanceBetweenFromAndTo = Math
+				.sqrt(Math.pow(toPoint.getX() - fromPoint.getX(), 2)
+						+ Math.pow(toPoint.getY() - fromPoint.getY(), 2));
+
+		// checking delta distance
+		// Note: this calculation is only an approximation
+		if (Math.abs(distanceBetweenFromAndTo - distanceBetweenXYandFrom
+				- distanceBetweenXYandTo) < Math.sqrt(strokeWidth)) {
+			return true;
+
+		}
+		return false;
+	}
+
+	@Override
+	public void translate(int i, int j) {
+		super.translate(i, j);
+		// if from and to points are not selected, translate them as well
+		if (this.fromPoint.isSelected() == false){
+			this.fromPoint.translate(i, j);
+		}
+		if (this.toPoint.isSelected() == false){
+			this.toPoint.translate(i, j);
+		}
+
 	}
 
 }

src/paintcomponents/PaintComponent.java

@@ -71,7 +71,6 @@ public void toggleSelect() {
 	public boolean isSelected(){
 		return selected;
 	}
-	public abstract Rectangle getBounds();
 
 	public void translate(int i, int j) {
 		this.x+=i;
@@ -80,4 +79,7 @@ public void translate(int i, int j) {
 	}
 
 
+	public abstract boolean contains(int x2, int y2); 
+
+
 }

src/paintcomponents/SimplePoint.java

@@ -48,8 +48,8 @@ protected void paintSelected(Graphics g) {
 	}
 
 	@Override
-	public Rectangle getBounds() {
-		return new Rectangle(this.getX()- this.radius/2, this.getY() - this.radius/2, radius, radius);
+	public boolean contains(int x, int y){
+		return new Rectangle(this.getX()- this.radius/2, this.getY() - this.radius/2, radius, radius).contains(x, y);
 	}
 
 }

src/ui/PaintPanel.java

@@ -186,9 +186,8 @@ public void addPaintComponent(PaintComponent comp) {
 	 * @return null if there is no component under current point
 	 */
 	public PaintComponent componentUnderPoint(int x, int y) {
-		System.out.println("Nuber of Paint Component: " +components.size() + " " + components.toString());
 		for (PaintComponent paintComponent : components) {
-			if (paintComponent.getBounds().contains(x, y)) {
+			if (paintComponent.contains(x, y)) {
 				return paintComponent;
 			}
 		}