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

QmlInspector: Fetch objects for location

Browse Source 
Since the object tree is fetched lazily, we might have
objects whose debugIds are not known. In such cases,
objects can be fetched by passing the location info.

Change-Id: I2001460cc14401e011efef9be9194c9f7868d617
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
This commit is contained in:
Aurindam Jana
2012-05-10 17:06:29 +02:00
parent 38905e523e
commit b9bc68c370
9 changed files with 121 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/plugins/debugger/qml/qmlinspectoragent.cpp
View File

@@ -399,10 +399,22 @@ void QmlInspectorAgent::onResult(quint32 queryId, const QVariant &value,
rootContextChanged(qvariant_cast<ContextReference>(value));
} else if (m_fetchCurrentObjectsQueryIds.contains(queryId)) {
m_fetchCurrentObjectsQueryIds.removeOne(queryId);
ObjectReference obj
= qvariant_cast<ObjectReference>(value);
m_fetchCurrentObjects.push_front(obj);
onCurrentObjectsFetched(obj);
if (value.type() == QVariant::List) {
QVariantList objList = value.toList();
foreach (QVariant var, objList) {
// TODO: check which among the list is the actual
// object that needs to be selected.
ObjectReference obj
= qvariant_cast<ObjectReference>(var);
m_fetchCurrentObjects.push_front(obj);
onCurrentObjectsFetched(obj);
}
} else {
ObjectReference obj
= qvariant_cast<ObjectReference>(value);
m_fetchCurrentObjects.push_front(obj);
onCurrentObjectsFetched(obj);
}
} else {
emit expressionResult(queryId, value);
}
@@ -469,6 +481,30 @@ quint32 QmlInspectorAgent::fetchContextObject(const ObjectReference &obj)
return queryId;
}
void QmlInspectorAgent::fetchContextObjectsForLocation(const QString &file,
int lineNumber, int columnNumber)
{
// This can be an expensive operation as it may return multiple
// objects. Use fetchContextObject() where possible.
if (debug)
qDebug() << __FUNCTION__ << "(" << file << ":" << lineNumber
<< ":" << columnNumber << ")";
if (!isConnected()
|| !debuggerCore()->boolSetting(ShowQmlObjectTree))
return;
log(LogSend, QString("FETCH_OBJECTS_FOR_LOCATION %1:%2:%3").arg(file)
.arg(QString::number(lineNumber)).arg(QString::number(columnNumber)));
quint32 queryId = m_engineClient->queryObjectsForLocation(QFileInfo(file).fileName(),
lineNumber, columnNumber);
if (debug)
qDebug() << __FUNCTION__ << "(" << file << ":" << lineNumber
<< ":" << columnNumber << ")" << " - query id" << queryId;
m_fetchCurrentObjectsQueryIds << queryId;
}
// fetch the root objects from the context + any child contexts
void QmlInspectorAgent::fetchRootObjects(const ContextReference &context,
bool clear)