[PATCH] org-plot: Handle explicit date/time index
Yasushi SHOJI <yashi <at> atmark-techno.com>
2014-03-10 17:26:47 GMT
* 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.
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: 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.
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
<at> <at> -109,7 +109,8 <at> <at> 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)
(concat "\"" (mapconcat 'identity (split-string s "\"") "\"\"") "\""))))
<at> <at> -312,7 +313,9 <at> <at> 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