From ba3c1bf7124ecac6a13f881314d0445d2fa0be42 Mon Sep 17 00:00:00 2001 From: Zack Rusin Date: Sun, 27 Mar 2011 17:12:06 -0400 Subject: [PATCH] Don't layout the text when filtering. --- gui/apitracecall.cpp | 22 ++++++++++++++++++++++ gui/apitracecall.h | 2 ++ gui/apitracefilter.cpp | 2 +- 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/gui/apitracecall.cpp b/gui/apitracecall.cpp index b964739..f5a5ff7 100644 --- a/gui/apitracecall.cpp +++ b/gui/apitracecall.cpp @@ -263,3 +263,25 @@ QString ApiTraceCall::richText() const staticText(); return m_richText; } + +QString ApiTraceCall::filterText() const +{ + if (!m_filterText.isEmpty()) + return m_filterText; + + m_filterText = name; + for (int i = 0; i < argNames.count(); ++i) { + m_filterText += argNames[i]; + m_filterText += QString::fromLatin1(" = "); + m_filterText += apiVariantToString(argValues[i]); + if (i < argNames.count() - 1) + m_filterText += QString::fromLatin1(", "); + } + m_filterText += QLatin1String(")"); + + if (returnValue.isValid()) { + m_filterText += QLatin1String(" = "); + m_filterText += apiVariantToString(returnValue); + } + return m_filterText; +} diff --git a/gui/apitracecall.h b/gui/apitracecall.h index 4cfa9ae..e47a88d 100644 --- a/gui/apitracecall.h +++ b/gui/apitracecall.h @@ -106,11 +106,13 @@ public: QVariantList argValues; QVariant returnValue; + QString filterText() const; QString richText() const; QStaticText staticText() const; private: mutable QString m_richText; mutable QStaticText m_staticText; + mutable QString m_filterText; }; Q_DECLARE_METATYPE(ApiTraceCall); Q_DECLARE_METATYPE(ApiTraceCall*); diff --git a/gui/apitracefilter.cpp b/gui/apitracefilter.cpp index 7f7da19..5542ea9 100644 --- a/gui/apitracefilter.cpp +++ b/gui/apitracefilter.cpp @@ -31,7 +31,7 @@ bool ApiTraceFilter::filterAcceptsRow(int sourceRow, if (function.contains(QLatin1String("wglGetProcAddress"))) return false; - QString fullText = call->richText(); + QString fullText = call->filterText(); if (function.contains(QLatin1String("glGetString")) && fullText.contains(QLatin1String("GL_EXTENSIONS"))) return false; -- 2.43.0