From: Gunter Kön. <pet...@us...> - 2016-07-28 09:39:45
|
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 CAS". The branch, master has been updated via 0ab4c8926546dd387e8e8e6076ffb83a960b1f58 (commit) via acfc00574af1ba9436eaae8b9488a360e201a9cd (commit) from 2f7df6f567297d9d6b791d0c9c96db800f46880e (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 0ab4c8926546dd387e8e8e6076ffb83a960b1f58 Author: Gunter Königsmann <gu...@pe...> Date: Thu Jul 28 11:39:04 2016 +0200 Draw/vtk: Minor corrections to a few comments diff --git a/share/draw/vtk.lisp b/share/draw/vtk.lisp index 5eed457..eb025f9 100644 --- a/share/draw/vtk.lisp +++ b/share/draw/vtk.lisp @@ -3152,7 +3152,7 @@ (if (eql cmdstorage nil) (merror "draw: Cannot create file '~a'. Probably maxima_tempdir doesn't point to a writable directory." gfn)) - ; requiered packages + ; pull in required packages (format cmdstorage "~a~%~a~%~%" "package require vtk" "package require vtkinteraction") @@ -3161,7 +3161,7 @@ (dolist (scn scenes) (format cmdstorage "~a" scn) ) - ; renderer window + ;; the renderer window (format cmdstorage "~a" (vtkrendererwindow-code (length scenes))) (format cmdstorage "~a" (vtk-terminal)) commit acfc00574af1ba9436eaae8b9488a360e201a9cd Author: Gunter Königsmann <gu...@pe...> Date: Thu Jul 28 11:37:03 2016 +0200 Draw: Explicitely check if all temporary files can be created. If draw doesn't manage to create temporary files that allow it to communicate with gnuplot the result is either a lisp error (which is fine) or a blank plot without a description why (which leads to long debugging sessions. Added a few lines of code that should catch the latter case. diff --git a/share/draw/gnuplot.lisp b/share/draw/gnuplot.lisp index a485ae4..0dbc678 100644 --- a/share/draw/gnuplot.lisp +++ b/share/draw/gnuplot.lisp @@ -3227,13 +3227,18 @@ gfn (plot-temp-file (get-option '$gnuplot_file_name)) dfn (plot-temp-file (get-option '$data_file_name))) - ; we now create two files: maxout.gnuplot and data.gnuplot + ;; we now create two files: maxout.gnuplot and data.gnuplot (setf cmdstorage (open gfn :direction :output :if-exists :supersede)) + (if (eql cmdstorage nil) + (merror "draw: Cannot create file '~a'. Probably maxima_tempdir doesn't point to a writable directory." gfn)) (setf datastorage (open dfn :direction :output :if-exists :supersede)) + (if (eql datastorage nil) + (merror "draw: Cannot create file '~a'. Probably maxima_tempdir doesn't point to a writable directory." dfn)) + (setf datapath (format nil "'~a'" dfn)) ; when one multiplot window is active, change of terminal is not allowed (if (not *multiplot-is-active*) diff --git a/share/draw/vtk.lisp b/share/draw/vtk.lisp index 14f67d8..5eed457 100644 --- a/share/draw/vtk.lisp +++ b/share/draw/vtk.lisp @@ -3149,6 +3149,8 @@ (setf cmdstorage (open gfn :direction :output :if-exists :supersede)) + (if (eql cmdstorage nil) + (merror "draw: Cannot create file '~a'. Probably maxima_tempdir doesn't point to a writable directory." gfn)) ; requiered packages (format cmdstorage "~a~%~a~%~%" ----------------------------------------------------------------------- Summary of changes: share/draw/gnuplot.lisp | 7 ++++++- share/draw/vtk.lisp | 6 ++++-- 2 files changed, 10 insertions(+), 3 deletions(-) hooks/post-receive -- Maxima CAS |