September 2005 - mcclim-cvs@common-lisp.net

[mcclim-cvs] CVS update: mcclim/Apps/Inspector/inspector.lisp
by varkesteijn＠common-lisp.net 13 Sep '05

13 Sep '05

Update of /project/mcclim/cvsroot/mcclim/Apps/Inspector In directory common-lisp.net:/tmp/cvs-serv4106 Modified Files: inspector.lisp Log Message: Bug fix: printed iso 8601 time stamp claims to be in UTC (as indicated by the trailing Z), but was in local time. Date: Tue Sep 13 13:07:41 2005 Author: varkesteijn Index: mcclim/Apps/Inspector/inspector.lisp diff -u mcclim/Apps/Inspector/inspector.lisp:1.32 mcclim/Apps/Inspector/inspector.lisp:1.33 --- mcclim/Apps/Inspector/inspector.lisp:1.32 Tue Apr 26 23:35:24 2005 +++ mcclim/Apps/Inspector/inspector.lisp Tue Sep 13 13:07:40 2005 @@ -599,7 +599,7 @@ "Return the given universal time in ISO 8601 format. This will raise an error if the given time is not a decodable universal time." (multiple-value-bind (sec min hour date month year) - (decode-universal-time time) + (decode-universal-time time 0) (format nil "~4,'0D-~2,'0D-~2,'0DT~2,'0D:~2,'0D:~2,'0DZ" year month date hour min sec)))

1 0

[mcclim-cvs] CVS update: mcclim/Tests/regions.lisp
by rstrandh＠common-lisp.net 12 Sep '05

12 Sep '05

Update of /project/mcclim/cvsroot/mcclim/Tests In directory common-lisp.net:/tmp/cvs-serv9556 Modified Files: regions.lisp Log Message: Tests for ellipses and elliptical arcs. This addition means that regions are mostly covered. Date: Mon Sep 12 23:23:57 2005 Author: rstrandh Index: mcclim/Tests/regions.lisp diff -u mcclim/Tests/regions.lisp:1.3 mcclim/Tests/regions.lisp:1.4 --- mcclim/Tests/regions.lisp:1.3 Sun Sep 11 23:44:42 2005 +++ mcclim/Tests/regions.lisp Mon Sep 12 23:23:56 2005 @@ -227,4 +227,67 @@ (assert (region-equal (make-point x1 y2) (rectangle-min-point r1))) (assert (region-equal (make-point x2 y1) (rectangle-max-point r1)))) +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; +;;; ellipse +(assert (subtypep 'ellipse 'area)) +(assert (subtypep 'standard-ellipse 'ellipse)) + +(let* ((xc 234) (yc 345) (xdr1 -858) (ydr1 44) (xdr2 -55) (ydr2 5) + (sa 10) (ea 270) + (pc (make-point xc yc)) + (e1 (make-ellipse* xc yc xdr1 ydr1 xdr2 ydr2 :start-angle sa :end-angle ea)) + (e2 (make-ellipse pc xdr1 ydr1 xdr2 ydr2 :start-angle sa :end-angle ea)) + (e3 (make-ellipse pc xdr1 ydr1 xdr2 ydr2))) + (assert (typep e1 'standard-ellipse)) + (assert (ellipsep e1)) +;;; this test fails +;;; (assert (region-equal e1 e2)) + (multiple-value-bind (x y) (ellipse-center-point* e1) + (assert (= (coordinate xc) x)) + (assert (= (coordinate yc) y)) + (assert (region-equal (make-point x y) (ellipse-center-point e2)))) + (multiple-value-bind (xr11 yr11 xr12 yr12) (ellipse-radii e1) + (multiple-value-bind (xr21 yr21 xr22 yr22) (ellipse-radii e2) + (assert (= xr11 xr21)) + (assert (= yr11 yr21)) + (assert (= xr12 xr22)) + (assert (= yr12 yr22)))) + (assert (= (coordinate sa) (coordinate (ellipse-start-angle e1)))) + (assert (= (coordinate ea) (coordinate (ellipse-end-angle e1)))) + (assert (null (ellipse-start-angle e3))) + (assert (null (ellipse-end-angle e3)))) + + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; +;;; elliptical arc + +(assert (subtypep 'elliptical-arc 'path)) +(assert (subtypep 'standard-elliptical-arc 'elliptical-arc)) + +(let* ((xc 234) (yc 345) (xdr1 -858) (ydr1 44) (xdr2 -55) (ydr2 5) + (sa 10) (ea 270) + (pc (make-point xc yc)) + (ea1 (make-elliptical-arc* xc yc xdr1 ydr1 xdr2 ydr2 :start-angle sa :end-angle ea)) + (ea2 (make-elliptical-arc pc xdr1 ydr1 xdr2 ydr2 :start-angle sa :end-angle ea)) + (ea3 (make-elliptical-arc pc xdr1 ydr1 xdr2 ydr2))) + (assert (typep ea1 'standard-elliptical-arc)) + (assert (elliptical-arc-p ea1)) +;;; this test fails +;;; (assert (region-equal ea1 ea2)) + (multiple-value-bind (x y) (ellipse-center-point* ea1) + (assert (= (coordinate xc) x)) + (assert (= (coordinate yc) y)) + (assert (region-equal (make-point x y) (ellipse-center-point ea2)))) + (multiple-value-bind (xr11 yr11 xr12 yr12) (ellipse-radii ea1) + (multiple-value-bind (xr21 yr21 xr22 yr22) (ellipse-radii ea2) + (assert (= xr11 xr21)) + (assert (= yr11 yr21)) + (assert (= xr12 xr22)) + (assert (= yr12 yr22)))) + (assert (= (coordinate sa) (coordinate (ellipse-start-angle ea1)))) + (assert (= (coordinate ea) (coordinate (ellipse-end-angle ea1)))) + (assert (null (ellipse-start-angle ea3))) + (assert (null (ellipse-end-angle ea3))))

1 0

[mcclim-cvs] CVS update: mcclim/Tests/regions.lisp
by rstrandh＠common-lisp.net 11 Sep '05

11 Sep '05

Update of /project/mcclim/cvsroot/mcclim/Tests In directory common-lisp.net:/tmp/cvs-serv5189 Modified Files: regions.lisp Log Message: tests for lines and rectangles Date: Sun Sep 11 23:44:42 2005 Author: rstrandh Index: mcclim/Tests/regions.lisp diff -u mcclim/Tests/regions.lisp:1.2 mcclim/Tests/regions.lisp:1.3 --- mcclim/Tests/regions.lisp:1.2 Thu Sep 8 23:43:22 2005 +++ mcclim/Tests/regions.lisp Sun Sep 11 23:44:42 2005 @@ -143,7 +143,9 @@ (push (make-point x y) points)) pl1) (assert (null (set-difference (list p1 p2 p3) points :test #'region-equal))) - (assert (null (set-difference points (list p1 p2 p3) :test #'region-equal)))) + (assert (null (set-difference points (list p1 p2 p3) :test #'region-equal))) + (assert (polyline-closed pl3)) + (assert (not (polyline-closed pl2)))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; @@ -172,3 +174,57 @@ pg1) (assert (null (set-difference (list p1 p2 p3) points :test #'region-equal))) (assert (null (set-difference points (list p1 p2 p3) :test #'region-equal)))) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; +;;; line + +(assert (subtypep 'line 'polyline)) +(assert (subtypep 'standard-line 'line)) + +(let* ((x1 234) (y1 876) (x2 345) (y2 -55) + (p1 (make-point x1 y1)) (p2 (make-point x2 y2)) + (l1 (make-line p1 p2)) (l2 (make-line* x1 y1 x2 y2))) + (assert (typep l1 'standard-line)) + (assert (linep l1)) + (assert (region-equal l1 l2)) + (multiple-value-bind (xx1 yy1) (line-start-point* l1) + (assert (= (coordinate x1) xx1)) + (assert (= (coordinate y1) yy1))) + (multiple-value-bind (xx2 yy2) (line-end-point* l1) + (assert (= (coordinate x2) xx2)) + (assert (= (coordinate y2)yy2))) + (assert (region-equal p1 (line-start-point l1))) + (assert (region-equal p2 (line-end-point l1)))) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; +;;; rectangle + +(assert (subtypep 'rectangle 'polygon)) +(assert (subtypep 'standard-rectangle 'rectangle)) + +(let* ((x1 234) (y1 876) (x2 345) (y2 -55) + (p1 (make-point x1 y1)) (p2 (make-point x2 y2)) + (r1 (make-rectangle p1 p2)) (r2 (make-rectangle* x1 y1 x2 y2))) + (assert (typep r1 'standard-rectangle)) + (assert (rectanglep r1)) + (assert (region-equal r1 r2)) + (multiple-value-bind (min-x min-y max-x max-y) (rectangle-edges* r1) + (assert (= (rectangle-min-x r1) min-x)) + (assert (= (rectangle-min-y r1) min-y)) + (assert (= (rectangle-max-x r1) max-x)) + (assert (= (rectangle-max-y r1) max-y)) + (assert (= (coordinate x1) min-x)) + (assert (= (coordinate y1) max-y)) + (assert (= (coordinate x2) max-x)) + (assert (= (coordinate y2) min-y)) + (multiple-value-bind (width height) (rectangle-size r1) + (assert (= width (rectangle-width r1))) + (assert (= height (rectangle-height r1))) + (assert (= width (- max-x min-x))) + (assert (= height (- max-y min-y))))) + (assert (region-equal (make-point x1 y2) (rectangle-min-point r1))) + (assert (region-equal (make-point x2 y1) (rectangle-max-point r1)))) + +

1 0

[mcclim-cvs] CVS update: mcclim/graphics.lisp
by rschlatte＠common-lisp.net 10 Sep '05

10 Sep '05

Update of /project/mcclim/cvsroot/mcclim In directory common-lisp.net:/tmp/cvs-serv26755 Modified Files: graphics.lisp Log Message: Implement with-output-to-pixmap with incomplete / missing size arguments Date: Sat Sep 10 13:53:15 2005 Author: rschlatte Index: mcclim/graphics.lisp diff -u mcclim/graphics.lisp:1.50 mcclim/graphics.lisp:1.51 --- mcclim/graphics.lisp:1.50 Wed Feb 2 12:33:58 2005 +++ mcclim/graphics.lisp Sat Sep 10 13:53:15 2005 @@ -705,15 +705,28 @@ ;;; mess. I think we need a pixmap output recording stream in order to do this ;;; right. -- moore (defmacro with-output-to-pixmap ((medium-var sheet &key width height) &body body) - `(let* ((pixmap (allocate-pixmap ,sheet ,width ,height)) ; XXX size might be unspecified -- APD - (,medium-var (make-medium (port ,sheet) pixmap)) - (old-medium (sheet-medium ,sheet))) - (setf (slot-value pixmap 'medium) ,medium-var) ; hmm, [seems to work] -- BTS - (setf (%sheet-medium ,sheet) ,medium-var) ;is sheet a sheet-with-medium-mixin? --GB - (unwind-protect - (progn ,@body) - (setf (%sheet-medium ,sheet) old-medium));is sheet a sheet-with-medium-mixin? --GB - pixmap)) + (if (and width height) + `(let* ((pixmap (allocate-pixmap ,sheet ,width ,height)) + (,medium-var (make-medium (port ,sheet) pixmap)) + (old-medium (sheet-medium ,sheet))) + (setf (slot-value pixmap 'medium) ,medium-var) ; hmm, [seems to work] -- BTS + (setf (%sheet-medium ,sheet) ,medium-var) ;is sheet a sheet-with-medium-mixin? --GB + (unwind-protect + (progn ,@body) + (setf (%sheet-medium ,sheet) old-medium)) ;is sheet a sheet-with-medium-mixin? --GB + pixmap) + (let ((record (gensym "OUTPUT-RECORD-"))) + ;; rudi (2005-09-05) What to do when only width or height are + ;; given? And what's the meaning of medium-var? + `(let* ((,medium-var ,sheet) + (,record (with-output-to-output-record (,medium-var) + ,@body))) + (with-output-to-pixmap + (,medium-var + ,sheet + :width ,(or width `(bounding-rectangle-width ,record)) + :height ,(or height `(bounding-rectangle-height ,record))) + (replay-output-record ,record ,sheet)))))) ;;; XXX This seems to be incorrect. ;;; This presumes that your drawing will completely fill the bounding rectangle

1 0

[mcclim-cvs] CVS update: mcclim/Tests/regions.lisp
by rstrandh＠common-lisp.net 08 Sep '05

08 Sep '05

Update of /project/mcclim/cvsroot/mcclim/Tests In directory common-lisp.net:/tmp/cvs-serv28792 Modified Files: regions.lisp Log Message: More tests for regions. Lines and rectangles are not done yet. Date: Thu Sep 8 23:43:23 2005 Author: rstrandh Index: mcclim/Tests/regions.lisp diff -u mcclim/Tests/regions.lisp:1.1 mcclim/Tests/regions.lisp:1.2 --- mcclim/Tests/regions.lisp:1.1 Fri Aug 26 21:58:37 2005 +++ mcclim/Tests/regions.lisp Thu Sep 8 23:43:22 2005 @@ -16,8 +16,6 @@ (assert (subtypep 'path 'region)) (assert (subtypep 'path 'bounding-rectangle)) - - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; ;;; area @@ -27,7 +25,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; -;;; coordiante +;;; coordinate (assert (or (and (subtypep 'coordinate t) (subtypep t 'coordinate)) @@ -100,4 +98,77 @@ (assert (or (typep d 'standard-region-difference) (pointp d))) (assert (member (length regions) '(1 2))) - (assert (member p1 regions :test #'region-equal))) + (assert (member p1 regions :test #'region-equal)) + (let* ((regions2 '())) + (map-over-region-set-regions + (lambda (region) (push region regions2)) + d) + (assert (null (set-difference regions regions2 :test #'region-equal))) + (assert (null (set-difference regions2 regions :test #'region-equal))))) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; +;;; polyline + +(assert (subtypep 'polyline 'path)) +(assert (subtypep 'standard-polyline 'polyline)) + +(let* ((x1 10) (y1 22) (x2 30) (y2 30) (x3 50) (y3 5) + (p1 (make-point x1 y1)) (p2 (make-point x2 y2)) (p3 (make-point x3 y3)) + (pl1 (make-polyline (list p1 p2 p3))) + (pl2 (make-polyline* (list x1 y1 x2 y2 x3 y3))) + (pl3 (make-polyline (list p1 p2 p3) :closed t)) + (pl4 (make-polyline* (list x1 y1 x2 y2 x3 y3) :closed t)) + (points '())) + (assert (typep pl1 'standard-polyline)) + (assert (polylinep pl1)) + (assert (typep pl2 'standard-polyline)) + (assert (polylinep pl2)) + (assert (region-equal pl1 pl2)) + (assert (typep pl3 'standard-polyline)) + (assert (polylinep pl3)) + (assert (typep pl4 'standard-polyline)) + (assert (polylinep pl4)) + (assert (region-equal pl3 pl4)) + (assert (null (set-difference (polygon-points pl1) (list p1 p2 p3) :test #'region-equal))) + (assert (null (set-difference (list p1 p2 p3) (polygon-points pl1) :test #'region-equal))) + (assert (null (set-difference (polygon-points pl2) (list p1 p2 p3) :test #'region-equal))) + (assert (null (set-difference (list p1 p2 p3) (polygon-points pl2) :test #'region-equal))) + (assert (null (set-difference (polygon-points pl3) (list p1 p2 p3) :test #'region-equal))) + (assert (null (set-difference (list p1 p2 p3) (polygon-points pl3) :test #'region-equal))) + (assert (null (set-difference (polygon-points pl4) (list p1 p2 p3) :test #'region-equal))) + (assert (null (set-difference (list p1 p2 p3) (polygon-points pl4) :test #'region-equal))) + (map-over-polygon-coordinates + (lambda (x y) + (push (make-point x y) points)) + pl1) + (assert (null (set-difference (list p1 p2 p3) points :test #'region-equal))) + (assert (null (set-difference points (list p1 p2 p3) :test #'region-equal)))) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; +;;; polygon + +(assert (subtypep 'polygon 'area)) +(assert (subtypep 'standard-polygon 'polygon)) + +(let* ((x1 10) (y1 22) (x2 30) (y2 30) (x3 50) (y3 5) + (p1 (make-point x1 y1)) (p2 (make-point x2 y2)) (p3 (make-point x3 y3)) + (pg1 (make-polygon (list p1 p2 p3))) + (pg2 (make-polygon* (list x1 y1 x2 y2 x3 y3))) + (points '())) + (assert (typep pg1 'standard-polygon)) + (assert (polygonp pg1)) + (assert (typep pg2 'standard-polygon)) + (assert (polygonp pg2)) + (assert (region-equal pg1 pg2)) + (assert (null (set-difference (polygon-points pg1) (list p1 p2 p3) :test #'region-equal))) + (assert (null (set-difference (list p1 p2 p3) (polygon-points pg1) :test #'region-equal))) + (assert (null (set-difference (polygon-points pg2) (list p1 p2 p3) :test #'region-equal))) + (assert (null (set-difference (list p1 p2 p3) (polygon-points pg2) :test #'region-equal))) + (map-over-polygon-coordinates + (lambda (x y) + (push (make-point x y) points)) + pg1) + (assert (null (set-difference (list p1 p2 p3) points :test #'region-equal))) + (assert (null (set-difference points (list p1 p2 p3) :test #'region-equal))))

1 0

[mcclim-cvs] CVS update: mcclim/presentation-defs.lisp
by mretzlaff＠common-lisp.net 02 Sep '05

02 Sep '05

Update of /project/mcclim/cvsroot/mcclim In directory common-lisp.net:/tmp/cvs-serv19729 Modified Files: presentation-defs.lisp Log Message: In response to: http://article.gmane.org/gmane.lisp.mcclim.devel/724 We reSIGNAL the condition now before the call to ABORT, to give outer handlers a chance to say "I know how to handle this" (as Christophe Rhodes has put it). Date: Fri Sep 2 13:36:48 2005 Author: mretzlaff Index: mcclim/presentation-defs.lisp diff -u mcclim/presentation-defs.lisp:1.47 mcclim/presentation-defs.lisp:1.48 --- mcclim/presentation-defs.lisp:1.47 Thu Sep 1 04:59:11 2005 +++ mcclim/presentation-defs.lisp Fri Sep 2 13:36:48 2005 @@ -664,7 +664,9 @@ display-default query-identifier activation-gestures additional-activation-gestures delimiter-gestures additional-delimiter-gestures)) - (handler-bind ((abort-gesture #'abort)) + (handler-bind ((abort-gesture (lambda (condition) + (signal condition) ;; to give outer handlers a chance to say "I know how to handle this" + (abort condition)))) (let* ((real-type (expand-presentation-type-abbreviation type)) (real-default-type (cond (default-type-p (expand-presentation-type-abbreviation

1 0

[mcclim-cvs] CVS update: mcclim/presentation-defs.lisp mcclim/presentations.lisp
by mretzlaff＠common-lisp.net 01 Sep '05

01 Sep '05

Update of /project/mcclim/cvsroot/mcclim In directory common-lisp.net:/tmp/cvs-serv10674 Modified Files: presentation-defs.lisp presentations.lisp Log Message: Section 23.7.1 "Defining Presentation Translators" of the clim spec says in the subsection on DEFINE-PRESENTATION-ACTION: Note that the tester for presentation actions is always assumed to be definitive. This hasn't been the case until now for McCLIM. In addition to this the lambda-list of DEFINE-DRAG-AND-DROP-TRANSLATOR has been revised a bit. (Note that I couldn't find a sentence in the spec that specifies the default value for the parameter MENU, but the other three define-translator macros have all t as the default. Nevertheless, most of the parameters are ignored right now.) Date: Thu Sep 1 04:59:12 2005 Author: mretzlaff Index: mcclim/presentation-defs.lisp diff -u mcclim/presentation-defs.lisp:1.46 mcclim/presentation-defs.lisp:1.47 --- mcclim/presentation-defs.lisp:1.46 Thu Aug 25 22:24:10 2005 +++ mcclim/presentation-defs.lisp Thu Sep 1 04:59:11 2005 @@ -2020,17 +2020,20 @@ (presentation-subtypep subtype-over over)))))) (defmacro define-drag-and-drop-translator - (name - (from-type to-type destination-type command-table - &rest args - &key (gesture :select) tester documentation - pointer-documentation menu priority - (feedback 'frame-drag-and-drop-feedback) - (highlighting 'frame-drag-and-drop-highlighting)) + (name (from-type to-type destination-type command-table + &rest args &key + (gesture :select) + (tester 'default-translator-tester) + documentation + (pointer-documentation nil pointer-documentation-p) + (menu t) + (priority 0) + (feedback 'frame-drag-and-drop-feedback) + (highlighting 'frame-drag-and-drop-highlighting)) arglist &body body) - (declare (ignore tester documentation pointer-documentation menu - priority)) + (declare (ignore tester documentation pointer-documentation pointer-documentation-p + menu priority)) (let* ((real-from-type (expand-presentation-type-abbreviation from-type)) (real-dest-type (expand-presentation-type-abbreviation destination-type)) Index: mcclim/presentations.lisp diff -u mcclim/presentations.lisp:1.70 mcclim/presentations.lisp:1.71 --- mcclim/presentations.lisp:1.70 Fri Jan 14 13:43:23 2005 +++ mcclim/presentations.lisp Thu Sep 1 04:59:11 2005 @@ -1357,6 +1357,7 @@ `',tester `#',(make-translator-fun (car tester) (cdr tester))) + :tester-definitive t :documentation #',(make-documentation-fun documentation) ,@(when pointer-documentation-p `(:pointer-documentation

1 0