feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ScriptConsole: Show current context

Browse Source 
Show the current context in the script console. The expression
in the script console is evaluated within this context.

Change-Id: Ieb4cfc3e0892b150301f4ad79220cd878dee3ce3
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
This commit is contained in:
Aurindam Jana
2012-01-16 12:38:33 +01:00
parent 8e7a11392c
commit 70bcccd646
3 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/debugger/stackhandler.cpp
View File

@@ -62,7 +62,7 @@ StackHandler::StackHandler()
{
m_resetLocationScheduled = false;
m_contentsValid = false;
m_currentIndex = 0;
m_currentIndex = -1;
m_canExpand = false;
connect(debuggerCore()->action(OperateByInstruction), SIGNAL(triggered()),
this, SLOT(resetModel()));
@@ -160,6 +160,8 @@ Qt::ItemFlags StackHandler::flags(const QModelIndex &index) const
StackFrame StackHandler::currentFrame() const
{
if (m_currentIndex == -1)
return StackFrame();
QTC_ASSERT(m_currentIndex >= 0, return StackFrame());
QTC_ASSERT(m_currentIndex < m_stackFrames.size(), return StackFrame());
return m_stackFrames.at(m_currentIndex);
@@ -167,7 +169,7 @@ StackFrame StackHandler::currentFrame() const
void StackHandler::setCurrentIndex(int level)
{
if (level == m_currentIndex)
if (level == -1 || level == m_currentIndex)
return;
// Emit changed for previous frame
@@ -175,6 +177,7 @@ void StackHandler::setCurrentIndex(int level)
emit dataChanged(i, i);
m_currentIndex = level;
emit currentIndexChanged();
// Emit changed for new frame
i = index(m_currentIndex, 0);
@@ -184,7 +187,7 @@ void StackHandler::setCurrentIndex(int level)
void StackHandler::removeAll()
{
m_stackFrames.clear();
m_currentIndex = 0;
setCurrentIndex(-1);
reset();
}
@@ -195,7 +198,7 @@ void StackHandler::setFrames(const StackFrames &frames, bool canExpand)
m_canExpand = canExpand;
m_stackFrames = frames;
if (m_currentIndex >= m_stackFrames.size())
m_currentIndex = m_stackFrames.size() - 1;
setCurrentIndex(m_stackFrames.size() - 1);
reset();
emit stackChanged();
}