Mercurial > octave
view libinterp/corefcn/octave-link.h @ 24645:f61502510d08
restore ability to select variables for editing from workspace widget
* octave-qt-link.h, octave-qt-link.cc: Declare octave::symbol_scope as
a Qt metatype.
(octave_qt_link::set_workspace_signal): Pass scope instead of
individual lists of scope things. Change all uses.
(octave_qt_link::do_set_workspace): Pass scope instead of list of
workspace_element objects.
* octave-link.h, octave-link.cc (octave_link::set_workspace,
octave_link::do_set_workspace): Pass scope instead of list of
workspace_element objects. Change all uses.
* workspace-model.h, workspace-model.cc (workspace_model::m_scope):
New data member.
(workspace_model::set_workspace): Pass and store scope instead of
individual lists of scope things. Change all uses.
(workspace_model::clear_data): Also invalidate m_scope.
(workspace_model::update_table): Unpack scope info here without using
an intermediate list of workspace elements.
(workspace_model::scope): New function.
* workspace-view.h, workspace-view.cc
(workspace_view::edit_variable_signal): Also pass value object.
Change all uses.
(workspace_view::setModel): Also extract value from scope.
* workspace-element.h: Delete.
* libinterp/corefcn/module.mk: Update.
* symscope.h, symscope.cc (symbol_scope::workspace_info,
symbol_scope::symbol_scope_rep::workspace_info): Delete.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sat, 27 Jan 2018 09:06:50 -0500 |
parents | 7d177be54c37 |
children | 13c207835e79 |
line wrap: on
line source
/* Copyright (C) 2013-2017 John W. Eaton Copyright (C) 2011-2016 Jacob Dawid Copyright (C) 2011-2016 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 <https://www.gnu.org/licenses/>. */ #if ! defined (octave_octave_link_h) #define octave_octave_link_h 1 #include "octave-config.h" #include <list> #include <string> #include "oct-mutex.h" #include "event-queue.h" class octave_value; class string_vector; namespace octave { class symbol_scope; } //! 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 OCTINTERP_API octave_link { protected: octave_link (void); public: // No copying! octave_link (const octave_link&) = delete; octave_link& operator = (const octave_link&) = delete; virtual ~octave_link (void); static void generate_events (void) { if (enabled ()) instance->do_generate_events (); } // If disable is TRUE, then no additional events will be processed // other than exit. static void process_events (bool disable = false) { if (enabled ()) { if (disable) instance->do_disable (); instance->do_process_events (); } } static void discard_events (void) { if (enabled ()) instance->do_discard_events (); } static bool confirm_shutdown (void) { bool retval = true; if (enabled ()) retval = instance->do_confirm_shutdown (); return retval; } template <typename T> static void post_event (T *obj, void (T::*method) (void)) { if (enabled ()) instance->do_post_event (obj, method); } template <typename T, typename A> static void post_event (T *obj, void (T::*method) (A), A arg) { if (enabled ()) instance->do_post_event (obj, method, arg); } template <typename T, typename A> static void post_event (T *obj, void (T::*method) (const A&), const A& arg) { if (enabled ()) instance->do_post_event (obj, method, arg); } template <class T, class A, class B> static void post_event (T *obj, void (T::*method) (const A&, const B&), const A& arg_a, const B& arg_b) { if (enabled ()) instance->do_post_event<T, A, B> (obj, method, arg_a, arg_b); } template <class T, class A, class B, class C> static void post_event (T *obj, void (T::*method) (const A&, const B&, const C&), const A& arg_a, const B& arg_b, const C& arg_c) { if (enabled ()) instance->do_post_event<T, A, B, C> (obj, method, arg_a, arg_b, arg_c); } template <class T, class A, class B, class C, class D> static void post_event (T *obj, void (T::*method) (const A&, const B&, const C&, const D&), const A& arg_a, const B& arg_b, const C& arg_c, const D& arg_d) { if (enabled ()) instance->do_post_event<T, A, B, C, D> (obj, method, arg_a, arg_b, arg_c, arg_d); } static void entered_readline_hook (void) { if (enabled ()) instance->do_entered_readline_hook (); } static void finished_readline_hook (void) { if (enabled ()) instance->do_finished_readline_hook (); } static bool copy_image_to_clipboard (const std::string& file) { return enabled () ? instance->do_copy_image_to_clipboard (file) : false; } static bool edit_file (const std::string& file) { return enabled () ? instance->do_edit_file (file) : false; } static bool prompt_new_edit_file (const std::string& file) { return enabled () ? instance->do_prompt_new_edit_file (file) : false; } static int message_dialog (const std::string& dlg, const std::string& msg, const std::string& title) { return enabled () ? instance->do_message_dialog (dlg, msg, title) : 0; } static std::string question_dialog (const std::string& msg, const std::string& title, const std::string& btn1, const std::string& btn2, const std::string& btn3, const std::string& btndef) { return enabled () ? instance->do_question_dialog (msg, title, btn1, btn2, btn3, btndef) : ""; } static std::pair<std::list<int>, int> list_dialog (const std::list<std::string>& list, const std::string& mode, int width, int height, const std::list<int>& initial_value, const std::string& name, const std::list<std::string>& prompt, const std::string& ok_string, const std::string& cancel_string) { return enabled () ? instance->do_list_dialog (list, mode, width, height, initial_value, name, prompt, ok_string, cancel_string) : std::pair<std::list<int>, int> (); } static std::list<std::string> input_dialog (const std::list<std::string>& prompt, const std::string& title, const std::list<float>& nr, const std::list<float>& nc, const std::list<std::string>& defaults) { return enabled () ? instance->do_input_dialog (prompt, title, nr, nc, defaults) : std::list<std::string> (); } typedef std::list<std::pair<std::string, std::string>> filter_list; static std::list<std::string> file_dialog (const filter_list& filter, const std::string& title, const std::string& filename, const std::string& dirname, const std::string& multimode) { return enabled () ? instance->do_file_dialog (filter, title, filename, dirname, multimode) : std::list<std::string> (); } static int debug_cd_or_addpath_error (const std::string& file, const std::string& dir, bool addpath_option) { return enabled () ? instance->do_debug_cd_or_addpath_error (file, dir, addpath_option) : 0; } static void change_directory (const std::string& dir) { if (enabled ()) instance->do_change_directory (dir); } // Preserves pending input. static void execute_command_in_terminal (const std::string& command) { if (enabled ()) instance->do_execute_command_in_terminal (command); } static void set_workspace (void); static void set_workspace (bool top_level, const octave::symbol_scope& scope, bool update_variable_editor = true) { if (enabled ()) instance->do_set_workspace (top_level, instance->debugging, scope, update_variable_editor); } static void clear_workspace (void) { if (enabled ()) instance->do_clear_workspace (); } static void set_history (const string_vector& hist) { if (enabled ()) instance->do_set_history (hist); } static void append_history (const std::string& hist_entry) { if (enabled ()) instance->do_append_history (hist_entry); } static void clear_history (void) { if (enabled ()) instance->do_clear_history (); } static void pre_input_event (void) { if (enabled ()) instance->do_pre_input_event (); } static void post_input_event (void) { if (enabled ()) instance->do_post_input_event (); } static void enter_debugger_event (const std::string& file, int line) { if (enabled ()) { instance->debugging = true; instance->do_enter_debugger_event (file, line); } } static void execute_in_debugger_event (const std::string& file, int line) { if (enabled ()) instance->do_execute_in_debugger_event (file, line); } static void exit_debugger_event (void) { if (enabled () && instance->debugging) { instance->debugging = false; instance->do_exit_debugger_event (); } } static void update_breakpoint (bool insert, const std::string& file, int line, const std::string& cond = "") { if (enabled ()) instance->do_update_breakpoint (insert, file, line, cond); } static void connect_link (octave_link *); static octave_link * disconnect_link (bool delete_instance = true) { if (delete_instance) { delete instance; instance = nullptr; return nullptr; } else { octave_link *retval = instance; instance = nullptr; return retval; } } static void set_default_prompts (std::string& ps1, std::string& ps2, std::string& ps4) { if (enabled ()) instance->do_set_default_prompts (ps1, ps2, ps4); } static bool enable (void) { return instance_ok () ? instance->do_enable () : false; } static bool disable (void) { return instance_ok () ? instance->do_disable () : false; } bool do_enable (void) { bool retval = link_enabled; link_enabled = true; return retval; } bool do_disable (void) { bool retval = link_enabled; link_enabled = false; return retval; } static bool enabled (void) { return instance_ok () ? instance->link_enabled : false; } static bool show_preferences () { if (enabled ()) { instance->do_show_preferences (); return true; } else return false; } static bool show_doc (const std::string & file) { if (enabled ()) { instance->do_show_doc (file); return true; } else return false; } static bool edit_variable (const std::string &name, const octave_value& val) { if (enabled ()) { instance->do_edit_variable (name, val); return true; } else return false; } private: static octave_link *instance; static bool instance_ok (void) { return instance != nullptr; } protected: // Semaphore to lock access to the event queue. octave::mutex *event_queue_mutex; // Event Queue. octave::event_queue gui_event_queue; bool debugging; bool link_enabled; void do_generate_events (void); void do_process_events (void); void do_discard_events (void); template <typename T> void do_post_event (T *obj, void (T::*method) (void)) { gui_event_queue.add_method (obj, method); } template <typename T, typename A> void do_post_event (T *obj, void (T::*method) (A), A arg) { gui_event_queue.add_method (obj, method, arg); } template <typename T, typename A> void do_post_event (T *obj, void (T::*method) (const A&), const A& arg) { gui_event_queue.add_method (obj, method, arg); } template <class T, class A, class B> void do_post_event (T *obj, void (T::*method) (const A&, const B&), const A& arg_a, const B& arg_b) { gui_event_queue.add_method<T, A, B> (obj, method, arg_a, arg_b); } template <class T, class A, class B, class C> void do_post_event (T *obj, void (T::*method) (const A&, const B&, const C&), const A& arg_a, const B& arg_b, const C& arg_c) { gui_event_queue.add_method<T, A, B, C> (obj, method, arg_a, arg_b, arg_c); } template <class T, class A, class B, class C, class D> void do_post_event (T *obj, void (T::*method) (const A&, const B&, const C&, const D&), const A& arg_a, const B& arg_b, const C& arg_c, const D& arg_d) { gui_event_queue.add_method<T, A, B, C, D> (obj, method, arg_a, arg_b, arg_c, arg_d); } void do_entered_readline_hook (void) { } void do_finished_readline_hook (void) { } virtual bool do_confirm_shutdown (void) = 0; virtual bool do_copy_image_to_clipboard (const std::string& file) = 0; virtual bool do_edit_file (const std::string& file) = 0; virtual bool do_prompt_new_edit_file (const std::string& file) = 0; virtual int do_message_dialog (const std::string& dlg, const std::string& msg, const std::string& title) = 0; virtual std::string do_question_dialog (const std::string& msg, const std::string& title, const std::string& btn1, const std::string& btn2, const std::string& btn3, const std::string& btndef) = 0; virtual std::pair<std::list<int>, int> do_list_dialog (const std::list<std::string>& list, const std::string& mode, int width, int height, const std::list<int>& initial_value, const std::string& name, const std::list<std::string>& prompt, const std::string& ok_string, const std::string& cancel_string) = 0; virtual std::list<std::string> do_input_dialog (const std::list<std::string>& prompt, const std::string& title, const std::list<float>& nr, const std::list<float>& nc, const std::list<std::string>& defaults) = 0; virtual std::list<std::string> do_file_dialog (const filter_list& filter, const std::string& title, const std::string& filename, const std::string& dirname, const std::string& multimode) = 0; virtual int do_debug_cd_or_addpath_error (const std::string& file, const std::string& dir, bool addpath_option) = 0; virtual void do_change_directory (const std::string& dir) = 0; virtual void do_execute_command_in_terminal (const std::string& command) = 0; virtual void do_set_workspace (bool top_level, bool debug, const octave::symbol_scope& scope, bool update_variable_editor) = 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, const std::string& cond) = 0; virtual void do_set_default_prompts (std::string& ps1, std::string& ps2, std::string& ps4) = 0; virtual void do_show_preferences (void) = 0; virtual void do_show_doc (const std::string& file) = 0; virtual void do_edit_variable (const std::string& name, const octave_value& val) = 0; }; #endif