diff --git a/VECTO/GUI/BatteryForm.Designer.vb b/VECTO/GUI/BatteryForm.Designer.vb
index 165cb8d8b68381483de995b4e90c76e78fe3fef8..103cbf3c1e05423c4bc721c42d95fd2cf7c33660 100644
--- a/VECTO/GUI/BatteryForm.Designer.vb
+++ b/VECTO/GUI/BatteryForm.Designer.vb
@@ -80,11 +80,25 @@ Partial Class BatteryForm
Me.tbSoCMax = New System.Windows.Forms.TextBox()
Me.FlowLayoutPanel1 = New System.Windows.Forms.FlowLayoutPanel()
Me.pnBattery = New System.Windows.Forms.Panel()
+ Me.Panel6 = New System.Windows.Forms.Panel()
+ Me.lblJunctionBoxIncl = New System.Windows.Forms.Label()
+ Me.cbJunctionBoxIncl = New System.Windows.Forms.CheckBox()
+ Me.Panel5 = New System.Windows.Forms.Panel()
+ Me.lblConnectorsIncl = New System.Windows.Forms.Label()
+ Me.cbConnectorsIncluded = New System.Windows.Forms.CheckBox()
+ Me.pnTestingTempB = New System.Windows.Forms.Panel()
+ Me.lblTestingTempB = New System.Windows.Forms.Label()
+ Me.lblTestingTempUnitB = New System.Windows.Forms.Label()
+ Me.tbTestingTempB = New System.Windows.Forms.TextBox()
Me.tbMaxCurrentMap = New System.Windows.Forms.TextBox()
Me.lblMaxCurrentMap = New System.Windows.Forms.Label()
Me.btnBrowseMaxCurrentMap = New System.Windows.Forms.Button()
Me.btnMaxCurrentMapOpen = New System.Windows.Forms.Button()
Me.pnSuperCap = New System.Windows.Forms.Panel()
+ Me.pnTestingTempC = New System.Windows.Forms.Panel()
+ Me.lblTestingTempC = New System.Windows.Forms.Label()
+ Me.lblTestingTempUnitC = New System.Windows.Forms.Label()
+ Me.tbTestingTempC = New System.Windows.Forms.TextBox()
Me.Panel4 = New System.Windows.Forms.Panel()
Me.lblMaxCurrentDischarge = New System.Windows.Forms.Label()
Me.lblMaxCurrentDischargeUnit = New System.Windows.Forms.Label()
@@ -111,20 +125,6 @@ Partial Class BatteryForm
Me.tbSuperCapCapacity = New System.Windows.Forms.TextBox()
Me.cbRESSType = New System.Windows.Forms.ComboBox()
Me.lblRessType = New System.Windows.Forms.Label()
- Me.pnTestingTempB = New System.Windows.Forms.Panel()
- Me.lblTestingTempB = New System.Windows.Forms.Label()
- Me.lblTestingTempUnitB = New System.Windows.Forms.Label()
- Me.tbTestingTempB = New System.Windows.Forms.TextBox()
- Me.pnTestingTempC = New System.Windows.Forms.Panel()
- Me.lblTestingTempC = New System.Windows.Forms.Label()
- Me.lblTestingTempUnitC = New System.Windows.Forms.Label()
- Me.tbTestingTempC = New System.Windows.Forms.TextBox()
- Me.Panel5 = New System.Windows.Forms.Panel()
- Me.cbConnectorsIncluded = New System.Windows.Forms.CheckBox()
- Me.lblConnectorsIncl = New System.Windows.Forms.Label()
- Me.Panel6 = New System.Windows.Forms.Panel()
- Me.lblJunctionBoxIncl = New System.Windows.Forms.Label()
- Me.cbJunctionBoxIncl = New System.Windows.Forms.CheckBox()
Me.ToolStrip1.SuspendLayout
Me.StatusStrip1.SuspendLayout
CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).BeginInit
@@ -135,17 +135,17 @@ Partial Class BatteryForm
Me.Panel2.SuspendLayout
Me.FlowLayoutPanel1.SuspendLayout
Me.pnBattery.SuspendLayout
+ Me.Panel6.SuspendLayout
+ Me.Panel5.SuspendLayout
+ Me.pnTestingTempB.SuspendLayout
Me.pnSuperCap.SuspendLayout
+ Me.pnTestingTempC.SuspendLayout
Me.Panel4.SuspendLayout
Me.Panel3.SuspendLayout
Me.pnSuperCapMaxV.SuspendLayout
Me.pnSuperCapMinV.SuspendLayout
Me.pnSuperCapResistance.SuspendLayout
Me.pnSuperCapCapacity.SuspendLayout
- Me.pnTestingTempB.SuspendLayout
- Me.pnTestingTempC.SuspendLayout
- Me.Panel5.SuspendLayout
- Me.Panel6.SuspendLayout
Me.SuspendLayout
'
'tbCapacity
@@ -438,7 +438,7 @@ Partial Class BatteryForm
Me.lblTitle.AutoSize = true
Me.lblTitle.BackColor = System.Drawing.Color.White
Me.lblTitle.Font = New System.Drawing.Font("Microsoft Sans Serif", 18!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point)
- Me.lblTitle.Location = New System.Drawing.Point(134, 39)
+ Me.lblTitle.Location = New System.Drawing.Point(116, 38)
Me.lblTitle.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblTitle.Name = "lblTitle"
Me.lblTitle.Size = New System.Drawing.Size(266, 29)
@@ -570,6 +570,103 @@ Partial Class BatteryForm
Me.pnBattery.Size = New System.Drawing.Size(570, 237)
Me.pnBattery.TabIndex = 0
'
+ 'Panel6
+ '
+ Me.Panel6.Controls.Add(Me.lblJunctionBoxIncl)
+ Me.Panel6.Controls.Add(Me.cbJunctionBoxIncl)
+ Me.Panel6.Location = New System.Drawing.Point(262, 67)
+ Me.Panel6.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.Panel6.Name = "Panel6"
+ Me.Panel6.Size = New System.Drawing.Size(247, 30)
+ Me.Panel6.TabIndex = 27
+ '
+ 'lblJunctionBoxIncl
+ '
+ Me.lblJunctionBoxIncl.AutoSize = true
+ Me.lblJunctionBoxIncl.Location = New System.Drawing.Point(5, 4)
+ Me.lblJunctionBoxIncl.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblJunctionBoxIncl.Name = "lblJunctionBoxIncl"
+ Me.lblJunctionBoxIncl.Size = New System.Drawing.Size(121, 15)
+ Me.lblJunctionBoxIncl.TabIndex = 2
+ Me.lblJunctionBoxIncl.Text = "Junctionbox Included"
+ '
+ 'cbJunctionBoxIncl
+ '
+ Me.cbJunctionBoxIncl.AutoSize = true
+ Me.cbJunctionBoxIncl.Location = New System.Drawing.Point(156, 5)
+ Me.cbJunctionBoxIncl.Name = "cbJunctionBoxIncl"
+ Me.cbJunctionBoxIncl.Size = New System.Drawing.Size(15, 14)
+ Me.cbJunctionBoxIncl.TabIndex = 1
+ Me.cbJunctionBoxIncl.UseVisualStyleBackColor = true
+ '
+ 'Panel5
+ '
+ Me.Panel5.Controls.Add(Me.lblConnectorsIncl)
+ Me.Panel5.Controls.Add(Me.cbConnectorsIncluded)
+ Me.Panel5.Location = New System.Drawing.Point(4, 67)
+ Me.Panel5.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.Panel5.Name = "Panel5"
+ Me.Panel5.Size = New System.Drawing.Size(247, 30)
+ Me.Panel5.TabIndex = 26
+ '
+ 'lblConnectorsIncl
+ '
+ Me.lblConnectorsIncl.AutoSize = true
+ Me.lblConnectorsIncl.Location = New System.Drawing.Point(5, 4)
+ Me.lblConnectorsIncl.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblConnectorsIncl.Name = "lblConnectorsIncl"
+ Me.lblConnectorsIncl.Size = New System.Drawing.Size(182, 15)
+ Me.lblConnectorsIncl.TabIndex = 2
+ Me.lblConnectorsIncl.Text = "Connectors Subsystems Included"
+ '
+ 'cbConnectorsIncluded
+ '
+ Me.cbConnectorsIncluded.AutoSize = true
+ Me.cbConnectorsIncluded.Location = New System.Drawing.Point(194, 5)
+ Me.cbConnectorsIncluded.Name = "cbConnectorsIncluded"
+ Me.cbConnectorsIncluded.Size = New System.Drawing.Size(15, 14)
+ Me.cbConnectorsIncluded.TabIndex = 1
+ Me.cbConnectorsIncluded.UseVisualStyleBackColor = true
+ '
+ 'pnTestingTempB
+ '
+ Me.pnTestingTempB.Controls.Add(Me.lblTestingTempB)
+ Me.pnTestingTempB.Controls.Add(Me.lblTestingTempUnitB)
+ Me.pnTestingTempB.Controls.Add(Me.tbTestingTempB)
+ Me.pnTestingTempB.Location = New System.Drawing.Point(4, 35)
+ Me.pnTestingTempB.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.pnTestingTempB.Name = "pnTestingTempB"
+ Me.pnTestingTempB.Size = New System.Drawing.Size(247, 30)
+ Me.pnTestingTempB.TabIndex = 25
+ '
+ 'lblTestingTempB
+ '
+ Me.lblTestingTempB.AutoSize = true
+ Me.lblTestingTempB.Location = New System.Drawing.Point(4, 6)
+ Me.lblTestingTempB.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblTestingTempB.Name = "lblTestingTempB"
+ Me.lblTestingTempB.Size = New System.Drawing.Size(79, 15)
+ Me.lblTestingTempB.TabIndex = 0
+ Me.lblTestingTempB.Text = "Testing Temp."
+ '
+ 'lblTestingTempUnitB
+ '
+ Me.lblTestingTempUnitB.AutoSize = true
+ Me.lblTestingTempUnitB.Location = New System.Drawing.Point(178, 6)
+ Me.lblTestingTempUnitB.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblTestingTempUnitB.Name = "lblTestingTempUnitB"
+ Me.lblTestingTempUnitB.Size = New System.Drawing.Size(28, 15)
+ Me.lblTestingTempUnitB.TabIndex = 24
+ Me.lblTestingTempUnitB.Text = "[°C]"
+ '
+ 'tbTestingTempB
+ '
+ Me.tbTestingTempB.Location = New System.Drawing.Point(105, 3)
+ Me.tbTestingTempB.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.tbTestingTempB.Name = "tbTestingTempB"
+ Me.tbTestingTempB.Size = New System.Drawing.Size(66, 23)
+ Me.tbTestingTempB.TabIndex = 0
+ '
'tbMaxCurrentMap
'
Me.tbMaxCurrentMap.Location = New System.Drawing.Point(5, 119)
@@ -623,6 +720,45 @@ Partial Class BatteryForm
Me.pnSuperCap.Size = New System.Drawing.Size(570, 203)
Me.pnSuperCap.TabIndex = 1
'
+ 'pnTestingTempC
+ '
+ Me.pnTestingTempC.Controls.Add(Me.lblTestingTempC)
+ Me.pnTestingTempC.Controls.Add(Me.lblTestingTempUnitC)
+ Me.pnTestingTempC.Controls.Add(Me.tbTestingTempC)
+ Me.pnTestingTempC.Location = New System.Drawing.Point(5, 127)
+ Me.pnTestingTempC.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.pnTestingTempC.Name = "pnTestingTempC"
+ Me.pnTestingTempC.Size = New System.Drawing.Size(247, 30)
+ Me.pnTestingTempC.TabIndex = 26
+ '
+ 'lblTestingTempC
+ '
+ Me.lblTestingTempC.AutoSize = true
+ Me.lblTestingTempC.Location = New System.Drawing.Point(4, 6)
+ Me.lblTestingTempC.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblTestingTempC.Name = "lblTestingTempC"
+ Me.lblTestingTempC.Size = New System.Drawing.Size(79, 15)
+ Me.lblTestingTempC.TabIndex = 0
+ Me.lblTestingTempC.Text = "Testing Temp."
+ '
+ 'lblTestingTempUnitC
+ '
+ Me.lblTestingTempUnitC.AutoSize = true
+ Me.lblTestingTempUnitC.Location = New System.Drawing.Point(178, 6)
+ Me.lblTestingTempUnitC.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblTestingTempUnitC.Name = "lblTestingTempUnitC"
+ Me.lblTestingTempUnitC.Size = New System.Drawing.Size(28, 15)
+ Me.lblTestingTempUnitC.TabIndex = 24
+ Me.lblTestingTempUnitC.Text = "[°C]"
+ '
+ 'tbTestingTempC
+ '
+ Me.tbTestingTempC.Location = New System.Drawing.Point(105, 3)
+ Me.tbTestingTempC.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.tbTestingTempC.Name = "tbTestingTempC"
+ Me.tbTestingTempC.Size = New System.Drawing.Size(66, 23)
+ Me.tbTestingTempC.TabIndex = 0
+ '
'Panel4
'
Me.Panel4.Controls.Add(Me.lblMaxCurrentDischarge)
@@ -876,142 +1012,6 @@ Partial Class BatteryForm
Me.lblRessType.TabIndex = 52
Me.lblRessType.Text = "REESS Type"
'
- 'pnTestingTempB
- '
- Me.pnTestingTempB.Controls.Add(Me.lblTestingTempB)
- Me.pnTestingTempB.Controls.Add(Me.lblTestingTempUnitB)
- Me.pnTestingTempB.Controls.Add(Me.tbTestingTempB)
- Me.pnTestingTempB.Location = New System.Drawing.Point(4, 35)
- Me.pnTestingTempB.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
- Me.pnTestingTempB.Name = "pnTestingTempB"
- Me.pnTestingTempB.Size = New System.Drawing.Size(247, 30)
- Me.pnTestingTempB.TabIndex = 25
- '
- 'lblTestingTempB
- '
- Me.lblTestingTempB.AutoSize = true
- Me.lblTestingTempB.Location = New System.Drawing.Point(4, 6)
- Me.lblTestingTempB.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
- Me.lblTestingTempB.Name = "lblTestingTempB"
- Me.lblTestingTempB.Size = New System.Drawing.Size(79, 15)
- Me.lblTestingTempB.TabIndex = 0
- Me.lblTestingTempB.Text = "Testing Temp."
- '
- 'lblTestingTempUnitB
- '
- Me.lblTestingTempUnitB.AutoSize = true
- Me.lblTestingTempUnitB.Location = New System.Drawing.Point(178, 6)
- Me.lblTestingTempUnitB.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
- Me.lblTestingTempUnitB.Name = "lblTestingTempUnitB"
- Me.lblTestingTempUnitB.Size = New System.Drawing.Size(28, 15)
- Me.lblTestingTempUnitB.TabIndex = 24
- Me.lblTestingTempUnitB.Text = "[°C]"
- '
- 'tbTestingTempB
- '
- Me.tbTestingTempB.Location = New System.Drawing.Point(105, 3)
- Me.tbTestingTempB.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
- Me.tbTestingTempB.Name = "tbTestingTempB"
- Me.tbTestingTempB.Size = New System.Drawing.Size(66, 23)
- Me.tbTestingTempB.TabIndex = 0
- '
- 'pnTestingTempC
- '
- Me.pnTestingTempC.Controls.Add(Me.lblTestingTempC)
- Me.pnTestingTempC.Controls.Add(Me.lblTestingTempUnitC)
- Me.pnTestingTempC.Controls.Add(Me.tbTestingTempC)
- Me.pnTestingTempC.Location = New System.Drawing.Point(5, 127)
- Me.pnTestingTempC.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
- Me.pnTestingTempC.Name = "pnTestingTempC"
- Me.pnTestingTempC.Size = New System.Drawing.Size(247, 30)
- Me.pnTestingTempC.TabIndex = 26
- '
- 'lblTestingTempC
- '
- Me.lblTestingTempC.AutoSize = true
- Me.lblTestingTempC.Location = New System.Drawing.Point(4, 6)
- Me.lblTestingTempC.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
- Me.lblTestingTempC.Name = "lblTestingTempC"
- Me.lblTestingTempC.Size = New System.Drawing.Size(79, 15)
- Me.lblTestingTempC.TabIndex = 0
- Me.lblTestingTempC.Text = "Testing Temp."
- '
- 'lblTestingTempUnitC
- '
- Me.lblTestingTempUnitC.AutoSize = true
- Me.lblTestingTempUnitC.Location = New System.Drawing.Point(178, 6)
- Me.lblTestingTempUnitC.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
- Me.lblTestingTempUnitC.Name = "lblTestingTempUnitC"
- Me.lblTestingTempUnitC.Size = New System.Drawing.Size(28, 15)
- Me.lblTestingTempUnitC.TabIndex = 24
- Me.lblTestingTempUnitC.Text = "[°C]"
- '
- 'tbTestingTempC
- '
- Me.tbTestingTempC.Location = New System.Drawing.Point(105, 3)
- Me.tbTestingTempC.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
- Me.tbTestingTempC.Name = "tbTestingTempC"
- Me.tbTestingTempC.Size = New System.Drawing.Size(66, 23)
- Me.tbTestingTempC.TabIndex = 0
- '
- 'Panel5
- '
- Me.Panel5.Controls.Add(Me.lblConnectorsIncl)
- Me.Panel5.Controls.Add(Me.cbConnectorsIncluded)
- Me.Panel5.Location = New System.Drawing.Point(4, 67)
- Me.Panel5.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
- Me.Panel5.Name = "Panel5"
- Me.Panel5.Size = New System.Drawing.Size(247, 30)
- Me.Panel5.TabIndex = 26
- '
- 'cbConnectorsIncluded
- '
- Me.cbConnectorsIncluded.AutoSize = true
- Me.cbConnectorsIncluded.Location = New System.Drawing.Point(194, 5)
- Me.cbConnectorsIncluded.Name = "cbConnectorsIncluded"
- Me.cbConnectorsIncluded.Size = New System.Drawing.Size(15, 14)
- Me.cbConnectorsIncluded.TabIndex = 1
- Me.cbConnectorsIncluded.UseVisualStyleBackColor = true
- '
- 'lblConnectorsIncl
- '
- Me.lblConnectorsIncl.AutoSize = true
- Me.lblConnectorsIncl.Location = New System.Drawing.Point(5, 4)
- Me.lblConnectorsIncl.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
- Me.lblConnectorsIncl.Name = "lblConnectorsIncl"
- Me.lblConnectorsIncl.Size = New System.Drawing.Size(182, 15)
- Me.lblConnectorsIncl.TabIndex = 2
- Me.lblConnectorsIncl.Text = "Connectors Subsystems Included"
- '
- 'Panel6
- '
- Me.Panel6.Controls.Add(Me.lblJunctionBoxIncl)
- Me.Panel6.Controls.Add(Me.cbJunctionBoxIncl)
- Me.Panel6.Location = New System.Drawing.Point(262, 67)
- Me.Panel6.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
- Me.Panel6.Name = "Panel6"
- Me.Panel6.Size = New System.Drawing.Size(247, 30)
- Me.Panel6.TabIndex = 27
- '
- 'lblJunctionBoxIncl
- '
- Me.lblJunctionBoxIncl.AutoSize = true
- Me.lblJunctionBoxIncl.Location = New System.Drawing.Point(5, 4)
- Me.lblJunctionBoxIncl.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
- Me.lblJunctionBoxIncl.Name = "lblJunctionBoxIncl"
- Me.lblJunctionBoxIncl.Size = New System.Drawing.Size(121, 15)
- Me.lblJunctionBoxIncl.TabIndex = 2
- Me.lblJunctionBoxIncl.Text = "Junctionbox Included"
- '
- 'cbJunctionBoxIncl
- '
- Me.cbJunctionBoxIncl.AutoSize = true
- Me.cbJunctionBoxIncl.Location = New System.Drawing.Point(156, 5)
- Me.cbJunctionBoxIncl.Name = "cbJunctionBoxIncl"
- Me.cbJunctionBoxIncl.Size = New System.Drawing.Size(15, 14)
- Me.cbJunctionBoxIncl.TabIndex = 1
- Me.cbJunctionBoxIncl.UseVisualStyleBackColor = true
- '
'BatteryForm
'
Me.AcceptButton = Me.ButOK
@@ -1055,7 +1055,15 @@ Partial Class BatteryForm
Me.FlowLayoutPanel1.ResumeLayout(false)
Me.pnBattery.ResumeLayout(false)
Me.pnBattery.PerformLayout
+ Me.Panel6.ResumeLayout(false)
+ Me.Panel6.PerformLayout
+ Me.Panel5.ResumeLayout(false)
+ Me.Panel5.PerformLayout
+ Me.pnTestingTempB.ResumeLayout(false)
+ Me.pnTestingTempB.PerformLayout
Me.pnSuperCap.ResumeLayout(false)
+ Me.pnTestingTempC.ResumeLayout(false)
+ Me.pnTestingTempC.PerformLayout
Me.Panel4.ResumeLayout(false)
Me.Panel4.PerformLayout
Me.Panel3.ResumeLayout(false)
@@ -1068,14 +1076,6 @@ Partial Class BatteryForm
Me.pnSuperCapResistance.PerformLayout
Me.pnSuperCapCapacity.ResumeLayout(false)
Me.pnSuperCapCapacity.PerformLayout
- Me.pnTestingTempB.ResumeLayout(false)
- Me.pnTestingTempB.PerformLayout
- Me.pnTestingTempC.ResumeLayout(false)
- Me.pnTestingTempC.PerformLayout
- Me.Panel5.ResumeLayout(false)
- Me.Panel5.PerformLayout
- Me.Panel6.ResumeLayout(false)
- Me.Panel6.PerformLayout
Me.ResumeLayout(false)
Me.PerformLayout
diff --git a/VECTO/GUI/ElectricMotorForm.Designer.vb b/VECTO/GUI/ElectricMotorForm.Designer.vb
index 419a9cfee273e01ccbd39a9187583504f268dc11..561308f0b89c2ba742cc5df73441260fd0f66517 100644
--- a/VECTO/GUI/ElectricMotorForm.Designer.vb
+++ b/VECTO/GUI/ElectricMotorForm.Designer.vb
@@ -141,8 +141,8 @@ Partial Class ElectricMotorForm
Me.lblRatedPowerUnit = New System.Windows.Forms.Label()
Me.tbRatedPower = New System.Windows.Forms.TextBox()
Me.pnElectricMachineType = New System.Windows.Forms.Panel()
- Me.lblEmType = New System.Windows.Forms.Label()
Me.cbEmType = New System.Windows.Forms.ComboBox()
+ Me.lblEmType = New System.Windows.Forms.Label()
Me.ToolStrip1.SuspendLayout
Me.StatusStrip1.SuspendLayout
CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).BeginInit
@@ -170,7 +170,7 @@ Partial Class ElectricMotorForm
'
'tbInertia
'
- Me.tbInertia.Location = New System.Drawing.Point(192, 6)
+ Me.tbInertia.Location = New System.Drawing.Point(196, 6)
Me.tbInertia.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbInertia.Name = "tbInertia"
Me.tbInertia.Size = New System.Drawing.Size(56, 23)
@@ -179,7 +179,7 @@ Partial Class ElectricMotorForm
'lblinertiaUnit
'
Me.lblinertiaUnit.AutoSize = true
- Me.lblinertiaUnit.Location = New System.Drawing.Point(256, 9)
+ Me.lblinertiaUnit.Location = New System.Drawing.Point(260, 9)
Me.lblinertiaUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblinertiaUnit.Name = "lblinertiaUnit"
Me.lblinertiaUnit.Size = New System.Drawing.Size(43, 15)
@@ -462,7 +462,7 @@ Partial Class ElectricMotorForm
Me.lblTitle.AutoSize = true
Me.lblTitle.BackColor = System.Drawing.Color.White
Me.lblTitle.Font = New System.Drawing.Font("Microsoft Sans Serif", 18!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point)
- Me.lblTitle.Location = New System.Drawing.Point(139, 39)
+ Me.lblTitle.Location = New System.Drawing.Point(122, 40)
Me.lblTitle.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblTitle.Name = "lblTitle"
Me.lblTitle.Size = New System.Drawing.Size(190, 29)
@@ -582,7 +582,7 @@ Partial Class ElectricMotorForm
'lblOvlRecoveryFactorUnit
'
Me.lblOvlRecoveryFactorUnit.AutoSize = true
- Me.lblOvlRecoveryFactorUnit.Location = New System.Drawing.Point(256, 9)
+ Me.lblOvlRecoveryFactorUnit.Location = New System.Drawing.Point(260, 9)
Me.lblOvlRecoveryFactorUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblOvlRecoveryFactorUnit.Name = "lblOvlRecoveryFactorUnit"
Me.lblOvlRecoveryFactorUnit.Size = New System.Drawing.Size(20, 15)
@@ -591,7 +591,7 @@ Partial Class ElectricMotorForm
'
'tbOverloadRecoveryFactor
'
- Me.tbOverloadRecoveryFactor.Location = New System.Drawing.Point(192, 5)
+ Me.tbOverloadRecoveryFactor.Location = New System.Drawing.Point(196, 5)
Me.tbOverloadRecoveryFactor.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbOverloadRecoveryFactor.Name = "tbOverloadRecoveryFactor"
Me.tbOverloadRecoveryFactor.Size = New System.Drawing.Size(56, 23)
@@ -727,7 +727,7 @@ Partial Class ElectricMotorForm
'lblVoltageHiUnit
'
Me.lblVoltageHiUnit.AutoSize = true
- Me.lblVoltageHiUnit.Location = New System.Drawing.Point(219, 12)
+ Me.lblVoltageHiUnit.Location = New System.Drawing.Point(219, 11)
Me.lblVoltageHiUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblVoltageHiUnit.Name = "lblVoltageHiUnit"
Me.lblVoltageHiUnit.Size = New System.Drawing.Size(22, 15)
@@ -755,7 +755,7 @@ Partial Class ElectricMotorForm
'lblVoltageLowUnit
'
Me.lblVoltageLowUnit.AutoSize = true
- Me.lblVoltageLowUnit.Location = New System.Drawing.Point(219, 10)
+ Me.lblVoltageLowUnit.Location = New System.Drawing.Point(219, 11)
Me.lblVoltageLowUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblVoltageLowUnit.Name = "lblVoltageLowUnit"
Me.lblVoltageLowUnit.Size = New System.Drawing.Size(22, 15)
@@ -1209,6 +1209,14 @@ Partial Class ElectricMotorForm
Me.pnElectricMachineType.Size = New System.Drawing.Size(268, 35)
Me.pnElectricMachineType.TabIndex = 54
'
+ 'cbEmType
+ '
+ Me.cbEmType.FormattingEnabled = true
+ Me.cbEmType.Location = New System.Drawing.Point(113, 7)
+ Me.cbEmType.Name = "cbEmType"
+ Me.cbEmType.Size = New System.Drawing.Size(151, 23)
+ Me.cbEmType.TabIndex = 26
+ '
'lblEmType
'
Me.lblEmType.AutoSize = true
@@ -1219,14 +1227,6 @@ Partial Class ElectricMotorForm
Me.lblEmType.TabIndex = 25
Me.lblEmType.Text = "EM Type"
'
- 'cbEmType
- '
- Me.cbEmType.FormattingEnabled = true
- Me.cbEmType.Location = New System.Drawing.Point(113, 7)
- Me.cbEmType.Name = "cbEmType"
- Me.cbEmType.Size = New System.Drawing.Size(151, 23)
- Me.cbEmType.TabIndex = 26
- '
'ElectricMotorForm
'
Me.AcceptButton = Me.ButOK
diff --git a/VECTO/GUI/ElectricMotorForm.vb b/VECTO/GUI/ElectricMotorForm.vb
index 215b0dede9e6984591a74ae09b405e8900b2c5ff..94b3c092497b8656480fcc9ce675463bba8ad41a 100644
--- a/VECTO/GUI/ElectricMotorForm.vb
+++ b/VECTO/GUI/ElectricMotorForm.vb
@@ -619,4 +619,7 @@ Public Class ElectricMotorForm
End If
End Sub
+ Private Sub PictureBox1_Click(sender As Object, e As EventArgs) Handles PictureBox1.Click
+
+ End Sub
End Class
diff --git a/VECTO/GUI/GearboxForm.vb b/VECTO/GUI/GearboxForm.vb
index 74aca6f0da5c811eadac8059ff06fec88b7a8b7f..cf4417f9a2e2b1db7514f717978e228508ec1058 100644
--- a/VECTO/GUI/GearboxForm.vb
+++ b/VECTO/GUI/GearboxForm.vb
@@ -81,17 +81,66 @@ Public Class GearboxForm
CbGStype.ValueMember = "Value"
CbGStype.DisplayMember = "Label"
- CbGStype.DataSource = [Enum].GetValues(GetType(GearboxType)) _
- .Cast(Of GearboxType)() _
- .Where(Function(type) type.ManualTransmission() OrElse type.AutomaticTransmission() OrElse type = GearboxType.IHPC OrElse type = GearboxType.IEPC) _
- .Select(Function(type) New With {Key .Value = type, .Label = type.GetLabel()}).ToList()
+ ' CbGStype.DataSource = [Enum].GetValues(GetType(GearboxType)) _
+ ' .Cast(Of GearboxType)() _
+ ' .Where(Function(type) type.ManualTransmission() OrElse type.AutomaticTransmission() OrElse type = GearboxType.IHPC OrElse type = GearboxType.IEPC) _
+ ' .Select(Function(type) New With {Key .Value = type, .Label = type.GetLabel()}).ToList()
+ SetupTransmissionTypes()
DeclInit()
_changed = False
NewGbx()
End Sub
+ private sub SetupTransmissionTypes()
+ Select case VectoJobForm.JobType
+ Case VectoSimulationJobType.ConventionalVehicle
+ CbGStype.DataSource = [Enum].GetValues(GetType(GearboxType)) _
+ .Cast(Of GearboxType)() _
+ .Where(Function(type) Not type = GearboxType.APTN And (type.ManualTransmission() OrElse type = GearboxType.ATSerial OrElse type = GearboxType.ATPowerSplit)) _
+ .Select(Function(type) New With {Key .Value = type, .Label = type.GetLabel()}).ToList()
+
+ Case VectoSimulationJobType.IHPC
+ CbGStype.DataSource = [Enum].GetValues(GetType(GearboxType)) _
+ .Cast(Of GearboxType)() _
+ .Where(Function(type) type = GearboxType.IHPC ) _
+ .Select(Function(type) New With {Key .Value = type, .Label = type.GetLabel()}).ToList()
+
+ Case VectoSimulationJobType.IEPC_E,VectoSimulationJobType.IEPC_S
+ CbGStype.DataSource = [Enum].GetValues(GetType(GearboxType)) _
+ .Cast(Of GearboxType)() _
+ .Where(Function(type) type = GearboxType.IEPC) _
+ .Select(Function(type) New With {Key .Value = type, .Label = type.GetLabel()}).ToList()
+
+ Case VectoSimulationJobType.ParallelHybridVehicle
+ CbGStype.DataSource = [Enum].GetValues(GetType(GearboxType)) _
+ .Cast(Of GearboxType)() _
+ .Where(Function(type) type = GearboxType.AMT OrElse (type.AutomaticTransmission() and not type = GearboxType.IHPC And Not type = GearboxType.APTN)) _
+ .Select(Function(type) New With {Key .Value = type, .Label = type.GetLabel()}).ToList()
+
+ Case VectoSimulationJobType.SerialHybridVehicle
+ CbGStype.DataSource = [Enum].GetValues(GetType(GearboxType)) _
+ .Cast(Of GearboxType)() _
+ .Where(Function(type) type = GearboxType.AMT OrElse type.AutomaticTransmission() and not type = GearboxType.IHPC ) _
+ .Select(Function(type) New With {Key .Value = type, .Label = type.GetLabel()}).ToList()
+
+ Case VectoSimulationJobType.BatteryElectricVehicle
+ CbGStype.DataSource = [Enum].GetValues(GetType(GearboxType)) _
+ .Cast(Of GearboxType)() _
+ .Where(Function(type) type = GearboxType.AMT OrElse type.AutomaticTransmission() and not type = GearboxType.IHPC ) _
+ .Select(Function(type) New With {Key .Value = type, .Label = type.GetLabel()}).ToList()
+
+ Case Else
+ CbGStype.DataSource = [Enum].GetValues(GetType(GearboxType)) _
+ .Cast(Of GearboxType)() _
+ .Where(Function(type) type.ManualTransmission() OrElse type.AutomaticTransmission() OrElse type = GearboxType.IHPC OrElse type = GearboxType.IEPC) _
+ .Select(Function(type) New With {Key .Value = type, .Label = type.GetLabel()}).ToList()
+
+ End Select
+
+ End sub
+
'Set generic values for Declaration mode.
Private Sub DeclInit()
Dim gbxType As GearboxType
diff --git a/VECTO/GUI/IEPCForm.Designer.vb b/VECTO/GUI/IEPCForm.Designer.vb
index b725da01b07231db8386434b5343a9ca2b700443..2a4b898005449429d07b8b69d573d08cdc990363 100644
--- a/VECTO/GUI/IEPCForm.Designer.vb
+++ b/VECTO/GUI/IEPCForm.Designer.vb
@@ -132,6 +132,7 @@ Partial Class IEPCForm
Me.ButOK = New System.Windows.Forms.Button()
Me.FlowLayoutPanel1 = New System.Windows.Forms.FlowLayoutPanel()
Me.FlowLayoutPanel4 = New System.Windows.Forms.Panel()
+ Me.Label3 = New System.Windows.Forms.Label()
Me.FlowLayoutPanel5 = New System.Windows.Forms.Panel()
Me.Label9 = New System.Windows.Forms.Label()
Me.pnInertia = New System.Windows.Forms.Panel()
@@ -151,7 +152,6 @@ Partial Class IEPCForm
Me.pnElectricMachineType = New System.Windows.Forms.Panel()
Me.cbEmType = New System.Windows.Forms.ComboBox()
Me.lblEmType = New System.Windows.Forms.Label()
- Me.Label3 = New System.Windows.Forms.Label()
Me.tcVoltageLevels.SuspendLayout
Me.tpFirstVoltageLevel.SuspendLayout
Me.FlowLayoutPanel9.SuspendLayout
@@ -342,13 +342,13 @@ Partial Class IEPCForm
'TableLayoutPanel1
'
Me.TableLayoutPanel1.ColumnCount = 7
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 163!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 72!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 35!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 149!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 160!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 75!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 41!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 143!))
Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 72!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 35!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 69!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 37!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 67!))
Me.TableLayoutPanel1.Controls.Add(Me.Label11, 2, 1)
Me.TableLayoutPanel1.Controls.Add(Me.Label4, 2, 0)
Me.TableLayoutPanel1.Controls.Add(Me.Label13, 5, 0)
@@ -381,7 +381,7 @@ Partial Class IEPCForm
'
Me.Label11.Anchor = System.Windows.Forms.AnchorStyles.None
Me.Label11.AutoSize = true
- Me.Label11.Location = New System.Drawing.Point(235, 39)
+ Me.Label11.Location = New System.Drawing.Point(238, 39)
Me.Label11.Margin = New System.Windows.Forms.Padding(0)
Me.Label11.Name = "Label11"
Me.Label11.Size = New System.Drawing.Size(35, 15)
@@ -392,7 +392,7 @@ Partial Class IEPCForm
'
Me.Label4.Anchor = System.Windows.Forms.AnchorStyles.None
Me.Label4.AutoSize = true
- Me.Label4.Location = New System.Drawing.Point(241, 8)
+ Me.Label4.Location = New System.Drawing.Point(244, 8)
Me.Label4.Margin = New System.Windows.Forms.Padding(0)
Me.Label4.Name = "Label4"
Me.Label4.Size = New System.Drawing.Size(22, 15)
@@ -403,7 +403,7 @@ Partial Class IEPCForm
'
Me.Label13.Anchor = System.Windows.Forms.AnchorStyles.None
Me.Label13.AutoSize = true
- Me.Label13.Location = New System.Drawing.Point(498, 8)
+ Me.Label13.Location = New System.Drawing.Point(499, 8)
Me.Label13.Margin = New System.Windows.Forms.Padding(0)
Me.Label13.Name = "Label13"
Me.Label13.Size = New System.Drawing.Size(20, 15)
@@ -425,7 +425,7 @@ Partial Class IEPCForm
'
Me.Label37.Anchor = System.Windows.Forms.AnchorStyles.Right
Me.Label37.AutoSize = true
- Me.Label37.Location = New System.Drawing.Point(113, 8)
+ Me.Label37.Location = New System.Drawing.Point(110, 8)
Me.Label37.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label37.Name = "Label37"
Me.Label37.Size = New System.Drawing.Size(46, 15)
@@ -444,7 +444,7 @@ Partial Class IEPCForm
'tbVoltage1
'
Me.tbVoltage1.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbVoltage1.Location = New System.Drawing.Point(166, 4)
+ Me.tbVoltage1.Location = New System.Drawing.Point(165, 4)
Me.tbVoltage1.Margin = New System.Windows.Forms.Padding(0)
Me.tbVoltage1.Name = "tbVoltage1"
Me.tbVoltage1.Size = New System.Drawing.Size(65, 23)
@@ -454,7 +454,7 @@ Partial Class IEPCForm
'
Me.Label39.Anchor = System.Windows.Forms.AnchorStyles.Right
Me.Label39.AutoSize = true
- Me.Label39.Location = New System.Drawing.Point(51, 39)
+ Me.Label39.Location = New System.Drawing.Point(48, 39)
Me.Label39.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label39.Name = "Label39"
Me.Label39.Size = New System.Drawing.Size(108, 15)
@@ -465,7 +465,7 @@ Partial Class IEPCForm
'
Me.Label1.Anchor = System.Windows.Forms.AnchorStyles.Right
Me.Label1.AutoSize = true
- Me.Label1.Location = New System.Drawing.Point(16, 71)
+ Me.Label1.Location = New System.Drawing.Point(13, 71)
Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label1.Name = "Label1"
Me.Label1.Size = New System.Drawing.Size(143, 15)
@@ -475,7 +475,7 @@ Partial Class IEPCForm
'tbContinousTorque1
'
Me.tbContinousTorque1.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbContinousTorque1.Location = New System.Drawing.Point(166, 35)
+ Me.tbContinousTorque1.Location = New System.Drawing.Point(165, 35)
Me.tbContinousTorque1.Margin = New System.Windows.Forms.Padding(0)
Me.tbContinousTorque1.Name = "tbContinousTorque1"
Me.tbContinousTorque1.Size = New System.Drawing.Size(65, 23)
@@ -484,7 +484,7 @@ Partial Class IEPCForm
'tbContinousTorqueSpeed1
'
Me.tbContinousTorqueSpeed1.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbContinousTorqueSpeed1.Location = New System.Drawing.Point(166, 67)
+ Me.tbContinousTorqueSpeed1.Location = New System.Drawing.Point(165, 67)
Me.tbContinousTorqueSpeed1.Margin = New System.Windows.Forms.Padding(0)
Me.tbContinousTorqueSpeed1.Name = "tbContinousTorqueSpeed1"
Me.tbContinousTorqueSpeed1.Size = New System.Drawing.Size(65, 23)
@@ -494,10 +494,10 @@ Partial Class IEPCForm
'
Me.Label15.Anchor = System.Windows.Forms.AnchorStyles.None
Me.Label15.AutoSize = true
- Me.Label15.Location = New System.Drawing.Point(236, 63)
+ Me.Label15.Location = New System.Drawing.Point(237, 71)
Me.Label15.Margin = New System.Windows.Forms.Padding(0)
Me.Label15.Name = "Label15"
- Me.Label15.Size = New System.Drawing.Size(33, 30)
+ Me.Label15.Size = New System.Drawing.Size(37, 15)
Me.Label15.TabIndex = 67
Me.Label15.Text = "[rpm]"
'
@@ -516,10 +516,10 @@ Partial Class IEPCForm
'
Me.Label14.Anchor = System.Windows.Forms.AnchorStyles.None
Me.Label14.AutoSize = true
- Me.Label14.Location = New System.Drawing.Point(492, 63)
+ Me.Label14.Location = New System.Drawing.Point(491, 71)
Me.Label14.Margin = New System.Windows.Forms.Padding(0)
Me.Label14.Name = "Label14"
- Me.Label14.Size = New System.Drawing.Size(33, 30)
+ Me.Label14.Size = New System.Drawing.Size(37, 15)
Me.Label14.TabIndex = 66
Me.Label14.Text = "[rpm]"
'
@@ -556,7 +556,7 @@ Partial Class IEPCForm
'
Me.Label12.Anchor = System.Windows.Forms.AnchorStyles.None
Me.Label12.AutoSize = true
- Me.Label12.Location = New System.Drawing.Point(491, 39)
+ Me.Label12.Location = New System.Drawing.Point(492, 39)
Me.Label12.Margin = New System.Windows.Forms.Padding(0)
Me.Label12.Name = "Label12"
Me.Label12.Size = New System.Drawing.Size(35, 15)
@@ -777,13 +777,13 @@ Partial Class IEPCForm
'
Me.TableLayoutPanel4.Anchor = System.Windows.Forms.AnchorStyles.None
Me.TableLayoutPanel4.ColumnCount = 7
- Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 163!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 160!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 75!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 41!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 143!))
Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 72!))
- Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 35!))
- Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 149!))
- Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 72!))
- Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 35!))
- Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 69!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 37!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 67!))
Me.TableLayoutPanel4.Controls.Add(Me.Label17, 2, 1)
Me.TableLayoutPanel4.Controls.Add(Me.Label18, 2, 0)
Me.TableLayoutPanel4.Controls.Add(Me.Label26, 5, 0)
@@ -816,7 +816,7 @@ Partial Class IEPCForm
'
Me.Label17.Anchor = System.Windows.Forms.AnchorStyles.None
Me.Label17.AutoSize = true
- Me.Label17.Location = New System.Drawing.Point(235, 39)
+ Me.Label17.Location = New System.Drawing.Point(238, 39)
Me.Label17.Margin = New System.Windows.Forms.Padding(0)
Me.Label17.Name = "Label17"
Me.Label17.Size = New System.Drawing.Size(35, 15)
@@ -827,7 +827,7 @@ Partial Class IEPCForm
'
Me.Label18.Anchor = System.Windows.Forms.AnchorStyles.None
Me.Label18.AutoSize = true
- Me.Label18.Location = New System.Drawing.Point(241, 8)
+ Me.Label18.Location = New System.Drawing.Point(244, 8)
Me.Label18.Margin = New System.Windows.Forms.Padding(0)
Me.Label18.Name = "Label18"
Me.Label18.Size = New System.Drawing.Size(22, 15)
@@ -838,7 +838,7 @@ Partial Class IEPCForm
'
Me.Label26.Anchor = System.Windows.Forms.AnchorStyles.None
Me.Label26.AutoSize = true
- Me.Label26.Location = New System.Drawing.Point(498, 8)
+ Me.Label26.Location = New System.Drawing.Point(499, 8)
Me.Label26.Margin = New System.Windows.Forms.Padding(0)
Me.Label26.Name = "Label26"
Me.Label26.Size = New System.Drawing.Size(20, 15)
@@ -849,7 +849,7 @@ Partial Class IEPCForm
'
Me.Label19.Anchor = System.Windows.Forms.AnchorStyles.Right
Me.Label19.AutoSize = true
- Me.Label19.Location = New System.Drawing.Point(113, 8)
+ Me.Label19.Location = New System.Drawing.Point(110, 8)
Me.Label19.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label19.Name = "Label19"
Me.Label19.Size = New System.Drawing.Size(46, 15)
@@ -879,7 +879,7 @@ Partial Class IEPCForm
'tbVoltage2
'
Me.tbVoltage2.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbVoltage2.Location = New System.Drawing.Point(167, 4)
+ Me.tbVoltage2.Location = New System.Drawing.Point(165, 4)
Me.tbVoltage2.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbVoltage2.Name = "tbVoltage2"
Me.tbVoltage2.Size = New System.Drawing.Size(64, 23)
@@ -889,7 +889,7 @@ Partial Class IEPCForm
'
Me.Label20.Anchor = System.Windows.Forms.AnchorStyles.Right
Me.Label20.AutoSize = true
- Me.Label20.Location = New System.Drawing.Point(51, 39)
+ Me.Label20.Location = New System.Drawing.Point(48, 39)
Me.Label20.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label20.Name = "Label20"
Me.Label20.Size = New System.Drawing.Size(108, 15)
@@ -900,7 +900,7 @@ Partial Class IEPCForm
'
Me.Label21.Anchor = System.Windows.Forms.AnchorStyles.Right
Me.Label21.AutoSize = true
- Me.Label21.Location = New System.Drawing.Point(16, 71)
+ Me.Label21.Location = New System.Drawing.Point(13, 71)
Me.Label21.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label21.Name = "Label21"
Me.Label21.Size = New System.Drawing.Size(143, 15)
@@ -910,7 +910,7 @@ Partial Class IEPCForm
'tbContinousTorque2
'
Me.tbContinousTorque2.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbContinousTorque2.Location = New System.Drawing.Point(167, 35)
+ Me.tbContinousTorque2.Location = New System.Drawing.Point(165, 35)
Me.tbContinousTorque2.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbContinousTorque2.Name = "tbContinousTorque2"
Me.tbContinousTorque2.Size = New System.Drawing.Size(64, 23)
@@ -919,7 +919,7 @@ Partial Class IEPCForm
'tbContinousTorqueSpeed2
'
Me.tbContinousTorqueSpeed2.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbContinousTorqueSpeed2.Location = New System.Drawing.Point(167, 67)
+ Me.tbContinousTorqueSpeed2.Location = New System.Drawing.Point(165, 67)
Me.tbContinousTorqueSpeed2.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbContinousTorqueSpeed2.Name = "tbContinousTorqueSpeed2"
Me.tbContinousTorqueSpeed2.Size = New System.Drawing.Size(64, 23)
@@ -929,10 +929,10 @@ Partial Class IEPCForm
'
Me.Label27.Anchor = System.Windows.Forms.AnchorStyles.None
Me.Label27.AutoSize = true
- Me.Label27.Location = New System.Drawing.Point(236, 63)
+ Me.Label27.Location = New System.Drawing.Point(237, 71)
Me.Label27.Margin = New System.Windows.Forms.Padding(0)
Me.Label27.Name = "Label27"
- Me.Label27.Size = New System.Drawing.Size(33, 30)
+ Me.Label27.Size = New System.Drawing.Size(37, 15)
Me.Label27.TabIndex = 67
Me.Label27.Text = "[rpm]"
'
@@ -960,10 +960,10 @@ Partial Class IEPCForm
'
Me.Label25.Anchor = System.Windows.Forms.AnchorStyles.None
Me.Label25.AutoSize = true
- Me.Label25.Location = New System.Drawing.Point(492, 63)
+ Me.Label25.Location = New System.Drawing.Point(491, 71)
Me.Label25.Margin = New System.Windows.Forms.Padding(0)
Me.Label25.Name = "Label25"
- Me.Label25.Size = New System.Drawing.Size(33, 30)
+ Me.Label25.Size = New System.Drawing.Size(37, 15)
Me.Label25.TabIndex = 66
Me.Label25.Text = "[rpm]"
'
@@ -991,7 +991,7 @@ Partial Class IEPCForm
'
Me.Label16.Anchor = System.Windows.Forms.AnchorStyles.None
Me.Label16.AutoSize = true
- Me.Label16.Location = New System.Drawing.Point(491, 39)
+ Me.Label16.Location = New System.Drawing.Point(492, 39)
Me.Label16.Margin = New System.Windows.Forms.Padding(0)
Me.Label16.Name = "Label16"
Me.Label16.Size = New System.Drawing.Size(35, 15)
@@ -1384,6 +1384,16 @@ Partial Class IEPCForm
Me.FlowLayoutPanel4.Size = New System.Drawing.Size(245, 28)
Me.FlowLayoutPanel4.TabIndex = 104
'
+ 'Label3
+ '
+ Me.Label3.AutoSize = true
+ Me.Label3.Location = New System.Drawing.Point(5, 5)
+ Me.Label3.Margin = New System.Windows.Forms.Padding(4, 7, 7, 7)
+ Me.Label3.Name = "Label3"
+ Me.Label3.Size = New System.Drawing.Size(142, 15)
+ Me.Label3.TabIndex = 55
+ Me.Label3.Text = "Design Type Wheel Motor"
+ '
'FlowLayoutPanel5
'
Me.FlowLayoutPanel5.Controls.Add(Me.Label48)
@@ -1560,16 +1570,6 @@ Partial Class IEPCForm
Me.lblEmType.TabIndex = 25
Me.lblEmType.Text = "EM Type"
'
- 'Label3
- '
- Me.Label3.AutoSize = true
- Me.Label3.Location = New System.Drawing.Point(5, 5)
- Me.Label3.Margin = New System.Windows.Forms.Padding(4, 7, 7, 7)
- Me.Label3.Name = "Label3"
- Me.Label3.Size = New System.Drawing.Size(142, 15)
- Me.Label3.TabIndex = 55
- Me.Label3.Text = "Design Type Wheel Motor"
- '
'IEPCForm
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(7!, 15!)
diff --git a/VECTO/GUI/IEPCForm.vb b/VECTO/GUI/IEPCForm.vb
index 82162f4a15ccdbb7dbd3f38af884bc344ac4106a..2d923213a8e4276c9dd3485b0a4fdacebb686ff7 100644
--- a/VECTO/GUI/IEPCForm.vb
+++ b/VECTO/GUI/IEPCForm.vb
@@ -300,6 +300,7 @@ Public Class IEPCForm
tbInertia.Text = ""
cbDifferentialIncluded.Checked = False
cbDesignTypeWheelMotor.Checked = False
+ FlowLayoutPanel5.Enabled = False
tbNumberOfDesignTypeWheelMotor.Text = "0"
tbThermalOverload.Text = ""
@@ -725,6 +726,7 @@ Public Class IEPCForm
Private Sub cbDesignTypeWheelMotor_CheckedChanged(sender As Object, e As EventArgs) Handles cbDesignTypeWheelMotor.CheckedChanged
tbNumberOfDesignTypeWheelMotor.Enabled = cbDesignTypeWheelMotor.Checked
+ FlowLayoutPanel5.Enabled = cbDesignTypeWheelMotor.Checked
cbDifferentialIncluded.Enabled = Not cbDesignTypeWheelMotor.Checked
if (cbDesignTypeWheelMotor.Checked) then
cbDifferentialIncluded.Checked = False
@@ -847,8 +849,4 @@ Public Class IEPCForm
MsgBox("File not found!")
End If
End Sub
-
- Private Sub Label2_Click(sender As Object, e As EventArgs) Handles Label2.Click
-
- End Sub
End Class
\ No newline at end of file
diff --git a/VECTO/GUI/IHPCForm.Designer.vb b/VECTO/GUI/IHPCForm.Designer.vb
index 7e363a2854bce9d7b8cf5f6de4c825b6cd78c439..db73a6755e0db9bcabb57cff959725d2f366545d 100644
--- a/VECTO/GUI/IHPCForm.Designer.vb
+++ b/VECTO/GUI/IHPCForm.Designer.vb
@@ -506,11 +506,11 @@ Partial Class IHPCForm
Me.TableLayoutPanel1.ColumnCount = 7
Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 163!))
Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 72!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 35!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 149!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 37!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 147!))
Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 72!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 35!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 69!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 37!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 67!))
Me.TableLayoutPanel1.Controls.Add(Me.Label11, 2, 1)
Me.TableLayoutPanel1.Controls.Add(Me.Label4, 2, 0)
Me.TableLayoutPanel1.Controls.Add(Me.Label13, 5, 0)
@@ -543,7 +543,7 @@ Partial Class IHPCForm
'
Me.Label11.Anchor = System.Windows.Forms.AnchorStyles.None
Me.Label11.AutoSize = true
- Me.Label11.Location = New System.Drawing.Point(235, 39)
+ Me.Label11.Location = New System.Drawing.Point(236, 39)
Me.Label11.Margin = New System.Windows.Forms.Padding(0)
Me.Label11.Name = "Label11"
Me.Label11.Size = New System.Drawing.Size(35, 15)
@@ -554,7 +554,7 @@ Partial Class IHPCForm
'
Me.Label4.Anchor = System.Windows.Forms.AnchorStyles.None
Me.Label4.AutoSize = true
- Me.Label4.Location = New System.Drawing.Point(241, 8)
+ Me.Label4.Location = New System.Drawing.Point(242, 8)
Me.Label4.Margin = New System.Windows.Forms.Padding(0)
Me.Label4.Name = "Label4"
Me.Label4.Size = New System.Drawing.Size(22, 15)
@@ -565,7 +565,7 @@ Partial Class IHPCForm
'
Me.Label13.Anchor = System.Windows.Forms.AnchorStyles.None
Me.Label13.AutoSize = true
- Me.Label13.Location = New System.Drawing.Point(498, 8)
+ Me.Label13.Location = New System.Drawing.Point(499, 8)
Me.Label13.Margin = New System.Windows.Forms.Padding(0)
Me.Label13.Name = "Label13"
Me.Label13.Size = New System.Drawing.Size(20, 15)
@@ -656,10 +656,10 @@ Partial Class IHPCForm
'
Me.Label15.Anchor = System.Windows.Forms.AnchorStyles.None
Me.Label15.AutoSize = true
- Me.Label15.Location = New System.Drawing.Point(236, 63)
+ Me.Label15.Location = New System.Drawing.Point(235, 71)
Me.Label15.Margin = New System.Windows.Forms.Padding(0)
Me.Label15.Name = "Label15"
- Me.Label15.Size = New System.Drawing.Size(33, 30)
+ Me.Label15.Size = New System.Drawing.Size(37, 15)
Me.Label15.TabIndex = 67
Me.Label15.Text = "[rpm]"
'
@@ -678,10 +678,10 @@ Partial Class IHPCForm
'
Me.Label14.Anchor = System.Windows.Forms.AnchorStyles.None
Me.Label14.AutoSize = true
- Me.Label14.Location = New System.Drawing.Point(492, 63)
+ Me.Label14.Location = New System.Drawing.Point(491, 71)
Me.Label14.Margin = New System.Windows.Forms.Padding(0)
Me.Label14.Name = "Label14"
- Me.Label14.Size = New System.Drawing.Size(33, 30)
+ Me.Label14.Size = New System.Drawing.Size(37, 15)
Me.Label14.TabIndex = 66
Me.Label14.Text = "[rpm]"
'
@@ -718,7 +718,7 @@ Partial Class IHPCForm
'
Me.Label12.Anchor = System.Windows.Forms.AnchorStyles.None
Me.Label12.AutoSize = true
- Me.Label12.Location = New System.Drawing.Point(491, 39)
+ Me.Label12.Location = New System.Drawing.Point(492, 39)
Me.Label12.Margin = New System.Windows.Forms.Padding(0)
Me.Label12.Name = "Label12"
Me.Label12.Size = New System.Drawing.Size(35, 15)
@@ -900,11 +900,11 @@ Partial Class IHPCForm
Me.TableLayoutPanel4.ColumnCount = 7
Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 163!))
Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 72!))
- Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 35!))
- Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 149!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 37!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 147!))
Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 72!))
- Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 35!))
- Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 69!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 37!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 67!))
Me.TableLayoutPanel4.Controls.Add(Me.Label17, 2, 1)
Me.TableLayoutPanel4.Controls.Add(Me.Label18, 2, 0)
Me.TableLayoutPanel4.Controls.Add(Me.Label26, 5, 0)
@@ -937,7 +937,7 @@ Partial Class IHPCForm
'
Me.Label17.Anchor = System.Windows.Forms.AnchorStyles.None
Me.Label17.AutoSize = true
- Me.Label17.Location = New System.Drawing.Point(235, 39)
+ Me.Label17.Location = New System.Drawing.Point(236, 39)
Me.Label17.Margin = New System.Windows.Forms.Padding(0)
Me.Label17.Name = "Label17"
Me.Label17.Size = New System.Drawing.Size(35, 15)
@@ -948,7 +948,7 @@ Partial Class IHPCForm
'
Me.Label18.Anchor = System.Windows.Forms.AnchorStyles.None
Me.Label18.AutoSize = true
- Me.Label18.Location = New System.Drawing.Point(241, 8)
+ Me.Label18.Location = New System.Drawing.Point(242, 8)
Me.Label18.Margin = New System.Windows.Forms.Padding(0)
Me.Label18.Name = "Label18"
Me.Label18.Size = New System.Drawing.Size(22, 15)
@@ -959,7 +959,7 @@ Partial Class IHPCForm
'
Me.Label26.Anchor = System.Windows.Forms.AnchorStyles.None
Me.Label26.AutoSize = true
- Me.Label26.Location = New System.Drawing.Point(498, 8)
+ Me.Label26.Location = New System.Drawing.Point(499, 8)
Me.Label26.Margin = New System.Windows.Forms.Padding(0)
Me.Label26.Name = "Label26"
Me.Label26.Size = New System.Drawing.Size(20, 15)
@@ -1050,10 +1050,10 @@ Partial Class IHPCForm
'
Me.Label27.Anchor = System.Windows.Forms.AnchorStyles.None
Me.Label27.AutoSize = true
- Me.Label27.Location = New System.Drawing.Point(236, 63)
+ Me.Label27.Location = New System.Drawing.Point(235, 71)
Me.Label27.Margin = New System.Windows.Forms.Padding(0)
Me.Label27.Name = "Label27"
- Me.Label27.Size = New System.Drawing.Size(33, 30)
+ Me.Label27.Size = New System.Drawing.Size(37, 15)
Me.Label27.TabIndex = 67
Me.Label27.Text = "[rpm]"
'
@@ -1081,10 +1081,10 @@ Partial Class IHPCForm
'
Me.Label25.Anchor = System.Windows.Forms.AnchorStyles.None
Me.Label25.AutoSize = true
- Me.Label25.Location = New System.Drawing.Point(492, 63)
+ Me.Label25.Location = New System.Drawing.Point(491, 71)
Me.Label25.Margin = New System.Windows.Forms.Padding(0)
Me.Label25.Name = "Label25"
- Me.Label25.Size = New System.Drawing.Size(33, 30)
+ Me.Label25.Size = New System.Drawing.Size(37, 15)
Me.Label25.TabIndex = 66
Me.Label25.Text = "[rpm]"
'
@@ -1112,7 +1112,7 @@ Partial Class IHPCForm
'
Me.Label16.Anchor = System.Windows.Forms.AnchorStyles.None
Me.Label16.AutoSize = true
- Me.Label16.Location = New System.Drawing.Point(491, 39)
+ Me.Label16.Location = New System.Drawing.Point(492, 39)
Me.Label16.Margin = New System.Windows.Forms.Padding(0)
Me.Label16.Name = "Label16"
Me.Label16.Size = New System.Drawing.Size(35, 15)