Moved loading code into separate functions based on source file type

Moved table view code into its own class that will handle modifications to the document Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2022-02-13 17:01:31 -06:00
parent 2b16f6860f
commit 2b49b5eefe
8 changed files with 280 additions and 181 deletions
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <AzCore/Name/Name.h>
+#include <Document/ShaderManagementConsoleDocumentRequestBus.h>
+#include <Window/ShaderManagementConsoleTableView.h>
+
+#include <QHeaderView>
+
+namespace ShaderManagementConsole
+{
+    ShaderManagementConsoleTableView::ShaderManagementConsoleTableView(const AZ::Uuid& documentId, QWidget* parent)
+        : QTableView(parent)
+        , m_documentId(documentId)
+        , m_model(new QStandardItemModel(this))
+    {
+        setSelectionBehavior(QAbstractItemView::SelectRows);
+        setModel(m_model);
+
+        RebuildTable();
+        AtomToolsFramework::AtomToolsDocumentNotificationBus::Handler::BusConnect();
+    }
+
+    ShaderManagementConsoleTableView::~ShaderManagementConsoleTableView()
+    {
+        AtomToolsFramework::AtomToolsDocumentNotificationBus::Handler::BusDisconnect();
+    }
+
+    void ShaderManagementConsoleTableView::OnDocumentOpened(const AZ::Uuid& documentId)
+    {
+        if (m_documentId == documentId)
+        {
+            RebuildTable();
+        }
+    }
+
+    void ShaderManagementConsoleTableView::OnDocumentModified(const AZ::Uuid& documentId)
+    {
+        if (m_documentId == documentId)
+        {
+            RebuildTable();
+        }
+    }
+
+    void ShaderManagementConsole::ShaderManagementConsoleTableView::RebuildTable()
+    {
+        AZStd::unordered_set<AZStd::string> optionNames;
+
+        size_t shaderOptionCount = 0;
+        ShaderManagementConsoleDocumentRequestBus::EventResult(
+            shaderOptionCount, m_documentId, &ShaderManagementConsoleDocumentRequestBus::Events::GetShaderOptionCount);
+
+        for (size_t optionIndex = 0; optionIndex < shaderOptionCount; ++optionIndex)
+        {
+            AZ::RPI::ShaderOptionDescriptor shaderOptionDesc;
+            ShaderManagementConsoleDocumentRequestBus::EventResult(
+                shaderOptionDesc, m_documentId, &ShaderManagementConsoleDocumentRequestBus::Events::GetShaderOptionDescriptor, optionIndex);
+            optionNames.insert(shaderOptionDesc.GetName().GetCStr());
+        }
+
+        size_t shaderVariantCount = 0;
+        ShaderManagementConsoleDocumentRequestBus::EventResult(
+            shaderVariantCount, m_documentId, &ShaderManagementConsoleDocumentRequestBus::Events::GetShaderVariantCount);
+
+        m_model->clear();
+        m_model->setRowCount(static_cast<int>(shaderVariantCount));
+        m_model->setColumnCount(static_cast<int>(optionNames.size()));
+
+        int nameIndex = 0;
+        for (const auto& optionName : optionNames)
+        {
+            m_model->setHeaderData(nameIndex++, Qt::Horizontal, optionName.c_str());
+        }
+
+        for (int variantIndex = 0; variantIndex < shaderVariantCount; ++variantIndex)
+        {
+            AZ::RPI::ShaderVariantListSourceData::VariantInfo shaderVariantInfo;
+            ShaderManagementConsoleDocumentRequestBus::EventResult(
+                shaderVariantInfo, m_documentId, &ShaderManagementConsoleDocumentRequestBus::Events::GetShaderVariantInfo, variantIndex);
+
+            m_model->setHeaderData(variantIndex, Qt::Vertical, QString::number(variantIndex));
+
+            for (const auto& shaderOption : shaderVariantInfo.m_options)
+            {
+                AZ::Name optionName{ shaderOption.first };
+                AZ::Name optionValue{ shaderOption.second };
+
+                auto optionIt = optionNames.find(optionName.GetCStr());
+                int optionIndex = static_cast<int>(AZStd::distance(optionNames.begin(), optionIt));
+
+                QStandardItem* item = new QStandardItem(optionValue.GetCStr());
+                m_model->setItem(variantIndex, optionIndex, item);
+            }
+        }
+    }
+} // namespace ShaderManagementConsole
+
+#include <Window/moc_ShaderManagementConsoleTableView.cpp>
+#include "ShaderManagementConsoleTableView.h"
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <AtomToolsFramework/Document/AtomToolsDocumentNotificationBus.h>
+
+#include <QStandardItemModel>
+#include <QTableView>
+#endif
+
+namespace ShaderManagementConsole
+{
+    class ShaderManagementConsoleTableView
+        : public QTableView
+        , public AtomToolsFramework::AtomToolsDocumentNotificationBus::Handler
+    {
+    public:
+        AZ_CLASS_ALLOCATOR(ShaderManagementConsoleTableView, AZ::SystemAllocator, 0);
+        ShaderManagementConsoleTableView(const AZ::Uuid& documentId, QWidget* parent = 0);
+        ~ShaderManagementConsoleTableView();
+
+    protected:
+        // AtomToolsFramework::AtomToolsDocumentNotificationBus::Handler overrides...
+        void OnDocumentOpened(const AZ::Uuid& documentId) override;
+        void OnDocumentModified(const AZ::Uuid& documentId) override;
+
+        void RebuildTable();
+
+        AZ::Uuid m_documentId = AZ::Uuid::CreateNull();
+        QStandardItemModel* m_model = {};
+
+    };
+} // namespace ShaderManagementConsole
@@ -6,23 +6,19 @@
 *
 */

+#include <Atom/RPI.Edit/Shader/ShaderSourceData.h>
+#include <Atom/RPI.Edit/Shader/ShaderVariantListSourceData.h>
+#include <Atom/RPI.Reflect/Shader/ShaderAsset.h>
 #include <AtomToolsFramework/Document/AtomToolsDocumentSystemRequestBus.h>
-#include <AtomToolsFramework/Util/Util.h>
-#include <AzCore/Name/Name.h>
 #include <AzCore/Utils/Utils.h>
 #include <AzQtComponents/Components/WindowDecorationWrapper.h>
-#include <Document/ShaderManagementConsoleDocumentRequestBus.h>
+#include <Window/ShaderManagementConsoleTableView.h>
 #include <Window/ShaderManagementConsoleWindow.h>

-AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") // disable warnings spawned by QT
 #include <QDesktopServices>
 #include <QFileDialog>
-#include <QHeaderView>
-#include <QStandardItemModel>
-#include <QTableView>
 #include <QUrl>
 #include <QWindow>
-AZ_POP_DISABLE_WARNING

 namespace ShaderManagementConsole
 {
@@ -79,60 +75,7 @@ namespace ShaderManagementConsole

    QWidget* ShaderManagementConsoleWindow::CreateDocumentTabView(const AZ::Uuid& documentId)
    {
-        AZStd::unordered_set<AZStd::string> optionNames;
-
-        size_t shaderOptionCount = 0;
-        ShaderManagementConsoleDocumentRequestBus::EventResult(
-            shaderOptionCount, documentId, &ShaderManagementConsoleDocumentRequestBus::Events::GetShaderOptionCount);
-
-        for (size_t optionIndex = 0; optionIndex < shaderOptionCount; ++optionIndex)
-        {
-            AZ::RPI::ShaderOptionDescriptor shaderOptionDesc;
-            ShaderManagementConsoleDocumentRequestBus::EventResult(
-                shaderOptionDesc, documentId, &ShaderManagementConsoleDocumentRequestBus::Events::GetShaderOptionDescriptor, optionIndex);
-            optionNames.insert(shaderOptionDesc.GetName().GetCStr());
-        }
-
-        size_t shaderVariantCount = 0;
-        ShaderManagementConsoleDocumentRequestBus::EventResult(
-            shaderVariantCount, documentId, &ShaderManagementConsoleDocumentRequestBus::Events::GetShaderVariantCount);
-
-        auto model = new QStandardItemModel();
-        model->setRowCount(static_cast<int>(shaderVariantCount));
-        model->setColumnCount(static_cast<int>(optionNames.size()));
-
-        int nameIndex = 0;
-        for (const auto& optionName : optionNames)
-        {
-            model->setHeaderData(nameIndex++, Qt::Horizontal, optionName.c_str());
-        }
-
-        for (int variantIndex = 0; variantIndex < shaderVariantCount; ++variantIndex)
-        {
-            AZ::RPI::ShaderVariantListSourceData::VariantInfo shaderVariantInfo;
-            ShaderManagementConsoleDocumentRequestBus::EventResult(
-                shaderVariantInfo, documentId, &ShaderManagementConsoleDocumentRequestBus::Events::GetShaderVariantInfo, variantIndex);
-
-            model->setHeaderData(variantIndex, Qt::Vertical, QString::number(variantIndex));
-
-            for (const auto& shaderOption : shaderVariantInfo.m_options)
-            {
-                AZ::Name optionName{ shaderOption.first };
-                AZ::Name optionValue{ shaderOption.second };
-
-                auto optionIt = optionNames.find(optionName.GetCStr());
-                int optionIndex = static_cast<int>(AZStd::distance(optionNames.begin(), optionIt));
-
-                QStandardItem* item = new QStandardItem(optionValue.GetCStr());
-                model->setItem(variantIndex, optionIndex, item);
-            }
-        }
-
-        // The document tab contains a table view.
-        auto contentWidget = new QTableView(centralWidget());
-        contentWidget->setSelectionBehavior(QAbstractItemView::SelectRows);
-        contentWidget->setModel(model);
-        return contentWidget;
+        return new ShaderManagementConsoleTableView(documentId, centralWidget());
    }
 } // namespace ShaderManagementConsole

@@ -8,16 +8,8 @@

 #pragma once

-#if !defined(Q_MOC_RUN)
-#include <Atom/RPI.Edit/Shader/ShaderVariantListSourceData.h>
-#include <Atom/RPI.Public/Shader/Shader.h>
 #include <AtomToolsFramework/Document/AtomToolsDocumentMainWindow.h>

-AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") // disable warnings spawned by QT
-#include <QStandardItemModel>
-AZ_POP_DISABLE_WARNING
-#endif
-
 namespace ShaderManagementConsole
 {
    //! ShaderManagementConsoleWindow is the main class. Its responsibility is limited to initializing and connecting