Revision: 727
Author: allain.lalonde
Date: Thu Oct 15 06:40:46 2009
Log: Applying patches in fixing Issue #70 by applying patches found in the
issue. I also updated the Basic SWT example so that it show the text's
background color in use. Thank you dimwethion for submitting the initial
patch.
http://code.google.com/p/piccolo2d/source/detail?r=727
Modified:
/piccolo2d.java/trunk/swt/src/main/java/edu/umd/cs/piccolox/swt/PSWTPath.java
/piccolo2d.java/trunk/swt/src/main/java/edu/umd/cs/piccolox/swt/PSWTText.java
/piccolo2d.java/trunk/swt/src/main/java/edu/umd/cs/piccolox/swt/SWTGraphics2D.java
/piccolo2d.java/trunk/swt-examples/src/main/java/edu/umd/cs/piccolox/swt/examples/SWTBasicExample.java
=======================================
---
/piccolo2d.java/trunk/swt/src/main/java/edu/umd/cs/piccolox/swt/PSWTPath.java
Thu Jul 30 14:59:39 2009
+++
/piccolo2d.java/trunk/swt/src/main/java/edu/umd/cs/piccolox/swt/PSWTPath.java
Thu Oct 15 06:40:46 2009
@@ -273,7 +273,7 @@
shapePts[3] - lineWidth, shapePts[4], shapePts[5]);
}
else {
- g2.fillPolygon(shapePts);
+ g2.fill(shape);
}
}
@@ -297,10 +297,8 @@
g2.drawRoundRect(shapePts[0] + lineWidth / 2, shapePts[1]
+ lineWidth / 2, shapePts[2] - lineWidth,
shapePts[3] - lineWidth, shapePts[4], shapePts[5]);
}
- else {
- // TODO The bounds may be incorrect for polylines at the
moment
- // - resulting in graphics turds at some scales
- g2.drawPolyline(shapePts);
+ else {
+ g2.draw(shape);
}
}
@@ -391,9 +389,7 @@
final Line2D l2 = (Line2D) aShape;
return new Line2D.Double(l2.getP1(), l2.getP2());
}
- else {
- // again: either throw or don't - but nothing in between
please.
- // new Exception().printStackTrace();
+ else {
final GeneralPath aPath = new GeneralPath();
aPath.append(aShape, false);
return aPath;
=======================================
---
/piccolo2d.java/trunk/swt/src/main/java/edu/umd/cs/piccolox/swt/PSWTText.java
Tue Jul 28 12:46:54 2009
+++
/piccolo2d.java/trunk/swt/src/main/java/edu/umd/cs/piccolox/swt/PSWTText.java
Thu Oct 15 06:40:46 2009
@@ -35,11 +35,7 @@
* same version of Jazz. A future release of Jazz will provide support for
long
* term persistence.
*/
-public class PSWTText extends PNode {
-
- /**
- *
- */
+public class PSWTText extends PNode {
private static final long serialVersionUID = 1L;
/**
@@ -82,11 +78,21 @@
*/
static protected final String DEFAULT_TEXT = "";
+ /**
+ * Default transparent state
+ */
+ static protected final boolean DEFAULT_IS_TRANSPARENT = false;
+
/**
* Default padding
*/
static protected final int DEFAULT_PADDING = 2;
+ /**
+ * Should text be drawn with transparent mode?
+ */
+ private boolean isTransparent = DEFAULT_IS_TRANSPARENT;
+
/**
* Below this magnification text is rendered as greek.
*/
@@ -212,6 +218,26 @@
public void setBackgroundColor(final Color color) {
super.setPaint(color);
}
+
+ /**
+ * Sets whether the text should be drawn in transparent mode, i.e.,
whether
+ * the background should be drawn or not.
+ *
+ * @param isTransparent
+ */
+ public void setTransparent(boolean isTransparent) {
+ this.isTransparent = isTransparent;
+ }
+
+ /**
+ * Returns whether the text should be drawn using the transparent mode,
+ * i.e., whether the background should be drawn or not.
+ *
+ * @return
+ */
+ public boolean isTransparent() {
+ return isTransparent;
+ }
/**
* Returns the current greek threshold. Below this magnification text
is
@@ -441,24 +467,19 @@
public void paintAsText(final PPaintContext ppc) {
final SWTGraphics2D sg2 = (SWTGraphics2D) ppc.getGraphics();
- if (getPaint() != null) {
- sg2.setBackground((Color) getPaint());
+ if (!isTransparent) {
+ if (getPaint() == null) {
+ sg2.setBackground(Color.WHITE);
+ } else {
+ sg2.setBackground((Color)getPaint());
+ }
+
final Rectangle2D rect = new Rectangle2D.Double(0.0, 0.0,
getWidth(), getHeight());
sg2.fillRect(rect.getX(), rect.getY(), rect.getWidth(),
rect.getHeight());
}
sg2.translate(padding, padding);
- final double scale = Math.min(sg2.getTransform().getScaleX(),
sg2.getTransform().getScaleY());
- final double dSize = scale * font.getSize();
- final double fixupScale = Math.floor(dSize) / dSize;
-
- // This moves the text size down to the next closest integer size
- to
- // help it stay in
- // it's alloted bounds. This is because SWT only supports integer
font
- // metrics
- sg2.scale(fixupScale, fixupScale);
-
// Render each line of text
// Note that the entire text gets rendered so that it's upper left
// corner
@@ -481,12 +502,10 @@
y = lineNum * metrics.getHeight();
- sg2.drawString(line, 0, y);
+ sg2.drawString(line, 0, y, isTransparent);
lineNum++;
}
-
- sg2.scale(1 / fixupScale, 1 / fixupScale);
sg2.translate(-padding, -padding);
}
=======================================
---
/piccolo2d.java/trunk/swt/src/main/java/edu/umd/cs/piccolox/swt/SWTGraphics2D.java
Thu Sep 17 23:38:55 2009
+++
/piccolo2d.java/trunk/swt/src/main/java/edu/umd/cs/piccolox/swt/SWTGraphics2D.java
Thu Oct 15 06:40:46 2009
@@ -48,6 +48,8 @@
import java.awt.geom.AffineTransform;
import java.awt.geom.Arc2D;
import java.awt.geom.Ellipse2D;
+import java.awt.geom.NoninvertibleTransformException;
+import java.awt.geom.PathIterator;
import java.awt.geom.Rectangle2D;
import java.awt.geom.RoundRectangle2D;
import java.awt.image.BufferedImage;
@@ -64,6 +66,8 @@
import org.eclipse.swt.graphics.Device;
import org.eclipse.swt.graphics.FontData;
import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Path;
+import org.eclipse.swt.graphics.Transform;
/**
* An extension to Graphics2D to support an SWT Piccolo Canvas with little
@@ -80,31 +84,39 @@
*/
public class SWTGraphics2D extends Graphics2D {
+ private static final boolean DEFAULT_STRING_TRANSPARENCY = true;
protected static int CACHE_COUNT = 0;
protected static HashMap FONT_CACHE = new HashMap();
protected static HashMap COLOR_CACHE = new HashMap();
protected static HashMap SHAPE_CACHE = new HashMap();
protected static BufferedImage BUFFER = new BufferedImage(1, 1,
BufferedImage.TYPE_INT_ARGB);
- static Point PT = new Point();
- static Rectangle2D RECT = new Rectangle2D.Double();
- static Rectangle2D LINE_RECT = new Rectangle2D.Double();
- static org.eclipse.swt.graphics.Rectangle SWT_RECT = new
org.eclipse.swt.graphics.Rectangle(0, 0, 0, 0);
+ private static Point PT = new Point();
+ private static Rectangle2D RECT = new Rectangle2D.Double();
+ private static Rectangle2D LINE_RECT = new Rectangle2D.Double();
+ private static org.eclipse.swt.graphics.Rectangle SWT_RECT = new
org.eclipse.swt.graphics.Rectangle(0, 0, 0, 0);
protected GC gc;
protected Device device;
protected AffineTransform transform = new AffineTransform();
+ private Transform swtTransform;
protected org.eclipse.swt.graphics.Font curFont;
protected double lineWidth = 1.0;
/**
* Constructor for SWTGraphics2D.
+ *
+ * @param gc The Eclipse Graphics Context onto which all Graphics2D
+ * operations are delegating
+ * @param device Device onto which ultimately all gc operations are
drawn
+ * onto
*/
public SWTGraphics2D(final GC gc, final Device device) {
- super();
-
this.gc = gc;
this.device = device;
+
+ swtTransform = new Transform(device);
+ gc.setAntialias(SWT.ON);
}
// //////////////////
@@ -146,7 +158,9 @@
}
/**
- * This method isn't really supported by SWT - so will use the shape
bounds
+ * This method isn't really supported by SWT - so will use the shape
bounds.
+ *
+ * @param s shape of the clipping region to apply to graphics
operations
*/
public void clip(final Shape s) {
final Rectangle2D clipBds = s.getBounds2D();
@@ -161,6 +175,9 @@
/**
* This method isn't really supported by SWT - so will use the shape
bounds
+ *
+ * @param clip the desired clipping region's shape, will be simplified
to
+ * its bounds
*/
public void setClip(final Shape clip) {
if (clip == null) {
@@ -181,7 +198,7 @@
try {
SWTShapeManager.transform(aRect, transform.createInverse());
}
- catch (final Exception e) {
+ catch (final NoninvertibleTransformException e) {
throw new RuntimeException(e);
}
return aRect;
@@ -273,7 +290,7 @@
style = style | SWT.ITALIC;
}
- return new Font(fd[0].getName(), style, fd[0].getHeight());
+ return new Font(fd[0].getName(), style, (int)
(fd[0].height + 0.5));
}
return null;
}
@@ -321,6 +338,9 @@
return cachedFont;
}
+ /**
+ * @deprecated
+ */
protected org.eclipse.swt.graphics.Font getTransformedFont() {
if (curFont != null) {
final FontData fontData = curFont.getFontData()[0];
@@ -342,41 +362,105 @@
public void translate(final int x, final int y) {
transform.translate(x, y);
+ updateSWTTransform();
}
public void translate(final double tx, final double ty) {
transform.translate(tx, ty);
+ updateSWTTransform();
}
public void rotate(final double theta) {
transform.rotate(theta);
+ updateSWTTransform();
}
public void rotate(final double theta, final double x, final double y)
{
transform.rotate(theta, x, y);
+ updateSWTTransform();
}
public void scale(final double sx, final double sy) {
transform.scale(sx, sy);
+ updateSWTTransform();
}
public void shear(final double shx, final double shy) {
transform.shear(shx, shy);
+ updateSWTTransform();
}
public void transform(final AffineTransform Tx) {
transform.concatenate(Tx);
+ updateSWTTransform();
}
public void setTransform(final AffineTransform Tx) {
transform = (AffineTransform) Tx.clone();
+ updateSWTTransform();
}
public AffineTransform getTransform() {
return (AffineTransform) transform.clone();
}
+ // SUPPORT METHODS
// /////////////////////////////
+
+ /**
+ * Updates the SWT transform instance such that it matches AWTs
counterpart.
+ */
+ private void updateSWTTransform() {
+ double[] m = new double[6];
+ transform.getMatrix(m);
+ swtTransform.setElements((float) m[0], (float) m[1], (float) m[2],
(float) m[3], (float) m[4], (float) m[5]);
+ }
+
+ /**
+ * Converts a java 2d path iterator to a SWT path.
+ *
+ * @param iter specifies the iterator to be converted.
+ * @return the corresponding path object. Must be disposed() when no
longer
+ * used.
+ */
+
+ private Path pathIterator2Path(PathIterator iter) {
+ float[] coords = new float[6];
+
+ Path path = new Path(device);
+
+ while (!iter.isDone()) {
+ int type = iter.currentSegment(coords);
+
+ switch (type) {
+ case PathIterator.SEG_MOVETO:
+ path.moveTo(coords[0], coords[1]);
+ break;
+
+ case PathIterator.SEG_LINETO:
+ path.lineTo(coords[0], coords[1]);
+ break;
+
+ case PathIterator.SEG_CLOSE:
+ path.close();
+ break;
+
+ case PathIterator.SEG_QUADTO:
+ path.quadTo(coords[0], coords[1], coords[2],
coords[3]);
+ break;
+
+ case PathIterator.SEG_CUBICTO:
+ path.cubicTo(coords[0], coords[1], coords[2],
coords[3], coords[4], coords[5]);
+ break;
+ }
+
+ iter.next();
+ }
+ return path;
+ }
+
+ // /////////////////////////////
+ // /////////////////////////////
// DRAWING AND FILLING METHODS
// /////////////////////////////
@@ -402,14 +486,12 @@
drawArc(a2.getX(), a2.getY(), a2.getWidth(), a2.getHeight(),
a2.getAngleStart(), a2.getAngleExtent());
}
else {
- double[] pts = (double[]) SHAPE_CACHE.get(s);
-
- if (pts == null) {
- pts = SWTShapeManager.shapeToPolyline(s);
- SHAPE_CACHE.put(s, pts);
- }
-
- drawPolyline(pts);
+ Path p = (Path) SHAPE_CACHE.get(s);
+ if (p == null) {
+ p = pathIterator2Path(s.getPathIterator(null));
+ SHAPE_CACHE.put(s, p);
+ }
+ drawPath(p);
}
}
@@ -431,14 +513,12 @@
fillArc(a2.getX(), a2.getY(), a2.getWidth(), a2.getHeight(),
a2.getAngleStart(), a2.getAngleExtent());
}
else {
- double[] pts = (double[]) SHAPE_CACHE.get(s);
-
- if (pts == null) {
- pts = SWTShapeManager.shapeToPolyline(s);
- SHAPE_CACHE.put(s, pts);
- }
-
- fillPolygon(pts);
+ Path p = (Path) SHAPE_CACHE.get(s);
+ if (p == null) {
+ p = pathIterator2Path(s.getPathIterator(null));
+ SHAPE_CACHE.put(s, p);
+ }
+ drawPath(p);
}
}
@@ -530,33 +610,34 @@
.getX(), (int) PT.getY());
}
- public void drawString(final String str, final double x, final double
y) {
- PT.setLocation(x, y);
- transform.transform(PT, PT);
- gc.setFont(getTransformedFont());
- gc.drawString(str, (int) (PT.getX() + 0.5), (int) (PT.getY() +
0.5), true);
+ public void drawString(String str, int x, int y, boolean
isTransparent) {
+ gc.setTransform(swtTransform);
+ gc.drawString(str, x, y, isTransparent);
+ gc.setTransform(null);
}
public void drawString(final String str, final int x, final int y) {
- drawString(str, (double) x, (double) y);
+ drawString(str, x, y, DEFAULT_STRING_TRANSPARENCY);
+ }
+
+ public void drawString(String str, double x, double y) {
+ drawString(str, (int) (x + 0.5), (int) (y + 0.5));
+ }
+
+ public void drawString(String str, double x, double y, boolean
isTransparent) {
+ drawString(str, (int) (x + 0.5), (int) (y + 0.5), isTransparent);
}
public void drawString(final String str, final float x, final float y)
{
- drawString(str, (double) x, (double) y);
+ drawString(str, (int) (x + 0.5), (int) (y + 0.5));
}
public void drawText(final String s, final double x, final double y) {
- PT.setLocation(x, y);
- transform.transform(PT, PT);
- gc.setFont(getTransformedFont());
- gc.drawText(s, (int) (PT.getX() + 0.5), (int) (PT.getY() + 0.5),
true);
+ drawString(s, (int) (x + 0.5), (int) (y + 0.5));
}
public void drawText(final String s, final double x, final double y,
final int flags) {
- PT.setLocation(x, y);
- transform.transform(PT, PT);
- gc.setFont(getTransformedFont());
- gc.drawText(s, (int) (PT.getX() + 0.5), (int) (PT.getY() + 0.5),
flags);
+ drawText(s, (int) (x + 0.5), (int) (y + 0.5), flags);
}
public void drawRect(final int x, final int y, final int width, final
int height) {
@@ -683,6 +764,18 @@
gc.drawArc((int) (RECT.getX() + 0.5), (int) (RECT.getY() + 0.5),
(int) (RECT.getWidth() + 0.5), (int) (RECT
.getHeight() + 0.5), (int) (startAngle + 0.5), (int)
(startAngle + extent + 0.5));
}
+
+ public void drawPath(Path p) {
+ gc.setTransform(swtTransform);
+ gc.drawPath(p);
+ gc.setTransform(null);
+ }
+
+ public void fillPath(Path p) {
+ gc.setTransform(swtTransform);
+ gc.fillPath(p);
+ gc.setTransform(null);
+ }
// ////////////////////////
// SWT IMAGE METHODS
@@ -995,6 +1088,11 @@
final org.eclipse.swt.graphics.Color color =
(org.eclipse.swt.graphics.Color) i.next();
color.dispose();
}
+ for (Iterator i = SHAPE_CACHE.values().iterator();
i.hasNext();) {
+ Path path = (Path) i.next();
+ path.dispose();
+ }
}
}
-}
+
+}
=======================================
---
/piccolo2d.java/trunk/swt-examples/src/main/java/edu/umd/cs/piccolox/swt/examples/SWTBasicExample.java
Wed Oct 14 21:00:12 2009
+++
/piccolo2d.java/trunk/swt-examples/src/main/java/edu/umd/cs/piccolox/swt/examples/SWTBasicExample.java
Thu Oct 15 06:40:46 2009
@@ -85,6 +85,7 @@
PSWTText text = new PSWTText("Hello World");
text.translate(350, 150);
text.setPenColor(Color.GRAY);
+ text.setBackgroundColor(Color.BLACK);
canvas.getLayer().addChild(text);
text = new PSWTText("Goodbye World");
--~--~---------~--~----~------------~-------~--~----~
Piccolo2D Developers Group: http://groups.google.com/group/piccolo2d-dev?hl=en
-~----------~----~----~----~------~----~------~--~---
