diff --git a/HLCt/pressure_welded.SLDPRT b/HLCt/pressure_welded.SLDPRT index 95a2a3d..418e4b8 100644 Binary files a/HLCt/pressure_welded.SLDPRT and b/HLCt/pressure_welded.SLDPRT differ diff --git a/HLCt/recess_middle_square.SLDPRT b/HLCt/recess_middle_square.SLDPRT new file mode 100644 index 0000000..4213dd5 Binary files /dev/null and b/HLCt/recess_middle_square.SLDPRT differ diff --git a/Wardrobe/GUI/Individual.Designer.vb b/Wardrobe/GUI/Individual.Designer.vb index b4000be..1b89a07 100644 --- a/Wardrobe/GUI/Individual.Designer.vb +++ b/Wardrobe/GUI/Individual.Designer.vb @@ -92,42 +92,45 @@ Partial Class Individual Me.Panel_Data.Location = New System.Drawing.Point(0, 0) Me.Panel_Data.Margin = New System.Windows.Forms.Padding(0) Me.Panel_Data.Name = "Panel_Data" - Me.Panel_Data.Size = New System.Drawing.Size(315, 772) + Me.Panel_Data.Size = New System.Drawing.Size(420, 950) Me.Panel_Data.TabIndex = 0 ' 'Button_Back ' - Me.Button_Back.Location = New System.Drawing.Point(9, 10) - Me.Button_Back.Margin = New System.Windows.Forms.Padding(2) + Me.Button_Back.Location = New System.Drawing.Point(12, 12) + Me.Button_Back.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.Button_Back.Name = "Button_Back" - Me.Button_Back.Size = New System.Drawing.Size(42, 33) + Me.Button_Back.Size = New System.Drawing.Size(56, 41) Me.Button_Back.TabIndex = 27 Me.Button_Back.Text = "Back" Me.Button_Back.UseVisualStyleBackColor = True ' 'TextBox_Width ' - Me.TextBox_Width.Location = New System.Drawing.Point(110, 418) + Me.TextBox_Width.Location = New System.Drawing.Point(147, 514) + Me.TextBox_Width.Margin = New System.Windows.Forms.Padding(4) Me.TextBox_Width.Name = "TextBox_Width" - Me.TextBox_Width.Size = New System.Drawing.Size(155, 20) + Me.TextBox_Width.Size = New System.Drawing.Size(205, 22) Me.TextBox_Width.TabIndex = 26 ' 'ComboBox_Width ' Me.ComboBox_Width.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.ComboBox_Width.FormattingEnabled = True - Me.ComboBox_Width.Location = New System.Drawing.Point(110, 418) + Me.ComboBox_Width.Location = New System.Drawing.Point(147, 514) + Me.ComboBox_Width.Margin = New System.Windows.Forms.Padding(4) Me.ComboBox_Width.Name = "ComboBox_Width" - Me.ComboBox_Width.Size = New System.Drawing.Size(155, 21) + Me.ComboBox_Width.Size = New System.Drawing.Size(205, 24) Me.ComboBox_Width.TabIndex = 25 ' 'Label7 ' Me.Label7.AutoSize = True Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label7.Location = New System.Drawing.Point(269, 462) + Me.Label7.Location = New System.Drawing.Point(359, 569) + Me.Label7.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label7.Name = "Label7" - Me.Label7.Size = New System.Drawing.Size(23, 13) + Me.Label7.Size = New System.Drawing.Size(30, 17) Me.Label7.TabIndex = 24 Me.Label7.Text = "mm" ' @@ -135,9 +138,10 @@ Partial Class Individual ' Me.Label6.AutoSize = True Me.Label6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label6.Location = New System.Drawing.Point(269, 421) + Me.Label6.Location = New System.Drawing.Point(359, 518) + Me.Label6.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(23, 13) + Me.Label6.Size = New System.Drawing.Size(30, 17) Me.Label6.TabIndex = 23 Me.Label6.Text = "mm" ' @@ -145,9 +149,10 @@ Partial Class Individual ' Me.Label5.AutoSize = True Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label5.Location = New System.Drawing.Point(269, 328) + 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(23, 13) + Me.Label5.Size = New System.Drawing.Size(30, 17) Me.Label5.TabIndex = 22 Me.Label5.Text = "mm" ' @@ -155,9 +160,10 @@ Partial Class Individual ' Me.Label4.AutoSize = True Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label4.Location = New System.Drawing.Point(269, 281) + 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(23, 13) + Me.Label4.Size = New System.Drawing.Size(30, 17) Me.Label4.TabIndex = 21 Me.Label4.Text = "mm" ' @@ -165,18 +171,20 @@ Partial Class Individual ' Me.Label3.AutoSize = True Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label3.Location = New System.Drawing.Point(269, 237) + 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(23, 13) + Me.Label3.Size = New System.Drawing.Size(30, 17) Me.Label3.TabIndex = 20 Me.Label3.Text = "mm" ' 'Button_Export_GUI ' Me.Button_Export_GUI.BackColor = System.Drawing.Color.Transparent - Me.Button_Export_GUI.Location = New System.Drawing.Point(49, 704) + Me.Button_Export_GUI.Location = New System.Drawing.Point(65, 866) + 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(75, 23) + Me.Button_Export_GUI.Size = New System.Drawing.Size(100, 28) Me.Button_Export_GUI.TabIndex = 18 Me.Button_Export_GUI.Text = "Export GUI" Me.Button_Export_GUI.UseVisualStyleBackColor = False @@ -184,9 +192,10 @@ Partial Class Individual 'Button_Export_SW ' Me.Button_Export_SW.BackColor = System.Drawing.Color.Transparent - Me.Button_Export_SW.Location = New System.Drawing.Point(176, 704) + Me.Button_Export_SW.Location = New System.Drawing.Point(235, 866) + 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(75, 23) + Me.Button_Export_SW.Size = New System.Drawing.Size(100, 28) Me.Button_Export_SW.TabIndex = 17 Me.Button_Export_SW.Text = "Export SW" Me.Button_Export_SW.UseVisualStyleBackColor = False @@ -195,9 +204,10 @@ Partial Class Individual ' Me.Label_Heading.AutoSize = True Me.Label_Heading.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label_Heading.Location = New System.Drawing.Point(56, 36) + Me.Label_Heading.Location = New System.Drawing.Point(94, 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(166, 20) + Me.Label_Heading.Size = New System.Drawing.Size(198, 25) Me.Label_Heading.TabIndex = 15 Me.Label_Heading.Text = "Grating Parameters" ' @@ -205,9 +215,10 @@ Partial Class Individual ' Me.Label_Material.AutoSize = True Me.Label_Material.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label_Material.Location = New System.Drawing.Point(46, 143) + 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(58, 17) + Me.Label_Material.Size = New System.Drawing.Size(69, 20) Me.Label_Material.TabIndex = 14 Me.Label_Material.Text = "Material" ' @@ -215,9 +226,10 @@ Partial Class Individual ' Me.Label_Mesh.AutoSize = True Me.Label_Mesh.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label_Mesh.Location = New System.Drawing.Point(31, 233) + 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(73, 17) + Me.Label_Mesh.Size = New System.Drawing.Size(88, 20) Me.Label_Mesh.TabIndex = 13 Me.Label_Mesh.Text = "Mesh Size" ' @@ -225,9 +237,10 @@ Partial Class Individual ' Me.Label_Height.AutoSize = True Me.Label_Height.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label_Height.Location = New System.Drawing.Point(55, 279) + 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(49, 17) + Me.Label_Height.Size = New System.Drawing.Size(58, 20) Me.Label_Height.TabIndex = 12 Me.Label_Height.Text = "Height" ' @@ -235,9 +248,10 @@ Partial Class Individual ' Me.Label_Thickness.AutoSize = True Me.Label_Thickness.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label_Thickness.Location = New System.Drawing.Point(32, 324) + 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(72, 17) + Me.Label_Thickness.Size = New System.Drawing.Size(85, 20) Me.Label_Thickness.TabIndex = 11 Me.Label_Thickness.Text = "Thickness" ' @@ -245,9 +259,10 @@ Partial Class Individual ' Me.Label_Width.AutoSize = True Me.Label_Width.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label_Width.Location = New System.Drawing.Point(60, 418) + Me.Label_Width.Location = New System.Drawing.Point(80, 514) + 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(44, 17) + Me.Label_Width.Size = New System.Drawing.Size(52, 20) Me.Label_Width.TabIndex = 10 Me.Label_Width.Text = "Width" ' @@ -255,9 +270,10 @@ Partial Class Individual ' Me.Label_Length.AutoSize = True Me.Label_Length.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label_Length.Location = New System.Drawing.Point(52, 458) + Me.Label_Length.Location = New System.Drawing.Point(69, 564) + 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(52, 17) + Me.Label_Length.Size = New System.Drawing.Size(60, 20) Me.Label_Length.TabIndex = 9 Me.Label_Length.Text = "Length" ' @@ -265,62 +281,69 @@ Partial Class Individual ' Me.Label_Type.AutoSize = True Me.Label_Type.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label_Type.Location = New System.Drawing.Point(64, 101) + 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(40, 16) + Me.Label_Type.Size = New System.Drawing.Size(45, 20) Me.Label_Type.TabIndex = 8 Me.Label_Type.Text = "Type" ' 'TextBox_Length ' - Me.TextBox_Length.Location = New System.Drawing.Point(110, 458) + Me.TextBox_Length.Location = New System.Drawing.Point(147, 564) + Me.TextBox_Length.Margin = New System.Windows.Forms.Padding(4) Me.TextBox_Length.Name = "TextBox_Length" - Me.TextBox_Length.Size = New System.Drawing.Size(155, 20) + Me.TextBox_Length.Size = New System.Drawing.Size(205, 22) Me.TextBox_Length.TabIndex = 7 ' 'ComboBox_Mesh ' Me.ComboBox_Mesh.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.ComboBox_Mesh.FormattingEnabled = True - Me.ComboBox_Mesh.Location = New System.Drawing.Point(110, 233) + Me.ComboBox_Mesh.Location = New System.Drawing.Point(147, 287) + Me.ComboBox_Mesh.Margin = New System.Windows.Forms.Padding(4) Me.ComboBox_Mesh.Name = "ComboBox_Mesh" - Me.ComboBox_Mesh.Size = New System.Drawing.Size(155, 21) + Me.ComboBox_Mesh.Size = New System.Drawing.Size(205, 24) Me.ComboBox_Mesh.TabIndex = 6 ' 'ComboBox_Thickness ' Me.ComboBox_Thickness.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.ComboBox_Thickness.FormattingEnabled = True - Me.ComboBox_Thickness.Location = New System.Drawing.Point(110, 323) + Me.ComboBox_Thickness.Location = New System.Drawing.Point(147, 398) + Me.ComboBox_Thickness.Margin = New System.Windows.Forms.Padding(4) Me.ComboBox_Thickness.Name = "ComboBox_Thickness" - Me.ComboBox_Thickness.Size = New System.Drawing.Size(155, 21) + Me.ComboBox_Thickness.Size = New System.Drawing.Size(205, 24) Me.ComboBox_Thickness.TabIndex = 3 ' 'ComboBox_Height ' Me.ComboBox_Height.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.ComboBox_Height.FormattingEnabled = True - Me.ComboBox_Height.Location = New System.Drawing.Point(110, 278) + Me.ComboBox_Height.Location = New System.Drawing.Point(147, 342) + Me.ComboBox_Height.Margin = New System.Windows.Forms.Padding(4) Me.ComboBox_Height.Name = "ComboBox_Height" - Me.ComboBox_Height.Size = New System.Drawing.Size(155, 21) + Me.ComboBox_Height.Size = New System.Drawing.Size(205, 24) Me.ComboBox_Height.TabIndex = 2 ' 'ComboBox_Material ' Me.ComboBox_Material.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.ComboBox_Material.FormattingEnabled = True - Me.ComboBox_Material.Location = New System.Drawing.Point(110, 142) + Me.ComboBox_Material.Location = New System.Drawing.Point(147, 175) + Me.ComboBox_Material.Margin = New System.Windows.Forms.Padding(4) Me.ComboBox_Material.Name = "ComboBox_Material" - Me.ComboBox_Material.Size = New System.Drawing.Size(155, 21) + Me.ComboBox_Material.Size = New System.Drawing.Size(205, 24) Me.ComboBox_Material.TabIndex = 1 ' 'ComboBox_Type ' Me.ComboBox_Type.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.ComboBox_Type.FormattingEnabled = True - Me.ComboBox_Type.Location = New System.Drawing.Point(110, 101) + Me.ComboBox_Type.Location = New System.Drawing.Point(147, 124) + Me.ComboBox_Type.Margin = New System.Windows.Forms.Padding(4) Me.ComboBox_Type.Name = "ComboBox_Type" - Me.ComboBox_Type.Size = New System.Drawing.Size(155, 21) + Me.ComboBox_Type.Size = New System.Drawing.Size(205, 24) Me.ComboBox_Type.TabIndex = 0 ' 'Panel_Recesses @@ -333,62 +356,84 @@ 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) Me.Panel_Recesses.Name = "Panel_Recesses" - Me.Panel_Recesses.Size = New System.Drawing.Size(1395, 120) + Me.Panel_Recesses.Size = New System.Drawing.Size(1860, 148) Me.Panel_Recesses.TabIndex = 1 ' 'Button_Square_Middle ' - Me.Button_Square_Middle.Location = New System.Drawing.Point(901, 25) + Me.Button_Square_Middle.BackColor = System.Drawing.Color.Gainsboro + 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) Me.Button_Square_Middle.Name = "Button_Square_Middle" - Me.Button_Square_Middle.Size = New System.Drawing.Size(70, 70) + Me.Button_Square_Middle.Size = New System.Drawing.Size(93, 86) Me.Button_Square_Middle.TabIndex = 21 Me.Button_Square_Middle.Text = "Square Middle" - Me.Button_Square_Middle.UseVisualStyleBackColor = True + Me.Button_Square_Middle.UseVisualStyleBackColor = False ' 'Button_Square_Side ' - Me.Button_Square_Side.Location = New System.Drawing.Point(796, 25) + Me.Button_Square_Side.BackColor = System.Drawing.Color.Gainsboro + 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) Me.Button_Square_Side.Name = "Button_Square_Side" - Me.Button_Square_Side.Size = New System.Drawing.Size(70, 70) + Me.Button_Square_Side.Size = New System.Drawing.Size(93, 86) Me.Button_Square_Side.TabIndex = 20 Me.Button_Square_Side.Text = "Square Side" - Me.Button_Square_Side.UseVisualStyleBackColor = True + Me.Button_Square_Side.UseVisualStyleBackColor = False ' 'Button_Angle_Side ' - Me.Button_Angle_Side.Location = New System.Drawing.Point(586, 25) + Me.Button_Angle_Side.BackColor = System.Drawing.Color.Gainsboro + 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) Me.Button_Angle_Side.Name = "Button_Angle_Side" - Me.Button_Angle_Side.Size = New System.Drawing.Size(70, 70) + Me.Button_Angle_Side.Size = New System.Drawing.Size(93, 86) Me.Button_Angle_Side.TabIndex = 19 Me.Button_Angle_Side.Text = "Angle Side" - Me.Button_Angle_Side.UseVisualStyleBackColor = True + Me.Button_Angle_Side.UseVisualStyleBackColor = False ' 'Button_Square_Corner ' - Me.Button_Square_Corner.Location = New System.Drawing.Point(691, 25) + Me.Button_Square_Corner.BackColor = System.Drawing.Color.Gainsboro + 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) Me.Button_Square_Corner.Name = "Button_Square_Corner" - Me.Button_Square_Corner.Size = New System.Drawing.Size(70, 70) + Me.Button_Square_Corner.Size = New System.Drawing.Size(93, 86) Me.Button_Square_Corner.TabIndex = 18 Me.Button_Square_Corner.Text = "Square Corner" - Me.Button_Square_Corner.UseVisualStyleBackColor = True + Me.Button_Square_Corner.UseVisualStyleBackColor = False ' 'Button_Angle_Corner ' - Me.Button_Angle_Corner.Location = New System.Drawing.Point(481, 25) + Me.Button_Angle_Corner.BackColor = System.Drawing.Color.Gainsboro + 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) Me.Button_Angle_Corner.Name = "Button_Angle_Corner" - Me.Button_Angle_Corner.Size = New System.Drawing.Size(70, 70) + Me.Button_Angle_Corner.Size = New System.Drawing.Size(93, 86) Me.Button_Angle_Corner.TabIndex = 17 Me.Button_Angle_Corner.Text = "Angle Corner" - Me.Button_Angle_Corner.UseVisualStyleBackColor = True + Me.Button_Angle_Corner.UseVisualStyleBackColor = False ' 'Label_Recesses ' Me.Label_Recesses.AutoSize = True Me.Label_Recesses.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label_Recesses.Location = New System.Drawing.Point(329, 36) + 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(88, 20) + Me.Label_Recesses.Size = New System.Drawing.Size(106, 25) Me.Label_Recesses.TabIndex = 16 Me.Label_Recesses.Text = "Recesses" ' @@ -397,18 +442,20 @@ Partial Class Individual Me.Panel_Grating.BackColor = System.Drawing.Color.White Me.Panel_Grating.Controls.Add(Me.Label2) Me.Panel_Grating.Controls.Add(Me.Label1) - Me.Panel_Grating.Location = New System.Drawing.Point(315, 120) + Me.Panel_Grating.Location = New System.Drawing.Point(420, 148) + Me.Panel_Grating.Margin = New System.Windows.Forms.Padding(4) Me.Panel_Grating.Name = "Panel_Grating" - Me.Panel_Grating.Size = New System.Drawing.Size(1080, 652) + Me.Panel_Grating.Size = New System.Drawing.Size(1440, 802) Me.Panel_Grating.TabIndex = 2 ' 'Label2 ' Me.Label2.AutoSize = True Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.8!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label2.Location = New System.Drawing.Point(64, 625) + 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(13, 13) + Me.Label2.Size = New System.Drawing.Size(16, 17) Me.Label2.TabIndex = 1 Me.Label2.Text = "L" ' @@ -416,22 +463,24 @@ Partial Class Individual ' Me.Label1.AutoSize = True Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.8!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label1.Location = New System.Drawing.Point(13, 575) + 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(18, 13) + Me.Label1.Size = New System.Drawing.Size(21, 17) Me.Label1.TabIndex = 0 Me.Label1.Text = "W" ' 'Individual ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 16.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.SystemColors.Control - Me.ClientSize = New System.Drawing.Size(1167, 718) + Me.ClientSize = New System.Drawing.Size(1556, 884) Me.Controls.Add(Me.Panel_Data) 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) Me.Name = "Individual" Me.Text = "Individual" Me.Panel_Data.ResumeLayout(False) diff --git a/Wardrobe/GUI/Individual.vb b/Wardrobe/GUI/Individual.vb index d59448b..1768ae5 100644 --- a/Wardrobe/GUI/Individual.vb +++ b/Wardrobe/GUI/Individual.vb @@ -204,7 +204,7 @@ Public Class Individual End Sub ' --- Check if max laod is a number --- - Private Sub TextBox_Max_Load_KeyPress(sender As Object, e As KeyPressEventArgs) + Public Sub TextBox_Max_Load_KeyPress(sender As Object, e As KeyPressEventArgs) User_Input.Check_IfNumber(e) End Sub @@ -236,7 +236,7 @@ Public Class Individual ' ---------------------------------- Calculate ---------------------------------- ' --- When calculate button is pressed --- - Private Sub Button_Calculate_Click(sender As Object, e As EventArgs) + Public Sub Button_Calculate_Click(sender As Object, e As EventArgs) Grating_Fill.Calculate_Grid() 'Grating_Fill.Calculate_Recesses() End Sub diff --git a/Wardrobe/GUI/Main_Menu.vb b/Wardrobe/GUI/Main_Menu.vb index ff04079..aa44a89 100644 --- a/Wardrobe/GUI/Main_Menu.vb +++ b/Wardrobe/GUI/Main_Menu.vb @@ -1,5 +1,13 @@ Public Class Main_Menu Private Sub Button_Individual_Click(sender As Object, e As EventArgs) Handles Button_Individual.Click + If AppForm.fillMode = True Then + Individual.Panel_Data.Controls.RemoveByKey("Label_Max_Load") + RemoveHandler Individual.Panel_Data.Controls("TextBox_Max_Load").KeyPress, AddressOf Individual.TextBox_Max_Load_KeyPress + Individual.Panel_Data.Controls.RemoveByKey("TextBox_Max_Load") + Individual.Panel_Data.Controls.RemoveByKey("Label_Max_Load_Unit") + RemoveHandler Individual.Panel_Data.Controls("Button_Calculate").Click, AddressOf Individual.Button_Calculate_Click + Individual.Panel_Data.Controls.RemoveByKey("Button_Calculate") + End If AppForm.fillMode = False AppForm.Panel_Start.Controls.Clear() Individual.TopLevel = False @@ -22,4 +30,6 @@ Private Sub Button_Settings_Click(sender As Object, e As EventArgs) Handles Button_Settings.Click Settings.ButtonClicked(sender, e) End Sub + + End Class \ No newline at end of file diff --git a/Wardrobe/Recess Functions/Corner_Angle.vb b/Wardrobe/Recess Functions/Corner_Angle.vb index bd711b0..5559eb9 100644 --- a/Wardrobe/Recess Functions/Corner_Angle.vb +++ b/Wardrobe/Recess Functions/Corner_Angle.vb @@ -28,8 +28,8 @@ Individual.Panel_Recesses.Controls("Button_Square_Side").Left = Individual.Panel_Recesses.Controls("Button_Square_Side").Left + buttonOffset Individual.Panel_Recesses.Controls("Button_Square_Middle").Left = Individual.Panel_Recesses.Controls("Button_Square_Middle").Left + buttonOffset - Individual.Button_Square_Side.FlatStyle = FlatStyle.Flat - Individual.Button_Square_Side.FlatAppearance.BorderColor = Color.Red + Individual.Button_Angle_Corner.FlatStyle = FlatStyle.Flat + Individual.Button_Angle_Corner.FlatAppearance.BorderColor = Color.Red End Sub ' --- Check the key pressed by the user --- @@ -377,7 +377,7 @@ Individual.Panel_Recesses.Controls("Button_Square_Side").Left = Individual.Panel_Recesses.Controls("Button_Square_Side").Left - buttonOffset Individual.Panel_Recesses.Controls("Button_Square_Middle").Left = Individual.Panel_Recesses.Controls("Button_Square_Middle").Left - buttonOffset - Individual.Button_Square_Side.FlatStyle = FlatStyle.Standard + Individual.Button_Angle_Corner.FlatAppearance.BorderColor = Color.Black End Sub ' --- Determines the clicked points quadrant --- diff --git a/Wardrobe/Recess Functions/Corner_Rectangle.vb b/Wardrobe/Recess Functions/Corner_Rectangle.vb index c482daf..342bf48 100644 --- a/Wardrobe/Recess Functions/Corner_Rectangle.vb +++ b/Wardrobe/Recess Functions/Corner_Rectangle.vb @@ -26,8 +26,8 @@ Individual.Panel_Recesses.Controls("Button_Square_Side").Left = Individual.Panel_Recesses.Controls("Button_Square_Side").Left + buttonOffset Individual.Panel_Recesses.Controls("Button_Square_Middle").Left = Individual.Panel_Recesses.Controls("Button_Square_Middle").Left + buttonOffset - Individual.Button_Square_Side.FlatStyle = FlatStyle.Flat - Individual.Button_Square_Side.FlatAppearance.BorderColor = Color.Red + Individual.Button_Square_Corner.FlatStyle = FlatStyle.Flat + Individual.Button_Square_Corner.FlatAppearance.BorderColor = Color.Red End Sub @@ -368,7 +368,7 @@ Individual.Panel_Recesses.Controls("Button_Square_Side").Enabled = True Individual.Panel_Recesses.Controls("Button_Square_Middle").Enabled = True - Individual.Button_Square_Side.FlatStyle = FlatStyle.Standard + Individual.Button_Square_Corner.FlatAppearance.BorderColor = Color.Black End Sub ' --- Determines the clicked points quadrant --- diff --git a/Wardrobe/Recess Functions/Side_Rectangle.vb b/Wardrobe/Recess Functions/Side_Rectangle.vb index 6d53187..94cf297 100644 --- a/Wardrobe/Recess Functions/Side_Rectangle.vb +++ b/Wardrobe/Recess Functions/Side_Rectangle.vb @@ -559,7 +559,7 @@ Individual.Panel_Recesses.Controls("Button_Square_Middle").Left = Individual.Panel_Recesses.Controls("Button_Square_Middle").Left - buttonOffset - Individual.Button_Square_Side.FlatStyle = FlatStyle.Standard + Individual.Button_Square_Side.FlatAppearance.BorderColor = Color.Black End Sub End Class diff --git a/Wardrobe/SolidWorks/Drawing.vb b/Wardrobe/SolidWorks/Drawing.vb index eed2b2d..37c816e 100644 --- a/Wardrobe/SolidWorks/Drawing.vb +++ b/Wardrobe/SolidWorks/Drawing.vb @@ -72,7 +72,7 @@ Public Class Drawing swFeature = swFeatureMgr.FeatureExtrusion3(True, False, False, 0, 0, gratingHeight, 0, False, False, False, False, 0, 0, False, False, False, False, True, True, True, 0, 0, False) - swSkMgr.InsertSketch(True) + 'swSkMgr.InsertSketch(True) boolstatus = Model.Extension.SelectByID2("Front Plane", "PLANE", 0, 0, 0, False, 0, Nothing, 0) Model.ClearSelection2(True) diff --git a/Wardrobe/SolidWorks/Model_3D_Fill.vb b/Wardrobe/SolidWorks/Model_3D_Fill.vb index a5e48e2..043dbf1 100644 --- a/Wardrobe/SolidWorks/Model_3D_Fill.vb +++ b/Wardrobe/SolidWorks/Model_3D_Fill.vb @@ -587,10 +587,10 @@ Public Class Model_3D_Fill squareArea = Math.Abs(p0(1) - p1(1)) * Math.Abs(p1(0) - p2(0)) End If - Dim area1 As Double = gp(0) * p0(1) + gp(1) * p1(0) + p0(0) * p1(1) - p0(1) * p1(0) - gp(1) * p0(0) - gp(0) * p1(1) - Dim area2 As Double = gp(0) * p1(1) + gp(1) * p2(0) + p1(0) * p2(1) - p1(1) * p2(0) - gp(1) * p1(0) - gp(0) * p2(1) - Dim area3 As Double = gp(0) * p2(1) + gp(1) * p3(0) + p2(0) * p3(1) - p2(1) * p3(0) - gp(1) * p2(0) - gp(0) * p3(1) - Dim area4 As Double = gp(0) * p3(1) + gp(1) * p0(0) + p3(0) * p0(1) - p3(1) * p0(0) - gp(1) * p3(0) - gp(0) * p0(1) + Dim area1 As Double = Math.Abs(gp(0) * p0(1) + gp(1) * p1(0) + p0(0) * p1(1) - p0(1) * p1(0) - gp(1) * p0(0) - gp(0) * p1(1)) / 2 + Dim area2 As Double = Math.Abs(gp(0) * p1(1) + gp(1) * p2(0) + p1(0) * p2(1) - p1(1) * p2(0) - gp(1) * p1(0) - gp(0) * p2(1)) / 2 + Dim area3 As Double = Math.Abs(gp(0) * p2(1) + gp(1) * p3(0) + p2(0) * p3(1) - p2(1) * p3(0) - gp(1) * p2(0) - gp(0) * p3(1)) / 2 + Dim area4 As Double = Math.Abs(gp(0) * p3(1) + gp(1) * p0(0) + p3(0) * p0(1) - p3(1) * p0(0) - gp(1) * p3(0) - gp(0) * p0(1)) / 2 Dim compArea As Double = area1 + area2 + area3 + area4 If compArea > squareArea Then