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

Inspector: Set the context of console

Browse Source 
The current selected item in the inspector view
is set as the context of the console.

Task-number: QTCREATORBUG-7439

Change-Id: Ibc980218751ce4afacf714cf1ab34f0a36550b2c
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
This commit is contained in:
Aurindam Jana
2012-10-05 13:42:14 +02:00
parent c90e1267c8
commit c2c58fecd7
9 changed files with 58 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/plugins/debugger/qml/qmlengine.cpp
View File

@@ -41,6 +41,8 @@
#include "debuggerrunner.h"
#include "debuggerstringutils.h"
#include "debuggertooltipmanager.h"
#include "localsandexpressionswindow.h"
#include "watchwindow.h"
#include "breakhandler.h"
#include "moduleshandler.h"
@@ -82,6 +84,8 @@
#include <QTcpSocket>
#include <QHostAddress>
#include <QDockWidget>
#define DEBUG_QML 1
#if DEBUG_QML
# define SDEBUG(s) qDebug() << s
@@ -292,7 +296,7 @@ QmlEngine::QmlEngine(const DebuggerStartParameters &startParameters)
SLOT(updateCurrentContext()));
connect(this->stackHandler(), SIGNAL(currentIndexChanged()),
SLOT(updateCurrentContext()));
connect(&m_inspectorAdapter, SIGNAL(selectionChanged()),
connect(inspectorTreeView(), SIGNAL(currentIndexChanged(QModelIndex)),
SLOT(updateCurrentContext()));
connect(m_inspectorAdapter.agent(), SIGNAL(
expressionResult(quint32,QVariant)),
@@ -1137,9 +1141,23 @@ void QmlEngine::documentUpdated(QmlJS::Document::Ptr doc)
void QmlEngine::updateCurrentContext()
{
const QString context = state() == InferiorStopOk ?
stackHandler()->currentFrame().function
: m_inspectorAdapter.currentSelectedDisplayName();
QString context;
if (state() == InferiorStopOk) {
context = stackHandler()->currentFrame().function;
} else {
QModelIndex currentIndex = inspectorTreeView()->currentIndex();
const WatchData *currentData = watchHandler()->watchData(currentIndex);
const WatchData *parentData = watchHandler()->watchData(currentIndex.parent());
const WatchData *grandParentData = watchHandler()->watchData(
currentIndex.parent().parent());
if (currentData->id != parentData->id)
context = currentData->name;
else if (parentData->id != grandParentData->id)
context = parentData->name;
else
context = grandParentData->name;
}
QmlJS::ConsoleManagerInterface *consoleManager = qmlConsoleManager();
if (consoleManager)
consoleManager->setContext(tr("Context: ").append(context));
@@ -1187,8 +1205,9 @@ bool QmlEngine::evaluateScript(const QString &expression)
// Evaluate expression based on engine state
// When engine->state() == InferiorStopOk, the expression is sent to debuggerClient.
if (state() != InferiorStopOk) {
QModelIndex currentIndex = inspectorTreeView()->currentIndex();
QmlInspectorAgent *agent = m_inspectorAdapter.agent();
quint32 queryId = agent->queryExpressionResult(m_inspectorAdapter.currentSelectedDebugId(),
quint32 queryId = agent->queryExpressionResult(watchHandler()->watchData(currentIndex)->id,
expression);
if (queryId) {
queryIds << queryId;
@@ -1333,6 +1352,15 @@ bool QmlEngine::adjustBreakpointLineAndColumn(
return success;
}
WatchTreeView *QmlEngine::inspectorTreeView() const
{
DebuggerMainWindow *dw = qobject_cast<DebuggerMainWindow *>(debuggerCore()->mainWindow());
LocalsAndExpressionsWindow *leW = qobject_cast<LocalsAndExpressionsWindow *>(
dw->dockWidget(QLatin1String(Constants::DOCKWIDGET_WATCHERS))->widget());
WatchWindow *inspectorWindow = qobject_cast<WatchWindow *>(leW->inspectorWidget());
return qobject_cast<WatchTreeView *>(inspectorWindow->treeView());
}
DebuggerEngine *createQmlEngine(const DebuggerStartParameters &sp)
{
return new QmlEngine(sp);