diff --git a/.gitignore b/.gitignore index f5dd4a557..fb34014ef 100755 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ dist/ .idea/ .project/ Demos/ignores/ +Pillow.egg-info/ diff --git a/Demos/draw_points/draw_points.py b/Demos/draw_points/draw_points.py index 4300ab769..8835997fb 100644 --- a/Demos/draw_points/draw_points.py +++ b/Demos/draw_points/draw_points.py @@ -2,27 +2,25 @@ import Image import ImageDraw +BLACK = "#ffffff" +WHITE = "#000000" -BLACK = 0 -WHITE = 255 +fg_color = WHITE +bg_color = BLACK 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) -p1_x, p1_y = 10, 10 -p2_x, p2_y = 15, 15 -p3_x, p3_y = 20, 10 +#xy = (p1_x, p1_y) +#or +#xy = (p1_x, p1_y, p2_x, p2_y, p3_x, p3_y) -xy = (p1_x, p1_y) -# 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) - -fill = "#000" - -draw.point(xy, fill) - -im.save("draw_points.bmp") +im.save("draw_points.png") diff --git a/Demos/draw_rectangle/draw_rectangle.py b/Demos/draw_rectangle/draw_rectangle.py index 77284d24a..bec172d86 100644 --- a/Demos/draw_rectangle/draw_rectangle.py +++ b/Demos/draw_rectangle/draw_rectangle.py @@ -2,12 +2,15 @@ import Image import ImageDraw -BLACK = 0 -WHITE = 255 +BLACK = "#ffffff" +WHITE = "#000000" + +fg_color = WHITE +bg_color = BLACK 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 +18,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.rectangle(xy = box, fill = BLACK, outline = None) +draw.rectangle(xy = box, fill = fg_color, outline = None) im.save("draw_rectangle.bmp") diff --git a/Demos/draw_text/draw_text.py b/Demos/draw_text/draw_text.py index f9e93a85c..1c8c8206e 100644 --- a/Demos/draw_text/draw_text.py +++ b/Demos/draw_text/draw_text.py @@ -2,11 +2,15 @@ from PIL import Image, ImageDraw, ImageFont import sys -BLACK = 0 -WHITE = 255 +BLACK = "#ffffff" +WHITE = "#000000" -canvas_w, canvas_h = 100, 100 -im = Image.new(mode = "L", size = (canvas_w, canvas_h), color = WHITE) +fg_color = WHITE +bg_color = BLACK + + +canvas_w, canvas_h = 180, 50 +im = Image.new(mode = "RGB", size = (canvas_w, canvas_h), color = bg_color) draw = ImageDraw.Draw(im = im) @@ -14,7 +18,6 @@ left_top_x, left_top_y = 10, 10 begin = left_top_x, left_top_y text = "hello world" -fill = "#000" if sys.platform == "darwin": filename = "/Library/Fonts/Microsoft/Times New Roman Bold.ttf" @@ -23,9 +26,9 @@ elif sys.platform == "win32": filename = "timesbd.ttf" else: raise Exception -font_size = 14 +font_size = 26 font = ImageFont.truetype(filename = filename, size = font_size) -draw.text(xy = begin, text = text, fill = fill, font = font) +draw.text(xy = begin, text = text, fill = fg_color, font = font) im.save("draw_text.bmp")