X-Git-Url: http://git.kpe.io/?p=cl-photo.git;a=blobdiff_plain;f=tables.lisp;h=aad7421756fbf701bf1e2a75ea083ed765ccf100;hp=c0df801e1f25201bd6577876f5039390e9f2f18a;hb=HEAD;hpb=3c1c551f36fe090936bf5d21e7eb65acbcc0d457

diff --git a/tables.lisp b/tables.lisp
old mode 100755
new mode 100644
index c0df801..aad7421
--- a/tables.lisp
+++ b/tables.lisp
@@ -23,13 +23,9 @@
 (defparameter +focal-lengths+ '(12 24 35 50 70 85 105 135 200 300 400 500 600))
 (defparameter +distances-feet+ '(0.5 1 3 8 15 25 50 100 200))
 
-(defun hyperfocal-list (focal-length coc &key (units :feet))
-  (loop for f-stop in +f-stops+
-        collect (hyperfocal focal-length f-stop coc :units units)))
-
 (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,26 +33,46 @@
   (let ((imager-dim (etypecase imager
                       (cons imager)
                       (symbol (imager-dimensions imager)))))
+    (format output "~5A ~5A ~5A ~5A~%" "FOCAL" "AOV-W" "AOV-H" "AOV-D")
     (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 "~4D ~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))
 
+(defun fov-table (imager focal-length
+                         &key (output *standard-output*) (projection :rectilinear)
+                         (units :feet))
+  (let ((imager-dim (etypecase imager
+                      (cons imager)
+                      (symbol (imager-dimensions imager))))
+        (distances (mapcar 'feet->mm +distances-feet+)))
+    (format output "~8A  ~6A ~6A ~6A ~6A~%" "DISTANCE" "WIDTH" "HEIGHT" "DIAGON" "MAG")
+    (loop for distance in distances
+          do (let ((fov (multiple-value-list (fov focal-length
+                                                  (car imager-dim) (cdr imager-dim)
+                                                  distance
+                                                  :projection projection))))
+               (format output "~8F: ~6F ~6F ~6F ~6F~%"
+                       (mm->length distance units)
+                       (nth 0 fov) (nth 1 fov) (nth 2 fov) (nth 3 fov)))))
+  (values))
+
 (defun dof-table (focal-length coc &key (output *standard-output*) (units :feet))
   (let ((distances (mapcar (lambda (mm) (mm->length mm units))
                            (mapcar 'feet->mm +distances-feet+))))
-    (format output "~&~5A" "")
+    (format output "~&~5A  " "FStop")
     (dolist (distance distances)
-      (format output " ~10F" distance))
+      (format output " ~10F " distance))
     (format output "~%")
     (dolist (f-stop +f-stops+)
-      (format output "~5,1F " f-stop)
+      (format output "~5,1F  " f-stop)
       (dolist (distance distances)
         (multiple-value-bind (near far dof mag blur) (dof focal-length f-stop distance coc
                                                           :units units)
-          (when (minusp far) (setq far "Inf"))
-          (format output "~4,1F/~4,1F " near far)))
+          (declare (ignorable dof mag blur))
+          (when (minusp far) (setq far "Inf  "))
+          (format output "~5F/~5F " near far)))
       (format output "~%")))
   (values))