X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=gui%2Fapitrace.h;h=a5c0329242b497ca0376f64aed4a80d66a746010;hb=149e71e4b1dc7521d78b471747e3c4ab1c9b5ddf;hp=b73acd6fd2d08c341b16dd8c168aa2c3db955246;hpb=bde6db84069fd9dfbc645de02cb22cacff17c298;p=apitrace

diff --git a/gui/apitrace.h b/gui/apitrace.h
index b73acd6..a5c0329 100644
--- a/gui/apitrace.h
+++ b/gui/apitrace.h
@@ -25,6 +25,31 @@ public:
         SearchResult_Found,
         SearchResult_Wrapped
     };
+    struct SearchRequest {
+        enum Direction {
+            Next,
+            Prev
+        };
+        SearchRequest()
+            : direction(Next)
+        {}
+        SearchRequest(Direction dir,
+                      ApiTraceFrame *f,
+                      ApiTraceCall *call,
+                      QString str,
+                      Qt::CaseSensitivity caseSens)
+            : direction(dir),
+              frame(f),
+              from(call),
+              text(str),
+              cs(caseSens)
+        {}
+        Direction direction;
+        ApiTraceFrame *frame;
+        ApiTraceCall *from;
+        QString text;
+        Qt::CaseSensitivity cs;
+    };
 
     static bool isCallAFrameMarker(const ApiTraceCall *call,
                                    FrameMarker marker);
@@ -42,7 +67,7 @@ public:
 
     ApiTraceCall *callWithIndex(int idx) const;
 
-    QList<ApiTraceFrame*> frames() const;
+    const QList<ApiTraceFrame*> & frames() const;
     ApiTraceFrame *frameAt(int idx) const;
     int numFrames() const;
     int numCallsInFrame(int idx) const;
@@ -75,6 +100,7 @@ public slots:
     void findCallIndex(int index);
     void setCallError(const ApiTraceError &error);
 
+    void bindThumbnailsToFrames(const QList<QImage> &thumbnails);
 
 signals:
     void loadTrace(const QString &name);
@@ -84,10 +110,11 @@ signals:
     void finishedLoadingTrace();
     void invalidated();
     void framesInvalidated();
-    void changed(ApiTraceCall *call);
+    void changed(ApiTraceEvent *event);
     void startedSaving();
     void saved();
-    void findResult(ApiTrace::SearchResult result,
+    void findResult(const ApiTrace::SearchRequest &request,
+                    ApiTrace::SearchResult result,
                     ApiTraceCall *call);
 
     void beginAddingFrames(int oldCount, int numAdded);
@@ -99,12 +126,7 @@ signals:
     void foundCallIndex(ApiTraceCall *call);
 
 signals:
-    void loaderSearchNext(int startFrame,
-                          const QString &str,
-                          Qt::CaseSensitivity sensitivity);
-    void loaderSearchPrev(int startFrame,
-                          const QString &str,
-                          Qt::CaseSensitivity sensitivity);
+    void loaderSearch(const ApiTrace::SearchRequest &request);
     void loaderFindFrameStart(ApiTraceFrame *frame);
     void loaderFindFrameEnd(ApiTraceFrame *frame);
     void loaderFindCallIndex(int index);
@@ -116,11 +138,13 @@ private slots:
     void loaderFrameLoaded(ApiTraceFrame *frame,
                            const QVector<ApiTraceCall*> &calls,
                            quint64 binaryDataSize);
-    void loaderSearchResult(ApiTrace::SearchResult result,
+    void loaderSearchResult(const ApiTrace::SearchRequest &request,
+                            ApiTrace::SearchResult result,
                             ApiTraceCall *call);
 
 private:
     int callInFrame(int callIdx) const;
+    bool isFrameLoading(ApiTraceFrame *frame) const;
 private:
     QString m_fileName;
     QString m_tempFileName;
@@ -139,6 +163,7 @@ private:
 
     QSet<ApiTraceCall*> m_errors;
     QList< QPair<ApiTraceFrame*, ApiTraceError> > m_queuedErrors;
+    QSet<ApiTraceFrame*> m_loadingFrames;
 };
 
 #endif