Mercurial > octave
diff src/pt-plot.cc @ 2972:ae2471c4e5c0
[project @ 1997-05-15 19:22:05 by jwe]
author | jwe |
---|---|
date | Thu, 15 May 1997 19:22:33 +0000 |
parents | c0c280cda856 |
children | 20f5cec4f11c |
line wrap: on
line diff
--- a/src/pt-plot.cc Thu May 15 18:55:47 1997 +0000 +++ b/src/pt-plot.cc Thu May 15 19:22:33 1997 +0000 @@ -58,6 +58,7 @@ #include "oct-obj.h" #include "pt-cmd.h" #include "pt-exp.h" +#include "pt-misc.h" #include "pt-plot.h" #include "pt-walk.h" #include "sighandlers.h" @@ -406,7 +407,8 @@ if (lower) { - octave_value lower_val = lower->eval (); + octave_value lower_val = lower->rvalue (); + if (error_state) { ::error ("evaluating lower bound of plot range"); @@ -423,7 +425,8 @@ if (upper) { - octave_value upper_val = upper->eval (); + octave_value upper_val = upper->rvalue (); + if (error_state) { ::error ("evaluating upper bound of plot range"); @@ -464,7 +467,8 @@ { if (x[i]) { - octave_value tmp = x[i]->eval (); + octave_value tmp = x[i]->rvalue (); + if (error_state) { ::error ("evaluating plot using command"); @@ -561,7 +565,8 @@ if (sp_linetype) { - octave_value tmp = sp_linetype->eval (); + octave_value tmp = sp_linetype->rvalue (); + if (! error_state && tmp.is_defined ()) { double val = tmp.double_value (); @@ -582,7 +587,8 @@ if (sp_pointtype) { - octave_value tmp = sp_pointtype->eval (); + octave_value tmp = sp_pointtype->rvalue (); + if (! error_state && tmp.is_defined ()) { double val = tmp.double_value (); @@ -687,7 +693,7 @@ { if (sp_plot_data) { - octave_value data = sp_plot_data->eval (); + octave_value data = sp_plot_data->rvalue (); if (! error_state && data.is_defined ()) { @@ -779,7 +785,8 @@ if (sp_title_clause) { - octave_value tmp = sp_title_clause->eval (); + octave_value tmp = sp_title_clause->rvalue (); + if (! error_state && tmp.is_string ()) plot_buf << " " << GPLOT_CMD_TITLE << " " << '"' << tmp.string_value () << '"';