Mercurial > emacs
annotate lisp/org/org-plot.el @ 105341:2a8a3a69c1c7
2009-10-01 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-set-tags-to): New command.
* org-latex.el (org-export-latex-set-initial-vars): Also check in
the plist.
* org.el (org-additional-option-like-keywords): Add LATEX_CLASS
keyword.
* org-exp.el (org-infile-export-plist): Add LATEX_CLASS keyword.
2009-10-01 Carsten Dominik <carsten.dominik@gmail.com>
* org-inlinetask.el (org-inlinetask-export): Option removed.
(org-inlinetask-export-handler): Better export.
* org-xoxo.el (org-export-xoxo-final-hook): New hook.
(org-export-as-xoxo): Run the new hook.
* org-html.el (org-export-html-final-hook): New hook.
(org-export-as-html): Run the new hook.
* org-docbook.el (org-export-docbook-final-hook): New hook.
(org-export-as-docbook): Run the new hook.
* org-ascii.el (org-export-ascii-final-hook): New hook.
(org-export-as-ascii): Run the new hook.
* org-latex.el (org-export-latex-treat-sub-super-char): Allow a
space character as the character before the ^/_.
(org-export-latex-final-hook): New hook.
(org-export-as-latex): Run `org-export-latex-final-hook'.
2009-10-01 Carsten Dominik <carsten.dominik@gmail.com>
* org-macs.el (org-if-unprotected-at): Fix docstring.
* org-agenda.el (org-agenda-change-all-lines): Handle invisible
text in the prefix (if category is a link).
* org-latex.el (org-export-latex-preprocess): Deal properly with
empty lines in verse environments.
* org.el (org-format-latex-header): Inline fullpage.sty.
* org-footnote.el (org-footnote-create-definition): Reveal context
to add a new footnote definition.
* org.el (org-ctrl-c-ctrl-c): Pass prefix arg to
org-table-recalculate when cursor is in TBLFM line.
* org-list.el (org-renumber-ordered-list): Fix cursor position
when bullet length has changed.
2009-10-01 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-format-latex): Mention `org-format-latex-options' in
the docstring.
2009-10-01 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-agenda-get): New function.
* org-agenda.el (org-agenda-post-command-hook): No longer move
point away from end of line.
(org-agenda-add-entry-text, org-agenda-collect-markers)
(org-finalize-agenda, org-agenda-mark-clocking-task)
(org-agenda-dim-blocked-tasks, org-agenda-entry-text-show-here)
(org-agenda-entry-text-show, org-agenda-highlight-todo)
(org-agenda-compare-effort, org-agenda-filter-apply)
(org-agenda-later, org-agenda-change-time-span)
(org-agenda-post-command-hook, org-agenda-show-priority)
(org-agenda-show-tags, org-agenda-goto, org-agenda-kill)
(org-agenda-archive, org-agenda-archive-to-archive-sibling)
(org-remove-subtree-entries-from-agenda, org-agenda-refile)
(org-agenda-open-link, org-agenda-copy-local-variable)
(org-agenda-switch-to, org-agenda-check-no-diary)
(org-agenda-tree-to-indirect-buffer, org-agenda-todo)
(org-agenda-add-note, org-agenda-change-all-lines)
(org-agenda-priority, org-agenda-set-tags)
(org-agenda-set-property, org-agenda-set-effort)
(org-agenda-toggle-archive-tag, org-agenda-date-later)
(org-agenda-show-new-time, org-agenda-date-prompt)
(org-agenda-schedule, org-agenda-deadline, org-agenda-action)
(org-agenda-clock-in, org-agenda-bulk-mark)
(org-agenda-bulk-unmark, org-agenda-show-the-flagging-note): Use
`org-get-at-bol'.
* org-colview.el (org-columns-display-here)
(org-columns-edit-allowed, org-agenda-columns): Use
`org-get-at-bol'.
2009-10-01 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-special-ctrl-a/e): Improve documentation and
customize type.
(org-end-of-line): Don't jump to after the ellipsis.
(org-mode-map): Bind <home> and <end> as well.
2009-10-01 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-fontify-meta-lines-and-blocks): Treat lines with a
space after #+ as comments.
(org-open-at-point): Run `org-follow-link-hook' always.
* org-latex.el (org-export-latex-emph-format): Use better commands
to insert special characters in verbatim snippets.
2009-10-01 Carsten Dominik <carsten.dominik@gmail.com>
* org-faces.el (org-copy-face): New function. Use it to create
various faces formerly created by using `copy-face'.
* org-agenda.el (org-prepare-agenda): Don't officially mark this
window dedicated.
(org-agenda-quit): Kill the frame containing the agenda window if
that frame was created for the agenda.
2009-10-01 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-date-prompt): Mark the changed time
stamp in the agenda.
2009-10-01 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-prepare-agenda): Reset
`org-drawers-for-agenda'.
(org-prepare-agenda): Uniquify list of drawers.
* org.el (org-complex-heading-regexp-format): New variable.
(org-set-regexps-and-options): Define
`org-complex-heading-regexp-format'.
(org-drawers-for-agenda): New variable.
(org-map-entries): Bind `org-drawers-for-agenda'.
(org-prepare-agenda-buffers): Add to `org-drawers-for-agenda'.
* org-remember.el (org-go-to-remember-target)
(org-remember-handler): Use `org-complex-heading-regexp-format'.
2009-10-01 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-highlight-todo): Fix text property
problem.
* org.el (org-on-heading-p, org-at-heading-p): Make sure these are
always with `invisible-ok'.
(org-store-link): No error when there is nothing to link to in the
agenda.
* org-list.el (org-update-checkbox-count): Insert changed cookie
before the old, to avoid problems with invisibility at the end of
the line.
(org-update-checkbox-count): Insert changed cookie before the old,
to avoid problems with invisibility at the end of the line.
* org.el (org-sort-entries-or-items): Include the final newline.
(org-fontify-meta-lines-and-blocks): Add indented dynamic block
lines for fontification.
(org-dblock-start-re, org-dblock-end-re): Allow indentation.
(org-prepare-dblock): Store the current indentation of the BEGIN
line.
(org-update-dblock): Apply the indentation of the begin line to
the rest of the block.
(org-ctrl-c-ctrl-c): Also find indented dblock lines.
(org-startup-folded): New allowed value `showeverything'.
(org-startup-options): Add STARTUP keyword `showeverything'.
(org-set-startup-visibility): Respect value `showeverything' in
org-startup-folded.
2009-10-01 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-closest-date): Fix issue with past preference.
* org-archive.el (org-archive-set-tag)
(org-archive-subtree-default): New commands.
* org-clock.el (org-clock-clocktable-default-properties): New
option.
(org-clock-report): Use
`org-clock-clocktable-default-properties'.
2009-10-01 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-iswitchb-completing-read): Fix typo.
* org-crypt.el: New file.
* org.el: Add an entry for org-crypt.
2009-10-01 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-menu): Reorganize the menu for more
consistency.
(org-batch-store-agenda-views): New function.
(org-agenda-title-append): Define variable.
(org-write-agenda): New export to Org files.
(org-agenda-get-some-entry-text): New arguments INDENT and KEEP.
(org-agenda): Allow to keep the restricted file list if a special
variable is bound to t.
(org-agenda): Define a special agenda view for working on flagged
entries.
(org-agenda-get-restriction-and-command): List the new agenda
view.
(org-agenda-show-the-flagging-note): New command.
(org-agenda-mode-map): New key `?' for looking at the flagging
note.
* org.el (org-autoload): Autoload org-mobile.el.
(org-org-menu): Add menu commands for MobileOrg in the Org menu.
* org-mobile.el: New file.
* org-id.el (org-id-get): Fix bug with forcing ID on an item.
2009-10-01 Carsten Dominik <carsten.dominik@gmail.com>
* org-table.el (orgtbl-line-start-regexp): Match also TBLNAME
statements.
(org-table-get-remote-range): Match indented #+TBLNAME
statements.
* org.el (org-convert-to-odd-levels)
(org-convert-to-oddeven-levels): Work also correctly if the file
is in outline-mode.
2009-10-01 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-store-link): When in agenda buffer, link to
referenced entry.
(org-add-planning-info): Remove spaces at eol.
* org-macs.el (org-with-point-at): Add a `lisp-indent-function'
property.
2009-10-01 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-first-lines): Fix problem with
LaTeX export of first line and selected subtree.
* org.el (org-shifttab): Interpret arg differently when using only
odd levels.
2009-10-01 Bastien Guerry <bzg@altern.org>
* org.el (org-check-agenda-file): Use a more explicit message
2009-10-01 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-remove-special-table-lines): Don't remove
normal lines.
2009-10-01 Bastien Guerry <bzg@altern.org>
* org.el (org-offer-links-in-entry): Don't use "Select link" as a
prompt in the temporary window.
* org-agenda.el (org-agenda-bulk-mark): Use a slightly soberer
prefix for marked entries in the agenda view.
2009-10-01 Andreas Burtzlaff <andy13@gmx.net> (tiny change)
* org.el (outline-end-of-subtree): Bugfix: advise this function in
a way that prevents any trailing character from being displayed.
2009-10-01 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-menu): Fix bugs in the bulk action
menu.
* org-exp.el (org-export-remove-special-table-lines): Remove bad
slow regexp match.
2009-10-01 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-preprocess): Do not protect in
the LaTeX header.
* org-src.el (org-edit-src-save): Save window setup while saving.
(org-edit-src-code): Use new buffer name construction scheme.
2009-10-01 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-entry-text-exclude-regexps): New
variable.
(org-agenda-entry-text-cleanup-hook): New hook.
(org-agenda-get-some-entry-text): Remove matches of
`org-agenda-entry-text-exclude-regexps' and run the hook
`org-agenda-entry-text-cleanup-hook'.
* org.el (org-offer-links-in-entry): New argument ZERO to
implement a link with index zero.
(org-cycle-show-empty-lines): Not keep empty line under header
hidden.
(org-iswitchb-completing-read): Bind `switchb-use-virtual-buffers'
to nil for special completion.
(org-store-link): Don't error before the first heading.
* org-agenda.el (org-agenda-open-link): Pass the prefix to
`org-offer-links-in-entry'.
2009-10-01 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-quit): Provide the window argument for
`window-dedicated-p', Emacs 22 needs it.
(org-format-agenda-item): If the category is a link, arrange for
invisible text to replaced with spaces.
(org-compile-prefix-format): Add the extra space.
(org-prefix-category-length): New variable.
* org-exp.el (org-export-cleanup-toc-line): Remove footnote
references from TOC lines.
* org.el (org-selected-window): New variable.
* org-table.el (org-table-edit-formulas): Remember the selected
window.
(org-table-fedit-finish, org-table-fedit-abort): Select the window
that was originally selected.
* org-exp.el (org-export-preprocess-apply-macros): Scan the
expansion of a macro for more macro definitions.
* org-agenda.el (org-agenda-dim-blocked-tasks): Make sure the
invisibility overlay starts on the newline.
author | Carsten Dominik <dominik@science.uva.nl> |
---|---|
date | Thu, 01 Oct 2009 07:59:53 +0000 |
parents | 86b7fe7d1d8f |
children | 131bccfc4f5d |
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 | 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 |
105341
2a8a3a69c1c7
2009-10-01 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents:
104810
diff
changeset
|
8 ;; Version: 6.31a |
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 | 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 |