Changeset main,57

Timestamp:

11/16/2007 05:02:49 PM (19 years ago)

Author:

David Owen <dsowen@…>

branch-nick:

tui

revision id:

dsowen@fugue88.ws-20071116170249-94hz80fpsdchxhwp

Message:

Moved header-columns into the data model.

Location:

main/grid

Files:

• display.lisp (modified) (4 diffs)
• model.lisp (modified) (1 diff)
• package.lisp (modified) (1 diff)
• test.lisp (modified) (3 diffs)

main/grid/display.lisp

@@ -5 +5 @@
 (defclass grid ()
   ((data :initarg :data)
-   (header-columns :type (integer 0) :initarg :header-columns)
    (window :initarg :window)
    (row-scroll :type (integer 0) :initform 0 :accessor row-scroll)
    (column-scroll :type (integer 0) :initform 0 :accessor column-scroll)))
 
-(defun make-grid (window data &key (header-columns 0))
+(defun make-grid (window data)
   (make-instance 'grid
                  :data data
-                 :header-columns header-columns
                  :window window))
 
@@ -32 +30 @@
 
 (defun column-split (grid column)
-  (with-slots (header-columns) grid
-    (saturate header-columns column))) 
+  (with-slots (data) grid
+    (saturate (header-columns data) column))) 
 
 (defun column-offset (grid column)
-  (with-slots (data header-columns column-scroll) grid
-    (let ((base (+ header-columns column-scroll))
-          (column-widths (mapcar (peval 'column-width data)
-                                 (range header-columns))))
-      (multiple-value-bind (in-header in-data) (column-split grid column)
-        (let ((w1 (reduce '+ column-widths :end in-header))
-              (w2 (reduce '+ column-widths :start base
-                                           :end (+ base in-data))))
-          (+ w1 w2))))))
+  (with-slots (data column-scroll) grid
+    (let ((header-columns (header-columns data)))
+      (let ((base (+ header-columns column-scroll))
+            (column-widths (mapcar (peval 'column-width data)
+                                   (range header-columns))))
+        (multiple-value-bind (in-header in-data) (column-split grid column)
+          (let ((w1 (reduce '+ column-widths :end in-header))
+                (w2 (reduce '+ column-widths :start base
+                                             :end (+ base in-data))))
+            (+ w1 w2)))))))
 
 (defun row-split (grid row)
@@ -96 +95 @@
 
 (defun draw (grid)
-  (with-slots (data header-columns window column-scroll) grid
-    (erase window)
-    (let ((x 0))
-      (dotimes (i header-columns)
-        (draw-column grid i x)
-        (incf x (column-width data i)))
-      (do ((i (+ header-columns column-scroll) (incf i)))
-          ((or (>= i (columns data))
-               (> x (nth-value 1 (size window)))))
-        (draw-column grid i x)
-        (incf x (column-width data i))))))
+  (with-slots (data window column-scroll) grid
+    (let ((header-columns (header-columns data)))
+      (erase window)
+      (let ((x 0))
+        (dotimes (i header-columns)
+          (draw-column grid i x)
+          (incf x (column-width data i)))
+        (do ((i (+ header-columns column-scroll) (incf i)))
+            ((or (>= i (columns data))
+                 (> x (nth-value 1 (size window)))))
+          (draw-column grid i x)
+          (incf x (column-width data i)))))))
 
 
@@ -121 +121 @@
 
 (defmethod max-column-scroll ((grid grid))
-  (with-slots (data header-columns window) grid
-    (- (columns data) header-columns 1)))
+  (with-slots (data window) grid
+    (- (columns data) (header-columns data) 1)))
 
 (defmethod (setf column-scroll) :around (i (grid grid))

main/grid/model.lisp

@@ -18 +18 @@
    "Returns the number of columns of data."))
 
-#|(defgeneric header-columns (grid-data)
+(defgeneric header-columns (grid-data)
   (:documentation
    "Returns the number of columns that contain header data, and may be
 considered for locking in place during scrolling operations.  Header
 columns are always at the left of the grid (from column 0).")
-  (:method (grid-data) 0))|#
+  (:method (grid-data) 0))
 
 (defgeneric column-width (grid-data column)

main/grid/package.lisp

@@ -1 +1 @@
 (defpackage #:grid
   (:use #:cl #:dso-util #:tui-display-string #:tui-output #:tui-window)
-  (:export #:rows #:header-rows #:columns #:column-width #:item
-           #:uses-display-strings #:row-scroll #:column-scroll #:make-grid
-           #:draw))
+  (:export #:rows #:header-rows #:columns #:header-columns #:column-width
+           #:item #:uses-display-strings #:row-scroll #:column-scroll
+           #:make-grid #:draw))

main/grid/test.lisp

@@ -15 +15 @@
 
 (defmethod columns ((gd test)) 10)
+
+(defmethod header-columns ((gd test))
+  1)
 
 (defmethod column-width ((gd test) column)
@@ -44 +47 @@
       (clear screen)
       (with-subwindow (window screen 5 16 0 0)
-        (let ((grid (make-grid window data :header-columns 1)))
+        (let ((grid (make-grid window data)))
           (flet ((try (i)
                    (setf (row-scroll grid) i)
@@ -60 +63 @@
             (try 99))))
       (clear screen)
-      (let ((grid (make-grid screen data :header-columns 1)))
+      (let ((grid (make-grid screen data)))
         (draw grid)
         (read-key screen)))))