Mercurial > hg > octave-lyh
view libinterp/interpfcn/octave-link.h @ 16468:0f143f68078d
use signal/slot for updating workspace instead of using event listener
* main-window.h, main-window.cc: Clean up list of include files.
(main_window::prepare_to_exit): Rename from prepare_to_quit. Change
all uses.
(main_window::update_workspace): Delete.
(main_window::construct): Don't connect
_octave_qt_event_listener:update_workspace_signal to
main_window::update_workspace.
(main_window::construct_octave_qt_link):
Connect _octave_qt_link::set_workspace_signal to
_workspace_model::set_workspace.
Connect _octave_qt_link::clear_workspace_signal to
_workspace_model::clear_workspace.
* symbol-information.h, symbol-information.cc: Delete
* libgui/src/module.mk (noinst_HEADERS, src_libgui_src_la_SOURCES):
Remove them from the lists.
* octave-qt-link.h, octave-qt-link.cc: Don't use symbol_information to
store workspace info.
(octave_qt_link::do_update_workspace): Delete.
(octave_qt_link::do_set_workspace,
octave_qt_link::do_clear_workspace): New functions.
(octave_qt_link::do_pre_input_event): Don't call do_update_workspace.
(octave_qt_link::set_workspace_signal,
octave_qt_link::clear_workspace_signal): New signals.
* workspace-model.h, workspace-model.cc: Don't use symbol_information
to store workspace info. Accept workspace info through a signal/slot
combination, not by asking the symbol table.
(workspace_model::request_update_workspace,
(workspace_model::update_workspace_callback): Delete.
(workspace_model::set_workspace, workspace_model::clear_workspace,
workspace_model::clear_data, workspace_model::clear_tree,
workspace_model::update_tree, workspace_model::append_tree):
New functions.
* workspace-view.h, workspace-view.cc (workspace_view::model_changed):
Don't call update_workspace_callback. The model now signals the view
when it has changed.
* input.cc (octave_base_reader::octave_gets, get_debug_input):
Call octave_link::set_workspace just prior to prompting for input.
* workspace-element.h: New file.
* libinterp/interpfcn/module.mk (INTERPFCN_INC): Include it in the list.
* octave-link.cc: Don't include symtab.h.
* octave-link.h (octave_link::update_workspace): Delete.
(octave_link::set_workspace, octave_link::do_set_workspace,
* octave_link::clear_workspace, octave_link::do_clear_workspace):
New functions.
* symtab.h, symtab.cc (symbol_table::workspace_info,
symbol_table::do_workspace_info): New functions.
* ov.h (octave_value::short_disp): New function.
* ov-base.h, ov-base.cc (octave_base_value::short_disp): New function.
* ov-base-scalar.h, ov-base-scalar.cc
(octave_base_scalar<ST>::short_disp): New function.
* ov-range.h, ov-range.cc (octave_range::short_disp): New function.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 08 Apr 2013 12:01:24 -0400 |
parents | 7a2ee6ea7800 |
children | 7a71ea0b7ae9 |
line wrap: on
line source
/* Copyright (C) 2013 John W. Eaton Copyright (C) 2011-2012 Jacob Dawid Copyright (C) 2011-2012 John P. Swensen 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/>. */ #if !defined (octave_link_h) #define octave_link_h 1 #include <string> #include "event-queue.h" #include "octave-event-listener.h" class octave_mutex; class string_vector; class workspace_element; // \class OctaveLink // \brief Provides threadsafe access to octave. // \author Jacob Dawid // // This class is a wrapper around octave and provides thread safety by // buffering access operations to octave and executing them in the // readline event hook, which lives in the octave thread. class octave_link { protected: octave_link (void); public: virtual ~octave_link (void) { } static void register_event_listener (octave_event_listener *el) { if (instance_ok ()) instance->do_register_event_listener (el); } static void generate_events (void) { if (instance_ok ()) instance->do_generate_events (); } static void process_events (void) { if (instance_ok ()) instance->do_process_events (); } template <class T> static void post_event (T *obj, void (T::*method) (void)) { if (instance_ok ()) instance->do_post_event (obj, method); } template <class T, class A> static void post_event (T *obj, void (T::*method) (A), A arg) { if (instance_ok ()) instance->do_post_event (obj, method, arg); } template <class T, class A> static void post_event (T *obj, void (T::*method) (const A&), const A& arg) { if (instance_ok ()) instance->do_post_event (obj, method, arg); } static void about_to_exit (void) { if (instance_ok ()) instance->do_about_to_exit (); } static void entered_readline_hook (void) { if (instance_ok ()) instance->do_entered_readline_hook (); } static void finished_readline_hook (void) { if (instance_ok ()) instance->do_finished_readline_hook (); } static bool edit_file (const std::string& file) { return instance_ok () ? instance->do_edit_file (file) : false; } static void change_directory (const std::string& dir) { if (instance_ok ()) instance->do_change_directory (dir); } static void set_workspace (const std::list<workspace_element>& ws) { if (instance_ok ()) instance->do_set_workspace (ws); } static void clear_workspace (void) { if (instance_ok ()) instance->do_clear_workspace (); } static void set_history (const string_vector& hist) { if (instance_ok ()) instance->do_set_history (hist); } static void append_history (const std::string& hist_entry) { if (instance_ok ()) instance->do_append_history (hist_entry); } static void clear_history (void) { if (instance_ok ()) instance->do_clear_history (); } static void pre_input_event (void) { if (instance_ok ()) instance->do_pre_input_event (); } static void post_input_event (void) { if (instance_ok ()) instance->do_post_input_event (); } static void enter_debugger_event (const std::string& file, int line) { if (instance_ok ()) { instance->debugging = true; instance->do_enter_debugger_event (file, line); } } static void execute_in_debugger_event (const std::string& file, int line) { if (instance_ok ()) instance->do_execute_in_debugger_event (file, line); } static void exit_debugger_event (void) { if (instance_ok () && instance->debugging) { instance->debugging = false; instance->do_exit_debugger_event (); } } static void update_breakpoint (bool insert, const std::string& file, int line) { if (instance_ok ()) instance->do_update_breakpoint (insert, file, line); } static void connect_link (octave_link *); private: static octave_link *instance; static void cleanup_instance (void) { delete instance; instance = 0; } // No copying! octave_link (const octave_link&); octave_link& operator = (const octave_link&); static bool instance_ok (void); protected: octave_event_listener *event_listener; // Semaphore to lock access to the event queue. octave_mutex *event_queue_mutex; // Event Queue. event_queue gui_event_queue; bool debugging; void do_register_event_listener (octave_event_listener *oel); void do_generate_events (void); void do_process_events (void); template <class T> void do_post_event (T *obj, void (T::*method) (void)) { gui_event_queue.add_method (obj, method); } template <class T, class A> void do_post_event (T *obj, void (T::*method) (A), A arg) { gui_event_queue.add_method (obj, method, arg); } template <class T, class A> void do_post_event (T *obj, void (T::*method) (const A&), const A& arg) { gui_event_queue.add_method (obj, method, arg); } void do_about_to_exit (void); void do_entered_readline_hook (void) { } void do_finished_readline_hook (void) { } virtual bool do_edit_file (const std::string& file) = 0; virtual void do_change_directory (const std::string& dir) = 0; virtual void do_set_workspace (const std::list<workspace_element>& ws) = 0; virtual void do_clear_workspace (void) = 0; virtual void do_set_history (const string_vector& hist) = 0; virtual void do_append_history (const std::string& hist_entry) = 0; virtual void do_clear_history (void) = 0; virtual void do_pre_input_event (void) = 0; virtual void do_post_input_event (void) = 0; virtual void do_enter_debugger_event (const std::string& file, int line) = 0; virtual void do_execute_in_debugger_event (const std::string& file, int line) = 0; virtual void do_exit_debugger_event (void) = 0; virtual void do_update_breakpoint (bool insert, const std::string& file, int line) = 0; }; #endif // OCTAVELINK_H