Mercurial > hg > octave-lyh
view libinterp/octave-value/ov-re-sparse.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 | 2fc554ffbc28 |
children |
line wrap: on
line source
/* Copyright (C) 2004-2012 David Bateman Copyright (C) 1998-2004 Andy Adler 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_sparse_matrix_h) #define octave_sparse_matrix_h 1 #include <cstdlib> #include <iosfwd> #include <string> #include "mx-base.h" #include "oct-alloc.h" #include "str-vec.h" #include "error.h" #include "oct-stream.h" #include "ov-base.h" #include "ov-typeinfo.h" #include "dSparse.h" #include "MatrixType.h" #include "ov-base-sparse.h" #include "ov-cx-sparse.h" class octave_value_list; class tree_walker; class OCTINTERP_API octave_sparse_matrix : public octave_base_sparse<SparseMatrix> { public: octave_sparse_matrix (void) : octave_base_sparse<SparseMatrix> () { } octave_sparse_matrix (const Matrix& m) : octave_base_sparse<SparseMatrix> (SparseMatrix (m)) { } octave_sparse_matrix (const NDArray& m) : octave_base_sparse<SparseMatrix> (SparseMatrix (m)) { } octave_sparse_matrix (const SparseMatrix& m) : octave_base_sparse<SparseMatrix> (m) { } octave_sparse_matrix (const SparseMatrix& m, const MatrixType& t) : octave_base_sparse<SparseMatrix> (m, t) { } octave_sparse_matrix (const MSparse<double>& m) : octave_base_sparse<SparseMatrix> (m) { } octave_sparse_matrix (const MSparse<double>& m, const MatrixType& t) : octave_base_sparse<SparseMatrix> (m, t) { } octave_sparse_matrix (const Sparse<double>& m) : octave_base_sparse<SparseMatrix> (SparseMatrix (m)) { } octave_sparse_matrix (const Sparse<double>& m, const MatrixType& t) : octave_base_sparse<SparseMatrix> (SparseMatrix (m), t) { } octave_sparse_matrix (const octave_sparse_matrix& m) : octave_base_sparse<SparseMatrix> (m) { } ~octave_sparse_matrix (void) { } octave_base_value *clone (void) const { return new octave_sparse_matrix (*this); } octave_base_value *empty_clone (void) const { return new octave_sparse_matrix (); } octave_base_value *try_narrowing_conversion (void); idx_vector index_vector (void) const; builtin_type_t builtin_type (void) const { return btyp_double; } bool is_real_matrix (void) const { return true; } bool is_real_type (void) const { return true; } bool is_double_type (void) const { return true; } bool is_float_type (void) const { return true; } double double_value (bool = false) const; double scalar_value (bool frc_str_conv = false) const { return double_value (frc_str_conv); } Matrix matrix_value (bool = false) const; Complex complex_value (bool = false) const; boolNDArray bool_array_value (bool warn = false) const; charNDArray char_array_value (bool = false) const; ComplexMatrix complex_matrix_value (bool = false) const; ComplexNDArray complex_array_value (bool = false) const; NDArray array_value (bool = false) const; SparseMatrix sparse_matrix_value (bool = false) const { return matrix; } SparseComplexMatrix sparse_complex_matrix_value (bool = false) const { return SparseComplexMatrix (matrix); } SparseBoolMatrix sparse_bool_matrix_value (bool warn = false) const; octave_value convert_to_str_internal (bool pad, bool force, char type) const; #if 0 int write (octave_stream& os, int block_size, oct_data_conv::data_type output_type, int skip, oct_mach_info::float_format flt_fmt) const { return os.write (matrix, block_size, output_type, skip, flt_fmt); } #endif bool save_binary (std::ostream& os, bool& save_as_floats); bool load_binary (std::istream& is, bool swap, oct_mach_info::float_format fmt); #if defined (HAVE_HDF5) bool save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats); bool load_hdf5 (hid_t loc_id, const char *name); #endif mxArray *as_mxArray (void) const; octave_value map (unary_mapper_t umap) const; private: octave_value map (double (*fcn) (double)) const; DECLARE_OCTAVE_ALLOCATOR DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA }; #endif