From ceb69c7a272b6f1e1b869a373f87e365c8160460 Mon Sep 17 00:00:00 2001 From: AJ Date: Thu, 14 Nov 2019 13:49:01 -0500 Subject: [PATCH] Fixed issue where first component was suppressed. Take the first unsuppressed component available --- ExportDXF/Forms/MainForm.cs | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/ExportDXF/Forms/MainForm.cs b/ExportDXF/Forms/MainForm.cs index fa3dce7..a969c75 100644 --- a/ExportDXF/Forms/MainForm.cs +++ b/ExportDXF/Forms/MainForm.cs @@ -719,10 +719,16 @@ namespace ExportDXF.Forms var distinctComponents = bomComponents .GroupBy(c => c.ReferencedConfiguration) - .Select(group => group.First()); + .Select(group => group.First()) + .ToList(); - if (distinctComponents.Count() == 1) + foreach (var component in bomComponents) { + if (component.IsSuppressed()) + { + continue; + } + var qtyString = table.DisplayedText[rowIndex, qtyColumnIndex]; int qty = 0; @@ -734,8 +740,10 @@ namespace ExportDXF.Forms Quantity = qty, Description = table.DisplayedText[rowIndex, descriptionColumnIndex], ItemNo = table.DisplayedText[rowIndex, itemNoColumnIndex], - Component = distinctComponents.First() + Component = component }); + + break; } }