Mercurial > hg > octave-lyh
view libinterp/octave-value/ov-struct.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) 1996-2012 John W. Eaton 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_struct_h) #define octave_struct_h 1 #include <cstdlib> #include <iosfwd> #include <string> #include "mx-base.h" #include "str-vec.h" #include "error.h" #include "oct-alloc.h" #include "oct-map.h" #include "ov-base.h" #include "ov-typeinfo.h" class octave_value_list; class tree_walker; // Data structures. class octave_struct : public octave_base_value { public: octave_struct (void) : octave_base_value (), map () { } octave_struct (const octave_map& m) : octave_base_value (), map (m) { } octave_struct (const octave_struct& s) : octave_base_value (), map (s.map) { } ~octave_struct (void) { } octave_base_value *clone (void) const { return new octave_struct (*this); } octave_base_value *empty_clone (void) const { return new octave_struct (); } octave_base_value *try_narrowing_conversion (void); Cell dotref (const octave_value_list& idx, bool auto_add = false); octave_value subsref (const std::string& type, const std::list<octave_value_list>& idx) { octave_value_list tmp = subsref (type, idx, 1); return tmp.length () > 0 ? tmp(0) : octave_value (); } octave_value_list subsref (const std::string&, const std::list<octave_value_list>&, int); octave_value subsref (const std::string& type, const std::list<octave_value_list>& idx, bool auto_add); static octave_value numeric_conv (const octave_value& val, const std::string& type); octave_value subsasgn (const std::string& type, const std::list<octave_value_list>& idx, const octave_value& rhs); octave_value squeeze (void) const { return map.squeeze (); } octave_value permute (const Array<int>& vec, bool inv = false) const { return map.permute (vec, inv); } octave_value do_index_op (const octave_value_list& idx, bool resize_ok = false); dim_vector dims (void) const { return map.dims (); } size_t byte_size (void) const; // This is the number of elements in each field. The total number // of elements is numel () * nfields (). octave_idx_type numel (void) const { return map.numel (); } octave_idx_type nfields (void) const { return map.nfields (); } octave_value reshape (const dim_vector& new_dims) const { return map.reshape (new_dims); } octave_value resize (const dim_vector& dv, bool fill = false) const { octave_map tmap = map; tmap.resize (dv, fill); return tmap; } bool is_defined (void) const { return true; } bool is_constant (void) const { return true; } bool is_map (void) const { return true; } builtin_type_t builtin_type (void) const { return btyp_struct; } octave_map map_value (void) const { return map; } string_vector map_keys (void) const { return map.fieldnames (); } void print (std::ostream& os, bool pr_as_read_syntax = false) const; void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const; bool print_name_tag (std::ostream& os, const std::string& name) const; bool save_ascii (std::ostream& os); bool load_ascii (std::istream& is); 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 fast_elem_extract (octave_idx_type n) const; bool fast_elem_insert (octave_idx_type n, const octave_value& x); protected: // The associative array used to manage the structure data. octave_map map; private: DECLARE_OCTAVE_ALLOCATOR DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA }; class octave_scalar_struct : public octave_base_value { public: octave_scalar_struct (void) : octave_base_value (), map () { } octave_scalar_struct (const octave_scalar_map& m) : octave_base_value (), map (m) { } octave_scalar_struct (const octave_scalar_struct& s) : octave_base_value (), map (s.map) { } ~octave_scalar_struct (void) { } octave_base_value *clone (void) const { return new octave_scalar_struct (*this); } octave_base_value *empty_clone (void) const { return new octave_scalar_struct (); } octave_value dotref (const octave_value_list& idx, bool auto_add = false); octave_value subsref (const std::string& type, const std::list<octave_value_list>& idx); octave_value_list subsref (const std::string& type, const std::list<octave_value_list>& idx, int); octave_value subsref (const std::string& type, const std::list<octave_value_list>& idx, bool auto_add); static octave_value numeric_conv (const octave_value& val, const std::string& type); octave_value subsasgn (const std::string& type, const std::list<octave_value_list>& idx, const octave_value& rhs); octave_value squeeze (void) const { return map; } octave_value permute (const Array<int>& vec, bool inv = false) const { return octave_map (map).permute (vec, inv); } octave_value do_index_op (const octave_value_list& idx, bool resize_ok = false); dim_vector dims (void) const { static dim_vector dv (1, 1); return dv; } size_t byte_size (void) const; // This is the number of elements in each field. The total number // of elements is numel () * nfields (). octave_idx_type numel (void) const { return 1; } octave_idx_type nfields (void) const { return map.nfields (); } octave_value reshape (const dim_vector& new_dims) const { return octave_map (map).reshape (new_dims); } octave_value resize (const dim_vector& dv, bool fill = false) const { octave_map tmap = map; tmap.resize (dv, fill); return tmap; } bool is_defined (void) const { return true; } bool is_constant (void) const { return true; } bool is_map (void) const { return true; } builtin_type_t builtin_type (void) const { return btyp_struct; } octave_map map_value (void) const { return map; } octave_scalar_map scalar_map_value (void) const { return map; } string_vector map_keys (void) const { return map.fieldnames (); } void print (std::ostream& os, bool pr_as_read_syntax = false) const; void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const; bool print_name_tag (std::ostream& os, const std::string& name) const; bool save_ascii (std::ostream& os); bool load_ascii (std::istream& is); 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; bool fast_elem_insert_self (void *where, builtin_type_t btyp) const; protected: // The associative array used to manage the structure data. octave_scalar_map map; private: octave_value to_array (void); DECLARE_OCTAVE_ALLOCATOR DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA }; #endif