Mercurial > octave-nkf
view gui/src/backend/OctaveLink.cpp @ 14694:ea11c9d8aa47 gui
Calling qApp->quit () via QMetaObject::invoke caused a segfault, now exits cleanly.
* OctaveLink (terminateOctave): Changed quit() call to direct method call.
* MainWindow: Added object name for QTerminal.
author | Jacob Dawid <jacob.dawid@googlemail.com> |
---|---|
date | Mon, 28 May 2012 00:39:57 +0200 |
parents | c952f1e35e50 |
children | 79c9a6d06590 |
line wrap: on
line source
/* OctaveGUI - A graphical user interface for Octave * Copyright (C) 2011 John P. Swensen, Jacob Dawid (jacob.dawid@googlemail.com) * * This program 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. * * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. */ #include "OctaveLink.h" #include "load-path.h" #include <QDir> #include <QApplication> int octave_readline_hook () { OctaveLink::instance ()->triggerUpdateHistoryModel (); OctaveLink::instance ()->triggerCacheSymbolTable (); QDir::setCurrent (load_path::get_command_line_path ().c_str ()); return 0; } void octave_exit_hook (int status) { Q_UNUSED (status); OctaveLink::instance ()->terminateOctave (); } OctaveLink OctaveLink::m_singleton; OctaveLink::OctaveLink ():QObject () { m_historyModel = new QStringListModel (this); m_workspaceModel = new WorkspaceModel (this); m_workspaceModel->insertTopLevelItem(0, new TreeItem ("Local")); m_workspaceModel->insertTopLevelItem(1, new TreeItem ("Global")); m_workspaceModel->insertTopLevelItem(2, new TreeItem ("Persistent")); m_workspaceModel->insertTopLevelItem(3, new TreeItem ("Hidden")); _updateWorkspaceModelTimer.setInterval (1000); _updateWorkspaceModelTimer.setSingleShot (false); connect(&_updateWorkspaceModelTimer, SIGNAL (timeout ()), m_workspaceModel, SLOT (updateFromSymbolTable ())); } OctaveLink::~OctaveLink () { } void OctaveLink::launchOctave () { // Create both threads. m_octaveMainThread = new OctaveMainThread (this); command_editor::add_event_hook (octave_readline_hook); octave_exit = octave_exit_hook; // Start the first one. m_octaveMainThread->start (); _updateWorkspaceModelTimer.start (); } void OctaveLink::terminateOctave () { qApp->quit (); } void OctaveLink::triggerUpdateHistoryModel () { // Determine the client's (our) history length and the one of the server. int clientHistoryLength = m_historyModel->rowCount (); int serverHistoryLength = command_history::length (); // If were behind the server, iterate through all new entries and add them to our history. if (clientHistoryLength < serverHistoryLength) { for (int i = clientHistoryLength; i < serverHistoryLength; i++) { m_historyModel->insertRow (0); m_historyModel->setData (m_historyModel->index (0), QString (command_history::get_entry (i).c_str ())); } } } void OctaveLink::triggerCacheSymbolTable () { m_workspaceModel->cacheSymbolTable(); } QStringListModel * OctaveLink::historyModel () { return m_historyModel; } WorkspaceModel * OctaveLink::workspaceModel () { return m_workspaceModel; }