Mercurial > octave
diff libgui/graphics/ListBoxControl.cc @ 31648:29d734430e5f stable
maint: Re-indent code after switch to using namespace macros.
* 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, FigureWindow.cc, FigureWindow.h, GLCanvas.cc,
GLCanvas.h, GenericEventNotify.h, KeyMap.cc, KeyMap.h,
ListBoxControl.cc, ListBoxControl.h, Logger.cc, Logger.h, Menu.cc,
Menu.h, MenuContainer.h, Object.cc, Object.h, ObjectProxy.cc,
ObjectProxy.h, Panel.cc, Panel.h, PopupMenuControl.cc,
PopupMenuControl.h, PushButtonControl.cc, PushButtonControl.h,
PushTool.cc, PushTool.h, QtHandlesUtils.cc, QtHandlesUtils.h,
RadioButtonControl.cc, RadioButtonControl.h, SliderControl.cc,
SliderControl.h, Table.cc, Table.h, TextControl.cc, TextControl.h,
TextEdit.cc, TextEdit.h, ToggleButtonControl.cc,
ToggleButtonControl.h, ToggleTool.cc, ToggleTool.h, ToolBar.cc,
ToolBar.h, ToolBarButton.cc, ToolBarButton.h, annotation-dialog.cc,
annotation-dialog.h, gl-select.cc, gl-select.h, qopengl-functions.h,
qt-graphics-toolkit.cc, qt-graphics-toolkit.h, module.mk, QTerminal.h,
color-picker.cc, color-picker.h, command-widget.cc, command-widget.h,
community-news.cc, community-news.h, dialog.cc, dialog.h,
documentation-bookmarks.cc, documentation-bookmarks.h,
documentation-dock-widget.cc, documentation-dock-widget.h,
documentation.cc, documentation.h, dw-main-window.cc,
dw-main-window.h, external-editor-interface.cc,
external-editor-interface.h, files-dock-widget.cc,
files-dock-widget.h, find-files-dialog.cc, find-files-dialog.h,
find-files-model.cc, find-files-model.h, graphics-init.cc,
graphics-init.h, gui-settings.cc, gui-settings.h, gui-utils.cc,
gui-utils.h, history-dock-widget.cc, history-dock-widget.h,
interpreter-qobject.cc, interpreter-qobject.h, led-indicator.cc,
led-indicator.h, file-editor-interface.h, file-editor-tab.cc,
file-editor-tab.h, file-editor.cc, file-editor.h, find-dialog.cc,
find-dialog.h, marker.cc, marker.h, octave-qscintilla.cc,
octave-qscintilla.h, octave-txt-lexer.cc, octave-txt-lexer.h,
main-window.cc, main-window.h, news-reader.cc, news-reader.h,
octave-dock-widget.cc, octave-dock-widget.h, octave-qobject.cc,
octave-qobject.h, qt-application.cc, qt-application.h,
qt-interpreter-events.cc, qt-interpreter-events.h, qt-utils.h,
release-notes.cc, release-notes.h, resource-manager.cc,
resource-manager.h, set-path-dialog.cc, set-path-dialog.h,
set-path-model.cc, set-path-model.h, settings-dialog.cc,
settings-dialog.h, shortcut-manager.cc, shortcut-manager.h,
tab-bar.cc, tab-bar.h, terminal-dock-widget.cc,
terminal-dock-widget.h, variable-editor-model.cc,
variable-editor-model.h, variable-editor.cc, variable-editor.h,
welcome-wizard.cc, welcome-wizard.h, workspace-model.cc,
workspace-model.h, workspace-view.cc, workspace-view.h:
Re-indent code after switch to using namespace macros.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 06 Dec 2022 14:53:00 -0500 |
| parents | c6d54dd31a7e |
| children | deb553ac2c54 597f3ee61a48 |
line wrap: on
line diff
--- a/libgui/graphics/ListBoxControl.cc Tue Dec 06 14:37:51 2022 -0500 +++ b/libgui/graphics/ListBoxControl.cc Tue Dec 06 14:53:00 2022 -0500 @@ -39,252 +39,252 @@ OCTAVE_BEGIN_NAMESPACE(octave) - static void - updateSelection (QListWidget *list, const Matrix& value) - { - octave_idx_type n = value.numel (); - int lc = list->count (); +static void +updateSelection (QListWidget *list, const Matrix& value) +{ + octave_idx_type n = value.numel (); + int lc = list->count (); + + list->clearSelection (); + + for (octave_idx_type i = 0; i < n; i++) + { + int idx = octave::math::round (value(i)); - list->clearSelection (); + if (1 <= idx && idx <= lc) + { + list->item (idx-1)->setSelected (true); + list->scrollToItem (list->item (idx-1)); + if (i == 0 + && list->selectionMode () == QAbstractItemView::SingleSelection) + break; + } + else + { + // Invalid selection. + list->clearSelection (); + break; + } + } +} - for (octave_idx_type i = 0; i < n; i++) - { - int idx = octave::math::round (value(i)); +ListBoxControl * +ListBoxControl::create (octave::base_qobject& oct_qobj, + octave::interpreter& interp, + const graphics_object& go) +{ + Object *parent = parentObject (interp, go); + + if (parent) + { + Container *container = parent->innerContainer (); + + if (container) + return new ListBoxControl (oct_qobj, interp, go, + new QListWidget (container)); + } + + return nullptr; +} + +ListBoxControl::ListBoxControl (octave::base_qobject& oct_qobj, + octave::interpreter& interp, + const graphics_object& go, QListWidget *list) + : BaseControl (oct_qobj, interp, go, list), m_blockCallback (false), + m_selectionChanged (false) +{ + uicontrol::properties& up = properties<uicontrol> (); - if (1 <= idx && idx <= lc) - { - list->item (idx-1)->setSelected (true); - list->scrollToItem (list->item (idx-1)); - if (i == 0 - && list->selectionMode () == QAbstractItemView::SingleSelection) - break; - } - else - { - // Invalid selection. - list->clearSelection (); - break; - } - } - } + list->addItems (Utils::fromStringVector (up.get_string_vector ())); + if ((up.get_max () - up.get_min ()) > 1) + list->setSelectionMode (QAbstractItemView::ExtendedSelection); + else + list->setSelectionMode (QAbstractItemView::SingleSelection); + Matrix value = up.get_value ().matrix_value (); + if (value.numel () > 0) + { + octave_idx_type n = value.numel (); + int lc = list->count (); + + for (octave_idx_type i = 0; i < n; i++) + { + int idx = octave::math::round (value(i)); + + if (1 <= idx && idx <= lc) + { + list->item (idx-1)->setSelected (true); + list->scrollToItem (list->item (idx-1)); + if (i == 0 && (list->selectionMode () + == QAbstractItemView::SingleSelection)) + break; + } + } + } + + list->viewport ()->installEventFilter (this); - ListBoxControl * - ListBoxControl::create (octave::base_qobject& oct_qobj, - octave::interpreter& interp, - const graphics_object& go) - { - Object *parent = parentObject (interp, go); + connect (list, &QListWidget::itemSelectionChanged, + this, &ListBoxControl::itemSelectionChanged); + connect (list, &QListWidget::activated, + this, &ListBoxControl::itemActivated); + connect (list, &QListWidget::itemPressed, + this, &ListBoxControl::itemPressed); +} + +ListBoxControl::~ListBoxControl (void) +{ } + +void +ListBoxControl::update (int pId) +{ + uicontrol::properties& up = properties<uicontrol> (); + QListWidget *list = qWidget<QListWidget> (); - if (parent) - { - Container *container = parent->innerContainer (); + switch (pId) + { + case uicontrol::properties::ID_STRING: + m_blockCallback = true; + list->clear (); + list->addItems (Utils::fromStringVector (up.get_string_vector ())); + updateSelection (list, up.get_value ().matrix_value ()); + m_blockCallback = false; + break; - if (container) - return new ListBoxControl (oct_qobj, interp, go, - new QListWidget (container)); + case uicontrol::properties::ID_MIN: + case uicontrol::properties::ID_MAX: + if ((up.get_max () - up.get_min ()) > 1) + list->setSelectionMode (QAbstractItemView::ExtendedSelection); + else + list->setSelectionMode (QAbstractItemView::SingleSelection); + break; + + case uicontrol::properties::ID_LISTBOXTOP: + { + int idx = octave::math::fix (up.get_listboxtop ()); + if (idx > 0) + list->scrollToItem (list->item (idx-1), + QAbstractItemView::PositionAtTop); + break; } - return nullptr; - } + case uicontrol::properties::ID_VALUE: + m_blockCallback = true; + updateSelection (list, up.get_value ().matrix_value ()); + m_blockCallback = false; + break; - ListBoxControl::ListBoxControl (octave::base_qobject& oct_qobj, - octave::interpreter& interp, - const graphics_object& go, QListWidget *list) - : BaseControl (oct_qobj, interp, go, list), m_blockCallback (false), - m_selectionChanged (false) - { - uicontrol::properties& up = properties<uicontrol> (); + default: + BaseControl::update (pId); + break; + } +} - list->addItems (Utils::fromStringVector (up.get_string_vector ())); - if ((up.get_max () - up.get_min ()) > 1) - list->setSelectionMode (QAbstractItemView::ExtendedSelection); - else - list->setSelectionMode (QAbstractItemView::SingleSelection); - Matrix value = up.get_value ().matrix_value (); - if (value.numel () > 0) - { - octave_idx_type n = value.numel (); - int lc = list->count (); +void +ListBoxControl::sendSelectionChange () +{ + if (! m_blockCallback) + { + QListWidget *list = qWidget<QListWidget> (); - for (octave_idx_type i = 0; i < n; i++) - { - int idx = octave::math::round (value(i)); + QModelIndexList l = list->selectionModel ()->selectedIndexes (); + Matrix value (dim_vector (1, l.size ())); + int i = 0; + + for (const auto& idx : l) + value(i++) = idx.row () + 1; - if (1 <= idx && idx <= lc) - { - list->item (idx-1)->setSelected (true); - list->scrollToItem (list->item (idx-1)); - if (i == 0 && (list->selectionMode () - == QAbstractItemView::SingleSelection)) - break; - } - } - } + emit gh_set_event (m_handle, "value", octave_value (value), false); + emit gh_callback_event (m_handle, "callback"); + } - list->viewport ()->installEventFilter (this); + m_selectionChanged = false; +} - connect (list, &QListWidget::itemSelectionChanged, - this, &ListBoxControl::itemSelectionChanged); - connect (list, &QListWidget::activated, - this, &ListBoxControl::itemActivated); - connect (list, &QListWidget::itemPressed, - this, &ListBoxControl::itemPressed); - } - - ListBoxControl::~ListBoxControl (void) - { } - - void - ListBoxControl::update (int pId) - { - uicontrol::properties& up = properties<uicontrol> (); - QListWidget *list = qWidget<QListWidget> (); +void +ListBoxControl::itemSelectionChanged (void) +{ + if (! m_blockCallback) + m_selectionChanged = true; +} - switch (pId) - { - case uicontrol::properties::ID_STRING: - m_blockCallback = true; - list->clear (); - list->addItems (Utils::fromStringVector (up.get_string_vector ())); - updateSelection (list, up.get_value ().matrix_value ()); - m_blockCallback = false; - break; +void +ListBoxControl::itemActivated (const QModelIndex&) +{ + m_selectionChanged = true; +} +void +ListBoxControl::itemPressed (QListWidgetItem *) +{ + m_selectionChanged = true; +} - case uicontrol::properties::ID_MIN: - case uicontrol::properties::ID_MAX: - if ((up.get_max () - up.get_min ()) > 1) - list->setSelectionMode (QAbstractItemView::ExtendedSelection); - else - list->setSelectionMode (QAbstractItemView::SingleSelection); - break; +bool +ListBoxControl::eventFilter (QObject *watched, QEvent *e) +{ + // listbox change + if (watched == m_qobject) + { + switch (e->type ()) + { + case QEvent::KeyRelease: + if (m_selectionChanged) + sendSelectionChange (); + m_selectionChanged = false; + break; - case uicontrol::properties::ID_LISTBOXTOP: - { - int idx = octave::math::fix (up.get_listboxtop ()); - if (idx > 0) - list->scrollToItem (list->item (idx-1), - QAbstractItemView::PositionAtTop); + default: break; } - case uicontrol::properties::ID_VALUE: - m_blockCallback = true; - updateSelection (list, up.get_value ().matrix_value ()); - m_blockCallback = false; - break; - - default: - BaseControl::update (pId); - break; - } - } + return Object::eventFilter (watched, e); + } + // listbox viewport + else + { + bool override_return = false; + QListWidget *list = qWidget<QListWidget> (); - void - ListBoxControl::sendSelectionChange () - { - if (! m_blockCallback) - { - QListWidget *list = qWidget<QListWidget> (); - - QModelIndexList l = list->selectionModel ()->selectedIndexes (); - Matrix value (dim_vector (1, l.size ())); - int i = 0; - - for (const auto& idx : l) - value(i++) = idx.row () + 1; - - emit gh_set_event (m_handle, "value", octave_value (value), false); - emit gh_callback_event (m_handle, "callback"); - } + switch (e->type ()) + { + case QEvent::MouseButtonPress: + { + QMouseEvent *m = dynamic_cast<QMouseEvent *> (e); - m_selectionChanged = false; - } - - void - ListBoxControl::itemSelectionChanged (void) - { - if (! m_blockCallback) - m_selectionChanged = true; - } + if (m->button () & Qt::RightButton) + override_return = true; + else + { + if (! list->indexAt (m->pos ()).isValid ()) + override_return = true; + m_selectionChanged = true; + } + break; + } + case QEvent::MouseButtonRelease: + { + QMouseEvent *m = dynamic_cast<QMouseEvent *> (e); - void - ListBoxControl::itemActivated (const QModelIndex&) - { - m_selectionChanged = true; - } - void - ListBoxControl::itemPressed (QListWidgetItem *) - { - m_selectionChanged = true; - } + if (m->button () & Qt::RightButton) + override_return = true; - bool - ListBoxControl::eventFilter (QObject *watched, QEvent *e) - { - // listbox change - if (watched == m_qobject) - { - switch (e->type ()) - { - case QEvent::KeyRelease: + else if (! list->indexAt (m->pos ()).isValid ()) + { + list->setCurrentRow (list->count () - 1); + override_return = true; + } + if (m_selectionChanged) sendSelectionChange (); m_selectionChanged = false; - break; - default: break; } - - return Object::eventFilter (watched, e); - } - // listbox viewport - else - { - bool override_return = false; - QListWidget *list = qWidget<QListWidget> (); - - switch (e->type ()) - { - case QEvent::MouseButtonPress: - { - QMouseEvent *m = dynamic_cast<QMouseEvent *> (e); + default: + break; - if (m->button () & Qt::RightButton) - override_return = true; - else - { - if (! list->indexAt (m->pos ()).isValid ()) - override_return = true; - m_selectionChanged = true; - } - break; - } - case QEvent::MouseButtonRelease: - { - QMouseEvent *m = dynamic_cast<QMouseEvent *> (e); - - if (m->button () & Qt::RightButton) - override_return = true; - - else if (! list->indexAt (m->pos ()).isValid ()) - { - list->setCurrentRow (list->count () - 1); - override_return = true; - } - - if (m_selectionChanged) - sendSelectionChange (); - m_selectionChanged = false; - - break; - } - default: - break; - - } - return BaseControl::eventFilter (watched, e) || override_return; - } - } + } + return BaseControl::eventFilter (watched, e) || override_return; + } +} OCTAVE_END_NAMESPACE(octave)