diff --git a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorer.cpp b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorer.cpp index bdf7f2926c..f1919b64f0 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorer.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorer.cpp @@ -189,7 +189,10 @@ namespace ScriptCanvasEditor AZStd::lock_guard lock(m_mutex); if (m_upgradeComplete) { + ++m_upgradeAssetIndex; m_inProgress = false; + m_ui->progressBar->setVisible(true); + m_ui->progressBar->setValue(m_upgradeAssetIndex); if (m_scriptCanvasEntity) { @@ -275,7 +278,7 @@ namespace ScriptCanvasEditor void VersionExplorer::OnUpgradeAll() { m_state = ProcessState::Upgrade; - // cache these + // cache these...with a widget thing ScriptCanvas::Grammar::g_saveRawTranslationOuputToFile = false; ScriptCanvas::Grammar::g_printAbstractCodeModel = false; ScriptCanvas::Grammar::g_saveRawTranslationOuputToFile = false; @@ -283,6 +286,9 @@ namespace ScriptCanvasEditor m_inProgressAsset = m_assetsToUpgrade.begin(); AZ::Debug::TraceMessageBus::Handler::BusConnect(); AZ::SystemTickBus::Handler::BusConnect(); + m_ui->progressBar->setVisible(true); + m_ui->progressBar->setRange(0, aznumeric_cast(m_assetsToUpgrade.size())); + m_ui->progressBar->setValue(m_upgradeAssetIndex); } AZStd::string VersionExplorer::BackupGraph(const AZ::Data::Asset& asset) @@ -669,6 +675,7 @@ namespace ScriptCanvasEditor m_ui->upgradeAllButton->setEnabled(false); m_ui->onlyShowOutdated->setEnabled(true); + m_ui->progressBar->setVisible(false); // Manual correction size_t assetsThatNeedManualInspection = AZ::Interface::Get()->GetGraphsThatNeedManualUpgrade().size(); if (assetsThatNeedManualInspection > 0) diff --git a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorer.h b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorer.h index dc7516abc4..bcde6fbbd0 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorer.h +++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorer.h @@ -139,6 +139,7 @@ namespace ScriptCanvasEditor AZStd::recursive_mutex m_mutex; bool m_upgradeComplete = false; AZ::Data::Asset m_upgradeAsset; + int m_upgradeAssetIndex = 0; OperationResult m_upgradeResult; AZStd::string m_upgradeMessage; AZStd::string m_tmpFileName;