diff --git a/CutList/CutList.csproj b/CutList/CutList.csproj index efc1cc4..8298152 100644 --- a/CutList/CutList.csproj +++ b/CutList/CutList.csproj @@ -26,8 +26,8 @@ true Cut List Rogers Engineering - 7 - 1.1.0.%2a + 1 + 1.2.1.%2a false true true diff --git a/CutList/Forms/ResultsForm.cs b/CutList/Forms/ResultsForm.cs index 791ab00..2d53af3 100644 --- a/CutList/Forms/ResultsForm.cs +++ b/CutList/Forms/ResultsForm.cs @@ -59,12 +59,16 @@ namespace CutList.Forms var writer = new StreamWriter(file); writer.AutoFlush = true; - var max = Bins.Max(b => b.Items.Max(i => ArchUnits.FormatFromInches(i.Length).Length)); + var max = Bins.Max(b => b.Items.Max(i => SawCut.Helper.ConvertToMixedFraction(i.Length).Length)); var id = 1; foreach (var bin in Bins) { - var binDescription = $"{id++}. {bin}"; + var totalLength = SawCut.Helper.ConvertToMixedFraction(bin.Length); + var remainingLength = SawCut.Helper.ConvertToMixedFraction(bin.RemainingLength); + var utilitation = Math.Round(bin.Utilization * 100, 2); + + var binDescription = $"{id++}. Length: {{totalLength}}, {remainingLength} remaining, {bin.Items.Count} items, {utilitation}% utilization"; writer.WriteLine(binDescription); var groups = bin.Items.GroupBy(i => $"{i.Name} {i.Length}"); @@ -73,7 +77,7 @@ namespace CutList.Forms { var first = group.First(); var count = group.Count(); - var length = ArchUnits.FormatFromInches(first.Length).ToString().PadLeft(max); + var length = SawCut.Helper.ConvertToMixedFraction(first.Length).PadLeft(max); var name = first.Name; var pcsSingularOrPlural = count == 1 ? "pc " : "pcs"; diff --git a/SawCut/Bin.cs b/SawCut/Bin.cs index 6581cdf..c8d3f9e 100644 --- a/SawCut/Bin.cs +++ b/SawCut/Bin.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Runtime.Remoting.Messaging; namespace SawCut { @@ -47,8 +48,8 @@ namespace SawCut public override string ToString() { - var totalLength = ArchUnits.FormatFromInches(Math.Round(Length, 4)); - var remainingLength = ArchUnits.FormatFromInches(Math.Round(RemainingLength, 4)); + var totalLength = Helper.ConvertToMixedFraction(Math.Round(Length, 4)); + var remainingLength = Helper.ConvertToMixedFraction(Math.Round(RemainingLength, 4)); var utilitation = Math.Round(Utilization * 100, 2); return $"Length: {totalLength}, {remainingLength} remaining, {Items.Count} items, {utilitation}% utilization";