Changeset 651 for trunk/tools/qttracereplay

Timestamp:

Mar 8, 2010, 12:52:58 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.2 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/qttracereplay/main.cpp (modified) (8 diffs)

trunk/tools/qttracereplay/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -53 +53 @@
 
     void paintEvent(QPaintEvent *event);
+    void resizeEvent(QResizeEvent *event);
 
 public slots:
@@ -65 +66 @@
     QTime timer;
 
+    QList<uint> visibleUpdates;
     QList<uint> iterationTimes;
     QString filename;
@@ -71 +73 @@
 void ReplayWidget::updateRect()
 {
-    if (!updates.isEmpty())
-        update(updates.at(currentFrame));
+    if (!visibleUpdates.isEmpty())
+        update(updates.at(visibleUpdates.at(currentFrame)));
 }
 
@@ -81 +83 @@
 //    p.setClipRegion(frames.at(currentFrame).updateRegion);
 
-    buffer.draw(&p, currentFrame);
+    buffer.draw(&p, visibleUpdates.at(currentFrame));
 
     ++currentFrame;
-    if (currentFrame >= buffer.numFrames()) {
+    if (currentFrame >= visibleUpdates.size()) {
         currentFrame = 0;
         ++currentIteration;
@@ -120 +122 @@
                 if (iterationTimes.size() >= 10 || stddev < 4) {
                     printf("%s, iterations: %d, frames: %d, min(ms): %d, median(ms): %d, stddev: %f %%, max(fps): %f\n", qPrintable(filename),
-                            iterationTimes.size(), updates.size(), min, median, stddev, 1000. * updates.size() / min);
+                            iterationTimes.size(), visibleUpdates.size(), min, median, stddev, 1000. * visibleUpdates.size() / min);
                     deleteLater();
                     return;
@@ -131 +133 @@
 }
 
+void ReplayWidget::resizeEvent(QResizeEvent *event)
+{
+    visibleUpdates.clear();
+
+    QRect bounds = rect();
+    for (int i = 0; i < updates.size(); ++i) {
+        if (updates.at(i).intersects(bounds))
+            visibleUpdates << i;
+    }
+
+    if (visibleUpdates.size() != updates.size())
+        printf("Warning: skipped %d frames due to limited resolution\n", updates.size() - visibleUpdates.size());
+
+}
+
 ReplayWidget::ReplayWidget(const QString &filename_)
     : currentFrame(0)
@@ -139 +156 @@
     QFile file(filename);
 
-    QRect bounds;
     if (!file.open(QIODevice::ReadOnly)) {
         printf("Failed to load input file '%s'\n", qPrintable(filename_));