From 1e7a4733546f340ff7c0f1ed761187077e3f5abf Mon Sep 17 00:00:00 2001 From: baldurk Date: Wed, 25 Mar 2015 19:02:39 +0000 Subject: [PATCH] Placeholder event browser and texture viewer windows, for testing --- qrenderdoc/EventBrowser.cpp | 14 ++ qrenderdoc/EventBrowser.h | 22 +++ qrenderdoc/EventBrowser.ui | 44 +++++ qrenderdoc/MainWindow.cpp | 17 ++ qrenderdoc/MainWindow.h | 3 + qrenderdoc/MainWindow.ui | 366 ++++++++++++++++++++++++++++++++++- qrenderdoc/TextureViewer.cpp | 14 ++ qrenderdoc/TextureViewer.h | 22 +++ qrenderdoc/TextureViewer.ui | 38 ++++ qrenderdoc/qrenderdoc.pro | 17 +- 10 files changed, 547 insertions(+), 10 deletions(-) create mode 100644 qrenderdoc/EventBrowser.cpp create mode 100644 qrenderdoc/EventBrowser.h create mode 100644 qrenderdoc/EventBrowser.ui create mode 100644 qrenderdoc/TextureViewer.cpp create mode 100644 qrenderdoc/TextureViewer.h create mode 100644 qrenderdoc/TextureViewer.ui diff --git a/qrenderdoc/EventBrowser.cpp b/qrenderdoc/EventBrowser.cpp new file mode 100644 index 000000000..545058c68 --- /dev/null +++ b/qrenderdoc/EventBrowser.cpp @@ -0,0 +1,14 @@ +#include "EventBrowser.h" +#include "ui_EventBrowser.h" + +EventBrowser::EventBrowser(QWidget *parent) : + QFrame(parent), + ui(new Ui::EventBrowser) +{ + ui->setupUi(this); +} + +EventBrowser::~EventBrowser() +{ + delete ui; +} diff --git a/qrenderdoc/EventBrowser.h b/qrenderdoc/EventBrowser.h new file mode 100644 index 000000000..c40ff16a5 --- /dev/null +++ b/qrenderdoc/EventBrowser.h @@ -0,0 +1,22 @@ +#ifndef EVENTBROWSER_H +#define EVENTBROWSER_H + +#include + +namespace Ui { +class EventBrowser; +} + +class EventBrowser : public QFrame +{ + Q_OBJECT + + public: + explicit EventBrowser(QWidget *parent = 0); + ~EventBrowser(); + + private: + Ui::EventBrowser *ui; +}; + +#endif // EVENTBROWSER_H diff --git a/qrenderdoc/EventBrowser.ui b/qrenderdoc/EventBrowser.ui new file mode 100644 index 000000000..bf2c280c5 --- /dev/null +++ b/qrenderdoc/EventBrowser.ui @@ -0,0 +1,44 @@ + + + EventBrowser + + + + 0 + 0 + 620 + 527 + + + + Event Browser + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + 9 + 9 + 441 + 311 + + + + + 0 + 0 + + + + Placeholder for Event Browser + + + + + + diff --git a/qrenderdoc/MainWindow.cpp b/qrenderdoc/MainWindow.cpp index 7cc8e8508..d40c5211e 100644 --- a/qrenderdoc/MainWindow.cpp +++ b/qrenderdoc/MainWindow.cpp @@ -1,4 +1,6 @@ #include "MainWindow.h" +#include "EventBrowser.h" +#include "TextureViewer.h" #include "ui_MainWindow.h" MainWindow::MainWindow(QWidget *parent) : @@ -6,9 +8,24 @@ MainWindow::MainWindow(QWidget *parent) : ui(new Ui::MainWindow) { ui->setupUi(this); + + EventBrowser *eventbrowser = new EventBrowser(); + + ui->toolWindowManager->addToolWindow(eventbrowser, ToolWindowManager::EmptySpace); + + TextureViewer *textureviewer = new TextureViewer(); + + ui->toolWindowManager->addToolWindow(textureviewer, ToolWindowManager::AreaReference(ToolWindowManager::RightOf, ui->toolWindowManager->areaOf(eventbrowser))); + + ui->toolWindowManager->setRubberBandLineWidth(50); } MainWindow::~MainWindow() { delete ui; } + +void MainWindow::on_action_Exit_triggered() +{ + this->close(); +} diff --git a/qrenderdoc/MainWindow.h b/qrenderdoc/MainWindow.h index a3948a917..edde1d67e 100644 --- a/qrenderdoc/MainWindow.h +++ b/qrenderdoc/MainWindow.h @@ -15,6 +15,9 @@ public: explicit MainWindow(QWidget *parent = 0); ~MainWindow(); +private slots: + void on_action_Exit_triggered(); + private: Ui::MainWindow *ui; }; diff --git a/qrenderdoc/MainWindow.ui b/qrenderdoc/MainWindow.ui index 6050363fa..c44e08d23 100644 --- a/qrenderdoc/MainWindow.ui +++ b/qrenderdoc/MainWindow.ui @@ -1,7 +1,8 @@ + MainWindow - - + + 0 0 @@ -9,16 +10,363 @@ 300 - + MainWindow - - - - + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + + + + + 0 + 0 + 400 + 18 + + + + + &Tools + + + + + + + + + + &File + + + + + + + + + + + + + + + + + &Window + + + + &Save Layout + + + + + + + + + + + + + &Load Layout + + + + + + + + + + + + + + + + + + + + + + + + + &Help + + + + + + + + + + + + + + + + + + + + &Capture Log + + + Ctrl+N + + + + + &Attach to Running Instance + + + + + &Inject into Process + + + + + &Open Log + + + Ctrl+O + + + + + &Save Log + + + Ctrl+S + + + + + C&lose Log + + + Ctrl+W + + + + + &Recent Logs + + + + + R&ecent Capture Settings + + + + + &Exit + + + Alt+F4 + + + + + P&ython Shell + + + + + &Event Viewer + + + + + &Texture Viewer + + + + + &Pipeline State + + + + + &API Inspector + + + + + &Mesh Output + + + + + Log Errors and &Warnings + + + + + T&imeline + + + + + Layout 1 + + + + + &Default Layout + + + + + &Default Layout + + + + + Layout &1 + + + + + Layout &2 + + + + + Layout &3 + + + + + Layout &4 + + + + + Layout &5 + + + + + Layout &5 + + + + + Layout &6 + + + + + Layout &1 + + + + + Layout &2 + + + + + Layout &3 + + + + + Layout &4 + + + + + Layout &5 + + + + + Layout &6 + + + + + &Resolve Symbols + + + + + &Log Statistics + + + + + &Options + + + + + &Manage Replay Devices + + + + + View &Documentation + + + + + View Diagnostic &Log File + + + + + Send &Error Report + + + + + Update available + + + + + Source on github + + + + + Build/Release downloads + + + + + &About + + - - + diff --git a/qrenderdoc/TextureViewer.cpp b/qrenderdoc/TextureViewer.cpp new file mode 100644 index 000000000..5c8eaa6b6 --- /dev/null +++ b/qrenderdoc/TextureViewer.cpp @@ -0,0 +1,14 @@ +#include "TextureViewer.h" +#include "ui_TextureViewer.h" + +TextureViewer::TextureViewer(QWidget *parent) : + QFrame(parent), + ui(new Ui::TextureViewer) +{ + ui->setupUi(this); +} + +TextureViewer::~TextureViewer() +{ + delete ui; +} diff --git a/qrenderdoc/TextureViewer.h b/qrenderdoc/TextureViewer.h new file mode 100644 index 000000000..ef709461c --- /dev/null +++ b/qrenderdoc/TextureViewer.h @@ -0,0 +1,22 @@ +#ifndef TEXTUREVIEWER_H +#define TEXTUREVIEWER_H + +#include + +namespace Ui { +class TextureViewer; +} + +class TextureViewer : public QFrame +{ + Q_OBJECT + + public: + explicit TextureViewer(QWidget *parent = 0); + ~TextureViewer(); + + private: + Ui::TextureViewer *ui; +}; + +#endif // TEXTUREVIEWER_H diff --git a/qrenderdoc/TextureViewer.ui b/qrenderdoc/TextureViewer.ui new file mode 100644 index 000000000..d9351ef5e --- /dev/null +++ b/qrenderdoc/TextureViewer.ui @@ -0,0 +1,38 @@ + + + TextureViewer + + + + 0 + 0 + 400 + 300 + + + + Texture Viewer + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + 80 + 50 + 211 + 131 + + + + Placeholder for Texture Viewer + + + + + + diff --git a/qrenderdoc/qrenderdoc.pro b/qrenderdoc/qrenderdoc.pro index f8d51cd19..d6f7a394f 100644 --- a/qrenderdoc/qrenderdoc.pro +++ b/qrenderdoc/qrenderdoc.pro @@ -19,6 +19,9 @@ OBJECTS_DIR = .obj # include path for core renderdoc API INCLUDEPATH += $$_PRO_FILE_PWD_/../renderdoc/api/replay +# For ToolWindowManager +INCLUDEPATH += $$_PRO_FILE_PWD_/3rdparty/toolwindowmanager + # Different output folders per platform win32 { @@ -45,8 +48,20 @@ win32 { } SOURCES += main.cpp\ - MainWindow.cpp + MainWindow.cpp + 3rdparty/toolwindowmanager/ToolWindowManager.cpp \ + 3rdparty/toolwindowmanager/ToolWindowManagerArea.cpp \ + 3rdparty/toolwindowmanager/ToolWindowManagerWrapper.cpp \ + EventBrowser.cpp \ + TextureViewer.cpp HEADERS += MainWindow.h + 3rdparty/toolwindowmanager/ToolWindowManager.h \ + 3rdparty/toolwindowmanager/ToolWindowManagerArea.h \ + 3rdparty/toolwindowmanager/ToolWindowManagerWrapper.h \ + EventBrowser.h \ + TextureViewer.h FORMS += MainWindow.ui + EventBrowser.ui \ + TextureViewer.ui