From 2d05bff5ddb55e0663b667967eefa895203ead11 Mon Sep 17 00:00:00 2001 From: Mans Date: Tue, 4 May 2021 15:31:45 +0200 Subject: [PATCH] Updated Quote --- Wardrobe/GUI/Export.Designer.vb | 59 ++-- Wardrobe/GUI/Export.vb | 10 +- Wardrobe/GUI/Grating_Configurator.Designer.vb | 283 ++++++++++-------- Wardrobe/GUI/Grating_Configurator.vb | 15 + Wardrobe/Gratings Data/User_Input.vb | 3 +- Wardrobe/Quote_Export/GUI_Export.vb | 185 +++++++++++- Wardrobe/SolidWorks/Frame_3D.vb | 25 +- Wardrobe/SolidWorks/Individual_3D.vb | 2 +- Wardrobe/SolidWorks/Multiple_3D.vb | 2 +- 9 files changed, 401 insertions(+), 183 deletions(-) diff --git a/Wardrobe/GUI/Export.Designer.vb b/Wardrobe/GUI/Export.Designer.vb index bc616fb..8d4fb37 100644 --- a/Wardrobe/GUI/Export.Designer.vb +++ b/Wardrobe/GUI/Export.Designer.vb @@ -38,11 +38,13 @@ Partial Class Export Me.Panel1 = New System.Windows.Forms.Panel() Me.Panel2 = New System.Windows.Forms.Panel() Me.Button_Export2 = New System.Windows.Forms.Button() + Me.Panel3 = New System.Windows.Forms.Panel() Me.SuspendLayout() ' 'CheckBox_3DModel ' Me.CheckBox_3DModel.AutoSize = True + Me.CheckBox_3DModel.BackColor = System.Drawing.SystemColors.ControlDark Me.CheckBox_3DModel.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.CheckBox_3DModel.ForeColor = System.Drawing.SystemColors.ControlLightLight Me.CheckBox_3DModel.Location = New System.Drawing.Point(28, 73) @@ -51,11 +53,12 @@ Partial Class Export Me.CheckBox_3DModel.Size = New System.Drawing.Size(130, 21) Me.CheckBox_3DModel.TabIndex = 37 Me.CheckBox_3DModel.Text = "Grating + Frame" - Me.CheckBox_3DModel.UseVisualStyleBackColor = True + Me.CheckBox_3DModel.UseVisualStyleBackColor = False ' 'CheckBox_FrameDrawing ' Me.CheckBox_FrameDrawing.AutoSize = True + Me.CheckBox_FrameDrawing.BackColor = System.Drawing.SystemColors.ControlDark Me.CheckBox_FrameDrawing.Enabled = False Me.CheckBox_FrameDrawing.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.CheckBox_FrameDrawing.ForeColor = System.Drawing.SystemColors.ControlLightLight @@ -65,11 +68,12 @@ Partial Class Export Me.CheckBox_FrameDrawing.Size = New System.Drawing.Size(67, 21) Me.CheckBox_FrameDrawing.TabIndex = 36 Me.CheckBox_FrameDrawing.Text = "Frame" - Me.CheckBox_FrameDrawing.UseVisualStyleBackColor = True + Me.CheckBox_FrameDrawing.UseVisualStyleBackColor = False ' 'CheckBox_GratingDrawing ' Me.CheckBox_GratingDrawing.AutoSize = True + Me.CheckBox_GratingDrawing.BackColor = System.Drawing.SystemColors.ControlDark Me.CheckBox_GratingDrawing.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.CheckBox_GratingDrawing.ForeColor = System.Drawing.SystemColors.ControlLightLight Me.CheckBox_GratingDrawing.Location = New System.Drawing.Point(190, 73) @@ -78,24 +82,25 @@ Partial Class Export Me.CheckBox_GratingDrawing.Size = New System.Drawing.Size(74, 21) Me.CheckBox_GratingDrawing.TabIndex = 35 Me.CheckBox_GratingDrawing.Text = "Grating" - Me.CheckBox_GratingDrawing.UseVisualStyleBackColor = True + Me.CheckBox_GratingDrawing.UseVisualStyleBackColor = False ' 'CheckBox_Instructions ' Me.CheckBox_Instructions.AutoSize = True + Me.CheckBox_Instructions.BackColor = System.Drawing.SystemColors.ControlDark Me.CheckBox_Instructions.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.CheckBox_Instructions.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.CheckBox_Instructions.Location = New System.Drawing.Point(327, 73) + Me.CheckBox_Instructions.Location = New System.Drawing.Point(321, 73) Me.CheckBox_Instructions.Margin = New System.Windows.Forms.Padding(2) Me.CheckBox_Instructions.Name = "CheckBox_Instructions" Me.CheckBox_Instructions.Size = New System.Drawing.Size(163, 21) Me.CheckBox_Instructions.TabIndex = 33 Me.CheckBox_Instructions.Text = "Assembly Instructions" - Me.CheckBox_Instructions.UseVisualStyleBackColor = True + Me.CheckBox_Instructions.UseVisualStyleBackColor = False ' 'Button_Export ' - Me.Button_Export.BackColor = System.Drawing.Color.Transparent + Me.Button_Export.BackColor = System.Drawing.SystemColors.ControlDark Me.Button_Export.FlatAppearance.BorderSize = 0 Me.Button_Export.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button_Export.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -111,6 +116,7 @@ Partial Class Export 'Label1 ' Me.Label1.AutoSize = True + Me.Label1.BackColor = System.Drawing.SystemColors.ControlDark Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label1.Location = New System.Drawing.Point(25, 43) Me.Label1.Name = "Label1" @@ -121,6 +127,7 @@ Partial Class Export 'CheckBox_3DModel_SW ' Me.CheckBox_3DModel_SW.AutoSize = True + Me.CheckBox_3DModel_SW.BackColor = System.Drawing.SystemColors.ControlDark Me.CheckBox_3DModel_SW.Checked = True Me.CheckBox_3DModel_SW.CheckState = System.Windows.Forms.CheckState.Checked Me.CheckBox_3DModel_SW.Enabled = False @@ -131,12 +138,13 @@ Partial Class Export Me.CheckBox_3DModel_SW.Size = New System.Drawing.Size(80, 17) Me.CheckBox_3DModel_SW.TabIndex = 40 Me.CheckBox_3DModel_SW.Text = "SolidWorks" - Me.CheckBox_3DModel_SW.UseVisualStyleBackColor = True + Me.CheckBox_3DModel_SW.UseVisualStyleBackColor = False Me.CheckBox_3DModel_SW.Visible = False ' 'CheckBox_3DModel_STEP ' Me.CheckBox_3DModel_STEP.AutoSize = True + Me.CheckBox_3DModel_STEP.BackColor = System.Drawing.SystemColors.ControlDark Me.CheckBox_3DModel_STEP.ForeColor = System.Drawing.SystemColors.ControlLightLight Me.CheckBox_3DModel_STEP.Location = New System.Drawing.Point(44, 120) Me.CheckBox_3DModel_STEP.Margin = New System.Windows.Forms.Padding(2) @@ -144,12 +152,13 @@ Partial Class Export Me.CheckBox_3DModel_STEP.Size = New System.Drawing.Size(54, 17) Me.CheckBox_3DModel_STEP.TabIndex = 41 Me.CheckBox_3DModel_STEP.Text = "STEP" - Me.CheckBox_3DModel_STEP.UseVisualStyleBackColor = True + Me.CheckBox_3DModel_STEP.UseVisualStyleBackColor = False Me.CheckBox_3DModel_STEP.Visible = False ' 'Label2 ' Me.Label2.AutoSize = True + Me.Label2.BackColor = System.Drawing.SystemColors.ControlDark Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label2.Location = New System.Drawing.Point(187, 43) Me.Label2.Name = "Label2" @@ -160,8 +169,9 @@ Partial Class Export 'Label3 ' Me.Label3.AutoSize = True + Me.Label3.BackColor = System.Drawing.SystemColors.ControlDark Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label3.Location = New System.Drawing.Point(324, 43) + Me.Label3.Location = New System.Drawing.Point(318, 43) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(49, 17) Me.Label3.TabIndex = 43 @@ -170,40 +180,43 @@ Partial Class Export 'CheckBox_Quote ' Me.CheckBox_Quote.AutoSize = True + Me.CheckBox_Quote.BackColor = System.Drawing.SystemColors.ControlDark Me.CheckBox_Quote.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.CheckBox_Quote.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.CheckBox_Quote.Location = New System.Drawing.Point(327, 99) + Me.CheckBox_Quote.Location = New System.Drawing.Point(321, 99) Me.CheckBox_Quote.Margin = New System.Windows.Forms.Padding(2) Me.CheckBox_Quote.Name = "CheckBox_Quote" Me.CheckBox_Quote.Size = New System.Drawing.Size(66, 21) Me.CheckBox_Quote.TabIndex = 44 Me.CheckBox_Quote.Text = "Quote" - Me.CheckBox_Quote.UseVisualStyleBackColor = True + Me.CheckBox_Quote.UseVisualStyleBackColor = False ' 'CheckBox_Quote_BOM ' Me.CheckBox_Quote_BOM.AutoSize = True + Me.CheckBox_Quote_BOM.BackColor = System.Drawing.SystemColors.ControlDark Me.CheckBox_Quote_BOM.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.CheckBox_Quote_BOM.Location = New System.Drawing.Point(343, 146) + Me.CheckBox_Quote_BOM.Location = New System.Drawing.Point(337, 146) Me.CheckBox_Quote_BOM.Margin = New System.Windows.Forms.Padding(2) Me.CheckBox_Quote_BOM.Name = "CheckBox_Quote_BOM" Me.CheckBox_Quote_BOM.Size = New System.Drawing.Size(50, 17) Me.CheckBox_Quote_BOM.TabIndex = 46 Me.CheckBox_Quote_BOM.Text = "BOM" - Me.CheckBox_Quote_BOM.UseVisualStyleBackColor = True + Me.CheckBox_Quote_BOM.UseVisualStyleBackColor = False Me.CheckBox_Quote_BOM.Visible = False ' 'CheckBox_Quote_Drawing ' Me.CheckBox_Quote_Drawing.AutoSize = True + Me.CheckBox_Quote_Drawing.BackColor = System.Drawing.SystemColors.ControlDark Me.CheckBox_Quote_Drawing.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.CheckBox_Quote_Drawing.Location = New System.Drawing.Point(343, 125) + Me.CheckBox_Quote_Drawing.Location = New System.Drawing.Point(337, 125) Me.CheckBox_Quote_Drawing.Margin = New System.Windows.Forms.Padding(2) Me.CheckBox_Quote_Drawing.Name = "CheckBox_Quote_Drawing" Me.CheckBox_Quote_Drawing.Size = New System.Drawing.Size(65, 17) Me.CheckBox_Quote_Drawing.TabIndex = 45 Me.CheckBox_Quote_Drawing.Text = "Drawing" - Me.CheckBox_Quote_Drawing.UseVisualStyleBackColor = True + Me.CheckBox_Quote_Drawing.UseVisualStyleBackColor = False Me.CheckBox_Quote_Drawing.Visible = False ' 'Panel1 @@ -217,14 +230,14 @@ Partial Class Export 'Panel2 ' Me.Panel2.BackColor = System.Drawing.SystemColors.ActiveCaptionText - Me.Panel2.Location = New System.Drawing.Point(317, 40) + Me.Panel2.Location = New System.Drawing.Point(311, 40) Me.Panel2.Name = "Panel2" Me.Panel2.Size = New System.Drawing.Size(1, 180) Me.Panel2.TabIndex = 50 ' 'Button_Export2 ' - Me.Button_Export2.BackColor = System.Drawing.Color.Transparent + Me.Button_Export2.BackColor = System.Drawing.SystemColors.ControlDark Me.Button_Export2.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Export Me.Button_Export2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.Button_Export2.FlatAppearance.BorderSize = 0 @@ -235,11 +248,19 @@ Partial Class Export Me.Button_Export2.TabIndex = 51 Me.Button_Export2.UseVisualStyleBackColor = False ' + 'Panel3 + ' + Me.Panel3.BackColor = System.Drawing.SystemColors.ControlDark + Me.Panel3.Location = New System.Drawing.Point(12, 12) + Me.Panel3.Name = "Panel3" + Me.Panel3.Size = New System.Drawing.Size(478, 276) + Me.Panel3.TabIndex = 52 + ' 'Export ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.BackColor = System.Drawing.SystemColors.ControlDark + Me.BackColor = System.Drawing.SystemColors.ControlDarkDark Me.ClientSize = New System.Drawing.Size(500, 300) Me.Controls.Add(Me.Button_Export2) Me.Controls.Add(Me.Panel2) @@ -257,6 +278,7 @@ Partial Class Export Me.Controls.Add(Me.CheckBox_FrameDrawing) Me.Controls.Add(Me.CheckBox_GratingDrawing) Me.Controls.Add(Me.CheckBox_Instructions) + Me.Controls.Add(Me.Panel3) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None Me.Name = "Export" Me.Text = "Export" @@ -281,4 +303,5 @@ Partial Class Export Friend WithEvents Panel1 As Panel Friend WithEvents Panel2 As Panel Friend WithEvents Button_Export2 As Button + Friend WithEvents Panel3 As Panel End Class diff --git a/Wardrobe/GUI/Export.vb b/Wardrobe/GUI/Export.vb index 0e76c68..a318fa8 100644 --- a/Wardrobe/GUI/Export.vb +++ b/Wardrobe/GUI/Export.vb @@ -13,10 +13,10 @@ End Sub Private Sub CheckBox_3DModel_STEP_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox_3DModel_STEP.CheckedChanged - If User_Input.Add3DStep = True Then - User_Input.Add3DStep = False + If User_Input.add3DStep = True Then + User_Input.add3DStep = False Else - User_Input.Add3DStep = True + User_Input.add3DStep = True End If End Sub @@ -146,8 +146,10 @@ End If End If + If User_Input.addQuote = True Then + GUI_Export.Generate_Quote() 'FIXA + End If - 'GUI_Export.Generate_Quote() 'FIXA Me.Close() End Sub diff --git a/Wardrobe/GUI/Grating_Configurator.Designer.vb b/Wardrobe/GUI/Grating_Configurator.Designer.vb index 028b5ce..1faa8dd 100644 --- a/Wardrobe/GUI/Grating_Configurator.Designer.vb +++ b/Wardrobe/GUI/Grating_Configurator.Designer.vb @@ -24,7 +24,11 @@ Partial Class Grating_Configurator Private Sub InitializeComponent() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(Grating_Configurator)) Me.Panel_Data = New System.Windows.Forms.Panel() + Me.CheckBox_CutFrame = New System.Windows.Forms.CheckBox() + Me.Button_Calculate2 = New System.Windows.Forms.Button() Me.Button_Calculate = New System.Windows.Forms.Button() + Me.Button_ExportMenu2 = New System.Windows.Forms.Button() + Me.PictureBox_ConfigType = New System.Windows.Forms.PictureBox() Me.Label_ConfigType = New System.Windows.Forms.Label() Me.CheckBox_Frames = New System.Windows.Forms.CheckBox() Me.Label_Frame = New System.Windows.Forms.Label() @@ -52,28 +56,26 @@ Partial Class Grating_Configurator Me.ComboBox_Material = New System.Windows.Forms.ComboBox() Me.ComboBox_Type = New System.Windows.Forms.ComboBox() Me.Panel_Recesses = New System.Windows.Forms.Panel() + Me.Button_Radius = New System.Windows.Forms.Button() + Me.Button_Square_Middle = New System.Windows.Forms.Button() + Me.Button_Angle_Side = New System.Windows.Forms.Button() + Me.Button_Square_Side = New System.Windows.Forms.Button() + 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.Panel_Grating = New System.Windows.Forms.Panel() Me.Label2 = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() - Me.Button_Calculate2 = New System.Windows.Forms.Button() - Me.Button_ExportMenu2 = New System.Windows.Forms.Button() - Me.PictureBox_ConfigType = New System.Windows.Forms.PictureBox() - Me.Button_Radius = New System.Windows.Forms.Button() - Me.Button_Square_Middle = New System.Windows.Forms.Button() - Me.Button_Square_Side = New System.Windows.Forms.Button() - Me.Button_Angle_Side = New System.Windows.Forms.Button() - Me.Button_Square_Corner = New System.Windows.Forms.Button() - Me.Button_Angle_Corner = New System.Windows.Forms.Button() Me.Panel_Data.SuspendLayout() + CType(Me.PictureBox_ConfigType, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel_Recesses.SuspendLayout() Me.Panel_Grating.SuspendLayout() - CType(Me.PictureBox_ConfigType, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'Panel_Data ' Me.Panel_Data.BackColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) + Me.Panel_Data.Controls.Add(Me.CheckBox_CutFrame) Me.Panel_Data.Controls.Add(Me.Button_Calculate2) Me.Panel_Data.Controls.Add(Me.Button_Calculate) Me.Panel_Data.Controls.Add(Me.Button_ExportMenu2) @@ -110,6 +112,33 @@ Partial Class Grating_Configurator Me.Panel_Data.Size = New System.Drawing.Size(315, 772) Me.Panel_Data.TabIndex = 0 ' + 'CheckBox_CutFrame + ' + Me.CheckBox_CutFrame.AutoSize = True + Me.CheckBox_CutFrame.ForeColor = System.Drawing.SystemColors.ControlLightLight + Me.CheckBox_CutFrame.Location = New System.Drawing.Point(110, 589) + Me.CheckBox_CutFrame.Margin = New System.Windows.Forms.Padding(2) + Me.CheckBox_CutFrame.Name = "CheckBox_CutFrame" + Me.CheckBox_CutFrame.Size = New System.Drawing.Size(98, 17) + Me.CheckBox_CutFrame.TabIndex = 41 + Me.CheckBox_CutFrame.Text = "Pre-Cut Frames" + Me.CheckBox_CutFrame.UseVisualStyleBackColor = True + Me.CheckBox_CutFrame.Visible = False + ' + 'Button_Calculate2 + ' + Me.Button_Calculate2.BackColor = System.Drawing.Color.Transparent + Me.Button_Calculate2.BackgroundImage = Global.Wardrobe.My.Resources.Resources.undo_arrow1 + Me.Button_Calculate2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.Button_Calculate2.Enabled = False + Me.Button_Calculate2.FlatAppearance.BorderSize = 0 + Me.Button_Calculate2.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button_Calculate2.Location = New System.Drawing.Point(110, 580) + Me.Button_Calculate2.Name = "Button_Calculate2" + Me.Button_Calculate2.Size = New System.Drawing.Size(29, 33) + Me.Button_Calculate2.TabIndex = 40 + Me.Button_Calculate2.UseVisualStyleBackColor = False + ' 'Button_Calculate ' Me.Button_Calculate.BackColor = System.Drawing.Color.Transparent @@ -126,6 +155,29 @@ Partial Class Grating_Configurator Me.Button_Calculate.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.Button_Calculate.UseVisualStyleBackColor = False ' + 'Button_ExportMenu2 + ' + Me.Button_ExportMenu2.BackColor = System.Drawing.Color.Transparent + Me.Button_ExportMenu2.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Export + Me.Button_ExportMenu2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.Button_ExportMenu2.FlatAppearance.BorderSize = 0 + Me.Button_ExportMenu2.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button_ExportMenu2.Location = New System.Drawing.Point(87, 700) + Me.Button_ExportMenu2.Name = "Button_ExportMenu2" + Me.Button_ExportMenu2.Size = New System.Drawing.Size(41, 33) + Me.Button_ExportMenu2.TabIndex = 38 + Me.Button_ExportMenu2.UseVisualStyleBackColor = False + ' + 'PictureBox_ConfigType + ' + Me.PictureBox_ConfigType.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Individual_Icon + Me.PictureBox_ConfigType.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox_ConfigType.Location = New System.Drawing.Point(225, 36) + Me.PictureBox_ConfigType.Name = "PictureBox_ConfigType" + Me.PictureBox_ConfigType.Size = New System.Drawing.Size(40, 31) + Me.PictureBox_ConfigType.TabIndex = 37 + Me.PictureBox_ConfigType.TabStop = False + ' 'Label_ConfigType ' Me.Label_ConfigType.AutoSize = True @@ -164,6 +216,7 @@ Partial Class Grating_Configurator ' Me.ComboBox_Frame.BackColor = System.Drawing.SystemColors.ScrollBar Me.ComboBox_Frame.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.ComboBox_Frame.Enabled = False Me.ComboBox_Frame.FormattingEnabled = True Me.ComboBox_Frame.Location = New System.Drawing.Point(110, 559) Me.ComboBox_Frame.Name = "ComboBox_Frame" @@ -421,6 +474,91 @@ Partial Class Grating_Configurator Me.Panel_Recesses.Size = New System.Drawing.Size(1395, 120) Me.Panel_Recesses.TabIndex = 1 ' + 'Button_Radius + ' + Me.Button_Radius.BackColor = System.Drawing.Color.Transparent + Me.Button_Radius.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Radius + Me.Button_Radius.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.Button_Radius.Enabled = False + Me.Button_Radius.FlatAppearance.BorderColor = System.Drawing.Color.Black + Me.Button_Radius.FlatAppearance.BorderSize = 0 + Me.Button_Radius.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button_Radius.Location = New System.Drawing.Point(675, 25) + Me.Button_Radius.Name = "Button_Radius" + Me.Button_Radius.Size = New System.Drawing.Size(70, 70) + Me.Button_Radius.TabIndex = 22 + Me.Button_Radius.UseVisualStyleBackColor = False + ' + 'Button_Square_Middle + ' + Me.Button_Square_Middle.BackColor = System.Drawing.Color.Transparent + Me.Button_Square_Middle.BackgroundImage = Global.Wardrobe.My.Resources.Resources.SquareMiddle + Me.Button_Square_Middle.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.Button_Square_Middle.FlatAppearance.BorderColor = System.Drawing.Color.Black + Me.Button_Square_Middle.FlatAppearance.BorderSize = 0 + Me.Button_Square_Middle.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button_Square_Middle.Location = New System.Drawing.Point(885, 25) + Me.Button_Square_Middle.Name = "Button_Square_Middle" + Me.Button_Square_Middle.Size = New System.Drawing.Size(70, 70) + Me.Button_Square_Middle.TabIndex = 21 + Me.Button_Square_Middle.UseVisualStyleBackColor = False + ' + 'Button_Angle_Side + ' + Me.Button_Angle_Side.BackColor = System.Drawing.Color.Transparent + Me.Button_Angle_Side.BackgroundImage = Global.Wardrobe.My.Resources.Resources.RadiusMiddle + Me.Button_Angle_Side.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.Button_Angle_Side.FlatAppearance.BorderColor = System.Drawing.Color.Black + Me.Button_Angle_Side.FlatAppearance.BorderSize = 0 + Me.Button_Angle_Side.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button_Angle_Side.Location = New System.Drawing.Point(990, 25) + Me.Button_Angle_Side.Name = "Button_Angle_Side" + Me.Button_Angle_Side.Size = New System.Drawing.Size(70, 70) + Me.Button_Angle_Side.TabIndex = 19 + Me.Button_Angle_Side.UseVisualStyleBackColor = False + ' + 'Button_Square_Side + ' + Me.Button_Square_Side.BackColor = System.Drawing.Color.Transparent + Me.Button_Square_Side.BackgroundImage = CType(resources.GetObject("Button_Square_Side.BackgroundImage"), System.Drawing.Image) + Me.Button_Square_Side.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.Button_Square_Side.FlatAppearance.BorderColor = System.Drawing.Color.Black + Me.Button_Square_Side.FlatAppearance.BorderSize = 0 + Me.Button_Square_Side.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button_Square_Side.Location = New System.Drawing.Point(780, 25) + Me.Button_Square_Side.Name = "Button_Square_Side" + Me.Button_Square_Side.Size = New System.Drawing.Size(70, 70) + Me.Button_Square_Side.TabIndex = 20 + Me.Button_Square_Side.UseVisualStyleBackColor = False + ' + 'Button_Square_Corner + ' + Me.Button_Square_Corner.BackColor = System.Drawing.Color.Transparent + Me.Button_Square_Corner.BackgroundImage = CType(resources.GetObject("Button_Square_Corner.BackgroundImage"), System.Drawing.Image) + Me.Button_Square_Corner.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.Button_Square_Corner.FlatAppearance.BorderColor = System.Drawing.Color.Black + Me.Button_Square_Corner.FlatAppearance.BorderSize = 0 + Me.Button_Square_Corner.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button_Square_Corner.Location = New System.Drawing.Point(570, 25) + Me.Button_Square_Corner.Name = "Button_Square_Corner" + Me.Button_Square_Corner.Size = New System.Drawing.Size(70, 70) + Me.Button_Square_Corner.TabIndex = 18 + Me.Button_Square_Corner.UseVisualStyleBackColor = False + ' + 'Button_Angle_Corner + ' + Me.Button_Angle_Corner.BackColor = System.Drawing.Color.Transparent + Me.Button_Angle_Corner.BackgroundImage = CType(resources.GetObject("Button_Angle_Corner.BackgroundImage"), System.Drawing.Image) + Me.Button_Angle_Corner.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.Button_Angle_Corner.FlatAppearance.BorderColor = System.Drawing.Color.Black + Me.Button_Angle_Corner.FlatAppearance.BorderSize = 0 + Me.Button_Angle_Corner.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button_Angle_Corner.Location = New System.Drawing.Point(465, 25) + Me.Button_Angle_Corner.Name = "Button_Angle_Corner" + Me.Button_Angle_Corner.Size = New System.Drawing.Size(70, 70) + Me.Button_Angle_Corner.TabIndex = 17 + Me.Button_Angle_Corner.UseVisualStyleBackColor = False + ' 'Label_Recesses ' Me.Label_Recesses.AutoSize = True @@ -462,128 +600,6 @@ Partial Class Grating_Configurator Me.Label1.TabIndex = 0 Me.Label1.Text = "W" ' - 'Button_Calculate2 - ' - Me.Button_Calculate2.BackColor = System.Drawing.Color.Transparent - Me.Button_Calculate2.BackgroundImage = Global.Wardrobe.My.Resources.Resources.undo_arrow1 - Me.Button_Calculate2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.Button_Calculate2.Enabled = False - Me.Button_Calculate2.FlatAppearance.BorderSize = 0 - Me.Button_Calculate2.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button_Calculate2.Location = New System.Drawing.Point(110, 580) - Me.Button_Calculate2.Name = "Button_Calculate2" - Me.Button_Calculate2.Size = New System.Drawing.Size(29, 33) - Me.Button_Calculate2.TabIndex = 40 - Me.Button_Calculate2.UseVisualStyleBackColor = False - ' - 'Button_ExportMenu2 - ' - Me.Button_ExportMenu2.BackColor = System.Drawing.Color.Transparent - Me.Button_ExportMenu2.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Export - Me.Button_ExportMenu2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.Button_ExportMenu2.FlatAppearance.BorderSize = 0 - Me.Button_ExportMenu2.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button_ExportMenu2.Location = New System.Drawing.Point(87, 700) - Me.Button_ExportMenu2.Name = "Button_ExportMenu2" - Me.Button_ExportMenu2.Size = New System.Drawing.Size(41, 33) - Me.Button_ExportMenu2.TabIndex = 38 - Me.Button_ExportMenu2.UseVisualStyleBackColor = False - ' - 'PictureBox_ConfigType - ' - Me.PictureBox_ConfigType.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Individual_Icon - Me.PictureBox_ConfigType.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox_ConfigType.Location = New System.Drawing.Point(225, 36) - Me.PictureBox_ConfigType.Name = "PictureBox_ConfigType" - Me.PictureBox_ConfigType.Size = New System.Drawing.Size(40, 31) - Me.PictureBox_ConfigType.TabIndex = 37 - Me.PictureBox_ConfigType.TabStop = False - ' - 'Button_Radius - ' - Me.Button_Radius.BackColor = System.Drawing.Color.Transparent - Me.Button_Radius.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Radius - Me.Button_Radius.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.Button_Radius.Enabled = False - Me.Button_Radius.FlatAppearance.BorderColor = System.Drawing.Color.Black - Me.Button_Radius.FlatAppearance.BorderSize = 0 - Me.Button_Radius.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button_Radius.Location = New System.Drawing.Point(675, 25) - Me.Button_Radius.Name = "Button_Radius" - Me.Button_Radius.Size = New System.Drawing.Size(70, 70) - Me.Button_Radius.TabIndex = 22 - Me.Button_Radius.UseVisualStyleBackColor = False - ' - 'Button_Square_Middle - ' - Me.Button_Square_Middle.BackColor = System.Drawing.Color.Transparent - Me.Button_Square_Middle.BackgroundImage = Global.Wardrobe.My.Resources.Resources.SquareMiddle - Me.Button_Square_Middle.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.Button_Square_Middle.FlatAppearance.BorderColor = System.Drawing.Color.Black - Me.Button_Square_Middle.FlatAppearance.BorderSize = 0 - Me.Button_Square_Middle.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button_Square_Middle.Location = New System.Drawing.Point(885, 25) - Me.Button_Square_Middle.Name = "Button_Square_Middle" - Me.Button_Square_Middle.Size = New System.Drawing.Size(70, 70) - Me.Button_Square_Middle.TabIndex = 21 - Me.Button_Square_Middle.UseVisualStyleBackColor = False - ' - 'Button_Square_Side - ' - Me.Button_Square_Side.BackColor = System.Drawing.Color.Transparent - Me.Button_Square_Side.BackgroundImage = CType(resources.GetObject("Button_Square_Side.BackgroundImage"), System.Drawing.Image) - Me.Button_Square_Side.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.Button_Square_Side.FlatAppearance.BorderColor = System.Drawing.Color.Black - Me.Button_Square_Side.FlatAppearance.BorderSize = 0 - Me.Button_Square_Side.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button_Square_Side.Location = New System.Drawing.Point(780, 25) - Me.Button_Square_Side.Name = "Button_Square_Side" - Me.Button_Square_Side.Size = New System.Drawing.Size(70, 70) - Me.Button_Square_Side.TabIndex = 20 - Me.Button_Square_Side.UseVisualStyleBackColor = False - ' - 'Button_Angle_Side - ' - Me.Button_Angle_Side.BackColor = System.Drawing.Color.Transparent - Me.Button_Angle_Side.BackgroundImage = Global.Wardrobe.My.Resources.Resources.RadiusMiddle - Me.Button_Angle_Side.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.Button_Angle_Side.FlatAppearance.BorderColor = System.Drawing.Color.Black - Me.Button_Angle_Side.FlatAppearance.BorderSize = 0 - Me.Button_Angle_Side.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button_Angle_Side.Location = New System.Drawing.Point(990, 25) - Me.Button_Angle_Side.Name = "Button_Angle_Side" - Me.Button_Angle_Side.Size = New System.Drawing.Size(70, 70) - Me.Button_Angle_Side.TabIndex = 19 - Me.Button_Angle_Side.UseVisualStyleBackColor = False - ' - 'Button_Square_Corner - ' - Me.Button_Square_Corner.BackColor = System.Drawing.Color.Transparent - Me.Button_Square_Corner.BackgroundImage = CType(resources.GetObject("Button_Square_Corner.BackgroundImage"), System.Drawing.Image) - Me.Button_Square_Corner.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.Button_Square_Corner.FlatAppearance.BorderColor = System.Drawing.Color.Black - Me.Button_Square_Corner.FlatAppearance.BorderSize = 0 - Me.Button_Square_Corner.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button_Square_Corner.Location = New System.Drawing.Point(570, 25) - Me.Button_Square_Corner.Name = "Button_Square_Corner" - Me.Button_Square_Corner.Size = New System.Drawing.Size(70, 70) - Me.Button_Square_Corner.TabIndex = 18 - Me.Button_Square_Corner.UseVisualStyleBackColor = False - ' - 'Button_Angle_Corner - ' - Me.Button_Angle_Corner.BackColor = System.Drawing.Color.Transparent - Me.Button_Angle_Corner.BackgroundImage = CType(resources.GetObject("Button_Angle_Corner.BackgroundImage"), System.Drawing.Image) - Me.Button_Angle_Corner.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.Button_Angle_Corner.FlatAppearance.BorderColor = System.Drawing.Color.Black - Me.Button_Angle_Corner.FlatAppearance.BorderSize = 0 - Me.Button_Angle_Corner.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button_Angle_Corner.Location = New System.Drawing.Point(465, 25) - Me.Button_Angle_Corner.Name = "Button_Angle_Corner" - Me.Button_Angle_Corner.Size = New System.Drawing.Size(70, 70) - Me.Button_Angle_Corner.TabIndex = 17 - Me.Button_Angle_Corner.UseVisualStyleBackColor = False - ' 'Grating_Configurator ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -598,11 +614,11 @@ Partial Class Grating_Configurator Me.Text = "Individual" Me.Panel_Data.ResumeLayout(False) Me.Panel_Data.PerformLayout() + CType(Me.PictureBox_ConfigType, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel_Recesses.ResumeLayout(False) Me.Panel_Recesses.PerformLayout() Me.Panel_Grating.ResumeLayout(False) Me.Panel_Grating.PerformLayout() - CType(Me.PictureBox_ConfigType, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub @@ -649,4 +665,5 @@ Partial Class Grating_Configurator Friend WithEvents Button_ExportMenu2 As Button Friend WithEvents Button_Calculate2 As Button Friend WithEvents Button_Calculate As Button + Friend WithEvents CheckBox_CutFrame As CheckBox End Class diff --git a/Wardrobe/GUI/Grating_Configurator.vb b/Wardrobe/GUI/Grating_Configurator.vb index ba4d8cb..25c03dd 100644 --- a/Wardrobe/GUI/Grating_Configurator.vb +++ b/Wardrobe/GUI/Grating_Configurator.vb @@ -53,6 +53,7 @@ Public Class Grating_Configurator CheckBox_Frames.Top = 537 Label_Frame.Top = 559 ComboBox_Frame.Top = 559 + CheckBox_CutFrame.Top = 589 Dim CheckTemp As New CheckBox With { .Name = "CheckBox_Whole_Mesh", @@ -91,6 +92,7 @@ Public Class Grating_Configurator CheckBox_Frames.Top = 637 Label_Frame.Top = 659 ComboBox_Frame.Top = 659 + CheckBox_CutFrame.Top = 689 ' --- Max Load --- Dim LabelTemp As New Label With { @@ -293,9 +295,21 @@ Public Class Grating_Configurator Export.CheckBox_FrameDrawing.Checked = False Export.CheckBox_FrameDrawing.Enabled = False User_Input.addFrameDrawing = False + CheckBox_CutFrame.Visible = False + ComboBox_Frame.Enabled = False Else User_Input.addFrame = True Export.CheckBox_FrameDrawing.Enabled = True + CheckBox_CutFrame.Visible = True + ComboBox_Frame.Enabled = True + End If + End Sub + + Private Sub CheckBox_CutFrame_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox_CutFrame.CheckedChanged + If User_Input.preCutFrame = True Then + User_Input.preCutFrame = False + Else + User_Input.preCutFrame = True End If End Sub @@ -351,4 +365,5 @@ Public Class Grating_Configurator Export.ShowDialog() End Sub + End Class \ No newline at end of file diff --git a/Wardrobe/Gratings Data/User_Input.vb b/Wardrobe/Gratings Data/User_Input.vb index 1245baf..082cb25 100644 --- a/Wardrobe/Gratings Data/User_Input.vb +++ b/Wardrobe/Gratings Data/User_Input.vb @@ -18,7 +18,8 @@ Public Shared addFrameDrawing As Boolean = False Public Shared addInstructions As Boolean = False Public Shared addQuote As Boolean = False - Public Shared Add3DStep As Boolean = False + Public Shared add3DStep As Boolean = False + Public Shared preCutFrame As Boolean = False Public Shared frameSize As Integer Public Shared Sub TypeChanged(sender As Object, e As EventArgs) diff --git a/Wardrobe/Quote_Export/GUI_Export.vb b/Wardrobe/Quote_Export/GUI_Export.vb index f740934..c2da436 100644 --- a/Wardrobe/Quote_Export/GUI_Export.vb +++ b/Wardrobe/Quote_Export/GUI_Export.vb @@ -82,7 +82,7 @@ Public Class GUI_Export Dim infoTable As Word.Table Dim tableRange As Word.Range = doc.Bookmarks.Item("\endofdoc").Range - infoTable = doc.Tables.Add(tableRange, 4, 2) + infoTable = doc.Tables.Add(tableRange, 6, 2) infoTable.Columns(1).SetWidth(120, 2) infoTable.Rows.SetHeight(18, 2) @@ -98,7 +98,13 @@ Public Class GUI_Export infoTable.Cell(3, 2).Range.Text = Get_RandomNumber(10000, 99999) infoTable.Cell(4, 1).Range.Text = "Sales Representative:" - infoTable.Cell(4, 2).Range.Text = "Sven Svensson" + infoTable.Cell(4, 2).Range.Text = Settings.SRName + + infoTable.Cell(5, 1).Range.Text = "Phone Number:" + infoTable.Cell(5, 2).Range.Text = Settings.SRPhone + + infoTable.Cell(6, 1).Range.Text = "Mail:" + infoTable.Cell(6, 2).Range.Text = Settings.SRMail End Sub Private Shared Sub Create_ProductsInfo(doc) @@ -112,7 +118,7 @@ Public Class GUI_Export Dim productsTable As Word.Table Dim tableRange As Word.Range = doc.Bookmarks.Item("\endofdoc").Range - productsTable = doc.Tables.Add(tableRange, 5, 5) 'FIXA generiskt + productsTable = doc.Tables.Add(tableRange, 16, 5) productsTable.Rows.SetHeight(18, 2) productsTable.Columns(1).SetWidth(240, 2) productsTable.Columns(2).SetWidth(78, 2) @@ -120,6 +126,9 @@ Public Class GUI_Export productsTable.Columns(4).SetWidth(60, 2) productsTable.Columns(5).SetWidth(52, 2) + Dim productInfoDT As New DataTable + productInfoDT = Generate_ProductInfo() + For c = 1 To productsTable.Columns.Count productsTable.Cell(1, c).Range.Font.Color = Word.WdColor.wdColorWhite productsTable.Cell(1, c).Shading.BackgroundPatternColor = Word.WdColor.wdColorBlack @@ -142,19 +151,13 @@ Public Class GUI_Export productsTable.Cell(1, 4).Range.Text = "Unit Price" productsTable.Cell(1, 5).Range.Text = "Price" - For i = 2 To productsTable.Rows.Count - productsTable.Cell(i, 1).Range.Text = "Floor Grating " & gratingTable.Rows(0)("NAME") & " " & - gratingTable.Rows(0)("LOADBAR_HEIGHT") & "/" & gratingTable.Rows(0)("LOADBAR_THICKNESS") - If gratingTable.Rows(0)("SERRATED") Then - productsTable.Cell(i, 2).Range.Text = gratingTable.Rows(0)("NAME").substring(0, 1) & "S" & - gratingTable.Rows(0)("LOADBAR_HEIGHT") & Get_RandomNumber(10000000, 99999999) - Else - productsTable.Cell(i, 2).Range.Text = gratingTable.Rows(0)("NAME") & gratingTable.Rows(0)("LOADBAR_HEIGHT") & - Get_RandomNumber(10000000, 99999999) - End If - productsTable.Cell(i, 3).Range.Text = 5.ToString("### ###") - productsTable.Cell(i, 4).Range.Text = 20000.ToString("### ###") - productsTable.Cell(i, 5).Range.Text = (CInt(Val(productsTable.Cell(i, 3).Range.Text)) * CInt(Val(productsTable.Cell(i, 4).Range.Text))).ToString("### ###") + For i = 2 To productInfoDT.Rows.Count + 1 + productsTable.Cell(i, 1).Range.Text = productInfoDT.Rows(i - 2)("Description") + productsTable.Cell(i, 2).Range.Text = productInfoDT.Rows(i - 2)("Art. Nr.") + productsTable.Cell(i, 3).Range.Text = CInt(productInfoDT.Rows(i - 2)("QTY")).ToString("### ###") + productsTable.Cell(i, 4).Range.Text = CInt(productInfoDT.Rows(i - 2)("Unit Price")).ToString("### ###") + productsTable.Cell(i, 5).Range.Text = CInt(productInfoDT.Rows(i - 2)("Price")).ToString("### ###") + For j = 1 To productsTable.Columns.Count productsTable.Cell(i, j).Range.Font.Size = 10 Next @@ -260,4 +263,154 @@ Public Class GUI_Export Static Generator As System.Random = New System.Random() Return Generator.Next(Min, Max) End Function + + Private Shared Function Generate_ProductInfo() + Dim productIDT As New DataTable + productIDT.Columns.Add("Description", GetType(String)) + productIDT.Columns.Add("Art. Nr.", GetType(String)) + productIDT.Columns.Add("QTY", GetType(Integer)) + productIDT.Columns.Add("Unit Price", GetType(Integer)) + productIDT.Columns.Add("Price", GetType(Integer)) + + If AppForm.fillMode = True Then + For i = 0 To Calculate_Fill_Grid.gratingDimensionsDT.Rows.Count - 1 + Dim DR As DataRow = Calculate_Fill_Grid.gratingDimensionsDT.Rows(i) + Dim newDR As DataRow = productIDT.NewRow + Dim descStr As String = "Floor Grating " & gratingTable.Rows(0)("NAME") & " " & + gratingTable.Rows(0)("LOADBAR_HEIGHT") & "/" & gratingTable.Rows(0)("LOADBAR_THICKNESS") & + " " & DR("LENGTH") & "x" & DR("WIDTH") + Dim withRecess As Boolean = False + 'For j = 0 To Data.recessData.Rows.Count - 1 'FIXA recessdata "GRATINGS" finns inte + ' Dim recessGratings As List(Of Integer) = Data.recessData.Rows(j)("GRATINGS") + ' For k = 0 To recessGratings.Count - 1 + ' If recessGratings(k) = DR("INDEX") Then + ' withRecess = True + ' End If + ' Next + 'Next + If withRecess = True Then + descStr += " (With Recess)" + End If + + Dim newRow As Boolean = True + For j = 0 To productIDT.Rows.Count - 1 + If productIDT.Rows(j)("Description") = descStr Then + productIDT.Rows(j)("QTY") += 1 + newRow = False + Exit For + End If + Next + + If newRow = True Then + newDR("Description") = descStr + + If gratingTable.Rows(0)("SERRATED") = True Then + newDR("Art. Nr.") = gratingTable.Rows(0)("NAME").substring(0, 1) & "S" & + gratingTable.Rows(0)("LOADBAR_HEIGHT") & Get_RandomNumber(10000000, 99999999) + Else + newDR("Art. Nr.") = gratingTable.Rows(0)("NAME") & gratingTable.Rows(0)("LOADBAR_HEIGHT") & + Get_RandomNumber(10000000, 99999999) + End If + + newDR("QTY") = 1 + Dim gratingArea As Double = (DR("LENGTH") / 1000) * (DR("WIDTH") / 1000) + Dim unitprice As Double = gratingArea * 1000 + If withRecess = True Then + unitprice += 300 + End If + newDR("Unit Price") = unitprice + productIDT.Rows.Add(newDR) + End If + Next + + Else + 'Individual + Dim newDR As DataRow = productIDT.NewRow + Dim descStr As String = "Floor Grating " & gratingTable.Rows(0)("NAME") & " " & + gratingTable.Rows(0)("LOADBAR_HEIGHT") & "/" & gratingTable.Rows(0)("LOADBAR_THICKNESS") & + " " & Data.gratingL & "x" & Data.gratingW + Dim withRecess As Boolean = False + 'For j = 0 To Data.recessData.Rows.Count - 1 'FIXA recessdata "GRATINGS" finns inte + ' Dim recessGratings As List(Of Integer) = Data.recessData.Rows(j)("GRATINGS") + ' For k = 0 To recessGratings.Count - 1 + ' If recessGratings(k) = DR("INDEX") Then + ' withRecess = True + ' End If + ' Next + 'Next + If withRecess = True Then + descStr += " (With Recess)" + End If + + newDR("Description") = descStr + + If gratingTable.Rows(0)("SERRATED") = True Then + newDR("Art. Nr.") = gratingTable.Rows(0)("NAME").substring(0, 1) & "S" & + gratingTable.Rows(0)("LOADBAR_HEIGHT") & Get_RandomNumber(10000000, 99999999) + Else + newDR("Art. Nr.") = gratingTable.Rows(0)("NAME") & gratingTable.Rows(0)("LOADBAR_HEIGHT") & + Get_RandomNumber(10000000, 99999999) + End If + + newDR("QTY") = 1 + Dim gratingArea As Double = (Data.gratingL / 1000) * (Data.gratingW / 1000) + Dim unitprice As Double = gratingArea * 2500 + If withRecess = True Then + unitprice += 300 + End If + newDR("Unit Price") = unitprice + productIDT.Rows.Add(newDR) + + End If + + If User_Input.addFrame = True Then + Frame_3D.Generate_FrameVariables() + If User_Input.preCutFrame = True Then + 'Precut + For Each sideFrame As KeyValuePair(Of String, Integer) In Frame_3D.sideFrameLengths + Dim newDR As DataRow = productIDT.NewRow + newDR("Description") = "Frame L-Profile Side " & sideFrame.Value & "mm " & User_Input.frameSize & "x" & User_Input.frameSize + Dim newRow As Boolean = True + For j = 0 To productIDT.Rows.Count - 1 + If productIDT.Rows(j)("Description") = newDR("Description") Then + productIDT.Rows(j)("QTY") += 1 + newRow = False + Exit For + End If + Next + If newRow = True Then + newDR("Art. Nr.") = 161 & Get_RandomNumber(100000, 999999) + newDR("QTY") = 1 + newDR("Unit Price") = ((26 * User_Input.frameSize) / 2000) * sideFrame.Value + 50 + productIDT.Rows.Add(newDR) + End If + Next + Else + 'Whole frames + Dim newDR As DataRow = productIDT.NewRow + + newDR("Description") = "Frame L-Profile Side 2000mm " & User_Input.frameSize & "x" & User_Input.frameSize + newDR("Art. Nr.") = 161 & Get_RandomNumber(100000, 999999) + newDR("QTY") = Frame_3D.cuttingList.Count + newDR("Unit Price") = 26 * User_Input.frameSize + productIDT.Rows.Add(newDR) + End If + 'Corners + If Frame_3D.frameDT.Rows.Count - Frame_3D.sideFrameLengths.Count > 0 Then + Dim newDR2 As DataRow = productIDT.NewRow + newDR2("Description") = "Frame L-Profile Corner " & User_Input.frameSize & "x" & User_Input.frameSize + newDR2("Art. Nr.") = 161 & Get_RandomNumber(100000, 999999) + newDR2("QTY") = Frame_3D.frameDT.Rows.Count - Frame_3D.sideFrameLengths.Count + newDR2("Unit Price") = 12 * User_Input.frameSize + productIDT.Rows.Add(newDR2) + End If + End If + + + + For i = 0 To productIDT.Rows.Count - 1 + productIDT.Rows(i)("Price") = productIDT.Rows(i)("Unit Price") * productIDT.Rows(i)("QTY") + Next + Return productIDT + End Function End Class diff --git a/Wardrobe/SolidWorks/Frame_3D.vb b/Wardrobe/SolidWorks/Frame_3D.vb index 6dfd3e3..a8e685f 100644 --- a/Wardrobe/SolidWorks/Frame_3D.vb +++ b/Wardrobe/SolidWorks/Frame_3D.vb @@ -9,15 +9,7 @@ Public Class Frame_3D Public Shared Sub Build_Frame(gratingParameters As DataRow, parentID As Integer) gParameters = gratingParameters - frameDT = Generate_FrameData(gratingParameters) - - For i = 0 To frameDT.Rows.Count - 1 - If frameDT.Rows(i)("TYPE") = "SIDE" Then - sideFrameLengths.Add("Frame " & sideFrameLengths.Count + 1, frameDT.Rows(i)("LENGTH")) - End If - Next - - cuttingList = Generate_CuttingList(frameDT, sideFrameLengths) + Generate_FrameVariables() Dim inst_ As Integer @@ -58,6 +50,21 @@ Public Class Frame_3D End Sub + Public Shared Sub Generate_FrameVariables() + Dim exportTable As DataTable + exportTable = User_Input.Create_ExportTable() + Dim gratingParameters As DataRow = exportTable.Rows(0) + frameDT = Generate_FrameData(gratingParameters) + + For i = 0 To frameDT.Rows.Count - 1 + If frameDT.Rows(i)("TYPE") = "SIDE" Then + sideFrameLengths.Add("Frame " & sideFrameLengths.Count + 1, frameDT.Rows(i)("LENGTH")) + End If + Next + + cuttingList = Generate_CuttingList(frameDT, sideFrameLengths) + End Sub + Private Shared Function Generate_FrameData(gratingParameters As DataRow) Dim DT As New DataTable DT.Columns.Add("TYPE", GetType(String)) diff --git a/Wardrobe/SolidWorks/Individual_3D.vb b/Wardrobe/SolidWorks/Individual_3D.vb index 0f56590..8fe8875 100644 --- a/Wardrobe/SolidWorks/Individual_3D.vb +++ b/Wardrobe/SolidWorks/Individual_3D.vb @@ -76,7 +76,7 @@ Public Class Individual_3D status = model.Save3(4, Errors, Warnings) 'To STEP - If User_Input.Add3DStep = True Then + If User_Input.add3DStep = True Then status = Assembly.SaveAs3(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_stp") & "\GRATING_ASSEMBLY.STEP", 0, 2) End If diff --git a/Wardrobe/SolidWorks/Multiple_3D.vb b/Wardrobe/SolidWorks/Multiple_3D.vb index ddeeb10..204b727 100644 --- a/Wardrobe/SolidWorks/Multiple_3D.vb +++ b/Wardrobe/SolidWorks/Multiple_3D.vb @@ -117,7 +117,7 @@ Public Class Multiple_3D status = model.Save3(4, Errors, Warnings) 'To STEP - If User_Input.Add3DStep = True Then + If User_Input.add3DStep = True Then status = Assembly.SaveAs3(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_stp") & "\GRATINGS_ASSEMBLY.STEP", 0, 2) End If