Mercurial > hg > octave-max

diff src/graphics.h.in @ 13756:6dfebfa334cb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
allow negative data log plots with OpenGL+FLTK graphics (bug #34232) * mx-inlines.cc (mx_inline_any_positive): New function. * lo-mappers.h (xpositive_sign (double), xpositive_sign (float)): New functions. * fNDArray.h, fNDArray.cc (FloatNDArray::any_element_is_positive): New function. * fMatrix.h, fMatrix.cc (FloatMatrix::any_element_is_positive): New function. * dNDArray.h, dNDArray.cc (NDArray::any_element_is_positive): New function. * dMatrix.h, dMatrix.cc (Matrix::any_element_is_positive): New function. * graphics.h.in (log_scaler::do_neg_scale): New function. (log_scaler::scale (const Matrix&) const, log_scaler::scale (const NDArray&) const): Call do_neg_scale if no array elements are positive. * graphics.cc (axes::properties::get_axis_limits): Omit zero from positive values for log plots. Correctly widen range for all negative log plots.
author John W. Eaton <jwe@octave.org>
date Wed, 26 Oct 2011 14:19:54 -0400
parents ecff4c684b89
children 760e4e88dba3
line wrap: on
line diff
--- a/src/graphics.h.in
+++ b/src/graphics.h.in
@@ -221,7 +221,11 @@
     {
       Matrix retval (m.rows (), m.cols ());
 
-      do_scale (m.data (), retval.fortran_vec (), m.numel ());
+      if (m.any_element_is_positive ())
+        do_scale (m.data (), retval.fortran_vec (), m.numel ());
+      else
+        do_neg_scale (m.data (), retval.fortran_vec (), m.numel ());
+
       return retval;
     }
 
@@ -229,7 +233,11 @@
     {
       NDArray retval (m.dims ());
 
-      do_scale (m.data (), retval.fortran_vec (), m.numel ());
+      if (m.any_element_is_positive ())
+        do_scale (m.data (), retval.fortran_vec (), m.numel ());
+      else
+        do_neg_scale (m.data (), retval.fortran_vec (), m.numel ());
+
       return retval;
     }
 
@@ -248,6 +256,12 @@
       for (int i = 0; i < n; i++)
         dest[i] = log10(src[i]);
     }
+
+  void do_neg_scale (const double *src, double *dest, int n) const
+    {
+      for (int i = 0; i < n; i++)
+        dest[i] = -log10(-src[i]);
+    }
 };
 
 class scaler