Mercurial > hg > octave-lyh
view libinterp/interpfcn/octave-link.cc @ 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 | a971d8bdaadc |
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/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include "cmd-edit.h" #include "defun.h" #include "oct-env.h" #include "oct-mutex.h" #include "singleton-cleanup.h" #include "toplev.h" #include "octave-link.h" static int octave_readline_hook (void) { octave_link::entered_readline_hook (); octave_link::generate_events (); octave_link::process_events (); octave_link::finished_readline_hook (); return 0; } static void octave_exit_hook (int) { octave_link::about_to_exit (); } octave_link *octave_link::instance = 0; octave_link::octave_link (void) : event_listener (0), event_queue_mutex (new octave_mutex ()), gui_event_queue (), debugging (false) { command_editor::add_event_hook (octave_readline_hook); octave_exit = octave_exit_hook; } // OBJ should be an object of a class that is derived from the base // class octave_link, or 0 to disconnect the link. It is the // responsibility of the caller to delete obj. void octave_link::connect_link (octave_link* obj) { if (obj && instance) ::error ("octave_link is already linked!"); else instance = obj; } void octave_link::do_register_event_listener (octave_event_listener *el) { event_listener = el; } void octave_link::do_generate_events (void) { } void octave_link::do_process_events (void) { event_queue_mutex->lock (); gui_event_queue.run (); event_queue_mutex->unlock (); } void octave_link::do_about_to_exit (void) { event_queue_mutex->lock (); gui_event_queue.discard (); event_queue_mutex->unlock (); if (event_listener) event_listener->about_to_exit (); } bool octave_link::instance_ok (void) { return instance != 0; } DEFUN (__octave_link_edit_file__, args, , "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {} __octave_link_edit_file__ (@var{file})\n\ Undocumented internal function.\n\ @end deftypefn") { octave_value retval; if (args.length () == 1) { std::string file = args(0).string_value (); if (! error_state) retval = octave_link::edit_file (file); else error ("expecting file name as argument"); } return retval; }