Mercurial > octave
diff libgui/src/octave-qt-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 | 7a2ee6ea7800 |
children | 7a71ea0b7ae9 |
line wrap: on
line diff
--- a/libgui/src/octave-qt-link.cc Sat Apr 06 18:08:08 2013 +0100 +++ b/libgui/src/octave-qt-link.cc Mon Apr 08 12:01:24 2013 -0400 @@ -30,6 +30,8 @@ #include "str-vec.h" +#include "workspace-element.h" + #include "octave-qt-link.h" octave_qt_link::octave_qt_link (void) @@ -58,14 +60,31 @@ } void -octave_qt_link::do_update_workspace (void) +octave_qt_link::do_set_workspace (const std::list<workspace_element>& ws) { - if (event_listener) + QString scopes; + QStringList symbols; + QStringList class_names; + QStringList dimensions; + QStringList values; + + for (std::list<workspace_element>::const_iterator it = ws.begin (); + it != ws.end (); it++) { - event_listener->update_workspace (); + scopes.append (it->scope ()); + symbols.append (QString::fromStdString (it->symbol ())); + class_names.append (QString::fromStdString (it->class_name ())); + dimensions.append (QString::fromStdString (it->dimension ())); + values.append (QString::fromStdString (it->value ())); + } - do_process_events (); - } + emit set_workspace_signal (scopes, symbols, class_names, dimensions, values); +} + +void +octave_qt_link::do_clear_workspace (void) +{ + emit clear_workspace_signal (); } void @@ -94,7 +113,6 @@ void octave_qt_link::do_pre_input_event (void) { - do_update_workspace (); } void