[mcclim-cvs] CVS mcclim/Backends/Graphic-Forms

junrue junrue at common-lisp.net
Mon Oct 1 01:19:34 UTC 2007


Update of /project/mcclim/cvsroot/mcclim/Backends/Graphic-Forms
In directory clnet:/tmp/cvs-serv23798

Modified Files:
	medium.lisp 
Log Message:
fix dumb mistake in COMPUTE-ARC-POINT where I handle the angle > 360
case


--- /project/mcclim/cvsroot/mcclim/Backends/Graphic-Forms/medium.lisp	2007/10/01 01:12:15	1.11
+++ /project/mcclim/cvsroot/mcclim/Backends/Graphic-Forms/medium.lisp	2007/10/01 01:19:34	1.12
@@ -307,28 +307,28 @@
     (multiple-value-bind (count remainder)
         (floor angle 360)
       (if (> count 0)
-          (compute-arc-point center-x center-y width height remainder)
-          (cond
-            ((= angle 270)
-             (gfs:make-point :x (floor center-x)
-                             :y (+ (floor center-y) (floor height 2))))
-            ((> angle 270)
-             (compute-quad-point center-x height (- angle 270)))
-            ((= angle 180)
-             (gfs:make-point :x (- (floor center-x) (floor width 2))
-                             :y (floor center-y)))
-            ((> angle 180)
-             (compute-quad-point center-x height (- angle 180)))
-            ((= angle 90)
-             (gfs:make-point :x (floor center-x)
-                             :y (- (floor center-y) (floor height 2))))
-            ((> angle 90)
-             (compute-quad-point center-x height(- angle 90)))
-            ((= angle 0)
-             (gfs:make-point :x (+ (floor center-x) (floor width 2))
-                             :y (floor center-y)))
-            (t
-             (compute-quad-point center-x height angle)))))))
+          (setf angle remainder)))
+    (cond
+      ((= angle 270)
+       (gfs:make-point :x (floor center-x)
+                       :y (+ (floor center-y) (floor height 2))))
+      ((> angle 270)
+       (compute-quad-point center-x height (- angle 270)))
+      ((= angle 180)
+       (gfs:make-point :x (- (floor center-x) (floor width 2))
+                       :y (floor center-y)))
+      ((> angle 180)
+       (compute-quad-point center-x height (- angle 180)))
+      ((= angle 90)
+       (gfs:make-point :x (floor center-x)
+                       :y (- (floor center-y) (floor height 2))))
+      ((> angle 90)
+       (compute-quad-point center-x height(- angle 90)))
+      ((= angle 0)
+       (gfs:make-point :x (+ (floor center-x) (floor width 2))
+                       :y (floor center-y)))
+      (t
+       (compute-quad-point center-x height angle)))))
 
 (defmethod medium-draw-ellipse* ((medium graphic-forms-medium)
                                  center-x center-y




More information about the Mcclim-cvs mailing list