diff --git a/CutList/Forms/ResultsForm.cs b/CutList/Forms/ResultsForm.cs index 89bc620..6d4791c 100644 --- a/CutList/Forms/ResultsForm.cs +++ b/CutList/Forms/ResultsForm.cs @@ -79,7 +79,7 @@ namespace CutList.Forms var writer = new StreamWriter(file); writer.AutoFlush = true; - var max = Bins.Max(b => b.Items.Max(i => i.Length.ToString().Length)); + var max = Bins.Max(b => b.Items.Max(i => ArchUnits.FormatFromInches(i.Length).Length)); var id = 1; foreach (var bin in Bins) @@ -92,16 +92,16 @@ namespace CutList.Forms { var first = group.First(); var count = group.Count(); - var length = first.Length.ToString().PadLeft(max); + var length = ArchUnits.FormatFromInches(first.Length).ToString().PadLeft(max); var name = first.Name; var pcsSingularOrPlural = count == 1 ? "pc " : "pcs"; - writer.WriteLine($" {count}{pcsSingularOrPlural} @ {length}\" LG Tag:{name}"); + writer.WriteLine($" {count}{pcsSingularOrPlural} @ {length} LG Tag: {name}"); } writer.WriteLine("---------------------------------------------------------------------"); - writer.WriteLine(); + //writer.WriteLine(); } writer.Close(); diff --git a/SawCut/ArchUnits.cs b/SawCut/ArchUnits.cs index 6868e66..e54f410 100644 --- a/SawCut/ArchUnits.cs +++ b/SawCut/ArchUnits.cs @@ -65,7 +65,7 @@ namespace SawCut if (feet > 0) { - return $"{feet}' {inches}\""; + return $"{feet}'-{inches}\""; } else { diff --git a/SawCut/Bin.cs b/SawCut/Bin.cs index 239a386..6c697d5 100644 --- a/SawCut/Bin.cs +++ b/SawCut/Bin.cs @@ -38,11 +38,11 @@ namespace SawCut public override string ToString() { - var totalLength = Math.Round(Length, 4); - var remainingLength = Math.Round(RemainingLength, 4); + var totalLength = ArchUnits.FormatFromInches(Math.Round(Length, 4)); + var remainingLength = ArchUnits.FormatFromInches(Math.Round(RemainingLength, 4)); var utilitation = Math.Round(Utilization * 100, 2); - return $"Length: {totalLength}\", {remainingLength}\" remaining, {Items.Count} items, {utilitation}% utilization"; + return $"Length: {totalLength}, {remainingLength} remaining, {Items.Count} items, {utilitation}% utilization"; } } }