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 @@
false
false
true
- 6
+ 9
1.0.0.%2a
false
true
@@ -123,10 +123,10 @@
True
- PreserveNewest
+ Always
- PreserveNewest
+ Always
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 7804cfa..df54f75 100644
Binary files a/ExportDXF/Templates/BomTemplate.xlsx and b/ExportDXF/Templates/BomTemplate.xlsx differ