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

Define separate methods for getting collapsed and expanded rows

Browse Source 
Change-Id: I3449e163dd00283a04fd5147d81034d2f68a961f
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2014-11-17 13:30:53 +01:00
parent 848336251a
commit ff45f1c156
8 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/qmlprofilerextension/inputeventsmodel.cpp
View File

@@ -70,13 +70,17 @@ QVariantMap InputEventsModel::details(int index) const
return result; return result;
} }
int InputEventsModel::row(int index) const int InputEventsModel::expandedRow(int index) const
{ {
if (!expanded())
return 1;
return selectionId(index) == QmlDebug::Mouse ? 1 : 2; return selectionId(index) == QmlDebug::Mouse ? 1 : 2;
} }
int InputEventsModel::collapsedRow(int index) const
{
Q_UNUSED(index)
return 1;
}
void InputEventsModel::loadData() void InputEventsModel::loadData()
{ {
clear(); clear();

3
plugins/qmlprofilerextension/inputeventsmodel.h
View File

@@ -38,7 +38,8 @@ public:
QColor color(int index) const; QColor color(int index) const;
QVariantList labels() const; QVariantList labels() const;
QVariantMap details(int index) const; QVariantMap details(int index) const;
int row(int index) const; int expandedRow(int index) const;
int collapsedRow(int index) const;
void loadData(); void loadData();
void clear(); void clear();

12
plugins/qmlprofilerextension/memoryusagemodel.cpp
View File

@@ -42,13 +42,15 @@ int MemoryUsageModel::rowMaxValue(int rowNumber) const
return m_maxSize; return m_maxSize;
} }
int MemoryUsageModel::row(int index) const int MemoryUsageModel::expandedRow(int index) const
{ {
int type = selectionId(index); int type = selectionId(index);
if (type == QmlDebug::HeapPage || type == QmlDebug::LargeItem) return (type == QmlDebug::HeapPage || type == QmlDebug::LargeItem) ? 1 : 2;
return 1; }
else
return 2; int MemoryUsageModel::collapsedRow(int index) const
{
return expandedRow(index);
} }
int MemoryUsageModel::typeId(int index) const int MemoryUsageModel::typeId(int index) const

3
plugins/qmlprofilerextension/memoryusagemodel.h
View File

@@ -50,7 +50,8 @@ public:
int rowMaxValue(int rowNumber) const; int rowMaxValue(int rowNumber) const;
int row(int index) const; int expandedRow(int index) const;
int collapsedRow(int index) const;
int typeId(int index) const; int typeId(int index) const;
QColor color(int index) const; QColor color(int index) const;
float relativeHeight(int index) const; float relativeHeight(int index) const;

9
plugins/qmlprofilerextension/pixmapcachemodel.cpp
View File

@@ -43,10 +43,13 @@ int PixmapCacheModel::rowMaxValue(int rowNumber) const
} }
} }
int PixmapCacheModel::row(int index) const int PixmapCacheModel::expandedRow(int index) const
{
return selectionId(index) + 1;
}
int PixmapCacheModel::collapsedRow(int index) const
{ {
if (expanded())
return selectionId(index) + 1;
return m_data[index].rowNumberCollapsed; return m_data[index].rowNumberCollapsed;
} }

3
plugins/qmlprofilerextension/pixmapcachemodel.h
View File

@@ -89,7 +89,8 @@ public:
int rowMaxValue(int rowNumber) const; int rowMaxValue(int rowNumber) const;
int row(int index) const; int expandedRow(int index) const;
int collapsedRow(int index) const;
int typeId(int index) const; int typeId(int index) const;
QColor color(int index) const; QColor color(int index) const;
float relativeHeight(int index) const; float relativeHeight(int index) const;

9
plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp
View File

@@ -77,9 +77,14 @@ SceneGraphTimelineModel::SceneGraphTimelineModel(QmlProfilerModelManager *manage
announceFeatures(1 << QmlDebug::ProfileSceneGraph); announceFeatures(1 << QmlDebug::ProfileSceneGraph);
} }
int SceneGraphTimelineModel::row(int index) const int SceneGraphTimelineModel::expandedRow(int index) const
{ {
return expanded() ? (selectionId(index) + 1) : m_data[index].rowNumberCollapsed; return selectionId(index) + 1;
}
int SceneGraphTimelineModel::collapsedRow(int index) const
{
return m_data[index].rowNumberCollapsed;
} }
int SceneGraphTimelineModel::typeId(int index) const int SceneGraphTimelineModel::typeId(int index) const

3
plugins/qmlprofilerextension/scenegraphtimelinemodel.h
View File

@@ -79,7 +79,8 @@ public:
SceneGraphTimelineModel(QmlProfiler::QmlProfilerModelManager *manager, QObject *parent = 0); SceneGraphTimelineModel(QmlProfiler::QmlProfilerModelManager *manager, QObject *parent = 0);
int row(int index) const; int expandedRow(int index) const;
int collapsedRow(int index) const;
int typeId(int index) const; int typeId(int index) const;
QColor color(int index) const; QColor color(int index) const;