X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tables.lisp;h=aad7421756fbf701bf1e2a75ea083ed765ccf100;hb=refs%2Ftags%2Fdebian-0.13-1;hp=0b256a514bd23f4e48424a862c0bf0be370b605c;hpb=42befba0efb70b244c70edf76dbb1c5d012bb685;p=cl-photo.git diff --git a/tables.lisp b/tables.lisp index 0b256a5..aad7421 100644 --- a/tables.lisp +++ b/tables.lisp @@ -25,7 +25,7 @@ (defun hyperfocal-table (focal-length coc &key (units :feet) (output *standard-output*)) (loop for f-stop in +f-stops+ - do (format output "~4,1F ~,1F~%" + do (format output "~4,1F ~,1F~%" f-stop (hyperfocal focal-length f-stop coc :units units))) (values)) @@ -37,7 +37,7 @@ (loop for focal-length in +focal-lengths+ do (let ((aov (multiple-value-list (aov focal-length (car imager-dim) (cdr imager-dim) :projection projection)))) - (format output "~5D ~5,1F ~5,1F ~5,1F~%" + (format output "~5D ~5,1F ~5,1F ~5,1F~%" focal-length (nth 0 aov) (nth 1 aov) (nth 2 aov))))) (values)) @@ -54,7 +54,7 @@ (car imager-dim) (cdr imager-dim) distance :projection projection)))) - (format output "~8F: ~6F ~6F ~6F ~6F~%" + (format output "~8F: ~6F ~6F ~6F ~6F~%" (mm->length distance units) (nth 0 fov) (nth 1 fov) (nth 2 fov) (nth 3 fov))))) (values)) @@ -71,6 +71,7 @@ (dolist (distance distances) (multiple-value-bind (near far dof mag blur) (dof focal-length f-stop distance coc :units units) + (declare (ignorable dof mag blur)) (when (minusp far) (setq far "Inf ")) (format output "~5F/~5F " near far))) (format output "~%")))