Merge pull request #26 from RaidcoreGG/dev

fix accidental ignore

src/GUI/Widgets/Log/CLogWindow.cpp

@@ -0,0 +1,229 @@
+#include "CLogWindow.h"
+
+#include <regex>
+
+#include "Shared.h"
+#include "Paths.h"
+#include "State.h"
+
+#include "Logging/LogHandler.h"
+
+#include "imgui.h"
+#include "imgui_extensions.h"
+
+namespace GUI
+{
+	float lwWidth = 38.0f;
+	float lwHeight = 24.0f;
+
+	bool SelectedOnly = false;
+	std::string ChannelFilter;
+
+	float off1 = 0.0f;
+	float off2 = 0.0f;
+	const char* filterLevels[] = { "Critical", "Warning", "Info", "Debug", "Trace", "All" };
+	size_t amtShown = 0;
+
+	CLogWindow::CLogWindow(std::string aName, ELogLevel aLogLevel)
+	{
+		Name = aName;
+		LogLevel = aLogLevel;
+	}
+
+	void CLogWindow::Render()
+	{
+		if (!Visible) { return; }
+
+		if (!(off1 && off2))
+		{
+			off1 = ImGui::CalcTextSize("XXXXXXXXX").x;
+			off2 = ImGui::CalcTextSize("XXXXXXXXXXX").x;
+		}
+
+		ImGui::SetNextWindowSize(ImVec2(lwWidth * ImGui::GetFontSize(), lwHeight * ImGui::GetFontSize()), ImGuiCond_FirstUseEver);
+		if (ImGui::Begin(Name.c_str(), &Visible, ImGuiWindowFlags_NoCollapse))
+		{
+			static int selectedLevel = (int)(ELogLevel::ALL)-1;
+			ImGui::Text("Filter: "); ImGui::SameLine();
+			ImGui::Combo("##filterLogLevel", &selectedLevel, filterLevels, IM_ARRAYSIZE(filterLevels));
+
+			ELogLevel filterLevel = (ELogLevel)(selectedLevel + 1);
+
+			ImGui::SameLine();
+			ImGui::Checkbox("Selected level only", &SelectedOnly);
+
+			float windowWidthQuarter = ImGui::GetWindowContentRegionWidth() / 4.0f;
+
+			ImGui::Separator();
+			{
+				ImGui::BeginChild("logchannels", ImVec2(windowWidthQuarter, 0.0f));
+
+				ImGui::Text("Channel:");
+
+				LogHandler::Mutex.lock();
+				{
+					for (std::string ch : Channels)
+					{
+						float opacity = 0.8f;
+						if (ch == ChannelFilter)
+						{
+							opacity = 1.0f;
+						}
+						ImGui::PushStyleVar(ImGuiStyleVar_Alpha, opacity);
+						if (ImGui::Button(ch.c_str(), ImVec2(windowWidthQuarter, 0.0f)))
+						{
+							/* if the selected channel is already the set filter, reset filter */
+							if (ChannelFilter == ch)
+							{
+								ChannelFilter = "";
+							}
+							else
+							{
+								ChannelFilter = ch.c_str();
+							}
+						}
+						ImGui::PopStyleVar();
+					}
+				}
+				LogHandler::Mutex.unlock();
+
+				ImGui::TextDisabled("Showing %d out of %d", amtShown, LogEntries.size() > 400 ? 400 : LogEntries.size());
+
+				ImGui::EndChild();
+			}
+
+			ImGui::SameLine();
+
+			amtShown = 0;
+
+			{
+				ImGui::BeginChild("logmessages", ImVec2(windowWidthQuarter * 3 - 1, 0.0f));
+
+				ImGuiStyle& style = ImGui::GetStyle();
+				float wrapWidth = ImGui::GetContentRegionAvailWidth() - off1 - off2 - style.ScrollbarSize;
+
+				LogHandler::Mutex.lock();
+				{
+					/* Show last 400 log messages */
+					size_t start = 0;
+					if (LogEntries.size() > 400) { start = LogEntries.size() - 400; }
+
+					for (size_t i = start; i < LogEntries.size(); i++)
+					{
+						LogEntry entry = LogEntries[i];
+
+						if (((filterLevel == ELogLevel::ALL) ||
+							(SelectedOnly && entry.LogLevel == filterLevel) ||
+							(!SelectedOnly && entry.LogLevel <= filterLevel)) &&
+							((ChannelFilter == "") || ChannelFilter == entry.Channel))
+						{
+							amtShown++;
+
+							const char* level;
+							ImColor levelColor;
+							switch (entry.LogLevel)
+							{
+								case ELogLevel::CRITICAL:   level = "[CRITICAL]";   levelColor = IM_COL32(255, 0, 0, 255);     break;
+								case ELogLevel::WARNING:    level = "[WARNING]";    levelColor = IM_COL32(255, 255, 0, 255);   break;
+								case ELogLevel::INFO:       level = "[INFO]";       levelColor = IM_COL32(0, 255, 0, 255);     break;
+								case ELogLevel::DEBUG:      level = "[DEBUG]";      levelColor = IM_COL32(0, 148, 255, 255);   break;
+
+								default:                    level = "[TRACE]";      levelColor = IM_COL32(220, 220, 220, 255); break;
+							}
+
+							/* time */
+							ImGui::TextColored(levelColor, entry.TimestampString(false).c_str()); ImGui::SameLine(off1);
+
+							/* level */
+							ImGui::TextColored(levelColor, level); ImGui::SameLine(off1 + off2);
+
+							float msgHeight = ImGui::CalcTextSize(entry.Message.c_str(), (const char*)0, false, wrapWidth).y;
+
+							/* message divider */
+							ImGui::PushStyleColor(ImGuiCol_TableBorderStrong, (ImVec4)levelColor);
+							if (ImGui::BeginTable(("##" + entry.Message).c_str(), 1, ImGuiTableFlags_Borders, ImVec2(1.0f, msgHeight)))
+							{
+								ImGui::TableNextRow();
+								ImGui::TableSetColumnIndex(0);
+								ImGui::Text("");
+								ImGui::EndTable();
+							}
+							ImGui::SameLine();
+							ImGui::PopStyleColor();
+
+							/* message */
+							float lineHeight = ImGui::GetTextLineHeight();
+							ImVec2 posInitial = ImGui::GetCursorPos();
+							ImVec2 pos = posInitial;
+							std::vector<std::string> msgParts = String::Split(entry.Message, " ", true);
+							std::vector<ImVec4> colStack;
+							for (std::string msgPart : msgParts)
+							{
+								if (msgPart.find("<c=#") != std::string::npos)
+								{
+									std::string hexCol = msgPart.substr(4, 6);
+
+									if (std::regex_match(hexCol, std::regex("[0-9a-fA-F]{6}")))
+									{
+										ImVec4 col = ImGui::HEXtoIV4(hexCol.c_str());
+
+										ImGui::PushStyleColor(ImGuiCol_Text, col);
+										colStack.push_back(col);
+
+										msgPart = msgPart.substr(11, msgPart.size() - 11);
+									}
+								}
+
+								bool popAfter = false;
+								// check if the string also contains the end tag, if so pop after string print
+								if (msgPart.find("</c>") != std::string::npos)
+								{
+									popAfter = true;
+
+									msgPart = msgPart.substr(0, msgPart.size() - 4);
+								}
+
+								float currWidth = ImGui::CalcTextSize(msgPart.c_str()).x;
+								if (pos.x - posInitial.x + currWidth > wrapWidth)
+								{
+									pos.x = posInitial.x;
+									pos.y += lineHeight;
+								}
+
+								ImGui::SetCursorPos(pos);
+								ImGui::Text(msgPart.c_str());
+								pos.x += currWidth;
+
+								if (popAfter && colStack.size() > 0)
+								{
+									ImGui::PopStyleColor();
+									colStack.pop_back();
+								}
+							}
+
+							// cleanup
+							while (colStack.size() > 0)
+							{
+								ImGui::PopStyleColor();
+								colStack.pop_back();
+							}
+
+							ImGui::Separator();
+						}
+					}
+				}
+				LogHandler::Mutex.unlock();
+
+				if (ImGui::GetScrollY() >= ImGui::GetScrollMaxY())
+				{
+					ImGui::SetScrollHereY(1.0f);
+				}
+
+				ImGui::EndChild();
+			}
+		}
+		ImGui::End();
+	}
+
+	void CLogWindow::LogMessage(LogEntry aLogEntry) {}
+}

src/GUI/Widgets/Log/CLogWindow.h

@@ -0,0 +1,23 @@
+#ifndef GUI_LOGWINDOW_H
+#define GUI_LOGWINDOW_H
+
+#include <string>
+
+#include "GUI/IWindow.h"
+#include "Logging/ILogger.h"
+#include "Logging//ELogLevel.h"
+#include "Logging/LogEntry.h"
+
+namespace GUI
+{
+	class CLogWindow : public IWindow, public virtual ILogger
+	{
+	public:
+		CLogWindow(std::string aName, ELogLevel aLogLevel);
+
+		void Render();
+		void LogMessage(LogEntry aLogEntry);
+	};
+}
+
+#endif