birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scan refactor is in a working state

Browse Source 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
This commit is contained in:
chcurran
2021-09-13 15:30:31 -07:00
parent cbaa2fcff5
commit 1badb5a31f
14 changed files with 485 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/EditorScriptCanvasBus.h
+1 -2
View File
@@ -221,8 +221,7 @@ namespace ScriptCanvasEditor
AZ_TYPE_INFO(IUpgradeRequests, "{D25318F2-4DDA-4E76-98CB-6D561BB6234D}");
using AssetList = AZStd::list<AZ::Data::AssetInfo>;
virtual AssetList& GetAssetsToUpgrade() = 0;
virtual void ClearGraphsThatNeedUpgrade() = 0;
virtual void GraphNeedsManualUpgrade(const AZ::Data::AssetId&) = 0;
virtual const AZStd::vector<AZ::Data::AssetId>& GetGraphsThatNeedManualUpgrade() const = 0;
Gems/ScriptCanvas/Code/Editor/SystemComponent.cpp
+16 -91
View File
@@ -6,46 +6,35 @@
*
*/
#include <AzCore/Serialization/SerializeContext.h>
#include <AzCore/Serialization/EditContext.h>
#include <AzCore/Jobs/JobFunction.h>
#include <AzCore/EBus/Results.h>
#include <AzCore/Jobs/JobFunction.h>
#include <AzCore/Serialization/EditContext.h>
#include <AzCore/Serialization/SerializeContext.h>
#include <AzCore/Serialization/Utils.h>
#include <AzCore/std/string/wildcard.h>
#include <AzFramework/Entity/EntityContextBus.h>
#include <AzFramework/IO/FileOperations.h>
#include <AzToolsFramework/API/ViewPaneOptions.h>
#include <AzToolsFramework/AssetBrowser/Entries/SourceAssetBrowserEntry.h>
#include <AzToolsFramework/UI/PropertyEditor/GenericComboBoxCtrl.h>
#include <GraphCanvas/GraphCanvasBus.h>
#include <Editor/Framework/ScriptCanvasGraphUtilities.h>
#include <Editor/Settings.h>
#include <Editor/SystemComponent.h>
#include <Editor/View/Windows/MainWindow.h>
#include <Editor/View/Dialogs/NewGraphDialog.h>
#include <Editor/View/Dialogs/SettingsDialog.h>
#include <Editor/Settings.h>
#include <Editor/View/Windows/MainWindow.h>
#include <GraphCanvas/GraphCanvasBus.h>
#include <LyViewPaneNames.h>
#include <QMenu>
#include <QMessageBox>
#include <ScriptCanvas/Bus/EditorScriptCanvasBus.h>
#include <ScriptCanvas/Components/EditorGraph.h>
#include <ScriptCanvas/Components/EditorGraphVariableManagerComponent.h>
#include <ScriptCanvas/Core/Datum.h>
#include <ScriptCanvas/Data/DataRegistry.h>
#include <ScriptCanvas/Libraries/Libraries.h>
#include <ScriptCanvas/Variable/VariableCore.h>
#include <ScriptCanvas/Components/EditorGraph.h>
#include <ScriptCanvas/Components/EditorGraphVariableManagerComponent.h>
#include <LyViewPaneNames.h>
#include <QMenu>
#include <QMessageBox>
#include <ScriptCanvas/View/EditCtrls/GenericLineEditCtrl.h>
#include <Editor/Framework/ScriptCanvasGraphUtilities.h>
#include <AzToolsFramework/AssetBrowser/Entries/SourceAssetBrowserEntry.h>
#include <AzFramework/IO/FileOperations.h>
#include <AzCore/Serialization/Utils.h>
namespace ScriptCanvasEditor
{
@@ -54,6 +43,7 @@ namespace ScriptCanvasEditor
SystemComponent::SystemComponent()
{
AzToolsFramework::AssetSeedManagerRequests::Bus::Handler::BusConnect();
m_versionExplorer = AZStd::make_unique<VersionExplorer::Model>();
}
SystemComponent::~SystemComponent()
@@ -61,7 +51,6 @@ namespace ScriptCanvasEditor
AzToolsFramework::UnregisterViewPane(LyViewPane::ScriptCanvas);
AzToolsFramework::EditorContextMenuBus::Handler::BusDisconnect();
AzToolsFramework::EditorEvents::Bus::Handler::BusDisconnect();
AzFramework::AssetCatalogEventBus::Handler::BusDisconnect();
AzToolsFramework::AssetSeedManagerRequests::Bus::Handler::BusDisconnect();
}
@@ -141,17 +130,12 @@ namespace ScriptCanvasEditor
{
if (userSettings->m_showUpgradeDialog)
{
AzFramework::AssetCatalogEventBus::Handler::BusConnect();
}
else
{
m_upgradeDisabled = true;
}
}
else
{
AzFramework::AssetCatalogEventBus::Handler::BusConnect();
}
}
void SystemComponent::NotifyRegisterViews()
@@ -172,7 +156,6 @@ namespace ScriptCanvasEditor
AzToolsFramework::EditorEvents::Bus::Handler::BusDisconnect();
ScriptCanvasExecutionBus::Handler::BusDisconnect();
SystemRequestBus::Handler::BusDisconnect();
AzFramework::AssetCatalogEventBus::Handler::BusDisconnect();
m_jobContext.reset();
m_jobManager.reset();
@@ -397,64 +380,6 @@ namespace ScriptCanvasEditor
return reporter;
}
void SystemComponent::OnCatalogLoaded(const char* /*catalogFile*/)
{
// Enumerate all ScriptCanvas assets
AZ::Data::AssetCatalogRequestBus::Broadcast(&AZ::Data::AssetCatalogRequestBus::Events::EnumerateAssets,
nullptr,
[this](const AZ::Data::AssetId, const AZ::Data::AssetInfo& assetInfo) {
if (assetInfo.m_assetType == azrtti_typeid<ScriptCanvasAsset>())
{
AddAssetToUpgrade(assetInfo);
}
},
nullptr
);
}
void SystemComponent::OnCatalogAssetAdded(const AZ::Data::AssetId& assetId)
{
if (IsUpgrading())
{
return;
}
auto assetInfo = ScriptCanvasEditor::AssetHelpers::GetAssetInfo(assetId);
AddAssetToUpgrade(assetInfo);
}
void SystemComponent::OnCatalogAssetRemoved(const AZ::Data::AssetId& assetId, const AZ::Data::AssetInfo& /*assetInfo*/)
{
if (IsUpgrading())
{
return;
}
AZStd::erase_if(m_assetsToConvert, [assetId](const AZ::Data::AssetInfo& assetToConvert)
{
return assetToConvert.m_assetId == assetId;
}
);
}
void SystemComponent::AddAssetToUpgrade(const AZ::Data::AssetInfo& assetInfo)
{
auto query = AZStd::find_if(m_assetsToConvert.begin(), m_assetsToConvert.end(), [assetInfo](const AZ::Data::AssetInfo& assetToConvert)
{
return assetToConvert.m_assetId == assetInfo.m_assetId;
}
);
if (query == m_assetsToConvert.end())
{
if (assetInfo.m_assetType == azrtti_typeid<ScriptCanvasAsset>())
{
m_assetsToConvert.push_back(assetInfo);
}
}
}
AzToolsFramework::AssetSeedManagerRequests::AssetTypePairs SystemComponent::GetAssetTypeMapping()
{
return {
Gems/ScriptCanvas/Code/Editor/SystemComponent.h
+10 -59
View File
@@ -9,23 +9,20 @@
#pragma once
#include <Core/GraphBus.h>
#include <ScriptCanvas/Bus/ScriptCanvasBus.h>
#include <ScriptCanvas/Bus/ScriptCanvasExecutionBus.h>
#include <AzCore/Component/Component.h>
#include <AzCore/std/smart_ptr/unique_ptr.h>
#include <AzCore/Jobs/JobContext.h>
#include <AzCore/Jobs/JobManager.h>
#include <AzCore/UserSettings/UserSettingsProvider.h>
#include <AzCore/std/smart_ptr/unique_ptr.h>
#include <AzToolsFramework/API/ToolsApplicationAPI.h>
#include <AzToolsFramework/Asset/AssetSeedManager.h>
#include <AzToolsFramework/AssetBrowser/AssetBrowserBus.h>
#include <AzToolsFramework/Editor/EditorContextMenuBus.h>
#include <Core/GraphBus.h>
#include <Editor/Assets/ScriptCanvasAssetTracker.h>
#include <AzToolsFramework/Asset/AssetSeedManager.h>
#include <AzCore/Jobs/JobManager.h>
#include <AzCore/Jobs/JobContext.h>
#include <Editor/View/Windows/Tools/UpgradeTool/Model.h>
#include <ScriptCanvas/Bus/ScriptCanvasBus.h>
#include <ScriptCanvas/Bus/ScriptCanvasExecutionBus.h>
namespace ScriptCanvasEditor
{
@@ -36,9 +33,7 @@ namespace ScriptCanvasEditor
, private AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotificationBus::Handler
, private ScriptCanvasExecutionBus::Handler
, private AZ::UserSettingsNotificationBus::Handler
, private AzFramework::AssetCatalogEventBus::Handler
, private AZ::Data::AssetBus::MultiHandler
, private AZ::Interface<IUpgradeRequests>::Registrar
, private AzToolsFramework::AssetSeedManagerRequests::Bus::Handler
, private AzToolsFramework::EditorContextMenuBus::Handler
{
@@ -96,74 +91,30 @@ namespace ScriptCanvasEditor
void OnUserSettingsActivated() override;
////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
// AzFramework::AssetCatalogEventBus::Handler...
void OnCatalogLoaded(const char* /*catalogFile*/) override;
void OnCatalogAssetAdded(const AZ::Data::AssetId& /*assetId*/) override;
void OnCatalogAssetRemoved(const AZ::Data::AssetId& /*assetId*/, const AZ::Data::AssetInfo& /*assetInfo*/) override;
////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
// AssetSeedManagerRequests::Bus::Handler...
AzToolsFramework::AssetSeedManagerRequests::AssetTypePairs GetAssetTypeMapping() override;
////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
// IUpgradeRequests...
void ClearGraphsThatNeedUpgrade()
{
m_assetsThatNeedManualUpgrade.clear();
}
IUpgradeRequests::AssetList& GetAssetsToUpgrade() override
{
return m_assetsToConvert;
}
void GraphNeedsManualUpgrade(const AZ::Data::AssetId& assetId) override
{
if (AZStd::find(m_assetsThatNeedManualUpgrade.begin(), m_assetsThatNeedManualUpgrade.end(), assetId) == m_assetsThatNeedManualUpgrade.end())
{
m_assetsThatNeedManualUpgrade.push_back(assetId);
}
}
const AZStd::vector<AZ::Data::AssetId>& GetGraphsThatNeedManualUpgrade() const override
{
return m_assetsThatNeedManualUpgrade;
}
bool IsUpgrading() override
{
return m_isUpgrading;
}
void SetIsUpgrading(bool isUpgrading) override
{
m_isUpgrading = isUpgrading;
}
////////////////////////////////////////////////////////////////////////
private:
SystemComponent(const SystemComponent&) = delete;
void FilterForScriptCanvasEnabledEntities(AzToolsFramework::EntityIdList& sourceList, AzToolsFramework::EntityIdList& targetList);
void PopulateEditorCreatableTypes();
void AddAssetToUpgrade(const AZ::Data::AssetInfo& assetInfo);
AZStd::unique_ptr<AZ::JobManager> m_jobManager;
AZStd::unique_ptr<AZ::JobContext> m_jobContext;
AZStd::unique_ptr<VersionExplorer::Model> m_versionExplorer;
AZStd::unordered_set<ScriptCanvas::Data::Type> m_creatableTypes;
AssetTracker m_assetTracker;
IUpgradeRequests::AssetList m_assetsToConvert;
AZStd::vector<AZ::Data::AssetId> m_assetsThatNeedManualUpgrade;
bool m_isUpgrading = false;
bool m_upgradeDisabled = false;
};
}
Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp
+8 -2
View File
@@ -134,7 +134,6 @@
#include <Editor/View/Widgets/NodePalette/CreateNodeMimeEvent.h>
#include <Editor/View/Widgets/NodePalette/EBusNodePaletteTreeItemTypes.h>
#include <Editor/View/Windows/Tools/UpgradeTool/UpgradeHelper.h>
#include <Editor/View/Windows/Tools/UpgradeTool/View.h>
#include <Editor/View/Widgets/VariablePanel/SlotTypeSelectorWidget.h>
@@ -3436,9 +3435,14 @@ namespace ScriptCanvasEditor
void MainWindow::RunUpgradeTool()
{
auto versionExplorer = aznew VersionExplorer::View(this);
// \todo, restore this behavior, post modification step
/*
auto versionExplorer = aznew VersionExplorer::Controller(this);
versionExplorer->exec();
// Manual correction
size_t assetsThatNeedManualInspection = AZ::Interface<IUpgradeRequests>::Get()->GetGraphsThatNeedManualUpgrade().size();
@@ -3448,6 +3452,8 @@ namespace ScriptCanvasEditor
UpgradeHelper* upgradeHelper = new UpgradeHelper(this);
upgradeHelper->show();
}
*/
}
void MainWindow::OnShowValidationErrors()
Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.h
+1 -1
View File
@@ -51,7 +51,7 @@
#include <Editor/View/Widgets/AssetGraphSceneDataBus.h>
#include <Editor/View/Windows/Tools/UpgradeTool/View.h>
#include <Editor/View/Windows/Tools/UpgradeTool/Controller.h>
#if SCRIPTCANVAS_EDITOR
#include <Include/EditorCoreAPI.h>
Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Controller.cpp
+216 -193
View File
@@ -28,12 +28,14 @@
#include <AzToolsFramework/API/ToolsApplicationAPI.h>
#include <AzToolsFramework/SourceControl/SourceControlAPI.h>
#include <Editor/Settings.h>
#include <Editor/View/Windows/Tools/UpgradeTool/View.h>
#include <Editor/View/Windows/Tools/UpgradeTool/ui_View.h>
#include <Editor/View/Windows/Tools/UpgradeTool/Controller.h>
#include <ScriptCanvas/Assets/ScriptCanvasAssetHandler.h>
#include <ScriptCanvas/Bus/EditorScriptCanvasBus.h>
#include <ScriptCanvas/Components/EditorGraph.h>
#include <Editor/View/Windows/Tools/UpgradeTool/ui_Controller.h>
#include <Editor/View/Windows/Tools/UpgradeTool/moc_Controller.cpp>
namespace ScriptCanvasEditor
{
namespace VersionExplorer
@@ -60,33 +62,32 @@ namespace ScriptCanvasEditor
}
}
View::View(QWidget* parent)
Controller::Controller(QWidget* parent)
: AzQtComponents::StyledDialog(parent)
, m_ui(new Ui::View())
, m_view(new Ui::Controller())
{
m_ui->setupUi(this);
m_ui->tableWidget->horizontalHeader()->setVisible(false);
m_ui->tableWidget->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
m_ui->tableWidget->horizontalHeader()->setSectionResizeMode(3, QHeaderView::Fixed);
m_ui->tableWidget->setColumnWidth(3, 22);
m_ui->textEdit->setHorizontalScrollBarPolicy(Qt::ScrollBarPolicy::ScrollBarAsNeeded);
m_ui->textEdit->setVerticalScrollBarPolicy(Qt::ScrollBarPolicy::ScrollBarAlwaysOn);
connect(m_ui->scanButton, &QPushButton::pressed, this, &View::OnScanButtonPress);
connect(m_ui->closeButton, &QPushButton::pressed, this, &View::OnCloseButtonPress);
connect(m_ui->upgradeAllButton, &QPushButton::pressed, this, &View::OnUpgradeAllButtonPress);
m_ui->progressBar->setValue(0);
m_ui->progressBar->setVisible(false);
m_view->setupUi(this);
m_view->tableWidget->horizontalHeader()->setVisible(false);
m_view->tableWidget->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
m_view->tableWidget->horizontalHeader()->setSectionResizeMode(3, QHeaderView::Fixed);
m_view->tableWidget->setColumnWidth(3, 22);
m_view->textEdit->setHorizontalScrollBarPolicy(Qt::ScrollBarPolicy::ScrollBarAsNeeded);
m_view->textEdit->setVerticalScrollBarPolicy(Qt::ScrollBarPolicy::ScrollBarAlwaysOn);
connect(m_view->scanButton, &QPushButton::pressed, this, &Controller::OnScanButtonPress);
connect(m_view->closeButton, &QPushButton::pressed, this, &Controller::OnCloseButtonPress);
connect(m_view->upgradeAllButton, &QPushButton::pressed, this, &Controller::OnUpgradeAllButtonPress);
m_view->progressBar->setValue(0);
m_view->progressBar->setVisible(false);
ViewRequestsBus::Handler::BusConnect();
ModelNotificationsBus::Handler::BusConnect();
// move to model, maybe
m_keepEditorAlive = AZStd::make_unique<EditorKeepAlive>();
}
void View::Log(const char* /*format*/, ...)
void Controller::Log(const char* /*format*/, ...)
{
// if (m_ui->verbose->isChecked())
// if (m_view->verbose->isChecked())
// {
// char sBuffer[2048];
// va_list ArgList;
@@ -99,12 +100,12 @@ namespace ScriptCanvasEditor
// }
}
void View::OnCloseButtonPress()
void Controller::OnCloseButtonPress()
{
reject();
}
void View::OnSystemTick()
void Controller::OnSystemTick()
{
// switch (m_state)
// {
@@ -125,10 +126,10 @@ namespace ScriptCanvasEditor
// }
// else
// {
// m_ui->tableWidget->insertRow(static_cast<int>(m_currentAssetRowIndex));
// m_view->tableWidget->insertRow(static_cast<int>(m_currentAssetRowIndex));
// QTableWidgetItem* rowName = new QTableWidgetItem
// (tr(AZStd::string::format("Error: %s", assetToUpgrade.m_relativePath.c_str()).c_str()));
// m_ui->tableWidget->setItem(static_cast<int>(m_currentAssetRowIndex), static_cast<int>(ColumnAsset), rowName);
// m_view->tableWidget->setItem(static_cast<int>(m_currentAssetRowIndex), static_cast<int>(ColumnAsset), rowName);
// ++m_currentAssetRowIndex;
//
// Log("SystemTick::ProcessState::Scan: %s post-blocking load, problem loading asset", assetToUpgrade.m_relativePath.c_str());
@@ -145,8 +146,8 @@ namespace ScriptCanvasEditor
// {
// ++m_upgradeAssetIndex;
// m_inProgress = false;
// m_ui->progressBar->setVisible(true);
// m_ui->progressBar->setValue(m_upgradeAssetIndex);
// m_view->progressBar->setVisible(true);
// m_view->progressBar->setValue(m_upgradeAssetIndex);
//
// if (m_scriptCanvasEntity)
// {
@@ -182,7 +183,7 @@ namespace ScriptCanvasEditor
//
// if (m_assetsToUpgrade.empty())
// {
// m_ui->upgradeAllButton->setEnabled(false);
// m_view->upgradeAllButton->setEnabled(false);
// }
//
// m_upgradeComplete = false;
@@ -195,13 +196,13 @@ namespace ScriptCanvasEditor
// if (errorMessage.empty())
// {
// Log("SystemTick::ProcessState::Upgrade: Backup Success %s ", m_inProgressAsset->GetHint().c_str());
// QList<QTableWidgetItem*> items = m_ui->tableWidget->findItems(m_inProgressAsset->GetHint().c_str(), Qt::MatchFlag::MatchExactly);
// QList<QTableWidgetItem*> items = m_view->tableWidget->findItems(m_inProgressAsset->GetHint().c_str(), Qt::MatchFlag::MatchExactly);
// if (!items.isEmpty())
// {
// for (auto* item : items)
// {
// int row = item->row();
// AzQtComponents::StyledBusyLabel* spinner = qobject_cast<AzQtComponents::StyledBusyLabel*>(m_ui->tableWidget->cellWidget(row, ColumnStatus));
// AzQtComponents::StyledBusyLabel* spinner = qobject_cast<AzQtComponents::StyledBusyLabel*>(m_view->tableWidget->cellWidget(row, ColumnStatus));
// spinner->SetIsBusy(true);
// }
// }
@@ -230,7 +231,7 @@ namespace ScriptCanvasEditor
// Backup
void View::OnUpgradeAllButtonPress()
void Controller::OnUpgradeAllButtonPress()
{
m_state = ProcessState::Upgrade;
//m_settingsCache = AZStd::make_unique<ScriptCanvas::Grammar::SettingsCache>();
@@ -241,15 +242,15 @@ namespace ScriptCanvasEditor
AZ::Interface<IUpgradeRequests>::Get()->ClearGraphsThatNeedUpgrade();
m_inProgressAsset = m_assetsToUpgrade.begin();
AZ::SystemTickBus::Handler::BusConnect();
m_ui->progressBar->setVisible(true);
m_ui->progressBar->setRange(0, aznumeric_cast<int>(m_assetsToUpgrade.size()));
m_ui->progressBar->setValue(m_upgradeAssetIndex);
m_view->progressBar->setVisible(true);
m_view->progressBar->setRange(0, aznumeric_cast<int>(m_assetsToUpgrade.size()));
m_view->progressBar->setValue(m_upgradeAssetIndex);
m_keepEditorAlive = AZStd::make_unique<EditorKeepAlive>();
}
AZStd::string View::BackupGraph(const AZ::Data::Asset<AZ::Data::AssetData>& asset)
AZStd::string Controller::BackupGraph(const AZ::Data::Asset<AZ::Data::AssetData>& asset)
{
if (!m_ui->makeBackupCheckbox->isChecked())
if (!m_view->makeBackupCheckbox->isChecked())
{
// considered a success
return "";
@@ -303,7 +304,7 @@ namespace ScriptCanvasEditor
}
else
{
AZ_Warning(ScriptCanvas::k_VersionExplorerWindow.data(), false, "View::BackupGraph: Failed to find file: %s", asset.GetHint().c_str());
AZ_Warning(ScriptCanvas::k_VersionExplorerWindow.data(), false, "Controller::BackupGraph: Failed to find file: %s", asset.GetHint().c_str());
return "Failed to find source file";
}
@@ -325,20 +326,20 @@ namespace ScriptCanvasEditor
if (AZ::IO::FileIOBase::GetInstance()->Copy(sourceFilePath.c_str(), targetFilePath.c_str()) != AZ::IO::ResultCode::Success)
{
AZ_Warning(ScriptCanvas::k_VersionExplorerWindow.data(), false, "View::BackupGraph: Error creating backup: %s ---> %s\n", sourceFilePath.c_str(), targetFilePath.c_str());
AZ_Warning(ScriptCanvas::k_VersionExplorerWindow.data(), false, "Controller::BackupGraph: Error creating backup: %s ---> %s\n", sourceFilePath.c_str(), targetFilePath.c_str());
return "Failed to copy source file to backup location";
}
Log("View::BackupGraph: Backed up: %s ---> %s\n", sourceFilePath.c_str(), targetFilePath.c_str());
Log("Controller::BackupGraph: Backed up: %s ---> %s\n", sourceFilePath.c_str(), targetFilePath.c_str());
return "";
}
void View::UpgradeGraph(const AZ::Data::Asset<AZ::Data::AssetData>& asset)
void Controller::UpgradeGraph(const AZ::Data::Asset<AZ::Data::AssetData>& asset)
{
m_inProgress = true;
m_upgradeComplete = false;
Log("UpgradeGraph %s ", m_inProgressAsset->GetHint().c_str());
m_ui->spinner->SetText(QObject::tr("Upgrading: %1").arg(asset.GetHint().c_str()));
m_view->spinner->SetText(QObject::tr("Upgrading: %1").arg(asset.GetHint().c_str()));
m_scriptCanvasEntity = nullptr;
UpgradeNotifications::Bus::Handler::BusConnect();
@@ -355,7 +356,7 @@ namespace ScriptCanvasEditor
}
AZ::Entity* scriptCanvasEntity = scriptCanvasAsset->GetScriptCanvasEntity();
AZ_Assert(scriptCanvasEntity, "View::UpgradeGraph The Script Canvas asset must have a valid entity");
AZ_Assert(scriptCanvasEntity, "Controller::UpgradeGraph The Script Canvas asset must have a valid entity");
if (!scriptCanvasEntity)
{
return;
@@ -393,15 +394,15 @@ namespace ScriptCanvasEditor
graphComponent->UpgradeGraph
(asset
, m_ui->forceUpgrade->isChecked() ? Graph::UpgradeRequest::Forced : Graph::UpgradeRequest::IfOutOfDate
, m_ui->verbose->isChecked());
, m_view->forceUpgrade->isChecked() ? Graph::UpgradeRequest::Forced : Graph::UpgradeRequest::IfOutOfDate
, m_view->verbose->isChecked());
}
}
AZ_Assert(m_scriptCanvasEntity, "The ScriptCanvas asset should have an entity");
}
void View::OnGraphUpgradeComplete(AZ::Data::Asset<AZ::Data::AssetData>& asset, bool /*skipped*/ /*= false*/)
void Controller::OnGraphUpgradeComplete(AZ::Data::Asset<AZ::Data::AssetData>& asset, bool /*skipped*/ /*= false*/)
{
AZStd::string relativePath, fullPath;
AZ::Data::AssetCatalogRequestBus::BroadcastResult(relativePath, &AZ::Data::AssetCatalogRequests::GetAssetPathById, asset.GetId());
@@ -421,7 +422,7 @@ namespace ScriptCanvasEditor
streamer->QueueRequest(flushRequest);
}
void View::OnSourceFileReleased(AZ::Data::Asset<AZ::Data::AssetData> asset)
void Controller::OnSourceFileReleased(AZ::Data::Asset<AZ::Data::AssetData> asset)
{
AZStd::string relativePath, fullPath;
AZ::Data::AssetCatalogRequestBus::BroadcastResult(relativePath, &AZ::Data::AssetCatalogRequests::GetAssetPathById, asset.GetId());
@@ -502,7 +503,7 @@ namespace ScriptCanvasEditor
});
}
void View::PerformMove(AZ::Data::Asset<AZ::Data::AssetData> asset, AZStd::string source, AZStd::string target
void Controller::PerformMove(AZ::Data::Asset<AZ::Data::AssetData> asset, AZStd::string source, AZStd::string target
, size_t remainingAttempts)
{
// ViewCpp::FileEventHandler fileEventHandler;
@@ -559,7 +560,7 @@ namespace ScriptCanvasEditor
}
}
void View::GraphUpgradeComplete
void Controller::GraphUpgradeComplete
(const AZ::Data::Asset<AZ::Data::AssetData> asset, OperationResult result, AZStd::string_view message)
{
AZStd::lock_guard<AZStd::recursive_mutex> lock(m_mutex);
@@ -587,24 +588,24 @@ namespace ScriptCanvasEditor
m_tmpFileName.clear();
}
void View::GraphUpgradeCompleteUIUpdate
void Controller::GraphUpgradeCompleteUIUpdate
(const AZ::Data::Asset<AZ::Data::AssetData> asset, OperationResult result, AZStd::string_view message)
{
QString text = asset.GetHint().c_str();
QList<QTableWidgetItem*> items = m_ui->tableWidget->findItems(text, Qt::MatchFlag::MatchExactly);
QList<QTableWidgetItem*> items = m_view->tableWidget->findItems(text, Qt::MatchFlag::MatchExactly);
if (!items.isEmpty())
{
for (auto* item : items)
{
int row = item->row();
QTableWidgetItem* label = m_ui->tableWidget->item(row, ColumnAsset);
QTableWidgetItem* label = m_view->tableWidget->item(row, ColumnAsset);
QString assetName = asset.GetHint().c_str();
if (label->text().compare(assetName) == 0)
{
m_ui->tableWidget->removeCellWidget(row, ColumnAction);
m_ui->tableWidget->removeCellWidget(row, ColumnStatus);
m_view->tableWidget->removeCellWidget(row, ColumnAction);
m_view->tableWidget->removeCellWidget(row, ColumnStatus);
QToolButton* doneButton = new QToolButton(this);
doneButton->setToolTip("Upgrade complete");
@@ -618,31 +619,31 @@ namespace ScriptCanvasEditor
doneButton->setToolTip(message.data());
}
m_ui->tableWidget->setCellWidget(row, ColumnStatus, doneButton);
m_view->tableWidget->setCellWidget(row, ColumnStatus, doneButton);
}
}
}
}
void View::FinalizeUpgrade()
void Controller::FinalizeUpgrade()
{
Log("FinalizeUpgrade!");
m_inProgress = false;
m_assetsToUpgrade.clear();
m_ui->upgradeAllButton->setEnabled(false);
m_ui->onlyShowOutdated->setEnabled(true);
m_view->upgradeAllButton->setEnabled(false);
m_view->onlyShowOutdated->setEnabled(true);
m_keepEditorAlive.reset();
m_ui->progressBar->setVisible(false);
m_view->progressBar->setVisible(false);
// Manual correction
size_t assetsThatNeedManualInspection = AZ::Interface<IUpgradeRequests>::Get()->GetGraphsThatNeedManualUpgrade().size();
if (assetsThatNeedManualInspection > 0)
{
m_ui->spinner->SetText("<html><head/><body><img src=':/stylesheet/img/UI20/Info.svg' width='16' height='16'/>Some graphs will require manual corrections, you will be prompted to review them upon closing this dialog</body></html>");
m_view->spinner->SetText("<html><head/><body><img src=':/stylesheet/img/UI20/Info.svg' width='16' height='16'/>Some graphs will require manual corrections, you will be prompted to review them upon closing this dialog</body></html>");
}
else
{
m_ui->spinner->SetText("Upgrade complete.");
m_view->spinner->SetText("Upgrade complete.");
}
AZ::SystemTickBus::Handler::BusDisconnect();
@@ -650,126 +651,120 @@ namespace ScriptCanvasEditor
//m_settingsCache.reset();
}
// Scanning
void View::OnScanButtonPress()
void Controller::OnScanButtonPress()
{
ViewNotificationsBus::Broadcast(&ViewNotificationsTraits::ScanRequested);
// m_assetsToUpgrade.clear();
// m_assetsToInspect.clear();
// m_ui->tableWidget->setRowCount(0);
// m_inspectedAssets = 0;
// m_currentAssetRowIndex = 0;
// IUpgradeRequests* upgradeRequests = AZ::Interface<IUpgradeRequests>::Get();
// m_assetsToInspect = upgradeRequests->GetAssetsToUpgrade();
// DoScan();
}
void View::DoScan()
{
// m_state = ProcessState::Scan;
// m_settingsCache = AZStd::make_unique<ScriptCanvas::Grammar::SettingsCache>();
// ScriptCanvas::Grammar::g_saveRawTranslationOuputToFile = false;
// ScriptCanvas::Grammar::g_printAbstractCodeModel = false;
// ScriptCanvas::Grammar::g_saveRawTranslationOuputToFile = false;
//
// AZ::SystemTickBus::Handler::BusConnect();
//
// if (!m_assetsToInspect.empty())
// {
// m_discoveredAssets = m_assetsToInspect.size();
// m_failedAssets = 0;
// m_inspectedAssets = 0;
// m_currentAssetRowIndex = 0;
// m_ui->progressFrame->setVisible(true);
// m_ui->progressBar->setVisible(true);
// m_ui->progressBar->setRange(0, aznumeric_cast<int>(m_assetsToInspect.size()));
// m_ui->progressBar->setValue(0);
//
// m_ui->spinner->SetIsBusy(true);
// m_ui->spinner->SetBusyIconSize(32);
//
// m_ui->scanButton->setEnabled(false);
// m_ui->upgradeAllButton->setEnabled(false);
// m_ui->onlyShowOutdated->setEnabled(false);
//
// m_inspectingAsset = m_assetsToInspect.begin();
// m_keepEditorAlive = AZStd::make_unique<EditorKeepAlive>();
// }
}
void View::BackupComplete()
{
m_currentAssetRowIndex = 0;
m_ui->progressBar->setValue(0);
DoScan();
}
void View::InspectAsset(AZ::Data::Asset<AZ::Data::AssetData>& asset, AZ::Data::AssetInfo& assetInfo)
{
Log("InspectAsset: %s", asset.GetHint().c_str());
AZ::Entity* scriptCanvasEntity = nullptr;
if (asset.GetType() == azrtti_typeid<ScriptCanvasAsset>())
auto isUpToDate = [this](AZ::Data::Asset<AZ::Data::AssetData> asset)
{
ScriptCanvasAsset* scriptCanvasAsset = asset.GetAs<ScriptCanvasAsset>();
if (!scriptCanvasAsset)
Log("InspectAsset: %s", asset.GetHint().c_str());
AZ::Entity* scriptCanvasEntity = nullptr;
if (asset.GetType() == azrtti_typeid<ScriptCanvasAsset>())
{
Log("InspectAsset: %s, AsestData failed to return ScriptCanvasAsset", asset.GetHint().c_str());
return;
ScriptCanvasAsset* scriptCanvasAsset = asset.GetAs<ScriptCanvasAsset>();
if (!scriptCanvasAsset)
{
Log("InspectAsset: %s, AsestData failed to return ScriptCanvasAsset", asset.GetHint().c_str());
return true;
}
scriptCanvasEntity = scriptCanvasAsset->GetScriptCanvasEntity();
AZ_Assert(scriptCanvasEntity, "The Script Canvas asset must have a valid entity");
}
scriptCanvasEntity = scriptCanvasAsset->GetScriptCanvasEntity();
AZ_Assert(scriptCanvasEntity, "The Script Canvas asset must have a valid entity");
auto graphComponent = scriptCanvasEntity->FindComponent<ScriptCanvasEditor::Graph>();
AZ_Assert(graphComponent, "The Script Canvas entity must have a Graph component");
return !m_view->forceUpgrade->isChecked() && graphComponent->GetVersion().IsLatest();
};
ScanConfiguration config;
config.reportFilteredGraphs = !m_view->onlyShowOutdated->isChecked();
config.filter = isUpToDate;
ModelRequestsBus::Broadcast(&ModelRequestsTraits::Scan, config);
}
void Controller::OnScanBegin(size_t assetCount)
{
m_currentAssetRowIndex = 0;
m_view->tableWidget->setRowCount(0);
m_view->progressBar->setVisible(true);
m_view->progressBar->setRange(0, aznumeric_cast<int>(assetCount));
m_view->progressBar->setValue(0);
m_view->scanButton->setEnabled(false);
m_view->upgradeAllButton->setEnabled(false);
m_view->onlyShowOutdated->setEnabled(false);
}
void Controller::OnScanComplete(const ScanResult& result)
{
Log("Full Scan Complete.");
m_view->onlyShowOutdated->setEnabled(true);
// Enable all the Upgrade buttons
for (int row = 0; row < m_view->tableWidget->rowCount(); ++row)
{
if (QPushButton* button = qobject_cast<QPushButton*>(m_view->tableWidget->cellWidget(row, ColumnAction)))
{
button->setEnabled(true);
}
}
auto graphComponent = scriptCanvasEntity->FindComponent<ScriptCanvasEditor::Graph>();
AZ_Assert(graphComponent, "The Script Canvas entity must have a Graph component");
QString spinnerText = QStringLiteral("Scan Complete");
spinnerText.append(QString::asprintf(" - Discovered: %zu, Failed: %zu, Upgradeable: %zu, Up-to-date: %zu"
, result.m_catalogAssets.size()
, result.m_loadErrors.size()
, result.m_unfiltered.size()
, result.m_filteredAssets.size()));
bool onlyShowOutdatedGraphs = m_ui->onlyShowOutdated->isChecked();
bool forceUpgrade = m_ui->forceUpgrade->isChecked();
ScriptCanvas::VersionData graphVersion = graphComponent->GetVersion();
m_view->spinner->SetText(spinnerText);
m_view->progressBar->setVisible(false);
if (!forceUpgrade && onlyShowOutdatedGraphs && graphVersion.IsLatest())
if (!result.m_unfiltered.empty())
{
ScanComplete(asset);
Log("InspectAsset: %s, is at latest", asset.GetHint().c_str());
return;
m_view->upgradeAllButton->setEnabled(true);
}
m_ui->tableWidget->insertRow(static_cast<int>(m_currentAssetRowIndex));
QTableWidgetItem* rowName = new QTableWidgetItem(tr(asset.GetHint().c_str()));
m_ui->tableWidget->setItem(static_cast<int>(m_currentAssetRowIndex), static_cast<int>(ColumnAsset), rowName);
m_keepEditorAlive.reset();
}
if (forceUpgrade || !graphComponent->GetVersion().IsLatest())
void Controller::OnScanFilteredGraph(const AZ::Data::AssetInfo& info)
{
OnScannedGraph(info, Filtered::Yes);
}
void Controller::OnScannedGraph(const AZ::Data::AssetInfo& assetInfo, Filtered filtered)
{
m_view->tableWidget->insertRow(static_cast<int>(m_currentAssetRowIndex));
QTableWidgetItem* rowName = new QTableWidgetItem(tr(assetInfo.m_relativePath.c_str()));
m_view->tableWidget->setItem(static_cast<int>(m_currentAssetRowIndex), static_cast<int>(ColumnAsset), rowName);
if (filtered == Filtered::No)
{
m_assetsToUpgrade.push_back(asset);
AzQtComponents::StyledBusyLabel* spinner = new AzQtComponents::StyledBusyLabel(this);
spinner->SetBusyIconSize(16);
QPushButton* rowGoToButton = new QPushButton(this);
rowGoToButton->setText("Upgrade");
rowGoToButton->setEnabled(false);
AzQtComponents::StyledBusyLabel* spinner = new AzQtComponents::StyledBusyLabel(this);
spinner->SetBusyIconSize(16);
//
// connect(rowGoToButton, &QPushButton::clicked, [this, rowGoToButton, assetInfo] {
//
// // request upgrade of a single graph
// // AZ::SystemTickBus::QueueFunction([this, rowGoToButton, assetInfo]() {
// // // Queue the process state change because we can't connect to the SystemTick bus in a Qt lambda
// // UpgradeSingle(rowGoToButton, spinner, assetInfo);
// // });
// //
// // AZ::SystemTickBus::ExecuteQueuedEvents();
//
// });
connect(rowGoToButton, &QPushButton::clicked, [this, spinner, rowGoToButton, assetInfo] {
AZ::SystemTickBus::QueueFunction([this, rowGoToButton, spinner, assetInfo]() {
// Queue the process state change because we can't connect to the SystemTick bus in a Qt lambda
UpgradeSingle(rowGoToButton, spinner, assetInfo);
});
AZ::SystemTickBus::ExecuteQueuedEvents();
});
m_ui->tableWidget->setCellWidget(static_cast<int>(m_currentAssetRowIndex), static_cast<int>(ColumnAction), rowGoToButton);
m_ui->tableWidget->setCellWidget(static_cast<int>(m_currentAssetRowIndex), static_cast<int>(ColumnStatus), spinner);
m_view->tableWidget->setCellWidget(static_cast<int>(m_currentAssetRowIndex), static_cast<int>(ColumnAction), rowGoToButton);
m_view->tableWidget->setCellWidget(static_cast<int>(m_currentAssetRowIndex), static_cast<int>(ColumnStatus), spinner);
}
char resolvedBuffer[AZ_MAX_PATH_LEN] = { 0 };
AZStd::string path = AZStd::string::format("@devroot@/%s", asset.GetHint().c_str());
AZStd::string path = AZStd::string::format("@devroot@/%s", assetInfo.m_relativePath.c_str());
AZ::IO::FileIOBase::GetInstance()->ResolvePath(path.c_str(), resolvedBuffer, AZ_MAX_PATH_LEN);
AZ::StringFunc::Path::GetFullPath(resolvedBuffer, path);
AZ::StringFunc::Path::Normalize(path);
@@ -777,10 +772,17 @@ namespace ScriptCanvasEditor
bool result = false;
AZ::Data::AssetInfo info;
AZStd::string watchFolder;
QByteArray assetNameUtf8 = asset.GetHint().c_str();
AzToolsFramework::AssetSystemRequestBus::BroadcastResult(result, &AzToolsFramework::AssetSystemRequestBus::Events::GetSourceInfoBySourcePath, assetNameUtf8, info, watchFolder);
AZ_Error(ScriptCanvas::k_VersionExplorerWindow.data(), result, "Failed to locate asset info for '%s'.", assetNameUtf8.constData());
QByteArray assetNameUtf8 = assetInfo.m_relativePath.c_str();
AzToolsFramework::AssetSystemRequestBus::BroadcastResult
( result
, &AzToolsFramework::AssetSystemRequestBus::Events::GetSourceInfoBySourcePath
, assetNameUtf8
, info
, watchFolder);
AZ_Error
( ScriptCanvas::k_VersionExplorerWindow.data()
, result
, "Failed to locate asset info for '%s'.", assetNameUtf8.constData());
QToolButton* browseButton = new QToolButton(this);
browseButton->setToolTip(AzQtComponents::fileBrowserActionName());
@@ -791,14 +793,40 @@ namespace ScriptCanvasEditor
AzQtComponents::ShowFileOnDesktop(absolutePath);
});
m_ui->tableWidget->setCellWidget(static_cast<int>(m_currentAssetRowIndex), static_cast<int>(ColumnBrowse), browseButton);
ScanComplete(asset);
++m_inspectedAssets;
++m_currentAssetRowIndex;
m_view->tableWidget->setCellWidget(static_cast<int>(m_currentAssetRowIndex), static_cast<int>(ColumnBrowse), browseButton);
OnScannedGraphResult(assetInfo);
}
void View::UpgradeSingle
(QPushButton* rowGoToButton
void Controller::OnScannedGraphResult(const AZ::Data::AssetInfo& info)
{
m_view->progressBar->setValue(aznumeric_cast<int>(m_currentAssetRowIndex));
++m_currentAssetRowIndex;
Log("ScanComplete: %s", info.m_relativePath.c_str());
FlushLogs();
}
void Controller::OnScanLoadFailure(const AZ::Data::AssetInfo& info)
{
m_view->tableWidget->insertRow(static_cast<int>(m_currentAssetRowIndex));
QTableWidgetItem* rowName = new QTableWidgetItem
(tr(AZStd::string::format("Load Error: %s", info.m_relativePath.c_str()).c_str()));
m_view->tableWidget->setItem(static_cast<int>(m_currentAssetRowIndex), static_cast<int>(ColumnAsset), rowName);
OnScannedGraphResult(info);
}
void Controller::OnScanUnFilteredGraph(const AZ::Data::AssetInfo& info)
{
OnScannedGraph(info, Filtered::No);
}
void Controller::BackupComplete()
{
m_currentAssetRowIndex = 0;
m_view->progressBar->setValue(0);
}
void Controller::UpgradeSingle
( QPushButton* rowGoToButton
, AzQtComponents::StyledBusyLabel* spinner
, AZ::Data::AssetInfo assetInfo)
{
@@ -814,7 +842,7 @@ namespace ScriptCanvasEditor
AZ::Interface<IUpgradeRequests>::Get()->SetIsUpgrading(true);
m_isUpgradingSingleGraph = true;
m_logs.clear();
m_ui->textEdit->clear();
m_view->textEdit->clear();
spinner->SetIsBusy(true);
rowGoToButton->setEnabled(false);
@@ -830,38 +858,37 @@ namespace ScriptCanvasEditor
}
}
void View::ScanComplete(const AZ::Data::Asset<AZ::Data::AssetData>& asset)
void Controller::ScanComplete(const AZ::Data::Asset<AZ::Data::AssetData>& asset)
{
Log("ScanComplete: %s", asset.GetHint().c_str());
m_inProgress = false;
m_ui->progressBar->setValue(aznumeric_cast<int>(m_currentAssetRowIndex));
m_ui->scanButton->setEnabled(true);
m_view->progressBar->setValue(aznumeric_cast<int>(m_currentAssetRowIndex));
m_view->scanButton->setEnabled(true);
m_inspectingAsset = m_assetsToInspect.erase(m_inspectingAsset);
FlushLogs();
if (m_inspectingAsset == m_assetsToInspect.end())
{
AZ::SystemTickBus::QueueFunction([this]() { FinalizeScan(); });
if (!m_assetsToUpgrade.empty())
{
m_ui->upgradeAllButton->setEnabled(true);
m_view->upgradeAllButton->setEnabled(true);
}
}
}
void View::FinalizeScan()
void Controller::FinalizeScan()
{
Log("FinalizeScan()");
m_ui->spinner->SetIsBusy(false);
m_ui->onlyShowOutdated->setEnabled(true);
m_view->spinner->SetIsBusy(false);
m_view->onlyShowOutdated->setEnabled(true);
// Enable all the Upgrade buttons
for (int row = 0; row < m_ui->tableWidget->rowCount(); ++row)
for (int row = 0; row < m_view->tableWidget->rowCount(); ++row)
{
QPushButton* button = qobject_cast<QPushButton*>(m_ui->tableWidget->cellWidget(row, ColumnAction));
QPushButton* button = qobject_cast<QPushButton*>(m_view->tableWidget->cellWidget(row, ColumnAction));
if (button)
{
button->setEnabled(true);
@@ -880,12 +907,12 @@ namespace ScriptCanvasEditor
}
m_ui->spinner->SetText(spinnerText);
m_ui->progressBar->setVisible(false);
m_view->spinner->SetText(spinnerText);
m_view->progressBar->setVisible(false);
if (!m_assetsToUpgrade.empty())
{
m_ui->upgradeAllButton->setEnabled(true);
m_view->upgradeAllButton->setEnabled(true);
}
AZ::SystemTickBus::Handler::BusDisconnect();
@@ -895,18 +922,18 @@ namespace ScriptCanvasEditor
m_state = ProcessState::Inactive;
}
void View::FlushLogs()
void Controller::FlushLogs()
{
if (m_logs.empty())
{
return;
}
const QTextCursor oldCursor = m_ui->textEdit->textCursor();
QScrollBar* scrollBar = m_ui->textEdit->verticalScrollBar();
const QTextCursor oldCursor = m_view->textEdit->textCursor();
QScrollBar* scrollBar = m_view->textEdit->verticalScrollBar();
m_ui->textEdit->moveCursor(QTextCursor::End);
QTextCursor textCursor = m_ui->textEdit->textCursor();
m_view->textEdit->moveCursor(QTextCursor::End);
QTextCursor textCursor = m_view->textEdit->textCursor();
while (!m_logs.empty())
{
@@ -918,19 +945,15 @@ namespace ScriptCanvasEditor
}
scrollBar->setValue(scrollBar->maximum());
m_ui->textEdit->moveCursor(QTextCursor::StartOfLine);
m_view->textEdit->moveCursor(QTextCursor::StartOfLine);
}
void View::closeEvent(QCloseEvent* event)
void Controller::closeEvent(QCloseEvent* event)
{
m_keepEditorAlive.reset();
AzQtComponents::StyledDialog::closeEvent(event);
}
}
#include <Editor/View/Windows/Tools/UpgradeTool/moc_View.cpp>
}
Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Controller.h
+26 -19
View File
@@ -9,27 +9,26 @@
#pragma once
#if !defined(Q_MOC_RUN)
#include <AzCore/PlatformDef.h>
AZ_PUSH_DISABLE_WARNING(4244 4251 4800, "-Wunknown-warning-option")
#include <QProgressBar>
AZ_POP_DISABLE_WARNING
#include <AzCore/Component/EntityId.h>
#include <AzCore/Component/TickBus.h>
#include <AzCore/PlatformDef.h>
#include <AzQtComponents/Components/StyledDialog.h>
#include <Editor/View/Windows/Tools/UpgradeTool/ModelTraits.h>
#include <Editor/View/Windows/Tools/UpgradeTool/ViewTraits.h>
#include <IConsole.h>
#include <ISystem.h>
#include <ScriptCanvas/Bus/EditorScriptCanvasBus.h>
#include <ScriptCanvas/Core/Core.h>
AZ_PUSH_DISABLE_WARNING(4244 4251 4800, "-Wunknown-warning-option")
#include <QProgressBar>
AZ_POP_DISABLE_WARNING
#endif
#include <Editor/View/Windows/Tools/UpgradeTool/ViewTraits.h>
#include <Editor/View/Windows/Tools/UpgradeTool/ModelTraits.h>
class QPushButton;
namespace Ui
{
class View;
class Controller;
}
namespace AzQtComponents
@@ -56,29 +55,41 @@ namespace ScriptCanvasEditor
//! A tool that collects and upgrades all Script Canvas graphs in the asset catalog
//! Handles display change notifications, handles state change notifications, sends control requests
class View
class Controller
: public AzQtComponents::StyledDialog
, private AZ::SystemTickBus::Handler
, private UpgradeNotifications::Bus::Handler
, private ViewRequestsBus::Handler
, private ModelNotificationsBus::Handler
{
Q_OBJECT
public:
AZ_CLASS_ALLOCATOR(View, AZ::SystemAllocator, 0);
AZ_CLASS_ALLOCATOR(Controller, AZ::SystemAllocator, 0);
explicit View(QWidget* parent = nullptr);
explicit Controller(QWidget* parent = nullptr);
private:
static constexpr int ColumnAsset = 0;
static constexpr int ColumnAction = 1;
static constexpr int ColumnBrowse = 2;
static constexpr int ColumnStatus = 3;
void OnCloseButtonPress();
void OnScanBegin(size_t assetCount) override;
void OnScanButtonPress();
void OnScanComplete(const ScanResult& result) override;
void OnScanFilteredGraph(const AZ::Data::AssetInfo& info) override;
void OnScanLoadFailure(const AZ::Data::AssetInfo& info) override;
void OnScanUnFilteredGraph(const AZ::Data::AssetInfo& info) override;
enum Filtered
{
No,
Yes
};
void OnScannedGraph(const AZ::Data::AssetInfo& info, Filtered filtered);
void OnScannedGraphResult(const AZ::Data::AssetInfo& info);
void OnUpgradeAllButtonPress();
enum class ProcessState
@@ -90,11 +101,8 @@ namespace ScriptCanvasEditor
};
ProcessState m_state = ProcessState::Inactive;
void DoScan();
void ScanComplete(const AZ::Data::Asset<AZ::Data::AssetData>&);
void InspectAsset(AZ::Data::Asset<AZ::Data::AssetData>& asset, AZ::Data::AssetInfo& assetInfo);
// SystemTickBus::Handler
void OnSystemTick() override;
@@ -123,9 +131,8 @@ namespace ScriptCanvasEditor
AZ::Data::Asset<AZ::Data::AssetData> m_currentAsset;
AZStd::unique_ptr<Ui::View> m_ui;
AZStd::unique_ptr<Ui::Controller> m_view;
// upgrade fields
AZStd::recursive_mutex m_mutex;
bool m_upgradeComplete = false;
Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Controller.ui
+2 -2
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>View</class>
<widget class="QWidget" name="View">
<class>Controller</class>
<widget class="QWidget" name="Controller">
<property name="windowModality">
<enum>Qt::WindowModal</enum>
</property>
Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Model.cpp
+44
View File
@@ -6,7 +6,10 @@
*
*/
#include <AzCore/Asset/AssetManagerBus.h>
#include <Editor/View/Windows/Tools/UpgradeTool/Model.h>
#include <Editor/Assets/ScriptCanvasAssetHelpers.h>
#include <ScriptCanvas/Assets/ScriptCanvasAsset.h>
namespace ModifierCpp
{
@@ -17,9 +20,50 @@ namespace ScriptCanvasEditor
{
namespace VersionExplorer
{
Model::Model()
{
ModelRequestsBus::Handler::BusConnect();
}
void Model::CacheSettings()
{
m_settingsCache = AZStd::make_unique<ScriptCanvas::Grammar::SettingsCache>();
ScriptCanvas::Grammar::g_saveRawTranslationOuputToFile = false;
ScriptCanvas::Grammar::g_printAbstractCodeModel = false;
ScriptCanvas::Grammar::g_saveRawTranslationOuputToFile = false;
}
const AZStd::vector<AZStd::string>* Model::GetLogs()
{
return &m_log.GetEntries();
}
bool Model::IsWorking() const
{
return m_state != State::Idle;
}
void Model::OnScanComplete()
{
ModelNotificationsBus::Broadcast(&ModelNotificationsTraits::OnScanComplete, m_scanner->GetResult());
m_state = State::Idle;
}
void Model::Scan(const ScanConfiguration& config)
{
if (IsWorking())
{
AZ_Warning(ScriptCanvas::k_VersionExplorerWindow.data(), false, "Explorer is already working");
return;
}
m_state = State::Scanning;
m_scanner = AZStd::make_unique<Scanner>(config, [this](){ OnScanComplete(); });
}
void Model::RestoreSettings()
{
m_settingsCache.reset();
}
}
}
Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Model.h
+24 -2
View File
@@ -7,9 +7,13 @@
*/
#pragma once
#include <ScriptCanvas/Core/Core.h>
#include <AzFramework/Asset/AssetCatalogBus.h>
#include <Editor/View/Windows/Tools/UpgradeTool/ModelTraits.h>
#include <Editor/View/Windows/Tools/UpgradeTool/Modifier.h>
#include <Editor/View/Windows/Tools/UpgradeTool/Scanner.h>
#include <Editor/View/Windows/Tools/UpgradeTool/VersionExplorerLog.h>
#include <ScriptCanvas/Core/Core.h>
namespace ScriptCanvasEditor
{
@@ -22,12 +26,30 @@ namespace ScriptCanvasEditor
public:
AZ_CLASS_ALLOCATOR(Model, AZ::SystemAllocator, 0);
Model();
const AZStd::vector<AZStd::string>* GetLogs();
void Scan(const ScanConfiguration& config) override;
private:
Log m_log;
enum class State
{
Idle,
Scanning,
Modifying,
};
State m_state = State::Idle;
Log m_log;
AZStd::unique_ptr<Modifier> m_modifier;
AZStd::unique_ptr<Scanner> m_scanner;
AZStd::unique_ptr<ScriptCanvas::Grammar::SettingsCache> m_settingsCache;
void CacheSettings();
bool IsWorking() const;
void OnScanComplete();
void RestoreSettings();
};
}
}
Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/ModelTraits.h
+22 -1
View File
@@ -8,23 +8,44 @@
#pragma once
#include <AzCore/EBus/EBus.h>
#include <AzCore/Asset/AssetManagerBus.h>
namespace ScriptCanvasEditor
{
namespace VersionExplorer
{
struct ScanConfiguration
{
AZStd::function<bool(AZ::Data::Asset<AZ::Data::AssetData>)> filter;
bool reportFilteredGraphs = false;
};
class ModelRequestsTraits
: public AZ::EBusTraits
{
public:
virtual const AZStd::vector<AZStd::string>* GetLogs();
virtual const AZStd::vector<AZStd::string>* GetLogs() = 0;
virtual void Scan(const ScanConfiguration& filter) = 0;
};
using ModelRequestsBus = AZ::EBus<ModelRequestsTraits>;
struct ScanResult
{
AZStd::vector<AZ::Data::AssetInfo> m_catalogAssets;
AZStd::vector<AZ::Data::AssetInfo> m_unfiltered;
AZStd::vector<AZ::Data::AssetInfo> m_filteredAssets;
AZStd::vector<AZ::Data::AssetInfo> m_loadErrors;
};
class ModelNotificationsTraits
: public AZ::EBusTraits
{
public:
virtual void OnScanBegin(size_t assetCount) = 0;
virtual void OnScanComplete(const ScanResult& result) = 0;
virtual void OnScanFilteredGraph(const AZ::Data::AssetInfo& info) = 0;
virtual void OnScanLoadFailure(const AZ::Data::AssetInfo& info) = 0;
virtual void OnScanUnFilteredGraph(const AZ::Data::AssetInfo& info) = 0;
};
using ModelNotificationsBus = AZ::EBus<ModelNotificationsTraits>;
}
Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Scanner.cpp
+94
View File
@@ -7,6 +7,7 @@
*/
#include <Editor/View/Windows/Tools/UpgradeTool/Scanner.h>
#include <ScriptCanvas/Assets/ScriptCanvasAsset.h>
namespace ScannerCpp
{
@@ -17,6 +18,99 @@ namespace ScriptCanvasEditor
{
namespace VersionExplorer
{
Scanner::Scanner(const ScanConfiguration& config, AZStd::function<void()> onComplete)
: m_config(config)
, m_onComplete(onComplete)
{
AZ::Data::AssetCatalogRequestBus::Broadcast
( &AZ::Data::AssetCatalogRequestBus::Events::EnumerateAssets
, nullptr
, [this](const AZ::Data::AssetId, const AZ::Data::AssetInfo& assetInfo)
{
if (assetInfo.m_assetType == azrtti_typeid<ScriptCanvasAsset>())
{
m_result.m_catalogAssets.push_back(assetInfo);
}
}
, nullptr);
ModelNotificationsBus::Broadcast(&ModelNotificationsTraits::OnScanBegin, m_result.m_catalogAssets.size());
AZ::SystemTickBus::Handler::BusConnect();
}
void Scanner::FilterAsset(AZ::Data::Asset<AZ::Data::AssetData> asset)
{
if (m_config.filter && m_config.filter(asset))
{
m_result.m_filteredAssets.push_back(GetCurrentAsset());
ModelNotificationsBus::Broadcast(&ModelNotificationsTraits::OnScanFilteredGraph, GetCurrentAsset());
}
else
{
m_result.m_unfiltered.push_back(GetCurrentAsset());
ModelNotificationsBus::Broadcast(&ModelNotificationsTraits::OnScanUnFilteredGraph, GetCurrentAsset());
}
}
const AZ::Data::AssetInfo& Scanner::GetCurrentAsset() const
{
return m_result.m_catalogAssets[m_catalogAssetIndex];
}
const ScanResult& Scanner::GetResult() const
{
return m_result;
}
AZ::Data::Asset<AZ::Data::AssetData> Scanner::LoadAsset()
{
AZ::Data::Asset<AZ::Data::AssetData> asset = AZ::Data::AssetManager::Instance().GetAsset
( GetCurrentAsset().m_assetId
, azrtti_typeid<ScriptCanvasAsset>()
, AZ::Data::AssetLoadBehavior::PreLoad);
// Log("Scan: Loading: %s ", m_catalogAssets[m_catalogAssetIndex].GetHint().c_str());
asset.BlockUntilLoadComplete();
if (asset.IsReady())
{
return asset;
}
else
{
return {};
}
}
void Scanner::OnSystemTick()
{
if (m_catalogAssetIndex == m_result.m_catalogAssets.size())
{
AZ::SystemTickBus::Handler::BusConnect();
if (m_onComplete)
{
m_onComplete();
}
}
else
{
if (auto asset = LoadAsset())
{
FilterAsset(asset);
}
else
{
m_result.m_loadErrors.push_back(GetCurrentAsset());
ModelNotificationsBus::Broadcast(&ModelNotificationsTraits::OnScanLoadFailure, GetCurrentAsset());
}
++m_catalogAssetIndex;
}
}
ScanResult&& Scanner::TakeResult()
{
return AZStd::move(m_result);
}
}
}
Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Scanner.h
+20
View File
@@ -9,15 +9,35 @@
#pragma once
#include <ScriptCanvas/Core/Core.h>
#include <AzCore/Component/TickBus.h>
#include <Editor/View/Windows/Tools/UpgradeTool/ModelTraits.h>
namespace ScriptCanvasEditor
{
namespace VersionExplorer
{
class Scanner
: private AZ::SystemTickBus::Handler
{
public:
AZ_CLASS_ALLOCATOR(Scanner, AZ::SystemAllocator, 0);
Scanner(const ScanConfiguration& config, AZStd::function<void()> onComplete);
const ScanResult& GetResult() const;
ScanResult&& TakeResult();
private:
size_t m_catalogAssetIndex = 0;
AZStd::function<void()> m_onComplete;
ScanConfiguration m_config;
ScanResult m_result;
void FilterAsset(AZ::Data::Asset<AZ::Data::AssetData>);
const AZ::Data::AssetInfo& GetCurrentAsset() const;
AZ::Data::Asset<AZ::Data::AssetData> LoadAsset();
void OnSystemTick() override;
};
}
}
Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/ViewTraits.h
+1 -9
View File
@@ -13,14 +13,6 @@ namespace ScriptCanvasEditor
{
namespace VersionExplorer
{
class ViewRequestsTraits : public AZ::EBusTraits
{
public:
// flush logs, or add log text
// set progress update
virtual void ClearProgress() {}
virtual void SetInProgress() {}
};
using ViewRequestsBus = AZ::EBus<ViewRequestsTraits>;
}
}