Add a simple viewer for surfaces.

diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
index f1f1a7f70814d32edeb59bc0b0e158016f8b7f61..8da0f6133dbef2cf7903b2896c5722b159e20763 100644 (file)
--- a/gui/CMakeLists.txt
+++ b/gui/CMakeLists.txt
@@ -8,6 +8,7 @@ set(qapitrace_SRCS
    apitracecall.cpp
    apitracefilter.cpp
    apitracemodel.cpp
+   imageviewer.cpp
    loaderthread.cpp
    mainwindow.cpp
    main.cpp
@@ -22,6 +23,7 @@ qt4_automoc(${qapitrace_SRCS})
 qt4_add_resources(qapitrace_SRCS qapitrace.qrc)
 
 set(qapitrace_UIS
+   ui/imageviewer.ui
    ui/mainwindow.ui
    ui/retracerdialog.ui
    ui/settings.ui

diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index 57112e54806744067da146e8bb7a8dd696ad5812..0838fcd5cda565597a89d5296b1831dd15d71738 100644 (file)
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -5,6 +5,7 @@
 #include "apicalldelegate.h"
 #include "apitracemodel.h"
 #include "apitracefilter.h"
+#include "imageviewer.h"
 #include "retracer.h"
 #include "settingsdialog.h"
 #include "shaderssourcewidget.h"
@@ -65,6 +66,8 @@ MainWindow::MainWindow()
     m_vdataInterpreter->setTypeFromString(
         m_ui.vertexTypeCB->currentText());
 
+    m_imageViewer = new ImageViewer(this);
+
     connect(m_ui.vertexInterpretButton, SIGNAL(clicked()),
             m_vdataInterpreter, SLOT(interpretData()));
     connect(m_ui.vertexTypeCB, SIGNAL(currentIndexChanged(const QString&)),
@@ -121,6 +124,14 @@ MainWindow::MainWindow()
     connect(m_filterEdit, SIGNAL(returnPressed()),
             this, SLOT(filterTrace()));
 
+    m_ui.surfacesTreeWidget->setContextMenuPolicy(Qt::CustomContextMenu);
+    connect(m_ui.surfacesTreeWidget,
+            SIGNAL(customContextMenuRequested(const QPoint &)),
+            SLOT(showSurfacesMenu(const QPoint &)));
+    connect(m_ui.surfacesTreeWidget,
+            SIGNAL(itemDoubleClicked(QTreeWidgetItem *, int)),
+            SLOT(showSelectedSurface()));
+
     m_ui.detailsWebView->page()->setLinkDelegationPolicy(
         QWebPage::DelegateExternalLinks);
     connect(m_ui.detailsWebView, SIGNAL(linkClicked(const QUrl&)),
@@ -411,7 +422,37 @@ void MainWindow::fillStateForFrame()
         m_sourcesWidget->setShaders(shaderSources);
     }
 
-    m_ui.surfacesTab->setEnabled(false);
+    const QList<ApiTexture> &textures =
+        state.textures();
+
+    if (textures.isEmpty()) {
+        m_ui.surfacesTreeWidget->clear();
+        m_ui.surfacesTab->setDisabled(false);
+    } else {
+        QTreeWidgetItem *textureItem =
+            new QTreeWidgetItem(m_ui.surfacesTreeWidget);
+        m_ui.surfacesTreeWidget->setIconSize(QSize(64, 64));
+        textureItem->setText(0, tr("Textures"));
+        for (int i = 0; i < textures.count(); ++i) {
+            const ApiTexture &texture =
+                textures[i];
+            QIcon icon(QPixmap::fromImage(texture.thumb()));
+            QTreeWidgetItem *item = new QTreeWidgetItem(textureItem);
+            item->setIcon(0, icon);
+            int width = texture.size().width();
+            int height = texture.size().height();
+            QString descr =
+                QString::fromLatin1("%1, %2 x %3")
+                .arg(texture.target())
+                .arg(width)
+                .arg(height);
+            item->setText(1, descr);
+
+            item->setData(0, Qt::UserRole,
+                          texture.image());
+        }
+        m_ui.surfacesTab->setEnabled(true);
+    }
     m_ui.stateDock->show();
 }
 
@@ -430,4 +471,36 @@ void MainWindow::openHelp(const QUrl &url)
     QDesktopServices::openUrl(url);
 }
 
+void MainWindow::showSurfacesMenu(const QPoint &pos)
+{
+    QTreeWidget *tree = m_ui.surfacesTreeWidget;
+    QTreeWidgetItem *item = tree->itemAt(pos);
+    if (!item)
+        return;
+
+    QMenu menu(tr("Surfaces"), this);
+    //add needed actions
+    QAction *act = menu.addAction(tr("View Image"));
+    act->setStatusTip(tr("View the currently selected surface"));
+    connect(act, SIGNAL(triggered()),
+            SLOT(showSelectedSurface()));
+
+    menu.exec(tree->viewport()->mapToGlobal(pos));
+}
+
+void MainWindow::showSelectedSurface()
+{
+    QTreeWidgetItem *item =
+        m_ui.surfacesTreeWidget->currentItem();
+
+    if (!item)
+        return;
+
+    QVariant var = item->data(0, Qt::UserRole);
+    m_imageViewer->setImage(var.value<QImage>());
+    m_imageViewer->show();
+    m_imageViewer->raise();
+    m_imageViewer->activateWindow();
+}
+
 #include "mainwindow.moc"

diff --git a/gui/mainwindow.h b/gui/mainwindow.h
index 19fffc2a64cc6064f95b93f8e260ca5b5599d186..d309ed2405b65cb2dd788b0dc1041f4338e45e35 100644 (file)
--- a/gui/mainwindow.h
+++ b/gui/mainwindow.h
@@ -11,6 +11,7 @@ class ApiTraceEvent;
 class ApiTraceFilter;
 class ApiTraceFrame;
 class ApiTraceModel;
+class ImageViewer;
 class QLineEdit;
 class QModelIndex;
 class QProgressBar;
@@ -46,6 +47,8 @@ private slots:
     void lookupState();
     void showSettings();
     void openHelp(const QUrl &url);
+    void showSurfacesMenu(const QPoint &pos);
+    void showSelectedSurface();
 
 private:
     void newTraceFile(const QString &fileName);
@@ -75,6 +78,8 @@ private:
     Retracer *m_retracer;
 
     VertexDataInterpreter *m_vdataInterpreter;
+
+    ImageViewer *m_imageViewer;
 };
 
 

diff --git a/gui/ui/mainwindow.ui b/gui/ui/mainwindow.ui
index 06988c7de2646f623e22b6d8b7e7ce08d443910f..89b5836ca6e2acfc9d6774e95f3140f08f1181eb 100644 (file)
--- a/gui/ui/mainwindow.ui
+++ b/gui/ui/mainwindow.ui
@@ -127,7 +127,7 @@
      <item>
       <widget class="QTabWidget" name="stateTabWidget">
        <property name="currentIndex">
-        <number>1</number>
+        <number>2</number>
        </property>
        <widget class="QWidget" name="parametersTab">
         <attribute name="title">
@@ -176,12 +176,12 @@
           <widget class="QTreeWidget" name="surfacesTreeWidget">
            <column>
             <property name="text">
-             <string>Type</string>
+             <string>Thumbnail</string>
             </property>
            </column>
            <column>
             <property name="text">
-             <string>Size</string>
+             <string>Description</string>
             </property>
            </column>
           </widget>