Mercurial > octave
view libgui/graphics/PopupMenuControl.cc @ 31639:ca7d58406f82
eliminate unnecessary uses of octave_qobject in GUI classes
* BaseControl.cc, BaseControl.h, ButtonControl.cc, ButtonControl.h,
ButtonGroup.cc, ButtonGroup.h, Canvas.cc, Canvas.h,
CheckBoxControl.cc, CheckBoxControl.h, Container.cc, Container.h,
ContextMenu.cc, ContextMenu.h, EditControl.cc, EditControl.h,
Figure.cc, Figure.h, GLCanvas.cc, GLCanvas.h, ListBoxControl.cc,
ListBoxControl.h, Menu.cc, Menu.h, Object.cc, Object.h, Panel.cc,
Panel.h, PopupMenuControl.cc, PopupMenuControl.h,
PushButtonControl.cc, PushButtonControl.h, PushTool.cc, PushTool.h,
RadioButtonControl.cc, RadioButtonControl.h, SliderControl.cc,
SliderControl.h, Table.cc, Table.h, TextControl.cc, TextControl.h,
ToggleButtonControl.cc, ToggleButtonControl.h, ToggleTool.cc,
ToggleTool.h, ToolBar.cc, ToolBar.h, ToolBarButton.cc,
ToolBarButton.h, annotation-dialog.cc, annotation-dialog.h,
qt-graphics-toolkit.cc, qt-graphics-toolkit.h, command-widget.h,
community-news.cc, community-news.h, documentation-bookmarks.cc,
documentation-bookmarks.h, documentation.cc,
external-editor-interface.cc, external-editor-interface.h,
find-files-dialog.cc, find-files-dialog.h, graphics-init.cc,
graphics-init.h, interpreter-qobject.cc, file-editor.cc,
find-dialog.cc, find-dialog.h, main-window.cc, main-window.h,
news-reader.cc, news-reader.h, octave-qobject.cc, release-notes.cc,
resource-manager.cc, set-path-dialog.cc, set-path-dialog.h,
shortcut-manager.cc, shortcut-manager.h, welcome-wizard.cc,
welcome-wizard.h, workspace-model.cc:
Don't store references to octave_qobject in GUI classes where it is
no longer needed. Eliminate unnecessary octave_qobject constructor
arguments. Change all uses.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sun, 04 Dec 2022 22:57:02 -0500 |
parents | 796f54d4ddbf |
children | 431f80aba37a |
line wrap: on
line source
//////////////////////////////////////////////////////////////////////// // // Copyright (C) 2011-2022 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 <QComboBox> #include "Container.h" #include "PopupMenuControl.h" #include "QtHandlesUtils.h" #include "octave-qtutils.h" namespace octave { PopupMenuControl * PopupMenuControl::create (octave::interpreter& interp, const graphics_object& go) { Object *parent = parentObject (interp, go); if (parent) { Container *container = parent->innerContainer (); if (container) return new PopupMenuControl (interp, go, new QComboBox (container)); } return nullptr; } PopupMenuControl::PopupMenuControl (octave::interpreter& interp, const graphics_object& go, QComboBox *box) : BaseControl (interp, go, box), m_blockUpdate (false) { uicontrol::properties& up = properties<uicontrol> (); box->addItems (Utils::fromStdString (up.get_string_string ()).split ('|')); update (uicontrol::properties::ID_VALUE); connect (box, QOverload<int>::of (&QComboBox::activated), this, &PopupMenuControl::currentIndexChanged); } PopupMenuControl::~PopupMenuControl (void) { } void PopupMenuControl::update (int pId) { uicontrol::properties& up = properties<uicontrol> (); QComboBox *box = qWidget<QComboBox> (); switch (pId) { case uicontrol::properties::ID_STRING: m_blockUpdate = true; { int oldCurrent = box->currentIndex (); box->clear (); box->addItems (Utils::fromStdString (up.get_string_string ()).split ('|')); if (box->count () > 0 && oldCurrent >= 0 && oldCurrent < box->count ()) { box->setCurrentIndex (oldCurrent); } else { emit gh_set_event (m_handle, "value", octave_value (box->count () > 0 ? 1.0 : 0.0), false); } } m_blockUpdate = false; break; case uicontrol::properties::ID_VALUE: m_blockUpdate = true; { Matrix value = up.get_value ().matrix_value (); if (value.numel () > 0) { if (value(0) != static_cast<int> (value(0))) warning ("popupmenu value should be integer"); else { int newIndex = int (value(0)) - 1; if (newIndex >= 0 && newIndex < box->count ()) { if (newIndex != box->currentIndex ()) box->setCurrentIndex (newIndex); } else warning ("popupmenu value not within valid display range"); } } } m_blockUpdate = false; break; default: BaseControl::update (pId); break; } } void PopupMenuControl::currentIndexChanged (int index) { if (! m_blockUpdate) { emit gh_set_event (m_handle, "value", octave_value (double (index + 1)), false); emit gh_callback_event (m_handle, "callback"); } } }