X-Git-Url: https://git.ao2.it/experiments/RadialSymmetry.git/blobdiff_plain/d61a76f33cbf0f18f63e0b365e9d7f0ba6732323..f14a04423f3b43238c5c92618fbcc9a4c40df668:/Diagram.py diff --git a/Diagram.py b/Diagram.py index ff5a500..fa35d32 100755 --- a/Diagram.py +++ b/Diagram.py @@ -161,30 +161,17 @@ class Diagram(object): stroke=False, stroke_color=[0, 0, 0, 0.5]): cr = self.cr + # the position of the center of a rectangle at (0,0) mx = width / 2.0 my = height / 2.0 + # calculate the position of the bottom-left corner after rotating the + # rectangle around the center rx = cx - (mx * cos(theta) - my * sin(theta)) ry = cy - (mx * sin(theta) + my * cos(theta)) - cr.save() - cr.translate(rx, ry) - cr.rotate(theta) - - if fill: - 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: - cr.rectangle(0, 0, width, height) - r, g, b, a = self.color_to_rgba(stroke_color) - cr.set_source_rgba(r, g, b, a) - cr.stroke() - self.draw_dot(0, 0, 3.0, stroke_color) - - cr.restore() + self.draw_rect(rx, ry, width, height, theta, fill, fill_color, stroke, + 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]): @@ -295,4 +282,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, 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.show()