diff --git a/Files Needed/A3 Assembly.slddrt b/Files Needed/A3 Assembly.slddrt index e5e06cb..775c694 100644 Binary files a/Files Needed/A3 Assembly.slddrt and b/Files Needed/A3 Assembly.slddrt differ diff --git a/Files Needed/A3 Part.slddrt b/Files Needed/A3 Part.slddrt index c111c58..5763ac7 100644 Binary files a/Files Needed/A3 Part.slddrt and b/Files Needed/A3 Part.slddrt differ diff --git a/HLCt/Parts/START.SLDPRT b/HLCt/Parts/START.SLDPRT index d35b9e1..980d16b 100644 Binary files a/HLCt/Parts/START.SLDPRT and b/HLCt/Parts/START.SLDPRT differ diff --git a/Wardrobe/SolidWorks/Drawing.vb b/Wardrobe/SolidWorks/Drawing.vb index e2bf96b..79eced6 100644 --- a/Wardrobe/SolidWorks/Drawing.vb +++ b/Wardrobe/SolidWorks/Drawing.vb @@ -126,6 +126,8 @@ Public Class Drawing 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) + Else + status = swCustPropMgr.Add3("ExtraBenämning2", 30, "", 1) End If If User_Input.gratingLacquered Then status = swCustPropMgr.Add3("Materialsort", 30, User_Input.gratingMaterial & " (Lacquered)", 1) @@ -135,6 +137,15 @@ Public Class Drawing status = swCustPropMgr.Add3("Art. Nr", 30, "TBD", 1) status = swCustPropMgr.Add3("Material_Art", 30, "TBD", 1) + status = swCustPropMgr.Add3("Author", 30, "", 1) + status = swCustPropMgr.Add3("Ändrad av", 30, "", 1) + status = swCustPropMgr.Add3("SkapadDatum", 30, "", 1) + status = swCustPropMgr.Add3("RevideradDatum", 30, "", 1) + + status = swCustPropMgr.Add3("epdmid", 30, "", 1) + status = swCustPropMgr.Add3("Revision", 30, "", 1) + + longstatus = iPart.SaveAs3(newName, 0, 0) Model.ClearSelection2(True) diff --git a/Wardrobe/SolidWorks/Individual_Frame_3D.vb b/Wardrobe/SolidWorks/Individual_Frame_3D.vb index 11e825c..84b5b8f 100644 --- a/Wardrobe/SolidWorks/Individual_Frame_3D.vb +++ b/Wardrobe/SolidWorks/Individual_Frame_3D.vb @@ -251,7 +251,7 @@ Public Class Individual_Frame_3D While frameLengths.Count > 0 Dim frameCutList As New Dictionary(Of String, Integer) - frameCutList.Add(frameLengths.ElementAt(0).Key, frameLengths.ElementAt(0).Value) + frameCutList.Add(frameLengths.ElementAt(0).Key, frameLengths.ElementAt(0).Value) 'Fixa så att vi hela tiden tar den längsta och testar mot de andra frameLengths.Remove(frameLengths.ElementAt(0).Key) For i = 0 To 100 @@ -298,7 +298,7 @@ Public Class Individual_Frame_3D For j = 0 To cuttingList.Count - 1 Dim Part = swApp.OpenDoc6(Settings.HLCtFolder & "\HLCt\frame_l_straight.SLDPRT", 1, 0, "", longstatus, longwarnings) - longstatus = Part.SaveAs3(Settings.folderPaths("object_" & Data.objectNum & "_models3D_frames_sw_support") & "\frame_l_end_piece" & j + 1 & ".SLDPRT", 0, 0) + longstatus = Part.SaveAs3(Settings.folderPaths("object_" & Data.objectNum & "_models3D_frames_sw_support") & "\FRAME_L_END_PIECE" & j + 1 & ".SLDPRT", 0, 0) Dim swEquationMgr As EquationMgr swEquationMgr = Part.GetEquationMgr() @@ -338,7 +338,7 @@ Public Class Individual_Frame_3D Dim swWarnings As Integer boolstatus = Part.Save3(1, swErrors, swWarnings) - swApp.CloseDoc(Settings.folderPaths("object_" & Data.objectNum & "_models3D_frames_sw_support") & "\frame_l_end_piece" & j + 1 & ".SLDPRT") + swApp.CloseDoc(Settings.folderPaths("object_" & Data.objectNum & "_models3D_frames_sw_support") & "\FRAME_L_END_PIECE" & j + 1 & ".SLDPRT") Next End Sub End Class diff --git a/Wardrobe/SolidWorks/Individual_Frame_Drawing.vb b/Wardrobe/SolidWorks/Individual_Frame_Drawing.vb index 08729d4..82d7fff 100644 --- a/Wardrobe/SolidWorks/Individual_Frame_Drawing.vb +++ b/Wardrobe/SolidWorks/Individual_Frame_Drawing.vb @@ -28,6 +28,25 @@ Public Class Individual_Frame_Drawing Dim assemComps As Object assemComps = assembly.AddComponents3((compNames), (transMatrix), (coordNames)) + + Dim config As Configuration + config = assembly.GetActiveConfiguration + Dim swCustPropMgr = config.CustomPropertyManager + longstatus = swCustPropMgr.Add3("Benämning", 30, "Whole L Straight Frame", 1) 'Lägg till storlek på frames + longstatus = swCustPropMgr.Add3("ExtraBenämning1", 30, "Cutting Instructions for Whole Frame ", 1) + longstatus = swCustPropMgr.Add3("Materialsort", 30, "Hot Dip Galvanized Steel", 1) + longstatus = swCustPropMgr.Add3("Art. Nr", 30, "TBD", 1) + longstatus = swCustPropMgr.Add3("Material_Art", 30, "TBD", 1) + + longstatus = swCustPropMgr.Add3("Author", 30, "", 1) + longstatus = swCustPropMgr.Add3("Ändrad av", 30, "", 1) + longstatus = swCustPropMgr.Add3("SkapadDatum", 30, "", 1) + longstatus = swCustPropMgr.Add3("RevideradDatum", 30, "", 1) + longstatus = swCustPropMgr.Add3("ExtraBenämning2", 30, "", 1) + longstatus = swCustPropMgr.Add3("epdmid", 30, "", 1) + longstatus = swCustPropMgr.Add3("Revision", 30, "", 1) + + longstatus = model.SaveAs3(Settings.folderPaths("object_" & Data.objectNum & "_models3D_frames_sw") & "\FRAME_ASSEMBLY" & i + 1 & ".SLDASM", 0, 0) swApp.CloseDoc(Settings.folderPaths("object_" & Data.objectNum & "_models3D_frames_sw") & "\FRAME_ASSEMBLY" & i + 1 & ".SLDASM") diff --git a/Wardrobe/SolidWorks/Model_3D.vb b/Wardrobe/SolidWorks/Model_3D.vb index 58e1f32..b2c2c04 100644 --- a/Wardrobe/SolidWorks/Model_3D.vb +++ b/Wardrobe/SolidWorks/Model_3D.vb @@ -88,8 +88,13 @@ Public Class Model_3D instanceCounter.Add(newName.Substring(0, newName.Length - 1), 1) End Try - childrenDestPaths.Add(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw") & "\" & newName & + If partNameArray(0) = "FRAME" Then + childrenDestPaths.Add(Settings.folderPaths("object_" & Data.objectNum & "_models3D_frames_sw") & "\" & newName & instanceCounter(newName.Substring(0, newName.Length - 1)) & ".SLDPRT") + Else + childrenDestPaths.Add(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw") & "\" & newName & + instanceCounter(newName.Substring(0, newName.Length - 1)) & ".SLDPRT") + End If Next swApp.CloseAllDocuments(True)