Mercurial > hg > octave-nkf
view src/ov-intx.h @ 13281:834f904a3dcb
Add support for full asynchronous graphics toolkit running in a separate
thread. Add uicontrol and uipanel implementation.
* oct-mutex.h (octave_base_mutex::try_lock): New method.
(octave_mutex::try_lock): Likewise.
(octave_auto_lock::octave_auto_lock): New argument for
blocking/non-blocking locks.
(octave_auto_lock::ok): New method to test locking state.
(octave_auto_lock::operator bool): Likewise.
(octave_thread): New utility class.
* oct-mutex.cc (octave_base_mutex::try_lock): New method.
(octave_w32_mutex::try_lock): Implement it for Win32.
(octave_pthread_mutex::try_lock): Implement it for pthread.
(octave_thread): Implement new utility class.
* octave.cc (octave_main): Initialize octave_thread.
* genprops.awk (emit_get_string_array): New function.
(emit_declarations): Use it for string_array_property.
* graphics.h.in (base_property::set): New argument to control toolkit
notifying.
(property::set): Likewise.
(string_array_property::string_vector_value): New method.
(radio_property::do_set): Add warning about abbreviated radio values.
(base_graphics_toolkit::initialize): Returns bool.
(graphics_toolkit::initialize): Likewise.
(base_graphics_object::toolkit_flag): New member.
(base_graphics_object::base_graphics_object): Initialize it.
(base_graphics_object::valid_toolkit_object): New method.
(base_graphics_object::initialize, base_graphics_object::finalize,
base_graphics_object::update): Likewise.
(graphics_object::initialize, graphics_object::finalize,
graphics_object::update): Likewise.
(figure::properties::set_toolkit): Move implementation to source file.
(base_properties::get_boundingbox): Add parent size argument for optimization.
(figure::properties::get_boundingbox): Likewise.
(axes::properties::get_boundingbox): Likewise.
(figure::properties::map_from_boundingbox): New utility method.
(figure::properties::map_to_boundingbox): Likewise.
(axes::properties::get_fontsize_points): New utility method.
(text::properties::get_fontsize_points): Likewise.
(axes::properties::xlabel, axes::properties::ylabel, axes::properties::zlabel,
axes::properties::title): Don't notify toolkit on initialization.
(axes::initialize): New method override.
(uicontrol): New class.
(uipanel): Likewise.
(graphics_event::create_callback_event): New static method overload.
(graphics_event::create_set_event): New argument to prevent circular
behavior when property change is triggered from the toolkit.
(gh_manager::post_set): Likewise.
(gh_manager::do_post_set): Likewise.
(gh_manager::make_graphics_handle): New argument controlling toolkit notify.
(gh_manager::make_figure_handle): Likewise.
(gh_manager::do_make_graphics_handle): Likewise.
(gh_manager::do_make_figure_handle): Likewise.
(gh_manager::try_lock): New static method.
(gh_manager::execute_listener): Likewise.
(gh_manager::enable_event_processing): Likewise.
(gh_manager::do_try_lock): New method.
(gh_manager::do_execute_listener): Likewise.
(gh_manager::do_enable_event_processing): Likewise.
(gh_manager::event_processing): New member.
(gh_manager::execute_callback): Protect graphics_object access.
(gh_manager::auto_lock): Inherits from octave_autolock. Renamed from autolock.
(gh_manager::auto_lock::auto_lock): New blocking/non-blocking argument.
* graphics.cc (default_control_position, default_control_sliderstep,
default_panel_position): New utility functions.
(convert_font_size): New utility function.
(convert_position): Support 2D-only positions.
(lookup_object_name): Support uicontrol and uipanel.
(make_graphics_object_from_type): Likewise.
(root_figure::init_factory_properties): Likewise.
(property_list::set, property_list::lookup): Likewise.
(base_property::set): New argument controlling toolkit notifying.
(base_property::run_listeners): Call gh_manager::execute_listener, allowing
to set a property from another thread and run listeners synchronously with
octave.
(color_property::do_set): Add warning about abbreviated radio value.
(double_radio_property::do_set): Likewise.
(finalize_r, initialize_r, xinitialize): New utility functions.
(gh_manager::do_free): Calls graphics_object::finalize.
(base_graphics_toolkit::initialize): Returns bool.
(gnuplot_toolkit::initialize): Likewise.
(figure::properties::set_toolkit): Move implementation from header.
(figure::properties::get_boundingbox): New argument for parent size.
(axes::properties::get_boundingbox): Likewise.
(figure::properties::map_from_boundingbox): New utility method.
(figure::properties::map_to_boundingbox): Likewise.
(axes::properties::update_fontunits): Use convert_font_size.
(axes::properties::get_fontsize_points): New utility method.
(text::properties::get_fontsize_points): Likewise.
(axes::initialize): New method override to trigger initialization of
labels and title.
(uicontrol): New class.
(uipanel): Likewise.
(gh_manager::gh_manager): Initialize new event_processing member.
(gh_manager::do_make_graphics_handle): New argument controlling toolkit
notifying.
(gh_manager::do_make_figure_handle): Likewise.
(callback_event::callback): New member.
(callback_event::callback_event): Initialize it.
(callback_event::execute): Use it.
(set_event::notify_toolkit): New member.
(set_event::set_event): Initialize it.
(set_event::execute): Use it. Also allow to set read-only properties.
(graphics_event::create_callback_event): New static method overload.
(graphics_event::create_set_event): New argument controlling toolkit notifying.
(gh_manager::do_restore_gcbo): Rename autolock to auto_lock.
(gh_manager::do_post_callback, gh_manager::do_post_function): Likewise.
(Fishandle, Fset, Fget, F__get__): Likewise.
(F__go_figure__, F__calc_dimensions__, GO_BODY): Likewise.
(F__go_delete__, F__go_axes_init__, F__go_handles__, F__go_figure_handles__,
Favailable_graphics_toolkits, Faddlistener, Fdellistener, Faddproperty):
Likewise.
(get_property_from_handle, set_property_in_handle): Likewise.
(gh_manager::do_post_set): Likewise. New argument controlling toolkit
notifying.
(gh_manager::do_execute_listener): New method.
(gh_manager::do_enable_event_processing): Likewise.
(gh_manager::do_execute_callback): Check callback argument validity.
Rename autolock to auto_lock.
(gh_manager::do_process_events): Execute drawnow at the end of event
processing loop, avoiding recursivity. Maintain the input event hook
if gh_manager::event_processing is non zero.
(make_graphics_object): Postpone object's toolkit initialization at
the end of the object creation.
(F__go_figure__): Likewise.
(F__go_uicontrol__, F__go_uipanel__): New functions.
* __init_fltk__.cc (fltk_graphics_toolkit::initialise): New method.
* gl-render.h (opengl_renderer::draw): New argument to identify top-level
calls.
(opengl_renderer::draw_uipanel): New method.
(opengl_renderer::init_gl_context): Likewise.
* gl-render.cc (opengl_renderer::draw): New argument to identify top-level
calls. Skip uicontrol objects. Handle uipanel objects when top-level.
(opengl_renderer::init_gl_context): New method.
(opengl_renderer::draw_figure): Use it.
(opengl_renderer::draw_uipanel): New method.
author | Michael Goffioul <michael.goffioul@gmail.com> |
---|---|
date | Thu, 06 Oct 2011 16:44:18 +0100 |
parents | d3ccd2e37de6 |
children | 72c96de7a403 |
line wrap: on
line source
/* Copyright (C) 2004-2011 John W. Eaton Copyright (C) 2010 VZLU Prague This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #include <cstdlib> #include <iosfwd> #include <string> #include "mx-base.h" #include "oct-alloc.h" #include "str-vec.h" #include "error.h" #include "oct-stream.h" #include "ov-base.h" #include "ov-base-int.h" #include "ov-typeinfo.h" #include "gripes.h" #include "ov-re-mat.h" #include "ov-scalar.h" class OCTINTERP_API OCTAVE_VALUE_INT_MATRIX_T : public octave_base_int_matrix<intNDArray<OCTAVE_INT_T> > { public: OCTAVE_VALUE_INT_MATRIX_T (void) : octave_base_int_matrix<intNDArray<OCTAVE_INT_T> > () { } OCTAVE_VALUE_INT_MATRIX_T (const intNDArray<OCTAVE_INT_T>& nda) : octave_base_int_matrix<intNDArray<OCTAVE_INT_T> > (nda) { } OCTAVE_VALUE_INT_MATRIX_T (const Array<OCTAVE_INT_T>& nda) : octave_base_int_matrix<intNDArray<OCTAVE_INT_T> > (intNDArray<OCTAVE_INT_T> (nda)) { } ~OCTAVE_VALUE_INT_MATRIX_T (void) { } octave_base_value *clone (void) const { return new OCTAVE_VALUE_INT_MATRIX_T (*this); } octave_base_value *empty_clone (void) const { return new OCTAVE_VALUE_INT_MATRIX_T (); } bool OCTAVE_TYPE_PREDICATE_FUNCTION (void) const { return true; } bool is_integer_type (void) const { return true; } builtin_type_t builtin_type (void) const { return OCTAVE_INT_BTYP; } public: int8NDArray int8_array_value (void) const { return int8NDArray (matrix); } int16NDArray int16_array_value (void) const { return int16NDArray (matrix); } int32NDArray int32_array_value (void) const { return int32NDArray (matrix); } int64NDArray int64_array_value (void) const { return int64NDArray (matrix); } uint8NDArray uint8_array_value (void) const { return uint8NDArray (matrix); } uint16NDArray uint16_array_value (void) const { return uint16NDArray (matrix); } uint32NDArray uint32_array_value (void) const { return uint32NDArray (matrix); } uint64NDArray uint64_array_value (void) const { return uint64NDArray (matrix); } double double_value (bool = false) const { double retval = lo_ieee_nan_value (); if (numel () > 0) { gripe_implicit_conversion ("Octave:array-as-scalar", type_name (), "real scalar"); retval = matrix(0).double_value (); } else gripe_invalid_conversion (type_name (), "real scalar"); return retval; } float float_value (bool = false) const { float retval = lo_ieee_float_nan_value (); if (numel () > 0) { gripe_implicit_conversion ("Octave:array-as-scalar", type_name (), "real scalar"); retval = matrix(0).float_value (); } else gripe_invalid_conversion (type_name (), "real scalar"); return retval; } double scalar_value (bool = false) const { return double_value (); } float float_scalar_value (bool = false) const { return float_value (); } Matrix matrix_value (bool = false) const { Matrix retval; dim_vector dv = dims (); if (dv.length () > 2) error ("invalid conversion of %s to Matrix", type_name().c_str ()); else { retval = Matrix (dv(0), dv(1)); double *vec = retval.fortran_vec (); octave_idx_type nel = matrix.numel (); for (octave_idx_type i = 0; i < nel; i++) vec[i] = matrix(i).double_value (); } return retval; } FloatMatrix float_matrix_value (bool = false) const { FloatMatrix retval; dim_vector dv = dims (); if (dv.length () > 2) error ("invalid conversion of %s to FloatMatrix", type_name().c_str ()); else { retval = FloatMatrix (dv(0), dv(1)); float *vec = retval.fortran_vec (); octave_idx_type nel = matrix.numel (); for (octave_idx_type i = 0; i < nel; i++) vec[i] = matrix(i).float_value (); } return retval; } ComplexMatrix complex_matrix_value (bool = false) const { ComplexMatrix retval; dim_vector dv = dims(); if (dv.length () > 2) error ("invalid conversion of %s to Matrix", type_name().c_str ()); else { retval = ComplexMatrix (dv(0), dv(1)); Complex *vec = retval.fortran_vec (); octave_idx_type nel = matrix.numel (); for (octave_idx_type i = 0; i < nel; i++) vec[i] = Complex (matrix(i).double_value ()); } return retval; } FloatComplexMatrix float_complex_matrix_value (bool = false) const { FloatComplexMatrix retval; dim_vector dv = dims(); if (dv.length () > 2) error ("invalid conversion of %s to FloatMatrix", type_name().c_str ()); else { retval = FloatComplexMatrix (dv(0), dv(1)); FloatComplex *vec = retval.fortran_vec (); octave_idx_type nel = matrix.numel (); for (octave_idx_type i = 0; i < nel; i++) vec[i] = FloatComplex (matrix(i).float_value ()); } return retval; } NDArray array_value (bool = false) const { NDArray retval (matrix.dims ()); double *vec = retval.fortran_vec (); octave_idx_type nel = matrix.numel (); for (octave_idx_type i = 0; i < nel; i++) vec[i] = matrix(i).double_value (); return retval; } FloatNDArray float_array_value (bool = false) const { FloatNDArray retval (matrix.dims ()); float *vec = retval.fortran_vec (); octave_idx_type nel = matrix.numel (); for (octave_idx_type i = 0; i < nel; i++) vec[i] = matrix(i).float_value (); return retval; } ComplexNDArray complex_array_value (bool = false) const { ComplexNDArray retval (matrix.dims ()); Complex *vec = retval.fortran_vec (); octave_idx_type nel = matrix.numel (); for (octave_idx_type i = 0; i < nel; i++) vec[i] = Complex (matrix(i).double_value ()); return retval; } FloatComplexNDArray float_complex_array_value (bool = false) const { FloatComplexNDArray retval (matrix.dims ()); FloatComplex *vec = retval.fortran_vec (); octave_idx_type nel = matrix.numel (); for (octave_idx_type i = 0; i < nel; i++) vec[i] = FloatComplex (matrix(i).float_value ()); return retval; } boolNDArray bool_array_value (bool warn = false) const { boolNDArray retval (dims ()); octave_idx_type nel = numel (); if (warn && matrix.any_element_not_one_or_zero ()) gripe_logical_conversion (); bool *vec = retval.fortran_vec (); for (octave_idx_type i = 0; i < nel; i++) vec[i] = matrix(i).bool_value (); return retval; } charNDArray char_array_value (bool = false) const { charNDArray retval (dims ()); octave_idx_type nel = numel (); char *vec = retval.fortran_vec (); for (octave_idx_type i = 0; i < nel; i++) vec[i] = matrix(i).char_value (); return retval; } // Use matrix_ref here to clear index cache. void increment (void) { matrix_ref() += OCTAVE_INT_T (1); } void decrement (void) { matrix_ref() -= OCTAVE_INT_T (1); } void changesign (void) { matrix_ref ().changesign (); } idx_vector index_vector (void) const { return idx_cache ? *idx_cache : set_idx_cache (idx_vector (matrix)); } int write (octave_stream& os, int block_size, oct_data_conv::data_type output_type, int skip, oct_mach_info::float_format flt_fmt) const { return os.write (matrix, block_size, output_type, skip, flt_fmt); } // Unsafe. This function exists to support the MEX interface. // You should not use it anywhere else. void *mex_get_data (void) const { return matrix.mex_get_data (); } mxArray *as_mxArray (void) const { mxArray *retval = new mxArray (OCTAVE_INT_MX_CLASS, dims (), mxREAL); OCTAVE_INT_T::val_type *pr = static_cast<OCTAVE_INT_T::val_type *> (retval->get_data ()); mwSize nel = numel (); const OCTAVE_INT_T *p = matrix.data (); for (mwIndex i = 0; i < nel; i++) pr[i] = p[i].value (); return retval; } octave_value map (unary_mapper_t umap) const { switch (umap) { case umap_abs: return matrix.abs (); case umap_signum: return matrix.signum (); case umap_ceil: case umap_conj: case umap_fix: case umap_floor: case umap_real: case umap_round: return matrix; case umap_imag: return intNDArray<OCTAVE_INT_T> (matrix.dims (), OCTAVE_INT_T ()); case umap_isnan: case umap_isna: case umap_isinf: return boolNDArray (matrix.dims (), false); case umap_finite: return boolNDArray (matrix.dims (), true); default: { octave_matrix m (array_value ()); return m.map (umap); } } } private: DECLARE_OCTAVE_ALLOCATOR DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA }; class OCTINTERP_API OCTAVE_VALUE_INT_SCALAR_T : public octave_base_int_scalar<OCTAVE_INT_T> { public: OCTAVE_VALUE_INT_SCALAR_T (void) : octave_base_int_scalar<OCTAVE_INT_T> () { } OCTAVE_VALUE_INT_SCALAR_T (const OCTAVE_INT_T& nda) : octave_base_int_scalar<OCTAVE_INT_T> (nda) { } ~OCTAVE_VALUE_INT_SCALAR_T (void) { } octave_base_value *clone (void) const { return new OCTAVE_VALUE_INT_SCALAR_T (*this); } octave_base_value *empty_clone (void) const { return new OCTAVE_VALUE_INT_MATRIX_T (); } octave_value do_index_op (const octave_value_list& idx, bool resize_ok = false) { // FIXME -- this doesn't solve the problem of // // a = 1; a([1,1], [1,1], [1,1]) // // and similar constructions. Hmm... // FIXME -- using this constructor avoids narrowing the // 1x1 matrix back to a scalar value. Need a better solution // to this problem. octave_value tmp (new OCTAVE_VALUE_INT_MATRIX_T (OCTAVE_VALUE_INT_NDARRAY_EXTRACTOR_FUNCTION ())); return tmp.do_index_op (idx, resize_ok); } bool OCTAVE_TYPE_PREDICATE_FUNCTION (void) const { return true; } bool is_integer_type (void) const { return true; } builtin_type_t builtin_type (void) const { return OCTAVE_INT_BTYP; } public: octave_int8 int8_scalar_value (void) const { return octave_int8 (scalar); } octave_int16 int16_scalar_value (void) const { return octave_int16 (scalar); } octave_int32 int32_scalar_value (void) const { return octave_int32 (scalar); } octave_int64 int64_scalar_value (void) const { return octave_int64 (scalar); } octave_uint8 uint8_scalar_value (void) const { return octave_uint8 (scalar); } octave_uint16 uint16_scalar_value (void) const { return octave_uint16 (scalar); } octave_uint32 uint32_scalar_value (void) const { return octave_uint32 (scalar); } octave_uint64 uint64_scalar_value (void) const { return octave_uint64 (scalar); } int8NDArray int8_array_value (void) const { return int8NDArray (dim_vector (1, 1), int8_scalar_value ()); } int16NDArray int16_array_value (void) const { return int16NDArray (dim_vector (1, 1), int16_scalar_value ()); } int32NDArray int32_array_value (void) const { return int32NDArray (dim_vector (1, 1), int32_scalar_value ()); } int64NDArray int64_array_value (void) const { return int64NDArray (dim_vector (1, 1), int64_scalar_value ()); } uint8NDArray uint8_array_value (void) const { return uint8NDArray (dim_vector (1, 1), uint8_scalar_value ()); } uint16NDArray uint16_array_value (void) const { return uint16NDArray (dim_vector (1, 1), uint16_scalar_value ()); } uint32NDArray uint32_array_value (void) const { return uint32NDArray (dim_vector (1, 1), uint32_scalar_value ()); } uint64NDArray uint64_array_value (void) const { return uint64NDArray (dim_vector (1, 1), uint64_scalar_value ()); } octave_value resize (const dim_vector& dv, bool fill = false) const { if (fill) { intNDArray<OCTAVE_INT_T> retval (dv, 0); if (dv.numel()) retval(0) = scalar; return retval; } else { intNDArray<OCTAVE_INT_T> retval (dv); if (dv.numel()) retval(0) = scalar; return retval; } } double double_value (bool = false) const { return scalar.double_value (); } float float_value (bool = false) const { return scalar.float_value (); } double scalar_value (bool = false) const { return scalar.double_value (); } float float_scalar_value (bool = false) const { return scalar.float_value (); } Matrix matrix_value (bool = false) const { Matrix retval (1, 1); retval(0,0) = scalar.double_value (); return retval; } FloatMatrix float_matrix_value (bool = false) const { FloatMatrix retval (1, 1); retval(0,0) = scalar.float_value (); return retval; } ComplexMatrix complex_matrix_value (bool = false) const { ComplexMatrix retval (1, 1); retval(0,0) = Complex (scalar.double_value ()); return retval; } FloatComplexMatrix float_complex_matrix_value (bool = false) const { FloatComplexMatrix retval (1, 1); retval(0,0) = FloatComplex (scalar.float_value ()); return retval; } NDArray array_value (bool = false) const { NDArray retval (dim_vector (1, 1)); retval(0) = scalar.double_value (); return retval; } FloatNDArray float_array_value (bool = false) const { FloatNDArray retval (dim_vector (1, 1)); retval(0) = scalar.float_value (); return retval; } ComplexNDArray complex_array_value (bool = false) const { ComplexNDArray retval (dim_vector (1, 1)); retval(0) = FloatComplex (scalar.double_value ()); return retval; } FloatComplexNDArray float_complex_array_value (bool = false) const { FloatComplexNDArray retval (dim_vector (1, 1)); retval(0) = FloatComplex (scalar.float_value ()); return retval; } bool bool_value (bool warn = false) const { if (warn && scalar != 0.0 && scalar != 1.0) gripe_logical_conversion (); return scalar.bool_value (); } boolNDArray bool_array_value (bool warn = false) const { boolNDArray retval (dim_vector (1, 1)); if (warn && scalar != 0.0 && scalar != 1.0) gripe_logical_conversion (); retval(0) = scalar.bool_value (); return retval; } charNDArray char_array_value (bool = false) const { charNDArray retval (dim_vector (1, 1)); retval(0) = scalar.char_value (); return retval; } void increment (void) { scalar += OCTAVE_INT_T (1); } void decrement (void) { scalar -= OCTAVE_INT_T (1); } idx_vector index_vector (void) const { return idx_vector (scalar); } int write (octave_stream& os, int block_size, oct_data_conv::data_type output_type, octave_idx_type skip, oct_mach_info::float_format flt_fmt) const { return os.write (OCTAVE_VALUE_INT_NDARRAY_EXTRACTOR_FUNCTION (), block_size, output_type, skip, flt_fmt); } // Unsafe. This function exists to support the MEX interface. // You should not use it anywhere else. void *mex_get_data (void) const { return scalar.mex_get_data (); } mxArray *as_mxArray (void) const { mxArray *retval = new mxArray (OCTAVE_INT_MX_CLASS, 1, 1, mxREAL); OCTAVE_INT_T::val_type *pr = static_cast<OCTAVE_INT_T::val_type *> (retval->get_data ()); pr[0] = scalar.value (); return retval; } octave_value map (unary_mapper_t umap) const { switch (umap) { case umap_abs: return scalar.abs (); case umap_signum: return scalar.signum (); case umap_ceil: case umap_conj: case umap_fix: case umap_floor: case umap_real: case umap_round: return scalar; case umap_imag: return OCTAVE_INT_T (); case umap_isnan: case umap_isna: case umap_isinf: return false; case umap_finite: return true; default: { octave_scalar m (scalar_value ()); return m.map (umap); } } } private: DECLARE_OCTAVE_ALLOCATOR DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA };