Mercurial > hg > octave-max
changeset 10596:24e915c602e7
Remove line object props ldata, udata, xldata, xudata.
author | Ben Abbott <bpabbott@mac.com> |
---|---|
date | Sat, 01 May 2010 10:55:42 -0400 |
parents | 46c8ecc4d565 |
children | ba346313bdc1 |
files | src/ChangeLog src/graphics.cc src/graphics.h.in |
diffstat | 3 files changed, 12 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-05-01 Ben Abbott <bpabbott@mac.com> + + * graphics.cc, graphics.h.in: Remove line object properties ldata, + udata, xldata, xudata. + 2010-04-30 Shai Ayal <shaiay@users.sourceforge.net> * DLD-FUNCTIONS/fltk_backend.cc (plot_window::set_axes_currentpoint):
--- a/src/graphics.cc +++ b/src/graphics.cc @@ -3917,7 +3917,6 @@ Matrix limits; if (axis_type == "xdata" || axis_type == "xscale" - || axis_type == "xldata" || axis_type == "xudata" || axis_type == "xlimmode" || axis_type == "xliminclude" || axis_type == "xlim") { @@ -3932,7 +3931,6 @@ } } else if (axis_type == "ydata" || axis_type == "yscale" - || axis_type == "ldata" || axis_type == "udata" || axis_type == "ylimmode" || axis_type == "yliminclude" || axis_type == "ylim") { @@ -4193,9 +4191,9 @@ { Matrix m (1, 3); - m(0) = xmin (xdata.min_val (), xmin (xldata.min_val (), xudata.min_val ())); - m(1) = xmax (xdata.max_val (), xmax (xldata.max_val (), xudata.max_val ())); - m(2) = xmin (xdata.min_pos (), xmin (xldata.min_pos (), xudata.min_pos ())); + m(0) = xdata.min_val (); + m(1) = xdata.max_val (); + m(2) = xdata.min_pos (); return m; } @@ -4205,9 +4203,9 @@ { Matrix m (1, 3); - m(0) = xmin (ydata.min_val (), xmin (ldata.min_val (), udata.min_val ())); - m(1) = xmax (ydata.max_val (), xmax (ldata.max_val (), udata.max_val ())); - m(2) = xmin (ydata.min_pos (), xmin (ldata.min_pos (), udata.min_pos ())); + m(0) = ydata.min_val (); + m(1) = ydata.max_val (); + m(2) = ydata.min_pos (); return m; }
--- a/src/graphics.h.in +++ b/src/graphics.h.in @@ -3170,17 +3170,12 @@ // See the genprops.awk script for an explanation of the // properties declarations. - // properties which are not in matlab: - // ldata, udata, xldata, xudata, keylabel, interpreter + // properties which are not in matlab: keylabel, interpreter BEGIN_PROPERTIES (line) row_vector_property xdata u , default_data () row_vector_property ydata u , default_data () row_vector_property zdata u , Matrix () - row_vector_property ldata u , Matrix () - row_vector_property udata u , Matrix () - row_vector_property xldata u , Matrix () - row_vector_property xudata u , Matrix () string_property xdatasource , "" string_property ydatasource , "" string_property zdatasource , "" @@ -3209,12 +3204,8 @@ Matrix compute_ylim (void) const; void update_xdata (void) { set_xlim (compute_xlim ()); } - void update_xldata (void) { set_xlim (compute_xlim ()); } - void update_xudata (void) { set_xlim (compute_xlim ()); } void update_ydata (void) { set_ylim (compute_ylim ()); } - void update_ldata (void) { set_ylim (compute_ylim ()); } - void update_udata (void) { set_ylim (compute_ylim ()); } void update_zdata (void) {