Add borders and x-axis labels

demo.ss

@@ -11,4 +11,4 @@
 	 (ys1 (map cos xs))
 	 (ys2 (map (lambda (x) (/ 1 (+ 0.5 x))) xs))
 	 (ys3 (map (lambda (x) (sin (* 2 x))) xs)))
-    (displayln (line-plot [xs ys1 ys2 ys3]))))
+    (displayln (line-plot [xs ys1 ys2 ys3] xlabel: "time"))))

uniplot/braille.ss

@@ -53,8 +53,7 @@
 	     (char-color (indexf (lambda (x) (or (char=? (car x) #\newline)
 					    (char>? (car x) #\⠀)))
 				 characters colors)))
-	(if char-color
+	(match char-color
-	  (str (graphics-style [(cadr char-color)])
+	  (#f " ")
-	       (car char-color)
+	  ([#\newline col] "\n")
-	       (graphics-style))
+	  ([c col] (str (graphics-style [col]) c (graphics-style))))))))
-	  #\⠀)))))

uniplot/lineplot.ss

@@ -20,24 +20,37 @@
 			 #t))
   canvas)
 
-(def (line-plot lsts (colors +default-colors+) width: (width 160) height: (height 80))
+(def (line-plot lsts (colors +default-colors+)
-  (canvases->string
+		width: (width 160) height: (height 80) borders: (borders #t)
-   (match lsts
+		xlabel: (xlabel #f))
-     ([ys] [(draw-canvas (iota (length ys)) ys
+  (def canvases
-			 (scale-fn 0 (length ys))
+    (match lsts
-			 (scale-fn (apply min ys) (apply max ys))
+      ([ys] [(draw-canvas (iota (length ys)) ys
-			 width: width height: height)])
+			  (scale-fn 0 (length ys))
-     ([xs ys] [(draw-canvas xs ys
+			  (scale-fn (apply min ys) (apply max ys))
-			    (scale-fn (apply min xs) (apply max xs))
+			  width: width height: height)])
-			    (scale-fn (apply min ys) (apply max ys))
+      ([xs ys] [(draw-canvas xs ys
-			    width: width height: height)])
+			     (scale-fn (apply min xs) (apply max xs))
-     ([xs . yss]
+			     (scale-fn (apply min ys) (apply max ys))
-      (let* ((x-scale-fn (scale-fn (apply min xs) (apply max xs)))
+			     width: width height: height)])
-	     (all-ys (flatten yss))
+      ([xs . yss]
-	     (min-ys (apply min all-ys))
+       (let* ((x-scale-fn (scale-fn (apply min xs) (apply max xs)))
-	     (max-ys (apply max all-ys))
+	      (all-ys (flatten yss))
-	     (y-scale-fn (scale-fn min-ys max-ys)))
+	      (min-ys (apply min all-ys))
-	(for/collect ((ys yss))
+	      (max-ys (apply max all-ys))
-	  (draw-canvas xs ys x-scale-fn y-scale-fn
+	      (y-scale-fn (scale-fn min-ys max-ys)))
-		       width: width height: height)))))
+	 (for/collect ((ys yss))
-   colors))
+	   (draw-canvas xs ys x-scale-fn y-scale-fn
+			width: width height: height))))))
+  (def canvases-str (canvases->string canvases colors))
+  (def hor-size (u8vector-length (vector-ref (car canvases) 0)))
+  (def plot (if borders
+	      (str
+	       " ┌" (make-string (+ 2 hor-size) #\─) "┐\n │ "
+	       (string-subst canvases-str "\n" " │ \n │ ")
+	       (make-string (+ 1 hor-size) #\ )
+	       "│\n └" (make-string (+ 2 hor-size) #\─) "┘\n")
+	      canvases-str))
+  (if xlabel
+    (str plot (make-string (quotient hor-size 2) #\ ) xlabel "\n")
+    plot))