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

QmlProfiler: fix selection propagation from event view to timeline

Browse Source 
The event view deals in type ids and the timeline view has to handle
selection by type id. Using the coincidence that typeId == selectionId
in the cases we're interested in is ugly.

Change-Id: I6f94ccd2c3945d5901d0a225deee7de077bfce58
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2014-10-28 12:56:53 +01:00
committed by Ulf Hermann
parent 936480316f
commit 4ec75995f8
10 changed files with 67 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -676,6 +676,26 @@ void TimelineRenderer::selectPrev()
}
int TimelineRenderer::nextItemFromSelectionId(int modelIndex, int selectionId) const
{
return nextItemFromId(modelIndex, SelectionId, selectionId);
}
int TimelineRenderer::nextItemFromTypeId(int modelIndex, int typeId) const
{
return nextItemFromId(modelIndex, TypeId, typeId);
}
int TimelineRenderer::prevItemFromSelectionId(int modelIndex, int selectionId) const
{
return prevItemFromId(modelIndex, SelectionId, selectionId);
}
int TimelineRenderer::prevItemFromTypeId(int modelIndex, int typeId) const
{
return prevItemFromId(modelIndex, TypeId, typeId);
}
int TimelineRenderer::nextItemFromId(int modelIndex, IdType idType, int id) const
{
int modelCount = m_profilerModelProxy->count(modelIndex);
if (modelCount == 0)
@@ -691,14 +711,15 @@ int TimelineRenderer::nextItemFromSelectionId(int modelIndex, int selectionId) c
ndx = 0;
int startIndex = ndx;
do {
if (m_profilerModelProxy->selectionId(modelIndex, ndx) == selectionId)
if ((idType == TypeId && m_profilerModelProxy->typeId(modelIndex, ndx) == id) ||
(idType == SelectionId && m_profilerModelProxy->selectionId(modelIndex, ndx) == id))
return ndx;
ndx = (ndx + 1) % modelCount;
} while (ndx != startIndex);
return -1;
}
int TimelineRenderer::prevItemFromSelectionId(int modelIndex, int selectionId) const
int TimelineRenderer::prevItemFromId(int modelIndex, IdType idType, int id) const
{
int ndx = -1;
if (m_selectedItem == -1 || modelIndex != m_selectedModel)
@@ -709,7 +730,8 @@ int TimelineRenderer::prevItemFromSelectionId(int modelIndex, int selectionId) c
ndx = m_profilerModelProxy->count(modelIndex) - 1;
int startIndex = ndx;
do {
if (m_profilerModelProxy->selectionId(modelIndex, ndx) == selectionId)
if ((idType == TypeId && m_profilerModelProxy->typeId(modelIndex, ndx) == id) ||
(idType == SelectionId && m_profilerModelProxy->selectionId(modelIndex, ndx) == id))
return ndx;
if (--ndx < 0)
ndx = m_profilerModelProxy->count(modelIndex)-1;