octave: libgui/src/interpreter-qobject.cc annotate

annotate libgui/src/interpreter-qobject.cc @ 29292:eb1e10abe9d5

use method in interpreter class to interrupt interpreter execution in GUI * interpreter.h, interpreter.cc (interpreter::interrupt): New function. * interpreter-qobject.h, interpreter-qobject.cc (interpreter_qobject::interrupt): New function. * octave-qobject.h, octave-qobject.cc (octave_qobject::interpreter_interrupt): New slot. * terminal-dock-widget.h, terminal-dock-widget.cc (): (terminal_dock_widget::terminal_dock_widget): Connect m_terminal interrupt_signal to oct_qobj interpreter_interrupt slot. (terminal_dock_widget::terminal_interrupt): Delete slot. Action is now performed in interpreter::interrupt method. (terminal_dock_widget::interrupt_signal): Delete signal.

author	John W. Eaton <jwe@octave.org>
date	Tue, 12 Jan 2021 21:01:42 -0500
parents	c2f3a0832cf0
children	7854d5752dd2

rev	line source
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	2 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	3 // Copyright (C) 2011-2020 The Octave Project Developers
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	4 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	7 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	9 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	14 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	19 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	23 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	24 ////////////////////////////////////////////////////////////////////////
27196 d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	25
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	26 #if defined (HAVE_CONFIG_H)
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	27 # include "config.h"
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	28 #endif
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	29
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	30 #include "interpreter-qobject.h"
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27197 diff changeset	31 #include "octave-qobject.h"
27412 da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27302 diff changeset	32 #include "qt-application.h"
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27262 diff changeset	33 #include "qt-interpreter-events.h"
27196 d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	34
27697 5e8891dceec7 backout changesets cdb681adc85a and b3401292e101 (bug #56952) John W. Eaton <jwe@octave.org> parents: 27695 diff changeset	35 #include "graphics-init.h"
27196 d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	36 #include "input.h"
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	37 #include "interpreter.h"
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	38
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	39 namespace octave
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	40 {
27588 f0e3f3e28a8e move qt_interpreter_events object from interpreter_qobject to octave_qobject John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	41 interpreter_qobject::interpreter_qobject (base_qobject& oct_qobj)
27697 5e8891dceec7 backout changesets cdb681adc85a and b3401292e101 (bug #56952) John W. Eaton <jwe@octave.org> parents: 27695 diff changeset	42 : QObject (), m_octave_qobj (oct_qobj), m_interpreter (nullptr)
27261 dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27260 diff changeset	43 { }
dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27260 diff changeset	44
dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27260 diff changeset	45 void interpreter_qobject::execute (void)
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27197 diff changeset	46 {
27261 dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27260 diff changeset	47 // The Octave application context owns the interpreter.
dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27260 diff changeset	48
27588 f0e3f3e28a8e move qt_interpreter_events object from interpreter_qobject to octave_qobject John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	49 qt_application& app_context = m_octave_qobj.app_context ();
27261 dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27260 diff changeset	50
dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27260 diff changeset	51 interpreter& interp = app_context.create_interpreter ();
dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27260 diff changeset	52
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27262 diff changeset	53 event_manager& evmgr = interp.get_event_manager ();
27261 dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27260 diff changeset	54
27588 f0e3f3e28a8e move qt_interpreter_events object from interpreter_qobject to octave_qobject John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	55 evmgr.connect_link (m_octave_qobj.get_qt_interpreter_events ());
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27262 diff changeset	56 evmgr.enable ();
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27197 diff changeset	57
29219 c2f3a0832cf0 fix possible glitch when interpreter is ready when main window is created Torsten Lilge <ttl-octave@mailbox.org> parents: 29163 diff changeset	58 connect (this, SIGNAL (ready (void)),
c2f3a0832cf0 fix possible glitch when interpreter is ready when main window is created Torsten Lilge <ttl-octave@mailbox.org> parents: 29163 diff changeset	59 &m_octave_qobj, SLOT (interpreter_ready (void)));
c2f3a0832cf0 fix possible glitch when interpreter is ready when main window is created Torsten Lilge <ttl-octave@mailbox.org> parents: 29163 diff changeset	60
27196 d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	61 int exit_status = 0;
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	62
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	63 try
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	64 {
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	65 // Final initialization.
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	66
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	67 interp.initialize ();
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	68
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27197 diff changeset	69 if (app_context.start_gui_p ())
27196 d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	70 {
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	71 input_system& input_sys = interp.get_input_system ();
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	72
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	73 input_sys.PS1 (">> ");
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	74 input_sys.PS2 ("");
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	75 }
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	76
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	77 if (interp.initialized ())
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	78 {
27697 5e8891dceec7 backout changesets cdb681adc85a and b3401292e101 (bug #56952) John W. Eaton <jwe@octave.org> parents: 27695 diff changeset	79 // The interpreter should be completely ready at this point so let
5e8891dceec7 backout changesets cdb681adc85a and b3401292e101 (bug #56952) John W. Eaton <jwe@octave.org> parents: 27695 diff changeset	80 // the GUI know.
27196 d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	81
27302 5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	82 m_interpreter = &interp;
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	83
28347 00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	84 emit ready ();
27196 d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	85
27697 5e8891dceec7 backout changesets cdb681adc85a and b3401292e101 (bug #56952) John W. Eaton <jwe@octave.org> parents: 27695 diff changeset	86 graphics_init (interp, m_octave_qobj);
27695 cdb681adc85a improve exit behavior with qt graphics toolkit (bug #56952) John W. Eaton <jwe@octave.org> parents: 27694 diff changeset	87
27196 d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	88 // Start executing commands in the command window.
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	89
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	90 exit_status = interp.execute ();
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	91 }
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	92 }
29163 8f67ad8b3103 maint: Updating naming conventions for exceptions and use const where possible. Rik <rik@octave.org> parents: 28347 diff changeset	93 catch (const exit_exception& xe)
27196 d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	94 {
29163 8f67ad8b3103 maint: Updating naming conventions for exceptions and use const where possible. Rik <rik@octave.org> parents: 28347 diff changeset	95 exit_status = xe.exit_status ();
27196 d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	96 }
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	97
28347 00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	98 // Signal that the interpreter is done executing code in the main
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	99 // REPL, from script files, or command line eval arguments. By
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	100 // using a signal here, we give the GUI a chance to process any
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	101 // pending events, then signal that it is safe to shutdown the
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	102 // interpreter. Our notification here allows the GUI to insert the
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	103 // request to shutdown the interpreter in the event queue after any
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	104 // other pending signals. The application context owns the
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	105 // interpreter and will be responsible for deleting it later, when
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	106 // the application object destructor is executed.
27302 5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	107
28347 00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	108 emit execution_finished (exit_status);
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	109 }
27302 5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	110
28347 00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	111 // This function is expected to be executed when the GUI signals that
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	112 // it is finished processing events and ready for the interpreter to
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	113 // perform shutdown actions.
27694 b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	114
28347 00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	115 void interpreter_qobject::shutdown (int exit_status)
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	116 {
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	117 if (m_interpreter)
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	118 m_interpreter->shutdown ();
27695 cdb681adc85a improve exit behavior with qt graphics toolkit (bug #56952) John W. Eaton <jwe@octave.org> parents: 27694 diff changeset	119
28347 00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	120 // Signal that the interpreter has executed shutdown actions.
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	121
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	122 emit shutdown_finished (exit_status);
27695 cdb681adc85a improve exit behavior with qt graphics toolkit (bug #56952) John W. Eaton <jwe@octave.org> parents: 27694 diff changeset	123 }
cdb681adc85a improve exit behavior with qt graphics toolkit (bug #56952) John W. Eaton <jwe@octave.org> parents: 27694 diff changeset	124
27302 5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	125 void interpreter_qobject::interpreter_event (const fcn_callback& fcn)
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	126 {
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	127 if (! m_interpreter)
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	128 return;
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	129
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	130 event_manager& evmgr = m_interpreter->get_event_manager ();
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	131
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	132 evmgr.post_event (fcn);
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	133 }
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	134
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	135 void interpreter_qobject::interpreter_event (const meth_callback& meth)
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	136 {
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	137 if (! m_interpreter)
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	138 return;
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	139
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	140 event_manager& evmgr = m_interpreter->get_event_manager ();
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	141
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	142 evmgr.post_event (meth);
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	143 }
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	144
29292 eb1e10abe9d5 use method in interpreter class to interrupt interpreter execution in GUI John W. Eaton <jwe@octave.org> parents: 29219 diff changeset	145 void interpreter_qobject::interrupt (void)
eb1e10abe9d5 use method in interpreter class to interrupt interpreter execution in GUI John W. Eaton <jwe@octave.org> parents: 29219 diff changeset	146 {
eb1e10abe9d5 use method in interpreter class to interrupt interpreter execution in GUI John W. Eaton <jwe@octave.org> parents: 29219 diff changeset	147 if (! m_interpreter)
eb1e10abe9d5 use method in interpreter class to interrupt interpreter execution in GUI John W. Eaton <jwe@octave.org> parents: 29219 diff changeset	148 return;
eb1e10abe9d5 use method in interpreter class to interrupt interpreter execution in GUI John W. Eaton <jwe@octave.org> parents: 29219 diff changeset	149
eb1e10abe9d5 use method in interpreter class to interrupt interpreter execution in GUI John W. Eaton <jwe@octave.org> parents: 29219 diff changeset	150 m_interpreter->interrupt ();
eb1e10abe9d5 use method in interpreter class to interrupt interpreter execution in GUI John W. Eaton <jwe@octave.org> parents: 29219 diff changeset	151 }
eb1e10abe9d5 use method in interpreter class to interrupt interpreter execution in GUI John W. Eaton <jwe@octave.org> parents: 29219 diff changeset	152
27588 f0e3f3e28a8e move qt_interpreter_events object from interpreter_qobject to octave_qobject John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	153 qt_interpreter_events * interpreter_qobject::qt_link (void)
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27197 diff changeset	154 {
27588 f0e3f3e28a8e move qt_interpreter_events object from interpreter_qobject to octave_qobject John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	155 return m_octave_qobj.qt_link ();
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27197 diff changeset	156 }
27196 d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	157 }

Mercurial > octave

annotate libgui/src/interpreter-qobject.cc @ 29292:eb1e10abe9d5