diff --git a/Wardrobe/GUI.Designer.vb b/Wardrobe/GUI.Designer.vb index 37ab63d..732d17b 100644 --- a/Wardrobe/GUI.Designer.vb +++ b/Wardrobe/GUI.Designer.vb @@ -23,267 +23,30 @@ Partial Class GUI _ Private Sub InitializeComponent() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(GUI)) - Me.Section_gui = New System.Windows.Forms.TabControl() - Me.Rail_lb = New System.Windows.Forms.Label() - Me.Hanger_lb = New System.Windows.Forms.Label() - Me.Shelf_lb = New System.Windows.Forms.Label() - Me.Basket_lb = New System.Windows.Forms.Label() - Me.Drying_lb = New System.Windows.Forms.Label() - Me.Hooks_lb = New System.Windows.Forms.Label() - Me.Del_rail_lb = New System.Windows.Forms.Label() - Me.Del_rail_btn = New System.Windows.Forms.Button() - Me.Hanger_btn = New System.Windows.Forms.Button() - Me.Shelf_btn = New System.Windows.Forms.Button() - Me.Basket_btn = New System.Windows.Forms.Button() - Me.Drying_btn = New System.Windows.Forms.Button() - Me.Hooks_btn = New System.Windows.Forms.Button() - Me.Rail_btn = New System.Windows.Forms.Button() - Me.Build_btn = New System.Windows.Forms.Button() - Me.Update_KB = New System.Windows.Forms.Button() + Me.Panel1 = New System.Windows.Forms.Panel() Me.SuspendLayout() ' - 'Section_gui + 'Panel1 ' - Me.Section_gui.Location = New System.Drawing.Point(18, 298) - Me.Section_gui.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.Section_gui.Name = "Section_gui" - Me.Section_gui.SelectedIndex = 0 - Me.Section_gui.Size = New System.Drawing.Size(822, 703) - Me.Section_gui.TabIndex = 0 - ' - 'Rail_lb - ' - Me.Rail_lb.AutoSize = True - Me.Rail_lb.Location = New System.Drawing.Point(14, 118) - Me.Rail_lb.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.Rail_lb.Name = "Rail_lb" - Me.Rail_lb.Size = New System.Drawing.Size(103, 20) - Me.Rail_lb.TabIndex = 13 - Me.Rail_lb.Text = "Add Wall Rail" - ' - 'Hanger_lb - ' - Me.Hanger_lb.AutoSize = True - Me.Hanger_lb.Location = New System.Drawing.Point(162, 118) - Me.Hanger_lb.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.Hanger_lb.Name = "Hanger_lb" - Me.Hanger_lb.Size = New System.Drawing.Size(95, 20) - Me.Hanger_lb.TabIndex = 14 - Me.Hanger_lb.Text = "Add Hanger" - ' - 'Shelf_lb - ' - Me.Shelf_lb.AutoSize = True - Me.Shelf_lb.Location = New System.Drawing.Point(304, 118) - Me.Shelf_lb.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.Shelf_lb.Name = "Shelf_lb" - Me.Shelf_lb.Size = New System.Drawing.Size(79, 20) - Me.Shelf_lb.TabIndex = 15 - Me.Shelf_lb.Text = "Add Shelf" - ' - 'Basket_lb - ' - Me.Basket_lb.AutoSize = True - Me.Basket_lb.Location = New System.Drawing.Point(444, 118) - Me.Basket_lb.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.Basket_lb.Name = "Basket_lb" - Me.Basket_lb.Size = New System.Drawing.Size(92, 20) - Me.Basket_lb.TabIndex = 16 - Me.Basket_lb.Text = "Add Basket" - ' - 'Drying_lb - ' - Me.Drying_lb.AutoSize = True - Me.Drying_lb.Location = New System.Drawing.Point(562, 118) - Me.Drying_lb.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.Drying_lb.Name = "Drying_lb" - Me.Drying_lb.Size = New System.Drawing.Size(128, 20) - Me.Drying_lb.TabIndex = 17 - Me.Drying_lb.Text = "Add Drying Rack" - ' - 'Hooks_lb - ' - Me.Hooks_lb.AutoSize = True - Me.Hooks_lb.Location = New System.Drawing.Point(718, 118) - Me.Hooks_lb.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.Hooks_lb.Name = "Hooks_lb" - Me.Hooks_lb.Size = New System.Drawing.Size(88, 20) - Me.Hooks_lb.TabIndex = 18 - Me.Hooks_lb.Text = "Add Hooks" - ' - 'Del_rail_lb - ' - Me.Del_rail_lb.AutoSize = True - Me.Del_rail_lb.Location = New System.Drawing.Point(14, 243) - Me.Del_rail_lb.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.Del_rail_lb.Name = "Del_rail_lb" - Me.Del_rail_lb.Size = New System.Drawing.Size(133, 20) - Me.Del_rail_lb.TabIndex = 20 - Me.Del_rail_lb.Text = "Remove Wall Rail" - ' - 'Del_rail_btn - ' - Me.Del_rail_btn.BackColor = System.Drawing.SystemColors.InactiveBorder - Me.Del_rail_btn.BackgroundImage = Global.Wardrobe.My.Resources.Resources.remove_b - Me.Del_rail_btn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.Del_rail_btn.FlatAppearance.BorderColor = System.Drawing.SystemColors.Highlight - Me.Del_rail_btn.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Del_rail_btn.Location = New System.Drawing.Point(24, 162) - Me.Del_rail_btn.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.Del_rail_btn.Name = "Del_rail_btn" - Me.Del_rail_btn.Size = New System.Drawing.Size(75, 77) - Me.Del_rail_btn.TabIndex = 19 - Me.Del_rail_btn.UseVisualStyleBackColor = False - ' - 'Hanger_btn - ' - Me.Hanger_btn.BackColor = System.Drawing.SystemColors.InactiveBorder - Me.Hanger_btn.BackgroundImage = Global.Wardrobe.My.Resources.Resources.add_b - Me.Hanger_btn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.Hanger_btn.FlatAppearance.BorderColor = System.Drawing.SystemColors.Highlight - Me.Hanger_btn.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Hanger_btn.Location = New System.Drawing.Point(166, 37) - Me.Hanger_btn.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.Hanger_btn.Name = "Hanger_btn" - Me.Hanger_btn.Size = New System.Drawing.Size(75, 77) - Me.Hanger_btn.TabIndex = 12 - Me.Hanger_btn.UseVisualStyleBackColor = False - ' - 'Shelf_btn - ' - Me.Shelf_btn.BackColor = System.Drawing.SystemColors.InactiveBorder - Me.Shelf_btn.BackgroundImage = Global.Wardrobe.My.Resources.Resources.add_b - Me.Shelf_btn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.Shelf_btn.FlatAppearance.BorderColor = System.Drawing.SystemColors.Highlight - Me.Shelf_btn.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Shelf_btn.Location = New System.Drawing.Point(308, 70) - Me.Shelf_btn.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.Shelf_btn.Name = "Shelf_btn" - Me.Shelf_btn.Size = New System.Drawing.Size(75, 77) - Me.Shelf_btn.TabIndex = 11 - Me.Shelf_btn.UseVisualStyleBackColor = False - ' - 'Basket_btn - ' - Me.Basket_btn.BackColor = System.Drawing.SystemColors.InactiveBorder - Me.Basket_btn.BackgroundImage = Global.Wardrobe.My.Resources.Resources.add_b - Me.Basket_btn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.Basket_btn.FlatAppearance.BorderColor = System.Drawing.SystemColors.Highlight - Me.Basket_btn.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Basket_btn.Location = New System.Drawing.Point(448, 37) - Me.Basket_btn.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.Basket_btn.Name = "Basket_btn" - Me.Basket_btn.Size = New System.Drawing.Size(75, 77) - Me.Basket_btn.TabIndex = 10 - Me.Basket_btn.UseVisualStyleBackColor = False - ' - 'Drying_btn - ' - Me.Drying_btn.BackColor = System.Drawing.SystemColors.InactiveBorder - Me.Drying_btn.BackgroundImage = Global.Wardrobe.My.Resources.Resources.add_b - Me.Drying_btn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.Drying_btn.FlatAppearance.BorderColor = System.Drawing.SystemColors.Highlight - Me.Drying_btn.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Drying_btn.Location = New System.Drawing.Point(591, 37) - Me.Drying_btn.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.Drying_btn.Name = "Drying_btn" - Me.Drying_btn.Size = New System.Drawing.Size(75, 77) - Me.Drying_btn.TabIndex = 9 - Me.Drying_btn.UseVisualStyleBackColor = False - ' - 'Hooks_btn - ' - Me.Hooks_btn.BackColor = System.Drawing.SystemColors.InactiveBorder - Me.Hooks_btn.BackgroundImage = Global.Wardrobe.My.Resources.Resources.add_b - Me.Hooks_btn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.Hooks_btn.FlatAppearance.BorderColor = System.Drawing.SystemColors.Highlight - Me.Hooks_btn.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Hooks_btn.Location = New System.Drawing.Point(723, 37) - Me.Hooks_btn.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.Hooks_btn.Name = "Hooks_btn" - Me.Hooks_btn.Size = New System.Drawing.Size(75, 77) - Me.Hooks_btn.TabIndex = 8 - Me.Hooks_btn.UseVisualStyleBackColor = False - ' - 'Rail_btn - ' - Me.Rail_btn.BackColor = System.Drawing.SystemColors.InactiveBorder - Me.Rail_btn.BackgroundImage = Global.Wardrobe.My.Resources.Resources.add_b - Me.Rail_btn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.Rail_btn.FlatAppearance.BorderColor = System.Drawing.SystemColors.Highlight - Me.Rail_btn.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Rail_btn.Location = New System.Drawing.Point(24, 37) - Me.Rail_btn.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.Rail_btn.Name = "Rail_btn" - Me.Rail_btn.Size = New System.Drawing.Size(75, 77) - Me.Rail_btn.TabIndex = 1 - Me.Rail_btn.UseVisualStyleBackColor = False - ' - 'Build_btn - ' - Me.Build_btn.Location = New System.Drawing.Point(654, 226) - Me.Build_btn.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.Build_btn.Name = "Build_btn" - Me.Build_btn.Size = New System.Drawing.Size(144, 52) - Me.Build_btn.TabIndex = 21 - Me.Build_btn.Text = "Build" - Me.Build_btn.UseVisualStyleBackColor = True - ' - 'Update_KB - ' - Me.Update_KB.Location = New System.Drawing.Point(476, 226) - Me.Update_KB.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.Update_KB.Name = "Update_KB" - Me.Update_KB.Size = New System.Drawing.Size(144, 52) - Me.Update_KB.TabIndex = 22 - Me.Update_KB.Text = "Update KB" - Me.Update_KB.UseVisualStyleBackColor = True + Me.Panel1.BackColor = System.Drawing.SystemColors.ControlLight + Me.Panel1.Location = New System.Drawing.Point(702, 152) + Me.Panel1.Name = "Panel1" + Me.Panel1.Size = New System.Drawing.Size(610, 388) + Me.Panel1.TabIndex = 0 ' 'GUI ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 16.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(858, 1020) - Me.Controls.Add(Me.Update_KB) - Me.Controls.Add(Me.Build_btn) - Me.Controls.Add(Me.Del_rail_lb) - Me.Controls.Add(Me.Del_rail_btn) - Me.Controls.Add(Me.Hooks_lb) - Me.Controls.Add(Me.Drying_lb) - Me.Controls.Add(Me.Basket_lb) - Me.Controls.Add(Me.Shelf_lb) - Me.Controls.Add(Me.Hanger_lb) - Me.Controls.Add(Me.Rail_lb) - Me.Controls.Add(Me.Hanger_btn) - Me.Controls.Add(Me.Shelf_btn) - Me.Controls.Add(Me.Basket_btn) - Me.Controls.Add(Me.Drying_btn) - Me.Controls.Add(Me.Hooks_btn) - Me.Controls.Add(Me.Rail_btn) - Me.Controls.Add(Me.Section_gui) + Me.ClientSize = New System.Drawing.Size(1324, 552) + Me.Controls.Add(Me.Panel1) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) - Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.Name = "GUI" Me.Text = "Build a wardrobe" Me.ResumeLayout(False) - Me.PerformLayout() End Sub - Friend WithEvents Section_gui As TabControl - Friend WithEvents Rail_btn As Button - Friend WithEvents Hooks_btn As Button - Friend WithEvents Drying_btn As Button - Friend WithEvents Basket_btn As Button - Friend WithEvents Shelf_btn As Button - Friend WithEvents Hanger_btn As Button - Friend WithEvents Rail_lb As Label - Friend WithEvents Hanger_lb As Label - Friend WithEvents Shelf_lb As Label - Friend WithEvents Basket_lb As Label - Friend WithEvents Drying_lb As Label - Friend WithEvents Hooks_lb As Label - Friend WithEvents Del_rail_lb As Label - Friend WithEvents Del_rail_btn As Button - Friend WithEvents Build_btn As Button - Friend WithEvents Update_KB As Button + + Friend WithEvents Panel1 As Panel End Class diff --git a/Wardrobe/GUI.vb b/Wardrobe/GUI.vb index f4ad408..af3fafc 100644 --- a/Wardrobe/GUI.vb +++ b/Wardrobe/GUI.vb @@ -1,5 +1,52 @@ Imports XCCLibrary Public Class GUI + Public Shared Surface As Graphics + Public Shared line As Integer = 0 + Public Shared point1 As Integer = 0 + Public Shared point2 As Integer = 0 + Public Shared point1p + Public Shared point2p + Public Shared mpos + Sub GUI_load() Handles MyBase.Load + Surface = CreateGraphics() + get_drawbox() + End Sub + + Private Sub get_drawbox() + Dim DrawBox As Panel + DrawBox = Panel1 + + Dim locX, locY As Integer + locX = DrawBox.Location.X + locY = DrawBox.Location.Y + + Dim boxW, boxH As Integer + boxW = DrawBox.Size.Width + boxH = DrawBox.Size.Height + + Dim boxMidX, boxMidY As Integer + boxMidX = locX + boxW / 2 + boxMidY = locY + boxH / 2 + + Dim pen As Pen = New Pen(Color.Red, 2) + Surface.DrawLine(pen, boxMidX, boxMidY, locX, locY) + End Sub + + Private Sub mouse_cl(sender As Object, e As MouseEventArgs) Handles Me.MouseClick + mpos = e + If point1 = 0 And point2 = 0 Then + point1p = mpos + point1 = 1 + ElseIf point1 = 1 And point2 = 0 Then + point2p = mpos + point2 = 1 + + Dim pen1 As Pen = New Pen(Color.Red, 2) + Surface.DrawLine(pen1, point1p.X, point1p.Y, point2p.X, point2p.Y) + point1 = 0 + point2 = 0 + End If + End Sub End Class diff --git a/Wardrobe/temp1.vb b/Wardrobe/temp1.vb index da4e735..ebc5a89 100644 --- a/Wardrobe/temp1.vb +++ b/Wardrobe/temp1.vb @@ -517,7 +517,7 @@ Public Class temp1 Dim Input As DataSet Input = Populate_table_from_GUI() - Program.Add_Parts(Input) + 'Program.Add_Parts(Input) importClass.copyGroupsByDataSet(ExternalClass.groupds_new) Dim GrNr = groupClass.NewGroupID @@ -529,6 +529,6 @@ Public Class temp1 End Sub Private Sub Update_KB_Click(sender As Object, e As EventArgs) Handles Update_KB.Click - Program.UpdateKB() + 'Program.UpdateKB() End Sub End Class \ No newline at end of file