Mercurial > emacs
changeset 82266:f46c1df3427a
(calc-curve-fit): Add "plot" indicator.
| author | Jay Belanger <jay.p.belanger@gmail.com> |
|---|---|
| date | Sat, 04 Aug 2007 04:33:07 +0000 |
| parents | 053c547b48f9 |
| children | 12609ae53f9b |
| files | lisp/calc/calcalg3.el |
| diffstat | 1 files changed, 15 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/calc/calcalg3.el Sat Aug 04 04:22:27 2007 +0000 +++ b/lisp/calc/calcalg3.el Sat Aug 04 04:33:07 2007 +0000 @@ -134,9 +134,12 @@ "P prefix = plot result" "' = alg entry, $ = stack, u = Model1, U = Model2"))) (while (not calc-curve-model) - (message "Fit to model: %s:%s" - (nth which msgs) - (if homog " h" "")) + (message + (if plot + "Fit to model (plot): %s:%s" + "Fit to model: %s:%s") + (nth which msgs) + (if homog " h" "")) (setq key (read-char)) (cond ((= key ?\C-g) (keyboard-quit)) @@ -145,13 +148,15 @@ ((memq key '(?h ?H)) (setq homog (not homog))) ((= key ?P) - (let ((data (calc-top 1))) - (if (or - (calc-is-hyperbolic) - (calc-is-inverse) - (not (= (length data) 3))) - (setq plot "Can't plot") - (setq plot data)))) + (if plot + (setq plot nil) + (let ((data (calc-top 1))) + (if (or + (calc-is-hyperbolic) + (calc-is-inverse) + (not (= (length data) 3))) + (setq plot "Can't plot") + (setq plot data))))) ((progn (if (eq key ?\$) (setq n 1)