comparison src/graphics.cc @ 12587:c3d4542a4f06 stable

graphics.cc: Allow ishandle() to accept vector of handles (bug 33025).
author John Eaton <jwe@octave.org>
date Sun, 10 Apr 2011 11:46:50 -0400
parents 570193964185
children 69cd5ebe5fb5 c7512d0d52e8
comparison
equal deleted inserted replaced
12584:7ef7e20057fa 12587:c3d4542a4f06
2009 { 2009 {
2010 octave_value retval = false; 2010 octave_value retval = false;
2011 2011
2012 if (val.is_real_scalar () && is_handle (val.double_value ())) 2012 if (val.is_real_scalar () && is_handle (val.double_value ()))
2013 retval = true; 2013 retval = true;
2014 else if (val.is_real_matrix ()) 2014 else if (val.is_numeric_type () && val.is_real_type ())
2015 { 2015 {
2016 if (val.is_string ()) 2016 const NDArray handles = val.array_value ();
2017 retval = boolNDArray (val.dims (), false); 2017
2018 else 2018 if (! error_state)
2019 { 2019 {
2020 const NDArray handles = val.array_value (); 2020 boolNDArray result (handles.dims ());
2021 2021
2022 if (! error_state) 2022 for (octave_idx_type i = 0; i < handles.numel (); i++)
2023 { 2023 result.xelem (i) = is_handle (handles (i));
2024 boolNDArray result (handles.dims ()); 2024
2025 2025 retval = result;
2026 for (octave_idx_type i = 0; i < handles.numel (); i++)
2027 result.xelem (i) = is_handle (handles (i));
2028
2029 retval = result;
2030 }
2031 } 2026 }
2032 } 2027 }
2033 2028
2034 return retval; 2029 return retval;
2035 } 2030 }