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

annotate libgui/src/workspace-model.cc @ 16069:0486a29d780f

gui: fix updating history and workspace widget for mxe-octave * history-dock-widget.h: new flag _update_event_enabled for disabling and enabling the update event * histroy-dock-widget.cc(construct): change update timer to periodic and to an interval of 500 ms, enable update * history-dock-widget.cc(request_history_model_update): if update is enabled post update event and disable update in order to prevent further events * history-dock-widget.cc(update_history_callback): reenalbe update when update is complete * workspace-model.h: new flag _update_event_enabled for disabling and enabling the update event * workspace-model.cc(workspace_model): change update timer to periodic, enable update * workspace-model.cc(request_update_workspace): if update is enabled post update event and disable update in order to prevent further events * workspace-model.cc(update_workspace_callback): reenalbe update when update is complete

author	Torsten <ttl@justmail.de>
date	Sun, 17 Feb 2013 21:17:46 +0100
parents	7f423c6111c6
children	d4b6ad43bc87

rev	line source
16069 0486a29d780f gui: fix updating history and workspace widget for mxe-octave Torsten <ttl@justmail.de> parents: 15402 diff changeset	1
15204 359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	2 /*
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	3
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	4 Copyright (C) 2011-2012 Jacob Dawid
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
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	8 Octave is free software; you can redistribute it and/or modify it
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	9 under the terms of the GNU General Public License as published by the
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	10 Free Software Foundation; either version 3 of the License, or (at your
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	11 option) any later version.
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	12
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	13 Octave is distributed in the hope that it will be useful, but WITHOUT
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	16 for more details.
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
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	20 <http://www.gnu.org/licenses/>.
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
15155 9e62d5a3a45e partial cleanup of include files in gui sources John W. Eaton <jwe@octave.org> parents: 14879 diff changeset	24 #ifdef HAVE_CONFIG_H
9e62d5a3a45e partial cleanup of include files in gui sources John W. Eaton <jwe@octave.org> parents: 14879 diff changeset	25 #include <config.h>
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>
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	29 #include <QTime>
15155 9e62d5a3a45e partial cleanup of include files in gui sources John W. Eaton <jwe@octave.org> parents: 14879 diff changeset	30
9e62d5a3a45e partial cleanup of include files in gui sources John W. Eaton <jwe@octave.org> parents: 14879 diff changeset	31 #include <list>
9e62d5a3a45e partial cleanup of include files in gui sources John W. Eaton <jwe@octave.org> parents: 14879 diff changeset	32
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	33 #include "symtab.h"
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	34 #include "variables.h"
15155 9e62d5a3a45e partial cleanup of include files in gui sources John W. Eaton <jwe@octave.org> parents: 14879 diff changeset	35
9e62d5a3a45e partial cleanup of include files in gui sources John W. Eaton <jwe@octave.org> parents: 14879 diff changeset	36 #include "workspace-model.h"
14707 674740c44c09 Changed various files to matche file naming conventions. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14703 diff changeset	37 #include "octave-link.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	38
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	39 workspace_model::workspace_model(QObject *p)
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	40 : QAbstractItemModel (p)
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	41 {
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 QList<QVariant> rootData;
15342 67fabb3d81f4 display class of variables in workspace viewer instead of type John W. Eaton <jwe@octave.org> parents: 15204 diff changeset	43 rootData << tr ("Name") << tr ("Class") << tr("Dimension") << tr ("Value");
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	44 _rootItem = new tree_item(rootData);
14719 89c64340e9ab Extended event based communication model. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14712 diff changeset	45
89c64340e9ab Extended event based communication model. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14712 diff changeset	46 insert_top_level_item(0, new tree_item ("Local"));
89c64340e9ab Extended event based communication model. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14712 diff changeset	47 insert_top_level_item(1, new tree_item ("Global"));
89c64340e9ab Extended event based communication model. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14712 diff changeset	48 insert_top_level_item(2, new tree_item ("Persistent"));
14720 cecc7da96e2a Added update events for the command history model and workspace model. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14719 diff changeset	49
cecc7da96e2a Added update events for the command history model and workspace model. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14719 diff changeset	50 connect(&_update_workspace_model_timer,
cecc7da96e2a Added update events for the command history model and workspace model. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14719 diff changeset	51 SIGNAL (timeout ()),
cecc7da96e2a Added update events for the command history model and workspace model. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14719 diff changeset	52 this,
cecc7da96e2a Added update events for the command history model and workspace model. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14719 diff changeset	53 SLOT (request_update_workspace()));
cecc7da96e2a Added update events for the command history model and workspace model. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14719 diff changeset	54
16069 0486a29d780f gui: fix updating history and workspace widget for mxe-octave Torsten <ttl@justmail.de> parents: 15402 diff changeset	55 _update_event_enabled = true;
14720 cecc7da96e2a Added update events for the command history model and workspace model. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14719 diff changeset	56 _update_workspace_model_timer.setInterval (500);
16069 0486a29d780f gui: fix updating history and workspace widget for mxe-octave Torsten <ttl@justmail.de> parents: 15402 diff changeset	57 _update_workspace_model_timer.setSingleShot (false);
14720 cecc7da96e2a Added update events for the command history model and workspace model. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14719 diff changeset	58 _update_workspace_model_timer.start ();
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	59 }
664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	60
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	61 workspace_model::~workspace_model()
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	62 {
664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	63 delete _rootItem;
664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	64 }
664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	65
14720 cecc7da96e2a Added update events for the command history model and workspace model. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14719 diff changeset	66 void
cecc7da96e2a Added update events for the command history model and workspace model. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14719 diff changeset	67 workspace_model::request_update_workspace ()
cecc7da96e2a Added update events for the command history model and workspace model. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14719 diff changeset	68 {
16069 0486a29d780f gui: fix updating history and workspace widget for mxe-octave Torsten <ttl@justmail.de> parents: 15402 diff changeset	69 if (_update_event_enabled)
0486a29d780f gui: fix updating history and workspace widget for mxe-octave Torsten <ttl@justmail.de> parents: 15402 diff changeset	70 {
0486a29d780f gui: fix updating history and workspace widget for mxe-octave Torsten <ttl@justmail.de> parents: 15402 diff changeset	71 _update_event_enabled = false; // no more update until this one is processed
0486a29d780f gui: fix updating history and workspace widget for mxe-octave Torsten <ttl@justmail.de> parents: 15402 diff changeset	72 octave_link::post_event (this, &workspace_model::update_workspace_callback);
0486a29d780f gui: fix updating history and workspace widget for mxe-octave Torsten <ttl@justmail.de> parents: 15402 diff changeset	73 }
14720 cecc7da96e2a Added update events for the command history model and workspace model. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14719 diff changeset	74 }
cecc7da96e2a Added update events for the command history model and workspace model. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14719 diff changeset	75
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	76 QModelIndex
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	77 workspace_model::index(int row, int column, const QModelIndex &p) const
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	78 {
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	79 if (!hasIndex(row, column, p))
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	80 return QModelIndex();
664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	81
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	82 tree_item *parentItem;
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	83
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	84 if (!p.isValid())
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	85 parentItem = _rootItem;
664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	86 else
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	87 parentItem = static_cast<tree_item*>(p.internalPointer());
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	88
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	89 tree_item *childItem = parentItem->child(row);
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	90 if (childItem)
664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	91 return createIndex(row, column, childItem);
664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	92 else
664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	93 return QModelIndex();
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 }
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
664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	96 QModelIndex
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	97 workspace_model::parent(const QModelIndex &idx) const
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	98 {
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	99 if (!idx.isValid())
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	100 return QModelIndex();
664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	101
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	102 tree_item childItem = static_cast<tree_item>(idx.internalPointer());
15345 bd906ac220b6 avoid GUI crash due to null pointer dereference John W. Eaton <jwe@octave.org> parents: 15344 diff changeset	103
bd906ac220b6 avoid GUI crash due to null pointer dereference John W. Eaton <jwe@octave.org> parents: 15344 diff changeset	104 if (childItem)
bd906ac220b6 avoid GUI crash due to null pointer dereference John W. Eaton <jwe@octave.org> parents: 15344 diff changeset	105 {
bd906ac220b6 avoid GUI crash due to null pointer dereference John W. Eaton <jwe@octave.org> parents: 15344 diff changeset	106 tree_item *parentItem = childItem->parent();
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	107
15345 bd906ac220b6 avoid GUI crash due to null pointer dereference John W. Eaton <jwe@octave.org> parents: 15344 diff changeset	108 if (! parentItem \|\| parentItem == _rootItem)
bd906ac220b6 avoid GUI crash due to null pointer dereference John W. Eaton <jwe@octave.org> parents: 15344 diff changeset	109 return QModelIndex();
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
15345 bd906ac220b6 avoid GUI crash due to null pointer dereference John W. Eaton <jwe@octave.org> parents: 15344 diff changeset	111 return createIndex(parentItem->row(), 0, parentItem);
bd906ac220b6 avoid GUI crash due to null pointer dereference John W. Eaton <jwe@octave.org> parents: 15344 diff changeset	112 }
bd906ac220b6 avoid GUI crash due to null pointer dereference John W. Eaton <jwe@octave.org> parents: 15344 diff changeset	113 else
bd906ac220b6 avoid GUI crash due to null pointer dereference John W. Eaton <jwe@octave.org> parents: 15344 diff changeset	114 return QModelIndex ();
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	115 }
664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	116
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 int
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	118 workspace_model::rowCount(const QModelIndex &p) const
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	119 {
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	120 tree_item *parentItem;
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	121 if (p.column() > 0)
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	122 return 0;
664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	123
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	124 if (!p.isValid())
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	125 parentItem = _rootItem;
664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	126 else
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	127 parentItem = static_cast<tree_item*>(p.internalPointer());
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	128
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	129 return parentItem->child_count();
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	130 }
664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	131
664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	132 int
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	133 workspace_model::columnCount(const QModelIndex &p) const
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	134 {
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	135 if (p.isValid())
36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	136 return static_cast<tree_item*>(p.internalPointer())->column_count();
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	137 else
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	138 return _rootItem->column_count();
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	139 }
664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	140
664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	141 void
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	142 workspace_model::insert_top_level_item(int at, tree_item *treeItem)
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	143 {
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	144 _rootItem->insert_child_item(at, treeItem);
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 }
664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	146
14712 5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	147 tree_item *
5cb54cca8a06 Completion of code reformatting. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14709 diff changeset	148 workspace_model::top_level_item (int at)
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	149 {
664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	150 return _rootItem->child(at);
664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	151 }
664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	152
664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	153 Qt::ItemFlags
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	154 workspace_model::flags(const QModelIndex &idx) const
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	155 {
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	156 if (!idx.isValid())
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	157 return 0;
664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	158
664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	159 return Qt::ItemIsEnabled \| Qt::ItemIsSelectable;
664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	160 }
664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	161
664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	162 QVariant
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	163 workspace_model::headerData(int section, Qt::Orientation orientation, int role) const
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	164 {
664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	165 if (orientation == Qt::Horizontal && role == Qt::DisplayRole)
664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	166 return _rootItem->data(section);
664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	167
664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	168 return QVariant();
664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	169 }
664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	170
664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	171 QVariant
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	172 workspace_model::data(const QModelIndex &idx, int role) const
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	173 {
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	174 if (!idx.isValid())
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	175 return QVariant();
664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	176
664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	177 if (role != Qt::DisplayRole)
664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	178 return QVariant();
664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	179
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	180 tree_item item = static_cast<tree_item>(idx.internalPointer());
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	181
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	182 return item->data(idx.column());
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	183 }
664f54233c98 Extracted model code from the WorkspaceView and rearranged it in a new model class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	184
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	185 void
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	186 workspace_model::update_workspace_callback (void)
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	187 {
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	188 std::list < symbol_table::symbol_record > symbolTable = symbol_table::all_variables ();
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	189
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	190 _symbol_information.clear ();
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	191 for (std::list < symbol_table::symbol_record > ::iterator iterator = symbolTable.begin ();
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	192 iterator != symbolTable.end (); iterator++)
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	193 _symbol_information.push_back (symbol_information (*iterator));
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	194
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	195 beginResetModel();
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	196 top_level_item (0)->delete_child_items ();
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	197 top_level_item (1)->delete_child_items ();
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	198 top_level_item (2)->delete_child_items ();
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	199
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	200 foreach (const symbol_information& s, _symbol_information)
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	201 {
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	202 tree_item *child = new tree_item ();
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	203
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	204 child->set_data (0, s.symbol ());
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	205 child->set_data (1, s.class_name ());
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	206 child->set_data (2, s.dimension ());
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	207 child->set_data (3, s.value ());
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	208
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	209 switch (s.scope ())
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	210 {
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	211 case symbol_information::local:
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	212 top_level_item (0)->add_child (child);
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	213 break;
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	214
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	215 case symbol_information::global:
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	216 top_level_item (1)->add_child (child);
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	217 break;
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	218
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	219 case symbol_information::persistent:
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	220 top_level_item (2)->add_child (child);
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	221 break;
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	222
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	223 default:
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	224 break;
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	225 }
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	226 }
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	227
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	228 endResetModel();
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	229 emit model_changed();
7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	230
16069 0486a29d780f gui: fix updating history and workspace widget for mxe-octave Torsten <ttl@justmail.de> parents: 15402 diff changeset	231 // update is processed, re-enable further updates events triggered by timer
0486a29d780f gui: fix updating history and workspace widget for mxe-octave Torsten <ttl@justmail.de> parents: 15402 diff changeset	232 _update_event_enabled = true;
0486a29d780f gui: fix updating history and workspace widget for mxe-octave Torsten <ttl@justmail.de> parents: 15402 diff changeset	233
15402 7f423c6111c6 refactor GUI event handling to use new event_queue class John W. Eaton <jwe@octave.org> parents: 15388 diff changeset	234 }

Mercurial > octave-nkf

annotate libgui/src/workspace-model.cc @ 16069:0486a29d780f