From 7048d27eee444077a2a527a13153023508432d0f Mon Sep 17 00:00:00 2001
From: AJ <ajisaacs@rogersengineering.net>
Date: Mon, 23 Apr 2018 10:58:04 -0400
Subject: [PATCH] Include kfactor in BOM

---
 ExportDXF/ExportDXF.csproj           |   6 +++---
 ExportDXF/Forms/MainForm.cs          |  30 ++++++++++++++++++---------
 ExportDXF/Item.cs                    |   2 ++
 ExportDXF/Templates/BomTemplate.xlsx | Bin 9659 -> 9710 bytes
 4 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/ExportDXF/ExportDXF.csproj b/ExportDXF/ExportDXF.csproj
index 619784d..2cb49b4 100644
--- a/ExportDXF/ExportDXF.csproj
+++ b/ExportDXF/ExportDXF.csproj
@@ -22,7 +22,7 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>6</ApplicationRevision>
+    <ApplicationRevision>9</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
@@ -123,10 +123,10 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
     <Content Include="Templates\Blank.drwdot">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Include="Templates\BomTemplate.xlsx">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
   <ItemGroup>
diff --git a/ExportDXF/Forms/MainForm.cs b/ExportDXF/Forms/MainForm.cs
index 53341c7..5a81b7b 100644
--- a/ExportDXF/Forms/MainForm.cs
+++ b/ExportDXF/Forms/MainForm.cs
@@ -217,10 +217,6 @@ namespace ExportDXF.Forms
 
                 var items = GetItems(bom);
 
-				foreach (var item in items)
-				{
-				}
-
 				Print("Found " + items.Count);
                 Print("");
 
@@ -270,7 +266,7 @@ namespace ExportDXF.Forms
 
 			if (savePath == null)
             {
-                Print("Cancelled\n", Color.Red);
+                Print("Canceled\n", Color.Red);
                 return;
             }
 
@@ -293,12 +289,23 @@ namespace ExportDXF.Forms
 				var config = item.Component.ReferencedConfiguration;
 
 				var sheetMetal = model.GetFeatureByTypeName("SheetMetal");
-				var thickness = sheetMetal.GetDimension("Thickness").GetValue2(config);
-				var db = string.Empty;
-				var material = part.GetMaterialPropertyName2(config, out db);
 
-				item.Thickness = thickness;
-				item.Material = material;
+				if (sheetMetal != null)
+				{
+					var kfactor = sheetMetal.GetDimension("D2")?.GetValue2(config);
+
+					if (kfactor.HasValue)
+						item.KFactor = kfactor.Value;
+
+					var thickness = sheetMetal.GetDimension("Thickness")?.GetValue2(config);
+
+					if (thickness.HasValue)
+						item.Thickness = thickness.Value;
+				}
+
+				var db = string.Empty;
+
+				item.Material = part.GetMaterialPropertyName2(config, out db);
 
 				if (part == null)
                     continue;
@@ -404,6 +411,9 @@ namespace ExportDXF.Forms
 						partsSheet.Cells[row, 5].Value = item.Thickness;
 
 					partsSheet.Cells[row, 6].Value = item.Material;
+
+					if (item.KFactor > 0)
+						partsSheet.Cells[row, 7].Value = item.KFactor;
 				}
 
 				workbook.Calculate();
diff --git a/ExportDXF/Item.cs b/ExportDXF/Item.cs
index 023ab85..590e31a 100644
--- a/ExportDXF/Item.cs
+++ b/ExportDXF/Item.cs
@@ -14,6 +14,8 @@ namespace ExportDXF
 
 		public double Thickness { get; set; }
 
+		public double KFactor { get; set; }
+
 		public string Material { get; set; }
 
 		public Component2 Component { get; set; }
diff --git a/ExportDXF/Templates/BomTemplate.xlsx b/ExportDXF/Templates/BomTemplate.xlsx
index 7804cfa4048c5934831c3f48d2c455548fd00568..df54f7546a38ff3c064be7aabd25481ae36b5341 100644
GIT binary patch
delta 3232
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

delta 3188
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
Axc~qF