Fully integrate DrawingWand C-API #194

emcconville · 2014-09-14T12:00:54Z

Originally a PU for adding a few methods I needed for whatever project, this drawing_pu turned into a general effort to integrate all ImageMagick's drawing wand methods. This request is open for code-review, feedback, and improved documents.

Drawing API Integration Status

Original PU Overview

Created PointInfo struct reference in API type casting.
Assigned / mapped arguments for wand library methods.
Completed initial unit test & documentation.

Examples

Drawing.polygon

with Image(filename="crosshatch.png") as img:
    with Drawing() as draw:
        draw.fill_color = Color("#fff")
        draw.stroke_color = Color("#000")
        draw.stroke_width = 2
        points = [(5,5),(45,40),(45,10),(5,45)]
        draw.polygon(points)
        draw.draw(img)
        img.save(filename="polygon.png")

Drawing.polyline

with Image(filename="crosshatch.png") as img:
    with Drawing() as draw:
        draw.fill_color = Color("transparent")
        draw.stroke_color = Color("#000")
        draw.stroke_width = 2
        points = [(5,5),(45,40),(45,10),(5,45)]
        draw.polyline(points)
        draw.draw(img)
        img.save(filename="polyline.png")

Drawing.bezier

with Image(filename="crosshatch.png") as img:
    with Drawing() as draw:
        draw.fill_color = Color("transparent")
        draw.stroke_color = Color("#000")
        draw.stroke_width = 2
        points = [(5,5), (0,50), (50,0), (45,45)]
        draw.bezier(points)
        draw.draw(img)
        img.save(filename="bezier.png")

coveralls · 2014-09-14T12:25:11Z

Coverage increased (+0.14%) when pulling f905d8f on emcconville:drawing_pu into 64ab5a5 on dahlia:0.3-maintenance.

- Created PointInfo struct reference in API type casting. - Assigned / mapped arguments for Draw(bezier|poly(gon|line)) library method. - Completed initial unit test & documentation.

…tring

- See comment: #192 (comment)

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=761325

… (e.g. polygons with holes)

- Arc - Circle - Ellipse - Point Light refactoring of docs & method signature order.

…ble are likely to change. - Drawing.path_close - Drawing.path_curve - Drawing.path_curve_to_quadratic_bezier - Drawing.path_elliptic_arc - Drawing.path_finish - Drawing.path_line - Drawing.path_horizontal_line - Drawing.path_vertical_line - Drawing.path_move - Drawing.path_start

- Fill & stroke properties - Color & Matte - Basic coordinate skew & translation

…lip_units

- Drawing wand Push/Pop - Pattern Push/Pop (needs testing) - Clip path Push/Pop (needs testing) - Definitions Push/Pop (needs testing)

- Drawing.font_family - Drawing.font_stretch - Drawing.font_style - Drawing.font_weight

… cleaned Drawing.comment test case, and other minor code-style.

… of file

coveralls · 2015-02-02T17:16:43Z

Coverage increased (+0.66%) to 84.81% when pulling 2f3de46 on emcconville:drawing_pu into 64ab5a5 on dahlia:0.3-maintenance.

coveralls · 2015-02-02T23:24:56Z

Coverage increased (+0.65%) to 84.8% when pulling 2c13583 on emcconville:drawing_pu into 64ab5a5 on dahlia:0.3-maintenance.

coveralls · 2015-02-02T23:24:57Z

Coverage increased (+0.65%) to 84.8% when pulling 2c13583 on emcconville:drawing_pu into 64ab5a5 on dahlia:0.3-maintenance.

dahlia · 2015-02-03T16:44:08Z

WOW. I am amazed and really appreciate your effort! Although it doesn’t seem possible to be reviewed at a time, I will gradually review the whole of this patch until this weekend. Really thanks for you again.

coveralls · 2015-02-05T21:13:51Z

Coverage increased (+0.86%) to 85.02% when pulling bfee33f on emcconville:drawing_pu into 64ab5a5 on dahlia:0.3-maintenance.

coveralls · 2015-02-05T21:13:51Z

Coverage increased (+0.86%) to 85.02% when pulling bfee33f on emcconville:drawing_pu into 64ab5a5 on dahlia:0.3-maintenance.

emcconville · 2015-02-07T17:34:36Z

Thanks @dahlia. With all the methods covered, I'm planing on updating the documentation + examples over the next couple weeks.

coveralls · 2015-02-08T03:45:53Z

Coverage increased (+0.86%) to 85.02% when pulling 083da68 on emcconville:drawing_pu into 64ab5a5 on dahlia:0.3-maintenance.

coveralls · 2015-02-08T03:45:53Z

Coverage increased (+0.86%) to 85.02% when pulling 083da68 on emcconville:drawing_pu into 64ab5a5 on dahlia:0.3-maintenance.

coveralls · 2015-02-08T03:45:54Z

Coverage increased (+0.86%) to 85.02% when pulling 083da68 on emcconville:drawing_pu into 64ab5a5 on dahlia:0.3-maintenance.

coveralls · 2015-02-14T14:50:33Z

Coverage increased (+0.86%) to 85.02% when pulling f479073 on emcconville:drawing_pu into 64ab5a5 on dahlia:0.3-maintenance.

coveralls · 2015-02-14T14:50:34Z

Coverage increased (+0.86%) to 85.02% when pulling f479073 on emcconville:drawing_pu into 64ab5a5 on dahlia:0.3-maintenance.

coveralls · 2015-02-14T14:50:35Z

Coverage increased (+0.86%) to 85.02% when pulling f479073 on emcconville:drawing_pu into 64ab5a5 on dahlia:0.3-maintenance.

…ods. - Drawing.clip_path - Drawing.font - Drawing.font_family - Drawing.stroke_dash_array - Drawing.text_encoding - Drawing.vector_graphics

emcconville · 2015-02-15T18:00:42Z

Commit ee5aeb4 fixes memory leaks in the wand library. MagickWand is expecting calling programs to handle deallocation for the following methods (and wand counterparts.)

DrawGetClipPath => Drawing.clip_path
DrawGetFont => Drawing.font
DrawGetFontFamily => Drawing.font_family
DrawGetStrokeDashArray => Drawing.stroke_dash_array
DrawGetTextEncoding => Drawing.text_encoding
DrawGetVectorGraphics => Drawing.vector_graphics

coveralls · 2015-02-15T18:14:50Z

Coverage increased (+0.97%) to 85.13% when pulling ee5aeb4 on emcconville:drawing_pu into 64ab5a5 on dahlia:0.3-maintenance.

coveralls · 2015-02-15T18:14:52Z

Coverage increased (+0.97%) to 85.13% when pulling ee5aeb4 on emcconville:drawing_pu into 64ab5a5 on dahlia:0.3-maintenance.

dahlia · 2015-02-19T17:03:33Z

It seems complete for me. @emcconville Is it ready to merge?

emcconville · 2015-02-20T02:06:30Z

Yes, Please merge. I believe I've covered everything in CONTRIBUTING doc.

Cheers, 🍻

Fully integrate DrawingWand C-API

dahlia · 2015-02-20T09:33:55Z

This patch was shipped with 0.4.0 release (what’s new in 0.4, changelog). Check it up!

emcconville changed the title ~~Drawing pu~~ Added support for drawing Polygone, Polyline, and Bezier curves Sep 14, 2014

frewsxcv and others added 25 commits September 17, 2014 06:22

Enable automated testing on PyPy 3

6273bf7

Added support for Drawing.polygon, Drawing.polyline, and Drawing.bezier.

630f204

- Created PointInfo struct reference in API type casting. - Assigned / mapped arguments for Draw(bezier|poly(gon|line)) library method. - Completed initial unit test & documentation.

Updated docs with usage of new methods, and added versionadded docs…

e598b25

…tring

Bumped versionadded number (my mistake) on new Drawing methods.

80dae05

- See comment: #192 (comment)

Add default value to Font.size

6cea4f8

Suggest libmagickcore5-extra package for delegates

9486ce2

Skip if non-Unicode filesystem encoding. Fix #193

94a666d

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=761325

Added Drawing.fill_rule property to allow control over complex shapes…

fdaa6ca

… (e.g. polygons with holes)

Mapped C-API methods for additional drawing shapes

fa6874c

- Arc - Circle - Ellipse - Point Light refactoring of docs & method signature order.

Fixed light typo in docs

94db565

Implemented additional API methods on drawing object.

d9a4be6

- Fill & stroke properties - Color & Matte - Basic coordinate skew & translation

Updated guide docs & cleaned pydoc notation

fbc0cf4

Added support for Drawing.text_direction property

d584156

EXPERIMENTAL: Added support for VectorGraphics methods

6fd5206

Added support for Drawing.clip_path, Drawing.clip_rule, and Drawing.c…

cb743ca

…lip_units

Added Drawing.viewbox for (M|R)SVG drawing, and cleaned some docblocks

d8eb9c1

Cleaned whitespace, and added version support for text direction.

1cd914d

Init build out of the pop/push methods on the drawing object

6765586

- Drawing wand Push/Pop - Pattern Push/Pop (needs testing) - Clip path Push/Pop (needs testing) - Definitions Push/Pop (needs testing)

Added Drawing.comment for vector desc tags

ca82654

Added support for additional font properties

e9a12a8

- Drawing.font_family - Drawing.font_stretch - Drawing.font_style - Drawing.font_weight

Integrated round corners into existing Drawing.rectangle method. Also…

8247be8

… cleaned Drawing.comment test case, and other minor code-style.

Added setter/getter support for font resolution

93b2b9f

Added Drawing.border_color

9457281

Added Drawing.opacity, but haven't finalized test case

02f6a9a

emcconville changed the title ~~Added support for drawing Polygone, Polyline, and Bezier curves~~ Fully integrate DrawingWand C-API Jan 31, 2015

emcconville added 2 commits February 1, 2015 11:47

Added Drawing.scale method

7f0d807

Added support for fill/stroke URL refs, and cleaned bad raise statement.

87499b9

Fixed more silly merge-conflicts by dropping new test cases to bottom…

2f3de46

… of file

Created AffineMatrix, and implemented Drawing.affine method

2c13583

Fixed misleading test case, and added ClipPath test case

8249107

Reworked test_set_get_font_resolution method to match coding style

bfee33f

Minor PEP 8 formatting changes

083da68

emcconville mentioned this pull request Feb 14, 2015

Support for specifying dash pattern #214

Closed

Updated usage docs including Color/Matte, Composite, Push/Pop

f479073

Fixed memory leaks by creating string decorator, and refactoring meth…

ee5aeb4

…ods. - Drawing.clip_path - Drawing.font - Drawing.font_family - Drawing.stroke_dash_array - Drawing.text_encoding - Drawing.vector_graphics

dahlia added a commit that referenced this pull request Feb 20, 2015

Merge pull request #194 from emcconville/drawing_pu

2ea0a55

Fully integrate DrawingWand C-API

dahlia merged commit 2ea0a55 into emcconville:0.3-maintenance Feb 20, 2015

emcconville deleted the drawing_pu branch April 23, 2015 01:59

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fully integrate DrawingWand C-API #194

Fully integrate DrawingWand C-API #194

emcconville commented Sep 14, 2014

coveralls commented Sep 14, 2014

coveralls commented Feb 2, 2015

coveralls commented Feb 2, 2015

coveralls commented Feb 2, 2015

dahlia commented Feb 3, 2015

coveralls commented Feb 5, 2015

coveralls commented Feb 5, 2015

emcconville commented Feb 7, 2015

coveralls commented Feb 8, 2015

coveralls commented Feb 8, 2015

coveralls commented Feb 8, 2015

coveralls commented Feb 14, 2015

coveralls commented Feb 14, 2015

coveralls commented Feb 14, 2015

emcconville commented Feb 15, 2015

coveralls commented Feb 15, 2015

coveralls commented Feb 15, 2015

dahlia commented Feb 19, 2015

emcconville commented Feb 20, 2015

dahlia commented Feb 20, 2015

Fully integrate DrawingWand C-API #194

Fully integrate DrawingWand C-API #194

Conversation

emcconville commented Sep 14, 2014

Drawing API Integration Status

Original PU Overview

Examples

coveralls commented Sep 14, 2014

coveralls commented Feb 2, 2015

coveralls commented Feb 2, 2015

coveralls commented Feb 2, 2015

dahlia commented Feb 3, 2015

coveralls commented Feb 5, 2015

coveralls commented Feb 5, 2015

emcconville commented Feb 7, 2015

coveralls commented Feb 8, 2015

coveralls commented Feb 8, 2015

coveralls commented Feb 8, 2015

coveralls commented Feb 14, 2015

coveralls commented Feb 14, 2015

coveralls commented Feb 14, 2015

emcconville commented Feb 15, 2015

coveralls commented Feb 15, 2015

coveralls commented Feb 15, 2015

dahlia commented Feb 19, 2015

emcconville commented Feb 20, 2015

dahlia commented Feb 20, 2015