annotate lisp/org/org-plot.el @ 104810:86b7fe7d1d8f

2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org-protocol.el (org-protocol-store-link) (org-protocol-remember, org-protocol-open-source): Add autoloads. * org-compat.el (org-float-time): New function. * org.el (org-clock-update-time-maybe) (org-sort-entries-or-items, org-do-sort) (org-evaluate-time-range, org-time-string-to-seconds) (org-closed-in-range): Use `org-float-time'. * org-timer.el (org-timer-start, org-timer-pause-or-continue) (org-timer-seconds): Use `org-float-time'. * org-clock.el (org-clock-get-clocked-time, org-clock-out) (org-clock-sum, org-dblock-write:clocktable) (org-clocktable-steps): Use `org-float-time'. * org-agenda.el (org-agenda-last-marker-time) (org-agenda-new-marker, org-diary): Use `org-float-time'. * org-compat.el (w32-focus-frame): Declare the w32-focus-frame function. * org-exp.el (org-get-file-contents): Only protect lines that really need it. * org-html.el (require): Require cl for compilation. * org.el: Avoid using `default-major-mode'. * org-plot.el (require): Require CL only at compile time. * org-exp.el (require): Require CL only at compile time. * org-agenda.el (org-agenda-quit): When the agenda window is dedicated, remove other windows before exiting, so that the frame really will be killed. * org-exp.el (org-export-handle-include-files): Reset START and END for each loop cycle. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-eval-in-calendar): Use `org-select-frame-set-input-focus'. * org-compat.el (org-select-frame-set-input-focus): New function. * org.el (org-update-statistics-cookies): New function. (org-mode-map): Bind `C-c #' to `org-update-statistics-cookies'. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org-src.el (org-edit-fixed-width-region): Set org-src-mode only after the local variables are set. * org-latex.el (org-export-latex-protect-amp): New function. (org-export-latex-links): Protect link ampersands in tables. * org-exp.el (org-export-select-backend-specific-text): Match in two steps, to avoid regexp problems. * org.el (org-offer-links-in-entry): Improve working with many and duplicate links. * org-agenda.el (org-agenda-show-1): Make more consistent with normal cycling. (org-agenda-cycle-show): Make more consistent with normal cycling. * org-gnus.el (org-gnus-store-link): Restore the linking to a website. 2009-09-02 Bastien Guerry <bzg@altern.org> * org-latex.el (org-export-latex-first-lines): Bugfix. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org-clock.el (org-clock-modify-effort-estimate): Emit message about new effort. * org.el (org-set-effort): New function. (org-mode-map): New key for effort setting command. * org-agenda.el (org-agenda): Keep window setup when calling agenda from within agenda window. (org-agenda-mode-map): New keys for effort setting commands. (org-agenda-menu): Add effort setting commands to menu. (org-agenda-set-property, org-agenda-set-effort): New functions. * org-latex.el (org-export-latex-tables): Fix `org-table-last-alignment' and `org-table-last-column-widths' if the first column has been removed. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-remove-timestamp-with-keyword): Only remove in entry, not in subtree. * org-src.el (org-src-lang-modes): Add abbreviation elisp for emacs lisp. * org.el (org-open-at-point): When on headline, offer all strings in entry. * org-remember.el (org-remember-templates): Documentation fix. * org.el (org-move-subtree-down): Use `org-get-next-sibling' and `org-get-last-sibling' instead of the outline versions of these functions. (org-get-last-sibling): New function. (org-refile): Use `org-get-next-sibling' instead of the outline version of this function. (org-clean-visibility-after-subtree-move): Use `org-get-next-sibling' and `org-get-last-sibling' instead of the outline versions of these functions. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org-agenda.el (org-prepare-agenda): When creating a new frame for the agenda, make the window dedicated. * org-agenda.el (org-agenda-mode-map): New keys for time motion. * org-table.el (org-table-align): Change the order of reinsertion and deletion, to avoid problems with overlays following the table. * org.el (org-parse-time-string): Better error message. (org-show-subtree): Use org-end-of-subtree. * org-macs.el (org-goto-line): New defsubst. * org.el (org-open-file, org-change-tag-in-region) (org-fast-tag-show-exit): Don't use `goto-line'. * org-table.el (org-table-align, org-table-insert-column) (org-table-delete-column, org-table-move-column) (org-table-sort-lines, org-table-copy-region) (org-table-paste-rectangle, org-table-wrap-region) (org-table-get-specials, org-table-rotate-recalc-marks) (org-table-get-range, org-table-recalculate) (org-table-edit-formulas, org-table-fedit-convert-buffer) (org-table-show-reference, org-table-highlight-rectangle): Don't use `goto-line'. * org-src.el (org-edit-src-code, org-edit-fixed-width-region) (org-edit-src-exit): Don't use `goto-line'. * org-macs.el (org-preserve-lc): Don't use `goto-line'. * org-list.el (org-renumber-ordered-list, org-fix-bullet-type): Don't use `goto-line'. * org-exp.el (org-export-number-lines): Don't use `goto-line'. * org-colview.el (org-columns, org-columns-redo) (org-agenda-columns): Don't use `goto-line'. * org-colview-xemacs.el (org-columns, org-agenda-columns): Don't use `goto-line'. * org-agenda.el (org-agenda-mode): Force visual line motion off. (org-agenda-add-entry-text-maxlines): Improve docstring. (org-agenda-start-with-entry-text-mode): New option. (org-agenda-entry-text-maxlines): New option. (org-agenda-entry-text-mode): New variable. (org-agenda-mode): Set initial value of `org-agenda-entry-text-mode'. (org-agenda-mode-map): Add the `E' key. (org-agenda-menu): Add entry text mode to the menu. (org-agenda-get-some-entry-text): Fix line count bug. (org-finalize-agenda): Apply entry text mode if appropriate. (org-agenda-entry-text-show-here): New function. (org-agenda-entry-text-show): New function. (org-agenda-entry-text-hide): New function. (org-agenda-view-mode-dispatch): Add entry text mode to the view key menu. (org-agenda-entry-text-mode): New command. (org-agenda-set-mode-name): Add entry text mode to the mode line string. (org-agenda-undo, org-agenda-get-restriction-and-command) (org-agenda-get-some-entry-text, org-agenda-redo): Don't use `goto-line'. 2009-09-02 Bernt Hansen <bernt@norang.ca> * org-clock.el (org-notify): Bugfix. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org-agenda.el (org-agenda-open-link): Handle multiple links and check for after-string. * org-gnus.el (org-gnus-store-link): Simplify. * org.el (org-latex-regexps): Don't add extra empty lines for display formulas. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org-agenda.el (org-agenda-get-some-entry-text): New function. (org-agenda-add-entry-text): Use `org-agenda-get-some-entry-text'. * org.el (org-cycle-separator-lines): Update docstring. (org-cycle-show-empty-lines): Handle negative values for `org-cycle-show-empty-lines'. * org-exp.el (org-export-protect-sub-super): New function. (org-export-normalize-links): Protect the url of plain links from supscript and superscript processing. * org-remember.el (org-remember-escaped-%): New function. (org-remember-apply-template): Use `org-remember-escaped-%' to detect escaped % signs. 2009-09-02 Bastien Guerry <bzg@altern.org> * org-timer.el (org-timer-set-timer): Use `org-notify' and play a sound when showing the notification. * org-clock.el (org-notify): New function. (org-clock-notify-once-if-expired): Use `org-notify'. * org-gnus.el (org-gnus-store-link): Handle `gnus-summary-mode' and `gnus-article-mode' separately. (gnus-summary-article-header): Fix the declare-function. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org-exp.el (org-export-format-source-code-or-example): Translate language. * org-src.el (org-src-lang-modes): New variable (org-edit-src-code): Translate language. * org-exp.el (org-export-format-source-code-or-example): Deal wit the new structure of the `org-export-latex-listings-langs' variable. * org-latex.el (org-export-latex-listings-langs): Change structure of the variable from plist to alist. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-in-commented-line): New function. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-hide-block-toggle): Make folded blocks searchable. 2009-09-02 Friedrich Delgado Friedrichs <friedel@nomaden.org> (tiny change) * org.el (org-flag-drawer): More useful error. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org-remember.el (org-remember-apply-template): Use org-icompleting-read. * org-publish.el (org-publish): Use org-icompleting-read. * org-colview.el (org-columns-edit-value, org-columns-new) (org-insert-columns-dblock): Use org-icompleting-read. * org-colview-xemacs.el (org-columns-edit-value) (org-columns-new, org-insert-columns-dblock): Use org-icompleting-read. * org-attach.el (org-attach-delete-one, org-attach-open): Use org-icompleting-read. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-hierarchical-todo-statistics): Improve docstring. (org-version): Return the version text. (org-org-menu): Add a menu entry for the new bug reporter. (org-submit-bug-report): New command. * org-list.el (org-hierarchical-checkbox-statistics): Improve docstring. * org.el (org-emphasis-regexp-components): Add "`" to set of pre-emphasis characters. * org-latex.el (org-export-latex-classes): Always include the soul package. (org-export-latex-emphasis-alist): Use \st for strikethough. * org-exp-blocks.el (org-export-blocks-preprocess): Use `indent-code-rigidly' to indent. * org-agenda.el (org-agenda-get-restriction-and-command): Remove properties only if MATCH really is a string. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org-latex.el (org-export-latex-packages-alist): Fix customization type. * org.el (org-create-formula-image): Also use `org-export-latex-packages-alist'. * org-html.el (org-export-as-html): Fix bug in footnote regexp. (org-export-as-html): Format footnotes correctly. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-fast-tag-selection): Avoid text properties on tags in the alist. * org-agenda.el (org-agenda-get-restriction-and-command): Avoid text properties on the match element. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-set-regexps-and-options): Make sure the list of done keywords is not invalid. * org-exp.el (org-export-interpolate-newlines): New function. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-format-latex): Avoid nested overlays. * org-latex.el (org-export-latex-listings-langs): Add a few more languages. * org-exp.el (org-export-preprocess-apply-macros): Make sure to ignore newlines and space before the first macro argument. * org-latex.el (org-export-latex-tables): Remove save-excursion around `org-table-align'. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-export-html-special-string-regexps): Definition moved into org.el * org-exp.el (org-export-preprocess-apply-macros): Allow newlines in macro calls. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org-latex.el (org-export-latex-listings) (org-export-latex-listings-langs): New options. * org-exp.el (org-export-format-source-code-or-example): Use listing package if requested by the user. 2009-09-02 Bastien Guerry <bzg@altern.org> * org.el (org-iswitchb): Fix bug when aborting the `org-iswitchb' command before actually switching to a buffer. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org-exp.el (org-get-file-contents): Only quote org lines when the markup is src or example. * org-agenda.el (org-agenda-skip-scheduled-if-deadline-is-shown): New option (org-agenda-get-day-entries): Remember deadline results and pass them on into the function getting the scheduling information. (org-agenda-get-scheduled): Accept deadline results as parameters and maybe skip some entries. (org-agenda-skip-scheduled-if-deadline-is-shown): New option. * org.el (org-insert-heading): When respecting content, do not convert current line to headline. * org-clock.el (org-clock-save-markers-for-cut-and-paste): Also cheeeeeck the hd marker (org-clock-in): Also set the hd marker. (org-clock-out): Also set the hd marker. (org-clock-cancel): Reset markers. * org.el (org-clock-hd-marker): New marker. * org-faces.el (org-agenda-clocking): New face. * org-agenda.el (org-agenda-mark-clocking-task): New function. (org-finalize-agenda): call `org-agenda-mark-clocking-task'. * org.el (org-modules): Add org-track.el. * org-agenda.el (org-agenda-bulk-marked-p): New function. (org-agenda-bulk-mark, org-agenda-bulk-unmark): Use `org-agenda-bulk-marked-p'. (org-agenda-bulk-toggle): New command. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-move-subtree-down): Hide subtree if it was folded, not just the body. * org-remember.el (org-remember-finalize): Avoid buffer-modified messages.
author Carsten Dominik <dominik@science.uva.nl>
date Wed, 02 Sep 2009 12:59:52 +0000
parents ac1a55cc2c38
children 2a8a3a69c1c7
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
98653
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
1 ;;; org-plot.el --- Support for plotting from Org-mode
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
2
100908
a9dc0e7c3f2b Add 2009 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 100605
diff changeset
3 ;; Copyright (C) 2008, 2009 Free Software Foundation, Inc.
98653
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
4 ;;
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
5 ;; Author: Eric Schulte <schulte dot eric at gmail dot com>
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
6 ;; Keywords: tables, plotting
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
7 ;; Homepage: http://orgmode.org
104810
86b7fe7d1d8f 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 104164
diff changeset
8 ;; Version: 6.30c
98653
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
9 ;;
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
10 ;; This file is part of GNU Emacs.
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
11 ;;
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
12 ;; GNU Emacs is free software: you can redistribute it and/or modify
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
13 ;; it under the terms of the GNU General Public License as published by
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
14 ;; the Free Software Foundation, either version 3 of the License, or
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
15 ;; (at your option) any later version.
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
16
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
17 ;; GNU Emacs is distributed in the hope that it will be useful,
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
20 ;; GNU General Public License for more details.
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
21
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
22 ;; You should have received a copy of the GNU General Public License
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
23 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
24
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
25 ;;; Commentary:
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
26
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
27 ;; Borrows ideas and a couple of lines of code from org-exp.el.
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
28
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
29 ;; Thanks to the org-mode mailing list for testing and implementation
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
30 ;; and feature suggestions
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
31
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
32 ;;; Code:
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
33 (require 'org)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
34 (require 'org-exp)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
35 (require 'org-table)
104810
86b7fe7d1d8f 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 104164
diff changeset
36 (eval-when-compile
98653
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
37 (require 'cl))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
38
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
39 (declare-function gnuplot-delchar-or-maybe-eof "ext:gnuplot" (arg))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
40 (declare-function gnuplot-mode "ext:gnuplot" ())
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
41 (declare-function gnuplot-send-buffer-to-gnuplot "ext:gnuplot" ())
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
42
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
43 (defvar org-plot/gnuplot-default-options
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
44 '((:plot-type . 2d)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
45 (:with . lines)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
46 (:ind . 0))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
47 "Default options to gnuplot used by `org-plot/gnuplot'")
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
48
99501
e3acb52d33e1 2008-11-12 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 99139
diff changeset
49 (defvar org-plot-timestamp-fmt nil)
e3acb52d33e1 2008-11-12 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 99139
diff changeset
50
98653
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
51 (defun org-plot/add-options-to-plist (p options)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
52 "Parse an OPTIONS line and set values in the property list P.
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
53 Returns the resulting property list."
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
54 (let (o)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
55 (when options
99501
e3acb52d33e1 2008-11-12 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 99139
diff changeset
56 (let ((op '(("type" . :plot-type)
e3acb52d33e1 2008-11-12 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 99139
diff changeset
57 ("script" . :script)
e3acb52d33e1 2008-11-12 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 99139
diff changeset
58 ("line" . :line)
e3acb52d33e1 2008-11-12 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 99139
diff changeset
59 ("set" . :set)
e3acb52d33e1 2008-11-12 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 99139
diff changeset
60 ("title" . :title)
e3acb52d33e1 2008-11-12 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 99139
diff changeset
61 ("ind" . :ind)
e3acb52d33e1 2008-11-12 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 99139
diff changeset
62 ("deps" . :deps)
e3acb52d33e1 2008-11-12 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 99139
diff changeset
63 ("with" . :with)
e3acb52d33e1 2008-11-12 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 99139
diff changeset
64 ("file" . :file)
e3acb52d33e1 2008-11-12 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 99139
diff changeset
65 ("labels" . :labels)
e3acb52d33e1 2008-11-12 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 99139
diff changeset
66 ("map" . :map)
104164
ac1a55cc2c38 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 101757
diff changeset
67 ("timeind" . :timeind)
100458
ba23e35d3eaf 2008-12-17 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 100448
diff changeset
68 ("timefmt" . :timefmt)))
98653
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
69 (multiples '("set" "line"))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
70 (regexp ":\\([\"][^\"]+?[\"]\\|[(][^)]+?[)]\\|[^ \t\n\r;,.]*\\)")
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
71 (start 0)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
72 o)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
73 (while (setq o (pop op))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
74 (if (member (car o) multiples) ;; keys with multiple values
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
75 (while (string-match
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
76 (concat (regexp-quote (car o)) regexp)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
77 options start)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
78 (setq start (match-end 0))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
79 (setq p (plist-put p (cdr o)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
80 (cons (car (read-from-string
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
81 (match-string 1 options)))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
82 (plist-get p (cdr o)))))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
83 p)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
84 (if (string-match (concat (regexp-quote (car o)) regexp)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
85 options)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
86 (setq p (plist-put p (cdr o)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
87 (car (read-from-string
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
88 (match-string 1 options)))))))))))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
89 p)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
90
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
91 (defun org-plot/goto-nearest-table ()
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
92 "Move the point forward to the beginning of nearest table.
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
93 Return value is the point at the beginning of the table."
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
94 (interactive) (move-beginning-of-line 1)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
95 (while (not (or (org-at-table-p) (< 0 (forward-line 1)))))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
96 (goto-char (org-table-begin)))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
97
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
98 (defun org-plot/collect-options (&optional params)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
99 "Collect options from an org-plot '#+Plot:' line.
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
100 Accepts an optional property list PARAMS, to which the options
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
101 will be added. Returns the resulting property list."
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
102 (interactive)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
103 (let ((line (thing-at-point 'line)))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
104 (if (string-match "#\\+PLOT: +\\(.*\\)$" line)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
105 (org-plot/add-options-to-plist params (match-string 1 line))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
106 params)))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
107
99501
e3acb52d33e1 2008-11-12 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 99139
diff changeset
108 (defun org-plot-quote-timestamp-field (s)
e3acb52d33e1 2008-11-12 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 99139
diff changeset
109 "Convert field S from timestamp to Unix time and export to gnuplot."
e3acb52d33e1 2008-11-12 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 99139
diff changeset
110 (format-time-string org-plot-timestamp-fmt (org-time-string-to-time s)))
e3acb52d33e1 2008-11-12 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 99139
diff changeset
111
98653
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
112 (defun org-plot-quote-tsv-field (s)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
113 "Quote field S for export to gnuplot."
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
114 (if (string-match org-table-number-regexp s) s
99501
e3acb52d33e1 2008-11-12 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 99139
diff changeset
115 (if (string-match org-ts-regexp3 s)
100458
ba23e35d3eaf 2008-12-17 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 100448
diff changeset
116 (org-plot-quote-timestamp-field s)
99501
e3acb52d33e1 2008-11-12 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 99139
diff changeset
117 (concat "\"" (mapconcat 'identity (split-string s "\"") "\"\"") "\""))))
98653
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
118
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
119 (defun org-plot/gnuplot-to-data (table data-file params)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
120 "Export TABLE to DATA-FILE in a format readable by gnuplot.
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
121 Pass PARAMS through to `orgtbl-to-generic' when exporting TABLE."
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
122 (with-temp-file
100267
c851df8e004e 2008-12-07 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 99866
diff changeset
123 data-file
99501
e3acb52d33e1 2008-11-12 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 99139
diff changeset
124 (make-local-variable 'org-plot-timestamp-fmt)
e3acb52d33e1 2008-11-12 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 99139
diff changeset
125 (setq org-plot-timestamp-fmt (or
100458
ba23e35d3eaf 2008-12-17 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 100448
diff changeset
126 (plist-get params :timefmt)
ba23e35d3eaf 2008-12-17 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 100448
diff changeset
127 "%Y-%m-%d-%H:%M:%S"))
99501
e3acb52d33e1 2008-11-12 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 99139
diff changeset
128 (insert (orgtbl-to-generic
100458
ba23e35d3eaf 2008-12-17 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 100448
diff changeset
129 table
ba23e35d3eaf 2008-12-17 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 100448
diff changeset
130 (org-combine-plists
ba23e35d3eaf 2008-12-17 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 100448
diff changeset
131 '(:sep "\t" :fmt org-plot-quote-tsv-field)
ba23e35d3eaf 2008-12-17 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 100448
diff changeset
132 params))))
98653
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
133 nil)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
134
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
135 (defun org-plot/gnuplot-to-grid-data (table data-file params)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
136 "Export the data in TABLE to DATA-FILE for gnuplot.
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
137 This means, in a format appropriate for grid plotting by gnuplot.
100458
ba23e35d3eaf 2008-12-17 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 100448
diff changeset
138 PARAMS specifies which columns of TABLE should be plotted as independent
98653
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
139 and dependant variables."
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
140 (interactive)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
141 (let* ((ind (- (plist-get params :ind) 1))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
142 (deps (if (plist-member params :deps)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
143 (mapcar (lambda (val) (- val 1)) (plist-get params :deps))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
144 (let (collector)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
145 (dotimes (col (length (first table)))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
146 (setf collector (cons col collector)))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
147 collector)))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
148 row-vals (counter 0))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
149 (when (>= ind 0) ;; collect values of ind col
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
150 (setf row-vals (mapcar (lambda (row) (setf counter (+ 1 counter))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
151 (cons counter (nth ind row))) table)))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
152 (when (or deps (>= ind 0)) ;; remove non-plotting columns
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
153 (setf deps (delq ind deps))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
154 (setf table (mapcar (lambda (row)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
155 (dotimes (col (length row))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
156 (unless (memq col deps)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
157 (setf (nth col row) nil)))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
158 (delq nil row))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
159 table)))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
160 ;; write table to gnuplot grid datafile format
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
161 (with-temp-file data-file
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
162 (let ((num-rows (length table)) (num-cols (length (first table)))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
163 front-edge back-edge)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
164 (flet ((gnuplot-row (col row value)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
165 (setf col (+ 1 col)) (setf row (+ 1 row))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
166 (format "%f %f %f\n%f %f %f\n"
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
167 col (- row 0.5) value ;; lower edge
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
168 col (+ row 0.5) value))) ;; upper edge
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
169 (dotimes (col num-cols)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
170 (dotimes (row num-rows)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
171 (setf back-edge
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
172 (concat back-edge
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
173 (gnuplot-row (- col 1) row (string-to-number
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
174 (nth col (nth row table))))))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
175 (setf front-edge
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
176 (concat front-edge
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
177 (gnuplot-row col row (string-to-number
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
178 (nth col (nth row table)))))))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
179 ;; only insert once per row
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
180 (insert back-edge) (insert "\n") ;; back edge
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
181 (insert front-edge) (insert "\n") ;; front edge
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
182 (setf back-edge "") (setf front-edge "")))))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
183 row-vals))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
184
104164
ac1a55cc2c38 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 101757
diff changeset
185 (defun org-plot/gnuplot-script (data-file num-cols params &optional preface)
98653
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
186 "Write a gnuplot script to DATA-FILE respecting the options set in PARAMS.
104164
ac1a55cc2c38 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 101757
diff changeset
187 NUM-COLS controls the number of columns plotted in a 2-d plot.
ac1a55cc2c38 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 101757
diff changeset
188 Optional argument PREFACE returns only option parameters in a
ac1a55cc2c38 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 101757
diff changeset
189 manner suitable for prepending to a user-specified script."
98653
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
190 (let* ((type (plist-get params :plot-type))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
191 (with (if (equal type 'grid)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
192 'pm3d
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
193 (plist-get params :with)))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
194 (sets (plist-get params :set))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
195 (lines (plist-get params :line))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
196 (map (plist-get params :map))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
197 (title (plist-get params :title))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
198 (file (plist-get params :file))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
199 (ind (plist-get params :ind))
100458
ba23e35d3eaf 2008-12-17 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 100448
diff changeset
200 (time-ind (plist-get params :timeind))
ba23e35d3eaf 2008-12-17 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 100448
diff changeset
201 (timefmt (plist-get params :timefmt))
98653
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
202 (text-ind (plist-get params :textind))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
203 (deps (if (plist-member params :deps) (plist-get params :deps)))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
204 (col-labels (plist-get params :labels))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
205 (x-labels (plist-get params :xlabels))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
206 (y-labels (plist-get params :ylabels))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
207 (plot-str "'%s' using %s%d%s with %s title '%s'")
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
208 (plot-cmd (case type
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
209 ('2d "plot")
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
210 ('3d "splot")
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
211 ('grid "splot")))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
212 (script "reset") plot-lines)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
213 (flet ((add-to-script (line) (setf script (format "%s\n%s" script line))))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
214 (when file ;; output file
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
215 (add-to-script (format "set term %s" (file-name-extension file)))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
216 (add-to-script (format "set output '%s'" file)))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
217 (case type ;; type
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
218 ('2d ())
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
219 ('3d (if map (add-to-script "set map")))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
220 ('grid (if map
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
221 (add-to-script "set pm3d map")
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
222 (add-to-script "set pm3d"))))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
223 (when title (add-to-script (format "set title '%s'" title))) ;; title
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
224 (when lines (mapc (lambda (el) (add-to-script el)) lines)) ;; line
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
225 (when sets ;; set
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
226 (mapc (lambda (el) (add-to-script (format "set %s" el))) sets))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
227 (when x-labels ;; x labels (xtics)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
228 (add-to-script
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
229 (format "set xtics (%s)"
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
230 (mapconcat (lambda (pair)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
231 (format "\"%s\" %d" (cdr pair) (car pair)))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
232 x-labels ", "))))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
233 (when y-labels ;; y labels (ytics)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
234 (add-to-script
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
235 (format "set ytics (%s)"
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
236 (mapconcat (lambda (pair)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
237 (format "\"%s\" %d" (cdr pair) (car pair)))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
238 y-labels ", "))))
99501
e3acb52d33e1 2008-11-12 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 99139
diff changeset
239 (when time-ind ;; timestamp index
100458
ba23e35d3eaf 2008-12-17 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 100448
diff changeset
240 (add-to-script "set xdata time")
ba23e35d3eaf 2008-12-17 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 100448
diff changeset
241 (add-to-script (concat "set timefmt \""
ba23e35d3eaf 2008-12-17 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 100448
diff changeset
242 (or timefmt ;; timefmt passed to gnuplot
ba23e35d3eaf 2008-12-17 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 100448
diff changeset
243 "%Y-%m-%d-%H:%M:%S") "\"")))
104164
ac1a55cc2c38 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 101757
diff changeset
244 (unless preface
ac1a55cc2c38 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 101757
diff changeset
245 (case type ;; plot command
98653
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
246 ('2d (dotimes (col num-cols)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
247 (unless (and (equal type '2d)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
248 (or (and ind (equal (+ 1 col) ind))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
249 (and deps (not (member (+ 1 col) deps)))))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
250 (setf plot-lines
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
251 (cons
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
252 (format plot-str data-file
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
253 (or (and (not text-ind) ind
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
254 (> ind 0) (format "%d:" ind)) "")
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
255 (+ 1 col)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
256 (if text-ind (format ":xticlabel(%d)" ind) "")
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
257 with
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
258 (or (nth col col-labels) (format "%d" (+ 1 col))))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
259 plot-lines)))))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
260 ('3d
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
261 (setq plot-lines (list (format "'%s' matrix with %s title ''"
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
262 data-file with))))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
263 ('grid
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
264 (setq plot-lines (list (format "'%s' with %s title ''"
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
265 data-file with)))))
104164
ac1a55cc2c38 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 101757
diff changeset
266 (add-to-script
ac1a55cc2c38 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 101757
diff changeset
267 (concat plot-cmd " " (mapconcat 'identity (reverse plot-lines) ",\\\n "))))
98653
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
268 script)))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
269
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
270 ;;-----------------------------------------------------------------------------
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
271 ;; facade functions
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
272 ;;;###autoload
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
273 (defun org-plot/gnuplot (&optional params)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
274 "Plot table using gnuplot. Gnuplot options can be specified with PARAMS.
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
275 If not given options will be taken from the +PLOT
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
276 line directly before or after the table."
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
277 (interactive)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
278 (require 'gnuplot)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
279 (save-window-excursion
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
280 (delete-other-windows)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
281 (when (get-buffer "*gnuplot*") ;; reset *gnuplot* if it already running
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
282 (save-excursion
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
283 (set-buffer "*gnuplot*") (goto-char (point-max))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
284 (gnuplot-delchar-or-maybe-eof nil)))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
285 (org-plot/goto-nearest-table)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
286 ;; set default options
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
287 (mapc
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
288 (lambda (pair)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
289 (unless (plist-member params (car pair))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
290 (setf params (plist-put params (car pair) (cdr pair)))))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
291 org-plot/gnuplot-default-options)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
292 ;; collect table and table information
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
293 (let* ((data-file (make-temp-file "org-plot"))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
294 (table (org-table-to-lisp))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
295 (num-cols (length (if (eq (first table) 'hline) (second table)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
296 (first table)))))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
297 (while (equal 'hline (first table)) (setf table (cdr table)))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
298 (when (equal (second table) 'hline)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
299 (setf params (plist-put params :labels (first table))) ;; headers to labels
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
300 (setf table (delq 'hline (cdr table)))) ;; clean non-data from table
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
301 ;; collect options
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
302 (save-excursion (while (and (equal 0 (forward-line -1))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
303 (looking-at "#\\+"))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
304 (setf params (org-plot/collect-options params))))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
305 ;; dump table to datafile (very different for grid)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
306 (case (plist-get params :plot-type)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
307 ('2d (org-plot/gnuplot-to-data table data-file params))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
308 ('3d (org-plot/gnuplot-to-data table data-file params))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
309 ('grid (let ((y-labels (org-plot/gnuplot-to-grid-data
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
310 table data-file params)))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
311 (when y-labels (plist-put params :ylabels y-labels)))))
99501
e3acb52d33e1 2008-11-12 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 99139
diff changeset
312 ;; check for timestamp ind column
98653
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
313 (let ((ind (- (plist-get params :ind) 1)))
100458
ba23e35d3eaf 2008-12-17 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 100448
diff changeset
314 (when (and (>= ind 0) (equal '2d (plist-get params :plot-type)))
ba23e35d3eaf 2008-12-17 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 100448
diff changeset
315 (if (= (length
ba23e35d3eaf 2008-12-17 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 100448
diff changeset
316 (delq 0 (mapcar
98653
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
317 (lambda (el)
99501
e3acb52d33e1 2008-11-12 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 99139
diff changeset
318 (if (string-match org-ts-regexp3 el)
98653
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
319 0 1))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
320 (mapcar (lambda (row) (nth ind row)) table)))) 0)
99501
e3acb52d33e1 2008-11-12 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 99139
diff changeset
321 (plist-put params :timeind t)
100458
ba23e35d3eaf 2008-12-17 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 100448
diff changeset
322 ;; check for text ind column
101458
36abe982e7cd 2009-01-25 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 100908
diff changeset
323
36abe982e7cd 2009-01-25 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 100908
diff changeset
324 (if (or (string= (plist-get params :with) "hist")
36abe982e7cd 2009-01-25 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 100908
diff changeset
325 (> (length
36abe982e7cd 2009-01-25 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 100908
diff changeset
326 (delq 0 (mapcar
36abe982e7cd 2009-01-25 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 100908
diff changeset
327 (lambda (el)
36abe982e7cd 2009-01-25 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 100908
diff changeset
328 (if (string-match org-table-number-regexp el)
36abe982e7cd 2009-01-25 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 100908
diff changeset
329 0 1))
36abe982e7cd 2009-01-25 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 100908
diff changeset
330 (mapcar (lambda (row) (nth ind row)) table)))) 0))
100458
ba23e35d3eaf 2008-12-17 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 100448
diff changeset
331 (plist-put params :textind t)))))
98653
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
332 ;; write script
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
333 (with-temp-buffer
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
334 (if (plist-get params :script) ;; user script
104164
ac1a55cc2c38 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 101757
diff changeset
335 (progn (insert
ac1a55cc2c38 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 101757
diff changeset
336 (org-plot/gnuplot-script data-file num-cols params t))
ac1a55cc2c38 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 101757
diff changeset
337 (insert "\n")
ac1a55cc2c38 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 101757
diff changeset
338 (insert-file-contents (plist-get params :script))
ac1a55cc2c38 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 101757
diff changeset
339 (goto-char (point-min))
ac1a55cc2c38 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 101757
diff changeset
340 (while (re-search-forward "$datafile" nil t)
ac1a55cc2c38 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 101757
diff changeset
341 (replace-match data-file nil nil)))
98653
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
342 (insert
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
343 (org-plot/gnuplot-script data-file num-cols params)))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
344 ;; graph table
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
345 (gnuplot-mode)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
346 (gnuplot-send-buffer-to-gnuplot))
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
347 ;; cleanup
99501
e3acb52d33e1 2008-11-12 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 99139
diff changeset
348 (bury-buffer (get-buffer "*gnuplot*"))
104164
ac1a55cc2c38 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents: 101757
diff changeset
349 (run-with-idle-timer 0.1 nil (lambda () (delete-file data-file))))))
98653
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
350
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
351 (provide 'org-plot)
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
352
98696
7e941d6d7c4c Add arch tagline
Miles Bader <miles@gnu.org>
parents: 98653
diff changeset
353 ;; arch-tag: 5763f7c6-0c75-416d-b070-398ee4ec0eca
98653
3553ffaa9490 Switch coding system to unix.
Carsten Dominik <dominik@science.uva.nl>
parents: 98645
diff changeset
354 ;;; org-plot.el ends here