Mercurial > hg > octave-lyh

changeset 11598:62b7ea59a6ff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixing color mismatch between axis and axis label
author Konstantinos Poulios <logari81@googlemail.com>
date Fri, 21 Jan 2011 20:22:42 +0100
parents a066673566da
children f4689107dd8c
files scripts/ChangeLog scripts/plot/xlabel.m scripts/plot/ylabel.m scripts/plot/zlabel.m src/ChangeLog src/graphics.cc
diffstat 6 files changed, 20 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-21  Konstantinos Poulios  <logari81@gmail.com>
+
+	* plot/xlabel.m, plot/ylabel.m, plot/zlabel.m: Setting axis label
+	color from axis color.
+
 2011-01-20  Jordi Gutiérrez Hermoso  <jordigh@gmail.com>
 
 	* image/imshow.m: Fix handling of clim and display_range so that
--- a/scripts/plot/xlabel.m
+++ b/scripts/plot/xlabel.m
@@ -42,7 +42,8 @@
   oldh = gca ();
   unwind_protect
     axes (h);
-    tmp = __axis_label__ ("xlabel", varargin{:});
+    tmp = __axis_label__ ("xlabel", varargin{:},
+                          "color", get (h, "xcolor"));
   unwind_protect_cleanup
     axes (oldh);
   end_unwind_protect
--- a/scripts/plot/ylabel.m
+++ b/scripts/plot/ylabel.m
@@ -36,7 +36,8 @@
   oldh = gca ();
   unwind_protect
     axes (h);
-    tmp = __axis_label__ ("ylabel", varargin{:});
+    tmp = __axis_label__ ("ylabel", varargin{:},
+                          "color", get (h, "ycolor"));
   unwind_protect_cleanup
     axes (oldh);
   end_unwind_protect
--- a/scripts/plot/zlabel.m
+++ b/scripts/plot/zlabel.m
@@ -36,7 +36,8 @@
   oldh = gca ();
   unwind_protect
     axes (h);
-    tmp = __axis_label__ ("zlabel", varargin{:});
+    tmp = __axis_label__ ("zlabel", varargin{:},
+                          "color", get (h, "zcolor"));
   unwind_protect_cleanup
     axes (oldh);
   end_unwind_protect
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-21  Konstantinos Poulios  <logari81@googlemail.com>
+
+	* src/graphics.cc (axes::properties::set_xlabel,
+	axes::properties::set_ylabel, axes::properties::set_zlabel):
+	Setting axis label color from axis color.
+
 2011-01-20  Rik  <octave@nomad.inbox5.com>
 
 	* src/file-io.cc, src/variables.cc: Prevent doubled quotes around @table
--- a/src/graphics.cc
+++ b/src/graphics.cc
@@ -3299,6 +3299,7 @@
   xset (xlabel.handle_value (), "horizontalalignmentmode", "auto");
   xset (xlabel.handle_value (), "verticalalignmentmode", "auto");
   xset (xlabel.handle_value (), "clipping", "off");
+  xset (xlabel.handle_value (), "color", get_xcolor ());
 }
 
 void
@@ -3310,6 +3311,7 @@
   xset (ylabel.handle_value (), "horizontalalignmentmode", "auto");
   xset (ylabel.handle_value (), "verticalalignmentmode", "auto");
   xset (ylabel.handle_value (), "clipping", "off");
+  xset (ylabel.handle_value (), "color", get_ycolor ());
 }
 
 void
@@ -3321,6 +3323,7 @@
   xset (zlabel.handle_value (), "horizontalalignmentmode", "auto");
   xset (zlabel.handle_value (), "verticalalignmentmode", "auto");
   xset (zlabel.handle_value (), "clipping", "off");
+  xset (zlabel.handle_value (), "color", get_zcolor ());
 }
 
 void