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

Optimize TimelineRenderer to not paint invisible items

Browse Source 
Check the dimensions of the window being painted to before actually
painting the events and skip invisible ones.

Some primitive profiling using QTime shows that the average time taken
per event in TimelineRenderer::paint() is approximately halved by this
patch when profiling the QML widget gallery example and expanding all
categories in the timeline.

drawSelectionBoxes() is not optimized because the number of selection
boxes is expected to be so small that the overhead of the check might
outweigh the performance gains of skipping events.

Task-number: QTCREATORBUG-9982
Change-Id: I42e533c11e3a17f9d63b61ce5e4192c8f40e1be9
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
This commit is contained in:
Ulf Hermann
2013-11-05 17:16:43 +01:00
committed by Kai Koehne
parent 526037da33
commit 5eb057c7e2
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/qmlprofiler/timelinerenderer.cpp
View File

@@ -118,6 +118,7 @@ void TimelineRenderer::drawItemsToPainter(QPainter *p, int modelIndex, int fromI
int modelRowStart = 0; int modelRowStart = 0;
for (int mi = 0; mi < modelIndex; mi++) for (int mi = 0; mi < modelIndex; mi++)
modelRowStart += m_profilerModelProxy->rowCount(mi); modelRowStart += m_profilerModelProxy->rowCount(mi);
QRect window = p->window();
for (int i = fromIndex; i <= toIndex; i++) { for (int i = fromIndex; i <= toIndex; i++) {
int x, y, width, height; int x, y, width, height;
@@ -125,6 +126,8 @@ void TimelineRenderer::drawItemsToPainter(QPainter *p, int modelIndex, int fromI
int rowNumber = m_profilerModelProxy->getEventRow(modelIndex, i); int rowNumber = m_profilerModelProxy->getEventRow(modelIndex, i);
y = (modelRowStart + rowNumber) * DefaultRowHeight; y = (modelRowStart + rowNumber) * DefaultRowHeight;
if (y >= window.bottom())
continue;
width = m_profilerModelProxy->getDuration(modelIndex, i) * m_spacing; width = m_profilerModelProxy->getDuration(modelIndex, i) * m_spacing;
if (width < 1) if (width < 1)
@@ -132,6 +135,8 @@ void TimelineRenderer::drawItemsToPainter(QPainter *p, int modelIndex, int fromI
height = DefaultRowHeight * m_profilerModelProxy->getHeight(modelIndex, i); height = DefaultRowHeight * m_profilerModelProxy->getHeight(modelIndex, i);
y += DefaultRowHeight - height; y += DefaultRowHeight - height;
if (y + height < window.top())
continue;
// normal events // normal events
p->setBrush(m_profilerModelProxy->getColor(modelIndex, i)); p->setBrush(m_profilerModelProxy->getColor(modelIndex, i));
@@ -201,6 +206,7 @@ void TimelineRenderer::drawBindingLoopMarkers(QPainter *p, int modelIndex, int f
QPen markerPen = QPen(QColor("orange"),2); QPen markerPen = QPen(QColor("orange"),2);
QBrush shadowBrush = QBrush(QColor("grey")); QBrush shadowBrush = QBrush(QColor("grey"));
QBrush markerBrush = QBrush(QColor("orange")); QBrush markerBrush = QBrush(QColor("orange"));
QRect window = p->window();
p->save(); p->save();
for (int i = fromIndex; i <= toIndex; i++) { for (int i = fromIndex; i <= toIndex; i++) {
@@ -228,8 +234,12 @@ void TimelineRenderer::drawBindingLoopMarkers(QPainter *p, int modelIndex, int f
if (radius < 2) if (radius < 2)
radius = 2; radius = 2;
// shadow
int shadowoffset = 2; int shadowoffset = 2;
if ((yfrom + radius + shadowoffset < window.top() && yto + radius + shadowoffset < window.top()) ||
(yfrom - radius >= window.bottom() && yto - radius >= window.bottom()))
return;
// shadow
p->setPen(shadowPen); p->setPen(shadowPen);
p->setBrush(shadowBrush); p->setBrush(shadowBrush);
p->drawEllipse(QPoint(xfrom, yfrom + shadowoffset), radius, radius); p->drawEllipse(QPoint(xfrom, yfrom + shadowoffset), radius, radius);