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

annotate libgui/src/interpreter-qobject.cc @ 27694:b3401292e101

store Qt graphics toolkit object in interpreter_qobject * graphics-init.h, graphics-init.cc: Delete. * libgui/src/module.mk: Update. * interpreter-qobject.h, interpreter-qobject.cc (interpreter::m_graphics_toolkit): New member variable. (interpreter::graphics_init): New member function, adapted from global graphics_init function. (interpreter::execute): Update graphics_init call. (interpreter_qobject::~interpreter_qobject): Delete m_graphics_toolkit.

author	John W. Eaton <jwe@octave.org>
date	Thu, 14 Nov 2019 21:35:14 -0500
parents	2ff12b707f60
children	cdb681adc85a

rev	line source
27196 d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	1 /*
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	2
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	3 Copyright (C) 2013-2019 John W. Eaton
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	4 Copyright (C) 2011-2019 Jacob Dawid
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	5
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	6 This file is part of Octave.
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	7
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	8 Octave is free software: you can redistribute it and/or modify it
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	9 under the terms of the GNU General Public License as published by
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	10 the Free Software Foundation, either version 3 of the License, or
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	11 (at your option) any later version.
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	12
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	13 Octave is distributed in the hope that it will be useful, but
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	14 WITHOUT ANY WARRANTY; without even the implied warranty of
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	16 GNU General Public License for more details.
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	17
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	18 You should have received a copy of the GNU General Public License
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	19 along with Octave; see the file COPYING. If not, see
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	20 <https://www.gnu.org/licenses/>.
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	21
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	22 */
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	23
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	24 #if defined (HAVE_CONFIG_H)
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	25 # include "config.h"
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	26 #endif
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	27
27694 b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	28 #include <QApplication>
b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	29 #include <QMetaType>
b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	30 #include <QThread>
b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	31
b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	32 #include "QtHandlesUtils.h"
27196 d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	33 #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	34 #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	35 #include "qt-application.h"
27694 b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	36 #include "qt-graphics-toolkit.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	37 #include "qt-interpreter-events.h"
27196 d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	38
27694 b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	39 #include "graphics.h"
b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	40 #include "gtk-manager.h"
27196 d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	41 #include "input.h"
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	42 #include "interpreter.h"
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	43
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	44 namespace octave
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	45 {
27588 f0e3f3e28a8e move qt_interpreter_events object from interpreter_qobject to octave_qobject John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	46 interpreter_qobject::interpreter_qobject (base_qobject& oct_qobj)
27694 b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	47 : QObject (), m_octave_qobj (oct_qobj), m_interpreter (nullptr),
b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	48 m_graphics_toolkit (nullptr)
27261 dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27260 diff changeset	49 { }
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 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	52 {
27261 dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27260 diff changeset	53 // 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	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 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	56
dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27260 diff changeset	57 interpreter& interp = app_context.create_interpreter ();
dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27260 diff changeset	58
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27262 diff changeset	59 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	60
27588 f0e3f3e28a8e move qt_interpreter_events object from interpreter_qobject to octave_qobject John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	61 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	62 evmgr.enable ();
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27197 diff changeset	63
27196 d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	64 int exit_status = 0;
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	65
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	66 try
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	67 {
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	68 // Final initialization.
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	69
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	70 interp.initialize ();
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	71
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27197 diff changeset	72 if (app_context.start_gui_p ())
27196 d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	73 {
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	74 input_system& input_sys = interp.get_input_system ();
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 input_sys.PS1 (">> ");
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	77 input_sys.PS2 ("");
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	78 }
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	79
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	80 if (interp.initialized ())
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	81 {
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	82 // The interpreter should be completely ready at this point so let
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	83 // the GUI know.
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	84
27302 5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	85 m_interpreter = &interp;
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	86
27196 d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	87 emit octave_ready_signal ();
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	88
27694 b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	89 graphics_init ();
27646 2ff12b707f60 integrate Qt graphics toolkit in Qt interpreter object John W. Eaton <jwe@octave.org> parents: 27588 diff changeset	90
27196 d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	91 // Start executing commands in the command window.
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	92
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	93 exit_status = interp.execute ();
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	94 }
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	95 }
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	96 catch (const exit_exception& ex)
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	97 {
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	98 exit_status = ex.exit_status ();
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	99 }
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	100
27302 5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	101 // Disable events from being passed from the GUI to the interpreter.
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	102
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	103 m_interpreter = nullptr;
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	104
27196 d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	105 // Whether or not initialization succeeds we need to clean up the
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	106 // interpreter once we are done with it.
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	107
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27197 diff changeset	108 app_context.delete_interpreter ();
27196 d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	109
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	110 emit octave_finished_signal (exit_status);
d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	111 }
27218 a044202208af more refactoring of GUI classes that manage the interpreter John W. Eaton <jwe@octave.org> parents: 27197 diff changeset	112
27694 b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	113 interpreter_qobject::~interpreter_qobject (void)
b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	114 {
b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	115 delete m_graphics_toolkit;
b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	116 }
b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	117
b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	118 void interpreter_qobject::graphics_init (void)
b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	119 {
b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	120 #if defined (HAVE_QT_GRAPHICS)
b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	121
b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	122 gh_manager& gh_mgr = m_interpreter->get_gh_manager ();
b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	123
b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	124 autolock guard (gh_mgr.graphics_lock ());
b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	125
b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	126 qRegisterMetaType<graphics_object> ("graphics_object");
b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	127
b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	128 gh_mgr.enable_event_processing (true);
b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	129
b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	130 QtHandles::qt_graphics_toolkit *qt_gtk
b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	131 = new QtHandles::qt_graphics_toolkit (*m_interpreter, m_octave_qobj);
b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	132
b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	133 if (QThread::currentThread ()
b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	134 != QApplication::instance ()->thread ())
b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	135 qt_gtk->moveToThread (QApplication::instance ()->thread ());
b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	136
b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	137 m_graphics_toolkit = new graphics_toolkit (qt_gtk);
b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	138
b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	139 octave::gtk_manager& gtk_mgr = m_interpreter->get_gtk_manager ();
b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	140
b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	141 gtk_mgr.register_toolkit ("qt");
b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	142
b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	143 gtk_mgr.load_toolkit (*m_graphics_toolkit);
b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	144
b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	145 #endif
b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	146 }
b3401292e101 store Qt graphics toolkit object in interpreter_qobject John W. Eaton <jwe@octave.org> parents: 27646 diff changeset	147
27302 5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	148 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	149 {
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	150 if (! m_interpreter)
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	151 return;
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	152
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	153 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	154
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	155 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	156 }
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	157
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	158 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	159 {
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	160 if (! m_interpreter)
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	161 return;
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	162
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	163 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	164
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	165 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	166 }
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	167
27588 f0e3f3e28a8e move qt_interpreter_events object from interpreter_qobject to octave_qobject John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	168 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	169 {
27588 f0e3f3e28a8e move qt_interpreter_events object from interpreter_qobject to octave_qobject John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	170 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	171 }
27196 d993642352d0 rename octave_interpreter object in GUI John W. Eaton <jwe@octave.org> parents: diff changeset	172 }

Mercurial > octave

annotate libgui/src/interpreter-qobject.cc @ 27694:b3401292e101