[#15] arc

src/doodler/core.clje

@@ -62,18 +62,22 @@
     (wxBrush/setColour brush (apply color args))
     (wxDC/setBrush *canvas* brush)))
 
-(defn fill-rect
+(defn arc
+  [x y w h start end]
+  (wxDC/drawEllipticArc *canvas* #erl[x y] #erl[w h] start end))
+
+(defn ellipse
+  [x y w h]
+  (wxDC/drawEllipse *canvas* #erl[x y] #erl[w h]))
+
+(defn rect
   [x y w h]
   (wxDC/drawRectangle *canvas* #erl[x y] #erl[w h]))
 
 (defn point
   [x y]
   (wxDC/drawPoint *canvas* (tuple x y)))
 
-(defn circle
-  [x y r]
-  (wxDC/drawCircle *canvas* #erl[x y] r))
-
 (defn width
   []
   (erlang/element 1 (wxDC/getSize *canvas*)))

src/doodler/examples/circles.clje

@@ -9,10 +9,10 @@
   (d/stroke (rand-int 255))
   (d/stroke-weight (rand-int 10))
   (d/fill (rand-int 255))
-  (let [radius (rand-int 50)
-        x      (rand-int (d/width))
-        y      (rand-int (d/height))]
-    (d/circle x y radius)))
+  (let [diam (rand-int 100)
+        x    (rand-int (d/width))
+        y    (rand-int (d/height))]
+    (d/ellipse x y diam diam)))
 
 (d/defsketch sketch
   :title "Oh so many circles"