emacs-orgmode
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Orgmode] org-plot and timestamps


From: Carsten Dominik
Subject: Re: [Orgmode] org-plot and timestamps
Date: Sun, 2 Nov 2008 08:04:03 +0100

Hi Charles,

I have now added this patch.

Could you also provide a ChangeLog entry?

Thanks.

- Carsten

On Oct 30, 2008, at 4:35 PM, Charles Sebold wrote:

On 28 Oct 2008, Eric Schulte wrote:

Hi Charles, The patch looks great, I vote we drop it 'as is' into
org-plot.el.  The only enhancement that comes to mind would be to
expose the `time-ind' variable as a plot option.  Allowing users to
specify different time formats, but really if they're that
sophisticated in their use of gnuplot, then they can do that on their
own through the `set:' option.  Thanks for the addition! -- Eric

If I understand you correctly, then what we want to expose is the
"timefmt" that is put into the data file and then passed to gnuplot.
The following patch is a complete one against current which adds this
(it works for me, at least), and documents the new +PLOT option
behavior.

The one thing I'm not sure about is my method of passing the timefmt
parameter all the way into the temp file creation function.  I made a
buffer-local variable there to do it.  That seemed the least intrusive
way to accomplish this, but it seemed like poor practice.  Thoughts?

You know, I really ought to allow a person to customize this variable (I
mean, using customize).

------------------------------------------------------------------------
Changes in origin/master
        Modified doc/org.texi
diff --git a/doc/org.texi b/doc/org.texi
index b675d92..60be4de 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -2345,6 +2345,10 @@ Specify an entire line to be inserted in the gnuplot script. When plotting @code{3d} or @code{grid} types, set this to @code{t} to graph a
flat mapping rather than a @code{3d} slope.

address@hidden timefmt
+Specify format of org-mode timestamps as they will be parsed by gnuplot.
+Defaults to '%Y-%m-%d-%H:%M:%S'.
+
@item script
If you want total control you can specify a script file (place the file name between double quotes) which will be used to plot. Before plotting, every
        Modified lisp/org-plot.el
diff --git a/lisp/org-plot.el b/lisp/org-plot.el
index db67257..f69bfc6 100644
--- a/lisp/org-plot.el
+++ b/lisp/org-plot.el
@@ -51,17 +51,18 @@
Returns the resulting property list."
  (let (o)
    (when options
-      (let ((op '(("type"   . :plot-type)
-                 ("script" . :script)
-                 ("line"   . :line)
-                 ("set"    . :set)
-                 ("title"  . :title)
-                 ("ind"    . :ind)
-                 ("deps"   . :deps)
-                 ("with"   . :with)
-                 ("file"   . :file)
-                 ("labels" . :labels)
-                 ("map"    . :map)))
+      (let ((op '(("type"    . :plot-type)
+                 ("script"  . :script)
+                 ("line"    . :line)
+                 ("set"     . :set)
+                 ("title"   . :title)
+                 ("ind"     . :ind)
+                 ("deps"    . :deps)
+                 ("with"    . :with)
+                 ("file"    . :file)
+                 ("labels"  . :labels)
+                 ("map"     . :map)
+                  ("timefmt" . :timefmt)))
            (multiples '("set" "line"))
            (regexp ":\\([\"][^\"]+?[\"]\\|[(][^)]+?[)]\\|[^ \t\n\r;,.]*\\)")
            (start 0)
@@ -101,20 +102,31 @@ will be added. Returns the resulting property list."
        (org-plot/add-options-to-plist params (match-string 1 line))
      params)))

+(defun org-plot-quote-timestamp-field (s)
+ "Convert field S from timestamp to Unix time and export to gnuplot." + (format-time-string org-plot-timestamp-fmt (org-time-string-to- time s)))
+
(defun org-plot-quote-tsv-field (s)
  "Quote field S for export to gnuplot."
  (if (string-match org-table-number-regexp s) s
- (concat "\"" (mapconcat 'identity (split-string s "\"") "\"\"") "\"")))
+    (if (string-match org-ts-regexp3 s)
+        (org-plot-quote-timestamp-field s)
+ (concat "\"" (mapconcat 'identity (split-string s "\"") "\"\"") "\""))))

(defun org-plot/gnuplot-to-data (table data-file params)
  "Export TABLE to DATA-FILE in a format readable by gnuplot.
Pass PARAMS through to `orgtbl-to-generic' when exporting TABLE."
  (with-temp-file
-      data-file (insert (orgtbl-to-generic
-                        table
-                        (org-combine-plists
-                         '(:sep "\t" :fmt org-plot-quote-tsv-field)
-                         params))))
+      data-file
+    (make-local-variable 'org-plot-timestamp-fmt)
+    (setq org-plot-timestamp-fmt (or
+                                  (plist-get params :timefmt)
+                                  "%Y-%m-%d-%H:%M:%S"))
+    (insert (orgtbl-to-generic
+             table
+             (org-combine-plists
+              '(:sep "\t" :fmt org-plot-quote-tsv-field)
+              params))))
  nil)

(defun org-plot/gnuplot-to-grid-data (table data-file params)
@@ -180,6 +192,8 @@ NUM-COLS controls the number of columns plotted in a 2-d plot."
         (title (plist-get params :title))
         (file (plist-get params :file))
         (ind (plist-get params :ind))
+         (time-ind (plist-get params :timeind))
+         (timefmt (plist-get params :timefmt))
         (text-ind (plist-get params :textind))
         (deps (if (plist-member params :deps) (plist-get params :deps)))
         (col-labels (plist-get params :labels))
@@ -217,6 +231,11 @@ NUM-COLS controls the number of columns plotted in a 2-d plot."
                 (mapconcat (lambda (pair)
                              (format "\"%s\" %d" (cdr pair) (car pair)))
                            y-labels ", "))))
+      (when time-ind ;; timestamp index
+        (add-to-script "set xdata time")
+        (add-to-script (concat "set timefmt \""
+ (or timefmt ;; timefmt passed to gnuplot
+                                   "%Y-%m-%d-%H:%M:%S") "\"")))
      (case type ;; plot command
        ('2d (dotimes (col num-cols)
               (unless (and (equal type '2d)
@@ -284,16 +303,24 @@ line directly before or after the table."
        ('grid (let ((y-labels (org-plot/gnuplot-to-grid-data
                                table data-file params)))
                 (when y-labels (plist-put params :ylabels y-labels)))))
-      ;; check for text ind column
+      ;; check for timestamp ind column
      (let ((ind (- (plist-get params :ind) 1)))
-       (when (and (>= ind 0) (equal '2d (plist-get params :plot-type)))
-         (if (> (length
-                 (delq 0 (mapcar
+ (when (and (>= ind 0) (equal '2d (plist-get params :plot- type)))
+          (if (= (length
+                  (delq 0 (mapcar
                           (lambda (el)
-                            (if (string-match org-table-number-regexp el)
+                            (if (string-match org-ts-regexp3 el)
                                 0 1))
                           (mapcar (lambda (row) (nth ind row)) table)))) 0)
-             (plist-put params :textind t))))
+             (plist-put params :timeind t)
+            ;; check for text ind column
+            (if (> (length
+                    (delq 0 (mapcar
+                             (lambda (el)
+ (if (string-match org-table-number- regexp el)
+                                   0 1))
+ (mapcar (lambda (row) (nth ind row)) table)))) 0)
+                (plist-put params :textind t)))))
      ;; write script
      (with-temp-buffer
        (if (plist-get params :script) ;; user script
@@ -307,7 +334,8 @@ line directly before or after the table."
        (gnuplot-mode)
        (gnuplot-send-buffer-to-gnuplot))
      ;; cleanup
- (bury-buffer (get-buffer "*gnuplot*"))(delete-file data- file))))
+      (bury-buffer (get-buffer "*gnuplot*"))
+      (delete-file data-file))))

(provide 'org-plot)



--
Charles Sebold
http://merbc.invigorated.org/
http://triablogue.blogspot.com/


_______________________________________________
Emacs-orgmode mailing list
Remember: use `Reply All' to send replies to the list.
address@hidden
http://lists.gnu.org/mailman/listinfo/emacs-orgmode





reply via email to

[Prev in Thread] Current Thread [Next in Thread]