Mercurial > hg > octave-lyh
view libgui/src/octave-qt-link.h @ 16479:7a71ea0b7ae9
eliminate event listener class
* main-window.h, main-window.cc (main_window::exit): New function.
(main_window::_ocxtave_qt_event_listener): Delete member variable and
all uses.
main_window::construct_octave_qt_link): connect
_octave_qt_link::octave_thread_finished to main_window::exit.
* octave-qt-event-listener.h, octave-qt-event-listener.cc: Delete.
* libgui/src/module.mk (octave_gui_MOC, noinst_HEADERS,
src_libgui_src_la_SOURCES): Update lists.
* octave-qt-link.h, octave-qt-link.cc
(octave_qt_link::octave_thread_finished): New signal.
(octave_qt_link::~octave_qt_link): Delete main_thread.
(octave_qt_link::octave_qt_link): Connect main_thread::finished and
main_thread::terminated to octave_qt_link::octave_thread_finished
signal.
* octave-event-listener.h: Delete.
* libinterp/interp-core/module.mk (INTERPFCN_INC): Remove it from the
list.
* octave-link.h, octave-link.cc (octave_exit_hook): Delete.
(octave_link::discard_events, octave_link::do_discard_events,
octave_link::exit, octave_link::do_exit): New functions.
(octave_link::event_listener): Delete member variable and all uses.
(octave_link::about_to_exit, octave_link::register_event_listener,
octave_link::do_about_to_exit,
octave_link::do_register_event_listener): Delete.
(octave_link::accepting_events): New member variable.
(octave_link::octave_link): Set octave_exit to octave_link::exit.
Initialize accepting_events.
(octave_link::do_post_event): Only add to gui_event_queue if
accepting_events is true.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 09 Apr 2013 13:47:43 -0400 |
parents | 0f143f68078d |
children | 8b783661e03f |
line wrap: on
line source
/* Copyright (C) 2013 John W. Eaton Copyright (C) 2011-2012 Jacob Dawid Copyright (C) 2011-2012 John P. Swensen 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/>. */ #ifndef OCTAVE_QT_LINK_H #define OCTAVE_QT_LINK_H #include <list> #include <string> #include <QList> #include <QObject> #include <QString> #include "octave-link.h" #include "octave-main-thread.h" // \class OctaveLink // \brief Provides threadsafe access to octave. // \author Jacob Dawid // // This class is a wrapper around octave and provides thread safety by // buffering access operations to octave and executing them in the // readline event hook, which lives in the octave thread. class octave_qt_link : public QObject, public octave_link { Q_OBJECT public: octave_qt_link (void); ~octave_qt_link (void); void execute_interpreter (void); bool do_edit_file (const std::string& file); void do_change_directory (const std::string& dir); void do_set_workspace (const std::list<workspace_element>& ws); void do_clear_workspace (void); void do_set_history (const string_vector& hist); void do_append_history (const std::string& hist_entry); void do_clear_history (void); void do_pre_input_event (void); void do_post_input_event (void); void do_enter_debugger_event (const std::string& file, int line); void do_execute_in_debugger_event (const std::string& file, int line); void do_exit_debugger_event (void); void do_update_breakpoint (bool insert, const std::string& file, int line); private: // No copying! octave_qt_link (const octave_qt_link&); octave_qt_link& operator = (const octave_qt_link&); void do_insert_debugger_pointer (const std::string& file, int line); void do_delete_debugger_pointer (const std::string& file, int line); // Thread running octave_main. octave_main_thread *main_thread; signals: void edit_file_signal (const QString& file); void change_directory_signal (const QString& dir); void set_workspace_signal (const QString& scopes, const QStringList& symbols, const QStringList& class_names, const QStringList& dimensions, const QStringList& values); void clear_workspace_signal (void); void set_history_signal (const QStringList& hist); void append_history_signal (const QString& hist_entry); void clear_history_signal (void); void enter_debugger_signal (void); void exit_debugger_signal (void); void update_breakpoint_marker_signal (bool insert, const QString& file, int line); void insert_debugger_pointer_signal (const QString&, int); void delete_debugger_pointer_signal (const QString&, int); void octave_thread_finished (void); }; #endif