From cec24af99e45a904818d143fbeafc6d795eb2fe5 Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Thu, 18 Jun 2015 12:06:54 +0200 Subject: [PATCH] Diagram.py: simplify setting fill and stroke when drawing rectangles --- Diagram.py | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/Diagram.py b/Diagram.py index 74c3bb2..b6de388 100755 --- a/Diagram.py +++ b/Diagram.py @@ -163,8 +163,7 @@ class Diagram(object): cr.stroke() def draw_rect_from_center(self, cx, cy, width, height, theta=0, - fill=True, fill_color=[1, 1, 1, 0.8], - stroke=False, stroke_color=[0, 0, 0, 0.5]): + fill_color=[1, 1, 1, 0.8], stroke_color=None): cr = self.cr # the position of the center of a rectangle at (0,0) @@ -176,24 +175,23 @@ class Diagram(object): rx = cx - (mx * cos(theta) - my * sin(theta)) ry = cy - (mx * sin(theta) + my * cos(theta)) - self.draw_rect(rx, ry, width, height, theta, fill, fill_color, stroke, - stroke_color) + self.draw_rect(rx, ry, width, height, theta, fill_color, stroke_color) - def draw_rect(self, x, y, width, height, theta=0, fill=True, fill_color=[1, 1, 1, 0.8], - stroke=False, stroke_color=[0, 0, 0, 0.5]): + def draw_rect(self, x, y, width, height, theta=0, + fill_color=[1, 1, 1, 0.8], stroke_color=None): cr = self.cr cr.save() cr.translate(x, y) cr.rotate(theta) - if fill: + if fill_color: cr.rectangle(0, 0, width, height) r, g, b, a = self.color_to_rgba(fill_color) cr.set_source_rgba(r, g, b, a) cr.fill() - if stroke: + if stroke_color: cr.rectangle(0, 0, width, height) r, g, b, a = self.color_to_rgba(stroke_color) cr.set_source_rgba(r, g, b, a) @@ -236,8 +234,8 @@ class Diagram(object): cr.translate(rx, ry) cr.rotate(theta) - if bb_fill or bb_stroke: - self.draw_rect(bb[0], bb[1], bb[2], bb[3], 0, bb_fill, bb_fill_color, bb_stroke, bb_stroke_color) + if bb_fill_color or bb_stroke_color: + self.draw_rect(bb[0], bb[1], bb[2], bb[3], 0, bb_fill_color, bb_stroke_color) r, g, b, a = self.color_to_rgba(color) cr.set_source_rgba(r, g, b, a) @@ -287,10 +285,10 @@ if __name__ == "__main__": diagram.draw_line(0, y, 400, y, [0, 0, 1, 0.2]) - diagram.draw_rect(40, 40, 300, 100, stroke=True) - diagram.draw_rect(40, 40, 300, 100, pi / 30, stroke=True) + diagram.draw_rect(40, 40, 300, 100, stroke_color=[0, 0, 0, 0.8]) + diagram.draw_rect(40, 40, 300, 100, pi / 30, stroke_color=[0, 0, 0, 0.8]) - diagram.draw_rect(40, 250, 300, 100, stroke=True) - diagram.draw_rect_from_center(40 + 150, 250 + 50, 300, 100, theta=pi / 40, stroke=True, stroke_color=[1, 0, 0], fill=False) + diagram.draw_rect(40, 250, 300, 100, stroke_color=[0, 0, 0, 0.8]) + diagram.draw_rect_from_center(40 + 150, 250 + 50, 300, 100, theta=(pi / 40), stroke_color=[1, 0, 0], fill_color=None) diagram.show() -- 2.1.4