Mercurial > hg > octave-nkf
view examples/make_int.cc @ 15848:424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
* file-editor-tab.cc, file-editor-tab.h (file_editor_tab::~file_editor_tab):
Add. Delete lexer to prevent memory leak. Delete _edit_area to prevent memory
leak. (file_editor_tab::conditional_close): Add. Simple slot that uses QWidget
pointer as unique ID, not for function call.
(file_editor_tab::file_name_query): Add. Simple slot that signals file name to
whomever is connected. (file_editor_tab::find,
file_editor_tab : public QWidget): Removed use of exec() and keep a pointer to
the find_dialog as a member. Toggle hide()/show() via a connected slot to
toggle visibility as desired.
* file-editor.cc, file-editor.h, file-editor-tab.cc file-editor-tab.h
(file_editor : public file_editor_interface, file_editor_tab : public QWidget,
file_editor_tab::file_editor_tab, file_editor_tab::closeEvent,
file_editor_tab::load_file, file_editor_tab::new_file,
file_editor_tab::run_file): Remove _file_editor pointer member from
file_editor_tab and rid file_editor::get_main_window from file_editor. There
should be no need for such information about higher-level hierarchy inside
lower-level objects. (file_editor::request_open_file,
file_editor_tab::open_file): Move QFileDialog to file_editor::request_open_file
and delete file_editor_tab::open_file since most of the remaining functionality
is in file_editor_tab::load_file. (file_editor::active_editor_tab): Deleted.
(file_editor::fetab_change_request, file_editor_tab::change_editor_state):
Added to initiate a request for the editor tab to change focus.
(file_editor_tab::editor_state_changed): Added arguments to pass the copy
status and the directory path so that editor doesn't have to call functions for
such information. (file_editor::handle_editor_state_changed): Add copying
directory of the file_editor_tab to the current editing directory.
(file_editor::check_conflict_save, file_editor_tab::editor_check_conflict_save,
file_editor_tab::save_file_as, file_editor_tab::handle_save_file_as_answer):
Moved a portion of the save-file-as dialog mechanism to the file_editor where
all file names can be obtained to check for conflict with already open files.
The new signal indicates to the editor that a name check be done, and in turn
the editor signals the tab to save the file.
* main-window.cc, file-editor.cc, file-editor.h, file-editor-interface.h
(file_editor::terminal, file_editor : public file_editor_interface,
file_editor_interface : public QDockWidget): Since file_editor_tab no longer
looks up to main_window, remove _main_window and _terminal from file_editor and
file_editor_interface, as well as file_editor::terminal.
* file-editor-tab.cc (file_editor_tab::file_has_changed): Make the dialog
boxes non-modal and use slots to handle user answers.
(file_editor_tab::closeEvent): Remove portion that accesses upper hierarchy
member functions, can find better approaches.
(file_editor_tab::file_editor_tab): Make there no parent for QsciScintilla so
that window modality can be set to individual editor.
* file-editor-tab.cc, file-editor.cc (file_editor_tab::load_file): Use show()
member rather than exec() and set modality to window so that rest of
application may function. Return a QString with message rather than a boolean.
* file-editor-tab.cc, (file_editor_tab::file_has_changed): Remove static
variable alreadyAsking. Multiple file_editor_tabs are using this code so do
not want to block recognition of multiple file having changed on disk
(bug #37406). Instead, simply stop tracking via the file watcher.
(file_editor_tab::save_file, file_editor_tab::save_file_as,
file_editor_tab::handle_save_file_as_answer,
file_editor_tab::handle_save_file_as_answer_close): Added a remove_on_success
variable. Changed the QFileDialog to WindowModal and created slots to handle
file selected signal and finished signal. Signal/slot connects vary based upon
remove_on_success setting. (file_editor_tab::check_file_modified): Changed the
QFileDialog to NonModal and attach some slots. Editor tab can't be parent in
case deleted, so use read-only state of the editor area.
* file-editor-tab.h (file_editor_tab : public QWidget): New signals for
file_editor for tab and file name management. (file_editor_tab::get_file_name):
Delete.
* file-editor.h (file_editor : public file_editor_interface): Make QStringList
sessionFileNames a member of file_editor so that it can retain data between
file_editor_tab signals. Also can be used for checking precense of filenames
and prevent opening multiple copies (bug #36869) Added signals for file editor
tabs--settings_changed, fetab_close_request, and query_file_name. Three new
slots for tab and file name management.
* file-editor-interface.h, file-editor.h
(file_editor_interface::add_file_editor_tab, file_editor::add_file_editor_tab):
Made the text name for the tab an input variable.
* file-editor.cc (file_editor::~file_editor): Replace dynamic_cast with simple
signal querying all file editor tabs for file names which end up in
savedSessionTabs. (file_editor::handle_file_name_changed): Dynamic cast not
necessary since QObject and QWidget are compatible.
(file_editor::handle_tab_close_request): Replace dynamic_cast with signal to
request file_editor_tab with associated tabID tag should close.
(file_editor::handle_tab_remove_request): Rename of handle_tab_close_request.
Instead of dynamic cast, loop through pointers comparing QWidget* to QObject*,
if same tag remove tab via index and also delete which fixes a memory leak.
(file_editor::handle_add_filename_to_list): Simple slot that uses append() of
the list member functions. (file_editor::notice_settings): Rather than dynamic
cast, emit signal for the file_editor_tabs. (file_editor::add_file_editor_tab):
New variety of connections for improved flow. (file_editor::request_open_file):
Given error messages are made WindowModal, the tab shouldn't be delete if file
open is not successful. The file_editor_tab takes care of that.
(file_editor::request_open_file): Added check and message box for the
requested file already open in editor. For the non-interactive overloaded
version, open a message dialog box to tell the user file not found, e.g.,
could not find file in the settings when launched.
(file_editor::request_open_file): Inquire file names and update list before
checking for existence of files. Supply empty title to editor tab then have
file_editor_tab update name.
* file-editor-tab.h, file-editor-tab.cc, file-editor.cc
(file_editor_tab::run_file): New signal process_octave_code.
(file_editor::add_file_editor_tab): Connect signal process_octave_code to
file_editor's parent's slot handle_command_double_clicked.
author | Daniel J Sebald <daniel.sebald@ieee.org> |
---|---|
date | Sun, 23 Dec 2012 14:33:48 -0600 |
parents | b099acf06b55 |
children | 224e76250443 |
line wrap: on
line source
#include <octave/config.h> #include <cstdlib> #include <string> #include <ostream> #include <octave/lo-mappers.h> #include <octave/lo-utils.h> #include <octave/mx-base.h> #include <octave/str-vec.h> #include <octave/defun-dld.h> #include <octave/error.h> #include <octave/gripes.h> #include <octave/oct-obj.h> #include <octave/ops.h> #include <octave/ov-base.h> #include <octave/ov-typeinfo.h> #include <octave/ov.h> #include <octave/ov-scalar.h> #include <octave/pager.h> #include <octave/pr-output.h> #include <octave/symtab.h> #include <octave/variables.h> class octave_value_list; class tree_walker; // Integer values. class octave_integer : public octave_base_value { public: octave_integer (void) : octave_base_value (), scalar (0) { } octave_integer (int i) : octave_base_value (), scalar (i) { } octave_integer (const octave_integer& s) : octave_base_value (), scalar (s.scalar) { } ~octave_integer (void) { } octave_base_value *clone (void) { return new octave_integer (*this); } #if 0 void *operator new (size_t size); void operator delete (void *p, size_t size); #endif idx_vector index_vector (void) const { return idx_vector ((double) scalar); } int rows (void) const { return 1; } int columns (void) const { return 1; } bool is_constant (void) const { return true; } bool is_defined (void) const { return true; } bool is_real_scalar (void) const { return true; } octave_value all (void) const { return (double) (scalar != 0); } octave_value any (void) const { return (double) (scalar != 0); } bool is_real_type (void) const { return true; } bool is_scalar_type (void) const { return true; } bool is_numeric_type (void) const { return true; } bool valid_as_scalar_index (void) const { return scalar == 1; } bool valid_as_zero_index (void) const { return scalar == 0; } bool is_true (void) const { return (scalar != 0); } double double_value (bool = false) const { return (double) scalar; } int integer_value (bool = false) const { return scalar; } Matrix matrix_value (bool = false) const { return Matrix (1, 1, scalar); } Complex complex_value (bool = false) const { return scalar; } ComplexMatrix complex_matrix_value (bool = false) const { return ComplexMatrix (1, 1, Complex (scalar)); } octave_value gnot (void) const { return octave_value ((double) ! scalar); } octave_value uminus (void) const { return new octave_integer (- scalar); } octave_value transpose (void) const { return new octave_integer (scalar); } octave_value hermitian (void) const { return new octave_integer (scalar); } void increment (void) { ++scalar; } void decrement (void) { --scalar; } void print (std::ostream& os, bool pr_as_read_syntax = false) const; private: int scalar; DECLARE_OCTAVE_ALLOCATOR DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA }; void octave_integer::print (std::ostream& os, bool pr_as_read_syntax) const { os << scalar; // octave_print_internal (os, scalar, pr_as_read_syntax); } #ifdef DEFUNOP_OP #undef DEFUNOP_OP #endif #define DEFUNOP_OP(name, t, op) \ UNOPDECL (name, a) \ { \ CAST_UNOP_ARG (const octave_ ## t&); \ return octave_value (new octave_integer (op v.t ## _value ())); \ } DEFUNOP_OP (gnot, integer, !) DEFUNOP_OP (uminus, integer, -) DEFUNOP_OP (transpose, integer, /* no-op */) DEFUNOP_OP (hermitian, integer, /* no-op */) DEFNCUNOP_METHOD (incr, integer, increment) DEFNCUNOP_METHOD (decr, integer, decrement) #ifdef DEFBINOP_OP #undef DEFBINOP_OP #endif #define DEFBINOP_OP(name, t1, t2, op) \ BINOPDECL (name, a1, a2) \ { \ CAST_BINOP_ARGS (const octave_ ## t1&, const octave_ ## t2&); \ return octave_value \ (new octave_integer (v1.t1 ## _value () op v2.t2 ## _value ())); \ } // integer by integer ops. DEFBINOP_OP (add, integer, integer, +) DEFBINOP_OP (sub, integer, integer, -) DEFBINOP_OP (mul, integer, integer, *) DEFBINOP (div, integer, integer) { CAST_BINOP_ARGS (const octave_integer&, const octave_integer&); int d = v2.integer_value (); if (d == 0) gripe_divide_by_zero (); return new octave_integer (v1.integer_value () / d); } DEFBINOP (i_s_div, integer, scalar) { CAST_BINOP_ARGS (const octave_integer&, const octave_scalar&); double d = v2.double_value (); if (d == 0.0) gripe_divide_by_zero (); return new octave_scalar (v1.double_value () / d); } DEFBINOP (ldiv, integer, integer) { CAST_BINOP_ARGS (const octave_integer&, const octave_integer&); int d = v1.integer_value (); if (d == 0) gripe_divide_by_zero (); return new octave_integer (v2.integer_value () / d); } DEFBINOP_OP (lt, integer, integer, <) DEFBINOP_OP (le, integer, integer, <=) DEFBINOP_OP (eq, integer, integer, ==) DEFBINOP_OP (ge, integer, integer, >=) DEFBINOP_OP (gt, integer, integer, >) DEFBINOP_OP (ne, integer, integer, !=) DEFBINOP_OP (el_mul, integer, integer, !=) DEFBINOP (el_div, integer, integer) { CAST_BINOP_ARGS (const octave_integer&, const octave_integer&); int d = v2.integer_value (); if (d == 0) gripe_divide_by_zero (); return new octave_integer (v1.integer_value () / d); } DEFBINOP (el_ldiv, integer, integer) { CAST_BINOP_ARGS (const octave_integer&, const octave_integer&); int d = v1.integer_value (); if (d == 0) gripe_divide_by_zero (); return new octave_integer (v2.integer_value () / d); } DEFBINOP_OP (el_and, integer, integer, &&) DEFBINOP_OP (el_or, integer, integer, ||) DEFUN_DLD (make_int, args, , "int_val = make_int (val)\n\ \n\ Creates an integer variable from VAL.") { static bool type_loaded = false; if (! type_loaded) { octave_integer::register_type (); mlock (); octave_stdout << "installing integer type at type-id = " << octave_integer::static_type_id () << "\n"; INSTALL_UNOP (op_not, octave_integer, gnot); INSTALL_UNOP (op_uminus, octave_integer, uminus); INSTALL_UNOP (op_transpose, octave_integer, transpose); INSTALL_UNOP (op_hermitian, octave_integer, hermitian); INSTALL_NCUNOP (op_incr, octave_integer, incr); INSTALL_NCUNOP (op_decr, octave_integer, decr); INSTALL_BINOP (op_add, octave_integer, octave_integer, add); INSTALL_BINOP (op_sub, octave_integer, octave_integer, sub); INSTALL_BINOP (op_mul, octave_integer, octave_integer, mul); INSTALL_BINOP (op_div, octave_integer, octave_integer, div); INSTALL_BINOP (op_ldiv, octave_integer, octave_integer, ldiv); INSTALL_BINOP (op_lt, octave_integer, octave_integer, lt); INSTALL_BINOP (op_le, octave_integer, octave_integer, le); INSTALL_BINOP (op_eq, octave_integer, octave_integer, eq); INSTALL_BINOP (op_ge, octave_integer, octave_integer, ge); INSTALL_BINOP (op_gt, octave_integer, octave_integer, gt); INSTALL_BINOP (op_ne, octave_integer, octave_integer, ne); INSTALL_BINOP (op_el_mul, octave_integer, octave_integer, el_mul); INSTALL_BINOP (op_el_div, octave_integer, octave_integer, el_div); INSTALL_BINOP (op_el_ldiv, octave_integer, octave_integer, el_ldiv); INSTALL_BINOP (op_el_and, octave_integer, octave_integer, el_and); INSTALL_BINOP (op_el_or, octave_integer, octave_integer, el_or); INSTALL_BINOP (op_div, octave_integer, octave_scalar, i_s_div); } octave_value retval; if (args.length () == 1) { double d = args(0).double_value (); if (! error_state) retval = octave_value (new octave_integer (NINT (d))); } else usage ("make_int"); return retval; } DEFUN_DLD (doit, args, , "doit (I)") { octave_value_list retval; if (args(0).type_id () == octave_integer::static_type_id ()) { // At this point, we know we have a handle for an octave_integer // object, so we can peek at the representation and extract the // data. const octave_base_value& rep = args(0).get_rep (); int my_value = ((const octave_integer&) rep) . integer_value (); message ("doit", "your lucky number is: %d", my_value); } else gripe_wrong_type_arg ("doit", args(0)); return retval; } DEFINE_OCTAVE_ALLOCATOR (octave_integer); DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_integer, "integer", "integer");