WriteStartupLog() not implemented
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
This commit is contained in:
@@ -33,8 +33,7 @@ namespace AzQtComponents
|
||||
AzQtComponents::PrepareQtPaths();
|
||||
|
||||
QLocale::setDefault(QLocale(QLocale::English, QLocale::UnitedStates));
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
void AzQtApplication::setDpiScaling()
|
||||
|
||||
@@ -12,22 +12,58 @@
|
||||
|
||||
#include <AzQtComponents/Application/AzQtTraceLogger.h>
|
||||
|
||||
#include <AzFramework/StringFunc/StringFunc.h>
|
||||
#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
|
||||
#include <AzFramework/StringFunc/StringFunc.h>
|
||||
#include <AzFramework/Logging/LogFile.h>
|
||||
|
||||
|
||||
namespace AzQtComponents
|
||||
{
|
||||
AzQtTraceLogger::AzQtTraceLogger()
|
||||
class AzQtTraceLogger::Impl : public AZ::Debug::TraceMessageBus::Handler
|
||||
{
|
||||
public:
|
||||
void WriteStartupLog(char name[]);
|
||||
|
||||
Impl()
|
||||
{
|
||||
AZ::Debug::TraceMessageBus::Handler::BusConnect();
|
||||
}
|
||||
~Impl()
|
||||
{
|
||||
AZ::Debug::TraceMessageBus::Handler::BusDisconnect();
|
||||
}
|
||||
|
||||
protected:
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
// AZ::Debug::TraceMessageBus::Handler overrides...
|
||||
bool OnOutput(const char* window, const char* message) override;
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
|
||||
struct LogMessage
|
||||
{
|
||||
public:
|
||||
AZStd::string window;
|
||||
AZStd::string message;
|
||||
};
|
||||
AZStd::vector<LogMessage> m_startupLogSink;
|
||||
AZStd::unique_ptr<AzFramework::LogFile> m_logFile;
|
||||
};
|
||||
|
||||
AzQtTraceLogger::AzQtTraceLogger()
|
||||
: m_impl(new Impl)
|
||||
{
|
||||
AZ::Debug::TraceMessageBus::Handler::BusConnect();
|
||||
}
|
||||
|
||||
AzQtTraceLogger::~AzQtTraceLogger()
|
||||
{
|
||||
AZ::Debug::TraceMessageBus::Handler::BusDisconnect();
|
||||
}
|
||||
|
||||
bool AzQtTraceLogger::OnOutput(const char* window, const char* message)
|
||||
|
||||
void AzQtTraceLogger::WriteStartupLog(char name[])
|
||||
{
|
||||
m_impl->WriteStartupLog(name);
|
||||
}
|
||||
|
||||
bool AzQtTraceLogger::Impl::OnOutput(const char* window, const char* message)
|
||||
{
|
||||
if (m_logFile)
|
||||
{
|
||||
@@ -40,7 +76,7 @@ namespace AzQtComponents
|
||||
return false;
|
||||
}
|
||||
|
||||
void AzQtTraceLogger::WriteStartupLog(char name[])
|
||||
void AzQtTraceLogger::Impl::WriteStartupLog(char name[])
|
||||
{
|
||||
using namespace AzFramework;
|
||||
|
||||
@@ -76,4 +112,3 @@ namespace AzQtComponents
|
||||
}
|
||||
}
|
||||
} // namespace AzQtComponents
|
||||
|
||||
|
||||
@@ -12,33 +12,22 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <AzFramework/Logging/LogFile.h>
|
||||
#include <AzCore/Debug/TraceMessageBus.h>
|
||||
#include <AzQtComponents/AzQtComponentsAPI.h>
|
||||
|
||||
namespace AzQtComponents
|
||||
{
|
||||
class AzQtTraceLogger : private AZ::Debug::TraceMessageBus::Handler
|
||||
class AZ_QT_COMPONENTS_API AzQtTraceLogger
|
||||
{
|
||||
public:
|
||||
AzQtTraceLogger();
|
||||
~AzQtTraceLogger();
|
||||
|
||||
void WriteStartupLog(char name[]);
|
||||
|
||||
protected:
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
// AZ::Debug::TraceMessageBus::Handler overrides...
|
||||
bool OnOutput(const char* window, const char* message) override;
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
|
||||
struct LogMessage
|
||||
{
|
||||
public:
|
||||
AZStd::string window;
|
||||
AZStd::string message;
|
||||
};
|
||||
AZStd::vector<LogMessage> m_startupLogSink;
|
||||
AZStd::unique_ptr<AzFramework::LogFile> m_logFile;
|
||||
class Impl;
|
||||
AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
|
||||
AZStd::unique_ptr<Impl> m_impl;
|
||||
AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
|
||||
};
|
||||
}
|
||||
|
||||
} // namespace AzQtComponents
|
||||
|
||||
@@ -9,6 +9,8 @@ set(FILES
|
||||
AzQtComponentsAPI.h
|
||||
Application/AzQtApplication.cpp
|
||||
Application/AzQtApplication.h
|
||||
Application/AzQtTraceLogger.cpp
|
||||
Application/AzQtTraceLogger.h
|
||||
Buses/DragAndDrop.h
|
||||
Buses/ShortcutDispatch.h
|
||||
DragAndDrop/MainWindowDragAndDrop.h
|
||||
|
||||
@@ -352,7 +352,7 @@ namespace MaterialEditor
|
||||
ExitMainLoop();
|
||||
}
|
||||
}
|
||||
|
||||
///*
|
||||
void MaterialEditorApplication::WriteStartupLog()
|
||||
{
|
||||
using namespace AzFramework;
|
||||
@@ -388,7 +388,7 @@ namespace MaterialEditor
|
||||
m_logFile->FlushLog();
|
||||
}
|
||||
}
|
||||
|
||||
//*/
|
||||
void MaterialEditorApplication::LoadSettings()
|
||||
{
|
||||
AZ::SerializeContext* context = nullptr;
|
||||
@@ -476,7 +476,8 @@ namespace MaterialEditor
|
||||
return;
|
||||
}
|
||||
|
||||
m_traceLogger->WriteStartupLog("MaterialEditor.log");
|
||||
//m_traceLogger->WriteStartupLog("MaterialEditor.log");
|
||||
WriteStartupLog();
|
||||
|
||||
if (!LaunchDiscoveryService())
|
||||
{
|
||||
|
||||
@@ -22,6 +22,8 @@
|
||||
#include <AzToolsFramework/API/EditorPythonConsoleBus.h>
|
||||
|
||||
#include <AzQtComponents/Application/AzQtApplication.h>
|
||||
#include <AzQtComponents/Application/AzQtTraceLogger.h>
|
||||
|
||||
#include <QTimer>
|
||||
|
||||
namespace MaterialEditor
|
||||
|
||||
Reference in New Issue
Block a user