Mercurial > emacs
annotate lisp/calc/calc-graph.el @ 105117:6d1d8494a3da
(calc-graph-lookup): Avoid assignment to free variable `var'.
Delete trailing whitespace.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Sat, 19 Sep 2009 21:22:45 +0000 |
parents | 6bb8dd0cfa31 |
children | e3187820f169 |
rev | line source |
---|---|
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
1 ;;; calc-graph.el --- graph output functions for Calc |
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
2 |
64325
1db49616ce05
Update copyright information.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
62516
diff
changeset
|
3 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004, |
100908 | 4 ;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
5 |
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
6 ;; Author: David Gillespie <daveg@synaptics.com> |
77465
1154f082efd9
Update maintainer's address.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
76595
diff
changeset
|
7 ;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com> |
40785 | 8 |
9 ;; This file is part of GNU Emacs. | |
10 | |
94654
6c9af2bfcfee
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
11 ;; GNU Emacs is free software: you can redistribute it and/or modify |
76595
497d17a80bb8
Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents:
75346
diff
changeset
|
12 ;; it under the terms of the GNU General Public License as published by |
94654
6c9af2bfcfee
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
13 ;; the Free Software Foundation, either version 3 of the License, or |
6c9af2bfcfee
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
14 ;; (at your option) any later version. |
40785 | 15 |
76595
497d17a80bb8
Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents:
75346
diff
changeset
|
16 ;; GNU Emacs is distributed in the hope that it will be useful, |
497d17a80bb8
Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents:
75346
diff
changeset
|
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
497d17a80bb8
Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents:
75346
diff
changeset
|
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
497d17a80bb8
Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents:
75346
diff
changeset
|
19 ;; GNU General Public License for more details. |
497d17a80bb8
Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents:
75346
diff
changeset
|
20 |
497d17a80bb8
Change form of license text to match rest of Emacs.
Glenn Morris <rgm@gnu.org>
parents:
75346
diff
changeset
|
21 ;; You should have received a copy of the GNU General Public License |
94654
6c9af2bfcfee
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
22 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
40785 | 23 |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
24 ;;; Commentary: |
40785 | 25 |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
26 ;;; Code: |
40785 | 27 |
28 ;; This file is autoloaded from calc-ext.el. | |
58657
05cfe246ec8d
Add a provide statement.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58478
diff
changeset
|
29 |
40785 | 30 (require 'calc-ext) |
31 (require 'calc-macs) | |
32 | |
33 ;;; Graphics | |
34 | |
61215 | 35 ;; The following three variables are customizable and defined in calc.el. |
36 (defvar calc-gnuplot-name) | |
37 (defvar calc-gnuplot-plot-command) | |
38 (defvar calc-gnuplot-print-command) | |
58657
05cfe246ec8d
Add a provide statement.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58478
diff
changeset
|
39 |
43606
54abc38794d9
(calc-gnuplot-tempfile): Don't expand against
Colin Walters <walters@gnu.org>
parents:
41271
diff
changeset
|
40 (defvar calc-gnuplot-tempfile "calc") |
40785 | 41 |
58478
0a85050b3bb4
(calc-gnuplot-default-device, calc-gnuplot-default-output)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58188
diff
changeset
|
42 (defvar calc-gnuplot-default-device) |
0a85050b3bb4
(calc-gnuplot-default-device, calc-gnuplot-default-output)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58188
diff
changeset
|
43 (defvar calc-gnuplot-default-output) |
0a85050b3bb4
(calc-gnuplot-default-device, calc-gnuplot-default-output)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58188
diff
changeset
|
44 (defvar calc-gnuplot-print-device) |
0a85050b3bb4
(calc-gnuplot-default-device, calc-gnuplot-default-output)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58188
diff
changeset
|
45 (defvar calc-gnuplot-print-output) |
40785 | 46 (defvar calc-gnuplot-keep-outfile nil) |
47 (defvar calc-gnuplot-version nil) | |
48 | |
49 (defvar calc-gnuplot-display (getenv "DISPLAY")) | |
58478
0a85050b3bb4
(calc-gnuplot-default-device, calc-gnuplot-default-output)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58188
diff
changeset
|
50 (defvar calc-gnuplot-geometry) |
40785 | 51 |
58478
0a85050b3bb4
(calc-gnuplot-default-device, calc-gnuplot-default-output)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58188
diff
changeset
|
52 (defvar calc-graph-default-resolution) |
0a85050b3bb4
(calc-gnuplot-default-device, calc-gnuplot-default-output)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58188
diff
changeset
|
53 (defvar calc-graph-default-resolution-3d) |
40785 | 54 (defvar calc-graph-default-precision 5) |
55 | |
56 (defvar calc-gnuplot-buffer nil) | |
57 (defvar calc-gnuplot-input nil) | |
58 | |
59 (defvar calc-gnuplot-last-error-pos 1) | |
60 (defvar calc-graph-last-device nil) | |
61 (defvar calc-graph-last-output nil) | |
62 (defvar calc-graph-file-cache nil) | |
63 (defvar calc-graph-var-cache nil) | |
64 (defvar calc-graph-data-cache nil) | |
65 (defvar calc-graph-data-cache-limit 10) | |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
66 (defvar calc-graph-no-auto-view nil) |
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
67 (defvar calc-graph-no-wait nil) |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
68 (defvar calc-gnuplot-trail-mark) |
40785 | 69 |
70 (defun calc-graph-fast (many) | |
71 (interactive "P") | |
72 (let ((calc-graph-no-auto-view t)) | |
73 (calc-graph-delete t) | |
74 (calc-graph-add many) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
75 (calc-graph-plot nil))) |
40785 | 76 |
77 (defun calc-graph-fast-3d (many) | |
78 (interactive "P") | |
79 (let ((calc-graph-no-auto-view t)) | |
80 (calc-graph-delete t) | |
81 (calc-graph-add-3d many) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
82 (calc-graph-plot nil))) |
40785 | 83 |
84 (defun calc-graph-delete (all) | |
85 (interactive "P") | |
86 (calc-wrapper | |
87 (calc-graph-init) | |
88 (save-excursion | |
89 (set-buffer calc-gnuplot-input) | |
90 (and (calc-graph-find-plot t all) | |
91 (progn | |
92 (if (looking-at "s?plot") | |
93 (progn | |
94 (setq calc-graph-var-cache nil) | |
95 (delete-region (point) (point-max))) | |
96 (delete-region (point) (1- (point-max))))))) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
97 (calc-graph-view-commands))) |
40785 | 98 |
99 (defun calc-graph-find-plot (&optional before all) | |
100 (goto-char (point-min)) | |
101 (and (re-search-forward "^s?plot[ \t]+" nil t) | |
102 (let ((beg (point))) | |
103 (goto-char (point-max)) | |
104 (if (or all | |
105 (not (search-backward "," nil t)) | |
106 (< (point) beg)) | |
107 (progn | |
108 (goto-char beg) | |
109 (if before | |
110 (beginning-of-line))) | |
111 (or before | |
112 (re-search-forward ",[ \t]+"))) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
113 t))) |
40785 | 114 |
115 (defun calc-graph-add (many) | |
116 (interactive "P") | |
117 (calc-wrapper | |
118 (calc-graph-init) | |
119 (cond ((null many) | |
120 (calc-graph-add-curve (calc-graph-lookup (calc-top-n 2)) | |
121 (calc-graph-lookup (calc-top-n 1)))) | |
122 ((or (consp many) (eq many 0)) | |
123 (let ((xdata (calc-graph-lookup (calc-top-n 2))) | |
124 (ylist (calc-top-n 1))) | |
125 (or (eq (car-safe ylist) 'vec) | |
126 (error "Y argument must be a vector")) | |
127 (while (setq ylist (cdr ylist)) | |
128 (calc-graph-add-curve xdata (calc-graph-lookup (car ylist)))))) | |
129 ((> (setq many (prefix-numeric-value many)) 0) | |
130 (let ((xdata (calc-graph-lookup (calc-top-n (1+ many))))) | |
131 (while (> many 0) | |
132 (calc-graph-add-curve xdata | |
133 (calc-graph-lookup (calc-top-n many))) | |
134 (setq many (1- many))))) | |
135 (t | |
136 (let (pair) | |
137 (setq many (- many)) | |
138 (while (> many 0) | |
139 (setq pair (calc-top-n many)) | |
140 (or (and (eq (car-safe pair) 'vec) | |
141 (= (length pair) 3)) | |
142 (error "Argument must be an [x,y] vector")) | |
143 (calc-graph-add-curve (calc-graph-lookup (nth 1 pair)) | |
144 (calc-graph-lookup (nth 2 pair))) | |
145 (setq many (1- many)))))) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
146 (calc-graph-view-commands))) |
40785 | 147 |
148 (defun calc-graph-add-3d (many) | |
149 (interactive "P") | |
150 (calc-wrapper | |
151 (calc-graph-init) | |
152 (cond ((null many) | |
153 (calc-graph-add-curve (calc-graph-lookup (calc-top-n 3)) | |
154 (calc-graph-lookup (calc-top-n 2)) | |
155 (calc-graph-lookup (calc-top-n 1)))) | |
156 ((or (consp many) (eq many 0)) | |
157 (let ((xdata (calc-graph-lookup (calc-top-n 3))) | |
158 (ydata (calc-graph-lookup (calc-top-n 2))) | |
159 (zlist (calc-top-n 1))) | |
160 (or (eq (car-safe zlist) 'vec) | |
161 (error "Z argument must be a vector")) | |
162 (while (setq zlist (cdr zlist)) | |
163 (calc-graph-add-curve xdata ydata | |
164 (calc-graph-lookup (car zlist)))))) | |
165 ((> (setq many (prefix-numeric-value many)) 0) | |
166 (let ((xdata (calc-graph-lookup (calc-top-n (+ many 2)))) | |
167 (ydata (calc-graph-lookup (calc-top-n (+ many 1))))) | |
168 (while (> many 0) | |
169 (calc-graph-add-curve xdata ydata | |
170 (calc-graph-lookup (calc-top-n many))) | |
171 (setq many (1- many))))) | |
172 (t | |
173 (let (curve) | |
174 (setq many (- many)) | |
175 (while (> many 0) | |
176 (setq curve (calc-top-n many)) | |
177 (or (and (eq (car-safe curve) 'vec) | |
178 (= (length curve) 4)) | |
179 (error "Argument must be an [x,y,z] vector")) | |
180 (calc-graph-add-curve (calc-graph-lookup (nth 1 curve)) | |
181 (calc-graph-lookup (nth 2 curve)) | |
182 (calc-graph-lookup (nth 3 curve))) | |
183 (setq many (1- many)))))) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
184 (calc-graph-view-commands))) |
40785 | 185 |
186 (defun calc-graph-add-curve (xdata ydata &optional zdata) | |
187 (let ((num (calc-graph-count-curves)) | |
188 (pstyle (calc-var-value 'var-PointStyles)) | |
189 (lstyle (calc-var-value 'var-LineStyles))) | |
190 (save-excursion | |
191 (set-buffer calc-gnuplot-input) | |
192 (goto-char (point-min)) | |
193 (if (re-search-forward (if zdata "^plot[ \t]" "^splot[ \t]") | |
194 nil t) | |
195 (error "Can't mix 2d and 3d curves on one graph")) | |
196 (if (re-search-forward "^s?plot[ \t]" nil t) | |
197 (progn | |
198 (end-of-line) | |
199 (insert ", ")) | |
200 (goto-char (point-max)) | |
201 (or (eq (preceding-char) ?\n) | |
202 (insert "\n")) | |
203 (insert (if zdata "splot" "plot") " \n") | |
204 (forward-char -1)) | |
205 (insert "{" (symbol-name (nth 1 xdata)) | |
206 ":" (symbol-name (nth 1 ydata))) | |
207 (if zdata | |
208 (insert ":" (symbol-name (nth 1 zdata)))) | |
209 (insert "} " | |
210 "title \"" (symbol-name (nth 1 ydata)) "\" " | |
211 "with dots") | |
212 (setq pstyle (and (eq (car-safe pstyle) 'vec) (nth (1+ num) pstyle))) | |
57183
1b540cda70aa
(calc-graph-add-curve): Moved the call to `calc-graph-set-styles' so
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
213 (setq lstyle (and (eq (car-safe lstyle) 'vec) (nth (1+ num) lstyle)))) |
1b540cda70aa
(calc-graph-add-curve): Moved the call to `calc-graph-set-styles' so
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
214 (calc-graph-set-styles |
1b540cda70aa
(calc-graph-add-curve): Moved the call to `calc-graph-set-styles' so
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
215 (or (and (Math-num-integerp lstyle) (math-trunc lstyle)) |
1b540cda70aa
(calc-graph-add-curve): Moved the call to `calc-graph-set-styles' so
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
216 0) |
1b540cda70aa
(calc-graph-add-curve): Moved the call to `calc-graph-set-styles' so
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
217 (or (and (Math-num-integerp pstyle) (math-trunc pstyle)) |
1b540cda70aa
(calc-graph-add-curve): Moved the call to `calc-graph-set-styles' so
Jay Belanger <jay.p.belanger@gmail.com>
parents:
52401
diff
changeset
|
218 (if (eq (car-safe (calc-var-value (nth 2 ydata))) 'vec) |
82247
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
219 0 -1)) |
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
220 (math-contains-sdev-p (eval (nth 2 ydata)))))) |
40785 | 221 |
222 (defun calc-graph-lookup (thing) | |
223 (if (and (eq (car-safe thing) 'var) | |
224 (calc-var-value (nth 2 thing))) | |
225 thing | |
226 (let ((found (assoc thing calc-graph-var-cache))) | |
227 (or found | |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
228 (let ((varname (concat "PlotData" |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
229 (int-to-string |
105117
6d1d8494a3da
(calc-graph-lookup): Avoid assignment to free variable `var'.
Glenn Morris <rgm@gnu.org>
parents:
104175
diff
changeset
|
230 (1+ (length calc-graph-var-cache))))) |
6d1d8494a3da
(calc-graph-lookup): Avoid assignment to free variable `var'.
Glenn Morris <rgm@gnu.org>
parents:
104175
diff
changeset
|
231 var) |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
232 (setq var (list 'var (intern varname) |
40785 | 233 (intern (concat "var-" varname))) |
234 found (cons thing var) | |
235 calc-graph-var-cache (cons found calc-graph-var-cache)) | |
236 (set (nth 2 var) thing))) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
237 (cdr found)))) |
40785 | 238 |
239 (defun calc-graph-juggle (arg) | |
240 (interactive "p") | |
241 (calc-graph-init) | |
242 (save-excursion | |
243 (set-buffer calc-gnuplot-input) | |
244 (if (< arg 0) | |
245 (let ((num (calc-graph-count-curves))) | |
246 (if (> num 0) | |
247 (while (< arg 0) | |
248 (setq arg (+ arg num)))))) | |
249 (while (>= (setq arg (1- arg)) 0) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
250 (calc-graph-do-juggle)))) |
40785 | 251 |
252 (defun calc-graph-count-curves () | |
253 (save-excursion | |
254 (set-buffer calc-gnuplot-input) | |
255 (if (re-search-forward "^s?plot[ \t]" nil t) | |
256 (let ((num 1)) | |
257 (goto-char (point-min)) | |
258 (while (search-forward "," nil t) | |
259 (setq num (1+ num))) | |
260 num) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
261 0))) |
40785 | 262 |
263 (defun calc-graph-do-juggle () | |
264 (let (base) | |
265 (and (calc-graph-find-plot t t) | |
266 (progn | |
267 (setq base (point)) | |
268 (calc-graph-find-plot t nil) | |
269 (or (eq base (point)) | |
270 (let ((str (buffer-substring (+ (point) 2) (1- (point-max))))) | |
271 (delete-region (point) (1- (point-max))) | |
272 (goto-char (+ base 5)) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
273 (insert str ", "))))))) |
40785 | 274 |
275 (defun calc-graph-print (flag) | |
276 (interactive "P") | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
277 (calc-graph-plot flag t)) |
40785 | 278 |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
279 (defvar var-DUMMY) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
280 (defvar var-DUMMY2) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
281 (defvar var-PlotRejects) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
282 |
105117
6d1d8494a3da
(calc-graph-lookup): Avoid assignment to free variable `var'.
Glenn Morris <rgm@gnu.org>
parents:
104175
diff
changeset
|
283 ;; The following variables are local to calc-graph-plot, but are |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
284 ;; used in the functions calc-graph-compute-2d, calc-graph-refine-2d, |
105117
6d1d8494a3da
(calc-graph-lookup): Avoid assignment to free variable `var'.
Glenn Morris <rgm@gnu.org>
parents:
104175
diff
changeset
|
285 ;; calc-graph-recompute-2d, calc-graph-compute-3d and |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
286 ;; calc-graph-format-data, which are called by calc-graph-plot. |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
287 (defvar calc-graph-yvalue) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
288 (defvar calc-graph-yvec) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
289 (defvar calc-graph-numsteps) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
290 (defvar calc-graph-numsteps3) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
291 (defvar calc-graph-xvalue) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
292 (defvar calc-graph-xvec) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
293 (defvar calc-graph-xname) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
294 (defvar calc-graph-yname) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
295 (defvar calc-graph-xstep) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
296 (defvar calc-graph-ycache) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
297 (defvar calc-graph-ycacheptr) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
298 (defvar calc-graph-refine) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
299 (defvar calc-graph-keep-file) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
300 (defvar calc-graph-xval) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
301 (defvar calc-graph-xlow) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
302 (defvar calc-graph-xhigh) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
303 (defvar calc-graph-yval) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
304 (defvar calc-graph-yp) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
305 (defvar calc-graph-xp) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
306 (defvar calc-graph-zp) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
307 (defvar calc-graph-yvector) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
308 (defvar calc-graph-resolution) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
309 (defvar calc-graph-y3value) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
310 (defvar calc-graph-y3name) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
311 (defvar calc-graph-y3step) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
312 (defvar calc-graph-zval) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
313 (defvar calc-graph-stepcount) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
314 (defvar calc-graph-is-splot) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
315 (defvar calc-graph-surprise-splot) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
316 (defvar calc-graph-blank) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
317 (defvar calc-graph-non-blank) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
318 (defvar calc-graph-curve-num) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
319 |
40785 | 320 (defun calc-graph-plot (flag &optional printing) |
321 (interactive "P") | |
322 (calc-slow-wrapper | |
323 (let ((calcbuf (current-buffer)) | |
324 (tempbuf (get-buffer-create "*Gnuplot Temp-2*")) | |
325 (tempbuftop 1) | |
326 (tempoutfile nil) | |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
327 (calc-graph-curve-num 0) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
328 (calc-graph-refine (and flag (> (prefix-numeric-value flag) 0))) |
40785 | 329 (recompute (and flag (< (prefix-numeric-value flag) 0))) |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
330 (calc-graph-surprise-splot nil) |
40785 | 331 (tty-output nil) |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
332 cache-env calc-graph-is-splot device output calc-graph-resolution precision samples-pos) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
333 (add-hook 'kill-emacs-hook 'calc-graph-kill-hook) |
40785 | 334 (save-excursion |
335 (calc-graph-init) | |
336 (set-buffer tempbuf) | |
337 (erase-buffer) | |
338 (set-buffer calc-gnuplot-input) | |
339 (goto-char (point-min)) | |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
340 (setq calc-graph-is-splot (re-search-forward "^splot[ \t]" nil t)) |
40785 | 341 (let ((str (buffer-string)) |
342 (ver calc-gnuplot-version)) | |
343 (set-buffer (get-buffer-create "*Gnuplot Temp*")) | |
344 (erase-buffer) | |
345 (insert "# (Note: This is a temporary copy---do not edit!)\n") | |
346 (if (>= ver 2) | |
347 (insert "set noarrow\nset nolabel\n" | |
348 "set autoscale xy\nset nologscale xy\n" | |
349 "set xlabel\nset ylabel\nset title\n" | |
350 "set noclip points\nset clip one\nset clip two\n" | |
351 "set format \"%g\"\nset tics\nset xtics\nset ytics\n" | |
352 "set data style linespoints\n" | |
353 "set nogrid\nset nokey\nset nopolar\n")) | |
354 (if (>= ver 3) | |
355 (insert "set surface\nset nocontour\n" | |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
356 "set " (if calc-graph-is-splot "" "no") "parametric\n" |
40785 | 357 "set notime\nset border\nset ztics\nset zeroaxis\n" |
358 "set view 60,30,1,1\nset offsets 0,0,0,0\n")) | |
359 (setq samples-pos (point)) | |
360 (insert "\n\n" str)) | |
361 (goto-char (point-min)) | |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
362 (if calc-graph-is-splot |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
363 (if calc-graph-refine |
40785 | 364 (error "This option works only for 2d plots") |
365 (setq recompute t))) | |
366 (let ((calc-gnuplot-input (current-buffer)) | |
367 (calc-graph-no-auto-view t)) | |
368 (if printing | |
369 (setq device calc-gnuplot-print-device | |
370 output calc-gnuplot-print-output) | |
371 (setq device (calc-graph-find-command "terminal") | |
372 output (calc-graph-find-command "output")) | |
373 (or device | |
374 (setq device calc-gnuplot-default-device)) | |
375 (if output | |
376 (setq output (car (read-from-string output))) | |
377 (setq output calc-gnuplot-default-output))) | |
378 (if (or (equal device "") (equal device "default")) | |
104175
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
379 (setq device |
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
380 (cond |
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
381 (printing "postscript") |
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
382 ;; Check MS-Windows before X, in case they have |
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
383 ;; $DISPLAY set for some reason (e.g., Cygwin or |
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
384 ;; whatever) |
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
385 ((string= calc-gnuplot-name "pgnuplot") |
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
386 "windows") |
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
387 ((or (eq window-system 'x) (getenv "DISPLAY")) |
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
388 "x11") |
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
389 ((>= calc-gnuplot-version 3) |
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
390 "dumb") |
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
391 (t "postscript")))) |
40785 | 392 (if (equal device "dumb") |
393 (setq device (format "dumb %d %d" | |
40998
ee9c2872370b
Use `frame-width' instead of `screen-width',
Eli Zaretskii <eliz@gnu.org>
parents:
40785
diff
changeset
|
394 (1- (frame-width)) (1- (frame-height))))) |
40785 | 395 (if (equal device "big") |
396 (setq device (format "dumb %d %d" | |
40998
ee9c2872370b
Use `frame-width' instead of `screen-width',
Eli Zaretskii <eliz@gnu.org>
parents:
40785
diff
changeset
|
397 (* 4 (- (frame-width) 3)) |
ee9c2872370b
Use `frame-width' instead of `screen-width',
Eli Zaretskii <eliz@gnu.org>
parents:
40785
diff
changeset
|
398 (* 4 (- (frame-height) 3))))) |
40785 | 399 (if (stringp output) |
400 (if (or (equal output "auto") | |
401 (and (equal output "tty") (setq tty-output t))) | |
402 (setq tempoutfile (calc-temp-file-name -1) | |
403 output tempoutfile)) | |
404 (setq output (eval output))) | |
405 (or (equal device calc-graph-last-device) | |
406 (progn | |
407 (setq calc-graph-last-device device) | |
408 (calc-gnuplot-command "set terminal" device))) | |
409 (or (equal output calc-graph-last-output) | |
410 (progn | |
411 (setq calc-graph-last-output output) | |
412 (calc-gnuplot-command "set output" | |
413 (if (equal output "STDOUT") | |
414 "" | |
415 (prin1-to-string output))))) | |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
416 (setq calc-graph-resolution (calc-graph-find-command "samples")) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
417 (if calc-graph-resolution |
62037
3947739eeeb9
(calc-graph-plot, calc-graph-set-styles, calc-graph-num-points)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61215
diff
changeset
|
418 (setq calc-graph-resolution (string-to-number calc-graph-resolution)) |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
419 (setq calc-graph-resolution (if calc-graph-is-splot |
40785 | 420 calc-graph-default-resolution-3d |
421 calc-graph-default-resolution))) | |
422 (setq precision (calc-graph-find-command "precision")) | |
423 (if precision | |
62037
3947739eeeb9
(calc-graph-plot, calc-graph-set-styles, calc-graph-num-points)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61215
diff
changeset
|
424 (setq precision (string-to-number precision)) |
40785 | 425 (setq precision calc-graph-default-precision)) |
426 (calc-graph-set-command "terminal") | |
427 (calc-graph-set-command "output") | |
428 (calc-graph-set-command "samples") | |
429 (calc-graph-set-command "precision")) | |
430 (goto-char samples-pos) | |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
431 (insert "set samples " (int-to-string (max (if calc-graph-is-splot 20 200) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
432 (+ 5 calc-graph-resolution))) "\n") |
40785 | 433 (while (re-search-forward "{\\*[^}]+}[^,\n]*" nil t) |
434 (delete-region (match-beginning 0) (match-end 0)) | |
435 (if (looking-at ",") | |
436 (delete-char 1) | |
49840
e4b97a8e48e6
(calc-graph-plot): Fix character constant.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
437 (while (memq (preceding-char) '(?\s ?\t)) |
40785 | 438 (forward-char -1)) |
439 (if (eq (preceding-char) ?\,) | |
440 (delete-backward-char 1)))) | |
441 (save-excursion | |
442 (set-buffer calcbuf) | |
443 (setq cache-env (list calc-angle-mode | |
444 calc-complex-mode | |
445 calc-simplify-mode | |
446 calc-infinite-mode | |
447 calc-word-size | |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
448 precision calc-graph-is-splot)) |
40785 | 449 (if (and (not recompute) |
450 (equal (cdr (car calc-graph-data-cache)) cache-env)) | |
451 (while (> (length calc-graph-data-cache) | |
452 calc-graph-data-cache-limit) | |
453 (setcdr calc-graph-data-cache | |
454 (cdr (cdr calc-graph-data-cache)))) | |
455 (setq calc-graph-data-cache (list (cons nil cache-env))))) | |
456 (calc-graph-find-plot t t) | |
457 (while (re-search-forward | |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
458 (if calc-graph-is-splot |
40785 | 459 "{\\([^{}:\n]+\\):\\([^{}:\n]+\\):\\([^{}:\n]+\\)}" |
460 "{\\([^{}:\n]+\\)\\(:\\)\\([^{}:\n]+\\)}") | |
461 nil t) | |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
462 (setq calc-graph-curve-num (1+ calc-graph-curve-num)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
463 (let* ((calc-graph-xname (buffer-substring (match-beginning 1) (match-end 1))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
464 (xvar (intern (concat "var-" calc-graph-xname))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
465 (calc-graph-xvalue (math-evaluate-expr (calc-var-value xvar))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
466 (calc-graph-y3name (and calc-graph-is-splot |
40785 | 467 (buffer-substring (match-beginning 2) |
468 (match-end 2)))) | |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
469 (y3var (and calc-graph-is-splot (intern (concat "var-" calc-graph-y3name)))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
470 (calc-graph-y3value (and calc-graph-is-splot (calc-var-value y3var))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
471 (calc-graph-yname (buffer-substring (match-beginning 3) (match-end 3))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
472 (yvar (intern (concat "var-" calc-graph-yname))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
473 (calc-graph-yvalue (calc-var-value yvar)) |
40785 | 474 filename) |
475 (delete-region (match-beginning 0) (match-end 0)) | |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
476 (setq filename (calc-temp-file-name calc-graph-curve-num)) |
40785 | 477 (save-excursion |
478 (set-buffer calcbuf) | |
479 (let (tempbuftop | |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
480 (calc-graph-xp calc-graph-xvalue) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
481 (calc-graph-yp calc-graph-yvalue) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
482 (calc-graph-zp nil) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
483 (calc-graph-xlow nil) (calc-graph-xhigh nil) (y3low nil) (y3high nil) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
484 calc-graph-xvec calc-graph-xval calc-graph-xstep var-DUMMY |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
485 y3val calc-graph-y3step var-DUMMY2 (calc-graph-zval nil) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
486 calc-graph-yvec calc-graph-yval calc-graph-ycache calc-graph-ycacheptr calc-graph-yvector |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
487 calc-graph-numsteps calc-graph-numsteps3 |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
488 (calc-graph-keep-file (and (not calc-graph-is-splot) (file-exists-p filename))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
489 (calc-graph-stepcount 0) |
40785 | 490 (calc-symbolic-mode nil) |
491 (calc-prefer-frac nil) | |
492 (calc-internal-prec (max 3 precision)) | |
493 (calc-simplify-mode (and (not (memq calc-simplify-mode | |
494 '(none num))) | |
495 calc-simplify-mode)) | |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
496 (calc-graph-blank t) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
497 (calc-graph-non-blank nil) |
40785 | 498 (math-working-step 0) |
499 (math-working-step-2 nil)) | |
500 (save-excursion | |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
501 (if calc-graph-is-splot |
40785 | 502 (calc-graph-compute-3d) |
503 (calc-graph-compute-2d)) | |
504 (set-buffer tempbuf) | |
505 (goto-char (point-max)) | |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
506 (insert "\n" calc-graph-xname) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
507 (if calc-graph-is-splot |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
508 (insert ":" calc-graph-y3name)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
509 (insert ":" calc-graph-yname "\n\n") |
40785 | 510 (setq tempbuftop (point)) |
511 (let ((calc-group-digits nil) | |
512 (calc-leading-zeros nil) | |
513 (calc-number-radix 10) | |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
514 (entry (and (not calc-graph-is-splot) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
515 (list calc-graph-xp calc-graph-yp calc-graph-xhigh calc-graph-numsteps)))) |
40785 | 516 (or (equal entry |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
517 (nth 1 (nth (1+ calc-graph-curve-num) |
40785 | 518 calc-graph-file-cache))) |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
519 (setq calc-graph-keep-file nil)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
520 (setcar (cdr (nth (1+ calc-graph-curve-num) calc-graph-file-cache)) |
40785 | 521 entry) |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
522 (or calc-graph-keep-file |
40785 | 523 (calc-graph-format-data))) |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
524 (or calc-graph-keep-file |
40785 | 525 (progn |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
526 (or calc-graph-non-blank |
40785 | 527 (error "No valid data points for %s:%s" |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
528 calc-graph-xname calc-graph-yname)) |
40785 | 529 (write-region tempbuftop (point-max) filename |
530 nil 'quiet)))))) | |
531 (insert (prin1-to-string filename)))) | |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
532 (if calc-graph-surprise-splot |
40785 | 533 (setcdr cache-env nil)) |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
534 (if (= calc-graph-curve-num 0) |
40785 | 535 (progn |
536 (calc-gnuplot-command "clear") | |
537 (calc-clear-command-flag 'clear-message) | |
538 (message "No data to plot!")) | |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
539 (setq calc-graph-data-cache-limit (max calc-graph-curve-num |
103561
c2bcca5f9ba3
(calc-graph-plot): Avoid assignment to free variable `filename'.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
540 calc-graph-data-cache-limit)) |
c2bcca5f9ba3
(calc-graph-plot): Avoid assignment to free variable `filename'.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
541 (let ((filename (calc-temp-file-name 0))) |
c2bcca5f9ba3
(calc-graph-plot): Avoid assignment to free variable `filename'.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
542 (write-region (point-min) (point-max) filename nil 'quiet) |
c2bcca5f9ba3
(calc-graph-plot): Avoid assignment to free variable `filename'.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
543 (calc-gnuplot-command "load" (prin1-to-string filename))) |
40785 | 544 (or (equal output "STDOUT") |
545 calc-gnuplot-keep-outfile | |
546 (progn ; need to close the output file before printing/plotting | |
547 (setq calc-graph-last-output "STDOUT") | |
548 (calc-gnuplot-command "set output"))) | |
549 (let ((command (if printing | |
550 calc-gnuplot-print-command | |
551 (or calc-gnuplot-plot-command | |
552 (and (string-match "^dumb" device) | |
553 'calc-graph-show-dumb) | |
554 (and tty-output | |
555 'calc-graph-show-tty))))) | |
556 (if command | |
557 (if (stringp command) | |
558 (calc-gnuplot-command | |
559 "!" (format command | |
560 (or tempoutfile | |
561 calc-gnuplot-print-output))) | |
562 (if (symbolp command) | |
563 (funcall command output) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
564 (eval command)))))))))) |
40785 | 565 |
566 (defun calc-graph-compute-2d () | |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
567 (if (setq calc-graph-yvec (eq (car-safe calc-graph-yvalue) 'vec)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
568 (if (= (setq calc-graph-numsteps (1- (length calc-graph-yvalue))) 0) |
40785 | 569 (error "Can't plot an empty vector") |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
570 (if (setq calc-graph-xvec (eq (car-safe calc-graph-xvalue) 'vec)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
571 (or (= (1- (length calc-graph-xvalue)) calc-graph-numsteps) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
572 (error "%s and %s have different lengths" calc-graph-xname calc-graph-yname)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
573 (if (and (eq (car-safe calc-graph-xvalue) 'intv) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
574 (math-constp calc-graph-xvalue)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
575 (setq calc-graph-xstep (math-div (math-sub (nth 3 calc-graph-xvalue) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
576 (nth 2 calc-graph-xvalue)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
577 (1- calc-graph-numsteps)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
578 calc-graph-xvalue (nth 2 calc-graph-xvalue)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
579 (if (math-realp calc-graph-xvalue) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
580 (setq calc-graph-xstep 1) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
581 (error "%s is not a suitable basis for %s" calc-graph-xname calc-graph-yname))))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
582 (or (math-realp calc-graph-yvalue) |
40785 | 583 (let ((arglist nil)) |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
584 (setq calc-graph-yvalue (math-evaluate-expr calc-graph-yvalue)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
585 (calc-default-formula-arglist calc-graph-yvalue) |
40785 | 586 (or arglist |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
587 (error "%s does not contain any unassigned variables" calc-graph-yname)) |
40785 | 588 (and (cdr arglist) |
589 (error "%s contains more than one variable: %s" | |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
590 calc-graph-yname arglist)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
591 (setq calc-graph-yvalue (math-expr-subst calc-graph-yvalue |
40785 | 592 (math-build-var-name (car arglist)) |
593 '(var DUMMY var-DUMMY))))) | |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
594 (setq calc-graph-ycache (assoc calc-graph-yvalue calc-graph-data-cache)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
595 (delq calc-graph-ycache calc-graph-data-cache) |
40785 | 596 (nconc calc-graph-data-cache |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
597 (list (or calc-graph-ycache (setq calc-graph-ycache (list calc-graph-yvalue))))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
598 (if (and (not (setq calc-graph-xvec (eq (car-safe calc-graph-xvalue) 'vec))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
599 calc-graph-refine (cdr (cdr calc-graph-ycache))) |
40785 | 600 (calc-graph-refine-2d) |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
601 (calc-graph-recompute-2d)))) |
40785 | 602 |
603 (defun calc-graph-refine-2d () | |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
604 (setq calc-graph-keep-file nil |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
605 calc-graph-ycacheptr (cdr calc-graph-ycache)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
606 (if (and (setq calc-graph-xval (calc-graph-find-command "xrange")) |
40785 | 607 (string-match "\\`\\[\\([0-9.eE+-]*\\):\\([0-9.eE+-]*\\)\\]\\'" |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
608 calc-graph-xval)) |
40785 | 609 (let ((b2 (match-beginning 2)) |
610 (e2 (match-end 2))) | |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
611 (setq calc-graph-xlow (math-read-number (substring calc-graph-xval |
40785 | 612 (match-beginning 1) |
613 (match-end 1))) | |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
614 calc-graph-xhigh (math-read-number (substring calc-graph-xval b2 e2)))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
615 (if calc-graph-xlow |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
616 (while (and (cdr calc-graph-ycacheptr) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
617 (Math-lessp (car (nth 1 calc-graph-ycacheptr)) calc-graph-xlow)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
618 (setq calc-graph-ycacheptr (cdr calc-graph-ycacheptr))))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
619 (setq math-working-step-2 (1- (length calc-graph-ycacheptr))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
620 (while (and (cdr calc-graph-ycacheptr) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
621 (or (not calc-graph-xhigh) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
622 (Math-lessp (car (car calc-graph-ycacheptr)) calc-graph-xhigh))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
623 (setq var-DUMMY (math-div (math-add (car (car calc-graph-ycacheptr)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
624 (car (nth 1 calc-graph-ycacheptr))) |
40785 | 625 2) |
626 math-working-step (1+ math-working-step) | |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
627 calc-graph-yval (math-evaluate-expr calc-graph-yvalue)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
628 (setcdr calc-graph-ycacheptr (cons (cons var-DUMMY calc-graph-yval) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
629 (cdr calc-graph-ycacheptr))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
630 (setq calc-graph-ycacheptr (cdr (cdr calc-graph-ycacheptr)))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
631 (setq calc-graph-yp calc-graph-ycache |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
632 calc-graph-numsteps 1000000)) |
40785 | 633 |
634 (defun calc-graph-recompute-2d () | |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
635 (setq calc-graph-ycacheptr calc-graph-ycache) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
636 (if calc-graph-xvec |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
637 (setq calc-graph-numsteps (1- (length calc-graph-xvalue)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
638 calc-graph-yvector nil) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
639 (if (and (eq (car-safe calc-graph-xvalue) 'intv) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
640 (math-constp calc-graph-xvalue)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
641 (setq calc-graph-numsteps calc-graph-resolution |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
642 calc-graph-yp nil |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
643 calc-graph-xlow (nth 2 calc-graph-xvalue) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
644 calc-graph-xhigh (nth 3 calc-graph-xvalue) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
645 calc-graph-xstep (math-div (math-sub calc-graph-xhigh calc-graph-xlow) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
646 (1- calc-graph-numsteps)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
647 calc-graph-xvalue (nth 2 calc-graph-xvalue)) |
40785 | 648 (error "%s is not a suitable basis for %s" |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
649 calc-graph-xname calc-graph-yname))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
650 (setq math-working-step-2 calc-graph-numsteps) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
651 (while (>= (setq calc-graph-numsteps (1- calc-graph-numsteps)) 0) |
40785 | 652 (setq math-working-step (1+ math-working-step)) |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
653 (if calc-graph-xvec |
40785 | 654 (progn |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
655 (setq calc-graph-xp (cdr calc-graph-xp) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
656 calc-graph-xval (car calc-graph-xp)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
657 (and (not (eq calc-graph-ycacheptr calc-graph-ycache)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
658 (consp (car calc-graph-ycacheptr)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
659 (not (Math-lessp (car (car calc-graph-ycacheptr)) calc-graph-xval)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
660 (setq calc-graph-ycacheptr calc-graph-ycache))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
661 (if (= calc-graph-numsteps 0) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
662 (setq calc-graph-xval calc-graph-xhigh) ; avoid cumulative roundoff |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
663 (setq calc-graph-xval calc-graph-xvalue |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
664 calc-graph-xvalue (math-add calc-graph-xvalue calc-graph-xstep)))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
665 (while (and (cdr calc-graph-ycacheptr) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
666 (Math-lessp (car (nth 1 calc-graph-ycacheptr)) calc-graph-xval)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
667 (setq calc-graph-ycacheptr (cdr calc-graph-ycacheptr))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
668 (or (and (cdr calc-graph-ycacheptr) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
669 (Math-equal (car (nth 1 calc-graph-ycacheptr)) calc-graph-xval)) |
40785 | 670 (progn |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
671 (setq calc-graph-keep-file nil |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
672 var-DUMMY calc-graph-xval) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
673 (setcdr calc-graph-ycacheptr (cons (cons calc-graph-xval (math-evaluate-expr calc-graph-yvalue)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
674 (cdr calc-graph-ycacheptr))))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
675 (setq calc-graph-ycacheptr (cdr calc-graph-ycacheptr)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
676 (if calc-graph-xvec |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
677 (setq calc-graph-yvector (cons (cdr (car calc-graph-ycacheptr)) calc-graph-yvector)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
678 (or calc-graph-yp (setq calc-graph-yp calc-graph-ycacheptr)))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
679 (if calc-graph-xvec |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
680 (setq calc-graph-xp calc-graph-xvalue |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
681 calc-graph-yvec t |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
682 calc-graph-yp (cons 'vec (nreverse calc-graph-yvector)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
683 calc-graph-numsteps (1- (length calc-graph-xp))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
684 (setq calc-graph-numsteps 1000000))) |
40785 | 685 |
686 (defun calc-graph-compute-3d () | |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
687 (if (setq calc-graph-yvec (eq (car-safe calc-graph-yvalue) 'vec)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
688 (if (math-matrixp calc-graph-yvalue) |
40785 | 689 (progn |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
690 (setq calc-graph-numsteps (1- (length calc-graph-yvalue)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
691 calc-graph-numsteps3 (1- (length (nth 1 calc-graph-yvalue)))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
692 (if (eq (car-safe calc-graph-xvalue) 'vec) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
693 (or (= (1- (length calc-graph-xvalue)) calc-graph-numsteps) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
694 (error "%s has wrong length" calc-graph-xname)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
695 (if (and (eq (car-safe calc-graph-xvalue) 'intv) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
696 (math-constp calc-graph-xvalue)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
697 (setq calc-graph-xvalue (calcFunc-index calc-graph-numsteps |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
698 (nth 2 calc-graph-xvalue) |
40785 | 699 (math-div |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
700 (math-sub (nth 3 calc-graph-xvalue) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
701 (nth 2 calc-graph-xvalue)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
702 (1- calc-graph-numsteps)))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
703 (if (math-realp calc-graph-xvalue) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
704 (setq calc-graph-xvalue (calcFunc-index calc-graph-numsteps calc-graph-xvalue 1)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
705 (error "%s is not a suitable basis for %s" calc-graph-xname calc-graph-yname)))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
706 (if (eq (car-safe calc-graph-y3value) 'vec) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
707 (or (= (1- (length calc-graph-y3value)) calc-graph-numsteps3) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
708 (error "%s has wrong length" calc-graph-y3name)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
709 (if (and (eq (car-safe calc-graph-y3value) 'intv) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
710 (math-constp calc-graph-y3value)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
711 (setq calc-graph-y3value (calcFunc-index calc-graph-numsteps3 |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
712 (nth 2 calc-graph-y3value) |
40785 | 713 (math-div |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
714 (math-sub (nth 3 calc-graph-y3value) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
715 (nth 2 calc-graph-y3value)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
716 (1- calc-graph-numsteps3)))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
717 (if (math-realp calc-graph-y3value) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
718 (setq calc-graph-y3value (calcFunc-index calc-graph-numsteps3 calc-graph-y3value 1)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
719 (error "%s is not a suitable basis for %s" calc-graph-y3name calc-graph-yname)))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
720 (setq calc-graph-xp nil |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
721 calc-graph-yp nil |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
722 calc-graph-zp nil |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
723 calc-graph-xvec t) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
724 (while (setq calc-graph-xvalue (cdr calc-graph-xvalue) calc-graph-yvalue (cdr calc-graph-yvalue)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
725 (setq calc-graph-xp (nconc calc-graph-xp (make-list (1+ calc-graph-numsteps3) (car calc-graph-xvalue))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
726 calc-graph-yp (nconc calc-graph-yp (cons 0 (copy-sequence (cdr calc-graph-y3value)))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
727 calc-graph-zp (nconc calc-graph-zp (cons '(skip) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
728 (copy-sequence (cdr (car calc-graph-yvalue))))))) |
105117
6d1d8494a3da
(calc-graph-lookup): Avoid assignment to free variable `var'.
Glenn Morris <rgm@gnu.org>
parents:
104175
diff
changeset
|
729 (setq calc-graph-numsteps (1- (* calc-graph-numsteps |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
730 (1+ calc-graph-numsteps3))))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
731 (if (= (setq calc-graph-numsteps (1- (length calc-graph-yvalue))) 0) |
40785 | 732 (error "Can't plot an empty vector")) |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
733 (or (and (eq (car-safe calc-graph-xvalue) 'vec) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
734 (= (1- (length calc-graph-xvalue)) calc-graph-numsteps)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
735 (error "%s is not a suitable basis for %s" calc-graph-xname calc-graph-yname)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
736 (or (and (eq (car-safe calc-graph-y3value) 'vec) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
737 (= (1- (length calc-graph-y3value)) calc-graph-numsteps)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
738 (error "%s is not a suitable basis for %s" calc-graph-y3name calc-graph-yname)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
739 (setq calc-graph-xp calc-graph-xvalue |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
740 calc-graph-yp calc-graph-y3value |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
741 calc-graph-zp calc-graph-yvalue |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
742 calc-graph-xvec t)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
743 (or (math-realp calc-graph-yvalue) |
40785 | 744 (let ((arglist nil)) |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
745 (setq calc-graph-yvalue (math-evaluate-expr calc-graph-yvalue)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
746 (calc-default-formula-arglist calc-graph-yvalue) |
40785 | 747 (setq arglist (sort arglist 'string-lessp)) |
748 (or (cdr arglist) | |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
749 (error "%s does not contain enough unassigned variables" calc-graph-yname)) |
40785 | 750 (and (cdr (cdr arglist)) |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
751 (error "%s contains too many variables: %s" calc-graph-yname arglist)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
752 (setq calc-graph-yvalue (math-multi-subst calc-graph-yvalue |
40785 | 753 (mapcar 'math-build-var-name |
754 arglist) | |
755 '((var DUMMY var-DUMMY) | |
756 (var DUMMY2 var-DUMMY2)))))) | |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
757 (if (setq calc-graph-xvec (eq (car-safe calc-graph-xvalue) 'vec)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
758 (setq calc-graph-numsteps (1- (length calc-graph-xvalue))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
759 (if (and (eq (car-safe calc-graph-xvalue) 'intv) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
760 (math-constp calc-graph-xvalue)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
761 (setq calc-graph-numsteps calc-graph-resolution |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
762 calc-graph-xvalue (calcFunc-index calc-graph-numsteps |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
763 (nth 2 calc-graph-xvalue) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
764 (math-div (math-sub (nth 3 calc-graph-xvalue) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
765 (nth 2 calc-graph-xvalue)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
766 (1- calc-graph-numsteps)))) |
40785 | 767 (error "%s is not a suitable basis for %s" |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
768 calc-graph-xname calc-graph-yname))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
769 (if (eq (car-safe calc-graph-y3value) 'vec) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
770 (setq calc-graph-numsteps3 (1- (length calc-graph-y3value))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
771 (if (and (eq (car-safe calc-graph-y3value) 'intv) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
772 (math-constp calc-graph-y3value)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
773 (setq calc-graph-numsteps3 calc-graph-resolution |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
774 calc-graph-y3value (calcFunc-index calc-graph-numsteps3 |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
775 (nth 2 calc-graph-y3value) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
776 (math-div (math-sub (nth 3 calc-graph-y3value) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
777 (nth 2 calc-graph-y3value)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
778 (1- calc-graph-numsteps3)))) |
40785 | 779 (error "%s is not a suitable basis for %s" |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
780 calc-graph-y3name calc-graph-yname))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
781 (setq calc-graph-xp nil |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
782 calc-graph-yp nil |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
783 calc-graph-zp nil |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
784 calc-graph-xvec t) |
40785 | 785 (setq math-working-step 0) |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
786 (while (setq calc-graph-xvalue (cdr calc-graph-xvalue)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
787 (setq calc-graph-xp (nconc calc-graph-xp (make-list (1+ calc-graph-numsteps3) (car calc-graph-xvalue))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
788 calc-graph-yp (nconc calc-graph-yp (cons 0 (copy-sequence (cdr calc-graph-y3value)))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
789 calc-graph-zp (cons '(skip) calc-graph-zp) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
790 calc-graph-y3step calc-graph-y3value |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
791 var-DUMMY (car calc-graph-xvalue) |
40785 | 792 math-working-step-2 0 |
793 math-working-step (1+ math-working-step)) | |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
794 (while (setq calc-graph-y3step (cdr calc-graph-y3step)) |
40785 | 795 (setq math-working-step-2 (1+ math-working-step-2) |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
796 var-DUMMY2 (car calc-graph-y3step) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
797 calc-graph-zp (cons (math-evaluate-expr calc-graph-yvalue) calc-graph-zp)))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
798 (setq calc-graph-zp (nreverse calc-graph-zp) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
799 calc-graph-numsteps (1- (* calc-graph-numsteps (1+ calc-graph-numsteps3)))))) |
40785 | 800 |
801 (defun calc-graph-format-data () | |
82247
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
802 (if (math-contains-sdev-p calc-graph-yp) |
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
803 (let ((yp calc-graph-yp)) |
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
804 (setq calc-graph-yp (cons 'vec (mapcar 'math-get-value (cdr yp)))) |
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
805 (setq calc-graph-zp (cons 'vec (mapcar 'math-get-sdev (cdr yp)))))) |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
806 (while (<= (setq calc-graph-stepcount (1+ calc-graph-stepcount)) calc-graph-numsteps) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
807 (if calc-graph-xvec |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
808 (setq calc-graph-xp (cdr calc-graph-xp) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
809 calc-graph-xval (car calc-graph-xp) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
810 calc-graph-yp (cdr calc-graph-yp) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
811 calc-graph-yval (car calc-graph-yp) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
812 calc-graph-zp (cdr calc-graph-zp) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
813 calc-graph-zval (car calc-graph-zp)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
814 (if calc-graph-yvec |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
815 (setq calc-graph-xval calc-graph-xvalue |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
816 calc-graph-xvalue (math-add calc-graph-xvalue calc-graph-xstep) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
817 calc-graph-yp (cdr calc-graph-yp) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
818 calc-graph-yval (car calc-graph-yp)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
819 (setq calc-graph-xval (car (car calc-graph-yp)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
820 calc-graph-yval (cdr (car calc-graph-yp)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
821 calc-graph-yp (cdr calc-graph-yp)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
822 (if (or (not calc-graph-yp) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
823 (and calc-graph-xhigh (equal calc-graph-xval calc-graph-xhigh))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
824 (setq calc-graph-numsteps 0)))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
825 (if calc-graph-is-splot |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
826 (if (and (eq (car-safe calc-graph-zval) 'calcFunc-xyz) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
827 (= (length calc-graph-zval) 4)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
828 (setq calc-graph-xval (nth 1 calc-graph-zval) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
829 calc-graph-yval (nth 2 calc-graph-zval) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
830 calc-graph-zval (nth 3 calc-graph-zval))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
831 (if (and (eq (car-safe calc-graph-yval) 'calcFunc-xyz) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
832 (= (length calc-graph-yval) 4)) |
40785 | 833 (progn |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
834 (or calc-graph-surprise-splot |
40785 | 835 (save-excursion |
836 (set-buffer (get-buffer-create "*Gnuplot Temp*")) | |
837 (save-excursion | |
838 (goto-char (point-max)) | |
839 (re-search-backward "^plot[ \t]") | |
840 (insert "set parametric\ns") | |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
841 (setq calc-graph-surprise-splot t)))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
842 (setq calc-graph-xval (nth 1 calc-graph-yval) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
843 calc-graph-zval (nth 3 calc-graph-yval) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
844 calc-graph-yval (nth 2 calc-graph-yval))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
845 (if (and (eq (car-safe calc-graph-yval) 'calcFunc-xy) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
846 (= (length calc-graph-yval) 3)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
847 (setq calc-graph-xval (nth 1 calc-graph-yval) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
848 calc-graph-yval (nth 2 calc-graph-yval))))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
849 (if (and (Math-realp calc-graph-xval) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
850 (Math-realp calc-graph-yval) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
851 (or (not calc-graph-zval) (Math-realp calc-graph-zval))) |
40785 | 852 (progn |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
853 (setq calc-graph-blank nil |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
854 calc-graph-non-blank t) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
855 (if (Math-integerp calc-graph-xval) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
856 (insert (math-format-number calc-graph-xval)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
857 (if (eq (car calc-graph-xval) 'frac) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
858 (setq calc-graph-xval (math-float calc-graph-xval))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
859 (insert (math-format-number (nth 1 calc-graph-xval)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
860 "e" (int-to-string (nth 2 calc-graph-xval)))) |
40785 | 861 (insert " ") |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
862 (if (Math-integerp calc-graph-yval) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
863 (insert (math-format-number calc-graph-yval)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
864 (if (eq (car calc-graph-yval) 'frac) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
865 (setq calc-graph-yval (math-float calc-graph-yval))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
866 (insert (math-format-number (nth 1 calc-graph-yval)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
867 "e" (int-to-string (nth 2 calc-graph-yval)))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
868 (if calc-graph-zval |
40785 | 869 (progn |
870 (insert " ") | |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
871 (if (Math-integerp calc-graph-zval) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
872 (insert (math-format-number calc-graph-zval)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
873 (if (eq (car calc-graph-zval) 'frac) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
874 (setq calc-graph-zval (math-float calc-graph-zval))) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
875 (insert (math-format-number (nth 1 calc-graph-zval)) |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
876 "e" (int-to-string (nth 2 calc-graph-zval)))))) |
40785 | 877 (insert "\n")) |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
878 (and (not (equal calc-graph-zval '(skip))) |
62516
b63a162aa98e
(calc-graph-format-data): Make sure var-PlotRejects is bound before
Jay Belanger <jay.p.belanger@gmail.com>
parents:
62037
diff
changeset
|
879 (boundp 'var-PlotRejects) |
40785 | 880 (eq (car-safe var-PlotRejects) 'vec) |
881 (nconc var-PlotRejects | |
882 (list (list 'vec | |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
883 calc-graph-curve-num |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
884 calc-graph-stepcount |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
885 calc-graph-xval calc-graph-yval))) |
40785 | 886 (calc-refresh-evaltos 'var-PlotRejects)) |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
887 (or calc-graph-blank |
40785 | 888 (progn |
889 (insert "\n") | |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
890 (setq calc-graph-blank t)))))) |
40785 | 891 |
892 (defun calc-temp-file-name (num) | |
893 (while (<= (length calc-graph-file-cache) (1+ num)) | |
894 (setq calc-graph-file-cache (nconc calc-graph-file-cache (list nil)))) | |
895 (car (or (nth (1+ num) calc-graph-file-cache) | |
896 (setcar (nthcdr (1+ num) calc-graph-file-cache) | |
43606
54abc38794d9
(calc-gnuplot-tempfile): Don't expand against
Colin Walters <walters@gnu.org>
parents:
41271
diff
changeset
|
897 (list (make-temp-file |
40785 | 898 (concat calc-gnuplot-tempfile |
899 (if (<= num 0) | |
900 (char-to-string (- ?A num)) | |
901 (int-to-string num)))) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
902 nil))))) |
40785 | 903 |
904 (defun calc-graph-delete-temps () | |
905 (while calc-graph-file-cache | |
906 (and (car calc-graph-file-cache) | |
907 (file-exists-p (car (car calc-graph-file-cache))) | |
908 (condition-case err | |
909 (delete-file (car (car calc-graph-file-cache))) | |
910 (error nil))) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
911 (setq calc-graph-file-cache (cdr calc-graph-file-cache)))) |
40785 | 912 |
913 (defun calc-graph-kill-hook () | |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
914 (calc-graph-delete-temps)) |
40785 | 915 |
916 (defun calc-graph-show-tty (output) | |
917 "Default calc-gnuplot-plot-command for \"tty\" output mode. | |
918 This is useful for tek40xx and other graphics-terminal types." | |
919 (call-process-region 1 1 shell-file-name | |
920 nil calc-gnuplot-buffer nil | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
921 "-c" (format "cat %s >/dev/tty; rm %s" output output))) |
40785 | 922 |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
923 (defvar calc-dumb-map nil |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
924 "The keymap for the \"dumb\" terminal plot.") |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
925 |
40785 | 926 (defun calc-graph-show-dumb (&optional output) |
927 "Default calc-gnuplot-plot-command for Pinard's \"dumb\" terminal type. | |
928 This \"dumb\" driver will be present in Gnuplot 3.0." | |
929 (interactive) | |
930 (save-window-excursion | |
931 (switch-to-buffer calc-gnuplot-buffer) | |
932 (delete-other-windows) | |
933 (goto-char calc-gnuplot-trail-mark) | |
934 (or (search-forward "\f" nil t) | |
935 (sleep-for 1)) | |
936 (goto-char (point-max)) | |
937 (re-search-backward "\f\\|^[ \t]+\\^$\\|G N U P L O T") | |
938 (if (looking-at "\f") | |
939 (progn | |
940 (forward-char 1) | |
941 (if (eolp) (forward-line 1)) | |
942 (or (calc-graph-find-command "time") | |
943 (calc-graph-find-command "title") | |
944 (calc-graph-find-command "ylabel") | |
945 (let ((pt (point))) | |
946 (insert-before-markers (format "(%s)" (current-time-string))) | |
947 (goto-char pt))) | |
948 (set-window-start (selected-window) (point)) | |
949 (goto-char (point-max))) | |
950 (end-of-line) | |
951 (backward-char 1) | |
952 (recenter '(4))) | |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
953 (or calc-dumb-map |
40785 | 954 (progn |
955 (setq calc-dumb-map (make-sparse-keymap)) | |
956 (define-key calc-dumb-map "\n" 'scroll-up) | |
957 (define-key calc-dumb-map " " 'scroll-up) | |
958 (define-key calc-dumb-map "\177" 'scroll-down) | |
959 (define-key calc-dumb-map "<" 'scroll-left) | |
960 (define-key calc-dumb-map ">" 'scroll-right) | |
961 (define-key calc-dumb-map "{" 'scroll-down) | |
962 (define-key calc-dumb-map "}" 'scroll-up) | |
963 (define-key calc-dumb-map "q" 'exit-recursive-edit) | |
964 (define-key calc-dumb-map "\C-c\C-c" 'exit-recursive-edit))) | |
965 (use-local-map calc-dumb-map) | |
966 (setq truncate-lines t) | |
59231
39d1282c0854
(calc-graph-show-dumb): Mention C-cC-c as the way to return to Calc.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58657
diff
changeset
|
967 (message "Type `q' or `C-c C-c' to return to Calc") |
40785 | 968 (recursive-edit) |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
969 (bury-buffer "*Gnuplot Trail*"))) |
40785 | 970 |
971 (defun calc-graph-clear () | |
972 (interactive) | |
973 (if calc-graph-last-device | |
974 (if (or (equal calc-graph-last-device "x11") | |
975 (equal calc-graph-last-device "X11")) | |
976 (calc-gnuplot-command "set output" | |
977 (if (equal calc-graph-last-output "STDOUT") | |
978 "" | |
979 (prin1-to-string calc-graph-last-output))) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
980 (calc-gnuplot-command "clear")))) |
40785 | 981 |
982 (defun calc-graph-title-x (title) | |
983 (interactive "sX axis title: ") | |
984 (calc-graph-set-command "xlabel" (if (not (equal title "")) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
985 (prin1-to-string title)))) |
40785 | 986 |
987 (defun calc-graph-title-y (title) | |
988 (interactive "sY axis title: ") | |
989 (calc-graph-set-command "ylabel" (if (not (equal title "")) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
990 (prin1-to-string title)))) |
40785 | 991 |
992 (defun calc-graph-title-z (title) | |
993 (interactive "sZ axis title: ") | |
994 (calc-graph-set-command "zlabel" (if (not (equal title "")) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
995 (prin1-to-string title)))) |
40785 | 996 |
997 (defun calc-graph-range-x (range) | |
998 (interactive "sX axis range: ") | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
999 (calc-graph-set-range "xrange" range)) |
40785 | 1000 |
1001 (defun calc-graph-range-y (range) | |
1002 (interactive "sY axis range: ") | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
1003 (calc-graph-set-range "yrange" range)) |
40785 | 1004 |
1005 (defun calc-graph-range-z (range) | |
1006 (interactive "sZ axis range: ") | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
1007 (calc-graph-set-range "zrange" range)) |
40785 | 1008 |
1009 (defun calc-graph-set-range (cmd range) | |
1010 (if (equal range "$") | |
1011 (calc-wrapper | |
1012 (let ((val (calc-top-n 1))) | |
1013 (if (and (eq (car-safe val) 'intv) (math-constp val)) | |
1014 (setq range (concat | |
1015 (math-format-number (math-float (nth 2 val))) ":" | |
1016 (math-format-number (math-float (nth 3 val))))) | |
1017 (if (and (eq (car-safe val) 'vec) | |
1018 (= (length val) 3)) | |
1019 (setq range (concat | |
1020 (math-format-number (math-float (nth 1 val))) ":" | |
1021 (math-format-number (math-float (nth 2 val))))) | |
1022 (error "Range specification must be an interval or 2-vector"))) | |
1023 (calc-pop-stack 1)))) | |
1024 (if (string-match "\\[.+\\]" range) | |
1025 (setq range (substring range 1 -1))) | |
1026 (if (and (not (string-match ":" range)) | |
1027 (or (string-match "," range) | |
1028 (string-match " " range))) | |
1029 (aset range (match-beginning 0) ?\:)) | |
1030 (calc-graph-set-command cmd (if (not (equal range "")) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
1031 (concat "[" range "]")))) |
40785 | 1032 |
1033 (defun calc-graph-log-x (flag) | |
1034 (interactive "P") | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
1035 (calc-graph-set-log flag 0 0)) |
40785 | 1036 |
1037 (defun calc-graph-log-y (flag) | |
1038 (interactive "P") | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
1039 (calc-graph-set-log 0 flag 0)) |
40785 | 1040 |
1041 (defun calc-graph-log-z (flag) | |
1042 (interactive "P") | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
1043 (calc-graph-set-log 0 0 flag)) |
40785 | 1044 |
1045 (defun calc-graph-set-log (xflag yflag zflag) | |
1046 (let* ((old (or (calc-graph-find-command "logscale") "")) | |
1047 (xold (string-match "x" old)) | |
1048 (yold (string-match "y" old)) | |
1049 (zold (string-match "z" old)) | |
1050 str) | |
1051 (setq str (concat (if (if xflag | |
1052 (if (eq xflag 0) xold | |
1053 (> (prefix-numeric-value xflag) 0)) | |
1054 (not xold)) "x" "") | |
1055 (if (if yflag | |
1056 (if (eq yflag 0) yold | |
1057 (> (prefix-numeric-value yflag) 0)) | |
1058 (not yold)) "y" "") | |
1059 (if (if zflag | |
1060 (if (eq zflag 0) zold | |
1061 (> (prefix-numeric-value zflag) 0)) | |
1062 (not zold)) "z" ""))) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
1063 (calc-graph-set-command "logscale" (if (not (equal str "")) str)))) |
40785 | 1064 |
1065 (defun calc-graph-line-style (style) | |
1066 (interactive "P") | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
1067 (calc-graph-set-styles (and style (prefix-numeric-value style)) t)) |
40785 | 1068 |
1069 (defun calc-graph-point-style (style) | |
1070 (interactive "P") | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
1071 (calc-graph-set-styles t (and style (prefix-numeric-value style)))) |
40785 | 1072 |
82247
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1073 (defun calc-graph-set-styles (lines points &optional yerr) |
40785 | 1074 (calc-graph-init) |
1075 (save-excursion | |
1076 (set-buffer calc-gnuplot-input) | |
1077 (or (calc-graph-find-plot nil nil) | |
1078 (error "No data points have been set!")) | |
1079 (let ((base (point)) | |
1080 (mode nil) (lstyle nil) (pstyle nil) | |
82247
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1081 start end lenbl penbl errform) |
40785 | 1082 (re-search-forward "[,\n]") |
1083 (forward-char -1) | |
1084 (setq end (point) start end) | |
1085 (goto-char base) | |
1086 (if (looking-at "[^,\n]*[^,\n \t]\\([ \t]+with\\)") | |
1087 (progn | |
1088 (setq start (match-beginning 1)) | |
1089 (goto-char (match-end 0)) | |
1090 (if (looking-at "[ \t]+\\([a-z]+\\)") | |
1091 (setq mode (buffer-substring (match-beginning 1) | |
1092 (match-end 1)))) | |
1093 (if (looking-at "[ \ta-z]+\\([0-9]+\\)") | |
62037
3947739eeeb9
(calc-graph-plot, calc-graph-set-styles, calc-graph-num-points)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61215
diff
changeset
|
1094 (setq lstyle (string-to-number |
40785 | 1095 (buffer-substring (match-beginning 1) |
1096 (match-end 1))))) | |
1097 (if (looking-at "[ \ta-z]+[0-9]+[ \t]+\\([0-9]+\\)") | |
62037
3947739eeeb9
(calc-graph-plot, calc-graph-set-styles, calc-graph-num-points)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61215
diff
changeset
|
1098 (setq pstyle (string-to-number |
40785 | 1099 (buffer-substring (match-beginning 1) |
1100 (match-end 1))))))) | |
82247
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1101 (unless yerr |
105117
6d1d8494a3da
(calc-graph-lookup): Avoid assignment to free variable `var'.
Glenn Morris <rgm@gnu.org>
parents:
104175
diff
changeset
|
1102 (setq lenbl (or (equal mode "lines") |
82247
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1103 (equal mode "linespoints")) |
105117
6d1d8494a3da
(calc-graph-lookup): Avoid assignment to free variable `var'.
Glenn Morris <rgm@gnu.org>
parents:
104175
diff
changeset
|
1104 penbl (or (equal mode "points") |
82247
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1105 (equal mode "linespoints"))) |
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1106 (if lines |
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1107 (or (eq lines t) |
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1108 (setq lstyle lines |
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1109 lenbl (>= lines 0))) |
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1110 (setq lenbl (not lenbl))) |
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1111 (if points |
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1112 (or (eq points t) |
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1113 (setq pstyle points |
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1114 penbl (>= points 0))) |
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1115 (setq penbl (not penbl)))) |
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1116 (delete-region start end) |
40785 | 1117 (goto-char start) |
82247
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1118 (setq errform |
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1119 (condition-case nil |
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1120 (math-contains-sdev-p |
105117
6d1d8494a3da
(calc-graph-lookup): Avoid assignment to free variable `var'.
Glenn Morris <rgm@gnu.org>
parents:
104175
diff
changeset
|
1121 (eval (intern |
82247
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1122 (concat "var-" |
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1123 (save-excursion |
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1124 (re-search-backward ":\\(.*\\)\\}") |
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1125 (match-string 1)))))) |
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1126 (error nil))) |
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1127 (if yerr |
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1128 (insert " with yerrorbars") |
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1129 (insert " with " |
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1130 (if (and errform |
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1131 (equal mode "dots") |
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1132 (eq lines t)) |
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1133 "yerrorbars" |
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1134 (if lenbl |
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1135 (if penbl "linespoints" "lines") |
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1136 (if penbl "points" "dots")))) |
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1137 (if (and pstyle (> pstyle 0)) |
105117
6d1d8494a3da
(calc-graph-lookup): Avoid assignment to free variable `var'.
Glenn Morris <rgm@gnu.org>
parents:
104175
diff
changeset
|
1138 (insert " " |
82247
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1139 (if (and lstyle (> lstyle 0)) (int-to-string lstyle) "1") |
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1140 " " (int-to-string pstyle)) |
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1141 (if (and lstyle (> lstyle 0)) |
c94005a91774
(calc-graph-format-data,calc-graph-add-curve): Check for error forms.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
78215
diff
changeset
|
1142 (insert " " (int-to-string lstyle))))))) |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
1143 (calc-graph-view-commands)) |
40785 | 1144 |
1145 (defun calc-graph-zero-x (flag) | |
1146 (interactive "P") | |
1147 (calc-graph-set-command "noxzeroaxis" | |
1148 (and (if flag | |
1149 (<= (prefix-numeric-value flag) 0) | |
1150 (not (calc-graph-find-command "noxzeroaxis"))) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
1151 " "))) |
40785 | 1152 |
1153 (defun calc-graph-zero-y (flag) | |
1154 (interactive "P") | |
1155 (calc-graph-set-command "noyzeroaxis" | |
1156 (and (if flag | |
1157 (<= (prefix-numeric-value flag) 0) | |
1158 (not (calc-graph-find-command "noyzeroaxis"))) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
1159 " "))) |
40785 | 1160 |
1161 (defun calc-graph-name (name) | |
1162 (interactive "sTitle for current curve: ") | |
1163 (calc-graph-init) | |
1164 (save-excursion | |
1165 (set-buffer calc-gnuplot-input) | |
1166 (or (calc-graph-find-plot nil nil) | |
1167 (error "No data points have been set!")) | |
1168 (let ((base (point)) | |
58188
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
1169 start |
9e6aba37e9aa
(calc-dumb-map): Declared it.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57631
diff
changeset
|
1170 end) |
40785 | 1171 (re-search-forward "[,\n]\\|[ \t]+with") |
1172 (setq end (match-beginning 0)) | |
1173 (goto-char base) | |
1174 (if (looking-at "[^,\n]*[^,\n \t]\\([ \t]+title\\)") | |
1175 (progn | |
1176 (goto-char (match-beginning 1)) | |
1177 (delete-region (point) end)) | |
1178 (goto-char end)) | |
1179 (insert " title " (prin1-to-string name)))) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
1180 (calc-graph-view-commands)) |
40785 | 1181 |
1182 (defun calc-graph-hide (flag) | |
1183 (interactive "P") | |
1184 (calc-graph-init) | |
1185 (and (calc-graph-find-plot nil nil) | |
1186 (progn | |
1187 (or (looking-at "{") | |
1188 (error "Can't hide this curve (wrong format)")) | |
1189 (forward-char 1) | |
1190 (if (looking-at "*") | |
1191 (if (or (null flag) (<= (prefix-numeric-value flag) 0)) | |
1192 (delete-char 1)) | |
1193 (if (or (null flag) (> (prefix-numeric-value flag) 0)) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
1194 (insert "*")))))) |
40785 | 1195 |
1196 (defun calc-graph-header (title) | |
1197 (interactive "sTitle for entire graph: ") | |
1198 (calc-graph-set-command "title" (if (not (equal title "")) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
1199 (prin1-to-string title)))) |
40785 | 1200 |
1201 (defun calc-graph-border (flag) | |
1202 (interactive "P") | |
1203 (calc-graph-set-command "noborder" | |
1204 (and (if flag | |
1205 (<= (prefix-numeric-value flag) 0) | |
1206 (not (calc-graph-find-command "noborder"))) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
1207 " "))) |
40785 | 1208 |
1209 (defun calc-graph-grid (flag) | |
1210 (interactive "P") | |
1211 (calc-graph-set-command "grid" (and (if flag | |
1212 (> (prefix-numeric-value flag) 0) | |
1213 (not (calc-graph-find-command "grid"))) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
1214 " "))) |
40785 | 1215 |
1216 (defun calc-graph-key (flag) | |
1217 (interactive "P") | |
1218 (calc-graph-set-command "key" (and (if flag | |
1219 (> (prefix-numeric-value flag) 0) | |
1220 (not (calc-graph-find-command "key"))) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
1221 " "))) |
40785 | 1222 |
1223 (defun calc-graph-num-points (res flag) | |
1224 (interactive "sNumber of data points: \nP") | |
1225 (if flag | |
1226 (if (> (prefix-numeric-value flag) 0) | |
1227 (if (equal res "") | |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
1228 (message "Default resolution is %d" |
40785 | 1229 calc-graph-default-resolution) |
62037
3947739eeeb9
(calc-graph-plot, calc-graph-set-styles, calc-graph-num-points)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61215
diff
changeset
|
1230 (setq calc-graph-default-resolution (string-to-number res))) |
40785 | 1231 (if (equal res "") |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
1232 (message "Default 3D resolution is %d" |
40785 | 1233 calc-graph-default-resolution-3d) |
62037
3947739eeeb9
(calc-graph-plot, calc-graph-set-styles, calc-graph-num-points)
Jay Belanger <jay.p.belanger@gmail.com>
parents:
61215
diff
changeset
|
1234 (setq calc-graph-default-resolution-3d (string-to-number res)))) |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
1235 (calc-graph-set-command "samples" (if (not (equal res "")) res)))) |
40785 | 1236 |
1237 (defun calc-graph-device (name flag) | |
1238 (interactive "sDevice name: \nP") | |
1239 (if (equal name "?") | |
1240 (progn | |
1241 (calc-gnuplot-command "set terminal") | |
1242 (calc-graph-view-trail)) | |
1243 (if flag | |
1244 (if (> (prefix-numeric-value flag) 0) | |
1245 (if (equal name "") | |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
1246 (message "Default GNUPLOT device is \"%s\"" |
40785 | 1247 calc-gnuplot-default-device) |
1248 (setq calc-gnuplot-default-device name)) | |
1249 (if (equal name "") | |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
1250 (message "GNUPLOT device for Print command is \"%s\"" |
40785 | 1251 calc-gnuplot-print-device) |
1252 (setq calc-gnuplot-print-device name))) | |
1253 (calc-graph-set-command "terminal" (if (not (equal name "")) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
1254 name))))) |
40785 | 1255 |
1256 (defun calc-graph-output (name flag) | |
1257 (interactive "FOutput file name: \np") | |
1258 (cond ((string-match "\\<[aA][uU][tT][oO]$" name) | |
1259 (setq name "auto")) | |
1260 ((string-match "\\<[tT][tT][yY]$" name) | |
1261 (setq name "tty")) | |
1262 ((string-match "\\<[sS][tT][dD][oO][uU][tT]$" name) | |
1263 (setq name "STDOUT")) | |
1264 ((equal (file-name-nondirectory name) "") | |
1265 (setq name "")) | |
1266 (t (setq name (expand-file-name name)))) | |
1267 (if flag | |
1268 (if (> (prefix-numeric-value flag) 0) | |
1269 (if (equal name "") | |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
1270 (message "Default GNUPLOT output file is \"%s\"" |
40785 | 1271 calc-gnuplot-default-output) |
1272 (setq calc-gnuplot-default-output name)) | |
1273 (if (equal name "") | |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
1274 (message "GNUPLOT output file for Print command is \"%s\"" |
40785 | 1275 calc-gnuplot-print-output) |
1276 (setq calc-gnuplot-print-output name))) | |
1277 (calc-graph-set-command "output" (if (not (equal name "")) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
1278 (prin1-to-string name))))) |
40785 | 1279 |
1280 (defun calc-graph-display (name) | |
1281 (interactive "sX display name: ") | |
1282 (if (equal name "") | |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
1283 (message "Current X display is \"%s\"" |
40785 | 1284 (or calc-gnuplot-display "<none>")) |
1285 (setq calc-gnuplot-display name) | |
1286 (if (calc-gnuplot-alive) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
1287 (calc-gnuplot-command "exit")))) |
40785 | 1288 |
1289 (defun calc-graph-geometry (name) | |
1290 (interactive "sX geometry spec (or \"default\"): ") | |
1291 (if (equal name "") | |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
1292 (message "Current X geometry is \"%s\"" |
40785 | 1293 (or calc-gnuplot-geometry "default")) |
1294 (setq calc-gnuplot-geometry (and (not (equal name "default")) name)) | |
1295 (if (calc-gnuplot-alive) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
1296 (calc-gnuplot-command "exit")))) |
40785 | 1297 |
1298 (defun calc-graph-find-command (cmd) | |
1299 (calc-graph-init) | |
1300 (save-excursion | |
1301 (set-buffer calc-gnuplot-input) | |
1302 (goto-char (point-min)) | |
1303 (if (re-search-forward (concat "^set[ \t]+" cmd "[ \t]*\\(.*\\)$") nil t) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
1304 (buffer-substring (match-beginning 1) (match-end 1))))) |
40785 | 1305 |
1306 (defun calc-graph-set-command (cmd &rest args) | |
1307 (calc-graph-init) | |
1308 (save-excursion | |
1309 (set-buffer calc-gnuplot-input) | |
1310 (goto-char (point-min)) | |
1311 (if (re-search-forward (concat "^set[ \t]+" cmd "[ \t\n]") nil t) | |
1312 (progn | |
1313 (forward-char -1) | |
1314 (end-of-line) | |
1315 (let ((end (point))) | |
1316 (beginning-of-line) | |
1317 (delete-region (point) (1+ end)))) | |
1318 (if (calc-graph-find-plot t t) | |
1319 (if (eq (preceding-char) ?\n) | |
1320 (forward-char -1)) | |
1321 (goto-char (1- (point-max))))) | |
1322 (if (and args (car args)) | |
1323 (progn | |
1324 (or (bolp) | |
1325 (insert "\n")) | |
1326 (insert "set " (mapconcat 'identity (cons cmd args) " ") "\n")))) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
1327 (calc-graph-view-commands)) |
40785 | 1328 |
1329 (defun calc-graph-command (cmd) | |
1330 (interactive "sGNUPLOT command: ") | |
1331 (calc-wrapper | |
1332 (calc-graph-init) | |
1333 (calc-graph-view-trail) | |
1334 (calc-gnuplot-command cmd) | |
104175
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
1335 (or (string= calc-gnuplot-name "pgnuplot") |
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
1336 (progn |
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
1337 (accept-process-output) |
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
1338 (calc-graph-view-trail))))) |
40785 | 1339 |
1340 (defun calc-graph-kill (&optional no-view) | |
1341 (interactive) | |
1342 (calc-graph-delete-temps) | |
1343 (if (calc-gnuplot-alive) | |
1344 (calc-wrapper | |
1345 (or no-view (calc-graph-view-trail)) | |
1346 (let ((calc-graph-no-wait t)) | |
1347 (calc-gnuplot-command "exit")) | |
1348 (sit-for 1) | |
1349 (if (process-status calc-gnuplot-process) | |
1350 (delete-process calc-gnuplot-process)) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
1351 (setq calc-gnuplot-process nil)))) |
40785 | 1352 |
1353 (defun calc-graph-quit () | |
1354 (interactive) | |
1355 (if (get-buffer-window calc-gnuplot-input) | |
1356 (calc-graph-view-commands t)) | |
1357 (if (get-buffer-window calc-gnuplot-buffer) | |
1358 (calc-graph-view-trail t)) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
1359 (calc-graph-kill t)) |
40785 | 1360 |
1361 (defun calc-graph-view-commands (&optional no-need) | |
1362 (interactive "p") | |
1363 (or calc-graph-no-auto-view (calc-graph-init-buffers)) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
1364 (calc-graph-view calc-gnuplot-input calc-gnuplot-buffer (null no-need))) |
40785 | 1365 |
1366 (defun calc-graph-view-trail (&optional no-need) | |
1367 (interactive "p") | |
1368 (or calc-graph-no-auto-view (calc-graph-init-buffers)) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
1369 (calc-graph-view calc-gnuplot-buffer calc-gnuplot-input (null no-need))) |
40785 | 1370 |
1371 (defun calc-graph-view (buf other-buf need) | |
1372 (let (win) | |
1373 (or calc-graph-no-auto-view | |
1374 (if (setq win (get-buffer-window buf)) | |
1375 (or need | |
1376 (and (eq buf calc-gnuplot-buffer) | |
1377 (save-excursion | |
1378 (set-buffer buf) | |
1379 (not (pos-visible-in-window-p (point-max) win)))) | |
1380 (progn | |
1381 (bury-buffer buf) | |
1382 (bury-buffer other-buf) | |
1383 (let ((curwin (selected-window))) | |
1384 (select-window win) | |
1385 (switch-to-buffer nil) | |
1386 (select-window curwin)))) | |
1387 (if (setq win (get-buffer-window other-buf)) | |
1388 (set-window-buffer win buf) | |
1389 (if (eq major-mode 'calc-mode) | |
1390 (if (or need | |
40998
ee9c2872370b
Use `frame-width' instead of `screen-width',
Eli Zaretskii <eliz@gnu.org>
parents:
40785
diff
changeset
|
1391 (< (window-height) (1- (frame-height)))) |
40785 | 1392 (display-buffer buf)) |
1393 (switch-to-buffer buf))))) | |
1394 (save-excursion | |
1395 (set-buffer buf) | |
1396 (if (and (eq buf calc-gnuplot-buffer) | |
1397 (setq win (get-buffer-window buf)) | |
1398 (not (pos-visible-in-window-p (point-max) win))) | |
1399 (progn | |
1400 (goto-char (point-max)) | |
1401 (vertical-motion (- 6 (window-height win))) | |
1402 (set-window-start win (point)) | |
1403 (goto-char (point-max))))) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
1404 (or calc-graph-no-auto-view (sit-for 0)))) |
40785 | 1405 |
1406 (defun calc-gnuplot-check-for-errors () | |
1407 (if (save-excursion | |
1408 (prog2 | |
1409 (progn | |
1410 (set-buffer calc-gnuplot-buffer) | |
1411 (goto-char calc-gnuplot-last-error-pos)) | |
1412 (re-search-forward "^[ \t]+\\^$" nil t) | |
1413 (goto-char (point-max)) | |
1414 (setq calc-gnuplot-last-error-pos (point-max)))) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
1415 (calc-graph-view-trail))) |
40785 | 1416 |
1417 (defun calc-gnuplot-command (&rest args) | |
1418 (calc-graph-init) | |
1419 (let ((cmd (concat (mapconcat 'identity args " ") "\n"))) | |
104175
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
1420 (or (string= calc-gnuplot-name "pgnuplot") |
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
1421 (accept-process-output)) |
40785 | 1422 (save-excursion |
1423 (set-buffer calc-gnuplot-buffer) | |
1424 (calc-gnuplot-check-for-errors) | |
1425 (goto-char (point-max)) | |
1426 (setq calc-gnuplot-trail-mark (point)) | |
1427 (or (>= calc-gnuplot-version 3) | |
1428 (insert cmd)) | |
1429 (set-marker (process-mark calc-gnuplot-process) (point)) | |
1430 (process-send-string calc-gnuplot-process cmd) | |
1431 (if (get-buffer-window calc-gnuplot-buffer) | |
1432 (calc-graph-view-trail)) | |
104175
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
1433 (or (string= calc-gnuplot-name "pgnuplot") |
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
1434 (accept-process-output (and (not calc-graph-no-wait) |
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
1435 calc-gnuplot-process))) |
40785 | 1436 (calc-gnuplot-check-for-errors) |
1437 (if (get-buffer-window calc-gnuplot-buffer) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
1438 (calc-graph-view-trail))))) |
40785 | 1439 |
1440 (defun calc-graph-init-buffers () | |
1441 (or (and calc-gnuplot-buffer | |
1442 (buffer-name calc-gnuplot-buffer)) | |
1443 (setq calc-gnuplot-buffer (get-buffer-create "*Gnuplot Trail*"))) | |
1444 (or (and calc-gnuplot-input | |
1445 (buffer-name calc-gnuplot-input)) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
1446 (setq calc-gnuplot-input (get-buffer-create "*Gnuplot Commands*")))) |
40785 | 1447 |
1448 (defun calc-graph-init () | |
1449 (or (calc-gnuplot-alive) | |
1450 (let ((process-connection-type t) | |
1451 origin) | |
1452 (if calc-gnuplot-process | |
1453 (progn | |
1454 (delete-process calc-gnuplot-process) | |
1455 (setq calc-gnuplot-process nil))) | |
1456 (calc-graph-init-buffers) | |
1457 (save-excursion | |
1458 (set-buffer calc-gnuplot-buffer) | |
1459 (insert "\nStarting gnuplot...\n") | |
1460 (setq origin (point))) | |
1461 (setq calc-graph-last-device nil) | |
1462 (setq calc-graph-last-output nil) | |
104175
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
1463 (if (string= calc-gnuplot-name "pgnuplot") |
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
1464 (let ((version-str (shell-command-to-string "pgnuplot -V"))) |
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
1465 (if (string-match "gnuplot \\([0-9]+\\)\\." version-str) |
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
1466 (setq calc-gnuplot-version (string-to-number |
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
1467 (substring version-str |
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
1468 (match-beginning 1) |
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
1469 (match-end 1)))) |
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
1470 (setq calc-gnuplot-version 1)))) |
40785 | 1471 (condition-case err |
1472 (let ((args (append (and calc-gnuplot-display | |
1473 (not (equal calc-gnuplot-display | |
1474 (getenv "DISPLAY"))) | |
104175
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
1475 (not (string= calc-gnuplot-name "pgnuplot")) |
40785 | 1476 (list "-display" |
1477 calc-gnuplot-display)) | |
1478 (and calc-gnuplot-geometry | |
104175
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
1479 (not (string= calc-gnuplot-name "pgnuplot")) |
40785 | 1480 (list "-geometry" |
1481 calc-gnuplot-geometry))))) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49263
diff
changeset
|
1482 (setq calc-gnuplot-process |
40785 | 1483 (apply 'start-process |
1484 "gnuplot" | |
1485 calc-gnuplot-buffer | |
1486 calc-gnuplot-name | |
1487 args)) | |
57631
3581e2403cc7
(calc-graph-init): Use `set-process-query-on-exit-flag'
Jay Belanger <jay.p.belanger@gmail.com>
parents:
57593
diff
changeset
|
1488 (set-process-query-on-exit-flag calc-gnuplot-process nil)) |
40785 | 1489 (file-error |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
1490 (error "Sorry, can't find \"%s\" on your system" |
40785 | 1491 calc-gnuplot-name))) |
1492 (save-excursion | |
1493 (set-buffer calc-gnuplot-buffer) | |
104175
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
1494 (while (and (not (string= calc-gnuplot-name "pgnuplot")) |
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
1495 (not (save-excursion |
40785 | 1496 (goto-char origin) |
1497 (search-forward "gnuplot> " nil t))) | |
1498 (memq (process-status calc-gnuplot-process) '(run stop))) | |
1499 (accept-process-output calc-gnuplot-process)) | |
1500 (or (memq (process-status calc-gnuplot-process) '(run stop)) | |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
1501 (error "Unable to start GNUPLOT process")) |
104175
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
1502 (if (not (string= calc-gnuplot-name "pgnuplot")) |
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
1503 (if (save-excursion |
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
1504 (goto-char origin) |
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
1505 (re-search-forward |
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
1506 "G N U P L O T.*\n.*version \\([0-9]+\\)\\." nil t)) |
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
1507 (setq calc-gnuplot-version |
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
1508 (string-to-number (buffer-substring |
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
1509 (match-beginning 1) |
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
1510 (match-end 1)))) |
6bb8dd0cfa31
(calc-graph-plot): Set calc-graph-last-device to "windows" when "pgnuplot"
Eli Zaretskii <eliz@gnu.org>
parents:
103561
diff
changeset
|
1511 (setq calc-gnuplot-version 1))) |
40785 | 1512 (goto-char (point-max))))) |
1513 (save-excursion | |
1514 (set-buffer calc-gnuplot-input) | |
1515 (if (= (buffer-size) 0) | |
1516 (insert "# Commands for running gnuplot\n\n\n") | |
1517 (or calc-graph-no-auto-view | |
1518 (eq (char-after (1- (point-max))) ?\n) | |
1519 (progn | |
1520 (goto-char (point-max)) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
1521 (insert "\n")))))) |
40785 | 1522 |
58657
05cfe246ec8d
Add a provide statement.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58478
diff
changeset
|
1523 (provide 'calc-graph) |
05cfe246ec8d
Add a provide statement.
Jay Belanger <jay.p.belanger@gmail.com>
parents:
58478
diff
changeset
|
1524 |
93975
1e3a407766b9
Fix up comment convention on the arch-tag lines.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1525 ;; arch-tag: e4b06a52-c386-4d54-a2bb-7c0a0ef533c2 |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40998
diff
changeset
|
1526 ;;; calc-graph.el ends here |