forked from mirrors/org-mode
started bringing in options from org-plot
This commit is contained in:
parent
b8fad91406
commit
4ff540bfd7
|
@ -54,7 +54,13 @@ called by `org-babel-execute-src-block'."
|
||||||
(result-params (split-string (or (cdr (assoc :results params)) "")))
|
(result-params (split-string (or (cdr (assoc :results params)) "")))
|
||||||
(out-file (cdr (assoc :file params)))
|
(out-file (cdr (assoc :file params)))
|
||||||
(cmdline (cdr (assoc :cmdline params)))
|
(cmdline (cdr (assoc :cmdline params)))
|
||||||
(in-file (make-temp-file "org-babel-ditaa")))
|
(in-file (make-temp-file "org-babel-ditaa"))
|
||||||
|
(title (plist-get params :title))
|
||||||
|
(lines (plist-get params :line))
|
||||||
|
(sets (plist-get params :set))
|
||||||
|
(x-labels (plist-get params :xlabels))
|
||||||
|
(y-labels (plist-get params :ylabels))
|
||||||
|
(time-ind (plist-get params :timeind)))
|
||||||
;; insert variables into code body
|
;; insert variables into code body
|
||||||
(mapc
|
(mapc
|
||||||
(lambda (pair)
|
(lambda (pair)
|
||||||
|
@ -67,7 +73,30 @@ called by `org-babel-execute-src-block'."
|
||||||
(cdr pair) (make-temp-file "org-babel-gnuplot") params)
|
(cdr pair) (make-temp-file "org-babel-gnuplot") params)
|
||||||
(cdr pair)) body)))
|
(cdr pair)) body)))
|
||||||
vars)
|
vars)
|
||||||
(with-temp-buffer ;; evaluate the code body with gnuplot
|
;; append header argument settings to body
|
||||||
|
(when title (add-to-script (format "set title '%s'" title))) ;; title
|
||||||
|
(when lines (mapc (lambda (el) (add-to-script el)) lines)) ;; line
|
||||||
|
(when sets ;; set
|
||||||
|
(mapc (lambda (el) (add-to-script (format "set %s" el))) sets))
|
||||||
|
(when x-labels ;; x labels (xtics)
|
||||||
|
(add-to-script
|
||||||
|
(format "set xtics (%s)"
|
||||||
|
(mapconcat (lambda (pair)
|
||||||
|
(format "\"%s\" %d" (cdr pair) (car pair)))
|
||||||
|
x-labels ", "))))
|
||||||
|
(when y-labels ;; y labels (ytics)
|
||||||
|
(add-to-script
|
||||||
|
(format "set ytics (%s)"
|
||||||
|
(mapconcat (lambda (pair)
|
||||||
|
(format "\"%s\" %d" (cdr pair) (car pair)))
|
||||||
|
y-labels ", "))))
|
||||||
|
(when time-ind ;; timestamp index
|
||||||
|
(add-to-script "set xdata time")
|
||||||
|
(add-to-script (concat "set timefmt \""
|
||||||
|
(or timefmt ;; timefmt passed to gnuplot
|
||||||
|
"%Y-%m-%d-%H:%M:%S") "\"")))
|
||||||
|
;; evaluate the code body with gnuplot
|
||||||
|
(with-temp-buffer
|
||||||
(insert (concat body "\n"))
|
(insert (concat body "\n"))
|
||||||
(gnuplot-mode)
|
(gnuplot-mode)
|
||||||
(gnuplot-send-buffer-to-gnuplot))
|
(gnuplot-send-buffer-to-gnuplot))
|
||||||
|
|
|
@ -2075,7 +2075,10 @@ plot "data" using 1:2 with lines
|
||||||
**** TODO a =file= header argument
|
**** TODO a =file= header argument
|
||||||
to specify a file holding the results
|
to specify a file holding the results
|
||||||
|
|
||||||
**** TODO helpers from org-plot.el
|
**** STARTED helpers from org-plot.el
|
||||||
|
there are a variety of helpers in org-plot which can be fit nicely
|
||||||
|
into custom gnuplot header arguments
|
||||||
|
|
||||||
**** TODO header argument specifying 3D data
|
**** TODO header argument specifying 3D data
|
||||||
**** TODO gnuplot sessions
|
**** TODO gnuplot sessions
|
||||||
*** TODO dot
|
*** TODO dot
|
||||||
|
|
Loading…
Reference in a new issue