Small fixes in GUI and SW export
This commit is contained in:
Anton
parent
cdf56dbf19
commit
21e5ab9520
|
|
@ -263,7 +263,7 @@
|
|||
' Draw grating grid for fill area
|
||||
If AppForm.fillMode Then
|
||||
Dim dashPen As Pen = New Pen(Color.DarkGray, 1)
|
||||
dashPen.DashPattern = {2, 4}
|
||||
dashPen.DashPattern = {6, 4}
|
||||
|
||||
Dim singleLength As Integer = Grating_Fill.minLength / Data.scaleDiff
|
||||
For i = 0 To Grating_Fill.numOfHorizontal - 2
|
||||
|
|
|
|||
|
|
@ -57,6 +57,7 @@ Partial Class Individual
|
|||
Me.Panel_Grating = New System.Windows.Forms.Panel()
|
||||
Me.Label2 = New System.Windows.Forms.Label()
|
||||
Me.Label1 = New System.Windows.Forms.Label()
|
||||
Me.Button_Radius = New System.Windows.Forms.Button()
|
||||
Me.Panel_Data.SuspendLayout()
|
||||
Me.Panel_Recesses.SuspendLayout()
|
||||
Me.Panel_Grating.SuspendLayout()
|
||||
|
|
@ -92,45 +93,42 @@ Partial Class Individual
|
|||
Me.Panel_Data.Location = New System.Drawing.Point(0, 0)
|
||||
Me.Panel_Data.Margin = New System.Windows.Forms.Padding(0)
|
||||
Me.Panel_Data.Name = "Panel_Data"
|
||||
Me.Panel_Data.Size = New System.Drawing.Size(420, 950)
|
||||
Me.Panel_Data.Size = New System.Drawing.Size(315, 772)
|
||||
Me.Panel_Data.TabIndex = 0
|
||||
'
|
||||
'Button_Back
|
||||
'
|
||||
Me.Button_Back.Location = New System.Drawing.Point(12, 12)
|
||||
Me.Button_Back.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2)
|
||||
Me.Button_Back.Location = New System.Drawing.Point(9, 10)
|
||||
Me.Button_Back.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
|
||||
Me.Button_Back.Name = "Button_Back"
|
||||
Me.Button_Back.Size = New System.Drawing.Size(56, 41)
|
||||
Me.Button_Back.Size = New System.Drawing.Size(42, 33)
|
||||
Me.Button_Back.TabIndex = 27
|
||||
Me.Button_Back.Text = "Back"
|
||||
Me.Button_Back.UseVisualStyleBackColor = True
|
||||
'
|
||||
'TextBox_Width
|
||||
'
|
||||
Me.TextBox_Width.Location = New System.Drawing.Point(147, 514)
|
||||
Me.TextBox_Width.Margin = New System.Windows.Forms.Padding(4)
|
||||
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.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
|
||||
Me.ComboBox_Width.FormattingEnabled = True
|
||||
Me.ComboBox_Width.Location = New System.Drawing.Point(147, 514)
|
||||
Me.ComboBox_Width.Margin = New System.Windows.Forms.Padding(4)
|
||||
Me.ComboBox_Width.Location = New System.Drawing.Point(110, 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, 569)
|
||||
Me.Label7.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
|
||||
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"
|
||||
'
|
||||
|
|
@ -138,10 +136,9 @@ Partial Class Individual
|
|||
'
|
||||
Me.Label6.AutoSize = True
|
||||
Me.Label6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
Me.Label6.Location = New System.Drawing.Point(359, 518)
|
||||
Me.Label6.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
|
||||
Me.Label6.Location = New System.Drawing.Point(269, 468)
|
||||
Me.Label6.Name = "Label6"
|
||||
Me.Label6.Size = New System.Drawing.Size(30, 17)
|
||||
Me.Label6.Size = New System.Drawing.Size(23, 13)
|
||||
Me.Label6.TabIndex = 23
|
||||
Me.Label6.Text = "mm"
|
||||
'
|
||||
|
|
@ -149,10 +146,9 @@ Partial Class Individual
|
|||
'
|
||||
Me.Label5.AutoSize = True
|
||||
Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
Me.Label5.Location = New System.Drawing.Point(359, 404)
|
||||
Me.Label5.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
|
||||
Me.Label5.Location = New System.Drawing.Point(269, 328)
|
||||
Me.Label5.Name = "Label5"
|
||||
Me.Label5.Size = New System.Drawing.Size(30, 17)
|
||||
Me.Label5.Size = New System.Drawing.Size(23, 13)
|
||||
Me.Label5.TabIndex = 22
|
||||
Me.Label5.Text = "mm"
|
||||
'
|
||||
|
|
@ -160,10 +156,9 @@ Partial Class Individual
|
|||
'
|
||||
Me.Label4.AutoSize = True
|
||||
Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
Me.Label4.Location = New System.Drawing.Point(359, 346)
|
||||
Me.Label4.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
|
||||
Me.Label4.Location = New System.Drawing.Point(269, 281)
|
||||
Me.Label4.Name = "Label4"
|
||||
Me.Label4.Size = New System.Drawing.Size(30, 17)
|
||||
Me.Label4.Size = New System.Drawing.Size(23, 13)
|
||||
Me.Label4.TabIndex = 21
|
||||
Me.Label4.Text = "mm"
|
||||
'
|
||||
|
|
@ -171,20 +166,18 @@ Partial Class Individual
|
|||
'
|
||||
Me.Label3.AutoSize = True
|
||||
Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
Me.Label3.Location = New System.Drawing.Point(359, 292)
|
||||
Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
|
||||
Me.Label3.Location = New System.Drawing.Point(269, 237)
|
||||
Me.Label3.Name = "Label3"
|
||||
Me.Label3.Size = New System.Drawing.Size(30, 17)
|
||||
Me.Label3.Size = New System.Drawing.Size(23, 13)
|
||||
Me.Label3.TabIndex = 20
|
||||
Me.Label3.Text = "mm"
|
||||
'
|
||||
'Button_Export_GUI
|
||||
'
|
||||
Me.Button_Export_GUI.BackColor = System.Drawing.Color.Transparent
|
||||
Me.Button_Export_GUI.Location = New System.Drawing.Point(65, 866)
|
||||
Me.Button_Export_GUI.Margin = New System.Windows.Forms.Padding(4)
|
||||
Me.Button_Export_GUI.Location = New System.Drawing.Point(49, 704)
|
||||
Me.Button_Export_GUI.Name = "Button_Export_GUI"
|
||||
Me.Button_Export_GUI.Size = New System.Drawing.Size(100, 28)
|
||||
Me.Button_Export_GUI.Size = New System.Drawing.Size(75, 23)
|
||||
Me.Button_Export_GUI.TabIndex = 18
|
||||
Me.Button_Export_GUI.Text = "Export GUI"
|
||||
Me.Button_Export_GUI.UseVisualStyleBackColor = False
|
||||
|
|
@ -192,10 +185,9 @@ Partial Class Individual
|
|||
'Button_Export_SW
|
||||
'
|
||||
Me.Button_Export_SW.BackColor = System.Drawing.Color.Transparent
|
||||
Me.Button_Export_SW.Location = New System.Drawing.Point(235, 866)
|
||||
Me.Button_Export_SW.Margin = New System.Windows.Forms.Padding(4)
|
||||
Me.Button_Export_SW.Location = New System.Drawing.Point(176, 704)
|
||||
Me.Button_Export_SW.Name = "Button_Export_SW"
|
||||
Me.Button_Export_SW.Size = New System.Drawing.Size(100, 28)
|
||||
Me.Button_Export_SW.Size = New System.Drawing.Size(75, 23)
|
||||
Me.Button_Export_SW.TabIndex = 17
|
||||
Me.Button_Export_SW.Text = "Export SW"
|
||||
Me.Button_Export_SW.UseVisualStyleBackColor = False
|
||||
|
|
@ -204,10 +196,9 @@ Partial Class Individual
|
|||
'
|
||||
Me.Label_Heading.AutoSize = True
|
||||
Me.Label_Heading.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
Me.Label_Heading.Location = New System.Drawing.Point(94, 46)
|
||||
Me.Label_Heading.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
|
||||
Me.Label_Heading.Location = New System.Drawing.Point(70, 37)
|
||||
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"
|
||||
'
|
||||
|
|
@ -215,10 +206,9 @@ Partial Class Individual
|
|||
'
|
||||
Me.Label_Material.AutoSize = True
|
||||
Me.Label_Material.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
Me.Label_Material.Location = New System.Drawing.Point(61, 176)
|
||||
Me.Label_Material.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
|
||||
Me.Label_Material.Location = New System.Drawing.Point(46, 143)
|
||||
Me.Label_Material.Name = "Label_Material"
|
||||
Me.Label_Material.Size = New System.Drawing.Size(69, 20)
|
||||
Me.Label_Material.Size = New System.Drawing.Size(58, 17)
|
||||
Me.Label_Material.TabIndex = 14
|
||||
Me.Label_Material.Text = "Material"
|
||||
'
|
||||
|
|
@ -226,10 +216,9 @@ Partial Class Individual
|
|||
'
|
||||
Me.Label_Mesh.AutoSize = True
|
||||
Me.Label_Mesh.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
Me.Label_Mesh.Location = New System.Drawing.Point(41, 287)
|
||||
Me.Label_Mesh.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
|
||||
Me.Label_Mesh.Location = New System.Drawing.Point(31, 233)
|
||||
Me.Label_Mesh.Name = "Label_Mesh"
|
||||
Me.Label_Mesh.Size = New System.Drawing.Size(88, 20)
|
||||
Me.Label_Mesh.Size = New System.Drawing.Size(73, 17)
|
||||
Me.Label_Mesh.TabIndex = 13
|
||||
Me.Label_Mesh.Text = "Mesh Size"
|
||||
'
|
||||
|
|
@ -237,10 +226,9 @@ Partial Class Individual
|
|||
'
|
||||
Me.Label_Height.AutoSize = True
|
||||
Me.Label_Height.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
Me.Label_Height.Location = New System.Drawing.Point(73, 343)
|
||||
Me.Label_Height.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
|
||||
Me.Label_Height.Location = New System.Drawing.Point(55, 279)
|
||||
Me.Label_Height.Name = "Label_Height"
|
||||
Me.Label_Height.Size = New System.Drawing.Size(58, 20)
|
||||
Me.Label_Height.Size = New System.Drawing.Size(49, 17)
|
||||
Me.Label_Height.TabIndex = 12
|
||||
Me.Label_Height.Text = "Height"
|
||||
'
|
||||
|
|
@ -248,10 +236,9 @@ Partial Class Individual
|
|||
'
|
||||
Me.Label_Thickness.AutoSize = True
|
||||
Me.Label_Thickness.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
Me.Label_Thickness.Location = New System.Drawing.Point(43, 399)
|
||||
Me.Label_Thickness.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
|
||||
Me.Label_Thickness.Location = New System.Drawing.Point(32, 324)
|
||||
Me.Label_Thickness.Name = "Label_Thickness"
|
||||
Me.Label_Thickness.Size = New System.Drawing.Size(85, 20)
|
||||
Me.Label_Thickness.Size = New System.Drawing.Size(72, 17)
|
||||
Me.Label_Thickness.TabIndex = 11
|
||||
Me.Label_Thickness.Text = "Thickness"
|
||||
'
|
||||
|
|
@ -259,10 +246,9 @@ Partial Class Individual
|
|||
'
|
||||
Me.Label_Width.AutoSize = True
|
||||
Me.Label_Width.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
Me.Label_Width.Location = New System.Drawing.Point(80, 514)
|
||||
Me.Label_Width.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
|
||||
Me.Label_Width.Location = New System.Drawing.Point(60, 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"
|
||||
'
|
||||
|
|
@ -270,10 +256,9 @@ Partial Class Individual
|
|||
'
|
||||
Me.Label_Length.AutoSize = True
|
||||
Me.Label_Length.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
Me.Label_Length.Location = New System.Drawing.Point(69, 564)
|
||||
Me.Label_Length.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
|
||||
Me.Label_Length.Location = New System.Drawing.Point(52, 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"
|
||||
'
|
||||
|
|
@ -281,74 +266,68 @@ Partial Class Individual
|
|||
'
|
||||
Me.Label_Type.AutoSize = True
|
||||
Me.Label_Type.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
Me.Label_Type.Location = New System.Drawing.Point(85, 124)
|
||||
Me.Label_Type.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
|
||||
Me.Label_Type.Location = New System.Drawing.Point(64, 101)
|
||||
Me.Label_Type.Name = "Label_Type"
|
||||
Me.Label_Type.Size = New System.Drawing.Size(45, 20)
|
||||
Me.Label_Type.Size = New System.Drawing.Size(40, 16)
|
||||
Me.Label_Type.TabIndex = 8
|
||||
Me.Label_Type.Text = "Type"
|
||||
'
|
||||
'TextBox_Length
|
||||
'
|
||||
Me.TextBox_Length.Location = New System.Drawing.Point(147, 564)
|
||||
Me.TextBox_Length.Margin = New System.Windows.Forms.Padding(4)
|
||||
Me.TextBox_Length.Location = New System.Drawing.Point(110, 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.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
|
||||
Me.ComboBox_Mesh.FormattingEnabled = True
|
||||
Me.ComboBox_Mesh.Location = New System.Drawing.Point(147, 287)
|
||||
Me.ComboBox_Mesh.Margin = New System.Windows.Forms.Padding(4)
|
||||
Me.ComboBox_Mesh.Location = New System.Drawing.Point(110, 233)
|
||||
Me.ComboBox_Mesh.Name = "ComboBox_Mesh"
|
||||
Me.ComboBox_Mesh.Size = New System.Drawing.Size(205, 24)
|
||||
Me.ComboBox_Mesh.Size = New System.Drawing.Size(155, 21)
|
||||
Me.ComboBox_Mesh.TabIndex = 6
|
||||
'
|
||||
'ComboBox_Thickness
|
||||
'
|
||||
Me.ComboBox_Thickness.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
|
||||
Me.ComboBox_Thickness.FormattingEnabled = True
|
||||
Me.ComboBox_Thickness.Location = New System.Drawing.Point(147, 398)
|
||||
Me.ComboBox_Thickness.Margin = New System.Windows.Forms.Padding(4)
|
||||
Me.ComboBox_Thickness.Location = New System.Drawing.Point(110, 323)
|
||||
Me.ComboBox_Thickness.Name = "ComboBox_Thickness"
|
||||
Me.ComboBox_Thickness.Size = New System.Drawing.Size(205, 24)
|
||||
Me.ComboBox_Thickness.Size = New System.Drawing.Size(155, 21)
|
||||
Me.ComboBox_Thickness.TabIndex = 3
|
||||
'
|
||||
'ComboBox_Height
|
||||
'
|
||||
Me.ComboBox_Height.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
|
||||
Me.ComboBox_Height.FormattingEnabled = True
|
||||
Me.ComboBox_Height.Location = New System.Drawing.Point(147, 342)
|
||||
Me.ComboBox_Height.Margin = New System.Windows.Forms.Padding(4)
|
||||
Me.ComboBox_Height.Location = New System.Drawing.Point(110, 278)
|
||||
Me.ComboBox_Height.Name = "ComboBox_Height"
|
||||
Me.ComboBox_Height.Size = New System.Drawing.Size(205, 24)
|
||||
Me.ComboBox_Height.Size = New System.Drawing.Size(155, 21)
|
||||
Me.ComboBox_Height.TabIndex = 2
|
||||
'
|
||||
'ComboBox_Material
|
||||
'
|
||||
Me.ComboBox_Material.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
|
||||
Me.ComboBox_Material.FormattingEnabled = True
|
||||
Me.ComboBox_Material.Location = New System.Drawing.Point(147, 175)
|
||||
Me.ComboBox_Material.Margin = New System.Windows.Forms.Padding(4)
|
||||
Me.ComboBox_Material.Location = New System.Drawing.Point(110, 142)
|
||||
Me.ComboBox_Material.Name = "ComboBox_Material"
|
||||
Me.ComboBox_Material.Size = New System.Drawing.Size(205, 24)
|
||||
Me.ComboBox_Material.Size = New System.Drawing.Size(155, 21)
|
||||
Me.ComboBox_Material.TabIndex = 1
|
||||
'
|
||||
'ComboBox_Type
|
||||
'
|
||||
Me.ComboBox_Type.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
|
||||
Me.ComboBox_Type.FormattingEnabled = True
|
||||
Me.ComboBox_Type.Location = New System.Drawing.Point(147, 124)
|
||||
Me.ComboBox_Type.Margin = New System.Windows.Forms.Padding(4)
|
||||
Me.ComboBox_Type.Location = New System.Drawing.Point(110, 101)
|
||||
Me.ComboBox_Type.Name = "ComboBox_Type"
|
||||
Me.ComboBox_Type.Size = New System.Drawing.Size(205, 24)
|
||||
Me.ComboBox_Type.Size = New System.Drawing.Size(155, 21)
|
||||
Me.ComboBox_Type.TabIndex = 0
|
||||
'
|
||||
'Panel_Recesses
|
||||
'
|
||||
Me.Panel_Recesses.BackColor = System.Drawing.Color.Silver
|
||||
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)
|
||||
|
|
@ -356,9 +335,8 @@ Partial Class Individual
|
|||
Me.Panel_Recesses.Controls.Add(Me.Button_Angle_Corner)
|
||||
Me.Panel_Recesses.Controls.Add(Me.Label_Recesses)
|
||||
Me.Panel_Recesses.Location = New System.Drawing.Point(0, 0)
|
||||
Me.Panel_Recesses.Margin = New System.Windows.Forms.Padding(4)
|
||||
Me.Panel_Recesses.Name = "Panel_Recesses"
|
||||
Me.Panel_Recesses.Size = New System.Drawing.Size(1860, 148)
|
||||
Me.Panel_Recesses.Size = New System.Drawing.Size(1395, 120)
|
||||
Me.Panel_Recesses.TabIndex = 1
|
||||
'
|
||||
'Button_Square_Middle
|
||||
|
|
@ -366,10 +344,9 @@ Partial Class Individual
|
|||
Me.Button_Square_Middle.BackColor = System.Drawing.Color.Gainsboro
|
||||
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.Location = New System.Drawing.Point(901, 25)
|
||||
Me.Button_Square_Middle.Name = "Button_Square_Middle"
|
||||
Me.Button_Square_Middle.Size = New System.Drawing.Size(93, 86)
|
||||
Me.Button_Square_Middle.Size = New System.Drawing.Size(70, 70)
|
||||
Me.Button_Square_Middle.TabIndex = 21
|
||||
Me.Button_Square_Middle.Text = "Square Middle"
|
||||
Me.Button_Square_Middle.UseVisualStyleBackColor = False
|
||||
|
|
@ -379,10 +356,9 @@ Partial Class Individual
|
|||
Me.Button_Square_Side.BackColor = System.Drawing.Color.Gainsboro
|
||||
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.Location = New System.Drawing.Point(796, 25)
|
||||
Me.Button_Square_Side.Name = "Button_Square_Side"
|
||||
Me.Button_Square_Side.Size = New System.Drawing.Size(93, 86)
|
||||
Me.Button_Square_Side.Size = New System.Drawing.Size(70, 70)
|
||||
Me.Button_Square_Side.TabIndex = 20
|
||||
Me.Button_Square_Side.Text = "Square Side"
|
||||
Me.Button_Square_Side.UseVisualStyleBackColor = False
|
||||
|
|
@ -392,10 +368,9 @@ Partial Class Individual
|
|||
Me.Button_Angle_Side.BackColor = System.Drawing.Color.Gainsboro
|
||||
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.Location = New System.Drawing.Point(586, 25)
|
||||
Me.Button_Angle_Side.Name = "Button_Angle_Side"
|
||||
Me.Button_Angle_Side.Size = New System.Drawing.Size(93, 86)
|
||||
Me.Button_Angle_Side.Size = New System.Drawing.Size(70, 70)
|
||||
Me.Button_Angle_Side.TabIndex = 19
|
||||
Me.Button_Angle_Side.Text = "Angle Side"
|
||||
Me.Button_Angle_Side.UseVisualStyleBackColor = False
|
||||
|
|
@ -405,10 +380,9 @@ Partial Class Individual
|
|||
Me.Button_Square_Corner.BackColor = System.Drawing.Color.Gainsboro
|
||||
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.Location = New System.Drawing.Point(691, 25)
|
||||
Me.Button_Square_Corner.Name = "Button_Square_Corner"
|
||||
Me.Button_Square_Corner.Size = New System.Drawing.Size(93, 86)
|
||||
Me.Button_Square_Corner.Size = New System.Drawing.Size(70, 70)
|
||||
Me.Button_Square_Corner.TabIndex = 18
|
||||
Me.Button_Square_Corner.Text = "Square Corner"
|
||||
Me.Button_Square_Corner.UseVisualStyleBackColor = False
|
||||
|
|
@ -418,10 +392,9 @@ Partial Class Individual
|
|||
Me.Button_Angle_Corner.BackColor = System.Drawing.Color.Gainsboro
|
||||
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.Location = New System.Drawing.Point(481, 25)
|
||||
Me.Button_Angle_Corner.Name = "Button_Angle_Corner"
|
||||
Me.Button_Angle_Corner.Size = New System.Drawing.Size(93, 86)
|
||||
Me.Button_Angle_Corner.Size = New System.Drawing.Size(70, 70)
|
||||
Me.Button_Angle_Corner.TabIndex = 17
|
||||
Me.Button_Angle_Corner.Text = "Angle Corner"
|
||||
Me.Button_Angle_Corner.UseVisualStyleBackColor = False
|
||||
|
|
@ -430,10 +403,9 @@ Partial Class Individual
|
|||
'
|
||||
Me.Label_Recesses.AutoSize = True
|
||||
Me.Label_Recesses.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
Me.Label_Recesses.Location = New System.Drawing.Point(439, 44)
|
||||
Me.Label_Recesses.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
|
||||
Me.Label_Recesses.Location = New System.Drawing.Point(329, 36)
|
||||
Me.Label_Recesses.Name = "Label_Recesses"
|
||||
Me.Label_Recesses.Size = New System.Drawing.Size(106, 25)
|
||||
Me.Label_Recesses.Size = New System.Drawing.Size(88, 20)
|
||||
Me.Label_Recesses.TabIndex = 16
|
||||
Me.Label_Recesses.Text = "Recesses"
|
||||
'
|
||||
|
|
@ -442,20 +414,18 @@ Partial Class Individual
|
|||
Me.Panel_Grating.BackColor = System.Drawing.Color.White
|
||||
Me.Panel_Grating.Controls.Add(Me.Label2)
|
||||
Me.Panel_Grating.Controls.Add(Me.Label1)
|
||||
Me.Panel_Grating.Location = New System.Drawing.Point(420, 148)
|
||||
Me.Panel_Grating.Margin = New System.Windows.Forms.Padding(4)
|
||||
Me.Panel_Grating.Location = New System.Drawing.Point(315, 120)
|
||||
Me.Panel_Grating.Name = "Panel_Grating"
|
||||
Me.Panel_Grating.Size = New System.Drawing.Size(1440, 802)
|
||||
Me.Panel_Grating.Size = New System.Drawing.Size(1080, 652)
|
||||
Me.Panel_Grating.TabIndex = 2
|
||||
'
|
||||
'Label2
|
||||
'
|
||||
Me.Label2.AutoSize = True
|
||||
Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.8!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
Me.Label2.Location = New System.Drawing.Point(85, 769)
|
||||
Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
|
||||
Me.Label2.Location = New System.Drawing.Point(64, 625)
|
||||
Me.Label2.Name = "Label2"
|
||||
Me.Label2.Size = New System.Drawing.Size(16, 17)
|
||||
Me.Label2.Size = New System.Drawing.Size(13, 13)
|
||||
Me.Label2.TabIndex = 1
|
||||
Me.Label2.Text = "L"
|
||||
'
|
||||
|
|
@ -463,24 +433,35 @@ Partial Class Individual
|
|||
'
|
||||
Me.Label1.AutoSize = True
|
||||
Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.8!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
Me.Label1.Location = New System.Drawing.Point(17, 708)
|
||||
Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
|
||||
Me.Label1.Location = New System.Drawing.Point(13, 575)
|
||||
Me.Label1.Name = "Label1"
|
||||
Me.Label1.Size = New System.Drawing.Size(21, 17)
|
||||
Me.Label1.Size = New System.Drawing.Size(18, 13)
|
||||
Me.Label1.TabIndex = 0
|
||||
Me.Label1.Text = "W"
|
||||
'
|
||||
'Button_Radius
|
||||
'
|
||||
Me.Button_Radius.BackColor = System.Drawing.Color.Gainsboro
|
||||
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(1006, 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.Text = "Radius"
|
||||
Me.Button_Radius.UseVisualStyleBackColor = False
|
||||
'
|
||||
'Individual
|
||||
'
|
||||
Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 16.0!)
|
||||
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
||||
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
|
||||
Me.BackColor = System.Drawing.SystemColors.Control
|
||||
Me.ClientSize = New System.Drawing.Size(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.Text = "Individual"
|
||||
Me.Panel_Data.ResumeLayout(False)
|
||||
|
|
@ -528,4 +509,5 @@ Partial Class Individual
|
|||
Friend WithEvents TextBox_Width As TextBox
|
||||
Friend WithEvents ComboBox_Width As ComboBox
|
||||
Friend WithEvents Button_Back As Button
|
||||
Friend WithEvents Button_Radius As Button
|
||||
End Class
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ Public Class Individual
|
|||
.Name = "CheckBox_Whole_Mesh",
|
||||
.Text = "Whole Mesh Widths",
|
||||
.Left = 110,
|
||||
.Top = 387,
|
||||
.Top = 443,
|
||||
.Font = New Font("Microsoft Sans Serif", 7.8),
|
||||
.Checked = True,
|
||||
.Enabled = False,
|
||||
|
|
|
|||
|
|
@ -273,13 +273,6 @@
|
|||
Next
|
||||
End Sub
|
||||
|
||||
Public Shared Sub WholeMeshWidthsChanged(sender As Object, e As EventArgs)
|
||||
If sender.Checked Then
|
||||
Individual.ComboBox_Width.DropDownStyle = ComboBoxStyle.DropDownList
|
||||
Else
|
||||
Individual.ComboBox_Width.DropDownStyle = ComboBoxStyle.DropDown
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Public Shared Sub ThicknessChanged(sender As Object, e As EventArgs)
|
||||
Individual.ComboBox_Width.Enabled = True
|
||||
|
|
@ -345,6 +338,35 @@
|
|||
End Sub
|
||||
|
||||
|
||||
Public Shared Sub WholeMeshWidthsChanged(sender As Object, e As EventArgs)
|
||||
If sender.Checked Then
|
||||
Individual.ComboBox_Width.DropDownStyle = ComboBoxStyle.DropDownList
|
||||
|
||||
Individual.Panel_Data.Controls.RemoveByKey("CheckBox_Edge_Bar")
|
||||
Else
|
||||
Individual.ComboBox_Width.DropDownStyle = ComboBoxStyle.DropDown
|
||||
|
||||
Dim CheckTemp As New CheckBox With {
|
||||
.Name = "CheckBox_Edge_Bar",
|
||||
.Text = "Extra Edge Bar",
|
||||
.Left = 110,
|
||||
.Top = 495,
|
||||
.Font = New Font("Microsoft Sans Serif", 7.8),
|
||||
.Checked = True,
|
||||
.Enabled = True,
|
||||
.AutoSize = True,
|
||||
.BackColor = Color.Transparent
|
||||
}
|
||||
AddHandler CheckTemp.CheckedChanged, AddressOf CheckBox_Edge_Bar_CheckedChanged
|
||||
Individual.Panel_Data.Controls.Add(CheckTemp)
|
||||
End If
|
||||
End Sub
|
||||
|
||||
|
||||
Public Shared Sub CheckBox_Edge_Bar_CheckedChanged(sender As Object, e As EventArgs)
|
||||
|
||||
End Sub
|
||||
|
||||
|
||||
Public Shared Sub WidthChanged(sender As Object, e As EventArgs)
|
||||
If AppForm.fillMode Then
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@
|
|||
Individual.Panel_Recesses.Controls("Button_Square_Corner").Left = Individual.Panel_Recesses.Controls("Button_Square_Corner").Left + buttonOffset
|
||||
Individual.Panel_Recesses.Controls("Button_Square_Side").Left = Individual.Panel_Recesses.Controls("Button_Square_Side").Left + buttonOffset
|
||||
Individual.Panel_Recesses.Controls("Button_Square_Middle").Left = Individual.Panel_Recesses.Controls("Button_Square_Middle").Left + buttonOffset
|
||||
Individual.Panel_Recesses.Controls("Button_Radius").Left = Individual.Panel_Recesses.Controls("Button_Radius").Left + buttonOffset
|
||||
|
||||
Individual.Button_Angle_Corner.FlatStyle = FlatStyle.Flat
|
||||
Individual.Button_Angle_Corner.FlatAppearance.BorderColor = Color.Red
|
||||
|
|
@ -126,7 +127,7 @@
|
|||
|
||||
For i = 2 To Data.pointsMeasurements.Count - 1
|
||||
Dim mesName As String = Data.pointsMeasurements.Keys(i)
|
||||
If mesName.Split("_")(0) <> "SS1" AndAlso mesName.Split("_")(0) <> "SS" Then
|
||||
If mesName.Split("_")(0) <> "SS1" AndAlso mesName.Split("_")(0) <> "SS" AndAlso mesName.Split("_")(0) <> "MS" AndAlso mesName.Split("_")(0) <> "MS1" Then
|
||||
If index + 1 = Data.pointsMeasurements(mesName)(0) Then
|
||||
If Draw_Grating.measureLabels(mesName)(3) = 1 Then
|
||||
Draw_Grating.measureLabels(mesName)(0) = Draw_Grating.measureLabels(mesName)(0) - Individual.Panel_Recesses.Controls("X_TextBox").Text
|
||||
|
|
@ -163,6 +164,21 @@
|
|||
Draw_Grating.measureLabels(mesName)(1) = Draw_Grating.measureLabels(mesName)(1) + dXGUI / 2
|
||||
|
||||
Draw_Grating.sideSquareMesLine(mesName)(0) = Draw_Grating.sideSquareMesLine(mesName)(0) + dXGUI
|
||||
ElseIf Draw_Grating.measureLabels(mesName)(3) = 2 Then
|
||||
Draw_Grating.measureLabels(mesName)(0) = Draw_Grating.measureLabels(mesName)(0) - Individual.Panel_Recesses.Controls("Y_TextBox").Text
|
||||
Draw_Grating.measureLabels(mesName)(2) = Draw_Grating.measureLabels(mesName)(2) + dYGUI / 2
|
||||
|
||||
Draw_Grating.sideSquareMesLine(mesName)(1) = Draw_Grating.sideSquareMesLine(mesName)(1) + dYGUI
|
||||
ElseIf Draw_Grating.measureLabels(mesName)(3) = 3 Then
|
||||
Draw_Grating.measureLabels(mesName)(0) = Draw_Grating.measureLabels(mesName)(0) - Individual.Panel_Recesses.Controls("X_TextBox").Text
|
||||
Draw_Grating.measureLabels(mesName)(1) = Draw_Grating.measureLabels(mesName)(1) - dXGUI / 2
|
||||
|
||||
Draw_Grating.sideSquareMesLine(mesName)(0) = Draw_Grating.sideSquareMesLine(mesName)(0) - dXGUI
|
||||
Else
|
||||
Draw_Grating.measureLabels(mesName)(0) = Draw_Grating.measureLabels(mesName)(0) - Individual.Panel_Recesses.Controls("Y_TextBox").Text
|
||||
Draw_Grating.measureLabels(mesName)(2) = Draw_Grating.measureLabels(mesName)(2) - dYGUI / 2
|
||||
|
||||
Draw_Grating.sideSquareMesLine(mesName)(1) = Draw_Grating.sideSquareMesLine(mesName)(1) - dYGUI
|
||||
End If
|
||||
End If
|
||||
Next
|
||||
|
|
@ -172,10 +188,18 @@
|
|||
For i = 2 To Data.pointsMeasurements.Count - 1
|
||||
Dim mesName As String = Data.pointsMeasurements.Keys(i)
|
||||
If index + 1 < Data.pointsMeasurements(mesName)(0) Then
|
||||
If mesName.Split("_")(0) <> "MS" AndAlso mesName.Split("_")(0) <> "MS1" Then
|
||||
Data.pointsMeasurements(mesName)(0) = Data.pointsMeasurements(mesName)(0) + 1
|
||||
Data.pointsMeasurements(mesName)(1) = Data.pointsMeasurements(mesName)(1) + 1
|
||||
ElseIf mesName.Split("_")(0) = "MS1" Then
|
||||
Data.pointsMeasurements(mesName)(0) = Data.pointsMeasurements(mesName)(0) + 1
|
||||
End If
|
||||
ElseIf index + 1 = Data.pointsMeasurements(mesName)(0) OrElse index + 1 = Data.pointsMeasurements(mesName)(1) Then
|
||||
If mesName.Split("_")(0) <> "MS" AndAlso mesName.Split("_")(0) <> "MS1" Then
|
||||
Data.pointsMeasurements(mesName)(1) = Data.pointsMeasurements(mesName)(1) + 1
|
||||
ElseIf mesName.Split("_")(0) = "MS1" AndAlso index + 1 = Data.pointsMeasurements(mesName)(0) AndAlso Data.pointsMeasurements(mesName)(2) = 3 Then
|
||||
Data.pointsMeasurements(mesName)(0) = Data.pointsMeasurements(mesName)(0) + 1
|
||||
End If
|
||||
End If
|
||||
Next
|
||||
|
||||
|
|
@ -376,6 +400,7 @@
|
|||
Individual.Panel_Recesses.Controls("Button_Square_Corner").Left = Individual.Panel_Recesses.Controls("Button_Square_Corner").Left - buttonOffset
|
||||
Individual.Panel_Recesses.Controls("Button_Square_Side").Left = Individual.Panel_Recesses.Controls("Button_Square_Side").Left - buttonOffset
|
||||
Individual.Panel_Recesses.Controls("Button_Square_Middle").Left = Individual.Panel_Recesses.Controls("Button_Square_Middle").Left - buttonOffset
|
||||
Individual.Panel_Recesses.Controls("Button_Radius").Left = Individual.Panel_Recesses.Controls("Button_Radius").Left - buttonOffset
|
||||
|
||||
Individual.Button_Angle_Corner.FlatAppearance.BorderColor = Color.Black
|
||||
End Sub
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@
|
|||
buttonOffset = 130
|
||||
Individual.Panel_Recesses.Controls("Button_Square_Side").Left = Individual.Panel_Recesses.Controls("Button_Square_Side").Left + buttonOffset
|
||||
Individual.Panel_Recesses.Controls("Button_Square_Middle").Left = Individual.Panel_Recesses.Controls("Button_Square_Middle").Left + buttonOffset
|
||||
Individual.Panel_Recesses.Controls("Button_Radius").Left = Individual.Panel_Recesses.Controls("Button_Radius").Left + buttonOffset
|
||||
|
||||
Individual.Button_Square_Corner.FlatStyle = FlatStyle.Flat
|
||||
Individual.Button_Square_Corner.FlatAppearance.BorderColor = Color.Red
|
||||
|
|
@ -125,7 +126,7 @@
|
|||
|
||||
For i = 2 To Data.pointsMeasurements.Count - 1
|
||||
Dim mesName As String = Data.pointsMeasurements.Keys(i)
|
||||
If mesName.Split("_")(0) <> "SS1" AndAlso mesName.Split("_")(0) <> "SS" Then
|
||||
If mesName.Split("_")(0) <> "SS1" AndAlso mesName.Split("_")(0) <> "SS" AndAlso mesName.Split("_")(0) <> "MS" AndAlso mesName.Split("_")(0) <> "MS1" Then
|
||||
If index + 1 = Data.pointsMeasurements(mesName)(0) Then
|
||||
If Draw_Grating.measureLabels(mesName)(3) = 1 Then
|
||||
Draw_Grating.measureLabels(mesName)(0) = Draw_Grating.measureLabels(mesName)(0) - Individual.Panel_Recesses.Controls("X_TextBox").Text
|
||||
|
|
@ -162,6 +163,21 @@
|
|||
Draw_Grating.measureLabels(mesName)(1) = Draw_Grating.measureLabels(mesName)(1) + dXGUI / 2
|
||||
|
||||
Draw_Grating.sideSquareMesLine(mesName)(0) = Draw_Grating.sideSquareMesLine(mesName)(0) + dXGUI
|
||||
ElseIf Draw_Grating.measureLabels(mesName)(3) = 2 Then
|
||||
Draw_Grating.measureLabels(mesName)(0) = Draw_Grating.measureLabels(mesName)(0) - Individual.Panel_Recesses.Controls("Y_TextBox").Text
|
||||
Draw_Grating.measureLabels(mesName)(2) = Draw_Grating.measureLabels(mesName)(2) + dYGUI / 2
|
||||
|
||||
Draw_Grating.sideSquareMesLine(mesName)(1) = Draw_Grating.sideSquareMesLine(mesName)(1) + dYGUI
|
||||
ElseIf Draw_Grating.measureLabels(mesName)(3) = 3 Then
|
||||
Draw_Grating.measureLabels(mesName)(0) = Draw_Grating.measureLabels(mesName)(0) - Individual.Panel_Recesses.Controls("X_TextBox").Text
|
||||
Draw_Grating.measureLabels(mesName)(1) = Draw_Grating.measureLabels(mesName)(1) - dXGUI / 2
|
||||
|
||||
Draw_Grating.sideSquareMesLine(mesName)(0) = Draw_Grating.sideSquareMesLine(mesName)(0) - dXGUI
|
||||
Else
|
||||
Draw_Grating.measureLabels(mesName)(0) = Draw_Grating.measureLabels(mesName)(0) - Individual.Panel_Recesses.Controls("Y_TextBox").Text
|
||||
Draw_Grating.measureLabels(mesName)(2) = Draw_Grating.measureLabels(mesName)(2) - dYGUI / 2
|
||||
|
||||
Draw_Grating.sideSquareMesLine(mesName)(1) = Draw_Grating.sideSquareMesLine(mesName)(1) - dYGUI
|
||||
End If
|
||||
End If
|
||||
Next
|
||||
|
|
@ -171,10 +187,18 @@
|
|||
For i = 2 To Data.pointsMeasurements.Count - 1
|
||||
Dim mesName As String = Data.pointsMeasurements.Keys(i)
|
||||
If index + 1 < Data.pointsMeasurements(mesName)(0) Then
|
||||
Data.pointsMeasurements(mesName)(0) = Data.pointsMeasurements(mesName)(0) + 1
|
||||
Data.pointsMeasurements(mesName)(1) = Data.pointsMeasurements(mesName)(1) + 1
|
||||
If mesName.Split("_")(0) <> "MS" AndAlso mesName.Split("_")(0) <> "MS1" Then
|
||||
Data.pointsMeasurements(mesName)(0) = Data.pointsMeasurements(mesName)(0) + 2
|
||||
Data.pointsMeasurements(mesName)(1) = Data.pointsMeasurements(mesName)(1) + 2
|
||||
ElseIf mesName.Split("_")(0) = "MS1" Then
|
||||
Data.pointsMeasurements(mesName)(0) = Data.pointsMeasurements(mesName)(0) + 2
|
||||
End If
|
||||
ElseIf index + 1 = Data.pointsMeasurements(mesName)(0) OrElse index + 1 = Data.pointsMeasurements(mesName)(1) Then
|
||||
Data.pointsMeasurements(mesName)(1) = Data.pointsMeasurements(mesName)(1) + 1
|
||||
If mesName.Split("_")(0) <> "MS" AndAlso mesName.Split("_")(0) <> "MS1" Then
|
||||
Data.pointsMeasurements(mesName)(1) = Data.pointsMeasurements(mesName)(1) + 2
|
||||
ElseIf mesName.Split("_")(0) = "MS1" AndAlso index + 1 = Data.pointsMeasurements(mesName)(0) AndAlso Data.pointsMeasurements(mesName)(2) = 3 Then
|
||||
Data.pointsMeasurements(mesName)(0) = Data.pointsMeasurements(mesName)(0) + 2
|
||||
End If
|
||||
End If
|
||||
Next
|
||||
|
||||
|
|
@ -361,6 +385,7 @@
|
|||
|
||||
Individual.Panel_Recesses.Controls("Button_Square_Side").Left = Individual.Panel_Recesses.Controls("Button_Square_Side").Left - buttonOffset
|
||||
Individual.Panel_Recesses.Controls("Button_Square_Middle").Left = Individual.Panel_Recesses.Controls("Button_Square_Middle").Left - buttonOffset
|
||||
Individual.Panel_Recesses.Controls("Button_Radius").Left = Individual.Panel_Recesses.Controls("Button_Radius").Left - buttonOffset
|
||||
|
||||
Individual.Panel_Recesses.Controls("Button_Angle_Corner").Enabled = True
|
||||
Individual.Panel_Recesses.Controls("Button_Angle_Side").Enabled = True
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
Public Class Middle_Rectangle
|
||||
Private Shared buttonOffset As Integer
|
||||
Private Shared middleSquareValues(3) As Integer
|
||||
Private Shared numOfMiddleRectangles As Integer = 0
|
||||
|
||||
|
|
@ -13,25 +14,28 @@
|
|||
Dim buttonX As Integer = Individual.Panel_Recesses.Controls("Button_Square_Middle").Location.X + Individual.Panel_Recesses.Controls("Button_Square_Middle").Width
|
||||
Dim buttonY As Integer = Individual.Panel_Recesses.Controls("Button_Square_Middle").Location.Y
|
||||
|
||||
Individual.Create_TextBox_Recesses("Y_TextBox", "", buttonX + 60, buttonY - 7, 60)
|
||||
Individual.Create_TextBox_Recesses("Y_TextBox", "", buttonX + 60, buttonY + 10, 60)
|
||||
AddHandler Individual.Panel_Recesses.Controls("Y_TextBox").TextChanged, AddressOf FunctionTextMiddle_Changed
|
||||
AddHandler Individual.Panel_Recesses.Controls("Y_TextBox").KeyPress, AddressOf FunctionText_KeyPress
|
||||
Individual.Create_Label_Recesses("Y_Label", "Width", buttonX + 18, buttonY - 4)
|
||||
Individual.Create_Label_Recesses("Y_Label", "Width", buttonX + 18, buttonY + 13)
|
||||
|
||||
Individual.Create_TextBox_Recesses("X_TextBox", "", buttonX + 60, buttonY + 23, 60)
|
||||
Individual.Create_TextBox_Recesses("X_TextBox", "", buttonX + 60, buttonY + 40, 60)
|
||||
AddHandler Individual.Panel_Recesses.Controls("X_TextBox").TextChanged, AddressOf FunctionTextMiddle_Changed
|
||||
AddHandler Individual.Panel_Recesses.Controls("X_TextBox").KeyPress, AddressOf FunctionText_KeyPress
|
||||
Individual.Create_Label_Recesses("X_Label", "Length", buttonX + 10, buttonY + 26)
|
||||
Individual.Create_Label_Recesses("X_Label", "Length", buttonX + 10, buttonY + 43)
|
||||
|
||||
Individual.Create_TextBox_Recesses("OffX_TextBox", "", buttonX + 60, buttonY + 53, 60)
|
||||
Individual.Create_TextBox_Recesses("OffX_TextBox", "", buttonX + 185, buttonY + 10, 60)
|
||||
AddHandler Individual.Panel_Recesses.Controls("OffX_TextBox").TextChanged, AddressOf FunctionTextMiddle_Changed
|
||||
AddHandler Individual.Panel_Recesses.Controls("OffX_TextBox").KeyPress, AddressOf FunctionText_KeyPress
|
||||
Individual.Create_Label_Recesses("OffX_Label", "Offset X", buttonX + 16, buttonY + 56)
|
||||
Individual.Create_Label_Recesses("OffX_Label", "Offset X", buttonX + 126, buttonY + 13)
|
||||
|
||||
Individual.Create_TextBox_Recesses("OffY_TextBox", "", buttonX + 60, buttonY + 83, 60)
|
||||
Individual.Create_TextBox_Recesses("OffY_TextBox", "", buttonX + 185, buttonY + 40, 60)
|
||||
AddHandler Individual.Panel_Recesses.Controls("OffY_TextBox").TextChanged, AddressOf FunctionTextMiddle_Changed
|
||||
AddHandler Individual.Panel_Recesses.Controls("OffY_TextBox").KeyPress, AddressOf FunctionText_KeyPress
|
||||
Individual.Create_Label_Recesses("OffY_Label", "Offset Y", buttonX + 16, buttonY + 86)
|
||||
Individual.Create_Label_Recesses("OffY_Label", "Offset Y", buttonX + 126, buttonY + 43)
|
||||
|
||||
buttonOffset = 260
|
||||
Individual.Panel_Recesses.Controls("Button_Radius").Left = Individual.Panel_Recesses.Controls("Button_Radius").Left + buttonOffset
|
||||
|
||||
Individual.Button_Square_Middle.FlatStyle = FlatStyle.Flat
|
||||
Individual.Button_Square_Middle.FlatAppearance.BorderColor = Color.Red
|
||||
|
|
@ -218,6 +222,8 @@
|
|||
Individual.Panel_Recesses.Controls("Button_Square_Side").Enabled = True
|
||||
Individual.Panel_Recesses.Controls("Button_Square_Middle").Enabled = True
|
||||
|
||||
Individual.Panel_Recesses.Controls("Button_Radius").Left = Individual.Panel_Recesses.Controls("Button_Radius").Left - buttonOffset
|
||||
|
||||
Individual.Button_Square_Middle.FlatAppearance.BorderColor = Color.Black
|
||||
End Sub
|
||||
End Class
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@
|
|||
|
||||
buttonOffset = 130
|
||||
Individual.Panel_Recesses.Controls("Button_Square_Middle").Left = Individual.Panel_Recesses.Controls("Button_Square_Middle").Left + buttonOffset
|
||||
Individual.Panel_Recesses.Controls("Button_Radius").Left = Individual.Panel_Recesses.Controls("Button_Radius").Left + buttonOffset
|
||||
|
||||
Individual.Button_Square_Side.FlatStyle = FlatStyle.Flat
|
||||
Individual.Button_Square_Side.FlatAppearance.BorderColor = Color.Red
|
||||
|
|
@ -217,7 +218,7 @@
|
|||
|
||||
For i = 2 To Data.pointsMeasurements.Count - 1
|
||||
Dim mesName As String = Data.pointsMeasurements.Keys(i)
|
||||
If mesName.Split("_")(0) = "SS1" Then
|
||||
If mesName.Split("_")(0) = "SS1" AndAlso mesName.Split("_")(0) <> "MS" AndAlso mesName.Split("_")(0) <> "MS1" Then
|
||||
If index + 2 = Data.pointsMeasurements(mesName)(1) Then
|
||||
If Draw_Grating.measureLabels(mesName)(3) = 1 Then
|
||||
Draw_Grating.measureLabels(mesName)(0) = Data.gratingPoints.Rows(index + 1)("X") * 1000 -
|
||||
|
|
@ -259,16 +260,26 @@
|
|||
For i = 2 To Data.pointsMeasurements.Count - 1
|
||||
Dim mesName As String = Data.pointsMeasurements.Keys(i)
|
||||
If mesName.Split("_")(0) <> "SS1" AndAlso index + 1 < Data.pointsMeasurements(mesName)(0) Then
|
||||
If mesName.Split("_")(0) <> "MS" AndAlso mesName.Split("_")(0) <> "MS1" Then
|
||||
Data.pointsMeasurements(mesName)(0) = Data.pointsMeasurements(mesName)(0) + 4
|
||||
Data.pointsMeasurements(mesName)(1) = Data.pointsMeasurements(mesName)(1) + 4
|
||||
ElseIf mesName.Split("_")(0) = "MS1" Then
|
||||
Data.pointsMeasurements(mesName)(0) = Data.pointsMeasurements(mesName)(0) + 4
|
||||
End If
|
||||
ElseIf mesName.Split("_")(0) = "SS1" Then
|
||||
If index + 2 <= Data.pointsMeasurements(mesName)(0) Then
|
||||
If mesName.Split("_")(0) <> "MS" AndAlso mesName.Split("_")(0) <> "MS1" Then
|
||||
Data.pointsMeasurements(mesName)(0) = Data.pointsMeasurements(mesName)(0) + 4
|
||||
Data.pointsMeasurements(mesName)(1) = Data.pointsMeasurements(mesName)(1) + 4
|
||||
ElseIf mesName.Split("_")(0) = "MS1" Then
|
||||
Data.pointsMeasurements(mesName)(0) = Data.pointsMeasurements(mesName)(0) + 4
|
||||
End If
|
||||
ElseIf index + 2 <= Data.pointsMeasurements(mesName)(1) Then
|
||||
If mesName.Split("_")(0) <> "MS" AndAlso mesName.Split("_")(0) <> "MS1" Then
|
||||
Data.pointsMeasurements(mesName)(1) = Data.pointsMeasurements(mesName)(1) + 4
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
Next
|
||||
|
||||
Dim mesNum As Integer = Data.pointsMeasurements.Count - 1
|
||||
|
|
@ -558,6 +569,7 @@
|
|||
|
||||
|
||||
Individual.Panel_Recesses.Controls("Button_Square_Middle").Left = Individual.Panel_Recesses.Controls("Button_Square_Middle").Left - buttonOffset
|
||||
Individual.Panel_Recesses.Controls("Button_Radius").Left = Individual.Panel_Recesses.Controls("Button_Radius").Left - buttonOffset
|
||||
|
||||
Individual.Button_Square_Side.FlatAppearance.BorderColor = Color.Black
|
||||
|
||||
|
|
|
|||
|
|
@ -330,6 +330,7 @@ Public Class Drawing
|
|||
Next
|
||||
swSkMgr.AddToDB = False
|
||||
longstatus = iDrawing.SaveAs3(newName, 0, 0)
|
||||
longstatus = iDrawing.SaveAs3(Individual.filepath & "\Temp" & "\TESTDRAWING" & 1 & ".pdf", 0, 2)
|
||||
End Sub
|
||||
|
||||
Private Shared Sub Add_Dimensions(points() As Integer, CompName As String, myView As View, iDrawing As DrawingDoc, swExtensions As SldWorks.ModelDocExtension _
|
||||
|
|
|
|||
|
|
@ -552,7 +552,7 @@ Public Class Model_3D_Fill
|
|||
End If
|
||||
|
||||
ElseIf Data.recessData.Rows(j)("RECESS TYPE") = "MIDDLE SQUARE" Then
|
||||
rec1(0) = Data.gratingMiddlePoints.Rows(rowIndex)("X") * 1000
|
||||
rec1(0) = Data.gratingMiddlePoints.Rows(rowIndex)("X") * 1000 'Använd inte rowindex här, ska vara 0,1,2,3
|
||||
rec1(1) = Data.gratingMiddlePoints.Rows(rowIndex)("Y") * 1000
|
||||
|
||||
rec2(0) = Data.gratingMiddlePoints.Rows(rowIndex + 1)("X") * 1000
|
||||
|
|
|
|||
Loading…
Reference in New Issue