h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 04:42:58 +08:00
Code Issues Releases Wiki Activity

Don't show graph at all if there's no data to use

Browse Source
This commit is contained in:
EVAST9919 2017-11-07 03:16:27 +03:00
parent 461baf3b97
commit 1063e18566
1 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
osu.Game/Overlays/Profile/RankChart.cs
View File

@ -62,25 +62,28 @@ namespace osu.Game.Overlays.Profile
Font = @"Exo2.0-RegularItalic", Font = @"Exo2.0-RegularItalic",
TextSize = secondary_textsize TextSize = secondary_textsize
}, },
graph = new RankChartLineGraph };
if (rankedDays > 0)
{
Add(graph = new RankChartLineGraph
{ {
Anchor = Anchor.BottomCentre, Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre, Origin = Anchor.BottomCentre,
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Y = -secondary_textsize, Y = -secondary_textsize,
DefaultValueCount = rankedDays, DefaultValueCount = rankedDays,
} });
};
graph.OnBallMove += showHistoryRankTexts; graph.OnBallMove += showHistoryRankTexts;
graph.OnReset += updateRankTexts; }
} }
private void updateRankTexts() private void updateRankTexts()
{ {
rankText.Text = user.Statistics.Rank > 0 ? $"#{user.Statistics.Rank:#,0}" : "no rank"; rankText.Text = rankedDays > 0 ? $"#{user.Statistics.Rank:#,0}" : "no rank";
performanceText.Text = user.Statistics.PP != null ? $"{user.Statistics.PP:#,0}pp" : string.Empty; performanceText.Text = rankedDays > 0 ? $"{user.Statistics.PP:#,0}pp" : string.Empty;
relativeText.Text = $"{user.Country?.FullName} #{user.CountryRank:#,0}"; relativeText.Text = rankedDays > 0 ? $"{user.Country?.FullName} #{user.CountryRank:#,0}" : string.Empty;
} }
private void showHistoryRankTexts(int dayIndex) private void showHistoryRankTexts(int dayIndex)
@ -93,14 +96,15 @@ namespace osu.Game.Overlays.Profile
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load(OsuColour colours)
{ {
graph.Colour = colours.Yellow; if (graph != null)
if (user.Statistics.Rank > 0)
{ {
graph.Colour = colours.Yellow;
// use logarithmic coordinates // use logarithmic coordinates
graph.Values = ranks.Select(x => -(float)Math.Log(x)); graph.Values = ranks.Select(x => -(float)Math.Log(x));
graph.SetStaticBallPosition(); graph.SetStaticBallPosition();
} }
updateRankTexts();
} }
public override bool Invalidate(Invalidation invalidation = Invalidation.All, Drawable source = null, bool shallPropagate = true) public override bool Invalidate(Invalidation invalidation = Invalidation.All, Drawable source = null, bool shallPropagate = true)
@ -115,19 +119,25 @@ namespace osu.Game.Overlays.Profile
protected override bool OnHover(InputState state) protected override bool OnHover(InputState state)
{ {
graph.ShowBall(ToLocalSpace(state.Mouse.NativeState.Position).X); if (graph != null)
graph.ShowBall(ToLocalSpace(state.Mouse.NativeState.Position).X);
return base.OnHover(state); return base.OnHover(state);
} }
protected override bool OnMouseMove(InputState state) protected override bool OnMouseMove(InputState state)
{ {
graph.MoveBall(ToLocalSpace(state.Mouse.NativeState.Position).X); if (graph != null)
graph.MoveBall(ToLocalSpace(state.Mouse.NativeState.Position).X);
return base.OnMouseMove(state); return base.OnMouseMove(state);
} }
protected override void OnHoverLost(InputState state) protected override void OnHoverLost(InputState state)
{ {
graph.HideBall(); if (graph != null)
{
graph.HideBall();
updateRankTexts();
}
base.OnHoverLost(state); base.OnHoverLost(state);
} }
@ -140,7 +150,6 @@ namespace osu.Game.Overlays.Profile
private readonly CircularContainer movingBall; private readonly CircularContainer movingBall;
public Action<int> OnBallMove; public Action<int> OnBallMove;
public Action OnReset;
public RankChartLineGraph() public RankChartLineGraph()
{ {
@ -163,11 +172,7 @@ namespace osu.Game.Overlays.Profile
}); });
} }
public void SetStaticBallPosition() public void SetStaticBallPosition() => staticBall.Position = new Vector2(1, GetYPosition(Values.Last()));
{
staticBall.Position = new Vector2(1, GetYPosition(Values.Last()));
OnReset.Invoke();
}
public void ShowBall(float mouseXPosition) public void ShowBall(float mouseXPosition)
{ {
@ -187,7 +192,6 @@ namespace osu.Game.Overlays.Profile
public void HideBall() public void HideBall()
{ {
movingBall.FadeOut(fade_duration); movingBall.FadeOut(fade_duration);
OnReset.Invoke();
} }
private int calculateIndex(float mouseXPosition) => (int)Math.Round(mouseXPosition / DrawWidth * (DefaultValueCount - 1)); private int calculateIndex(float mouseXPosition) => (int)Math.Round(mouseXPosition / DrawWidth * (DefaultValueCount - 1));