Mercurial > octave
diff libgui/src/workspace-model.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/src/workspace-model.cc Tue Dec 06 14:37:51 2022 -0500 +++ b/libgui/src/workspace-model.cc Tue Dec 06 14:53:00 2022 -0500 @@ -41,235 +41,235 @@ OCTAVE_BEGIN_NAMESPACE(octave) - workspace_model::workspace_model (QObject *p) - : QAbstractTableModel (p) - { - // The header names. Use tr () again when accessing them since - // the translator si not yet initialized when this ctor is called - m_columnNames.append (tr ("Name")); - m_columnNames.append (tr ("Class")); - m_columnNames.append (tr ("Dimension")); - m_columnNames.append (tr ("Value")); - m_columnNames.append (tr ("Attribute")); +workspace_model::workspace_model (QObject *p) +: QAbstractTableModel (p) +{ + // The header names. Use tr () again when accessing them since + // the translator si not yet initialized when this ctor is called + m_columnNames.append (tr ("Name")); + m_columnNames.append (tr ("Class")); + m_columnNames.append (tr ("Dimension")); + m_columnNames.append (tr ("Value")); + m_columnNames.append (tr ("Attribute")); - // Initialize the background and foreground colors of special - // classes in the workspace view. The structure is - // m_storage_class_colors(1,2,...,colors): background colors - // m_storage_class_colors(colors+1,...,2*colors): foreground colors - for (unsigned int i = 0; i < 2*ws_colors_count; i++) - m_storage_class_colors.append (QColor (Qt::white)); + // Initialize the background and foreground colors of special + // classes in the workspace view. The structure is + // m_storage_class_colors(1,2,...,colors): background colors + // m_storage_class_colors(colors+1,...,2*colors): foreground colors + for (unsigned int i = 0; i < 2*ws_colors_count; i++) + m_storage_class_colors.append (QColor (Qt::white)); - } +} - int - workspace_model::rowCount (const QModelIndex&) const - { - return m_symbols.size (); - } +int +workspace_model::rowCount (const QModelIndex&) const +{ + return m_symbols.size (); +} - int - workspace_model::columnCount (const QModelIndex&) const - { - return m_columnNames.size (); - } +int +workspace_model::columnCount (const QModelIndex&) const +{ + return m_columnNames.size (); +} - Qt::ItemFlags - workspace_model::flags (const QModelIndex& idx) const - { - Qt::ItemFlags retval = Qt::NoItemFlags; +Qt::ItemFlags +workspace_model::flags (const QModelIndex& idx) const +{ + Qt::ItemFlags retval = Qt::NoItemFlags; - if (idx.isValid ()) - { - retval |= Qt::ItemIsEnabled; + if (idx.isValid ()) + { + retval |= Qt::ItemIsEnabled; - if (m_top_level && idx.column () == 0) - retval |= Qt::ItemIsSelectable; - } + if (m_top_level && idx.column () == 0) + retval |= Qt::ItemIsSelectable; + } - return retval; - } + return retval; +} - QVariant - workspace_model::headerData (int section, Qt::Orientation orientation, - int role) const - { - if (orientation == Qt::Horizontal && role == Qt::DisplayRole) - return tr (m_columnNames[section].toStdString ().data ()); - else - return QVariant (); - } +QVariant +workspace_model::headerData (int section, Qt::Orientation orientation, + int role) const +{ + if (orientation == Qt::Horizontal && role == Qt::DisplayRole) + return tr (m_columnNames[section].toStdString ().data ()); + else + return QVariant (); +} - QVariant - workspace_model::data (const QModelIndex& idx, int role) const - { - QVariant retval; +QVariant +workspace_model::data (const QModelIndex& idx, int role) const +{ + QVariant retval; - if (idx.isValid ()) - { - if ((role == Qt::BackgroundRole || role == Qt::ForegroundRole) - && m_enable_colors) - { - int actual_class - = ws_class_chars.indexOf (m_scopes[idx.row ()].toLatin1 ()); - if (actual_class >= 0) - { - // Valid class: Get background (normal indexes) or foreground - // color (indexes with offset) - if (role == Qt::ForegroundRole) - actual_class += ws_colors_count; + if (idx.isValid ()) + { + if ((role == Qt::BackgroundRole || role == Qt::ForegroundRole) + && m_enable_colors) + { + int actual_class + = ws_class_chars.indexOf (m_scopes[idx.row ()].toLatin1 ()); + if (actual_class >= 0) + { + // Valid class: Get background (normal indexes) or foreground + // color (indexes with offset) + if (role == Qt::ForegroundRole) + actual_class += ws_colors_count; - return QVariant (m_storage_class_colors.at (actual_class)); - } - else - return retval; - } + return QVariant (m_storage_class_colors.at (actual_class)); + } + else + return retval; + } - if (role == Qt::DisplayRole - || (idx.column () == 0 && role == Qt::EditRole) - || (idx.column () == 0 && role == Qt::ToolTipRole)) - { - switch (idx.column ()) + if (role == Qt::DisplayRole + || (idx.column () == 0 && role == Qt::EditRole) + || (idx.column () == 0 && role == Qt::ToolTipRole)) + { + switch (idx.column ()) + { + case 0: + if (role == Qt::ToolTipRole) + retval + = QVariant (tr ("Right click to copy, rename, or display")); + else + retval = QVariant (m_symbols[idx.row ()]); + break; + + case 1: + retval = QVariant (m_class_names[idx.row ()]); + break; + + case 2: + retval = QVariant (m_dimensions[idx.row ()]); + break; + + case 3: + retval = QVariant (m_values[idx.row ()]); + break; + + case 4: { - case 0: - if (role == Qt::ToolTipRole) - retval - = QVariant (tr ("Right click to copy, rename, or display")); - else - retval = QVariant (m_symbols[idx.row ()]); - break; - - case 1: - retval = QVariant (m_class_names[idx.row ()]); - break; - - case 2: - retval = QVariant (m_dimensions[idx.row ()]); - break; - - case 3: - retval = QVariant (m_values[idx.row ()]); - break; - - case 4: - { - QString sclass; + QString sclass; - int actual_class - = ws_class_chars.indexOf (m_scopes[idx.row ()].toLatin1 ()); + int actual_class + = ws_class_chars.indexOf (m_scopes[idx.row ()].toLatin1 ()); - if (actual_class >= 0) - sclass = ws_color_names.at (actual_class); + if (actual_class >= 0) + sclass = ws_color_names.at (actual_class); - if (m_complex_flags[idx.row ()]) - { - if (sclass.isEmpty ()) - sclass = tr ("complex"); - else - sclass += ", " + tr ("complex"); - } + if (m_complex_flags[idx.row ()]) + { + if (sclass.isEmpty ()) + sclass = tr ("complex"); + else + sclass += ", " + tr ("complex"); + } - retval = QVariant (sclass); - } - break; + retval = QVariant (sclass); } - } - } + break; + } + } + } - return retval; - } + return retval; +} - void - workspace_model::set_workspace (bool top_level, bool /* debug */, - const symbol_info_list& syminfo) - { - clear_data (); +void +workspace_model::set_workspace (bool top_level, bool /* debug */, + const symbol_info_list& syminfo) +{ + clear_data (); - m_top_level = top_level; - m_syminfo_list = syminfo; + m_top_level = top_level; + m_syminfo_list = syminfo; - update_table (); - } + update_table (); +} - void - workspace_model::clear_workspace (void) - { - clear_data (); - update_table (); - } +void +workspace_model::clear_workspace (void) +{ + clear_data (); + update_table (); +} - void - workspace_model::notice_settings (const gui_settings *settings) - { - m_enable_colors = settings->value (ws_enable_colors).toBool (); +void +workspace_model::notice_settings (const gui_settings *settings) +{ + m_enable_colors = settings->value (ws_enable_colors).toBool (); - int mode = settings->value (ws_color_mode).toInt (); + int mode = settings->value (ws_color_mode).toInt (); - for (int i = 0; i < ws_colors_count; i++) - { - QColor setting_color = settings->color_value (ws_colors[i], mode); + for (int i = 0; i < ws_colors_count; i++) + { + QColor setting_color = settings->color_value (ws_colors[i], mode); - QPalette p (setting_color); - m_storage_class_colors.replace (i, setting_color); + QPalette p (setting_color); + m_storage_class_colors.replace (i, setting_color); - QColor fg_color = p.color (QPalette::WindowText); - m_storage_class_colors.replace (i + ws_colors_count, fg_color); + QColor fg_color = p.color (QPalette::WindowText); + m_storage_class_colors.replace (i + ws_colors_count, fg_color); - } - } + } +} - void - workspace_model::clear_data (void) - { - m_top_level = false; - m_syminfo_list = symbol_info_list (); - m_scopes = QString (); - m_symbols = QStringList (); - m_class_names = QStringList (); - m_dimensions = QStringList (); - m_values = QStringList (); - m_complex_flags = QIntList (); - } +void +workspace_model::clear_data (void) +{ + m_top_level = false; + m_syminfo_list = symbol_info_list (); + m_scopes = QString (); + m_symbols = QStringList (); + m_class_names = QStringList (); + m_dimensions = QStringList (); + m_values = QStringList (); + m_complex_flags = QIntList (); +} - void - workspace_model::update_table (void) - { - beginResetModel (); +void +workspace_model::update_table (void) +{ + beginResetModel (); - for (const auto& syminfo : m_syminfo_list) - { - std::string nm = syminfo.name (); + for (const auto& syminfo : m_syminfo_list) + { + std::string nm = syminfo.name (); - octave_value val = syminfo.value (); + octave_value val = syminfo.value (); - // FIXME: fix size for objects, see kluge in ov.cc - Matrix sz = val.size (); - dim_vector dv = dim_vector::alloc (sz.numel ()); - for (octave_idx_type i = 0; i < dv.ndims (); i++) - dv(i) = sz(i); + // FIXME: fix size for objects, see kluge in ov.cc + Matrix sz = val.size (); + dim_vector dv = dim_vector::alloc (sz.numel ()); + for (octave_idx_type i = 0; i < dv.ndims (); i++) + dv(i) = sz(i); - char storage = ' '; - if (syminfo.is_formal ()) - storage = 'a'; - else if (syminfo.is_global ()) - storage = 'g'; - else if (syminfo.is_persistent ()) - storage = 'p'; + char storage = ' '; + if (syminfo.is_formal ()) + storage = 'a'; + else if (syminfo.is_global ()) + storage = 'g'; + else if (syminfo.is_persistent ()) + storage = 'p'; - std::ostringstream buf; - val.short_disp (buf); - std::string short_disp_str = buf.str (); + std::ostringstream buf; + val.short_disp (buf); + std::string short_disp_str = buf.str (); - m_scopes.append (storage); - m_symbols.append (QString::fromStdString (nm)); - m_class_names.append (QString::fromStdString (val.class_name ())); - m_dimensions.append (QString::fromStdString (dv.str ())); - m_values.append (QString::fromStdString (short_disp_str)); - m_complex_flags.append (val.iscomplex ()); - } + m_scopes.append (storage); + m_symbols.append (QString::fromStdString (nm)); + m_class_names.append (QString::fromStdString (val.class_name ())); + m_dimensions.append (QString::fromStdString (dv.str ())); + m_values.append (QString::fromStdString (short_disp_str)); + m_complex_flags.append (val.iscomplex ()); + } - endResetModel (); + endResetModel (); - emit model_changed (); - } + emit model_changed (); +} OCTAVE_END_NAMESPACE(octave)