diff --git a/Files Needed/A3 Assembly.slddrt b/Files Needed/A3 Assembly.slddrt index 775c694..08010ae 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 5763ac7..7e125c4 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 b25e890..3416c3a 100644 Binary files a/HLCt/Parts/START.SLDPRT and b/HLCt/Parts/START.SLDPRT differ diff --git a/HLCt/pressure_welded_serrated.SLDPRT b/HLCt/pressure_welded_serrated.SLDPRT index 90c24a0..185d605 100644 Binary files a/HLCt/pressure_welded_serrated.SLDPRT and b/HLCt/pressure_welded_serrated.SLDPRT differ diff --git a/HLCt/recess_middle_square.SLDPRT b/HLCt/recess_middle_square.SLDPRT index 419da74..facc01f 100644 Binary files a/HLCt/recess_middle_square.SLDPRT and b/HLCt/recess_middle_square.SLDPRT differ diff --git a/HLCt/type_a_serrated.SLDPRT b/HLCt/type_a_serrated.SLDPRT index a263e50..a211a96 100644 Binary files a/HLCt/type_a_serrated.SLDPRT and b/HLCt/type_a_serrated.SLDPRT differ diff --git a/Wardrobe/GUI/Export.vb b/Wardrobe/GUI/Export.vb index 72d1e20..929b6e3 100644 --- a/Wardrobe/GUI/Export.vb +++ b/Wardrobe/GUI/Export.vb @@ -53,6 +53,8 @@ ' ---------------------------------- Export Button ---------------------------------- Private Sub Button_Export_SW_Click(sender As Object, e As EventArgs) Handles PictureBox_Export.Click + Cursor.Current = Cursors.WaitCursor + If AppForm.fillMode Then Calculate_Fill_Grid.Calculate_Grid() @@ -134,7 +136,7 @@ simplifiedCreated = True End If If simplifiedCreated = False Then - Multiple_3D_Simplified.Build_Grid(False) + Individual_3D_Simplified.Build_Simplified(False) End If Instructions.Generate_Instructions(User_Input.addFrame) End If @@ -144,6 +146,7 @@ GUI_Export.Generate_Quote() End If + Cursor.Current = Cursors.Default Me.Close() End Sub Private Sub PictureBox_Export_MouseEnter(sender As Object, e As EventArgs) Handles PictureBox_Export.MouseEnter diff --git a/Wardrobe/GUI/Main_Menu.vb b/Wardrobe/GUI/Main_Menu.vb index 45de0c8..aff8641 100644 --- a/Wardrobe/GUI/Main_Menu.vb +++ b/Wardrobe/GUI/Main_Menu.vb @@ -2,52 +2,49 @@ Public Class Main_Menu Private Sub Generate_Folders() - Settings.folderPaths.Add("object_" & Data.objectNum, Settings.folderPaths("order") & "\Object " & Data.objectNum) - System.IO.Directory.CreateDirectory(Settings.folderPaths("object_" & Data.objectNum)) - ' 3D-Models - Settings.folderPaths.Add("object_" & Data.objectNum & "_models3D", Settings.folderPaths("object_" & Data.objectNum) & "\3D-Models") - System.IO.Directory.CreateDirectory(Settings.folderPaths("object_" & Data.objectNum & "_models3D")) - Settings.folderPaths.Add("object_" & Data.objectNum & "_models3D_gratings", Settings.folderPaths("object_" & Data.objectNum & "_models3D") & "\Floor Gratings") - System.IO.Directory.CreateDirectory(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings")) - Settings.folderPaths.Add("object_" & Data.objectNum & "_models3D_gratings_sw", Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings") & "\SLD") - System.IO.Directory.CreateDirectory(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw")) - Settings.folderPaths.Add("object_" & Data.objectNum & "_models3D_gratings_sw_support", Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw") & "\Support Models") - System.IO.Directory.CreateDirectory(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support")) - Settings.folderPaths.Add("object_" & Data.objectNum & "_models3D_gratings_stp", Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings") & "\STP") - System.IO.Directory.CreateDirectory(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_stp")) - Settings.folderPaths.Add("object_" & Data.objectNum & "_models3D_frames", Settings.folderPaths("object_" & Data.objectNum & "_models3D") & "\Frames") - System.IO.Directory.CreateDirectory(Settings.folderPaths("object_" & Data.objectNum & "_models3D_frames")) - Settings.folderPaths.Add("object_" & Data.objectNum & "_models3D_frames_sw", Settings.folderPaths("object_" & Data.objectNum & "_models3D_frames") & "\SLD") - System.IO.Directory.CreateDirectory(Settings.folderPaths("object_" & Data.objectNum & "_models3D_frames_sw")) - Settings.folderPaths.Add("object_" & Data.objectNum & "_models3D_frames_sw_support", Settings.folderPaths("object_" & Data.objectNum & "_models3D_frames_sw") & "\Support Models") - System.IO.Directory.CreateDirectory(Settings.folderPaths("object_" & Data.objectNum & "_models3D_frames_sw_support")) - Settings.folderPaths.Add("object_" & Data.objectNum & "_models3D_frames_stp", Settings.folderPaths("object_" & Data.objectNum & "_models3D_frames") & "\STP") - System.IO.Directory.CreateDirectory(Settings.folderPaths("object_" & Data.objectNum & "_models3D_frames_stp")) + Settings.folderPaths.Add("models3D", Settings.folderPaths("order") & "\3D-Models") + System.IO.Directory.CreateDirectory(Settings.folderPaths("models3D")) + Settings.folderPaths.Add("models3D_gratings", Settings.folderPaths("models3D") & "\Floor Gratings") + System.IO.Directory.CreateDirectory(Settings.folderPaths("models3D_gratings")) + Settings.folderPaths.Add("models3D_gratings_sw", Settings.folderPaths("models3D_gratings") & "\SLD") + System.IO.Directory.CreateDirectory(Settings.folderPaths("models3D_gratings_sw")) + Settings.folderPaths.Add("models3D_gratings_sw_support", Settings.folderPaths("models3D_gratings_sw") & "\Support Models") + System.IO.Directory.CreateDirectory(Settings.folderPaths("models3D_gratings_sw_support")) + Settings.folderPaths.Add("models3D_gratings_stp", Settings.folderPaths("models3D_gratings") & "\STEP") + System.IO.Directory.CreateDirectory(Settings.folderPaths("models3D_gratings_stp")) + Settings.folderPaths.Add("models3D_frames", Settings.folderPaths("models3D") & "\Frames") + System.IO.Directory.CreateDirectory(Settings.folderPaths("models3D_frames")) + Settings.folderPaths.Add("models3D_frames_sw", Settings.folderPaths("models3D_frames") & "\SLD") + System.IO.Directory.CreateDirectory(Settings.folderPaths("models3D_frames_sw")) + Settings.folderPaths.Add("models3D_frames_sw_support", Settings.folderPaths("models3D_frames_sw") & "\Support Models") + System.IO.Directory.CreateDirectory(Settings.folderPaths("models3D_frames_sw_support")) + Settings.folderPaths.Add("models3D_frames_stp", Settings.folderPaths("models3D_frames") & "\STEP") + System.IO.Directory.CreateDirectory(Settings.folderPaths("models3D_frames_stp")) ' Drawings - Settings.folderPaths.Add("object_" & Data.objectNum & "_drawings", Settings.folderPaths("object_" & Data.objectNum) & "\Drawings") - System.IO.Directory.CreateDirectory(Settings.folderPaths("object_" & Data.objectNum & "_drawings")) - Settings.folderPaths.Add("object_" & Data.objectNum & "_drawings_gratings", Settings.folderPaths("object_" & Data.objectNum & "_drawings") & "\Floor Gratings") - System.IO.Directory.CreateDirectory(Settings.folderPaths("object_" & Data.objectNum & "_drawings_gratings")) - Settings.folderPaths.Add("object_" & Data.objectNum & "_drawings_gratings_sw", Settings.folderPaths("object_" & Data.objectNum & "_drawings_gratings") & "\SLD") - System.IO.Directory.CreateDirectory(Settings.folderPaths("object_" & Data.objectNum & "_drawings_gratings_sw")) - Settings.folderPaths.Add("object_" & Data.objectNum & "_drawings_gratings_pdf", Settings.folderPaths("object_" & Data.objectNum & "_drawings_gratings") & "\PDF") - System.IO.Directory.CreateDirectory(Settings.folderPaths("object_" & Data.objectNum & "_drawings_gratings_pdf")) - Settings.folderPaths.Add("object_" & Data.objectNum & "_drawings_frames", Settings.folderPaths("object_" & Data.objectNum & "_drawings") & "\Frames") - System.IO.Directory.CreateDirectory(Settings.folderPaths("object_" & Data.objectNum & "_drawings_frames")) - Settings.folderPaths.Add("object_" & Data.objectNum & "_drawings_frames_sw", Settings.folderPaths("object_" & Data.objectNum & "_drawings_frames") & "\SLD") - System.IO.Directory.CreateDirectory(Settings.folderPaths("object_" & Data.objectNum & "_drawings_frames_sw")) - Settings.folderPaths.Add("object_" & Data.objectNum & "_drawings_frames_pdf", Settings.folderPaths("object_" & Data.objectNum & "_drawings_frames") & "\PDF") - System.IO.Directory.CreateDirectory(Settings.folderPaths("object_" & Data.objectNum & "_drawings_frames_pdf")) + Settings.folderPaths.Add("drawings", Settings.folderPaths("order") & "\Drawings") + System.IO.Directory.CreateDirectory(Settings.folderPaths("drawings")) + Settings.folderPaths.Add("drawings_gratings", Settings.folderPaths("drawings") & "\Floor Gratings") + System.IO.Directory.CreateDirectory(Settings.folderPaths("drawings_gratings")) + Settings.folderPaths.Add("drawings_gratings_sw", Settings.folderPaths("drawings_gratings") & "\SLD") + System.IO.Directory.CreateDirectory(Settings.folderPaths("drawings_gratings_sw")) + Settings.folderPaths.Add("drawings_gratings_pdf", Settings.folderPaths("drawings_gratings") & "\PDF") + System.IO.Directory.CreateDirectory(Settings.folderPaths("drawings_gratings_pdf")) + Settings.folderPaths.Add("drawings_frames", Settings.folderPaths("drawings") & "\Frames") + System.IO.Directory.CreateDirectory(Settings.folderPaths("drawings_frames")) + Settings.folderPaths.Add("drawings_frames_sw", Settings.folderPaths("drawings_frames") & "\SLD") + System.IO.Directory.CreateDirectory(Settings.folderPaths("drawings_frames_sw")) + Settings.folderPaths.Add("drawings_frames_pdf", Settings.folderPaths("drawings_frames") & "\PDF") + System.IO.Directory.CreateDirectory(Settings.folderPaths("drawings_frames_pdf")) ' Quote - Settings.folderPaths.Add("object_" & Data.objectNum & "_quote", Settings.folderPaths("object_" & Data.objectNum) & "\Quote") - System.IO.Directory.CreateDirectory(Settings.folderPaths("object_" & Data.objectNum & "_quote")) + Settings.folderPaths.Add("quote", Settings.folderPaths("order") & "\Quote") + System.IO.Directory.CreateDirectory(Settings.folderPaths("quote")) ' Placement Guides - Settings.folderPaths.Add("object_" & Data.objectNum & "_guide", Settings.folderPaths("object_" & Data.objectNum) & "\Placement Guides") - System.IO.Directory.CreateDirectory(Settings.folderPaths("object_" & Data.objectNum & "_guide")) + Settings.folderPaths.Add("guide", Settings.folderPaths("order") & "\Instructions") + System.IO.Directory.CreateDirectory(Settings.folderPaths("guide")) End Sub @@ -58,10 +55,8 @@ Public Class Main_Menu PictureBox_Multiple.Enabled = True PictureBox_Multiple.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_Multiple1_01 - Settings.folderPaths.Add("order", Settings.exportFolder & "\Order " & GUI_Export.Get_RandomNumber(10000, 99999)) + Settings.folderPaths.Add("order", Settings.exportFolder & "\Order " & GUI_Export.Get_RandomNumber(100000, 999999)) System.IO.Directory.CreateDirectory(Settings.folderPaths("order")) - - Data.objectNum = 0 End Sub Private Sub PictureBox_CreateOrder_MouseEnter(sender As Object, e As EventArgs) Handles PictureBox_CreateOrder.MouseEnter PictureBox_CreateOrder.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_CreateOrder2_01 @@ -100,7 +95,6 @@ Public Class Main_Menu Grating_Configurator.Load_GUI() Grating_Configurator.Show() - Data.objectNum += 1 Generate_Folders() End Sub Private Sub PictureBox_Individual_MouseEnter(sender As Object, e As EventArgs) Handles PictureBox_Individual.MouseEnter @@ -126,7 +120,6 @@ Public Class Main_Menu Grating_Configurator.Load_GUI() Grating_Configurator.Show() - Data.objectNum += 1 Generate_Folders() End Sub Private Sub PictureBox_Multiple_MouseEnter(sender As Object, e As EventArgs) Handles PictureBox_Multiple.MouseEnter diff --git a/Wardrobe/GUI/Settings.vb b/Wardrobe/GUI/Settings.vb index b8655a0..5b2b118 100644 --- a/Wardrobe/GUI/Settings.vb +++ b/Wardrobe/GUI/Settings.vb @@ -93,6 +93,8 @@ Public Class Settings ' ---------------------------------- Update KB Button ---------------------------------- Private Sub Button_KB_Click(sender As Object, e As EventArgs) Handles PictureBox_UpdateKB.Click + Cursor.Current = Cursors.WaitCursor + adminClass.updateDatabase() 'Update KB Dim timeNow As Date = Date.Now @@ -100,6 +102,8 @@ Public Class Settings Label_KB_Updated.Text = "Last Updated: " & KBUpdateTime Update_AppData(KBUpdateTimeHead, KBUpdateTime) + + Cursor.Current = Cursors.Default End Sub Private Sub PictureBox_UpdateKB_MouseEnter(sender As Object, e As EventArgs) Handles PictureBox_UpdateKB.MouseEnter PictureBox_UpdateKB.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Icon_UpdateKB2_01 diff --git a/Wardrobe/Gratings Data/Data.vb b/Wardrobe/Gratings Data/Data.vb index b594cec..de2e6f0 100644 --- a/Wardrobe/Gratings Data/Data.vb +++ b/Wardrobe/Gratings Data/Data.vb @@ -1,6 +1,4 @@ Public Class Data - Public Shared objectNum As Integer - Public Shared grossAreaPoints As New DataTable Public Shared gratingPoints As New DataTable Public Shared gratingMiddlePoints As New DataTable diff --git a/Wardrobe/Quote_Export/GUI_Export.vb b/Wardrobe/Quote_Export/GUI_Export.vb index 7c3f779..0ad02c6 100644 --- a/Wardrobe/Quote_Export/GUI_Export.vb +++ b/Wardrobe/Quote_Export/GUI_Export.vb @@ -17,7 +17,7 @@ Public Class GUI_Export Create_GratingPicture(doc) Create_GratingData(doc) - doc.ExportAsFixedFormat(Settings.folderPaths("object_" & Data.objectNum & "_quote") & "\Specification.pdf", Word.WdExportFormat.wdExportFormatPDF) + doc.ExportAsFixedFormat(Settings.folderPaths("quote") & "\Quote.pdf", Word.WdExportFormat.wdExportFormatPDF) doc.Close(False) End Sub @@ -27,7 +27,7 @@ Public Class GUI_Export Draw_Grating.Draw_ForExport(graphicImg, 12) - gratingImg.Save(Settings.folderPaths("object_" & Data.objectNum & "_quote") & "\GUI.png", Imaging.ImageFormat.Png) + gratingImg.Save(Settings.folderPaths("quote") & "\GUI_Drawing.png", Imaging.ImageFormat.Png) End Sub @@ -202,7 +202,7 @@ Public Class GUI_Export drawingPara = doc.Content.Paragraphs.Add(lineRange) drawingPara.Range.InsertParagraphBefore() drawingPara.Format.SpaceBefore = 10 - drawingPara.Range.InlineShapes.AddPicture(Settings.folderPaths("object_" & Data.objectNum & "_quote") & "\GUI.png") + drawingPara.Range.InlineShapes.AddPicture(Settings.folderPaths("quote") & "\GUI_Drawing.png") drawingPara.Range.InlineShapes(1).ScaleHeight = 55 drawingPara.Range.InlineShapes(1).ScaleWidth = 55 drawingPara.Format.SpaceAfter = 1 @@ -258,7 +258,6 @@ Public Class GUI_Export End Sub - Public Shared Function Get_RandomNumber(Min As Integer, Max As Integer) As Integer Static Generator As System.Random = New System.Random() Return Generator.Next(Min, Max) diff --git a/Wardrobe/SolidWorks/Frame_3D.vb b/Wardrobe/SolidWorks/Frame_3D.vb index a8e685f..ee55c06 100644 --- a/Wardrobe/SolidWorks/Frame_3D.vb +++ b/Wardrobe/SolidWorks/Frame_3D.vb @@ -478,7 +478,7 @@ Public Class Frame_3D If endPieceLength > 0 Then 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("models3D_frames_sw_support") & "\FRAME_L_END_PIECE" & j + 1 & ".SLDPRT", 0, 0) Dim swEquationMgr As EquationMgr swEquationMgr = Part.GetEquationMgr() @@ -518,7 +518,7 @@ Public Class Frame_3D Dim swWarnings As Integer boolstatus = Part.Save3(4, swErrors, swWarnings) - swApp.CloseDoc(Settings.folderPaths("object_" & Data.objectNum & "_models3D_frames_sw_support") & "\FRAME_L_END_PIECE" & j + 1 & ".SLDPRT") + swApp.CloseDoc(Settings.folderPaths("models3D_frames_sw_support") & "\FRAME_L_END_PIECE" & j + 1 & ".SLDPRT") End If Next End Sub diff --git a/Wardrobe/SolidWorks/Frame_Drawing.vb b/Wardrobe/SolidWorks/Frame_Drawing.vb index b525e57..68b532c 100644 --- a/Wardrobe/SolidWorks/Frame_Drawing.vb +++ b/Wardrobe/SolidWorks/Frame_Drawing.vb @@ -30,12 +30,12 @@ Public Class Frame_Drawing Dim transMatrix As Object = Nothing For j = 0 To compNames.Count - 2 + endPieceExist Dim frameID = Frame_3D.cuttingList.ElementAt(i).Value(j) - compNames(j) = Settings.folderPaths("object_" & Data.objectNum & "_models3D_frames_sw") & "\" & "FRAME_L_STRAIGHT_" & frameID & ".SLDPRT" + compNames(j) = Settings.folderPaths("models3D_frames_sw") & "\" & "FRAME_L_STRAIGHT_" & frameID & ".SLDPRT" coordNames(j) = "" Next If endPieceLength > 0 Then - compNames(compNames.Count - 1) = Settings.folderPaths("object_" & Data.objectNum & "_models3D_frames_sw_support") & "\FRAME_L_END_PIECE" & i + 1 & ".SLDPRT" + compNames(compNames.Count - 1) = Settings.folderPaths("models3D_frames_sw_support") & "\FRAME_L_END_PIECE" & i + 1 & ".SLDPRT" coordNames(coordNames.Count - 1) = "" End If @@ -60,9 +60,9 @@ Public Class Frame_Drawing longstatus = swCustPropMgr.Add3("Revision", 30, "", 1) - longstatus = model.SaveAs3(Settings.folderPaths("object_" & Data.objectNum & "_models3D_frames_sw") & "\FRAME_ASSEMBLY" & i + 1 & ".SLDASM", 0, 0) + longstatus = model.SaveAs3(Settings.folderPaths("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") + swApp.CloseDoc(Settings.folderPaths("models3D_frames_sw") & "\FRAME_ASSEMBLY" & i + 1 & ".SLDASM") Next End Sub @@ -99,7 +99,7 @@ Public Class Frame_Drawing status = layMgr.SetCurrentLayer("Svenska") Dim myView As View - myView = iDrawing.CreateDrawViewFromModelView3(Settings.folderPaths("object_" & Data.objectNum & "_models3D_frames_sw") & "\FRAME_ASSEMBLY" & i + 1 & ".SLDASM", + myView = iDrawing.CreateDrawViewFromModelView3(Settings.folderPaths("models3D_frames_sw") & "\FRAME_ASSEMBLY" & i + 1 & ".SLDASM", "*Front", swSheetWidth / 2, swSheetHeight / 2, 0) myView.UseSheetScale() = True myView.SetDisplayTangentEdges2(2) @@ -192,10 +192,10 @@ Public Class Frame_Drawing Next Dim newName As String - newName = Settings.folderPaths("object_" & Data.objectNum & "_drawings_frames_sw") & "\frame_drawing.SLDDRW" + newName = Settings.folderPaths("drawings_frames_sw") & "\frame_drawing.SLDDRW" status = iDrawing.SaveAs3(newName, 0, 0) - status = iDrawing.SaveAs3(Settings.folderPaths("object_" & Data.objectNum & "_drawings_frames_pdf") & "\frame_drawing.pdf", 0, 2) + status = iDrawing.SaveAs3(Settings.folderPaths("drawings_frames_pdf") & "\frame_drawing.pdf", 0, 2) End Sub diff --git a/Wardrobe/SolidWorks/Individual_3D.vb b/Wardrobe/SolidWorks/Individual_3D.vb index 8fe8875..eb4912e 100644 --- a/Wardrobe/SolidWorks/Individual_3D.vb +++ b/Wardrobe/SolidWorks/Individual_3D.vb @@ -62,6 +62,8 @@ Public Class Individual_3D Dim Assembly = swApp.ActiveDoc() + status = Assembly.EditRebuild3() + Dim Errors As Integer Dim Warnings As Integer @@ -77,7 +79,7 @@ Public Class Individual_3D 'To STEP If User_Input.add3DStep = True Then - status = Assembly.SaveAs3(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_stp") & "\GRATING_ASSEMBLY.STEP", 0, 2) + status = Assembly.SaveAs3(Settings.folderPaths("models3D_gratings_stp") & "\GRATING_ASSEMBLY.STEP", 0, 2) End If Dim sourcePath, destPath As String @@ -85,10 +87,10 @@ Public Class Individual_3D Dim childrenDestPaths As New List(Of String) sourcePath = Settings.filesFolder & "\Files\CADStart\" & designName & ".SLDASM" - destPath = Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw") & "\GRATING_ASSEMBLY.SLDASM" + destPath = Settings.folderPaths("models3D_gratings_sw") & "\GRATING_ASSEMBLY.SLDASM" childrenSourcePaths.Add(Settings.HLCtFolder & "\HLCt\Parts\START.SLDPRT") - childrenDestPaths.Add(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\MASTER.SLDPRT") + childrenDestPaths.Add(Settings.folderPaths("models3D_gratings_sw_support") & "\MASTER.SLDPRT") Dim instanceCounter As New Dictionary(Of String, Integer) For i = 0 To partDT.Rows.Count - 1 @@ -109,10 +111,10 @@ Public Class Individual_3D End Try If partNameArray(0) = "FRAME" Then - childrenDestPaths.Add(Settings.folderPaths("object_" & Data.objectNum & "_models3D_frames_sw") & "\" & newName & + childrenDestPaths.Add(Settings.folderPaths("models3D_frames_sw") & "\" & newName & instanceCounter(newName.Substring(0, newName.Length - 1)) & ".SLDPRT") Else - childrenDestPaths.Add(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw") & "\" & newName & + childrenDestPaths.Add(Settings.folderPaths("models3D_gratings_sw") & "\" & newName & instanceCounter(newName.Substring(0, newName.Length - 1)) & ".SLDPRT") End If Next @@ -286,8 +288,10 @@ Public Class Individual_3D Dim modelDoc As IModelDoc2 modelDoc = Assembly + Assembly.ClearSelection2(True) boolstatus = AssemblyExtension.SelectByID2("HorizontalSplitBody@" & gratingPartName & "-1@" & designName, "BODYFEATURE", 0, 0, 0, False, 0, Nothing, 0) modelDoc.EditSuppress2() + Assembly.ClearSelection2(True) boolstatus = AssemblyExtension.SelectByID2("VerticalSplitBody@" & gratingPartName & "-1@" & designName, "BODYFEATURE", 0, 0, 0, False, 0, Nothing, 0) modelDoc.EditSuppress2() @@ -311,8 +315,6 @@ Public Class Individual_3D ' End If 'Next - - Dim recessPartName As String For i = 0 To recessParts.Count - 1 Dim partName As String = recessParts(i)("partName") diff --git a/Wardrobe/SolidWorks/Individual_3D_Simplified.vb b/Wardrobe/SolidWorks/Individual_3D_Simplified.vb index d165bad..a11de7a 100644 --- a/Wardrobe/SolidWorks/Individual_3D_Simplified.vb +++ b/Wardrobe/SolidWorks/Individual_3D_Simplified.vb @@ -86,9 +86,9 @@ Public Class Individual_3D_Simplified 'Dim newName As String 'If withFrame = True Then - ' newName = Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\grating_assembly_simplified_with_frame.SLDASM" + ' newName = Settings.folderPaths("models3D_gratings_sw_support") & "\grating_assembly_simplified_with_frame.SLDASM" 'Else - ' newName = Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\grating_assembly_simplified.SLDASM" + ' newName = Settings.folderPaths("models3D_gratings_sw_support") & "\grating_assembly_simplified.SLDASM" 'End If 'Dim swExtensions As IModelDocExtension 'swExtensions = Assembly.Extension @@ -101,6 +101,8 @@ Public Class Individual_3D_Simplified Dim Errors As Integer Dim Warnings As Integer + status = Assembly.EditRebuild3() + Dim components = Assembly.GetComponents(True) For i = 0 To UBound(components) Dim partDoc = components(i).GetModelDoc2() @@ -120,11 +122,11 @@ Public Class Individual_3D_Simplified childrenSourcePaths.Add(Settings.HLCtFolder & "\HLCt\Parts\START.SLDPRT") If withFrame = True Then - destPath = Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\GRATING_ASSEMBLY_SIMPLIFIED_WITH_FRAME.SLDASM" - childrenDestPaths.Add(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\MASTER_SIMPLIFIED_WITH_FRAME.SLDPRT") + destPath = Settings.folderPaths("models3D_gratings_sw_support") & "\GRATING_ASSEMBLY_SIMPLIFIED_WITH_FRAME.SLDASM" + childrenDestPaths.Add(Settings.folderPaths("models3D_gratings_sw_support") & "\MASTER_SIMPLIFIED_WITH_FRAME.SLDPRT") Else - destPath = Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\GRATING_ASSEMBLY_SIMPLIFIED.SLDASM" - childrenDestPaths.Add(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\MASTER_SIMPLIFIED.SLDPRT") + destPath = Settings.folderPaths("models3D_gratings_sw_support") & "\GRATING_ASSEMBLY_SIMPLIFIED.SLDASM" + childrenDestPaths.Add(Settings.folderPaths("models3D_gratings_sw_support") & "\MASTER_SIMPLIFIED.SLDPRT") End If Dim instanceCounter As New Dictionary(Of String, Integer) @@ -146,10 +148,10 @@ Public Class Individual_3D_Simplified End Try If partNameArray(0) = "FRAME" Then - childrenDestPaths.Add(Settings.folderPaths("object_" & Data.objectNum & "_models3D_frames_sw") & "\" & newName & - instanceCounter(newName.Substring(0, newName.Length - 1)) & ".SLDPRT") + childrenDestPaths.Add(Settings.folderPaths("models3D_frames_sw") & "\" & newName & + instanceCounter(newName.Substring(0, newName.Length - 1)) & "_S" & ".SLDPRT") Else - childrenDestPaths.Add(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\" & newName & + childrenDestPaths.Add(Settings.folderPaths("models3D_gratings_sw_support") & "\" & newName & instanceCounter(newName.Substring(0, newName.Length - 1)) & ".SLDPRT") End If Next diff --git a/Wardrobe/SolidWorks/Individual_Drawing.vb b/Wardrobe/SolidWorks/Individual_Drawing.vb index 0d18881..5bf6524 100644 --- a/Wardrobe/SolidWorks/Individual_Drawing.vb +++ b/Wardrobe/SolidWorks/Individual_Drawing.vb @@ -112,7 +112,7 @@ Public Class Individual_Drawing Dim iPart As PartDoc iPart = swApp.ActiveDoc Dim newName As String - newName = Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\simplified_grating.SLDPRT" + newName = Settings.folderPaths("models3D_gratings_sw_support") & "\simplified_grating.SLDPRT" Dim config As Configuration config = iPart.GetActiveConfiguration @@ -176,7 +176,7 @@ Public Class Individual_Drawing status = layMgr.SetCurrentLayer("Svenska") Dim myView As View - myView = iDrawing.CreateDrawViewFromModelView3(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\simplified_grating.SLDPRT", + myView = iDrawing.CreateDrawViewFromModelView3(Settings.folderPaths("models3D_gratings_sw_support") & "\simplified_grating.SLDPRT", "*Front", swSheetWidth / 2, swSheetHeight / 2, 0) myView.UseSheetScale() = True Dim viewScale1, viewScale2 As Double @@ -293,7 +293,7 @@ Public Class Individual_Drawing Add_Dimensions(sortedMeasurments("Lmes"), CompName, myView, iDrawing, swExtensions, OutLine, scaleDecimal, X_Mid, Y_Mid, "Lmes") Add_Dimensions(sortedMeasurments("Wmes"), CompName, myView, iDrawing, swExtensions, OutLine, scaleDecimal, X_Mid, Y_Mid, "Wmes") Dim myView2 As View - myView2 = iDrawing.CreateDrawViewFromModelView3(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\simplified_grating.SLDPRT", + myView2 = iDrawing.CreateDrawViewFromModelView3(Settings.folderPaths("models3D_gratings_sw_support") & "\simplified_grating.SLDPRT", "*Bottom", swSheetWidth / 2, OutLine(3) + sideCounter(0) * 0.01 + 0.03, 0) myView2.UseSheetScale() = True @@ -315,7 +315,7 @@ Public Class Individual_Drawing Dim longstatus As Integer Dim newName As String - newName = Settings.folderPaths("object_" & Data.objectNum & "_drawings_gratings_sw") & "\grating_drawing.SLDDRW" + newName = Settings.folderPaths("drawings_gratings_sw") & "\grating_drawing.SLDDRW" status = layMgr.AddLayer("Symbol", "", 0, 0, 2) status = layMgr.SetCurrentLayer("Symbol") @@ -339,7 +339,7 @@ Public Class Individual_Drawing swSkMgr.AddToDB = False longstatus = iDrawing.SaveAs3(newName, 0, 0) - longstatus = iDrawing.SaveAs3(Settings.folderPaths("object_" & Data.objectNum & "_drawings_gratings_pdf") & "\grating_drawing.pdf", 0, 2) + longstatus = iDrawing.SaveAs3(Settings.folderPaths("drawings_gratings_pdf") & "\grating_drawing.pdf", 0, 2) End Sub Private Shared Sub Add_Dimensions(points() As Integer, CompName As String, myView As View, iDrawing As DrawingDoc, swExtensions As SldWorks.ModelDocExtension _ diff --git a/Wardrobe/SolidWorks/Instructions.vb b/Wardrobe/SolidWorks/Instructions.vb index fbb8be1..7036cb1 100644 --- a/Wardrobe/SolidWorks/Instructions.vb +++ b/Wardrobe/SolidWorks/Instructions.vb @@ -28,15 +28,15 @@ Public Class Instructions Dim drawName As String If AppForm.fillMode = True Then If withFrame = True Then - drawName = Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\GRATINGS_ASSEMBLY_SIMPLIFIED_WITH_FRAME.SLDASM" + drawName = Settings.folderPaths("models3D_gratings_sw_support") & "\GRATINGS_ASSEMBLY_SIMPLIFIED_WITH_FRAME.SLDASM" Else - drawName = Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\GRATINGS_ASSEMBLY_SIMPLIFIED.SLDASM" + drawName = Settings.folderPaths("models3D_gratings_sw_support") & "\GRATINGS_ASSEMBLY_SIMPLIFIED.SLDASM" End If Else If withFrame = True Then - drawName = Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\GRATING_ASSEMBLY_SIMPLIFIED_WITH_FRAME.SLDASM" + drawName = Settings.folderPaths("models3D_gratings_sw_support") & "\GRATING_ASSEMBLY_SIMPLIFIED_WITH_FRAME.SLDASM" Else - drawName = Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\GRATING_ASSEMBLY_SIMPLIFIED.SLDASM" + drawName = Settings.folderPaths("models3D_gratings_sw_support") & "\GRATING_ASSEMBLY_SIMPLIFIED.SLDASM" End If End If @@ -275,7 +275,7 @@ Public Class Instructions swSheetWidth, swSheetHeight, "Same as sheet specified in Document Properties") status = layMgr.SetCurrentLayer("Svenska") - drawName = Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\GRATINGS_ASSEMBLY_SIMPLIFIED.SLDASM" + drawName = Settings.folderPaths("models3D_gratings_sw_support") & "\GRATINGS_ASSEMBLY_SIMPLIFIED.SLDASM" myView = iDrawing.CreateDrawViewFromModelView3(drawName, "*Front", swSheetWidth / 2, adjustedHeightPosInSheet, 0) myView.UseSheetScale() = True @@ -413,10 +413,10 @@ Public Class Instructions End If Dim newName As String - newName = Settings.folderPaths("object_" & Data.objectNum & "_guide") & "\assembly_instructions.SLDDRW" + newName = Settings.folderPaths("guide") & "\assembly_instructions.SLDDRW" status = iDrawing.SaveAs3(newName, 0, 0) - status = iDrawing.SaveAs3(newName, 0, 2) + status = iDrawing.SaveAs3(Settings.folderPaths("guide") & "\assembly_instructions.PDF", 0, 2) End Sub Private Shared Sub Set_MeasurementProperties(measurement As IDisplayDimension) diff --git a/Wardrobe/SolidWorks/Multiple_3D.vb b/Wardrobe/SolidWorks/Multiple_3D.vb index 204b727..e6b3075 100644 --- a/Wardrobe/SolidWorks/Multiple_3D.vb +++ b/Wardrobe/SolidWorks/Multiple_3D.vb @@ -106,6 +106,8 @@ Public Class Multiple_3D Dim Errors As Integer Dim Warnings As Integer + status = Assembly.EditRebuild3() + Dim components = Assembly.GetComponents(True) For i = 0 To UBound(components) Dim partDoc = components(i).GetModelDoc2() @@ -118,7 +120,7 @@ Public Class Multiple_3D 'To STEP If User_Input.add3DStep = True Then - status = Assembly.SaveAs3(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_stp") & "\GRATINGS_ASSEMBLY.STEP", 0, 2) + status = Assembly.SaveAs3(Settings.folderPaths("models3D_gratings_stp") & "\GRATINGS_ASSEMBLY.STEP", 0, 2) End If Dim sourcePath, destPath As String @@ -126,10 +128,10 @@ Public Class Multiple_3D Dim childrenDestPaths As New List(Of String) sourcePath = Settings.filesFolder & "\Files\CADStart\" & designName & ".SLDASM" - destPath = Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw") & "\GRATINGS_ASSEMBLY.SLDASM" + destPath = Settings.folderPaths("models3D_gratings_sw") & "\GRATINGS_ASSEMBLY.SLDASM" childrenSourcePaths.Add(Settings.HLCtFolder & "\HLCt\Parts\START.SLDPRT") - childrenDestPaths.Add(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\MASTER.SLDPRT") + childrenDestPaths.Add(Settings.folderPaths("models3D_gratings_sw_support") & "\MASTER.SLDPRT") Dim instanceCounter As New Dictionary(Of String, Integer) For i = 0 To partDT.Rows.Count - 1 @@ -150,10 +152,10 @@ Public Class Multiple_3D End Try If partNameArray(0) = "FRAME" Then - childrenDestPaths.Add(Settings.folderPaths("object_" & Data.objectNum & "_models3D_frames_sw") & "\" & newName & + childrenDestPaths.Add(Settings.folderPaths("models3D_frames_sw") & "\" & newName & instanceCounter(newName.Substring(0, newName.Length - 1)) & ".SLDPRT") Else - childrenDestPaths.Add(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw") & "\" & newName & + childrenDestPaths.Add(Settings.folderPaths("models3D_gratings_sw") & "\" & newName & instanceCounter(newName.Substring(0, newName.Length - 1)) & ".SLDPRT") End If Next diff --git a/Wardrobe/SolidWorks/Multiple_3D_Simplified.vb b/Wardrobe/SolidWorks/Multiple_3D_Simplified.vb index 8b55fa3..b3cdb40 100644 --- a/Wardrobe/SolidWorks/Multiple_3D_Simplified.vb +++ b/Wardrobe/SolidWorks/Multiple_3D_Simplified.vb @@ -168,6 +168,8 @@ Public Class Multiple_3D_Simplified Dim Errors As Integer Dim Warnings As Integer + status = assembly.EditRebuild3() + Dim components = assembly.GetComponents(True) For i = 0 To UBound(components) Dim partDoc = components(i).GetModelDoc2() @@ -190,8 +192,8 @@ Public Class Multiple_3D_Simplified frameStr = "_WITH_FRAME" End If - destPath = Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\GRATINGS_ASSEMBLY_SIMPLIFIED" & frameStr & ".SLDASM" - childrenDestPaths.Add(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\MASTER_SIMPLIFIED" & frameStr & ".SLDPRT") + destPath = Settings.folderPaths("models3D_gratings_sw_support") & "\GRATINGS_ASSEMBLY_SIMPLIFIED" & frameStr & ".SLDASM" + childrenDestPaths.Add(Settings.folderPaths("models3D_gratings_sw_support") & "\MASTER_SIMPLIFIED" & frameStr & ".SLDPRT") Dim instanceCounter As New Dictionary(Of String, Integer) For i = 0 To partDT.Rows.Count - 1 @@ -212,10 +214,10 @@ Public Class Multiple_3D_Simplified End Try If partNameArray(0) = "FRAME" Then - childrenDestPaths.Add(Settings.folderPaths("object_" & Data.objectNum & "_models3D_frames_sw") & "\" & newName & frameStr & - instanceCounter(newName.Substring(0, newName.Length - 1)) & ".SLDPRT") + childrenDestPaths.Add(Settings.folderPaths("models3D_frames_sw") & "\" & newName & frameStr & + instanceCounter(newName.Substring(0, newName.Length - 1)) & "_S" & ".SLDPRT") Else - childrenDestPaths.Add(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\" & newName & frameStr & + childrenDestPaths.Add(Settings.folderPaths("models3D_gratings_sw_support") & "\" & newName & frameStr & instanceCounter(newName.Substring(0, newName.Length - 1)) & ".SLDPRT") End If Next diff --git a/Wardrobe/SolidWorks/Multiple_Drawing.vb b/Wardrobe/SolidWorks/Multiple_Drawing.vb index f3b1e07..bf212ca 100644 --- a/Wardrobe/SolidWorks/Multiple_Drawing.vb +++ b/Wardrobe/SolidWorks/Multiple_Drawing.vb @@ -28,7 +28,7 @@ Public Class Multiple_Drawing Dim adjustedHeightPosInSheet As Double = swSheetHeight / 2 + 0.02 Dim myView As View - myView = iDrawing.CreateDrawViewFromModelView3(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\GRATINGS_ASSEMBLY_SIMPLIFIED.SLDASM", + myView = iDrawing.CreateDrawViewFromModelView3(Settings.folderPaths("models3D_gratings_sw_support") & "\GRATINGS_ASSEMBLY_SIMPLIFIED.SLDASM", "*Front", swSheetWidth / 2, adjustedHeightPosInSheet, 0) myView.UseSheetScale() = True myView.SetDisplayTangentEdges2(2) @@ -52,10 +52,26 @@ Public Class Multiple_Drawing mesOffsets(3) = OutLine(0) - 0.005 ' -- Recess measurements -- + Dim instanceCounter As New Dictionary(Of String, Integer) Dim recessDT = modelsDT.Select("parentName = '" & modelsDT.Rows(Calculate_Fill_Grid.numOfHorizontal * (Calculate_Fill_Grid.numOfVertical - 1))("partName") & "'") For i = 0 To Data.recessData.Rows.Count - 1 Dim DR As DataRow = Data.recessData.Rows(i) - Dim recessName As String = recessDT(i)("partName") + + Dim tempName As String = recessDT(i)("partName") + Dim recessNameArray As String() = tempName.Split("_") + + Dim recessNameTemp As String = "" + For j = 0 To recessNameArray.Length - 4 + recessNameTemp += recessNameArray(j) & "_" + Next + + Try + instanceCounter(recessNameTemp.Substring(0, recessNameTemp.Length - 1)) += 1 + Catch ex As Exception + instanceCounter.Add(recessNameTemp.Substring(0, recessNameTemp.Length - 1), 1) + End Try + + Dim recessName As String = recessNameTemp & instanceCounter(recessNameTemp.Substring(0, recessNameTemp.Length - 1)) If DR("RECESS TYPE") = "ANGLE" Then If DR("CORNER") = 1 Then @@ -230,12 +246,30 @@ Public Class Multiple_Drawing Create_Measurement("Point1@SB", False, mesOffsets(2), CompName, myView, recessName, swExtensions, iDrawing) - - status = False counter = 0 While status = False gratingName = modelsDT.Rows(Calculate_Fill_Grid.numOfHorizontal * Calculate_Fill_Grid.numOfVertical - 1 - counter)("partName") + + ' Forstsätt här: Måste hantera namnen på grating med rätt ändelse + + 'Dim tempName As String = recessDT(i)("partName") + 'Dim recessNameArray As String() = tempName.Split("_") + + 'Dim recessNameTemp As String = "" + 'For j = 0 To recessNameArray.Length - 4 + ' recessNameTemp += recessNameArray(j) & "_" + 'Next + + 'Try + ' instanceCounter(recessNameTemp.Substring(0, recessNameTemp.Length - 1)) += 1 + 'Catch ex As Exception + ' instanceCounter.Add(recessNameTemp.Substring(0, recessNameTemp.Length - 1), 1) + 'End Try + + 'Dim recessName As String = recessNameTemp & instanceCounter(recessNameTemp.Substring(0, recessNameTemp.Length - 1)) + + iDrawing.ClearSelection2(True) plane2Name = "Point1@SW2@" & CompName & "@" & myView.GetName2 & "/" & gratingName & "-1@" & CompName.Split("-")(0) @@ -431,10 +465,10 @@ Public Class Multiple_Drawing Next Dim newName As String - newName = Settings.folderPaths("object_" & Data.objectNum & "_drawings_gratings_sw") & "\grating_drawing.SLDDRW" + newName = Settings.folderPaths("drawings_gratings_sw") & "\grating_drawing.SLDDRW" status = iDrawing.SaveAs3(newName, 0, 0) - status = iDrawing.SaveAs3(Settings.folderPaths("object_" & Data.objectNum & "_drawings_gratings_pdf") & "\grating_drawing.pdf", 0, 2) + status = iDrawing.SaveAs3(Settings.folderPaths("drawings_gratings_pdf") & "\grating_drawing.pdf", 0, 2) End Sub