Add the Draw / ImageInfo properties to the DrawingContext.

3 files changed, 345 insertions, 23 deletions

diff --git a/dmagick/DrawingContext.d b/dmagick/DrawingContext.d
index 9799786..51f24f3 100644
--- a/dmagick/DrawingContext.d
+++ b/dmagick/DrawingContext.d
@@ -6,29 +6,39 @@
 
 module dmagick.DrawingContext;
 
+import dmagick.Color;
+import dmagick.Geometry;
 import dmagick.Image;
+import dmagick.Options;
 
+import dmagick.c.draw;
 import dmagick.c.geometry;
+import dmagick.c.type;
 
+/**
+ * Drawable provides a convenient interface for preparing vector,
+ * image, or text arguments.
+ */
 class DrawingContext
 {
 	private void delegate(Image)[] actions;
 
-	//Image property changes that need undoing.
-	private void delegate(Image)[string] undo;
-
 	/**
 	 * Apply the drawing context to the image.
 	 */
 	void draw(Image image)
 	{
-		undo = null;
+		Options options = image.options.clone();
 
 		foreach ( action; actions )
 			action(image);
 
-		foreach ( u; undo )
-			u(image);
+		image.options = options;
+
+		//Make sure the ImageInfo an DrawInfo for these a in sync.
+		image.backgroundColor = options.backgroundColor;
+		image.borderColor = options.borderColor;
+		image.fuzz = options.fuzz;
 	}
 
 	/**
@@ -38,20 +48,8 @@ class DrawingContext
 	 */
 	void affine(AffineMatrix affine)
 	{
-		AffineMatrix oldAffine;
-
 		actions ~= (Image image)
 		{
-			if ( "affine" !in undo )
-			{
-				oldAffine = image.options.affine;
-
-				undo["affine"] = (Image image)
-				{
-					image.options.affine = oldAffine;
-				};
-			}
-
 			image.options.affine = affine;
 		};
 	}
@@ -66,4 +64,282 @@ class DrawingContext
 			image.affineTransform(affine);
 		};
 	}
+
+	/**
+	 * Control antialiasing of rendered Postscript
+	 * and Postscript or TrueType fonts. The default is true.
+	 */
+	void antialias(bool antialias)
+	{
+		actions ~= (Image image)
+		{
+			image.options.antialias = antialias;
+		};
+	}
+
+	/**
+	 * Set the image background color. The default is "white".
+	 */
+	void backgroundColor(Color color)
+	{
+		actions ~= (Image image)
+		{
+			image.backgroundColor = color;
+		};
+	}
+
+	/**
+	 * Set the image border color. The default is "#dfdfdf".
+	 */
+	void borderColor(string color)
+	{
+		actions ~= (Image image)
+		{
+			image.borderColor = color;
+		};
+	}
+
+
+	/**
+	 * If set, causes the text to be drawn over a box of the specified color.
+	 */
+	void boxColor(Color color)
+	{
+		actions ~= (Image image)
+		{
+			image.options.boxColor = color;
+		};
+	}
+
+	/**
+	 * Color to use when filling drawn objects.
+	 * The default is "black".
+	 */
+	void fillColor(Color color)
+	{
+		actions ~= (Image image)
+		{
+			image.options.fillColor = color;
+		};
+	}
+
+	/**
+	 * Pattern image to use when filling drawn objects.
+	 */
+	void fillPattern(Image pattern)
+	{
+		actions ~= (Image image)
+		{
+			image.options.fillPattern = pattern;
+		};
+	}
+
+	/**
+	 * Rule to use when filling drawn objects.
+	 */
+	void fillRule(FillRule rule)
+	{
+		actions ~= (Image image)
+		{
+			image.options.fillRule = rule;
+		};
+	}
+
+	/**
+	 * The _font name or filename.
+	 * You can tag a _font to specify whether it is a Postscript,
+	 * Truetype, or OPTION1 _font. For example, Arial.ttf is a
+	 * Truetype _font, ps:helvetica is Postscript, and x:fixed is OPTION1.
+	 * 
+	 * The _font name can be a complete filename such as
+	 * "/mnt/windows/windows/fonts/Arial.ttf". The _font name can
+	 * also be a fully qualified X font name such as
+	 * "-urw-times-medium-i-normal--0-0-0-0-p-0-iso8859-13".
+	 */
+	void font(string str)
+	{
+		actions ~= (Image image)
+		{
+			image.options.font = str;
+		};
+	}
+
+	/**
+	 * Specify font family, style, weight (one of the set { 100 | 200 |
+	 * 300 | 400 | 500 | 600 | 700 | 800 | 900 } with 400 being the normal
+	 * size), and stretch to be used to select the font used when drawing
+	 * text. Wildcard matches may be applied to style via the AnyStyle
+	 * enumeration, applied to weight if weight is zero, and applied to
+	 * stretch via the AnyStretch enumeration.
+	 */
+	void font(string family, StyleType style = StyleType.NormalStyle, size_t weight = 400, StretchType stretch = StretchType.NormalStretch)
+	{
+		actions ~= (Image image)
+		{
+			image.options.fontFamily  = family;
+			image.options.fontStyle   = style;
+			image.options.fontWeight  = weight;
+			image.options.fontStretch = stretch;
+		};
+	}
+
+	/**
+	 * Colors within this distance are considered equal. 
+	 * A number of algorithms search for a target  color.
+	 * By default the color must be exact. Use this option to match
+	 * colors that are close to the target color in RGB space.
+	 */
+	void fuzz(double f)
+	{
+		actions ~= (Image image)
+		{
+			image.fuzz = f;
+		};
+	}
+
+	/**
+	 * Text rendering font point size
+	 */
+	void pointSize(double size)
+	{
+		actions ~= (Image image)
+		{
+			image.options.pointSize = size;
+		};
+	}
+
+	/**
+	 * Enable or disable anti-aliasing when drawing object outlines.
+	 */
+	void strokeAntialias(bool antialias)
+	{
+		actions ~= (Image image)
+		{
+			image.options.strokeAntialias = antialias;
+		};
+	}
+
+	/**
+	 * Color to use when drawing object outlines
+	 */
+	void strokeColor(Color color)
+	{
+		actions ~= (Image image)
+		{
+			image.options.strokeColor = color;
+		};
+	}
+
+	/**
+	 * The initial distance into the dash pattern. The units are pixels.
+	 */
+	void strokeDashOffset(double offset)
+	{
+		actions ~= (Image image)
+		{
+			image.options.strokeDashOffset = offset;
+		};
+	}
+
+	/**
+	 * Describe a _pattern of dashes to be used when stroking paths.
+	 * The arguments are a list of pixel widths of
+	 * alternating dashes and gaps.
+	 * All elements must be > 0.
+	 */
+	void strokeDashPattern(const(double)[] pattern)
+	{
+		actions ~= (Image image)
+		{
+			image.options.strokeDashPattern = pattern;
+		};
+	}
+
+	/**
+	 * Specify how the line ends should be drawn.
+	 */
+	void strokeLineCap(LineCap cap)
+	{
+		actions ~= (Image image)
+		{
+			image.options.strokeLineCap = cap;
+		};
+	}
+
+	/**
+	 * Specify how corners are drawn.
+	 */
+	void strokeLineJoin(LineJoin join)
+	{
+		actions ~= (Image image)
+		{
+			image.options.strokeLineJoin = join;
+		};
+	}
+
+	/**
+	 * Specify a constraint on the length of the "miter"
+	 * formed by two lines meeting at an angle. If the angle
+	 * if very sharp, the miter could be very long relative
+	 * to the line thickness. The miter _limit is a _limit on
+	 * the ratio of the miter length to the line width.
+	 * The default is 4.
+	 */
+	void strokeMiterlimit(size_t limit)
+	{
+		actions ~= (Image image)
+		{
+			image.options.strokeMiterlimit = limit;
+		};
+	}
+
+	/**
+	 * Pattern image to use while drawing object stroke
+	 */
+	void strokePattern(Image pattern)
+	{
+		actions ~= (Image image)
+		{
+			image.options.strokePattern = pattern;
+		};
+	}
+
+	/**
+	 * Stroke _width for use when drawing vector objects
+	 */
+	void strokeWidth(double width)
+	{
+		actions ~= (Image image)
+		{
+			image.options.strokeWidth = width;
+		};
+	}
+
+	/**
+	 * The text density in the x and y directions. The default is "72x72".
+	 */
+	void textDensity(Geometry geometry)
+	{
+		actions ~= (Image image)
+		{
+			image.options.textDensity = geometry;
+		};
+	}
+
+	/**
+	 * Specify the code set to use for text annotations.
+	 * The only character encoding which may be specified at
+	 * this time is "UTF-8" for representing Unicode as a
+	 * sequence of bytes. Specify an empty string to use
+	 * ASCII encoding. Successful text annotation using
+	 * Unicode may require fonts designed to support Unicode.
+	 * The default is "UTF-8"
+	 */
+	void textEncoding(string encoding)
+	{
+		actions ~= (Image image)
+		{
+			image.options.textEncoding = encoding;
+		};
+	}
 }
diff --git a/dmagick/Image.d b/dmagick/Image.d
index 2bd2cd3..acee806 100644
--- a/dmagick/Image.d
+++ b/dmagick/Image.d
@@ -3907,7 +3907,7 @@ class Image
 	/**
 	 * JPEG/MIFF/PNG compression level (default 75).
 	 */
-	void quality(size_t )
+	void quality(size_t quality)
 	{
 		imageRef.quality = quality;
 		options.quality = quality;
diff --git a/dmagick/Options.d b/dmagick/Options.d
index 5e7e033..d11366e 100644
--- a/dmagick/Options.d
+++ b/dmagick/Options.d
@@ -31,6 +31,7 @@ import dmagick.c.memory;
 import dmagick.c.option;
 import dmagick.c.quantize;
 import dmagick.c.quantum;
+import dmagick.c.type;
 
 /**
  * A class that wraps ImageInfo, DrawInfo and QuantizeInfo
@@ -859,6 +860,55 @@ class Options
 	}
 
 	/**
+	 * Specify the font family, such as "arial" or "helvetica".
+	 */
+	void fontFamily(string type)
+	{
+		copyString(drawInfo.family, type);
+	}
+	///ditto
+	string fontFamily() const
+	{
+		return to!(string)(drawInfo.family);
+	}
+
+	void fontStretch(StretchType type)
+	{
+		drawInfo.stretch = type;
+	}
+	///ditto
+	StretchType fontStretch() const
+	{
+		return drawInfo.stretch;
+	}
+
+	/**
+	 * Specify the font style, i.e. italic, oblique, or normal.
+	 */
+	void fontStyle(StyleType type)
+	{
+		drawInfo.style = type;
+	}
+	///ditto
+	StyleType fontStyle() const
+	{
+		return drawInfo.style;
+	}
+
+	/**
+	 * Specify the font style, i.e. italic, oblique, or normal.
+	 */
+	void fontWeight(size_t weight)
+	{
+		drawInfo.weight = type;
+	}
+	///ditto
+	size_t fontWeight() const
+	{
+		return drawInfo.weight;
+	}
+
+	/**
 	 * Enable or disable anti-aliasing when drawing object outlines.
 	 */
 	void strokeAntialias(bool antialias)
@@ -1054,10 +1104,6 @@ class Options
 	//char* text;
 	//size_t face;
 	//char* metrics,
-	//char* family;
-	//StyleType style;
-	//StretchType stretch;
-	//size_t weight;
 	//AlignType align;
 	//char* clip_mask;
 	//SegmentInfo bounds;