octave: libgui/src/workspace-model.cc annotate

annotate libgui/src/workspace-model.cc @ 25974:c3cd63006870

add preference for disabling workspace colors for different attributes * gui-preferences.h: add new and mive existing preferences for the workspace view * settings-dialog.cc (settings_dialog, write_changed_settings): remove use of workspace prefs here; (read_workspace_colors): construct all elements of the workspace tab by code instead of the designer file; (write_workspace_colors): store the values of the check boxes for workspace preferences * settings-dialog.h: add check boxes of workspace view, that are removed from the designer file and now constructed in the code, as class variables; * settings-dialog.ui: clear the workspace tab, all elements are now constructed and laid out in the the code * workspace-model.cc (data): set background color only if attribute colors are desired * workspace-model.h: new class variable holding whether colors are used or not * workspace-view.cc (notice_settings): use constants from gui-preferences.h for key names and default values instead of hard coded values and store preference for using attribute colors

author	Torsten <mttl@mailbox.org>
date	Sun, 28 Oct 2018 20:31:08 +0100
parents	6652d3823428
children	a6df420457ac

rev	line source
15204 359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	1 /*
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	2
25054 6652d3823428 maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 24766 diff changeset	3 Copyright (C) 2013-2018 John W. Eaton
6652d3823428 maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 24766 diff changeset	4 Copyright (C) 2011-2018 Jacob Dawid
15204 359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	5
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	6 This file is part of Octave.
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	7
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24396 diff changeset	8 Octave is free software: you can redistribute it and/or modify it
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22411 diff changeset	9 under the terms of the GNU General Public License as published by
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24396 diff changeset	10 the Free Software Foundation, either version 3 of the License, or
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22411 diff changeset	11 (at your option) any later version.
15204 359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	12
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22411 diff changeset	13 Octave is distributed in the hope that it will be useful, but
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22411 diff changeset	14 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22411 diff changeset	15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22411 diff changeset	16 GNU General Public License for more details.
15204 359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	17
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	18 You should have received a copy of the GNU General Public License
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	19 along with Octave; see the file COPYING. If not, see
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24396 diff changeset	20 <https://www.gnu.org/licenses/>.
15204 359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	21
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	22 */
14664 664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	23
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	24 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21203 diff changeset	25 # include "config.h"
15155 9e62d5a3a45e partial cleanup of include files in gui sources John W. Eaton <jwe@octave.org> parents: 14879 diff changeset	26 #endif
9e62d5a3a45e partial cleanup of include files in gui sources John W. Eaton <jwe@octave.org> parents: 14879 diff changeset	27
14664 664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	28 #include <QTreeWidget>
16610 a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16527 diff changeset	29 #include <QSettings>
15155 9e62d5a3a45e partial cleanup of include files in gui sources John W. Eaton <jwe@octave.org> parents: 14879 diff changeset	30
24645 f61502510d08 restore ability to select variables for editing from workspace widget John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	31 #include "symscope.h"
16502 45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16478 diff changeset	32 #include "utils.h"
24645 f61502510d08 restore ability to select variables for editing from workspace widget John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	33
16610 a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16527 diff changeset	34 #include "resource-manager.h"
25974 c3cd63006870 add preference for disabling workspace colors for different attributes Torsten <mttl@mailbox.org> parents: 25054 diff changeset	35 #include "gui-preferences.h"
15155 9e62d5a3a45e partial cleanup of include files in gui sources John W. Eaton <jwe@octave.org> parents: 14879 diff changeset	36 #include "workspace-model.h"
14664 664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	37
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	38 namespace octave
16641 64f9a3e301d3 don't store default values in resource manager class John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	39 {
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	40 workspace_model::workspace_model (QObject *p)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	41 : QAbstractTableModel (p)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	42 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	43 m_columnNames.append (tr ("Name"));
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	44 m_columnNames.append (tr ("Class"));
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	45 m_columnNames.append (tr ("Dimension"));
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	46 m_columnNames.append (tr ("Value"));
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	47 m_columnNames.append (tr ("Attribute"));
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	48
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	49 for (int i = 0; i < resource_manager::storage_class_chars ().length (); i++)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	50 m_storage_class_colors.append (QColor (Qt::white));
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	51
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	52 }
16641 64f9a3e301d3 don't store default values in resource manager class John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	53
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	54 QList<QColor>
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	55 workspace_model::storage_class_default_colors (void)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	56 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	57 QList<QColor> colors;
16641 64f9a3e301d3 don't store default values in resource manager class John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	58
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	59 if (colors.isEmpty ())
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	60 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	61 colors << QColor (190, 255, 255)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	62 << QColor (220, 255, 220)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	63 << QColor (220, 220, 255)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	64 << QColor (255, 255, 190)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	65 << QColor (255, 220, 220)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	66 << QColor (255, 190, 255);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	67 }
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	68
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	69 return colors;
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	70 }
16641 64f9a3e301d3 don't store default values in resource manager class John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	71
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	72 QStringList
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	73 workspace_model::storage_class_names (void)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	74 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	75 QStringList names;
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	76
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	77 if (names.isEmpty ())
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	78 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	79 names << QObject::tr ("automatic")
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	80 << QObject::tr ("function")
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	81 << QObject::tr ("global")
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	82 << QObject::tr ("hidden")
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	83 << QObject::tr ("inherited")
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	84 << QObject::tr ("persistent");
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	85 }
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	86
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	87 return names;
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	88 }
14664 664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	89
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	90 int
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	91 workspace_model::rowCount (const QModelIndex&) const
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	92 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	93 return m_symbols.size ();
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	94 }
14664 664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	95
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	96 int
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	97 workspace_model::columnCount (const QModelIndex&) const
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	98 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	99 return m_columnNames.size ();
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	100 }
16502 45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16478 diff changeset	101
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	102 Qt::ItemFlags
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	103 workspace_model::flags (const QModelIndex& idx) const
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	104 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	105 Qt::ItemFlags retval = Qt::NoItemFlags;
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	106
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	107 if (idx.isValid ())
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	108 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	109 retval \|= Qt::ItemIsEnabled;
14664 664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	110
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	111 if (m_top_level && idx.column () == 0)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	112 retval \|= Qt::ItemIsSelectable;
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	113 }
16502 45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16478 diff changeset	114
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	115 return retval;
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	116 }
14664 664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	117
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	118 QVariant
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	119 workspace_model::headerData (int section, Qt::Orientation orientation,
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	120 int role) const
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	121 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	122 if (orientation == Qt::Horizontal && role == Qt::DisplayRole)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	123 return m_columnNames[section];
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	124 else
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	125 return QVariant ();
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	126 }
14664 664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	127
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	128 QVariant
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	129 workspace_model::data (const QModelIndex& idx, int role) const
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	130 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	131 QVariant retval;
16478 079ec7ce60e0 delete useless connection; style fixes John W. Eaton <jwe@octave.org> parents: 16477 diff changeset	132
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	133 if (idx.isValid ())
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	134 {
25974 c3cd63006870 add preference for disabling workspace colors for different attributes Torsten <mttl@mailbox.org> parents: 25054 diff changeset	135 if (role == Qt::BackgroundColorRole && m_enable_colors)
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	136 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	137 QString class_chars = resource_manager::storage_class_chars ();
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	138 int actual_class
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	139 = class_chars.indexOf (m_scopes[idx.row ()].toLatin1 ());
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	140 if (actual_class >= 0)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	141 return QVariant (m_storage_class_colors.at (actual_class));
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	142 else
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	143 return retval;
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	144 }
14664 664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	145
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	146 if (role == Qt::DisplayRole
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	147 \|\| (idx.column () == 0 && role == Qt::EditRole)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	148 \|\| (idx.column () == 0 && role == Qt::ToolTipRole))
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	149 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	150 switch (idx.column ())
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	151 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	152 case 0:
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	153 if (role == Qt::ToolTipRole)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	154 retval
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	155 = QVariant (tr ("Right click to copy, rename, or display"));
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	156 else
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	157 retval = QVariant (m_symbols[idx.row ()]);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	158 break;
16478 079ec7ce60e0 delete useless connection; style fixes John W. Eaton <jwe@octave.org> parents: 16477 diff changeset	159
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	160 case 1:
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	161 retval = QVariant (m_class_names[idx.row ()]);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	162 break;
16502 45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16478 diff changeset	163
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	164 case 2:
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	165 retval = QVariant (m_dimensions[idx.row ()]);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	166 break;
16610 a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16527 diff changeset	167
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	168 case 3:
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	169 retval = QVariant (m_values[idx.row ()]);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	170 break;
16527 8701792e16ec include column in workspace viewer for storage class John W. Eaton <jwe@octave.org> parents: 16521 diff changeset	171
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	172 case 4:
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	173 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	174 QString sclass;
17826 574ab045f70c restore display of "persistent", "automatic", etc. removed by 53f433bae63b John W. Eaton <jwe@octave.org> parents: 17824 diff changeset	175
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	176 QString class_chars = resource_manager::storage_class_chars ();
17826 574ab045f70c restore display of "persistent", "automatic", etc. removed by 53f433bae63b John W. Eaton <jwe@octave.org> parents: 17824 diff changeset	177
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	178 int actual_class
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	179 = class_chars.indexOf (m_scopes[idx.row ()].toLatin1 ());
17826 574ab045f70c restore display of "persistent", "automatic", etc. removed by 53f433bae63b John W. Eaton <jwe@octave.org> parents: 17824 diff changeset	180
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	181 if (actual_class >= 0)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	182 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	183 QStringList class_names
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	184 = resource_manager::storage_class_names ();
17826 574ab045f70c restore display of "persistent", "automatic", etc. removed by 53f433bae63b John W. Eaton <jwe@octave.org> parents: 17824 diff changeset	185
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	186 sclass = class_names.at (actual_class);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	187 }
17826 574ab045f70c restore display of "persistent", "automatic", etc. removed by 53f433bae63b John W. Eaton <jwe@octave.org> parents: 17824 diff changeset	188
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	189 if (m_complex_flags[idx.row ()])
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	190 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	191 if (sclass.isEmpty ())
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	192 sclass = tr ("complex");
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	193 else
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	194 sclass += ", " + tr ("complex");
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	195 }
17826 574ab045f70c restore display of "persistent", "automatic", etc. removed by 53f433bae63b John W. Eaton <jwe@octave.org> parents: 17824 diff changeset	196
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	197 retval = QVariant (sclass);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	198 }
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	199 break;
17826 574ab045f70c restore display of "persistent", "automatic", etc. removed by 53f433bae63b John W. Eaton <jwe@octave.org> parents: 17824 diff changeset	200 }
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	201 }
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	202 }
16478 079ec7ce60e0 delete useless connection; style fixes John W. Eaton <jwe@octave.org> parents: 16477 diff changeset	203
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	204 return retval;
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	205 }
14664 664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	206
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	207 bool
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	208 workspace_model::setData (const QModelIndex& idx, const QVariant& value,
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	209 int role)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	210 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	211 bool retval = false;
16502 45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16478 diff changeset	212
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	213 if (idx.column () == 0 && role == Qt::EditRole)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	214 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	215 QString qold_name = m_symbols[idx.row ()];
16502 45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16478 diff changeset	216
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	217 QString qnew_name = value.toString ();
16502 45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16478 diff changeset	218
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	219 std::string new_name = qnew_name.toStdString ();
16502 45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16478 diff changeset	220
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	221 if (valid_identifier (new_name))
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	222 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	223 emit rename_variable (qold_name, qnew_name);
16502 45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16478 diff changeset	224
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	225 retval = true;
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	226 }
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	227 }
16502 45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16478 diff changeset	228
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	229 return retval;
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	230 }
16502 45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16478 diff changeset	231
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	232 void
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	233 workspace_model::set_workspace (bool top_level, bool /* debug */,
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	234 const symbol_scope& scope)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	235 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	236 clear_data ();
24645 f61502510d08 restore ability to select variables for editing from workspace widget John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	237
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	238 m_top_level = top_level;
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	239 m_scope = scope;
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	240
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	241 update_table ();
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	242 }
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	243
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	244 void
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	245 workspace_model::clear_workspace (void)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	246 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	247 clear_data ();
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	248 update_table ();
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	249 }
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	250
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	251 void
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	252 workspace_model::notice_settings (const QSettings *settings)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	253 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	254 QList<QColor> default_colors =
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	255 resource_manager::storage_class_default_colors ();
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	256 QString class_chars = resource_manager::storage_class_chars ();
16610 a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16527 diff changeset	257
25974 c3cd63006870 add preference for disabling workspace colors for different attributes Torsten <mttl@mailbox.org> parents: 25054 diff changeset	258 m_enable_colors =
c3cd63006870 add preference for disabling workspace colors for different attributes Torsten <mttl@mailbox.org> parents: 25054 diff changeset	259 settings->value (ws_enable_colors.key, ws_enable_colors.key).toBool ();
c3cd63006870 add preference for disabling workspace colors for different attributes Torsten <mttl@mailbox.org> parents: 25054 diff changeset	260
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	261 for (int i = 0; i < class_chars.length (); i++)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	262 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	263 QVariant default_var = default_colors.at (i);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	264 QColor setting_color = settings->value ("workspaceview/color_"
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	265 + class_chars.mid (i,1),
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	266 default_var).value<QColor> ();
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	267 m_storage_class_colors.replace (i,setting_color);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	268 }
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	269 }
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	270
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	271 void
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	272 workspace_model::clear_data (void)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	273 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	274 m_top_level = false;
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	275 m_scope = symbol_scope ();
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	276 m_scopes = QString ();
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	277 m_symbols = QStringList ();
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	278 m_class_names = QStringList ();
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	279 m_dimensions = QStringList ();
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	280 m_values = QStringList ();
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	281 m_complex_flags = QIntList ();
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	282 }
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	283
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	284 void
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	285 workspace_model::update_table (void)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	286 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	287 beginResetModel ();
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	288
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	289 std::list<symbol_record> sr_list = m_scope.all_variables ();
24645 f61502510d08 restore ability to select variables for editing from workspace widget John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	290
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	291 symbol_record::context_id context = m_scope.current_context ();
24645 f61502510d08 restore ability to select variables for editing from workspace widget John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	292
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	293 for (const auto& sr : sr_list)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	294 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	295 std::string nm = sr.name ();
24645 f61502510d08 restore ability to select variables for editing from workspace widget John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	296
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	297 octave_value val = sr.varval (context);
24645 f61502510d08 restore ability to select variables for editing from workspace widget John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	298
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	299 // FIXME: fix size for objects, see kluge in variables.cc
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	300 //dim_vector dv = val.dims ();
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	301 octave_value tmp = val;
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	302 Matrix sz = tmp.size ();
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	303 dim_vector dv = dim_vector::alloc (sz.numel ());
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	304 for (octave_idx_type i = 0; i < dv.ndims (); i++)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	305 dv(i) = sz(i);
24645 f61502510d08 restore ability to select variables for editing from workspace widget John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	306
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	307 char storage = ' ';
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	308 if (sr.is_global ())
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	309 storage = 'g';
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	310 else if (sr.is_persistent ())
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	311 storage = 'p';
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	312 else if (sr.is_automatic ())
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	313 storage = 'a';
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	314 else if (sr.is_formal ())
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	315 storage = 'f';
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	316 else if (sr.is_hidden ())
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	317 storage = 'h';
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	318 else if (sr.is_inherited ())
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	319 storage = 'i';
24645 f61502510d08 restore ability to select variables for editing from workspace widget John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	320
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	321 std::ostringstream buf;
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	322 val.short_disp (buf);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	323 std::string short_disp_str = buf.str ();
24645 f61502510d08 restore ability to select variables for editing from workspace widget John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	324
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	325 m_scopes.append (storage);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	326 m_symbols.append (QString::fromStdString (nm));
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	327 m_class_names.append (QString::fromStdString (val.class_name ()));
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	328 m_dimensions.append (QString::fromStdString (dv.str ()));
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	329 m_values.append (QString::fromStdString (short_disp_str));
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	330 m_complex_flags.append (val.iscomplex ());
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	331 }
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	332
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	333 endResetModel ();
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	334
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	335 emit model_changed ();
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	336 }
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	337 }

Mercurial > octave

annotate libgui/src/workspace-model.cc @ 25974:c3cd63006870