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

QmlProfiler: Add scaling support to paint events model

Browse Source 
Change-Id: I04856628b7498df976d3b7db5539a1125060e9eb
Task-number: QTCREATORBUG-12337
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
This commit is contained in:
Ulf Hermann
2014-06-23 12:38:53 +02:00
parent daf6aa160b
commit 6d5cf83a69
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -167,6 +167,20 @@ int PaintEventsModelProxy::getEventRow(int index) const
return (threadId == QmlDebug::GuiThread || d->maxGuiThreadAnimations == 0) ? 1 : 2; return (threadId == QmlDebug::GuiThread || d->maxGuiThreadAnimations == 0) ? 1 : 2;
} }
int PaintEventsModelProxy::rowMaxValue(int rowNumber) const
{
Q_D(const PaintEventsModelProxy);
switch (rowNumber) {
case 1:
return d->maxGuiThreadAnimations > 0 ? d->maxGuiThreadAnimations :
d->maxRenderThreadAnimations;
case 2:
return d->maxRenderThreadAnimations;
default:
return AbstractTimelineModel::rowMaxValue(rowNumber);
}
}
int PaintEventsModelProxy::getEventId(int index) const int PaintEventsModelProxy::getEventId(int index) const
{ {
Q_D(const PaintEventsModelProxy); Q_D(const PaintEventsModelProxy);
@@ -189,7 +203,7 @@ float PaintEventsModelProxy::getHeight(int index) const
Q_D(const PaintEventsModelProxy); Q_D(const PaintEventsModelProxy);
const PaintEventsModelProxyPrivate::Range &range = d->range(index); const PaintEventsModelProxyPrivate::Range &range = d->range(index);
return (float)range.animationcount / (float)(range.threadId == QmlDebug::GuiThread ? return (float)range.animationcount / (float)(range.threadId == QmlDebug::GuiThread ?
d->maxGuiThreadAnimations : d->maxRenderThreadAnimations) * 0.85f + 0.15f; d->maxGuiThreadAnimations : d->maxRenderThreadAnimations);
} }
const QVariantList PaintEventsModelProxy::getLabels() const const QVariantList PaintEventsModelProxy::getLabels() const

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

@@ -64,6 +64,8 @@ public:
void loadData(); void loadData();
void clear(); void clear();
int rowMaxValue(int rowNumber) const;
Q_INVOKABLE int rowCount() const; Q_INVOKABLE int rowCount() const;
Q_INVOKABLE int getEventId(int index) const; Q_INVOKABLE int getEventId(int index) const;
int getEventRow(int index) const; int getEventRow(int index) const;