[noctool-cvs] CVS source

[imattsson]

Update of /project/noctool/cvsroot/source
In directory clnet:/tmp/cvs-serv3991

Modified Files:
	noctool.asd graph-monitors.lisp 
Log Message:
IM

Remove dependencies on the Image library (now separated).
Knock-on changes to graph-monitoring fixed up.


--- /project/noctool/cvsroot/source/noctool.asd	2008/05/17 10:19:17	1.2
+++ /project/noctool/cvsroot/source/noctool.asd	2008/05/17 12:32:25	1.3
@@ -10,7 +10,7 @@
 	       (:file "generics" :depends-on ("packages" "globals"))
 	       (:file "classes" :depends-on ("packages" "globals" "graphing" "graph-utils"))
 	       (:file "methods" :depends-on ("packages" "classes" "generics"))
-	       (:file "graphing" :depends-on ("packages" "image"))
+	       (:file "graphing" :depends-on ("packages"))
 	       (:file "graph-utils" :depends-on ("packages" "graphing"))
 	       (:file "graph-monitors" :depends-on ("packages"  "classes"))
 	       (:file "config" :depends-on ("utils" "packages" "classes" "globals" "generics"))
--- /project/noctool/cvsroot/source/graph-monitors.lisp	2008/03/17 08:27:58	1.1.1.1
+++ /project/noctool/cvsroot/source/graph-monitors.lisp	2008/05/17 12:32:25	1.2
@@ -72,17 +72,17 @@
 
 
 (defmethod show ((graph noctool::ping-monitor) sink format &key (selector :short) scale &allow-other-keys)
-  (let ((image (make-image 350 140)))
+  (let ((image (image:make-image 350 140)))
     (image:rect image 0 0 349 139 t 240 240 240)
     (multiple-value-bind (percentile max scale)
 	(show (noctool::graph graph) image nil :selector selector :scale scale)
       )))
 
 (defmethod show ((graph noctool::disk-container) sink format &key (selector :short) scale &allow-other-keys)
-  (let ((image:lines (length (noctool::disk-list graph)))
+  (let ((lines (length (noctool::disk-list graph)))
 	(disks (sort (copy-list (noctool::disk-list graph)) #'> :key #'noctool::disk-max)))
     (let ((image (make-image 350 (+ 130 (* 10 lines)))))
-      (image:rect image 0 0 349 (1- (height image)) t 192 192 192)
+      (image:rect image 0 0 349 (1- (image:height image)) t 192 192 192)
       (multiple-value-bind (percentile max scale) (show (noctool::disk-graph (car disks)) image nil :color '(0 0 0 0.0) :base-x 25 :base-y 110 :height 100 :selector selector)
 	(draw-grid image max (interval graph) selector scale "b" 3 (noctool:last-updated graph))
 	(loop for disk in disks
@@ -99,4 +99,4 @@
 
 (defmethod show :around ((graph noctool::monitor) (sink string) format &key (selector :short) scale &allow-other-keys)
   (let ((image (call-next-method)))
-    (export-to-gif image sink)))
+    (image:export-to-gif image sink)))