From: Mario R. R. <rio...@us...> - 2012-05-23 18:36:41
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Maxima, A Computer Algebra System". The branch, master has been updated via 58a8d98f2f9371283b70b1395679ce00e74a6ec0 (commit) from 528765031db7c7bb7713e34c63e7cb801ede1ea4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 58a8d98f2f9371283b70b1395679ce00e74a6ec0 Author: Mario Rodriguez <rio...@us...> Date: Wed May 23 20:37:57 2012 +0200 More work on background_color diff --git a/share/draw/draw.lisp b/share/draw/draw.lisp index 4f340f1..d82bd4c 100644 --- a/share/draw/draw.lisp +++ b/share/draw/draw.lisp @@ -18,14 +18,18 @@ ;;; This is a maxima-gnuplot interface. ;;; Visit -;;; http://www.telefonica.net/web2/biomates/maxima/gpdraw +;;; http://riotorto.users.sourceforge.net/gnuplot ;;; for examples ;;; Some portions of this package were written by -;;; Andrej Vodopivec and Joan Pau Beltran. Thanks! +;;; Andrej Vodopivec and Joan Pau Beltran. +;;; Some other people has also helped with bug reports, +;;; comments, complains and feature requests. +;;; Thanks to everybody!! ;;; For questions, suggestions, bugs and the like, feel free ;;; to contact me at + ;;; mario @@@ edu DOT xunta DOT es @@ -2659,6 +2663,7 @@ ; save in plotcmd the gnuplot preamble (setf plotcmd (concatenate 'string + (format nil "set style rectangle fillcolor rgb '~a'~%" (get-option '$background_color)) ; background rectangle (if (equal (get-option '$proportional_axes) '$none) (format nil "set size noratio~%") (format nil "set size ratio -1~%") ) @@ -2826,6 +2831,7 @@ ; save in plotcmd the gnuplot preamble (setf plotcmd (concatenate 'string + (format nil "set style rectangle fillcolor rgb '~a'~%" (get-option '$background_color)) ; background rectangle ; this let statement is to prevent error messages in gnuplot when ; the amplitude of the ranges equals zero (let ((xi (first (get-option '$xrange))) @@ -3004,7 +3010,6 @@ ($file_name (update-gr-option '$file_name ($rhs x))) ($gnuplot_file_name (update-gr-option '$gnuplot_file_name ($rhs x))) ($data_file_name (update-gr-option '$data_file_name ($rhs x))) - ($background_color (update-gr-option '$background_color ($rhs x))) ($delay (update-gr-option '$delay ($rhs x))) ; deprecated global options @@ -3047,19 +3052,15 @@ (round (/ (first (get-option '$dimensions)) 10)) (round (/ (second (get-option '$dimensions)) 10)) (get-option '$file_name))) - ($png (format cmdstorage "set terminal png enhanced truecolor ~a size ~a, ~a~%~a~%set out '~a.png'" + ($png (format cmdstorage "set terminal png enhanced truecolor ~a size ~a, ~a~%set out '~a.png'" (write-font-type) (round (first (get-option '$dimensions))) (round (second (get-option '$dimensions))) - (format nil "set obj 999 rectangle behind from screen 0,0 to screen 1,1 fillcolor rgb '~a'" - (get-option '$background_color)) (get-option '$file_name) ) ) - ($pngcairo (format cmdstorage "set terminal pngcairo enhanced truecolor ~a size ~a, ~a~%~a~%set out '~a.png'" + ($pngcairo (format cmdstorage "set terminal pngcairo enhanced truecolor ~a size ~a, ~a~%set out '~a.png'" (write-font-type) (round (first (get-option '$dimensions))) (round (second (get-option '$dimensions))) - (format nil "set obj 999 rectangle behind from screen 0,0 to screen 1,1 fillcolor rgb '~a'" - (get-option '$background_color)) (get-option '$file_name) ) ) ($eps (format cmdstorage "set terminal postscript eps enhanced ~a size ~acm, ~acm~%set out '~a.eps'" (write-font-type) @@ -3081,32 +3082,26 @@ (/ (first (get-option '$dimensions)) 100.0) (/ (second (get-option '$dimensions)) 100.0) (get-option '$file_name))) - ($jpg (format cmdstorage "set terminal jpeg enhanced ~a size ~a, ~a~%~a~%set out '~a.jpg'" + ($jpg (format cmdstorage "set terminal jpeg enhanced ~a size ~a, ~a~%set out '~a.jpg'" (write-font-type) (round (first (get-option '$dimensions))) (round (second (get-option '$dimensions))) - (format nil "set obj 999 rectangle behind from screen 0,0 to screen 1,1 fillcolor rgb '~a'" - (get-option '$background_color)) (get-option '$file_name))) - ($gif (format cmdstorage "set terminal gif enhanced ~a size ~a, ~a~%~a~%set out '~a.gif'" + ($gif (format cmdstorage "set terminal gif enhanced ~a size ~a, ~a~%set out '~a.gif'" (write-font-type) (round (first (get-option '$dimensions))) (round (second (get-option '$dimensions))) - (format nil "set obj 999 rectangle behind from screen 0,0 to screen 1,1 fillcolor rgb '~a'" - (get-option '$background_color)) (get-option '$file_name))) ($svg (format cmdstorage "set terminal svg enhanced ~a size ~a, ~a~%set out '~a.svg'" (write-font-type) (round (first (get-option '$dimensions))) (round (second (get-option '$dimensions))) (get-option '$file_name))) - ($animated_gif (format cmdstorage "set terminal gif enhanced animate ~a size ~a, ~a delay ~a~%~a~%set out '~a.gif'" + ($animated_gif (format cmdstorage "set terminal gif enhanced animate ~a size ~a, ~a delay ~a~%set out '~a.gif'" (write-font-type) (round (first (get-option '$dimensions))) (round (second (get-option '$dimensions))) (get-option '$delay) - (format nil "set obj 999 rectangle behind from screen 0,0 to screen 1,1 fillcolor rgb '~a'" - (get-option '$background_color)) (get-option '$file_name))) ($aquaterm (format cmdstorage "set terminal aqua enhanced ~a ~a size ~a ~a~%" *draw-terminal-number* @@ -3169,7 +3164,9 @@ size2 height) (incf nilcounter))) (format cmdstorage "~%set size ~a, ~a~%" size1 size2) - (format cmdstorage "set origin ~a, ~a~%" origin1 origin2) )) + (format cmdstorage "set origin ~a, ~a~%" origin1 origin2) + (format cmdstorage "set obj 1 rectangle behind from screen ~a,~a to screen ~a,~a~%" + origin1 origin2 (+ origin1 size1 ) (+ origin2 size2)) )) (setf is1stobj t biglist '() grouplist '()) @@ -3350,19 +3347,15 @@ (update-gr-option ($lhs x) ($rhs x)) (merror "draw: item ~M is not recognized as an option assignment" x))) (case (get-option '$terminal) - ($png (setf str (format nil "set terminal png enhanced truecolor ~a size ~a, ~a~%~a~%set out '~a.png'" + ($png (setf str (format nil "set terminal png enhanced truecolor ~a size ~a, ~a~%set out '~a.png'" (write-font-type) (round (first (get-option '$dimensions))) (round (second (get-option '$dimensions))) - (format nil "set obj 999 rectangle behind from screen 0,0 to screen 1,1 fillcolor rgb '~a'" - (get-option '$background_color)) (get-option '$file_name) ) )) - ($pngcairo (setf str (format nil "set terminal pngcairo enhanced truecolor ~a size ~a, ~a~%~a~%set out '~a.png'" + ($pngcairo (setf str (format nil "set terminal pngcairo enhanced truecolor ~a size ~a, ~a~%set out '~a.png'" (write-font-type) (round (first (get-option '$dimensions))) (round (second (get-option '$dimensions))) - (format nil "set obj 999 rectangle behind from screen 0,0 to screen 1,1 fillcolor rgb '~a'" - (get-option '$background_color)) (get-option '$file_name) ) )) ($eps (setf str (format nil "set terminal postscript eps enhanced ~a size ~acm, ~acm~%set out '~a.eps'" (write-font-type) ; other alternatives are Arial, Courier @@ -3384,19 +3377,15 @@ (/ (first (get-option '$dimensions)) 100.0) (/ (second (get-option '$dimensions)) 100.0) (get-option '$file_name)))) - ($jpg (setf str (format nil "set terminal jpeg ~a size ~a, ~a~%~a~%set out '~a.jpg'" + ($jpg (setf str (format nil "set terminal jpeg ~a size ~a, ~a~%set out '~a.jpg'" (write-font-type) (round (first (get-option '$dimensions))) (round (second (get-option '$dimensions))) - (format nil "set obj 999 rectangle behind from screen 0,0 to screen 1,1 fillcolor rgb '~a'" - (get-option '$background_color)) (get-option '$file_name)))) - ($gif (setf str (format nil "set terminal gif ~a size ~a, ~a~%~a~%set out '~a.gif'" + ($gif (setf str (format nil "set terminal gif ~a size ~a, ~a~%set out '~a.gif'" (write-font-type) (round (first (get-option '$dimensions))) (round (second (get-option '$dimensions))) - (format nil "set obj 999 rectangle behind from screen 0,0 to screen 1,1 fillcolor rgb '~a'" - (get-option '$background_color)) (get-option '$file_name)))) ($svg (setf str (format nil "set terminal svg enhanced ~a size ~a, ~a~%set out '~a.svg'" (write-font-type) diff --git a/share/draw/grcommon.lisp b/share/draw/grcommon.lisp index 4bae4f2..3d61cf4 100644 --- a/share/draw/grcommon.lisp +++ b/share/draw/grcommon.lisp @@ -78,9 +78,11 @@ (gethash '$font_size *gr-options*) 10; ; colors are specified by name - (gethash '$color *gr-options*) "#0000ff" ; for lines, points, borders and labels - (gethash '$fill_color *gr-options*) "#ff0000" ; for filled regions - (gethash '$fill_density *gr-options*) 0 ; in [0,1], only for object 'bars + (gethash '$background_color *gr-options*) "#ffffff" + (gethash '$color *gr-options*) "#0000ff" ; for lines, points, borders and labels + (gethash '$fill_color *gr-options*) "#ff0000" ; for filled regions + (gethash '$fill_density *gr-options*) 0 ; in [0,1], only for object 'bars + ; implicit plot options (gethash '$ip_grid *gr-options*) '((mlist simp) 50 50) @@ -754,7 +756,6 @@ (gethash '$file_name *gr-options*) "maxima_out" (gethash '$gnuplot_file_name *gr-options*) "maxout.gnuplot" (gethash '$data_file_name *gr-options*) "data.gnuplot" - (gethash '$background_color *gr-options*) "#ffffff" (gethash '$delay *gr-options*) 5 ; delay for animated gif's, default 5*(1/100) sec )) ----------------------------------------------------------------------- Summary of changes: share/draw/draw.lisp | 51 ++++++++++++++++++---------------------------- share/draw/grcommon.lisp | 9 ++++--- 2 files changed, 25 insertions(+), 35 deletions(-) hooks/post-receive -- Maxima, A Computer Algebra System |