Merge lp:~danilovesky/workcraft/trunk-bug-1288772 into lp:workcraft

[Danil Sokolov]

[Danil Sokolov (danilovesky)]

review: Approve

=== modified file 'CircuitPlugin/src/org/workcraft/plugins/circuit/VisualCircuitComponent.java'
--- CircuitPlugin/src/org/workcraft/plugins/circuit/VisualCircuitComponent.java	2014-01-15 13:37:34 +0000
+++ CircuitPlugin/src/org/workcraft/plugins/circuit/VisualCircuitComponent.java	2014-04-09 17:15:15 +0000
@@ -414,27 +414,12 @@
 	}
 	
 	@Override
-	public double getLabelOffset() {
-		double result = size / 2;
-		if (totalBB != null) {
-			switch (getLabelPositioning()) {
-			case CENTER:
-				result = 0.0;
-				break;
-			case TOP: 
-			case BOTTOM: 
-				result = totalBB.getHeight() / 2;
-				break;
-			case LEFT: 
-			case RIGHT: 
-				result = totalBB.getWidth() / 2; 
-				break;
-			default:
-				result = Math.min(totalBB.getHeight(), totalBB.getWidth()) / 2; 
-			}
+	public Rectangle2D getInternalBoundingBoxInLocalSpace() {
+		if (groupImpl == null) {
+			return super.getInternalBoundingBoxInLocalSpace();
 		}
-		return result;
-	}
+		return BoundingBoxHelper.union(totalBB, BoundingBoxHelper.mergeBoundingBoxes(Hierarchy.getChildrenOfType(this, Touchable.class)));
+	}	
 	
 	@Override
 	public void draw(DrawRequest r) {

=== modified file 'CircuitPlugin/src/org/workcraft/plugins/circuit/VisualFunctionContact.java'
--- CircuitPlugin/src/org/workcraft/plugins/circuit/VisualFunctionContact.java	2014-01-15 14:11:43 +0000
+++ CircuitPlugin/src/org/workcraft/plugins/circuit/VisualFunctionContact.java	2014-04-09 17:15:15 +0000
@@ -224,11 +224,11 @@
 			g.draw(line);
 		}
 		g.translate(textX, textY);
-		result.draw(g, foreground);
+		g.setColor(foreground);
+		result.draw(g);
 		g.setTransform(transform);
 	}
 	
-	
 	@Override
 	public void draw(DrawRequest r) {
 		Graphics2D g = r.getGraphics();
@@ -257,7 +257,6 @@
 		super.draw(r);
 	}
 	
-	
 	@Override
 	public void notify(StateEvent e) {
 //		renderedFormula = null;

=== added file 'CpogsPlugin/src/org/workcraft/plugins/cpog/RenderedFormula.java'
--- CpogsPlugin/src/org/workcraft/plugins/cpog/RenderedFormula.java	1970-01-01 00:00:00 +0000
+++ CpogsPlugin/src/org/workcraft/plugins/cpog/RenderedFormula.java	2014-04-09 17:15:15 +0000
@@ -0,0 +1,77 @@
+package org.workcraft.plugins.cpog;
+
+import java.awt.Font;
+import java.awt.Graphics2D;
+import java.awt.font.FontRenderContext;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
+
+import org.workcraft.dom.visual.BoundingBoxHelper;
+import org.workcraft.dom.visual.Positioning;
+import org.workcraft.dom.visual.Touchable;
+import org.workcraft.plugins.cpog.optimisation.BooleanFormula;
+import org.workcraft.plugins.cpog.optimisation.booleanvisitors.FormulaRenderingResult;
+import org.workcraft.plugins.cpog.optimisation.booleanvisitors.FormulaToGraphics;
+import org.workcraft.plugins.cpog.optimisation.expressions.One;
+
+public class RenderedFormula implements Touchable {
+	final public String text;
+	final public BooleanFormula formula;
+	final public Font font;
+	final public Positioning positioning;
+	final public double xOffset;
+	final public double yOffset;
+	final private FormulaRenderingResult renderingResult;
+	private Rectangle2D boundingBox;
+
+	public RenderedFormula(String text, BooleanFormula formula, Font font, Positioning positioning, Point2D offset) {
+		this.text = text;
+		this.formula = formula;
+		this.font = font;
+		this.positioning = positioning;
+		this.xOffset = offset.getX();
+		this.yOffset = offset.getY();
+		final FontRenderContext context = new FontRenderContext(AffineTransform.getScaleInstance(1000, 1000), true, true);
+		renderingResult = FormulaToGraphics.print(text, font, context);
+		if (formula != One.instance()) {
+			renderingResult.add(FormulaToGraphics.render(formula, context, font));
+		}
+		Rectangle2D bb = renderingResult.boundingBox;
+		double x = offset.getX() + positioning.xOffset + 0.5 * positioning.xSign * bb.getWidth();
+		double y = offset.getY() + 0.5 * positioning.ySign * bb.getHeight();
+		boundingBox = BoundingBoxHelper.move(bb, x - bb.getCenterX(), y - bb.getCenterY());
+	}
+
+	public boolean isDifferent(String text, BooleanFormula formula, Font font, Positioning positioning, Point2D offset) {
+		if (text == null) {
+			text = "";
+		}
+		return (!text.equals(this.text) || !formula.equals(this.formula) || !font.equals(this.font) 
+				|| positioning != this.positioning || offset.getX() != this.xOffset || offset.getY() != this.yOffset);
+	}
+	
+	public void draw (Graphics2D g) {
+		g.setFont(font);
+		AffineTransform oldTransform = g.getTransform();
+		g.translate(boundingBox.getX(), boundingBox.getCenterY());
+		renderingResult.draw(g);
+		g.setTransform(oldTransform);
+	}
+	
+	@Override
+	public boolean hitTest(Point2D point) {
+		return boundingBox.contains(point);
+	}
+
+	@Override
+	public Rectangle2D getBoundingBox() {
+		return boundingBox;
+	}
+
+	@Override
+	public Point2D getCenter() {
+		return new Point2D.Double(boundingBox.getCenterX(), boundingBox.getCenterY());
+	}
+	
+}

=== modified file 'CpogsPlugin/src/org/workcraft/plugins/cpog/VisualArc.java'
--- CpogsPlugin/src/org/workcraft/plugins/cpog/VisualArc.java	2010-10-19 20:13:26 +0000
+++ CpogsPlugin/src/org/workcraft/plugins/cpog/VisualArc.java	2014-04-09 17:15:15 +0000
@@ -171,8 +171,9 @@
 		AffineTransform transform = AffineTransform.getTranslateInstance(p.getX() - labelPosition.getX(), p.getY() - labelPosition.getY()); 
 		transform.concatenate(AffineTransform.getRotateInstance(d.getX(), d.getY(), labelPosition.getX(), labelPosition.getY()));
 		
-		g.transform(transform);		
-		result.draw(g, Coloriser.colorise(Color.BLACK, r.getDecoration().getColorisation()));
+		g.transform(transform);
+		g.setColor(Coloriser.colorise(Color.BLACK, r.getDecoration().getColorisation()));
+		result.draw(g);
 		g.setTransform(oldTransform);
 		
 		labelBB = BoundingBoxHelper.transform(labelBB, transform);

=== modified file 'CpogsPlugin/src/org/workcraft/plugins/cpog/VisualRhoClause.java'
--- CpogsPlugin/src/org/workcraft/plugins/cpog/VisualRhoClause.java	2014-01-02 14:47:00 +0000
+++ CpogsPlugin/src/org/workcraft/plugins/cpog/VisualRhoClause.java	2014-04-09 17:15:15 +0000
@@ -98,8 +98,8 @@
 		
 		AffineTransform transform = g.getTransform();
 		g.translate(textX, textY);
-		
-		result.draw(g, Coloriser.colorise(getColor(), colorisation));
+		g.setColor(Coloriser.colorise(getColor(), colorisation));
+		result.draw(g);
 				
 		g.setTransform(transform);		
 	}

=== modified file 'CpogsPlugin/src/org/workcraft/plugins/cpog/VisualScenario.java'
--- CpogsPlugin/src/org/workcraft/plugins/cpog/VisualScenario.java	2013-12-27 12:29:16 +0000
+++ CpogsPlugin/src/org/workcraft/plugins/cpog/VisualScenario.java	2014-04-09 17:15:15 +0000
@@ -62,7 +62,6 @@
 			e.printStackTrace();
 		}
 	}
-
 	
 	public VisualScenario() {
 		addPropertyDeclaration(new PropertyDeclaration<VisualScenario, String>(
@@ -87,17 +86,17 @@
 	}
 
 	@Override
-	public Rectangle2D getBoundingBoxInLocalSpace()
-	{
+	public Rectangle2D getBoundingBoxInLocalSpace() {
 		Rectangle2D bb = getContentsBoundingBox();
 		
 		// Increase bb by the label height (to include the latter into the bb)
-		if(labelBB != null)
+		if(labelBB != null) {
 			bb.add(bb.getMinX(), bb.getMinY() - labelBB.getHeight());
-		
+		}
 		// Increase bb by the encoding height (to include the latter into the bb)
-		if(encodingBB != null)
+		if(encodingBB != null) {
 			bb.add(bb.getMinX(), bb.getMaxY() + encodingBB.getHeight());
+		}
 		
 		return bb;
 	}
@@ -105,15 +104,15 @@
 	private Rectangle2D getContentsBoundingBox() {
 		Rectangle2D bb = null;
 		
-		for(VisualVertex v : Hierarchy.getChildrenOfType(this, VisualVertex.class))
-			bb = BoundingBoxHelper.union(bb, v.getBoundingBox());
-
-		for(VisualVariable v : Hierarchy.getChildrenOfType(this, VisualVariable.class))
-			bb = BoundingBoxHelper.union(bb, v.getBoundingBox());
-
-		for(VisualArc a : Hierarchy.getChildrenOfType(this, VisualArc.class))
+		for(VisualVertex v : Hierarchy.getChildrenOfType(this, VisualVertex.class)) {
+			bb = BoundingBoxHelper.union(bb, v.getBoundingBox());
+		}
+		for(VisualVariable v : Hierarchy.getChildrenOfType(this, VisualVariable.class)) {
+			bb = BoundingBoxHelper.union(bb, v.getBoundingBox());
+		}
+		for(VisualArc a : Hierarchy.getChildrenOfType(this, VisualArc.class)) {
 			bb = BoundingBoxHelper.union(bb, a.getLabelBoundingBox());
-
+		}
 		if (bb == null) bb = contentsBB;
 		else
 		bb.setRect(bb.getMinX() - frameDepth, bb.getMinY() - frameDepth, 
@@ -127,8 +126,7 @@
 	}
 	
 	@Override
-	public void draw(DrawRequest r)
-	{
+	public void draw(DrawRequest r) {
 		Graphics2D g = r.getGraphics();
 		Color colorisation = r.getDecoration().getColorisation();
 		Color background = r.getDecoration().getBackground();
@@ -159,8 +157,8 @@
 		
 			AffineTransform transform = g.getTransform();
 			g.translate(labelPosition.getX(), labelPosition.getY());
-					
-			result.draw(g, Coloriser.colorise(Color.BLACK, colorisation));
+			g.setColor(Coloriser.colorise(Color.BLACK, colorisation));
+			result.draw(g);
 			
 			g.setTransform(transform);
 
@@ -209,8 +207,8 @@
 				
 				transform = g.getTransform();
 				g.translate(labelPosition.getX(), labelPosition.getY());
-						
-				result.draw(g, Coloriser.colorise(Color.BLACK, colorisation));
+				g.setColor(Coloriser.colorise(Color.BLACK, colorisation));
+				result.draw(g);
 				
 				g.setTransform(transform);
 				
@@ -242,8 +240,8 @@
 				Color color = Color.BLACK;
 				if (!var.getState().matches(encoding.getState(var))) color = Color.RED;
 				if (perfectMatch) color = Color.GREEN;
-
-				result.draw(g, Coloriser.colorise(color, colorisation));
+				g.setColor(Coloriser.colorise(color, colorisation));
+				result.draw(g);
 				
 				g.setTransform(transform);
 				
@@ -254,19 +252,17 @@
 		}
 	}
 	
-	public Variable getVariableAt(Point2D p)
-	{
+	public Variable getVariableAt(Point2D p) {
 		Point2D q = new Point2D.Double();
 		getParentToLocalTransform().transform(p, q);
-		for(Rectangle2D rect : variableBBs.keySet())
+		for(Rectangle2D rect : variableBBs.keySet()) {
 			if (rect.contains(q)) return variableBBs.get(rect);
-		
+		}
 		return null;
 	}
 	
 	@Override
-	public boolean hitTestInLocalSpace(Point2D p)
-	{
+	public boolean hitTestInLocalSpace(Point2D p) {
 		return 
 			getContentsBoundingBox().contains(p) ||
 			getLabelBB().contains(p) ||
@@ -278,25 +274,21 @@
 		return new Rectangle2D.Double(bb.getMaxX() - labelBB.getWidth(), bb.getMinY() - labelBB.getHeight(), labelBB.getWidth(), labelBB.getHeight());
 	}
 
-	public void setLabel(String label)
-	{
+	public void setLabel(String label) {
 		this.label = label;
 		sendNotification(new PropertyChangedEvent(this, "label"));
 	}
 
-	public String getLabel()
-	{
+	public String getLabel() {
 		return label;
 	}
 
-	public void setEncoding(Encoding encoding)
-	{
+	public void setEncoding(Encoding encoding) {
 		this.encoding = encoding;
 		sendNotification(new PropertyChangedEvent(this, "encoding"));
 	}
 
-	public Encoding getEncoding()
-	{
+	public Encoding getEncoding() {
 		return encoding;
 	}
 }

=== modified file 'CpogsPlugin/src/org/workcraft/plugins/cpog/VisualVariable.java'
--- CpogsPlugin/src/org/workcraft/plugins/cpog/VisualVariable.java	2014-04-08 12:03:26 +0000
+++ CpogsPlugin/src/org/workcraft/plugins/cpog/VisualVariable.java	2014-04-09 17:15:15 +0000
@@ -28,7 +28,6 @@
 import java.awt.Graphics2D;
 import java.awt.Shape;
 import java.awt.event.KeyEvent;
-import java.awt.geom.AffineTransform;
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
 import java.io.IOException;
@@ -37,29 +36,36 @@
 import org.workcraft.annotations.SVGIcon;
 import org.workcraft.dom.visual.BoundingBoxHelper;
 import org.workcraft.dom.visual.DrawRequest;
+import org.workcraft.dom.visual.Positioning;
 import org.workcraft.dom.visual.VisualComponent;
 import org.workcraft.gui.Coloriser;
+import org.workcraft.gui.graph.tools.Decoration;
 import org.workcraft.gui.propertyeditor.PropertyDeclaration;
 import org.workcraft.observation.PropertyChangedEvent;
-import org.workcraft.plugins.cpog.optimisation.booleanvisitors.FormulaRenderingResult;
-import org.workcraft.plugins.cpog.optimisation.booleanvisitors.FormulaToGraphics;
+import org.workcraft.plugins.cpog.optimisation.expressions.One;
 import org.workcraft.serialisation.xml.NoAutoSerialisation;
 
 @Hotkey(KeyEvent.VK_X)
 @SVGIcon("images/icons/svg/variable.svg")
-public class VisualVariable extends VisualComponent
-{
-	private final static double size = 1.0;
-	private final static float strokeWidth = 0.08f;
+public class VisualVariable extends VisualComponent {
+	private static Font variableFont;
 	private static Font valueFont;
-	private static Font labelFont;
-	private Point2D labelPosition = null;
-	private Rectangle2D labelBoundingBox = null;
-	
+	
+	private final RenderedFormula valueFalseRenderedFormula = new RenderedFormula(
+			VariableState.FALSE.toString(), One.instance(), valueFont, Positioning.CENTER, new Point2D.Double(0.0, 0.2));
+
+	private final RenderedFormula valueTrueRenderedFormula = new RenderedFormula(
+			VariableState.TRUE.toString(), One.instance(), valueFont, Positioning.CENTER, new Point2D.Double(0.0, 0.2));
+
+	private final RenderedFormula valueUndefinedRenderedFormula = new RenderedFormula(
+			VariableState.UNDEFINED.toString(), One.instance(), valueFont, Positioning.CENTER, new Point2D.Double(0.0, 0.2));
+	
+	private RenderedFormula variableRenderedFormula = new RenderedFormula("", One.instance(), variableFont, getLabelPositioning(), getLabelOffset());
+
 	static {
 		try {
 			Font font = Font.createFont(Font.TYPE1_FONT, ClassLoader.getSystemResourceAsStream("fonts/eurm10.pfb"));
-			labelFont = font.deriveFont(0.5f);
+			variableFont = font.deriveFont(0.5f);
 			valueFont = font.deriveFont(0.75f);
 		} catch (FontFormatException e) {
 			e.printStackTrace();
@@ -68,10 +74,8 @@
 		}
 	}
 	
-	public VisualVariable(Variable variable)
-	{
+	public VisualVariable(Variable variable) {
 		super(variable);
-
 		addPropertyDeclaration(new PropertyDeclaration<VisualVariable, VariableState>(
 				this, "State", VariableState.class, VariableState.getChoice()) { 
 			public void setter(VisualVariable object, VariableState value) {
@@ -84,8 +88,7 @@
 	}
 
 	@Override
-	public void draw(DrawRequest r)
-	{
+	public void draw(DrawRequest r) {
 		Graphics2D g = r.getGraphics();
 		Color colorisation = r.getDecoration().getColorisation();
 		Color background = r.getDecoration().getBackground();
@@ -93,95 +96,81 @@
 		Shape shape = new Rectangle2D.Double(-size / 2 + strokeWidth / 2, -size / 2 + strokeWidth / 2,
 				size - strokeWidth, size - strokeWidth);
 
-		g.setStroke(new BasicStroke(strokeWidth));
+		g.setStroke(new BasicStroke((float)strokeWidth));
 		g.setColor(Coloriser.colorise(getFillColor(), background));
 		g.fill(shape);
 		g.setColor(Coloriser.colorise(getForegroundColor(), colorisation));
 		g.draw(shape);
-		
-		String text = getState().toString();
-		FormulaRenderingResult result = FormulaToGraphics.print(text, valueFont, g.getFontRenderContext());
-		Rectangle2D textBB = result.boundingBox;
-			
-		float textX = (float)-textBB.getCenterX();
-		float textY = (float)-textBB.getCenterY() + 0.1f;
-		if (getState() == VariableState.UNDEFINED) {
-			// FIXMI: A hack to draw "?" symbol a bit higher, otherwise it shows too low, not sure why)
-			textY -= 0.3f;
-		}
-			
-		AffineTransform transform = g.getTransform();
-		g.translate(textX, textY);
-		result.draw(g, Coloriser.colorise(getForegroundColor(), colorisation));
-		g.setTransform(transform);
-		drawLabelInLocalSpace(r);
+	
+		g.setColor(Coloriser.colorise(getForegroundColor(), colorisation));
+		switch (getState()) {
+		case FALSE:
+			valueFalseRenderedFormula.draw(g);
+			break;
+		case TRUE:
+			valueTrueRenderedFormula.draw(g);
+			break;
+		case UNDEFINED:
+			valueUndefinedRenderedFormula.draw(g);
+			break;
+		default:
+			break;
+		}
+		drawVariableInLocalSpace(r);
+	}
+	
+	
+	protected void cacheVariableRenderedFormula(DrawRequest r) {
+		if (variableRenderedFormula.isDifferent(getLabel(), One.instance(), variableFont, getLabelPositioning(), getLabelOffset())) {
+			variableRenderedFormula = new RenderedFormula(getLabel(), One.instance(), variableFont, getLabelPositioning(), getLabelOffset());
+		}
+	}
+
+	protected void drawVariableInLocalSpace(DrawRequest r) {
+		if (getLabelVisibility()) {
+			Graphics2D g = r.getGraphics();
+			Decoration d = r.getDecoration();
+			cacheVariableRenderedFormula(r);
+			g.setColor(Coloriser.colorise(getLabelColor(), d.getColorisation()));
+			variableRenderedFormula.draw(g);
+		}
 	}
 	
 	@NoAutoSerialisation	
 	@Override
-	public String getLabel()
-	{
+	public String getLabel() {
 		return getMathVariable().getLabel();
 	}
 	
 	@NoAutoSerialisation
 	@Override
-	public void setLabel(String label)
-	{
+	public void setLabel(String label)	{
 		getMathVariable().setLabel(label);
 		sendNotification(new PropertyChangedEvent(this, "label"));
 	}
 	
-	protected void drawLabelInLocalSpace(DrawRequest r)
-	{
-		Graphics2D g = r.getGraphics();
-		Color colorisation = r.getDecoration().getColorisation();
-		Rectangle2D bb = new Rectangle2D.Double(-size / 2, -size / 2, size, size);
-		
-		FormulaRenderingResult result = FormulaToGraphics.print(getLabel(), labelFont, g.getFontRenderContext());
-		Rectangle2D gbb = result.boundingBox;
-
-		labelPosition = new Point2D.Double(
-				bb.getCenterX() - gbb.getCenterX() + 0.5 * getLabelPositioning().xOffset * (bb.getWidth() + gbb.getWidth() + 0.2),
-				bb.getCenterY() - gbb.getCenterY() + 0.5 * getLabelPositioning().yOffset * (bb.getHeight() + gbb.getHeight() + 0.2));
-		labelBoundingBox = new Rectangle2D.Double(gbb.getX() + labelPosition.getX(), gbb.getY() + labelPosition.getY(),
-				gbb.getWidth(), gbb.getHeight());
-
-		AffineTransform oldTransform = g.getTransform();
-		g.translate(labelPosition.getX(), labelPosition.getY());
-		result.draw(g, Coloriser.colorise(getLabelColor(), colorisation));
-		g.setTransform(oldTransform);
-	}
-
-	public Rectangle2D getBoundingBoxInLocalSpace()
-	{
-		Rectangle2D bb = new Rectangle2D.Double(-size / 2, -size / 2, size, size);
-		return BoundingBoxHelper.union(bb, labelBoundingBox);
-	}
-
-	public boolean hitTestInLocalSpace(Point2D pointInLocalSpace)
-	{
-		if (labelBoundingBox != null && labelBoundingBox.contains(pointInLocalSpace)) return true;
-		return Math.abs(pointInLocalSpace.getX()) <= size / 2 && Math.abs(pointInLocalSpace.getY()) <= size / 2;		
-	}
-
-	public Variable getMathVariable()
-	{
+	@Override
+	public Rectangle2D getBoundingBoxInLocalSpace() {
+		Rectangle2D bb = super.getBoundingBoxInLocalSpace();
+		if (getLabelVisibility()) {
+			bb = BoundingBoxHelper.union(bb, variableRenderedFormula.getBoundingBox());
+		}
+		return bb;
+	}
+
+	public Variable getMathVariable() {
 		return (Variable)getReferencedComponent();
 	}
 	
-	public VariableState getState()
-	{
+	public VariableState getState() {
 		return getMathVariable().getState();
 	}	
 
-	public void setState(VariableState state)
-	{
+	public void setState(VariableState state) {
 		getMathVariable().setState(state);
 	}
 
-	public void toggle()
-	{
+	public void toggle() {
 		setState(getState().toggle());		
 	}	
 	

=== modified file 'CpogsPlugin/src/org/workcraft/plugins/cpog/VisualVertex.java'
--- CpogsPlugin/src/org/workcraft/plugins/cpog/VisualVertex.java	2013-10-21 17:36:57 +0000
+++ CpogsPlugin/src/org/workcraft/plugins/cpog/VisualVertex.java	2014-04-09 17:15:15 +0000
@@ -28,9 +28,7 @@
 import java.awt.Graphics2D;
 import java.awt.Shape;
 import java.awt.event.KeyEvent;
-import java.awt.geom.AffineTransform;
 import java.awt.geom.Ellipse2D;
-import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
 import java.io.IOException;
 import java.util.HashMap;
@@ -41,31 +39,26 @@
 import org.workcraft.dom.visual.DrawRequest;
 import org.workcraft.dom.visual.VisualComponent;
 import org.workcraft.gui.Coloriser;
+import org.workcraft.gui.graph.tools.Decoration;
 import org.workcraft.observation.PropertyChangedEvent;
 import org.workcraft.plugins.cpog.expressions.CpogFormulaVariable;
 import org.workcraft.plugins.cpog.expressions.CpogVisitor;
 import org.workcraft.plugins.cpog.optimisation.BooleanFormula;
 import org.workcraft.plugins.cpog.optimisation.BooleanVariable;
 import org.workcraft.plugins.cpog.optimisation.booleanvisitors.BooleanReplacer;
-import org.workcraft.plugins.cpog.optimisation.booleanvisitors.FormulaRenderingResult;
-import org.workcraft.plugins.cpog.optimisation.booleanvisitors.FormulaToGraphics;
 import org.workcraft.plugins.cpog.optimisation.expressions.One;
 import org.workcraft.plugins.cpog.optimisation.expressions.Zero;
 
 @Hotkey(KeyEvent.VK_V)
 @SVGIcon("images/icons/svg/vertex.svg")
-public class VisualVertex extends VisualComponent implements CpogFormulaVariable
-{
-	private final static double size = 1;
-	private final static float strokeWidth = 0.1f;
-	private static Font labelFont;
-	private Point2D labelPosition = null;
-	private Rectangle2D labelBoundingBox = null;
+public class VisualVertex extends VisualComponent implements CpogFormulaVariable {
+	public static Font conditionFont;
+	private RenderedFormula conditionRenderedFormula = new RenderedFormula("", One.instance(), conditionFont, getLabelPositioning(), getLabelOffset());
 	
 	static {
 		try {
 			Font font = Font.createFont(Font.TYPE1_FONT, ClassLoader.getSystemResourceAsStream("fonts/eurm10.pfb"));
-			labelFont = font.deriveFont(0.5f);
+			conditionFont = font.deriveFont(0.5f);
 		} catch (FontFormatException e) {
 			e.printStackTrace();
 		} catch (IOException e) {
@@ -77,83 +70,71 @@
 		super(vertex);
 	}
 	
-	public void draw(DrawRequest r)
-	{
+	
+	
+	@Override
+	public void draw(DrawRequest r) {
 		Graphics2D g = r.getGraphics();
 		Color colorisation = r.getDecoration().getColorisation();
 		Color background = r.getDecoration().getBackground();
-		
-		Shape shape = new Ellipse2D.Double(-size / 2 + strokeWidth / 2, -size / 2 + strokeWidth / 2,
+		Shape shape = new Ellipse2D.Double(
+				-size / 2 + strokeWidth / 2, -size / 2 + strokeWidth / 2, 
 				size - strokeWidth, size - strokeWidth);
 
 		BooleanFormula value = evaluate();
-		
 		g.setColor(Coloriser.colorise(getFillColor(), background));
 		g.fill(shape);
-		
 		g.setColor(Coloriser.colorise(getForegroundColor(), colorisation));
-		if (value == Zero.instance())
-		{
-			g.setStroke(new BasicStroke(strokeWidth, BasicStroke.CAP_BUTT,
+		if (value == Zero.instance()) {
+			g.setStroke(new BasicStroke((float)strokeWidth, BasicStroke.CAP_BUTT,
 			        BasicStroke.JOIN_MITER, 1.0f, new float[] {0.18f, 0.18f}, 0.00f));
-		}
-		else
-		{
-			g.setStroke(new BasicStroke(strokeWidth));
+		} else {
+			g.setStroke(new BasicStroke((float)strokeWidth));
 			if (value != One.instance())
 				g.setColor(Coloriser.colorise(Color.LIGHT_GRAY, colorisation));
 		}
-			
 		g.draw(shape);
-		drawLabelInLocalSpace(r);
+		drawConditionInLocalSpace(r);
 	}
-
-	protected void drawLabelInLocalSpace(DrawRequest r)
-	{
-		Graphics2D g = r.getGraphics();
-		Color colorisation = r.getDecoration().getColorisation();
-		
+	
+	protected void cacheConditionRenderedFormula(DrawRequest r) {
 		String text = getLabel();
-		if (getCondition() != One.instance()) text += ": ";
-		FormulaRenderingResult result = FormulaToGraphics.print(text, labelFont, g.getFontRenderContext());
-		if (getCondition() != One.instance()) result.add(FormulaToGraphics.render(getCondition(), g.getFontRenderContext(), labelFont));
-			
-		Rectangle2D gbb = result.boundingBox;
-		labelPosition = new Point2D.Double(
-			-gbb.getCenterX() + 0.5 * getLabelPositioning().xOffset * (1.0 + gbb.getWidth() + 0.2),
-			-gbb.getCenterY() + 0.5 * getLabelPositioning().yOffset * (1.0 + gbb.getHeight() + 0.2));
-		labelBoundingBox = new Rectangle2D.Double(gbb.getX() + labelPosition.getX(), gbb.getY() + labelPosition.getY(),
-				gbb.getWidth(), gbb.getHeight());
-
-		AffineTransform oldTransform = g.getTransform();
-		g.translate(labelPosition.getX(), labelPosition.getY());
-		result.draw(g, Coloriser.colorise(getLabelColor(), colorisation));
-		g.setTransform(oldTransform);
-	}
-
-	public Rectangle2D getBoundingBoxInLocalSpace()
-	{
-		Rectangle2D bb = new Rectangle2D.Double(-size / 2, -size / 2, size, size);
-		return BoundingBoxHelper.union(bb, labelBoundingBox);
-	}
-
-	public boolean hitTestInLocalSpace(Point2D pointInLocalSpace)
-	{
-		return pointInLocalSpace.distanceSq(0, 0) < size * size / 4;		
-	}
-
-	public Vertex getMathVertex()
-	{
+		if (getCondition() != One.instance()) {
+			text += ": ";
+		}
+		if (conditionRenderedFormula.isDifferent(text, getCondition(), conditionFont, getLabelPositioning(), getLabelOffset())) {
+			conditionRenderedFormula = new RenderedFormula(text, getCondition(), conditionFont, getLabelPositioning(), getLabelOffset());
+		}
+	}
+
+	protected void drawConditionInLocalSpace(DrawRequest r) {
+		if (getLabelVisibility()) {
+			Graphics2D g = r.getGraphics();
+			Decoration d = r.getDecoration();
+			cacheConditionRenderedFormula(r);
+			g.setColor(Coloriser.colorise(getLabelColor(), d.getColorisation()));
+			conditionRenderedFormula.draw(g);
+		}
+	}
+
+	@Override
+	public Rectangle2D getBoundingBoxInLocalSpace() {
+		Rectangle2D bb = super.getBoundingBoxInLocalSpace();
+		if (getLabelVisibility()) {
+			bb = BoundingBoxHelper.union(bb, conditionRenderedFormula.getBoundingBox());
+		}
+		return bb;
+	}
+
+	public Vertex getMathVertex() {
 		return (Vertex) getReferencedComponent();
 	}
 
-	public BooleanFormula getCondition()
-	{
+	public BooleanFormula getCondition() {
 		return getMathVertex().getCondition();
 	}
 
-	public void setCondition(BooleanFormula condition)
-	{
+	public void setCondition(BooleanFormula condition) {
 		getMathVertex().setCondition(condition);
 		sendNotification(new PropertyChangedEvent(this, "condition"));
 	}
@@ -181,4 +162,5 @@
 	public <T> T accept(CpogVisitor<T> visitor) {
 		return visitor.visit(this);
 	}
+
 }

=== modified file 'CpogsPlugin/src/org/workcraft/plugins/cpog/optimisation/booleanvisitors/FormulaRenderingResult.java'
--- CpogsPlugin/src/org/workcraft/plugins/cpog/optimisation/booleanvisitors/FormulaRenderingResult.java	2010-05-01 15:12:53 +0000
+++ CpogsPlugin/src/org/workcraft/plugins/cpog/optimisation/booleanvisitors/FormulaRenderingResult.java	2014-04-09 17:15:15 +0000
@@ -1,7 +1,6 @@
 package org.workcraft.plugins.cpog.optimisation.booleanvisitors;
 
 import java.awt.BasicStroke;
-import java.awt.Color;
 import java.awt.Graphics2D;
 import java.awt.font.GlyphVector;
 import java.awt.geom.Line2D;
@@ -39,10 +38,8 @@
 		visualTop = Math.min(visualTop, summand.visualTop);
 	}
 	
-	public void draw(Graphics2D g, Color color)
+	public void draw(Graphics2D g)
 	{
-		g.setColor(color);
-		
 		int k = 0;
 		for(GlyphVector glyph : glyphs)
 		{

=== modified file 'SONPlugin/src/org/workcraft/plugins/son/elements/VisualCondition.java'
--- SONPlugin/src/org/workcraft/plugins/son/elements/VisualCondition.java	2014-01-02 14:47:00 +0000
+++ SONPlugin/src/org/workcraft/plugins/son/elements/VisualCondition.java	2014-04-09 17:15:15 +0000
@@ -32,11 +32,11 @@
 @DisplayName("Condition")
 @Hotkey(KeyEvent.VK_B)
 @SVGIcon("images/icons/svg/place_empty.svg")
-public class VisualCondition extends VisualComponent{
+public class VisualCondition extends VisualComponent {
 
 	private Font errorFont = new Font("Sans-serif", Font.PLAIN, 1).deriveFont(0.45f);
 	private Positioning errLabelPositioning = SONSettings.getErrLabelPositioning();
-	private RenderedText errorRenderedText = new RenderedText("", errorFont, errLabelPositioning, 0.0);
+	private RenderedText errorRenderedText = new RenderedText("", errorFont, errLabelPositioning, getErrLabelOffset());
 	private Color errLabelColor = SONSettings.getErrLabelColor();
 	
 	protected static double singleTokenSize = CommonVisualSettings.getBaseSize() / 1.9;
@@ -123,9 +123,19 @@
 		}
 	}
 	
+	private Point2D getErrLabelOffset() {
+        Point2D result = getOffset(errLabelPositioning);
+        if (errLabelPositioning.ySign < 0) {
+        	result.setLocation(result.getX(), result.getY() - 0.4);
+        } else {
+        	result.setLocation(result.getX(), result.getY() + 0.4);
+        }
+        return result;
+	}
+	
 	private void cahceErrorRenderedText(DrawRequest r) {
 		String error = "Err = "+((Integer)this.getErrors()).toString();
-		double offset = 0.8 * size;
+		Point2D offset = getErrLabelOffset();
 		if (errorRenderedText.isDifferent(error, labelFont, errLabelPositioning, offset)) {
 			errorRenderedText = new RenderedText(error, labelFont, errLabelPositioning, offset);
 		}

=== modified file 'STGPlugin/src/org/workcraft/plugins/stg/VisualNamedTransition.java'
--- STGPlugin/src/org/workcraft/plugins/stg/VisualNamedTransition.java	2014-01-07 16:03:24 +0000
+++ STGPlugin/src/org/workcraft/plugins/stg/VisualNamedTransition.java	2014-04-09 17:15:15 +0000
@@ -41,7 +41,7 @@
 
 public class VisualNamedTransition extends VisualTransition implements StateObserver {
 	public static Font font = new Font("Sans-serif", Font.PLAIN, 1).deriveFont(0.75f);
-	private RenderedText renderedText = new RenderedText("", font, Positioning.CENTER, 0.0);
+	private RenderedText renderedText = new RenderedText("", font, Positioning.CENTER, getRenderedTextOffset());
 
 	public VisualNamedTransition(Transition transition) {
 		super(transition, false, false, false);
@@ -49,14 +49,18 @@
 		updateRenderedText();
 	}
 
+	public Point2D getRenderedTextOffset() {
+		return new Point2D.Double(0.0, 0.0);
+	}
+
 	@Override
 	public boolean getLabelVisibility() {
 		return false;
 	}
 
 	@Override
-	public double getLabelOffset() {
-		return 0.0;
+	public Point2D getLabelOffset() {
+		return new Point2D.Double(0.0, 0.0);
 	}
 
 	@Override
@@ -65,8 +69,8 @@
 	}
 
 	@Override
-	public double getNameOffset() {
-		return 0.0;
+	public Point2D getNameOffset() {
+		return new Point2D.Double(0.0, 0.0);
 	}
 
 	@Override
@@ -98,9 +102,10 @@
 	}
 	
 	protected void updateRenderedText() {
-		if (renderedText.isDifferent(getName(), font, Positioning.CENTER, 0.0)) {
+		Point2D offset = getRenderedTextOffset();
+		if (renderedText.isDifferent(getName(), font, Positioning.CENTER, offset)) {
 			transformChanging(true);
-			renderedText = new RenderedText(getName(), font, Positioning.CENTER, 0.0);
+			renderedText = new RenderedText(getName(), font, Positioning.CENTER, offset);
 			transformChanged(true);
 		}
 	}

=== modified file 'WorkcraftCore/src/org/workcraft/dom/visual/Positioning.java'
--- WorkcraftCore/src/org/workcraft/dom/visual/Positioning.java	2013-12-16 12:01:22 +0000
+++ WorkcraftCore/src/org/workcraft/dom/visual/Positioning.java	2014-04-09 17:15:15 +0000
@@ -4,15 +4,15 @@
 import java.util.Map;
 
 public enum Positioning {
-	TOP("Top", 0.0, -1.3), 
-	BOTTOM("Bottom", 0.0, 1.3),
-	LEFT("Left", -1.3, 0.0), 
-	RIGHT("Right", 1.3, 0.0), 
+	TOP("Top", 0.0, -0.2), 
+	BOTTOM("Bottom", 0.0, 0.2),
+	LEFT("Left", -0.2, 0.0), 
+	RIGHT("Right", 0.2, 0.0), 
 	CENTER("Center", 0.0, 0.0),
-	TOP_LEFT("Top-Left", -1.1, -1.3), 
-	TOP_RIGHT("Top-Right", 1.1, -1.3), 
-	BOTTOM_LEFT("Bottom-Left", -1.1, 1.3),
-	BOTTOM_RIGHT("Bottom-Right", 1.1, 1.3); 
+	TOP_LEFT("Top-Left", -0.2, -0.2), 
+	TOP_RIGHT("Top-Right", 0.2, -0.2), 
+	BOTTOM_LEFT("Bottom-Left", -0.2, 0.2),
+	BOTTOM_RIGHT("Bottom-Right", 0.2, 0.2); 
 
 	public final String name;
 	public final double xOffset;

=== modified file 'WorkcraftCore/src/org/workcraft/dom/visual/RenderedText.java'
--- WorkcraftCore/src/org/workcraft/dom/visual/RenderedText.java	2013-12-27 18:14:34 +0000
+++ WorkcraftCore/src/org/workcraft/dom/visual/RenderedText.java	2014-04-09 17:15:15 +0000
@@ -12,26 +12,31 @@
 	final public String text;
 	final public Font font;
 	final public Positioning positioning;
-	final public double offset;
+	final public double xOffset;
+	final public double yOffset;
 	final private GlyphVector glyphVector;
 	private Rectangle2D boundingBox;
 
-	public RenderedText(String text, Font font, Positioning positioning, double offset) {
+	public RenderedText(String text, Font font, Positioning positioning, Point2D offset) {
 		this.text = text;
 		this.font = font;
 		this.positioning = positioning;
-		this.offset = offset;
+		this.xOffset = offset.getX();
+		this.yOffset = offset.getY();
 		final FontRenderContext context = new FontRenderContext(AffineTransform.getScaleInstance(1000, 1000), true, true);
 		glyphVector = font.createGlyphVector(context, text);
-		final Rectangle2D bb = BoundingBoxHelper.expand(glyphVector.getVisualBounds(), 0, 0);
-		boundingBox = BoundingBoxHelper.move(bb, -bb.getCenterX(), -bb.getCenterY());
-		double x = offset * positioning.xOffset + 0.5 * positioning.xSign * boundingBox.getWidth();
-		double y = offset * positioning.yOffset + 0.5 * positioning.ySign * boundingBox.getHeight();
+		final Rectangle2D bb = glyphVector.getVisualBounds();
+		double x = xOffset + positioning.xOffset + 0.5 * positioning.xSign * bb.getWidth();
+		double y = yOffset + positioning.yOffset + 0.5 * positioning.ySign * bb.getHeight();
 		boundingBox = BoundingBoxHelper.move(bb, x - bb.getCenterX(), y - bb.getCenterY());
 	}
 
-	public boolean isDifferent(String text, Font font, Positioning positioning, double offset) {
-		return (!text.equals(this.text) || font != this.font || positioning != this.positioning || offset != this.offset);
+	public boolean isDifferent(String text, Font font, Positioning positioning, Point2D offset) {
+		if (text == null) {
+			text = "";
+		}
+		return (!text.equals(this.text) || !font.equals(this.font) || positioning != this.positioning
+				|| offset.getX() != this.xOffset || offset.getY() != this.yOffset);
 	}
 	
 	public void draw (Graphics2D g) {

=== modified file 'WorkcraftCore/src/org/workcraft/dom/visual/VisualComment.java'
--- WorkcraftCore/src/org/workcraft/dom/visual/VisualComment.java	2014-01-03 16:49:50 +0000
+++ WorkcraftCore/src/org/workcraft/dom/visual/VisualComment.java	2014-04-09 17:15:15 +0000
@@ -50,8 +50,8 @@
 	}
 
 	@Override
-	public double getLabelOffset() {
-		return 0.0;
+	public Point2D getLabelOffset() {
+		return new Point2D.Double(0.0, 0.0);
 	}
 
 	@Override
@@ -60,8 +60,8 @@
 	}
 
 	@Override
-	public double getNameOffset() {
-		return 0.0;
+	public Point2D getNameOffset() {
+		return new Point2D.Double(0.0, 0.0);
 	}
 
 	@Override

=== modified file 'WorkcraftCore/src/org/workcraft/dom/visual/VisualComponent.java'
--- WorkcraftCore/src/org/workcraft/dom/visual/VisualComponent.java	2014-01-28 17:11:19 +0000
+++ WorkcraftCore/src/org/workcraft/dom/visual/VisualComponent.java	2014-04-09 17:15:15 +0000
@@ -244,11 +244,18 @@
 		return CommonVisualSettings.getLabelVisibility();
 	}
 	
-	public double getLabelOffset() {
-		return 0.5 * size;
+	public Point2D getOffset(Positioning positioning) {
+		Rectangle2D bb = getInternalBoundingBoxInLocalSpace();
+	    double xOffset = (positioning.xSign<0) ? bb.getMinX() : (positioning.xSign>0) ? bb.getMaxX() : bb.getCenterX();
+        double yOffset = (positioning.ySign<0) ? bb.getMinY() : (positioning.ySign>0) ? bb.getMaxY() : bb.getCenterY();
+        return new Point2D.Double(xOffset, yOffset);
+	}
+	
+	public Point2D getLabelOffset() {
+        return getOffset(labelPositioning);
 	}
 
-	private void cacheLabelRenderedText(DrawRequest r) {
+	protected void cacheLabelRenderedText(DrawRequest r) {
 		if (labelRenderedText.isDifferent(label, labelFont, labelPositioning, getLabelOffset())) {
 			labelRenderedText = new RenderedText(label, labelFont, labelPositioning, getLabelOffset());
 		}
@@ -268,15 +275,12 @@
 		return CommonVisualSettings.getNameVisibility();
 	}
 
-	public double getNameOffset() {
-		return 0.5 * size;
+	public Point2D getNameOffset() {
+        return getOffset(namePositioning);
 	}
 
-	private void cacheNameRenderedText(DrawRequest r) {
+	protected void cacheNameRenderedText(DrawRequest r) {
 		String name = r.getModel().getMathModel().getNodeReference(getReferencedComponent());
-		if (name == null) {
-			name = "";
-		}
 		if (nameRenderedText.isDifferent(name, nameFont, namePositioning, getNameOffset())) {
 			nameRenderedText = new RenderedText(name, nameFont, namePositioning, getNameOffset());
 		}
@@ -299,9 +303,17 @@
 		cacheNameRenderedText(r);
 	}
 	
+	/*
+     * The internal bounding box does not include the related label and name of the node
+     */
+    public Rectangle2D getInternalBoundingBoxInLocalSpace() {
+        Rectangle2D bb = new Rectangle2D.Double(-size / 2, -size / 2, size, size);
+        return bb;
+    }
+
 	@Override
 	public Rectangle2D getBoundingBoxInLocalSpace() {
-		Rectangle2D bb = new Rectangle2D.Double(-size / 2, -size / 2, size,	size);
+		Rectangle2D bb = getInternalBoundingBoxInLocalSpace();
 		if (getLabelVisibility()) {
 			bb = BoundingBoxHelper.union(bb, labelRenderedText.getBoundingBox());
 		}
@@ -313,8 +325,7 @@
 
 	@Override
 	public boolean hitTestInLocalSpace(Point2D pointInLocalSpace) {
-		return Math.abs(pointInLocalSpace.getX()) <= size / 2
-			&& Math.abs(pointInLocalSpace.getY()) <= size / 2;
+		return getInternalBoundingBoxInLocalSpace().contains(pointInLocalSpace);
 	}
 
 }
\ No newline at end of file

=== modified file 'WorkcraftCore/src/org/workcraft/dom/visual/VisualTransformableNode.java'
--- WorkcraftCore/src/org/workcraft/dom/visual/VisualTransformableNode.java	2014-01-07 16:03:24 +0000
+++ WorkcraftCore/src/org/workcraft/dom/visual/VisualTransformableNode.java	2014-04-09 17:15:15 +0000
@@ -136,7 +136,7 @@
 		return hitTestInLocalSpace(parentToLocalTransform.transform(point, null));
 	}
 	
-	public abstract Rectangle2D getBoundingBoxInLocalSpace();
+	public abstract Rectangle2D getBoundingBoxInLocalSpace();
 
     public final Rectangle2D getBoundingBox() {
     	return transformToParentSpace(getBoundingBoxInLocalSpace());