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

QmlProfiler: Simplify range details

Browse Source 
There is no use in creating multiple nested maps and lists and
selecting special translation contexts for that.

Change-Id: Ib83ab651adca8258a0e5b9ac99a657623a24145b
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
This commit is contained in:
Ulf Hermann
2014-07-07 14:02:29 +02:00
parent b0a3b2950a
commit 092627f680
8 changed files with 28 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmlprofiler/abstracttimelinemodel.h
View File

@@ -78,7 +78,7 @@ public:
virtual int eventId(int index) const = 0; virtual int eventId(int index) const = 0;
virtual QColor color(int index) const = 0; virtual QColor color(int index) const = 0;
virtual QVariantList labels() const = 0; virtual QVariantList labels() const = 0;
virtual QVariantList details(int index) const = 0; virtual QVariantMap details(int index) const = 0;
virtual int row(int index) const = 0; virtual int row(int index) const = 0;
virtual void loadData() = 0; virtual void loadData() = 0;
virtual void clear() = 0; virtual void clear() = 0;

15
src/plugins/qmlprofiler/qml/RangeDetails.qml
View File

@@ -57,21 +57,18 @@ Item {
onHeightChanged: fitInView(); onHeightChanged: fitInView();
} }
//property int eventInfo
ListModel { ListModel {
id: eventInfo id: eventInfo
} }
function showInfo(eventData) { function showInfo(eventData) {
eventInfo.clear(); eventInfo.clear();
rangeDetails.dialogTitle = eventData[0].displayName; for (var k in eventData) {
for (var i = 1; i < eventData.length; i++) { if (k === "displayName") {
for (var k in eventData[i]) { dialogTitle = eventData[k];
if (eventData[i][k].length > 0) { } else if (eventData[k].length > 0) {
eventInfo.append({"content" : k}); eventInfo.append({content : k});
eventInfo.append({"content" : eventData[i][k]}); eventInfo.append({content : eventData[k]});
}
} }
} }
rangeDetails.visible = true; rangeDetails.visible = true;

46
src/plugins/qmlprofiler/qmlprofilerpainteventsmodelproxy.cpp
View File

@@ -236,49 +236,17 @@ QVariantList PaintEventsModelProxy::labels() const
return result; return result;
} }
QVariantList PaintEventsModelProxy::details(int index) const QVariantMap PaintEventsModelProxy::details(int index) const
{ {
Q_D(const PaintEventsModelProxy); Q_D(const PaintEventsModelProxy);
QVariantList result; QVariantMap result;
static const char trContext[] = "RangeDetails"; result.insert(QStringLiteral("displayName"), displayName());
{ result.insert(tr("Duration"), QmlProfilerBaseModel::formatTime(d->range(index).duration));
QVariantMap valuePair; result.insert(tr("Framerate"), QString::fromLatin1("%1 FPS").arg(d->range(index).framerate));
valuePair.insert(QLatin1String("displayName"), QVariant(displayName())); result.insert(tr("Animations"), QString::fromLatin1("%1").arg(d->range(index).animationcount));
result << valuePair; result.insert(tr("Context"), tr(d->range(index).threadId == QmlDebug::GuiThread ?
}
// duration
{
QVariantMap valuePair;
valuePair.insert(QCoreApplication::translate(trContext, "Duration:"),
QVariant(QmlProfilerBaseModel::formatTime(d->range(index).duration)));
result << valuePair;
}
// duration
{
QVariantMap valuePair;
valuePair.insert(QCoreApplication::translate(trContext, "Framerate:"), QVariant(QString::fromLatin1("%1 FPS").arg(d->range(index).framerate)));
result << valuePair;
}
// duration
{
QVariantMap valuePair;
valuePair.insert(QCoreApplication::translate(trContext, "Animations:"), QVariant(QString::fromLatin1("%1").arg(d->range(index).animationcount)));
result << valuePair;
}
{
QVariantMap valuePair;
valuePair.insert(QCoreApplication::translate(trContext, "Context:"),
QCoreApplication::translate(trContext,
d->range(index).threadId == QmlDebug::GuiThread ?
"GUI Thread" : "Render Thread")); "GUI Thread" : "Render Thread"));
result << valuePair;
}
return result; return result;
} }

2
src/plugins/qmlprofiler/qmlprofilerpainteventsmodelproxy.h
View File

@@ -74,7 +74,7 @@ public:
float height(int index) const; float height(int index) const;
QVariantList labels() const; QVariantList labels() const;
QVariantList details(int index) const; QVariantMap details(int index) const;
private slots: private slots:
bool accepted(const QmlProfilerDataModel::QmlEventTypeData &event) const; bool accepted(const QmlProfilerDataModel::QmlEventTypeData &event) const;

41
src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp
View File

@@ -287,51 +287,22 @@ QVariantList RangeTimelineModel::labels() const
return result; return result;
} }
QVariantList RangeTimelineModel::details(int index) const QVariantMap RangeTimelineModel::details(int index) const
{ {
Q_D(const RangeTimelineModel); Q_D(const RangeTimelineModel);
QVariantList result; QVariantMap result;
int id = eventId(index); int id = eventId(index);
const QVector<QmlProfilerDataModel::QmlEventTypeData> &types = const QVector<QmlProfilerDataModel::QmlEventTypeData> &types =
d->modelManager->qmlModel()->getEventTypes(); d->modelManager->qmlModel()->getEventTypes();
static const char trContext[] = "RangeDetails"; result.insert(QStringLiteral("displayName"), categoryLabel(d->rangeType));
{ result.insert(tr("Duration"), QmlProfilerBaseModel::formatTime(d->range(index).duration));
QVariantMap valuePair;
valuePair.insert(QLatin1String("displayName"), QVariant(categoryLabel(d->rangeType)));
result << valuePair;
}
// duration
{
QVariantMap valuePair;
valuePair.insert(QCoreApplication::translate(trContext, "Duration:"),
QVariant(QmlProfilerBaseModel::formatTime(d->range(index).duration)));
result << valuePair;
}
// details
{
QVariantMap valuePair;
QString detailsString = types[id].data; QString detailsString = types[id].data;
if (detailsString.length() > 40) if (detailsString.length() > 40)
detailsString = detailsString.left(40) + QLatin1String("..."); detailsString = detailsString.left(40) + QLatin1String("...");
valuePair.insert(QCoreApplication::translate(trContext, "Details:"), result.insert(tr("Details"), detailsString);
QVariant(detailsString)); result.insert(tr("Location"), types[id].displayName);
result << valuePair;
}
// location
{
QVariantMap valuePair;
valuePair.insert(QCoreApplication::translate(trContext, "Location:"),
QVariant(types[id].displayName));
result << valuePair;
}
// isbindingloop
{}
return result; return result;
} }

2
src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.h
View File

@@ -80,7 +80,7 @@ public:
QColor color(int index) const; QColor color(int index) const;
QVariantList labels() const; QVariantList labels() const;
QVariantList details(int index) const; QVariantMap details(int index) const;
QVariantMap location(int index) const; QVariantMap location(int index) const;
int eventIdForTypeIndex(int typeIndex) const; int eventIdForTypeIndex(int typeIndex) const;

2
src/plugins/qmlprofiler/timelinemodelaggregator.cpp
View File

@@ -225,7 +225,7 @@ QVariantList TimelineModelAggregator::labels(int modelIndex) const
return d->modelList[modelIndex]->labels(); return d->modelList[modelIndex]->labels();
} }
QVariantList TimelineModelAggregator::details(int modelIndex, int index) const QVariantMap TimelineModelAggregator::details(int modelIndex, int index) const
{ {
return d->modelList[modelIndex]->details(index); return d->modelList[modelIndex]->details(index);
} }

2
src/plugins/qmlprofiler/timelinemodelaggregator.h
View File

@@ -82,7 +82,7 @@ public:
Q_INVOKABLE QVariantList labels(int modelIndex) const; Q_INVOKABLE QVariantList labels(int modelIndex) const;
Q_INVOKABLE QVariantList details(int modelIndex, int index) const; Q_INVOKABLE QVariantMap details(int modelIndex, int index) const;
Q_INVOKABLE QVariantMap location(int modelIndex, int index) const; Q_INVOKABLE QVariantMap location(int modelIndex, int index) const;
Q_INVOKABLE int eventIdForTypeIndex(int modelIndex, int typeIndex) const; Q_INVOKABLE int eventIdForTypeIndex(int modelIndex, int typeIndex) const;