diff --git a/HLCt/Parts/START.SLDPRT b/HLCt/Parts/START.SLDPRT index 6719d82..8377ac7 100644 Binary files a/HLCt/Parts/START.SLDPRT and b/HLCt/Parts/START.SLDPRT differ diff --git a/HLCt/Parts/~$START.SLDPRT b/HLCt/Parts/~$START.SLDPRT new file mode 100644 index 0000000..214926b Binary files /dev/null and b/HLCt/Parts/~$START.SLDPRT differ diff --git a/Wardrobe/GUI/Export.Designer.vb b/Wardrobe/GUI/Export.Designer.vb new file mode 100644 index 0000000..bc616fb --- /dev/null +++ b/Wardrobe/GUI/Export.Designer.vb @@ -0,0 +1,284 @@ + _ +Partial Class Export + 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.CheckBox_3DModel = New System.Windows.Forms.CheckBox() + Me.CheckBox_FrameDrawing = New System.Windows.Forms.CheckBox() + Me.CheckBox_GratingDrawing = New System.Windows.Forms.CheckBox() + Me.CheckBox_Instructions = New System.Windows.Forms.CheckBox() + Me.Button_Export = New System.Windows.Forms.Button() + Me.Label1 = New System.Windows.Forms.Label() + Me.CheckBox_3DModel_SW = New System.Windows.Forms.CheckBox() + Me.CheckBox_3DModel_STEP = New System.Windows.Forms.CheckBox() + Me.Label2 = New System.Windows.Forms.Label() + Me.Label3 = New System.Windows.Forms.Label() + Me.CheckBox_Quote = New System.Windows.Forms.CheckBox() + Me.CheckBox_Quote_BOM = New System.Windows.Forms.CheckBox() + Me.CheckBox_Quote_Drawing = New System.Windows.Forms.CheckBox() + Me.Panel1 = New System.Windows.Forms.Panel() + Me.Panel2 = New System.Windows.Forms.Panel() + Me.Button_Export2 = New System.Windows.Forms.Button() + Me.SuspendLayout() + ' + 'CheckBox_3DModel + ' + Me.CheckBox_3DModel.AutoSize = True + 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) + Me.CheckBox_3DModel.Margin = New System.Windows.Forms.Padding(2) + Me.CheckBox_3DModel.Name = "CheckBox_3DModel" + 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 + ' + 'CheckBox_FrameDrawing + ' + Me.CheckBox_FrameDrawing.AutoSize = True + 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 + Me.CheckBox_FrameDrawing.Location = New System.Drawing.Point(190, 99) + Me.CheckBox_FrameDrawing.Margin = New System.Windows.Forms.Padding(2) + Me.CheckBox_FrameDrawing.Name = "CheckBox_FrameDrawing" + 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 + ' + 'CheckBox_GratingDrawing + ' + Me.CheckBox_GratingDrawing.AutoSize = True + 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) + Me.CheckBox_GratingDrawing.Margin = New System.Windows.Forms.Padding(2) + Me.CheckBox_GratingDrawing.Name = "CheckBox_GratingDrawing" + 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 + ' + 'CheckBox_Instructions + ' + Me.CheckBox_Instructions.AutoSize = True + 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.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 + ' + 'Button_Export + ' + Me.Button_Export.BackColor = System.Drawing.Color.Transparent + 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)) + Me.Button_Export.ForeColor = System.Drawing.SystemColors.ControlLightLight + Me.Button_Export.Location = New System.Drawing.Point(202, 241) + Me.Button_Export.Name = "Button_Export" + Me.Button_Export.Size = New System.Drawing.Size(93, 35) + Me.Button_Export.TabIndex = 38 + Me.Button_Export.Text = "Export" + Me.Button_Export.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button_Export.UseVisualStyleBackColor = False + ' + 'Label1 + ' + Me.Label1.AutoSize = True + 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" + Me.Label1.Size = New System.Drawing.Size(85, 17) + Me.Label1.TabIndex = 39 + Me.Label1.Text = "3D-Models" + ' + 'CheckBox_3DModel_SW + ' + Me.CheckBox_3DModel_SW.AutoSize = True + Me.CheckBox_3DModel_SW.Checked = True + Me.CheckBox_3DModel_SW.CheckState = System.Windows.Forms.CheckState.Checked + Me.CheckBox_3DModel_SW.Enabled = False + Me.CheckBox_3DModel_SW.ForeColor = System.Drawing.SystemColors.ControlLightLight + Me.CheckBox_3DModel_SW.Location = New System.Drawing.Point(44, 99) + Me.CheckBox_3DModel_SW.Margin = New System.Windows.Forms.Padding(2) + Me.CheckBox_3DModel_SW.Name = "CheckBox_3DModel_SW" + 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.Visible = False + ' + 'CheckBox_3DModel_STEP + ' + Me.CheckBox_3DModel_STEP.AutoSize = True + 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) + Me.CheckBox_3DModel_STEP.Name = "CheckBox_3DModel_STEP" + 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.Visible = False + ' + 'Label2 + ' + Me.Label2.AutoSize = True + 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" + Me.Label2.Size = New System.Drawing.Size(74, 17) + Me.Label2.TabIndex = 42 + Me.Label2.Text = "Drawings" + ' + 'Label3 + ' + Me.Label3.AutoSize = True + 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.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(49, 17) + Me.Label3.TabIndex = 43 + Me.Label3.Text = "Other" + ' + 'CheckBox_Quote + ' + Me.CheckBox_Quote.AutoSize = True + 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.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 + ' + 'CheckBox_Quote_BOM + ' + Me.CheckBox_Quote_BOM.AutoSize = True + Me.CheckBox_Quote_BOM.ForeColor = System.Drawing.SystemColors.ControlLightLight + Me.CheckBox_Quote_BOM.Location = New System.Drawing.Point(343, 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.Visible = False + ' + 'CheckBox_Quote_Drawing + ' + Me.CheckBox_Quote_Drawing.AutoSize = True + Me.CheckBox_Quote_Drawing.ForeColor = System.Drawing.SystemColors.ControlLightLight + Me.CheckBox_Quote_Drawing.Location = New System.Drawing.Point(343, 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.Visible = False + ' + 'Panel1 + ' + Me.Panel1.BackColor = System.Drawing.SystemColors.ActiveCaptionText + Me.Panel1.Location = New System.Drawing.Point(180, 40) + Me.Panel1.Name = "Panel1" + Me.Panel1.Size = New System.Drawing.Size(1, 180) + Me.Panel1.TabIndex = 49 + ' + 'Panel2 + ' + Me.Panel2.BackColor = System.Drawing.SystemColors.ActiveCaptionText + Me.Panel2.Location = New System.Drawing.Point(317, 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.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Export + Me.Button_Export2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.Button_Export2.FlatAppearance.BorderSize = 0 + Me.Button_Export2.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button_Export2.Location = New System.Drawing.Point(211, 247) + Me.Button_Export2.Name = "Button_Export2" + Me.Button_Export2.Size = New System.Drawing.Size(29, 23) + Me.Button_Export2.TabIndex = 51 + Me.Button_Export2.UseVisualStyleBackColor = False + ' + '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.ClientSize = New System.Drawing.Size(500, 300) + Me.Controls.Add(Me.Button_Export2) + Me.Controls.Add(Me.Panel2) + Me.Controls.Add(Me.Panel1) + Me.Controls.Add(Me.CheckBox_Quote_BOM) + Me.Controls.Add(Me.CheckBox_Quote_Drawing) + Me.Controls.Add(Me.CheckBox_Quote) + Me.Controls.Add(Me.Label3) + Me.Controls.Add(Me.Label2) + Me.Controls.Add(Me.CheckBox_3DModel_STEP) + Me.Controls.Add(Me.CheckBox_3DModel_SW) + Me.Controls.Add(Me.Label1) + Me.Controls.Add(Me.Button_Export) + Me.Controls.Add(Me.CheckBox_3DModel) + Me.Controls.Add(Me.CheckBox_FrameDrawing) + Me.Controls.Add(Me.CheckBox_GratingDrawing) + Me.Controls.Add(Me.CheckBox_Instructions) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None + Me.Name = "Export" + Me.Text = "Export" + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents CheckBox_3DModel As CheckBox + Friend WithEvents CheckBox_FrameDrawing As CheckBox + Friend WithEvents CheckBox_GratingDrawing As CheckBox + Friend WithEvents CheckBox_Instructions As CheckBox + Friend WithEvents Button_Export As Button + Friend WithEvents Label1 As Label + Friend WithEvents CheckBox_3DModel_SW As CheckBox + Friend WithEvents CheckBox_3DModel_STEP As CheckBox + Friend WithEvents Label2 As Label + Friend WithEvents Label3 As Label + Friend WithEvents CheckBox_Quote As CheckBox + Friend WithEvents CheckBox_Quote_BOM As CheckBox + Friend WithEvents CheckBox_Quote_Drawing As CheckBox + Friend WithEvents Panel1 As Panel + Friend WithEvents Panel2 As Panel + Friend WithEvents Button_Export2 As Button +End Class diff --git a/Wardrobe/GUI/Export.resx b/Wardrobe/GUI/Export.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Wardrobe/GUI/Export.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/Export.vb b/Wardrobe/GUI/Export.vb new file mode 100644 index 0000000..0e76c68 --- /dev/null +++ b/Wardrobe/GUI/Export.vb @@ -0,0 +1,156 @@ +Public Class Export + + Private Sub CheckBox_3DModel_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox_3DModel.CheckedChanged + If User_Input.add3DGrating = True Then + User_Input.add3DGrating = False + CheckBox_3DModel_SW.Visible = False + CheckBox_3DModel_STEP.Visible = False + Else + User_Input.add3DGrating = True + CheckBox_3DModel_SW.Visible = True + CheckBox_3DModel_STEP.Visible = True + End If + 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 + Else + User_Input.Add3DStep = True + End If + End Sub + + Private Sub CheckBox_GratingDrawing_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox_GratingDrawing.CheckedChanged + If User_Input.addGratingDrawing = True Then + User_Input.addGratingDrawing = False + Else + User_Input.addGratingDrawing = True + End If + End Sub + + Private Sub CheckBox_FrameDrawing_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox_FrameDrawing.CheckedChanged + If User_Input.addFrameDrawing = True Then + User_Input.addFrameDrawing = False + Else + User_Input.addFrameDrawing = True + End If + End Sub + + Private Sub CheckBox_Instructions_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox_Instructions.CheckedChanged + If User_Input.addInstructions = True Then + User_Input.addInstructions = False + Else + User_Input.addInstructions = True + End If + End Sub + + Private Sub CheckBox_Quote_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox_Quote.CheckedChanged + If User_Input.addQuote = True Then + User_Input.addQuote = False + CheckBox_Quote_BOM.Visible = False + CheckBox_Quote_Drawing.Visible = False + Else + User_Input.addQuote = True + CheckBox_Quote_BOM.Visible = True + CheckBox_Quote_Drawing.Visible = True + End If + End Sub + + ' ---------------------------------- Export to SW ---------------------------------- + ' --- When export to SW button is pressed --- + Private Sub Button_Export_SW_Click(sender As Object, e As EventArgs) Handles Button_Export.Click + If AppForm.fillMode Then + Calculate_Fill_Grid.Calculate_Grid() + + Dim frameCreated As Boolean = False + If User_Input.add3DGrating = True Then + Multiple_3D.BuildGrid() + frameCreated = True + End If + + Dim simplifiedCreated As Boolean = False + If User_Input.addGratingDrawing = True Then + Multiple_3D_Simplified.Build_Grid(False) + simplifiedCreated = True + Multiple_Drawing.Generate_Drawing() + End If + + Dim simplifiedWithFrameCreated As Boolean = False + If User_Input.addFrameDrawing = True Then + If frameCreated = False Then + Multiple_3D_Simplified.Build_Grid(True) + simplifiedWithFrameCreated = True + End If + For Each DR As DataRow In Frame_3D.frameDT.Rows + If DR("TYPE") = "SIDE" Then + Frame_3D.Generate_End_Frame_Pieces() + Frame_Drawing.Create_Assemblies(simplifiedWithFrameCreated) + Frame_Drawing.Generate_Drawings() + Exit For + End If + Next + End If + + If User_Input.addInstructions = True Then + If User_Input.addFrame = True AndAlso simplifiedWithFrameCreated = False Then + Multiple_3D_Simplified.Build_Grid(True) + ElseIf simplifiedWithFrameCreated = False Then + Multiple_3D_Simplified.Build_Grid(False) + simplifiedCreated = True + End If + If simplifiedCreated = False Then + Multiple_3D_Simplified.Build_Grid(False) + End If + Instructions.Generate_Instructions(User_Input.addFrame) + End If + Else + + Dim frameCreated As Boolean = False + If User_Input.add3DGrating = True Then + Individual_3D.BuildGrating() + frameCreated = True + End If + + If User_Input.addGratingDrawing = True Then + Individual_Drawing.Generate_Drawing() + End If + + Dim simplifiedWithFrameCreated As Boolean = False + If User_Input.addFrameDrawing = True Then + If frameCreated = False Then + Individual_3D_Simplified.Build_Simplified(True) + simplifiedWithFrameCreated = True + End If + For Each DR As DataRow In Frame_3D.frameDT.Rows + If DR("TYPE") = "SIDE" Then + Frame_3D.Generate_End_Frame_Pieces() + Frame_Drawing.Create_Assemblies(simplifiedWithFrameCreated) + Frame_Drawing.Generate_Drawings() + Exit For + End If + Next + End If + + Dim simplifiedCreated As Boolean = False + If User_Input.addInstructions = True Then + If User_Input.addFrame = True AndAlso simplifiedWithFrameCreated = False Then + Individual_3D_Simplified.Build_Simplified(True) + ElseIf simplifiedWithFrameCreated = False Then + Individual_3D_Simplified.Build_Simplified(False) + simplifiedCreated = True + End If + If simplifiedCreated = False Then + Multiple_3D_Simplified.Build_Grid(False) + End If + Instructions.Generate_Instructions(User_Input.addFrame) + End If + End If + + + 'GUI_Export.Generate_Quote() 'FIXA + + Me.Close() + End Sub + + +End Class \ No newline at end of file diff --git a/Wardrobe/GUI/Grating_Configurator.Designer.vb b/Wardrobe/GUI/Grating_Configurator.Designer.vb index 3ae87f1..028b5ce 100644 --- a/Wardrobe/GUI/Grating_Configurator.Designer.vb +++ b/Wardrobe/GUI/Grating_Configurator.Designer.vb @@ -24,23 +24,19 @@ 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.Label8 = New System.Windows.Forms.Label() - Me.ComboBox_Frame = New System.Windows.Forms.ComboBox() - Me.CheckBox_3DModel = New System.Windows.Forms.CheckBox() - Me.CheckBox_FrameDrawing = New System.Windows.Forms.CheckBox() - Me.CheckBox_GratingDrawing = New System.Windows.Forms.CheckBox() + Me.Button_Calculate = New System.Windows.Forms.Button() + Me.Label_ConfigType = New System.Windows.Forms.Label() Me.CheckBox_Frames = New System.Windows.Forms.CheckBox() - Me.CheckBox_Instructions = New System.Windows.Forms.CheckBox() - Me.Button_Back = New System.Windows.Forms.Button() + Me.Label_Frame = New System.Windows.Forms.Label() + Me.ComboBox_Frame = New System.Windows.Forms.ComboBox() Me.TextBox_Width = New System.Windows.Forms.TextBox() Me.ComboBox_Width = New System.Windows.Forms.ComboBox() Me.Label7 = New System.Windows.Forms.Label() - Me.Label6 = New System.Windows.Forms.Label() + Me.Label_WidthUnit = 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.Button_Export_GUI = New System.Windows.Forms.Button() - Me.Button_Export_SW = New System.Windows.Forms.Button() + Me.Button_ExportMenu = 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() @@ -56,41 +52,44 @@ 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.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.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.Panel_Data.SuspendLayout() 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.SystemColors.GradientActiveCaption - Me.Panel_Data.Controls.Add(Me.Label8) - Me.Panel_Data.Controls.Add(Me.ComboBox_Frame) - Me.Panel_Data.Controls.Add(Me.CheckBox_3DModel) - Me.Panel_Data.Controls.Add(Me.CheckBox_FrameDrawing) - Me.Panel_Data.Controls.Add(Me.CheckBox_GratingDrawing) + 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.Button_Calculate2) + Me.Panel_Data.Controls.Add(Me.Button_Calculate) + Me.Panel_Data.Controls.Add(Me.Button_ExportMenu2) + Me.Panel_Data.Controls.Add(Me.PictureBox_ConfigType) + Me.Panel_Data.Controls.Add(Me.Label_ConfigType) Me.Panel_Data.Controls.Add(Me.CheckBox_Frames) - Me.Panel_Data.Controls.Add(Me.CheckBox_Instructions) - Me.Panel_Data.Controls.Add(Me.Button_Back) + Me.Panel_Data.Controls.Add(Me.Label_Frame) + Me.Panel_Data.Controls.Add(Me.ComboBox_Frame) Me.Panel_Data.Controls.Add(Me.TextBox_Width) Me.Panel_Data.Controls.Add(Me.ComboBox_Width) Me.Panel_Data.Controls.Add(Me.Label7) - Me.Panel_Data.Controls.Add(Me.Label6) + Me.Panel_Data.Controls.Add(Me.Label_WidthUnit) 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.Button_Export_GUI) - Me.Panel_Data.Controls.Add(Me.Button_Export_SW) + Me.Panel_Data.Controls.Add(Me.Button_ExportMenu) Me.Panel_Data.Controls.Add(Me.Label_Heading) Me.Panel_Data.Controls.Add(Me.Label_Material) Me.Panel_Data.Controls.Add(Me.Label_Mesh) @@ -108,139 +107,118 @@ Partial Class Grating_Configurator 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 ' - 'Label8 + 'Button_Calculate ' - Me.Label8.AutoSize = True - Me.Label8.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label8.Location = New System.Drawing.Point(53, 656) - Me.Label8.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.Label8.Name = "Label8" - Me.Label8.Size = New System.Drawing.Size(99, 20) - Me.Label8.TabIndex = 34 - Me.Label8.Text = "Frame WxH" + Me.Button_Calculate.BackColor = System.Drawing.Color.Transparent + Me.Button_Calculate.Enabled = False + Me.Button_Calculate.FlatAppearance.BorderSize = 0 + Me.Button_Calculate.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button_Calculate.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Button_Calculate.ForeColor = System.Drawing.SystemColors.ControlLightLight + Me.Button_Calculate.Location = New System.Drawing.Point(110, 580) + Me.Button_Calculate.Name = "Button_Calculate" + Me.Button_Calculate.Size = New System.Drawing.Size(135, 33) + Me.Button_Calculate.TabIndex = 39 + Me.Button_Calculate.Text = "Calculate Grid" + Me.Button_Calculate.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button_Calculate.UseVisualStyleBackColor = False ' - 'ComboBox_Frame + 'Label_ConfigType ' - Me.ComboBox_Frame.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.ComboBox_Frame.FormattingEnabled = True - Me.ComboBox_Frame.Location = New System.Drawing.Point(147, 656) - Me.ComboBox_Frame.Margin = New System.Windows.Forms.Padding(4) - Me.ComboBox_Frame.Name = "ComboBox_Frame" - Me.ComboBox_Frame.Size = New System.Drawing.Size(205, 24) - Me.ComboBox_Frame.TabIndex = 33 - ' - 'CheckBox_3DModel - ' - Me.CheckBox_3DModel.AutoSize = True - Me.CheckBox_3DModel.Location = New System.Drawing.Point(235, 727) - Me.CheckBox_3DModel.Name = "CheckBox_3DModel" - Me.CheckBox_3DModel.Size = New System.Drawing.Size(141, 21) - Me.CheckBox_3DModel.TabIndex = 32 - Me.CheckBox_3DModel.Text = "3D Grating Model" - Me.CheckBox_3DModel.UseVisualStyleBackColor = True - ' - 'CheckBox_FrameDrawing - ' - Me.CheckBox_FrameDrawing.AutoSize = True - Me.CheckBox_FrameDrawing.Enabled = False - Me.CheckBox_FrameDrawing.Location = New System.Drawing.Point(235, 808) - Me.CheckBox_FrameDrawing.Name = "CheckBox_FrameDrawing" - Me.CheckBox_FrameDrawing.Size = New System.Drawing.Size(125, 21) - Me.CheckBox_FrameDrawing.TabIndex = 31 - Me.CheckBox_FrameDrawing.Text = "Frame Drawing" - Me.CheckBox_FrameDrawing.UseVisualStyleBackColor = True - ' - 'CheckBox_GratingDrawing - ' - Me.CheckBox_GratingDrawing.AutoSize = True - Me.CheckBox_GratingDrawing.Location = New System.Drawing.Point(235, 754) - Me.CheckBox_GratingDrawing.Name = "CheckBox_GratingDrawing" - Me.CheckBox_GratingDrawing.Size = New System.Drawing.Size(132, 21) - Me.CheckBox_GratingDrawing.TabIndex = 30 - Me.CheckBox_GratingDrawing.Text = "Grating Drawing" - Me.CheckBox_GratingDrawing.UseVisualStyleBackColor = True + Me.Label_ConfigType.AutoSize = True + Me.Label_ConfigType.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label_ConfigType.ForeColor = System.Drawing.SystemColors.ControlLightLight + Me.Label_ConfigType.Location = New System.Drawing.Point(23, 52) + Me.Label_ConfigType.Name = "Label_ConfigType" + Me.Label_ConfigType.Size = New System.Drawing.Size(123, 17) + Me.Label_ConfigType.TabIndex = 36 + Me.Label_ConfigType.Text = "- Single Grating" ' 'CheckBox_Frames ' Me.CheckBox_Frames.AutoSize = True - Me.CheckBox_Frames.Location = New System.Drawing.Point(235, 781) + Me.CheckBox_Frames.ForeColor = System.Drawing.SystemColors.ControlLightLight + Me.CheckBox_Frames.Location = New System.Drawing.Point(110, 537) + Me.CheckBox_Frames.Margin = New System.Windows.Forms.Padding(2) Me.CheckBox_Frames.Name = "CheckBox_Frames" - Me.CheckBox_Frames.Size = New System.Drawing.Size(106, 21) - Me.CheckBox_Frames.TabIndex = 29 + Me.CheckBox_Frames.Size = New System.Drawing.Size(82, 17) + Me.CheckBox_Frames.TabIndex = 35 Me.CheckBox_Frames.Text = "Add Frames" Me.CheckBox_Frames.UseVisualStyleBackColor = True ' - 'CheckBox_Instructions + 'Label_Frame ' - Me.CheckBox_Instructions.AutoSize = True - Me.CheckBox_Instructions.Location = New System.Drawing.Point(235, 835) - Me.CheckBox_Instructions.Name = "CheckBox_Instructions" - Me.CheckBox_Instructions.Size = New System.Drawing.Size(166, 21) - Me.CheckBox_Instructions.TabIndex = 28 - Me.CheckBox_Instructions.Text = "Assembly Instructions" - Me.CheckBox_Instructions.UseVisualStyleBackColor = True + Me.Label_Frame.AutoSize = True + Me.Label_Frame.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label_Frame.ForeColor = System.Drawing.SystemColors.ControlLightLight + Me.Label_Frame.Location = New System.Drawing.Point(23, 559) + Me.Label_Frame.Name = "Label_Frame" + Me.Label_Frame.Size = New System.Drawing.Size(81, 17) + Me.Label_Frame.TabIndex = 34 + Me.Label_Frame.Text = "Frame WxH" ' - 'Button_Back + 'ComboBox_Frame ' - Me.Button_Back.Location = New System.Drawing.Point(12, 12) - Me.Button_Back.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) - Me.Button_Back.Name = "Button_Back" - Me.Button_Back.Size = New System.Drawing.Size(56, 41) - Me.Button_Back.TabIndex = 27 - Me.Button_Back.Text = "Back" - Me.Button_Back.UseVisualStyleBackColor = True + Me.ComboBox_Frame.BackColor = System.Drawing.SystemColors.ScrollBar + Me.ComboBox_Frame.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.ComboBox_Frame.FormattingEnabled = True + Me.ComboBox_Frame.Location = New System.Drawing.Point(110, 559) + Me.ComboBox_Frame.Name = "ComboBox_Frame" + Me.ComboBox_Frame.Size = New System.Drawing.Size(155, 21) + Me.ComboBox_Frame.TabIndex = 33 ' 'TextBox_Width ' - Me.TextBox_Width.Location = New System.Drawing.Point(147, 572) - Me.TextBox_Width.Margin = New System.Windows.Forms.Padding(4) + Me.TextBox_Width.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.TextBox_Width.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.TextBox_Width.Location = New System.Drawing.Point(110, 465) 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.BackColor = System.Drawing.SystemColors.ScrollBar Me.ComboBox_Width.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.ComboBox_Width.FormattingEnabled = True - Me.ComboBox_Width.Location = New System.Drawing.Point(147, 572) - Me.ComboBox_Width.Margin = New System.Windows.Forms.Padding(4) + Me.ComboBox_Width.Location = New System.Drawing.Point(110, 465) 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, 495) - Me.Label7.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label7.ForeColor = System.Drawing.SystemColors.ControlLightLight + Me.Label7.Location = New System.Drawing.Point(269, 402) 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" ' - 'Label6 + 'Label_WidthUnit ' - 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, 576) - 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 = 23 - Me.Label6.Text = "mm" + Me.Label_WidthUnit.AutoSize = True + Me.Label_WidthUnit.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label_WidthUnit.ForeColor = System.Drawing.SystemColors.ControlLightLight + Me.Label_WidthUnit.Location = New System.Drawing.Point(269, 468) + Me.Label_WidthUnit.Name = "Label_WidthUnit" + Me.Label_WidthUnit.Size = New System.Drawing.Size(23, 13) + Me.Label_WidthUnit.TabIndex = 23 + Me.Label_WidthUnit.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(359, 404) - Me.Label5.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label5.ForeColor = System.Drawing.SystemColors.ControlLightLight + 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" ' @@ -248,10 +226,10 @@ Partial Class Grating_Configurator ' 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.ForeColor = System.Drawing.SystemColors.ControlLightLight + 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" ' @@ -259,43 +237,36 @@ Partial Class Grating_Configurator ' 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.ForeColor = System.Drawing.SystemColors.ControlLightLight + 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 + 'Button_ExportMenu ' - 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.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 = False - ' - 'Button_Export_SW - ' - Me.Button_Export_SW.BackColor = System.Drawing.Color.Transparent - Me.Button_Export_SW.Location = New System.Drawing.Point(235, 866) - Me.Button_Export_SW.Margin = New System.Windows.Forms.Padding(4) - Me.Button_Export_SW.Name = "Button_Export_SW" - Me.Button_Export_SW.Size = New System.Drawing.Size(100, 28) - Me.Button_Export_SW.TabIndex = 17 - Me.Button_Export_SW.Text = "Export SW" - Me.Button_Export_SW.UseVisualStyleBackColor = False + Me.Button_ExportMenu.BackColor = System.Drawing.Color.Transparent + Me.Button_ExportMenu.FlatAppearance.BorderSize = 0 + Me.Button_ExportMenu.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button_ExportMenu.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Button_ExportMenu.ForeColor = System.Drawing.SystemColors.ControlLightLight + Me.Button_ExportMenu.Location = New System.Drawing.Point(87, 700) + Me.Button_ExportMenu.Name = "Button_ExportMenu" + Me.Button_ExportMenu.Size = New System.Drawing.Size(134, 33) + Me.Button_ExportMenu.TabIndex = 18 + Me.Button_ExportMenu.Text = "Export Menu" + Me.Button_ExportMenu.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button_ExportMenu.UseVisualStyleBackColor = False ' '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(93, 46) - Me.Label_Heading.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label_Heading.ForeColor = System.Drawing.SystemColors.ControlLightLight + Me.Label_Heading.Location = New System.Drawing.Point(22, 25) 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" ' @@ -303,10 +274,10 @@ Partial Class Grating_Configurator ' 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.ForeColor = System.Drawing.Color.White + 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" ' @@ -314,10 +285,10 @@ Partial Class Grating_Configurator ' 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.ForeColor = System.Drawing.SystemColors.ControlLightLight + 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" ' @@ -325,10 +296,10 @@ Partial Class Grating_Configurator ' 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.ForeColor = System.Drawing.SystemColors.ControlLightLight + 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" ' @@ -336,10 +307,10 @@ Partial Class Grating_Configurator ' 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.ForeColor = System.Drawing.SystemColors.ControlLightLight + 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" ' @@ -347,10 +318,10 @@ Partial Class Grating_Configurator ' 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, 572) - Me.Label_Width.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label_Width.ForeColor = System.Drawing.SystemColors.ControlLightLight + Me.Label_Width.Location = New System.Drawing.Point(60, 465) 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" ' @@ -358,10 +329,10 @@ Partial Class Grating_Configurator ' 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, 490) - Me.Label_Length.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label_Length.ForeColor = System.Drawing.SystemColors.ControlLightLight + Me.Label_Length.Location = New System.Drawing.Point(52, 398) 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" ' @@ -369,180 +340,95 @@ Partial Class Grating_Configurator ' 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.ForeColor = System.Drawing.SystemColors.ControlLightLight + 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, 490) - Me.TextBox_Length.Margin = New System.Windows.Forms.Padding(4) + Me.TextBox_Length.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.TextBox_Length.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.TextBox_Length.Location = New System.Drawing.Point(110, 398) 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.BackColor = System.Drawing.SystemColors.ScrollBar 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.BackColor = System.Drawing.SystemColors.ScrollBar 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.BackColor = System.Drawing.SystemColors.ScrollBar 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.BackColor = System.Drawing.SystemColors.ScrollBar 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.BackColor = System.Drawing.SystemColors.ScrollBar 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 ' - Me.Panel_Recesses.BackColor = System.Drawing.Color.Silver + Me.Panel_Recesses.BackColor = System.Drawing.Color.Gray Me.Panel_Recesses.Controls.Add(Me.Button_Radius) Me.Panel_Recesses.Controls.Add(Me.Button_Square_Middle) - 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_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) 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_Radius - ' - Me.Button_Radius.BackColor = System.Drawing.Color.Gainsboro - 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.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button_Radius.Location = New System.Drawing.Point(1341, 31) - Me.Button_Radius.Margin = New System.Windows.Forms.Padding(4) - Me.Button_Radius.Name = "Button_Radius" - Me.Button_Radius.Size = New System.Drawing.Size(93, 86) - Me.Button_Radius.TabIndex = 22 - Me.Button_Radius.UseVisualStyleBackColor = False - ' - 'Button_Square_Middle - ' - Me.Button_Square_Middle.BackColor = System.Drawing.Color.Gainsboro - 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.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button_Square_Middle.Location = New System.Drawing.Point(1201, 31) - Me.Button_Square_Middle.Margin = New System.Windows.Forms.Padding(4) - Me.Button_Square_Middle.Name = "Button_Square_Middle" - Me.Button_Square_Middle.Size = New System.Drawing.Size(93, 86) - Me.Button_Square_Middle.TabIndex = 21 - Me.Button_Square_Middle.UseVisualStyleBackColor = False - ' - 'Button_Square_Side - ' - Me.Button_Square_Side.BackColor = System.Drawing.Color.Gainsboro - 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.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button_Square_Side.Location = New System.Drawing.Point(1061, 31) - Me.Button_Square_Side.Margin = New System.Windows.Forms.Padding(4) - Me.Button_Square_Side.Name = "Button_Square_Side" - Me.Button_Square_Side.Size = New System.Drawing.Size(93, 86) - Me.Button_Square_Side.TabIndex = 20 - Me.Button_Square_Side.UseVisualStyleBackColor = False - ' - 'Button_Angle_Side - ' - Me.Button_Angle_Side.BackColor = System.Drawing.Color.Gainsboro - Me.Button_Angle_Side.BackgroundImage = Global.Wardrobe.My.Resources.Resources.AngleSide - Me.Button_Angle_Side.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.Button_Angle_Side.FlatAppearance.BorderColor = System.Drawing.Color.Black - Me.Button_Angle_Side.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button_Angle_Side.Location = New System.Drawing.Point(781, 31) - Me.Button_Angle_Side.Margin = New System.Windows.Forms.Padding(4) - Me.Button_Angle_Side.Name = "Button_Angle_Side" - Me.Button_Angle_Side.Size = New System.Drawing.Size(93, 86) - Me.Button_Angle_Side.TabIndex = 19 - Me.Button_Angle_Side.UseVisualStyleBackColor = False - ' - 'Button_Square_Corner - ' - Me.Button_Square_Corner.BackColor = System.Drawing.Color.Gainsboro - 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.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button_Square_Corner.Location = New System.Drawing.Point(921, 31) - Me.Button_Square_Corner.Margin = New System.Windows.Forms.Padding(4) - Me.Button_Square_Corner.Name = "Button_Square_Corner" - Me.Button_Square_Corner.Size = New System.Drawing.Size(93, 86) - Me.Button_Square_Corner.TabIndex = 18 - Me.Button_Square_Corner.UseVisualStyleBackColor = False - ' - 'Button_Angle_Corner - ' - Me.Button_Angle_Corner.BackColor = System.Drawing.Color.Gainsboro - 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.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button_Angle_Corner.Location = New System.Drawing.Point(641, 31) - Me.Button_Angle_Corner.Margin = New System.Windows.Forms.Padding(4) - Me.Button_Angle_Corner.Name = "Button_Angle_Corner" - Me.Button_Angle_Corner.Size = New System.Drawing.Size(93, 86) - Me.Button_Angle_Corner.TabIndex = 17 - Me.Button_Angle_Corner.UseVisualStyleBackColor = False - ' 'Label_Recesses ' Me.Label_Recesses.AutoSize = True Me.Label_Recesses.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label_Recesses.Location = New System.Drawing.Point(439, 44) - Me.Label_Recesses.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label_Recesses.ForeColor = System.Drawing.SystemColors.ControlLightLight + Me.Label_Recesses.Location = New System.Drawing.Point(343, 25) 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" ' @@ -551,20 +437,18 @@ Partial Class Grating_Configurator 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" ' @@ -572,25 +456,145 @@ Partial Class Grating_Configurator ' 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" ' - 'Individual + 'Button_Calculate2 ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 16.0!) + 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!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.SystemColors.Control - Me.ClientSize = New System.Drawing.Size(1556, 884) + 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.Name = "Grating_Configurator" Me.Text = "Individual" Me.Panel_Data.ResumeLayout(False) Me.Panel_Data.PerformLayout() @@ -598,6 +602,7 @@ Partial Class Grating_Configurator 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 @@ -625,24 +630,23 @@ Partial Class Grating_Configurator Friend WithEvents Button_Angle_Corner As Button Friend WithEvents Label_Recesses As Label Friend WithEvents Panel_Grating As Panel - Friend WithEvents Button_Export_GUI As Button - Friend WithEvents Button_Export_SW As Button + Friend WithEvents Button_ExportMenu As Button Friend WithEvents Label2 As Label Friend WithEvents Label1 As Label Friend WithEvents Label3 As Label Friend WithEvents Label7 As Label - Friend WithEvents Label6 As Label + Friend WithEvents Label_WidthUnit As Label Friend WithEvents Label5 As Label Friend WithEvents Label4 As Label Friend WithEvents TextBox_Width As TextBox Friend WithEvents ComboBox_Width As ComboBox - Friend WithEvents Button_Back As Button Friend WithEvents Button_Radius As Button - Friend WithEvents CheckBox_FrameDrawing As CheckBox - Friend WithEvents CheckBox_GratingDrawing As CheckBox - Friend WithEvents CheckBox_Frames As CheckBox - Friend WithEvents CheckBox_Instructions As CheckBox - Friend WithEvents CheckBox_3DModel As CheckBox - Friend WithEvents Label8 As Label + Friend WithEvents Label_Frame As Label Friend WithEvents ComboBox_Frame As ComboBox + Friend WithEvents CheckBox_Frames As CheckBox + Friend WithEvents Label_ConfigType As Label + Friend WithEvents PictureBox_ConfigType As PictureBox + Friend WithEvents Button_ExportMenu2 As Button + Friend WithEvents Button_Calculate2 As Button + Friend WithEvents Button_Calculate As Button End Class diff --git a/Wardrobe/GUI/Grating_Configurator.vb b/Wardrobe/GUI/Grating_Configurator.vb index cbd2bc4..ba4d8cb 100644 --- a/Wardrobe/GUI/Grating_Configurator.vb +++ b/Wardrobe/GUI/Grating_Configurator.vb @@ -26,19 +26,33 @@ Public Class Grating_Configurator Me.ComboBox_Width.Enabled = False Me.TextBox_Width.Enabled = False Me.TextBox_Length.Enabled = False - Me.Button_Export_GUI.Enabled = False - Me.Button_Export_SW.Enabled = False + Me.Button_ExportMenu.Enabled = False Me.Button_Angle_Corner.Enabled = False Me.Button_Angle_Side.Enabled = False Me.Button_Square_Corner.Enabled = False Me.Button_Square_Side.Enabled = False Me.Button_Square_Middle.Enabled = False + + Button_ExportMenu.Top = 720 + Button_ExportMenu2.Top = 720 End Sub Private Sub Init_Individual() - Me.Panel_Data.BackColor = Color.AliceBlue - Me.Panel_Recesses.BackColor = Color.LightGray + Label_ConfigType.Text = "- Single Grating" + PictureBox_ConfigType.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Individual_Icon + + Button_Calculate.Visible = False + Button_Calculate2.Visible = False + + Label_Width.Top = 465 + TextBox_Width.Top = 465 + ComboBox_Width.Top = 465 + Label_WidthUnit.Top = 469 + + CheckBox_Frames.Top = 537 + Label_Frame.Top = 559 + ComboBox_Frame.Top = 559 Dim CheckTemp As New CheckBox With { .Name = "CheckBox_Whole_Mesh", @@ -49,7 +63,8 @@ Public Class Grating_Configurator .Checked = True, .Enabled = False, .AutoSize = True, - .BackColor = Color.Transparent + .BackColor = Color.Transparent, + .ForeColor = Color.White } AddHandler CheckTemp.CheckedChanged, AddressOf CheckBox_Whole_Mesh_CheckedChanged Me.Panel_Data.Controls.Add(CheckTemp) @@ -62,17 +77,30 @@ Public Class Grating_Configurator End Sub Private Sub Init_Multiple() - Me.Panel_Data.BackColor = Color.Salmon - Me.Panel_Recesses.BackColor = Color.LightPink + Label_ConfigType.Text = "- Fill Area" + PictureBox_ConfigType.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Fill_Icon + + Button_Calculate.Visible = True + Button_Calculate2.Visible = True + + Label_Width.Top = 440 + TextBox_Width.Top = 440 + ComboBox_Width.Top = 440 + Label_WidthUnit.Top = 444 + + CheckBox_Frames.Top = 637 + Label_Frame.Top = 659 + ComboBox_Frame.Top = 659 ' --- Max Load --- Dim LabelTemp As New Label With { .Name = "Label_Max_Load", .Text = "Max Load", .Left = 35, - .Top = 525, + .Top = 500, .AutoSize = True, - .Font = New Font("Microsoft Sans Serif", 10) + .Font = New Font("Microsoft Sans Serif", 10), + .ForeColor = Color.White } Me.Panel_Data.Controls.Add(LabelTemp) @@ -80,10 +108,11 @@ Public Class Grating_Configurator .Name = "TextBox_Max_Load", .Text = "5", .Left = 110, - .Top = 525, + .Top = 500, .Width = 155, .Font = New Font("Microsoft Sans Serif", 8), - .Enabled = False + .Enabled = False, + .BackColor = Color.FromArgb(224, 224, 224) } AddHandler textBoxTemp.KeyPress, AddressOf TextBox_Max_Load_KeyPress Me.Panel_Data.Controls.Add(textBoxTemp) @@ -92,30 +121,44 @@ Public Class Grating_Configurator .Name = "Label_Max_Load_Unit", .Text = "kN/m²", .Left = 269, - .Top = 529, - .Font = New Font("Microsoft Sans Serif", 8) + .Top = 504, + .Font = New Font("Microsoft Sans Serif", 8), + .ForeColor = Color.White } Me.Panel_Data.Controls.Add(LabelTemp2) ' --- Max Grating weight --- Dim LabelTemp3 As New Label With { .Name = "Label_Max_Weight", - .Text = "Max Grating Weight", - .Left = 20, - .Top = 550, + .Text = "Max Single", + .Left = 15, + .Top = 535, .AutoSize = True, - .Font = New Font("Microsoft Sans Serif", 10) + .Font = New Font("Microsoft Sans Serif", 10), + .ForeColor = Color.White } Me.Panel_Data.Controls.Add(LabelTemp3) + ' --- Max Grating weight --- + Dim LabelTemp3_2 As New Label With { + .Name = "Label_Max_Weight2", + .Text = "Grating Mass", + .Left = 15, + .Top = 552, + .AutoSize = True, + .Font = New Font("Microsoft Sans Serif", 10), + .ForeColor = Color.White + } + Me.Panel_Data.Controls.Add(LabelTemp3_2) Dim textBoxTemp2 As New TextBox With { .Name = "TextBox_Max_Weight", .Text = "70", .Left = 110, - .Top = 550, + .Top = 545, .Width = 155, .Font = New Font("Microsoft Sans Serif", 8), - .Enabled = False + .Enabled = False, + .BackColor = Color.FromArgb(224, 224, 224) } AddHandler textBoxTemp2.KeyPress, AddressOf TextBox_Max_Load_KeyPress Me.Panel_Data.Controls.Add(textBoxTemp2) @@ -124,25 +167,12 @@ Public Class Grating_Configurator .Name = "Label_Max_Weight_Unit", .Text = "kg", .Left = 269, - .Top = 554, - .Font = New Font("Microsoft Sans Serif", 8) + .Top = 549, + .Font = New Font("Microsoft Sans Serif", 8), + .ForeColor = Color.White } Me.Panel_Data.Controls.Add(LabelTemp4) - Dim calculateButton As New Button With { - .Name = "Button_Calculate", - .Text = "Calculate", - .Left = 100, - .Top = 600, - .Width = 100, - .Height = 40, - .BackColor = Color.Transparent, - .UseVisualStyleBackColor = False, - .Enabled = False - } - AddHandler calculateButton.Click, AddressOf Button_Calculate_Click - Me.Panel_Data.Controls.Add(calculateButton) - Me.ComboBox_Width.Visible = False Me.TextBox_Width.Visible = True End Sub @@ -257,6 +287,18 @@ Public Class Grating_Configurator End If End Sub + Private Sub CheckBox_Frames_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox_Frames.CheckedChanged + If User_Input.addFrame = True Then + User_Input.addFrame = False + Export.CheckBox_FrameDrawing.Checked = False + Export.CheckBox_FrameDrawing.Enabled = False + User_Input.addFrameDrawing = False + Else + User_Input.addFrame = True + Export.CheckBox_FrameDrawing.Enabled = True + End If + End Sub + ' --- Check if max laod is a number --- Public Sub TextBox_Max_Load_KeyPress(sender As Object, e As KeyPressEventArgs) User_Input.Check_IfNumber(e) @@ -289,167 +331,24 @@ Public Class Grating_Configurator End Sub - - Private Sub CheckBox_3DModel_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox_3DModel.CheckedChanged - If User_Input.add3DGrating = True Then - User_Input.add3DGrating = False - Else - User_Input.add3DGrating = True - End If - End Sub - - Private Sub CheckBox_Frames_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox_Frames.CheckedChanged - If User_Input.addFrame = True Then - User_Input.addFrame = False - CheckBox_FrameDrawing.Checked = False - CheckBox_FrameDrawing.Enabled = False - User_Input.addFrameDrawing = False - Else - User_Input.addFrame = True - CheckBox_FrameDrawing.Enabled = True - End If - End Sub - - Private Sub CheckBox_GratingDrawing_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox_GratingDrawing.CheckedChanged - If User_Input.addGratingDrawing = True Then - User_Input.addGratingDrawing = False - Else - User_Input.addGratingDrawing = True - End If - End Sub - - Private Sub CheckBox_FrameDrawing_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox_FrameDrawing.CheckedChanged - If User_Input.addFrameDrawing = True Then - User_Input.addFrameDrawing = False - Else - User_Input.addFrameDrawing = True - End If - End Sub - - Private Sub CheckBox_Instructions_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox_Instructions.CheckedChanged - If User_Input.addInstructions = True Then - User_Input.addInstructions = False - Else - User_Input.addInstructions = True - End If - End Sub - - ' ---------------------------------- Calculate ---------------------------------- ' --- When calculate button is pressed --- - Public Sub Button_Calculate_Click(sender As Object, e As EventArgs) + Public Sub Button_Calculate_Click(sender As Object, e As EventArgs) Handles Button_Calculate.Click Calculate_Fill_Grid.Calculate_Grid() End Sub - ' ---------------------------------- Export to SW ---------------------------------- - ' --- 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 - Calculate_Fill_Grid.Calculate_Grid() - - Dim frameCreated As Boolean = False - If User_Input.add3DGrating = True Then - Multiple_3D.BuildGrid() - frameCreated = True - End If - - Dim simplifiedCreated As Boolean = False - If User_Input.addGratingDrawing = True Then - Multiple_3D_Simplified.Build_Grid(False) - simplifiedCreated = True - Multiple_Drawing.Generate_Drawing() - End If - - Dim simplifiedWithFrameCreated As Boolean = False - If User_Input.addFrameDrawing = True Then - If frameCreated = False Then - Multiple_3D_Simplified.Build_Grid(True) - simplifiedWithFrameCreated = True - End If - For Each DR As DataRow In Frame_3D.frameDT.Rows - If DR("TYPE") = "SIDE" Then - Frame_3D.Generate_End_Frame_Pieces() - Frame_Drawing.Create_Assemblies(simplifiedWithFrameCreated) - Frame_Drawing.Generate_Drawings() - Exit For - End If - Next - End If - - If User_Input.addInstructions = True Then - If User_Input.addFrame = True AndAlso simplifiedWithFrameCreated = False Then - Multiple_3D_Simplified.Build_Grid(True) - ElseIf simplifiedWithFrameCreated = False Then - Multiple_3D_Simplified.Build_Grid(False) - simplifiedCreated = True - End If - If simplifiedCreated = False Then - Multiple_3D_Simplified.Build_Grid(False) - End If - Instructions.Generate_Instructions(User_Input.addFrame) - End If - Else - - Dim frameCreated As Boolean = False - If User_Input.add3DGrating = True Then - Individual_3D.BuildGrating() - frameCreated = True - End If - - If User_Input.addGratingDrawing = True Then - Individual_Drawing.Generate_Drawing() - End If - - Dim simplifiedWithFrameCreated As Boolean = False - If User_Input.addFrameDrawing = True Then - If frameCreated = False Then - Individual_3D_Simplified.Build_Simplified(True) - simplifiedWithFrameCreated = True - End If - For Each DR As DataRow In Frame_3D.frameDT.Rows - If DR("TYPE") = "SIDE" Then - Frame_3D.Generate_End_Frame_Pieces() - Frame_Drawing.Create_Assemblies(simplifiedWithFrameCreated) - Frame_Drawing.Generate_Drawings() - Exit For - End If - Next - End If - - Dim simplifiedCreated As Boolean = False - If User_Input.addInstructions = True Then - If User_Input.addFrame = True AndAlso simplifiedWithFrameCreated = False Then - Individual_3D_Simplified.Build_Simplified(True) - ElseIf simplifiedWithFrameCreated = False Then - Individual_3D_Simplified.Build_Simplified(False) - simplifiedCreated = True - End If - If simplifiedCreated = False Then - Multiple_3D_Simplified.Build_Grid(False) - End If - Instructions.Generate_Instructions(User_Input.addFrame) - End If - End If - End Sub - ' ---------------------------------- Export GUI ---------------------------------- ' --- When export GUI button is pressed --- - Private Sub Button_Export_GUI_Click(sender As Object, e As EventArgs) Handles Button_Export_GUI.Click - GUI_Export.Generate_Quote() - End Sub + Private Sub Button_Export_GUI_Click(sender As Object, e As EventArgs) Handles Button_ExportMenu.Click + If User_Input.addFrame = True Then + Export.CheckBox_3DModel.Text = "Grating + Frame" + Else + Export.CheckBox_3DModel.Text = "Grating" + End If - ' ---------------------------------- Back to main menu ---------------------------------- - ' --- When export back button is pressed --- - Private Sub Button_Back_Click(sender As Object, e As EventArgs) Handles Button_Back.Click - AppForm.Panel_Start.Controls.Clear() - Main_Menu.TopLevel = False - AppForm.Panel_Start.Controls.Add(Main_Menu) - AppForm.Width = 800 - AppForm.Height = 500 - AppForm.Top = 170 - AppForm.Left = 350 - - Main_Menu.Show() + Export.StartPosition = FormStartPosition.Manual + Export.Location = New Point(500, 250) + Export.ShowDialog() End Sub End Class \ No newline at end of file diff --git a/Wardrobe/GUI/Main_Menu.Designer.vb b/Wardrobe/GUI/Main_Menu.Designer.vb index 422b60f..067b368 100644 --- a/Wardrobe/GUI/Main_Menu.Designer.vb +++ b/Wardrobe/GUI/Main_Menu.Designer.vb @@ -27,6 +27,8 @@ Partial Class Main_Menu Me.Button_Individual = New System.Windows.Forms.Button() Me.Button_Order = New System.Windows.Forms.Button() Me.Label_SettingsError = New System.Windows.Forms.Label() + Me.Button_Multiple2 = New System.Windows.Forms.Button() + Me.Button_Individual2 = New System.Windows.Forms.Button() Me.Button_Order2 = New System.Windows.Forms.Button() Me.Button_Settings2 = New System.Windows.Forms.Button() Me.SuspendLayout() @@ -38,7 +40,7 @@ Partial Class Main_Menu Me.Button_Settings.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button_Settings.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Button_Settings.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.Button_Settings.Location = New System.Drawing.Point(11, 47) + Me.Button_Settings.Location = New System.Drawing.Point(47, 44) Me.Button_Settings.Margin = New System.Windows.Forms.Padding(2) Me.Button_Settings.Name = "Button_Settings" Me.Button_Settings.Size = New System.Drawing.Size(115, 41) @@ -49,23 +51,35 @@ Partial Class Main_Menu ' 'Button_Multiple ' + Me.Button_Multiple.BackColor = System.Drawing.Color.Transparent Me.Button_Multiple.Enabled = False - Me.Button_Multiple.Location = New System.Drawing.Point(500, 296) + Me.Button_Multiple.FlatAppearance.BorderSize = 0 + Me.Button_Multiple.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button_Multiple.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Button_Multiple.ForeColor = System.Drawing.SystemColors.ControlLightLight + Me.Button_Multiple.Location = New System.Drawing.Point(435, 309) Me.Button_Multiple.Name = "Button_Multiple" - Me.Button_Multiple.Size = New System.Drawing.Size(117, 93) + Me.Button_Multiple.Size = New System.Drawing.Size(132, 67) Me.Button_Multiple.TabIndex = 4 Me.Button_Multiple.Text = "Multiple" - Me.Button_Multiple.UseVisualStyleBackColor = True + Me.Button_Multiple.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button_Multiple.UseVisualStyleBackColor = False ' 'Button_Individual ' + Me.Button_Individual.BackColor = System.Drawing.Color.Transparent Me.Button_Individual.Enabled = False - Me.Button_Individual.Location = New System.Drawing.Point(500, 166) + Me.Button_Individual.FlatAppearance.BorderSize = 0 + Me.Button_Individual.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button_Individual.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Button_Individual.ForeColor = System.Drawing.SystemColors.ControlLightLight + Me.Button_Individual.Location = New System.Drawing.Point(435, 179) Me.Button_Individual.Name = "Button_Individual" - Me.Button_Individual.Size = New System.Drawing.Size(117, 93) + Me.Button_Individual.Size = New System.Drawing.Size(142, 67) Me.Button_Individual.TabIndex = 3 Me.Button_Individual.Text = "Individual" - Me.Button_Individual.UseVisualStyleBackColor = True + Me.Button_Individual.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button_Individual.UseVisualStyleBackColor = False ' 'Button_Order ' @@ -75,7 +89,7 @@ Partial Class Main_Menu Me.Button_Order.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button_Order.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Button_Order.ForeColor = System.Drawing.SystemColors.ControlLightLight - Me.Button_Order.Location = New System.Drawing.Point(71, 250) + Me.Button_Order.Location = New System.Drawing.Point(107, 248) Me.Button_Order.Name = "Button_Order" Me.Button_Order.Size = New System.Drawing.Size(151, 65) Me.Button_Order.TabIndex = 7 @@ -88,13 +102,41 @@ Partial Class Main_Menu Me.Label_SettingsError.AutoSize = True Me.Label_SettingsError.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label_SettingsError.ForeColor = System.Drawing.Color.Red - Me.Label_SettingsError.Location = New System.Drawing.Point(139, 59) + Me.Label_SettingsError.Location = New System.Drawing.Point(175, 56) Me.Label_SettingsError.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) Me.Label_SettingsError.Name = "Label_SettingsError" Me.Label_SettingsError.Size = New System.Drawing.Size(112, 17) Me.Label_SettingsError.TabIndex = 8 Me.Label_SettingsError.Text = "Update Settings!" ' + 'Button_Multiple2 + ' + Me.Button_Multiple2.BackColor = System.Drawing.Color.Transparent + Me.Button_Multiple2.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Fill_Icon + Me.Button_Multiple2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.Button_Multiple2.Enabled = False + Me.Button_Multiple2.FlatAppearance.BorderSize = 0 + Me.Button_Multiple2.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button_Multiple2.Location = New System.Drawing.Point(445, 309) + Me.Button_Multiple2.Name = "Button_Multiple2" + Me.Button_Multiple2.Size = New System.Drawing.Size(49, 67) + Me.Button_Multiple2.TabIndex = 12 + Me.Button_Multiple2.UseVisualStyleBackColor = False + ' + 'Button_Individual2 + ' + Me.Button_Individual2.BackColor = System.Drawing.Color.Transparent + Me.Button_Individual2.BackgroundImage = Global.Wardrobe.My.Resources.Resources.Individual_Icon + Me.Button_Individual2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.Button_Individual2.Enabled = False + Me.Button_Individual2.FlatAppearance.BorderSize = 0 + Me.Button_Individual2.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button_Individual2.Location = New System.Drawing.Point(445, 179) + Me.Button_Individual2.Name = "Button_Individual2" + Me.Button_Individual2.Size = New System.Drawing.Size(49, 67) + Me.Button_Individual2.TabIndex = 11 + Me.Button_Individual2.UseVisualStyleBackColor = False + ' 'Button_Order2 ' Me.Button_Order2.BackColor = System.Drawing.Color.Transparent @@ -103,7 +145,7 @@ Partial Class Main_Menu Me.Button_Order2.Enabled = False Me.Button_Order2.FlatAppearance.BorderSize = 0 Me.Button_Order2.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button_Order2.Location = New System.Drawing.Point(71, 258) + Me.Button_Order2.Location = New System.Drawing.Point(107, 256) Me.Button_Order2.Name = "Button_Order2" Me.Button_Order2.Size = New System.Drawing.Size(55, 49) Me.Button_Order2.TabIndex = 10 @@ -116,7 +158,7 @@ Partial Class Main_Menu Me.Button_Settings2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.Button_Settings2.FlatAppearance.BorderSize = 0 Me.Button_Settings2.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button_Settings2.Location = New System.Drawing.Point(11, 47) + Me.Button_Settings2.Location = New System.Drawing.Point(47, 44) Me.Button_Settings2.Margin = New System.Windows.Forms.Padding(2) Me.Button_Settings2.Name = "Button_Settings2" Me.Button_Settings2.Size = New System.Drawing.Size(54, 41) @@ -129,6 +171,8 @@ Partial Class Main_Menu Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) Me.ClientSize = New System.Drawing.Size(800, 500) + Me.Controls.Add(Me.Button_Multiple2) + Me.Controls.Add(Me.Button_Individual2) Me.Controls.Add(Me.Button_Order2) Me.Controls.Add(Me.Button_Settings2) Me.Controls.Add(Me.Label_SettingsError) @@ -152,4 +196,6 @@ Partial Class Main_Menu Friend WithEvents Label_SettingsError As Label Friend WithEvents Button_Settings2 As Button Friend WithEvents Button_Order2 As Button + Friend WithEvents Button_Individual2 As Button + Friend WithEvents Button_Multiple2 As Button End Class diff --git a/Wardrobe/Gratings Data/User_Input.vb b/Wardrobe/Gratings Data/User_Input.vb index 39f2703..1245baf 100644 --- a/Wardrobe/Gratings Data/User_Input.vb +++ b/Wardrobe/Gratings Data/User_Input.vb @@ -17,6 +17,8 @@ Public Shared addGratingDrawing As Boolean = False 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 frameSize As Integer Public Shared Sub TypeChanged(sender As Object, e As EventArgs) @@ -57,6 +59,7 @@ serratedCheckBox.Text = "Serrated" serratedCheckBox.Left = Grating_Configurator.ComboBox_Material.Left serratedCheckBox.Top = Grating_Configurator.ComboBox_Material.Top + 25 + serratedCheckBox.ForeColor = Color.White AddHandler serratedCheckBox.CheckedChanged, AddressOf CheckBox_Serrated_CheckedChanged Grating_Configurator.Panel_Data.Controls.Add(serratedCheckBox) serratedCheckBoxBol = True @@ -96,6 +99,7 @@ lacqueredCheckBox.Text = "Lacquered" lacqueredCheckBox.Left = Grating_Configurator.ComboBox_Material.Left lacqueredCheckBox.Top = Grating_Configurator.ComboBox_Material.Top + 50 + lacqueredCheckBox.ForeColor = Color.White AddHandler lacqueredCheckBox.CheckedChanged, AddressOf CheckBox_Lacquered_CheckedChanged Grating_Configurator.Panel_Data.Controls.Add(lacqueredCheckBox) lacqueredCheckBoxBol = True @@ -367,7 +371,8 @@ .Checked = True, .Enabled = True, .AutoSize = True, - .BackColor = Color.Transparent + .BackColor = Color.Transparent, + .ForeColor = Color.White } AddHandler CheckTemp.CheckedChanged, AddressOf CheckBox_Edge_Bar_CheckedChanged Grating_Configurator.Panel_Data.Controls.Add(CheckTemp) @@ -428,9 +433,9 @@ Private Shared Sub Enable_Buttons() If AppForm.fillMode Then If Grating_Configurator.TextBox_Width.Text <> "" AndAlso Grating_Configurator.TextBox_Length.Text <> "" Then - Grating_Configurator.Button_Export_GUI.Enabled = True - Grating_Configurator.Button_Export_SW.Enabled = True - Grating_Configurator.Panel_Data.Controls("Button_Calculate").Enabled = True + Grating_Configurator.Button_ExportMenu.Enabled = True + Grating_Configurator.Button_Calculate.Enabled = True + Grating_Configurator.Button_Calculate2.Enabled = True Grating_Configurator.Button_Angle_Corner.Enabled = True Grating_Configurator.Button_Angle_Side.Enabled = True @@ -443,8 +448,7 @@ End If Else If Grating_Configurator.ComboBox_Width.Text <> "" AndAlso Grating_Configurator.TextBox_Length.Text <> "" Then - Grating_Configurator.Button_Export_GUI.Enabled = True - Grating_Configurator.Button_Export_SW.Enabled = True + Grating_Configurator.Button_ExportMenu.Enabled = True Grating_Configurator.Button_Angle_Corner.Enabled = True Grating_Configurator.Button_Angle_Side.Enabled = True diff --git a/Wardrobe/My Project/Resources.Designer.vb b/Wardrobe/My Project/Resources.Designer.vb index f2380f9..a7764be 100644 --- a/Wardrobe/My Project/Resources.Designer.vb +++ b/Wardrobe/My Project/Resources.Designer.vb @@ -90,6 +90,26 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' + Friend ReadOnly Property Export() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Export", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + ''' + ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' + Friend ReadOnly Property Fill_Icon() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Fill_Icon", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Looks up a localized resource of type System.Drawing.Bitmap. ''' @@ -100,6 +120,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' + Friend ReadOnly Property Individual_Icon() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Individual_Icon", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Looks up a localized resource of type System.Drawing.Bitmap. ''' @@ -110,6 +140,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' + Friend ReadOnly Property RadiusMiddle() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("RadiusMiddle", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Looks up a localized resource of type System.Drawing.Bitmap. ''' @@ -169,5 +209,15 @@ Namespace My.Resources Return CType(obj,System.Drawing.Bitmap) End Get End Property + + ''' + ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' + Friend ReadOnly Property undo_arrow1() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("undo-arrow1", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property End Module End Namespace diff --git a/Wardrobe/My Project/Resources.resx b/Wardrobe/My Project/Resources.resx index b06d7ed..c8afd28 100644 --- a/Wardrobe/My Project/Resources.resx +++ b/Wardrobe/My Project/Resources.resx @@ -118,37 +118,52 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\SquareSide.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\AngleSide.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\SquareMiddle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Individual_Icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\folder-search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Save-settings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\setting.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\SquareCorner.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\undo-arrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\AngleCorner.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Radius.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\AngleCorner.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Save-settings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\SquareCorner.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\AngleSide.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Fill_Icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\undo-arrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Export.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\SquareMiddle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\copy-line.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\undo-arrow1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\SquareSide.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\RadiusMiddle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/Wardrobe/Recess Functions/Corner_Rectangle.vb b/Wardrobe/Recess Functions/Corner_Rectangle.vb index 92279ba..23a03d4 100644 --- a/Wardrobe/Recess Functions/Corner_Rectangle.vb +++ b/Wardrobe/Recess Functions/Corner_Rectangle.vb @@ -23,6 +23,7 @@ Grating_Configurator.Create_Label_Recesses("X_Label", "Length", buttonX + 10, buttonY + 43) buttonOffset = 130 + Grating_Configurator.Panel_Recesses.Controls("Button_Angle_Side").Left = Grating_Configurator.Panel_Recesses.Controls("Button_Angle_Side").Left + buttonOffset Grating_Configurator.Panel_Recesses.Controls("Button_Square_Side").Left = Grating_Configurator.Panel_Recesses.Controls("Button_Square_Side").Left + buttonOffset Grating_Configurator.Panel_Recesses.Controls("Button_Square_Middle").Left = Grating_Configurator.Panel_Recesses.Controls("Button_Square_Middle").Left + buttonOffset Grating_Configurator.Panel_Recesses.Controls("Button_Radius").Left = Grating_Configurator.Panel_Recesses.Controls("Button_Radius").Left + buttonOffset @@ -384,6 +385,7 @@ Grating_Configurator.Panel_Recesses.Controls.RemoveByKey("X_Label") Grating_Configurator.Panel_Recesses.Controls.RemoveByKey("Y_Label") + Grating_Configurator.Panel_Recesses.Controls("Button_Angle_Side").Left = Grating_Configurator.Panel_Recesses.Controls("Button_Angle_Side").Left - buttonOffset Grating_Configurator.Panel_Recesses.Controls("Button_Square_Side").Left = Grating_Configurator.Panel_Recesses.Controls("Button_Square_Side").Left - buttonOffset Grating_Configurator.Panel_Recesses.Controls("Button_Square_Middle").Left = Grating_Configurator.Panel_Recesses.Controls("Button_Square_Middle").Left - buttonOffset Grating_Configurator.Panel_Recesses.Controls("Button_Radius").Left = Grating_Configurator.Panel_Recesses.Controls("Button_Radius").Left - buttonOffset diff --git a/Wardrobe/Recess Functions/Middle_Rectangle.vb b/Wardrobe/Recess Functions/Middle_Rectangle.vb index c345db2..1064fd9 100644 --- a/Wardrobe/Recess Functions/Middle_Rectangle.vb +++ b/Wardrobe/Recess Functions/Middle_Rectangle.vb @@ -35,7 +35,7 @@ Grating_Configurator.Create_Label_Recesses("OffY_Label", "Offset Y", buttonX + 126, buttonY + 43) buttonOffset = 260 - Grating_Configurator.Panel_Recesses.Controls("Button_Radius").Left = Grating_Configurator.Panel_Recesses.Controls("Button_Radius").Left + buttonOffset + Grating_Configurator.Panel_Recesses.Controls("Button_Angle_Side").Left = Grating_Configurator.Panel_Recesses.Controls("Button_Angle_Side").Left + buttonOffset Grating_Configurator.Button_Square_Middle.FlatStyle = FlatStyle.Flat Grating_Configurator.Button_Square_Middle.FlatAppearance.BorderColor = Color.Red @@ -238,7 +238,7 @@ Grating_Configurator.Panel_Recesses.Controls("Button_Square_Side").Enabled = True Grating_Configurator.Panel_Recesses.Controls("Button_Square_Middle").Enabled = True - Grating_Configurator.Panel_Recesses.Controls("Button_Radius").Left = Grating_Configurator.Panel_Recesses.Controls("Button_Radius").Left - buttonOffset + Grating_Configurator.Panel_Recesses.Controls("Button_Angle_Side").Left = Grating_Configurator.Panel_Recesses.Controls("Button_Angle_Side").Left - buttonOffset Grating_Configurator.Button_Square_Middle.FlatAppearance.BorderColor = Color.Black End Sub diff --git a/Wardrobe/Recess Functions/Side_Rectangle.vb b/Wardrobe/Recess Functions/Side_Rectangle.vb index eacdffb..2dd62ce 100644 --- a/Wardrobe/Recess Functions/Side_Rectangle.vb +++ b/Wardrobe/Recess Functions/Side_Rectangle.vb @@ -31,7 +31,7 @@ buttonOffset = 130 Grating_Configurator.Panel_Recesses.Controls("Button_Square_Middle").Left = Grating_Configurator.Panel_Recesses.Controls("Button_Square_Middle").Left + buttonOffset - Grating_Configurator.Panel_Recesses.Controls("Button_Radius").Left = Grating_Configurator.Panel_Recesses.Controls("Button_Radius").Left + buttonOffset + Grating_Configurator.Panel_Recesses.Controls("Button_Angle_Side").Left = Grating_Configurator.Panel_Recesses.Controls("Button_Angle_Side").Left + buttonOffset Grating_Configurator.Button_Square_Side.FlatStyle = FlatStyle.Flat Grating_Configurator.Button_Square_Side.FlatAppearance.BorderColor = Color.Red @@ -570,7 +570,7 @@ Grating_Configurator.Panel_Recesses.Controls("Button_Square_Middle").Left = Grating_Configurator.Panel_Recesses.Controls("Button_Square_Middle").Left - buttonOffset - Grating_Configurator.Panel_Recesses.Controls("Button_Radius").Left = Grating_Configurator.Panel_Recesses.Controls("Button_Radius").Left - buttonOffset + Grating_Configurator.Panel_Recesses.Controls("Button_Angle_Side").Left = Grating_Configurator.Panel_Recesses.Controls("Button_Angle_Side").Left - buttonOffset Grating_Configurator.Button_Square_Side.FlatAppearance.BorderColor = Color.Black diff --git a/Wardrobe/Resources/Export.png b/Wardrobe/Resources/Export.png new file mode 100644 index 0000000..b859c09 Binary files /dev/null and b/Wardrobe/Resources/Export.png differ diff --git a/Wardrobe/Resources/Fill_Icon.png b/Wardrobe/Resources/Fill_Icon.png new file mode 100644 index 0000000..4a34153 Binary files /dev/null and b/Wardrobe/Resources/Fill_Icon.png differ diff --git a/Wardrobe/Resources/Individual_Icon.png b/Wardrobe/Resources/Individual_Icon.png new file mode 100644 index 0000000..56d1a97 Binary files /dev/null and b/Wardrobe/Resources/Individual_Icon.png differ diff --git a/Wardrobe/Resources/RadiusMiddle.png b/Wardrobe/Resources/RadiusMiddle.png new file mode 100644 index 0000000..9ea0a56 Binary files /dev/null and b/Wardrobe/Resources/RadiusMiddle.png differ diff --git a/Wardrobe/Resources/undo-arrow1.png b/Wardrobe/Resources/undo-arrow1.png new file mode 100644 index 0000000..d4df03e Binary files /dev/null and b/Wardrobe/Resources/undo-arrow1.png differ diff --git a/Wardrobe/SolidWorks/Individual_3D.vb b/Wardrobe/SolidWorks/Individual_3D.vb index c1c00f5..0f56590 100644 --- a/Wardrobe/SolidWorks/Individual_3D.vb +++ b/Wardrobe/SolidWorks/Individual_3D.vb @@ -61,22 +61,25 @@ Public Class Individual_3D Dim status As Integer Dim Assembly = swApp.ActiveDoc() - 'Dim newName As String - 'newName = Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw") & "\grating_assembly.SLDASM" - - 'Dim swExtensions As IModelDocExtension - 'swExtensions = Assembly.Extension - 'Dim Errors As Integer - 'Dim Warnings As Integer - - 'status = swExtensions.SaveAs2(newName, 0, 4, Nothing, "", True, Errors, Warnings) Dim Errors As Integer Dim Warnings As Integer + + Dim components = Assembly.GetComponents(True) + For i = 0 To UBound(components) + Dim partDoc = components(i).GetModelDoc2() + status = partDoc.Save3(4, Errors, Warnings) + Next + Dim model As IModelDoc2 model = Assembly status = model.Save3(4, Errors, Warnings) + 'To STEP + If User_Input.Add3DStep = True Then + status = Assembly.SaveAs3(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_stp") & "\GRATING_ASSEMBLY.STEP", 0, 2) + End If + Dim sourcePath, destPath As String Dim childrenSourcePaths As New List(Of String) Dim childrenDestPaths As New List(Of String) diff --git a/Wardrobe/SolidWorks/Multiple_3D.vb b/Wardrobe/SolidWorks/Multiple_3D.vb index 3317eb7..ddeeb10 100644 --- a/Wardrobe/SolidWorks/Multiple_3D.vb +++ b/Wardrobe/SolidWorks/Multiple_3D.vb @@ -112,11 +112,15 @@ Public Class Multiple_3D status = partDoc.Save3(4, Errors, Warnings) Next - Dim model As IModelDoc2 model = Assembly status = model.Save3(4, Errors, Warnings) + 'To STEP + If User_Input.Add3DStep = True Then + status = Assembly.SaveAs3(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_stp") & "\GRATINGS_ASSEMBLY.STEP", 0, 2) + End If + Dim sourcePath, destPath As String Dim childrenSourcePaths As New List(Of String) Dim childrenDestPaths As New List(Of String) diff --git a/Wardrobe/Wardrobe.vbproj b/Wardrobe/Wardrobe.vbproj index 0114556..320cf68 100644 --- a/Wardrobe/Wardrobe.vbproj +++ b/Wardrobe/Wardrobe.vbproj @@ -85,6 +85,12 @@ Form + + Export.vb + + + Form + Grating_Configurator.vb @@ -139,6 +145,9 @@ AppForm.vb Designer + + Export.vb + Grating_Configurator.vb @@ -247,5 +256,20 @@ + + + + + + + + + + + + + + + \ No newline at end of file