Skip to content

Use async calculations when creating strain bars #271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Use async calculations when creating strain bars #271

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
28670af
Update StrainVisualizer.cs
Givikap120 Jun 22, 2025
8cb93b8
fix cli
Givikap120 Jun 22, 2025
955eadb
Update StrainVisualizer.cs
Givikap120 Jun 22, 2025
d39ad2a
fix ci again
Givikap120 Jun 22, 2025
f27cf87
move create function
Givikap120 Jun 30, 2025
0317c27
fix CI
Givikap120 Jun 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
137 changes: 78 additions & 59 deletions PerformanceCalculatorGUI/Components/StrainVisualizer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Containers;
Expand Down Expand Up @@ -49,8 +51,6 @@ public StrainVisualizer()

private void updateGraphs(ValueChangedEvent<Skill[]> val)
{
graphsContainer.Clear();

var skills = val.NewValue.Where(x => x is StrainSkill or StrainDecaySkill).ToArray();

// dont bother if there are no strain skills to draw
Expand All @@ -63,69 +63,74 @@ private void updateGraphs(ValueChangedEvent<Skill[]> val)

graphAlpha = Math.Min(1.5f / skills.Length, 0.9f);
var strainLists = getStrainLists(skills);
addStrainBars(skills, strainLists);
addTooltipBars(strainLists);

if (val.OldValue == null || !val.NewValue.All(x => val.OldValue.Any(y => y.GetType().Name == x.GetType().Name)))
createStrainBars(skills, strainLists).ContinueWith(t => Schedule(() =>
{
// skill list changed - recreate toggles
legendContainer.Clear();
graphToggles.Clear();
graphsContainer.Clear();
addStrainBars(t.GetResultSafely(), skills, strainLists);
addTooltipBars(strainLists);

for (int i = 0; i < skills.Length; i++)
if (val.OldValue == null || !val.NewValue.All(x => val.OldValue.Any(y => y.GetType().Name == x.GetType().Name)))
{
// this is ugly, but it works
var graphToggleBindable = new Bindable<bool>();
int graphNum = i;
graphToggleBindable.BindValueChanged(state =>
{
if (state.NewValue)
{
graphsContainer[graphNum].FadeTo(graphAlpha);
}
else
{
graphsContainer[graphNum].Hide();
}
});
graphToggles.Add(graphToggleBindable);
// skill list changed - recreate toggles
legendContainer.Clear();
graphToggles.Clear();

legendContainer.Add(new Container
for (int i = 0; i < skills.Length; i++)
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Masking = true,
CornerRadius = 10,
AutoSizeAxes = Axes.Both,
Children = new Drawable[]
// this is ugly, but it works
var graphToggleBindable = new Bindable<bool>();
int graphNum = i;
graphToggleBindable.BindValueChanged(state =>
{
new Box
if (state.NewValue)
{
RelativeSizeAxes = Axes.Both,
Colour = colourProvider.Background5
},
new ExtendedOsuCheckbox
graphsContainer[graphNum].FadeTo(graphAlpha);
}
else
{
Padding = new MarginPadding(10),
RelativeSizeAxes = Axes.None,
Width = 200,
Current = { BindTarget = graphToggleBindable, Default = true, Value = true },
LabelText = skills[i].GetType().Name,
TextColour = skillColours[i % skillColours.Length]
graphsContainer[graphNum].Hide();
}
}
});
});
graphToggles.Add(graphToggleBindable);

legendContainer.Add(new Container
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Masking = true,
CornerRadius = 10,
AutoSizeAxes = Axes.Both,
Children = new Drawable[]
{
new Box
{
RelativeSizeAxes = Axes.Both,
Colour = colourProvider.Background5
},
new ExtendedOsuCheckbox
{
Padding = new MarginPadding(10),
RelativeSizeAxes = Axes.None,
Width = 200,
Current = { BindTarget = graphToggleBindable, Default = true, Value = true },
LabelText = skills[i].GetType().Name,
TextColour = skillColours[i % skillColours.Length]
}
}
});
}
}
}
else
{
for (int i = 0; i < skills.Length; i++)
else
{
// graphs are visible by default, we want to hide ones that were disabled before
if (!graphToggles[i].Value)
graphsContainer[i].Hide();
for (int i = 0; i < skills.Length; i++)
{
// graphs are visible by default, we want to hide ones that were disabled before
if (!graphToggles[i].Value)
graphsContainer[i].Hide();
}
}
}
}));
}

[BackgroundDependencyLoader]
Expand Down Expand Up @@ -184,7 +189,26 @@ private void load(OsuColour colours)
Skills.BindValueChanged(updateGraphs);
}

private void addStrainBars(Skill[] skills, List<float[]> strainLists)
private Task<List<StrainBarGraph>> createStrainBars(Skill[] skills, List<float[]> strainLists)
{
List<StrainBarGraph> graphs = [];

float strainMaxValue = strainLists.Max(list => list.Max());

for (int i = 0; i < skills.Length; i++)
{
graphs.Add(new StrainBarGraph
{
RelativeSizeAxes = Axes.Both,
MaxValue = strainMaxValue,
Values = strainLists[i]
});
}

return LoadComponentsAsync(graphs).ContinueWith(_ => graphs);
}

private void addStrainBars(List<StrainBarGraph> graphs, Skill[] skills, List<float[]> strainLists)
{
float strainMaxValue = strainLists.Max(list => list.Max());

Expand All @@ -197,12 +221,7 @@ private void addStrainBars(Skill[] skills, List<float[]> strainLists)
RelativeSizeAxes = Axes.Both,
Alpha = graphAlpha,
Colour = skillColours[i % skillColours.Length],
Child = new StrainBarGraph
{
RelativeSizeAxes = Axes.Both,
MaxValue = strainMaxValue,
Values = strainLists[i]
}
Child = graphs[i]
}
});
}
Expand Down
Loading