mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

Make plotting work for tables starting with hline.

This commit is contained in:
Carsten Dominik 2008-09-22 05:56:34 +02:00
parent d670d20af2
commit a7febf233e
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lisp/ChangeLog
View File

@ -1,3 +1,10 @@
2008-09-22 James TA Smith <ahktenzero@mohorovi.cc>
* org-plot.el (org-plot/gnuplot): Make tables starting with a
hline work correctly.
(org-plot/gnuplot-script): Put commas at the end of each script
line.
2008-09-20 James TD Smith <ahktenzero@mohorovi.cc>
* org.el (org-get-refile-targets): Replace links with their

13
lisp/org-plot.el
View File

@ -218,7 +218,7 @@ NUM-COLS controls the number of columns plotted in a 2-d plot."
(format "\"%s\" %d" (cdr pair) (car pair)))
y-labels ", "))))
(case type ;; plot command
('2d (dotimes (col num-cols)
('2d (dotimes (col num-cols)
(unless (and (equal type '2d)
(or (and ind (equal (+ 1 col) ind))
(and deps (not (member (+ 1 col) deps)))))
@ -239,11 +239,11 @@ NUM-COLS controls the number of columns plotted in a 2-d plot."
(setq plot-lines (list (format "'%s' with %s title ''"
data-file with)))))
(add-to-script
(concat plot-cmd " " (mapconcat 'identity (reverse plot-lines) "\\\n ,")))
(concat plot-cmd " " (mapconcat 'identity (reverse plot-lines) ",\\\n ")))
script)))
;;-----------------------------------------------------------------------------
;; facad functions
;; facade functions
;;;###autoload
(defun org-plot/gnuplot (&optional params)
"Plot table using gnuplot. Gnuplot options can be specified with PARAMS.
@ -255,11 +255,11 @@ line directly before or after the table."
(delete-other-windows)
(when (get-buffer "*gnuplot*") ;; reset *gnuplot* if it already running
(save-excursion
(set-buffer "*gnuplot*") (goto-char (point-max))
(set-buffer "*gnuplot*") (goto-char (point-max))
(gnuplot-delchar-or-maybe-eof nil)))
(org-plot/goto-nearest-table)
;; set default options
(mapc
(mapc
(lambda (pair)
(unless (plist-member params (car pair))
(setf params (plist-put params (car pair) (cdr pair)))))
@ -267,7 +267,8 @@ line directly before or after the table."
;; collect table and table information
(let* ((data-file (make-temp-file "org-plot"))
(table (org-table-to-lisp))
(num-cols (length (first table))))
(num-cols (length (if (eq (first table) 'hline) (second table)
(first table)))))
(while (equal 'hline (first table)) (setf table (cdr table)))
(when (equal (second table) 'hline)
(setf params (plist-put params :labels (first table))) ;; headers to labels