Merge lp:~yrke/tapaal/refactor-arcdraw-combinedublicatedraw into lp:tapaal

[Kenneth Yrke Jørgensen]

Refactored drawing of Arc-heads

Now using one function to draw arc-heads, in supercalss arc. No longer needed to overwrite the paint class to change the arc head. Set arc head via Shape head, and set if transparent with fillHead boolean.

Test drawing of all arc type, and save/load of nets. Check that arc head are rendered correctly.
Especially for inhibitor arcs.

=== modified file 'src/pipe/gui/graphicElements/Arc.java'
--- src/pipe/gui/graphicElements/Arc.java	2018-08-05 22:20:35 +0000
+++ src/pipe/gui/graphicElements/Arc.java	2018-12-29 11:17:56 +0000
@@ -1,7 +1,8 @@
 package pipe.gui.graphicElements;
 
-import java.awt.Rectangle;
+import java.awt.*;
 import java.awt.event.ActionEvent;
+import java.awt.geom.AffineTransform;
 import java.awt.geom.Point2D;
 
 import javax.swing.*;
@@ -22,6 +23,10 @@
 
 	private static final long serialVersionUID = 6527845538091358791L;
 
+	protected Shape head = new Polygon(new int[] { 0, 5, 0, -5 }, new int[] {
+			0, -10, -7, -10 }, 4);
+	protected boolean fillHead = true; //If true, fill the shape when drawing, if false, fill with bg color.
+
 	protected NameLabel label;
 
 	private static Point2D.Double point;
@@ -219,6 +224,70 @@
 	}
 
 	@Override
+	public void paintComponent(Graphics g) {
+		super.paintComponent(g);
+		Graphics2D g2 = (Graphics2D) g;
+
+		g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+				RenderingHints.VALUE_ANTIALIAS_ON);
+
+		g2.translate(COMPONENT_DRAW_OFFSET + zoomGrow
+				- myPath.getBounds().getX(), COMPONENT_DRAW_OFFSET + zoomGrow
+				- myPath.getBounds().getY());
+
+		AffineTransform reset = g2.getTransform();
+
+		//Draw Path
+		if (selected && !ignoreSelection) {
+			g2.setPaint(Pipe.SELECTION_LINE_COLOUR);
+			this.label.setForeground(Pipe.SELECTION_LINE_COLOUR);
+		} else {
+			g2.setPaint(Pipe.ELEMENT_LINE_COLOUR);
+			this.label.setForeground(Pipe.ELEMENT_LINE_COLOUR);
+		}
+
+		g2.setStroke(new BasicStroke(0.01f * zoom));
+		g2.draw(myPath);
+
+		//Draw Arrow-head
+		//Jump to arc end
+		g2.translate(myPath.getPoint(myPath.getEndIndex()).getX(), myPath
+				.getPoint(myPath.getEndIndex()).getY());
+
+		//Rotate to match arrowhead to arc angle
+		g2.rotate(myPath.getEndAngle() + Math.PI);
+		g2.setColor(java.awt.Color.WHITE);
+
+		g2.transform(Zoomer.getTransform(zoom));
+		g2.setPaint(Pipe.ELEMENT_LINE_COLOUR);
+
+		if (selected && !ignoreSelection) {
+			g2.setPaint(Pipe.SELECTION_LINE_COLOUR);
+			this.label.setForeground(Pipe.SELECTION_LINE_COLOUR);
+		} else {
+			g2.setPaint(Pipe.ELEMENT_LINE_COLOUR);
+			this.label.setForeground(Pipe.ELEMENT_LINE_COLOUR);
+		}
+
+		g2.setStroke(new BasicStroke(0.8f));
+
+		if (fillHead) {
+			g2.fill(head);
+		} else {
+			Paint p = g2.getPaint();
+
+			//Fill first to get thick edge
+			g2.setColor(java.awt.Color.WHITE); // XXX: should be GB color of canvas / drawingsurface
+			g2.fill(head);
+
+			g2.setPaint(p);
+			g2.draw(head);
+		}
+
+		g2.transform(reset);
+	}
+
+	@Override
 	public boolean contains(int x, int y) {
 		point = new Point2D.Double(x + myPath.getBounds().getX()
 				- COMPONENT_DRAW_OFFSET - zoomGrow, y

=== modified file 'src/pipe/gui/graphicElements/tapn/TimedInhibitorArcComponent.java'
--- src/pipe/gui/graphicElements/tapn/TimedInhibitorArcComponent.java	2014-06-10 16:32:25 +0000
+++ src/pipe/gui/graphicElements/tapn/TimedInhibitorArcComponent.java	2018-12-29 11:17:56 +0000
@@ -5,6 +5,7 @@
 import java.awt.Graphics2D;
 import java.awt.RenderingHints;
 import java.awt.geom.AffineTransform;
+import java.awt.geom.Ellipse2D;
 import java.util.Hashtable;
 
 import pipe.dataLayer.DataLayer;
@@ -29,14 +30,17 @@
 
 	public TimedInhibitorArcComponent(TimedOutputArcComponent arc) {
 		super(arc);
+		setHead();
 	}
 
 	public TimedInhibitorArcComponent(TimedOutputArcComponent arc, String guard) {
 		super(arc, guard);
+		setHead();
 	}
 
 	public TimedInhibitorArcComponent(PlaceTransitionObject source) {
 		super(source);
+		setHead();
 	}
 
 	public void setUnderlyingArc(TimedInhibitorArc arc) {
@@ -48,6 +52,11 @@
 		return inhibitorArc;
 	}
 
+	protected void setHead() {
+		head = new Ellipse2D.Double(-4, -8, 8, 8);
+		fillHead = false;
+	}
+
 	@Override
 	public void delete() {
 		if (inhibitorArc != null)
@@ -111,47 +120,7 @@
 	}
 
 	@Override
-	public void paintComponent(Graphics g) {
-		// super.paintComponent(g);
-		Graphics2D g2 = (Graphics2D) g;
-
-		g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
-				RenderingHints.VALUE_ANTIALIAS_ON);
-
-		g2.translate(COMPONENT_DRAW_OFFSET + zoomGrow
-				- myPath.getBounds().getX(), COMPONENT_DRAW_OFFSET + zoomGrow
-				- myPath.getBounds().getY());
-
-		if (selected && !ignoreSelection) {
-			g2.setPaint(Pipe.SELECTION_LINE_COLOUR);
-		} else {
-			g2.setPaint(Pipe.ELEMENT_LINE_COLOUR);
-		}
-
-		g2.setStroke(new BasicStroke(0.01f * zoom));
-		g2.draw(myPath);
-
-		g2.translate(myPath.getPoint(myPath.getEndIndex()).getX(), myPath
-				.getPoint(myPath.getEndIndex()).getY());
-
-		g2.rotate(myPath.getEndAngle() + Math.PI);
-		g2.setColor(java.awt.Color.WHITE);
-
-		AffineTransform reset = g2.getTransform();
-		g2.transform(Zoomer.getTransform(zoom));
-
-		g2.setStroke(new BasicStroke(0.8f));
-		g2.fillOval(-4, -8, 8, 8);
-
-		if (selected && !ignoreSelection) {
-			g2.setPaint(Pipe.SELECTION_LINE_COLOUR);
-		} else {
-			g2.setPaint(Pipe.ELEMENT_LINE_COLOUR);
-		}
-		g2.drawOval(-4, -8, 8, 8);
-
-		g2.setTransform(reset);
-	}
+
 	
 	public TimedInhibitorArcComponent copy(TimedArcPetriNet tapn, DataLayer guiModel, Hashtable<PlaceTransitionObject, PlaceTransitionObject> oldToNewMapping) {
 		TimedInhibitorArcComponent arc = new TimedInhibitorArcComponent(this);

=== modified file 'src/pipe/gui/graphicElements/tapn/TimedOutputArcComponent.java'
--- src/pipe/gui/graphicElements/tapn/TimedOutputArcComponent.java	2018-08-11 10:29:10 +0000
+++ src/pipe/gui/graphicElements/tapn/TimedOutputArcComponent.java	2018-12-29 11:17:56 +0000
@@ -47,9 +47,6 @@
 	 */
 	private static final long serialVersionUID = 5588142404135607382L;
 
-	protected Polygon head = new Polygon(new int[] { 0, 5, 0, -5 }, new int[] {
-			0, -10, -7, -10 }, 4);
-
 	private dk.aau.cs.model.tapn.TimedOutputArc outputArc;
 
 	/**
@@ -201,53 +198,7 @@
 
 	}
 
-	@Override
-	public void paintComponent(Graphics g) {
-		super.paintComponent(g);
-		Graphics2D g2 = (Graphics2D) g;
-
-		g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
-				RenderingHints.VALUE_ANTIALIAS_ON);
-
-		g2.translate(COMPONENT_DRAW_OFFSET + zoomGrow
-				- myPath.getBounds().getX(), COMPONENT_DRAW_OFFSET + zoomGrow
-				- myPath.getBounds().getY());
-
-		AffineTransform reset = g2.getTransform();
-
-		if (selected && !ignoreSelection) {
-			g2.setPaint(Pipe.SELECTION_LINE_COLOUR);
-			this.label.setForeground(Pipe.SELECTION_LINE_COLOUR);
-		} else {
-			g2.setPaint(Pipe.ELEMENT_LINE_COLOUR);
-			this.label.setForeground(Pipe.ELEMENT_LINE_COLOUR);
-		}
-
-		g2.setStroke(new BasicStroke(0.01f * zoom));
-		g2.draw(myPath);
-
-		g2.translate(myPath.getPoint(myPath.getEndIndex()).getX(), myPath
-				.getPoint(myPath.getEndIndex()).getY());
-
-		g2.rotate(myPath.getEndAngle() + Math.PI);
-		g2.setColor(java.awt.Color.WHITE);
-
-		g2.transform(Zoomer.getTransform(zoom));
-		g2.setPaint(Pipe.ELEMENT_LINE_COLOUR);
-
-		if (selected && !ignoreSelection) {
-			g2.setPaint(Pipe.SELECTION_LINE_COLOUR);
-			this.label.setForeground(Pipe.SELECTION_LINE_COLOUR);
-		} else {
-			g2.setPaint(Pipe.ELEMENT_LINE_COLOUR);
-			this.label.setForeground(Pipe.ELEMENT_LINE_COLOUR);
-		}
-
-		g2.setStroke(new BasicStroke(0.8f));
-		g2.fillPolygon(head);
-
-		g2.transform(reset);
-	}
+
 
 	public dk.aau.cs.model.tapn.TimedOutputArc underlyingArc() {
 		return outputArc;