[mcclim-cvs] CVS mcclim/Apps/Functional-Geometry
tmoore
tmoore at common-lisp.net
Mon Mar 20 08:15:27 UTC 2006
Update of /project/mcclim/cvsroot/mcclim/Apps/Functional-Geometry
In directory clnet:/tmp/cvs-serv14553/Apps/Functional-Geometry
Added Files:
functional-geometry.asd geometry.lisp package.lisp
Log Message:
Made the command-table-inherit-from slot of command tables setf-able,
as per the Franz manual.
Changed the default documentation of presentation translators from the
presentation object to the name of the translator. If this is too
controversial I will back it out.
Force the tester of drag-and-drop translators to be definitive;
otherwise serious weirdness ensues.
Added the functional geometry explorer of Frank Buss and Rainer
Joswig, who graciously agreed to it being included, as an application.
--- /project/mcclim/cvsroot/mcclim/Apps/Functional-Geometry/functional-geometry.asd 2006/03/20 08:15:27 NONE
+++ /project/mcclim/cvsroot/mcclim/Apps/Functional-Geometry/functional-geometry.asd 2006/03/20 08:15:27 1.1
;;; -*- Mode: Lisp -*-
;;;
;;; (c) copyright 2006 by Timothy Moore (moore at bricoworks.com)
;;;
;;; This library is free software; you can redistribute it and/or
;;; modify it under the terms of the GNU Library General Public
;;; License as published by the Free Software Foundation; either
;;; version 2 of the License, or (at your option) any later version.
;;;
;;; This library is distributed in the hope that it will be useful,
;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
;;; Library General Public License for more details.
;;;
;;; You should have received a copy of the GNU Library General Public
;;; License along with this library; if not, write to the
;;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
;;; Boston, MA 02111-1307 USA.
(defpackage :mcclim.functional-geometry.system
(:use :asdf :cl))
(in-package :mcclim.functional-geometry.system)
(defsystem #:functional-geometry
:name #:functional-geometry
:depends-on (:clim-listener)
:components ((:file "package")
(:file "geometry" :depends-on ("package"))))
--- /project/mcclim/cvsroot/mcclim/Apps/Functional-Geometry/geometry.lisp 2006/03/20 08:15:27 NONE
+++ /project/mcclim/cvsroot/mcclim/Apps/Functional-Geometry/geometry.lisp 2006/03/20 08:15:27 1.1
;;; -*- Mode: Lisp -*-
;;;
;;; Copyright (c) 2005 by Frank Buss (fb at frank-buss.de)
;;; Clim interface by Rainer Joswig is in the public domain
;;;
;;; Permission is hereby granted, free of charge, to any person obtaining a
;;; copy of this software and associated documentation files (the "Software"),
;;; to deal in the Software without restriction, including without limitation
;;; the rights to use, copy, modify, merge, publish, distribute, sublicense,
;;; and/or sell copies of the Software, and to permit persons to whom the
;;; Software is furnished to do so, subject to the following conditions:
;;;
;;; The above copyright notice and this permission notice shall be included in
;;; all copies or substantial portions of the Software.
;;;
;;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
;;; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
;;; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
;;; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
;;; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
;;; FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
;;; DEALINGS IN THE SOFTWARE.
;;; Functional Geometry
;;;
;;; Original idea by Peter Henderson, see
;;; http://www.ecs.soton.ac.uk/~ph/funcgeo.pdf
;;; and http://www.ecs.soton.ac.uk/~ph/papers/funcgeo2.pdf
;;;
;;; Implemented in Lisp by Frank Buss
;;;
;;; CLIM Listener interface by Rainer Joswig
;;;
;;; call it with (clim-plot *fishes*) from a Listener.
;;;
;;; the framework
;;;
(in-package #:functional-geometry)
(defun p* (vector m)
"vector scalar multiplication"
(destructuring-bind (vx vy) vector
(list (* vx m) (* vy m))))
(defun p/ (vector d)
"vector scalar division"
(destructuring-bind (vx vy) vector
(list (/ vx d) (/ vy d))))
(defun p+ (&rest vectors)
"#'+ for vectors"
(case (length vectors)
(0 '(0 0))
(1 (car vectors))
(otherwise (flet ((p+p (v1 v2)
(destructuring-bind (vx0 vy0) v1
(destructuring-bind (vx1 vy1) v2
(list (+ vx0 vx1) (+ vy0 vy1))))))
(reduce #'p+p vectors)))))
(defun p- (&rest vectors)
"#'- for vectors"
(case (length vectors)
(0 '(0 0))
(1 (p* (car vectors) -1))
(otherwise (flet ((p-p (v1 v2)
(destructuring-bind (vx0 vy0) v1
(destructuring-bind (vx1 vy1) v2
(list (- vx0 vx1) (- vy0 vy1))))))
(reduce #'p-p vectors)))))
(defun grid (m n s)
"defines a picture from lines in a grid"
(lambda (a b c)
(loop for line in s collect
(destructuring-bind ((x0 y0) (x1 y1)) line
(list (p+ (p/ (p* b x0) m) a (p/ (p* c y0) n))
(p+ (p/ (p* b x1) m) a (p/ (p* c y1) n)))))))
(defun polygon (points)
"converts the points, which specifies a polygon, in a list of lines"
(let ((start (car (last points))))
(loop for point in points collect
(list start point)
do (setf start point))))
(defun blank ()
"a blank picture"
(lambda (a b c)
(declare (ignore a b c))
'()))
(defun beside (p q)
"returns picture p besides picture q"
(lambda (a b c)
(let ((b-half (p/ b 2)))
(union (funcall p a b-half c)
(funcall q (p+ a b-half) b-half c)))))
(defun above (p q)
"returns picture q above picture p"
(lambda (a b c)
(let ((c-half (p/ c 2)))
(union (funcall p (p+ a c-half) b c-half)
(funcall q a b c-half)))))
(defun rot (p)
"returns picture p rotated by 90 degree"
(lambda (a b c)
(funcall p (p+ a b) c (p- b))))
(defun quartet (p1 p2 p3 p4)
"returns the pictures p1-p4, layouted in a square"
(above (beside p1 p2) (beside p3 p4)))
(defun cycle (p)
"returns four times the p, layouted in a square and rotated"
(quartet p (rot (rot (rot p))) (rot p) (rot (rot p))))
#-(and)
(defun plot (p)
" saves a picture as postscript and shows it"
(with-open-file (s "c:/tmp/test.ps"
:direction :output :if-exists :supersede)
(format s "500 500 scale~%")
(format s ".1 .1 translate~%")
(format s "0 setlinewidth~%")
(format s "0 0 moveto 1 0 lineto 1 1 lineto 0 1 lineto 0 0 lineto~%")
(dolist (line (funcall p '(0 0) '(1 0) '(0 1)))
(destructuring-bind ((x0 y0) (x1 y1)) line
(format s "~D ~D moveto ~D ~D lineto~%" (float x0) (float y0) (float x1) (float y1))))
(format s "stroke~%")
(format s "showpage~%"))
(sys:call-system "c:/gs/gs7.05/bin/gswin32.exe -g800x800 c:/tmp/test.ps"))
;;;
;;; a simple test
;;;
;; defines a man
(defparameter *man*
(grid 14 20
(polygon
'((6 10) (0 10) (0 12) (6 12) (6 14)
(4 16) (4 18) (6 20) (8 20) (10 18)
(10 16) (8 14) (8 12) (10 12) (10 14)
(12 14) (12 10) (8 10) (8 8) (10 0)
(8 0) (7 4) (6 0) (4 0) (6 8)))))
;; demonstrates beside
(defparameter *man-beside-man* (beside *man* *man*))
;; demonstrates above
(defparameter *man-above-man* (above *man* *man*))
;; demonstrates rot
(defparameter *man-rotated* (rot *man*))
;; demonstrates quartet
(defparameter *man-quartet* (quartet *man* *man* *man* *man*))
;; demonstrates cycle
(defparameter *man-cycle* (cycle *man*))
;;;
;;; the fish
;;;
;; defines part p of the fish
(defparameter *p*
(grid 16 16
'(((4 4) (6 0)) ((0 3)(3 4)) ((3 4)(0 8))
((0 8)(0 3)) ((4 5)(7 6)) ((7 6)(4 10))
((4 10)(4 5)) ((11 0)(10 4)) ((10 4)(8 8))
((8 8)(4 13)) ((4 13)(0 16)) ((11 0)(14 2))
((14 2)(16 2)) ((10 4)(13 5)) ((13 5)(16 4))
((9 6)(12 7)) ((12 7)(16 6)) ((8 8)(12 9))
((12 9)(16 8)) ((8 12)(16 10)) ((0 16)(6 15))
((6 15)(8 16)) ((8 16)(12 12)) ((12 12)(16 12))
((10 16)(12 14)) ((12 14)(16 13)) ((12 16)(13 15))
((13 15)(16 14)) ((14 16)(16 15)))))
;; defines part q of the fish
(defparameter *q*
(grid 16 16
'(((2 0)(4 5)) ((4 5)(4 7)) ((4 0)(6 5))
((6 5)(6 7)) ((6 0)(8 5)) ((8 5)(8 8))
((8 0)(10 6)) ((10 6)(10 9)) ((10 0)(14 11))
((12 0)(13 4)) ((13 4)(16 8)) ((16 8)(15 10))
((15 10)(16 16)) ((16 16)(12 10)) ((12 10)(6 7))
((6 7)(4 7)) ((4 7)(0 8)) ((13 0)(16 6))
((14 0)(16 4)) ((15 0)(16 2)) ((0 10)(7 11))
((9 12)(10 10)) ((10 10)(12 12)) ((12 12)(9 12))
((8 15)(9 13)) ((9 13)(11 15)) ((11 15)(8 15))
((0 12)(3 13)) ((3 13)(7 15)) ((7 15)(8 16))
((2 16)(3 13)) ((4 16)(5 14)) ((6 16)(7 15)))))
;; defines part r of the fish
(defparameter *r*
(grid 16 16
'(((0 12)(1 14)) ((0 8)(2 12)) ((0 4)(5 10))
((0 0)(8 8)) ((1 1)(4 0)) ((2 2)(8 0))
((3 3)(8 2)) ((8 2)(12 0)) ((5 5)(12 3))
((12 3)(16 0)) ((0 16)(2 12)) ((2 12)(8 8))
((8 8)(14 6)) ((14 6)(16 4)) ((6 16)(11 10))
((11 10)(16 6)) ((11 16)(12 12)) ((12 12)(16 8))
((12 12)(16 16)) ((13 13)(16 10)) ((14 14)(16 12))
((15 15)(16 14)))))
;; defines part s of the fish
(defparameter *s*
(grid 16 16
'(((0 0)(4 2)) ((4 2)(8 2)) ((8 2)(16 0))
((0 4)(2 1)) ((0 6)(7 4)) ((0 8)(8 6))
((0 10)(7 8)) ((0 12)(7 10)) ((0 14)(7 13))
((8 16)(7 13)) ((7 13)(7 8)) ((7 8)(8 6))
((8 6)(10 4)) ((10 4)(16 0)) ((10 16)(11 10))
((10 6)(12 4)) ((12 4)(12 7)) ((12 7)(10 6))
((13 7)(15 5)) ((15 5)(15 8)) ((15 8)(13 7))
((12 16)(13 13)) ((13 13)(15 9)) ((15 9)(16 8))
((13 13)(16 14)) ((14 11)(16 12)) ((15 9)(16 10)))))
;; builds the fishes drawing
(defparameter *t*
(quartet *p* *q* *r* *s*))
(defparameter *u*
(cycle (rot *q*)))
(defparameter *side1*
(quartet (blank) (blank) (rot *t*) *t*))
(defparameter *side2*
(quartet *side1* *side1* (rot *t*) *t*))
(defparameter *corner1*
(quartet (blank) (blank) (blank) *u*))
(defparameter *corner2*
(quartet *corner1* *side1* (rot *side1*) *u*))
(defparameter *pseudocorner*
(quartet *corner2* *side2* (rot *side2*) (rot *t*)))
(defparameter *fishes*
(cycle *pseudocorner*))
(define-presentation-type picture ())
(define-presentation-method presentation-typep (object (type picture))
(typep object 'function))
;;; Plotting
(define-command-table functional-geometry)
(defmacro define-functional-geometry-command ((name &rest options) &body body)
`(define-command (,name :command-table functional-geometry , at options)
, at body))
(defun clim-plot (p &optional (stream *standard-output*))
(fresh-line stream)
(with-output-as-presentation (stream p 'picture :single-box t)
(with-room-for-graphics (stream)
(with-scaling (stream 200 200)
(with-translation (stream 0.1 0.1)
(loop for (x0 y0 x1 y1) in '((0 0 1 0) (1 0 1 1) (1 1 0 1) (0 1 0 0))
do (draw-line* stream x0 y0 x1 y1))
(dolist (line (funcall p (list 0 0) (list 1 0) (list 0 1)))
(destructuring-bind ((x0 y0) (x1 y1)) line
(draw-line* stream x0 y0 x1 y1))))))))
(defun clim-plot-in-window (p &optional (stream *standard-output*))
(clim-plot p stream))
(defun clim-plot-to-postscript (p &optional (pathname "/Users/joswig/Desktop/test-clim.ps"))
(with-open-file (file-stream pathname
:direction :output
:if-exists :supersede
:if-does-not-exist :create)
(with-output-to-postscript-stream (stream file-stream)
(clim-plot p stream))))
;;; XXX The use of EXPRESSION in the OR presentation type exposes a bug in the
;;; accept method for expression when rescanning; you have to hit ENTER three
;;; times when entering an expression (e.g., a variable name) as a picture
;;; value. This will be fixed after .9.2.2. -- moore
(define-functional-geometry-command (plot :name t)
((picture '(or picture expression) :provide-default nil :prompt "picture"))
(unless (presentation-typep picture 'picture)
(setq picture (eval picture))
(clim-plot-in-window picture)
picture))
(define-functional-geometry-command(save-picture-as-postscript :name t)
((picture 'picture :provide-default nil :prompt "picture")
(file 'pathname :provide-default nil :prompt "file"))
(clim-plot-to-postscript picture file)
(values file picture))
(define-functional-geometry-command (com-beside :name t)
((picture0 'picture :provide-default nil :prompt "picture 0")
(picture1 'picture :provide-default nil :prompt "picture 1"))
(let ((new-picture (beside picture0 picture1)))
(clim-plot new-picture)
new-picture))
(define-functional-geometry-command (com-above :name t)
((picture0 'picture :provide-default nil :prompt "picture 0")
(picture1 'picture :provide-default nil :prompt "picture 1"))
(let ((new-picture (above picture0 picture1)))
(clim-plot new-picture)
new-picture))
(define-functional-geometry-command (com-rot :name t)
((picture 'picture :provide-default nil :prompt "picture"))
(let ((new-picture (rot picture)))
(clim-plot new-picture)
new-picture))
(define-functional-geometry-command (com-cycle :name t)
((picture 'picture :provide-default nil :prompt "picture"))
(let ((new-picture (cycle picture)))
(clim-plot new-picture)
new-picture))
(define-functional-geometry-command (com-quartet :name t)
((picture0 'picture :provide-default nil :prompt "picture 0")
(picture1 'picture :provide-default nil :prompt "picture 1")
(picture2 'picture :provide-default nil :prompt "picture 2")
(picture3 'picture :provide-default nil :prompt "picture 3"))
(let ((new-picture (quartet picture0 picture1 picture2 picture3)))
(clim-plot new-picture)
new-picture))
(define-presentation-to-command-translator rot
(picture com-rot functional-geometry :menu t :gesture nil)
(object)
(list object))
(define-presentation-to-command-translator cycle
(picture com-cycle functional-geometry :menu t :gesture nil)
(object)
(list object))
(define-drag-and-drop-translator besides
(picture command picture functional-geometry
:tester ((object destination-object)
(not (eq object destination-object))))
(object destination-object)
`(com-beside ,object ,destination-object))
(pushnew 'functional-geometry
(command-table-inherit-from (find-command-table
'clim-listener::listener)))
(defun run-functional-geometry (&rest args)
"Run a Lisp Listener augmented with functional geometry commands."
(let ((*package* (find-package '#:functional-geometry)))
(apply #'run-listener (append args '(:process-name "Functional Geometry"
:height 800)))))
--- /project/mcclim/cvsroot/mcclim/Apps/Functional-Geometry/package.lisp 2006/03/20 08:15:27 NONE
+++ /project/mcclim/cvsroot/mcclim/Apps/Functional-Geometry/package.lisp 2006/03/20 08:15:27 1.1
;;;
;;; (c) copyright 2006 by Timothy Moore (moore at bricoworks.com)
;;;
;;; This library is free software; you can redistribute it and/or
;;; modify it under the terms of the GNU Library General Public
[17 lines skipped]
More information about the Mcclim-cvs
mailing list