Mercurial > hg > octave-lojdl

changeset 7425:fe4a43e1d1d3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2008-01-28 09:13:01 by jwe]
author jwe
date Mon, 28 Jan 2008 09:13:01 +0000
parents 132647e6c829
children b9df9abdffbb
files liboctave/idx-vector.cc scripts/ChangeLog scripts/plot/xlabel.m scripts/plot/ylabel.m scripts/plot/zlabel.m
diffstat 5 files changed, 21 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/idx-vector.cc
+++ b/liboctave/idx-vector.cc
@@ -306,14 +306,14 @@
 
       num_zeros = a.num_zeros;
       num_ones = a.num_ones;
+      range_base = a.range_base;
+      range_step = a.range_step;
       max_val = a.max_val;
       min_val = a.min_val;
       frozen_at_z_len = a.frozen_at_z_len;
       frozen_len = a.frozen_len;
       colon = a.colon;
       range = a.range;
-      range_base = a.range_base;
-      range_step = a.range_step;
       one_zero = a.one_zero;
       initialized = a.initialized;
       frozen = a.frozen;
@@ -570,8 +570,17 @@
 std::ostream&
 IDX_VEC_REP::print (std::ostream& os) const
 {
-  for (octave_idx_type ii = 0; ii < len; ii++)
-    os << data[ii] << "\n";
+  if (colon)
+    os << "colon" << std::endl;
+  else if (range)
+    os << "range_base: " << range_base
+       << ", range_step: " << range_step << std::endl;
+  else
+    {
+      for (octave_idx_type ii = 0; ii < len; ii++)
+	os << data[ii] << "\n";
+    }
+
   return os;
 }
 
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-28  Michael Goffioul <michael.goffioul@gmail.com>
+
+	* plot/xlabel.m, plot/ylabel.m, plot/zlabel.m:
+	Return the label handle, not the current axis handle.
+
 2008-01-25  Alexander Barth  <barth.alexander@gmail.com>
 
 	* general/interpn.m: Compatibility fix. Don't ndgrid vector
--- a/scripts/plot/xlabel.m
+++ b/scripts/plot/xlabel.m
@@ -49,7 +49,7 @@
   end_unwind_protect
 
   if (nargout > 0)
-    retval = h;
+    retval = tmp;
   endif
 
 endfunction
--- a/scripts/plot/ylabel.m
+++ b/scripts/plot/ylabel.m
@@ -44,7 +44,7 @@
   end_unwind_protect
 
   if (nargout > 0)
-    retval = h;
+    retval = tmp;
   endif
 
 endfunction
--- a/scripts/plot/zlabel.m
+++ b/scripts/plot/zlabel.m
@@ -44,7 +44,7 @@
   end_unwind_protect
 
   if (nargout > 0)
-    retval = h;
+    retval = tmp;
   endif
 
 endfunction