Skip to content

Completed and reference splits #15

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 2 commits into
base: master
Choose a base branch
from
Open

Completed and reference splits #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c63778
Added a new column type: "Completed Splits"
Feb 17, 2020
5077230
Added a new column type: "Reference Splits"
Feb 18, 2020
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
2 changes: 1 addition & 1 deletion UI/ColumnType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
{
public enum ColumnType
{
Delta, SplitTime, DeltaorSplitTime, SegmentDelta, SegmentTime, SegmentDeltaorSegmentTime
Delta, SplitTime, CompletedSplits, ReferenceSplits, DeltaorSplitTime, SegmentDelta, SegmentTime, SegmentDeltaorSegmentTime
}
}
7 changes: 0 additions & 7 deletions UI/Components/ColumnSettings.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions UI/Components/ColumnSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ public ColumnSettings(LiveSplitState state, string columnName, IList<ColumnSetti
{
InitializeComponent();

System.Collections.IEnumerable colNames =
from ColumnType type in System.Enum.GetValues(typeof(ColumnType)) select GetColumnType(type);
this.cmbColumnType.Items.AddRange(colNames.Cast<object>().ToArray());

Data = new ColumnData(columnName, ColumnType.Delta, "Current Comparison", "Current Timing Method");

CurrentState = state;
Expand Down Expand Up @@ -106,6 +110,10 @@ private static string GetColumnType(ColumnType type)
{
if (type == ColumnType.SplitTime)
return "Split Time";
else if (type == ColumnType.CompletedSplits)
return "Completed Splits";
else if (type == ColumnType.ReferenceSplits)
return "Reference Splits";
else if (type == ColumnType.Delta)
return "Delta";
else if (type == ColumnType.DeltaorSplitTime)
Expand Down
19 changes: 14 additions & 5 deletions UI/Components/SplitComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,14 +366,22 @@ protected void UpdateColumn(LiveSplitState state, SimpleLabel label, ColumnData

var type = data.Type;

if (type == ColumnType.ReferenceSplits)
{
label.ForeColor = state.LayoutSettings.TextColor;
label.Text = TimeFormatter.Format(Split.Comparisons[comparison][timingMethod]);
return;
}

var splitIndex = state.Run.IndexOf(Split);
if (splitIndex < state.CurrentSplitIndex)
{
if (type == ColumnType.SplitTime || type == ColumnType.SegmentTime)
// Formatting for each completed segment.
if (type == ColumnType.SplitTime || type == ColumnType.CompletedSplits || type == ColumnType.SegmentTime)
{
label.ForeColor = Settings.OverrideTimesColor ? Settings.BeforeTimesColor : state.LayoutSettings.TextColor;

if (type == ColumnType.SplitTime)
if (type == ColumnType.SplitTime || type == ColumnType.CompletedSplits)
{
label.Text = TimeFormatter.Format(Split.SplitTime[timingMethod]);
}
Expand Down Expand Up @@ -404,7 +412,7 @@ protected void UpdateColumn(LiveSplitState state, SimpleLabel label, ColumnData
label.Text = DeltaTimeFormatter.Format(deltaTime);
}

else if (type == ColumnType.SegmentDeltaorSegmentTime || type == ColumnType.SegmentDelta)
if (type == ColumnType.SegmentDeltaorSegmentTime || type == ColumnType.SegmentDelta)
{
var segmentDelta = LiveSplitStateHelper.GetPreviousSegmentDelta(state, splitIndex, comparison, timingMethod);
var color = LiveSplitStateHelper.GetSplitColor(state, segmentDelta, splitIndex, false, true, comparison, timingMethod);
Expand All @@ -427,6 +435,7 @@ protected void UpdateColumn(LiveSplitState state, SimpleLabel label, ColumnData
}
else
{
// Formatting for each active or upcoming segment.
if (type == ColumnType.SplitTime || type == ColumnType.SegmentTime || type == ColumnType.DeltaorSplitTime || type == ColumnType.SegmentDeltaorSegmentTime)
{
if (Split == state.CurrentSplit)
Expand All @@ -441,7 +450,7 @@ protected void UpdateColumn(LiveSplitState state, SimpleLabel label, ColumnData
else //SegmentTime or SegmentTimeorSegmentDeltaTime
{
var previousTime = TimeSpan.Zero;
for (var index = splitIndex - 1; index >= 0; index --)
for (var index = splitIndex - 1; index >= 0; index--)
{
var comparisonTime = state.Run[index].Comparisons[comparison][timingMethod];
if (comparisonTime != null)
Expand All @@ -463,7 +472,7 @@ protected void UpdateColumn(LiveSplitState state, SimpleLabel label, ColumnData
label.Text = DeltaTimeFormatter.Format(bestDelta);
label.ForeColor = Settings.OverrideDeltasColor ? Settings.DeltasColor : state.LayoutSettings.TextColor;
}
else if (type == ColumnType.Delta || type == ColumnType.SegmentDelta)
else if (type == ColumnType.Delta || type == ColumnType.SegmentDelta || type == ColumnType.CompletedSplits)
{
label.Text = "";
}
Expand Down