diagram: move draw_rect_from_center to the generic Diagram class

Move draw_rect_from_center from cairo_diagram.py to diagram.py as it
does not depend on any specific backend.

diff --git a/src/diagram/cairo_diagram.py b/src/diagram/cairo_diagram.py
index 9aab30e..fd632d7 100755 (executable)
--- a/src/diagram/cairo_diagram.py
+++ b/src/diagram/cairo_diagram.py
@@ -143,20 +143,6 @@ class CairoDiagram(Diagram):
         cr.line_to(x2, y2)
         self._stroke(stroke_color)
 
         cr.line_to(x2, y2)
         self._stroke(stroke_color)
 

-    def draw_rect_from_center(self, cx, cy, width, height, theta=0.0,
-                              stroke_color=None,
-                              fill_color=(1, 1, 1, 0.8)):
-        # 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))
-
-        self.draw_rect(rx, ry, width, height, theta, stroke_color, fill_color)
-

     def draw_rect(self, x, y, width, height, theta=0,
                   stroke_color=None,
                   fill_color=(1, 1, 1, 0.8)):
     def draw_rect(self, x, y, width, height, theta=0,
                   stroke_color=None,
                   fill_color=(1, 1, 1, 0.8)):

diff --git a/src/diagram/diagram.py b/src/diagram/diagram.py
index eee9fc6..a949577 100755 (executable)
--- a/src/diagram/diagram.py
+++ b/src/diagram/diagram.py
@@ -86,3 +86,22 @@ class Diagram(object):
         apothem_angle = theta + pi / sides
 
         return self.draw_star(cx, cy, sides, apothem, apothem_angle, stroke_color)
         apothem_angle = theta + pi / sides
 
         return self.draw_star(cx, cy, sides, apothem, apothem_angle, stroke_color)

+
+    def draw_rect(self, x, y, width, height, theta=0,
+                  stroke_color=None,
+                  fill_color=(1, 1, 1, 0.8)):
+        raise NotImplementedError
+
+    def draw_rect_from_center(self, cx, cy, width, height, theta=0.0,
+                              stroke_color=None,
+                              fill_color=(1, 1, 1, 0.8)):
+        # 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))
+
+        self.draw_rect(rx, ry, width, height, theta, stroke_color, fill_color)