Use call number instead of frame number for snapshot filenames.

[apitrace] / gui / apitracefilter.cpp

diff --git a/gui/apitracefilter.cpp b/gui/apitracefilter.cpp
index 98ee1db52dac6bb75106bf582e6cae3165596209..8a40faf5d563cb8bc7475adc259cbde686ac597b 100644 (file)
--- a/gui/apitracefilter.cpp
+++ b/gui/apitracefilter.cpp
@@ -31,8 +31,8 @@ bool ApiTraceFilter::filterAcceptsRow(int sourceRow,
     ApiTraceCall *call = static_cast<ApiTraceCall*>(event);
     QString function = call->name;
 
-    if (!m_text.isEmpty()) {
-        return function.contains(m_text);
+    if (!m_regexp.isEmpty() && m_regexp.isValid()) {
+        return function.contains(m_regexp);
     }
 
     if (m_filters & ResolutionsFilter) {
@@ -50,6 +50,8 @@ bool ApiTraceFilter::filterAcceptsRow(int sourceRow,
     if (m_filters & ExtraStateFilter) {
         if (function.contains(QLatin1String("glXGetCurrentDisplay")))
             return false;
+        if (function.contains(QLatin1String("wglDescribePixelFormat")))
+            return false;
     }
 
     if (m_filters & ExtensionsFilter) {
@@ -68,10 +70,10 @@ bool ApiTraceFilter::filterAcceptsRow(int sourceRow,
 }
 
 
-void ApiTraceFilter::setFilterString(const QString &text)
+void ApiTraceFilter::setFilterRegexp(const QRegExp &regexp)
 {
-    if (text != m_text) {
-        m_text = text;
+    if (regexp != m_regexp) {
+        m_regexp = regexp;
         invalidate();
     }
 }
@@ -89,4 +91,23 @@ void ApiTraceFilter::setFilterOptions(ApiTraceFilter::FilterOptions opts)
     }
 }
 
+QModelIndex ApiTraceFilter::callIndex(int callIdx) const
+{
+    ApiTraceModel *model = static_cast<ApiTraceModel *>(sourceModel());
+    QModelIndex index = model->callIndex(callIdx);
+    return mapFromSource(index);
+}
+
+QModelIndex ApiTraceFilter::indexForCall(ApiTraceCall *call) const
+{
+    ApiTraceModel *model = static_cast<ApiTraceModel *>(sourceModel());
+    QModelIndex index = model->indexForCall(call);
+    return mapFromSource(index);
+}
+
+QRegExp ApiTraceFilter::filterRegexp() const
+{
+    return m_regexp;
+}
+
 #include "apitracefilter.moc"