From cb743697fcc7abbfa565015c98127d9c39958d98 Mon Sep 17 00:00:00 2001 From: Shuge Lee Date: Tue, 15 Jan 2013 11:03:52 +0800 Subject: [PATCH] Small chagned, clean up code --- Demos/access_pixsel/access_pixsel.py | 2 +- Demos/draw_line/draw_line.py | 6 +++--- Demos/draw_points/draw_points.py | 6 +++--- Demos/draw_polygon/draw_polygon.py | 6 +++--- Demos/draw_rectangle/draw_rectangle.py | 6 +++--- Demos/draw_text/draw_text.py | 8 ++++---- Demos/flip/flip.py | 4 ++-- Demos/grayscale/grayscale.py | 2 +- Demos/histogram/histogram.py | 6 +++--- Demos/image_info/get_img_info.py | 4 ++-- Demos/rotate/rotate.py | 4 ++-- Demos/thumbnail/create_thumbnail.py | 4 ++-- 12 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Demos/access_pixsel/access_pixsel.py b/Demos/access_pixsel/access_pixsel.py index 9a3e6e269..238eb3a17 100644 --- a/Demos/access_pixsel/access_pixsel.py +++ b/Demos/access_pixsel/access_pixsel.py @@ -16,7 +16,7 @@ print "width:", w print "high:", h print "white(255) ~ black(0):", pixsels[0, 0] -def print_im(im, w = None, h = None): +def print_im(im, w=None, h=None): if isinstance(im, Image.Image): w, h = im.size[0], im.size[1] pixsels = im.load() diff --git a/Demos/draw_line/draw_line.py b/Demos/draw_line/draw_line.py index e85175071..141d2f3df 100644 --- a/Demos/draw_line/draw_line.py +++ b/Demos/draw_line/draw_line.py @@ -9,14 +9,14 @@ fg_color = BLACK bg_color = WHITE canvas_w, canvas_h = 100, 100 -im = Image.new(mode = "RGB", size = (canvas_w, canvas_h), color = bg_color) +im = Image.new(mode="RGB", size=(canvas_w, canvas_h), color=bg_color) -draw = ImageDraw.Draw(im = im) +draw = ImageDraw.Draw(im=im) 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 = fg_color, width = 1) +draw.line(xy=box, fill=fg_color, width=1) im.save("draw_line.jpeg") diff --git a/Demos/draw_points/draw_points.py b/Demos/draw_points/draw_points.py index 7a38621e3..4ed5e91da 100644 --- a/Demos/draw_points/draw_points.py +++ b/Demos/draw_points/draw_points.py @@ -11,9 +11,9 @@ bg_color = WHITE canvas_w, canvas_h = 100, 100 -im = Image.new(mode = "RGB", size = (canvas_w, canvas_h), color = bg_color) +im = Image.new(mode="RGB", size=(canvas_w, canvas_h), color=bg_color) -draw = ImageDraw.Draw(im = im) +draw = ImageDraw.Draw(im=im) #xy = (p1_x, p1_y) #or @@ -21,6 +21,6 @@ draw = ImageDraw.Draw(im = im) points = ((10, 10), (40, 10), (55, 35), (40,50)) for point in points: - draw.point(xy = point, fill = fg_color) + draw.point(xy=point, fill=fg_color) im.save("draw_points.jpeg") diff --git a/Demos/draw_polygon/draw_polygon.py b/Demos/draw_polygon/draw_polygon.py index 299f40574..270b30907 100644 --- a/Demos/draw_polygon/draw_polygon.py +++ b/Demos/draw_polygon/draw_polygon.py @@ -9,14 +9,14 @@ bg_color = WHITE canvas_w, canvas_h = 100, 100 -im = Image.new(mode = "RGB", size = (canvas_w, canvas_h), color = bg_color) +im = Image.new(mode="RGB", size=(canvas_w, canvas_h), color=bg_color) -draw = ImageDraw.Draw(im = im) +draw = ImageDraw.Draw(im=im) #xy = (p1_x, p1_y) #or #xy = (p1_x, p1_y, p2_x, p2_y, p3_x, p3_y) xy = ((10, 10), (40, 10), (55, 35), (40,50)) -draw.polygon(xy = xy, fill = RED, outline = BLACK) +draw.polygon(xy=xy, fill=RED, outline=BLACK) im.save("draw_polygon.jpeg") diff --git a/Demos/draw_rectangle/draw_rectangle.py b/Demos/draw_rectangle/draw_rectangle.py index 27a1d0f2e..fa5161673 100644 --- a/Demos/draw_rectangle/draw_rectangle.py +++ b/Demos/draw_rectangle/draw_rectangle.py @@ -10,14 +10,14 @@ bg_color = WHITE canvas_w, canvas_h = 100, 100 -im = Image.new(mode = "RGB", size = (canvas_w, canvas_h), color = bg_color) +im = Image.new(mode="RGB", size=(canvas_w, canvas_h), color=bg_color) -draw = ImageDraw.Draw(im = im) +draw = ImageDraw.Draw(im=im) 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 = fg_color, outline = None) +draw.rectangle(xy=box, fill=fg_color, outline=None) im.save("draw_rectangle.jpeg") diff --git a/Demos/draw_text/draw_text.py b/Demos/draw_text/draw_text.py index 1c8c8206e..95515bc70 100644 --- a/Demos/draw_text/draw_text.py +++ b/Demos/draw_text/draw_text.py @@ -10,9 +10,9 @@ bg_color = BLACK canvas_w, canvas_h = 180, 50 -im = Image.new(mode = "RGB", size = (canvas_w, canvas_h), color = bg_color) +im = Image.new(mode="RGB", size=(canvas_w, canvas_h), color=bg_color) -draw = ImageDraw.Draw(im = im) +draw = ImageDraw.Draw(im=im) left_top_x, left_top_y = 10, 10 begin = left_top_x, left_top_y @@ -27,8 +27,8 @@ elif sys.platform == "win32": else: raise Exception font_size = 26 -font = ImageFont.truetype(filename = filename, size = font_size) +font = ImageFont.truetype(filename=filename, size=font_size) -draw.text(xy = begin, text = text, fill = fg_color, font = font) +draw.text(xy=begin, text=text, fill=fg_color, font=font) im.save("draw_text.bmp") diff --git a/Demos/flip/flip.py b/Demos/flip/flip.py index 8a87f7082..c2f4cb4df 100644 --- a/Demos/flip/flip.py +++ b/Demos/flip/flip.py @@ -6,7 +6,7 @@ parent_path = os.path.dirname(PWD) import Image file_path = os.path.join(parent_path, "image_resources", "captcha.jpg") -im = Image.open(fp = file_path) +im = Image.open(fp=file_path) #new_im = im.transpose(Image.FLIP_LEFT_RIGHT) #new_filename = os.path.splitext(filepath)[0] + "flip_left_right" + ".jpg" @@ -14,4 +14,4 @@ im = Image.open(fp = file_path) new_im = im.transpose(Image.FLIP_TOP_BOTTOM) new_filename = os.path.splitext(os.path.basename(file_path))[0] + '-' + "flip_top_bottom" + ".jpg" -new_im.save(new_filename) \ No newline at end of file +new_im.save(new_filename) diff --git a/Demos/grayscale/grayscale.py b/Demos/grayscale/grayscale.py index d92f6d6a6..ca84435bb 100644 --- a/Demos/grayscale/grayscale.py +++ b/Demos/grayscale/grayscale.py @@ -7,7 +7,7 @@ import Image file_path = os.path.join(parent_path, "image_resources", "l_hires.jpg") -im = Image.open(fp = file_path) +im = Image.open(fp=file_path) # "L" (8-bit pixels, black and white) # http://www.pythonware.com/library/pil/handbook/concepts.htm diff --git a/Demos/histogram/histogram.py b/Demos/histogram/histogram.py index f5c868c5a..6207f4676 100644 --- a/Demos/histogram/histogram.py +++ b/Demos/histogram/histogram.py @@ -39,7 +39,7 @@ for x in xrange(w): counts.append(count) -hist_im = Image.new(mode = "L", size = (w, h), color = WHITE) +hist_im = Image.new(mode="L", size=(w, h), color=WHITE) draw = ImageDraw.Draw(hist_im) h_step = h / max(counts) @@ -47,9 +47,9 @@ for x in xrange(w): left_top_x, left_top_y = x, h - counts[x] * h_step right_bottom_x, right_bottom_y = x + 1, h box = (left_top_x, left_top_y, right_bottom_x, right_bottom_y) - draw.rectangle(xy = box, fill = BLACK) + draw.rectangle(xy=box, fill=BLACK) new_file_name = os.path.splitext(os.path.basename(file_path))[0] new_file_name = new_file_name + '-' + 'histogram' + '.bmp' -hist_im.save(new_file_name) \ No newline at end of file +hist_im.save(new_file_name) diff --git a/Demos/image_info/get_img_info.py b/Demos/image_info/get_img_info.py index 22ff55f69..9414d9f94 100644 --- a/Demos/image_info/get_img_info.py +++ b/Demos/image_info/get_img_info.py @@ -7,7 +7,7 @@ import Image file_path = os.path.join(parent_path, "image_resources", "captcha.jpg") -im = Image.open(fp = file_path) +im = Image.open(fp=file_path) w, h = im.size[0], im.size[1] print "format:", type(im.format), im.format @@ -19,4 +19,4 @@ print "histogram:", type(im.histogram()) data = im.getdata() print "getdata:", type(data) -assert len(im.getdata()) == w * h \ No newline at end of file +assert len(im.getdata()) == w * h diff --git a/Demos/rotate/rotate.py b/Demos/rotate/rotate.py index 85d0303f2..e91c5e316 100644 --- a/Demos/rotate/rotate.py +++ b/Demos/rotate/rotate.py @@ -7,9 +7,9 @@ import Image file_path = os.path.join(parent_path, "image_resources", "captcha.jpg") -im = Image.open(fp = file_path) +im = Image.open(fp=file_path) degress = 90 new_im = im.rotate(degress) new_filename = os.path.splitext(os.path.basename(file_path))[0] + "-rotate-" + str(degress) + ".jpg" -new_im.save(new_filename) \ No newline at end of file +new_im.save(new_filename) diff --git a/Demos/thumbnail/create_thumbnail.py b/Demos/thumbnail/create_thumbnail.py index d46e43f47..6778f5f83 100644 --- a/Demos/thumbnail/create_thumbnail.py +++ b/Demos/thumbnail/create_thumbnail.py @@ -6,7 +6,7 @@ parent_path = os.path.dirname(PWD) import Image file_path = os.path.join(parent_path, "image_resources", 'l_hires.jpg') -im = Image.open(fp = file_path) +im = Image.open(fp=file_path) width, height = im.size[0], im.size[1] new_size = (width/8, height/8) @@ -17,4 +17,4 @@ new_filename= "x".join([str(i) for i in new_size]) new_filename = os.path.splitext(os.path.basename(file_path))[0] + '-' + new_filename + ".jpg" new_file_path = os.path.join(PWD, new_filename) -im.save(new_filename) \ No newline at end of file +im.save(new_filename)