diff --git a/Wardrobe/GUI.vb b/Wardrobe/GUI.vb index 2bba154..d80869b 100644 --- a/Wardrobe/GUI.vb +++ b/Wardrobe/GUI.vb @@ -302,7 +302,6 @@ Public Class GUI End Sub Private Function Create_ExportTable() As DataTable - Dim lSpacing As String = ComboBox_MeshSize.Text.Split("x")(0) Dim cSpacing As String = ComboBox_MeshSize.Text.Split("x")(1).Split(" ")(0) @@ -320,8 +319,8 @@ Public Class GUI gratingTable.Columns.Add("CROSSBAR_HEIGHT", GetType(Decimal)) gratingTable.Rows.Add() - gratingTable.Rows(0)("TYPE") = ComboBox_TypeChooser.Text ' Här behövs namn på HLCt modellen - gratingTable.Rows(0)("SERRATED") = False + + gratingTable.Rows(0)("SERRATED") = False 'Hämta från GUI gratingTable.Rows(0)("WIDTH") = CDec(WidthBox.Text) gratingTable.Rows(0)("LENGTH") = CDec(LengthBox.Text) gratingTable.Rows(0)("LOADBAR_THICKNESS") = CDec(ComboBox_Thickness.Text) @@ -329,11 +328,13 @@ Public Class GUI gratingTable.Rows(0)("LOADBAR_SPACING") = CDec(lSpacing) gratingTable.Rows(0)("CROSSBAR_SPACING") = CDec(cSpacing) - If gratingTable.Rows(0)("TYPE") = "pressure_welded" Then + If ComboBox_TypeChooser.Text = "Pressure Welded" Then + gratingTable.Rows(0)("TYPE") = "pressure_welded" ' Här behövs namn på HLCt modellen gratingTable.Rows(0)("CROSSBAR_DIAMETER") = 5 gratingTable.Rows(0)("CROSSBAR_THICKNESS") = 0 gratingTable.Rows(0)("CROSSBAR_HEIGHT") = 0 Else + gratingTable.Rows(0)("TYPE") = "type_a" ' Här behövs namn på HLCt modellen gratingTable.Rows(0)("CROSSBAR_DIAMETER") = 0 gratingTable.Rows(0)("CROSSBAR_THICKNESS") = 2 gratingTable.Rows(0)("CROSSBAR_HEIGHT") = 15