Mercurial > hg > octave-lyh

comparison src/graphics.cc @ 10596:24e915c602e7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove line object props ldata, udata, xldata, xudata.
author Ben Abbott <bpabbott@mac.com>
date Sat, 01 May 2010 10:55:42 -0400
parents 2880a862b1a8
children fbd7843974fa
comparison
equal deleted inserted replaced
10595:46c8ecc4d565 10596:24e915c602e7
3915 char update_type = 0; 3915 char update_type = 0;
3916 3916
3917 Matrix limits; 3917 Matrix limits;
3918 3918
3919 if (axis_type == "xdata" || axis_type == "xscale" 3919 if (axis_type == "xdata" || axis_type == "xscale"
3920 || axis_type == "xldata" || axis_type == "xudata"
3921 || axis_type == "xlimmode" || axis_type == "xliminclude" 3920 || axis_type == "xlimmode" || axis_type == "xliminclude"
3922 || axis_type == "xlim") 3921 || axis_type == "xlim")
3923 { 3922 {
3924 if (xproperties.xlimmode_is ("auto")) 3923 if (xproperties.xlimmode_is ("auto"))
3925 { 3924 {
3930 3929
3931 update_type = 'x'; 3930 update_type = 'x';
3932 } 3931 }
3933 } 3932 }
3934 else if (axis_type == "ydata" || axis_type == "yscale" 3933 else if (axis_type == "ydata" || axis_type == "yscale"
3935 || axis_type == "ldata" || axis_type == "udata"
3936 || axis_type == "ylimmode" || axis_type == "yliminclude" 3934 || axis_type == "ylimmode" || axis_type == "yliminclude"
3937 || axis_type == "ylim") 3935 || axis_type == "ylim")
3938 { 3936 {
3939 if (xproperties.ylimmode_is ("auto")) 3937 if (xproperties.ylimmode_is ("auto"))
3940 { 3938 {
4191 Matrix 4189 Matrix
4192 line::properties::compute_xlim (void) const 4190 line::properties::compute_xlim (void) const
4193 { 4191 {
4194 Matrix m (1, 3); 4192 Matrix m (1, 3);
4195 4193
4196 m(0) = xmin (xdata.min_val (), xmin (xldata.min_val (), xudata.min_val ())); 4194 m(0) = xdata.min_val ();
4197 m(1) = xmax (xdata.max_val (), xmax (xldata.max_val (), xudata.max_val ())); 4195 m(1) = xdata.max_val ();
4198 m(2) = xmin (xdata.min_pos (), xmin (xldata.min_pos (), xudata.min_pos ())); 4196 m(2) = xdata.min_pos ();
4199 4197
4200 return m; 4198 return m;
4201 } 4199 }
4202 4200
4203 Matrix 4201 Matrix
4204 line::properties::compute_ylim (void) const 4202 line::properties::compute_ylim (void) const
4205 { 4203 {
4206 Matrix m (1, 3); 4204 Matrix m (1, 3);
4207 4205
4208 m(0) = xmin (ydata.min_val (), xmin (ldata.min_val (), udata.min_val ())); 4206 m(0) = ydata.min_val ();
4209 m(1) = xmax (ydata.max_val (), xmax (ldata.max_val (), udata.max_val ())); 4207 m(1) = ydata.max_val ();
4210 m(2) = xmin (ydata.min_pos (), xmin (ldata.min_pos (), udata.min_pos ())); 4208 m(2) = ydata.min_pos ();
4211 4209
4212 return m; 4210 return m;
4213 } 4211 }
4214 4212
4215 // --------------------------------------------------------------------- 4213 // ---------------------------------------------------------------------