diff --git a/Databas.xlsx b/Databas.xlsx index c21cba6..988c984 100644 Binary files a/Databas.xlsx and b/Databas.xlsx differ diff --git a/Wardrobe/GUI.Designer.vb b/Wardrobe/GUI.Designer.vb index 7efec01..7a720a9 100644 --- a/Wardrobe/GUI.Designer.vb +++ b/Wardrobe/GUI.Designer.vb @@ -68,7 +68,7 @@ Partial Class GUI ' Me.Label1.AutoSize = True Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label1.Location = New System.Drawing.Point(45, 348) + Me.Label1.Location = New System.Drawing.Point(45, 400) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(44, 17) Me.Label1.TabIndex = 4 @@ -78,7 +78,7 @@ Partial Class GUI ' Me.Label2.AutoSize = True Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label2.Location = New System.Drawing.Point(34, 408) + Me.Label2.Location = New System.Drawing.Point(34, 460) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(52, 17) Me.Label2.TabIndex = 5 @@ -133,7 +133,7 @@ Partial Class GUI Me.ComboBox_MeshSize.Enabled = False Me.ComboBox_MeshSize.FormattingEnabled = True Me.ComboBox_MeshSize.Items.AddRange(New Object() {"12x100 (B9)", "25x50 (F4)", "34x37 (H3)"}) - Me.ComboBox_MeshSize.Location = New System.Drawing.Point(91, 144) + Me.ComboBox_MeshSize.Location = New System.Drawing.Point(91, 196) Me.ComboBox_MeshSize.Margin = New System.Windows.Forms.Padding(2) Me.ComboBox_MeshSize.Name = "ComboBox_MeshSize" Me.ComboBox_MeshSize.Size = New System.Drawing.Size(141, 21) @@ -145,7 +145,7 @@ Partial Class GUI Me.ComboBox_Thickness.Enabled = False Me.ComboBox_Thickness.FormattingEnabled = True Me.ComboBox_Thickness.Items.AddRange(New Object() {"2", "3", "4"}) - Me.ComboBox_Thickness.Location = New System.Drawing.Point(91, 253) + Me.ComboBox_Thickness.Location = New System.Drawing.Point(91, 305) Me.ComboBox_Thickness.Margin = New System.Windows.Forms.Padding(2) Me.ComboBox_Thickness.Name = "ComboBox_Thickness" Me.ComboBox_Thickness.Size = New System.Drawing.Size(141, 21) @@ -157,7 +157,7 @@ Partial Class GUI Me.ComboBox_Height.Enabled = False Me.ComboBox_Height.FormattingEnabled = True Me.ComboBox_Height.Items.AddRange(New Object() {"20", "25", "30"}) - Me.ComboBox_Height.Location = New System.Drawing.Point(91, 212) + Me.ComboBox_Height.Location = New System.Drawing.Point(91, 264) Me.ComboBox_Height.Margin = New System.Windows.Forms.Padding(2) Me.ComboBox_Height.Name = "ComboBox_Height" Me.ComboBox_Height.Size = New System.Drawing.Size(141, 21) @@ -177,7 +177,7 @@ Partial Class GUI ' Me.Label4.AutoSize = True Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label4.Location = New System.Drawing.Point(13, 145) + Me.Label4.Location = New System.Drawing.Point(13, 197) Me.Label4.Name = "Label4" Me.Label4.Size = New System.Drawing.Size(73, 17) Me.Label4.TabIndex = 18 @@ -187,7 +187,7 @@ Partial Class GUI ' Me.Label5.AutoSize = True Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label5.Location = New System.Drawing.Point(14, 254) + Me.Label5.Location = New System.Drawing.Point(14, 306) Me.Label5.Name = "Label5" Me.Label5.Size = New System.Drawing.Size(72, 17) Me.Label5.TabIndex = 19 @@ -197,7 +197,7 @@ Partial Class GUI ' Me.Label6.AutoSize = True Me.Label6.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label6.Location = New System.Drawing.Point(37, 212) + Me.Label6.Location = New System.Drawing.Point(37, 264) Me.Label6.Name = "Label6" Me.Label6.Size = New System.Drawing.Size(49, 17) Me.Label6.TabIndex = 20 @@ -219,7 +219,7 @@ Partial Class GUI Me.ComboBox_Width.Enabled = False Me.ComboBox_Width.FormattingEnabled = True Me.ComboBox_Width.Items.AddRange(New Object() {"500", "700", "722", "1000"}) - Me.ComboBox_Width.Location = New System.Drawing.Point(94, 348) + Me.ComboBox_Width.Location = New System.Drawing.Point(94, 400) Me.ComboBox_Width.Margin = New System.Windows.Forms.Padding(2) Me.ComboBox_Width.Name = "ComboBox_Width" Me.ComboBox_Width.Size = New System.Drawing.Size(141, 21) @@ -230,7 +230,7 @@ Partial Class GUI Me.ComboBox_Length.Enabled = False Me.ComboBox_Length.FormattingEnabled = True Me.ComboBox_Length.Items.AddRange(New Object() {"300", "600", "900", "1000", "3000"}) - Me.ComboBox_Length.Location = New System.Drawing.Point(94, 408) + Me.ComboBox_Length.Location = New System.Drawing.Point(94, 460) Me.ComboBox_Length.Margin = New System.Windows.Forms.Padding(2) Me.ComboBox_Length.Name = "ComboBox_Length" Me.ComboBox_Length.Size = New System.Drawing.Size(141, 21) @@ -282,7 +282,7 @@ Partial Class GUI Me.CheckBox1.AutoSize = True Me.CheckBox1.Checked = True Me.CheckBox1.CheckState = System.Windows.Forms.CheckState.Checked - Me.CheckBox1.Location = New System.Drawing.Point(94, 316) + Me.CheckBox1.Location = New System.Drawing.Point(94, 368) Me.CheckBox1.Margin = New System.Windows.Forms.Padding(2) Me.CheckBox1.Name = "CheckBox1" Me.CheckBox1.Size = New System.Drawing.Size(121, 18) diff --git a/Wardrobe/GUI.vb b/Wardrobe/GUI.vb index f43673b..18da343 100644 --- a/Wardrobe/GUI.vb +++ b/Wardrobe/GUI.vb @@ -2,8 +2,8 @@ Imports Excel = Microsoft.Office.Interop.Excel Public Class GUI - 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" Dim filesFolder As String = filepath ' Hämta från settings Dim HLCtFolder As String = filepath & "\X2021" ' Hämta från settings @@ -45,6 +45,10 @@ Public Class GUI Dim serratedCheckBox As New CheckBox Dim serratedCheckBoxBol As Boolean = False + Dim lacqueredCheckBox As New CheckBox + Dim lacqueredCheckBoxBol As Boolean = False + Dim gratingLacquered As Boolean = False + Dim dataBase As New Dictionary(Of String, DataTable) @@ -438,11 +442,27 @@ Public Class GUI RemoveHandler serratedCheckBox.CheckedChanged, AddressOf CheckBox_Serrated_CheckedChanged Me.Controls.RemoveByKey("CheckBox_Serrated") serratedCheckBoxBol = False + gratingSerrated = False End If End If - ' CheckBox för lack eller ej då varförzinkat eller obehandlat väljs, påverkar ej övrig kod (förutom kommentar att det är special order) + If lacqueredCheckBoxBol = False AndAlso (gratingMaterial = "Hot dip galvanized steel" OrElse gratingMaterial = "Untreated") Then + lacqueredCheckBox.Name = "CheckBox_Lacquered" + lacqueredCheckBox.Text = "Lacquered" + lacqueredCheckBox.Left = 115 + lacqueredCheckBox.Top = 135 + AddHandler lacqueredCheckBox.CheckedChanged, AddressOf CheckBox_Lacquered_CheckedChanged + Me.Controls.Add(lacqueredCheckBox) + lacqueredCheckBoxBol = True + ElseIf lacqueredCheckBoxBol = True AndAlso gratingMaterial <> "Hot dip galvanized steel" AndAlso gratingMaterial <> "Untreated" Then + RemoveHandler lacqueredCheckBox.CheckedChanged, AddressOf CheckBox_Lacquered_CheckedChanged + Me.Controls.RemoveByKey("CheckBox_Lacquered") + lacqueredCheckBoxBol = False + gratingLacquered = False + End If + + ' Untreated finns för alla som är varmförzinkade enligt Jakob Teams Update_AvalaibleMeshes() End Sub @@ -457,6 +477,18 @@ Public Class GUI End If End Sub + Private Sub CheckBox_Lacquered_CheckedChanged(sender As Object, e As EventArgs) + 'Här hanterar vi om den är lackad eller inte + 'påverkar ej övrig kod (förutom kommentar att det är special order) + If sender.Checked Then + gratingLacquered = True + + Else + gratingLacquered = False + + End If + End Sub + Private Sub Update_AvalaibleMeshes() ComboBox_MeshSize.Items.Clear()