Mercurial > hg > octave-lyh
view libinterp/octave-value/ov-flt-re-diag.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) 2008-2012 Jaroslav Hajek 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_float_diag_matrix_h) #define octave_float_diag_matrix_h 1 #include "ov-base.h" #include "ov-base-diag.h" #include "ov-flt-re-mat.h" #include "ov-typeinfo.h" // Real diagonal matrix values. class OCTINTERP_API octave_float_diag_matrix : public octave_base_diag<FloatDiagMatrix, FloatMatrix> { public: octave_float_diag_matrix (void) : octave_base_diag<FloatDiagMatrix, FloatMatrix> () { } octave_float_diag_matrix (const FloatDiagMatrix& m) : octave_base_diag<FloatDiagMatrix, FloatMatrix> (m) { } octave_float_diag_matrix (const octave_float_diag_matrix& m) : octave_base_diag<FloatDiagMatrix, FloatMatrix> (m) { } ~octave_float_diag_matrix (void) { } octave_base_value *clone (void) const { return new octave_float_diag_matrix (*this); } octave_base_value *empty_clone (void) const { return new octave_float_diag_matrix (); } type_conv_info numeric_conversion_function (void) const; octave_base_value *try_narrowing_conversion (void); builtin_type_t builtin_type (void) const { return btyp_float; } bool is_real_matrix (void) const { return true; } bool is_real_type (void) const { return true; } bool is_single_type (void) const { return true; } bool is_float_type (void) const { return true; } DiagMatrix diag_matrix_value (bool = false) const; FloatDiagMatrix float_diag_matrix_value (bool = false) const; ComplexDiagMatrix complex_diag_matrix_value (bool = false) const; FloatComplexDiagMatrix float_complex_diag_matrix_value (bool = false) const; bool save_binary (std::ostream& os, bool& save_as_floats); bool load_binary (std::istream& is, bool swap, oct_mach_info::float_format fmt); octave_value map (unary_mapper_t umap) const; private: bool chk_valid_scalar (const octave_value&, float&) const; DECLARE_OCTAVE_ALLOCATOR DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA }; #endif