From: Yasushi SHOJI <yashi@atmark-techno.com>
To: emacs-orgmode@gnu.org
Subject: [PATCH] org-plot: Handle explicit date/time index
Date: Tue, 11 Mar 2014 02:26:47 +0900 [thread overview]
Message-ID: <87ob1e2bin.wl@dns1.atmark-techno.com> (raw)
* lisp/org-plot.el (org-plot-quote-tsv-field): Dump data as is when
`timeind' is set.
* lisp/org-plot.el (org-plot/gnuplot): By-pass type checking when
either `textind' or `timeind' is set.
The current org-plot relies on `org-table-number-regexp' and
`org-ts-regexp3' to check the index type. However, we already have
`timeind' to indicate that the index is the datatype of date/time.
By-pass the type checking in `org-plot/gnuplot' when either `textind'
or `timeind' is set. The whole point of the check is to determine the
type. We do not need that when we already know.
Also dump the date/time data with `org-plot-quote-tsv-field' as is,
without double quotes, when `timeind' is set. So that we can use
`timefmt' to read what we have. Currently we do not have a good way
to specify `timefmt' with the double quotes.
---
Hi,
It seems to me that dates with slash (ie. 2014/03/11) does not work
with the current org-plot.el, even if you set `timeind' and
`timefmt'. That's because the current org-plot treat "2014/03/11" as
string instead of data/time.
Here is an ECM:
#+PLOT: ind:1
#+PLOT: timeind:t timefmt:"%Y/%m/%d"
#+PLOT: set:"format x '%y-%m'"
#+PLOT: set:"xtics rotate by -45"
| 2014/03/11 | 0 |
| 2014/03/12 | 1 |
| 2014/03/13 | 2 |
This patch fixes my itch but I'm not sure it doesn't break others.
Could you please test it? and tell me how it works.
BTW, do we have any test for org-plot? Let me know if there is any.
Thanks,
--
yashi
lisp/org-plot.el | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/lisp/org-plot.el b/lisp/org-plot.el
index 556b9ef..b5000ea 100644
--- a/lisp/org-plot.el
+++ b/lisp/org-plot.el
@@ -109,7 +109,8 @@ will be added. Returns the resulting property list."
(defun org-plot-quote-tsv-field (s)
"Quote field S for export to gnuplot."
- (if (string-match org-table-number-regexp s) s
+ (if (or (string-match org-table-number-regexp s)
+ (plist-get params :timeind)) s
(if (string-match org-ts-regexp3 s)
(org-plot-quote-timestamp-field s)
(concat "\"" (mapconcat 'identity (split-string s "\"") "\"\"") "\""))))
@@ -312,7 +313,9 @@ line directly before or after the table."
(when y-labels (plist-put params :ylabels y-labels)))))
;; check for timestamp ind column
(let ((ind (- (plist-get params :ind) 1)))
- (when (and (>= ind 0) (equal '2d (plist-get params :plot-type)))
+ (when (and (>= ind 0) (equal '2d (plist-get params :plot-type))
+ (not (or (plist-get params :timeind)
+ (plist-get params :textind))))
(if (= (length
(delq 0 (mapcar
(lambda (el)
--
1.9.0
next reply other threads:[~2014-03-10 17:45 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-10 17:26 Yasushi SHOJI [this message]
2014-03-13 11:58 ` [PATCH] org-plot: Handle explicit date/time index Bastien
2014-03-13 12:45 ` Yasushi SHOJI
2014-03-23 18:41 ` Bastien
2014-03-24 21:37 ` Yasushi SHOJI
2014-03-25 8:26 ` Bastien
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87ob1e2bin.wl@dns1.atmark-techno.com \
--to=yashi@atmark-techno.com \
--cc=emacs-orgmode@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).