X-Git-Url: https://git.ao2.it/experiments/RadialSymmetry.git/blobdiff_plain/d384fe52ac8dec5263fed96acbd511780d14b0d7..7b312ebf7585412a6f3e0a999adf6972b0e239e8:/Diagram.py diff --git a/Diagram.py b/Diagram.py index 8cb41ad..1e9b172 100755 --- a/Diagram.py +++ b/Diagram.py @@ -23,7 +23,7 @@ from math import * class Diagram(object): - def __init__(self, width, height, background=[1, 1, 1]): + def __init__(self, width, height, background=[1, 1, 1], font_size=20): self.width = width self.height = height self.background = background @@ -38,7 +38,7 @@ class Diagram(object): cr.select_font_face("Georgia", cairo.FONT_SLANT_NORMAL, cairo.FONT_WEIGHT_NORMAL) - cr.set_font_size(20) + cr.set_font_size(font_size) # Adjust the font matrix to left-bottom origin M = cr.get_font_matrix() @@ -97,39 +97,36 @@ class Diagram(object): else: return None - def draw_polygon(self, verts, stroke_color=[0, 0, 0], fill_color=None): + def _draw_polygon(self, verts): cr = self.cr - if fill_color: - v = verts[0] - cr.move_to(v[0], v[1]) - for v in verts[1:]: - cr.line_to(v[0], v[1]) - cr.close_path() + v = verts[0] + cr.move_to(v[0], v[1]) + for v in verts[1:]: + cr.line_to(v[0], v[1]) + cr.close_path() + + def draw_polygon(self, verts, fill_color=None, stroke_color=[0, 0, 0]): + cr = self.cr + if fill_color: + self._draw_polygon(verts) r, g, b, a = self.color_to_rgba(fill_color) cr.set_source_rgba(r, g, b, a) cr.fill() - n = len(verts) - for i in range(0, n): - v1 = verts[i] - v2 = verts[(i + 1) % n] - cr.move_to(v1[0], v1[1]) - cr.line_to(v2[0], v2[1]) - - r, g, b, a = self.color_to_rgba(stroke_color) - cr.set_source_rgba(r, g, b, a) - cr.stroke() + if stroke_color: + self._draw_polygon(verts) + r, g, b, a = self.color_to_rgba(stroke_color) + cr.set_source_rgba(r, g, b, a) + cr.stroke() def draw_star(self, cx, cy, verts, stroke_color=[0, 0, 0]): cr = self.cr - v = verts[0] - cr.move_to(cx, cy) for v in verts: - cr.line_to(v[0], v[1]) cr.move_to(cx, cy) + cr.line_to(v[0], v[1]) r, g, b, a = self.color_to_rgba(stroke_color) cr.set_source_rgba(r, g, b, a) @@ -192,7 +189,6 @@ class Diagram(object): 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() @@ -282,4 +278,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()