diff --git a/HLCt/Parts/START.SLDPRT b/HLCt/Parts/START.SLDPRT index 2f43324..d0abf65 100644 Binary files a/HLCt/Parts/START.SLDPRT and b/HLCt/Parts/START.SLDPRT differ diff --git a/Wardrobe/GUI/AppForm.vb b/Wardrobe/GUI/AppForm.vb index 67c90c9..f7b407d 100644 --- a/Wardrobe/GUI/AppForm.vb +++ b/Wardrobe/GUI/AppForm.vb @@ -66,6 +66,13 @@ Public Class AppForm Individual.ComboBox_Type.Items.Add("Pressure Welded") Individual.ComboBox_Type.Items.Add("Type A") + + For i = 25 To 55 Step 5 + Individual.ComboBox_Frame.Items.Add(i & " x " & i) + Next + For i = 65 To 85 Step 10 + Individual.ComboBox_Frame.Items.Add(i & " x " & i) + Next End Sub End Class \ No newline at end of file diff --git a/Wardrobe/GUI/Individual.Designer.vb b/Wardrobe/GUI/Individual.Designer.vb index 33cd770..3a42695 100644 --- a/Wardrobe/GUI/Individual.Designer.vb +++ b/Wardrobe/GUI/Individual.Designer.vb @@ -24,6 +24,11 @@ Partial Class Individual Private Sub InitializeComponent() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(Individual)) Me.Panel_Data = New System.Windows.Forms.Panel() + Me.CheckBox_3DModel = New System.Windows.Forms.CheckBox() + Me.CheckBox_FrameDrawing = New System.Windows.Forms.CheckBox() + Me.CheckBox_GratingDrawing = New System.Windows.Forms.CheckBox() + Me.CheckBox_Frames = New System.Windows.Forms.CheckBox() + Me.CheckBox_Instructions = New System.Windows.Forms.CheckBox() Me.Button_Back = New System.Windows.Forms.Button() Me.TextBox_Width = New System.Windows.Forms.TextBox() Me.ComboBox_Width = New System.Windows.Forms.ComboBox() @@ -59,11 +64,8 @@ Partial Class Individual Me.Panel_Grating = New System.Windows.Forms.Panel() Me.Label2 = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() - Me.CheckBox_Instructions = New System.Windows.Forms.CheckBox() - Me.CheckBox_Frames = New System.Windows.Forms.CheckBox() - Me.CheckBox_GratingDrawing = New System.Windows.Forms.CheckBox() - Me.CheckBox_FrameDrawing = New System.Windows.Forms.CheckBox() - Me.CheckBox_3DModel = New System.Windows.Forms.CheckBox() + Me.ComboBox_Frame = New System.Windows.Forms.ComboBox() + Me.Label8 = New System.Windows.Forms.Label() Me.Panel_Data.SuspendLayout() Me.Panel_Recesses.SuspendLayout() Me.Panel_Grating.SuspendLayout() @@ -72,6 +74,8 @@ Partial Class Individual 'Panel_Data ' Me.Panel_Data.BackColor = System.Drawing.SystemColors.GradientActiveCaption + Me.Panel_Data.Controls.Add(Me.Label8) + Me.Panel_Data.Controls.Add(Me.ComboBox_Frame) Me.Panel_Data.Controls.Add(Me.CheckBox_3DModel) Me.Panel_Data.Controls.Add(Me.CheckBox_FrameDrawing) Me.Panel_Data.Controls.Add(Me.CheckBox_GratingDrawing) @@ -107,6 +111,57 @@ Partial Class Individual Me.Panel_Data.Size = New System.Drawing.Size(420, 950) Me.Panel_Data.TabIndex = 0 ' + 'CheckBox_3DModel + ' + Me.CheckBox_3DModel.AutoSize = True + Me.CheckBox_3DModel.Location = New System.Drawing.Point(235, 727) + Me.CheckBox_3DModel.Name = "CheckBox_3DModel" + Me.CheckBox_3DModel.Size = New System.Drawing.Size(131, 20) + Me.CheckBox_3DModel.TabIndex = 32 + Me.CheckBox_3DModel.Text = "3D Grating Model" + Me.CheckBox_3DModel.UseVisualStyleBackColor = True + ' + 'CheckBox_FrameDrawing + ' + Me.CheckBox_FrameDrawing.AutoSize = True + Me.CheckBox_FrameDrawing.Enabled = False + Me.CheckBox_FrameDrawing.Location = New System.Drawing.Point(235, 808) + Me.CheckBox_FrameDrawing.Name = "CheckBox_FrameDrawing" + Me.CheckBox_FrameDrawing.Size = New System.Drawing.Size(118, 20) + Me.CheckBox_FrameDrawing.TabIndex = 31 + Me.CheckBox_FrameDrawing.Text = "Frame Drawing" + Me.CheckBox_FrameDrawing.UseVisualStyleBackColor = True + ' + 'CheckBox_GratingDrawing + ' + Me.CheckBox_GratingDrawing.AutoSize = True + Me.CheckBox_GratingDrawing.Location = New System.Drawing.Point(235, 754) + Me.CheckBox_GratingDrawing.Name = "CheckBox_GratingDrawing" + Me.CheckBox_GratingDrawing.Size = New System.Drawing.Size(122, 20) + Me.CheckBox_GratingDrawing.TabIndex = 30 + Me.CheckBox_GratingDrawing.Text = "Grating Drawing" + Me.CheckBox_GratingDrawing.UseVisualStyleBackColor = True + ' + 'CheckBox_Frames + ' + Me.CheckBox_Frames.AutoSize = True + Me.CheckBox_Frames.Location = New System.Drawing.Point(235, 781) + Me.CheckBox_Frames.Name = "CheckBox_Frames" + Me.CheckBox_Frames.Size = New System.Drawing.Size(101, 20) + Me.CheckBox_Frames.TabIndex = 29 + Me.CheckBox_Frames.Text = "Add Frames" + Me.CheckBox_Frames.UseVisualStyleBackColor = True + ' + 'CheckBox_Instructions + ' + Me.CheckBox_Instructions.AutoSize = True + Me.CheckBox_Instructions.Location = New System.Drawing.Point(235, 835) + Me.CheckBox_Instructions.Name = "CheckBox_Instructions" + Me.CheckBox_Instructions.Size = New System.Drawing.Size(156, 20) + Me.CheckBox_Instructions.TabIndex = 28 + Me.CheckBox_Instructions.Text = "Assembly Instructions" + Me.CheckBox_Instructions.UseVisualStyleBackColor = True + ' 'Button_Back ' Me.Button_Back.Location = New System.Drawing.Point(12, 12) @@ -120,7 +175,7 @@ Partial Class Individual 'TextBox_Width ' Me.TextBox_Width.Location = New System.Drawing.Point(147, 572) - Me.TextBox_Width.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.TextBox_Width.Margin = New System.Windows.Forms.Padding(4) Me.TextBox_Width.Name = "TextBox_Width" Me.TextBox_Width.Size = New System.Drawing.Size(205, 22) Me.TextBox_Width.TabIndex = 26 @@ -130,7 +185,7 @@ Partial Class Individual Me.ComboBox_Width.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.ComboBox_Width.FormattingEnabled = True Me.ComboBox_Width.Location = New System.Drawing.Point(147, 572) - Me.ComboBox_Width.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.ComboBox_Width.Margin = New System.Windows.Forms.Padding(4) Me.ComboBox_Width.Name = "ComboBox_Width" Me.ComboBox_Width.Size = New System.Drawing.Size(205, 24) Me.ComboBox_Width.TabIndex = 25 @@ -142,7 +197,7 @@ Partial Class Individual Me.Label7.Location = New System.Drawing.Point(359, 495) Me.Label7.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label7.Name = "Label7" - Me.Label7.Size = New System.Drawing.Size(30, 17) + Me.Label7.Size = New System.Drawing.Size(23, 13) Me.Label7.TabIndex = 24 Me.Label7.Text = "mm" ' @@ -153,7 +208,7 @@ Partial Class Individual Me.Label6.Location = New System.Drawing.Point(359, 576) Me.Label6.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(30, 17) + Me.Label6.Size = New System.Drawing.Size(23, 13) Me.Label6.TabIndex = 23 Me.Label6.Text = "mm" ' @@ -164,7 +219,7 @@ Partial Class Individual Me.Label5.Location = New System.Drawing.Point(359, 404) Me.Label5.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label5.Name = "Label5" - Me.Label5.Size = New System.Drawing.Size(30, 17) + Me.Label5.Size = New System.Drawing.Size(23, 13) Me.Label5.TabIndex = 22 Me.Label5.Text = "mm" ' @@ -175,7 +230,7 @@ Partial Class Individual Me.Label4.Location = New System.Drawing.Point(359, 346) Me.Label4.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label4.Name = "Label4" - Me.Label4.Size = New System.Drawing.Size(30, 17) + Me.Label4.Size = New System.Drawing.Size(23, 13) Me.Label4.TabIndex = 21 Me.Label4.Text = "mm" ' @@ -186,7 +241,7 @@ Partial Class Individual Me.Label3.Location = New System.Drawing.Point(359, 292) Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(30, 17) + Me.Label3.Size = New System.Drawing.Size(23, 13) Me.Label3.TabIndex = 20 Me.Label3.Text = "mm" ' @@ -194,7 +249,7 @@ Partial Class Individual ' Me.Button_Export_GUI.BackColor = System.Drawing.Color.Transparent Me.Button_Export_GUI.Location = New System.Drawing.Point(65, 866) - Me.Button_Export_GUI.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button_Export_GUI.Margin = New System.Windows.Forms.Padding(4) Me.Button_Export_GUI.Name = "Button_Export_GUI" Me.Button_Export_GUI.Size = New System.Drawing.Size(100, 28) Me.Button_Export_GUI.TabIndex = 18 @@ -205,7 +260,7 @@ Partial Class Individual ' Me.Button_Export_SW.BackColor = System.Drawing.Color.Transparent Me.Button_Export_SW.Location = New System.Drawing.Point(235, 866) - Me.Button_Export_SW.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button_Export_SW.Margin = New System.Windows.Forms.Padding(4) Me.Button_Export_SW.Name = "Button_Export_SW" Me.Button_Export_SW.Size = New System.Drawing.Size(100, 28) Me.Button_Export_SW.TabIndex = 17 @@ -219,7 +274,7 @@ Partial Class Individual Me.Label_Heading.Location = New System.Drawing.Point(93, 46) Me.Label_Heading.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label_Heading.Name = "Label_Heading" - Me.Label_Heading.Size = New System.Drawing.Size(198, 25) + Me.Label_Heading.Size = New System.Drawing.Size(166, 20) Me.Label_Heading.TabIndex = 15 Me.Label_Heading.Text = "Grating Parameters" ' @@ -230,7 +285,7 @@ Partial Class Individual Me.Label_Material.Location = New System.Drawing.Point(61, 176) Me.Label_Material.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label_Material.Name = "Label_Material" - Me.Label_Material.Size = New System.Drawing.Size(69, 20) + Me.Label_Material.Size = New System.Drawing.Size(58, 17) Me.Label_Material.TabIndex = 14 Me.Label_Material.Text = "Material" ' @@ -241,7 +296,7 @@ Partial Class Individual Me.Label_Mesh.Location = New System.Drawing.Point(41, 287) Me.Label_Mesh.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label_Mesh.Name = "Label_Mesh" - Me.Label_Mesh.Size = New System.Drawing.Size(88, 20) + Me.Label_Mesh.Size = New System.Drawing.Size(73, 17) Me.Label_Mesh.TabIndex = 13 Me.Label_Mesh.Text = "Mesh Size" ' @@ -252,7 +307,7 @@ Partial Class Individual Me.Label_Height.Location = New System.Drawing.Point(73, 343) Me.Label_Height.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label_Height.Name = "Label_Height" - Me.Label_Height.Size = New System.Drawing.Size(58, 20) + Me.Label_Height.Size = New System.Drawing.Size(49, 17) Me.Label_Height.TabIndex = 12 Me.Label_Height.Text = "Height" ' @@ -263,7 +318,7 @@ Partial Class Individual Me.Label_Thickness.Location = New System.Drawing.Point(43, 399) Me.Label_Thickness.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label_Thickness.Name = "Label_Thickness" - Me.Label_Thickness.Size = New System.Drawing.Size(85, 20) + Me.Label_Thickness.Size = New System.Drawing.Size(72, 17) Me.Label_Thickness.TabIndex = 11 Me.Label_Thickness.Text = "Thickness" ' @@ -274,7 +329,7 @@ Partial Class Individual Me.Label_Width.Location = New System.Drawing.Point(80, 572) Me.Label_Width.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label_Width.Name = "Label_Width" - Me.Label_Width.Size = New System.Drawing.Size(52, 20) + Me.Label_Width.Size = New System.Drawing.Size(44, 17) Me.Label_Width.TabIndex = 10 Me.Label_Width.Text = "Width" ' @@ -285,7 +340,7 @@ Partial Class Individual Me.Label_Length.Location = New System.Drawing.Point(69, 490) Me.Label_Length.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label_Length.Name = "Label_Length" - Me.Label_Length.Size = New System.Drawing.Size(60, 20) + Me.Label_Length.Size = New System.Drawing.Size(52, 17) Me.Label_Length.TabIndex = 9 Me.Label_Length.Text = "Length" ' @@ -296,14 +351,14 @@ Partial Class Individual Me.Label_Type.Location = New System.Drawing.Point(85, 124) Me.Label_Type.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label_Type.Name = "Label_Type" - Me.Label_Type.Size = New System.Drawing.Size(45, 20) + Me.Label_Type.Size = New System.Drawing.Size(40, 16) Me.Label_Type.TabIndex = 8 Me.Label_Type.Text = "Type" ' 'TextBox_Length ' Me.TextBox_Length.Location = New System.Drawing.Point(147, 490) - Me.TextBox_Length.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.TextBox_Length.Margin = New System.Windows.Forms.Padding(4) Me.TextBox_Length.Name = "TextBox_Length" Me.TextBox_Length.Size = New System.Drawing.Size(205, 22) Me.TextBox_Length.TabIndex = 7 @@ -313,7 +368,7 @@ Partial Class Individual Me.ComboBox_Mesh.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.ComboBox_Mesh.FormattingEnabled = True Me.ComboBox_Mesh.Location = New System.Drawing.Point(147, 287) - Me.ComboBox_Mesh.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.ComboBox_Mesh.Margin = New System.Windows.Forms.Padding(4) Me.ComboBox_Mesh.Name = "ComboBox_Mesh" Me.ComboBox_Mesh.Size = New System.Drawing.Size(205, 24) Me.ComboBox_Mesh.TabIndex = 6 @@ -323,7 +378,7 @@ Partial Class Individual Me.ComboBox_Thickness.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.ComboBox_Thickness.FormattingEnabled = True Me.ComboBox_Thickness.Location = New System.Drawing.Point(147, 398) - Me.ComboBox_Thickness.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.ComboBox_Thickness.Margin = New System.Windows.Forms.Padding(4) Me.ComboBox_Thickness.Name = "ComboBox_Thickness" Me.ComboBox_Thickness.Size = New System.Drawing.Size(205, 24) Me.ComboBox_Thickness.TabIndex = 3 @@ -333,7 +388,7 @@ Partial Class Individual Me.ComboBox_Height.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.ComboBox_Height.FormattingEnabled = True Me.ComboBox_Height.Location = New System.Drawing.Point(147, 342) - Me.ComboBox_Height.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.ComboBox_Height.Margin = New System.Windows.Forms.Padding(4) Me.ComboBox_Height.Name = "ComboBox_Height" Me.ComboBox_Height.Size = New System.Drawing.Size(205, 24) Me.ComboBox_Height.TabIndex = 2 @@ -343,7 +398,7 @@ Partial Class Individual Me.ComboBox_Material.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.ComboBox_Material.FormattingEnabled = True Me.ComboBox_Material.Location = New System.Drawing.Point(147, 175) - Me.ComboBox_Material.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.ComboBox_Material.Margin = New System.Windows.Forms.Padding(4) Me.ComboBox_Material.Name = "ComboBox_Material" Me.ComboBox_Material.Size = New System.Drawing.Size(205, 24) Me.ComboBox_Material.TabIndex = 1 @@ -353,7 +408,7 @@ Partial Class Individual Me.ComboBox_Type.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.ComboBox_Type.FormattingEnabled = True Me.ComboBox_Type.Location = New System.Drawing.Point(147, 124) - Me.ComboBox_Type.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.ComboBox_Type.Margin = New System.Windows.Forms.Padding(4) Me.ComboBox_Type.Name = "ComboBox_Type" Me.ComboBox_Type.Size = New System.Drawing.Size(205, 24) Me.ComboBox_Type.TabIndex = 0 @@ -369,7 +424,7 @@ Partial Class Individual Me.Panel_Recesses.Controls.Add(Me.Button_Angle_Corner) Me.Panel_Recesses.Controls.Add(Me.Label_Recesses) Me.Panel_Recesses.Location = New System.Drawing.Point(0, 0) - Me.Panel_Recesses.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Panel_Recesses.Margin = New System.Windows.Forms.Padding(4) Me.Panel_Recesses.Name = "Panel_Recesses" Me.Panel_Recesses.Size = New System.Drawing.Size(1860, 148) Me.Panel_Recesses.TabIndex = 1 @@ -383,7 +438,7 @@ Partial Class Individual Me.Button_Radius.FlatAppearance.BorderColor = System.Drawing.Color.Black Me.Button_Radius.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button_Radius.Location = New System.Drawing.Point(1341, 31) - Me.Button_Radius.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button_Radius.Margin = New System.Windows.Forms.Padding(4) Me.Button_Radius.Name = "Button_Radius" Me.Button_Radius.Size = New System.Drawing.Size(93, 86) Me.Button_Radius.TabIndex = 22 @@ -397,7 +452,7 @@ Partial Class Individual Me.Button_Square_Middle.FlatAppearance.BorderColor = System.Drawing.Color.Black Me.Button_Square_Middle.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button_Square_Middle.Location = New System.Drawing.Point(1201, 31) - Me.Button_Square_Middle.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button_Square_Middle.Margin = New System.Windows.Forms.Padding(4) Me.Button_Square_Middle.Name = "Button_Square_Middle" Me.Button_Square_Middle.Size = New System.Drawing.Size(93, 86) Me.Button_Square_Middle.TabIndex = 21 @@ -411,7 +466,7 @@ Partial Class Individual Me.Button_Square_Side.FlatAppearance.BorderColor = System.Drawing.Color.Black Me.Button_Square_Side.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button_Square_Side.Location = New System.Drawing.Point(1061, 31) - Me.Button_Square_Side.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button_Square_Side.Margin = New System.Windows.Forms.Padding(4) Me.Button_Square_Side.Name = "Button_Square_Side" Me.Button_Square_Side.Size = New System.Drawing.Size(93, 86) Me.Button_Square_Side.TabIndex = 20 @@ -425,7 +480,7 @@ Partial Class Individual Me.Button_Angle_Side.FlatAppearance.BorderColor = System.Drawing.Color.Black Me.Button_Angle_Side.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button_Angle_Side.Location = New System.Drawing.Point(781, 31) - Me.Button_Angle_Side.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button_Angle_Side.Margin = New System.Windows.Forms.Padding(4) Me.Button_Angle_Side.Name = "Button_Angle_Side" Me.Button_Angle_Side.Size = New System.Drawing.Size(93, 86) Me.Button_Angle_Side.TabIndex = 19 @@ -439,7 +494,7 @@ Partial Class Individual Me.Button_Square_Corner.FlatAppearance.BorderColor = System.Drawing.Color.Black Me.Button_Square_Corner.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button_Square_Corner.Location = New System.Drawing.Point(921, 31) - Me.Button_Square_Corner.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button_Square_Corner.Margin = New System.Windows.Forms.Padding(4) Me.Button_Square_Corner.Name = "Button_Square_Corner" Me.Button_Square_Corner.Size = New System.Drawing.Size(93, 86) Me.Button_Square_Corner.TabIndex = 18 @@ -453,7 +508,7 @@ Partial Class Individual Me.Button_Angle_Corner.FlatAppearance.BorderColor = System.Drawing.Color.Black Me.Button_Angle_Corner.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button_Angle_Corner.Location = New System.Drawing.Point(641, 31) - Me.Button_Angle_Corner.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button_Angle_Corner.Margin = New System.Windows.Forms.Padding(4) Me.Button_Angle_Corner.Name = "Button_Angle_Corner" Me.Button_Angle_Corner.Size = New System.Drawing.Size(93, 86) Me.Button_Angle_Corner.TabIndex = 17 @@ -466,7 +521,7 @@ Partial Class Individual Me.Label_Recesses.Location = New System.Drawing.Point(439, 44) Me.Label_Recesses.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label_Recesses.Name = "Label_Recesses" - Me.Label_Recesses.Size = New System.Drawing.Size(106, 25) + Me.Label_Recesses.Size = New System.Drawing.Size(88, 20) Me.Label_Recesses.TabIndex = 16 Me.Label_Recesses.Text = "Recesses" ' @@ -476,7 +531,7 @@ Partial Class Individual Me.Panel_Grating.Controls.Add(Me.Label2) Me.Panel_Grating.Controls.Add(Me.Label1) Me.Panel_Grating.Location = New System.Drawing.Point(420, 148) - Me.Panel_Grating.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Panel_Grating.Margin = New System.Windows.Forms.Padding(4) Me.Panel_Grating.Name = "Panel_Grating" Me.Panel_Grating.Size = New System.Drawing.Size(1440, 802) Me.Panel_Grating.TabIndex = 2 @@ -488,7 +543,7 @@ Partial Class Individual Me.Label2.Location = New System.Drawing.Point(85, 769) Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(16, 17) + Me.Label2.Size = New System.Drawing.Size(13, 13) Me.Label2.TabIndex = 1 Me.Label2.Text = "L" ' @@ -499,60 +554,30 @@ Partial Class Individual Me.Label1.Location = New System.Drawing.Point(17, 708) Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(21, 17) + Me.Label1.Size = New System.Drawing.Size(18, 13) Me.Label1.TabIndex = 0 Me.Label1.Text = "W" ' - 'CheckBox_Instructions + 'ComboBox_Frame ' - Me.CheckBox_Instructions.AutoSize = True - Me.CheckBox_Instructions.Location = New System.Drawing.Point(235, 835) - Me.CheckBox_Instructions.Name = "CheckBox_Instructions" - Me.CheckBox_Instructions.Size = New System.Drawing.Size(166, 21) - Me.CheckBox_Instructions.TabIndex = 28 - Me.CheckBox_Instructions.Text = "Assembly Instructions" - Me.CheckBox_Instructions.UseVisualStyleBackColor = True + Me.ComboBox_Frame.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.ComboBox_Frame.FormattingEnabled = True + Me.ComboBox_Frame.Location = New System.Drawing.Point(147, 656) + Me.ComboBox_Frame.Margin = New System.Windows.Forms.Padding(4) + Me.ComboBox_Frame.Name = "ComboBox_Frame" + Me.ComboBox_Frame.Size = New System.Drawing.Size(205, 24) + Me.ComboBox_Frame.TabIndex = 33 ' - 'CheckBox_Frames + 'Label8 ' - Me.CheckBox_Frames.AutoSize = True - Me.CheckBox_Frames.Location = New System.Drawing.Point(235, 781) - Me.CheckBox_Frames.Name = "CheckBox_Frames" - Me.CheckBox_Frames.Size = New System.Drawing.Size(106, 21) - Me.CheckBox_Frames.TabIndex = 29 - Me.CheckBox_Frames.Text = "Add Frames" - Me.CheckBox_Frames.UseVisualStyleBackColor = True - ' - 'CheckBox_GratingDrawing - ' - Me.CheckBox_GratingDrawing.AutoSize = True - Me.CheckBox_GratingDrawing.Location = New System.Drawing.Point(235, 754) - Me.CheckBox_GratingDrawing.Name = "CheckBox_GratingDrawing" - Me.CheckBox_GratingDrawing.Size = New System.Drawing.Size(132, 21) - Me.CheckBox_GratingDrawing.TabIndex = 30 - Me.CheckBox_GratingDrawing.Text = "Grating Drawing" - Me.CheckBox_GratingDrawing.UseVisualStyleBackColor = True - ' - 'CheckBox_FrameDrawing - ' - Me.CheckBox_FrameDrawing.AutoSize = True - Me.CheckBox_FrameDrawing.Enabled = False - Me.CheckBox_FrameDrawing.Location = New System.Drawing.Point(235, 808) - Me.CheckBox_FrameDrawing.Name = "CheckBox_FrameDrawing" - Me.CheckBox_FrameDrawing.Size = New System.Drawing.Size(125, 21) - Me.CheckBox_FrameDrawing.TabIndex = 31 - Me.CheckBox_FrameDrawing.Text = "Frame Drawing" - Me.CheckBox_FrameDrawing.UseVisualStyleBackColor = True - ' - 'CheckBox_3DModel - ' - Me.CheckBox_3DModel.AutoSize = True - Me.CheckBox_3DModel.Location = New System.Drawing.Point(235, 727) - Me.CheckBox_3DModel.Name = "CheckBox_3DModel" - Me.CheckBox_3DModel.Size = New System.Drawing.Size(141, 21) - Me.CheckBox_3DModel.TabIndex = 32 - Me.CheckBox_3DModel.Text = "3D Grating Model" - Me.CheckBox_3DModel.UseVisualStyleBackColor = True + Me.Label8.AutoSize = True + Me.Label8.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label8.Location = New System.Drawing.Point(53, 656) + Me.Label8.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label8.Name = "Label8" + Me.Label8.Size = New System.Drawing.Size(81, 17) + Me.Label8.TabIndex = 34 + Me.Label8.Text = "Frame WxH" ' 'Individual ' @@ -564,7 +589,7 @@ Partial Class Individual Me.Controls.Add(Me.Panel_Recesses) Me.Controls.Add(Me.Panel_Grating) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None - Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Margin = New System.Windows.Forms.Padding(4) Me.Name = "Individual" Me.Text = "Individual" Me.Panel_Data.ResumeLayout(False) @@ -618,4 +643,6 @@ Partial Class Individual Friend WithEvents CheckBox_Frames As CheckBox Friend WithEvents CheckBox_Instructions As CheckBox Friend WithEvents CheckBox_3DModel As CheckBox + Friend WithEvents Label8 As Label + Friend WithEvents ComboBox_Frame As ComboBox End Class diff --git a/Wardrobe/GUI/Individual.vb b/Wardrobe/GUI/Individual.vb index 0980d98..6baf338 100644 --- a/Wardrobe/GUI/Individual.vb +++ b/Wardrobe/GUI/Individual.vb @@ -184,6 +184,10 @@ Public Class Individual User_Input.Check_IfNumber(e) End Sub + Private Sub ComboBox_Frame_TextChanged(sender As Object, e As EventArgs) Handles ComboBox_Frame.TextChanged + User_Input.FrameChanged(sender, e) + End Sub + ' --- Grating width changed --- Private Sub TextBox_Width_TextChanged(sender As Object, e As EventArgs) Handles TextBox_Width.TextChanged User_Input.WidthChanged(sender, e) @@ -392,4 +396,5 @@ Public Class Individual Main_Menu.Show() End Sub + End Class \ No newline at end of file diff --git a/Wardrobe/Gratings Data/User_Input.vb b/Wardrobe/Gratings Data/User_Input.vb index f2e64e3..3cdf846 100644 --- a/Wardrobe/Gratings Data/User_Input.vb +++ b/Wardrobe/Gratings Data/User_Input.vb @@ -17,6 +17,8 @@ Public Shared addGratingDrawing As Boolean = False Public Shared addFrameDrawing As Boolean = False Public Shared addInstructions As Boolean = False + + Public Shared frameSize As Integer Public Shared Sub TypeChanged(sender As Object, e As EventArgs) Individual.ComboBox_Material.Enabled = True Individual.ComboBox_Material.Items.Clear() @@ -275,6 +277,15 @@ For i = 0 To tempList.Count - 1 Individual.ComboBox_Thickness.Items.Add(tempList(i)) Next + + For i = 0 To Individual.ComboBox_Frame.Items.Count - 1 + Dim item As String = Individual.ComboBox_Frame.Items(i) + If CInt(item.Split(" ")(0)) = gratingHeight + 5 Then + Individual.ComboBox_Frame.Text = Individual.ComboBox_Frame.Items(i) + Exit For + End If + Next + End Sub @@ -415,6 +426,12 @@ End If End Sub + Public Shared Sub FrameChanged(Sender As Object, e As EventArgs) + If Individual.ComboBox_Frame.Text <> "" Then + frameSize = CInt(Individual.ComboBox_Frame.Text.Split(" ")(0)) + End If + End Sub + Private Shared Sub Enable_Buttons() If AppForm.fillMode Then If Individual.TextBox_Width.Text <> "" AndAlso Individual.TextBox_Length.Text <> "" Then @@ -465,6 +482,7 @@ gratingTable.Columns.Add("CROSSBAR_DIAMETER", GetType(Integer)) gratingTable.Columns.Add("CROSSBAR_THICKNESS", GetType(Integer)) gratingTable.Columns.Add("CROSSBAR_HEIGHT", GetType(Integer)) + gratingTable.Columns.Add("FRAME_SIZE", GetType(Integer)) gratingTable.Rows.Add() @@ -478,6 +496,7 @@ gratingTable.Rows(0)("LOADBAR_HEIGHT") = CInt(Individual.ComboBox_Height.Text) gratingTable.Rows(0)("LOADBAR_SPACING") = CInt(lSpacing) gratingTable.Rows(0)("CROSSBAR_SPACING") = CInt(cSpacing) + gratingTable.Rows(0)("FRAME_SIZE") = frameSize If Individual.ComboBox_Type.Text = "Pressure Welded" Then If gratingSerrated = True Then diff --git a/Wardrobe/SolidWorks/Frame_3D.vb b/Wardrobe/SolidWorks/Frame_3D.vb index 7c33dce..ec83947 100644 --- a/Wardrobe/SolidWorks/Frame_3D.vb +++ b/Wardrobe/SolidWorks/Frame_3D.vb @@ -5,8 +5,10 @@ Public Class Frame_3D Public Shared frameDT As New DataTable Public Shared cuttingList As New Dictionary(Of Integer, Integer()) Public Shared sideFrameLengths As New Dictionary(Of String, Integer) + Private Shared gParameters As DataRow Public Shared Sub Build_Frame(gratingParameters As DataRow, parentID As Integer) + gParameters = gratingParameters frameDT = Generate_FrameData(gratingParameters) For i = 0 To frameDT.Rows.Count - 1 @@ -28,8 +30,8 @@ Public Class Frame_3D HLCtName = "frame_l_straight" End If inst_ = ExternalClass.instantiate_parts(parentID, HLCtName, "") - ExternalClass.modify_parameter_value("DP_HEIGHT", inst_, 40) 'FIXA: Dropdown i GUI med alla alternativ - ExternalClass.modify_parameter_value("DP_WIDTH", inst_, 40) 'FIXA + ExternalClass.modify_parameter_value("DP_HEIGHT", inst_, gratingParameters("FRAME_SIZE")) + ExternalClass.modify_parameter_value("DP_WIDTH", inst_, gratingParameters("FRAME_SIZE")) ExternalClass.modify_parameter_value("DP_ROTATION", inst_, frameDT.Rows(i)("ROTATION")) ExternalClass.modify_parameter_value("DP_OFFSET_W", inst_, frameDT.Rows(i)("OFFSET_W")) @@ -121,10 +123,10 @@ Public Class Frame_3D DTRow("CORNER") = Data.gratingPoints.Rows(i)("QUADRANT") DTRow("ROTATION") = (Data.gratingPoints.Rows(i)("QUADRANT") - 1) * 90 If DTRow("CORNER") = 1 Then - DTRow("OFFSET_W") = Data.gratingW 'gratingParameters("WIDTH") + DTRow("OFFSET_W") = Data.gratingW DTRow("OFFSET_L") = 0 ElseIf DTRow("CORNER") = 2 Then - DTRow("OFFSET_W") = Data.gratingW 'gratingParameters("WIDTH") + DTRow("OFFSET_W") = Data.gratingW DTRow("OFFSET_L") = gratingParameters("LENGTH") ElseIf DTRow("CORNER") = 3 Then DTRow("OFFSET_W") = 0 @@ -188,7 +190,7 @@ Public Class Frame_3D If Data.gratingPoints.Rows(i)("X") = Data.gratingPoints.Rows(i2)("X") Then If Data.gratingPoints.Rows(i)("Y") > Data.gratingPoints.Rows(i2)("Y") Then - DTRow("SIDE") = 3 + DTRow("SIDE") = 3 'Side 2 DTRow("LENGTH") = (Data.gratingPoints.Rows(i)("Y") - Data.gratingPoints.Rows(i2)("Y")) * 1000 - 20 - numOfP * 200 + extraCorner1 + extraCorner2 If Data.gratingPoints.Rows(i2)("NAME").substring(0, 1) = "P" Then DTRow("OFFSET_W") = 210 - extraCorner2 @@ -197,7 +199,7 @@ Public Class Frame_3D End If DTRow("OFFSET_L") = gratingParameters("LENGTH") Else - DTRow("SIDE") = 1 + DTRow("SIDE") = 1 ' Side 4 DTRow("LENGTH") = (Data.gratingPoints.Rows(i2)("Y") - Data.gratingPoints.Rows(i)("Y")) * 1000 - 20 - numOfP * 200 + extraCorner1 + extraCorner2 If Data.gratingPoints.Rows(i)("NAME").substring(0, 1) = "P" Then DTRow("OFFSET_W") = DTRow("LENGTH") + 210 - extraCorner1 @@ -208,7 +210,7 @@ Public Class Frame_3D End If Else If Data.gratingPoints.Rows(i)("X") > Data.gratingPoints.Rows(i2)("X") Then - DTRow("SIDE") = 4 + DTRow("SIDE") = 4 'Side 3 DTRow("LENGTH") = (Data.gratingPoints.Rows(i)("X") - Data.gratingPoints.Rows(i2)("X")) * 1000 - 20 - numOfP * 200 + extraCorner1 + extraCorner2 DTRow("OFFSET_W") = 0 If Data.gratingPoints.Rows(i2)("NAME").substring(0, 1) = "P" Then @@ -217,7 +219,7 @@ Public Class Frame_3D DTRow("OFFSET_L") = Data.gratingL / 2 + Data.gratingPoints.Rows(i2)("X") * 1000 + 10 End If Else - DTRow("SIDE") = 2 + DTRow("SIDE") = 2 ' Side 1 DTRow("LENGTH") = (Data.gratingPoints.Rows(i2)("X") - Data.gratingPoints.Rows(i)("X")) * 1000 - 20 - numOfP * 200 + extraCorner1 + extraCorner2 DTRow("OFFSET_W") = Data.gratingW 'gratingParameters("WIDTH") If Data.gratingPoints.Rows(i)("NAME").substring(0, 1) = "P" Then @@ -484,10 +486,10 @@ Public Class Frame_3D equationName = equationName.Split("=")(0) & "= " If tempName = "DP_HEIGHT" Then - swEquationMgr.Equation(i) = equationName & 30 'FIXA + swEquationMgr.Equation(i) = equationName & gParameters("FRAME_SIZE") counter += 1 ElseIf tempName = "DP_WIDTH" Then - swEquationMgr.Equation(i) = equationName & 40 'FIXA + swEquationMgr.Equation(i) = equationName & gParameters("FRAME_SIZE") counter += 1 ElseIf tempName = "DP_CUTOFFSET1" Then Dim cutLength As Integer = 0 diff --git a/Wardrobe/SolidWorks/Frame_Drawing.vb b/Wardrobe/SolidWorks/Frame_Drawing.vb index 8544f3d..2cc4b13 100644 --- a/Wardrobe/SolidWorks/Frame_Drawing.vb +++ b/Wardrobe/SolidWorks/Frame_Drawing.vb @@ -45,12 +45,7 @@ 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) - 1 - - If frameInSimplified = True Then - compNames(j) = Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\" & frameComponents(frameID)("partName") & ".SLDPRT" - Else - compNames(j) = Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw") & "\" & frameComponents(frameID)("partName") & ".SLDPRT" - End If + compNames(j) = Settings.folderPaths("object_" & Data.objectNum & "_models3D_frames_sw") & "\" & frameComponents(frameID)("partName") & ".SLDPRT" coordNames(j) = "" Next @@ -62,11 +57,10 @@ Public Class 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("Benämning", 30, "Whole L Straight Frame " & Individual.ComboBox_Frame.Text & " x 3", 1) 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) diff --git a/Wardrobe/SolidWorks/Individual_3D.vb b/Wardrobe/SolidWorks/Individual_3D.vb index 3c07c14..97ecc94 100644 --- a/Wardrobe/SolidWorks/Individual_3D.vb +++ b/Wardrobe/SolidWorks/Individual_3D.vb @@ -61,55 +61,61 @@ Public Class Individual_3D Dim status As Integer Dim Assembly = swApp.ActiveDoc() - Dim newName As String - newName = Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw") & "\grating_assembly.SLDASM" + 'Dim newName As String + 'newName = Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw") & "\grating_assembly.SLDASM" + + 'Dim swExtensions As IModelDocExtension + 'swExtensions = Assembly.Extension + 'Dim Errors As Integer + 'Dim Warnings As Integer + + 'status = swExtensions.SaveAs2(newName, 0, 4, Nothing, "", True, Errors, Warnings) - Dim swExtensions As IModelDocExtension - swExtensions = Assembly.Extension Dim Errors As Integer Dim Warnings As Integer + Dim model As IModelDoc2 + model = Assembly + status = model.Save3(1, Errors, Warnings) - status = swExtensions.SaveAs2(newName, 0, 4, Nothing, "", True, Errors, Warnings) + Dim sourcePath, destPath As String + Dim childrenSourcePaths As New List(Of String) + Dim childrenDestPaths As New List(Of String) - 'Dim sourcePath, destPath As String - 'Dim childrenSourcePaths As New List(Of String) - '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" - 'sourcePath = Settings.filesFolder & "\Files\CADStart\" & designName & ".SLDASM" - 'destPath = Settings.folderPaths("object_" & Data.objectNum & "_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") - 'childrenSourcePaths.Add(Settings.HLCtFolder & "\HLCt\Parts\START.SLDPRT") - 'childrenDestPaths.Add(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\MASTER.SLDPRT") + Dim instanceCounter As New Dictionary(Of String, Integer) + For i = 0 To partDT.Rows.Count - 1 + childrenSourcePaths.Add(Settings.filesFolder & "\Files\CADStart\" & partDT.Rows(i)("partName") & ".SLDPRT") - 'Dim instanceCounter As New Dictionary(Of String, Integer) - 'For i = 0 To partDT.Rows.Count - 1 - ' childrenSourcePaths.Add(Settings.filesFolder & "\Files\CADStart\" & partDT.Rows(i)("partName") & ".SLDPRT") + Dim partName As String = partDT.Rows(i)("partName") + Dim partNameArray As String() = partName.Split("_") - ' Dim partName As String = partDT.Rows(i)("partName") - ' Dim partNameArray As String() = partName.Split("_") + Dim newName As String = "" + For j = 0 To partNameArray.Length - 4 + newName += partNameArray(j) & "_" + Next - ' Dim newName As String = "" - ' For j = 0 To partNameArray.Length - 4 - ' newName += partNameArray(j) & "_" - ' Next + Try + instanceCounter(newName.Substring(0, newName.Length - 1)) += 1 + Catch ex As Exception + instanceCounter.Add(newName.Substring(0, newName.Length - 1), 1) + End Try - ' Try - ' instanceCounter(newName.Substring(0, newName.Length - 1)) += 1 - ' Catch ex As Exception - ' instanceCounter.Add(newName.Substring(0, newName.Length - 1), 1) - ' 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") + Else + childrenDestPaths.Add(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw") & "\" & newName & + instanceCounter(newName.Substring(0, newName.Length - 1)) & ".SLDPRT") + End If + Next - ' 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) - 'status = swApp.CopyDocument(sourcePath, destPath, childrenSourcePaths.ToArray(), childrenDestPaths.ToArray(), 2) + swApp.CloseAllDocuments(True) + status = swApp.CopyDocument(sourcePath, destPath, childrenSourcePaths.ToArray(), childrenDestPaths.ToArray(), 2) End Sub Private Shared Sub Inst_Recesses(parentID As Integer, gratingParameters As DataRow, recessDR As DataRow) diff --git a/Wardrobe/SolidWorks/Individual_3D_Simplified.vb b/Wardrobe/SolidWorks/Individual_3D_Simplified.vb index c83a9ba..b17d1bd 100644 --- a/Wardrobe/SolidWorks/Individual_3D_Simplified.vb +++ b/Wardrobe/SolidWorks/Individual_3D_Simplified.vb @@ -84,60 +84,70 @@ Public Class Individual_3D_Simplified status = swCustPropMgr.Add3("Revision", 30, "", 1) - Dim newName As String - If withFrame = True Then - newName = Settings.folderPaths("object_" & Data.objectNum & "_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" - End If - Dim swExtensions As IModelDocExtension - swExtensions = Assembly.Extension + 'Dim newName As String + 'If withFrame = True Then + ' newName = Settings.folderPaths("object_" & Data.objectNum & "_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" + 'End If + 'Dim swExtensions As IModelDocExtension + 'swExtensions = Assembly.Extension + 'Dim Errors As Integer + 'Dim Warnings As Integer + + 'status = swExtensions.SaveAs2(newName, 0, 4, Nothing, "", True, Errors, Warnings) + Dim Errors As Integer Dim Warnings As Integer - - status = swExtensions.SaveAs2(newName, 0, 4, Nothing, "", True, Errors, Warnings) + Dim model As IModelDoc2 + model = Assembly + status = model.Save3(1, Errors, Warnings) + Dim sourcePath, destPath As String + Dim childrenSourcePaths As New List(Of String) + Dim childrenDestPaths As New List(Of String) - 'Dim sourcePath, destPath As String - 'Dim childrenSourcePaths As New List(Of String) - 'Dim childrenDestPaths As New List(Of String) + sourcePath = Settings.filesFolder & "\Files\CADStart\" & designName & ".SLDASM" - 'sourcePath = Settings.filesFolder & "\Files\CADStart\" & designName & ".SLDASM" - 'destPath = Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw") & "\GRATING_ASSEMBLY.SLDASM" + 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") + 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") + End If - 'childrenSourcePaths.Add(Settings.HLCtFolder & "\HLCt\Parts\START.SLDPRT") - 'childrenDestPaths.Add(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\MASTER.SLDPRT") + Dim instanceCounter As New Dictionary(Of String, Integer) + For i = 0 To partDT.Rows.Count - 1 + childrenSourcePaths.Add(Settings.filesFolder & "\Files\CADStart\" & partDT.Rows(i)("partName") & ".SLDPRT") - 'Dim instanceCounter As New Dictionary(Of String, Integer) - 'For i = 0 To partDT.Rows.Count - 1 - ' childrenSourcePaths.Add(Settings.filesFolder & "\Files\CADStart\" & partDT.Rows(i)("partName") & ".SLDPRT") + Dim partName As String = partDT.Rows(i)("partName") + Dim partNameArray As String() = partName.Split("_") - ' Dim partName As String = partDT.Rows(i)("partName") - ' Dim partNameArray As String() = partName.Split("_") + Dim newName As String = "" + For j = 0 To partNameArray.Length - 4 + newName += partNameArray(j) & "_" + Next - ' Dim newName As String = "" - ' For j = 0 To partNameArray.Length - 4 - ' newName += partNameArray(j) & "_" - ' Next + Try + instanceCounter(newName.Substring(0, newName.Length - 1)) += 1 + Catch ex As Exception + instanceCounter.Add(newName.Substring(0, newName.Length - 1), 1) + End Try - ' Try - ' instanceCounter(newName.Substring(0, newName.Length - 1)) += 1 - ' Catch ex As Exception - ' instanceCounter.Add(newName.Substring(0, newName.Length - 1), 1) - ' 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") + Else + childrenDestPaths.Add(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\" & newName & + instanceCounter(newName.Substring(0, newName.Length - 1)) & ".SLDPRT") + End If + Next - ' 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) - 'status = swApp.CopyDocument(sourcePath, destPath, childrenSourcePaths.ToArray(), childrenDestPaths.ToArray(), 2) + swApp.CloseAllDocuments(True) + status = swApp.CopyDocument(sourcePath, destPath, childrenSourcePaths.ToArray(), childrenDestPaths.ToArray(), 2) End Sub Private Shared Sub Inst_Recesses(parentID As Integer, gratingParameters As DataRow, recessDR As DataRow) diff --git a/Wardrobe/SolidWorks/Instructions.vb b/Wardrobe/SolidWorks/Instructions.vb index 8763712..8a67507 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("object_" & Data.objectNum & "_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("object_" & Data.objectNum & "_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("object_" & Data.objectNum & "_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("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\GRATING_ASSEMBLY_SIMPLIFIED.SLDASM" End If End If @@ -114,6 +114,8 @@ Public Class Instructions Dim straightFramesDT As New DataTable straightFramesDT.Columns.Add("LENGTH", GetType(Integer)) straightFramesDT.Columns.Add("SIDE", GetType(Integer)) + straightFramesDT.Columns.Add("OFFSET_W", GetType(Integer)) + straightFramesDT.Columns.Add("OFFSET_L", GetType(Integer)) For i = 1 To 4 Dim sideNum = i + 1 If sideNum = 5 Then @@ -125,53 +127,37 @@ Public Class Instructions Dim newDR As DataRow = straightFramesDT.NewRow newDR("LENGTH") = DR("LENGTH") newDR("SIDE") = i + newDR("OFFSET_W") = DR("OFFSET_W") + newDR("OFFSET_L") = DR("OFFSET_L") straightFramesDT.Rows.Add(newDR) End If Next Next - Dim sideOffsets(3) As Double - Dim cornerFrames = Frame_3D.frameDT.Select("TYPE = 'CORNER'") - For i = 0 To 3 - Dim cornerFrameExist As Boolean = False - For j = 0 To cornerFrames.Length - 1 - If cornerFrames(j)("CORNER") = i + 1 Then - cornerFrameExist = True - Exit For - End If - Next - If cornerFrameExist = True Then - sideOffsets(i) = 0.21 - Else - sideOffsets(i) = 0 - End If - Next - Dim worldX, worldY, offsetX, offsetY As Double Dim scale As Double = myView.ScaleDecimal For i = 0 To straightFramesDT.Rows.Count - 1 + Dim offsetL As Double = straightFramesDT.Rows(i)("OFFSET_L") / 1000 + Dim offsetW As Double = straightFramesDT.Rows(i)("OFFSET_W") / 1000 + Dim length As Double = straightFramesDT.Rows(i)("LENGTH") / 1000 If straightFramesDT.Rows(i)("SIDE") = 1 Then - worldX = swSheetWidth / 2 + (-(Data.gratingL / 1000) / 2 + sideOffsets(0) + (straightFramesDT.Rows(i)("LENGTH") / 1000) / 2) * scale - sideOffsets(0) += straightFramesDT.Rows(i)("LENGTH") / 1000 + worldX = swSheetWidth / 2 + (-(Data.gratingL / 1000) / 2 + offsetL - length / 2) * scale worldY = swSheetHeight / 2 + ((Data.gratingW / 1000) / 2 + 0.001) * scale offsetX = worldX - 0.01 - 0.0045 offsetY = worldY + 0.02 + 0.0015 ElseIf straightFramesDT.Rows(i)("SIDE") = 2 Then worldX = swSheetWidth / 2 + ((Data.gratingL / 1000) / 2 + 0.001) * scale - worldY = swSheetHeight / 2 + ((Data.gratingW / 1000) / 2 - sideOffsets(1) - (straightFramesDT.Rows(i)("LENGTH") / 1000) / 2) * scale - sideOffsets(1) += straightFramesDT.Rows(i)("LENGTH") / 1000 + worldY = swSheetHeight / 2 + (-(Data.gratingW / 1000) / 2 + offsetW + length / 2) * scale offsetX = worldX + 0.02 - 0.0045 offsetY = worldY + 0.01 + 0.0015 ElseIf straightFramesDT.Rows(i)("SIDE") = 3 Then - worldX = swSheetWidth / 2 + ((Data.gratingL / 1000) / 2 - sideOffsets(2) - (straightFramesDT.Rows(i)("LENGTH") / 1000) / 2) * scale - sideOffsets(2) += straightFramesDT.Rows(i)("LENGTH") / 1000 + worldX = swSheetWidth / 2 + (-(Data.gratingL / 1000) / 2 + offsetL + length / 2) * scale worldY = swSheetHeight / 2 - ((Data.gratingW / 1000) / 2 + 0.001) * scale offsetX = worldX + 0.01 - 0.0045 offsetY = worldY - 0.02 + 0.0015 Else worldX = swSheetWidth / 2 - ((Data.gratingL / 1000) / 2 + 0.001) * scale - worldY = swSheetHeight / 2 + (-(Data.gratingW / 1000) / 2 + sideOffsets(3) + (straightFramesDT.Rows(i)("LENGTH") / 1000) / 2) * scale - sideOffsets(3) += straightFramesDT.Rows(i)("LENGTH") / 1000 + worldY = swSheetHeight / 2 + (-(Data.gratingW / 1000) / 2 + offsetW - length / 2) * scale offsetX = worldX - 0.02 - 0.0045 offsetY = worldY - 0.01 + 0.0015 End If @@ -203,6 +189,61 @@ Public Class Instructions status = swExtensions.SelectByID2(balloonName & "@" & myView.GetName2, "NOTE", 0, 0, 0, False, 0, Nothing, 0) editedNote = swExtensions.EditBalloonProperties2(1, 3, 0, "F-" & i + 1, 0, "", 0, False, 1, "X", 0.001) Next + + Dim cornerFrames = Frame_3D.frameDT.Select("TYPE = 'CORNER'") + For i = 0 To cornerFrames.Length - 1 + If cornerFrames(i)("CORNER") = 1 Then + worldX = swSheetWidth / 2 - ((Data.gratingL / 1000) / 2 + 0.001) * scale + worldY = swSheetHeight / 2 + ((Data.gratingW / 1000) / 2 + 0.001) * scale + offsetX = worldX - 0.022 - 0.01 + offsetY = worldY + 0.002 + 0.01 + + ElseIf cornerFrames(i)("CORNER") = 2 Then + worldX = swSheetWidth / 2 + ((Data.gratingL / 1000) / 2 + 0.001) * scale + worldY = swSheetHeight / 2 + ((Data.gratingW / 1000) / 2 + 0.001) * scale + offsetX = worldX + 0.01 + offsetY = worldY + 0.002 + 0.01 + ElseIf cornerFrames(i)("CORNER") = 3 Then + worldX = swSheetWidth / 2 + ((Data.gratingL / 1000) / 2 + 0.001) * scale + worldY = swSheetHeight / 2 - ((Data.gratingW / 1000) / 2 + 0.001) * scale + offsetX = worldX + 0.01 + offsetY = worldY - 0.002 - 0.01 + Else + worldX = swSheetWidth / 2 - ((Data.gratingL / 1000) / 2 + 0.001) * scale + worldY = swSheetHeight / 2 - ((Data.gratingW / 1000) / 2 + 0.001) * scale + offsetX = worldX - 0.022 - 0.01 + offsetY = worldY - 0.002 - 0.01 + End If + + status = swExtensions.SelectByRay(worldX, worldY, 0, 0, 0, -1, 0.0005, 2, False, 0, 0) + + Dim BomBalloonParams As Object + BomBalloonParams = swExtensions.CreateBalloonOptions() + BomBalloonParams.Style = 0 + BomBalloonParams.Size = 3 + BomBalloonParams.UpperTextContent = 1 + BomBalloonParams.UpperText = """" + BomBalloonParams.ShowQuantity = False + BomBalloonParams.QuantityPlacement = 1 + BomBalloonParams.QuantityDenotationText = "X" + BomBalloonParams.QuantityOverride = False + Dim myNote = swExtensions.InsertBOMBalloon2(BomBalloonParams) + + noteAnnotation = myNote.GetAnnotation() + + textFormat = noteAnnotation.GetTextFormat(0) + textFormat.CharHeight = 0.0025 + status = noteAnnotation.SetTextFormat(0, False, textFormat) + + noteAnnotation.SetPosition2(offsetX, offsetY, 0) + + iDrawing.ClearSelection2(True) + balloonName = myNote.GetName() + status = swExtensions.SelectByID2(balloonName & "@" & myView.GetName2, "NOTE", 0, 0, 0, False, 0, Nothing, 0) + editedNote = swExtensions.EditBalloonProperties2(0, 3, 0, "Frame Corner", 0, "", 0, False, 1, "X", 0.001) + Next + + End If diff --git a/Wardrobe/SolidWorks/Multiple_3D.vb b/Wardrobe/SolidWorks/Multiple_3D.vb index fc48a53..08a2ead 100644 --- a/Wardrobe/SolidWorks/Multiple_3D.vb +++ b/Wardrobe/SolidWorks/Multiple_3D.vb @@ -82,12 +82,58 @@ Public Class Multiple_3D Dim status As Boolean Dim Assembly = swApp.ActiveDoc() - Dim swExtensions As IModelDocExtension - swExtensions = Assembly.Extension + 'Dim swExtensions As IModelDocExtension + 'swExtensions = Assembly.Extension + 'Dim Errors As Integer + 'Dim Warnings As Integer + 'status = swExtensions.SaveAs2(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw") & "\gratings_assembly.SLDASM", + ' 0, 4, Nothing, "", True, Errors, Warnings) 'FIXA + Dim Errors As Integer Dim Warnings As Integer - status = swExtensions.SaveAs2(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw") & "\gratings_assembly.SLDASM", - 0, 4, Nothing, "", True, Errors, Warnings) 'FIXA + Dim model As IModelDoc2 + model = Assembly + status = model.Save3(1, Errors, Warnings) + + Dim sourcePath, destPath As String + Dim childrenSourcePaths As New List(Of String) + 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" + + childrenSourcePaths.Add(Settings.HLCtFolder & "\HLCt\Parts\START.SLDPRT") + childrenDestPaths.Add(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\MASTER.SLDPRT") + + Dim instanceCounter As New Dictionary(Of String, Integer) + For i = 0 To partDT.Rows.Count - 1 + childrenSourcePaths.Add(Settings.filesFolder & "\Files\CADStart\" & partDT.Rows(i)("partName") & ".SLDPRT") + + Dim partName As String = partDT.Rows(i)("partName") + Dim partNameArray As String() = partName.Split("_") + + Dim newName As String = "" + For j = 0 To partNameArray.Length - 4 + newName += partNameArray(j) & "_" + Next + + Try + instanceCounter(newName.Substring(0, newName.Length - 1)) += 1 + Catch ex As Exception + instanceCounter.Add(newName.Substring(0, newName.Length - 1), 1) + 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") + 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) + status = swApp.CopyDocument(sourcePath, destPath, childrenSourcePaths.ToArray(), childrenDestPaths.ToArray(), 2) End Sub Private Shared Sub Inst_Recesses(parentID As Integer, gratingParameters As DataRow, recessDR As DataRow) diff --git a/Wardrobe/SolidWorks/Multiple_3D_Simplified.vb b/Wardrobe/SolidWorks/Multiple_3D_Simplified.vb index b18e3ff..5f82777 100644 --- a/Wardrobe/SolidWorks/Multiple_3D_Simplified.vb +++ b/Wardrobe/SolidWorks/Multiple_3D_Simplified.vb @@ -145,19 +145,70 @@ Public Class Multiple_3D_Simplified status = swCustPropMgr.Add3("epdmid", 30, "", 1) status = swCustPropMgr.Add3("Revision", 30, "", 1) - Dim Assebmly = swApp.ActiveDoc() - Dim newName As String - If withFrame = True Then - newName = Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\gratings_assembly_simplified_with_frame.SLDASM" - Else - newName = Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\gratings_assembly_simplified.SLDASM" - End If - Dim swExtensions As IModelDocExtension - swExtensions = assembly.Extension + 'Dim Assebmly = swApp.ActiveDoc() + 'Dim newName As String + 'If withFrame = True Then + ' newName = Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\gratings_assembly_simplified_with_frame.SLDASM" + 'Else + ' newName = Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\gratings_assembly_simplified.SLDASM" + 'End If + 'Dim swExtensions As IModelDocExtension + 'swExtensions = assembly.Extension + 'Dim Errors As Integer + 'Dim Warnings As Integer + + 'status = swExtensions.SaveAs2(newName, 0, 4, Nothing, "", True, Errors, Warnings) + Dim Errors As Integer Dim Warnings As Integer + Dim model As IModelDoc2 + model = assembly + status = model.Save3(1, Errors, Warnings) - status = swExtensions.SaveAs2(newName, 0, 4, Nothing, "", True, Errors, Warnings) + Dim sourcePath, destPath As String + Dim childrenSourcePaths As New List(Of String) + Dim childrenDestPaths As New List(Of String) + + sourcePath = Settings.filesFolder & "\Files\CADStart\" & designName & ".SLDASM" + + childrenSourcePaths.Add(Settings.HLCtFolder & "\HLCt\Parts\START.SLDPRT") + If withFrame = True Then + destPath = Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\GRATINGS_ASSEMBLY_SIMPLIFIED_WITH_FRAME.SLDASM" + childrenDestPaths.Add(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\MASTER_SIMPLIFIED_WITH_FRAME.SLDPRT") + Else + destPath = Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\GRATINGS_ASSEMBLY_SIMPLIFIED.SLDASM" + childrenDestPaths.Add(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\MASTER_SIMPLIFIED.SLDPRT") + End If + + Dim instanceCounter As New Dictionary(Of String, Integer) + For i = 0 To partDT.Rows.Count - 1 + childrenSourcePaths.Add(Settings.filesFolder & "\Files\CADStart\" & partDT.Rows(i)("partName") & ".SLDPRT") + + Dim partName As String = partDT.Rows(i)("partName") + Dim partNameArray As String() = partName.Split("_") + + Dim newName As String = "" + For j = 0 To partNameArray.Length - 4 + newName += partNameArray(j) & "_" + Next + + Try + instanceCounter(newName.Substring(0, newName.Length - 1)) += 1 + Catch ex As Exception + instanceCounter.Add(newName.Substring(0, newName.Length - 1), 1) + 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") + Else + childrenDestPaths.Add(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\" & newName & + instanceCounter(newName.Substring(0, newName.Length - 1)) & ".SLDPRT") + End If + Next + + swApp.CloseAllDocuments(True) + status = swApp.CopyDocument(sourcePath, destPath, childrenSourcePaths.ToArray(), childrenDestPaths.ToArray(), 2) End Sub Private Shared Sub Inst_Recesses(parentID As Integer, gratingParameters As DataRow, recessDR As DataRow)