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

annotate libgui/src/workspace-model.h @ 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: 24014 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: 24014 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: 24014 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
20791 f7084eae3318 maint: Use Octave coding conventions for #if statements. Rik <rik@octave.org> parents: 19970 diff changeset	24 #if ! defined (octave_workspace_model_h)
17822 ebb3ef964372 maint: Use common #define syntax "octave_filename_h" in h_files. Rik <rik@octave.org> parents: 17790 diff changeset	25 #define octave_workspace_model_h 1
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	26
16477 64727ed135cb use QTableView instead of QTreeView to display workspace John Donoghue <john.donoghue@ieee.org> parents: 16468 diff changeset	27 #include <QAbstractTableModel>
14669 7605e7136b50 Discarded initFileEditor, instead put that in the constructor. Speedup for updating the symbol table by lowering complexity from n² to n. Fixed problem with hangup on quit. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14668 diff changeset	28 #include <QVector>
14671 f346343654a4 Settings readline event hook and fixed race condition. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14669 diff changeset	29 #include <QSemaphore>
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16444 diff changeset	30 #include <QStringList>
16610 a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16502 diff changeset	31 #include <QChar>
16641 64f9a3e301d3 don't store default values in resource manager class John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	32 #include <QList>
16610 a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16502 diff changeset	33 #include <QColor>
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16502 diff changeset	34 #include <QSettings>
14720 cecc7da96e2a Added update events for the command history model and workspace model. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14719 diff changeset	35
24645 f61502510d08 restore ability to select variables for editing from workspace widget John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	36 #include "symscope.h"
f61502510d08 restore ability to select variables for editing from workspace widget John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	37
17824 86e8dbccf7c7 show when variables are complex in workspace view (bug #40445) John W. Eaton <jwe@octave.org> parents: 17822 diff changeset	38 // Defined for purposes of sending QList<int> as part of signal.
86e8dbccf7c7 show when variables are complex in workspace view (bug #40445) John W. Eaton <jwe@octave.org> parents: 17822 diff changeset	39 typedef QList<int> QIntList;
86e8dbccf7c7 show when variables are complex in workspace view (bug #40445) John W. Eaton <jwe@octave.org> parents: 17822 diff changeset	40
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	41 namespace octave
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	42 {
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	43 class workspace_model
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	44 : public QAbstractTableModel
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	45 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	46 Q_OBJECT
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	47
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	48 public:
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16444 diff changeset	49
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	50 workspace_model (QObject *parent = nullptr);
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16444 diff changeset	51
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	52 ~workspace_model (void) = default;
14720 cecc7da96e2a Added update events for the command history model and workspace model. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14719 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 static QList<QColor> storage_class_default_colors (void);
16641 64f9a3e301d3 don't store default values in resource manager class John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	55
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	56 static QStringList storage_class_names (void);
16641 64f9a3e301d3 don't store default values in resource manager class John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	57
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	58 int rowCount (const QModelIndex& parent = QModelIndex ()) const;
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16444 diff changeset	59
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	60 int columnCount (const QModelIndex& parent = QModelIndex ()) const;
16502 45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16478 diff changeset	61
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	62 Qt::ItemFlags flags (const QModelIndex& index) const;
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16444 diff changeset	63
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	64 QVariant 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	65 int role = Qt::DisplayRole) const;
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16444 diff changeset	66
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	67 QVariant data (const QModelIndex& index, int role) const;
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16444 diff changeset	68
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	69 bool setData (const QModelIndex& index, const QVariant& value,
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	70 int role = Qt::EditRole);
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	71
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	72 bool is_top_level (void) const { return m_top_level; }
16502 45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16478 diff changeset	73
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	74 QColor storage_class_color (int s_class)
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	75 {
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	76 return m_storage_class_colors.at (s_class);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	77 }
16610 a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16502 diff changeset	78
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	79 symbol_scope scope (void) const { return m_scope; }
24645 f61502510d08 restore ability to select variables for editing from workspace widget John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	80
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	81 public slots:
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16444 diff changeset	82
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	83 void 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	84 const symbol_scope& scope);
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16444 diff changeset	85
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	86 void clear_workspace (void);
14671 f346343654a4 Settings readline event hook and fixed race condition. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14669 diff changeset	87
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	88 void notice_settings (const QSettings *);
16610 a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16502 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 signals:
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16444 diff changeset	91
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	92 void model_changed (void);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	93 void prompt_variable_editor(void);
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	94
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	95 void rename_variable (const QString& old_name, const QString& new_name);
16502 45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16478 diff changeset	96
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	97 private:
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	98
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	99 void clear_data (void);
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	100 void update_table (void);
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16444 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 bool m_top_level;
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	103 symbol_scope m_scope;
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	104 QString m_scopes;
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	105 QStringList m_symbols;
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	106 QStringList m_class_names;
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	107 QStringList m_dimensions;
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	108 QStringList m_values;
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	109 QIntList m_complex_flags;
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16444 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 QStringList m_columnNames;
16610 a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16502 diff changeset	112
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	113 QList<QColor> m_storage_class_colors;
25974 c3cd63006870 add preference for disabling workspace colors for different attributes Torsten <mttl@mailbox.org> parents: 25054 diff changeset	114 bool m_enable_colors;
16610 a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16502 diff changeset	115
24766 08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	116 };
08c92c9d48e3 move workspace view and model classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24645 diff changeset	117 }
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	118
16478 079ec7ce60e0 delete useless connection; style fixes John W. Eaton <jwe@octave.org> parents: 16477 diff changeset	119 #endif

Mercurial > octave

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