diff --git a/HLCt/Parts/~$START.SLDPRT b/HLCt/Parts/~$START.SLDPRT new file mode 100644 index 0000000..b07f2ee Binary files /dev/null and b/HLCt/Parts/~$START.SLDPRT differ diff --git a/HLCt/pressure_welded.SLDPRT b/HLCt/pressure_welded.SLDPRT index 602576f..ba8f2bd 100644 Binary files a/HLCt/pressure_welded.SLDPRT and b/HLCt/pressure_welded.SLDPRT differ diff --git a/Wardrobe/GUI/Individual.Designer.vb b/Wardrobe/GUI/Individual.Designer.vb index 5d8432d..36185a5 100644 --- a/Wardrobe/GUI/Individual.Designer.vb +++ b/Wardrobe/GUI/Individual.Designer.vb @@ -23,6 +23,7 @@ Partial Class Individual Private Sub InitializeComponent() Me.Panel_Data = New System.Windows.Forms.Panel() + Me.Button_Back = New System.Windows.Forms.Button() Me.TextBox_Width = New System.Windows.Forms.TextBox() Me.ComboBox_Width = New System.Windows.Forms.ComboBox() Me.Label7 = New System.Windows.Forms.Label() @@ -56,7 +57,6 @@ 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.Button_Back = New System.Windows.Forms.Button() Me.Panel_Data.SuspendLayout() Me.Panel_Recesses.SuspendLayout() Me.Panel_Grating.SuspendLayout() @@ -92,35 +92,42 @@ 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(420, 950) + Me.Panel_Data.Size = New System.Drawing.Size(315, 772) 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, 2, 2, 2) + Me.Button_Back.Name = "Button_Back" + Me.Button_Back.Size = New System.Drawing.Size(42, 33) + 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(147, 515) - Me.TextBox_Width.Margin = New System.Windows.Forms.Padding(4) + Me.TextBox_Width.Location = New System.Drawing.Point(110, 392) Me.TextBox_Width.Name = "TextBox_Width" - Me.TextBox_Width.Size = New System.Drawing.Size(205, 22) + Me.TextBox_Width.Size = New System.Drawing.Size(155, 20) 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(147, 514) - Me.ComboBox_Width.Margin = New System.Windows.Forms.Padding(4) + Me.ComboBox_Width.Location = New System.Drawing.Point(110, 418) Me.ComboBox_Width.Name = "ComboBox_Width" - Me.ComboBox_Width.Size = New System.Drawing.Size(205, 24) + Me.ComboBox_Width.Size = New System.Drawing.Size(155, 21) 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(359, 569) - Me.Label7.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label7.Location = New System.Drawing.Point(269, 462) 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" ' @@ -128,10 +135,9 @@ 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(359, 518) - Me.Label6.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label6.Location = New System.Drawing.Point(269, 421) 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" ' @@ -139,10 +145,9 @@ 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(359, 404) - Me.Label5.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label5.Location = New System.Drawing.Point(269, 328) 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" ' @@ -150,10 +155,9 @@ 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(359, 346) - Me.Label4.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label4.Location = New System.Drawing.Point(269, 281) 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" ' @@ -161,20 +165,18 @@ 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(359, 292) - Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label3.Location = New System.Drawing.Point(269, 237) 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" ' 'Button_Export_GUI ' 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) + Me.Button_Export_GUI.Location = New System.Drawing.Point(49, 704) Me.Button_Export_GUI.Name = "Button_Export_GUI" - Me.Button_Export_GUI.Size = New System.Drawing.Size(100, 28) + Me.Button_Export_GUI.Size = New System.Drawing.Size(75, 23) Me.Button_Export_GUI.TabIndex = 18 Me.Button_Export_GUI.Text = "Export GUI" Me.Button_Export_GUI.UseVisualStyleBackColor = False @@ -182,10 +184,9 @@ Partial Class Individual 'Button_Export_SW ' Me.Button_Export_SW.BackColor = System.Drawing.Color.Transparent - Me.Button_Export_SW.Location = New System.Drawing.Point(234, 866) - Me.Button_Export_SW.Margin = New System.Windows.Forms.Padding(4) + Me.Button_Export_SW.Location = New System.Drawing.Point(176, 704) Me.Button_Export_SW.Name = "Button_Export_SW" - Me.Button_Export_SW.Size = New System.Drawing.Size(100, 28) + Me.Button_Export_SW.Size = New System.Drawing.Size(75, 23) Me.Button_Export_SW.TabIndex = 17 Me.Button_Export_SW.Text = "Export SW" Me.Button_Export_SW.UseVisualStyleBackColor = False @@ -194,10 +195,9 @@ 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(75, 44) - Me.Label_Heading.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label_Heading.Location = New System.Drawing.Point(56, 36) 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" ' @@ -205,10 +205,9 @@ 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(61, 176) - Me.Label_Material.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label_Material.Location = New System.Drawing.Point(46, 143) 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" ' @@ -216,10 +215,9 @@ 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(41, 287) - Me.Label_Mesh.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label_Mesh.Location = New System.Drawing.Point(31, 233) 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" ' @@ -227,10 +225,9 @@ 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(73, 343) - Me.Label_Height.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label_Height.Location = New System.Drawing.Point(55, 279) 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" ' @@ -238,10 +235,9 @@ 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(43, 399) - Me.Label_Thickness.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label_Thickness.Location = New System.Drawing.Point(32, 324) 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" ' @@ -249,10 +245,9 @@ 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(80, 514) - Me.Label_Width.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label_Width.Location = New System.Drawing.Point(60, 418) 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" ' @@ -260,10 +255,9 @@ 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(69, 564) - Me.Label_Length.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label_Length.Location = New System.Drawing.Point(52, 458) 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" ' @@ -271,69 +265,62 @@ 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(85, 124) - Me.Label_Type.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label_Type.Location = New System.Drawing.Point(64, 101) 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, 564) - Me.TextBox_Length.Margin = New System.Windows.Forms.Padding(4) + Me.TextBox_Length.Location = New System.Drawing.Point(110, 458) Me.TextBox_Length.Name = "TextBox_Length" - Me.TextBox_Length.Size = New System.Drawing.Size(205, 22) + Me.TextBox_Length.Size = New System.Drawing.Size(155, 20) 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(147, 287) - Me.ComboBox_Mesh.Margin = New System.Windows.Forms.Padding(4) + Me.ComboBox_Mesh.Location = New System.Drawing.Point(110, 233) Me.ComboBox_Mesh.Name = "ComboBox_Mesh" - Me.ComboBox_Mesh.Size = New System.Drawing.Size(205, 24) + Me.ComboBox_Mesh.Size = New System.Drawing.Size(155, 21) 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(147, 398) - Me.ComboBox_Thickness.Margin = New System.Windows.Forms.Padding(4) + Me.ComboBox_Thickness.Location = New System.Drawing.Point(110, 323) Me.ComboBox_Thickness.Name = "ComboBox_Thickness" - Me.ComboBox_Thickness.Size = New System.Drawing.Size(205, 24) + Me.ComboBox_Thickness.Size = New System.Drawing.Size(155, 21) 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(147, 342) - Me.ComboBox_Height.Margin = New System.Windows.Forms.Padding(4) + Me.ComboBox_Height.Location = New System.Drawing.Point(110, 278) Me.ComboBox_Height.Name = "ComboBox_Height" - Me.ComboBox_Height.Size = New System.Drawing.Size(205, 24) + Me.ComboBox_Height.Size = New System.Drawing.Size(155, 21) 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(147, 175) - Me.ComboBox_Material.Margin = New System.Windows.Forms.Padding(4) + Me.ComboBox_Material.Location = New System.Drawing.Point(110, 142) Me.ComboBox_Material.Name = "ComboBox_Material" - Me.ComboBox_Material.Size = New System.Drawing.Size(205, 24) + Me.ComboBox_Material.Size = New System.Drawing.Size(155, 21) 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(147, 124) - Me.ComboBox_Type.Margin = New System.Windows.Forms.Padding(4) + Me.ComboBox_Type.Location = New System.Drawing.Point(110, 101) Me.ComboBox_Type.Name = "ComboBox_Type" - Me.ComboBox_Type.Size = New System.Drawing.Size(205, 24) + Me.ComboBox_Type.Size = New System.Drawing.Size(155, 21) Me.ComboBox_Type.TabIndex = 0 ' 'Panel_Recesses @@ -346,57 +333,51 @@ 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(1860, 148) + Me.Panel_Recesses.Size = New System.Drawing.Size(1395, 120) Me.Panel_Recesses.TabIndex = 1 ' 'Button_Square_Middle ' - 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.Location = New System.Drawing.Point(901, 25) Me.Button_Square_Middle.Name = "Button_Square_Middle" - Me.Button_Square_Middle.Size = New System.Drawing.Size(93, 86) + Me.Button_Square_Middle.Size = New System.Drawing.Size(70, 70) Me.Button_Square_Middle.TabIndex = 21 Me.Button_Square_Middle.Text = "Square Middle" Me.Button_Square_Middle.UseVisualStyleBackColor = True ' 'Button_Square_Side ' - 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.Location = New System.Drawing.Point(796, 25) Me.Button_Square_Side.Name = "Button_Square_Side" - Me.Button_Square_Side.Size = New System.Drawing.Size(93, 86) + Me.Button_Square_Side.Size = New System.Drawing.Size(70, 70) Me.Button_Square_Side.TabIndex = 20 Me.Button_Square_Side.Text = "Square Side" Me.Button_Square_Side.UseVisualStyleBackColor = True ' 'Button_Angle_Side ' - 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.Location = New System.Drawing.Point(586, 25) Me.Button_Angle_Side.Name = "Button_Angle_Side" - Me.Button_Angle_Side.Size = New System.Drawing.Size(93, 86) + Me.Button_Angle_Side.Size = New System.Drawing.Size(70, 70) Me.Button_Angle_Side.TabIndex = 19 Me.Button_Angle_Side.Text = "Angle Side" Me.Button_Angle_Side.UseVisualStyleBackColor = True ' 'Button_Square_Corner ' - 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.Location = New System.Drawing.Point(691, 25) Me.Button_Square_Corner.Name = "Button_Square_Corner" - Me.Button_Square_Corner.Size = New System.Drawing.Size(93, 86) + Me.Button_Square_Corner.Size = New System.Drawing.Size(70, 70) Me.Button_Square_Corner.TabIndex = 18 Me.Button_Square_Corner.Text = "Square Corner" Me.Button_Square_Corner.UseVisualStyleBackColor = True ' 'Button_Angle_Corner ' - 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.Location = New System.Drawing.Point(481, 25) Me.Button_Angle_Corner.Name = "Button_Angle_Corner" - Me.Button_Angle_Corner.Size = New System.Drawing.Size(93, 86) + Me.Button_Angle_Corner.Size = New System.Drawing.Size(70, 70) Me.Button_Angle_Corner.TabIndex = 17 Me.Button_Angle_Corner.Text = "Angle Corner" Me.Button_Angle_Corner.UseVisualStyleBackColor = True @@ -405,10 +386,9 @@ Partial Class Individual ' 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(439, 44) - Me.Label_Recesses.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label_Recesses.Location = New System.Drawing.Point(329, 36) 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" ' @@ -417,20 +397,18 @@ 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(420, 148) - Me.Panel_Grating.Margin = New System.Windows.Forms.Padding(4) + Me.Panel_Grating.Location = New System.Drawing.Point(315, 120) Me.Panel_Grating.Name = "Panel_Grating" - Me.Panel_Grating.Size = New System.Drawing.Size(1440, 802) + Me.Panel_Grating.Size = New System.Drawing.Size(1080, 652) 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(85, 769) - Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label2.Location = New System.Drawing.Point(64, 625) 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" ' @@ -438,33 +416,22 @@ 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(17, 708) - Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label1.Location = New System.Drawing.Point(13, 575) 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" ' - 'Button_Back - ' - Me.Button_Back.Location = New System.Drawing.Point(12, 12) - Me.Button_Back.Name = "Button_Back" - 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 - ' 'Individual ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 16.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.SystemColors.Control - Me.ClientSize = New System.Drawing.Size(1860, 950) + Me.ClientSize = New System.Drawing.Size(1167, 718) 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 a237b63..60dbd01 100644 --- a/Wardrobe/GUI/Individual.vb +++ b/Wardrobe/GUI/Individual.vb @@ -1,8 +1,8 @@  Public Class Individual - Public Shared filepath As String = "C:\Users\Anton\Documents\Exjobb" - 'Public Shared filepath As String = "C:\Users\xperd\Documents" + 'Public Shared filepath As String = "C:\Users\Anton\Documents\Exjobb" + Public Shared filepath As String = "C:\Users\xperd\Documents" Sub Load_GUI() ' Initialize GUI @@ -245,7 +245,7 @@ Public Class Individual ' --- When export to SW button is pressed --- Private Sub Button_Export_SW_Click(sender As Object, e As EventArgs) Handles Button_Export_SW.Click If AppForm.fillMode Then - + Model_3D_Fill.BuildGrid() Else 'Model_3D.BuildGrating() Drawing.CreateDrawing() diff --git a/Wardrobe/GUI/Multiple.Designer.vb b/Wardrobe/GUI/Multiple.Designer.vb deleted file mode 100644 index fd40eb9..0000000 --- a/Wardrobe/GUI/Multiple.Designer.vb +++ /dev/null @@ -1,558 +0,0 @@ - _ -Partial Class Multiple - Inherits System.Windows.Forms.Form - - 'Form overrides dispose to clean up the component list. - _ - Protected Overrides Sub Dispose(ByVal disposing As Boolean) - Try - If disposing AndAlso components IsNot Nothing Then - components.Dispose() - End If - Finally - MyBase.Dispose(disposing) - End Try - End Sub - - 'Required by the Windows Form Designer - Private components As System.ComponentModel.IContainer - - 'NOTE: The following procedure is required by the Windows Form Designer - 'It can be modified using the Windows Form Designer. - 'Do not modify it using the code editor. - _ - Private Sub InitializeComponent() - Me.Button_Square_Middle = New System.Windows.Forms.Button() - Me.Button_Angle_Side = New System.Windows.Forms.Button() - Me.CheckBox_Whole_Mesh = New System.Windows.Forms.CheckBox() - Me.Button_Export_GUI = New System.Windows.Forms.Button() - Me.Button_Export_SW = New System.Windows.Forms.Button() - Me.Label_Heading = New System.Windows.Forms.Label() - Me.Label_Material = New System.Windows.Forms.Label() - Me.Label_Mesh = New System.Windows.Forms.Label() - Me.Label_Height = New System.Windows.Forms.Label() - Me.Button_Square_Corner = New System.Windows.Forms.Button() - Me.Button_Angle_Corner = New System.Windows.Forms.Button() - Me.Label_Recesses = New System.Windows.Forms.Label() - Me.Label_Thickness = New System.Windows.Forms.Label() - Me.Label_Width = New System.Windows.Forms.Label() - Me.Label_Length = New System.Windows.Forms.Label() - Me.TextBox_Length = New System.Windows.Forms.TextBox() - Me.Button_Settings = New System.Windows.Forms.Button() - Me.Panel_Grating = New System.Windows.Forms.Panel() - Me.Label2 = New System.Windows.Forms.Label() - Me.Label1 = New System.Windows.Forms.Label() - Me.Label_Type = New System.Windows.Forms.Label() - Me.ComboBox_Mesh = New System.Windows.Forms.ComboBox() - Me.ComboBox_Width = New System.Windows.Forms.ComboBox() - Me.ComboBox_Thickness = New System.Windows.Forms.ComboBox() - Me.ComboBox_Height = New System.Windows.Forms.ComboBox() - Me.ComboBox_Material = New System.Windows.Forms.ComboBox() - Me.ComboBox_Type = New System.Windows.Forms.ComboBox() - Me.Panel_Data = New System.Windows.Forms.Panel() - Me.Label8 = New System.Windows.Forms.Label() - Me.Label7 = New System.Windows.Forms.Label() - Me.Label6 = New System.Windows.Forms.Label() - Me.Label5 = New System.Windows.Forms.Label() - Me.Label4 = New System.Windows.Forms.Label() - Me.Label3 = New System.Windows.Forms.Label() - Me.Label_Max_Load = New System.Windows.Forms.Label() - Me.TextBox1 = New System.Windows.Forms.TextBox() - Me.Button_Square_Side = New System.Windows.Forms.Button() - Me.Panel_Recesses = New System.Windows.Forms.Panel() - Me.Panel_Grating.SuspendLayout() - Me.Panel_Data.SuspendLayout() - Me.Panel_Recesses.SuspendLayout() - Me.SuspendLayout() - ' - 'Button_Square_Middle - ' - 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.Name = "Button_Square_Middle" - 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 - ' - 'Button_Angle_Side - ' - 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.Name = "Button_Angle_Side" - 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 - ' - 'CheckBox_Whole_Mesh - ' - Me.CheckBox_Whole_Mesh.AutoSize = True - Me.CheckBox_Whole_Mesh.Location = New System.Drawing.Point(147, 476) - Me.CheckBox_Whole_Mesh.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) - Me.CheckBox_Whole_Mesh.Name = "CheckBox_Whole_Mesh" - Me.CheckBox_Whole_Mesh.Size = New System.Drawing.Size(155, 21) - Me.CheckBox_Whole_Mesh.TabIndex = 19 - Me.CheckBox_Whole_Mesh.Text = "Whole Mesh Widths" - Me.CheckBox_Whole_Mesh.UseVisualStyleBackColor = True - ' - 'Button_Export_GUI - ' - Me.Button_Export_GUI.Location = New System.Drawing.Point(47, 849) - Me.Button_Export_GUI.Margin = New System.Windows.Forms.Padding(4, 4, 4, 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 - Me.Button_Export_GUI.Text = "Export GUI" - Me.Button_Export_GUI.UseVisualStyleBackColor = True - ' - 'Button_Export_SW - ' - Me.Button_Export_SW.Location = New System.Drawing.Point(208, 849) - Me.Button_Export_SW.Margin = New System.Windows.Forms.Padding(4, 4, 4, 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 - Me.Button_Export_SW.Text = "Export SW" - Me.Button_Export_SW.UseVisualStyleBackColor = True - ' - 'Label_Heading - ' - 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(75, 44) - 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.TabIndex = 15 - Me.Label_Heading.Text = "Grating Parameters" - ' - 'Label_Material - ' - 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(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.TabIndex = 14 - Me.Label_Material.Text = "Material" - ' - 'Label_Mesh - ' - 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(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.TabIndex = 13 - Me.Label_Mesh.Text = "Mesh Size" - ' - 'Label_Height - ' - 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(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.TabIndex = 12 - Me.Label_Height.Text = "Height" - ' - 'Button_Square_Corner - ' - 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.Name = "Button_Square_Corner" - 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 - ' - 'Button_Angle_Corner - ' - 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.Name = "Button_Angle_Corner" - 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 - ' - '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(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.TabIndex = 16 - Me.Label_Recesses.Text = "Recesses" - ' - 'Label_Thickness - ' - 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(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.TabIndex = 11 - Me.Label_Thickness.Text = "Thickness" - ' - 'Label_Width - ' - 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(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(52, 20) - Me.Label_Width.TabIndex = 10 - Me.Label_Width.Text = "Width" - ' - 'Label_Length - ' - 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(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(60, 20) - Me.Label_Length.TabIndex = 9 - Me.Label_Length.Text = "Length" - ' - 'TextBox_Length - ' - Me.TextBox_Length.Location = New System.Drawing.Point(147, 564) - Me.TextBox_Length.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) - Me.TextBox_Length.Name = "TextBox_Length" - Me.TextBox_Length.Size = New System.Drawing.Size(193, 22) - Me.TextBox_Length.TabIndex = 7 - ' - 'Button_Settings - ' - Me.Button_Settings.Location = New System.Drawing.Point(1673, 4) - Me.Button_Settings.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) - Me.Button_Settings.Name = "Button_Settings" - Me.Button_Settings.Size = New System.Drawing.Size(100, 28) - Me.Button_Settings.TabIndex = 16 - Me.Button_Settings.Text = "Settings" - Me.Button_Settings.UseVisualStyleBackColor = True - ' - 'Panel_Grating - ' - 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(397, 148) - Me.Panel_Grating.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) - Me.Panel_Grating.Name = "Panel_Grating" - Me.Panel_Grating.Size = New System.Drawing.Size(1463, 802) - Me.Panel_Grating.TabIndex = 5 - ' - '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(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.TabIndex = 1 - Me.Label2.Text = "L" - ' - 'Label1 - ' - 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(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.TabIndex = 0 - Me.Label1.Text = "W" - ' - 'Label_Type - ' - 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(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.TabIndex = 8 - Me.Label_Type.Text = "Type" - ' - 'ComboBox_Mesh - ' - 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.Name = "ComboBox_Mesh" - Me.ComboBox_Mesh.Size = New System.Drawing.Size(193, 24) - Me.ComboBox_Mesh.TabIndex = 6 - ' - 'ComboBox_Width - ' - Me.ComboBox_Width.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.ComboBox_Width.FormattingEnabled = True - Me.ComboBox_Width.Location = New System.Drawing.Point(147, 514) - Me.ComboBox_Width.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) - Me.ComboBox_Width.Name = "ComboBox_Width" - Me.ComboBox_Width.Size = New System.Drawing.Size(193, 24) - Me.ComboBox_Width.TabIndex = 4 - ' - 'ComboBox_Thickness - ' - 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.Name = "ComboBox_Thickness" - Me.ComboBox_Thickness.Size = New System.Drawing.Size(193, 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(147, 342) - Me.ComboBox_Height.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) - Me.ComboBox_Height.Name = "ComboBox_Height" - Me.ComboBox_Height.Size = New System.Drawing.Size(193, 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(147, 175) - Me.ComboBox_Material.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) - Me.ComboBox_Material.Name = "ComboBox_Material" - Me.ComboBox_Material.Size = New System.Drawing.Size(193, 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(147, 124) - Me.ComboBox_Type.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) - Me.ComboBox_Type.Name = "ComboBox_Type" - Me.ComboBox_Type.Size = New System.Drawing.Size(193, 24) - Me.ComboBox_Type.TabIndex = 0 - ' - 'Panel_Data - ' - Me.Panel_Data.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer)) - Me.Panel_Data.Controls.Add(Me.Label8) - Me.Panel_Data.Controls.Add(Me.Label7) - Me.Panel_Data.Controls.Add(Me.Label6) - Me.Panel_Data.Controls.Add(Me.Label5) - Me.Panel_Data.Controls.Add(Me.Label4) - Me.Panel_Data.Controls.Add(Me.Label3) - Me.Panel_Data.Controls.Add(Me.Label_Max_Load) - Me.Panel_Data.Controls.Add(Me.TextBox1) - Me.Panel_Data.Controls.Add(Me.CheckBox_Whole_Mesh) - Me.Panel_Data.Controls.Add(Me.Button_Export_GUI) - Me.Panel_Data.Controls.Add(Me.Button_Export_SW) - Me.Panel_Data.Controls.Add(Me.Label_Heading) - Me.Panel_Data.Controls.Add(Me.Label_Material) - Me.Panel_Data.Controls.Add(Me.Label_Mesh) - Me.Panel_Data.Controls.Add(Me.Label_Height) - Me.Panel_Data.Controls.Add(Me.Label_Thickness) - Me.Panel_Data.Controls.Add(Me.Label_Width) - Me.Panel_Data.Controls.Add(Me.Label_Length) - Me.Panel_Data.Controls.Add(Me.Label_Type) - Me.Panel_Data.Controls.Add(Me.TextBox_Length) - Me.Panel_Data.Controls.Add(Me.ComboBox_Mesh) - Me.Panel_Data.Controls.Add(Me.ComboBox_Width) - Me.Panel_Data.Controls.Add(Me.ComboBox_Thickness) - Me.Panel_Data.Controls.Add(Me.ComboBox_Height) - Me.Panel_Data.Controls.Add(Me.ComboBox_Material) - Me.Panel_Data.Controls.Add(Me.ComboBox_Type) - 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(397, 950) - Me.Panel_Data.TabIndex = 3 - ' - 'Label8 - ' - Me.Label8.AutoSize = True - Me.Label8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label8.Location = New System.Drawing.Point(344, 656) - Me.Label8.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.Label8.Name = "Label8" - Me.Label8.Size = New System.Drawing.Size(45, 17) - Me.Label8.TabIndex = 30 - Me.Label8.Text = "kN/m²" - ' - '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(347, 569) - 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.TabIndex = 29 - Me.Label7.Text = "mm" - ' - 'Label6 - ' - 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(347, 519) - 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.TabIndex = 28 - Me.Label6.Text = "mm" - ' - 'Label5 - ' - 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(347, 401) - 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.TabIndex = 27 - Me.Label5.Text = "mm" - ' - 'Label4 - ' - 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(347, 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.TabIndex = 26 - Me.Label4.Text = "mm" - ' - 'Label3 - ' - 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(347, 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.TabIndex = 25 - Me.Label3.Text = "mm" - ' - 'Label_Max_Load - ' - Me.Label_Max_Load.AutoSize = True - Me.Label_Max_Load.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label_Max_Load.Location = New System.Drawing.Point(47, 654) - Me.Label_Max_Load.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.Label_Max_Load.Name = "Label_Max_Load" - Me.Label_Max_Load.Size = New System.Drawing.Size(82, 20) - Me.Label_Max_Load.TabIndex = 21 - Me.Label_Max_Load.Text = "Max Load" - ' - 'TextBox1 - ' - Me.TextBox1.Location = New System.Drawing.Point(147, 652) - Me.TextBox1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) - Me.TextBox1.Name = "TextBox1" - Me.TextBox1.Size = New System.Drawing.Size(193, 22) - Me.TextBox1.TabIndex = 20 - Me.TextBox1.Text = "5" - Me.TextBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - ' - 'Button_Square_Side - ' - 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.Name = "Button_Square_Side" - 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 - ' - 'Panel_Recesses - ' - Me.Panel_Recesses.BackColor = System.Drawing.Color.RosyBrown - Me.Panel_Recesses.Controls.Add(Me.Button_Square_Middle) - Me.Panel_Recesses.Controls.Add(Me.Button_Settings) - Me.Panel_Recesses.Controls.Add(Me.Button_Square_Side) - Me.Panel_Recesses.Controls.Add(Me.Button_Angle_Side) - Me.Panel_Recesses.Controls.Add(Me.Button_Square_Corner) - 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.Name = "Panel_Recesses" - Me.Panel_Recesses.Size = New System.Drawing.Size(1860, 148) - Me.Panel_Recesses.TabIndex = 4 - ' - 'Multiple - ' - 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(1860, 950) - Me.Controls.Add(Me.Panel_Grating) - Me.Controls.Add(Me.Panel_Data) - Me.Controls.Add(Me.Panel_Recesses) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None - Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) - Me.Name = "Multiple" - Me.Text = "Multiple" - Me.Panel_Grating.ResumeLayout(False) - Me.Panel_Grating.PerformLayout() - Me.Panel_Data.ResumeLayout(False) - Me.Panel_Data.PerformLayout() - Me.Panel_Recesses.ResumeLayout(False) - Me.Panel_Recesses.PerformLayout() - Me.ResumeLayout(False) - - End Sub - - Friend WithEvents Button_Square_Middle As Button - Friend WithEvents Button_Angle_Side As Button - Friend WithEvents CheckBox_Whole_Mesh As CheckBox - Friend WithEvents Button_Export_GUI As Button - Friend WithEvents Button_Export_SW As Button - Friend WithEvents Label_Heading As Label - Friend WithEvents Label_Material As Label - Friend WithEvents Label_Mesh As Label - Friend WithEvents Label_Height As Label - Friend WithEvents Button_Square_Corner As Button - Friend WithEvents Button_Angle_Corner As Button - Friend WithEvents Label_Recesses As Label - Friend WithEvents Label_Thickness As Label - Friend WithEvents Label_Width As Label - Friend WithEvents Label_Length As Label - Friend WithEvents TextBox_Length As TextBox - Friend WithEvents Button_Settings As Button - Friend WithEvents Panel_Grating As Panel - Friend WithEvents Label2 As Label - Friend WithEvents Label1 As Label - Friend WithEvents Label_Type As Label - Friend WithEvents ComboBox_Mesh As ComboBox - Friend WithEvents ComboBox_Width As ComboBox - Friend WithEvents ComboBox_Thickness As ComboBox - Friend WithEvents ComboBox_Height As ComboBox - Friend WithEvents ComboBox_Material As ComboBox - Friend WithEvents ComboBox_Type As ComboBox - Friend WithEvents Panel_Data As Panel - Friend WithEvents Label_Max_Load As Label - Friend WithEvents TextBox1 As TextBox - Friend WithEvents Button_Square_Side As Button - Friend WithEvents Panel_Recesses As Panel - Friend WithEvents Label8 As Label - Friend WithEvents Label7 As Label - Friend WithEvents Label6 As Label - Friend WithEvents Label5 As Label - Friend WithEvents Label4 As Label - Friend WithEvents Label3 As Label -End Class diff --git a/Wardrobe/GUI/Multiple.resx b/Wardrobe/GUI/Multiple.resx deleted file mode 100644 index 1af7de1..0000000 --- a/Wardrobe/GUI/Multiple.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/Wardrobe/GUI/Multiple.vb b/Wardrobe/GUI/Multiple.vb deleted file mode 100644 index 37c3a61..0000000 --- a/Wardrobe/GUI/Multiple.vb +++ /dev/null @@ -1,5 +0,0 @@ -Public Class Multiple - Private Sub TextBox1_TextChanged(sender As Object, e As EventArgs) Handles TextBox1.TextChanged - - End Sub -End Class \ No newline at end of file diff --git a/Wardrobe/Gratings Data/Grating_Fill.vb b/Wardrobe/Gratings Data/Grating_Fill.vb index ab298f1..13a1335 100644 --- a/Wardrobe/Gratings Data/Grating_Fill.vb +++ b/Wardrobe/Gratings Data/Grating_Fill.vb @@ -5,15 +5,18 @@ Public Class Grating_Fill Public Shared widthRevNeeded, lengthRevNeeded As Boolean Public Shared revLength, revWidth As Integer - Private Shared gratingDimensions As New DataTable + Public Shared gratingDimensions As New DataTable Public Shared Sub Calculate_Grid() Get_SingleGratingMaxDimensions() gratingDimensions.Clear() gratingDimensions.Columns.Clear() - gratingDimensions.Columns.Add("INDEX") - gratingDimensions.Columns.Add("WIDTH") - gratingDimensions.Columns.Add("LENGTH") + gratingDimensions.Columns.Add("INDEX", GetType(Integer)) + gratingDimensions.Columns.Add("ROW", GetType(Integer)) + gratingDimensions.Columns.Add("COLUMN", GetType(Integer)) + gratingDimensions.Columns.Add("WIDTH", GetType(Integer)) + gratingDimensions.Columns.Add("LENGTH", GetType(Integer)) + numOfHorizontal = Math.Floor(Data.gratingL / maxSingleLength) + 1 numOfVertical = Math.Floor(Data.gratingW / maxSingleWidth) + 1 @@ -43,7 +46,8 @@ Public Class Grating_Fill For i = 0 To numOfHorizontal * numOfVertical - 1 Dim tempDR As DataRow = gratingDimensions.NewRow tempDR("INDEX") = i - + tempDR("ROW") = row - 1 + tempDR("COLUMN") = i - numOfHorizontal * (row - 1) If CDbl((i + 1) / numOfHorizontal) = row Then tempDR("LENGTH") = endLength row += 1 diff --git a/Wardrobe/SolidWorks/Model_3D.vb b/Wardrobe/SolidWorks/Model_3D.vb index b8173c4..396b941 100644 --- a/Wardrobe/SolidWorks/Model_3D.vb +++ b/Wardrobe/SolidWorks/Model_3D.vb @@ -1,6 +1,4 @@ Imports XCCLibrary -Imports SldWorks -Imports System.Diagnostics Public Class Model_3D Private Shared designName As String @@ -29,6 +27,9 @@ Public Class Model_3D ExternalClass.modify_parameter_value("DP_CROSSBAR_HEIGHT", inst_, gratingParameters("CROSSBAR_HEIGHT")) End If + ExternalClass.modify_parameter_value("DP_OFFSET_X", inst_, 0) + ExternalClass.modify_parameter_value("DP_OFFSET_Y", inst_, 0) + 'Instantiate recess rectangle parentID = inst_ For Each recessDR As DataRow In Data.recessData.Rows diff --git a/Wardrobe/SolidWorks/Model_3D_Fill.vb b/Wardrobe/SolidWorks/Model_3D_Fill.vb new file mode 100644 index 0000000..d1ad595 --- /dev/null +++ b/Wardrobe/SolidWorks/Model_3D_Fill.vb @@ -0,0 +1,58 @@ +Imports XCCLibrary + +Public Class Model_3D_Fill + Private Shared designName As String + Public Shared Sub BuildGrid() + Dim exportTable As DataTable + exportTable = User_Input.Create_ExportTable() + + XCCBaseClass.newDesign() + ExternalClass.PopulateTamplateXMLGroup() + + + + Dim inst_ As Integer + Dim parentID As Integer = 0 + Dim gratingParameters As DataRow = exportTable.Rows(0) + + For i = 0 To Grating_Fill.gratingDimensions.Rows.Count - 1 + inst_ = ExternalClass.instantiate_parts(parentID, gratingParameters("TYPE"), "") ' Ange pressure_welded eller type A, Serrated? + ExternalClass.modify_parameter_value("DP_LOADBAR_THICKNESS", inst_, gratingParameters("LOADBAR_THICKNESS")) + ExternalClass.modify_parameter_value("DP_LOADBAR_HEIGHT", inst_, gratingParameters("LOADBAR_HEIGHT")) + ExternalClass.modify_parameter_value("DP_LOADBAR_SPACING", inst_, gratingParameters("LOADBAR_SPACING")) + ExternalClass.modify_parameter_value("DP_CROSSBAR_SPACING", inst_, gratingParameters("CROSSBAR_SPACING")) + + If gratingParameters("TYPE") = "pressure_welded" Then + ExternalClass.modify_parameter_value("DP_CROSSBAR_DIAMETER", inst_, gratingParameters("CROSSBAR_DIAMETER")) + Else + ExternalClass.modify_parameter_value("DP_CROSSBAR_THICKNESS", inst_, gratingParameters("CROSSBAR_THICKNESS")) + ExternalClass.modify_parameter_value("DP_CROSSBAR_HEIGHT", inst_, gratingParameters("CROSSBAR_HEIGHT")) + End If + + + ExternalClass.modify_parameter_value("DP_GRATING_WIDTH", inst_, Grating_Fill.gratingDimensions.Rows(i)("WIDTH")) + ExternalClass.modify_parameter_value("DP_GRATING_LENGTH", inst_, Grating_Fill.gratingDimensions.Rows(i)("LENGTH")) + Dim offsetX As Integer = 0 + For j = 1 To Grating_Fill.gratingDimensions.Rows(i)("COLUMN") + offsetX += Grating_Fill.gratingDimensions.Rows(i - j)("LENGTH") + + Next + + Dim offsetY As Integer = 0 + For j = 1 To Grating_Fill.gratingDimensions.Rows(i)("ROW") + offsetY += Grating_Fill.gratingDimensions.Rows(i - Grating_Fill.numOfHorizontal * j)("WIDTH") + + Next + + ExternalClass.modify_parameter_value("DP_OFFSET_X", inst_, (Grating_Fill.gratingDimensions.Rows(i)("LENGTH") / 2) + offsetX) + ExternalClass.modify_parameter_value("DP_OFFSET_Y", inst_, (Grating_Fill.gratingDimensions.Rows(i)("WIDTH") / 2) + offsetY) + Next + + importClass.copyGroupsByDataSet(ExternalClass.groupds_new) + Dim grNr = groupClass.NewGroupID + Dim designTable = designModel.selectDesign("*") + designName = designTable.rows(0)("designName") + groupClass.InstantiateGroup(designName, grNr, "START") + End Sub + +End Class diff --git a/Wardrobe/Wardrobe.vbproj b/Wardrobe/Wardrobe.vbproj index 87a6fc8..4e2db4c 100644 --- a/Wardrobe/Wardrobe.vbproj +++ b/Wardrobe/Wardrobe.vbproj @@ -97,12 +97,6 @@ Form - - Multiple.vb - - - Form - @@ -125,6 +119,7 @@ + @@ -136,9 +131,6 @@ Main_Menu.vb - - Multiple.vb - VbMyResourcesResXFileCodeGenerator Resources.Designer.vb