Mercurial > hg > octave-lyh

changeset 11688:e13219eaf388 release-3-0-x

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
__go_draw_axes__: use strcmpi for text properties; use get for hidden properties
author John W. Eaton <jwe@octave.org>
date Tue, 11 Mar 2008 23:13:04 -0400
parents 7817fd1f2237
children 842cc9439011
files scripts/ChangeLog scripts/plot/__go_draw_axes__.m
diffstat 2 files changed, 10 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,5 +1,8 @@
 2008-03-11  John W. Eaton  <jwe@octave.org>
 
+	* plot/__go_draw_axes__.m: Use get to access hidden properties.
+	Use strcmpi when comparing string properties.
+
 	* plot/ChangeLog: Handle axes linewidth property.
 
 	* plot/__go_draw_axes__.m (get_old_gnuplot_color): New subfunction.
--- a/scripts/plot/__go_draw_axes__.m
+++ b/scripts/plot/__go_draw_axes__.m
@@ -33,7 +33,7 @@
 
     ## Set axis properties here?
     pos = [0, 0, 1, 1];
-    if (strcmp (axis_obj.activepositionproperty, "outerposition"))
+    if (strcmpi (axis_obj.activepositionproperty, "outerposition"))
       ymirror = true;
       if (! isempty (axis_obj.outerposition))
 	pos = axis_obj.outerposition;
@@ -49,9 +49,9 @@
       endif
     endif
 
-    if (! strcmp (axis_obj.__colorbar__, "none"))
+    if (! strcmpi (get (h, "__colorbar__"), "none"))
       [pos, cbox_orient, cbox_size, cbox_origin, cbox_mirror] = ...
-	  gnuplot_postion_colorbox (pos, axis_obj.__colorbar__);
+	  gnuplot_postion_colorbox (pos, get (h, "__colorbar__"));
     endif
 
     fprintf (plot_stream, "set origin %.15g, %.15g;\n", pos(1), pos(2));
@@ -321,7 +321,7 @@
 
     [view_cmd, view_fcn, view_zoom] = image_viewer ();
     use_gnuplot_for_images = (ischar (view_fcn)
-			      && strcmp (view_fcn, "gnuplot_internal"));
+			      && strcmpi (view_fcn, "gnuplot_internal"));
 
     ximg_data = {};
     ximg_data_idx = 0;
@@ -338,7 +338,7 @@
 
 	  if (use_gnuplot_for_images)
 
-	    if (strcmp (obj.cdatamapping, "direct"))
+	    if (strcmpi (obj.cdatamapping, "direct"))
 	      cdatadirect = true;
 	    endif
 	    fputs (plot_stream, "set border front;\n");
@@ -509,7 +509,7 @@
 
 	 if (! isempty (obj.cdata))
 	   cdat = obj.cdata;
-	   if (strcmp (obj.cdatamapping, "direct"))
+	   if (strcmpi (obj.cdatamapping, "direct"))
 	     cdatadirect = true;
 	   endif
 	 else
@@ -1202,7 +1202,7 @@
       endif
     endif
 	    
-    if (strcmp (axis_obj.__colorbar__, "none"))
+    if (strcmpi (get (h, "__colorbar__"), "none"))
       fputs (plot_stream, "unset colorbox;\n");
     else
       ## FIXME If cbox_mirror is true we want to invert the tic labels