Mercurial > hg > octave-nkf
view src/pt-assign.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 | fd0a3ac60b0e |
children | 922bfdd80413 |
line wrap: on
line source
/* Copyright (C) 1996-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 <iostream> #include <set> #include "defun.h" #include "error.h" #include "gripes.h" #include "input.h" #include "oct-obj.h" #include "oct-lvalue.h" #include "pager.h" #include "ov.h" #include "pt-arg-list.h" #include "pt-bp.h" #include "pt-assign.h" #include "pt-walk.h" #include "utils.h" #include "variables.h" // Simple assignment expressions. // FIXME -- the following variable and the function that uses it // should be removed from some future version of Octave. static const char *former_built_in_variables[] = { "DEFAULT_EXEC_PATH", "DEFAULT_LOADPATH", "EDITOR", "EXEC_PATH", "FFTW_WISDOM_PROGRAM", "IMAGEPATH", "INFO_FILE", "INFO_PROGRAM", "LOADPATH", "MAKEINFO_PROGRAM", "PAGER", "PS1", "PS2", "PS4", "__kluge_procbuf_delay__", "automatic_replot", "beep_on_error", "completion_append_char", "crash_dumps_octave_core", "current_script_file_name", "debug_on_error", "debug_on_interrupt", "debug_on_warning", "debug_symtab_lookups", "default_save_format", "echo_executing_commands", "fixed_point_format", "gnuplot_binary", "gnuplot_command_axes", "gnuplot_command_end", "gnuplot_command_plot", "gnuplot_command_replot", "gnuplot_command_splot", "gnuplot_command_title", "gnuplot_command_using", "gnuplot_command_with", "gnuplot_has_frames", "history_file", "history_size", "ignore_function_time_stamp", "max_recursion_depth", "octave_core_file_format", "octave_core_file_limit", "octave_core_file_name", "output_max_field_width", "output_precision", "page_output_immediately", "page_screen_output", "print_answer_id_name", "print_empty_dimensions", "print_rhs_assign_val", "save_header_format_string", "save_precision", "saving_history", "sighup_dumps_octave_core", "sigterm_dumps_octave_core", "silent_functions", "split_long_rows", "string_fill_char", "struct_levels_to_print", "suppress_verbose_help_message", "variables_can_hide_functions", "warn_assign_as_truth_value", "warn_associativity_change", "warn_divide_by_zero", "warn_empty_list_elements", "warn_fortran_indexing", "warn_function_name_clash", "warn_future_time_stamp", "warn_imag_to_real", "warn_matlab_incompatible", "warn_missing_semicolon", "warn_neg_dim_as_zero", "warn_num_to_str", "warn_precedence_change", "warn_reload_forces_clear", "warn_resize_on_range_error", "warn_separator_insert", "warn_single_quote_string", "warn_str_to_num", "warn_undefined_return_values", "warn_variable_switch_label", "whos_line_format", 0, }; static void maybe_warn_former_built_in_variable (const std::string& nm) { static bool initialized = false; static std::set<std::string> vars; if (! initialized) { const char **p = former_built_in_variables; while (*p) vars.insert (*p++); initialized = true; } if (vars.find (nm) != vars.end ()) { const char *nm_c_str = nm.c_str (); warning_with_id ("Octave:built-in-variable-assignment", "%s is now a function instead of a built-in variable. By assigning to %s, you have created a variable that hides the function %s. To remove the variable and restore the function, type \"clear %s\"", nm_c_str, nm_c_str, nm_c_str, nm_c_str); } } tree_simple_assignment::tree_simple_assignment (tree_expression *le, tree_expression *re, bool plhs, int l, int c, octave_value::assign_op t) : tree_expression (l, c), lhs (le), rhs (re), preserve (plhs), etype (t), first_execution (true) { } tree_simple_assignment::~tree_simple_assignment (void) { if (! preserve) delete lhs; delete rhs; } octave_value_list tree_simple_assignment::rvalue (int nargout) { octave_value_list retval; if (nargout > 1) error ("invalid number of output arguments for expression X = RHS"); else retval = rvalue1 (nargout); return retval; } octave_value tree_simple_assignment::rvalue1 (int) { octave_value retval; if (first_execution && lhs) maybe_warn_former_built_in_variable (lhs->name ()); if (error_state) return retval; if (rhs) { octave_value rhs_val = rhs->rvalue1 (); if (! error_state) { if (rhs_val.is_undefined ()) { error ("value on right hand side of assignment is undefined"); return retval; } else { if (rhs_val.is_cs_list ()) { const octave_value_list lst = rhs_val.list_value (); if (! lst.empty ()) rhs_val = lst(0); else { error ("invalid number of elements on RHS of assignment"); return retval; } } octave_lvalue ult = lhs->lvalue (); if (ult.numel () != 1) gripe_nonbraced_cs_list_assignment (); if (! error_state) { ult.assign (etype, rhs_val); if (! error_state) { if (etype == octave_value::op_asn_eq) retval = rhs_val; else retval = ult.value (); if (print_result ()) { // We clear any index here so that we can // get the new value of the referenced // object below, instead of the indexed // value (which should be the same as the // right hand side value). ult.clear_index (); octave_value lhs_val = ult.value (); if (! error_state) lhs_val.print_with_name (octave_stdout, lhs->name ()); } } } } } } first_execution = false; return retval; } std::string tree_simple_assignment::oper (void) const { return octave_value::assign_op_as_string (etype); } tree_expression * tree_simple_assignment::dup (symbol_table::scope_id scope, symbol_table::context_id context) const { tree_simple_assignment *new_sa = new tree_simple_assignment (lhs ? lhs->dup (scope, context) : 0, rhs ? rhs->dup (scope, context) : 0, preserve, etype); new_sa->copy_base (*this); return new_sa; } void tree_simple_assignment::accept (tree_walker& tw) { tw.visit_simple_assignment (*this); } // Multi-valued assignment expressions. tree_multi_assignment::tree_multi_assignment (tree_argument_list *lst, tree_expression *r, bool plhs, int l, int c) : tree_expression (l, c), lhs (lst), rhs (r), preserve (plhs), first_execution (true) { } tree_multi_assignment::~tree_multi_assignment (void) { if (! preserve) delete lhs; delete rhs; } octave_value tree_multi_assignment::rvalue1 (int nargout) { octave_value retval; const octave_value_list tmp = rvalue (nargout); if (! tmp.empty ()) retval = tmp(0); return retval; } // FIXME -- this works, but it would look a little better if // it were broken up into a couple of separate functions. octave_value_list tree_multi_assignment::rvalue (int) { octave_value_list retval; if (error_state) return retval; if (first_execution) { for (tree_argument_list::iterator p = lhs->begin (); p != lhs->end (); p++) { tree_expression *lhs_expr = *p; if (lhs_expr) maybe_warn_former_built_in_variable (lhs_expr->name ()); } } if (rhs) { std::list<octave_lvalue> lvalue_list = lhs->lvalue_list (); if (error_state) return retval; octave_idx_type n_out = 0; for (std::list<octave_lvalue>::const_iterator p = lvalue_list.begin (); p != lvalue_list.end (); p++) n_out += p->numel (); // The following trick is used to keep rhs_val constant. const octave_value_list rhs_val1 = rhs->rvalue (n_out, &lvalue_list); const octave_value_list rhs_val = (rhs_val1.length () == 1 && rhs_val1(0).is_cs_list () ? rhs_val1(0).list_value () : rhs_val1); if (error_state) return retval; octave_idx_type k = 0; octave_idx_type n = rhs_val.length (); // To avoid copying per elements and possible optimizations, we // postpone joining the final values. std::list<octave_value_list> retval_list; tree_argument_list::iterator q = lhs->begin (); for (std::list<octave_lvalue>::iterator p = lvalue_list.begin (); p != lvalue_list.end (); p++) { tree_expression *lhs_elt = *q++; octave_lvalue ult = *p; octave_idx_type nel = ult.numel (); if (nel != 1) { if (k + nel <= n) { // This won't do a copy. octave_value_list ovl = rhs_val.slice (k, nel); ult.assign (octave_value::op_asn_eq, octave_value (ovl, true)); if (! error_state) { retval_list.push_back (ovl); k += nel; } } else error ("some elements undefined in return list"); } else { if (k < n) { ult.assign (octave_value::op_asn_eq, rhs_val(k)); if (ult.is_black_hole ()) { k++; continue; } else if (! error_state) { retval_list.push_back (rhs_val(k)); k++; } } else error ("element number %d undefined in return list", k+1); } if (error_state) break; else if (print_result ()) { // We clear any index here so that we can get // the new value of the referenced object below, // instead of the indexed value (which should be // the same as the right hand side value). ult.clear_index (); octave_value lhs_val = ult.value (); if (! error_state) lhs_val.print_with_name (octave_stdout, lhs_elt->name ()); } if (error_state) break; } // Concatenate return values. retval = retval_list; } first_execution = false; return retval; } std::string tree_multi_assignment::oper (void) const { return octave_value::assign_op_as_string (op_type ()); } tree_expression * tree_multi_assignment::dup (symbol_table::scope_id scope, symbol_table::context_id context) const { tree_multi_assignment *new_ma = new tree_multi_assignment (lhs ? lhs->dup (scope, context) : 0, rhs ? rhs->dup (scope, context) : 0, preserve); new_ma->copy_base (*this); return new_ma; } void tree_multi_assignment::accept (tree_walker& tw) { tw.visit_multi_assignment (*this); }