diff --git a/Databas.xlsx b/Databas.xlsx deleted file mode 100644 index fe37bb6..0000000 Binary files a/Databas.xlsx and /dev/null differ diff --git a/Database/Databas.xlsx b/Database/Databas.xlsx index 8998c2e..7906b3c 100644 Binary files a/Database/Databas.xlsx and b/Database/Databas.xlsx differ diff --git a/Database/Meshes.csv b/Database/Meshes.csv index 61e018a..7d1f65b 100644 --- a/Database/Meshes.csv +++ b/Database/Meshes.csv @@ -219,30 +219,30 @@ J9-T,41,100,40,5,6.5,Pressure Welded,Untreated,1,J 41 J9-T,41,100,45,5,6.5,Pressure Welded,Untreated,1,J 41 J9-T,41,100,50,5,6.5,Pressure Welded,Untreated,1,J 41 J9-T,41,100,60,5,6.5,Pressure Welded,Untreated,1,J 41 -HN9-T,35,100,25,3,6.5,Pressure Welded,Hot dip galvanized steel,1,H 35 -HN9-T,35,100,30,3,6.5,Pressure Welded,Hot dip galvanized steel,1,H 35 -HN9-T,35,100,35,3,6.5,Pressure Welded,Hot dip galvanized steel,1,H 35 -HN9-T,35,100,40,3,6.5,Pressure Welded,Hot dip galvanized steel,1,H 35 -HN9-T,35,100,45,3,6.5,Pressure Welded,Hot dip galvanized steel,1,H 35 -HN9-T,35,100,50,3,6.5,Pressure Welded,Hot dip galvanized steel,1,H 35 -HN9-T,35,100,25,5,6.5,Pressure Welded,Hot dip galvanized steel,1,H 35 -HN9-T,35,100,30,5,6.5,Pressure Welded,Hot dip galvanized steel,1,H 35 -HN9-T,35,100,35,5,6.5,Pressure Welded,Hot dip galvanized steel,1,H 35 -HN9-T,35,100,40,5,6.5,Pressure Welded,Hot dip galvanized steel,1,H 35 -HN9-T,35,100,45,5,6.5,Pressure Welded,Hot dip galvanized steel,1,H 35 -HN9-T,35,100,50,5,6.5,Pressure Welded,Hot dip galvanized steel,1,H 35 -HN9-T,35,100,25,3,6.5,Pressure Welded,Untreated,1,H 35 -HN9-T,35,100,30,3,6.5,Pressure Welded,Untreated,1,H 35 -HN9-T,35,100,35,3,6.5,Pressure Welded,Untreated,1,H 35 -HN9-T,35,100,40,3,6.5,Pressure Welded,Untreated,1,H 35 -HN9-T,35,100,45,3,6.5,Pressure Welded,Untreated,1,H 35 -HN9-T,35,100,50,3,6.5,Pressure Welded,Untreated,1,H 35 -HN9-T,35,100,25,5,6.5,Pressure Welded,Untreated,1,H 35 -HN9-T,35,100,30,5,6.5,Pressure Welded,Untreated,1,H 35 -HN9-T,35,100,35,5,6.5,Pressure Welded,Untreated,1,H 35 -HN9-T,35,100,40,5,6.5,Pressure Welded,Untreated,1,H 35 -HN9-T,35,100,45,5,6.5,Pressure Welded,Untreated,1,H 35 -HN9-T,35,100,50,5,6.5,Pressure Welded,Untreated,1,H 35 +HN9-T,35,100,25,3,6.5,Pressure Welded,Hot dip galvanized steel,1,HN 35 +HN9-T,35,100,30,3,6.5,Pressure Welded,Hot dip galvanized steel,1,HN 35 +HN9-T,35,100,35,3,6.5,Pressure Welded,Hot dip galvanized steel,1,HN 35 +HN9-T,35,100,40,3,6.5,Pressure Welded,Hot dip galvanized steel,1,HN 35 +HN9-T,35,100,45,3,6.5,Pressure Welded,Hot dip galvanized steel,1,HN 35 +HN9-T,35,100,50,3,6.5,Pressure Welded,Hot dip galvanized steel,1,HN 35 +HN9-T,35,100,25,5,6.5,Pressure Welded,Hot dip galvanized steel,1,HN 35 +HN9-T,35,100,30,5,6.5,Pressure Welded,Hot dip galvanized steel,1,HN 35 +HN9-T,35,100,35,5,6.5,Pressure Welded,Hot dip galvanized steel,1,HN 35 +HN9-T,35,100,40,5,6.5,Pressure Welded,Hot dip galvanized steel,1,HN 35 +HN9-T,35,100,45,5,6.5,Pressure Welded,Hot dip galvanized steel,1,HN 35 +HN9-T,35,100,50,5,6.5,Pressure Welded,Hot dip galvanized steel,1,HN 35 +HN9-T,35,100,25,3,6.5,Pressure Welded,Untreated,1,HN 35 +HN9-T,35,100,30,3,6.5,Pressure Welded,Untreated,1,HN 35 +HN9-T,35,100,35,3,6.5,Pressure Welded,Untreated,1,HN 35 +HN9-T,35,100,40,3,6.5,Pressure Welded,Untreated,1,HN 35 +HN9-T,35,100,45,3,6.5,Pressure Welded,Untreated,1,HN 35 +HN9-T,35,100,50,3,6.5,Pressure Welded,Untreated,1,HN 35 +HN9-T,35,100,25,5,6.5,Pressure Welded,Untreated,1,HN 35 +HN9-T,35,100,30,5,6.5,Pressure Welded,Untreated,1,HN 35 +HN9-T,35,100,35,5,6.5,Pressure Welded,Untreated,1,HN 35 +HN9-T,35,100,40,5,6.5,Pressure Welded,Untreated,1,HN 35 +HN9-T,35,100,45,5,6.5,Pressure Welded,Untreated,1,HN 35 +HN9-T,35,100,50,5,6.5,Pressure Welded,Untreated,1,HN 35 JN9-T,41,100,25,3,6.5,Pressure Welded,Hot dip galvanized steel,1,JN 41 JN9-T,41,100,30,3,6.5,Pressure Welded,Hot dip galvanized steel,1,JN 41 JN9-T,41,100,35,3,6.5,Pressure Welded,Hot dip galvanized steel,1,JN 41 diff --git a/Wardrobe/Gratings Data/User_Input.vb b/Wardrobe/Gratings Data/User_Input.vb index a4711f4..6a76797 100644 --- a/Wardrobe/Gratings Data/User_Input.vb +++ b/Wardrobe/Gratings Data/User_Input.vb @@ -1,14 +1,15 @@ Public Class User_Input - Private Shared gratingType, gratingMaterial, gratingMesh, gratingName As String - Private Shared gratingSerrated As Boolean = False - Private Shared loadBarSpacing, crossBarSpacing, gratingHeight, loadBarThickness As Integer + Public Shared gratingType, gratingMaterial, gratingMesh, gratingName As String + Public Shared gratingSerrated As Boolean = False + Public Shared gratingLacquered As Boolean = False + Public Shared loadBarSpacing, crossBarSpacing, gratingHeight, loadBarThickness As Integer Private Shared serratedCheckBox As New CheckBox Private Shared serratedCheckBoxBol As Boolean = False Private Shared lacqueredCheckBox As New CheckBox Private Shared lacqueredCheckBoxBol As Boolean = False - Private Shared gratingLacquered As Boolean = False + Public Shared Sub TypeChanged(sender As Object, e As EventArgs) GUI.ComboBox_Material.Enabled = True diff --git a/Wardrobe/SolidWorks/Drawing.vb b/Wardrobe/SolidWorks/Drawing.vb index 37a26a5..cd6ff76 100644 --- a/Wardrobe/SolidWorks/Drawing.vb +++ b/Wardrobe/SolidWorks/Drawing.vb @@ -75,6 +75,23 @@ Public Class Drawing iPart = swApp.ActiveDoc Dim newName As String newName = GUI.filepath & "\Temp" & "\TESTPART" & 1 & ".SLDPRT" + + Dim config As Configuration + config = iPart.GetActiveConfiguration + Dim swCustPropMgr = config.CustomPropertyManager + status = swCustPropMgr.Add3("Benämning", 30, "Floor grating " & User_Input.gratingMesh & " " & User_Input.gratingHeight & "/" & User_Input.loadBarThickness, 1) + status = swCustPropMgr.Add3("ExtraBenämning1", 30, "LxW " & Data.gratingL & "x" & Data.gratingW, 1) + If User_Input.gratingSerrated Then + status = swCustPropMgr.Add3("ExtraBenämning2", 30, "Serrated", 1) + End If + If User_Input.gratingLacquered Then + status = swCustPropMgr.Add3("Materialsort", 30, User_Input.gratingMaterial & " (Lacquered)", 1) + Else + status = swCustPropMgr.Add3("Materialsort", 30, User_Input.gratingMaterial, 1) + End If + status = swCustPropMgr.Add3("Art. Nr", 30, "TBD", 1) + status = swCustPropMgr.Add3("Material_Art", 30, "TBD", 1) + longstatus = iPart.SaveAs3(newName, 0, 0) Model.ClearSelection2(True)