From 10884452fdd5ebd23e49ca515827fffcfad54d33 Mon Sep 17 00:00:00 2001
From: bancika <bancika@813357f0-ed8a-11de-91ba-91c70a792394>
Date: Thu, 2 Feb 2012 04:29:45 +0000
Subject: [PATCH]

---
 .../diylc-core/library/main.jar               | Bin 99877 -> 100163 bytes
 .../org/diylc/presenter/DrawingManager.java   |  43 ++++++++++--------
 .../src/org/diylc/presenter/G2DWrapper.java   |  26 +++++++++--
 .../src/org/diylc/presenter/Presenter.java    |   2 +-
 4 files changed, 46 insertions(+), 25 deletions(-)

diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/library/main.jar b/ diy-layout-creator --username bancika@gmail.com/diylc-core/library/main.jar
index 90d9cd1ceaf064fa15de2b3d4a3907ddfb1b66a2..b2211645cdb7337287a5d69932eb78a689544aec 100644
GIT binary patch
delta 6025
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
GBmMz44rMn0

delta 5546
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
F{{coYX&C?j

diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/DrawingManager.java b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/DrawingManager.java
index 5a347c30..1b636a7a 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/DrawingManager.java	
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/DrawingManager.java	
@@ -205,26 +205,29 @@ public class DrawingManager {
 			// Do not track the area if component is not invalidated and was
 			// drawn in the same state.
 			boolean trackArea = lastDrawnStateMap.get(component) != state;
-			g2dWrapper.startedDrawingComponent();
-			if (!trackArea) {
-				g2dWrapper.stopTracking();
-			}
-			// Draw locked components in a new composite.
-			if (lockedComponents.contains(component)) {
-				g2d.setComposite(lockedComposite);
-			}
-			// Draw the component through the g2dWrapper.
-			try {
-				component.draw(g2dWrapper, state, drawOptions.contains(DrawOption.OUTLINE_MODE),
-						project, g2dWrapper);
-			} catch (Exception e) {
-				LOG.error("Error drawing " + component.getName(), e);
-				failedComponents.add(component);
-			}
-			Area area = g2dWrapper.finishedDrawingComponent();
-			if (trackArea && area != null && !area.isEmpty()) {
-				componentAreaMap.put(component, area);
-				lastDrawnStateMap.put(component, state);
+			
+			synchronized (g2d) {
+				g2dWrapper.startedDrawingComponent();
+				if (!trackArea) {
+					g2dWrapper.stopTracking();
+				}
+				// Draw locked components in a new composite.
+				if (lockedComponents.contains(component)) {
+					g2d.setComposite(lockedComposite);
+				}
+				// Draw the component through the g2dWrapper.
+				try {
+					component.draw(g2dWrapper, state,
+							drawOptions.contains(DrawOption.OUTLINE_MODE), project, g2dWrapper);
+				} catch (Exception e) {
+					LOG.error("Error drawing " + component.getName(), e);
+					failedComponents.add(component);
+				}
+				Area area = g2dWrapper.finishedDrawingComponent();
+				if (trackArea && area != null && !area.isEmpty()) {
+					componentAreaMap.put(component, area);
+					lastDrawnStateMap.put(component, state);
+				}
 			}
 		}
 
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/G2DWrapper.java b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/G2DWrapper.java
index 10e638f0..47c892b1 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/G2DWrapper.java	
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/G2DWrapper.java	
@@ -24,6 +24,7 @@ import java.awt.geom.Area;
 import java.awt.geom.CubicCurve2D;
 import java.awt.geom.Ellipse2D;
 import java.awt.geom.Line2D;
+import java.awt.geom.NoninvertibleTransformException;
 import java.awt.geom.PathIterator;
 import java.awt.geom.Point2D;
 import java.awt.geom.QuadCurve2D;
@@ -64,6 +65,7 @@ class G2DWrapper extends Graphics2D implements IDrawingObserver {
 	private AffineTransform originalTx;
 	private Font originalFont;
 	private AffineTransform currentTx;
+	private AffineTransform initialTx;
 	private Area currentArea;
 	private Shape lastShape;
 
@@ -91,6 +93,7 @@ class G2DWrapper extends Graphics2D implements IDrawingObserver {
 		originalComposite = canvasGraphics.getComposite();
 		originalFont = canvasGraphics.getFont();
 		currentTx = new AffineTransform();
+		initialTx = canvasGraphics.getTransform(); 
 		lastShape = null;
 		startTracking();
 	}
@@ -179,7 +182,7 @@ class G2DWrapper extends Graphics2D implements IDrawingObserver {
 						width, thickness);
 				Area area = new Area(rect);
 				area.transform(AffineTransform.getRotateInstance(theta, midX, midY));
-//				area.transform(currentTx);
+				// area.transform(currentTx);
 				appendShape(area);
 				// Set the prev point to line end
 				prevPoint = nextPoint;
@@ -294,8 +297,11 @@ class G2DWrapper extends Graphics2D implements IDrawingObserver {
 		if (drawingComponent && trackingAllowed) {
 			FontMetrics fontMetrics = canvasGraphics.getFontMetrics();
 			Rectangle2D rect = fontMetrics.getStringBounds(str, canvasGraphics);
-			appendShape(new Rectangle2D.Double(rect.getX() + x, rect.getY() + y, rect.getWidth(),
-					rect.getHeight()));
+			Point2D point = new Point2D.Double(x, y);
+			//currentTx.transform(point, point);
+			Rectangle2D finalRec = new Rectangle2D.Double(rect.getX() + point.getX(), rect.getY() + point.getY(), rect
+					.getWidth(), rect.getHeight());
+			appendShape(finalRec);
 		}
 	}
 
@@ -434,7 +440,19 @@ class G2DWrapper extends Graphics2D implements IDrawingObserver {
 	@Override
 	public void setTransform(AffineTransform Tx) {
 		canvasGraphics.setTransform(Tx);
-		currentTx = Tx;
+		currentTx = new AffineTransform(Tx);
+		try {
+			// Invert the tx that was set before we started drawing the component.
+			// We're left only component tx.
+			AffineTransform inverseInitialTx = initialTx.createInverse();
+			Point2D p = new Point2D.Double(currentTx.getTranslateX(), currentTx.getTranslateY());
+			inverseInitialTx.transform(p, p);
+			currentTx.concatenate(inverseInitialTx);
+			double[] matrix = new double[6];
+			currentTx.getMatrix(matrix);
+			currentTx.setTransform(matrix[0], matrix[1], matrix[2], matrix[3], p.getX(), p.getY());
+		} catch (NoninvertibleTransformException e) {
+		}
 	}
 
 	@Override
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/Presenter.java b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/Presenter.java
index e9e5b0de..4dfb8988 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/Presenter.java	
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/Presenter.java	
@@ -54,7 +54,7 @@ public class Presenter implements IPlugInPort {
 
 	private static final Logger LOG = Logger.getLogger(Presenter.class);
 
-	public static final VersionNumber CURRENT_VERSION = new VersionNumber(3, 0, 9);
+	public static final VersionNumber CURRENT_VERSION = new VersionNumber(3, 1, 0);
 	public static final String DEFAULTS_KEY_PREFIX = "default.";
 
 	public static final List<IDIYComponent<?>> EMPTY_SELECTION = Collections.emptyList();