Mercurial > hg > octave-lyh
view libinterp/octave-value/module.mk @ 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 | f96faf028d90 |
| children | 009984ecf419 |
line wrap: on
line source
EXTRA_DIST += \ octave-value/module.mk OV_INTTYPE_INC = \ octave-value/ov-base-int.h \ octave-value/ov-base-int.cc \ octave-value/ov-int-traits.h \ octave-value/ov-int16.h \ octave-value/ov-int32.h \ octave-value/ov-int64.h \ octave-value/ov-int8.h \ octave-value/ov-intx.h \ octave-value/ov-uint16.h \ octave-value/ov-uint32.h \ octave-value/ov-uint64.h \ octave-value/ov-uint8.h OV_SPARSE_INC = \ octave-value/ov-base-sparse.h \ octave-value/ov-bool-sparse.h \ octave-value/ov-cx-sparse.h \ octave-value/ov-re-sparse.h OCTAVE_VALUE_INC = \ octave-value/ov-base-diag.h \ octave-value/ov-base-diag.cc \ octave-value/ov-base-mat.h \ octave-value/ov-base-mat.cc \ octave-value/ov-base-scalar.h \ octave-value/ov-base-scalar.cc \ octave-value/ov-base.h \ octave-value/ov-bool-mat.h \ octave-value/ov-bool-mat.cc \ octave-value/ov-bool.h \ octave-value/ov-builtin.h \ octave-value/ov-cell.h \ octave-value/ov-ch-mat.h \ octave-value/ov-class.h \ octave-value/ov-colon.h \ octave-value/ov-complex.h \ octave-value/ov-cs-list.h \ octave-value/ov-cx-diag.h \ octave-value/ov-cx-mat.h \ octave-value/ov-dld-fcn.h \ octave-value/ov-fcn-handle.h \ octave-value/ov-fcn-inline.h \ octave-value/ov-fcn.h \ octave-value/ov-float.h \ octave-value/ov-flt-complex.h \ octave-value/ov-flt-cx-diag.h \ octave-value/ov-flt-cx-mat.h \ octave-value/ov-flt-re-diag.h \ octave-value/ov-flt-re-mat.h \ octave-value/ov-java.h \ octave-value/ov-lazy-idx.h \ octave-value/ov-mex-fcn.h \ octave-value/ov-null-mat.h \ octave-value/ov-oncleanup.h \ octave-value/ov-perm.h \ octave-value/ov-range.h \ octave-value/ov-re-diag.h \ octave-value/ov-re-mat.h \ octave-value/ov-scalar.h \ octave-value/ov-str-mat.h \ octave-value/ov-struct.h \ octave-value/ov-type-conv.h \ octave-value/ov-typeinfo.h \ octave-value/ov-usr-fcn.h \ octave-value/ov.h \ $(OV_INTTYPE_INC) \ $(OV_SPARSE_INC) OV_INTTYPE_SRC = \ octave-value/ov-int16.cc \ octave-value/ov-int32.cc \ octave-value/ov-int64.cc \ octave-value/ov-int8.cc \ octave-value/ov-uint16.cc \ octave-value/ov-uint32.cc \ octave-value/ov-uint64.cc \ octave-value/ov-uint8.cc OV_SPARSE_SRC = \ octave-value/ov-base-sparse.cc \ octave-value/ov-bool-sparse.cc \ octave-value/ov-cx-sparse.cc \ octave-value/ov-re-sparse.cc OCTAVE_VALUE_SRC = \ octave-value/ov-base.cc \ octave-value/ov-bool-mat.cc \ octave-value/ov-bool.cc \ octave-value/ov-builtin.cc \ octave-value/ov-cell.cc \ octave-value/ov-ch-mat.cc \ octave-value/ov-class.cc \ octave-value/ov-colon.cc \ octave-value/ov-complex.cc \ octave-value/ov-cs-list.cc \ octave-value/ov-cx-diag.cc \ octave-value/ov-cx-mat.cc \ octave-value/ov-dld-fcn.cc \ octave-value/ov-fcn-handle.cc \ octave-value/ov-fcn-inline.cc \ octave-value/ov-fcn.cc \ octave-value/ov-float.cc \ octave-value/ov-flt-complex.cc \ octave-value/ov-flt-cx-diag.cc \ octave-value/ov-flt-cx-mat.cc \ octave-value/ov-flt-re-diag.cc \ octave-value/ov-flt-re-mat.cc \ octave-value/ov-java.cc \ octave-value/ov-lazy-idx.cc \ octave-value/ov-mex-fcn.cc \ octave-value/ov-null-mat.cc \ octave-value/ov-oncleanup.cc \ octave-value/ov-perm.cc \ octave-value/ov-range.cc \ octave-value/ov-re-diag.cc \ octave-value/ov-re-mat.cc \ octave-value/ov-scalar.cc \ octave-value/ov-str-mat.cc \ octave-value/ov-struct.cc \ octave-value/ov-typeinfo.cc \ octave-value/ov-usr-fcn.cc \ octave-value/ov.cc \ $(OV_INTTYPE_SRC) \ $(OV_SPARSE_SRC) noinst_LTLIBRARIES += octave-value/liboctave-value.la octave_value_liboctave_value_la_SOURCES = $(OCTAVE_VALUE_SRC) ## FIXME -- maybe it would be better to limit the JAVA flags to ## the compile commands for ov-java.cc? Does JAVA_LIBS need to be ## added to LIBOCTINTERP_LINK_DEPS (see libinterp/link-deps.mk)? ## Should we have a separate set of JAVA_LDFLAGS? octave_value_liboctave_value_la_CPPFLAGS = \ $(liboctinterp_la_CPPFLAGS) \ $(JAVA_CPPFLAGS) octave_value_liboctave_value_la_LIBADD = $(JAVA_LIBS)