Mercurial > hg > octave-nkf
view src/ov-base-int.cc @ 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 | 12df7854fa7c |
children | 72c96de7a403 |
line wrap: on
line source
/* Copyright (C) 2004-2011 John W. Eaton 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/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include <climits> #include <iostream> #include <vector> #include "lo-ieee.h" #include "lo-utils.h" #include "mx-base.h" #include "quit.h" #include "oct-locbuf.h" #include "defun.h" #include "gripes.h" #include "oct-obj.h" #include "oct-lvalue.h" #include "oct-stream.h" #include "ops.h" #include "ov-base.h" #include "ov-base-mat.h" #include "ov-base-mat.cc" #include "ov-base-scalar.h" #include "ov-base-scalar.cc" #include "ov-base-int.h" #include "ov-int-traits.h" #include "pr-output.h" #include "variables.h" #include "byte-swap.h" #include "ls-oct-ascii.h" #include "ls-utils.h" #include "ls-hdf5.h" // We have all the machinery below (octave_base_int_helper and // octave_base_int_helper_traits) to avoid a few warnings from GCC // about comparisons always false due to limited range of data types. // Ugh. The cure may be worse than the disease. template <class T, bool is_signed = true, bool can_be_too_big = true> struct octave_base_int_helper { static bool char_value_out_of_range (T val) { return val < 0 || val > UCHAR_MAX; } }; template <class T> struct octave_base_int_helper<T, false, false> { static bool char_value_out_of_range (T) { return false; } }; template <class T> struct octave_base_int_helper<T, false, true> { static bool char_value_out_of_range (T val) { return val > UCHAR_MAX; } }; template <class T> struct octave_base_int_helper<T, true, false> { static bool char_value_out_of_range (T val) { return val < 0; } }; // For all types other than char, signed char, and unsigned char, we // assume that the upper limit for the range of allowable values is // larger than the range for unsigned char. If that's not true, we // are still OK, but will see the warnings again for any other types // that do not meet this assumption. template <class T> struct octave_base_int_helper_traits { static const bool can_be_larger_than_uchar_max = true; }; template <> struct octave_base_int_helper_traits<char> { static const bool can_be_larger_than_uchar_max = false; }; template <> struct octave_base_int_helper_traits<signed char> { static const bool can_be_larger_than_uchar_max = false; }; template <> struct octave_base_int_helper_traits<unsigned char> { static const bool can_be_larger_than_uchar_max = false; }; template <class T> octave_base_value * octave_base_int_matrix<T>::try_narrowing_conversion (void) { octave_base_value *retval = 0; if (this->matrix.nelem () == 1) retval = new typename octave_value_int_traits<T>::scalar_type (this->matrix (0)); return retval; } template <class T> octave_value octave_base_int_matrix<T>::convert_to_str_internal (bool, bool, char type) const { octave_value retval; dim_vector dv = this->dims (); octave_idx_type nel = dv.numel (); charNDArray chm (dv); bool warned = false; for (octave_idx_type i = 0; i < nel; i++) { octave_quit (); typename T::element_type tmp = this->matrix(i); typedef typename T::element_type::val_type val_type; val_type ival = tmp.value (); static const bool is_signed = std::numeric_limits<val_type>::is_signed; static const bool can_be_larger_than_uchar_max = octave_base_int_helper_traits<val_type>::can_be_larger_than_uchar_max; if (octave_base_int_helper<val_type, is_signed, can_be_larger_than_uchar_max>::char_value_out_of_range (ival)) { // FIXME -- is there something better we could do? ival = 0; if (! warned) { ::warning ("range error for conversion to character value"); warned = true; } } else chm (i) = static_cast<char> (ival); } retval = octave_value (chm, type); return retval; } template <class T> bool octave_base_int_matrix<T>::save_ascii (std::ostream& os) { dim_vector d = this->dims (); os << "# ndims: " << d.length () << "\n"; for (int i = 0; i < d.length (); i++) os << " " << d (i); os << "\n" << this->matrix; return true; } template <class T> bool octave_base_int_matrix<T>::load_ascii (std::istream& is) { int mdims = 0; bool success = true; if (extract_keyword (is, "ndims", mdims, true)) { if (mdims >= 0) { dim_vector dv; dv.resize (mdims); for (int i = 0; i < mdims; i++) is >> dv(i); T tmp(dv); is >> tmp; if (!is) { error ("load: failed to load matrix constant"); success = false; } this->matrix = tmp; } else { error ("load: failed to extract number of rows and columns"); success = false; } } else error ("load: failed to extract number of dimensions"); return success; } template <class T> bool octave_base_int_matrix<T>::save_binary (std::ostream& os, bool&) { dim_vector d = this->dims (); if (d.length() < 1) return false; // Use negative value for ndims to differentiate with old format!! int32_t tmp = - d.length(); os.write (reinterpret_cast<char *> (&tmp), 4); for (int i=0; i < d.length (); i++) { tmp = d(i); os.write (reinterpret_cast<char *> (&tmp), 4); } os.write (reinterpret_cast<const char *> (this->matrix.data()), this->byte_size()); return true; } template <class T> bool octave_base_int_matrix<T>::load_binary (std::istream& is, bool swap, oct_mach_info::float_format ) { int32_t mdims; if (! is.read (reinterpret_cast<char *> (&mdims), 4)) return false; if (swap) swap_bytes<4> (&mdims); if (mdims >= 0) return false; mdims = - mdims; int32_t di; dim_vector dv; dv.resize (mdims); for (int i = 0; i < mdims; i++) { if (! is.read (reinterpret_cast<char *> (&di), 4)) return false; if (swap) swap_bytes<4> (&di); dv(i) = di; } // Convert an array with a single dimension to be a row vector. // Octave should never write files like this, other software // might. if (mdims == 1) { mdims = 2; dv.resize (mdims); dv(1) = dv(0); dv(0) = 1; } T m (dv); if (! is.read (reinterpret_cast<char *> (m.fortran_vec ()), m.byte_size ())) return false; if (swap) { int nel = dv.numel (); int bytes = nel / m.byte_size(); for (int i = 0; i < nel; i++) switch (bytes) { case 8: swap_bytes<8> (&m(i)); break; case 4: swap_bytes<4> (&m(i)); break; case 2: swap_bytes<2> (&m(i)); break; case 1: default: break; } } this->matrix = m; return true; } #if defined (HAVE_HDF5) template <class T> bool octave_base_int_matrix<T>::save_hdf5 (hid_t loc_id, const char *name, bool) { hid_t save_type_hid = HDF5_SAVE_TYPE; bool retval = true; dim_vector dv = this->dims (); int empty = save_hdf5_empty (loc_id, name, dv); if (empty) return (empty > 0); int rank = dv.length (); hid_t space_hid = -1, data_hid = -1; OCTAVE_LOCAL_BUFFER (hsize_t, hdims, rank); // Octave uses column-major, while HDF5 uses row-major ordering for (int i = 0; i < rank; i++) hdims[i] = dv (rank-i-1); space_hid = H5Screate_simple (rank, hdims, 0); if (space_hid < 0) return false; #if HAVE_HDF5_18 data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); #else data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid, H5P_DEFAULT); #endif if (data_hid < 0) { H5Sclose (space_hid); return false; } retval = H5Dwrite (data_hid, save_type_hid, H5S_ALL, H5S_ALL, H5P_DEFAULT, this->matrix.data()) >= 0; H5Dclose (data_hid); H5Sclose (space_hid); return retval; } template <class T> bool octave_base_int_matrix<T>::load_hdf5 (hid_t loc_id, const char *name) { hid_t save_type_hid = HDF5_SAVE_TYPE; bool retval = false; dim_vector dv; int empty = load_hdf5_empty (loc_id, name, dv); if (empty > 0) this->matrix.resize(dv); if (empty) return (empty > 0); #if HAVE_HDF5_18 hid_t data_hid = H5Dopen (loc_id, name, H5P_DEFAULT); #else hid_t data_hid = H5Dopen (loc_id, name); #endif hid_t space_id = H5Dget_space (data_hid); hsize_t rank = H5Sget_simple_extent_ndims (space_id); if (rank < 1) { H5Sclose (space_id); H5Dclose (data_hid); return false; } OCTAVE_LOCAL_BUFFER (hsize_t, hdims, rank); OCTAVE_LOCAL_BUFFER (hsize_t, maxdims, rank); H5Sget_simple_extent_dims (space_id, hdims, maxdims); // Octave uses column-major, while HDF5 uses row-major ordering if (rank == 1) { dv.resize (2); dv(0) = 1; dv(1) = hdims[0]; } else { dv.resize (rank); for (hsize_t i = 0, j = rank - 1; i < rank; i++, j--) dv(j) = hdims[i]; } T m (dv); if (H5Dread (data_hid, save_type_hid, H5S_ALL, H5S_ALL, H5P_DEFAULT, m.fortran_vec()) >= 0) { retval = true; this->matrix = m; } H5Sclose (space_id); H5Dclose (data_hid); return retval; } #endif template <class T> void octave_base_int_matrix<T>::print_raw (std::ostream& os, bool pr_as_read_syntax) const { octave_print_internal (os, this->matrix, pr_as_read_syntax, this->current_print_indent_level ()); } template <class T> octave_value octave_base_int_scalar<T>::convert_to_str_internal (bool, bool, char type) const { octave_value retval; T tmp = this->scalar; typedef typename T::val_type val_type; val_type ival = tmp.value (); static const bool is_signed = std::numeric_limits<val_type>::is_signed; static const bool can_be_larger_than_uchar_max = octave_base_int_helper_traits<val_type>::can_be_larger_than_uchar_max; if (octave_base_int_helper<val_type, is_signed, can_be_larger_than_uchar_max>::char_value_out_of_range (ival)) { // FIXME -- is there something better we could do? ival = 0; ::warning ("range error for conversion to character value"); } else retval = octave_value (std::string (1, static_cast<char> (ival)), type); return retval; } template <class T> bool octave_base_int_scalar<T>::save_ascii (std::ostream& os) { os << this->scalar << "\n"; return true; } template <class T> bool octave_base_int_scalar<T>::load_ascii (std::istream& is) { is >> this->scalar; if (!is) { error ("load: failed to load scalar constant"); return false; } return true; } template <class T> bool octave_base_int_scalar<T>::save_binary (std::ostream& os, bool&) { os.write (reinterpret_cast<char *> (&(this->scalar)), this->byte_size()); return true; } template <class T> bool octave_base_int_scalar<T>::load_binary (std::istream& is, bool swap, oct_mach_info::float_format) { T tmp; if (! is.read (reinterpret_cast<char *> (&tmp), this->byte_size())) return false; if (swap) switch (this->byte_size()) { case 8: swap_bytes<8> (&tmp); break; case 4: swap_bytes<4> (&tmp); break; case 2: swap_bytes<2> (&tmp); break; case 1: default: break; } this->scalar = tmp; return true; } #if defined (HAVE_HDF5) template <class T> bool octave_base_int_scalar<T>::save_hdf5 (hid_t loc_id, const char *name, bool) { hid_t save_type_hid = HDF5_SAVE_TYPE; bool retval = true; hsize_t dimens[3]; hid_t space_hid = -1, data_hid = -1; space_hid = H5Screate_simple (0, dimens, 0); if (space_hid < 0) return false; #if HAVE_HDF5_18 data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); #else data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid, H5P_DEFAULT); #endif if (data_hid < 0) { H5Sclose (space_hid); return false; } retval = H5Dwrite (data_hid, save_type_hid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &(this->scalar)) >= 0; H5Dclose (data_hid); H5Sclose (space_hid); return retval; } template <class T> bool octave_base_int_scalar<T>::load_hdf5 (hid_t loc_id, const char *name) { hid_t save_type_hid = HDF5_SAVE_TYPE; #if HAVE_HDF5_18 hid_t data_hid = H5Dopen (loc_id, name, H5P_DEFAULT); #else hid_t data_hid = H5Dopen (loc_id, name); #endif hid_t space_id = H5Dget_space (data_hid); hsize_t rank = H5Sget_simple_extent_ndims (space_id); if (rank != 0) { H5Dclose (data_hid); return false; } T tmp; if (H5Dread (data_hid, save_type_hid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &tmp) < 0) { H5Dclose (data_hid); return false; } this->scalar = tmp; H5Dclose (data_hid); return true; } #endif