ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-01-03 06:13:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Add "jump to" button to self-test window

Browse source
This commit is contained in:
goaaats 2025-04-03 00:17:20 +02:00
parent 7286d9714c
commit 810611e086
1 changed files with 40 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

68
Dalamud/Interface/Internal/Windows/SelfTest/SelfTestWindow.cs
View file

@ -6,6 +6,7 @@ using Dalamud.Interface.Colors;
using Dalamud.Interface.Components; using Dalamud.Interface.Components;
using Dalamud.Interface.Internal.Windows.SelfTest.Steps; using Dalamud.Interface.Internal.Windows.SelfTest.Steps;
using Dalamud.Interface.Utility; using Dalamud.Interface.Utility;
using Dalamud.Interface.Utility.Raii;
using Dalamud.Interface.Windowing; using Dalamud.Interface.Windowing;
using Dalamud.Logging.Internal; using Dalamud.Logging.Internal;
using ImGuiNET; using ImGuiNET;
@ -56,7 +57,7 @@ internal class SelfTestWindow : Window
new LogoutEventSelfTestStep(), new LogoutEventSelfTestStep(),
}; };
private readonly List<(SelfTestStepResult Result, TimeSpan? Duration)> stepResults = new(); private readonly Dictionary<int, (SelfTestStepResult Result, TimeSpan? Duration)> testIndexToResult = new();
private bool selfTestRunning = false; private bool selfTestRunning = false;
private int currentStep = 0; private int currentStep = 0;
@ -89,7 +90,7 @@ internal class SelfTestWindow : Window
if (ImGuiComponents.IconButton(FontAwesomeIcon.StepForward)) if (ImGuiComponents.IconButton(FontAwesomeIcon.StepForward))
{ {
this.stepResults.Add((SelfTestStepResult.NotRan, null)); this.testIndexToResult.Add(this.currentStep, (SelfTestStepResult.NotRan, null));
this.steps[this.currentStep].CleanUp(); this.steps[this.currentStep].CleanUp();
this.currentStep++; this.currentStep++;
this.lastTestStart = DateTimeOffset.Now; this.lastTestStart = DateTimeOffset.Now;
@ -106,7 +107,7 @@ internal class SelfTestWindow : Window
{ {
this.selfTestRunning = true; this.selfTestRunning = true;
this.currentStep = 0; this.currentStep = 0;
this.stepResults.Clear(); this.testIndexToResult.Clear();
this.lastTestStart = DateTimeOffset.Now; this.lastTestStart = DateTimeOffset.Now;
} }
} }
@ -128,7 +129,7 @@ internal class SelfTestWindow : Window
this.StopTests(); this.StopTests();
} }
if (this.stepResults.Any(x => x.Result == SelfTestStepResult.Fail)) if (this.testIndexToResult.Any(x => x.Value.Result == SelfTestStepResult.Fail))
{ {
ImGui.TextColored(ImGuiColors.DalamudRed, "One or more checks failed!"); ImGui.TextColored(ImGuiColors.DalamudRed, "One or more checks failed!");
} }
@ -168,8 +169,8 @@ internal class SelfTestWindow : Window
if (result != SelfTestStepResult.Waiting) if (result != SelfTestStepResult.Waiting)
{ {
var duration = DateTimeOffset.Now - this.lastTestStart; var duration = DateTimeOffset.Now - this.lastTestStart;
this.testIndexToResult.Add(this.currentStep, (result, duration));
this.currentStep++; this.currentStep++;
this.stepResults.Add((result, duration));
this.lastTestStart = DateTimeOffset.Now; this.lastTestStart = DateTimeOffset.Now;
} }
@ -177,12 +178,13 @@ internal class SelfTestWindow : Window
private void DrawResultTable() private void DrawResultTable()
{ {
if (ImGui.BeginTable("agingResultTable", 4, ImGuiTableFlags.Borders)) if (ImGui.BeginTable("agingResultTable", 5, ImGuiTableFlags.Borders))
{ {
ImGui.TableSetupColumn("###index", ImGuiTableColumnFlags.WidthFixed, 12f); ImGui.TableSetupColumn("###index", ImGuiTableColumnFlags.WidthFixed, 12f * ImGuiHelpers.GlobalScale);
ImGui.TableSetupColumn("Name"); ImGui.TableSetupColumn("Name");
ImGui.TableSetupColumn("Result", ImGuiTableColumnFlags.WidthFixed, 40f); ImGui.TableSetupColumn("Result", ImGuiTableColumnFlags.WidthFixed, 40f * ImGuiHelpers.GlobalScale);
ImGui.TableSetupColumn("Duration", ImGuiTableColumnFlags.WidthFixed, 90f); ImGui.TableSetupColumn("Duration", ImGuiTableColumnFlags.WidthFixed, 90f * ImGuiHelpers.GlobalScale);
ImGui.TableSetupColumn(string.Empty, ImGuiTableColumnFlags.WidthFixed, 30f * ImGuiHelpers.GlobalScale);
ImGui.TableHeadersRow(); ImGui.TableHeadersRow();
@ -197,11 +199,10 @@ internal class SelfTestWindow : Window
ImGui.TableSetColumnIndex(1); ImGui.TableSetColumnIndex(1);
ImGui.Text(step.Name); ImGui.Text(step.Name);
ImGui.TableSetColumnIndex(2); if (this.testIndexToResult.TryGetValue(i, out var result))
ImGui.PushFont(Interface.Internal.InterfaceManager.MonoFont);
if (this.stepResults.Count > i)
{ {
var result = this.stepResults[i]; ImGui.TableSetColumnIndex(2);
ImGui.PushFont(InterfaceManager.MonoFont);
switch (result.Result) switch (result.Result)
{ {
@ -215,9 +216,18 @@ internal class SelfTestWindow : Window
ImGui.TextColored(ImGuiColors.DalamudGrey, "NR"); ImGui.TextColored(ImGuiColors.DalamudGrey, "NR");
break; break;
} }
ImGui.PopFont();
ImGui.TableSetColumnIndex(3);
if (result.Duration.HasValue)
{
ImGui.TextUnformatted(result.Duration.Value.ToString("g"));
}
} }
else else
{ {
ImGui.TableSetColumnIndex(2);
if (this.selfTestRunning && this.currentStep == i) if (this.selfTestRunning && this.currentStep == i)
{ {
ImGui.TextColored(ImGuiColors.DalamudGrey, "WAIT"); ImGui.TextColored(ImGuiColors.DalamudGrey, "WAIT");
@ -226,27 +236,29 @@ internal class SelfTestWindow : Window
{ {
ImGui.TextColored(ImGuiColors.DalamudGrey, "NR"); ImGui.TextColored(ImGuiColors.DalamudGrey, "NR");
} }
}
ImGui.PopFont(); ImGui.TableSetColumnIndex(3);
ImGui.TableSetColumnIndex(3);
if (this.stepResults.Count > i)
{
var (_, duration) = this.stepResults[i];
if (duration.HasValue)
{
ImGui.TextUnformatted(duration.Value.ToString("g"));
}
}
else
{
if (this.selfTestRunning && this.currentStep == i) if (this.selfTestRunning && this.currentStep == i)
{ {
ImGui.TextUnformatted((DateTimeOffset.Now - this.lastTestStart).ToString("g")); ImGui.TextUnformatted((DateTimeOffset.Now - this.lastTestStart).ToString("g"));
} }
} }
ImGui.TableSetColumnIndex(4);
using var id = ImRaii.PushId($"selfTest{i}");
if (ImGuiComponents.IconButton(FontAwesomeIcon.FastForward))
{
this.StopTests();
this.testIndexToResult.Remove(i);
this.currentStep = i;
this.selfTestRunning = true;
this.lastTestStart = DateTimeOffset.Now;
}
if (ImGui.IsItemHovered())
{
ImGui.SetTooltip("Jump to this test");
}
} }
ImGui.EndTable(); ImGui.EndTable();