From 108228d84b42817def4f9612bbe14d29b196971d Mon Sep 17 00:00:00 2001 From: Shuge Lee Date: Sat, 23 Jun 2012 12:55:56 +0800 Subject: [PATCH] fixed fg_color/bg_color in hex --- Demos/draw_line/draw_line.py | 12 +++++++----- Demos/draw_points/draw_points.py | 18 +++++++++--------- Demos/draw_rectangle/draw_rectangle.py | 10 +++++----- Demos/image_resources/captcha.jpg | Bin 1900 -> 0 bytes 4 files changed, 21 insertions(+), 19 deletions(-) delete mode 100644 Demos/image_resources/captcha.jpg diff --git a/Demos/draw_line/draw_line.py b/Demos/draw_line/draw_line.py index bd8b2062e..e85175071 100644 --- a/Demos/draw_line/draw_line.py +++ b/Demos/draw_line/draw_line.py @@ -2,12 +2,14 @@ import Image import ImageDraw -BLACK = 0 -WHITE = 255 +BLACK = "#000000" +WHITE = "#ffffff" +fg_color = BLACK +bg_color = WHITE canvas_w, canvas_h = 100, 100 -im = Image.new(mode = "L", size = (canvas_w, canvas_h), color = WHITE) +im = Image.new(mode = "RGB", size = (canvas_w, canvas_h), color = bg_color) draw = ImageDraw.Draw(im = im) @@ -15,6 +17,6 @@ left_top_x, left_top_y = 10, 10 right_bottom_x, right_bottom_y = 30, 100 box = (left_top_x, left_top_y, right_bottom_x, right_bottom_y) -draw.line(xy = box, fill = BLACK, width = 1) +draw.line(xy = box, fill = fg_color, width = 1) -im.save("draw_line.bmp") +im.save("draw_line.jpeg") diff --git a/Demos/draw_points/draw_points.py b/Demos/draw_points/draw_points.py index 8835997fb..7a38621e3 100644 --- a/Demos/draw_points/draw_points.py +++ b/Demos/draw_points/draw_points.py @@ -2,11 +2,12 @@ import Image import ImageDraw -BLACK = "#ffffff" -WHITE = "#000000" -fg_color = WHITE -bg_color = BLACK +BLACK = "#000000" +WHITE = "#ffffff" + +fg_color = BLACK +bg_color = WHITE canvas_w, canvas_h = 100, 100 @@ -18,9 +19,8 @@ draw = ImageDraw.Draw(im = im) #or #xy = (p1_x, p1_y, p2_x, p2_y, p3_x, p3_y) -y = 10 -for x in range(5, 100): - point = (x, y) - draw.point(point, fg_color) +points = ((10, 10), (40, 10), (55, 35), (40,50)) +for point in points: + draw.point(xy = point, fill = fg_color) -im.save("draw_points.png") +im.save("draw_points.jpeg") diff --git a/Demos/draw_rectangle/draw_rectangle.py b/Demos/draw_rectangle/draw_rectangle.py index bec172d86..27a1d0f2e 100644 --- a/Demos/draw_rectangle/draw_rectangle.py +++ b/Demos/draw_rectangle/draw_rectangle.py @@ -2,11 +2,11 @@ import Image import ImageDraw -BLACK = "#ffffff" -WHITE = "#000000" +BLACK = "#000000" +WHITE = "#ffffff" -fg_color = WHITE -bg_color = BLACK +fg_color = BLACK +bg_color = WHITE canvas_w, canvas_h = 100, 100 @@ -20,4 +20,4 @@ box = (left_top_x, left_top_y, right_bottom_x, right_bottom_y) draw.rectangle(xy = box, fill = fg_color, outline = None) -im.save("draw_rectangle.bmp") +im.save("draw_rectangle.jpeg") diff --git a/Demos/image_resources/captcha.jpg b/Demos/image_resources/captcha.jpg deleted file mode 100644 index e5d7db2f2f17ae2c0312a4cb99aa6f2463ac6596..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1900 zcmbW#c{tm78UXNLE=eSgkhmIzI9g|gNl~Gtj#M>{s-kSmjB`;mRF}1sYE`MDl+Lml zjH^al2@Tp(S9PE1tourkx+zVJBkqaaeP*9$pZQ~U-}ia{`o7Qmyr1X&9*!JN0n+E~ zsCEDd1Ol#!5;z;KLqJF*5{*JDNJuD<)bMJg|2Ym@0Sp4r0K6a| zbpVV3K`@}h4nP$EKrqp^M+^TuKwtH|a64x8iQ!NlCq%cJF?APHx`g{DLQiMcE;Lz~M=os(Q^vvws{KDdrVD0Dijm<6L z_Rf(D1VH}9`c?K{E{wl_)jujOI1BIy>iOHOGfnSf5RVO7Ou-4g(7i~zQ zu`3_v7u72+r(wd=6dck1Df@k}K{04O>&Ub=NE5Z(}y z)oCRr%xWL&NR<8@P``UYrj)avuAQMP2~G8UO4uKo=g$;z_y?u20>^e=LXH!-?@x}~ z{+Z5=vnnTKG-e^^?9R5qV|~q|0x##4HgOYu%RPN6>Q9F`tser?%f*O6{g&pZF~yw0Vxy8xCDOQ51uWZ+^TbohSc?Eh-8foox3t1W``IUW17~a?^ z-u7%Nxp&h^?p&7pkjXCmQMhdr+u?zfvqHu&>RJ4`0mByM2s$HJDNnwDe_wyq^V;$B znm6{x$}C_K19T$0GcLC--BK-{IMiZO8;arTKgh+Z`X^n<8*z-dgns3^FJ-ne;WN0` zs6&qVnZk-stf2C0MA)-|3DFf}4m_{p&jTLXdAS?1Vs4C>%`4#l%3MxV^!4$!jg(K` zv-5upVSK}KOD2)fQ(26;7JqwTNpRTI7xs+628r1)M5>|tb@01r}S~_dKf|1WnX^t`qi%fx3^rQ=Wu>;KmrHP5A8RoEp1^I4PCq7X4m^hQWDWN z&${)oe3u+V8n0fwy;>ed{#?&hzgV6CuC$iA7%jYfd-8q1BX;90QaJyq@sWXrCy&Z} zqV)$7MJ4tzF?{7=S^bKI*fq;St>(!zE0pL5q&?^K;5Y@tTLisE$t1v;DqfSD)NiJ( z5wqxPRsH9WmRb!tG5vH3c@yf>dmq)Vm!{ao!ND!i4HSnuXCZ}m2*@uK#grZb$eUZW z#!Z?`5Bax2NToYlH$KbfW^#2(Lr=@7R_x{)~Tg5fle&bF-RnblH2kwhZ*N`2`-KUPUW$$A66o#D5Z}(^tPzL1g2TDv7 zR%o`Tn4K;w$EzbeQ%rr4PvVJqcvBeMvGbvg4}rFuB}3lGCc?*IS*