Mercurial > octave
view libgui/graphics/ObjectProxy.cc @ 28225:fbced93c9704 stable
Fix reversal of width and height in uicontrol icon creation (bug #58144).
* PushButtonControl.cc (PushButtonControl::PushButtonControl): Reverse order of
parameters in call to Utils::makeImageFromCData which expects order to be
width, height.
* ToggleButtonControl.cc (ToggleButtonControl::ToggleButtonControl): Reverse
order of parameters in call to Utils::makeImageFromCData which expects order to
be width, height.
author | Rik <rik@octave.org> |
---|---|
date | Thu, 16 Apr 2020 11:48:06 -0700 |
parents | 265b386f8b20 |
children | 00a9a49c7670 |
line wrap: on
line source
//////////////////////////////////////////////////////////////////////// // // Copyright (C) 2011-2020 The Octave Project Developers // // See the file COPYRIGHT.md in the top-level directory of this // distribution or <https://octave.org/copyright/>. // // 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 // <https://www.gnu.org/licenses/>. // //////////////////////////////////////////////////////////////////////// #if defined (HAVE_CONFIG_H) # include "config.h" #endif #include <QCoreApplication> #include <QString> #include <QThread> #include "Object.h" #include "ObjectProxy.h" #include "oct-mutex.h" #include "utils.h" namespace QtHandles { ObjectProxy::ObjectProxy (Object *obj) : QObject (), m_object (nullptr) { init (obj); } void ObjectProxy::init (Object *obj) { if (obj != m_object) { if (m_object) { disconnect (this, SIGNAL (sendUpdate (int)), m_object, SLOT (slotUpdate (int))); disconnect (this, SIGNAL (sendRedraw (void)), m_object, SLOT (slotRedraw (void))); disconnect (this, SIGNAL (sendShow (void)), m_object, SLOT (slotShow (void))); disconnect (this, SIGNAL (sendPrint (const QString&, const QString&)), m_object, SLOT (slotPrint (const QString&, const QString&))); } m_object = obj; if (m_object) { connect (this, SIGNAL (sendUpdate (int)), m_object, SLOT (slotUpdate (int))); connect (this, SIGNAL (sendRedraw (void)), m_object, SLOT (slotRedraw (void))); connect (this, SIGNAL (sendShow (void)), m_object, SLOT (slotShow (void))); connect (this, SIGNAL (sendPrint (const QString&, const QString&)), m_object, SLOT (slotPrint (const QString&, const QString&)), Qt::BlockingQueuedConnection); } } } void ObjectProxy::setObject (Object *obj) { finalize (); init (obj); } void ObjectProxy::update (int pId) { if (octave::thread::is_thread ()) emit sendUpdate (pId); else if (m_object) m_object->slotUpdate (pId); } void ObjectProxy::finalize (void) { if (! m_object) return; Qt::ConnectionType t = Qt::BlockingQueuedConnection; if (QThread::currentThread () == QCoreApplication::instance ()->thread ()) t = Qt::DirectConnection; QMetaObject::invokeMethod (m_object, "slotFinalize", t); } void ObjectProxy::redraw (void) { emit sendRedraw (); } void ObjectProxy::show (void) { emit sendShow (); } void ObjectProxy::print (const QString& file_cmd, const QString& term) { emit sendPrint (file_cmd, term); } uint8NDArray ObjectProxy::get_pixels (void) { uint8NDArray retval; // The ObjectProxy is generally ran from the interpreter thread // while the actual Figure (Object) lives in the gui thread. The // following ensures synchronous execution of the Figure method and // allows retrieving a return value. Qt::ConnectionType t = Qt::BlockingQueuedConnection; if (QThread::currentThread () == QCoreApplication::instance ()->thread ()) t = Qt::DirectConnection; QMetaObject::invokeMethod (m_object, "slotGetPixels", t, Q_RETURN_ARG (uint8NDArray, retval)); return retval; } };