From ff45f1c1560cf169432ed88255fd38a49ee86e1f Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Mon, 17 Nov 2014 13:30:53 +0100 Subject: Define separate methods for getting collapsed and expanded rows Change-Id: I3449e163dd00283a04fd5147d81034d2f68a961f Reviewed-by: Kai Koehne --- plugins/qmlprofilerextension/inputeventsmodel.cpp | 10 +++++++--- plugins/qmlprofilerextension/inputeventsmodel.h | 3 ++- plugins/qmlprofilerextension/memoryusagemodel.cpp | 12 +++++++----- plugins/qmlprofilerextension/memoryusagemodel.h | 3 ++- plugins/qmlprofilerextension/pixmapcachemodel.cpp | 9 ++++++--- plugins/qmlprofilerextension/pixmapcachemodel.h | 3 ++- plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp | 9 +++++++-- plugins/qmlprofilerextension/scenegraphtimelinemodel.h | 3 ++- 8 files changed, 35 insertions(+), 17 deletions(-) diff --git a/plugins/qmlprofilerextension/inputeventsmodel.cpp b/plugins/qmlprofilerextension/inputeventsmodel.cpp index 310a3d5f06..1e624f9d39 100644 --- a/plugins/qmlprofilerextension/inputeventsmodel.cpp +++ b/plugins/qmlprofilerextension/inputeventsmodel.cpp @@ -70,13 +70,17 @@ QVariantMap InputEventsModel::details(int index) const 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; } +int InputEventsModel::collapsedRow(int index) const +{ + Q_UNUSED(index) + return 1; +} + void InputEventsModel::loadData() { clear(); diff --git a/plugins/qmlprofilerextension/inputeventsmodel.h b/plugins/qmlprofilerextension/inputeventsmodel.h index 6ed1a4cbe0..17c47881e9 100644 --- a/plugins/qmlprofilerextension/inputeventsmodel.h +++ b/plugins/qmlprofilerextension/inputeventsmodel.h @@ -38,7 +38,8 @@ public: QColor color(int index) const; QVariantList labels() const; QVariantMap details(int index) const; - int row(int index) const; + int expandedRow(int index) const; + int collapsedRow(int index) const; void loadData(); void clear(); diff --git a/plugins/qmlprofilerextension/memoryusagemodel.cpp b/plugins/qmlprofilerextension/memoryusagemodel.cpp index 516bcc2c03..efb158cb36 100644 --- a/plugins/qmlprofilerextension/memoryusagemodel.cpp +++ b/plugins/qmlprofilerextension/memoryusagemodel.cpp @@ -42,13 +42,15 @@ int MemoryUsageModel::rowMaxValue(int rowNumber) const return m_maxSize; } -int MemoryUsageModel::row(int index) const +int MemoryUsageModel::expandedRow(int index) const { int type = selectionId(index); - if (type == QmlDebug::HeapPage || type == QmlDebug::LargeItem) - return 1; - else - return 2; + return (type == QmlDebug::HeapPage || type == QmlDebug::LargeItem) ? 1 : 2; +} + +int MemoryUsageModel::collapsedRow(int index) const +{ + return expandedRow(index); } int MemoryUsageModel::typeId(int index) const diff --git a/plugins/qmlprofilerextension/memoryusagemodel.h b/plugins/qmlprofilerextension/memoryusagemodel.h index bad9af5a10..2096675866 100644 --- a/plugins/qmlprofilerextension/memoryusagemodel.h +++ b/plugins/qmlprofilerextension/memoryusagemodel.h @@ -50,7 +50,8 @@ public: 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; QColor color(int index) const; float relativeHeight(int index) const; diff --git a/plugins/qmlprofilerextension/pixmapcachemodel.cpp b/plugins/qmlprofilerextension/pixmapcachemodel.cpp index 6808d53dbb..43163c62bb 100644 --- a/plugins/qmlprofilerextension/pixmapcachemodel.cpp +++ b/plugins/qmlprofilerextension/pixmapcachemodel.cpp @@ -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; } diff --git a/plugins/qmlprofilerextension/pixmapcachemodel.h b/plugins/qmlprofilerextension/pixmapcachemodel.h index 49a7fb5a46..19181384f6 100644 --- a/plugins/qmlprofilerextension/pixmapcachemodel.h +++ b/plugins/qmlprofilerextension/pixmapcachemodel.h @@ -89,7 +89,8 @@ public: 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; QColor color(int index) const; float relativeHeight(int index) const; diff --git a/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp b/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp index 91e981e103..ac3bb8e221 100644 --- a/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp +++ b/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp @@ -77,9 +77,14 @@ SceneGraphTimelineModel::SceneGraphTimelineModel(QmlProfilerModelManager *manage 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 diff --git a/plugins/qmlprofilerextension/scenegraphtimelinemodel.h b/plugins/qmlprofilerextension/scenegraphtimelinemodel.h index d7a55b66a3..3e3b6b3128 100644 --- a/plugins/qmlprofilerextension/scenegraphtimelinemodel.h +++ b/plugins/qmlprofilerextension/scenegraphtimelinemodel.h @@ -79,7 +79,8 @@ public: 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; QColor color(int index) const; -- cgit v1.2.3