Sun Jan 10 09:54:26 CET 2010 Tobias Rautenkranz <tobias@rautenkranz.ch>
* modular smoke & cleanup.
move ./qt.examples.asd ./cl-smoke.qt.examples.asd
addfile ./src/origami/tri.lisp
hunk ./tests/test.lisp 1
-(in-package :qt.examples)
-
-(let ((qt:*exec-p* nil))
- (do-external-symbols (example :qt.examples)
- (when (fboundp example)
- (format *debug-io* "testing ~A~%"
- (documentation (symbol-function example)
- 'function))
- (funcall (symbol-function example)))))
rmfile ./tests/test.lisp
rmdir ./tests
hunk ./cl-smoke.qt.examples.asd 1
-(defpackage qt.examples-system
- (:use :cl :asdf))
-
-(in-package qt.examples-system)
-
-(asdf:defsystem :qt.examples
- :name :qt.examples
+(defsystem :cl-smoke.qt.examples
+ :name :cl-smoke.qt.examples
hunk ./cl-smoke.qt.examples.asd 7
- :depends-on (:qt :qt.webkit :qt.uitools :qt.phonon)
+ :depends-on (:cl-smoke.qt.gui :cl-smoke.qt.webkit :cl-smoke.qt.uitools
+ :cl-smoke.qt.phonon)
+ ;;:cl-opengl :cl-glu :cl-smoke.qt.opengl)
hunk ./cl-smoke.qt.examples.asd 24
+ ;;(:module "origami"
+ ;; :depends-on ("package")
+ ;; :components
+ ;; ((:file "origami" :depends-on ("tri"))
+ ;; (:file "tri")))))))
+
+(defmethod perform ((o test-op) (c (eql (find-system :cl-smoke.qt.examples))))
+ (funcall (intern (string :test-all) (string :qt.examples))))
hunk ./src/class-browser.lisp 82
- (cxx:load web-view (format nil "http://doc.trolltech.com/~A/~A.html" [_$_]
+ (cxx:load web-view (format nil "http://doc.trolltech.com/~A/~(~A~).html" [_$_]
hunk ./src/hello-world-quit.lisp 7
- "Quit on push-button click."
+ "Quit on push-button click"
hunk ./src/i18n-hello-world.lisp 9
- ;; ensures that the message catalogs are found regardless
- ;; of the current directory.
- (let ((source-path *default-pathname-defaults*))
- (qt:with-translator ("hello-world" [_$_]
- *default-pathname-defaults*
- source-path)
- (let ((widget (make-instance 'qt:label)))
- (setf (cxx:window-title widget) (qt:tr "Lisp Qt Example" "hello-world")
- (cxx:text widget) (format nil (qt:tr "<h1>Hello world</h1>
+ (qt:with-translator ("hello-world" [_$_]
+ *default-pathname-defaults*
+ *source-path*)
+ (let ((widget (make-instance 'qt:label)))
+ (setf (cxx:window-title widget) (qt:tr "Lisp Qt Example" "hello-world")
+ (cxx:text widget) (format nil (qt:tr "<h1>Hello world</h1>
hunk ./src/i18n-hello-world.lisp 17
- (lisp-implementation-type)
- (lisp-implementation-version)
- (software-type)
- (software-version)))
- (cxx:show widget)
- (qt:exec))))))
+ (lisp-implementation-type)
+ (lisp-implementation-version)
+ (software-type)
+ (software-version)))
+ (cxx:show widget)
+ (qt:exec)))))
hunk ./src/origami/origami.lisp 1
-;;; Pleated Hyperbolic Paraboloid
+;;; OpenGL Pleated Hyperbolic Paraboloid
hunk ./src/origami/origami.lisp 4
+;;;
hunk ./src/origami/origami.lisp 6
-;;; 6 Existence of Triangulated Hyperbolic Paraboloid
-;;; http://arxiv.org/abs/0906.4747
hunk ./src/origami/origami.lisp 7
-;;; depends on: :qt.examples tri.lisp :cl-opengl :cl-glu
+;;; Erik D. Demaine, Martin L. Demaine, Vi Hart, Gregory N. Price,
+;;; Tomohiro Tachi
+;;;
+;;; http://arxiv.org/abs/0906.4747
+;;; [_$_]
+;;; Section 6: Existence of Triangulated Hyperbolic Paraboloid
hunk ./src/origami/origami.lisp 277
+
+(defun origami ()
+ "OpenGL Pleated Hyperbolic Paraboloid"
+ (qt:with-app ()
+ (let ((origami (make-instance 'origami)))
+ (cxx:show origami)
+ (qt:exec))))
hunk ./src/origami/tri.lisp 1
+(in-package :qt.examples)
+
+(declaim (inline ^))
+(defun ^ (base power)
+ (expt base power))
+
+
+(defun v1 (z1 z2 d1 r1 r2)
+ (values
+ (/
+ (+
+ (* (+ (* -1 z2) z1)
+ (^
+ (+
+ (+
+ (+
+ (+ (* (* -16 (^ d1 2)) (^ z2 4))
+ (* (* (* 64 (^ d1 2)) z1) (^ z2 3)))
+ (*
+ (+ (* (* -96 (^ d1 2)) (^ z1 2))
+ (+ (* (* 32 (^ d1 2)) (^ r2 2))
+ (+ (* (* 32 (^ d1 2)) (^ r1 2)) (* -32 (^ d1 4)))))
+ (^ z2 2)))
+ (*
+ (+ (* (* 64 (^ d1 2)) (^ z1 3))
+ (*
+ (+ (* (* -64 (^ d1 2)) (^ r2 2))
+ (+ (* (* -64 (^ d1 2)) (^ r1 2)) (* 64 (^ d1 4))))
+ z1))
+ z2))
+ (+
+ (+ (* (* -16 (^ d1 2)) (^ z1 4))
+ (*
+ (+ (* (* 32 (^ d1 2)) (^ r2 2))
+ (+ (* (* 32 (^ d1 2)) (^ r1 2)) (* -32 (^ d1 4))))
+ (^ z1 2)))
+ (+
+ (+ (* (* -16 (^ d1 2)) (^ r2 4))
+ (* (+ (* (* 32 (^ d1 2)) (^ r1 2)) (* 32 (^ d1 4))) (^ r2 2)))
+ (+ (+ (* (* -16 (^ d1 2)) (^ r1 4)) (* (* 32 (^ d1 4)) (^ r1 2)))
+ (* -16 (^ d1 6))))))
+ (/ 1 2)))
+ (+ (+ (* (* 4 (^ d1 2)) (^ z2 2)) (* (* (* -8 (^ d1 2)) z1) z2))
+ (+ (* (* 4 (^ d1 2)) (^ z1 2))
+ (+ (* (* 4 (^ d1 2)) (^ r2 2))
+ (+ (* (* -4 (^ d1 2)) (^ r1 2)) (* 4 (^ d1 4)))))))
+ (+ (+ (* (* 8 d1) (^ z2 2)) (* (* (* -16 d1) z1) z2))
+ (+ (* (* 8 d1) (^ z1 2)) (* 8 (^ d1 3)))))
+ (/
+ (+
+ (* -1
+ (^
+ (+
+ (+
+ (+
+ (+ (* (* -16 (^ d1 2)) (^ z2 4))
+ (* (* (* 64 (^ d1 2)) z1) (^ z2 3)))
+ (*
+ (+ (* (* -96 (^ d1 2)) (^ z1 2))
+ (+ (* (* 32 (^ d1 2)) (^ r2 2))
+ (+ (* (* 32 (^ d1 2)) (^ r1 2)) (* -32 (^ d1 4)))))
+ (^ z2 2)))
+ (*
+ (+ (* (* 64 (^ d1 2)) (^ z1 3))
+ (*
+ (+ (* (* -64 (^ d1 2)) (^ r2 2))
+ (+ (* (* -64 (^ d1 2)) (^ r1 2)) (* 64 (^ d1 4))))
+ z1))
+ z2))
+ (+
+ (+ (* (* -16 (^ d1 2)) (^ z1 4))
+ (*
+ (+ (* (* 32 (^ d1 2)) (^ r2 2))
+ (+ (* (* 32 (^ d1 2)) (^ r1 2)) (* -32 (^ d1 4))))
+ (^ z1 2)))
+ (+
+ (+ (* (* -16 (^ d1 2)) (^ r2 4))
+ (* (+ (* (* 32 (^ d1 2)) (^ r1 2)) (* 32 (^ d1 4))) (^ r2 2)))
+ (+ (+ (* (* -16 (^ d1 2)) (^ r1 4)) (* (* 32 (^ d1 4)) (^ r1 2)))
+ (* -16 (^ d1 6))))))
+ (/ 1 2)))
+ (+
+ (+ (+ (* 4 (^ z2 3)) (* (* -4 z1) (^ z2 2)))
+ (*
+ (+ (* -4 (^ z1 2))
+ (+ (* -4 (^ r2 2)) (+ (* 4 (^ r1 2)) (* 4 (^ d1 2)))))
+ z2))
+ (+ (* 4 (^ z1 3))
+ (* (+ (* 4 (^ r2 2)) (+ (* -4 (^ r1 2)) (* 4 (^ d1 2)))) z1))))
+ (+ (+ (* 8 (^ z2 2)) (* (* -16 z1) z2))
+ (+ (* 8 (^ z1 2)) (* 8 (^ d1 2))))))) [_$_]
+
+(defun v2 (z1 z2 d1 r1 r2)
+ (values
+ (/
+ (+
+ (* (+ z2 (* -1 z1))
+ (^
+ (+
+ (+
+ (+
+ (+ (* (* -16 (^ d1 2)) (^ z2 4))
+ (* (* (* 64 (^ d1 2)) z1) (^ z2 3)))
+ (*
+ (+ (* (* -96 (^ d1 2)) (^ z1 2))
+ (+ (* (* 32 (^ d1 2)) (^ r2 2))
+ (+ (* (* 32 (^ d1 2)) (^ r1 2)) (* -32 (^ d1 4)))))
+ (^ z2 2)))
+ (*
+ (+ (* (* 64 (^ d1 2)) (^ z1 3))
+ (*
+ (+ (* (* -64 (^ d1 2)) (^ r2 2))
+ (+ (* (* -64 (^ d1 2)) (^ r1 2)) (* 64 (^ d1 4))))
+ z1))
+ z2))
+ (+
+ (+ (* (* -16 (^ d1 2)) (^ z1 4))
+ (*
+ (+ (* (* 32 (^ d1 2)) (^ r2 2))
+ (+ (* (* 32 (^ d1 2)) (^ r1 2)) (* -32 (^ d1 4))))
+ (^ z1 2)))
+ (+
+ (+ (* (* -16 (^ d1 2)) (^ r2 4))
+ (* (+ (* (* 32 (^ d1 2)) (^ r1 2)) (* 32 (^ d1 4))) (^ r2 2)))
+ (+ (+ (* (* -16 (^ d1 2)) (^ r1 4)) (* (* 32 (^ d1 4)) (^ r1 2)))
+ (* -16 (^ d1 6))))))
+ (/ 1 2)))
+ (+ (+ (* (* 4 (^ d1 2)) (^ z2 2)) (* (* (* -8 (^ d1 2)) z1) z2))
+ (+ (* (* 4 (^ d1 2)) (^ z1 2))
+ (+ (* (* 4 (^ d1 2)) (^ r2 2))
+ (+ (* (* -4 (^ d1 2)) (^ r1 2)) (* 4 (^ d1 4)))))))
+ (+ (+ (* (* 8 d1) (^ z2 2)) (* (* (* -16 d1) z1) z2))
+ (+ (* (* 8 d1) (^ z1 2)) (* 8 (^ d1 3)))))
+ (/
+ (+
+ (^
+ (+
+ (+
+ (+
+ (+ (* (* -16 (^ d1 2)) (^ z2 4)) (* (* (* 64 (^ d1 2)) z1) (^ z2 3)))
+ (*
+ (+ (* (* -96 (^ d1 2)) (^ z1 2))
+ (+ (* (* 32 (^ d1 2)) (^ r2 2))
+ (+ (* (* 32 (^ d1 2)) (^ r1 2)) (* -32 (^ d1 4)))))
+ (^ z2 2)))
+ (*
+ (+ (* (* 64 (^ d1 2)) (^ z1 3))
+ (*
+ (+ (* (* -64 (^ d1 2)) (^ r2 2))
+ (+ (* (* -64 (^ d1 2)) (^ r1 2)) (* 64 (^ d1 4))))
+ z1))
+ z2))
+ (+
+ (+ (* (* -16 (^ d1 2)) (^ z1 4))
+ (*
+ (+ (* (* 32 (^ d1 2)) (^ r2 2))
+ (+ (* (* 32 (^ d1 2)) (^ r1 2)) (* -32 (^ d1 4))))
+ (^ z1 2)))
+ (+
+ (+ (* (* -16 (^ d1 2)) (^ r2 4))
+ (* (+ (* (* 32 (^ d1 2)) (^ r1 2)) (* 32 (^ d1 4))) (^ r2 2)))
+ (+ (+ (* (* -16 (^ d1 2)) (^ r1 4)) (* (* 32 (^ d1 4)) (^ r1 2)))
+ (* -16 (^ d1 6))))))
+ (/ 1 2))
+ (+
+ (+ (+ (* 4 (^ z2 3)) (* (* -4 z1) (^ z2 2)))
+ (*
+ (+ (* -4 (^ z1 2))
+ (+ (* -4 (^ r2 2)) (+ (* 4 (^ r1 2)) (* 4 (^ d1 2)))))
+ z2))
+ (+ (* 4 (^ z1 3))
+ (* (+ (* 4 (^ r2 2)) (+ (* -4 (^ r1 2)) (* 4 (^ d1 2)))) z1))))
+ (+ (+ (* 8 (^ z2 2)) (* (* -16 z1) z2))
+ (+ (* 8 (^ z1 2)) (* 8 (^ d1 2))))))) [_$_]
hunk ./src/package.lisp 15
- [_$_]
hunk ./src/package.lisp 16
+ ;;#:origami
hunk ./src/package.lisp 21
+
+(in-package #:qt.examples)
+
+(defvar *source-path*
+ #.(asdf:component-pathname (asdf:find-component
+ (asdf:find-system :cl-smoke.qt.examples) "src")))
+
+(defun test-all ()
+ (let ((qt:*exec-p* nil))
+ (do-external-symbols (example :qt.examples)
+ (when (fboundp example)
+ (format *debug-io* "testing ~A~%"
+ (documentation (symbol-function example)
+ 'function))
+ (funcall (symbol-function example))))))
hunk ./src/ui.lisp 15
+ *source-path*
hunk ./test.lisp 5
-(asdf:oos 'asdf:load-op :qt.examples)
-(asdf:oos 'asdf:test-op :qt.examples)
+(asdf:oos 'asdf:load-op :cl-smoke.qt.examples)
+(asdf:oos 'asdf:test-op :cl-smoke.qt.examples)
changepref test
sh test.lisp