diff --git a/VECTO/GUI/BatteryForm.Designer.vb b/VECTO/GUI/BatteryForm.Designer.vb
index b83c072c1e761b873c1735012a23d367c5d736b5..165cb8d8b68381483de995b4e90c76e78fe3fef8 100644
--- a/VECTO/GUI/BatteryForm.Designer.vb
+++ b/VECTO/GUI/BatteryForm.Designer.vb
@@ -111,6 +111,20 @@ 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
@@ -128,30 +142,37 @@ Partial Class BatteryForm
Me.pnSuperCapMinV.SuspendLayout
Me.pnSuperCapResistance.SuspendLayout
Me.pnSuperCapCapacity.SuspendLayout
+ Me.pnTestingTempB.SuspendLayout
+ Me.pnTestingTempC.SuspendLayout
+ Me.Panel5.SuspendLayout
+ Me.Panel6.SuspendLayout
Me.SuspendLayout
'
'tbCapacity
'
- Me.tbCapacity.Location = New System.Drawing.Point(90, 4)
+ Me.tbCapacity.Location = New System.Drawing.Point(105, 3)
+ Me.tbCapacity.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbCapacity.Name = "tbCapacity"
- Me.tbCapacity.Size = New System.Drawing.Size(57, 20)
+ Me.tbCapacity.Size = New System.Drawing.Size(66, 23)
Me.tbCapacity.TabIndex = 0
'
'lblCapacityUnit
'
Me.lblCapacityUnit.AutoSize = true
- Me.lblCapacityUnit.Location = New System.Drawing.Point(153, 7)
+ Me.lblCapacityUnit.Location = New System.Drawing.Point(178, 6)
+ Me.lblCapacityUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblCapacityUnit.Name = "lblCapacityUnit"
- Me.lblCapacityUnit.Size = New System.Drawing.Size(26, 13)
+ Me.lblCapacityUnit.Size = New System.Drawing.Size(30, 15)
Me.lblCapacityUnit.TabIndex = 24
Me.lblCapacityUnit.Text = "[Ah]"
'
'lblCapacity
'
Me.lblCapacity.AutoSize = true
- Me.lblCapacity.Location = New System.Drawing.Point(3, 7)
+ Me.lblCapacity.Location = New System.Drawing.Point(4, 6)
+ Me.lblCapacity.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblCapacity.Name = "lblCapacity"
- Me.lblCapacity.Size = New System.Drawing.Size(48, 13)
+ Me.lblCapacity.Size = New System.Drawing.Size(53, 15)
Me.lblCapacity.TabIndex = 0
Me.lblCapacity.Text = "Capacity"
'
@@ -159,9 +180,10 @@ Partial Class BatteryForm
'
Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.ButCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
- Me.ButCancel.Location = New System.Drawing.Point(811, 321)
+ Me.ButCancel.Location = New System.Drawing.Point(946, 374)
+ Me.ButCancel.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.ButCancel.Name = "ButCancel"
- Me.ButCancel.Size = New System.Drawing.Size(75, 23)
+ Me.ButCancel.Size = New System.Drawing.Size(88, 27)
Me.ButCancel.TabIndex = 4
Me.ButCancel.Text = "Cancel"
Me.ButCancel.UseVisualStyleBackColor = true
@@ -169,9 +191,10 @@ Partial Class BatteryForm
'ButOK
'
Me.ButOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.ButOK.Location = New System.Drawing.Point(730, 321)
+ Me.ButOK.Location = New System.Drawing.Point(852, 374)
+ Me.ButOK.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.ButOK.Name = "ButOK"
- Me.ButOK.Size = New System.Drawing.Size(75, 23)
+ Me.ButOK.Size = New System.Drawing.Size(88, 27)
Me.ButOK.TabIndex = 3
Me.ButOK.Text = "Save"
Me.ButOK.UseVisualStyleBackColor = true
@@ -184,7 +207,7 @@ Partial Class BatteryForm
Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
Me.ToolStrip1.Name = "ToolStrip1"
Me.ToolStrip1.Padding = New System.Windows.Forms.Padding(0, 0, 2, 0)
- Me.ToolStrip1.Size = New System.Drawing.Size(898, 31)
+ Me.ToolStrip1.Size = New System.Drawing.Size(1048, 31)
Me.ToolStrip1.TabIndex = 30
Me.ToolStrip1.Text = "ToolStrip1"
'
@@ -261,9 +284,10 @@ Partial Class BatteryForm
'
Me.StatusStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LbStatus})
- Me.StatusStrip1.Location = New System.Drawing.Point(0, 347)
+ Me.StatusStrip1.Location = New System.Drawing.Point(0, 408)
Me.StatusStrip1.Name = "StatusStrip1"
- Me.StatusStrip1.Size = New System.Drawing.Size(898, 22)
+ Me.StatusStrip1.Padding = New System.Windows.Forms.Padding(1, 0, 16, 0)
+ Me.StatusStrip1.Size = New System.Drawing.Size(1048, 22)
Me.StatusStrip1.SizingGrip = false
Me.StatusStrip1.TabIndex = 37
Me.StatusStrip1.Text = "StatusStrip1"
@@ -276,17 +300,19 @@ Partial Class BatteryForm
'
'tbMakeModel
'
- Me.tbMakeModel.Location = New System.Drawing.Point(109, 82)
+ Me.tbMakeModel.Location = New System.Drawing.Point(127, 95)
+ Me.tbMakeModel.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbMakeModel.Name = "tbMakeModel"
- Me.tbMakeModel.Size = New System.Drawing.Size(370, 20)
+ Me.tbMakeModel.Size = New System.Drawing.Size(431, 23)
Me.tbMakeModel.TabIndex = 0
'
'lblMakeModel
'
Me.lblMakeModel.AutoSize = true
- Me.lblMakeModel.Location = New System.Drawing.Point(16, 85)
+ Me.lblMakeModel.Location = New System.Drawing.Point(19, 98)
+ Me.lblMakeModel.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblMakeModel.Name = "lblMakeModel"
- Me.lblMakeModel.Size = New System.Drawing.Size(87, 13)
+ Me.lblMakeModel.Size = New System.Drawing.Size(96, 15)
Me.lblMakeModel.TabIndex = 11
Me.lblMakeModel.Text = "Make and Model"
'
@@ -294,9 +320,10 @@ Partial Class BatteryForm
'
Me.PictureBox1.BackColor = System.Drawing.Color.White
Me.PictureBox1.Image = Global.TUGraz.VECTO.My.Resources.Resources.VECTO_ENG
- Me.PictureBox1.Location = New System.Drawing.Point(0, 28)
+ Me.PictureBox1.Location = New System.Drawing.Point(0, 32)
+ Me.PictureBox1.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.PictureBox1.Name = "PictureBox1"
- Me.PictureBox1.Size = New System.Drawing.Size(502, 40)
+ Me.PictureBox1.Size = New System.Drawing.Size(586, 46)
Me.PictureBox1.TabIndex = 39
Me.PictureBox1.TabStop = false
'
@@ -324,85 +351,95 @@ Partial Class BatteryForm
Me.pnInertia.Controls.Add(Me.lblCapacity)
Me.pnInertia.Controls.Add(Me.lblCapacityUnit)
Me.pnInertia.Controls.Add(Me.tbCapacity)
- Me.pnInertia.Location = New System.Drawing.Point(3, 3)
+ Me.pnInertia.Location = New System.Drawing.Point(4, 3)
+ Me.pnInertia.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.pnInertia.Name = "pnInertia"
- Me.pnInertia.Size = New System.Drawing.Size(212, 30)
+ Me.pnInertia.Size = New System.Drawing.Size(247, 30)
Me.pnInertia.TabIndex = 0
'
'tbSoCCurve
'
- Me.tbSoCCurve.Location = New System.Drawing.Point(3, 123)
+ Me.tbSoCCurve.Location = New System.Drawing.Point(4, 161)
+ Me.tbSoCCurve.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbSoCCurve.Name = "tbSoCCurve"
- Me.tbSoCCurve.Size = New System.Drawing.Size(434, 20)
+ Me.tbSoCCurve.Size = New System.Drawing.Size(506, 23)
Me.tbSoCCurve.TabIndex = 6
'
'lblSoCCurve
'
Me.lblSoCCurve.AutoSize = true
- Me.lblSoCCurve.Location = New System.Drawing.Point(3, 107)
+ Me.lblSoCCurve.Location = New System.Drawing.Point(4, 142)
+ Me.lblSoCCurve.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblSoCCurve.Name = "lblSoCCurve"
- Me.lblSoCCurve.Size = New System.Drawing.Size(60, 13)
+ Me.lblSoCCurve.Size = New System.Drawing.Size(65, 15)
Me.lblSoCCurve.TabIndex = 38
Me.lblSoCCurve.Text = "OCV Curve"
'
'btnBrowseSoCCurve
'
Me.btnBrowseSoCCurve.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnBrowseSoCCurve.Location = New System.Drawing.Point(437, 122)
+ Me.btnBrowseSoCCurve.Location = New System.Drawing.Point(510, 160)
+ Me.btnBrowseSoCCurve.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btnBrowseSoCCurve.Name = "btnBrowseSoCCurve"
- Me.btnBrowseSoCCurve.Size = New System.Drawing.Size(24, 24)
+ Me.btnBrowseSoCCurve.Size = New System.Drawing.Size(28, 28)
Me.btnBrowseSoCCurve.TabIndex = 7
Me.btnBrowseSoCCurve.UseVisualStyleBackColor = true
'
'btnSoCCurveOpen
'
Me.btnSoCCurveOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btnSoCCurveOpen.Location = New System.Drawing.Point(460, 122)
+ Me.btnSoCCurveOpen.Location = New System.Drawing.Point(537, 160)
+ Me.btnSoCCurveOpen.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btnSoCCurveOpen.Name = "btnSoCCurveOpen"
- Me.btnSoCCurveOpen.Size = New System.Drawing.Size(24, 24)
+ Me.btnSoCCurveOpen.Size = New System.Drawing.Size(28, 28)
Me.btnSoCCurveOpen.TabIndex = 8
Me.btnSoCCurveOpen.UseVisualStyleBackColor = true
'
'btnRiMapOpen
'
Me.btnRiMapOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btnRiMapOpen.Location = New System.Drawing.Point(460, 159)
+ Me.btnRiMapOpen.Location = New System.Drawing.Point(537, 202)
+ Me.btnRiMapOpen.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btnRiMapOpen.Name = "btnRiMapOpen"
- Me.btnRiMapOpen.Size = New System.Drawing.Size(24, 24)
+ Me.btnRiMapOpen.Size = New System.Drawing.Size(28, 28)
Me.btnRiMapOpen.TabIndex = 11
Me.btnRiMapOpen.UseVisualStyleBackColor = true
'
'btnBrowseRiMap
'
Me.btnBrowseRiMap.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnBrowseRiMap.Location = New System.Drawing.Point(437, 159)
+ Me.btnBrowseRiMap.Location = New System.Drawing.Point(510, 202)
+ Me.btnBrowseRiMap.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btnBrowseRiMap.Name = "btnBrowseRiMap"
- Me.btnBrowseRiMap.Size = New System.Drawing.Size(24, 24)
+ Me.btnBrowseRiMap.Size = New System.Drawing.Size(28, 28)
Me.btnBrowseRiMap.TabIndex = 10
Me.btnBrowseRiMap.UseVisualStyleBackColor = true
'
'lblRiMap
'
Me.lblRiMap.AutoSize = true
- Me.lblRiMap.Location = New System.Drawing.Point(3, 144)
+ Me.lblRiMap.Location = New System.Drawing.Point(4, 185)
+ Me.lblRiMap.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblRiMap.Name = "lblRiMap"
- Me.lblRiMap.Size = New System.Drawing.Size(129, 13)
+ Me.lblRiMap.Size = New System.Drawing.Size(139, 15)
Me.lblRiMap.TabIndex = 43
Me.lblRiMap.Text = "Internal Resistance Curve"
'
'tbRiCurve
'
- Me.tbRiCurve.Location = New System.Drawing.Point(3, 161)
+ Me.tbRiCurve.Location = New System.Drawing.Point(4, 205)
+ Me.tbRiCurve.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbRiCurve.Name = "tbRiCurve"
- Me.tbRiCurve.Size = New System.Drawing.Size(434, 20)
+ Me.tbRiCurve.Size = New System.Drawing.Size(506, 23)
Me.tbRiCurve.TabIndex = 9
'
'lblTitle
'
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, CType(0,Byte))
- Me.lblTitle.Location = New System.Drawing.Point(115, 34)
+ 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.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblTitle.Name = "lblTitle"
Me.lblTitle.Size = New System.Drawing.Size(266, 29)
Me.lblTitle.TabIndex = 48
@@ -412,9 +449,10 @@ Partial Class BatteryForm
'
Me.PicBox.BackColor = System.Drawing.Color.LightGray
Me.PicBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
- Me.PicBox.Location = New System.Drawing.Point(508, 28)
+ Me.PicBox.Location = New System.Drawing.Point(593, 32)
+ Me.PicBox.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.PicBox.Name = "PicBox"
- Me.PicBox.Size = New System.Drawing.Size(382, 266)
+ Me.PicBox.Size = New System.Drawing.Size(445, 307)
Me.PicBox.TabIndex = 49
Me.PicBox.TabStop = false
'
@@ -423,34 +461,38 @@ Partial Class BatteryForm
Me.Panel1.Controls.Add(Me.lblMinSoc)
Me.Panel1.Controls.Add(Me.lblSoCMinUnit)
Me.Panel1.Controls.Add(Me.tbSoCMin)
- Me.Panel1.Location = New System.Drawing.Point(3, 36)
+ Me.Panel1.Location = New System.Drawing.Point(262, 3)
+ Me.Panel1.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.Panel1.Name = "Panel1"
- Me.Panel1.Size = New System.Drawing.Size(212, 30)
+ Me.Panel1.Size = New System.Drawing.Size(247, 30)
Me.Panel1.TabIndex = 1
'
'lblMinSoc
'
Me.lblMinSoc.AutoSize = true
- Me.lblMinSoc.Location = New System.Drawing.Point(3, 7)
+ Me.lblMinSoc.Location = New System.Drawing.Point(4, 6)
+ Me.lblMinSoc.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblMinSoc.Name = "lblMinSoc"
- Me.lblMinSoc.Size = New System.Drawing.Size(46, 13)
+ Me.lblMinSoc.Size = New System.Drawing.Size(52, 15)
Me.lblMinSoc.TabIndex = 0
Me.lblMinSoc.Text = "SoC min"
'
'lblSoCMinUnit
'
Me.lblSoCMinUnit.AutoSize = true
- Me.lblSoCMinUnit.Location = New System.Drawing.Point(153, 7)
+ Me.lblSoCMinUnit.Location = New System.Drawing.Point(178, 6)
+ Me.lblSoCMinUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblSoCMinUnit.Name = "lblSoCMinUnit"
- Me.lblSoCMinUnit.Size = New System.Drawing.Size(21, 13)
+ Me.lblSoCMinUnit.Size = New System.Drawing.Size(25, 15)
Me.lblSoCMinUnit.TabIndex = 24
Me.lblSoCMinUnit.Text = "[%]"
'
'tbSoCMin
'
- Me.tbSoCMin.Location = New System.Drawing.Point(90, 4)
+ Me.tbSoCMin.Location = New System.Drawing.Point(105, 3)
+ Me.tbSoCMin.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbSoCMin.Name = "tbSoCMin"
- Me.tbSoCMin.Size = New System.Drawing.Size(57, 20)
+ Me.tbSoCMin.Size = New System.Drawing.Size(66, 23)
Me.tbSoCMin.TabIndex = 0
'
'Panel2
@@ -458,48 +500,55 @@ Partial Class BatteryForm
Me.Panel2.Controls.Add(Me.lblSoCMax)
Me.Panel2.Controls.Add(Me.lblSoCMaxUnit)
Me.Panel2.Controls.Add(Me.tbSoCMax)
- Me.Panel2.Location = New System.Drawing.Point(225, 36)
+ Me.Panel2.Location = New System.Drawing.Point(262, 35)
+ Me.Panel2.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.Panel2.Name = "Panel2"
- Me.Panel2.Size = New System.Drawing.Size(212, 30)
+ Me.Panel2.Size = New System.Drawing.Size(247, 30)
Me.Panel2.TabIndex = 2
'
'lblSoCMax
'
Me.lblSoCMax.AutoSize = true
- Me.lblSoCMax.Location = New System.Drawing.Point(3, 7)
+ Me.lblSoCMax.Location = New System.Drawing.Point(3, 6)
+ Me.lblSoCMax.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblSoCMax.Name = "lblSoCMax"
- Me.lblSoCMax.Size = New System.Drawing.Size(49, 13)
+ Me.lblSoCMax.Size = New System.Drawing.Size(54, 15)
Me.lblSoCMax.TabIndex = 0
Me.lblSoCMax.Text = "SoC max"
'
'lblSoCMaxUnit
'
Me.lblSoCMaxUnit.AutoSize = true
- Me.lblSoCMaxUnit.Location = New System.Drawing.Point(153, 7)
+ Me.lblSoCMaxUnit.Location = New System.Drawing.Point(177, 6)
+ Me.lblSoCMaxUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblSoCMaxUnit.Name = "lblSoCMaxUnit"
- Me.lblSoCMaxUnit.Size = New System.Drawing.Size(21, 13)
+ Me.lblSoCMaxUnit.Size = New System.Drawing.Size(25, 15)
Me.lblSoCMaxUnit.TabIndex = 24
Me.lblSoCMaxUnit.Text = "[%]"
'
'tbSoCMax
'
- Me.tbSoCMax.Location = New System.Drawing.Point(90, 4)
+ Me.tbSoCMax.Location = New System.Drawing.Point(104, 3)
+ Me.tbSoCMax.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbSoCMax.Name = "tbSoCMax"
- Me.tbSoCMax.Size = New System.Drawing.Size(57, 20)
+ Me.tbSoCMax.Size = New System.Drawing.Size(66, 23)
Me.tbSoCMax.TabIndex = 0
'
'FlowLayoutPanel1
'
Me.FlowLayoutPanel1.Controls.Add(Me.pnBattery)
Me.FlowLayoutPanel1.Controls.Add(Me.pnSuperCap)
- Me.FlowLayoutPanel1.Location = New System.Drawing.Point(8, 136)
+ Me.FlowLayoutPanel1.Location = New System.Drawing.Point(9, 157)
Me.FlowLayoutPanel1.Margin = New System.Windows.Forms.Padding(2)
Me.FlowLayoutPanel1.Name = "FlowLayoutPanel1"
- Me.FlowLayoutPanel1.Size = New System.Drawing.Size(495, 200)
+ Me.FlowLayoutPanel1.Size = New System.Drawing.Size(578, 254)
Me.FlowLayoutPanel1.TabIndex = 2
'
'pnBattery
'
+ Me.pnBattery.Controls.Add(Me.Panel6)
+ Me.pnBattery.Controls.Add(Me.Panel5)
+ Me.pnBattery.Controls.Add(Me.pnTestingTempB)
Me.pnBattery.Controls.Add(Me.tbMaxCurrentMap)
Me.pnBattery.Controls.Add(Me.lblMaxCurrentMap)
Me.pnBattery.Controls.Add(Me.btnBrowseMaxCurrentMap)
@@ -518,55 +567,60 @@ Partial Class BatteryForm
Me.pnBattery.Location = New System.Drawing.Point(2, 2)
Me.pnBattery.Margin = New System.Windows.Forms.Padding(2)
Me.pnBattery.Name = "pnBattery"
- Me.pnBattery.Size = New System.Drawing.Size(489, 188)
+ Me.pnBattery.Size = New System.Drawing.Size(570, 237)
Me.pnBattery.TabIndex = 0
'
'tbMaxCurrentMap
'
- Me.tbMaxCurrentMap.Location = New System.Drawing.Point(4, 87)
+ Me.tbMaxCurrentMap.Location = New System.Drawing.Point(5, 119)
+ Me.tbMaxCurrentMap.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbMaxCurrentMap.Name = "tbMaxCurrentMap"
- Me.tbMaxCurrentMap.Size = New System.Drawing.Size(434, 20)
+ Me.tbMaxCurrentMap.Size = New System.Drawing.Size(506, 23)
Me.tbMaxCurrentMap.TabIndex = 3
'
'lblMaxCurrentMap
'
Me.lblMaxCurrentMap.AutoSize = true
- Me.lblMaxCurrentMap.Location = New System.Drawing.Point(4, 71)
+ Me.lblMaxCurrentMap.Location = New System.Drawing.Point(5, 101)
+ Me.lblMaxCurrentMap.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblMaxCurrentMap.Name = "lblMaxCurrentMap"
- Me.lblMaxCurrentMap.Size = New System.Drawing.Size(88, 13)
+ Me.lblMaxCurrentMap.Size = New System.Drawing.Size(100, 15)
Me.lblMaxCurrentMap.TabIndex = 47
Me.lblMaxCurrentMap.Text = "Max Current Map"
'
'btnBrowseMaxCurrentMap
'
Me.btnBrowseMaxCurrentMap.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnBrowseMaxCurrentMap.Location = New System.Drawing.Point(438, 85)
+ Me.btnBrowseMaxCurrentMap.Location = New System.Drawing.Point(511, 117)
+ Me.btnBrowseMaxCurrentMap.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btnBrowseMaxCurrentMap.Name = "btnBrowseMaxCurrentMap"
- Me.btnBrowseMaxCurrentMap.Size = New System.Drawing.Size(24, 24)
+ Me.btnBrowseMaxCurrentMap.Size = New System.Drawing.Size(28, 28)
Me.btnBrowseMaxCurrentMap.TabIndex = 4
Me.btnBrowseMaxCurrentMap.UseVisualStyleBackColor = true
'
'btnMaxCurrentMapOpen
'
Me.btnMaxCurrentMapOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btnMaxCurrentMapOpen.Location = New System.Drawing.Point(461, 85)
+ Me.btnMaxCurrentMapOpen.Location = New System.Drawing.Point(538, 117)
+ Me.btnMaxCurrentMapOpen.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btnMaxCurrentMapOpen.Name = "btnMaxCurrentMapOpen"
- Me.btnMaxCurrentMapOpen.Size = New System.Drawing.Size(24, 24)
+ Me.btnMaxCurrentMapOpen.Size = New System.Drawing.Size(28, 28)
Me.btnMaxCurrentMapOpen.TabIndex = 5
Me.btnMaxCurrentMapOpen.UseVisualStyleBackColor = true
'
'pnSuperCap
'
+ Me.pnSuperCap.Controls.Add(Me.pnTestingTempC)
Me.pnSuperCap.Controls.Add(Me.Panel4)
Me.pnSuperCap.Controls.Add(Me.Panel3)
Me.pnSuperCap.Controls.Add(Me.pnSuperCapMaxV)
Me.pnSuperCap.Controls.Add(Me.pnSuperCapMinV)
Me.pnSuperCap.Controls.Add(Me.pnSuperCapResistance)
Me.pnSuperCap.Controls.Add(Me.pnSuperCapCapacity)
- Me.pnSuperCap.Location = New System.Drawing.Point(2, 194)
+ Me.pnSuperCap.Location = New System.Drawing.Point(2, 243)
Me.pnSuperCap.Margin = New System.Windows.Forms.Padding(2)
Me.pnSuperCap.Name = "pnSuperCap"
- Me.pnSuperCap.Size = New System.Drawing.Size(489, 110)
+ Me.pnSuperCap.Size = New System.Drawing.Size(570, 203)
Me.pnSuperCap.TabIndex = 1
'
'Panel4
@@ -574,34 +628,38 @@ Partial Class BatteryForm
Me.Panel4.Controls.Add(Me.lblMaxCurrentDischarge)
Me.Panel4.Controls.Add(Me.lblMaxCurrentDischargeUnit)
Me.Panel4.Controls.Add(Me.tbSuperCapMaxCurrentDischarge)
- Me.Panel4.Location = New System.Drawing.Point(225, 76)
+ Me.Panel4.Location = New System.Drawing.Point(262, 88)
+ Me.Panel4.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.Panel4.Name = "Panel4"
- Me.Panel4.Size = New System.Drawing.Size(212, 30)
+ Me.Panel4.Size = New System.Drawing.Size(247, 35)
Me.Panel4.TabIndex = 5
'
'lblMaxCurrentDischarge
'
Me.lblMaxCurrentDischarge.AutoSize = true
- Me.lblMaxCurrentDischarge.Location = New System.Drawing.Point(3, 7)
+ Me.lblMaxCurrentDischarge.Location = New System.Drawing.Point(4, 8)
+ Me.lblMaxCurrentDischarge.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblMaxCurrentDischarge.Name = "lblMaxCurrentDischarge"
- Me.lblMaxCurrentDischarge.Size = New System.Drawing.Size(100, 13)
+ Me.lblMaxCurrentDischarge.Size = New System.Drawing.Size(112, 15)
Me.lblMaxCurrentDischarge.TabIndex = 0
Me.lblMaxCurrentDischarge.Text = "Max Current Dischg"
'
'lblMaxCurrentDischargeUnit
'
Me.lblMaxCurrentDischargeUnit.AutoSize = true
- Me.lblMaxCurrentDischargeUnit.Location = New System.Drawing.Point(171, 8)
+ Me.lblMaxCurrentDischargeUnit.Location = New System.Drawing.Point(200, 9)
+ Me.lblMaxCurrentDischargeUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblMaxCurrentDischargeUnit.Name = "lblMaxCurrentDischargeUnit"
- Me.lblMaxCurrentDischargeUnit.Size = New System.Drawing.Size(20, 13)
+ Me.lblMaxCurrentDischargeUnit.Size = New System.Drawing.Size(23, 15)
Me.lblMaxCurrentDischargeUnit.TabIndex = 24
Me.lblMaxCurrentDischargeUnit.Text = "[A]"
'
'tbSuperCapMaxCurrentDischarge
'
- Me.tbSuperCapMaxCurrentDischarge.Location = New System.Drawing.Point(108, 5)
+ Me.tbSuperCapMaxCurrentDischarge.Location = New System.Drawing.Point(126, 6)
+ Me.tbSuperCapMaxCurrentDischarge.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbSuperCapMaxCurrentDischarge.Name = "tbSuperCapMaxCurrentDischarge"
- Me.tbSuperCapMaxCurrentDischarge.Size = New System.Drawing.Size(57, 20)
+ Me.tbSuperCapMaxCurrentDischarge.Size = New System.Drawing.Size(66, 23)
Me.tbSuperCapMaxCurrentDischarge.TabIndex = 0
'
'Panel3
@@ -609,34 +667,38 @@ Partial Class BatteryForm
Me.Panel3.Controls.Add(Me.lblMaxCurrentChg)
Me.Panel3.Controls.Add(Me.lblMaxCurrentChargeUnit)
Me.Panel3.Controls.Add(Me.tbSuperCapMaxCurrentCharge)
- Me.Panel3.Location = New System.Drawing.Point(3, 76)
+ Me.Panel3.Location = New System.Drawing.Point(4, 88)
+ Me.Panel3.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.Panel3.Name = "Panel3"
- Me.Panel3.Size = New System.Drawing.Size(212, 30)
+ Me.Panel3.Size = New System.Drawing.Size(247, 35)
Me.Panel3.TabIndex = 2
'
'lblMaxCurrentChg
'
Me.lblMaxCurrentChg.AutoSize = true
- Me.lblMaxCurrentChg.Location = New System.Drawing.Point(3, 7)
+ Me.lblMaxCurrentChg.Location = New System.Drawing.Point(4, 8)
+ Me.lblMaxCurrentChg.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblMaxCurrentChg.Name = "lblMaxCurrentChg"
- Me.lblMaxCurrentChg.Size = New System.Drawing.Size(86, 13)
+ Me.lblMaxCurrentChg.Size = New System.Drawing.Size(98, 15)
Me.lblMaxCurrentChg.TabIndex = 0
Me.lblMaxCurrentChg.Text = "Max Current Chg"
'
'lblMaxCurrentChargeUnit
'
Me.lblMaxCurrentChargeUnit.AutoSize = true
- Me.lblMaxCurrentChargeUnit.Location = New System.Drawing.Point(153, 7)
+ Me.lblMaxCurrentChargeUnit.Location = New System.Drawing.Point(178, 8)
+ Me.lblMaxCurrentChargeUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblMaxCurrentChargeUnit.Name = "lblMaxCurrentChargeUnit"
- Me.lblMaxCurrentChargeUnit.Size = New System.Drawing.Size(20, 13)
+ Me.lblMaxCurrentChargeUnit.Size = New System.Drawing.Size(23, 15)
Me.lblMaxCurrentChargeUnit.TabIndex = 24
Me.lblMaxCurrentChargeUnit.Text = "[A]"
'
'tbSuperCapMaxCurrentCharge
'
- Me.tbSuperCapMaxCurrentCharge.Location = New System.Drawing.Point(90, 4)
+ Me.tbSuperCapMaxCurrentCharge.Location = New System.Drawing.Point(105, 5)
+ Me.tbSuperCapMaxCurrentCharge.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbSuperCapMaxCurrentCharge.Name = "tbSuperCapMaxCurrentCharge"
- Me.tbSuperCapMaxCurrentCharge.Size = New System.Drawing.Size(57, 20)
+ Me.tbSuperCapMaxCurrentCharge.Size = New System.Drawing.Size(66, 23)
Me.tbSuperCapMaxCurrentCharge.TabIndex = 0
'
'pnSuperCapMaxV
@@ -644,34 +706,38 @@ Partial Class BatteryForm
Me.pnSuperCapMaxV.Controls.Add(Me.lblSuperCapMaxV)
Me.pnSuperCapMaxV.Controls.Add(Me.lblSuperCapMaxVUnit)
Me.pnSuperCapMaxV.Controls.Add(Me.tbSuperCapMaxV)
- Me.pnSuperCapMaxV.Location = New System.Drawing.Point(225, 40)
+ Me.pnSuperCapMaxV.Location = New System.Drawing.Point(262, 46)
+ Me.pnSuperCapMaxV.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.pnSuperCapMaxV.Name = "pnSuperCapMaxV"
- Me.pnSuperCapMaxV.Size = New System.Drawing.Size(212, 30)
+ Me.pnSuperCapMaxV.Size = New System.Drawing.Size(247, 35)
Me.pnSuperCapMaxV.TabIndex = 4
'
'lblSuperCapMaxV
'
Me.lblSuperCapMaxV.AutoSize = true
- Me.lblSuperCapMaxV.Location = New System.Drawing.Point(3, 7)
+ Me.lblSuperCapMaxV.Location = New System.Drawing.Point(4, 8)
+ Me.lblSuperCapMaxV.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblSuperCapMaxV.Name = "lblSuperCapMaxV"
- Me.lblSuperCapMaxV.Size = New System.Drawing.Size(66, 13)
+ Me.lblSuperCapMaxV.Size = New System.Drawing.Size(72, 15)
Me.lblSuperCapMaxV.TabIndex = 0
Me.lblSuperCapMaxV.Text = "Max Voltage"
'
'lblSuperCapMaxVUnit
'
Me.lblSuperCapMaxVUnit.AutoSize = true
- Me.lblSuperCapMaxVUnit.Location = New System.Drawing.Point(171, 8)
+ Me.lblSuperCapMaxVUnit.Location = New System.Drawing.Point(200, 9)
+ Me.lblSuperCapMaxVUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblSuperCapMaxVUnit.Name = "lblSuperCapMaxVUnit"
- Me.lblSuperCapMaxVUnit.Size = New System.Drawing.Size(20, 13)
+ Me.lblSuperCapMaxVUnit.Size = New System.Drawing.Size(22, 15)
Me.lblSuperCapMaxVUnit.TabIndex = 24
Me.lblSuperCapMaxVUnit.Text = "[V]"
'
'tbSuperCapMaxV
'
- Me.tbSuperCapMaxV.Location = New System.Drawing.Point(108, 5)
+ Me.tbSuperCapMaxV.Location = New System.Drawing.Point(126, 6)
+ Me.tbSuperCapMaxV.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbSuperCapMaxV.Name = "tbSuperCapMaxV"
- Me.tbSuperCapMaxV.Size = New System.Drawing.Size(57, 20)
+ Me.tbSuperCapMaxV.Size = New System.Drawing.Size(66, 23)
Me.tbSuperCapMaxV.TabIndex = 0
'
'pnSuperCapMinV
@@ -679,34 +745,38 @@ Partial Class BatteryForm
Me.pnSuperCapMinV.Controls.Add(Me.lblSuperCapMinV)
Me.pnSuperCapMinV.Controls.Add(Me.lblSuperCapMinVUnit)
Me.pnSuperCapMinV.Controls.Add(Me.tbSuperCapMinV)
- Me.pnSuperCapMinV.Location = New System.Drawing.Point(3, 40)
+ Me.pnSuperCapMinV.Location = New System.Drawing.Point(4, 46)
+ Me.pnSuperCapMinV.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.pnSuperCapMinV.Name = "pnSuperCapMinV"
- Me.pnSuperCapMinV.Size = New System.Drawing.Size(212, 30)
+ Me.pnSuperCapMinV.Size = New System.Drawing.Size(247, 35)
Me.pnSuperCapMinV.TabIndex = 1
'
'lblSuperCapMinV
'
Me.lblSuperCapMinV.AutoSize = true
- Me.lblSuperCapMinV.Location = New System.Drawing.Point(3, 7)
+ Me.lblSuperCapMinV.Location = New System.Drawing.Point(4, 8)
+ Me.lblSuperCapMinV.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblSuperCapMinV.Name = "lblSuperCapMinV"
- Me.lblSuperCapMinV.Size = New System.Drawing.Size(63, 13)
+ Me.lblSuperCapMinV.Size = New System.Drawing.Size(70, 15)
Me.lblSuperCapMinV.TabIndex = 0
Me.lblSuperCapMinV.Text = "Min Voltage"
'
'lblSuperCapMinVUnit
'
Me.lblSuperCapMinVUnit.AutoSize = true
- Me.lblSuperCapMinVUnit.Location = New System.Drawing.Point(153, 7)
+ Me.lblSuperCapMinVUnit.Location = New System.Drawing.Point(178, 8)
+ Me.lblSuperCapMinVUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblSuperCapMinVUnit.Name = "lblSuperCapMinVUnit"
- Me.lblSuperCapMinVUnit.Size = New System.Drawing.Size(20, 13)
+ Me.lblSuperCapMinVUnit.Size = New System.Drawing.Size(22, 15)
Me.lblSuperCapMinVUnit.TabIndex = 24
Me.lblSuperCapMinVUnit.Text = "[V]"
'
'tbSuperCapMinV
'
- Me.tbSuperCapMinV.Location = New System.Drawing.Point(90, 4)
+ Me.tbSuperCapMinV.Location = New System.Drawing.Point(105, 5)
+ Me.tbSuperCapMinV.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbSuperCapMinV.Name = "tbSuperCapMinV"
- Me.tbSuperCapMinV.Size = New System.Drawing.Size(57, 20)
+ Me.tbSuperCapMinV.Size = New System.Drawing.Size(66, 23)
Me.tbSuperCapMinV.TabIndex = 0
'
'pnSuperCapResistance
@@ -714,34 +784,38 @@ Partial Class BatteryForm
Me.pnSuperCapResistance.Controls.Add(Me.lblSuperCapRi)
Me.pnSuperCapResistance.Controls.Add(Me.lblSuperCapRiUnit)
Me.pnSuperCapResistance.Controls.Add(Me.tbSuperCapRi)
- Me.pnSuperCapResistance.Location = New System.Drawing.Point(225, 3)
+ Me.pnSuperCapResistance.Location = New System.Drawing.Point(262, 3)
+ Me.pnSuperCapResistance.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.pnSuperCapResistance.Name = "pnSuperCapResistance"
- Me.pnSuperCapResistance.Size = New System.Drawing.Size(212, 30)
+ Me.pnSuperCapResistance.Size = New System.Drawing.Size(247, 35)
Me.pnSuperCapResistance.TabIndex = 3
'
'lblSuperCapRi
'
Me.lblSuperCapRi.AutoSize = true
- Me.lblSuperCapRi.Location = New System.Drawing.Point(3, 7)
+ Me.lblSuperCapRi.Location = New System.Drawing.Point(4, 8)
+ Me.lblSuperCapRi.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblSuperCapRi.Name = "lblSuperCapRi"
- Me.lblSuperCapRi.Size = New System.Drawing.Size(98, 13)
+ Me.lblSuperCapRi.Size = New System.Drawing.Size(105, 15)
Me.lblSuperCapRi.TabIndex = 0
Me.lblSuperCapRi.Text = "Internal Resistance"
'
'lblSuperCapRiUnit
'
Me.lblSuperCapRiUnit.AutoSize = true
- Me.lblSuperCapRiUnit.Location = New System.Drawing.Point(171, 8)
+ Me.lblSuperCapRiUnit.Location = New System.Drawing.Point(200, 9)
+ Me.lblSuperCapRiUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblSuperCapRiUnit.Name = "lblSuperCapRiUnit"
- Me.lblSuperCapRiUnit.Size = New System.Drawing.Size(22, 13)
+ Me.lblSuperCapRiUnit.Size = New System.Drawing.Size(24, 15)
Me.lblSuperCapRiUnit.TabIndex = 24
Me.lblSuperCapRiUnit.Text = "[Ω]"
'
'tbSuperCapRi
'
- Me.tbSuperCapRi.Location = New System.Drawing.Point(108, 5)
+ Me.tbSuperCapRi.Location = New System.Drawing.Point(126, 6)
+ Me.tbSuperCapRi.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbSuperCapRi.Name = "tbSuperCapRi"
- Me.tbSuperCapRi.Size = New System.Drawing.Size(57, 20)
+ Me.tbSuperCapRi.Size = New System.Drawing.Size(66, 23)
Me.tbSuperCapRi.TabIndex = 0
'
'pnSuperCapCapacity
@@ -749,61 +823,202 @@ Partial Class BatteryForm
Me.pnSuperCapCapacity.Controls.Add(Me.lblSuperCapCapacity)
Me.pnSuperCapCapacity.Controls.Add(Me.lblSuperCapCapacityUnit)
Me.pnSuperCapCapacity.Controls.Add(Me.tbSuperCapCapacity)
- Me.pnSuperCapCapacity.Location = New System.Drawing.Point(3, 3)
+ Me.pnSuperCapCapacity.Location = New System.Drawing.Point(4, 3)
+ Me.pnSuperCapCapacity.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.pnSuperCapCapacity.Name = "pnSuperCapCapacity"
- Me.pnSuperCapCapacity.Size = New System.Drawing.Size(212, 30)
+ Me.pnSuperCapCapacity.Size = New System.Drawing.Size(247, 35)
Me.pnSuperCapCapacity.TabIndex = 0
'
'lblSuperCapCapacity
'
Me.lblSuperCapCapacity.AutoSize = true
- Me.lblSuperCapCapacity.Location = New System.Drawing.Point(3, 7)
+ Me.lblSuperCapCapacity.Location = New System.Drawing.Point(4, 8)
+ Me.lblSuperCapCapacity.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblSuperCapCapacity.Name = "lblSuperCapCapacity"
- Me.lblSuperCapCapacity.Size = New System.Drawing.Size(67, 13)
+ Me.lblSuperCapCapacity.Size = New System.Drawing.Size(72, 15)
Me.lblSuperCapCapacity.TabIndex = 0
Me.lblSuperCapCapacity.Text = "Capacitance"
'
'lblSuperCapCapacityUnit
'
Me.lblSuperCapCapacityUnit.AutoSize = true
- Me.lblSuperCapCapacityUnit.Location = New System.Drawing.Point(153, 7)
+ Me.lblSuperCapCapacityUnit.Location = New System.Drawing.Point(178, 8)
+ Me.lblSuperCapCapacityUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblSuperCapCapacityUnit.Name = "lblSuperCapCapacityUnit"
- Me.lblSuperCapCapacityUnit.Size = New System.Drawing.Size(19, 13)
+ Me.lblSuperCapCapacityUnit.Size = New System.Drawing.Size(21, 15)
Me.lblSuperCapCapacityUnit.TabIndex = 24
Me.lblSuperCapCapacityUnit.Text = "[F]"
'
'tbSuperCapCapacity
'
- Me.tbSuperCapCapacity.Location = New System.Drawing.Point(90, 4)
+ Me.tbSuperCapCapacity.Location = New System.Drawing.Point(105, 5)
+ Me.tbSuperCapCapacity.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbSuperCapCapacity.Name = "tbSuperCapCapacity"
- Me.tbSuperCapCapacity.Size = New System.Drawing.Size(57, 20)
+ Me.tbSuperCapCapacity.Size = New System.Drawing.Size(66, 23)
Me.tbSuperCapCapacity.TabIndex = 0
'
'cbRESSType
'
Me.cbRESSType.FormattingEnabled = true
- Me.cbRESSType.Location = New System.Drawing.Point(111, 107)
+ Me.cbRESSType.Location = New System.Drawing.Point(130, 123)
Me.cbRESSType.Margin = New System.Windows.Forms.Padding(2)
Me.cbRESSType.Name = "cbRESSType"
- Me.cbRESSType.Size = New System.Drawing.Size(142, 21)
+ Me.cbRESSType.Size = New System.Drawing.Size(165, 23)
Me.cbRESSType.TabIndex = 1
'
'lblRessType
'
Me.lblRessType.AutoSize = true
- Me.lblRessType.Location = New System.Drawing.Point(16, 109)
+ Me.lblRessType.Location = New System.Drawing.Point(19, 126)
+ Me.lblRessType.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblRessType.Name = "lblRessType"
- Me.lblRessType.Size = New System.Drawing.Size(70, 13)
+ Me.lblRessType.Size = New System.Drawing.Size(65, 15)
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
- Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(7!, 15!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.CancelButton = Me.ButCancel
- Me.ClientSize = New System.Drawing.Size(898, 369)
+ Me.ClientSize = New System.Drawing.Size(1048, 430)
Me.Controls.Add(Me.lblRessType)
Me.Controls.Add(Me.cbRESSType)
Me.Controls.Add(Me.FlowLayoutPanel1)
@@ -818,6 +1033,7 @@ Partial Class BatteryForm
Me.Controls.Add(Me.tbMakeModel)
Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
Me.Icon = CType(resources.GetObject("$this.Icon"),System.Drawing.Icon)
+ Me.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.MaximizeBox = false
Me.Name = "BatteryForm"
Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide
@@ -852,6 +1068,14 @@ 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
@@ -930,4 +1154,18 @@ End Sub
Friend WithEvents lblMaxCurrentChg As Label
Friend WithEvents lblMaxCurrentChargeUnit As Label
Friend WithEvents tbSuperCapMaxCurrentCharge As TextBox
+ Friend WithEvents Panel6 As Panel
+ Friend WithEvents lblJunctionBoxIncl As Label
+ Friend WithEvents cbJunctionBoxIncl As CheckBox
+ Friend WithEvents Panel5 As Panel
+ Friend WithEvents lblConnectorsIncl As Label
+ Friend WithEvents cbConnectorsIncluded As CheckBox
+ Friend WithEvents pnTestingTempB As Panel
+ Friend WithEvents lblTestingTempB As Label
+ Friend WithEvents lblTestingTempUnitB As Label
+ Friend WithEvents tbTestingTempB As TextBox
+ Friend WithEvents pnTestingTempC As Panel
+ Friend WithEvents lblTestingTempC As Label
+ Friend WithEvents lblTestingTempUnitC As Label
+ Friend WithEvents tbTestingTempC As TextBox
End Class
diff --git a/VECTO/GUI/BatteryForm.resx b/VECTO/GUI/BatteryForm.resx
index 81623a24e36cbaf6c70822eb47f982f654db0f27..256f87a53c1585f15c485cb58958cd0eb825b2ad 100644
--- a/VECTO/GUI/BatteryForm.resx
+++ b/VECTO/GUI/BatteryForm.resx
@@ -1,64 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
+<root>
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
diff --git a/VECTO/GUI/BatteryForm.vb b/VECTO/GUI/BatteryForm.vb
index d9165edf3407c2791594bab1b83dea2cba156c25..d7e065ff666bb5557e393a6e1fc6f109da258df9 100644
--- a/VECTO/GUI/BatteryForm.vb
+++ b/VECTO/GUI/BatteryForm.vb
@@ -195,6 +195,9 @@ Public Class BatteryForm
tbMaxCurrentMap.Text = GetRelativePath(battery.MaxCurrentMap.Source, basePath)
tbSoCCurve.Text = GetRelativePath(battery.VoltageCurve.Source, basePath)
tbRiCurve.Text = GetRelativePath(battery.InternalResistanceCurve.Source, basePath)
+ tbTestingTempB.Text = battery.TestingTemperature.AsDegCelsius.ToGUIFormat()
+ cbJunctionBoxIncl.Checked = battery.JunctionboxIncluded
+ cbConnectorsIncluded.Checked = battery.ConnectorsSubsystemsIncluded
tbSuperCapCapacity.Text = String.Empty
tbSuperCapMaxV.Text = string.Empty
@@ -219,6 +222,7 @@ Public Class BatteryForm
tbSuperCapMaxV.Text = superCap.MaxVoltage.ToGUIFormat()
tbSuperCapMinV.Text= superCap.MinVoltage.ToGUIFormat()
tbSuperCapRi.Text= superCap.InternalResistance.ToGUIFormat()
+ tbTestingTempC.Text = superCap.TestingTemperature.AsDegCelsius.ToGUIFormat()
tbSuperCapMaxCurrentCharge.Text = superCap.MaxCurrentCharge.ToGuiFormat()
tbSuperCapMaxCurrentDischarge.Text = superCap.MaxCurrentDischarge.ToGuiFormat()
@@ -302,6 +306,7 @@ Public Class BatteryForm
superCap.MaxChgCurrent = tbSuperCapMaxCurrentCharge.Text.ToDouble(0)
superCap.MaxDischgCurrent = tbSuperCapMaxCurrentDischarge.Text.ToDouble(0)
+ superCap.TestingTemperature = tbTestingTempC.Text.ToDouble(20).DegCelsiusToKelvin()
Return superCap
End Function
@@ -321,6 +326,9 @@ Public Class BatteryForm
battery.BatMaxSoc = tbSoCMax.Text.ToDouble(0)
battery.PathMaxCurrentCurve = tbMaxCurrentMap.Text
+ battery.JunctionboxIncluded = cbJunctionBoxIncl.Checked
+ battery.ConnectorsSubsystemsIncluded = cbConnectorsIncluded.Checked
+ battery.TestingTemperature = tbTestingTempB.Text.ToDouble(20).DegCelsiusToKelvin()
Return battery
End Function
Private Sub tbCapacity_Leave(sender As Object, e As System.EventArgs) Handles tbCapacity.Leave
diff --git a/VECTO/GUI/ElectricMotorForm.Designer.vb b/VECTO/GUI/ElectricMotorForm.Designer.vb
index ab1c0be2263c09aa1c75546839429293289df1f5..419a9cfee273e01ccbd39a9187583504f268dc11 100644
--- a/VECTO/GUI/ElectricMotorForm.Designer.vb
+++ b/VECTO/GUI/ElectricMotorForm.Designer.vb
@@ -78,7 +78,7 @@ Partial Class ElectricMotorForm
Me.lblOvlTime = New System.Windows.Forms.Label()
Me.lblOvltimeUnit = New System.Windows.Forms.Label()
Me.tbOvlTimeLo = New System.Windows.Forms.TextBox()
- Me.Panel3 = New System.Windows.Forms.Panel()
+ Me.pnThermalOverloadRecovery = New System.Windows.Forms.Panel()
Me.lblOvlRecovery = New System.Windows.Forms.Label()
Me.lblOvlRecoveryFactorUnit = New System.Windows.Forms.Label()
Me.tbOverloadRecoveryFactor = New System.Windows.Forms.TextBox()
@@ -135,6 +135,14 @@ Partial Class ElectricMotorForm
Me.Label9 = New System.Windows.Forms.Label()
Me.Label10 = New System.Windows.Forms.Label()
Me.tbContTqHi = New System.Windows.Forms.TextBox()
+ Me.pnDragCurve = New System.Windows.Forms.Panel()
+ Me.pnRatedPower = New System.Windows.Forms.Panel()
+ Me.lblRatedPower = New System.Windows.Forms.Label()
+ 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.ToolStrip1.SuspendLayout
Me.StatusStrip1.SuspendLayout
CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).BeginInit
@@ -143,7 +151,7 @@ Partial Class ElectricMotorForm
CType(Me.PicBox,System.ComponentModel.ISupportInitialize).BeginInit
Me.Panel1.SuspendLayout
Me.Panel2.SuspendLayout
- Me.Panel3.SuspendLayout
+ Me.pnThermalOverloadRecovery.SuspendLayout
Me.Panel4.SuspendLayout
Me.pnOverloadTq.SuspendLayout
Me.Panel6.SuspendLayout
@@ -155,30 +163,36 @@ Partial Class ElectricMotorForm
Me.Panel8.SuspendLayout
Me.Panel9.SuspendLayout
Me.Panel10.SuspendLayout
+ Me.pnDragCurve.SuspendLayout
+ Me.pnRatedPower.SuspendLayout
+ Me.pnElectricMachineType.SuspendLayout
Me.SuspendLayout
'
'tbInertia
'
- Me.tbInertia.Location = New System.Drawing.Point(127, 5)
+ Me.tbInertia.Location = New System.Drawing.Point(192, 6)
+ Me.tbInertia.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbInertia.Name = "tbInertia"
- Me.tbInertia.Size = New System.Drawing.Size(49, 20)
+ Me.tbInertia.Size = New System.Drawing.Size(56, 23)
Me.tbInertia.TabIndex = 3
'
'lblinertiaUnit
'
Me.lblinertiaUnit.AutoSize = true
- Me.lblinertiaUnit.Location = New System.Drawing.Point(182, 8)
+ Me.lblinertiaUnit.Location = New System.Drawing.Point(256, 9)
+ Me.lblinertiaUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblinertiaUnit.Name = "lblinertiaUnit"
- Me.lblinertiaUnit.Size = New System.Drawing.Size(36, 13)
+ Me.lblinertiaUnit.Size = New System.Drawing.Size(43, 15)
Me.lblinertiaUnit.TabIndex = 24
Me.lblinertiaUnit.Text = "[kgm²]"
'
'lblInertia
'
Me.lblInertia.AutoSize = true
- Me.lblInertia.Location = New System.Drawing.Point(3, 7)
+ Me.lblInertia.Location = New System.Drawing.Point(4, 8)
+ Me.lblInertia.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblInertia.Name = "lblInertia"
- Me.lblInertia.Size = New System.Drawing.Size(36, 13)
+ Me.lblInertia.Size = New System.Drawing.Size(40, 15)
Me.lblInertia.TabIndex = 0
Me.lblInertia.Text = "Inertia"
'
@@ -186,9 +200,10 @@ Partial Class ElectricMotorForm
'
Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.ButCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
- Me.ButCancel.Location = New System.Drawing.Point(854, 421)
+ Me.ButCancel.Location = New System.Drawing.Point(996, 537)
+ Me.ButCancel.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.ButCancel.Name = "ButCancel"
- Me.ButCancel.Size = New System.Drawing.Size(75, 23)
+ Me.ButCancel.Size = New System.Drawing.Size(88, 27)
Me.ButCancel.TabIndex = 13
Me.ButCancel.Text = "Cancel"
Me.ButCancel.UseVisualStyleBackColor = true
@@ -196,9 +211,10 @@ Partial Class ElectricMotorForm
'ButOK
'
Me.ButOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.ButOK.Location = New System.Drawing.Point(773, 421)
+ Me.ButOK.Location = New System.Drawing.Point(902, 537)
+ Me.ButOK.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.ButOK.Name = "ButOK"
- Me.ButOK.Size = New System.Drawing.Size(75, 23)
+ Me.ButOK.Size = New System.Drawing.Size(88, 27)
Me.ButOK.TabIndex = 12
Me.ButOK.Text = "Save"
Me.ButOK.UseVisualStyleBackColor = true
@@ -211,7 +227,7 @@ Partial Class ElectricMotorForm
Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
Me.ToolStrip1.Name = "ToolStrip1"
Me.ToolStrip1.Padding = New System.Windows.Forms.Padding(0, 0, 2, 0)
- Me.ToolStrip1.Size = New System.Drawing.Size(941, 31)
+ Me.ToolStrip1.Size = New System.Drawing.Size(1098, 31)
Me.ToolStrip1.TabIndex = 30
Me.ToolStrip1.Text = "ToolStrip1"
'
@@ -288,9 +304,10 @@ Partial Class ElectricMotorForm
'
Me.StatusStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LbStatus})
- Me.StatusStrip1.Location = New System.Drawing.Point(0, 446)
+ Me.StatusStrip1.Location = New System.Drawing.Point(0, 569)
Me.StatusStrip1.Name = "StatusStrip1"
- Me.StatusStrip1.Size = New System.Drawing.Size(941, 22)
+ Me.StatusStrip1.Padding = New System.Windows.Forms.Padding(1, 0, 16, 0)
+ Me.StatusStrip1.Size = New System.Drawing.Size(1098, 22)
Me.StatusStrip1.SizingGrip = false
Me.StatusStrip1.TabIndex = 37
Me.StatusStrip1.Text = "StatusStrip1"
@@ -303,17 +320,19 @@ Partial Class ElectricMotorForm
'
'tbMakeModel
'
- Me.tbMakeModel.Location = New System.Drawing.Point(109, 82)
+ Me.tbMakeModel.Location = New System.Drawing.Point(127, 95)
+ Me.tbMakeModel.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbMakeModel.Name = "tbMakeModel"
- Me.tbMakeModel.Size = New System.Drawing.Size(370, 20)
+ Me.tbMakeModel.Size = New System.Drawing.Size(431, 23)
Me.tbMakeModel.TabIndex = 0
'
'lblMakeModel
'
Me.lblMakeModel.AutoSize = true
- Me.lblMakeModel.Location = New System.Drawing.Point(16, 85)
+ Me.lblMakeModel.Location = New System.Drawing.Point(19, 98)
+ Me.lblMakeModel.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblMakeModel.Name = "lblMakeModel"
- Me.lblMakeModel.Size = New System.Drawing.Size(87, 13)
+ Me.lblMakeModel.Size = New System.Drawing.Size(96, 15)
Me.lblMakeModel.TabIndex = 11
Me.lblMakeModel.Text = "Make and Model"
'
@@ -321,9 +340,10 @@ Partial Class ElectricMotorForm
'
Me.PictureBox1.BackColor = System.Drawing.Color.White
Me.PictureBox1.Image = Global.TUGraz.VECTO.My.Resources.Resources.VECTO_ENG
- Me.PictureBox1.Location = New System.Drawing.Point(0, 28)
+ Me.PictureBox1.Location = New System.Drawing.Point(0, 32)
+ Me.PictureBox1.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.PictureBox1.Name = "PictureBox1"
- Me.PictureBox1.Size = New System.Drawing.Size(502, 40)
+ Me.PictureBox1.Size = New System.Drawing.Size(586, 46)
Me.PictureBox1.TabIndex = 39
Me.PictureBox1.TabStop = false
'
@@ -351,17 +371,19 @@ Partial Class ElectricMotorForm
Me.pnInertia.Controls.Add(Me.lblInertia)
Me.pnInertia.Controls.Add(Me.lblinertiaUnit)
Me.pnInertia.Controls.Add(Me.tbInertia)
- Me.pnInertia.Location = New System.Drawing.Point(12, 108)
+ Me.pnInertia.Location = New System.Drawing.Point(287, 124)
+ Me.pnInertia.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.pnInertia.Name = "pnInertia"
- Me.pnInertia.Size = New System.Drawing.Size(221, 30)
+ Me.pnInertia.Size = New System.Drawing.Size(304, 35)
Me.pnInertia.TabIndex = 3
'
'btnEmMapOpenHi
'
Me.btnEmMapOpenHi.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btnEmMapOpenHi.Location = New System.Drawing.Point(441, 87)
+ Me.btnEmMapOpenHi.Location = New System.Drawing.Point(514, 100)
+ Me.btnEmMapOpenHi.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btnEmMapOpenHi.Name = "btnEmMapOpenHi"
- Me.btnEmMapOpenHi.Size = New System.Drawing.Size(24, 24)
+ Me.btnEmMapOpenHi.Size = New System.Drawing.Size(28, 28)
Me.btnEmMapOpenHi.TabIndex = 42
Me.btnEmMapOpenHi.TabStop = false
Me.btnEmMapOpenHi.UseVisualStyleBackColor = true
@@ -369,9 +391,10 @@ Partial Class ElectricMotorForm
'btnBrowseEmMapHi
'
Me.btnBrowseEmMapHi.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnBrowseEmMapHi.Location = New System.Drawing.Point(419, 87)
+ Me.btnBrowseEmMapHi.Location = New System.Drawing.Point(489, 100)
+ Me.btnBrowseEmMapHi.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btnBrowseEmMapHi.Name = "btnBrowseEmMapHi"
- Me.btnBrowseEmMapHi.Size = New System.Drawing.Size(24, 24)
+ Me.btnBrowseEmMapHi.Size = New System.Drawing.Size(28, 28)
Me.btnBrowseEmMapHi.TabIndex = 41
Me.btnBrowseEmMapHi.TabStop = false
Me.btnBrowseEmMapHi.UseVisualStyleBackColor = true
@@ -379,61 +402,68 @@ Partial Class ElectricMotorForm
'lblPowerMapHi
'
Me.lblPowerMapHi.AutoSize = true
- Me.lblPowerMapHi.Location = New System.Drawing.Point(5, 74)
+ Me.lblPowerMapHi.Location = New System.Drawing.Point(6, 85)
+ Me.lblPowerMapHi.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblPowerMapHi.Name = "lblPowerMapHi"
- Me.lblPowerMapHi.Size = New System.Drawing.Size(163, 13)
+ Me.lblPowerMapHi.Size = New System.Drawing.Size(184, 15)
Me.lblPowerMapHi.TabIndex = 43
Me.lblPowerMapHi.Text = "Electric Power Consumption Map"
'
'tbMapHi
'
- Me.tbMapHi.Location = New System.Drawing.Point(5, 90)
+ Me.tbMapHi.Location = New System.Drawing.Point(6, 104)
+ Me.tbMapHi.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbMapHi.Name = "tbMapHi"
- Me.tbMapHi.Size = New System.Drawing.Size(406, 20)
+ Me.tbMapHi.Size = New System.Drawing.Size(473, 23)
Me.tbMapHi.TabIndex = 40
'
'btnMaxTorqueCurveOpenHi
'
Me.btnMaxTorqueCurveOpenHi.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btnMaxTorqueCurveOpenHi.Location = New System.Drawing.Point(441, 48)
+ Me.btnMaxTorqueCurveOpenHi.Location = New System.Drawing.Point(514, 55)
+ Me.btnMaxTorqueCurveOpenHi.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btnMaxTorqueCurveOpenHi.Name = "btnMaxTorqueCurveOpenHi"
- Me.btnMaxTorqueCurveOpenHi.Size = New System.Drawing.Size(24, 24)
+ Me.btnMaxTorqueCurveOpenHi.Size = New System.Drawing.Size(28, 28)
Me.btnMaxTorqueCurveOpenHi.TabIndex = 46
- Me.btnMaxTorqueCurveOpenHi.TabStop = False
- Me.btnMaxTorqueCurveOpenHi.UseVisualStyleBackColor = True
+ Me.btnMaxTorqueCurveOpenHi.TabStop = false
+ Me.btnMaxTorqueCurveOpenHi.UseVisualStyleBackColor = true
'
'btnBrowseMaxTorqueHi
'
Me.btnBrowseMaxTorqueHi.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnBrowseMaxTorqueHi.Location = New System.Drawing.Point(419, 48)
+ Me.btnBrowseMaxTorqueHi.Location = New System.Drawing.Point(489, 55)
+ Me.btnBrowseMaxTorqueHi.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btnBrowseMaxTorqueHi.Name = "btnBrowseMaxTorqueHi"
- Me.btnBrowseMaxTorqueHi.Size = New System.Drawing.Size(24, 24)
+ Me.btnBrowseMaxTorqueHi.Size = New System.Drawing.Size(28, 28)
Me.btnBrowseMaxTorqueHi.TabIndex = 45
- Me.btnBrowseMaxTorqueHi.TabStop = False
- Me.btnBrowseMaxTorqueHi.UseVisualStyleBackColor = True
+ Me.btnBrowseMaxTorqueHi.TabStop = false
+ Me.btnBrowseMaxTorqueHi.UseVisualStyleBackColor = true
'
'lblMaxTorqueHi
'
- Me.lblMaxTorqueHi.AutoSize = True
- Me.lblMaxTorqueHi.Location = New System.Drawing.Point(5, 34)
+ Me.lblMaxTorqueHi.AutoSize = true
+ Me.lblMaxTorqueHi.Location = New System.Drawing.Point(6, 39)
+ Me.lblMaxTorqueHi.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblMaxTorqueHi.Name = "lblMaxTorqueHi"
- Me.lblMaxTorqueHi.Size = New System.Drawing.Size(222, 13)
+ Me.lblMaxTorqueHi.Size = New System.Drawing.Size(243, 15)
Me.lblMaxTorqueHi.TabIndex = 47
Me.lblMaxTorqueHi.Text = "Max Drive and Max Generation Torque Curve"
'
'tbMaxTorqueHi
'
- Me.tbMaxTorqueHi.Location = New System.Drawing.Point(5, 50)
+ Me.tbMaxTorqueHi.Location = New System.Drawing.Point(6, 58)
+ Me.tbMaxTorqueHi.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbMaxTorqueHi.Name = "tbMaxTorqueHi"
- Me.tbMaxTorqueHi.Size = New System.Drawing.Size(406, 20)
+ Me.tbMaxTorqueHi.Size = New System.Drawing.Size(473, 23)
Me.tbMaxTorqueHi.TabIndex = 44
'
'lblTitle
'
- Me.lblTitle.AutoSize = True
+ Me.lblTitle.AutoSize = true
Me.lblTitle.BackColor = System.Drawing.Color.White
- Me.lblTitle.Font = New System.Drawing.Font("Microsoft Sans Serif", 18.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.lblTitle.Location = New System.Drawing.Point(119, 34)
+ 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.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblTitle.Name = "lblTitle"
Me.lblTitle.Size = New System.Drawing.Size(190, 29)
Me.lblTitle.TabIndex = 48
@@ -443,45 +473,50 @@ Partial Class ElectricMotorForm
'
Me.PicBox.BackColor = System.Drawing.Color.LightGray
Me.PicBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
- Me.PicBox.Location = New System.Drawing.Point(517, 28)
+ Me.PicBox.Location = New System.Drawing.Point(603, 32)
+ Me.PicBox.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.PicBox.Name = "PicBox"
- Me.PicBox.Size = New System.Drawing.Size(382, 266)
+ Me.PicBox.Size = New System.Drawing.Size(445, 307)
Me.PicBox.TabIndex = 49
- Me.PicBox.TabStop = False
+ Me.PicBox.TabStop = false
'
'Panel1
'
Me.Panel1.Controls.Add(Me.lblContTq)
Me.Panel1.Controls.Add(Me.lblContTqUnit)
Me.Panel1.Controls.Add(Me.tbContTqLo)
- Me.Panel1.Location = New System.Drawing.Point(5, 120)
+ Me.Panel1.Location = New System.Drawing.Point(6, 138)
+ Me.Panel1.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.Panel1.Name = "Panel1"
- Me.Panel1.Size = New System.Drawing.Size(221, 30)
+ Me.Panel1.Size = New System.Drawing.Size(258, 35)
Me.Panel1.TabIndex = 25
'
'lblContTq
'
- Me.lblContTq.AutoSize = True
- Me.lblContTq.Location = New System.Drawing.Point(3, 7)
+ Me.lblContTq.AutoSize = true
+ Me.lblContTq.Location = New System.Drawing.Point(4, 8)
+ Me.lblContTq.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblContTq.Name = "lblContTq"
- Me.lblContTq.Size = New System.Drawing.Size(100, 13)
+ Me.lblContTq.Size = New System.Drawing.Size(111, 15)
Me.lblContTq.TabIndex = 0
Me.lblContTq.Text = "Continuous Torque:"
'
'lblContTqUnit
'
- Me.lblContTqUnit.AutoSize = True
- Me.lblContTqUnit.Location = New System.Drawing.Point(182, 8)
+ Me.lblContTqUnit.AutoSize = true
+ Me.lblContTqUnit.Location = New System.Drawing.Point(212, 9)
+ Me.lblContTqUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblContTqUnit.Name = "lblContTqUnit"
- Me.lblContTqUnit.Size = New System.Drawing.Size(29, 13)
+ Me.lblContTqUnit.Size = New System.Drawing.Size(35, 15)
Me.lblContTqUnit.TabIndex = 24
Me.lblContTqUnit.Text = "[Nm]"
'
'tbContTqLo
'
- Me.tbContTqLo.Location = New System.Drawing.Point(127, 5)
+ Me.tbContTqLo.Location = New System.Drawing.Point(148, 6)
+ Me.tbContTqLo.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbContTqLo.Name = "tbContTqLo"
- Me.tbContTqLo.Size = New System.Drawing.Size(49, 20)
+ Me.tbContTqLo.Size = New System.Drawing.Size(56, 23)
Me.tbContTqLo.TabIndex = 3
'
'Panel2
@@ -489,69 +524,77 @@ Partial Class ElectricMotorForm
Me.Panel2.Controls.Add(Me.lblOvlTime)
Me.Panel2.Controls.Add(Me.lblOvltimeUnit)
Me.Panel2.Controls.Add(Me.tbOvlTimeLo)
- Me.Panel2.Location = New System.Drawing.Point(5, 181)
+ Me.Panel2.Location = New System.Drawing.Point(6, 209)
+ Me.Panel2.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.Panel2.Name = "Panel2"
- Me.Panel2.Size = New System.Drawing.Size(221, 30)
+ Me.Panel2.Size = New System.Drawing.Size(258, 35)
Me.Panel2.TabIndex = 25
'
'lblOvlTime
'
- Me.lblOvlTime.AutoSize = True
- Me.lblOvlTime.Location = New System.Drawing.Point(3, 7)
+ Me.lblOvlTime.AutoSize = true
+ Me.lblOvlTime.Location = New System.Drawing.Point(4, 8)
+ Me.lblOvlTime.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblOvlTime.Name = "lblOvlTime"
- Me.lblOvlTime.Size = New System.Drawing.Size(96, 13)
+ Me.lblOvlTime.Size = New System.Drawing.Size(107, 15)
Me.lblOvlTime.TabIndex = 0
Me.lblOvlTime.Text = "Overload Duration:"
'
'lblOvltimeUnit
'
- Me.lblOvltimeUnit.AutoSize = True
- Me.lblOvltimeUnit.Location = New System.Drawing.Point(180, 7)
+ Me.lblOvltimeUnit.AutoSize = true
+ Me.lblOvltimeUnit.Location = New System.Drawing.Point(210, 8)
+ Me.lblOvltimeUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblOvltimeUnit.Name = "lblOvltimeUnit"
- Me.lblOvltimeUnit.Size = New System.Drawing.Size(18, 13)
+ Me.lblOvltimeUnit.Size = New System.Drawing.Size(20, 15)
Me.lblOvltimeUnit.TabIndex = 24
Me.lblOvltimeUnit.Text = "[s]"
'
'tbOvlTimeLo
'
- Me.tbOvlTimeLo.Location = New System.Drawing.Point(127, 5)
+ Me.tbOvlTimeLo.Location = New System.Drawing.Point(148, 6)
+ Me.tbOvlTimeLo.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbOvlTimeLo.Name = "tbOvlTimeLo"
- Me.tbOvlTimeLo.Size = New System.Drawing.Size(49, 20)
+ Me.tbOvlTimeLo.Size = New System.Drawing.Size(56, 23)
Me.tbOvlTimeLo.TabIndex = 3
'
- 'Panel3
+ 'pnThermalOverloadRecovery
'
- Me.Panel3.Controls.Add(Me.lblOvlRecovery)
- Me.Panel3.Controls.Add(Me.lblOvlRecoveryFactorUnit)
- Me.Panel3.Controls.Add(Me.tbOverloadRecoveryFactor)
- Me.Panel3.Location = New System.Drawing.Point(246, 108)
- Me.Panel3.Name = "Panel3"
- Me.Panel3.Size = New System.Drawing.Size(261, 30)
- Me.Panel3.TabIndex = 26
+ Me.pnThermalOverloadRecovery.Controls.Add(Me.lblOvlRecovery)
+ Me.pnThermalOverloadRecovery.Controls.Add(Me.lblOvlRecoveryFactorUnit)
+ Me.pnThermalOverloadRecovery.Controls.Add(Me.tbOverloadRecoveryFactor)
+ Me.pnThermalOverloadRecovery.Location = New System.Drawing.Point(287, 160)
+ Me.pnThermalOverloadRecovery.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.pnThermalOverloadRecovery.Name = "pnThermalOverloadRecovery"
+ Me.pnThermalOverloadRecovery.Size = New System.Drawing.Size(304, 35)
+ Me.pnThermalOverloadRecovery.TabIndex = 26
'
'lblOvlRecovery
'
- Me.lblOvlRecovery.AutoSize = True
- Me.lblOvlRecovery.Location = New System.Drawing.Point(-2, 8)
+ Me.lblOvlRecovery.AutoSize = true
+ Me.lblOvlRecovery.Location = New System.Drawing.Point(2, 9)
+ Me.lblOvlRecovery.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblOvlRecovery.Name = "lblOvlRecovery"
- Me.lblOvlRecovery.Size = New System.Drawing.Size(176, 13)
+ Me.lblOvlRecovery.Size = New System.Drawing.Size(191, 15)
Me.lblOvlRecovery.TabIndex = 0
Me.lblOvlRecovery.Text = "Thermal Overload Recovery Factor:"
'
'lblOvlRecoveryFactorUnit
'
- Me.lblOvlRecoveryFactorUnit.AutoSize = True
- Me.lblOvlRecoveryFactorUnit.Location = New System.Drawing.Point(230, 7)
+ Me.lblOvlRecoveryFactorUnit.AutoSize = true
+ Me.lblOvlRecoveryFactorUnit.Location = New System.Drawing.Point(256, 9)
+ Me.lblOvlRecoveryFactorUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblOvlRecoveryFactorUnit.Name = "lblOvlRecoveryFactorUnit"
- Me.lblOvlRecoveryFactorUnit.Size = New System.Drawing.Size(16, 13)
+ Me.lblOvlRecoveryFactorUnit.Size = New System.Drawing.Size(20, 15)
Me.lblOvlRecoveryFactorUnit.TabIndex = 24
Me.lblOvlRecoveryFactorUnit.Text = "[-]"
'
'tbOverloadRecoveryFactor
'
- Me.tbOverloadRecoveryFactor.Location = New System.Drawing.Point(177, 5)
+ Me.tbOverloadRecoveryFactor.Location = New System.Drawing.Point(192, 5)
+ Me.tbOverloadRecoveryFactor.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbOverloadRecoveryFactor.Name = "tbOverloadRecoveryFactor"
- Me.tbOverloadRecoveryFactor.Size = New System.Drawing.Size(49, 20)
+ Me.tbOverloadRecoveryFactor.Size = New System.Drawing.Size(56, 23)
Me.tbOverloadRecoveryFactor.TabIndex = 3
'
'Panel4
@@ -559,34 +602,38 @@ Partial Class ElectricMotorForm
Me.Panel4.Controls.Add(Me.lblRatedSpeed)
Me.Panel4.Controls.Add(Me.lblRatedSpeedUnit)
Me.Panel4.Controls.Add(Me.tbRatedSpeedLo)
- Me.Panel4.Location = New System.Drawing.Point(226, 120)
+ Me.Panel4.Location = New System.Drawing.Point(264, 138)
+ Me.Panel4.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.Panel4.Name = "Panel4"
- Me.Panel4.Size = New System.Drawing.Size(261, 30)
+ Me.Panel4.Size = New System.Drawing.Size(304, 35)
Me.Panel4.TabIndex = 26
'
'lblRatedSpeed
'
- Me.lblRatedSpeed.AutoSize = True
- Me.lblRatedSpeed.Location = New System.Drawing.Point(3, 7)
+ Me.lblRatedSpeed.AutoSize = true
+ Me.lblRatedSpeed.Location = New System.Drawing.Point(4, 8)
+ Me.lblRatedSpeed.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblRatedSpeed.Name = "lblRatedSpeed"
- Me.lblRatedSpeed.Size = New System.Drawing.Size(158, 13)
+ Me.lblRatedSpeed.Size = New System.Drawing.Size(169, 15)
Me.lblRatedSpeed.TabIndex = 0
Me.lblRatedSpeed.Text = "Test Speed Continuous Torque:"
'
'lblRatedSpeedUnit
'
- Me.lblRatedSpeedUnit.AutoSize = True
- Me.lblRatedSpeedUnit.Location = New System.Drawing.Point(229, 7)
+ Me.lblRatedSpeedUnit.AutoSize = true
+ Me.lblRatedSpeedUnit.Location = New System.Drawing.Point(267, 8)
+ Me.lblRatedSpeedUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblRatedSpeedUnit.Name = "lblRatedSpeedUnit"
- Me.lblRatedSpeedUnit.Size = New System.Drawing.Size(30, 13)
+ Me.lblRatedSpeedUnit.Size = New System.Drawing.Size(37, 15)
Me.lblRatedSpeedUnit.TabIndex = 24
Me.lblRatedSpeedUnit.Text = "[rpm]"
'
'tbRatedSpeedLo
'
- Me.tbRatedSpeedLo.Location = New System.Drawing.Point(177, 5)
+ Me.tbRatedSpeedLo.Location = New System.Drawing.Point(206, 6)
+ Me.tbRatedSpeedLo.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbRatedSpeedLo.Name = "tbRatedSpeedLo"
- Me.tbRatedSpeedLo.Size = New System.Drawing.Size(49, 20)
+ Me.tbRatedSpeedLo.Size = New System.Drawing.Size(56, 23)
Me.tbRatedSpeedLo.TabIndex = 3
'
'pnOverloadTq
@@ -594,34 +641,38 @@ Partial Class ElectricMotorForm
Me.pnOverloadTq.Controls.Add(Me.lblOverloadTq)
Me.pnOverloadTq.Controls.Add(Me.lblOverloadTqUnit)
Me.pnOverloadTq.Controls.Add(Me.tbOverloadTqLo)
- Me.pnOverloadTq.Location = New System.Drawing.Point(5, 150)
+ Me.pnOverloadTq.Location = New System.Drawing.Point(6, 173)
+ Me.pnOverloadTq.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.pnOverloadTq.Name = "pnOverloadTq"
- Me.pnOverloadTq.Size = New System.Drawing.Size(221, 30)
+ Me.pnOverloadTq.Size = New System.Drawing.Size(258, 35)
Me.pnOverloadTq.TabIndex = 26
'
'lblOverloadTq
'
- Me.lblOverloadTq.AutoSize = True
- Me.lblOverloadTq.Location = New System.Drawing.Point(3, 7)
+ Me.lblOverloadTq.AutoSize = true
+ Me.lblOverloadTq.Location = New System.Drawing.Point(4, 8)
+ Me.lblOverloadTq.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblOverloadTq.Name = "lblOverloadTq"
- Me.lblOverloadTq.Size = New System.Drawing.Size(90, 13)
+ Me.lblOverloadTq.Size = New System.Drawing.Size(97, 15)
Me.lblOverloadTq.TabIndex = 0
Me.lblOverloadTq.Text = "Overload Torque:"
'
'lblOverloadTqUnit
'
- Me.lblOverloadTqUnit.AutoSize = True
- Me.lblOverloadTqUnit.Location = New System.Drawing.Point(182, 8)
+ Me.lblOverloadTqUnit.AutoSize = true
+ Me.lblOverloadTqUnit.Location = New System.Drawing.Point(212, 9)
+ Me.lblOverloadTqUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblOverloadTqUnit.Name = "lblOverloadTqUnit"
- Me.lblOverloadTqUnit.Size = New System.Drawing.Size(29, 13)
+ Me.lblOverloadTqUnit.Size = New System.Drawing.Size(35, 15)
Me.lblOverloadTqUnit.TabIndex = 24
Me.lblOverloadTqUnit.Text = "[Nm]"
'
'tbOverloadTqLo
'
- Me.tbOverloadTqLo.Location = New System.Drawing.Point(127, 5)
+ Me.tbOverloadTqLo.Location = New System.Drawing.Point(148, 6)
+ Me.tbOverloadTqLo.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbOverloadTqLo.Name = "tbOverloadTqLo"
- Me.tbOverloadTqLo.Size = New System.Drawing.Size(49, 20)
+ Me.tbOverloadTqLo.Size = New System.Drawing.Size(56, 23)
Me.tbOverloadTqLo.TabIndex = 3
'
'Panel6
@@ -629,203 +680,225 @@ Partial Class ElectricMotorForm
Me.Panel6.Controls.Add(Me.lblOverloadSpeed)
Me.Panel6.Controls.Add(Me.lblOverloadSpeedUnit)
Me.Panel6.Controls.Add(Me.tbOvlSpeedLo)
- Me.Panel6.Location = New System.Drawing.Point(226, 150)
+ Me.Panel6.Location = New System.Drawing.Point(264, 173)
+ Me.Panel6.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.Panel6.Name = "Panel6"
- Me.Panel6.Size = New System.Drawing.Size(261, 30)
+ Me.Panel6.Size = New System.Drawing.Size(304, 35)
Me.Panel6.TabIndex = 27
'
'lblOverloadSpeed
'
- Me.lblOverloadSpeed.AutoSize = True
- Me.lblOverloadSpeed.Location = New System.Drawing.Point(3, 7)
+ Me.lblOverloadSpeed.AutoSize = true
+ Me.lblOverloadSpeed.Location = New System.Drawing.Point(4, 8)
+ Me.lblOverloadSpeed.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblOverloadSpeed.Name = "lblOverloadSpeed"
- Me.lblOverloadSpeed.Size = New System.Drawing.Size(148, 13)
+ Me.lblOverloadSpeed.Size = New System.Drawing.Size(155, 15)
Me.lblOverloadSpeed.TabIndex = 0
Me.lblOverloadSpeed.Text = "Test Speed Overload Torque:"
'
'lblOverloadSpeedUnit
'
- Me.lblOverloadSpeedUnit.AutoSize = True
- Me.lblOverloadSpeedUnit.Location = New System.Drawing.Point(229, 7)
+ Me.lblOverloadSpeedUnit.AutoSize = true
+ Me.lblOverloadSpeedUnit.Location = New System.Drawing.Point(267, 8)
+ Me.lblOverloadSpeedUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblOverloadSpeedUnit.Name = "lblOverloadSpeedUnit"
- Me.lblOverloadSpeedUnit.Size = New System.Drawing.Size(30, 13)
+ Me.lblOverloadSpeedUnit.Size = New System.Drawing.Size(37, 15)
Me.lblOverloadSpeedUnit.TabIndex = 24
Me.lblOverloadSpeedUnit.Text = "[rpm]"
'
'tbOvlSpeedLo
'
- Me.tbOvlSpeedLo.Location = New System.Drawing.Point(177, 5)
+ Me.tbOvlSpeedLo.Location = New System.Drawing.Point(206, 6)
+ Me.tbOvlSpeedLo.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbOvlSpeedLo.Name = "tbOvlSpeedLo"
- Me.tbOvlSpeedLo.Size = New System.Drawing.Size(49, 20)
+ Me.tbOvlSpeedLo.Size = New System.Drawing.Size(56, 23)
Me.tbOvlSpeedLo.TabIndex = 3
'
'lblVoltageHi
'
- Me.lblVoltageHi.AutoSize = True
- Me.lblVoltageHi.Location = New System.Drawing.Point(11, 9)
+ Me.lblVoltageHi.AutoSize = true
+ Me.lblVoltageHi.Location = New System.Drawing.Point(13, 10)
+ Me.lblVoltageHi.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblVoltageHi.Name = "lblVoltageHi"
- Me.lblVoltageHi.Size = New System.Drawing.Size(43, 13)
+ Me.lblVoltageHi.Size = New System.Drawing.Size(46, 15)
Me.lblVoltageHi.TabIndex = 48
Me.lblVoltageHi.Text = "Voltage"
'
'lblVoltageHiUnit
'
- Me.lblVoltageHiUnit.AutoSize = True
- Me.lblVoltageHiUnit.Location = New System.Drawing.Point(188, 10)
+ Me.lblVoltageHiUnit.AutoSize = true
+ Me.lblVoltageHiUnit.Location = New System.Drawing.Point(219, 12)
+ Me.lblVoltageHiUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblVoltageHiUnit.Name = "lblVoltageHiUnit"
- Me.lblVoltageHiUnit.Size = New System.Drawing.Size(20, 13)
+ Me.lblVoltageHiUnit.Size = New System.Drawing.Size(22, 15)
Me.lblVoltageHiUnit.TabIndex = 50
Me.lblVoltageHiUnit.Text = "[V]"
'
'tbVoltageHi
'
- Me.tbVoltageHi.Location = New System.Drawing.Point(135, 7)
+ Me.tbVoltageHi.Location = New System.Drawing.Point(158, 8)
+ Me.tbVoltageHi.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbVoltageHi.Name = "tbVoltageHi"
- Me.tbVoltageHi.Size = New System.Drawing.Size(49, 20)
+ Me.tbVoltageHi.Size = New System.Drawing.Size(56, 23)
Me.tbVoltageHi.TabIndex = 49
'
'lblVoltageLow
'
- Me.lblVoltageLow.AutoSize = True
- Me.lblVoltageLow.Location = New System.Drawing.Point(11, 9)
+ Me.lblVoltageLow.AutoSize = true
+ Me.lblVoltageLow.Location = New System.Drawing.Point(13, 10)
+ Me.lblVoltageLow.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblVoltageLow.Name = "lblVoltageLow"
- Me.lblVoltageLow.Size = New System.Drawing.Size(43, 13)
+ Me.lblVoltageLow.Size = New System.Drawing.Size(46, 15)
Me.lblVoltageLow.TabIndex = 48
Me.lblVoltageLow.Text = "Voltage"
'
'lblVoltageLowUnit
'
- Me.lblVoltageLowUnit.AutoSize = True
- Me.lblVoltageLowUnit.Location = New System.Drawing.Point(188, 9)
+ Me.lblVoltageLowUnit.AutoSize = true
+ Me.lblVoltageLowUnit.Location = New System.Drawing.Point(219, 10)
+ Me.lblVoltageLowUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblVoltageLowUnit.Name = "lblVoltageLowUnit"
- Me.lblVoltageLowUnit.Size = New System.Drawing.Size(20, 13)
+ Me.lblVoltageLowUnit.Size = New System.Drawing.Size(22, 15)
Me.lblVoltageLowUnit.TabIndex = 50
Me.lblVoltageLowUnit.Text = "[V]"
'
'tbVoltageLow
'
- Me.tbVoltageLow.Location = New System.Drawing.Point(135, 7)
+ Me.tbVoltageLow.Location = New System.Drawing.Point(158, 8)
+ Me.tbVoltageLow.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbVoltageLow.Name = "tbVoltageLow"
- Me.tbVoltageLow.Size = New System.Drawing.Size(49, 20)
+ Me.tbVoltageLow.Size = New System.Drawing.Size(56, 23)
Me.tbVoltageLow.TabIndex = 49
'
'lblMaxTorqueLow
'
- Me.lblMaxTorqueLow.AutoSize = True
- Me.lblMaxTorqueLow.Location = New System.Drawing.Point(5, 34)
+ Me.lblMaxTorqueLow.AutoSize = true
+ Me.lblMaxTorqueLow.Location = New System.Drawing.Point(6, 39)
+ Me.lblMaxTorqueLow.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblMaxTorqueLow.Name = "lblMaxTorqueLow"
- Me.lblMaxTorqueLow.Size = New System.Drawing.Size(222, 13)
+ Me.lblMaxTorqueLow.Size = New System.Drawing.Size(243, 15)
Me.lblMaxTorqueLow.TabIndex = 47
Me.lblMaxTorqueLow.Text = "Max Drive and Max Generation Torque Curve"
'
'tbDragTorque
'
- Me.tbDragTorque.Location = New System.Drawing.Point(17, 161)
+ Me.tbDragTorque.Location = New System.Drawing.Point(4, 25)
+ Me.tbDragTorque.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbDragTorque.Name = "tbDragTorque"
- Me.tbDragTorque.Size = New System.Drawing.Size(406, 20)
+ Me.tbDragTorque.Size = New System.Drawing.Size(473, 23)
Me.tbDragTorque.TabIndex = 5
'
'lblDragTorque
'
- Me.lblDragTorque.AutoSize = True
- Me.lblDragTorque.Location = New System.Drawing.Point(17, 145)
+ Me.lblDragTorque.AutoSize = true
+ Me.lblDragTorque.Location = New System.Drawing.Point(4, 6)
+ Me.lblDragTorque.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblDragTorque.Name = "lblDragTorque"
- Me.lblDragTorque.Size = New System.Drawing.Size(98, 13)
+ Me.lblDragTorque.Size = New System.Drawing.Size(105, 15)
Me.lblDragTorque.TabIndex = 38
Me.lblDragTorque.Text = "Drag Torque Curve"
'
'btnBrowseDragCurve
'
Me.btnBrowseDragCurve.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnBrowseDragCurve.Location = New System.Drawing.Point(431, 158)
+ Me.btnBrowseDragCurve.Location = New System.Drawing.Point(487, 21)
+ Me.btnBrowseDragCurve.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btnBrowseDragCurve.Name = "btnBrowseDragCurve"
- Me.btnBrowseDragCurve.Size = New System.Drawing.Size(24, 24)
+ Me.btnBrowseDragCurve.Size = New System.Drawing.Size(28, 28)
Me.btnBrowseDragCurve.TabIndex = 6
- Me.btnBrowseDragCurve.TabStop = False
- Me.btnBrowseDragCurve.UseVisualStyleBackColor = True
+ Me.btnBrowseDragCurve.TabStop = false
+ Me.btnBrowseDragCurve.UseVisualStyleBackColor = true
'
'btnDragCurveOpen
'
Me.btnDragCurveOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btnDragCurveOpen.Location = New System.Drawing.Point(454, 158)
+ Me.btnDragCurveOpen.Location = New System.Drawing.Point(514, 21)
+ Me.btnDragCurveOpen.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btnDragCurveOpen.Name = "btnDragCurveOpen"
- Me.btnDragCurveOpen.Size = New System.Drawing.Size(24, 24)
+ Me.btnDragCurveOpen.Size = New System.Drawing.Size(28, 28)
Me.btnDragCurveOpen.TabIndex = 7
- Me.btnDragCurveOpen.TabStop = False
- Me.btnDragCurveOpen.UseVisualStyleBackColor = True
+ Me.btnDragCurveOpen.TabStop = false
+ Me.btnDragCurveOpen.UseVisualStyleBackColor = true
'
'tbMapLow
'
- Me.tbMapLow.Location = New System.Drawing.Point(5, 90)
+ Me.tbMapLow.Location = New System.Drawing.Point(6, 104)
+ Me.tbMapLow.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbMapLow.Name = "tbMapLow"
- Me.tbMapLow.Size = New System.Drawing.Size(406, 20)
+ Me.tbMapLow.Size = New System.Drawing.Size(473, 23)
Me.tbMapLow.TabIndex = 40
'
'lblPowerMapLow
'
- Me.lblPowerMapLow.AutoSize = True
- Me.lblPowerMapLow.Location = New System.Drawing.Point(5, 74)
+ Me.lblPowerMapLow.AutoSize = true
+ Me.lblPowerMapLow.Location = New System.Drawing.Point(6, 85)
+ Me.lblPowerMapLow.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblPowerMapLow.Name = "lblPowerMapLow"
- Me.lblPowerMapLow.Size = New System.Drawing.Size(163, 13)
+ Me.lblPowerMapLow.Size = New System.Drawing.Size(184, 15)
Me.lblPowerMapLow.TabIndex = 43
Me.lblPowerMapLow.Text = "Electric Power Consumption Map"
'
'btnBrowseEmMapLow
'
Me.btnBrowseEmMapLow.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnBrowseEmMapLow.Location = New System.Drawing.Point(419, 87)
+ Me.btnBrowseEmMapLow.Location = New System.Drawing.Point(489, 100)
+ Me.btnBrowseEmMapLow.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btnBrowseEmMapLow.Name = "btnBrowseEmMapLow"
- Me.btnBrowseEmMapLow.Size = New System.Drawing.Size(24, 24)
+ Me.btnBrowseEmMapLow.Size = New System.Drawing.Size(28, 28)
Me.btnBrowseEmMapLow.TabIndex = 41
- Me.btnBrowseEmMapLow.TabStop = False
- Me.btnBrowseEmMapLow.UseVisualStyleBackColor = True
+ Me.btnBrowseEmMapLow.TabStop = false
+ Me.btnBrowseEmMapLow.UseVisualStyleBackColor = true
'
'btnEmMapOpenLow
'
Me.btnEmMapOpenLow.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btnEmMapOpenLow.Location = New System.Drawing.Point(441, 87)
+ Me.btnEmMapOpenLow.Location = New System.Drawing.Point(514, 100)
+ Me.btnEmMapOpenLow.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btnEmMapOpenLow.Name = "btnEmMapOpenLow"
- Me.btnEmMapOpenLow.Size = New System.Drawing.Size(24, 24)
+ Me.btnEmMapOpenLow.Size = New System.Drawing.Size(28, 28)
Me.btnEmMapOpenLow.TabIndex = 42
- Me.btnEmMapOpenLow.TabStop = False
- Me.btnEmMapOpenLow.UseVisualStyleBackColor = True
+ Me.btnEmMapOpenLow.TabStop = false
+ Me.btnEmMapOpenLow.UseVisualStyleBackColor = true
'
'tbMaxTorqueLow
'
- Me.tbMaxTorqueLow.Location = New System.Drawing.Point(5, 50)
+ Me.tbMaxTorqueLow.Location = New System.Drawing.Point(6, 58)
+ Me.tbMaxTorqueLow.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbMaxTorqueLow.Name = "tbMaxTorqueLow"
- Me.tbMaxTorqueLow.Size = New System.Drawing.Size(406, 20)
+ Me.tbMaxTorqueLow.Size = New System.Drawing.Size(473, 23)
Me.tbMaxTorqueLow.TabIndex = 44
'
'btnMaxTorqueCurveOpenLow
'
Me.btnMaxTorqueCurveOpenLow.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btnMaxTorqueCurveOpenLow.Location = New System.Drawing.Point(441, 48)
+ Me.btnMaxTorqueCurveOpenLow.Location = New System.Drawing.Point(514, 55)
+ Me.btnMaxTorqueCurveOpenLow.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btnMaxTorqueCurveOpenLow.Name = "btnMaxTorqueCurveOpenLow"
- Me.btnMaxTorqueCurveOpenLow.Size = New System.Drawing.Size(24, 24)
+ Me.btnMaxTorqueCurveOpenLow.Size = New System.Drawing.Size(28, 28)
Me.btnMaxTorqueCurveOpenLow.TabIndex = 46
- Me.btnMaxTorqueCurveOpenLow.TabStop = False
- Me.btnMaxTorqueCurveOpenLow.UseVisualStyleBackColor = True
+ Me.btnMaxTorqueCurveOpenLow.TabStop = false
+ Me.btnMaxTorqueCurveOpenLow.UseVisualStyleBackColor = true
'
'btnBrowseMaxTorqueLow
'
Me.btnBrowseMaxTorqueLow.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnBrowseMaxTorqueLow.Location = New System.Drawing.Point(419, 48)
+ Me.btnBrowseMaxTorqueLow.Location = New System.Drawing.Point(489, 55)
+ Me.btnBrowseMaxTorqueLow.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btnBrowseMaxTorqueLow.Name = "btnBrowseMaxTorqueLow"
- Me.btnBrowseMaxTorqueLow.Size = New System.Drawing.Size(24, 24)
+ Me.btnBrowseMaxTorqueLow.Size = New System.Drawing.Size(28, 28)
Me.btnBrowseMaxTorqueLow.TabIndex = 45
- Me.btnBrowseMaxTorqueLow.TabStop = False
- Me.btnBrowseMaxTorqueLow.UseVisualStyleBackColor = True
+ Me.btnBrowseMaxTorqueLow.TabStop = false
+ Me.btnBrowseMaxTorqueLow.UseVisualStyleBackColor = true
'
'tcVoltageLevels
'
Me.tcVoltageLevels.Controls.Add(Me.tpVoltageLow)
Me.tcVoltageLevels.Controls.Add(Me.tpVoltageHigh)
- Me.tcVoltageLevels.Location = New System.Drawing.Point(12, 189)
+ Me.tcVoltageLevels.Location = New System.Drawing.Point(14, 257)
Me.tcVoltageLevels.Margin = New System.Windows.Forms.Padding(2)
Me.tcVoltageLevels.Name = "tcVoltageLevels"
Me.tcVoltageLevels.SelectedIndex = 0
- Me.tcVoltageLevels.Size = New System.Drawing.Size(501, 246)
+ Me.tcVoltageLevels.Size = New System.Drawing.Size(584, 284)
Me.tcVoltageLevels.TabIndex = 52
'
'tpVoltageLow
@@ -846,14 +919,14 @@ Partial Class ElectricMotorForm
Me.tpVoltageLow.Controls.Add(Me.btnBrowseEmMapLow)
Me.tpVoltageLow.Controls.Add(Me.lblPowerMapLow)
Me.tpVoltageLow.Controls.Add(Me.tbMapLow)
- Me.tpVoltageLow.Location = New System.Drawing.Point(4, 22)
+ Me.tpVoltageLow.Location = New System.Drawing.Point(4, 24)
Me.tpVoltageLow.Margin = New System.Windows.Forms.Padding(2)
Me.tpVoltageLow.Name = "tpVoltageLow"
Me.tpVoltageLow.Padding = New System.Windows.Forms.Padding(2)
- Me.tpVoltageLow.Size = New System.Drawing.Size(493, 220)
+ Me.tpVoltageLow.Size = New System.Drawing.Size(576, 256)
Me.tpVoltageLow.TabIndex = 0
Me.tpVoltageLow.Text = "Voltage Level Low"
- Me.tpVoltageLow.UseVisualStyleBackColor = True
+ Me.tpVoltageLow.UseVisualStyleBackColor = true
'
'tpVoltageHigh
'
@@ -873,11 +946,11 @@ Partial Class ElectricMotorForm
Me.tpVoltageHigh.Controls.Add(Me.btnBrowseEmMapHi)
Me.tpVoltageHigh.Controls.Add(Me.lblPowerMapHi)
Me.tpVoltageHigh.Controls.Add(Me.tbMapHi)
- Me.tpVoltageHigh.Location = New System.Drawing.Point(4, 22)
+ Me.tpVoltageHigh.Location = New System.Drawing.Point(4, 24)
Me.tpVoltageHigh.Margin = New System.Windows.Forms.Padding(2)
Me.tpVoltageHigh.Name = "tpVoltageHigh"
Me.tpVoltageHigh.Padding = New System.Windows.Forms.Padding(2)
- Me.tpVoltageHigh.Size = New System.Drawing.Size(493, 220)
+ Me.tpVoltageHigh.Size = New System.Drawing.Size(576, 256)
Me.tpVoltageHigh.TabIndex = 1
Me.tpVoltageHigh.Text = "Voltage Level High"
Me.tpVoltageHigh.UseVisualStyleBackColor = true
@@ -887,34 +960,38 @@ Partial Class ElectricMotorForm
Me.Panel5.Controls.Add(Me.Label1)
Me.Panel5.Controls.Add(Me.Label2)
Me.Panel5.Controls.Add(Me.tbOvlSpeedHi)
- Me.Panel5.Location = New System.Drawing.Point(226, 150)
+ Me.Panel5.Location = New System.Drawing.Point(264, 173)
+ Me.Panel5.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.Panel5.Name = "Panel5"
- Me.Panel5.Size = New System.Drawing.Size(261, 30)
+ Me.Panel5.Size = New System.Drawing.Size(304, 35)
Me.Panel5.TabIndex = 55
'
'Label1
'
Me.Label1.AutoSize = true
- Me.Label1.Location = New System.Drawing.Point(3, 7)
+ Me.Label1.Location = New System.Drawing.Point(4, 8)
+ Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label1.Name = "Label1"
- Me.Label1.Size = New System.Drawing.Size(148, 13)
+ Me.Label1.Size = New System.Drawing.Size(155, 15)
Me.Label1.TabIndex = 0
Me.Label1.Text = "Test Speed Overload Torque:"
'
'Label2
'
Me.Label2.AutoSize = true
- Me.Label2.Location = New System.Drawing.Point(229, 7)
+ Me.Label2.Location = New System.Drawing.Point(267, 8)
+ Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label2.Name = "Label2"
- Me.Label2.Size = New System.Drawing.Size(30, 13)
+ Me.Label2.Size = New System.Drawing.Size(37, 15)
Me.Label2.TabIndex = 24
Me.Label2.Text = "[rpm]"
'
'tbOvlSpeedHi
'
- Me.tbOvlSpeedHi.Location = New System.Drawing.Point(177, 5)
+ Me.tbOvlSpeedHi.Location = New System.Drawing.Point(206, 6)
+ Me.tbOvlSpeedHi.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbOvlSpeedHi.Name = "tbOvlSpeedHi"
- Me.tbOvlSpeedHi.Size = New System.Drawing.Size(49, 20)
+ Me.tbOvlSpeedHi.Size = New System.Drawing.Size(56, 23)
Me.tbOvlSpeedHi.TabIndex = 3
'
'Panel7
@@ -922,34 +999,38 @@ Partial Class ElectricMotorForm
Me.Panel7.Controls.Add(Me.Label3)
Me.Panel7.Controls.Add(Me.Label4)
Me.Panel7.Controls.Add(Me.tbOverloadTqHi)
- Me.Panel7.Location = New System.Drawing.Point(5, 150)
+ Me.Panel7.Location = New System.Drawing.Point(6, 173)
+ Me.Panel7.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.Panel7.Name = "Panel7"
- Me.Panel7.Size = New System.Drawing.Size(221, 30)
+ Me.Panel7.Size = New System.Drawing.Size(258, 35)
Me.Panel7.TabIndex = 53
'
'Label3
'
Me.Label3.AutoSize = true
- Me.Label3.Location = New System.Drawing.Point(3, 7)
+ Me.Label3.Location = New System.Drawing.Point(4, 8)
+ Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label3.Name = "Label3"
- Me.Label3.Size = New System.Drawing.Size(90, 13)
+ Me.Label3.Size = New System.Drawing.Size(97, 15)
Me.Label3.TabIndex = 0
Me.Label3.Text = "Overload Torque:"
'
'Label4
'
Me.Label4.AutoSize = true
- Me.Label4.Location = New System.Drawing.Point(182, 8)
+ Me.Label4.Location = New System.Drawing.Point(212, 9)
+ Me.Label4.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label4.Name = "Label4"
- Me.Label4.Size = New System.Drawing.Size(29, 13)
+ Me.Label4.Size = New System.Drawing.Size(35, 15)
Me.Label4.TabIndex = 24
Me.Label4.Text = "[Nm]"
'
'tbOverloadTqHi
'
- Me.tbOverloadTqHi.Location = New System.Drawing.Point(127, 5)
+ Me.tbOverloadTqHi.Location = New System.Drawing.Point(148, 6)
+ Me.tbOverloadTqHi.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbOverloadTqHi.Name = "tbOverloadTqHi"
- Me.tbOverloadTqHi.Size = New System.Drawing.Size(49, 20)
+ Me.tbOverloadTqHi.Size = New System.Drawing.Size(56, 23)
Me.tbOverloadTqHi.TabIndex = 3
'
'Panel8
@@ -957,34 +1038,38 @@ Partial Class ElectricMotorForm
Me.Panel8.Controls.Add(Me.Label5)
Me.Panel8.Controls.Add(Me.Label6)
Me.Panel8.Controls.Add(Me.tbRatedSpeedHi)
- Me.Panel8.Location = New System.Drawing.Point(226, 120)
+ Me.Panel8.Location = New System.Drawing.Point(264, 138)
+ Me.Panel8.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.Panel8.Name = "Panel8"
- Me.Panel8.Size = New System.Drawing.Size(261, 30)
+ Me.Panel8.Size = New System.Drawing.Size(304, 35)
Me.Panel8.TabIndex = 54
'
'Label5
'
Me.Label5.AutoSize = true
- Me.Label5.Location = New System.Drawing.Point(3, 7)
+ Me.Label5.Location = New System.Drawing.Point(4, 8)
+ Me.Label5.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label5.Name = "Label5"
- Me.Label5.Size = New System.Drawing.Size(158, 13)
+ Me.Label5.Size = New System.Drawing.Size(169, 15)
Me.Label5.TabIndex = 0
Me.Label5.Text = "Test Speed Continuous Torque:"
'
'Label6
'
Me.Label6.AutoSize = true
- Me.Label6.Location = New System.Drawing.Point(229, 7)
+ Me.Label6.Location = New System.Drawing.Point(267, 8)
+ Me.Label6.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label6.Name = "Label6"
- Me.Label6.Size = New System.Drawing.Size(30, 13)
+ Me.Label6.Size = New System.Drawing.Size(37, 15)
Me.Label6.TabIndex = 24
Me.Label6.Text = "[rpm]"
'
'tbRatedSpeedHi
'
- Me.tbRatedSpeedHi.Location = New System.Drawing.Point(177, 5)
+ Me.tbRatedSpeedHi.Location = New System.Drawing.Point(206, 6)
+ Me.tbRatedSpeedHi.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbRatedSpeedHi.Name = "tbRatedSpeedHi"
- Me.tbRatedSpeedHi.Size = New System.Drawing.Size(49, 20)
+ Me.tbRatedSpeedHi.Size = New System.Drawing.Size(56, 23)
Me.tbRatedSpeedHi.TabIndex = 3
'
'Panel9
@@ -992,34 +1077,38 @@ Partial Class ElectricMotorForm
Me.Panel9.Controls.Add(Me.Label7)
Me.Panel9.Controls.Add(Me.Label8)
Me.Panel9.Controls.Add(Me.tbOvlTimeHi)
- Me.Panel9.Location = New System.Drawing.Point(5, 181)
+ Me.Panel9.Location = New System.Drawing.Point(6, 209)
+ Me.Panel9.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.Panel9.Name = "Panel9"
- Me.Panel9.Size = New System.Drawing.Size(221, 30)
+ Me.Panel9.Size = New System.Drawing.Size(258, 35)
Me.Panel9.TabIndex = 51
'
'Label7
'
Me.Label7.AutoSize = true
- Me.Label7.Location = New System.Drawing.Point(3, 7)
+ Me.Label7.Location = New System.Drawing.Point(4, 8)
+ Me.Label7.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label7.Name = "Label7"
- Me.Label7.Size = New System.Drawing.Size(96, 13)
+ Me.Label7.Size = New System.Drawing.Size(107, 15)
Me.Label7.TabIndex = 0
Me.Label7.Text = "Overload Duration:"
'
'Label8
'
Me.Label8.AutoSize = true
- Me.Label8.Location = New System.Drawing.Point(180, 7)
+ Me.Label8.Location = New System.Drawing.Point(210, 8)
+ Me.Label8.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label8.Name = "Label8"
- Me.Label8.Size = New System.Drawing.Size(18, 13)
+ Me.Label8.Size = New System.Drawing.Size(20, 15)
Me.Label8.TabIndex = 24
Me.Label8.Text = "[s]"
'
'tbOvlTimeHi
'
- Me.tbOvlTimeHi.Location = New System.Drawing.Point(127, 5)
+ Me.tbOvlTimeHi.Location = New System.Drawing.Point(148, 6)
+ Me.tbOvlTimeHi.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbOvlTimeHi.Name = "tbOvlTimeHi"
- Me.tbOvlTimeHi.Size = New System.Drawing.Size(49, 20)
+ Me.tbOvlTimeHi.Size = New System.Drawing.Size(56, 23)
Me.tbOvlTimeHi.TabIndex = 3
'
'Panel10
@@ -1027,45 +1116,129 @@ Partial Class ElectricMotorForm
Me.Panel10.Controls.Add(Me.Label9)
Me.Panel10.Controls.Add(Me.Label10)
Me.Panel10.Controls.Add(Me.tbContTqHi)
- Me.Panel10.Location = New System.Drawing.Point(5, 120)
+ Me.Panel10.Location = New System.Drawing.Point(6, 138)
+ Me.Panel10.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.Panel10.Name = "Panel10"
- Me.Panel10.Size = New System.Drawing.Size(221, 30)
+ Me.Panel10.Size = New System.Drawing.Size(258, 35)
Me.Panel10.TabIndex = 52
'
'Label9
'
Me.Label9.AutoSize = true
- Me.Label9.Location = New System.Drawing.Point(3, 7)
+ Me.Label9.Location = New System.Drawing.Point(4, 8)
+ Me.Label9.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label9.Name = "Label9"
- Me.Label9.Size = New System.Drawing.Size(100, 13)
+ Me.Label9.Size = New System.Drawing.Size(111, 15)
Me.Label9.TabIndex = 0
Me.Label9.Text = "Continuous Torque:"
'
'Label10
'
Me.Label10.AutoSize = true
- Me.Label10.Location = New System.Drawing.Point(182, 8)
+ Me.Label10.Location = New System.Drawing.Point(212, 9)
+ Me.Label10.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label10.Name = "Label10"
- Me.Label10.Size = New System.Drawing.Size(29, 13)
+ Me.Label10.Size = New System.Drawing.Size(35, 15)
Me.Label10.TabIndex = 24
Me.Label10.Text = "[Nm]"
'
'tbContTqHi
'
- Me.tbContTqHi.Location = New System.Drawing.Point(127, 5)
+ Me.tbContTqHi.Location = New System.Drawing.Point(148, 6)
+ Me.tbContTqHi.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbContTqHi.Name = "tbContTqHi"
- Me.tbContTqHi.Size = New System.Drawing.Size(49, 20)
+ Me.tbContTqHi.Size = New System.Drawing.Size(56, 23)
Me.tbContTqHi.TabIndex = 3
'
+ 'pnDragCurve
+ '
+ Me.pnDragCurve.Controls.Add(Me.tbDragTorque)
+ Me.pnDragCurve.Controls.Add(Me.btnBrowseDragCurve)
+ Me.pnDragCurve.Controls.Add(Me.btnDragCurveOpen)
+ Me.pnDragCurve.Controls.Add(Me.lblDragTorque)
+ Me.pnDragCurve.Location = New System.Drawing.Point(14, 199)
+ Me.pnDragCurve.Name = "pnDragCurve"
+ Me.pnDragCurve.Size = New System.Drawing.Size(577, 53)
+ Me.pnDragCurve.TabIndex = 53
+ '
+ 'pnRatedPower
+ '
+ Me.pnRatedPower.Controls.Add(Me.lblRatedPower)
+ Me.pnRatedPower.Controls.Add(Me.lblRatedPowerUnit)
+ Me.pnRatedPower.Controls.Add(Me.tbRatedPower)
+ Me.pnRatedPower.Location = New System.Drawing.Point(14, 160)
+ Me.pnRatedPower.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.pnRatedPower.Name = "pnRatedPower"
+ Me.pnRatedPower.Size = New System.Drawing.Size(268, 35)
+ Me.pnRatedPower.TabIndex = 25
+ '
+ 'lblRatedPower
+ '
+ Me.lblRatedPower.AutoSize = true
+ Me.lblRatedPower.Location = New System.Drawing.Point(4, 8)
+ Me.lblRatedPower.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblRatedPower.Name = "lblRatedPower"
+ Me.lblRatedPower.Size = New System.Drawing.Size(73, 15)
+ Me.lblRatedPower.TabIndex = 0
+ Me.lblRatedPower.Text = "Rated Power"
+ '
+ 'lblRatedPowerUnit
+ '
+ Me.lblRatedPowerUnit.AutoSize = true
+ Me.lblRatedPowerUnit.Location = New System.Drawing.Point(232, 9)
+ Me.lblRatedPowerUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblRatedPowerUnit.Name = "lblRatedPowerUnit"
+ Me.lblRatedPowerUnit.Size = New System.Drawing.Size(32, 15)
+ Me.lblRatedPowerUnit.TabIndex = 24
+ Me.lblRatedPowerUnit.Text = "[kW]"
+ '
+ 'tbRatedPower
+ '
+ Me.tbRatedPower.Location = New System.Drawing.Point(168, 6)
+ Me.tbRatedPower.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.tbRatedPower.Name = "tbRatedPower"
+ Me.tbRatedPower.Size = New System.Drawing.Size(56, 23)
+ Me.tbRatedPower.TabIndex = 3
+ '
+ 'pnElectricMachineType
+ '
+ Me.pnElectricMachineType.Controls.Add(Me.cbEmType)
+ Me.pnElectricMachineType.Controls.Add(Me.lblEmType)
+ Me.pnElectricMachineType.Location = New System.Drawing.Point(14, 124)
+ Me.pnElectricMachineType.Name = "pnElectricMachineType"
+ Me.pnElectricMachineType.Size = New System.Drawing.Size(268, 35)
+ Me.pnElectricMachineType.TabIndex = 54
+ '
+ 'lblEmType
+ '
+ Me.lblEmType.AutoSize = true
+ Me.lblEmType.Location = New System.Drawing.Point(5, 9)
+ Me.lblEmType.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblEmType.Name = "lblEmType"
+ Me.lblEmType.Size = New System.Drawing.Size(51, 15)
+ 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
- Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(7!, 15!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.CancelButton = Me.ButCancel
- Me.ClientSize = New System.Drawing.Size(941, 468)
+ Me.ClientSize = New System.Drawing.Size(1098, 591)
+ Me.Controls.Add(Me.pnElectricMachineType)
+ Me.Controls.Add(Me.pnRatedPower)
+ Me.Controls.Add(Me.pnDragCurve)
Me.Controls.Add(Me.tcVoltageLevels)
- Me.Controls.Add(Me.Panel3)
+ Me.Controls.Add(Me.pnThermalOverloadRecovery)
Me.Controls.Add(Me.PicBox)
Me.Controls.Add(Me.lblTitle)
Me.Controls.Add(Me.pnInertia)
@@ -1073,15 +1246,12 @@ Partial Class ElectricMotorForm
Me.Controls.Add(Me.StatusStrip1)
Me.Controls.Add(Me.ToolStrip1)
Me.Controls.Add(Me.ButCancel)
- Me.Controls.Add(Me.tbDragTorque)
Me.Controls.Add(Me.ButOK)
Me.Controls.Add(Me.lblMakeModel)
Me.Controls.Add(Me.tbMakeModel)
- Me.Controls.Add(Me.lblDragTorque)
- Me.Controls.Add(Me.btnDragCurveOpen)
- Me.Controls.Add(Me.btnBrowseDragCurve)
Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
Me.Icon = CType(resources.GetObject("$this.Icon"),System.Drawing.Icon)
+ Me.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.MaximizeBox = false
Me.Name = "ElectricMotorForm"
Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide
@@ -1100,8 +1270,8 @@ Partial Class ElectricMotorForm
Me.Panel1.PerformLayout
Me.Panel2.ResumeLayout(false)
Me.Panel2.PerformLayout
- Me.Panel3.ResumeLayout(false)
- Me.Panel3.PerformLayout
+ Me.pnThermalOverloadRecovery.ResumeLayout(false)
+ Me.pnThermalOverloadRecovery.PerformLayout
Me.Panel4.ResumeLayout(false)
Me.Panel4.PerformLayout
Me.pnOverloadTq.ResumeLayout(false)
@@ -1123,6 +1293,12 @@ Partial Class ElectricMotorForm
Me.Panel9.PerformLayout
Me.Panel10.ResumeLayout(false)
Me.Panel10.PerformLayout
+ Me.pnDragCurve.ResumeLayout(false)
+ Me.pnDragCurve.PerformLayout
+ Me.pnRatedPower.ResumeLayout(false)
+ Me.pnRatedPower.PerformLayout
+ Me.pnElectricMachineType.ResumeLayout(false)
+ Me.pnElectricMachineType.PerformLayout
Me.ResumeLayout(false)
Me.PerformLayout
@@ -1168,7 +1344,7 @@ End Sub
Friend WithEvents lblOvlTime As Label
Friend WithEvents lblOvltimeUnit As Label
Friend WithEvents tbOvlTimeLo As TextBox
- Friend WithEvents Panel3 As Panel
+ Friend WithEvents pnThermalOverloadRecovery As Panel
Friend WithEvents lblOvlRecovery As Label
Friend WithEvents lblOvlRecoveryFactorUnit As Label
Friend WithEvents tbOverloadRecoveryFactor As TextBox
@@ -1225,4 +1401,12 @@ End Sub
Friend WithEvents Label9 As Label
Friend WithEvents Label10 As Label
Friend WithEvents tbContTqHi As TextBox
+ Friend WithEvents pnDragCurve As Panel
+ Friend WithEvents pnRatedPower As Panel
+ Friend WithEvents lblRatedPower As Label
+ Friend WithEvents lblRatedPowerUnit As Label
+ Friend WithEvents tbRatedPower As TextBox
+ Friend WithEvents pnElectricMachineType As Panel
+ Friend WithEvents cbEmType As ComboBox
+ Friend WithEvents lblEmType As Label
End Class
diff --git a/VECTO/GUI/ElectricMotorForm.resx b/VECTO/GUI/ElectricMotorForm.resx
index 81623a24e36cbaf6c70822eb47f982f654db0f27..256f87a53c1585f15c485cb58958cd0eb825b2ad 100644
--- a/VECTO/GUI/ElectricMotorForm.resx
+++ b/VECTO/GUI/ElectricMotorForm.resx
@@ -1,64 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
+<root>
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
diff --git a/VECTO/GUI/ElectricMotorForm.vb b/VECTO/GUI/ElectricMotorForm.vb
index 702d9efabbd26e02377a1053014d5f9a50b1ed11..0b38115a2ca04664191b675cbc4de2ade50fb2b3 100644
--- a/VECTO/GUI/ElectricMotorForm.vb
+++ b/VECTO/GUI/ElectricMotorForm.vb
@@ -53,6 +53,12 @@ Public Class ElectricMotorForm
_changed = False
+ pnThermalOverloadRecovery.Enabled = not cfg.DeclMode
+
+ cbEmType.ValueMember = "Value"
+ cbEmType.DisplayMember = "Label"
+ cbEmType.DataSource = [enum].GetValues(GetType(ElectricMachineType)).Cast(Of ElectricMachineType).Select(Function(type) New With {Key .Value = type, .Label = type.GetLabel()}).ToList()
+
NewEngine()
End Sub
@@ -176,7 +182,7 @@ Public Class ElectricMotorForm
tbOverloadRecoveryFactor.Text = engine.OverloadRecoveryFactor.ToGUIFormat()
tbDragTorque.Text = GetRelativePath(engine.DragCurve.Source, basePath)
-
+ cbEmType.SelectedValue = engine.ElectricMachineType
Dim voltageLevelLow As IElectricMotorVoltageLevel = engine.VoltageLevels.MinBy(function(level) level.VoltageLevel.Value())
Dim voltageLevelHigh As IElectricMotorVoltageLevel = engine.VoltageLevels.MaxBy(function(level) level.VoltageLevel.Value())
@@ -201,6 +207,8 @@ Public Class ElectricMotorForm
tbMapLow.Text = GetRelativePath(voltageLevelLow.PowerMap.First().PowerMap.Source, basePath)
tbVoltageLow.Text = voltageLevelLow.VoltageLevel.Value().ToGUIFormat()
+ tbRatedPower.Text = engine.R85RatedPower.ConvertToKiloWatt().Value.ToGUIFormat()
+
DeclInit()
ElectricMotorFileBrowser.UpdateHistory(file)
@@ -234,6 +242,7 @@ Public Class ElectricMotorForm
em.ModelName = tbMakeModel.Text
If Trim(em.ModelName) = "" Then em.ModelName = "Undefined"
em.MotorInertia = tbInertia.Text.ToDouble(0)
+ em.ElectricMachineType = CType(cbEmType.SelectedValue, ElectricMachineType)
em.PathDrag = tbDragTorque.Text
em.OvlTqLo = tbOverloadTqLo.Text.ToDouble(0)
@@ -259,6 +268,8 @@ Public Class ElectricMotorForm
em.PathMapHi = tbMapHi.Text
em.VoltageLevelHigh = tbVoltageHi.Text.ToDouble(0)
+ em.R85RatedPower = tbRatedPower.Text.ToDouble(0).SI(unit.SI.Kilo.Watt).Cast(of Watt)()
+
If Not em.SaveFile Then
MsgBox("Cannot save to " & file, MsgBoxStyle.Critical)
Return False
@@ -607,4 +618,5 @@ Public Class ElectricMotorForm
OpenFiles(FileRepl(tbMaxTorqueLow.Text, GetPath(_emFile)))
End If
End Sub
+
End Class
diff --git a/VECTO/GUI/GearboxForm.vb b/VECTO/GUI/GearboxForm.vb
index 17d975510c3e8ea4583c0ae6b5c1c3797f7e8c0d..c8ee2e0c8e1dd1a8510466fa2a5557ff097e7807 100644
--- a/VECTO/GUI/GearboxForm.vb
+++ b/VECTO/GUI/GearboxForm.vb
@@ -81,17 +81,11 @@ Public Class GearboxForm
CbGStype.ValueMember = "Value"
CbGStype.DisplayMember = "Label"
- If (Cfg.DeclMode) Then
- CbGStype.DataSource = [Enum].GetValues(GetType(GearboxType)) _
- .Cast(Of GearboxType)() _
- .Where(Function(type) Not type = GearboxType.APTN And (type.ManualTransmission() OrElse type = GearboxType.ATSerial)) _
- .Select(Function(type) New With {Key .Value = type, .Label = type.GetLabel()}).ToList()
- 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 If
+ 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()
+
DeclInit()
_changed = False
diff --git a/VECTO/GUI/IEPCForm.Designer.vb b/VECTO/GUI/IEPCForm.Designer.vb
index 83a875cab437120d005516c1d419ab5a0aea74d8..b725da01b07231db8386434b5343a9ca2b700443 100644
--- a/VECTO/GUI/IEPCForm.Designer.vb
+++ b/VECTO/GUI/IEPCForm.Designer.vb
@@ -62,15 +62,15 @@ Partial Class IEPCForm
Me.TableLayoutPanel6 = New System.Windows.Forms.TableLayoutPanel()
Me.Label47 = New System.Windows.Forms.Label()
Me.lvPowerMap1 = New System.Windows.Forms.ListView()
- Me.ColumnHeader13 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
- Me.ColumnHeader14 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader13 = New System.Windows.Forms.ColumnHeader()
+ Me.ColumnHeader14 = New System.Windows.Forms.ColumnHeader()
Me.tpVoltageLevel = New System.Windows.Forms.TabPage()
Me.GroupBox4 = New System.Windows.Forms.GroupBox()
Me.TableLayoutPanel2 = New System.Windows.Forms.TableLayoutPanel()
Me.Label5 = New System.Windows.Forms.Label()
Me.lvPowerMap2 = New System.Windows.Forms.ListView()
- Me.ColumnHeader6 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
- Me.ColumnHeader7 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader6 = New System.Windows.Forms.ColumnHeader()
+ Me.ColumnHeader7 = New System.Windows.Forms.ColumnHeader()
Me.FlowLayoutPanel10 = New System.Windows.Forms.FlowLayoutPanel()
Me.Label28 = New System.Windows.Forms.Label()
Me.tbFLCurve2 = New System.Windows.Forms.TextBox()
@@ -95,7 +95,6 @@ Partial Class IEPCForm
Me.Label22 = New System.Windows.Forms.Label()
Me.tbOverloadTorque2 = New System.Windows.Forms.TextBox()
Me.Label16 = New System.Windows.Forms.Label()
- Me.Label3 = New System.Windows.Forms.Label()
Me.cbDesignTypeWheelMotor = New System.Windows.Forms.CheckBox()
Me.Label2 = New System.Windows.Forms.Label()
Me.cbDifferentialIncluded = New System.Windows.Forms.CheckBox()
@@ -106,14 +105,14 @@ Partial Class IEPCForm
Me.btRemoveGear = New System.Windows.Forms.Button()
Me.Label6 = New System.Windows.Forms.Label()
Me.lvGear = New System.Windows.Forms.ListView()
- Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
- Me.ColumnHeader2 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
- Me.ColumnHeader3 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader1 = New System.Windows.Forms.ColumnHeader()
+ Me.ColumnHeader2 = New System.Windows.Forms.ColumnHeader()
+ Me.ColumnHeader3 = New System.Windows.Forms.ColumnHeader()
Me.GroupBox3 = New System.Windows.Forms.GroupBox()
Me.TableLayoutPanel3 = New System.Windows.Forms.TableLayoutPanel()
Me.lvDragCurve = New System.Windows.Forms.ListView()
- Me.ColumnHeader4 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
- Me.ColumnHeader5 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader4 = New System.Windows.Forms.ColumnHeader()
+ Me.ColumnHeader5 = New System.Windows.Forms.ColumnHeader()
Me.FlowLayoutPanel11 = New System.Windows.Forms.FlowLayoutPanel()
Me.btAddDragCurve = New System.Windows.Forms.Button()
Me.btRemoveDragCurve = New System.Windows.Forms.Button()
@@ -132,19 +131,27 @@ Partial Class IEPCForm
Me.ButCancel = New System.Windows.Forms.Button()
Me.ButOK = New System.Windows.Forms.Button()
Me.FlowLayoutPanel1 = New System.Windows.Forms.FlowLayoutPanel()
- Me.FlowLayoutPanel4 = New System.Windows.Forms.FlowLayoutPanel()
- Me.FlowLayoutPanel5 = New System.Windows.Forms.FlowLayoutPanel()
+ Me.FlowLayoutPanel4 = New System.Windows.Forms.Panel()
+ Me.FlowLayoutPanel5 = New System.Windows.Forms.Panel()
Me.Label9 = New System.Windows.Forms.Label()
- Me.FlowLayoutPanel6 = New System.Windows.Forms.FlowLayoutPanel()
+ Me.pnInertia = New System.Windows.Forms.Panel()
Me.lblinertiaUnit = New System.Windows.Forms.Label()
- Me.FlowLayoutPanel7 = New System.Windows.Forms.FlowLayoutPanel()
- Me.FlowLayoutPanel8 = New System.Windows.Forms.FlowLayoutPanel()
+ Me.FlowLayoutPanel7 = New System.Windows.Forms.Panel()
+ Me.pnThermalOverloadRecovery = New System.Windows.Forms.Panel()
Me.Label10 = New System.Windows.Forms.Label()
Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
Me.LbStatus = New System.Windows.Forms.ToolStripStatusLabel()
Me.CmOpenFile = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.pnRatedPower = New System.Windows.Forms.Panel()
+ Me.lblRatedPower = New System.Windows.Forms.Label()
+ Me.lblRatedPowerUnit = New System.Windows.Forms.Label()
+ Me.tbRatedPower = New System.Windows.Forms.TextBox()
+ 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
@@ -167,98 +174,99 @@ Partial Class IEPCForm
Me.FlowLayoutPanel1.SuspendLayout
Me.FlowLayoutPanel4.SuspendLayout
Me.FlowLayoutPanel5.SuspendLayout
- Me.FlowLayoutPanel6.SuspendLayout
+ Me.pnInertia.SuspendLayout
Me.FlowLayoutPanel7.SuspendLayout
- Me.FlowLayoutPanel8.SuspendLayout
+ Me.pnThermalOverloadRecovery.SuspendLayout
Me.StatusStrip1.SuspendLayout
Me.CmOpenFile.SuspendLayout
+ Me.pnRatedPower.SuspendLayout
+ Me.pnElectricMachineType.SuspendLayout
Me.SuspendLayout
'
'btFLCurveFile1
'
Me.btFLCurveFile1.Anchor = System.Windows.Forms.AnchorStyles.None
Me.btFLCurveFile1.Image = CType(resources.GetObject("btFLCurveFile1.Image"),System.Drawing.Image)
- Me.btFLCurveFile1.Location = New System.Drawing.Point(425, 1)
+ Me.btFLCurveFile1.Location = New System.Drawing.Point(487, 0)
Me.btFLCurveFile1.Margin = New System.Windows.Forms.Padding(0)
Me.btFLCurveFile1.Name = "btFLCurveFile1"
- Me.btFLCurveFile1.Size = New System.Drawing.Size(24, 24)
+ Me.btFLCurveFile1.Size = New System.Drawing.Size(28, 28)
Me.btFLCurveFile1.TabIndex = 15
- Me.btFLCurveFile1.UseVisualStyleBackColor = True
+ Me.btFLCurveFile1.UseVisualStyleBackColor = true
'
'tbThermalOverload
'
- Me.tbThermalOverload.Anchor = System.Windows.Forms.AnchorStyles.Left
- Me.tbThermalOverload.Location = New System.Drawing.Point(216, 3)
- Me.tbThermalOverload.Margin = New System.Windows.Forms.Padding(30, 3, 3, 3)
+ Me.tbThermalOverload.Location = New System.Drawing.Point(222, 1)
+ Me.tbThermalOverload.Margin = New System.Windows.Forms.Padding(35, 3, 4, 3)
Me.tbThermalOverload.Name = "tbThermalOverload"
- Me.tbThermalOverload.Size = New System.Drawing.Size(56, 20)
+ Me.tbThermalOverload.Size = New System.Drawing.Size(65, 23)
Me.tbThermalOverload.TabIndex = 3
'
'Label52
'
- Me.Label52.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label52.AutoSize = True
- Me.Label52.Location = New System.Drawing.Point(3, 6)
- Me.Label52.Margin = New System.Windows.Forms.Padding(3, 0, 10, 0)
+ Me.Label52.AutoSize = true
+ Me.Label52.Location = New System.Drawing.Point(6, 4)
+ Me.Label52.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label52.Name = "Label52"
- Me.Label52.Size = New System.Drawing.Size(173, 13)
+ Me.Label52.Size = New System.Drawing.Size(188, 15)
Me.Label52.TabIndex = 50
Me.Label52.Text = "Thermal Overload Recovery Factor"
'
'Label48
'
- Me.Label48.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label48.AutoSize = True
- Me.Label48.Location = New System.Drawing.Point(3, 6)
+ Me.Label48.AutoSize = true
+ Me.Label48.Location = New System.Drawing.Point(4, 5)
+ Me.Label48.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label48.Name = "Label48"
- Me.Label48.Size = New System.Drawing.Size(207, 13)
+ Me.Label48.Size = New System.Drawing.Size(227, 15)
Me.Label48.TabIndex = 48
Me.Label48.Text = "Nr of Design Type Wheel Motor Measured"
'
'tbNumberOfDesignTypeWheelMotor
'
- Me.tbNumberOfDesignTypeWheelMotor.Anchor = System.Windows.Forms.AnchorStyles.Left
- Me.tbNumberOfDesignTypeWheelMotor.Enabled = False
- Me.tbNumberOfDesignTypeWheelMotor.Location = New System.Drawing.Point(216, 3)
+ Me.tbNumberOfDesignTypeWheelMotor.Enabled = false
+ Me.tbNumberOfDesignTypeWheelMotor.Location = New System.Drawing.Point(254, 2)
+ Me.tbNumberOfDesignTypeWheelMotor.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbNumberOfDesignTypeWheelMotor.Name = "tbNumberOfDesignTypeWheelMotor"
- Me.tbNumberOfDesignTypeWheelMotor.Size = New System.Drawing.Size(30, 20)
+ Me.tbNumberOfDesignTypeWheelMotor.Size = New System.Drawing.Size(34, 23)
Me.tbNumberOfDesignTypeWheelMotor.TabIndex = 5
'
'Label51
'
- Me.Label51.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label51.AutoSize = True
- Me.Label51.Location = New System.Drawing.Point(3, 6)
+ Me.Label51.AutoSize = true
+ Me.Label51.Location = New System.Drawing.Point(5, 7)
+ Me.Label51.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label51.Name = "Label51"
- Me.Label51.Size = New System.Drawing.Size(36, 13)
+ Me.Label51.Size = New System.Drawing.Size(40, 15)
Me.Label51.TabIndex = 45
Me.Label51.Text = "Inertia"
'
'tbInertia
'
- Me.tbInertia.Anchor = System.Windows.Forms.AnchorStyles.Left
- Me.tbInertia.Location = New System.Drawing.Point(45, 3)
+ Me.tbInertia.Location = New System.Drawing.Point(222, 4)
+ Me.tbInertia.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbInertia.Name = "tbInertia"
- Me.tbInertia.Size = New System.Drawing.Size(57, 20)
+ Me.tbInertia.Size = New System.Drawing.Size(66, 23)
Me.tbInertia.TabIndex = 2
'
'Label49
'
Me.Label49.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label49.AutoSize = True
- Me.Label49.Location = New System.Drawing.Point(3, 6)
+ Me.Label49.AutoSize = true
+ Me.Label49.Location = New System.Drawing.Point(4, 7)
+ Me.Label49.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label49.Name = "Label49"
- Me.Label49.Size = New System.Drawing.Size(87, 13)
+ Me.Label49.Size = New System.Drawing.Size(96, 15)
Me.Label49.TabIndex = 43
Me.Label49.Text = "Make and Model"
'
'tbModel
'
Me.tbModel.Anchor = System.Windows.Forms.AnchorStyles.Left
- Me.tbModel.Location = New System.Drawing.Point(96, 3)
- Me.tbModel.Margin = New System.Windows.Forms.Padding(3, 3, 0, 3)
+ Me.tbModel.Location = New System.Drawing.Point(108, 3)
+ Me.tbModel.Margin = New System.Windows.Forms.Padding(4, 3, 0, 3)
Me.tbModel.Name = "tbModel"
- Me.tbModel.Size = New System.Drawing.Size(414, 20)
+ Me.tbModel.Size = New System.Drawing.Size(482, 23)
Me.tbModel.TabIndex = 1
'
'tcVoltageLevels
@@ -266,10 +274,11 @@ Partial Class IEPCForm
Me.tcVoltageLevels.Anchor = System.Windows.Forms.AnchorStyles.Top
Me.tcVoltageLevels.Controls.Add(Me.tpFirstVoltageLevel)
Me.tcVoltageLevels.Controls.Add(Me.tpVoltageLevel)
- Me.tcVoltageLevels.Location = New System.Drawing.Point(16, 207)
+ Me.tcVoltageLevels.Location = New System.Drawing.Point(19, 246)
+ Me.tcVoltageLevels.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tcVoltageLevels.Name = "tcVoltageLevels"
Me.tcVoltageLevels.SelectedIndex = 0
- Me.tcVoltageLevels.Size = New System.Drawing.Size(517, 322)
+ Me.tcVoltageLevels.Size = New System.Drawing.Size(603, 372)
Me.tcVoltageLevels.TabIndex = 107
'
'tpFirstVoltageLevel
@@ -277,13 +286,14 @@ Partial Class IEPCForm
Me.tpFirstVoltageLevel.Controls.Add(Me.FlowLayoutPanel9)
Me.tpFirstVoltageLevel.Controls.Add(Me.TableLayoutPanel1)
Me.tpFirstVoltageLevel.Controls.Add(Me.GroupBox2)
- Me.tpFirstVoltageLevel.Location = New System.Drawing.Point(4, 22)
+ Me.tpFirstVoltageLevel.Location = New System.Drawing.Point(4, 24)
+ Me.tpFirstVoltageLevel.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tpFirstVoltageLevel.Name = "tpFirstVoltageLevel"
- Me.tpFirstVoltageLevel.Padding = New System.Windows.Forms.Padding(3)
- Me.tpFirstVoltageLevel.Size = New System.Drawing.Size(509, 296)
+ Me.tpFirstVoltageLevel.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.tpFirstVoltageLevel.Size = New System.Drawing.Size(595, 344)
Me.tpFirstVoltageLevel.TabIndex = 0
Me.tpFirstVoltageLevel.Text = "Voltage Level Low"
- Me.tpFirstVoltageLevel.UseVisualStyleBackColor = True
+ Me.tpFirstVoltageLevel.UseVisualStyleBackColor = true
'
'FlowLayoutPanel9
'
@@ -292,52 +302,53 @@ Partial Class IEPCForm
Me.FlowLayoutPanel9.Controls.Add(Me.tbFLCurve1)
Me.FlowLayoutPanel9.Controls.Add(Me.btFLCurveFile1)
Me.FlowLayoutPanel9.Controls.Add(Me.btShowFLCurve1)
- Me.FlowLayoutPanel9.Location = New System.Drawing.Point(6, 94)
+ Me.FlowLayoutPanel9.Location = New System.Drawing.Point(7, 108)
+ Me.FlowLayoutPanel9.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.FlowLayoutPanel9.Name = "FlowLayoutPanel9"
- Me.FlowLayoutPanel9.Size = New System.Drawing.Size(496, 26)
+ Me.FlowLayoutPanel9.Size = New System.Drawing.Size(579, 30)
Me.FlowLayoutPanel9.TabIndex = 108
'
'Label44
'
Me.Label44.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label44.AutoSize = True
- Me.Label44.Location = New System.Drawing.Point(14, 6)
- Me.Label44.Margin = New System.Windows.Forms.Padding(14, 0, 0, 0)
+ Me.Label44.AutoSize = true
+ Me.Label44.Location = New System.Drawing.Point(16, 7)
+ Me.Label44.Margin = New System.Windows.Forms.Padding(16, 0, 0, 0)
Me.Label44.Name = "Label44"
- Me.Label44.Size = New System.Drawing.Size(125, 13)
+ Me.Label44.Size = New System.Drawing.Size(138, 15)
Me.Label44.TabIndex = 59
Me.Label44.Text = "Full Load Curve (.viepcp)"
'
'tbFLCurve1
'
Me.tbFLCurve1.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbFLCurve1.Location = New System.Drawing.Point(142, 3)
- Me.tbFLCurve1.Margin = New System.Windows.Forms.Padding(3, 3, 6, 3)
+ Me.tbFLCurve1.Location = New System.Drawing.Point(158, 3)
+ Me.tbFLCurve1.Margin = New System.Windows.Forms.Padding(4, 3, 7, 3)
Me.tbFLCurve1.Name = "tbFLCurve1"
- Me.tbFLCurve1.Size = New System.Drawing.Size(277, 20)
+ Me.tbFLCurve1.Size = New System.Drawing.Size(322, 23)
Me.tbFLCurve1.TabIndex = 14
'
'btShowFLCurve1
'
Me.btShowFLCurve1.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btShowFLCurve1.Location = New System.Drawing.Point(449, 1)
+ Me.btShowFLCurve1.Location = New System.Drawing.Point(515, 1)
Me.btShowFLCurve1.Margin = New System.Windows.Forms.Padding(0, 1, 0, 0)
Me.btShowFLCurve1.Name = "btShowFLCurve1"
- Me.btShowFLCurve1.Size = New System.Drawing.Size(24, 24)
+ Me.btShowFLCurve1.Size = New System.Drawing.Size(28, 28)
Me.btShowFLCurve1.TabIndex = 85
- Me.btShowFLCurve1.TabStop = False
- Me.btShowFLCurve1.UseVisualStyleBackColor = True
+ Me.btShowFLCurve1.TabStop = false
+ Me.btShowFLCurve1.UseVisualStyleBackColor = true
'
'TableLayoutPanel1
'
Me.TableLayoutPanel1.ColumnCount = 7
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 140.0!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 62.0!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 30.0!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 128.0!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 62.0!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 30.0!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 59.0!))
+ 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, 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.Controls.Add(Me.Label11, 2, 1)
Me.TableLayoutPanel1.Controls.Add(Me.Label4, 2, 0)
Me.TableLayoutPanel1.Controls.Add(Me.Label13, 5, 0)
@@ -356,190 +367,199 @@ Partial Class IEPCForm
Me.TableLayoutPanel1.Controls.Add(Me.Label41, 3, 1)
Me.TableLayoutPanel1.Controls.Add(Me.tbOverloadTorque1, 4, 1)
Me.TableLayoutPanel1.Controls.Add(Me.Label12, 5, 1)
- Me.TableLayoutPanel1.Location = New System.Drawing.Point(6, 7)
+ Me.TableLayoutPanel1.Location = New System.Drawing.Point(7, 8)
+ Me.TableLayoutPanel1.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
Me.TableLayoutPanel1.RowCount = 3
- Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27.0!))
- Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27.0!))
- Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27.0!))
- Me.TableLayoutPanel1.Size = New System.Drawing.Size(496, 82)
+ Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 31!))
+ Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 31!))
+ Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 31!))
+ Me.TableLayoutPanel1.Size = New System.Drawing.Size(579, 95)
Me.TableLayoutPanel1.TabIndex = 107
'
'Label11
'
Me.Label11.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label11.AutoSize = True
- Me.Label11.Location = New System.Drawing.Point(202, 34)
+ Me.Label11.AutoSize = true
+ Me.Label11.Location = New System.Drawing.Point(235, 39)
Me.Label11.Margin = New System.Windows.Forms.Padding(0)
Me.Label11.Name = "Label11"
- Me.Label11.Size = New System.Drawing.Size(29, 13)
+ Me.Label11.Size = New System.Drawing.Size(35, 15)
Me.Label11.TabIndex = 63
Me.Label11.Text = "[Nm]"
'
'Label4
'
Me.Label4.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label4.AutoSize = True
- Me.Label4.Location = New System.Drawing.Point(207, 7)
+ Me.Label4.AutoSize = true
+ Me.Label4.Location = New System.Drawing.Point(241, 8)
Me.Label4.Margin = New System.Windows.Forms.Padding(0)
Me.Label4.Name = "Label4"
- Me.Label4.Size = New System.Drawing.Size(20, 13)
+ Me.Label4.Size = New System.Drawing.Size(22, 15)
Me.Label4.TabIndex = 62
Me.Label4.Text = "[V]"
'
'Label13
'
Me.Label13.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label13.AutoSize = True
- Me.Label13.Location = New System.Drawing.Point(428, 7)
+ Me.Label13.AutoSize = true
+ Me.Label13.Location = New System.Drawing.Point(498, 8)
Me.Label13.Margin = New System.Windows.Forms.Padding(0)
Me.Label13.Name = "Label13"
- Me.Label13.Size = New System.Drawing.Size(18, 13)
+ Me.Label13.Size = New System.Drawing.Size(20, 15)
Me.Label13.TabIndex = 65
Me.Label13.Text = "[s]"
'
'Label43
'
Me.Label43.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label43.AutoSize = True
- Me.Label43.Location = New System.Drawing.Point(281, 7)
+ Me.Label43.AutoSize = true
+ Me.Label43.Location = New System.Drawing.Point(331, 8)
+ Me.Label43.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label43.Name = "Label43"
- Me.Label43.Size = New System.Drawing.Size(76, 13)
+ Me.Label43.Size = New System.Drawing.Size(84, 15)
Me.Label43.TabIndex = 11
Me.Label43.Text = "Overload Time"
'
'Label37
'
Me.Label37.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label37.AutoSize = True
- Me.Label37.Location = New System.Drawing.Point(94, 7)
+ Me.Label37.AutoSize = true
+ Me.Label37.Location = New System.Drawing.Point(113, 8)
+ Me.Label37.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label37.Name = "Label37"
- Me.Label37.Size = New System.Drawing.Size(43, 13)
+ Me.Label37.Size = New System.Drawing.Size(46, 15)
Me.Label37.TabIndex = 1
Me.Label37.Text = "Voltage"
'
'tbOverloadTime1
'
Me.tbOverloadTime1.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbOverloadTime1.Location = New System.Drawing.Point(363, 3)
+ Me.tbOverloadTime1.Location = New System.Drawing.Point(422, 4)
Me.tbOverloadTime1.Margin = New System.Windows.Forms.Padding(0)
Me.tbOverloadTime1.Name = "tbOverloadTime1"
- Me.tbOverloadTime1.Size = New System.Drawing.Size(56, 20)
+ Me.tbOverloadTime1.Size = New System.Drawing.Size(65, 23)
Me.tbOverloadTime1.TabIndex = 11
'
'tbVoltage1
'
Me.tbVoltage1.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbVoltage1.Location = New System.Drawing.Point(143, 3)
+ Me.tbVoltage1.Location = New System.Drawing.Point(166, 4)
Me.tbVoltage1.Margin = New System.Windows.Forms.Padding(0)
Me.tbVoltage1.Name = "tbVoltage1"
- Me.tbVoltage1.Size = New System.Drawing.Size(56, 20)
+ Me.tbVoltage1.Size = New System.Drawing.Size(65, 23)
Me.tbVoltage1.TabIndex = 8
'
'Label39
'
Me.Label39.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label39.AutoSize = True
- Me.Label39.Location = New System.Drawing.Point(40, 34)
+ Me.Label39.AutoSize = true
+ Me.Label39.Location = New System.Drawing.Point(51, 39)
+ Me.Label39.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label39.Name = "Label39"
- Me.Label39.Size = New System.Drawing.Size(97, 13)
+ Me.Label39.Size = New System.Drawing.Size(108, 15)
Me.Label39.TabIndex = 3
Me.Label39.Text = "Continuous Torque"
'
'Label1
'
Me.Label1.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label1.AutoSize = True
- Me.Label1.Location = New System.Drawing.Point(6, 61)
+ Me.Label1.AutoSize = true
+ Me.Label1.Location = New System.Drawing.Point(16, 71)
+ Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label1.Name = "Label1"
- Me.Label1.Size = New System.Drawing.Size(131, 13)
+ Me.Label1.Size = New System.Drawing.Size(143, 15)
Me.Label1.TabIndex = 6
Me.Label1.Text = "Continuous Torque Speed"
'
'tbContinousTorque1
'
Me.tbContinousTorque1.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbContinousTorque1.Location = New System.Drawing.Point(143, 30)
+ Me.tbContinousTorque1.Location = New System.Drawing.Point(166, 35)
Me.tbContinousTorque1.Margin = New System.Windows.Forms.Padding(0)
Me.tbContinousTorque1.Name = "tbContinousTorque1"
- Me.tbContinousTorque1.Size = New System.Drawing.Size(56, 20)
+ Me.tbContinousTorque1.Size = New System.Drawing.Size(65, 23)
Me.tbContinousTorque1.TabIndex = 9
'
'tbContinousTorqueSpeed1
'
Me.tbContinousTorqueSpeed1.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbContinousTorqueSpeed1.Location = New System.Drawing.Point(143, 58)
+ Me.tbContinousTorqueSpeed1.Location = New System.Drawing.Point(166, 67)
Me.tbContinousTorqueSpeed1.Margin = New System.Windows.Forms.Padding(0)
Me.tbContinousTorqueSpeed1.Name = "tbContinousTorqueSpeed1"
- Me.tbContinousTorqueSpeed1.Size = New System.Drawing.Size(56, 20)
+ Me.tbContinousTorqueSpeed1.Size = New System.Drawing.Size(65, 23)
Me.tbContinousTorqueSpeed1.TabIndex = 10
'
'Label15
'
Me.Label15.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label15.AutoSize = True
- Me.Label15.Location = New System.Drawing.Point(202, 61)
+ Me.Label15.AutoSize = true
+ Me.Label15.Location = New System.Drawing.Point(236, 63)
Me.Label15.Margin = New System.Windows.Forms.Padding(0)
Me.Label15.Name = "Label15"
- Me.Label15.Size = New System.Drawing.Size(30, 13)
+ Me.Label15.Size = New System.Drawing.Size(33, 30)
Me.Label15.TabIndex = 67
Me.Label15.Text = "[rpm]"
'
'Label42
'
Me.Label42.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label42.AutoSize = True
- Me.Label42.Location = New System.Drawing.Point(236, 61)
+ Me.Label42.AutoSize = true
+ Me.Label42.Location = New System.Drawing.Point(286, 71)
+ Me.Label42.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label42.Name = "Label42"
- Me.Label42.Size = New System.Drawing.Size(121, 13)
+ Me.Label42.Size = New System.Drawing.Size(129, 15)
Me.Label42.TabIndex = 9
Me.Label42.Text = "Overload Torque Speed"
'
'Label14
'
Me.Label14.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label14.AutoSize = True
- Me.Label14.Location = New System.Drawing.Point(422, 61)
+ Me.Label14.AutoSize = true
+ Me.Label14.Location = New System.Drawing.Point(492, 63)
Me.Label14.Margin = New System.Windows.Forms.Padding(0)
Me.Label14.Name = "Label14"
- Me.Label14.Size = New System.Drawing.Size(30, 13)
+ Me.Label14.Size = New System.Drawing.Size(33, 30)
Me.Label14.TabIndex = 66
Me.Label14.Text = "[rpm]"
'
'tboverloadTorqueSpeed1
'
Me.tboverloadTorqueSpeed1.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tboverloadTorqueSpeed1.Location = New System.Drawing.Point(363, 58)
+ Me.tboverloadTorqueSpeed1.Location = New System.Drawing.Point(423, 67)
+ Me.tboverloadTorqueSpeed1.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tboverloadTorqueSpeed1.Name = "tboverloadTorqueSpeed1"
- Me.tboverloadTorqueSpeed1.Size = New System.Drawing.Size(56, 20)
+ Me.tboverloadTorqueSpeed1.Size = New System.Drawing.Size(64, 23)
Me.tboverloadTorqueSpeed1.TabIndex = 13
'
'Label41
'
Me.Label41.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label41.AutoSize = True
- Me.Label41.Location = New System.Drawing.Point(270, 34)
+ Me.Label41.AutoSize = true
+ Me.Label41.Location = New System.Drawing.Point(321, 39)
+ Me.Label41.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label41.Name = "Label41"
- Me.Label41.Size = New System.Drawing.Size(87, 13)
+ Me.Label41.Size = New System.Drawing.Size(94, 15)
Me.Label41.TabIndex = 7
Me.Label41.Text = "Overload Torque"
'
'tbOverloadTorque1
'
Me.tbOverloadTorque1.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbOverloadTorque1.Location = New System.Drawing.Point(363, 30)
+ Me.tbOverloadTorque1.Location = New System.Drawing.Point(423, 35)
+ Me.tbOverloadTorque1.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbOverloadTorque1.Name = "tbOverloadTorque1"
- Me.tbOverloadTorque1.Size = New System.Drawing.Size(56, 20)
+ Me.tbOverloadTorque1.Size = New System.Drawing.Size(64, 23)
Me.tbOverloadTorque1.TabIndex = 12
'
'Label12
'
Me.Label12.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label12.AutoSize = True
- Me.Label12.Location = New System.Drawing.Point(422, 34)
+ Me.Label12.AutoSize = true
+ Me.Label12.Location = New System.Drawing.Point(491, 39)
Me.Label12.Margin = New System.Windows.Forms.Padding(0)
Me.Label12.Name = "Label12"
- Me.Label12.Size = New System.Drawing.Size(29, 13)
+ Me.Label12.Size = New System.Drawing.Size(35, 15)
Me.Label12.TabIndex = 64
Me.Label12.Text = "[Nm]"
'
@@ -547,57 +567,61 @@ Partial Class IEPCForm
'
Me.GroupBox2.Anchor = System.Windows.Forms.AnchorStyles.Top
Me.GroupBox2.Controls.Add(Me.TableLayoutPanel6)
- Me.GroupBox2.Location = New System.Drawing.Point(6, 126)
+ Me.GroupBox2.Location = New System.Drawing.Point(7, 145)
+ Me.GroupBox2.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.GroupBox2.Name = "GroupBox2"
- Me.GroupBox2.Size = New System.Drawing.Size(315, 162)
+ Me.GroupBox2.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.GroupBox2.Size = New System.Drawing.Size(368, 187)
Me.GroupBox2.TabIndex = 60
- Me.GroupBox2.TabStop = False
+ Me.GroupBox2.TabStop = false
Me.GroupBox2.Text = "Power Map Per Gear"
'
'TableLayoutPanel6
'
Me.TableLayoutPanel6.Anchor = System.Windows.Forms.AnchorStyles.None
Me.TableLayoutPanel6.ColumnCount = 2
- Me.TableLayoutPanel6.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 129.0!))
- Me.TableLayoutPanel6.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 169.0!))
+ Me.TableLayoutPanel6.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 150!))
+ Me.TableLayoutPanel6.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 197!))
Me.TableLayoutPanel6.Controls.Add(Me.Label47, 1, 1)
Me.TableLayoutPanel6.Controls.Add(Me.lvPowerMap1, 0, 0)
- Me.TableLayoutPanel6.Location = New System.Drawing.Point(6, 13)
+ Me.TableLayoutPanel6.Location = New System.Drawing.Point(7, 15)
+ Me.TableLayoutPanel6.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.TableLayoutPanel6.Name = "TableLayoutPanel6"
Me.TableLayoutPanel6.RowCount = 2
Me.TableLayoutPanel6.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 88.81119!))
Me.TableLayoutPanel6.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.18881!))
- Me.TableLayoutPanel6.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20.0!))
- Me.TableLayoutPanel6.Size = New System.Drawing.Size(298, 143)
+ Me.TableLayoutPanel6.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 23!))
+ Me.TableLayoutPanel6.Size = New System.Drawing.Size(348, 165)
Me.TableLayoutPanel6.TabIndex = 53
'
'Label47
'
- Me.Label47.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.Label47.AutoSize = True
- Me.Label47.Location = New System.Drawing.Point(189, 127)
+ Me.Label47.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.Label47.AutoSize = true
+ Me.Label47.Location = New System.Drawing.Point(223, 146)
+ Me.Label47.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label47.Name = "Label47"
- Me.Label47.Size = New System.Drawing.Size(106, 13)
+ Me.Label47.Size = New System.Drawing.Size(121, 15)
Me.Label47.TabIndex = 6
Me.Label47.Text = "(Double-Click to Edit)"
'
'lvPowerMap1
'
- Me.lvPowerMap1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
- Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.lvPowerMap1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.lvPowerMap1.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader13, Me.ColumnHeader14})
Me.TableLayoutPanel6.SetColumnSpan(Me.lvPowerMap1, 2)
- Me.lvPowerMap1.FullRowSelect = True
- Me.lvPowerMap1.GridLines = True
- Me.lvPowerMap1.HideSelection = False
- Me.lvPowerMap1.Location = New System.Drawing.Point(3, 3)
- Me.lvPowerMap1.MultiSelect = False
+ Me.lvPowerMap1.FullRowSelect = true
+ Me.lvPowerMap1.GridLines = true
+ Me.lvPowerMap1.Location = New System.Drawing.Point(4, 3)
+ Me.lvPowerMap1.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.lvPowerMap1.MultiSelect = false
Me.lvPowerMap1.Name = "lvPowerMap1"
- Me.lvPowerMap1.Size = New System.Drawing.Size(292, 121)
+ Me.lvPowerMap1.Size = New System.Drawing.Size(340, 140)
Me.lvPowerMap1.TabIndex = 108
- Me.lvPowerMap1.TabStop = False
- Me.lvPowerMap1.UseCompatibleStateImageBehavior = False
+ Me.lvPowerMap1.TabStop = false
+ Me.lvPowerMap1.UseCompatibleStateImageBehavior = false
Me.lvPowerMap1.View = System.Windows.Forms.View.Details
'
'ColumnHeader13
@@ -615,69 +639,74 @@ Partial Class IEPCForm
Me.tpVoltageLevel.Controls.Add(Me.GroupBox4)
Me.tpVoltageLevel.Controls.Add(Me.FlowLayoutPanel10)
Me.tpVoltageLevel.Controls.Add(Me.TableLayoutPanel4)
- Me.tpVoltageLevel.Location = New System.Drawing.Point(4, 22)
+ Me.tpVoltageLevel.Location = New System.Drawing.Point(4, 24)
+ Me.tpVoltageLevel.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tpVoltageLevel.Name = "tpVoltageLevel"
- Me.tpVoltageLevel.Padding = New System.Windows.Forms.Padding(3)
- Me.tpVoltageLevel.Size = New System.Drawing.Size(509, 296)
+ Me.tpVoltageLevel.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.tpVoltageLevel.Size = New System.Drawing.Size(595, 344)
Me.tpVoltageLevel.TabIndex = 1
Me.tpVoltageLevel.Text = "Voltage Level High"
- Me.tpVoltageLevel.UseVisualStyleBackColor = True
+ Me.tpVoltageLevel.UseVisualStyleBackColor = true
'
'GroupBox4
'
Me.GroupBox4.Anchor = System.Windows.Forms.AnchorStyles.Top
Me.GroupBox4.Controls.Add(Me.TableLayoutPanel2)
- Me.GroupBox4.Location = New System.Drawing.Point(6, 126)
+ Me.GroupBox4.Location = New System.Drawing.Point(7, 145)
+ Me.GroupBox4.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.GroupBox4.Name = "GroupBox4"
- Me.GroupBox4.Size = New System.Drawing.Size(315, 162)
+ Me.GroupBox4.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.GroupBox4.Size = New System.Drawing.Size(368, 187)
Me.GroupBox4.TabIndex = 75
- Me.GroupBox4.TabStop = False
+ Me.GroupBox4.TabStop = false
Me.GroupBox4.Text = "Power Map Per Gear"
'
'TableLayoutPanel2
'
Me.TableLayoutPanel2.Anchor = System.Windows.Forms.AnchorStyles.None
Me.TableLayoutPanel2.ColumnCount = 2
- Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 129.0!))
- Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 169.0!))
+ Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 150!))
+ Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 197!))
Me.TableLayoutPanel2.Controls.Add(Me.Label5, 1, 1)
Me.TableLayoutPanel2.Controls.Add(Me.lvPowerMap2, 0, 0)
- Me.TableLayoutPanel2.Location = New System.Drawing.Point(6, 13)
+ Me.TableLayoutPanel2.Location = New System.Drawing.Point(7, 15)
+ Me.TableLayoutPanel2.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.TableLayoutPanel2.Name = "TableLayoutPanel2"
Me.TableLayoutPanel2.RowCount = 2
Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 88.81119!))
Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.18881!))
- Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20.0!))
- Me.TableLayoutPanel2.Size = New System.Drawing.Size(298, 143)
+ Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 23!))
+ Me.TableLayoutPanel2.Size = New System.Drawing.Size(348, 165)
Me.TableLayoutPanel2.TabIndex = 53
'
'Label5
'
- Me.Label5.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.Label5.AutoSize = True
- Me.Label5.Location = New System.Drawing.Point(189, 127)
+ Me.Label5.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.Label5.AutoSize = true
+ Me.Label5.Location = New System.Drawing.Point(223, 146)
+ Me.Label5.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label5.Name = "Label5"
- Me.Label5.Size = New System.Drawing.Size(106, 13)
+ Me.Label5.Size = New System.Drawing.Size(121, 15)
Me.Label5.TabIndex = 6
Me.Label5.Text = "(Double-Click to Edit)"
'
'lvPowerMap2
'
- Me.lvPowerMap2.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
- Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.lvPowerMap2.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.lvPowerMap2.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader6, Me.ColumnHeader7})
Me.TableLayoutPanel2.SetColumnSpan(Me.lvPowerMap2, 2)
- Me.lvPowerMap2.FullRowSelect = True
- Me.lvPowerMap2.GridLines = True
- Me.lvPowerMap2.HideSelection = False
- Me.lvPowerMap2.Location = New System.Drawing.Point(3, 3)
- Me.lvPowerMap2.MultiSelect = False
+ Me.lvPowerMap2.FullRowSelect = true
+ Me.lvPowerMap2.GridLines = true
+ Me.lvPowerMap2.Location = New System.Drawing.Point(4, 3)
+ Me.lvPowerMap2.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.lvPowerMap2.MultiSelect = false
Me.lvPowerMap2.Name = "lvPowerMap2"
- Me.lvPowerMap2.Size = New System.Drawing.Size(292, 121)
+ Me.lvPowerMap2.Size = New System.Drawing.Size(340, 140)
Me.lvPowerMap2.TabIndex = 109
- Me.lvPowerMap2.TabStop = False
- Me.lvPowerMap2.UseCompatibleStateImageBehavior = False
+ Me.lvPowerMap2.TabStop = false
+ Me.lvPowerMap2.UseCompatibleStateImageBehavior = false
Me.lvPowerMap2.View = System.Windows.Forms.View.Details
'
'ColumnHeader6
@@ -696,64 +725,65 @@ Partial Class IEPCForm
Me.FlowLayoutPanel10.Controls.Add(Me.tbFLCurve2)
Me.FlowLayoutPanel10.Controls.Add(Me.btFLCurveFile2)
Me.FlowLayoutPanel10.Controls.Add(Me.btShowFLCurve2)
- Me.FlowLayoutPanel10.Location = New System.Drawing.Point(6, 94)
+ Me.FlowLayoutPanel10.Location = New System.Drawing.Point(7, 108)
+ Me.FlowLayoutPanel10.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.FlowLayoutPanel10.Name = "FlowLayoutPanel10"
- Me.FlowLayoutPanel10.Size = New System.Drawing.Size(496, 26)
+ Me.FlowLayoutPanel10.Size = New System.Drawing.Size(579, 30)
Me.FlowLayoutPanel10.TabIndex = 110
'
'Label28
'
Me.Label28.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label28.AutoSize = True
- Me.Label28.Location = New System.Drawing.Point(14, 6)
- Me.Label28.Margin = New System.Windows.Forms.Padding(14, 0, 0, 0)
+ Me.Label28.AutoSize = true
+ Me.Label28.Location = New System.Drawing.Point(16, 7)
+ Me.Label28.Margin = New System.Windows.Forms.Padding(16, 0, 0, 0)
Me.Label28.Name = "Label28"
- Me.Label28.Size = New System.Drawing.Size(125, 13)
+ Me.Label28.Size = New System.Drawing.Size(138, 15)
Me.Label28.TabIndex = 59
Me.Label28.Text = "Full Load Curve (.viepcp)"
'
'tbFLCurve2
'
Me.tbFLCurve2.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbFLCurve2.Location = New System.Drawing.Point(142, 3)
- Me.tbFLCurve2.Margin = New System.Windows.Forms.Padding(3, 3, 6, 3)
+ Me.tbFLCurve2.Location = New System.Drawing.Point(158, 3)
+ Me.tbFLCurve2.Margin = New System.Windows.Forms.Padding(4, 3, 7, 3)
Me.tbFLCurve2.Name = "tbFLCurve2"
- Me.tbFLCurve2.Size = New System.Drawing.Size(277, 20)
+ Me.tbFLCurve2.Size = New System.Drawing.Size(322, 23)
Me.tbFLCurve2.TabIndex = 23
'
'btFLCurveFile2
'
Me.btFLCurveFile2.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.btFLCurveFile2.Image = CType(resources.GetObject("btFLCurveFile2.Image"), System.Drawing.Image)
- Me.btFLCurveFile2.Location = New System.Drawing.Point(425, 1)
+ Me.btFLCurveFile2.Image = CType(resources.GetObject("btFLCurveFile2.Image"),System.Drawing.Image)
+ Me.btFLCurveFile2.Location = New System.Drawing.Point(487, 0)
Me.btFLCurveFile2.Margin = New System.Windows.Forms.Padding(0)
Me.btFLCurveFile2.Name = "btFLCurveFile2"
- Me.btFLCurveFile2.Size = New System.Drawing.Size(24, 24)
+ Me.btFLCurveFile2.Size = New System.Drawing.Size(28, 28)
Me.btFLCurveFile2.TabIndex = 24
- Me.btFLCurveFile2.UseVisualStyleBackColor = True
+ Me.btFLCurveFile2.UseVisualStyleBackColor = true
'
'btShowFLCurve2
'
Me.btShowFLCurve2.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btShowFLCurve2.Location = New System.Drawing.Point(449, 1)
+ Me.btShowFLCurve2.Location = New System.Drawing.Point(515, 1)
Me.btShowFLCurve2.Margin = New System.Windows.Forms.Padding(0, 1, 0, 0)
Me.btShowFLCurve2.Name = "btShowFLCurve2"
- Me.btShowFLCurve2.Size = New System.Drawing.Size(24, 24)
+ Me.btShowFLCurve2.Size = New System.Drawing.Size(28, 28)
Me.btShowFLCurve2.TabIndex = 85
- Me.btShowFLCurve2.TabStop = False
- Me.btShowFLCurve2.UseVisualStyleBackColor = True
+ Me.btShowFLCurve2.TabStop = false
+ Me.btShowFLCurve2.UseVisualStyleBackColor = true
'
'TableLayoutPanel4
'
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, 140.0!))
- Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 62.0!))
- Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 30.0!))
- Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 128.0!))
- Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 62.0!))
- Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 30.0!))
- Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 59.0!))
+ 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, 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.Controls.Add(Me.Label17, 2, 1)
Me.TableLayoutPanel4.Controls.Add(Me.Label18, 2, 0)
Me.TableLayoutPanel4.Controls.Add(Me.Label26, 5, 0)
@@ -772,315 +802,321 @@ Partial Class IEPCForm
Me.TableLayoutPanel4.Controls.Add(Me.Label22, 3, 1)
Me.TableLayoutPanel4.Controls.Add(Me.tbOverloadTorque2, 4, 1)
Me.TableLayoutPanel4.Controls.Add(Me.Label16, 5, 1)
- Me.TableLayoutPanel4.Location = New System.Drawing.Point(6, 7)
+ Me.TableLayoutPanel4.Location = New System.Drawing.Point(7, 8)
+ Me.TableLayoutPanel4.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.TableLayoutPanel4.Name = "TableLayoutPanel4"
Me.TableLayoutPanel4.RowCount = 3
- Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27.0!))
- Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27.0!))
- Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27.0!))
- Me.TableLayoutPanel4.Size = New System.Drawing.Size(496, 82)
+ Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 31!))
+ Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 31!))
+ Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 31!))
+ Me.TableLayoutPanel4.Size = New System.Drawing.Size(579, 95)
Me.TableLayoutPanel4.TabIndex = 109
'
'Label17
'
Me.Label17.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label17.AutoSize = True
- Me.Label17.Location = New System.Drawing.Point(202, 34)
+ Me.Label17.AutoSize = true
+ Me.Label17.Location = New System.Drawing.Point(235, 39)
Me.Label17.Margin = New System.Windows.Forms.Padding(0)
Me.Label17.Name = "Label17"
- Me.Label17.Size = New System.Drawing.Size(29, 13)
+ Me.Label17.Size = New System.Drawing.Size(35, 15)
Me.Label17.TabIndex = 63
Me.Label17.Text = "[Nm]"
'
'Label18
'
Me.Label18.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label18.AutoSize = True
- Me.Label18.Location = New System.Drawing.Point(207, 7)
+ Me.Label18.AutoSize = true
+ Me.Label18.Location = New System.Drawing.Point(241, 8)
Me.Label18.Margin = New System.Windows.Forms.Padding(0)
Me.Label18.Name = "Label18"
- Me.Label18.Size = New System.Drawing.Size(20, 13)
+ Me.Label18.Size = New System.Drawing.Size(22, 15)
Me.Label18.TabIndex = 62
Me.Label18.Text = "[V]"
'
'Label26
'
Me.Label26.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label26.AutoSize = True
- Me.Label26.Location = New System.Drawing.Point(428, 7)
+ Me.Label26.AutoSize = true
+ Me.Label26.Location = New System.Drawing.Point(498, 8)
Me.Label26.Margin = New System.Windows.Forms.Padding(0)
Me.Label26.Name = "Label26"
- Me.Label26.Size = New System.Drawing.Size(18, 13)
+ Me.Label26.Size = New System.Drawing.Size(20, 15)
Me.Label26.TabIndex = 65
Me.Label26.Text = "[s]"
'
'Label19
'
Me.Label19.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label19.AutoSize = True
- Me.Label19.Location = New System.Drawing.Point(94, 7)
+ Me.Label19.AutoSize = true
+ Me.Label19.Location = New System.Drawing.Point(113, 8)
+ Me.Label19.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label19.Name = "Label19"
- Me.Label19.Size = New System.Drawing.Size(43, 13)
+ Me.Label19.Size = New System.Drawing.Size(46, 15)
Me.Label19.TabIndex = 1
Me.Label19.Text = "Voltage"
'
'tbOverloadTime2
'
Me.tbOverloadTime2.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbOverloadTime2.Location = New System.Drawing.Point(363, 3)
+ Me.tbOverloadTime2.Location = New System.Drawing.Point(423, 4)
+ Me.tbOverloadTime2.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbOverloadTime2.Name = "tbOverloadTime2"
- Me.tbOverloadTime2.Size = New System.Drawing.Size(56, 20)
+ Me.tbOverloadTime2.Size = New System.Drawing.Size(64, 23)
Me.tbOverloadTime2.TabIndex = 20
'
'Label24
'
Me.Label24.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label24.AutoSize = True
- Me.Label24.Location = New System.Drawing.Point(281, 7)
+ Me.Label24.AutoSize = true
+ Me.Label24.Location = New System.Drawing.Point(331, 8)
+ Me.Label24.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label24.Name = "Label24"
- Me.Label24.Size = New System.Drawing.Size(76, 13)
+ Me.Label24.Size = New System.Drawing.Size(84, 15)
Me.Label24.TabIndex = 11
Me.Label24.Text = "Overload Time"
'
'tbVoltage2
'
Me.tbVoltage2.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbVoltage2.Location = New System.Drawing.Point(143, 3)
+ Me.tbVoltage2.Location = New System.Drawing.Point(167, 4)
+ Me.tbVoltage2.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbVoltage2.Name = "tbVoltage2"
- Me.tbVoltage2.Size = New System.Drawing.Size(56, 20)
+ Me.tbVoltage2.Size = New System.Drawing.Size(64, 23)
Me.tbVoltage2.TabIndex = 17
'
'Label20
'
Me.Label20.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label20.AutoSize = True
- Me.Label20.Location = New System.Drawing.Point(40, 34)
+ Me.Label20.AutoSize = true
+ Me.Label20.Location = New System.Drawing.Point(51, 39)
+ Me.Label20.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label20.Name = "Label20"
- Me.Label20.Size = New System.Drawing.Size(97, 13)
+ Me.Label20.Size = New System.Drawing.Size(108, 15)
Me.Label20.TabIndex = 3
Me.Label20.Text = "Continuous Torque"
'
'Label21
'
Me.Label21.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label21.AutoSize = True
- Me.Label21.Location = New System.Drawing.Point(6, 61)
+ Me.Label21.AutoSize = true
+ Me.Label21.Location = New System.Drawing.Point(16, 71)
+ Me.Label21.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label21.Name = "Label21"
- Me.Label21.Size = New System.Drawing.Size(131, 13)
+ Me.Label21.Size = New System.Drawing.Size(143, 15)
Me.Label21.TabIndex = 6
Me.Label21.Text = "Continuous Torque Speed"
'
'tbContinousTorque2
'
Me.tbContinousTorque2.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbContinousTorque2.Location = New System.Drawing.Point(143, 30)
+ Me.tbContinousTorque2.Location = New System.Drawing.Point(167, 35)
+ Me.tbContinousTorque2.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbContinousTorque2.Name = "tbContinousTorque2"
- Me.tbContinousTorque2.Size = New System.Drawing.Size(56, 20)
+ Me.tbContinousTorque2.Size = New System.Drawing.Size(64, 23)
Me.tbContinousTorque2.TabIndex = 18
'
'tbContinousTorqueSpeed2
'
Me.tbContinousTorqueSpeed2.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbContinousTorqueSpeed2.Location = New System.Drawing.Point(143, 58)
+ Me.tbContinousTorqueSpeed2.Location = New System.Drawing.Point(167, 67)
+ Me.tbContinousTorqueSpeed2.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbContinousTorqueSpeed2.Name = "tbContinousTorqueSpeed2"
- Me.tbContinousTorqueSpeed2.Size = New System.Drawing.Size(56, 20)
+ Me.tbContinousTorqueSpeed2.Size = New System.Drawing.Size(64, 23)
Me.tbContinousTorqueSpeed2.TabIndex = 19
'
'Label27
'
Me.Label27.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label27.AutoSize = True
- Me.Label27.Location = New System.Drawing.Point(202, 61)
+ Me.Label27.AutoSize = true
+ Me.Label27.Location = New System.Drawing.Point(236, 63)
Me.Label27.Margin = New System.Windows.Forms.Padding(0)
Me.Label27.Name = "Label27"
- Me.Label27.Size = New System.Drawing.Size(30, 13)
+ Me.Label27.Size = New System.Drawing.Size(33, 30)
Me.Label27.TabIndex = 67
Me.Label27.Text = "[rpm]"
'
'Label23
'
Me.Label23.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label23.AutoSize = True
- Me.Label23.Location = New System.Drawing.Point(236, 61)
+ Me.Label23.AutoSize = true
+ Me.Label23.Location = New System.Drawing.Point(286, 71)
+ Me.Label23.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label23.Name = "Label23"
- Me.Label23.Size = New System.Drawing.Size(121, 13)
+ Me.Label23.Size = New System.Drawing.Size(129, 15)
Me.Label23.TabIndex = 9
Me.Label23.Text = "Overload Torque Speed"
'
'tbOverloadTorqueSpeed2
'
Me.tbOverloadTorqueSpeed2.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbOverloadTorqueSpeed2.Location = New System.Drawing.Point(363, 58)
+ Me.tbOverloadTorqueSpeed2.Location = New System.Drawing.Point(423, 67)
+ Me.tbOverloadTorqueSpeed2.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbOverloadTorqueSpeed2.Name = "tbOverloadTorqueSpeed2"
- Me.tbOverloadTorqueSpeed2.Size = New System.Drawing.Size(56, 20)
+ Me.tbOverloadTorqueSpeed2.Size = New System.Drawing.Size(64, 23)
Me.tbOverloadTorqueSpeed2.TabIndex = 22
'
'Label25
'
Me.Label25.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label25.AutoSize = True
- Me.Label25.Location = New System.Drawing.Point(422, 61)
+ Me.Label25.AutoSize = true
+ Me.Label25.Location = New System.Drawing.Point(492, 63)
Me.Label25.Margin = New System.Windows.Forms.Padding(0)
Me.Label25.Name = "Label25"
- Me.Label25.Size = New System.Drawing.Size(30, 13)
+ Me.Label25.Size = New System.Drawing.Size(33, 30)
Me.Label25.TabIndex = 66
Me.Label25.Text = "[rpm]"
'
'Label22
'
Me.Label22.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label22.AutoSize = True
- Me.Label22.Location = New System.Drawing.Point(270, 34)
+ Me.Label22.AutoSize = true
+ Me.Label22.Location = New System.Drawing.Point(321, 39)
+ Me.Label22.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label22.Name = "Label22"
- Me.Label22.Size = New System.Drawing.Size(87, 13)
+ Me.Label22.Size = New System.Drawing.Size(94, 15)
Me.Label22.TabIndex = 7
Me.Label22.Text = "Overload Torque"
'
'tbOverloadTorque2
'
Me.tbOverloadTorque2.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbOverloadTorque2.Location = New System.Drawing.Point(363, 30)
+ Me.tbOverloadTorque2.Location = New System.Drawing.Point(423, 35)
+ Me.tbOverloadTorque2.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbOverloadTorque2.Name = "tbOverloadTorque2"
- Me.tbOverloadTorque2.Size = New System.Drawing.Size(56, 20)
+ Me.tbOverloadTorque2.Size = New System.Drawing.Size(64, 23)
Me.tbOverloadTorque2.TabIndex = 21
'
'Label16
'
Me.Label16.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label16.AutoSize = True
- Me.Label16.Location = New System.Drawing.Point(422, 34)
+ Me.Label16.AutoSize = true
+ Me.Label16.Location = New System.Drawing.Point(491, 39)
Me.Label16.Margin = New System.Windows.Forms.Padding(0)
Me.Label16.Name = "Label16"
- Me.Label16.Size = New System.Drawing.Size(29, 13)
+ Me.Label16.Size = New System.Drawing.Size(35, 15)
Me.Label16.TabIndex = 64
Me.Label16.Text = "[Nm]"
'
- 'Label3
- '
- Me.Label3.AutoSize = True
- Me.Label3.Dock = System.Windows.Forms.DockStyle.Top
- Me.Label3.Location = New System.Drawing.Point(3, 6)
- Me.Label3.Margin = New System.Windows.Forms.Padding(3, 6, 6, 6)
- Me.Label3.Name = "Label3"
- Me.Label3.Size = New System.Drawing.Size(131, 13)
- Me.Label3.TabIndex = 54
- Me.Label3.Text = "Design Type Wheel Motor"
- '
'cbDesignTypeWheelMotor
'
- Me.cbDesignTypeWheelMotor.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.cbDesignTypeWheelMotor.AutoSize = True
- Me.cbDesignTypeWheelMotor.Location = New System.Drawing.Point(190, 6)
- Me.cbDesignTypeWheelMotor.Margin = New System.Windows.Forms.Padding(50, 6, 3, 6)
+ Me.cbDesignTypeWheelMotor.AutoSize = true
+ Me.cbDesignTypeWheelMotor.Location = New System.Drawing.Point(170, 6)
+ Me.cbDesignTypeWheelMotor.Margin = New System.Windows.Forms.Padding(58, 7, 4, 7)
Me.cbDesignTypeWheelMotor.Name = "cbDesignTypeWheelMotor"
Me.cbDesignTypeWheelMotor.Size = New System.Drawing.Size(15, 14)
Me.cbDesignTypeWheelMotor.TabIndex = 4
- Me.cbDesignTypeWheelMotor.UseVisualStyleBackColor = True
+ Me.cbDesignTypeWheelMotor.UseVisualStyleBackColor = true
'
'Label2
'
- Me.Label2.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label2.AutoSize = True
- Me.Label2.Location = New System.Drawing.Point(3, 6)
- Me.Label2.Margin = New System.Windows.Forms.Padding(3, 6, 6, 6)
+ Me.Label2.AutoSize = true
+ Me.Label2.Location = New System.Drawing.Point(4, 5)
+ Me.Label2.Margin = New System.Windows.Forms.Padding(4, 7, 7, 7)
Me.Label2.Name = "Label2"
- Me.Label2.Size = New System.Drawing.Size(101, 13)
+ Me.Label2.Size = New System.Drawing.Size(114, 15)
Me.Label2.TabIndex = 53
Me.Label2.Text = "Differential Included"
'
'cbDifferentialIncluded
'
- Me.cbDifferentialIncluded.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.cbDifferentialIncluded.AutoSize = True
- Me.cbDifferentialIncluded.Location = New System.Drawing.Point(190, 6)
- Me.cbDifferentialIncluded.Margin = New System.Windows.Forms.Padding(80, 6, 3, 6)
+ Me.cbDifferentialIncluded.AutoSize = true
+ Me.cbDifferentialIncluded.Location = New System.Drawing.Point(169, 6)
+ Me.cbDifferentialIncluded.Margin = New System.Windows.Forms.Padding(93, 7, 4, 7)
Me.cbDifferentialIncluded.Name = "cbDifferentialIncluded"
Me.cbDifferentialIncluded.Size = New System.Drawing.Size(15, 14)
Me.cbDifferentialIncluded.TabIndex = 6
- Me.cbDifferentialIncluded.UseVisualStyleBackColor = True
+ Me.cbDifferentialIncluded.UseVisualStyleBackColor = true
'
'GroupBox1
'
Me.GroupBox1.Anchor = System.Windows.Forms.AnchorStyles.Top
Me.GroupBox1.Controls.Add(Me.TableLayoutPanel5)
- Me.GroupBox1.Location = New System.Drawing.Point(539, 188)
+ Me.GroupBox1.Location = New System.Drawing.Point(630, 90)
+ Me.GroupBox1.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.GroupBox1.Name = "GroupBox1"
- Me.GroupBox1.Size = New System.Drawing.Size(314, 180)
+ Me.GroupBox1.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.GroupBox1.Size = New System.Drawing.Size(366, 276)
Me.GroupBox1.TabIndex = 61
- Me.GroupBox1.TabStop = False
+ Me.GroupBox1.TabStop = false
Me.GroupBox1.Text = "Gears"
'
'TableLayoutPanel5
'
Me.TableLayoutPanel5.Anchor = System.Windows.Forms.AnchorStyles.None
Me.TableLayoutPanel5.ColumnCount = 2
- Me.TableLayoutPanel5.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 129.0!))
- Me.TableLayoutPanel5.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 171.0!))
+ Me.TableLayoutPanel5.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 150!))
+ Me.TableLayoutPanel5.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 200!))
Me.TableLayoutPanel5.Controls.Add(Me.FlowLayoutPanel2, 0, 1)
Me.TableLayoutPanel5.Controls.Add(Me.Label6, 1, 1)
Me.TableLayoutPanel5.Controls.Add(Me.lvGear, 0, 0)
- Me.TableLayoutPanel5.Location = New System.Drawing.Point(7, 16)
+ Me.TableLayoutPanel5.Location = New System.Drawing.Point(8, 22)
+ Me.TableLayoutPanel5.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.TableLayoutPanel5.Name = "TableLayoutPanel5"
Me.TableLayoutPanel5.RowCount = 2
Me.TableLayoutPanel5.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 78.61636!))
Me.TableLayoutPanel5.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 21.38365!))
- Me.TableLayoutPanel5.Size = New System.Drawing.Size(300, 159)
+ Me.TableLayoutPanel5.Size = New System.Drawing.Size(350, 245)
Me.TableLayoutPanel5.TabIndex = 111
'
'FlowLayoutPanel2
'
Me.FlowLayoutPanel2.Controls.Add(Me.btAddGear)
Me.FlowLayoutPanel2.Controls.Add(Me.btRemoveGear)
- Me.FlowLayoutPanel2.Location = New System.Drawing.Point(3, 128)
+ Me.FlowLayoutPanel2.Location = New System.Drawing.Point(4, 195)
+ Me.FlowLayoutPanel2.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.FlowLayoutPanel2.Name = "FlowLayoutPanel2"
- Me.FlowLayoutPanel2.Size = New System.Drawing.Size(61, 28)
+ Me.FlowLayoutPanel2.Size = New System.Drawing.Size(71, 32)
Me.FlowLayoutPanel2.TabIndex = 112
'
'btAddGear
'
Me.btAddGear.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
- Me.btAddGear.Location = New System.Drawing.Point(3, 3)
+ Me.btAddGear.Location = New System.Drawing.Point(4, 3)
+ Me.btAddGear.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btAddGear.Name = "btAddGear"
- Me.btAddGear.Size = New System.Drawing.Size(24, 24)
+ Me.btAddGear.Size = New System.Drawing.Size(28, 28)
Me.btAddGear.TabIndex = 25
- Me.btAddGear.UseVisualStyleBackColor = True
+ Me.btAddGear.UseVisualStyleBackColor = true
'
'btRemoveGear
'
Me.btRemoveGear.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
- Me.btRemoveGear.Location = New System.Drawing.Point(33, 3)
+ Me.btRemoveGear.Location = New System.Drawing.Point(4, 37)
+ Me.btRemoveGear.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btRemoveGear.Name = "btRemoveGear"
- Me.btRemoveGear.Size = New System.Drawing.Size(24, 24)
+ Me.btRemoveGear.Size = New System.Drawing.Size(28, 28)
Me.btRemoveGear.TabIndex = 26
- Me.btRemoveGear.UseVisualStyleBackColor = True
+ Me.btRemoveGear.UseVisualStyleBackColor = true
'
'Label6
'
- Me.Label6.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.Label6.AutoSize = True
- Me.Label6.Location = New System.Drawing.Point(191, 125)
+ Me.Label6.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.Label6.AutoSize = true
+ Me.Label6.Location = New System.Drawing.Point(225, 192)
+ Me.Label6.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label6.Name = "Label6"
- Me.Label6.Size = New System.Drawing.Size(106, 13)
+ Me.Label6.Size = New System.Drawing.Size(121, 15)
Me.Label6.TabIndex = 6
Me.Label6.Text = "(Double-Click to Edit)"
'
'lvGear
'
- Me.lvGear.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
- Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.lvGear.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.lvGear.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader2, Me.ColumnHeader3})
Me.TableLayoutPanel5.SetColumnSpan(Me.lvGear, 2)
- Me.lvGear.FullRowSelect = True
- Me.lvGear.GridLines = True
- Me.lvGear.HideSelection = False
- Me.lvGear.Location = New System.Drawing.Point(3, 3)
- Me.lvGear.MultiSelect = False
+ Me.lvGear.FullRowSelect = true
+ Me.lvGear.GridLines = true
+ Me.lvGear.Location = New System.Drawing.Point(4, 3)
+ Me.lvGear.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.lvGear.MultiSelect = false
Me.lvGear.Name = "lvGear"
- Me.lvGear.Size = New System.Drawing.Size(294, 119)
+ Me.lvGear.Size = New System.Drawing.Size(342, 186)
Me.lvGear.TabIndex = 78
- Me.lvGear.TabStop = False
- Me.lvGear.UseCompatibleStateImageBehavior = False
+ Me.lvGear.TabStop = false
+ Me.lvGear.UseCompatibleStateImageBehavior = false
Me.lvGear.View = System.Windows.Forms.View.Details
'
'ColumnHeader1
@@ -1102,47 +1138,50 @@ Partial Class IEPCForm
'
Me.GroupBox3.Anchor = System.Windows.Forms.AnchorStyles.Top
Me.GroupBox3.Controls.Add(Me.TableLayoutPanel3)
- Me.GroupBox3.Location = New System.Drawing.Point(539, 372)
+ Me.GroupBox3.Location = New System.Drawing.Point(630, 375)
+ Me.GroupBox3.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.GroupBox3.Name = "GroupBox3"
- Me.GroupBox3.Size = New System.Drawing.Size(314, 180)
+ Me.GroupBox3.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.GroupBox3.Size = New System.Drawing.Size(366, 239)
Me.GroupBox3.TabIndex = 62
- Me.GroupBox3.TabStop = False
+ Me.GroupBox3.TabStop = false
Me.GroupBox3.Text = "Drag Curves"
'
'TableLayoutPanel3
'
Me.TableLayoutPanel3.Anchor = System.Windows.Forms.AnchorStyles.None
Me.TableLayoutPanel3.ColumnCount = 2
- Me.TableLayoutPanel3.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 129.0!))
- Me.TableLayoutPanel3.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 171.0!))
+ Me.TableLayoutPanel3.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 150!))
+ Me.TableLayoutPanel3.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 200!))
Me.TableLayoutPanel3.Controls.Add(Me.lvDragCurve, 0, 0)
Me.TableLayoutPanel3.Controls.Add(Me.FlowLayoutPanel11, 0, 1)
Me.TableLayoutPanel3.Controls.Add(Me.Label7, 1, 1)
- Me.TableLayoutPanel3.Location = New System.Drawing.Point(7, 14)
+ Me.TableLayoutPanel3.Location = New System.Drawing.Point(8, 22)
+ Me.TableLayoutPanel3.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.TableLayoutPanel3.Name = "TableLayoutPanel3"
Me.TableLayoutPanel3.RowCount = 2
Me.TableLayoutPanel3.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 78.61636!))
Me.TableLayoutPanel3.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 21.38365!))
- Me.TableLayoutPanel3.Size = New System.Drawing.Size(300, 159)
+ Me.TableLayoutPanel3.Size = New System.Drawing.Size(350, 211)
Me.TableLayoutPanel3.TabIndex = 113
'
'lvDragCurve
'
- Me.lvDragCurve.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
- Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.lvDragCurve.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.lvDragCurve.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader4, Me.ColumnHeader5})
Me.TableLayoutPanel3.SetColumnSpan(Me.lvDragCurve, 2)
- Me.lvDragCurve.FullRowSelect = True
- Me.lvDragCurve.GridLines = True
- Me.lvDragCurve.HideSelection = False
- Me.lvDragCurve.Location = New System.Drawing.Point(3, 3)
- Me.lvDragCurve.MultiSelect = False
+ Me.lvDragCurve.FullRowSelect = true
+ Me.lvDragCurve.GridLines = true
+ Me.lvDragCurve.Location = New System.Drawing.Point(4, 3)
+ Me.lvDragCurve.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.lvDragCurve.MultiSelect = false
Me.lvDragCurve.Name = "lvDragCurve"
- Me.lvDragCurve.Size = New System.Drawing.Size(294, 119)
+ Me.lvDragCurve.Size = New System.Drawing.Size(342, 159)
Me.lvDragCurve.TabIndex = 78
- Me.lvDragCurve.TabStop = False
- Me.lvDragCurve.UseCompatibleStateImageBehavior = False
+ Me.lvDragCurve.TabStop = false
+ Me.lvDragCurve.UseCompatibleStateImageBehavior = false
Me.lvDragCurve.View = System.Windows.Forms.View.Details
'
'ColumnHeader4
@@ -1159,36 +1198,40 @@ Partial Class IEPCForm
'
Me.FlowLayoutPanel11.Controls.Add(Me.btAddDragCurve)
Me.FlowLayoutPanel11.Controls.Add(Me.btRemoveDragCurve)
- Me.FlowLayoutPanel11.Location = New System.Drawing.Point(3, 128)
+ Me.FlowLayoutPanel11.Location = New System.Drawing.Point(4, 168)
+ Me.FlowLayoutPanel11.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.FlowLayoutPanel11.Name = "FlowLayoutPanel11"
- Me.FlowLayoutPanel11.Size = New System.Drawing.Size(61, 28)
+ Me.FlowLayoutPanel11.Size = New System.Drawing.Size(71, 32)
Me.FlowLayoutPanel11.TabIndex = 114
'
'btAddDragCurve
'
Me.btAddDragCurve.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
- Me.btAddDragCurve.Location = New System.Drawing.Point(3, 3)
+ Me.btAddDragCurve.Location = New System.Drawing.Point(4, 3)
+ Me.btAddDragCurve.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btAddDragCurve.Name = "btAddDragCurve"
- Me.btAddDragCurve.Size = New System.Drawing.Size(24, 24)
+ Me.btAddDragCurve.Size = New System.Drawing.Size(28, 28)
Me.btAddDragCurve.TabIndex = 27
- Me.btAddDragCurve.UseVisualStyleBackColor = True
+ Me.btAddDragCurve.UseVisualStyleBackColor = true
'
'btRemoveDragCurve
'
Me.btRemoveDragCurve.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
- Me.btRemoveDragCurve.Location = New System.Drawing.Point(33, 3)
+ Me.btRemoveDragCurve.Location = New System.Drawing.Point(4, 37)
+ Me.btRemoveDragCurve.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btRemoveDragCurve.Name = "btRemoveDragCurve"
- Me.btRemoveDragCurve.Size = New System.Drawing.Size(24, 24)
+ Me.btRemoveDragCurve.Size = New System.Drawing.Size(28, 28)
Me.btRemoveDragCurve.TabIndex = 28
- Me.btRemoveDragCurve.UseVisualStyleBackColor = True
+ Me.btRemoveDragCurve.UseVisualStyleBackColor = true
'
'Label7
'
- Me.Label7.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.Label7.AutoSize = True
- Me.Label7.Location = New System.Drawing.Point(191, 125)
+ Me.Label7.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.Label7.AutoSize = true
+ Me.Label7.Location = New System.Drawing.Point(225, 165)
+ Me.Label7.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label7.Name = "Label7"
- Me.Label7.Size = New System.Drawing.Size(106, 13)
+ Me.Label7.Size = New System.Drawing.Size(121, 15)
Me.Label7.TabIndex = 6
Me.Label7.Text = "(Double-Click to Edit)"
'
@@ -1199,7 +1242,7 @@ Partial Class IEPCForm
Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator3, Me.ToolStripBtSendTo, Me.ToolStripSeparator1, Me.ToolStripButton1})
Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
Me.ToolStrip1.Name = "ToolStrip1"
- Me.ToolStrip1.Size = New System.Drawing.Size(864, 31)
+ Me.ToolStrip1.Size = New System.Drawing.Size(1008, 31)
Me.ToolStrip1.TabIndex = 63
Me.ToolStrip1.Text = "ToolStrip1"
'
@@ -1278,18 +1321,20 @@ Partial Class IEPCForm
Me.PictureBox1.Dock = System.Windows.Forms.DockStyle.Top
Me.PictureBox1.Image = Global.TUGraz.VECTO.My.Resources.Resources.VECTO_Mainform
Me.PictureBox1.Location = New System.Drawing.Point(0, 31)
+ Me.PictureBox1.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.PictureBox1.Name = "PictureBox1"
- Me.PictureBox1.Size = New System.Drawing.Size(864, 40)
+ Me.PictureBox1.Size = New System.Drawing.Size(1008, 46)
Me.PictureBox1.TabIndex = 64
- Me.PictureBox1.TabStop = False
+ Me.PictureBox1.TabStop = false
'
'lblTitle
'
Me.lblTitle.Anchor = System.Windows.Forms.AnchorStyles.Top
- Me.lblTitle.AutoSize = True
+ Me.lblTitle.AutoSize = true
Me.lblTitle.BackColor = System.Drawing.Color.White
- Me.lblTitle.Font = New System.Drawing.Font("Microsoft Sans Serif", 18.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.lblTitle.Location = New System.Drawing.Point(114, 36)
+ 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(133, 42)
+ Me.lblTitle.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblTitle.Name = "lblTitle"
Me.lblTitle.Size = New System.Drawing.Size(68, 29)
Me.lblTitle.TabIndex = 65
@@ -1297,32 +1342,35 @@ Partial Class IEPCForm
'
'ButCancel
'
- Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.ButCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
- Me.ButCancel.Location = New System.Drawing.Point(778, 561)
+ Me.ButCancel.Location = New System.Drawing.Point(908, 621)
+ Me.ButCancel.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.ButCancel.Name = "ButCancel"
- Me.ButCancel.Size = New System.Drawing.Size(75, 23)
+ Me.ButCancel.Size = New System.Drawing.Size(88, 27)
Me.ButCancel.TabIndex = 67
Me.ButCancel.Text = "Cancel"
- Me.ButCancel.UseVisualStyleBackColor = True
+ Me.ButCancel.UseVisualStyleBackColor = true
'
'ButOK
'
- Me.ButOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.ButOK.Location = New System.Drawing.Point(697, 561)
+ Me.ButOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.ButOK.Location = New System.Drawing.Point(813, 621)
+ Me.ButOK.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.ButOK.Name = "ButOK"
- Me.ButOK.Size = New System.Drawing.Size(75, 23)
+ Me.ButOK.Size = New System.Drawing.Size(88, 27)
Me.ButOK.TabIndex = 66
Me.ButOK.Text = "Save"
- Me.ButOK.UseVisualStyleBackColor = True
+ Me.ButOK.UseVisualStyleBackColor = true
'
'FlowLayoutPanel1
'
Me.FlowLayoutPanel1.Controls.Add(Me.Label49)
Me.FlowLayoutPanel1.Controls.Add(Me.tbModel)
- Me.FlowLayoutPanel1.Location = New System.Drawing.Point(12, 77)
+ Me.FlowLayoutPanel1.Location = New System.Drawing.Point(14, 89)
+ Me.FlowLayoutPanel1.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.FlowLayoutPanel1.Name = "FlowLayoutPanel1"
- Me.FlowLayoutPanel1.Size = New System.Drawing.Size(513, 26)
+ Me.FlowLayoutPanel1.Size = New System.Drawing.Size(598, 30)
Me.FlowLayoutPanel1.TabIndex = 101
'
'FlowLayoutPanel4
@@ -1330,9 +1378,10 @@ Partial Class IEPCForm
Me.FlowLayoutPanel4.Anchor = System.Windows.Forms.AnchorStyles.Top
Me.FlowLayoutPanel4.Controls.Add(Me.Label3)
Me.FlowLayoutPanel4.Controls.Add(Me.cbDesignTypeWheelMotor)
- Me.FlowLayoutPanel4.Location = New System.Drawing.Point(12, 131)
+ Me.FlowLayoutPanel4.Location = New System.Drawing.Point(14, 186)
+ Me.FlowLayoutPanel4.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.FlowLayoutPanel4.Name = "FlowLayoutPanel4"
- Me.FlowLayoutPanel4.Size = New System.Drawing.Size(210, 26)
+ Me.FlowLayoutPanel4.Size = New System.Drawing.Size(245, 28)
Me.FlowLayoutPanel4.TabIndex = 104
'
'FlowLayoutPanel5
@@ -1340,38 +1389,40 @@ Partial Class IEPCForm
Me.FlowLayoutPanel5.Controls.Add(Me.Label48)
Me.FlowLayoutPanel5.Controls.Add(Me.tbNumberOfDesignTypeWheelMotor)
Me.FlowLayoutPanel5.Controls.Add(Me.Label9)
- Me.FlowLayoutPanel5.Location = New System.Drawing.Point(227, 131)
+ Me.FlowLayoutPanel5.Location = New System.Drawing.Point(265, 186)
+ Me.FlowLayoutPanel5.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.FlowLayoutPanel5.Name = "FlowLayoutPanel5"
- Me.FlowLayoutPanel5.Size = New System.Drawing.Size(298, 26)
+ Me.FlowLayoutPanel5.Size = New System.Drawing.Size(348, 28)
Me.FlowLayoutPanel5.TabIndex = 105
'
'Label9
'
- Me.Label9.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label9.AutoSize = True
- Me.Label9.Location = New System.Drawing.Point(252, 6)
+ Me.Label9.AutoSize = true
+ Me.Label9.Location = New System.Drawing.Point(296, 5)
+ Me.Label9.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label9.Name = "Label9"
- Me.Label9.Size = New System.Drawing.Size(16, 13)
+ Me.Label9.Size = New System.Drawing.Size(20, 15)
Me.Label9.TabIndex = 66
Me.Label9.Text = "[-]"
'
- 'FlowLayoutPanel6
+ 'pnInertia
'
- Me.FlowLayoutPanel6.Controls.Add(Me.Label51)
- Me.FlowLayoutPanel6.Controls.Add(Me.tbInertia)
- Me.FlowLayoutPanel6.Controls.Add(Me.lblinertiaUnit)
- Me.FlowLayoutPanel6.Location = New System.Drawing.Point(12, 104)
- Me.FlowLayoutPanel6.Name = "FlowLayoutPanel6"
- Me.FlowLayoutPanel6.Size = New System.Drawing.Size(210, 26)
- Me.FlowLayoutPanel6.TabIndex = 102
+ Me.pnInertia.Controls.Add(Me.Label51)
+ Me.pnInertia.Controls.Add(Me.lblinertiaUnit)
+ Me.pnInertia.Controls.Add(Me.tbInertia)
+ Me.pnInertia.Location = New System.Drawing.Point(265, 125)
+ Me.pnInertia.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.pnInertia.Name = "pnInertia"
+ Me.pnInertia.Size = New System.Drawing.Size(348, 30)
+ Me.pnInertia.TabIndex = 102
'
'lblinertiaUnit
'
- Me.lblinertiaUnit.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.lblinertiaUnit.AutoSize = True
- Me.lblinertiaUnit.Location = New System.Drawing.Point(108, 6)
+ Me.lblinertiaUnit.AutoSize = true
+ Me.lblinertiaUnit.Location = New System.Drawing.Point(296, 7)
+ Me.lblinertiaUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblinertiaUnit.Name = "lblinertiaUnit"
- Me.lblinertiaUnit.Size = New System.Drawing.Size(36, 13)
+ Me.lblinertiaUnit.Size = New System.Drawing.Size(43, 15)
Me.lblinertiaUnit.TabIndex = 64
Me.lblinertiaUnit.Text = "[kgm²]"
'
@@ -1379,28 +1430,30 @@ Partial Class IEPCForm
'
Me.FlowLayoutPanel7.Controls.Add(Me.Label2)
Me.FlowLayoutPanel7.Controls.Add(Me.cbDifferentialIncluded)
- Me.FlowLayoutPanel7.Location = New System.Drawing.Point(12, 158)
+ Me.FlowLayoutPanel7.Location = New System.Drawing.Point(14, 215)
+ Me.FlowLayoutPanel7.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.FlowLayoutPanel7.Name = "FlowLayoutPanel7"
- Me.FlowLayoutPanel7.Size = New System.Drawing.Size(210, 26)
+ Me.FlowLayoutPanel7.Size = New System.Drawing.Size(245, 28)
Me.FlowLayoutPanel7.TabIndex = 106
'
- 'FlowLayoutPanel8
+ 'pnThermalOverloadRecovery
'
- Me.FlowLayoutPanel8.Controls.Add(Me.Label52)
- Me.FlowLayoutPanel8.Controls.Add(Me.tbThermalOverload)
- Me.FlowLayoutPanel8.Controls.Add(Me.Label10)
- Me.FlowLayoutPanel8.Location = New System.Drawing.Point(227, 104)
- Me.FlowLayoutPanel8.Name = "FlowLayoutPanel8"
- Me.FlowLayoutPanel8.Size = New System.Drawing.Size(298, 26)
- Me.FlowLayoutPanel8.TabIndex = 103
+ Me.pnThermalOverloadRecovery.Controls.Add(Me.Label52)
+ Me.pnThermalOverloadRecovery.Controls.Add(Me.tbThermalOverload)
+ Me.pnThermalOverloadRecovery.Controls.Add(Me.Label10)
+ Me.pnThermalOverloadRecovery.Location = New System.Drawing.Point(265, 157)
+ Me.pnThermalOverloadRecovery.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.pnThermalOverloadRecovery.Name = "pnThermalOverloadRecovery"
+ Me.pnThermalOverloadRecovery.Size = New System.Drawing.Size(348, 26)
+ Me.pnThermalOverloadRecovery.TabIndex = 103
'
'Label10
'
- Me.Label10.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label10.AutoSize = True
- Me.Label10.Location = New System.Drawing.Point(278, 6)
+ Me.Label10.AutoSize = true
+ Me.Label10.Location = New System.Drawing.Point(296, 4)
+ Me.Label10.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label10.Name = "Label10"
- Me.Label10.Size = New System.Drawing.Size(16, 13)
+ Me.Label10.Size = New System.Drawing.Size(20, 15)
Me.Label10.TabIndex = 67
Me.Label10.Text = "[-]"
'
@@ -1408,10 +1461,11 @@ Partial Class IEPCForm
'
Me.StatusStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LbStatus})
- Me.StatusStrip1.Location = New System.Drawing.Point(0, 587)
+ Me.StatusStrip1.Location = New System.Drawing.Point(0, 655)
Me.StatusStrip1.Name = "StatusStrip1"
- Me.StatusStrip1.Size = New System.Drawing.Size(864, 22)
- Me.StatusStrip1.SizingGrip = False
+ Me.StatusStrip1.Padding = New System.Windows.Forms.Padding(1, 0, 16, 0)
+ Me.StatusStrip1.Size = New System.Drawing.Size(1008, 22)
+ Me.StatusStrip1.SizingGrip = false
Me.StatusStrip1.TabIndex = 74
Me.StatusStrip1.Text = "StatusStrip1"
'
@@ -1440,17 +1494,95 @@ Partial Class IEPCForm
Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
'
+ 'pnRatedPower
+ '
+ Me.pnRatedPower.Controls.Add(Me.lblRatedPower)
+ Me.pnRatedPower.Controls.Add(Me.lblRatedPowerUnit)
+ Me.pnRatedPower.Controls.Add(Me.tbRatedPower)
+ Me.pnRatedPower.Location = New System.Drawing.Point(14, 157)
+ Me.pnRatedPower.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.pnRatedPower.Name = "pnRatedPower"
+ Me.pnRatedPower.Size = New System.Drawing.Size(245, 26)
+ Me.pnRatedPower.TabIndex = 103
+ '
+ 'lblRatedPower
+ '
+ Me.lblRatedPower.AutoSize = true
+ Me.lblRatedPower.Location = New System.Drawing.Point(5, 5)
+ Me.lblRatedPower.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblRatedPower.Name = "lblRatedPower"
+ Me.lblRatedPower.Size = New System.Drawing.Size(73, 15)
+ Me.lblRatedPower.TabIndex = 45
+ Me.lblRatedPower.Text = "Rated Power"
+ '
+ 'lblRatedPowerUnit
+ '
+ Me.lblRatedPowerUnit.AutoSize = true
+ Me.lblRatedPowerUnit.Location = New System.Drawing.Point(193, 5)
+ Me.lblRatedPowerUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblRatedPowerUnit.Name = "lblRatedPowerUnit"
+ Me.lblRatedPowerUnit.Size = New System.Drawing.Size(32, 15)
+ Me.lblRatedPowerUnit.TabIndex = 64
+ Me.lblRatedPowerUnit.Text = "[kW]"
+ '
+ 'tbRatedPower
+ '
+ Me.tbRatedPower.Location = New System.Drawing.Point(119, 1)
+ Me.tbRatedPower.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.tbRatedPower.Name = "tbRatedPower"
+ Me.tbRatedPower.Size = New System.Drawing.Size(66, 23)
+ Me.tbRatedPower.TabIndex = 2
+ '
+ 'pnElectricMachineType
+ '
+ Me.pnElectricMachineType.Controls.Add(Me.cbEmType)
+ Me.pnElectricMachineType.Controls.Add(Me.lblEmType)
+ Me.pnElectricMachineType.Location = New System.Drawing.Point(14, 125)
+ Me.pnElectricMachineType.Name = "pnElectricMachineType"
+ Me.pnElectricMachineType.Size = New System.Drawing.Size(245, 30)
+ Me.pnElectricMachineType.TabIndex = 108
+ '
+ 'cbEmType
+ '
+ Me.cbEmType.FormattingEnabled = true
+ Me.cbEmType.Location = New System.Drawing.Point(75, 4)
+ Me.cbEmType.Name = "cbEmType"
+ Me.cbEmType.Size = New System.Drawing.Size(151, 23)
+ Me.cbEmType.TabIndex = 26
+ '
+ 'lblEmType
+ '
+ Me.lblEmType.AutoSize = true
+ Me.lblEmType.Location = New System.Drawing.Point(5, 6)
+ Me.lblEmType.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblEmType.Name = "lblEmType"
+ Me.lblEmType.Size = New System.Drawing.Size(51, 15)
+ 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(6.0!, 13.0!)
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(7!, 15!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
- Me.ClientSize = New System.Drawing.Size(864, 609)
+ Me.ClientSize = New System.Drawing.Size(1008, 677)
+ Me.Controls.Add(Me.pnElectricMachineType)
+ Me.Controls.Add(Me.pnRatedPower)
Me.Controls.Add(Me.StatusStrip1)
Me.Controls.Add(Me.FlowLayoutPanel7)
Me.Controls.Add(Me.FlowLayoutPanel5)
- Me.Controls.Add(Me.FlowLayoutPanel8)
+ Me.Controls.Add(Me.pnThermalOverloadRecovery)
Me.Controls.Add(Me.GroupBox3)
- Me.Controls.Add(Me.FlowLayoutPanel6)
+ Me.Controls.Add(Me.pnInertia)
Me.Controls.Add(Me.FlowLayoutPanel4)
Me.Controls.Add(Me.FlowLayoutPanel1)
Me.Controls.Add(Me.ButCancel)
@@ -1461,8 +1593,9 @@ Partial Class IEPCForm
Me.Controls.Add(Me.GroupBox1)
Me.Controls.Add(Me.tcVoltageLevels)
Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
- Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
- Me.MaximizeBox = False
+ Me.Icon = CType(resources.GetObject("$this.Icon"),System.Drawing.Icon)
+ Me.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.MaximizeBox = false
Me.Name = "IEPCForm"
Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide
Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
@@ -1501,15 +1634,19 @@ Partial Class IEPCForm
Me.FlowLayoutPanel4.PerformLayout
Me.FlowLayoutPanel5.ResumeLayout(false)
Me.FlowLayoutPanel5.PerformLayout
- Me.FlowLayoutPanel6.ResumeLayout(false)
- Me.FlowLayoutPanel6.PerformLayout
+ Me.pnInertia.ResumeLayout(false)
+ Me.pnInertia.PerformLayout
Me.FlowLayoutPanel7.ResumeLayout(false)
Me.FlowLayoutPanel7.PerformLayout
- Me.FlowLayoutPanel8.ResumeLayout(false)
- Me.FlowLayoutPanel8.PerformLayout
+ Me.pnThermalOverloadRecovery.ResumeLayout(false)
+ Me.pnThermalOverloadRecovery.PerformLayout
Me.StatusStrip1.ResumeLayout(false)
Me.StatusStrip1.PerformLayout
Me.CmOpenFile.ResumeLayout(false)
+ Me.pnRatedPower.ResumeLayout(false)
+ Me.pnRatedPower.PerformLayout
+ Me.pnElectricMachineType.ResumeLayout(false)
+ Me.pnElectricMachineType.PerformLayout
Me.ResumeLayout(false)
Me.PerformLayout
@@ -1548,7 +1685,6 @@ End Sub
Friend WithEvents Label2 As Label
Friend WithEvents cbDesignTypeWheelMotor As CheckBox
Friend WithEvents cbDifferentialIncluded As CheckBox
- Friend WithEvents Label3 As Label
Friend WithEvents Label4 As Label
Friend WithEvents Label12 As Label
Friend WithEvents Label11 As Label
@@ -1604,11 +1740,9 @@ End Sub
Friend WithEvents ButCancel As Button
Friend WithEvents ButOK As Button
Friend WithEvents FlowLayoutPanel1 As FlowLayoutPanel
- Friend WithEvents FlowLayoutPanel4 As FlowLayoutPanel
- Friend WithEvents FlowLayoutPanel5 As FlowLayoutPanel
- Friend WithEvents FlowLayoutPanel6 As FlowLayoutPanel
- Friend WithEvents FlowLayoutPanel7 As FlowLayoutPanel
- Friend WithEvents FlowLayoutPanel8 As FlowLayoutPanel
+ Friend WithEvents FlowLayoutPanel4 As Panel
+ Friend WithEvents pnInertia As Panel
+ Friend WithEvents FlowLayoutPanel7 As Panel
Friend WithEvents FlowLayoutPanel9 As FlowLayoutPanel
Friend WithEvents lblinertiaUnit As Label
Friend WithEvents Label9 As Label
@@ -1635,4 +1769,14 @@ End Sub
Friend WithEvents CmOpenFile As ContextMenuStrip
Friend WithEvents OpenWithToolStripMenuItem As ToolStripMenuItem
Friend WithEvents ShowInFolderToolStripMenuItem As ToolStripMenuItem
+ Friend WithEvents pnRatedPower As Panel
+ Friend WithEvents lblRatedPower As Label
+ Friend WithEvents lblRatedPowerUnit As Label
+ Friend WithEvents tbRatedPower As TextBox
+ Friend WithEvents pnElectricMachineType As Panel
+ Friend WithEvents cbEmType As ComboBox
+ Friend WithEvents lblEmType As Label
+ Friend WithEvents FlowLayoutPanel5 As Panel
+ Friend WithEvents pnThermalOverloadRecovery As Panel
+ Friend WithEvents Label3 As Label
End Class
diff --git a/VECTO/GUI/IEPCForm.resx b/VECTO/GUI/IEPCForm.resx
index 50021e8dee392b488a1cf238c54469d8f1de2343..9ce0c514cbb626a74197b4081d87c69d49282988 100644
--- a/VECTO/GUI/IEPCForm.resx
+++ b/VECTO/GUI/IEPCForm.resx
@@ -1,64 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
+<root>
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
diff --git a/VECTO/GUI/IEPCForm.vb b/VECTO/GUI/IEPCForm.vb
index b1355d59d8357e6501b5cf56b1708330c070010f..82162f4a15ccdbb7dbd3f38af884bc344ac4106a 100644
--- a/VECTO/GUI/IEPCForm.vb
+++ b/VECTO/GUI/IEPCForm.vb
@@ -21,9 +21,15 @@ Public Class IEPCForm
Private Sub IEPCForm_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+ pnThermalOverloadRecovery.Enabled = not Cfg.DeclMode
_powerMapDlg = New IEPCInputDialog(IEPCDialogType.PowerMapDialog)
_dragCurveDlg = New IEPCInputDialog(IEPCDialogType.DragCurveDialog)
_gearDlg = New IEPCGearInputDialog()
+
+ cbEmType.ValueMember = "Value"
+ cbEmType.DisplayMember = "Label"
+ cbEmType.DataSource = [enum].GetValues(GetType(ElectricMachineType)).Cast(Of ElectricMachineType).Select(Function(type) New With {Key .Value = type, .Label = type.GetLabel()}).ToList()
+
End Sub
#Region "Set IEPC Data"
@@ -36,7 +42,12 @@ Public Class IEPCForm
cbDifferentialIncluded.Checked = inputData.DifferentialIncluded
cbDesignTypeWheelMotor.Checked = inputData.DesignTypeWheelMotor
tbNumberOfDesignTypeWheelMotor.Text = inputData.NrOfDesignTypeWheelMotorMeasured.Value.ToGUIFormat()
- tbThermalOverload.Text = inputData.OverloadRecoveryFactor.ToGUIFormat()
+
+ tbRatedPower.Text = inputData.R85RatedPower.ConvertToKiloWatt().Value.ToGUIFormat()
+ cbEmType.SelectedValue = inputData.ElectricMachineType
+ if Not Cfg.DeclMode Then
+ tbThermalOverload.Text = inputData.OverloadRecoveryFactor.ToGUIFormat()
+ End If
Dim voltageLevel = inputData.VoltageLevels.First()
SetFirstVoltageLevel(voltageLevel)
@@ -409,7 +420,9 @@ Public Class IEPCForm
iepc.SetCommonEntries(tbModel.Text, tbInertia.Text, cbDesignTypeWheelMotor.Checked,
tbNumberOfDesignTypeWheelMotor.Text, cbDifferentialIncluded.Checked,
tbThermalOverload.Text)
-
+ iepc.R85RatedPower = tbRatedPower.Text.ToDouble(0).SI(Unit.SI.Kilo.Watt).Cast(of Watt)
+ iepc.ElectricMachineType = CType(cbEmType.SelectedValue, ElectricMachineType)
+
iepc.SetVoltageLevelEntries(tbVoltage1.Text, tbContinousTorque1.Text, tbContinousTorqueSpeed1.Text,
tbOverloadTime1.Text, tbOverloadTorque1.Text, tboverloadTorqueSpeed1.Text,
tbFLCurve1.Text, lvPowerMap1)
@@ -511,6 +524,9 @@ Public Class IEPCForm
End Function
Private Function ValidateOverloadRecoveryFactor() As Boolean
+ if cfg.DeclMode Then
+ return true
+ End If
If Not ValidDoubleValue(tbThermalOverload.Text) Then
ShowErrorMessageBox("Thermal Overload Recovery Factor", tbThermalOverload)
Return False
@@ -832,4 +848,7 @@ Public Class IEPCForm
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 50779dd92cc63089749b9712823bf574024a6875..7e363a2854bce9d7b8cf5f6de4c825b6cd78c439 100644
--- a/VECTO/GUI/IHPCForm.Designer.vb
+++ b/VECTO/GUI/IHPCForm.Designer.vb
@@ -27,11 +27,11 @@ Partial Class IHPCForm
Me.FlowLayoutPanel1 = New System.Windows.Forms.FlowLayoutPanel()
Me.Label49 = New System.Windows.Forms.Label()
Me.tbModel = New System.Windows.Forms.TextBox()
- Me.FlowLayoutPanel6 = New System.Windows.Forms.FlowLayoutPanel()
+ Me.pnInertia = New System.Windows.Forms.Panel()
Me.Label51 = New System.Windows.Forms.Label()
Me.tbInertia = New System.Windows.Forms.TextBox()
Me.lblinertiaUnit = New System.Windows.Forms.Label()
- Me.FlowLayoutPanel8 = New System.Windows.Forms.FlowLayoutPanel()
+ Me.pnThermalOverloadRecovery = New System.Windows.Forms.FlowLayoutPanel()
Me.Label52 = New System.Windows.Forms.Label()
Me.tbThermalOverload = New System.Windows.Forms.TextBox()
Me.Label10 = New System.Windows.Forms.Label()
@@ -45,8 +45,8 @@ Partial Class IHPCForm
Me.lvPowerMap = New System.Windows.Forms.GroupBox()
Me.TableLayoutPanel3 = New System.Windows.Forms.TableLayoutPanel()
Me.lvPowerMap1 = New System.Windows.Forms.ListView()
- Me.ColumnHeader4 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
- Me.ColumnHeader5 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader4 = New System.Windows.Forms.ColumnHeader()
+ Me.ColumnHeader5 = New System.Windows.Forms.ColumnHeader()
Me.FlowLayoutPanel11 = New System.Windows.Forms.FlowLayoutPanel()
Me.btAddPowerMap1 = New System.Windows.Forms.Button()
Me.btRemovePowerMap1 = New System.Windows.Forms.Button()
@@ -79,8 +79,8 @@ Partial Class IHPCForm
Me.GroupBox1 = New System.Windows.Forms.GroupBox()
Me.TableLayoutPanel2 = New System.Windows.Forms.TableLayoutPanel()
Me.lvPowerMap2 = New System.Windows.Forms.ListView()
- Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
- Me.ColumnHeader2 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader1 = New System.Windows.Forms.ColumnHeader()
+ Me.ColumnHeader2 = New System.Windows.Forms.ColumnHeader()
Me.FlowLayoutPanel4 = New System.Windows.Forms.FlowLayoutPanel()
Me.btAddPowerMap2 = New System.Windows.Forms.Button()
Me.btRemovePowerMap2 = New System.Windows.Forms.Button()
@@ -127,9 +127,13 @@ Partial Class IHPCForm
Me.CmOpenFile = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.Panel1 = New System.Windows.Forms.Panel()
+ Me.lblRatedPower = New System.Windows.Forms.Label()
+ Me.tbRatedPower = New System.Windows.Forms.TextBox()
+ Me.lblRatedPowerUnit = New System.Windows.Forms.Label()
Me.FlowLayoutPanel1.SuspendLayout
- Me.FlowLayoutPanel6.SuspendLayout
- Me.FlowLayoutPanel8.SuspendLayout
+ Me.pnInertia.SuspendLayout
+ Me.pnThermalOverloadRecovery.SuspendLayout
Me.FlowLayoutPanel2.SuspendLayout
Me.tcVoltageLevels.SuspendLayout
Me.tpFirstVoltageLevel.SuspendLayout
@@ -148,112 +152,117 @@ Partial Class IHPCForm
CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).BeginInit
Me.StatusStrip1.SuspendLayout
Me.CmOpenFile.SuspendLayout
+ Me.Panel1.SuspendLayout
Me.SuspendLayout
'
'FlowLayoutPanel1
'
Me.FlowLayoutPanel1.Controls.Add(Me.Label49)
Me.FlowLayoutPanel1.Controls.Add(Me.tbModel)
- Me.FlowLayoutPanel1.Location = New System.Drawing.Point(12, 77)
+ Me.FlowLayoutPanel1.Location = New System.Drawing.Point(14, 89)
+ Me.FlowLayoutPanel1.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.FlowLayoutPanel1.Name = "FlowLayoutPanel1"
- Me.FlowLayoutPanel1.Size = New System.Drawing.Size(513, 26)
+ Me.FlowLayoutPanel1.Size = New System.Drawing.Size(598, 30)
Me.FlowLayoutPanel1.TabIndex = 100
'
'Label49
'
Me.Label49.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label49.AutoSize = True
- Me.Label49.Location = New System.Drawing.Point(3, 6)
+ Me.Label49.AutoSize = true
+ Me.Label49.Location = New System.Drawing.Point(4, 7)
+ Me.Label49.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label49.Name = "Label49"
- Me.Label49.Size = New System.Drawing.Size(87, 13)
+ Me.Label49.Size = New System.Drawing.Size(96, 15)
Me.Label49.TabIndex = 43
Me.Label49.Text = "Make and Model"
'
'tbModel
'
Me.tbModel.Anchor = System.Windows.Forms.AnchorStyles.Left
- Me.tbModel.Location = New System.Drawing.Point(96, 3)
- Me.tbModel.Margin = New System.Windows.Forms.Padding(3, 3, 0, 3)
+ Me.tbModel.Location = New System.Drawing.Point(108, 3)
+ Me.tbModel.Margin = New System.Windows.Forms.Padding(4, 3, 0, 3)
Me.tbModel.Name = "tbModel"
- Me.tbModel.Size = New System.Drawing.Size(417, 20)
+ Me.tbModel.Size = New System.Drawing.Size(486, 23)
Me.tbModel.TabIndex = 0
'
- 'FlowLayoutPanel6
+ 'pnInertia
'
- Me.FlowLayoutPanel6.Controls.Add(Me.Label51)
- Me.FlowLayoutPanel6.Controls.Add(Me.tbInertia)
- Me.FlowLayoutPanel6.Controls.Add(Me.lblinertiaUnit)
- Me.FlowLayoutPanel6.Location = New System.Drawing.Point(12, 106)
- Me.FlowLayoutPanel6.Name = "FlowLayoutPanel6"
- Me.FlowLayoutPanel6.Size = New System.Drawing.Size(147, 26)
- Me.FlowLayoutPanel6.TabIndex = 101
+ Me.pnInertia.Controls.Add(Me.Label51)
+ Me.pnInertia.Controls.Add(Me.tbInertia)
+ Me.pnInertia.Controls.Add(Me.lblinertiaUnit)
+ Me.pnInertia.Location = New System.Drawing.Point(14, 122)
+ Me.pnInertia.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.pnInertia.Name = "pnInertia"
+ Me.pnInertia.Size = New System.Drawing.Size(248, 30)
+ Me.pnInertia.TabIndex = 101
'
'Label51
'
- Me.Label51.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label51.AutoSize = True
- Me.Label51.Location = New System.Drawing.Point(3, 6)
+ Me.Label51.AutoSize = true
+ Me.Label51.Location = New System.Drawing.Point(4, 7)
+ Me.Label51.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label51.Name = "Label51"
- Me.Label51.Size = New System.Drawing.Size(36, 13)
+ Me.Label51.Size = New System.Drawing.Size(40, 15)
Me.Label51.TabIndex = 45
Me.Label51.Text = "Inertia"
'
'tbInertia
'
- Me.tbInertia.Anchor = System.Windows.Forms.AnchorStyles.Left
- Me.tbInertia.Location = New System.Drawing.Point(45, 3)
+ Me.tbInertia.Location = New System.Drawing.Point(125, 3)
+ Me.tbInertia.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbInertia.Name = "tbInertia"
- Me.tbInertia.Size = New System.Drawing.Size(57, 20)
+ Me.tbInertia.Size = New System.Drawing.Size(66, 23)
Me.tbInertia.TabIndex = 1
'
'lblinertiaUnit
'
- Me.lblinertiaUnit.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.lblinertiaUnit.AutoSize = True
- Me.lblinertiaUnit.Location = New System.Drawing.Point(108, 6)
+ Me.lblinertiaUnit.AutoSize = true
+ Me.lblinertiaUnit.Location = New System.Drawing.Point(199, 7)
+ Me.lblinertiaUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblinertiaUnit.Name = "lblinertiaUnit"
- Me.lblinertiaUnit.Size = New System.Drawing.Size(36, 13)
+ Me.lblinertiaUnit.Size = New System.Drawing.Size(43, 15)
Me.lblinertiaUnit.TabIndex = 64
Me.lblinertiaUnit.Text = "[kgm²]"
'
- 'FlowLayoutPanel8
+ 'pnThermalOverloadRecovery
'
- Me.FlowLayoutPanel8.Controls.Add(Me.Label52)
- Me.FlowLayoutPanel8.Controls.Add(Me.tbThermalOverload)
- Me.FlowLayoutPanel8.Controls.Add(Me.Label10)
- Me.FlowLayoutPanel8.Location = New System.Drawing.Point(162, 106)
- Me.FlowLayoutPanel8.Name = "FlowLayoutPanel8"
- Me.FlowLayoutPanel8.Size = New System.Drawing.Size(305, 26)
- Me.FlowLayoutPanel8.TabIndex = 102
+ Me.pnThermalOverloadRecovery.Controls.Add(Me.Label52)
+ Me.pnThermalOverloadRecovery.Controls.Add(Me.tbThermalOverload)
+ Me.pnThermalOverloadRecovery.Controls.Add(Me.Label10)
+ Me.pnThermalOverloadRecovery.Location = New System.Drawing.Point(266, 122)
+ Me.pnThermalOverloadRecovery.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.pnThermalOverloadRecovery.Name = "pnThermalOverloadRecovery"
+ Me.pnThermalOverloadRecovery.Size = New System.Drawing.Size(309, 30)
+ Me.pnThermalOverloadRecovery.TabIndex = 102
'
'Label52
'
Me.Label52.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label52.AutoSize = True
- Me.Label52.Location = New System.Drawing.Point(3, 6)
- Me.Label52.Margin = New System.Windows.Forms.Padding(3, 0, 0, 0)
+ Me.Label52.AutoSize = true
+ Me.Label52.Location = New System.Drawing.Point(4, 7)
+ Me.Label52.Margin = New System.Windows.Forms.Padding(4, 0, 0, 0)
Me.Label52.Name = "Label52"
- Me.Label52.Size = New System.Drawing.Size(173, 13)
+ Me.Label52.Size = New System.Drawing.Size(188, 15)
Me.Label52.TabIndex = 50
Me.Label52.Text = "Thermal Overload Recovery Factor"
'
'tbThermalOverload
'
Me.tbThermalOverload.Anchor = System.Windows.Forms.AnchorStyles.Left
- Me.tbThermalOverload.Location = New System.Drawing.Point(181, 3)
- Me.tbThermalOverload.Margin = New System.Windows.Forms.Padding(5, 3, 3, 3)
+ Me.tbThermalOverload.Location = New System.Drawing.Point(198, 3)
+ Me.tbThermalOverload.Margin = New System.Windows.Forms.Padding(6, 3, 4, 3)
Me.tbThermalOverload.Name = "tbThermalOverload"
- Me.tbThermalOverload.Size = New System.Drawing.Size(56, 20)
+ Me.tbThermalOverload.Size = New System.Drawing.Size(65, 23)
Me.tbThermalOverload.TabIndex = 2
'
'Label10
'
Me.Label10.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label10.AutoSize = True
- Me.Label10.Location = New System.Drawing.Point(242, 6)
- Me.Label10.Margin = New System.Windows.Forms.Padding(2, 0, 3, 0)
+ Me.Label10.AutoSize = true
+ Me.Label10.Location = New System.Drawing.Point(269, 7)
+ Me.Label10.Margin = New System.Windows.Forms.Padding(2, 0, 4, 0)
Me.Label10.Name = "Label10"
- Me.Label10.Size = New System.Drawing.Size(16, 13)
+ Me.Label10.Size = New System.Drawing.Size(20, 15)
Me.Label10.TabIndex = 67
Me.Label10.Text = "[-]"
'
@@ -263,63 +272,63 @@ Partial Class IHPCForm
Me.FlowLayoutPanel2.Controls.Add(Me.tbDragCurve)
Me.FlowLayoutPanel2.Controls.Add(Me.btDragCurve)
Me.FlowLayoutPanel2.Controls.Add(Me.btDragCurveOpen)
- Me.FlowLayoutPanel2.Location = New System.Drawing.Point(12, 135)
+ Me.FlowLayoutPanel2.Location = New System.Drawing.Point(14, 203)
Me.FlowLayoutPanel2.Margin = New System.Windows.Forms.Padding(0)
Me.FlowLayoutPanel2.Name = "FlowLayoutPanel2"
- Me.FlowLayoutPanel2.Size = New System.Drawing.Size(469, 26)
+ Me.FlowLayoutPanel2.Size = New System.Drawing.Size(547, 30)
Me.FlowLayoutPanel2.TabIndex = 103
'
'Label1
'
Me.Label1.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label1.AutoSize = True
- Me.Label1.Location = New System.Drawing.Point(3, 6)
- Me.Label1.Margin = New System.Windows.Forms.Padding(3, 0, 6, 0)
+ Me.Label1.AutoSize = true
+ Me.Label1.Location = New System.Drawing.Point(4, 7)
+ Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 7, 0)
Me.Label1.Name = "Label1"
- Me.Label1.Size = New System.Drawing.Size(99, 13)
+ Me.Label1.Size = New System.Drawing.Size(110, 15)
Me.Label1.TabIndex = 59
Me.Label1.Text = "Drag Curve (.vemd)"
'
'tbDragCurve
'
Me.tbDragCurve.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbDragCurve.Location = New System.Drawing.Point(111, 3)
- Me.tbDragCurve.Margin = New System.Windows.Forms.Padding(3, 3, 6, 3)
+ Me.tbDragCurve.Location = New System.Drawing.Point(125, 3)
+ Me.tbDragCurve.Margin = New System.Windows.Forms.Padding(4, 3, 7, 3)
Me.tbDragCurve.Name = "tbDragCurve"
- Me.tbDragCurve.Size = New System.Drawing.Size(277, 20)
+ Me.tbDragCurve.Size = New System.Drawing.Size(322, 23)
Me.tbDragCurve.TabIndex = 3
'
'btDragCurve
'
Me.btDragCurve.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.btDragCurve.Image = CType(resources.GetObject("btDragCurve.Image"), System.Drawing.Image)
- Me.btDragCurve.Location = New System.Drawing.Point(394, 1)
+ Me.btDragCurve.Image = CType(resources.GetObject("btDragCurve.Image"),System.Drawing.Image)
+ Me.btDragCurve.Location = New System.Drawing.Point(454, 0)
Me.btDragCurve.Margin = New System.Windows.Forms.Padding(0)
Me.btDragCurve.Name = "btDragCurve"
- Me.btDragCurve.Size = New System.Drawing.Size(24, 24)
+ Me.btDragCurve.Size = New System.Drawing.Size(28, 28)
Me.btDragCurve.TabIndex = 4
- Me.btDragCurve.UseVisualStyleBackColor = True
+ Me.btDragCurve.UseVisualStyleBackColor = true
'
'btDragCurveOpen
'
Me.btDragCurveOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btDragCurveOpen.Location = New System.Drawing.Point(418, 1)
+ Me.btDragCurveOpen.Location = New System.Drawing.Point(482, 1)
Me.btDragCurveOpen.Margin = New System.Windows.Forms.Padding(0, 1, 0, 0)
Me.btDragCurveOpen.Name = "btDragCurveOpen"
- Me.btDragCurveOpen.Size = New System.Drawing.Size(24, 24)
+ Me.btDragCurveOpen.Size = New System.Drawing.Size(28, 28)
Me.btDragCurveOpen.TabIndex = 84
- Me.btDragCurveOpen.TabStop = False
- Me.btDragCurveOpen.UseVisualStyleBackColor = True
+ Me.btDragCurveOpen.TabStop = false
+ Me.btDragCurveOpen.UseVisualStyleBackColor = true
'
'tcVoltageLevels
'
Me.tcVoltageLevels.Controls.Add(Me.tpFirstVoltageLevel)
Me.tcVoltageLevels.Controls.Add(Me.tpVoltageLevel)
- Me.tcVoltageLevels.Location = New System.Drawing.Point(12, 175)
+ Me.tcVoltageLevels.Location = New System.Drawing.Point(14, 244)
Me.tcVoltageLevels.Margin = New System.Windows.Forms.Padding(0)
Me.tcVoltageLevels.Name = "tcVoltageLevels"
Me.tcVoltageLevels.SelectedIndex = 0
- Me.tcVoltageLevels.Size = New System.Drawing.Size(517, 339)
+ Me.tcVoltageLevels.Size = New System.Drawing.Size(603, 391)
Me.tcVoltageLevels.TabIndex = 104
'
'tpFirstVoltageLevel
@@ -327,59 +336,63 @@ Partial Class IHPCForm
Me.tpFirstVoltageLevel.Controls.Add(Me.lvPowerMap)
Me.tpFirstVoltageLevel.Controls.Add(Me.FlowLayoutPanel3)
Me.tpFirstVoltageLevel.Controls.Add(Me.TableLayoutPanel1)
- Me.tpFirstVoltageLevel.Location = New System.Drawing.Point(4, 22)
+ Me.tpFirstVoltageLevel.Location = New System.Drawing.Point(4, 24)
+ Me.tpFirstVoltageLevel.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tpFirstVoltageLevel.Name = "tpFirstVoltageLevel"
- Me.tpFirstVoltageLevel.Padding = New System.Windows.Forms.Padding(3)
- Me.tpFirstVoltageLevel.Size = New System.Drawing.Size(509, 313)
+ Me.tpFirstVoltageLevel.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.tpFirstVoltageLevel.Size = New System.Drawing.Size(595, 363)
Me.tpFirstVoltageLevel.TabIndex = 0
Me.tpFirstVoltageLevel.Text = "Voltage Level Low"
- Me.tpFirstVoltageLevel.UseVisualStyleBackColor = True
+ Me.tpFirstVoltageLevel.UseVisualStyleBackColor = true
'
'lvPowerMap
'
Me.lvPowerMap.Anchor = System.Windows.Forms.AnchorStyles.Top
Me.lvPowerMap.Controls.Add(Me.TableLayoutPanel3)
- Me.lvPowerMap.Location = New System.Drawing.Point(6, 126)
+ Me.lvPowerMap.Location = New System.Drawing.Point(7, 145)
+ Me.lvPowerMap.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.lvPowerMap.Name = "lvPowerMap"
- Me.lvPowerMap.Size = New System.Drawing.Size(500, 180)
+ Me.lvPowerMap.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.lvPowerMap.Size = New System.Drawing.Size(583, 208)
Me.lvPowerMap.TabIndex = 107
- Me.lvPowerMap.TabStop = False
+ Me.lvPowerMap.TabStop = false
Me.lvPowerMap.Text = "Power Map Per Gear"
'
'TableLayoutPanel3
'
Me.TableLayoutPanel3.Anchor = System.Windows.Forms.AnchorStyles.None
Me.TableLayoutPanel3.ColumnCount = 2
- Me.TableLayoutPanel3.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 129.0!))
- Me.TableLayoutPanel3.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 359.0!))
+ Me.TableLayoutPanel3.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 150!))
+ Me.TableLayoutPanel3.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 419!))
Me.TableLayoutPanel3.Controls.Add(Me.lvPowerMap1, 0, 0)
Me.TableLayoutPanel3.Controls.Add(Me.FlowLayoutPanel11, 0, 1)
Me.TableLayoutPanel3.Controls.Add(Me.Label7, 1, 1)
- Me.TableLayoutPanel3.Location = New System.Drawing.Point(6, 14)
+ Me.TableLayoutPanel3.Location = New System.Drawing.Point(7, 16)
+ Me.TableLayoutPanel3.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.TableLayoutPanel3.Name = "TableLayoutPanel3"
Me.TableLayoutPanel3.RowCount = 2
Me.TableLayoutPanel3.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 78.61636!))
Me.TableLayoutPanel3.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 21.38365!))
- Me.TableLayoutPanel3.Size = New System.Drawing.Size(488, 159)
+ Me.TableLayoutPanel3.Size = New System.Drawing.Size(569, 183)
Me.TableLayoutPanel3.TabIndex = 108
'
'lvPowerMap1
'
- Me.lvPowerMap1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
- Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.lvPowerMap1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.lvPowerMap1.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader4, Me.ColumnHeader5})
Me.TableLayoutPanel3.SetColumnSpan(Me.lvPowerMap1, 2)
- Me.lvPowerMap1.FullRowSelect = True
- Me.lvPowerMap1.GridLines = True
- Me.lvPowerMap1.HideSelection = False
- Me.lvPowerMap1.Location = New System.Drawing.Point(3, 3)
- Me.lvPowerMap1.MultiSelect = False
+ Me.lvPowerMap1.FullRowSelect = true
+ Me.lvPowerMap1.GridLines = true
+ Me.lvPowerMap1.Location = New System.Drawing.Point(4, 3)
+ Me.lvPowerMap1.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.lvPowerMap1.MultiSelect = false
Me.lvPowerMap1.Name = "lvPowerMap1"
- Me.lvPowerMap1.Size = New System.Drawing.Size(482, 119)
+ Me.lvPowerMap1.Size = New System.Drawing.Size(561, 137)
Me.lvPowerMap1.TabIndex = 77
- Me.lvPowerMap1.TabStop = False
- Me.lvPowerMap1.UseCompatibleStateImageBehavior = False
+ Me.lvPowerMap1.TabStop = false
+ Me.lvPowerMap1.UseCompatibleStateImageBehavior = false
Me.lvPowerMap1.View = System.Windows.Forms.View.Details
'
'ColumnHeader4
@@ -396,36 +409,40 @@ Partial Class IHPCForm
'
Me.FlowLayoutPanel11.Controls.Add(Me.btAddPowerMap1)
Me.FlowLayoutPanel11.Controls.Add(Me.btRemovePowerMap1)
- Me.FlowLayoutPanel11.Location = New System.Drawing.Point(3, 128)
+ Me.FlowLayoutPanel11.Location = New System.Drawing.Point(4, 146)
+ Me.FlowLayoutPanel11.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.FlowLayoutPanel11.Name = "FlowLayoutPanel11"
- Me.FlowLayoutPanel11.Size = New System.Drawing.Size(61, 28)
+ Me.FlowLayoutPanel11.Size = New System.Drawing.Size(71, 32)
Me.FlowLayoutPanel11.TabIndex = 109
'
'btAddPowerMap1
'
Me.btAddPowerMap1.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
- Me.btAddPowerMap1.Location = New System.Drawing.Point(3, 3)
+ Me.btAddPowerMap1.Location = New System.Drawing.Point(4, 3)
+ Me.btAddPowerMap1.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btAddPowerMap1.Name = "btAddPowerMap1"
- Me.btAddPowerMap1.Size = New System.Drawing.Size(24, 24)
+ Me.btAddPowerMap1.Size = New System.Drawing.Size(28, 28)
Me.btAddPowerMap1.TabIndex = 38
- Me.btAddPowerMap1.UseVisualStyleBackColor = True
+ Me.btAddPowerMap1.UseVisualStyleBackColor = true
'
'btRemovePowerMap1
'
Me.btRemovePowerMap1.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
- Me.btRemovePowerMap1.Location = New System.Drawing.Point(33, 3)
+ Me.btRemovePowerMap1.Location = New System.Drawing.Point(4, 37)
+ Me.btRemovePowerMap1.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btRemovePowerMap1.Name = "btRemovePowerMap1"
- Me.btRemovePowerMap1.Size = New System.Drawing.Size(24, 24)
+ Me.btRemovePowerMap1.Size = New System.Drawing.Size(28, 28)
Me.btRemovePowerMap1.TabIndex = 39
- Me.btRemovePowerMap1.UseVisualStyleBackColor = True
+ Me.btRemovePowerMap1.UseVisualStyleBackColor = true
'
'Label7
'
- Me.Label7.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.Label7.AutoSize = True
- Me.Label7.Location = New System.Drawing.Point(379, 125)
+ Me.Label7.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.Label7.AutoSize = true
+ Me.Label7.Location = New System.Drawing.Point(444, 143)
+ Me.Label7.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label7.Name = "Label7"
- Me.Label7.Size = New System.Drawing.Size(106, 13)
+ Me.Label7.Size = New System.Drawing.Size(121, 15)
Me.Label7.TabIndex = 6
Me.Label7.Text = "(Double-Click to Edit)"
'
@@ -436,63 +453,64 @@ Partial Class IHPCForm
Me.FlowLayoutPanel3.Controls.Add(Me.tbFLCurve1)
Me.FlowLayoutPanel3.Controls.Add(Me.btFLCurveFile1)
Me.FlowLayoutPanel3.Controls.Add(Me.btFLCurve1)
- Me.FlowLayoutPanel3.Location = New System.Drawing.Point(6, 94)
+ Me.FlowLayoutPanel3.Location = New System.Drawing.Point(7, 108)
+ Me.FlowLayoutPanel3.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.FlowLayoutPanel3.Name = "FlowLayoutPanel3"
- Me.FlowLayoutPanel3.Size = New System.Drawing.Size(496, 26)
+ Me.FlowLayoutPanel3.Size = New System.Drawing.Size(579, 30)
Me.FlowLayoutPanel3.TabIndex = 106
'
'Label2
'
Me.Label2.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label2.AutoSize = True
- Me.Label2.Location = New System.Drawing.Point(6, 6)
- Me.Label2.Margin = New System.Windows.Forms.Padding(6, 0, 9, 0)
+ Me.Label2.AutoSize = true
+ Me.Label2.Location = New System.Drawing.Point(7, 7)
+ Me.Label2.Margin = New System.Windows.Forms.Padding(7, 0, 10, 0)
Me.Label2.Name = "Label2"
- Me.Label2.Size = New System.Drawing.Size(125, 13)
+ Me.Label2.Size = New System.Drawing.Size(138, 15)
Me.Label2.TabIndex = 59
Me.Label2.Text = "Full Load Curve (.viepcp)"
'
'tbFLCurve1
'
Me.tbFLCurve1.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbFLCurve1.Location = New System.Drawing.Point(143, 3)
- Me.tbFLCurve1.Margin = New System.Windows.Forms.Padding(3, 3, 6, 3)
+ Me.tbFLCurve1.Location = New System.Drawing.Point(159, 3)
+ Me.tbFLCurve1.Margin = New System.Windows.Forms.Padding(4, 3, 7, 3)
Me.tbFLCurve1.Name = "tbFLCurve1"
- Me.tbFLCurve1.Size = New System.Drawing.Size(277, 20)
+ Me.tbFLCurve1.Size = New System.Drawing.Size(322, 23)
Me.tbFLCurve1.TabIndex = 36
'
'btFLCurveFile1
'
Me.btFLCurveFile1.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.btFLCurveFile1.Image = CType(resources.GetObject("btFLCurveFile1.Image"), System.Drawing.Image)
- Me.btFLCurveFile1.Location = New System.Drawing.Point(426, 1)
+ Me.btFLCurveFile1.Image = CType(resources.GetObject("btFLCurveFile1.Image"),System.Drawing.Image)
+ Me.btFLCurveFile1.Location = New System.Drawing.Point(488, 0)
Me.btFLCurveFile1.Margin = New System.Windows.Forms.Padding(0)
Me.btFLCurveFile1.Name = "btFLCurveFile1"
- Me.btFLCurveFile1.Size = New System.Drawing.Size(24, 24)
+ Me.btFLCurveFile1.Size = New System.Drawing.Size(28, 28)
Me.btFLCurveFile1.TabIndex = 37
- Me.btFLCurveFile1.UseVisualStyleBackColor = True
+ Me.btFLCurveFile1.UseVisualStyleBackColor = true
'
'btFLCurve1
'
Me.btFLCurve1.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btFLCurve1.Location = New System.Drawing.Point(450, 1)
+ Me.btFLCurve1.Location = New System.Drawing.Point(516, 1)
Me.btFLCurve1.Margin = New System.Windows.Forms.Padding(0, 1, 0, 0)
Me.btFLCurve1.Name = "btFLCurve1"
- Me.btFLCurve1.Size = New System.Drawing.Size(24, 24)
+ Me.btFLCurve1.Size = New System.Drawing.Size(28, 28)
Me.btFLCurve1.TabIndex = 85
- Me.btFLCurve1.TabStop = False
- Me.btFLCurve1.UseVisualStyleBackColor = True
+ Me.btFLCurve1.TabStop = false
+ Me.btFLCurve1.UseVisualStyleBackColor = true
'
'TableLayoutPanel1
'
Me.TableLayoutPanel1.ColumnCount = 7
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 140.0!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 62.0!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 30.0!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 128.0!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 62.0!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 30.0!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 59.0!))
+ 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, 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.Controls.Add(Me.Label11, 2, 1)
Me.TableLayoutPanel1.Controls.Add(Me.Label4, 2, 0)
Me.TableLayoutPanel1.Controls.Add(Me.Label13, 5, 0)
@@ -511,190 +529,199 @@ Partial Class IHPCForm
Me.TableLayoutPanel1.Controls.Add(Me.Label41, 3, 1)
Me.TableLayoutPanel1.Controls.Add(Me.tbOverloadTorque1, 4, 1)
Me.TableLayoutPanel1.Controls.Add(Me.Label12, 5, 1)
- Me.TableLayoutPanel1.Location = New System.Drawing.Point(6, 7)
+ Me.TableLayoutPanel1.Location = New System.Drawing.Point(7, 8)
+ Me.TableLayoutPanel1.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
Me.TableLayoutPanel1.RowCount = 3
- Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27.0!))
- Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27.0!))
- Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27.0!))
- Me.TableLayoutPanel1.Size = New System.Drawing.Size(496, 82)
+ Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 31!))
+ Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 31!))
+ Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 31!))
+ Me.TableLayoutPanel1.Size = New System.Drawing.Size(579, 95)
Me.TableLayoutPanel1.TabIndex = 105
'
'Label11
'
Me.Label11.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label11.AutoSize = True
- Me.Label11.Location = New System.Drawing.Point(202, 34)
+ Me.Label11.AutoSize = true
+ Me.Label11.Location = New System.Drawing.Point(235, 39)
Me.Label11.Margin = New System.Windows.Forms.Padding(0)
Me.Label11.Name = "Label11"
- Me.Label11.Size = New System.Drawing.Size(29, 13)
+ Me.Label11.Size = New System.Drawing.Size(35, 15)
Me.Label11.TabIndex = 63
Me.Label11.Text = "[Nm]"
'
'Label4
'
Me.Label4.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label4.AutoSize = True
- Me.Label4.Location = New System.Drawing.Point(207, 7)
+ Me.Label4.AutoSize = true
+ Me.Label4.Location = New System.Drawing.Point(241, 8)
Me.Label4.Margin = New System.Windows.Forms.Padding(0)
Me.Label4.Name = "Label4"
- Me.Label4.Size = New System.Drawing.Size(20, 13)
+ Me.Label4.Size = New System.Drawing.Size(22, 15)
Me.Label4.TabIndex = 62
Me.Label4.Text = "[V]"
'
'Label13
'
Me.Label13.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label13.AutoSize = True
- Me.Label13.Location = New System.Drawing.Point(428, 7)
+ Me.Label13.AutoSize = true
+ Me.Label13.Location = New System.Drawing.Point(498, 8)
Me.Label13.Margin = New System.Windows.Forms.Padding(0)
Me.Label13.Name = "Label13"
- Me.Label13.Size = New System.Drawing.Size(18, 13)
+ Me.Label13.Size = New System.Drawing.Size(20, 15)
Me.Label13.TabIndex = 65
Me.Label13.Text = "[s]"
'
'Label43
'
Me.Label43.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label43.AutoSize = True
- Me.Label43.Location = New System.Drawing.Point(281, 7)
+ Me.Label43.AutoSize = true
+ Me.Label43.Location = New System.Drawing.Point(331, 8)
+ Me.Label43.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label43.Name = "Label43"
- Me.Label43.Size = New System.Drawing.Size(76, 13)
+ Me.Label43.Size = New System.Drawing.Size(84, 15)
Me.Label43.TabIndex = 11
Me.Label43.Text = "Overload Time"
'
'Label37
'
Me.Label37.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label37.AutoSize = True
- Me.Label37.Location = New System.Drawing.Point(94, 7)
+ Me.Label37.AutoSize = true
+ Me.Label37.Location = New System.Drawing.Point(113, 8)
+ Me.Label37.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label37.Name = "Label37"
- Me.Label37.Size = New System.Drawing.Size(43, 13)
+ Me.Label37.Size = New System.Drawing.Size(46, 15)
Me.Label37.TabIndex = 1
Me.Label37.Text = "Voltage"
'
'tbOverloadTime1
'
Me.tbOverloadTime1.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbOverloadTime1.Location = New System.Drawing.Point(363, 3)
+ Me.tbOverloadTime1.Location = New System.Drawing.Point(422, 4)
Me.tbOverloadTime1.Margin = New System.Windows.Forms.Padding(0)
Me.tbOverloadTime1.Name = "tbOverloadTime1"
- Me.tbOverloadTime1.Size = New System.Drawing.Size(56, 20)
+ Me.tbOverloadTime1.Size = New System.Drawing.Size(65, 23)
Me.tbOverloadTime1.TabIndex = 33
'
'tbVoltage1
'
Me.tbVoltage1.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbVoltage1.Location = New System.Drawing.Point(143, 3)
+ Me.tbVoltage1.Location = New System.Drawing.Point(166, 4)
Me.tbVoltage1.Margin = New System.Windows.Forms.Padding(0)
Me.tbVoltage1.Name = "tbVoltage1"
- Me.tbVoltage1.Size = New System.Drawing.Size(56, 20)
+ Me.tbVoltage1.Size = New System.Drawing.Size(65, 23)
Me.tbVoltage1.TabIndex = 30
'
'Label39
'
Me.Label39.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label39.AutoSize = True
- Me.Label39.Location = New System.Drawing.Point(40, 34)
+ Me.Label39.AutoSize = true
+ Me.Label39.Location = New System.Drawing.Point(51, 39)
+ Me.Label39.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label39.Name = "Label39"
- Me.Label39.Size = New System.Drawing.Size(97, 13)
+ Me.Label39.Size = New System.Drawing.Size(108, 15)
Me.Label39.TabIndex = 3
Me.Label39.Text = "Continuous Torque"
'
'Label3
'
Me.Label3.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label3.AutoSize = True
- Me.Label3.Location = New System.Drawing.Point(6, 61)
+ Me.Label3.AutoSize = true
+ Me.Label3.Location = New System.Drawing.Point(16, 71)
+ Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label3.Name = "Label3"
- Me.Label3.Size = New System.Drawing.Size(131, 13)
+ Me.Label3.Size = New System.Drawing.Size(143, 15)
Me.Label3.TabIndex = 6
Me.Label3.Text = "Continuous Torque Speed"
'
'tbContinuousTorque1
'
Me.tbContinuousTorque1.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbContinuousTorque1.Location = New System.Drawing.Point(143, 30)
+ Me.tbContinuousTorque1.Location = New System.Drawing.Point(166, 35)
Me.tbContinuousTorque1.Margin = New System.Windows.Forms.Padding(0)
Me.tbContinuousTorque1.Name = "tbContinuousTorque1"
- Me.tbContinuousTorque1.Size = New System.Drawing.Size(56, 20)
+ Me.tbContinuousTorque1.Size = New System.Drawing.Size(65, 23)
Me.tbContinuousTorque1.TabIndex = 31
'
'tbContinuousTorqueSpeed1
'
Me.tbContinuousTorqueSpeed1.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbContinuousTorqueSpeed1.Location = New System.Drawing.Point(143, 58)
+ Me.tbContinuousTorqueSpeed1.Location = New System.Drawing.Point(166, 67)
Me.tbContinuousTorqueSpeed1.Margin = New System.Windows.Forms.Padding(0)
Me.tbContinuousTorqueSpeed1.Name = "tbContinuousTorqueSpeed1"
- Me.tbContinuousTorqueSpeed1.Size = New System.Drawing.Size(56, 20)
+ Me.tbContinuousTorqueSpeed1.Size = New System.Drawing.Size(65, 23)
Me.tbContinuousTorqueSpeed1.TabIndex = 32
'
'Label15
'
Me.Label15.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label15.AutoSize = True
- Me.Label15.Location = New System.Drawing.Point(202, 61)
+ Me.Label15.AutoSize = true
+ Me.Label15.Location = New System.Drawing.Point(236, 63)
Me.Label15.Margin = New System.Windows.Forms.Padding(0)
Me.Label15.Name = "Label15"
- Me.Label15.Size = New System.Drawing.Size(30, 13)
+ Me.Label15.Size = New System.Drawing.Size(33, 30)
Me.Label15.TabIndex = 67
Me.Label15.Text = "[rpm]"
'
'Label42
'
Me.Label42.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label42.AutoSize = True
- Me.Label42.Location = New System.Drawing.Point(236, 61)
+ Me.Label42.AutoSize = true
+ Me.Label42.Location = New System.Drawing.Point(286, 71)
+ Me.Label42.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label42.Name = "Label42"
- Me.Label42.Size = New System.Drawing.Size(121, 13)
+ Me.Label42.Size = New System.Drawing.Size(129, 15)
Me.Label42.TabIndex = 9
Me.Label42.Text = "Overload Torque Speed"
'
'Label14
'
Me.Label14.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label14.AutoSize = True
- Me.Label14.Location = New System.Drawing.Point(422, 61)
+ Me.Label14.AutoSize = true
+ Me.Label14.Location = New System.Drawing.Point(492, 63)
Me.Label14.Margin = New System.Windows.Forms.Padding(0)
Me.Label14.Name = "Label14"
- Me.Label14.Size = New System.Drawing.Size(30, 13)
+ Me.Label14.Size = New System.Drawing.Size(33, 30)
Me.Label14.TabIndex = 66
Me.Label14.Text = "[rpm]"
'
'tbOverloadTorqueSpeed1
'
Me.tbOverloadTorqueSpeed1.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbOverloadTorqueSpeed1.Location = New System.Drawing.Point(363, 58)
+ Me.tbOverloadTorqueSpeed1.Location = New System.Drawing.Point(423, 67)
+ Me.tbOverloadTorqueSpeed1.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbOverloadTorqueSpeed1.Name = "tbOverloadTorqueSpeed1"
- Me.tbOverloadTorqueSpeed1.Size = New System.Drawing.Size(56, 20)
+ Me.tbOverloadTorqueSpeed1.Size = New System.Drawing.Size(64, 23)
Me.tbOverloadTorqueSpeed1.TabIndex = 35
'
'Label41
'
Me.Label41.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label41.AutoSize = True
- Me.Label41.Location = New System.Drawing.Point(270, 34)
+ Me.Label41.AutoSize = true
+ Me.Label41.Location = New System.Drawing.Point(321, 39)
+ Me.Label41.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label41.Name = "Label41"
- Me.Label41.Size = New System.Drawing.Size(87, 13)
+ Me.Label41.Size = New System.Drawing.Size(94, 15)
Me.Label41.TabIndex = 7
Me.Label41.Text = "Overload Torque"
'
'tbOverloadTorque1
'
Me.tbOverloadTorque1.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbOverloadTorque1.Location = New System.Drawing.Point(363, 30)
+ Me.tbOverloadTorque1.Location = New System.Drawing.Point(423, 35)
+ Me.tbOverloadTorque1.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbOverloadTorque1.Name = "tbOverloadTorque1"
- Me.tbOverloadTorque1.Size = New System.Drawing.Size(56, 20)
+ Me.tbOverloadTorque1.Size = New System.Drawing.Size(64, 23)
Me.tbOverloadTorque1.TabIndex = 34
'
'Label12
'
Me.Label12.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label12.AutoSize = True
- Me.Label12.Location = New System.Drawing.Point(422, 34)
+ Me.Label12.AutoSize = true
+ Me.Label12.Location = New System.Drawing.Point(491, 39)
Me.Label12.Margin = New System.Windows.Forms.Padding(0)
Me.Label12.Name = "Label12"
- Me.Label12.Size = New System.Drawing.Size(29, 13)
+ Me.Label12.Size = New System.Drawing.Size(35, 15)
Me.Label12.TabIndex = 64
Me.Label12.Text = "[Nm]"
'
@@ -703,59 +730,63 @@ Partial Class IHPCForm
Me.tpVoltageLevel.Controls.Add(Me.GroupBox1)
Me.tpVoltageLevel.Controls.Add(Me.FlowLayoutPanel10)
Me.tpVoltageLevel.Controls.Add(Me.TableLayoutPanel4)
- Me.tpVoltageLevel.Location = New System.Drawing.Point(4, 22)
+ Me.tpVoltageLevel.Location = New System.Drawing.Point(4, 24)
+ Me.tpVoltageLevel.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tpVoltageLevel.Name = "tpVoltageLevel"
- Me.tpVoltageLevel.Padding = New System.Windows.Forms.Padding(3)
- Me.tpVoltageLevel.Size = New System.Drawing.Size(509, 313)
+ Me.tpVoltageLevel.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.tpVoltageLevel.Size = New System.Drawing.Size(595, 363)
Me.tpVoltageLevel.TabIndex = 1
Me.tpVoltageLevel.Text = "Voltage Level High"
- Me.tpVoltageLevel.UseVisualStyleBackColor = True
+ Me.tpVoltageLevel.UseVisualStyleBackColor = true
'
'GroupBox1
'
Me.GroupBox1.Anchor = System.Windows.Forms.AnchorStyles.Top
Me.GroupBox1.Controls.Add(Me.TableLayoutPanel2)
- Me.GroupBox1.Location = New System.Drawing.Point(6, 126)
+ Me.GroupBox1.Location = New System.Drawing.Point(7, 145)
+ Me.GroupBox1.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.GroupBox1.Name = "GroupBox1"
- Me.GroupBox1.Size = New System.Drawing.Size(496, 180)
+ Me.GroupBox1.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.GroupBox1.Size = New System.Drawing.Size(579, 208)
Me.GroupBox1.TabIndex = 122
- Me.GroupBox1.TabStop = False
+ Me.GroupBox1.TabStop = false
Me.GroupBox1.Text = "Power Map Per Gear"
'
'TableLayoutPanel2
'
Me.TableLayoutPanel2.Anchor = System.Windows.Forms.AnchorStyles.None
Me.TableLayoutPanel2.ColumnCount = 2
- Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 129.0!))
- Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 359.0!))
+ Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 150!))
+ Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 419!))
Me.TableLayoutPanel2.Controls.Add(Me.lvPowerMap2, 0, 0)
Me.TableLayoutPanel2.Controls.Add(Me.FlowLayoutPanel4, 0, 1)
Me.TableLayoutPanel2.Controls.Add(Me.Label5, 1, 1)
- Me.TableLayoutPanel2.Location = New System.Drawing.Point(6, 14)
+ Me.TableLayoutPanel2.Location = New System.Drawing.Point(7, 16)
+ Me.TableLayoutPanel2.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.TableLayoutPanel2.Name = "TableLayoutPanel2"
Me.TableLayoutPanel2.RowCount = 2
Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 78.61636!))
Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 21.38365!))
- Me.TableLayoutPanel2.Size = New System.Drawing.Size(488, 159)
+ Me.TableLayoutPanel2.Size = New System.Drawing.Size(569, 183)
Me.TableLayoutPanel2.TabIndex = 123
'
'lvPowerMap2
'
- Me.lvPowerMap2.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
- Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.lvPowerMap2.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.lvPowerMap2.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader2})
Me.TableLayoutPanel2.SetColumnSpan(Me.lvPowerMap2, 2)
- Me.lvPowerMap2.FullRowSelect = True
- Me.lvPowerMap2.GridLines = True
- Me.lvPowerMap2.HideSelection = False
- Me.lvPowerMap2.Location = New System.Drawing.Point(3, 3)
- Me.lvPowerMap2.MultiSelect = False
+ Me.lvPowerMap2.FullRowSelect = true
+ Me.lvPowerMap2.GridLines = true
+ Me.lvPowerMap2.Location = New System.Drawing.Point(4, 3)
+ Me.lvPowerMap2.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.lvPowerMap2.MultiSelect = false
Me.lvPowerMap2.Name = "lvPowerMap2"
- Me.lvPowerMap2.Size = New System.Drawing.Size(482, 119)
+ Me.lvPowerMap2.Size = New System.Drawing.Size(561, 137)
Me.lvPowerMap2.TabIndex = 77
- Me.lvPowerMap2.TabStop = False
- Me.lvPowerMap2.UseCompatibleStateImageBehavior = False
+ Me.lvPowerMap2.TabStop = false
+ Me.lvPowerMap2.UseCompatibleStateImageBehavior = false
Me.lvPowerMap2.View = System.Windows.Forms.View.Details
'
'ColumnHeader1
@@ -772,36 +803,40 @@ Partial Class IHPCForm
'
Me.FlowLayoutPanel4.Controls.Add(Me.btAddPowerMap2)
Me.FlowLayoutPanel4.Controls.Add(Me.btRemovePowerMap2)
- Me.FlowLayoutPanel4.Location = New System.Drawing.Point(3, 128)
+ Me.FlowLayoutPanel4.Location = New System.Drawing.Point(4, 146)
+ Me.FlowLayoutPanel4.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.FlowLayoutPanel4.Name = "FlowLayoutPanel4"
- Me.FlowLayoutPanel4.Size = New System.Drawing.Size(61, 28)
+ Me.FlowLayoutPanel4.Size = New System.Drawing.Size(71, 32)
Me.FlowLayoutPanel4.TabIndex = 124
'
'btAddPowerMap2
'
Me.btAddPowerMap2.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
- Me.btAddPowerMap2.Location = New System.Drawing.Point(3, 3)
+ Me.btAddPowerMap2.Location = New System.Drawing.Point(4, 3)
+ Me.btAddPowerMap2.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btAddPowerMap2.Name = "btAddPowerMap2"
- Me.btAddPowerMap2.Size = New System.Drawing.Size(24, 24)
+ Me.btAddPowerMap2.Size = New System.Drawing.Size(28, 28)
Me.btAddPowerMap2.TabIndex = 48
- Me.btAddPowerMap2.UseVisualStyleBackColor = True
+ Me.btAddPowerMap2.UseVisualStyleBackColor = true
'
'btRemovePowerMap2
'
Me.btRemovePowerMap2.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
- Me.btRemovePowerMap2.Location = New System.Drawing.Point(33, 3)
+ Me.btRemovePowerMap2.Location = New System.Drawing.Point(4, 37)
+ Me.btRemovePowerMap2.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btRemovePowerMap2.Name = "btRemovePowerMap2"
- Me.btRemovePowerMap2.Size = New System.Drawing.Size(24, 24)
+ Me.btRemovePowerMap2.Size = New System.Drawing.Size(28, 28)
Me.btRemovePowerMap2.TabIndex = 49
- Me.btRemovePowerMap2.UseVisualStyleBackColor = True
+ Me.btRemovePowerMap2.UseVisualStyleBackColor = true
'
'Label5
'
- Me.Label5.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.Label5.AutoSize = True
- Me.Label5.Location = New System.Drawing.Point(379, 125)
+ Me.Label5.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.Label5.AutoSize = true
+ Me.Label5.Location = New System.Drawing.Point(444, 143)
+ Me.Label5.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label5.Name = "Label5"
- Me.Label5.Size = New System.Drawing.Size(106, 13)
+ Me.Label5.Size = New System.Drawing.Size(121, 15)
Me.Label5.TabIndex = 6
Me.Label5.Text = "(Double-Click to Edit)"
'
@@ -811,64 +846,65 @@ Partial Class IHPCForm
Me.FlowLayoutPanel10.Controls.Add(Me.tbFLCurve2)
Me.FlowLayoutPanel10.Controls.Add(Me.btFLCurveFile2)
Me.FlowLayoutPanel10.Controls.Add(Me.btFLCurve2)
- Me.FlowLayoutPanel10.Location = New System.Drawing.Point(6, 94)
+ Me.FlowLayoutPanel10.Location = New System.Drawing.Point(7, 108)
+ Me.FlowLayoutPanel10.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.FlowLayoutPanel10.Name = "FlowLayoutPanel10"
- Me.FlowLayoutPanel10.Size = New System.Drawing.Size(496, 26)
+ Me.FlowLayoutPanel10.Size = New System.Drawing.Size(579, 30)
Me.FlowLayoutPanel10.TabIndex = 121
'
'Label28
'
Me.Label28.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label28.AutoSize = True
- Me.Label28.Location = New System.Drawing.Point(6, 6)
- Me.Label28.Margin = New System.Windows.Forms.Padding(6, 0, 9, 0)
+ Me.Label28.AutoSize = true
+ Me.Label28.Location = New System.Drawing.Point(7, 7)
+ Me.Label28.Margin = New System.Windows.Forms.Padding(7, 0, 10, 0)
Me.Label28.Name = "Label28"
- Me.Label28.Size = New System.Drawing.Size(125, 13)
+ Me.Label28.Size = New System.Drawing.Size(138, 15)
Me.Label28.TabIndex = 59
Me.Label28.Text = "Full Load Curve (.viepcp)"
'
'tbFLCurve2
'
Me.tbFLCurve2.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbFLCurve2.Location = New System.Drawing.Point(143, 3)
- Me.tbFLCurve2.Margin = New System.Windows.Forms.Padding(3, 3, 6, 3)
+ Me.tbFLCurve2.Location = New System.Drawing.Point(159, 3)
+ Me.tbFLCurve2.Margin = New System.Windows.Forms.Padding(4, 3, 7, 3)
Me.tbFLCurve2.Name = "tbFLCurve2"
- Me.tbFLCurve2.Size = New System.Drawing.Size(277, 20)
+ Me.tbFLCurve2.Size = New System.Drawing.Size(322, 23)
Me.tbFLCurve2.TabIndex = 46
'
'btFLCurveFile2
'
Me.btFLCurveFile2.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.btFLCurveFile2.Image = CType(resources.GetObject("btFLCurveFile2.Image"), System.Drawing.Image)
- Me.btFLCurveFile2.Location = New System.Drawing.Point(426, 1)
+ Me.btFLCurveFile2.Image = CType(resources.GetObject("btFLCurveFile2.Image"),System.Drawing.Image)
+ Me.btFLCurveFile2.Location = New System.Drawing.Point(488, 0)
Me.btFLCurveFile2.Margin = New System.Windows.Forms.Padding(0)
Me.btFLCurveFile2.Name = "btFLCurveFile2"
- Me.btFLCurveFile2.Size = New System.Drawing.Size(24, 24)
+ Me.btFLCurveFile2.Size = New System.Drawing.Size(28, 28)
Me.btFLCurveFile2.TabIndex = 47
- Me.btFLCurveFile2.UseVisualStyleBackColor = True
+ Me.btFLCurveFile2.UseVisualStyleBackColor = true
'
'btFLCurve2
'
Me.btFLCurve2.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btFLCurve2.Location = New System.Drawing.Point(450, 1)
+ Me.btFLCurve2.Location = New System.Drawing.Point(516, 1)
Me.btFLCurve2.Margin = New System.Windows.Forms.Padding(0, 1, 0, 0)
Me.btFLCurve2.Name = "btFLCurve2"
- Me.btFLCurve2.Size = New System.Drawing.Size(24, 24)
+ Me.btFLCurve2.Size = New System.Drawing.Size(28, 28)
Me.btFLCurve2.TabIndex = 86
- Me.btFLCurve2.TabStop = False
- Me.btFLCurve2.UseVisualStyleBackColor = True
+ Me.btFLCurve2.TabStop = false
+ Me.btFLCurve2.UseVisualStyleBackColor = true
'
'TableLayoutPanel4
'
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, 140.0!))
- Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 62.0!))
- Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 30.0!))
- Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 128.0!))
- Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 62.0!))
- Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 30.0!))
- Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 59.0!))
+ 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, 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.Controls.Add(Me.Label17, 2, 1)
Me.TableLayoutPanel4.Controls.Add(Me.Label18, 2, 0)
Me.TableLayoutPanel4.Controls.Add(Me.Label26, 5, 0)
@@ -887,45 +923,46 @@ Partial Class IHPCForm
Me.TableLayoutPanel4.Controls.Add(Me.Label22, 3, 1)
Me.TableLayoutPanel4.Controls.Add(Me.tbOverloadTorque2, 4, 1)
Me.TableLayoutPanel4.Controls.Add(Me.Label16, 5, 1)
- Me.TableLayoutPanel4.Location = New System.Drawing.Point(6, 7)
+ Me.TableLayoutPanel4.Location = New System.Drawing.Point(7, 8)
+ Me.TableLayoutPanel4.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.TableLayoutPanel4.Name = "TableLayoutPanel4"
Me.TableLayoutPanel4.RowCount = 3
- Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27.0!))
- Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27.0!))
- Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27.0!))
- Me.TableLayoutPanel4.Size = New System.Drawing.Size(496, 82)
+ Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 31!))
+ Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 31!))
+ Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 31!))
+ Me.TableLayoutPanel4.Size = New System.Drawing.Size(579, 95)
Me.TableLayoutPanel4.TabIndex = 120
'
'Label17
'
Me.Label17.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label17.AutoSize = True
- Me.Label17.Location = New System.Drawing.Point(202, 34)
+ Me.Label17.AutoSize = true
+ Me.Label17.Location = New System.Drawing.Point(235, 39)
Me.Label17.Margin = New System.Windows.Forms.Padding(0)
Me.Label17.Name = "Label17"
- Me.Label17.Size = New System.Drawing.Size(29, 13)
+ Me.Label17.Size = New System.Drawing.Size(35, 15)
Me.Label17.TabIndex = 63
Me.Label17.Text = "[Nm]"
'
'Label18
'
Me.Label18.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label18.AutoSize = True
- Me.Label18.Location = New System.Drawing.Point(207, 7)
+ Me.Label18.AutoSize = true
+ Me.Label18.Location = New System.Drawing.Point(241, 8)
Me.Label18.Margin = New System.Windows.Forms.Padding(0)
Me.Label18.Name = "Label18"
- Me.Label18.Size = New System.Drawing.Size(20, 13)
+ Me.Label18.Size = New System.Drawing.Size(22, 15)
Me.Label18.TabIndex = 62
Me.Label18.Text = "[V]"
'
'Label26
'
Me.Label26.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label26.AutoSize = True
- Me.Label26.Location = New System.Drawing.Point(428, 7)
+ Me.Label26.AutoSize = true
+ Me.Label26.Location = New System.Drawing.Point(498, 8)
Me.Label26.Margin = New System.Windows.Forms.Padding(0)
Me.Label26.Name = "Label26"
- Me.Label26.Size = New System.Drawing.Size(18, 13)
+ Me.Label26.Size = New System.Drawing.Size(20, 15)
Me.Label26.TabIndex = 65
Me.Label26.Text = "[s]"
'
@@ -933,45 +970,50 @@ Partial Class IHPCForm
'
Me.Label19.Anchor = System.Windows.Forms.AnchorStyles.Right
Me.Label19.AutoSize = true
- Me.Label19.Location = New System.Drawing.Point(94, 7)
+ Me.Label19.Location = New System.Drawing.Point(113, 8)
+ Me.Label19.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label19.Name = "Label19"
- Me.Label19.Size = New System.Drawing.Size(43, 13)
+ Me.Label19.Size = New System.Drawing.Size(46, 15)
Me.Label19.TabIndex = 1
Me.Label19.Text = "Voltage"
'
'tbOverloadTime2
'
Me.tbOverloadTime2.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbOverloadTime2.Location = New System.Drawing.Point(363, 3)
+ Me.tbOverloadTime2.Location = New System.Drawing.Point(423, 4)
+ Me.tbOverloadTime2.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbOverloadTime2.Name = "tbOverloadTime2"
- Me.tbOverloadTime2.Size = New System.Drawing.Size(56, 20)
+ Me.tbOverloadTime2.Size = New System.Drawing.Size(64, 23)
Me.tbOverloadTime2.TabIndex = 43
'
'Label24
'
Me.Label24.Anchor = System.Windows.Forms.AnchorStyles.Right
Me.Label24.AutoSize = true
- Me.Label24.Location = New System.Drawing.Point(281, 7)
+ Me.Label24.Location = New System.Drawing.Point(331, 8)
+ Me.Label24.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label24.Name = "Label24"
- Me.Label24.Size = New System.Drawing.Size(76, 13)
+ Me.Label24.Size = New System.Drawing.Size(84, 15)
Me.Label24.TabIndex = 11
Me.Label24.Text = "Overload Time"
'
'tbVoltage2
'
Me.tbVoltage2.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbVoltage2.Location = New System.Drawing.Point(143, 3)
+ Me.tbVoltage2.Location = New System.Drawing.Point(167, 4)
+ Me.tbVoltage2.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbVoltage2.Name = "tbVoltage2"
- Me.tbVoltage2.Size = New System.Drawing.Size(56, 20)
+ Me.tbVoltage2.Size = New System.Drawing.Size(64, 23)
Me.tbVoltage2.TabIndex = 40
'
'Label20
'
Me.Label20.Anchor = System.Windows.Forms.AnchorStyles.Right
Me.Label20.AutoSize = true
- Me.Label20.Location = New System.Drawing.Point(40, 34)
+ Me.Label20.Location = New System.Drawing.Point(51, 39)
+ Me.Label20.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label20.Name = "Label20"
- Me.Label20.Size = New System.Drawing.Size(97, 13)
+ Me.Label20.Size = New System.Drawing.Size(108, 15)
Me.Label20.TabIndex = 3
Me.Label20.Text = "Continuous Torque"
'
@@ -979,36 +1021,39 @@ Partial Class IHPCForm
'
Me.Label21.Anchor = System.Windows.Forms.AnchorStyles.Right
Me.Label21.AutoSize = true
- Me.Label21.Location = New System.Drawing.Point(6, 61)
+ Me.Label21.Location = New System.Drawing.Point(16, 71)
+ Me.Label21.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label21.Name = "Label21"
- Me.Label21.Size = New System.Drawing.Size(131, 13)
+ Me.Label21.Size = New System.Drawing.Size(143, 15)
Me.Label21.TabIndex = 6
Me.Label21.Text = "Continuous Torque Speed"
'
'tbContinuousTorque2
'
Me.tbContinuousTorque2.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbContinuousTorque2.Location = New System.Drawing.Point(143, 30)
+ Me.tbContinuousTorque2.Location = New System.Drawing.Point(167, 35)
+ Me.tbContinuousTorque2.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbContinuousTorque2.Name = "tbContinuousTorque2"
- Me.tbContinuousTorque2.Size = New System.Drawing.Size(56, 20)
+ Me.tbContinuousTorque2.Size = New System.Drawing.Size(64, 23)
Me.tbContinuousTorque2.TabIndex = 41
'
'tbContinuousTorqueSpeed2
'
Me.tbContinuousTorqueSpeed2.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbContinuousTorqueSpeed2.Location = New System.Drawing.Point(143, 58)
+ Me.tbContinuousTorqueSpeed2.Location = New System.Drawing.Point(167, 67)
+ Me.tbContinuousTorqueSpeed2.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbContinuousTorqueSpeed2.Name = "tbContinuousTorqueSpeed2"
- Me.tbContinuousTorqueSpeed2.Size = New System.Drawing.Size(56, 20)
+ Me.tbContinuousTorqueSpeed2.Size = New System.Drawing.Size(64, 23)
Me.tbContinuousTorqueSpeed2.TabIndex = 42
'
'Label27
'
Me.Label27.Anchor = System.Windows.Forms.AnchorStyles.None
Me.Label27.AutoSize = true
- Me.Label27.Location = New System.Drawing.Point(202, 61)
+ Me.Label27.Location = New System.Drawing.Point(236, 63)
Me.Label27.Margin = New System.Windows.Forms.Padding(0)
Me.Label27.Name = "Label27"
- Me.Label27.Size = New System.Drawing.Size(30, 13)
+ Me.Label27.Size = New System.Drawing.Size(33, 30)
Me.Label27.TabIndex = 67
Me.Label27.Text = "[rpm]"
'
@@ -1016,28 +1061,30 @@ Partial Class IHPCForm
'
Me.Label23.Anchor = System.Windows.Forms.AnchorStyles.Right
Me.Label23.AutoSize = true
- Me.Label23.Location = New System.Drawing.Point(236, 61)
+ Me.Label23.Location = New System.Drawing.Point(286, 71)
+ Me.Label23.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label23.Name = "Label23"
- Me.Label23.Size = New System.Drawing.Size(121, 13)
+ Me.Label23.Size = New System.Drawing.Size(129, 15)
Me.Label23.TabIndex = 9
Me.Label23.Text = "Overload Torque Speed"
'
'tbOverloadTorqueSpeed2
'
Me.tbOverloadTorqueSpeed2.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbOverloadTorqueSpeed2.Location = New System.Drawing.Point(363, 58)
+ Me.tbOverloadTorqueSpeed2.Location = New System.Drawing.Point(423, 67)
+ Me.tbOverloadTorqueSpeed2.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbOverloadTorqueSpeed2.Name = "tbOverloadTorqueSpeed2"
- Me.tbOverloadTorqueSpeed2.Size = New System.Drawing.Size(56, 20)
+ Me.tbOverloadTorqueSpeed2.Size = New System.Drawing.Size(64, 23)
Me.tbOverloadTorqueSpeed2.TabIndex = 45
'
'Label25
'
Me.Label25.Anchor = System.Windows.Forms.AnchorStyles.None
Me.Label25.AutoSize = true
- Me.Label25.Location = New System.Drawing.Point(422, 61)
+ Me.Label25.Location = New System.Drawing.Point(492, 63)
Me.Label25.Margin = New System.Windows.Forms.Padding(0)
Me.Label25.Name = "Label25"
- Me.Label25.Size = New System.Drawing.Size(30, 13)
+ Me.Label25.Size = New System.Drawing.Size(33, 30)
Me.Label25.TabIndex = 66
Me.Label25.Text = "[rpm]"
'
@@ -1045,28 +1092,30 @@ Partial Class IHPCForm
'
Me.Label22.Anchor = System.Windows.Forms.AnchorStyles.Right
Me.Label22.AutoSize = true
- Me.Label22.Location = New System.Drawing.Point(270, 34)
+ Me.Label22.Location = New System.Drawing.Point(321, 39)
+ Me.Label22.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label22.Name = "Label22"
- Me.Label22.Size = New System.Drawing.Size(87, 13)
+ Me.Label22.Size = New System.Drawing.Size(94, 15)
Me.Label22.TabIndex = 7
Me.Label22.Text = "Overload Torque"
'
'tbOverloadTorque2
'
Me.tbOverloadTorque2.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbOverloadTorque2.Location = New System.Drawing.Point(363, 30)
+ Me.tbOverloadTorque2.Location = New System.Drawing.Point(423, 35)
+ Me.tbOverloadTorque2.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbOverloadTorque2.Name = "tbOverloadTorque2"
- Me.tbOverloadTorque2.Size = New System.Drawing.Size(56, 20)
+ Me.tbOverloadTorque2.Size = New System.Drawing.Size(64, 23)
Me.tbOverloadTorque2.TabIndex = 44
'
'Label16
'
Me.Label16.Anchor = System.Windows.Forms.AnchorStyles.None
Me.Label16.AutoSize = true
- Me.Label16.Location = New System.Drawing.Point(422, 34)
+ Me.Label16.Location = New System.Drawing.Point(491, 39)
Me.Label16.Margin = New System.Windows.Forms.Padding(0)
Me.Label16.Name = "Label16"
- Me.Label16.Size = New System.Drawing.Size(29, 13)
+ Me.Label16.Size = New System.Drawing.Size(35, 15)
Me.Label16.TabIndex = 64
Me.Label16.Text = "[Nm]"
'
@@ -1077,7 +1126,7 @@ Partial Class IHPCForm
Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator3, Me.ToolStripBtSendTo, Me.ToolStripSeparator1, Me.ToolStripButton1})
Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
Me.ToolStrip1.Name = "ToolStrip1"
- Me.ToolStrip1.Size = New System.Drawing.Size(541, 31)
+ Me.ToolStrip1.Size = New System.Drawing.Size(631, 31)
Me.ToolStrip1.TabIndex = 78
Me.ToolStrip1.Text = "ToolStrip1"
'
@@ -1156,8 +1205,9 @@ Partial Class IHPCForm
Me.PictureBox1.Dock = System.Windows.Forms.DockStyle.Top
Me.PictureBox1.Image = Global.TUGraz.VECTO.My.Resources.Resources.VECTO_Mainform
Me.PictureBox1.Location = New System.Drawing.Point(0, 31)
+ Me.PictureBox1.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.PictureBox1.Name = "PictureBox1"
- Me.PictureBox1.Size = New System.Drawing.Size(541, 40)
+ Me.PictureBox1.Size = New System.Drawing.Size(631, 46)
Me.PictureBox1.TabIndex = 79
Me.PictureBox1.TabStop = false
'
@@ -1165,8 +1215,9 @@ Partial Class IHPCForm
'
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, CType(0,Byte))
- Me.lblTitle.Location = New System.Drawing.Point(108, 37)
+ 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(126, 43)
+ Me.lblTitle.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblTitle.Name = "lblTitle"
Me.lblTitle.Size = New System.Drawing.Size(69, 29)
Me.lblTitle.TabIndex = 80
@@ -1174,19 +1225,23 @@ Partial Class IHPCForm
'
'btCancel
'
+ Me.btCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.btCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
- Me.btCancel.Location = New System.Drawing.Point(454, 520)
+ Me.btCancel.Location = New System.Drawing.Point(530, 662)
+ Me.btCancel.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btCancel.Name = "btCancel"
- Me.btCancel.Size = New System.Drawing.Size(75, 23)
+ Me.btCancel.Size = New System.Drawing.Size(88, 27)
Me.btCancel.TabIndex = 51
Me.btCancel.Text = "Cancel"
Me.btCancel.UseVisualStyleBackColor = true
'
'btSave
'
- Me.btSave.Location = New System.Drawing.Point(373, 520)
+ Me.btSave.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.btSave.Location = New System.Drawing.Point(435, 662)
+ Me.btSave.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btSave.Name = "btSave"
- Me.btSave.Size = New System.Drawing.Size(75, 23)
+ Me.btSave.Size = New System.Drawing.Size(88, 27)
Me.btSave.TabIndex = 50
Me.btSave.Text = "Save"
Me.btSave.UseVisualStyleBackColor = true
@@ -1195,9 +1250,10 @@ Partial Class IHPCForm
'
Me.StatusStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LbStatus})
- Me.StatusStrip1.Location = New System.Drawing.Point(0, 555)
+ Me.StatusStrip1.Location = New System.Drawing.Point(0, 692)
Me.StatusStrip1.Name = "StatusStrip1"
- Me.StatusStrip1.Size = New System.Drawing.Size(541, 22)
+ Me.StatusStrip1.Padding = New System.Windows.Forms.Padding(1, 0, 16, 0)
+ Me.StatusStrip1.Size = New System.Drawing.Size(631, 22)
Me.StatusStrip1.SizingGrip = false
Me.StatusStrip1.TabIndex = 83
Me.StatusStrip1.Text = "StatusStrip1"
@@ -1227,11 +1283,51 @@ Partial Class IHPCForm
Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
'
+ 'Panel1
+ '
+ Me.Panel1.Controls.Add(Me.lblRatedPower)
+ Me.Panel1.Controls.Add(Me.tbRatedPower)
+ Me.Panel1.Controls.Add(Me.lblRatedPowerUnit)
+ Me.Panel1.Location = New System.Drawing.Point(14, 154)
+ Me.Panel1.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.Panel1.Name = "Panel1"
+ Me.Panel1.Size = New System.Drawing.Size(248, 30)
+ Me.Panel1.TabIndex = 102
+ '
+ 'lblRatedPower
+ '
+ Me.lblRatedPower.AutoSize = true
+ Me.lblRatedPower.Location = New System.Drawing.Point(4, 7)
+ Me.lblRatedPower.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblRatedPower.Name = "lblRatedPower"
+ Me.lblRatedPower.Size = New System.Drawing.Size(73, 15)
+ Me.lblRatedPower.TabIndex = 45
+ Me.lblRatedPower.Text = "Rated Power"
+ '
+ 'tbRatedPower
+ '
+ Me.tbRatedPower.Location = New System.Drawing.Point(125, 3)
+ Me.tbRatedPower.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.tbRatedPower.Name = "tbRatedPower"
+ Me.tbRatedPower.Size = New System.Drawing.Size(66, 23)
+ Me.tbRatedPower.TabIndex = 1
+ '
+ 'lblRatedPowerUnit
+ '
+ Me.lblRatedPowerUnit.AutoSize = true
+ Me.lblRatedPowerUnit.Location = New System.Drawing.Point(199, 7)
+ Me.lblRatedPowerUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblRatedPowerUnit.Name = "lblRatedPowerUnit"
+ Me.lblRatedPowerUnit.Size = New System.Drawing.Size(32, 15)
+ Me.lblRatedPowerUnit.TabIndex = 64
+ Me.lblRatedPowerUnit.Text = "[kW]"
+ '
'IHPCForm
'
- Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(7!, 15!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
- Me.ClientSize = New System.Drawing.Size(541, 577)
+ Me.ClientSize = New System.Drawing.Size(631, 714)
+ Me.Controls.Add(Me.Panel1)
Me.Controls.Add(Me.StatusStrip1)
Me.Controls.Add(Me.btCancel)
Me.Controls.Add(Me.btSave)
@@ -1239,12 +1335,13 @@ Partial Class IHPCForm
Me.Controls.Add(Me.PictureBox1)
Me.Controls.Add(Me.ToolStrip1)
Me.Controls.Add(Me.tcVoltageLevels)
- Me.Controls.Add(Me.FlowLayoutPanel8)
- Me.Controls.Add(Me.FlowLayoutPanel6)
+ Me.Controls.Add(Me.pnThermalOverloadRecovery)
+ Me.Controls.Add(Me.pnInertia)
Me.Controls.Add(Me.FlowLayoutPanel2)
Me.Controls.Add(Me.FlowLayoutPanel1)
Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
Me.Icon = CType(resources.GetObject("$this.Icon"),System.Drawing.Icon)
+ Me.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.MaximizeBox = false
Me.Name = "IHPCForm"
Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide
@@ -1252,10 +1349,10 @@ Partial Class IHPCForm
Me.Text = "IHPC"
Me.FlowLayoutPanel1.ResumeLayout(false)
Me.FlowLayoutPanel1.PerformLayout
- Me.FlowLayoutPanel6.ResumeLayout(false)
- Me.FlowLayoutPanel6.PerformLayout
- Me.FlowLayoutPanel8.ResumeLayout(false)
- Me.FlowLayoutPanel8.PerformLayout
+ Me.pnInertia.ResumeLayout(false)
+ Me.pnInertia.PerformLayout
+ Me.pnThermalOverloadRecovery.ResumeLayout(false)
+ Me.pnThermalOverloadRecovery.PerformLayout
Me.FlowLayoutPanel2.ResumeLayout(false)
Me.FlowLayoutPanel2.PerformLayout
Me.tcVoltageLevels.ResumeLayout(false)
@@ -1283,6 +1380,8 @@ Partial Class IHPCForm
Me.StatusStrip1.ResumeLayout(false)
Me.StatusStrip1.PerformLayout
Me.CmOpenFile.ResumeLayout(false)
+ Me.Panel1.ResumeLayout(false)
+ Me.Panel1.PerformLayout
Me.ResumeLayout(false)
Me.PerformLayout
@@ -1291,11 +1390,11 @@ End Sub
Friend WithEvents FlowLayoutPanel1 As FlowLayoutPanel
Friend WithEvents Label49 As Label
Friend WithEvents tbModel As TextBox
- Friend WithEvents FlowLayoutPanel6 As FlowLayoutPanel
+ Friend WithEvents pnInertia As Panel
Friend WithEvents Label51 As Label
Friend WithEvents tbInertia As TextBox
Friend WithEvents lblinertiaUnit As Label
- Friend WithEvents FlowLayoutPanel8 As FlowLayoutPanel
+ Friend WithEvents pnThermalOverloadRecovery As FlowLayoutPanel
Friend WithEvents Label52 As Label
Friend WithEvents tbThermalOverload As TextBox
Friend WithEvents Label10 As Label
@@ -1391,4 +1490,8 @@ End Sub
Friend WithEvents OpenWithToolStripMenuItem As ToolStripMenuItem
Friend WithEvents ShowInFolderToolStripMenuItem As ToolStripMenuItem
Friend WithEvents btFLCurve2 As Button
+ Friend WithEvents Panel1 As Panel
+ Friend WithEvents lblRatedPower As Label
+ Friend WithEvents tbRatedPower As TextBox
+ Friend WithEvents lblRatedPowerUnit As Label
End Class
diff --git a/VECTO/GUI/IHPCForm.resx b/VECTO/GUI/IHPCForm.resx
index 6beee2d38eb9de43c25eb98c893c851e7afdc849..7a0db1b43338e930f42f47d6a1cf511439ad77a3 100644
--- a/VECTO/GUI/IHPCForm.resx
+++ b/VECTO/GUI/IHPCForm.resx
@@ -1,64 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
+<root>
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
diff --git a/VECTO/GUI/IHPCForm.vb b/VECTO/GUI/IHPCForm.vb
index d9d8ccc1e855018384985bd4741b50b9ed7bdad5..a6b464447ffa8733cfe3ba61b921bde49e88e35f 100644
--- a/VECTO/GUI/IHPCForm.vb
+++ b/VECTO/GUI/IHPCForm.vb
@@ -26,6 +26,7 @@ Public Class IHPCForm
tbInertia.Text = ihpcData.Inertia.ToGUIFormat()
tbThermalOverload.Text = ihpcData.OverloadRecoveryFactor.ToGUIFormat()
tbDragCurve.Text = GetRelativePath(ihpcData.DragCurve.Source, Path.GetDirectoryName(_ihpcFilePath))
+ tbRatedPower.Text = ihpcData.R85RatedPower.ConvertToKiloWatt().Value.ToGUIFormat()
SetVoltageLevelLow(ihpcData.VoltageLevels.First())
SetVoltageLevelHigh(ihpcData.VoltageLevels.Last())
@@ -291,6 +292,7 @@ Public Class IHPCForm
Dim ihpcInputData = New IHPCInputData(ihpcFilePath)
ihpcInputData.SetCommonEntries(tbModel.Text, tbInertia.Text, tbDragCurve.Text, tbThermalOverload.Text)
+ ihpcInputData.R85RatedPower = tbRatedPower.Text.ToDouble(0).SI(unit.SI.Kilo.Watt).Cast(of Watt)
ihpcInputData.SetVoltageLevelEntries(tbVoltage1.Text, tbContinuousTorque1.Text, tbContinuousTorqueSpeed1.Text,
tbOverloadTime1.Text, tbOverloadTorque1.Text, tbOverloadTorqueSpeed1.Text,
tbFLCurve1.Text, lvPowerMap1)
@@ -640,5 +642,9 @@ Public Class IHPCForm
End If
End Sub
+ Private Sub IHPCForm_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+ pnThermalOverloadRecovery.Enabled = not Cfg.DeclMode
+ End Sub
+
#End Region
End Class
\ No newline at end of file
diff --git a/VECTO/GUI/MainForm.vb b/VECTO/GUI/MainForm.vb
index b28db35e1e8bc4966816d3807315a98652700208..5157c02e1bd013584f112bd71976cc5e9787a0ae 100644
--- a/VECTO/GUI/MainForm.vb
+++ b/VECTO/GUI/MainForm.vb
@@ -1756,13 +1756,6 @@ lbFound:
RbDev.Checked = Not RbDecl.Checked
DeclOnOff()
End If
- JobEditorBatteryElectricVehicleToolStripMenuItem.Enabled = Not Cfg.DeclMode
- JobEditorParallelHybridVehicleToolStripMenuItem.Enabled = Not Cfg.DeclMode
- JobEditorEngineOnlyModeToolStripMenuItem.Enabled = Not Cfg.DeclMode
- JobEditorSerialHybridVehicleToolStripMenuItem.Enabled = Not Cfg.DeclMode
- JobEditorIEPC_E_VehicleToolStripMenuItem.Enabled = Not Cfg.DeclMode
- JobEditorIEPC_S_VehicleToolStripMenuItem.Enabled = Not Cfg.DeclMode
- JobEditorIHPCVehicleToolStripMenuItem.Enabled = Not Cfg.DeclMode
End Sub
diff --git a/VECTO/GUI/VectoJobForm.Designer.vb b/VECTO/GUI/VectoJobForm.Designer.vb
index 936913a804ebec07d39f341331f8f98ec81ccd6b..c57d2620a36a7a39ba41f3dcf4998831cf37b2a1 100644
--- a/VECTO/GUI/VectoJobForm.Designer.vb
+++ b/VECTO/GUI/VectoJobForm.Designer.vb
@@ -51,15 +51,15 @@ Partial Class VectoJobForm
Me.GrCycles = New System.Windows.Forms.GroupBox()
Me.Label2 = New System.Windows.Forms.Label()
Me.LvCycles = New System.Windows.Forms.ListView()
- Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader1 = New System.Windows.Forms.ColumnHeader()
Me.BtDRIrem = New System.Windows.Forms.Button()
Me.BtDRIadd = New System.Windows.Forms.Button()
Me.GrAuxMech = New System.Windows.Forms.GroupBox()
Me.pnAuxDeclarationMode = New System.Windows.Forms.Panel()
Me.LvAux = New System.Windows.Forms.ListView()
- Me.ColumnHeader4 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
- Me.ColumnHeader5 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
- Me.ColumnHeader6 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader4 = New System.Windows.Forms.ColumnHeader()
+ Me.ColumnHeader5 = New System.Windows.Forms.ColumnHeader()
+ Me.ColumnHeader6 = New System.Windows.Forms.ColumnHeader()
Me.Label32 = New System.Windows.Forms.Label()
Me.pnAuxEngineering = New System.Windows.Forms.Panel()
Me.tbPAuxStandstillICEOff = New System.Windows.Forms.TextBox()
@@ -216,43 +216,42 @@ Partial Class VectoJobForm
Me.lblTitle = New System.Windows.Forms.Label()
Me.pnJobInfo = New System.Windows.Forms.Panel()
Me.Label50 = New System.Windows.Forms.Label()
- Me.DateTimePicker1 = New System.Windows.Forms.DateTimePicker()
- Me.TabPgGen.SuspendLayout()
- Me.pnHybridStrategy.SuspendLayout()
- Me.pnVehicle.SuspendLayout()
- Me.pnEngine.SuspendLayout()
- Me.pnGearbox.SuspendLayout()
- Me.pnShiftParams.SuspendLayout()
- Me.GrCycles.SuspendLayout()
- Me.GrAuxMech.SuspendLayout()
- Me.pnAuxDeclarationMode.SuspendLayout()
- Me.pnAuxEngineering.SuspendLayout()
- CType(Me.picAuxInfo, System.ComponentModel.ISupportInitialize).BeginInit()
- Me.tcJob.SuspendLayout()
- Me.tpAuxiliaries.SuspendLayout()
- Me.gbBusAux.SuspendLayout()
- Me.pnBusAux.SuspendLayout()
- Me.gbElectricAux.SuspendLayout()
- Me.tpCycles.SuspendLayout()
- Me.TabPgDriver.SuspendLayout()
- Me.GrVACC.SuspendLayout()
- Me.GrLAC.SuspendLayout()
- Me.pnLookAheadCoasting.SuspendLayout()
- CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit()
- Me.gbOverspeed.SuspendLayout()
- Me.PnEcoRoll.SuspendLayout()
- Me.TabPgADAS.SuspendLayout()
- Me.gbPCC.SuspendLayout()
- Me.gbEcoRoll.SuspendLayout()
- Me.gbEngineStopStart.SuspendLayout()
- Me.StatusStrip1.SuspendLayout()
- Me.ToolStrip1.SuspendLayout()
- CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
- Me.CmOpenFile.SuspendLayout()
- CType(Me.PicVehicle, System.ComponentModel.ISupportInitialize).BeginInit()
- CType(Me.PicBox, System.ComponentModel.ISupportInitialize).BeginInit()
- Me.pnJobInfo.SuspendLayout()
- Me.SuspendLayout()
+ Me.TabPgGen.SuspendLayout
+ Me.pnHybridStrategy.SuspendLayout
+ Me.pnVehicle.SuspendLayout
+ Me.pnEngine.SuspendLayout
+ Me.pnGearbox.SuspendLayout
+ Me.pnShiftParams.SuspendLayout
+ Me.GrCycles.SuspendLayout
+ Me.GrAuxMech.SuspendLayout
+ Me.pnAuxDeclarationMode.SuspendLayout
+ Me.pnAuxEngineering.SuspendLayout
+ CType(Me.picAuxInfo,System.ComponentModel.ISupportInitialize).BeginInit
+ Me.tcJob.SuspendLayout
+ Me.tpAuxiliaries.SuspendLayout
+ Me.gbBusAux.SuspendLayout
+ Me.pnBusAux.SuspendLayout
+ Me.gbElectricAux.SuspendLayout
+ Me.tpCycles.SuspendLayout
+ Me.TabPgDriver.SuspendLayout
+ Me.GrVACC.SuspendLayout
+ Me.GrLAC.SuspendLayout
+ Me.pnLookAheadCoasting.SuspendLayout
+ CType(Me.PictureBox2,System.ComponentModel.ISupportInitialize).BeginInit
+ Me.gbOverspeed.SuspendLayout
+ Me.PnEcoRoll.SuspendLayout
+ Me.TabPgADAS.SuspendLayout
+ Me.gbPCC.SuspendLayout
+ Me.gbEcoRoll.SuspendLayout
+ Me.gbEngineStopStart.SuspendLayout
+ Me.StatusStrip1.SuspendLayout
+ Me.ToolStrip1.SuspendLayout
+ CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).BeginInit
+ Me.CmOpenFile.SuspendLayout
+ CType(Me.PicVehicle,System.ComponentModel.ISupportInitialize).BeginInit
+ CType(Me.PicBox,System.ComponentModel.ISupportInitialize).BeginInit
+ Me.pnJobInfo.SuspendLayout
+ Me.SuspendLayout
'
'TabPgGen
'
@@ -261,88 +260,97 @@ Partial Class VectoJobForm
Me.TabPgGen.Controls.Add(Me.pnEngine)
Me.TabPgGen.Controls.Add(Me.pnGearbox)
Me.TabPgGen.Controls.Add(Me.pnShiftParams)
- Me.TabPgGen.Location = New System.Drawing.Point(4, 22)
+ Me.TabPgGen.Location = New System.Drawing.Point(4, 24)
+ Me.TabPgGen.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.TabPgGen.Name = "TabPgGen"
- Me.TabPgGen.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPgGen.Size = New System.Drawing.Size(525, 494)
+ Me.TabPgGen.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.TabPgGen.Size = New System.Drawing.Size(614, 572)
Me.TabPgGen.TabIndex = 0
Me.TabPgGen.Text = "General"
- Me.TabPgGen.UseVisualStyleBackColor = True
+ Me.TabPgGen.UseVisualStyleBackColor = true
'
'pnHybridStrategy
'
Me.pnHybridStrategy.Controls.Add(Me.btnOpenHybridStrategyParameters)
Me.pnHybridStrategy.Controls.Add(Me.tbHybridStrategyParams)
Me.pnHybridStrategy.Controls.Add(Me.btnBrowseHybridStrategyParams)
- Me.pnHybridStrategy.Location = New System.Drawing.Point(4, 125)
+ Me.pnHybridStrategy.Location = New System.Drawing.Point(5, 144)
+ Me.pnHybridStrategy.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.pnHybridStrategy.Name = "pnHybridStrategy"
- Me.pnHybridStrategy.Size = New System.Drawing.Size(516, 26)
+ Me.pnHybridStrategy.Size = New System.Drawing.Size(602, 30)
Me.pnHybridStrategy.TabIndex = 4
'
'btnOpenHybridStrategyParameters
'
- Me.btnOpenHybridStrategyParameters.Location = New System.Drawing.Point(3, 3)
+ Me.btnOpenHybridStrategyParameters.Location = New System.Drawing.Point(4, 3)
+ Me.btnOpenHybridStrategyParameters.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btnOpenHybridStrategyParameters.Name = "btnOpenHybridStrategyParameters"
- Me.btnOpenHybridStrategyParameters.Size = New System.Drawing.Size(72, 21)
+ Me.btnOpenHybridStrategyParameters.Size = New System.Drawing.Size(84, 24)
Me.btnOpenHybridStrategyParameters.TabIndex = 0
Me.btnOpenHybridStrategyParameters.Text = "Hyb. Str. P."
- Me.btnOpenHybridStrategyParameters.UseVisualStyleBackColor = True
+ Me.btnOpenHybridStrategyParameters.UseVisualStyleBackColor = true
'
'tbHybridStrategyParams
'
- Me.tbHybridStrategyParams.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.tbHybridStrategyParams.Location = New System.Drawing.Point(81, 3)
+ Me.tbHybridStrategyParams.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.tbHybridStrategyParams.Location = New System.Drawing.Point(94, 3)
+ Me.tbHybridStrategyParams.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbHybridStrategyParams.Name = "tbHybridStrategyParams"
- Me.tbHybridStrategyParams.Size = New System.Drawing.Size(406, 20)
+ Me.tbHybridStrategyParams.Size = New System.Drawing.Size(473, 23)
Me.tbHybridStrategyParams.TabIndex = 1
'
'btnBrowseHybridStrategyParams
'
- Me.btnBrowseHybridStrategyParams.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.btnBrowseHybridStrategyParams.Image = CType(resources.GetObject("btnBrowseHybridStrategyParams.Image"), System.Drawing.Image)
- Me.btnBrowseHybridStrategyParams.Location = New System.Drawing.Point(489, 1)
+ Me.btnBrowseHybridStrategyParams.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.btnBrowseHybridStrategyParams.Image = CType(resources.GetObject("btnBrowseHybridStrategyParams.Image"),System.Drawing.Image)
+ Me.btnBrowseHybridStrategyParams.Location = New System.Drawing.Point(570, 1)
+ Me.btnBrowseHybridStrategyParams.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btnBrowseHybridStrategyParams.Name = "btnBrowseHybridStrategyParams"
- Me.btnBrowseHybridStrategyParams.Size = New System.Drawing.Size(24, 24)
+ Me.btnBrowseHybridStrategyParams.Size = New System.Drawing.Size(28, 28)
Me.btnBrowseHybridStrategyParams.TabIndex = 2
- Me.btnBrowseHybridStrategyParams.UseVisualStyleBackColor = True
+ Me.btnBrowseHybridStrategyParams.UseVisualStyleBackColor = true
'
'pnVehicle
'
Me.pnVehicle.Controls.Add(Me.ButOpenVEH)
Me.pnVehicle.Controls.Add(Me.ButtonVEH)
Me.pnVehicle.Controls.Add(Me.TbVEH)
- Me.pnVehicle.Location = New System.Drawing.Point(4, 7)
+ Me.pnVehicle.Location = New System.Drawing.Point(5, 8)
+ Me.pnVehicle.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.pnVehicle.Name = "pnVehicle"
- Me.pnVehicle.Size = New System.Drawing.Size(518, 27)
+ Me.pnVehicle.Size = New System.Drawing.Size(604, 31)
Me.pnVehicle.TabIndex = 0
'
'ButOpenVEH
'
- Me.ButOpenVEH.Location = New System.Drawing.Point(4, 3)
+ Me.ButOpenVEH.Location = New System.Drawing.Point(5, 3)
+ Me.ButOpenVEH.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.ButOpenVEH.Name = "ButOpenVEH"
- Me.ButOpenVEH.Size = New System.Drawing.Size(72, 21)
+ Me.ButOpenVEH.Size = New System.Drawing.Size(84, 24)
Me.ButOpenVEH.TabIndex = 0
Me.ButOpenVEH.Text = "Vehicle"
- Me.ButOpenVEH.UseVisualStyleBackColor = True
+ Me.ButOpenVEH.UseVisualStyleBackColor = true
'
'ButtonVEH
'
- Me.ButtonVEH.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.ButtonVEH.Image = CType(resources.GetObject("ButtonVEH.Image"), System.Drawing.Image)
- Me.ButtonVEH.Location = New System.Drawing.Point(492, 2)
+ Me.ButtonVEH.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.ButtonVEH.Image = CType(resources.GetObject("ButtonVEH.Image"),System.Drawing.Image)
+ Me.ButtonVEH.Location = New System.Drawing.Point(574, 2)
+ Me.ButtonVEH.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.ButtonVEH.Name = "ButtonVEH"
- Me.ButtonVEH.Size = New System.Drawing.Size(24, 24)
+ Me.ButtonVEH.Size = New System.Drawing.Size(28, 28)
Me.ButtonVEH.TabIndex = 2
- Me.ButtonVEH.UseVisualStyleBackColor = True
+ Me.ButtonVEH.UseVisualStyleBackColor = true
'
'TbVEH
'
- Me.TbVEH.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.TbVEH.Location = New System.Drawing.Point(82, 4)
+ Me.TbVEH.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.TbVEH.Location = New System.Drawing.Point(96, 5)
+ Me.TbVEH.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.TbVEH.Name = "TbVEH"
- Me.TbVEH.Size = New System.Drawing.Size(404, 20)
+ Me.TbVEH.Size = New System.Drawing.Size(471, 23)
Me.TbVEH.TabIndex = 1
'
'pnEngine
@@ -350,37 +358,41 @@ Partial Class VectoJobForm
Me.pnEngine.Controls.Add(Me.ButOpenENG)
Me.pnEngine.Controls.Add(Me.ButtonMAP)
Me.pnEngine.Controls.Add(Me.TbENG)
- Me.pnEngine.Location = New System.Drawing.Point(4, 37)
+ Me.pnEngine.Location = New System.Drawing.Point(5, 43)
+ Me.pnEngine.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.pnEngine.Name = "pnEngine"
- Me.pnEngine.Size = New System.Drawing.Size(519, 27)
+ Me.pnEngine.Size = New System.Drawing.Size(606, 31)
Me.pnEngine.TabIndex = 1
'
'ButOpenENG
'
- Me.ButOpenENG.Location = New System.Drawing.Point(4, 3)
+ Me.ButOpenENG.Location = New System.Drawing.Point(5, 3)
+ Me.ButOpenENG.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.ButOpenENG.Name = "ButOpenENG"
- Me.ButOpenENG.Size = New System.Drawing.Size(72, 21)
+ Me.ButOpenENG.Size = New System.Drawing.Size(84, 24)
Me.ButOpenENG.TabIndex = 0
Me.ButOpenENG.Text = "Engine"
- Me.ButOpenENG.UseVisualStyleBackColor = True
+ Me.ButOpenENG.UseVisualStyleBackColor = true
'
'ButtonMAP
'
- Me.ButtonMAP.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.ButtonMAP.Image = CType(resources.GetObject("ButtonMAP.Image"), System.Drawing.Image)
- Me.ButtonMAP.Location = New System.Drawing.Point(492, 1)
+ Me.ButtonMAP.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.ButtonMAP.Image = CType(resources.GetObject("ButtonMAP.Image"),System.Drawing.Image)
+ Me.ButtonMAP.Location = New System.Drawing.Point(574, 1)
+ Me.ButtonMAP.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.ButtonMAP.Name = "ButtonMAP"
- Me.ButtonMAP.Size = New System.Drawing.Size(24, 24)
+ Me.ButtonMAP.Size = New System.Drawing.Size(28, 28)
Me.ButtonMAP.TabIndex = 2
- Me.ButtonMAP.UseVisualStyleBackColor = True
+ Me.ButtonMAP.UseVisualStyleBackColor = true
'
'TbENG
'
- Me.TbENG.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.TbENG.Location = New System.Drawing.Point(82, 3)
+ Me.TbENG.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.TbENG.Location = New System.Drawing.Point(96, 3)
+ Me.TbENG.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.TbENG.Name = "TbENG"
- Me.TbENG.Size = New System.Drawing.Size(404, 20)
+ Me.TbENG.Size = New System.Drawing.Size(471, 23)
Me.TbENG.TabIndex = 1
'
'pnGearbox
@@ -388,37 +400,41 @@ Partial Class VectoJobForm
Me.pnGearbox.Controls.Add(Me.ButOpenGBX)
Me.pnGearbox.Controls.Add(Me.ButtonGBX)
Me.pnGearbox.Controls.Add(Me.TbGBX)
- Me.pnGearbox.Location = New System.Drawing.Point(3, 66)
+ Me.pnGearbox.Location = New System.Drawing.Point(4, 76)
+ Me.pnGearbox.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.pnGearbox.Name = "pnGearbox"
- Me.pnGearbox.Size = New System.Drawing.Size(517, 28)
+ Me.pnGearbox.Size = New System.Drawing.Size(603, 32)
Me.pnGearbox.TabIndex = 2
'
'ButOpenGBX
'
- Me.ButOpenGBX.Location = New System.Drawing.Point(4, 3)
+ Me.ButOpenGBX.Location = New System.Drawing.Point(5, 3)
+ Me.ButOpenGBX.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.ButOpenGBX.Name = "ButOpenGBX"
- Me.ButOpenGBX.Size = New System.Drawing.Size(72, 21)
+ Me.ButOpenGBX.Size = New System.Drawing.Size(84, 24)
Me.ButOpenGBX.TabIndex = 0
Me.ButOpenGBX.Text = "Gearbox"
- Me.ButOpenGBX.UseVisualStyleBackColor = True
+ Me.ButOpenGBX.UseVisualStyleBackColor = true
'
'ButtonGBX
'
- Me.ButtonGBX.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.ButtonGBX.Image = CType(resources.GetObject("ButtonGBX.Image"), System.Drawing.Image)
- Me.ButtonGBX.Location = New System.Drawing.Point(492, 1)
+ Me.ButtonGBX.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.ButtonGBX.Image = CType(resources.GetObject("ButtonGBX.Image"),System.Drawing.Image)
+ Me.ButtonGBX.Location = New System.Drawing.Point(574, 1)
+ Me.ButtonGBX.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.ButtonGBX.Name = "ButtonGBX"
- Me.ButtonGBX.Size = New System.Drawing.Size(24, 24)
+ Me.ButtonGBX.Size = New System.Drawing.Size(28, 28)
Me.ButtonGBX.TabIndex = 2
- Me.ButtonGBX.UseVisualStyleBackColor = True
+ Me.ButtonGBX.UseVisualStyleBackColor = true
'
'TbGBX
'
- Me.TbGBX.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.TbGBX.Location = New System.Drawing.Point(82, 3)
+ Me.TbGBX.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.TbGBX.Location = New System.Drawing.Point(96, 3)
+ Me.TbGBX.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.TbGBX.Name = "TbGBX"
- Me.TbGBX.Size = New System.Drawing.Size(404, 20)
+ Me.TbGBX.Size = New System.Drawing.Size(471, 23)
Me.TbGBX.TabIndex = 1
'
'pnShiftParams
@@ -426,83 +442,90 @@ Partial Class VectoJobForm
Me.pnShiftParams.Controls.Add(Me.BtnShiftParamsForm)
Me.pnShiftParams.Controls.Add(Me.TbShiftStrategyParams)
Me.pnShiftParams.Controls.Add(Me.BtnShiftStrategyParams)
- Me.pnShiftParams.Location = New System.Drawing.Point(4, 96)
+ Me.pnShiftParams.Location = New System.Drawing.Point(5, 111)
+ Me.pnShiftParams.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.pnShiftParams.Name = "pnShiftParams"
- Me.pnShiftParams.Size = New System.Drawing.Size(516, 26)
+ Me.pnShiftParams.Size = New System.Drawing.Size(602, 30)
Me.pnShiftParams.TabIndex = 3
'
'BtnShiftParamsForm
'
- Me.BtnShiftParamsForm.Location = New System.Drawing.Point(3, 3)
+ Me.BtnShiftParamsForm.Location = New System.Drawing.Point(4, 3)
+ Me.BtnShiftParamsForm.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.BtnShiftParamsForm.Name = "BtnShiftParamsForm"
- Me.BtnShiftParamsForm.Size = New System.Drawing.Size(72, 21)
+ Me.BtnShiftParamsForm.Size = New System.Drawing.Size(84, 24)
Me.BtnShiftParamsForm.TabIndex = 0
Me.BtnShiftParamsForm.Text = "Shift Parameters"
- Me.BtnShiftParamsForm.UseVisualStyleBackColor = True
+ Me.BtnShiftParamsForm.UseVisualStyleBackColor = true
'
'TbShiftStrategyParams
'
- Me.TbShiftStrategyParams.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.TbShiftStrategyParams.Location = New System.Drawing.Point(81, 3)
+ Me.TbShiftStrategyParams.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.TbShiftStrategyParams.Location = New System.Drawing.Point(94, 3)
+ Me.TbShiftStrategyParams.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.TbShiftStrategyParams.Name = "TbShiftStrategyParams"
- Me.TbShiftStrategyParams.Size = New System.Drawing.Size(406, 20)
+ Me.TbShiftStrategyParams.Size = New System.Drawing.Size(473, 23)
Me.TbShiftStrategyParams.TabIndex = 1
'
'BtnShiftStrategyParams
'
- Me.BtnShiftStrategyParams.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.BtnShiftStrategyParams.Image = CType(resources.GetObject("BtnShiftStrategyParams.Image"), System.Drawing.Image)
- Me.BtnShiftStrategyParams.Location = New System.Drawing.Point(489, 1)
+ Me.BtnShiftStrategyParams.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.BtnShiftStrategyParams.Image = CType(resources.GetObject("BtnShiftStrategyParams.Image"),System.Drawing.Image)
+ Me.BtnShiftStrategyParams.Location = New System.Drawing.Point(570, 1)
+ Me.BtnShiftStrategyParams.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.BtnShiftStrategyParams.Name = "BtnShiftStrategyParams"
- Me.BtnShiftStrategyParams.Size = New System.Drawing.Size(24, 24)
+ Me.BtnShiftStrategyParams.Size = New System.Drawing.Size(28, 28)
Me.BtnShiftStrategyParams.TabIndex = 2
- Me.BtnShiftStrategyParams.UseVisualStyleBackColor = True
+ Me.BtnShiftStrategyParams.UseVisualStyleBackColor = true
'
'GrCycles
'
- Me.GrCycles.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.GrCycles.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.GrCycles.Controls.Add(Me.Label2)
Me.GrCycles.Controls.Add(Me.LvCycles)
Me.GrCycles.Controls.Add(Me.BtDRIrem)
Me.GrCycles.Controls.Add(Me.BtDRIadd)
- Me.GrCycles.Location = New System.Drawing.Point(6, 6)
+ Me.GrCycles.Location = New System.Drawing.Point(7, 7)
+ Me.GrCycles.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.GrCycles.Name = "GrCycles"
- Me.GrCycles.Size = New System.Drawing.Size(515, 138)
+ Me.GrCycles.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.GrCycles.Size = New System.Drawing.Size(601, 159)
Me.GrCycles.TabIndex = 0
- Me.GrCycles.TabStop = False
+ Me.GrCycles.TabStop = false
Me.GrCycles.Text = "Cycles"
'
'Label2
'
- Me.Label2.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.Label2.AutoSize = True
- Me.Label2.Location = New System.Drawing.Point(391, 109)
+ Me.Label2.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.Label2.AutoSize = true
+ Me.Label2.Location = New System.Drawing.Point(456, 126)
+ Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label2.Name = "Label2"
- Me.Label2.Size = New System.Drawing.Size(118, 13)
+ Me.Label2.Size = New System.Drawing.Size(137, 15)
Me.Label2.TabIndex = 3
Me.Label2.Text = "(Right-Click for Options)"
'
'LvCycles
'
- Me.LvCycles.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
- Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.LvCycles.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.LvCycles.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1})
- Me.LvCycles.FullRowSelect = True
- Me.LvCycles.GridLines = True
+ Me.LvCycles.FullRowSelect = true
+ Me.LvCycles.GridLines = true
Me.LvCycles.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None
- Me.LvCycles.HideSelection = False
- Me.LvCycles.LabelEdit = True
- Me.LvCycles.Location = New System.Drawing.Point(6, 19)
- Me.LvCycles.MultiSelect = False
+ Me.LvCycles.LabelEdit = true
+ Me.LvCycles.Location = New System.Drawing.Point(7, 22)
+ Me.LvCycles.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.LvCycles.MultiSelect = false
Me.LvCycles.Name = "LvCycles"
- Me.LvCycles.Size = New System.Drawing.Size(503, 89)
+ Me.LvCycles.Size = New System.Drawing.Size(586, 102)
Me.LvCycles.TabIndex = 0
- Me.LvCycles.TabStop = False
- Me.LvCycles.UseCompatibleStateImageBehavior = False
+ Me.LvCycles.TabStop = false
+ Me.LvCycles.UseCompatibleStateImageBehavior = false
Me.LvCycles.View = System.Windows.Forms.View.Details
'
'ColumnHeader1
@@ -512,64 +535,69 @@ Partial Class VectoJobForm
'
'BtDRIrem
'
- Me.BtDRIrem.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.BtDRIrem.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.BtDRIrem.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
- Me.BtDRIrem.Location = New System.Drawing.Point(29, 109)
+ Me.BtDRIrem.Location = New System.Drawing.Point(34, 126)
+ Me.BtDRIrem.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.BtDRIrem.Name = "BtDRIrem"
- Me.BtDRIrem.Size = New System.Drawing.Size(24, 24)
+ Me.BtDRIrem.Size = New System.Drawing.Size(28, 28)
Me.BtDRIrem.TabIndex = 2
- Me.BtDRIrem.UseVisualStyleBackColor = True
+ Me.BtDRIrem.UseVisualStyleBackColor = true
'
'BtDRIadd
'
- Me.BtDRIadd.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.BtDRIadd.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.BtDRIadd.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
- Me.BtDRIadd.Location = New System.Drawing.Point(5, 109)
+ Me.BtDRIadd.Location = New System.Drawing.Point(6, 126)
+ Me.BtDRIadd.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.BtDRIadd.Name = "BtDRIadd"
- Me.BtDRIadd.Size = New System.Drawing.Size(24, 24)
+ Me.BtDRIadd.Size = New System.Drawing.Size(28, 28)
Me.BtDRIadd.TabIndex = 1
- Me.BtDRIadd.UseVisualStyleBackColor = True
+ Me.BtDRIadd.UseVisualStyleBackColor = true
'
'GrAuxMech
'
- Me.GrAuxMech.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.GrAuxMech.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.GrAuxMech.Controls.Add(Me.pnAuxDeclarationMode)
Me.GrAuxMech.Controls.Add(Me.pnAuxEngineering)
- Me.GrAuxMech.Location = New System.Drawing.Point(6, 16)
+ Me.GrAuxMech.Location = New System.Drawing.Point(7, 18)
+ Me.GrAuxMech.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.GrAuxMech.Name = "GrAuxMech"
- Me.GrAuxMech.Size = New System.Drawing.Size(515, 280)
+ Me.GrAuxMech.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.GrAuxMech.Size = New System.Drawing.Size(601, 323)
Me.GrAuxMech.TabIndex = 0
- Me.GrAuxMech.TabStop = False
+ Me.GrAuxMech.TabStop = false
Me.GrAuxMech.Text = "Mechanical Auxiliaries"
'
'pnAuxDeclarationMode
'
Me.pnAuxDeclarationMode.Controls.Add(Me.LvAux)
Me.pnAuxDeclarationMode.Controls.Add(Me.Label32)
- Me.pnAuxDeclarationMode.Location = New System.Drawing.Point(6, 104)
+ Me.pnAuxDeclarationMode.Location = New System.Drawing.Point(7, 120)
+ Me.pnAuxDeclarationMode.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.pnAuxDeclarationMode.Name = "pnAuxDeclarationMode"
- Me.pnAuxDeclarationMode.Size = New System.Drawing.Size(503, 170)
+ Me.pnAuxDeclarationMode.Size = New System.Drawing.Size(587, 196)
Me.pnAuxDeclarationMode.TabIndex = 40
'
'LvAux
'
- Me.LvAux.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
- Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.LvAux.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.LvAux.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader4, Me.ColumnHeader5, Me.ColumnHeader6})
- Me.LvAux.FullRowSelect = True
- Me.LvAux.GridLines = True
- Me.LvAux.HideSelection = False
- Me.LvAux.Location = New System.Drawing.Point(3, 3)
- Me.LvAux.MultiSelect = False
+ Me.LvAux.FullRowSelect = true
+ Me.LvAux.GridLines = true
+ Me.LvAux.Location = New System.Drawing.Point(4, 3)
+ Me.LvAux.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.LvAux.MultiSelect = false
Me.LvAux.Name = "LvAux"
- Me.LvAux.Size = New System.Drawing.Size(504, 145)
+ Me.LvAux.Size = New System.Drawing.Size(587, 167)
Me.LvAux.TabIndex = 0
- Me.LvAux.TabStop = False
- Me.LvAux.UseCompatibleStateImageBehavior = False
+ Me.LvAux.TabStop = false
+ Me.LvAux.UseCompatibleStateImageBehavior = false
Me.LvAux.View = System.Windows.Forms.View.Details
'
'ColumnHeader4
@@ -589,12 +617,13 @@ Partial Class VectoJobForm
'
'Label32
'
- Me.Label32.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.Label32.AutoSize = True
- Me.Label32.Location = New System.Drawing.Point(9, 151)
+ Me.Label32.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.Label32.AutoSize = true
+ Me.Label32.Location = New System.Drawing.Point(10, 174)
+ Me.Label32.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label32.Name = "Label32"
- Me.Label32.Size = New System.Drawing.Size(106, 13)
+ Me.Label32.Size = New System.Drawing.Size(121, 15)
Me.Label32.TabIndex = 3
Me.Label32.Text = "(Double-Click to Edit)"
'
@@ -609,83 +638,93 @@ Partial Class VectoJobForm
Me.pnAuxEngineering.Controls.Add(Me.TbAuxPAuxICEOn)
Me.pnAuxEngineering.Controls.Add(Me.lblAuxICEOnUnit)
Me.pnAuxEngineering.Controls.Add(Me.lblAuxICEOn)
- Me.pnAuxEngineering.Location = New System.Drawing.Point(6, 19)
+ Me.pnAuxEngineering.Location = New System.Drawing.Point(7, 22)
+ Me.pnAuxEngineering.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.pnAuxEngineering.Name = "pnAuxEngineering"
- Me.pnAuxEngineering.Size = New System.Drawing.Size(500, 80)
+ Me.pnAuxEngineering.Size = New System.Drawing.Size(583, 92)
Me.pnAuxEngineering.TabIndex = 0
'
'tbPAuxStandstillICEOff
'
- Me.tbPAuxStandstillICEOff.Location = New System.Drawing.Point(170, 55)
+ Me.tbPAuxStandstillICEOff.Location = New System.Drawing.Point(198, 63)
+ Me.tbPAuxStandstillICEOff.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbPAuxStandstillICEOff.Name = "tbPAuxStandstillICEOff"
- Me.tbPAuxStandstillICEOff.Size = New System.Drawing.Size(76, 20)
+ Me.tbPAuxStandstillICEOff.Size = New System.Drawing.Size(88, 23)
Me.tbPAuxStandstillICEOff.TabIndex = 2
'
'lblAuxStandstillICEOffUnit
'
- Me.lblAuxStandstillICEOffUnit.AutoSize = True
- Me.lblAuxStandstillICEOffUnit.Location = New System.Drawing.Point(252, 58)
+ Me.lblAuxStandstillICEOffUnit.AutoSize = true
+ Me.lblAuxStandstillICEOffUnit.Location = New System.Drawing.Point(294, 67)
+ Me.lblAuxStandstillICEOffUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblAuxStandstillICEOffUnit.Name = "lblAuxStandstillICEOffUnit"
- Me.lblAuxStandstillICEOffUnit.Size = New System.Drawing.Size(24, 13)
+ Me.lblAuxStandstillICEOffUnit.Size = New System.Drawing.Size(26, 15)
Me.lblAuxStandstillICEOffUnit.TabIndex = 50
Me.lblAuxStandstillICEOffUnit.Text = "[W]"
'
'lblAuxStandstillICEOff
'
- Me.lblAuxStandstillICEOff.AutoSize = True
- Me.lblAuxStandstillICEOff.Location = New System.Drawing.Point(3, 58)
+ Me.lblAuxStandstillICEOff.AutoSize = true
+ Me.lblAuxStandstillICEOff.Location = New System.Drawing.Point(4, 67)
+ Me.lblAuxStandstillICEOff.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblAuxStandstillICEOff.Name = "lblAuxStandstillICEOff"
- Me.lblAuxStandstillICEOff.Size = New System.Drawing.Size(143, 13)
+ Me.lblAuxStandstillICEOff.Size = New System.Drawing.Size(159, 15)
Me.lblAuxStandstillICEOff.TabIndex = 48
Me.lblAuxStandstillICEOff.Text = "Aux Load (Standstill, ICE Off)"
'
'tbPAuxDrivingICEOff
'
- Me.tbPAuxDrivingICEOff.Location = New System.Drawing.Point(170, 29)
+ Me.tbPAuxDrivingICEOff.Location = New System.Drawing.Point(198, 33)
+ Me.tbPAuxDrivingICEOff.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbPAuxDrivingICEOff.Name = "tbPAuxDrivingICEOff"
- Me.tbPAuxDrivingICEOff.Size = New System.Drawing.Size(76, 20)
+ Me.tbPAuxDrivingICEOff.Size = New System.Drawing.Size(88, 23)
Me.tbPAuxDrivingICEOff.TabIndex = 1
'
'lblAuxDrivingICEOffUnit
'
- Me.lblAuxDrivingICEOffUnit.AutoSize = True
- Me.lblAuxDrivingICEOffUnit.Location = New System.Drawing.Point(252, 32)
+ Me.lblAuxDrivingICEOffUnit.AutoSize = true
+ Me.lblAuxDrivingICEOffUnit.Location = New System.Drawing.Point(294, 37)
+ Me.lblAuxDrivingICEOffUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblAuxDrivingICEOffUnit.Name = "lblAuxDrivingICEOffUnit"
- Me.lblAuxDrivingICEOffUnit.Size = New System.Drawing.Size(24, 13)
+ Me.lblAuxDrivingICEOffUnit.Size = New System.Drawing.Size(26, 15)
Me.lblAuxDrivingICEOffUnit.TabIndex = 47
Me.lblAuxDrivingICEOffUnit.Text = "[W]"
'
'lblAuxDrivingICEOff
'
- Me.lblAuxDrivingICEOff.AutoSize = True
- Me.lblAuxDrivingICEOff.Location = New System.Drawing.Point(3, 32)
+ Me.lblAuxDrivingICEOff.AutoSize = true
+ Me.lblAuxDrivingICEOff.Location = New System.Drawing.Point(4, 37)
+ Me.lblAuxDrivingICEOff.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblAuxDrivingICEOff.Name = "lblAuxDrivingICEOff"
- Me.lblAuxDrivingICEOff.Size = New System.Drawing.Size(134, 13)
+ Me.lblAuxDrivingICEOff.Size = New System.Drawing.Size(149, 15)
Me.lblAuxDrivingICEOff.TabIndex = 45
Me.lblAuxDrivingICEOff.Text = "Aux Load (Driving, ICE Off)"
'
'TbAuxPAuxICEOn
'
- Me.TbAuxPAuxICEOn.Location = New System.Drawing.Point(170, 3)
+ Me.TbAuxPAuxICEOn.Location = New System.Drawing.Point(198, 3)
+ Me.TbAuxPAuxICEOn.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.TbAuxPAuxICEOn.Name = "TbAuxPAuxICEOn"
- Me.TbAuxPAuxICEOn.Size = New System.Drawing.Size(76, 20)
+ Me.TbAuxPAuxICEOn.Size = New System.Drawing.Size(88, 23)
Me.TbAuxPAuxICEOn.TabIndex = 0
'
'lblAuxICEOnUnit
'
- Me.lblAuxICEOnUnit.AutoSize = True
- Me.lblAuxICEOnUnit.Location = New System.Drawing.Point(252, 6)
+ Me.lblAuxICEOnUnit.AutoSize = true
+ Me.lblAuxICEOnUnit.Location = New System.Drawing.Point(294, 7)
+ Me.lblAuxICEOnUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblAuxICEOnUnit.Name = "lblAuxICEOnUnit"
- Me.lblAuxICEOnUnit.Size = New System.Drawing.Size(24, 13)
+ Me.lblAuxICEOnUnit.Size = New System.Drawing.Size(26, 15)
Me.lblAuxICEOnUnit.TabIndex = 44
Me.lblAuxICEOnUnit.Text = "[W]"
'
'lblAuxICEOn
'
- Me.lblAuxICEOn.AutoSize = True
- Me.lblAuxICEOn.Location = New System.Drawing.Point(3, 6)
+ Me.lblAuxICEOn.AutoSize = true
+ Me.lblAuxICEOn.Location = New System.Drawing.Point(4, 7)
+ Me.lblAuxICEOn.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblAuxICEOn.Name = "lblAuxICEOn"
- Me.lblAuxICEOn.Size = New System.Drawing.Size(95, 13)
+ Me.lblAuxICEOn.Size = New System.Drawing.Size(104, 15)
Me.lblAuxICEOn.TabIndex = 42
Me.lblAuxICEOn.Text = "Aux Load (ICE On)"
'
@@ -695,7 +734,7 @@ Partial Class VectoJobForm
Me.GrAux.Name = "GrAux"
Me.GrAux.Size = New System.Drawing.Size(200, 100)
Me.GrAux.TabIndex = 0
- Me.GrAux.TabStop = False
+ Me.GrAux.TabStop = false
'
'Label9
'
@@ -708,7 +747,7 @@ Partial Class VectoJobForm
'
Me.TbAuxPAdd.Location = New System.Drawing.Point(0, 0)
Me.TbAuxPAdd.Name = "TbAuxPAdd"
- Me.TbAuxPAdd.Size = New System.Drawing.Size(100, 20)
+ Me.TbAuxPAdd.Size = New System.Drawing.Size(100, 23)
Me.TbAuxPAdd.TabIndex = 0
'
'Label8
@@ -743,7 +782,7 @@ Partial Class VectoJobForm
'
Me.txtAdvancedAuxiliaryFile.Location = New System.Drawing.Point(0, 0)
Me.txtAdvancedAuxiliaryFile.Name = "txtAdvancedAuxiliaryFile"
- Me.txtAdvancedAuxiliaryFile.Size = New System.Drawing.Size(100, 20)
+ Me.txtAdvancedAuxiliaryFile.Size = New System.Drawing.Size(100, 23)
Me.txtAdvancedAuxiliaryFile.TabIndex = 0
'
'picAuxInfo
@@ -752,13 +791,13 @@ Partial Class VectoJobForm
Me.picAuxInfo.Name = "picAuxInfo"
Me.picAuxInfo.Size = New System.Drawing.Size(100, 50)
Me.picAuxInfo.TabIndex = 0
- Me.picAuxInfo.TabStop = False
+ Me.picAuxInfo.TabStop = false
'
'cboAdvancedAuxiliaries
'
Me.cboAdvancedAuxiliaries.Location = New System.Drawing.Point(0, 0)
Me.cboAdvancedAuxiliaries.Name = "cboAdvancedAuxiliaries"
- Me.cboAdvancedAuxiliaries.Size = New System.Drawing.Size(121, 21)
+ Me.cboAdvancedAuxiliaries.Size = New System.Drawing.Size(121, 23)
Me.cboAdvancedAuxiliaries.TabIndex = 0
'
'lbAdvancedAuxiliaries
@@ -770,17 +809,18 @@ Partial Class VectoJobForm
'
'tcJob
'
- Me.tcJob.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.tcJob.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.tcJob.Controls.Add(Me.TabPgGen)
Me.tcJob.Controls.Add(Me.tpAuxiliaries)
Me.tcJob.Controls.Add(Me.tpCycles)
Me.tcJob.Controls.Add(Me.TabPgDriver)
Me.tcJob.Controls.Add(Me.TabPgADAS)
- Me.tcJob.Location = New System.Drawing.Point(1, 78)
+ Me.tcJob.Location = New System.Drawing.Point(1, 90)
+ Me.tcJob.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tcJob.Name = "tcJob"
Me.tcJob.SelectedIndex = 0
- Me.tcJob.Size = New System.Drawing.Size(533, 520)
+ Me.tcJob.Size = New System.Drawing.Size(622, 600)
Me.tcJob.SizeMode = System.Windows.Forms.TabSizeMode.Fixed
Me.tcJob.TabIndex = 0
'
@@ -789,74 +829,82 @@ Partial Class VectoJobForm
Me.tpAuxiliaries.Controls.Add(Me.gbBusAux)
Me.tpAuxiliaries.Controls.Add(Me.gbElectricAux)
Me.tpAuxiliaries.Controls.Add(Me.GrAuxMech)
- Me.tpAuxiliaries.Location = New System.Drawing.Point(4, 22)
+ Me.tpAuxiliaries.Location = New System.Drawing.Point(4, 24)
+ Me.tpAuxiliaries.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tpAuxiliaries.Name = "tpAuxiliaries"
- Me.tpAuxiliaries.Padding = New System.Windows.Forms.Padding(3)
- Me.tpAuxiliaries.Size = New System.Drawing.Size(525, 494)
+ Me.tpAuxiliaries.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.tpAuxiliaries.Size = New System.Drawing.Size(614, 572)
Me.tpAuxiliaries.TabIndex = 9
Me.tpAuxiliaries.Text = "Auxiliaries"
- Me.tpAuxiliaries.UseVisualStyleBackColor = True
+ Me.tpAuxiliaries.UseVisualStyleBackColor = true
'
'gbBusAux
'
Me.gbBusAux.Controls.Add(Me.cbEnableBusAux)
Me.gbBusAux.Controls.Add(Me.pnBusAux)
- Me.gbBusAux.Location = New System.Drawing.Point(6, 302)
+ Me.gbBusAux.Location = New System.Drawing.Point(7, 348)
+ Me.gbBusAux.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.gbBusAux.Name = "gbBusAux"
- Me.gbBusAux.Size = New System.Drawing.Size(515, 78)
+ Me.gbBusAux.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.gbBusAux.Size = New System.Drawing.Size(601, 90)
Me.gbBusAux.TabIndex = 1
- Me.gbBusAux.TabStop = False
+ Me.gbBusAux.TabStop = false
Me.gbBusAux.Text = "Bus Auxiliaries"
'
'cbEnableBusAux
'
- Me.cbEnableBusAux.AutoSize = True
- Me.cbEnableBusAux.Location = New System.Drawing.Point(10, 17)
+ Me.cbEnableBusAux.AutoSize = true
+ Me.cbEnableBusAux.Location = New System.Drawing.Point(12, 20)
+ Me.cbEnableBusAux.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.cbEnableBusAux.Name = "cbEnableBusAux"
- Me.cbEnableBusAux.Size = New System.Drawing.Size(115, 17)
+ Me.cbEnableBusAux.Size = New System.Drawing.Size(124, 19)
Me.cbEnableBusAux.TabIndex = 0
Me.cbEnableBusAux.Text = "Use Bus Auxiliaries"
- Me.cbEnableBusAux.UseVisualStyleBackColor = True
+ Me.cbEnableBusAux.UseVisualStyleBackColor = true
'
'pnBusAux
'
Me.pnBusAux.Controls.Add(Me.btnBusAuxP)
Me.pnBusAux.Controls.Add(Me.tbBusAuxParams)
Me.pnBusAux.Controls.Add(Me.btnBrowsBusAuxParams)
- Me.pnBusAux.Enabled = False
- Me.pnBusAux.Location = New System.Drawing.Point(6, 40)
+ Me.pnBusAux.Enabled = false
+ Me.pnBusAux.Location = New System.Drawing.Point(7, 46)
+ Me.pnBusAux.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.pnBusAux.Name = "pnBusAux"
- Me.pnBusAux.Size = New System.Drawing.Size(503, 26)
+ Me.pnBusAux.Size = New System.Drawing.Size(587, 30)
Me.pnBusAux.TabIndex = 1
'
'btnBusAuxP
'
- Me.btnBusAuxP.Location = New System.Drawing.Point(3, 3)
+ Me.btnBusAuxP.Location = New System.Drawing.Point(4, 3)
+ Me.btnBusAuxP.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btnBusAuxP.Name = "btnBusAuxP"
- Me.btnBusAuxP.Size = New System.Drawing.Size(72, 21)
+ Me.btnBusAuxP.Size = New System.Drawing.Size(84, 24)
Me.btnBusAuxP.TabIndex = 0
- Me.btnBusAuxP.TabStop = False
+ Me.btnBusAuxP.TabStop = false
Me.btnBusAuxP.Text = "BusAux P."
- Me.btnBusAuxP.UseVisualStyleBackColor = True
+ Me.btnBusAuxP.UseVisualStyleBackColor = true
'
'tbBusAuxParams
'
- Me.tbBusAuxParams.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.tbBusAuxParams.Location = New System.Drawing.Point(81, 3)
+ Me.tbBusAuxParams.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.tbBusAuxParams.Location = New System.Drawing.Point(94, 3)
+ Me.tbBusAuxParams.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbBusAuxParams.Name = "tbBusAuxParams"
- Me.tbBusAuxParams.Size = New System.Drawing.Size(393, 20)
+ Me.tbBusAuxParams.Size = New System.Drawing.Size(458, 23)
Me.tbBusAuxParams.TabIndex = 1
'
'btnBrowsBusAuxParams
'
- Me.btnBrowsBusAuxParams.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.btnBrowsBusAuxParams.Image = CType(resources.GetObject("btnBrowsBusAuxParams.Image"), System.Drawing.Image)
- Me.btnBrowsBusAuxParams.Location = New System.Drawing.Point(476, 1)
+ Me.btnBrowsBusAuxParams.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.btnBrowsBusAuxParams.Image = CType(resources.GetObject("btnBrowsBusAuxParams.Image"),System.Drawing.Image)
+ Me.btnBrowsBusAuxParams.Location = New System.Drawing.Point(555, 1)
+ Me.btnBrowsBusAuxParams.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btnBrowsBusAuxParams.Name = "btnBrowsBusAuxParams"
- Me.btnBrowsBusAuxParams.Size = New System.Drawing.Size(24, 24)
+ Me.btnBrowsBusAuxParams.Size = New System.Drawing.Size(28, 28)
Me.btnBrowsBusAuxParams.TabIndex = 2
- Me.btnBrowsBusAuxParams.UseVisualStyleBackColor = True
+ Me.btnBrowsBusAuxParams.UseVisualStyleBackColor = true
'
'gbElectricAux
'
@@ -864,19 +912,22 @@ Partial Class VectoJobForm
Me.gbElectricAux.Controls.Add(Me.lblElAuxConstUnit)
Me.gbElectricAux.Controls.Add(Me.tbElectricAuxConstant)
Me.gbElectricAux.Controls.Add(Me.lblElAuxConst)
- Me.gbElectricAux.Location = New System.Drawing.Point(6, 386)
+ Me.gbElectricAux.Location = New System.Drawing.Point(7, 445)
+ Me.gbElectricAux.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.gbElectricAux.Name = "gbElectricAux"
- Me.gbElectricAux.Size = New System.Drawing.Size(515, 55)
+ Me.gbElectricAux.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.gbElectricAux.Size = New System.Drawing.Size(601, 63)
Me.gbElectricAux.TabIndex = 2
- Me.gbElectricAux.TabStop = False
+ Me.gbElectricAux.TabStop = false
Me.gbElectricAux.Text = "Electric Auxiliaries"
- Me.gbElectricAux.Visible = False
+ Me.gbElectricAux.Visible = false
'
'Label46
'
- Me.Label46.AutoSize = True
- Me.Label46.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Italic)
- Me.Label46.Location = New System.Drawing.Point(235, 22)
+ Me.Label46.AutoSize = true
+ Me.Label46.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point)
+ Me.Label46.Location = New System.Drawing.Point(274, 25)
+ Me.Label46.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label46.Name = "Label46"
Me.Label46.Size = New System.Drawing.Size(106, 13)
Me.Label46.TabIndex = 48
@@ -884,52 +935,57 @@ Partial Class VectoJobForm
'
'lblElAuxConstUnit
'
- Me.lblElAuxConstUnit.AutoSize = True
- Me.lblElAuxConstUnit.Location = New System.Drawing.Point(191, 22)
+ Me.lblElAuxConstUnit.AutoSize = true
+ Me.lblElAuxConstUnit.Location = New System.Drawing.Point(223, 25)
+ Me.lblElAuxConstUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblElAuxConstUnit.Name = "lblElAuxConstUnit"
- Me.lblElAuxConstUnit.Size = New System.Drawing.Size(24, 13)
+ Me.lblElAuxConstUnit.Size = New System.Drawing.Size(26, 15)
Me.lblElAuxConstUnit.TabIndex = 47
Me.lblElAuxConstUnit.Text = "[W]"
'
'tbElectricAuxConstant
'
- Me.tbElectricAuxConstant.Location = New System.Drawing.Point(109, 19)
+ Me.tbElectricAuxConstant.Location = New System.Drawing.Point(127, 22)
+ Me.tbElectricAuxConstant.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbElectricAuxConstant.Name = "tbElectricAuxConstant"
- Me.tbElectricAuxConstant.Size = New System.Drawing.Size(76, 20)
+ Me.tbElectricAuxConstant.Size = New System.Drawing.Size(88, 23)
Me.tbElectricAuxConstant.TabIndex = 0
'
'lblElAuxConst
'
- Me.lblElAuxConst.AutoSize = True
- Me.lblElAuxConst.Location = New System.Drawing.Point(7, 22)
+ Me.lblElAuxConst.AutoSize = true
+ Me.lblElAuxConst.Location = New System.Drawing.Point(8, 25)
+ Me.lblElAuxConst.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblElAuxConst.Name = "lblElAuxConst"
- Me.lblElAuxConst.Size = New System.Drawing.Size(97, 13)
+ Me.lblElAuxConst.Size = New System.Drawing.Size(108, 15)
Me.lblElAuxConst.TabIndex = 45
Me.lblElAuxConst.Text = "Constant Aux Load"
'
'tpCycles
'
Me.tpCycles.Controls.Add(Me.GrCycles)
- Me.tpCycles.Location = New System.Drawing.Point(4, 22)
+ Me.tpCycles.Location = New System.Drawing.Point(4, 24)
+ Me.tpCycles.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tpCycles.Name = "tpCycles"
- Me.tpCycles.Padding = New System.Windows.Forms.Padding(3)
- Me.tpCycles.Size = New System.Drawing.Size(525, 494)
+ Me.tpCycles.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.tpCycles.Size = New System.Drawing.Size(614, 572)
Me.tpCycles.TabIndex = 10
Me.tpCycles.Text = "Cycles"
- Me.tpCycles.UseVisualStyleBackColor = True
+ Me.tpCycles.UseVisualStyleBackColor = true
'
'TabPgDriver
'
Me.TabPgDriver.Controls.Add(Me.GrVACC)
Me.TabPgDriver.Controls.Add(Me.GrLAC)
Me.TabPgDriver.Controls.Add(Me.gbOverspeed)
- Me.TabPgDriver.Location = New System.Drawing.Point(4, 22)
+ Me.TabPgDriver.Location = New System.Drawing.Point(4, 24)
+ Me.TabPgDriver.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.TabPgDriver.Name = "TabPgDriver"
- Me.TabPgDriver.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPgDriver.Size = New System.Drawing.Size(525, 494)
+ Me.TabPgDriver.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.TabPgDriver.Size = New System.Drawing.Size(614, 572)
Me.TabPgDriver.TabIndex = 7
Me.TabPgDriver.Text = "Driver Model"
- Me.TabPgDriver.UseVisualStyleBackColor = True
+ Me.TabPgDriver.UseVisualStyleBackColor = true
'
'GrVACC
'
@@ -937,60 +993,68 @@ Partial Class VectoJobForm
Me.GrVACC.Controls.Add(Me.TbDesMaxFile)
Me.GrVACC.Controls.Add(Me.BtDesMaxBr)
Me.GrVACC.Controls.Add(Me.BtAccOpen)
- Me.GrVACC.Location = New System.Drawing.Point(9, 271)
+ Me.GrVACC.Location = New System.Drawing.Point(10, 313)
+ Me.GrVACC.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.GrVACC.Name = "GrVACC"
- Me.GrVACC.Size = New System.Drawing.Size(515, 69)
+ Me.GrVACC.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.GrVACC.Size = New System.Drawing.Size(601, 80)
Me.GrVACC.TabIndex = 2
- Me.GrVACC.TabStop = False
+ Me.GrVACC.TabStop = false
Me.GrVACC.Text = "Max. acceleration and brake curves"
'
'Label15
'
- Me.Label15.AutoSize = True
- Me.Label15.Location = New System.Drawing.Point(3, 20)
+ Me.Label15.AutoSize = true
+ Me.Label15.Location = New System.Drawing.Point(4, 23)
+ Me.Label15.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label15.Name = "Label15"
- Me.Label15.Size = New System.Drawing.Size(220, 13)
+ Me.Label15.Size = New System.Drawing.Size(240, 15)
Me.Label15.TabIndex = 4
Me.Label15.Text = "Driver Acceleration/Deceleration File (.vacc):"
'
'TbDesMaxFile
'
- Me.TbDesMaxFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.TbDesMaxFile.Location = New System.Drawing.Point(6, 36)
+ Me.TbDesMaxFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.TbDesMaxFile.Location = New System.Drawing.Point(7, 42)
+ Me.TbDesMaxFile.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.TbDesMaxFile.Name = "TbDesMaxFile"
- Me.TbDesMaxFile.Size = New System.Drawing.Size(450, 20)
+ Me.TbDesMaxFile.Size = New System.Drawing.Size(524, 23)
Me.TbDesMaxFile.TabIndex = 0
'
'BtDesMaxBr
'
- Me.BtDesMaxBr.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.BtDesMaxBr.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.BtDesMaxBr.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.BtDesMaxBr.Location = New System.Drawing.Point(457, 34)
+ Me.BtDesMaxBr.Location = New System.Drawing.Point(533, 39)
+ Me.BtDesMaxBr.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.BtDesMaxBr.Name = "BtDesMaxBr"
- Me.BtDesMaxBr.Size = New System.Drawing.Size(24, 24)
+ Me.BtDesMaxBr.Size = New System.Drawing.Size(28, 28)
Me.BtDesMaxBr.TabIndex = 1
- Me.BtDesMaxBr.UseVisualStyleBackColor = True
+ Me.BtDesMaxBr.UseVisualStyleBackColor = true
'
'BtAccOpen
'
- Me.BtAccOpen.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.BtAccOpen.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.BtAccOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.BtAccOpen.Location = New System.Drawing.Point(481, 34)
+ Me.BtAccOpen.Location = New System.Drawing.Point(561, 39)
+ Me.BtAccOpen.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.BtAccOpen.Name = "BtAccOpen"
- Me.BtAccOpen.Size = New System.Drawing.Size(24, 24)
+ Me.BtAccOpen.Size = New System.Drawing.Size(28, 28)
Me.BtAccOpen.TabIndex = 2
- Me.BtAccOpen.UseVisualStyleBackColor = True
+ Me.BtAccOpen.UseVisualStyleBackColor = true
'
'GrLAC
'
Me.GrLAC.Controls.Add(Me.pnLookAheadCoasting)
Me.GrLAC.Controls.Add(Me.CbLookAhead)
- Me.GrLAC.Location = New System.Drawing.Point(9, 92)
+ Me.GrLAC.Location = New System.Drawing.Point(10, 106)
+ Me.GrLAC.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.GrLAC.Name = "GrLAC"
- Me.GrLAC.Size = New System.Drawing.Size(514, 173)
+ Me.GrLAC.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.GrLAC.Size = New System.Drawing.Size(600, 200)
Me.GrLAC.TabIndex = 1
- Me.GrLAC.TabStop = False
+ Me.GrLAC.TabStop = false
Me.GrLAC.Text = "Look-Ahead Coasting"
'
'pnLookAheadCoasting
@@ -1013,193 +1077,215 @@ Partial Class VectoJobForm
Me.pnLookAheadCoasting.Controls.Add(Me.btnDfTargetSpeed)
Me.pnLookAheadCoasting.Controls.Add(Me.tbLacPreviewFactor)
Me.pnLookAheadCoasting.Controls.Add(Me.tbLacDfVelocityDropFile)
- Me.pnLookAheadCoasting.Location = New System.Drawing.Point(15, 19)
+ Me.pnLookAheadCoasting.Location = New System.Drawing.Point(18, 22)
+ Me.pnLookAheadCoasting.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.pnLookAheadCoasting.Name = "pnLookAheadCoasting"
- Me.pnLookAheadCoasting.Size = New System.Drawing.Size(493, 148)
+ Me.pnLookAheadCoasting.Size = New System.Drawing.Size(575, 171)
Me.pnLookAheadCoasting.TabIndex = 0
'
'PictureBox2
'
- Me.PictureBox2.Location = New System.Drawing.Point(21, 129)
+ Me.PictureBox2.Location = New System.Drawing.Point(24, 149)
+ Me.PictureBox2.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.PictureBox2.Name = "PictureBox2"
Me.PictureBox2.Padding = New System.Windows.Forms.Padding(0, 2, 0, 0)
- Me.PictureBox2.Size = New System.Drawing.Size(472, 19)
+ Me.PictureBox2.Size = New System.Drawing.Size(551, 22)
Me.PictureBox2.TabIndex = 35
- Me.PictureBox2.TabStop = False
+ Me.PictureBox2.TabStop = false
'
'Label49
'
- Me.Label49.AutoSize = True
- Me.Label49.Location = New System.Drawing.Point(246, 31)
+ Me.Label49.AutoSize = true
+ Me.Label49.Location = New System.Drawing.Point(287, 36)
+ Me.Label49.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label49.Name = "Label49"
- Me.Label49.Size = New System.Drawing.Size(16, 13)
+ Me.Label49.Size = New System.Drawing.Size(20, 15)
Me.Label49.TabIndex = 34
Me.Label49.Text = "[-]"
'
'Label7
'
- Me.Label7.AutoSize = True
- Me.Label7.Location = New System.Drawing.Point(245, 6)
+ Me.Label7.AutoSize = true
+ Me.Label7.Location = New System.Drawing.Point(286, 7)
+ Me.Label7.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label7.Name = "Label7"
- Me.Label7.Size = New System.Drawing.Size(38, 13)
+ Me.Label7.Size = New System.Drawing.Size(44, 15)
Me.Label7.TabIndex = 4
Me.Label7.Text = "[km/h]"
'
'Label6
'
- Me.Label6.AutoSize = True
- Me.Label6.Location = New System.Drawing.Point(106, 5)
+ Me.Label6.AutoSize = true
+ Me.Label6.Location = New System.Drawing.Point(124, 6)
+ Me.Label6.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label6.Name = "Label6"
- Me.Label6.Size = New System.Drawing.Size(67, 13)
+ Me.Label6.Size = New System.Drawing.Size(75, 15)
Me.Label6.TabIndex = 33
Me.Label6.Text = "Min. Velocity"
Me.Label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight
'
'tbLacMinSpeed
'
- Me.tbLacMinSpeed.Location = New System.Drawing.Point(179, 3)
+ Me.tbLacMinSpeed.Location = New System.Drawing.Point(209, 3)
+ Me.tbLacMinSpeed.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbLacMinSpeed.Name = "tbLacMinSpeed"
- Me.tbLacMinSpeed.Size = New System.Drawing.Size(64, 20)
+ Me.tbLacMinSpeed.Size = New System.Drawing.Size(74, 23)
Me.tbLacMinSpeed.TabIndex = 0
'
'btnDfVelocityDrop
'
- Me.btnDfVelocityDrop.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.btnDfVelocityDrop.Image = CType(resources.GetObject("btnDfVelocityDrop.Image"), System.Drawing.Image)
- Me.btnDfVelocityDrop.Location = New System.Drawing.Point(466, 78)
+ Me.btnDfVelocityDrop.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.btnDfVelocityDrop.Image = CType(resources.GetObject("btnDfVelocityDrop.Image"),System.Drawing.Image)
+ Me.btnDfVelocityDrop.Location = New System.Drawing.Point(544, 90)
+ Me.btnDfVelocityDrop.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btnDfVelocityDrop.Name = "btnDfVelocityDrop"
- Me.btnDfVelocityDrop.Size = New System.Drawing.Size(24, 24)
+ Me.btnDfVelocityDrop.Size = New System.Drawing.Size(28, 28)
Me.btnDfVelocityDrop.TabIndex = 5
- Me.btnDfVelocityDrop.UseVisualStyleBackColor = True
+ Me.btnDfVelocityDrop.UseVisualStyleBackColor = true
'
'Label12
'
- Me.Label12.AutoSize = True
- Me.Label12.Location = New System.Drawing.Point(284, 110)
+ Me.Label12.AutoSize = true
+ Me.Label12.Location = New System.Drawing.Point(331, 127)
+ Me.Label12.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label12.Name = "Label12"
- Me.Label12.Size = New System.Drawing.Size(130, 13)
+ Me.Label12.Size = New System.Drawing.Size(134, 15)
Me.Label12.TabIndex = 31
Me.Label12.Text = "* DF_vTarget * DF_vDrop"
'
'tbDfCoastingScale
'
- Me.tbDfCoastingScale.Location = New System.Drawing.Point(241, 107)
+ Me.tbDfCoastingScale.Location = New System.Drawing.Point(281, 123)
+ Me.tbDfCoastingScale.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbDfCoastingScale.Name = "tbDfCoastingScale"
- Me.tbDfCoastingScale.Size = New System.Drawing.Size(37, 20)
+ Me.tbDfCoastingScale.Size = New System.Drawing.Size(42, 23)
Me.tbDfCoastingScale.TabIndex = 7
'
'Label11
'
- Me.Label11.AutoSize = True
- Me.Label11.Location = New System.Drawing.Point(224, 109)
+ Me.Label11.AutoSize = true
+ Me.Label11.Location = New System.Drawing.Point(261, 126)
+ Me.Label11.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label11.Name = "Label11"
- Me.Label11.Size = New System.Drawing.Size(13, 13)
+ Me.Label11.Size = New System.Drawing.Size(15, 15)
Me.Label11.TabIndex = 29
Me.Label11.Text = "- "
'
'Label3
'
- Me.Label3.AutoSize = True
- Me.Label3.Location = New System.Drawing.Point(55, 30)
+ Me.Label3.AutoSize = true
+ Me.Label3.Location = New System.Drawing.Point(64, 35)
+ Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label3.Name = "Label3"
- Me.Label3.Size = New System.Drawing.Size(118, 13)
+ Me.Label3.Size = New System.Drawing.Size(129, 15)
Me.Label3.TabIndex = 20
Me.Label3.Text = "Preview distance factor"
Me.Label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight
'
'tbDfCoastingOffset
'
- Me.tbDfCoastingOffset.Location = New System.Drawing.Point(180, 107)
+ Me.tbDfCoastingOffset.Location = New System.Drawing.Point(210, 123)
+ Me.tbDfCoastingOffset.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbDfCoastingOffset.Name = "tbDfCoastingOffset"
- Me.tbDfCoastingOffset.Size = New System.Drawing.Size(37, 20)
+ Me.tbDfCoastingOffset.Size = New System.Drawing.Size(42, 23)
Me.tbDfCoastingOffset.TabIndex = 6
'
'tbLacDfTargetSpeedFile
'
- Me.tbLacDfTargetSpeedFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.tbLacDfTargetSpeedFile.Location = New System.Drawing.Point(179, 54)
+ Me.tbLacDfTargetSpeedFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.tbLacDfTargetSpeedFile.Location = New System.Drawing.Point(209, 62)
+ Me.tbLacDfTargetSpeedFile.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbLacDfTargetSpeedFile.Name = "tbLacDfTargetSpeedFile"
- Me.tbLacDfTargetSpeedFile.Size = New System.Drawing.Size(286, 20)
+ Me.tbLacDfTargetSpeedFile.Size = New System.Drawing.Size(333, 23)
Me.tbLacDfTargetSpeedFile.TabIndex = 2
'
'Label10
'
- Me.Label10.AutoSize = True
- Me.Label10.Location = New System.Drawing.Point(94, 109)
+ Me.Label10.AutoSize = true
+ Me.Label10.Location = New System.Drawing.Point(110, 126)
+ Me.Label10.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label10.Name = "Label10"
- Me.Label10.Size = New System.Drawing.Size(79, 13)
+ Me.Label10.Size = New System.Drawing.Size(85, 15)
Me.Label10.TabIndex = 27
Me.Label10.Text = "DF_coasting = "
'
'Label4
'
- Me.Label4.AutoSize = True
- Me.Label4.Location = New System.Drawing.Point(18, 56)
+ Me.Label4.AutoSize = true
+ Me.Label4.Location = New System.Drawing.Point(21, 65)
+ Me.Label4.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label4.Name = "Label4"
- Me.Label4.Size = New System.Drawing.Size(155, 13)
+ Me.Label4.Size = New System.Drawing.Size(166, 15)
Me.Label4.TabIndex = 24
Me.Label4.Text = "Decision Factor - Target Speed"
Me.Label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight
'
'Label5
'
- Me.Label5.AutoSize = True
- Me.Label5.Location = New System.Drawing.Point(18, 83)
+ Me.Label5.AutoSize = true
+ Me.Label5.Location = New System.Drawing.Point(21, 96)
+ Me.Label5.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label5.Name = "Label5"
- Me.Label5.Size = New System.Drawing.Size(153, 13)
+ Me.Label5.Size = New System.Drawing.Size(169, 15)
Me.Label5.TabIndex = 26
Me.Label5.Text = "Decision Factor - Velocity Drop"
Me.Label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight
'
'btnDfTargetSpeed
'
- Me.btnDfTargetSpeed.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.btnDfTargetSpeed.Image = CType(resources.GetObject("btnDfTargetSpeed.Image"), System.Drawing.Image)
- Me.btnDfTargetSpeed.Location = New System.Drawing.Point(466, 52)
+ Me.btnDfTargetSpeed.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.btnDfTargetSpeed.Image = CType(resources.GetObject("btnDfTargetSpeed.Image"),System.Drawing.Image)
+ Me.btnDfTargetSpeed.Location = New System.Drawing.Point(544, 60)
+ Me.btnDfTargetSpeed.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btnDfTargetSpeed.Name = "btnDfTargetSpeed"
- Me.btnDfTargetSpeed.Size = New System.Drawing.Size(24, 24)
+ Me.btnDfTargetSpeed.Size = New System.Drawing.Size(28, 28)
Me.btnDfTargetSpeed.TabIndex = 3
- Me.btnDfTargetSpeed.UseVisualStyleBackColor = True
+ Me.btnDfTargetSpeed.UseVisualStyleBackColor = true
'
'tbLacPreviewFactor
'
- Me.tbLacPreviewFactor.Location = New System.Drawing.Point(179, 28)
+ Me.tbLacPreviewFactor.Location = New System.Drawing.Point(209, 32)
+ Me.tbLacPreviewFactor.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbLacPreviewFactor.Name = "tbLacPreviewFactor"
- Me.tbLacPreviewFactor.Size = New System.Drawing.Size(64, 20)
+ Me.tbLacPreviewFactor.Size = New System.Drawing.Size(74, 23)
Me.tbLacPreviewFactor.TabIndex = 1
'
'tbLacDfVelocityDropFile
'
- Me.tbLacDfVelocityDropFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.tbLacDfVelocityDropFile.Location = New System.Drawing.Point(179, 81)
+ Me.tbLacDfVelocityDropFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.tbLacDfVelocityDropFile.Location = New System.Drawing.Point(209, 93)
+ Me.tbLacDfVelocityDropFile.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbLacDfVelocityDropFile.Name = "tbLacDfVelocityDropFile"
- Me.tbLacDfVelocityDropFile.Size = New System.Drawing.Size(286, 20)
+ Me.tbLacDfVelocityDropFile.Size = New System.Drawing.Size(333, 23)
Me.tbLacDfVelocityDropFile.TabIndex = 4
'
'CbLookAhead
'
- Me.CbLookAhead.AutoSize = True
- Me.CbLookAhead.Checked = True
+ Me.CbLookAhead.AutoSize = true
+ Me.CbLookAhead.Checked = true
Me.CbLookAhead.CheckState = System.Windows.Forms.CheckState.Checked
- Me.CbLookAhead.Location = New System.Drawing.Point(16, 21)
+ Me.CbLookAhead.Location = New System.Drawing.Point(19, 24)
+ Me.CbLookAhead.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.CbLookAhead.Name = "CbLookAhead"
- Me.CbLookAhead.Size = New System.Drawing.Size(65, 17)
+ Me.CbLookAhead.Size = New System.Drawing.Size(68, 19)
Me.CbLookAhead.TabIndex = 0
Me.CbLookAhead.Text = "Enabled"
- Me.CbLookAhead.UseVisualStyleBackColor = True
+ Me.CbLookAhead.UseVisualStyleBackColor = true
'
'gbOverspeed
'
Me.gbOverspeed.Controls.Add(Me.PnEcoRoll)
Me.gbOverspeed.Controls.Add(Me.RdOverspeed)
Me.gbOverspeed.Controls.Add(Me.RdOff)
- Me.gbOverspeed.Location = New System.Drawing.Point(9, 9)
+ Me.gbOverspeed.Location = New System.Drawing.Point(10, 10)
+ Me.gbOverspeed.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.gbOverspeed.Name = "gbOverspeed"
- Me.gbOverspeed.Size = New System.Drawing.Size(515, 77)
+ Me.gbOverspeed.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.gbOverspeed.Size = New System.Drawing.Size(601, 89)
Me.gbOverspeed.TabIndex = 0
- Me.gbOverspeed.TabStop = False
+ Me.gbOverspeed.TabStop = false
Me.gbOverspeed.Text = "Overspeed"
'
'PnEcoRoll
@@ -1210,94 +1296,104 @@ Partial Class VectoJobForm
Me.PnEcoRoll.Controls.Add(Me.TbOverspeed)
Me.PnEcoRoll.Controls.Add(Me.Label23)
Me.PnEcoRoll.Controls.Add(Me.Label13)
- Me.PnEcoRoll.Location = New System.Drawing.Point(91, 17)
+ Me.PnEcoRoll.Location = New System.Drawing.Point(106, 20)
+ Me.PnEcoRoll.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.PnEcoRoll.Name = "PnEcoRoll"
- Me.PnEcoRoll.Size = New System.Drawing.Size(256, 54)
+ Me.PnEcoRoll.Size = New System.Drawing.Size(299, 62)
Me.PnEcoRoll.TabIndex = 2
'
'Label21
'
- Me.Label21.AutoSize = True
- Me.Label21.Location = New System.Drawing.Point(187, 31)
+ Me.Label21.AutoSize = true
+ Me.Label21.Location = New System.Drawing.Point(218, 36)
+ Me.Label21.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label21.Name = "Label21"
- Me.Label21.Size = New System.Drawing.Size(38, 13)
+ Me.Label21.Size = New System.Drawing.Size(44, 15)
Me.Label21.TabIndex = 3
Me.Label21.Text = "[km/h]"
'
'Label14
'
- Me.Label14.AutoSize = True
- Me.Label14.Location = New System.Drawing.Point(187, 5)
+ Me.Label14.AutoSize = true
+ Me.Label14.Location = New System.Drawing.Point(218, 6)
+ Me.Label14.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label14.Name = "Label14"
- Me.Label14.Size = New System.Drawing.Size(38, 13)
+ Me.Label14.Size = New System.Drawing.Size(44, 15)
Me.Label14.TabIndex = 3
Me.Label14.Text = "[km/h]"
'
'TbVmin
'
- Me.TbVmin.Location = New System.Drawing.Point(121, 28)
+ Me.TbVmin.Location = New System.Drawing.Point(141, 32)
+ Me.TbVmin.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.TbVmin.Name = "TbVmin"
- Me.TbVmin.Size = New System.Drawing.Size(64, 20)
+ Me.TbVmin.Size = New System.Drawing.Size(74, 23)
Me.TbVmin.TabIndex = 1
'
'TbOverspeed
'
- Me.TbOverspeed.Location = New System.Drawing.Point(121, 2)
+ Me.TbOverspeed.Location = New System.Drawing.Point(141, 2)
+ Me.TbOverspeed.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.TbOverspeed.Name = "TbOverspeed"
- Me.TbOverspeed.Size = New System.Drawing.Size(64, 20)
+ Me.TbOverspeed.Size = New System.Drawing.Size(74, 23)
Me.TbOverspeed.TabIndex = 0
'
'Label23
'
- Me.Label23.AutoSize = True
- Me.Label23.Location = New System.Drawing.Point(13, 31)
+ Me.Label23.AutoSize = true
+ Me.Label23.Location = New System.Drawing.Point(15, 36)
+ Me.Label23.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label23.Name = "Label23"
- Me.Label23.Size = New System.Drawing.Size(82, 13)
+ Me.Label23.Size = New System.Drawing.Size(95, 15)
Me.Label23.TabIndex = 1
Me.Label23.Text = "Minimum Speed"
'
'Label13
'
- Me.Label13.AutoSize = True
- Me.Label13.Location = New System.Drawing.Point(13, 6)
+ Me.Label13.AutoSize = true
+ Me.Label13.Location = New System.Drawing.Point(15, 7)
+ Me.Label13.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label13.Name = "Label13"
- Me.Label13.Size = New System.Drawing.Size(106, 13)
+ Me.Label13.Size = New System.Drawing.Size(121, 15)
Me.Label13.TabIndex = 1
Me.Label13.Text = "Maximum Overspeed"
'
'RdOverspeed
'
- Me.RdOverspeed.AutoSize = True
- Me.RdOverspeed.Checked = True
- Me.RdOverspeed.Location = New System.Drawing.Point(16, 44)
+ Me.RdOverspeed.AutoSize = true
+ Me.RdOverspeed.Checked = true
+ Me.RdOverspeed.Location = New System.Drawing.Point(19, 51)
+ Me.RdOverspeed.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.RdOverspeed.Name = "RdOverspeed"
- Me.RdOverspeed.Size = New System.Drawing.Size(77, 17)
+ Me.RdOverspeed.Size = New System.Drawing.Size(81, 19)
Me.RdOverspeed.TabIndex = 1
- Me.RdOverspeed.TabStop = True
+ Me.RdOverspeed.TabStop = true
Me.RdOverspeed.Text = "Overspeed"
- Me.RdOverspeed.UseVisualStyleBackColor = True
+ Me.RdOverspeed.UseVisualStyleBackColor = true
'
'RdOff
'
- Me.RdOff.AutoSize = True
- Me.RdOff.Location = New System.Drawing.Point(16, 21)
+ Me.RdOff.AutoSize = true
+ Me.RdOff.Location = New System.Drawing.Point(19, 24)
+ Me.RdOff.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.RdOff.Name = "RdOff"
- Me.RdOff.Size = New System.Drawing.Size(39, 17)
+ Me.RdOff.Size = New System.Drawing.Size(42, 19)
Me.RdOff.TabIndex = 0
Me.RdOff.Text = "Off"
- Me.RdOff.UseVisualStyleBackColor = True
+ Me.RdOff.UseVisualStyleBackColor = true
'
'TabPgADAS
'
Me.TabPgADAS.Controls.Add(Me.gbPCC)
Me.TabPgADAS.Controls.Add(Me.gbEcoRoll)
Me.TabPgADAS.Controls.Add(Me.gbEngineStopStart)
- Me.TabPgADAS.Location = New System.Drawing.Point(4, 22)
+ Me.TabPgADAS.Location = New System.Drawing.Point(4, 24)
+ Me.TabPgADAS.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.TabPgADAS.Name = "TabPgADAS"
- Me.TabPgADAS.Size = New System.Drawing.Size(525, 494)
+ Me.TabPgADAS.Size = New System.Drawing.Size(614, 572)
Me.TabPgADAS.TabIndex = 8
Me.TabPgADAS.Text = "ADAS Parameters"
- Me.TabPgADAS.UseVisualStyleBackColor = True
+ Me.TabPgADAS.UseVisualStyleBackColor = true
'
'gbPCC
'
@@ -1321,18 +1417,21 @@ Partial Class VectoJobForm
Me.gbPCC.Controls.Add(Me.Label20)
Me.gbPCC.Controls.Add(Me.Label22)
Me.gbPCC.Controls.Add(Me.tbPCCUnderspeed)
- Me.gbPCC.Location = New System.Drawing.Point(7, 269)
+ Me.gbPCC.Location = New System.Drawing.Point(8, 310)
+ Me.gbPCC.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.gbPCC.Name = "gbPCC"
- Me.gbPCC.Size = New System.Drawing.Size(515, 217)
+ Me.gbPCC.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.gbPCC.Size = New System.Drawing.Size(601, 250)
Me.gbPCC.TabIndex = 2
- Me.gbPCC.TabStop = False
+ Me.gbPCC.TabStop = false
Me.gbPCC.Text = "Predictive Cruise Control"
'
'Label43
'
- Me.Label43.AutoSize = True
- Me.Label43.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Italic)
- Me.Label43.Location = New System.Drawing.Point(39, 196)
+ Me.Label43.AutoSize = true
+ Me.Label43.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point)
+ Me.Label43.Location = New System.Drawing.Point(46, 226)
+ Me.Label43.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label43.Name = "Label43"
Me.Label43.Size = New System.Drawing.Size(157, 13)
Me.Label43.TabIndex = 30
@@ -1340,163 +1439,182 @@ Partial Class VectoJobForm
'
'Label42
'
- Me.Label42.AutoSize = True
- Me.Label42.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Italic)
- Me.Label42.Location = New System.Drawing.Point(7, 181)
+ Me.Label42.AutoSize = true
+ Me.Label42.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point)
+ Me.Label42.Location = New System.Drawing.Point(8, 209)
+ Me.Label42.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label42.Name = "Label42"
Me.Label42.Size = New System.Drawing.Size(403, 13)
Me.Label42.TabIndex = 29
- Me.Label42.Text = "Note: Predictive cruise control is only activated on highway parts of the driving" &
+ Me.Label42.Text = "Note: Predictive cruise control is only activated on highway parts of the driving"& _
" cycle"
'
'Label40
'
- Me.Label40.AutoSize = True
- Me.Label40.Location = New System.Drawing.Point(305, 152)
+ Me.Label40.AutoSize = true
+ Me.Label40.Location = New System.Drawing.Point(356, 175)
+ Me.Label40.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label40.Name = "Label40"
- Me.Label40.Size = New System.Drawing.Size(21, 13)
+ Me.Label40.Size = New System.Drawing.Size(26, 15)
Me.Label40.TabIndex = 28
Me.Label40.Text = "[m]"
'
'Label41
'
- Me.Label41.AutoSize = True
- Me.Label41.Location = New System.Drawing.Point(7, 152)
+ Me.Label41.AutoSize = true
+ Me.Label41.Location = New System.Drawing.Point(8, 175)
+ Me.Label41.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label41.Name = "Label41"
- Me.Label41.Size = New System.Drawing.Size(146, 13)
+ Me.Label41.Size = New System.Drawing.Size(154, 15)
Me.Label41.TabIndex = 26
Me.Label41.Text = "Preview distance use case 2:"
'
'tbPCCPreviewUseCase2
'
- Me.tbPCCPreviewUseCase2.Location = New System.Drawing.Point(247, 149)
+ Me.tbPCCPreviewUseCase2.Location = New System.Drawing.Point(288, 172)
+ Me.tbPCCPreviewUseCase2.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbPCCPreviewUseCase2.Name = "tbPCCPreviewUseCase2"
- Me.tbPCCPreviewUseCase2.Size = New System.Drawing.Size(52, 20)
+ Me.tbPCCPreviewUseCase2.Size = New System.Drawing.Size(60, 23)
Me.tbPCCPreviewUseCase2.TabIndex = 5
'
'Label38
'
- Me.Label38.AutoSize = True
- Me.Label38.Location = New System.Drawing.Point(305, 126)
+ Me.Label38.AutoSize = true
+ Me.Label38.Location = New System.Drawing.Point(356, 145)
+ Me.Label38.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label38.Name = "Label38"
- Me.Label38.Size = New System.Drawing.Size(21, 13)
+ Me.Label38.Size = New System.Drawing.Size(26, 15)
Me.Label38.TabIndex = 25
Me.Label38.Text = "[m]"
'
'Label39
'
- Me.Label39.AutoSize = True
- Me.Label39.Location = New System.Drawing.Point(7, 126)
+ Me.Label39.AutoSize = true
+ Me.Label39.Location = New System.Drawing.Point(8, 145)
+ Me.Label39.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label39.Name = "Label39"
- Me.Label39.Size = New System.Drawing.Size(146, 13)
+ Me.Label39.Size = New System.Drawing.Size(154, 15)
Me.Label39.TabIndex = 23
Me.Label39.Text = "Preview distance use case 1:"
'
'tbPCCPreviewUseCase1
'
- Me.tbPCCPreviewUseCase1.Location = New System.Drawing.Point(247, 123)
+ Me.tbPCCPreviewUseCase1.Location = New System.Drawing.Point(288, 142)
+ Me.tbPCCPreviewUseCase1.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbPCCPreviewUseCase1.Name = "tbPCCPreviewUseCase1"
- Me.tbPCCPreviewUseCase1.Size = New System.Drawing.Size(52, 20)
+ Me.tbPCCPreviewUseCase1.Size = New System.Drawing.Size(60, 23)
Me.tbPCCPreviewUseCase1.TabIndex = 4
'
'Label36
'
- Me.Label36.AutoSize = True
- Me.Label36.Location = New System.Drawing.Point(305, 100)
+ Me.Label36.AutoSize = true
+ Me.Label36.Location = New System.Drawing.Point(356, 115)
+ Me.Label36.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label36.Name = "Label36"
- Me.Label36.Size = New System.Drawing.Size(38, 13)
+ Me.Label36.Size = New System.Drawing.Size(44, 15)
Me.Label36.TabIndex = 22
Me.Label36.Text = "[km/h]"
'
'Label37
'
- Me.Label37.AutoSize = True
- Me.Label37.Location = New System.Drawing.Point(7, 100)
+ Me.Label37.AutoSize = true
+ Me.Label37.Location = New System.Drawing.Point(8, 115)
+ Me.Label37.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label37.Name = "Label37"
- Me.Label37.Size = New System.Drawing.Size(83, 13)
+ Me.Label37.Size = New System.Drawing.Size(97, 15)
Me.Label37.TabIndex = 20
Me.Label37.Text = "Minimum speed:"
'
'tbPCCMinSpeed
'
- Me.tbPCCMinSpeed.Location = New System.Drawing.Point(247, 97)
+ Me.tbPCCMinSpeed.Location = New System.Drawing.Point(288, 112)
+ Me.tbPCCMinSpeed.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbPCCMinSpeed.Name = "tbPCCMinSpeed"
- Me.tbPCCMinSpeed.Size = New System.Drawing.Size(52, 20)
+ Me.tbPCCMinSpeed.Size = New System.Drawing.Size(60, 23)
Me.tbPCCMinSpeed.TabIndex = 3
'
'Label34
'
- Me.Label34.AutoSize = True
- Me.Label34.Location = New System.Drawing.Point(305, 74)
+ Me.Label34.AutoSize = true
+ Me.Label34.Location = New System.Drawing.Point(356, 85)
+ Me.Label34.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label34.Name = "Label34"
- Me.Label34.Size = New System.Drawing.Size(38, 13)
+ Me.Label34.Size = New System.Drawing.Size(44, 15)
Me.Label34.TabIndex = 19
Me.Label34.Text = "[km/h]"
'
'Label35
'
- Me.Label35.AutoSize = True
- Me.Label35.Location = New System.Drawing.Point(7, 74)
+ Me.Label35.AutoSize = true
+ Me.Label35.Location = New System.Drawing.Point(8, 85)
+ Me.Label35.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label35.Name = "Label35"
- Me.Label35.Size = New System.Drawing.Size(113, 13)
+ Me.Label35.Size = New System.Drawing.Size(126, 15)
Me.Label35.TabIndex = 17
Me.Label35.Text = "PCC enabling velocity:"
'
'tbPCCEnableSpeed
'
- Me.tbPCCEnableSpeed.Location = New System.Drawing.Point(247, 71)
+ Me.tbPCCEnableSpeed.Location = New System.Drawing.Point(288, 82)
+ Me.tbPCCEnableSpeed.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbPCCEnableSpeed.Name = "tbPCCEnableSpeed"
- Me.tbPCCEnableSpeed.Size = New System.Drawing.Size(52, 20)
+ Me.tbPCCEnableSpeed.Size = New System.Drawing.Size(60, 23)
Me.tbPCCEnableSpeed.TabIndex = 2
'
'Label31
'
- Me.Label31.AutoSize = True
- Me.Label31.Location = New System.Drawing.Point(305, 48)
+ Me.Label31.AutoSize = true
+ Me.Label31.Location = New System.Drawing.Point(356, 55)
+ Me.Label31.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label31.Name = "Label31"
- Me.Label31.Size = New System.Drawing.Size(38, 13)
+ Me.Label31.Size = New System.Drawing.Size(44, 15)
Me.Label31.TabIndex = 16
Me.Label31.Text = "[km/h]"
'
'Label33
'
- Me.Label33.AutoSize = True
- Me.Label33.Location = New System.Drawing.Point(7, 48)
+ Me.Label33.AutoSize = true
+ Me.Label33.Location = New System.Drawing.Point(8, 55)
+ Me.Label33.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label33.Name = "Label33"
- Me.Label33.Size = New System.Drawing.Size(100, 13)
+ Me.Label33.Size = New System.Drawing.Size(110, 15)
Me.Label33.TabIndex = 14
Me.Label33.Text = "Allowed overspeed:"
'
'tbPCCOverspeed
'
- Me.tbPCCOverspeed.Location = New System.Drawing.Point(247, 45)
+ Me.tbPCCOverspeed.Location = New System.Drawing.Point(288, 52)
+ Me.tbPCCOverspeed.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbPCCOverspeed.Name = "tbPCCOverspeed"
- Me.tbPCCOverspeed.Size = New System.Drawing.Size(52, 20)
+ Me.tbPCCOverspeed.Size = New System.Drawing.Size(60, 23)
Me.tbPCCOverspeed.TabIndex = 1
'
'Label20
'
- Me.Label20.AutoSize = True
- Me.Label20.Location = New System.Drawing.Point(305, 22)
+ Me.Label20.AutoSize = true
+ Me.Label20.Location = New System.Drawing.Point(356, 25)
+ Me.Label20.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label20.Name = "Label20"
- Me.Label20.Size = New System.Drawing.Size(38, 13)
+ Me.Label20.Size = New System.Drawing.Size(44, 15)
Me.Label20.TabIndex = 13
Me.Label20.Text = "[km/h]"
'
'Label22
'
- Me.Label22.AutoSize = True
- Me.Label22.Location = New System.Drawing.Point(7, 22)
+ Me.Label22.AutoSize = true
+ Me.Label22.Location = New System.Drawing.Point(8, 25)
+ Me.Label22.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label22.Name = "Label22"
- Me.Label22.Size = New System.Drawing.Size(106, 13)
+ Me.Label22.Size = New System.Drawing.Size(118, 15)
Me.Label22.TabIndex = 11
Me.Label22.Text = "Allowed underspeed:"
'
'tbPCCUnderspeed
'
- Me.tbPCCUnderspeed.Location = New System.Drawing.Point(247, 19)
+ Me.tbPCCUnderspeed.Location = New System.Drawing.Point(288, 22)
+ Me.tbPCCUnderspeed.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbPCCUnderspeed.Name = "tbPCCUnderspeed"
- Me.tbPCCUnderspeed.Size = New System.Drawing.Size(52, 20)
+ Me.tbPCCUnderspeed.Size = New System.Drawing.Size(60, 23)
Me.tbPCCUnderspeed.TabIndex = 0
'
'gbEcoRoll
@@ -1513,114 +1631,128 @@ Partial Class VectoJobForm
Me.gbEcoRoll.Controls.Add(Me.Label25)
Me.gbEcoRoll.Controls.Add(Me.Label26)
Me.gbEcoRoll.Controls.Add(Me.tbEcoRollMinSpeed)
- Me.gbEcoRoll.Location = New System.Drawing.Point(7, 136)
+ Me.gbEcoRoll.Location = New System.Drawing.Point(8, 157)
+ Me.gbEcoRoll.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.gbEcoRoll.Name = "gbEcoRoll"
- Me.gbEcoRoll.Size = New System.Drawing.Size(515, 127)
+ Me.gbEcoRoll.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.gbEcoRoll.Size = New System.Drawing.Size(601, 147)
Me.gbEcoRoll.TabIndex = 1
- Me.gbEcoRoll.TabStop = False
+ Me.gbEcoRoll.TabStop = false
Me.gbEcoRoll.Text = "Eco-Roll"
'
'Label44
'
- Me.Label44.AutoSize = True
- Me.Label44.Location = New System.Drawing.Point(305, 75)
+ Me.Label44.AutoSize = true
+ Me.Label44.Location = New System.Drawing.Point(356, 87)
+ Me.Label44.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label44.Name = "Label44"
- Me.Label44.Size = New System.Drawing.Size(34, 13)
+ Me.Label44.Size = New System.Drawing.Size(40, 15)
Me.Label44.TabIndex = 19
Me.Label44.Text = "[m/s²]"
'
'Label45
'
- Me.Label45.AutoSize = True
- Me.Label45.Location = New System.Drawing.Point(7, 75)
+ Me.Label45.AutoSize = true
+ Me.Label45.Location = New System.Drawing.Point(8, 87)
+ Me.Label45.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label45.Name = "Label45"
- Me.Label45.Size = New System.Drawing.Size(125, 13)
+ Me.Label45.Size = New System.Drawing.Size(141, 15)
Me.Label45.TabIndex = 17
Me.Label45.Text = "Upper Acceleration Limit:"
'
'tbEcoRollMaxAcc
'
- Me.tbEcoRollMaxAcc.Location = New System.Drawing.Point(247, 72)
+ Me.tbEcoRollMaxAcc.Location = New System.Drawing.Point(288, 83)
+ Me.tbEcoRollMaxAcc.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbEcoRollMaxAcc.Name = "tbEcoRollMaxAcc"
- Me.tbEcoRollMaxAcc.Size = New System.Drawing.Size(52, 20)
+ Me.tbEcoRollMaxAcc.Size = New System.Drawing.Size(60, 23)
Me.tbEcoRollMaxAcc.TabIndex = 2
'
'Label29
'
- Me.Label29.AutoSize = True
- Me.Label29.Location = New System.Drawing.Point(305, 100)
+ Me.Label29.AutoSize = true
+ Me.Label29.Location = New System.Drawing.Point(356, 115)
+ Me.Label29.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label29.Name = "Label29"
- Me.Label29.Size = New System.Drawing.Size(38, 13)
+ Me.Label29.Size = New System.Drawing.Size(44, 15)
Me.Label29.TabIndex = 16
Me.Label29.Text = "[km/h]"
- Me.Label29.Visible = False
+ Me.Label29.Visible = false
'
'Label30
'
- Me.Label30.AutoSize = True
- Me.Label30.Location = New System.Drawing.Point(7, 100)
+ Me.Label30.AutoSize = true
+ Me.Label30.Location = New System.Drawing.Point(8, 115)
+ Me.Label30.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label30.Name = "Label30"
- Me.Label30.Size = New System.Drawing.Size(114, 13)
+ Me.Label30.Size = New System.Drawing.Size(126, 15)
Me.Label30.TabIndex = 14
Me.Label30.Text = "Underspeed threshold:"
- Me.Label30.Visible = False
+ Me.Label30.Visible = false
'
'tbEcoRollUnderspeed
'
- Me.tbEcoRollUnderspeed.Location = New System.Drawing.Point(247, 97)
+ Me.tbEcoRollUnderspeed.Location = New System.Drawing.Point(288, 112)
+ Me.tbEcoRollUnderspeed.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbEcoRollUnderspeed.Name = "tbEcoRollUnderspeed"
- Me.tbEcoRollUnderspeed.Size = New System.Drawing.Size(52, 20)
+ Me.tbEcoRollUnderspeed.Size = New System.Drawing.Size(60, 23)
Me.tbEcoRollUnderspeed.TabIndex = 3
- Me.tbEcoRollUnderspeed.Visible = False
+ Me.tbEcoRollUnderspeed.Visible = false
'
'Label27
'
- Me.Label27.AutoSize = True
- Me.Label27.Location = New System.Drawing.Point(305, 48)
+ Me.Label27.AutoSize = true
+ Me.Label27.Location = New System.Drawing.Point(356, 55)
+ Me.Label27.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label27.Name = "Label27"
- Me.Label27.Size = New System.Drawing.Size(18, 13)
+ Me.Label27.Size = New System.Drawing.Size(20, 15)
Me.Label27.TabIndex = 13
Me.Label27.Text = "[s]"
'
'Label28
'
- Me.Label28.AutoSize = True
- Me.Label28.Location = New System.Drawing.Point(7, 48)
+ Me.Label28.AutoSize = true
+ Me.Label28.Location = New System.Drawing.Point(8, 55)
+ Me.Label28.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label28.Name = "Label28"
- Me.Label28.Size = New System.Drawing.Size(85, 13)
+ Me.Label28.Size = New System.Drawing.Size(95, 15)
Me.Label28.TabIndex = 11
Me.Label28.Text = "Activation delay:"
'
'tbEcoRollActivationDelay
'
- Me.tbEcoRollActivationDelay.Location = New System.Drawing.Point(247, 45)
+ Me.tbEcoRollActivationDelay.Location = New System.Drawing.Point(288, 52)
+ Me.tbEcoRollActivationDelay.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbEcoRollActivationDelay.Name = "tbEcoRollActivationDelay"
- Me.tbEcoRollActivationDelay.Size = New System.Drawing.Size(52, 20)
+ Me.tbEcoRollActivationDelay.Size = New System.Drawing.Size(60, 23)
Me.tbEcoRollActivationDelay.TabIndex = 1
'
'Label25
'
- Me.Label25.AutoSize = True
- Me.Label25.Location = New System.Drawing.Point(305, 22)
+ Me.Label25.AutoSize = true
+ Me.Label25.Location = New System.Drawing.Point(356, 25)
+ Me.Label25.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label25.Name = "Label25"
- Me.Label25.Size = New System.Drawing.Size(38, 13)
+ Me.Label25.Size = New System.Drawing.Size(44, 15)
Me.Label25.TabIndex = 10
Me.Label25.Text = "[km/h]"
'
'Label26
'
- Me.Label26.AutoSize = True
- Me.Label26.Location = New System.Drawing.Point(7, 22)
+ Me.Label26.AutoSize = true
+ Me.Label26.Location = New System.Drawing.Point(8, 25)
+ Me.Label26.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label26.Name = "Label26"
- Me.Label26.Size = New System.Drawing.Size(83, 13)
+ Me.Label26.Size = New System.Drawing.Size(97, 15)
Me.Label26.TabIndex = 8
Me.Label26.Text = "Minimum speed:"
'
'tbEcoRollMinSpeed
'
- Me.tbEcoRollMinSpeed.Location = New System.Drawing.Point(247, 19)
+ Me.tbEcoRollMinSpeed.Location = New System.Drawing.Point(288, 22)
+ Me.tbEcoRollMinSpeed.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbEcoRollMinSpeed.Name = "tbEcoRollMinSpeed"
- Me.tbEcoRollMinSpeed.Size = New System.Drawing.Size(52, 20)
+ Me.tbEcoRollMinSpeed.Size = New System.Drawing.Size(60, 23)
Me.tbEcoRollMinSpeed.TabIndex = 0
'
'gbEngineStopStart
@@ -1637,110 +1769,124 @@ Partial Class VectoJobForm
Me.gbEngineStopStart.Controls.Add(Me.Label17)
Me.gbEngineStopStart.Controls.Add(Me.tbEngineStopStartActivationDelay)
Me.gbEngineStopStart.Controls.Add(Me.Label16)
- Me.gbEngineStopStart.Location = New System.Drawing.Point(7, 9)
+ Me.gbEngineStopStart.Location = New System.Drawing.Point(8, 10)
+ Me.gbEngineStopStart.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.gbEngineStopStart.Name = "gbEngineStopStart"
- Me.gbEngineStopStart.Size = New System.Drawing.Size(515, 121)
+ Me.gbEngineStopStart.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.gbEngineStopStart.Size = New System.Drawing.Size(601, 140)
Me.gbEngineStopStart.TabIndex = 0
- Me.gbEngineStopStart.TabStop = False
+ Me.gbEngineStopStart.TabStop = false
Me.gbEngineStopStart.Text = "Engine Stop/Start"
'
'lblESSUtilityFactorDrivingUnit
'
- Me.lblESSUtilityFactorDrivingUnit.AutoSize = True
- Me.lblESSUtilityFactorDrivingUnit.Location = New System.Drawing.Point(305, 98)
+ Me.lblESSUtilityFactorDrivingUnit.AutoSize = true
+ Me.lblESSUtilityFactorDrivingUnit.Location = New System.Drawing.Point(356, 113)
+ Me.lblESSUtilityFactorDrivingUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblESSUtilityFactorDrivingUnit.Name = "lblESSUtilityFactorDrivingUnit"
- Me.lblESSUtilityFactorDrivingUnit.Size = New System.Drawing.Size(16, 13)
+ Me.lblESSUtilityFactorDrivingUnit.Size = New System.Drawing.Size(20, 15)
Me.lblESSUtilityFactorDrivingUnit.TabIndex = 10
Me.lblESSUtilityFactorDrivingUnit.Text = "[-]"
'
'Label47
'
- Me.Label47.AutoSize = True
- Me.Label47.Location = New System.Drawing.Point(305, 72)
+ Me.Label47.AutoSize = true
+ Me.Label47.Location = New System.Drawing.Point(356, 83)
+ Me.Label47.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label47.Name = "Label47"
- Me.Label47.Size = New System.Drawing.Size(16, 13)
+ Me.Label47.Size = New System.Drawing.Size(20, 15)
Me.Label47.TabIndex = 9
Me.Label47.Text = "[-]"
'
'tbESSUtilityFactorDriving
'
- Me.tbESSUtilityFactorDriving.Location = New System.Drawing.Point(247, 95)
+ Me.tbESSUtilityFactorDriving.Location = New System.Drawing.Point(288, 110)
+ Me.tbESSUtilityFactorDriving.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbESSUtilityFactorDriving.Name = "tbESSUtilityFactorDriving"
- Me.tbESSUtilityFactorDriving.Size = New System.Drawing.Size(52, 20)
+ Me.tbESSUtilityFactorDriving.Size = New System.Drawing.Size(60, 23)
Me.tbESSUtilityFactorDriving.TabIndex = 3
'
'lblESSUtilityFactorDriving
'
- Me.lblESSUtilityFactorDriving.AutoSize = True
- Me.lblESSUtilityFactorDriving.Location = New System.Drawing.Point(7, 98)
+ Me.lblESSUtilityFactorDriving.AutoSize = true
+ Me.lblESSUtilityFactorDriving.Location = New System.Drawing.Point(8, 113)
+ Me.lblESSUtilityFactorDriving.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblESSUtilityFactorDriving.Name = "lblESSUtilityFactorDriving"
- Me.lblESSUtilityFactorDriving.Size = New System.Drawing.Size(214, 13)
+ Me.lblESSUtilityFactorDriving.Size = New System.Drawing.Size(246, 15)
Me.lblESSUtilityFactorDriving.TabIndex = 8
Me.lblESSUtilityFactorDriving.Text = "Engine stop/start utility factor (while driving):"
'
'tbEssUtility
'
- Me.tbEssUtility.Location = New System.Drawing.Point(247, 69)
+ Me.tbEssUtility.Location = New System.Drawing.Point(288, 80)
+ Me.tbEssUtility.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbEssUtility.Name = "tbEssUtility"
- Me.tbEssUtility.Size = New System.Drawing.Size(52, 20)
+ Me.tbEssUtility.Size = New System.Drawing.Size(60, 23)
Me.tbEssUtility.TabIndex = 2
'
'Label24
'
- Me.Label24.AutoSize = True
- Me.Label24.Location = New System.Drawing.Point(7, 72)
+ Me.Label24.AutoSize = true
+ Me.Label24.Location = New System.Drawing.Point(8, 83)
+ Me.Label24.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label24.Name = "Label24"
- Me.Label24.Size = New System.Drawing.Size(213, 13)
+ Me.Label24.Size = New System.Drawing.Size(241, 15)
Me.Label24.TabIndex = 6
Me.Label24.Text = "Engine stop/start utility factor (vehicle stop):"
'
'Label18
'
- Me.Label18.AutoSize = True
- Me.Label18.Location = New System.Drawing.Point(305, 46)
+ Me.Label18.AutoSize = true
+ Me.Label18.Location = New System.Drawing.Point(356, 53)
+ Me.Label18.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label18.Name = "Label18"
- Me.Label18.Size = New System.Drawing.Size(18, 13)
+ Me.Label18.Size = New System.Drawing.Size(20, 15)
Me.Label18.TabIndex = 5
Me.Label18.Text = "[s]"
'
'tbMaxEngineOffTimespan
'
- Me.tbMaxEngineOffTimespan.Location = New System.Drawing.Point(247, 43)
+ Me.tbMaxEngineOffTimespan.Location = New System.Drawing.Point(288, 50)
+ Me.tbMaxEngineOffTimespan.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbMaxEngineOffTimespan.Name = "tbMaxEngineOffTimespan"
- Me.tbMaxEngineOffTimespan.Size = New System.Drawing.Size(52, 20)
+ Me.tbMaxEngineOffTimespan.Size = New System.Drawing.Size(60, 23)
Me.tbMaxEngineOffTimespan.TabIndex = 1
'
'Label19
'
- Me.Label19.AutoSize = True
- Me.Label19.Location = New System.Drawing.Point(7, 46)
+ Me.Label19.AutoSize = true
+ Me.Label19.Location = New System.Drawing.Point(8, 53)
+ Me.Label19.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label19.Name = "Label19"
- Me.Label19.Size = New System.Drawing.Size(105, 13)
+ Me.Label19.Size = New System.Drawing.Size(122, 15)
Me.Label19.TabIndex = 3
Me.Label19.Text = "Max. engine-off time:"
'
'Label17
'
- Me.Label17.AutoSize = True
- Me.Label17.Location = New System.Drawing.Point(305, 20)
+ Me.Label17.AutoSize = true
+ Me.Label17.Location = New System.Drawing.Point(356, 23)
+ Me.Label17.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label17.Name = "Label17"
- Me.Label17.Size = New System.Drawing.Size(18, 13)
+ Me.Label17.Size = New System.Drawing.Size(20, 15)
Me.Label17.TabIndex = 2
Me.Label17.Text = "[s]"
'
'tbEngineStopStartActivationDelay
'
- Me.tbEngineStopStartActivationDelay.Location = New System.Drawing.Point(247, 17)
+ Me.tbEngineStopStartActivationDelay.Location = New System.Drawing.Point(288, 20)
+ Me.tbEngineStopStartActivationDelay.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbEngineStopStartActivationDelay.Name = "tbEngineStopStartActivationDelay"
- Me.tbEngineStopStartActivationDelay.Size = New System.Drawing.Size(52, 20)
+ Me.tbEngineStopStartActivationDelay.Size = New System.Drawing.Size(60, 23)
Me.tbEngineStopStartActivationDelay.TabIndex = 0
'
'Label16
'
- Me.Label16.AutoSize = True
- Me.Label16.Location = New System.Drawing.Point(7, 20)
+ Me.Label16.AutoSize = true
+ Me.Label16.Location = New System.Drawing.Point(8, 23)
+ Me.Label16.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label16.Name = "Label16"
- Me.Label16.Size = New System.Drawing.Size(87, 13)
+ Me.Label16.Size = New System.Drawing.Size(98, 15)
Me.Label16.TabIndex = 0
Me.Label16.Text = "Delay engine-off:"
'
@@ -1764,7 +1910,7 @@ Partial Class VectoJobForm
Me.GroupBox1.Name = "GroupBox1"
Me.GroupBox1.Size = New System.Drawing.Size(200, 100)
Me.GroupBox1.TabIndex = 0
- Me.GroupBox1.TabStop = False
+ Me.GroupBox1.TabStop = false
'
'GroupBox2
'
@@ -1772,23 +1918,24 @@ Partial Class VectoJobForm
Me.GroupBox2.Name = "GroupBox2"
Me.GroupBox2.Size = New System.Drawing.Size(200, 100)
Me.GroupBox2.TabIndex = 0
- Me.GroupBox2.TabStop = False
+ Me.GroupBox2.TabStop = false
'
'TbUnderSpeed
'
Me.TbUnderSpeed.Location = New System.Drawing.Point(0, 0)
Me.TbUnderSpeed.Name = "TbUnderSpeed"
- Me.TbUnderSpeed.Size = New System.Drawing.Size(100, 20)
+ Me.TbUnderSpeed.Size = New System.Drawing.Size(100, 23)
Me.TbUnderSpeed.TabIndex = 0
'
'StatusStrip1
'
Me.StatusStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripStatusLabelGEN})
- Me.StatusStrip1.Location = New System.Drawing.Point(0, 609)
+ Me.StatusStrip1.Location = New System.Drawing.Point(0, 706)
Me.StatusStrip1.Name = "StatusStrip1"
- Me.StatusStrip1.Size = New System.Drawing.Size(944, 22)
- Me.StatusStrip1.SizingGrip = False
+ Me.StatusStrip1.Padding = New System.Windows.Forms.Padding(1, 0, 16, 0)
+ Me.StatusStrip1.Size = New System.Drawing.Size(1101, 22)
+ Me.StatusStrip1.SizingGrip = false
Me.StatusStrip1.TabIndex = 6
Me.StatusStrip1.Text = "StatusStrip1"
'
@@ -1800,24 +1947,26 @@ Partial Class VectoJobForm
'
'ButOK
'
- Me.ButOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.ButOK.Location = New System.Drawing.Point(776, 563)
+ Me.ButOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.ButOK.Location = New System.Drawing.Point(905, 650)
+ Me.ButOK.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.ButOK.Name = "ButOK"
- Me.ButOK.Size = New System.Drawing.Size(75, 23)
+ Me.ButOK.Size = New System.Drawing.Size(88, 27)
Me.ButOK.TabIndex = 1
Me.ButOK.Text = "Save"
- Me.ButOK.UseVisualStyleBackColor = True
+ Me.ButOK.UseVisualStyleBackColor = true
'
'ButCancel
'
- Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.ButCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
- Me.ButCancel.Location = New System.Drawing.Point(857, 563)
+ Me.ButCancel.Location = New System.Drawing.Point(1000, 650)
+ Me.ButCancel.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.ButCancel.Name = "ButCancel"
- Me.ButCancel.Size = New System.Drawing.Size(75, 23)
+ Me.ButCancel.Size = New System.Drawing.Size(88, 27)
Me.ButCancel.TabIndex = 2
Me.ButCancel.Text = "Cancel"
- Me.ButCancel.UseVisualStyleBackColor = True
+ Me.ButCancel.UseVisualStyleBackColor = true
'
'ToolStrip1
'
@@ -1827,7 +1976,7 @@ Partial Class VectoJobForm
Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
Me.ToolStrip1.Name = "ToolStrip1"
Me.ToolStrip1.Padding = New System.Windows.Forms.Padding(0, 0, 2, 0)
- Me.ToolStrip1.Size = New System.Drawing.Size(944, 31)
+ Me.ToolStrip1.Size = New System.Drawing.Size(1101, 31)
Me.ToolStrip1.TabIndex = 20
Me.ToolStrip1.Text = "ToolStrip1"
'
@@ -1902,22 +2051,23 @@ Partial Class VectoJobForm
'
'PictureBox1
'
- Me.PictureBox1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.PictureBox1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.PictureBox1.BackColor = System.Drawing.Color.White
Me.PictureBox1.Image = Global.TUGraz.VECTO.My.Resources.Resources.VECTO_Mainform
- Me.PictureBox1.Location = New System.Drawing.Point(0, 28)
+ Me.PictureBox1.Location = New System.Drawing.Point(0, 32)
+ Me.PictureBox1.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.PictureBox1.Name = "PictureBox1"
- Me.PictureBox1.Size = New System.Drawing.Size(944, 40)
+ Me.PictureBox1.Size = New System.Drawing.Size(1101, 46)
Me.PictureBox1.TabIndex = 21
- Me.PictureBox1.TabStop = False
+ Me.PictureBox1.TabStop = false
'
'CmOpenFile
'
Me.CmOpenFile.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
Me.CmOpenFile.Name = "CmOpenFile"
- Me.CmOpenFile.ShowImageMargin = False
+ Me.CmOpenFile.ShowImageMargin = false
Me.CmOpenFile.Size = New System.Drawing.Size(128, 48)
'
'OpenWithToolStripMenuItem
@@ -1937,87 +2087,97 @@ Partial Class VectoJobForm
Me.PicVehicle.BackColor = System.Drawing.Color.LightGray
Me.PicVehicle.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
Me.PicVehicle.InitialImage = Nothing
- Me.PicVehicle.Location = New System.Drawing.Point(4, 3)
+ Me.PicVehicle.Location = New System.Drawing.Point(5, 3)
+ Me.PicVehicle.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.PicVehicle.Name = "PicVehicle"
- Me.PicVehicle.Size = New System.Drawing.Size(300, 88)
+ Me.PicVehicle.Size = New System.Drawing.Size(350, 101)
Me.PicVehicle.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
Me.PicVehicle.TabIndex = 36
- Me.PicVehicle.TabStop = False
+ Me.PicVehicle.TabStop = false
'
'PicBox
'
Me.PicBox.BackColor = System.Drawing.Color.LightGray
Me.PicBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
- Me.PicBox.Location = New System.Drawing.Point(4, 144)
+ Me.PicBox.Location = New System.Drawing.Point(5, 166)
+ Me.PicBox.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.PicBox.Name = "PicBox"
- Me.PicBox.Size = New System.Drawing.Size(390, 296)
+ Me.PicBox.Size = New System.Drawing.Size(455, 341)
Me.PicBox.TabIndex = 36
- Me.PicBox.TabStop = False
+ Me.PicBox.TabStop = false
'
'TbEngTxt
'
- Me.TbEngTxt.Location = New System.Drawing.Point(4, 93)
+ Me.TbEngTxt.Location = New System.Drawing.Point(5, 107)
+ Me.TbEngTxt.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.TbEngTxt.Name = "TbEngTxt"
- Me.TbEngTxt.ReadOnly = True
- Me.TbEngTxt.Size = New System.Drawing.Size(390, 20)
+ Me.TbEngTxt.ReadOnly = true
+ Me.TbEngTxt.Size = New System.Drawing.Size(454, 23)
Me.TbEngTxt.TabIndex = 6
'
'TbVehCat
'
- Me.TbVehCat.Location = New System.Drawing.Point(307, 3)
+ Me.TbVehCat.Location = New System.Drawing.Point(358, 3)
+ Me.TbVehCat.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.TbVehCat.Name = "TbVehCat"
- Me.TbVehCat.ReadOnly = True
- Me.TbVehCat.Size = New System.Drawing.Size(87, 20)
+ Me.TbVehCat.ReadOnly = true
+ Me.TbVehCat.Size = New System.Drawing.Size(101, 23)
Me.TbVehCat.TabIndex = 2
'
'TbAxleConf
'
- Me.TbAxleConf.Location = New System.Drawing.Point(363, 29)
+ Me.TbAxleConf.Location = New System.Drawing.Point(424, 33)
+ Me.TbAxleConf.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.TbAxleConf.Name = "TbAxleConf"
- Me.TbAxleConf.ReadOnly = True
- Me.TbAxleConf.Size = New System.Drawing.Size(31, 20)
+ Me.TbAxleConf.ReadOnly = true
+ Me.TbAxleConf.Size = New System.Drawing.Size(35, 23)
Me.TbAxleConf.TabIndex = 4
Me.TbAxleConf.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
'
'TbHVCclass
'
- Me.TbHVCclass.Location = New System.Drawing.Point(307, 72)
+ Me.TbHVCclass.Location = New System.Drawing.Point(358, 83)
+ Me.TbHVCclass.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.TbHVCclass.Name = "TbHVCclass"
- Me.TbHVCclass.ReadOnly = True
- Me.TbHVCclass.Size = New System.Drawing.Size(87, 20)
+ Me.TbHVCclass.ReadOnly = true
+ Me.TbHVCclass.Size = New System.Drawing.Size(101, 23)
Me.TbHVCclass.TabIndex = 5
'
'TbGbxTxt
'
- Me.TbGbxTxt.Location = New System.Drawing.Point(4, 118)
+ Me.TbGbxTxt.Location = New System.Drawing.Point(5, 136)
+ Me.TbGbxTxt.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.TbGbxTxt.Name = "TbGbxTxt"
- Me.TbGbxTxt.ReadOnly = True
- Me.TbGbxTxt.Size = New System.Drawing.Size(390, 20)
+ Me.TbGbxTxt.ReadOnly = true
+ Me.TbGbxTxt.Size = New System.Drawing.Size(454, 23)
Me.TbGbxTxt.TabIndex = 7
'
'TbMass
'
- Me.TbMass.Location = New System.Drawing.Point(307, 29)
+ Me.TbMass.Location = New System.Drawing.Point(358, 33)
+ Me.TbMass.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.TbMass.Name = "TbMass"
- Me.TbMass.ReadOnly = True
- Me.TbMass.Size = New System.Drawing.Size(50, 20)
+ Me.TbMass.ReadOnly = true
+ Me.TbMass.Size = New System.Drawing.Size(58, 23)
Me.TbMass.TabIndex = 3
Me.TbMass.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
'
'lblEngineCharacteristics
'
- Me.lblEngineCharacteristics.AutoSize = True
- Me.lblEngineCharacteristics.Location = New System.Drawing.Point(7, 445)
+ Me.lblEngineCharacteristics.AutoSize = true
+ Me.lblEngineCharacteristics.Location = New System.Drawing.Point(8, 513)
+ Me.lblEngineCharacteristics.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblEngineCharacteristics.Name = "lblEngineCharacteristics"
- Me.lblEngineCharacteristics.Size = New System.Drawing.Size(0, 13)
+ Me.lblEngineCharacteristics.Size = New System.Drawing.Size(0, 15)
Me.lblEngineCharacteristics.TabIndex = 37
'
'lblTitle
'
- Me.lblTitle.AutoSize = True
+ Me.lblTitle.AutoSize = true
Me.lblTitle.BackColor = System.Drawing.Color.White
- Me.lblTitle.Font = New System.Drawing.Font("Microsoft Sans Serif", 18.0!)
- Me.lblTitle.Location = New System.Drawing.Point(114, 34)
+ 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(133, 39)
+ Me.lblTitle.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblTitle.Name = "lblTitle"
Me.lblTitle.Size = New System.Drawing.Size(320, 29)
Me.lblTitle.TabIndex = 38
@@ -2026,7 +2186,6 @@ Partial Class VectoJobForm
'pnJobInfo
'
Me.pnJobInfo.Controls.Add(Me.Label50)
- Me.pnJobInfo.Controls.Add(Me.DateTimePicker1)
Me.pnJobInfo.Controls.Add(Me.PicVehicle)
Me.pnJobInfo.Controls.Add(Me.TbVehCat)
Me.pnJobInfo.Controls.Add(Me.TbHVCclass)
@@ -2035,34 +2194,29 @@ Partial Class VectoJobForm
Me.pnJobInfo.Controls.Add(Me.PicBox)
Me.pnJobInfo.Controls.Add(Me.TbGbxTxt)
Me.pnJobInfo.Controls.Add(Me.TbEngTxt)
- Me.pnJobInfo.Location = New System.Drawing.Point(532, 78)
+ Me.pnJobInfo.Location = New System.Drawing.Point(621, 90)
+ Me.pnJobInfo.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.pnJobInfo.Name = "pnJobInfo"
- Me.pnJobInfo.Size = New System.Drawing.Size(397, 471)
+ Me.pnJobInfo.Size = New System.Drawing.Size(463, 543)
Me.pnJobInfo.TabIndex = 39
'
'Label50
'
- Me.Label50.AutoSize = True
- Me.Label50.Location = New System.Drawing.Point(304, 56)
+ Me.Label50.AutoSize = true
+ Me.Label50.Location = New System.Drawing.Point(355, 65)
+ Me.Label50.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label50.Name = "Label50"
- Me.Label50.Size = New System.Drawing.Size(62, 13)
+ Me.Label50.Size = New System.Drawing.Size(67, 15)
Me.Label50.TabIndex = 39
Me.Label50.Text = "HDV Group"
'
- 'DateTimePicker1
- '
- Me.DateTimePicker1.Location = New System.Drawing.Point(100, 69)
- Me.DateTimePicker1.Name = "DateTimePicker1"
- Me.DateTimePicker1.Size = New System.Drawing.Size(200, 20)
- Me.DateTimePicker1.TabIndex = 37
- '
'VectoJobForm
'
Me.AcceptButton = Me.ButOK
- Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(7!, 15!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.CancelButton = Me.ButCancel
- Me.ClientSize = New System.Drawing.Size(944, 631)
+ Me.ClientSize = New System.Drawing.Size(1101, 728)
Me.Controls.Add(Me.pnJobInfo)
Me.Controls.Add(Me.lblTitle)
Me.Controls.Add(Me.tcJob)
@@ -2073,72 +2227,73 @@ Partial Class VectoJobForm
Me.Controls.Add(Me.ButOK)
Me.Controls.Add(Me.StatusStrip1)
Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
- Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
- Me.MaximizeBox = False
+ Me.Icon = CType(resources.GetObject("$this.Icon"),System.Drawing.Icon)
+ Me.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.MaximizeBox = false
Me.Name = "VectoJobForm"
Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
Me.Text = "Job Editor"
- Me.TabPgGen.ResumeLayout(False)
- Me.pnHybridStrategy.ResumeLayout(False)
- Me.pnHybridStrategy.PerformLayout()
- Me.pnVehicle.ResumeLayout(False)
- Me.pnVehicle.PerformLayout()
- Me.pnEngine.ResumeLayout(False)
- Me.pnEngine.PerformLayout()
- Me.pnGearbox.ResumeLayout(False)
- Me.pnGearbox.PerformLayout()
- Me.pnShiftParams.ResumeLayout(False)
- Me.pnShiftParams.PerformLayout()
- Me.GrCycles.ResumeLayout(False)
- Me.GrCycles.PerformLayout()
- Me.GrAuxMech.ResumeLayout(False)
- Me.pnAuxDeclarationMode.ResumeLayout(False)
- Me.pnAuxDeclarationMode.PerformLayout()
- Me.pnAuxEngineering.ResumeLayout(False)
- Me.pnAuxEngineering.PerformLayout()
- CType(Me.picAuxInfo, System.ComponentModel.ISupportInitialize).EndInit()
- Me.tcJob.ResumeLayout(False)
- Me.tpAuxiliaries.ResumeLayout(False)
- Me.gbBusAux.ResumeLayout(False)
- Me.gbBusAux.PerformLayout()
- Me.pnBusAux.ResumeLayout(False)
- Me.pnBusAux.PerformLayout()
- Me.gbElectricAux.ResumeLayout(False)
- Me.gbElectricAux.PerformLayout()
- Me.tpCycles.ResumeLayout(False)
- Me.TabPgDriver.ResumeLayout(False)
- Me.GrVACC.ResumeLayout(False)
- Me.GrVACC.PerformLayout()
- Me.GrLAC.ResumeLayout(False)
- Me.GrLAC.PerformLayout()
- Me.pnLookAheadCoasting.ResumeLayout(False)
- Me.pnLookAheadCoasting.PerformLayout()
- CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).EndInit()
- Me.gbOverspeed.ResumeLayout(False)
- Me.gbOverspeed.PerformLayout()
- Me.PnEcoRoll.ResumeLayout(False)
- Me.PnEcoRoll.PerformLayout()
- Me.TabPgADAS.ResumeLayout(False)
- Me.gbPCC.ResumeLayout(False)
- Me.gbPCC.PerformLayout()
- Me.gbEcoRoll.ResumeLayout(False)
- Me.gbEcoRoll.PerformLayout()
- Me.gbEngineStopStart.ResumeLayout(False)
- Me.gbEngineStopStart.PerformLayout()
- Me.StatusStrip1.ResumeLayout(False)
- Me.StatusStrip1.PerformLayout()
- Me.ToolStrip1.ResumeLayout(False)
- Me.ToolStrip1.PerformLayout()
- CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
- Me.CmOpenFile.ResumeLayout(False)
- CType(Me.PicVehicle, System.ComponentModel.ISupportInitialize).EndInit()
- CType(Me.PicBox, System.ComponentModel.ISupportInitialize).EndInit()
- Me.pnJobInfo.ResumeLayout(False)
- Me.pnJobInfo.PerformLayout()
- Me.ResumeLayout(False)
- Me.PerformLayout()
+ Me.TabPgGen.ResumeLayout(false)
+ Me.pnHybridStrategy.ResumeLayout(false)
+ Me.pnHybridStrategy.PerformLayout
+ Me.pnVehicle.ResumeLayout(false)
+ Me.pnVehicle.PerformLayout
+ Me.pnEngine.ResumeLayout(false)
+ Me.pnEngine.PerformLayout
+ Me.pnGearbox.ResumeLayout(false)
+ Me.pnGearbox.PerformLayout
+ Me.pnShiftParams.ResumeLayout(false)
+ Me.pnShiftParams.PerformLayout
+ Me.GrCycles.ResumeLayout(false)
+ Me.GrCycles.PerformLayout
+ Me.GrAuxMech.ResumeLayout(false)
+ Me.pnAuxDeclarationMode.ResumeLayout(false)
+ Me.pnAuxDeclarationMode.PerformLayout
+ Me.pnAuxEngineering.ResumeLayout(false)
+ Me.pnAuxEngineering.PerformLayout
+ CType(Me.picAuxInfo,System.ComponentModel.ISupportInitialize).EndInit
+ Me.tcJob.ResumeLayout(false)
+ Me.tpAuxiliaries.ResumeLayout(false)
+ Me.gbBusAux.ResumeLayout(false)
+ Me.gbBusAux.PerformLayout
+ Me.pnBusAux.ResumeLayout(false)
+ Me.pnBusAux.PerformLayout
+ Me.gbElectricAux.ResumeLayout(false)
+ Me.gbElectricAux.PerformLayout
+ Me.tpCycles.ResumeLayout(false)
+ Me.TabPgDriver.ResumeLayout(false)
+ Me.GrVACC.ResumeLayout(false)
+ Me.GrVACC.PerformLayout
+ Me.GrLAC.ResumeLayout(false)
+ Me.GrLAC.PerformLayout
+ Me.pnLookAheadCoasting.ResumeLayout(false)
+ Me.pnLookAheadCoasting.PerformLayout
+ CType(Me.PictureBox2,System.ComponentModel.ISupportInitialize).EndInit
+ Me.gbOverspeed.ResumeLayout(false)
+ Me.gbOverspeed.PerformLayout
+ Me.PnEcoRoll.ResumeLayout(false)
+ Me.PnEcoRoll.PerformLayout
+ Me.TabPgADAS.ResumeLayout(false)
+ Me.gbPCC.ResumeLayout(false)
+ Me.gbPCC.PerformLayout
+ Me.gbEcoRoll.ResumeLayout(false)
+ Me.gbEcoRoll.PerformLayout
+ Me.gbEngineStopStart.ResumeLayout(false)
+ Me.gbEngineStopStart.PerformLayout
+ Me.StatusStrip1.ResumeLayout(false)
+ Me.StatusStrip1.PerformLayout
+ Me.ToolStrip1.ResumeLayout(false)
+ Me.ToolStrip1.PerformLayout
+ CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).EndInit
+ Me.CmOpenFile.ResumeLayout(false)
+ CType(Me.PicVehicle,System.ComponentModel.ISupportInitialize).EndInit
+ CType(Me.PicBox,System.ComponentModel.ISupportInitialize).EndInit
+ Me.pnJobInfo.ResumeLayout(false)
+ Me.pnJobInfo.PerformLayout
+ Me.ResumeLayout(false)
+ Me.PerformLayout
- End Sub
+End Sub
Friend WithEvents TabPgGen As TabPage
Friend WithEvents tcJob As TabControl
@@ -2329,6 +2484,5 @@ Partial Class VectoJobForm
Friend WithEvents Label47 As Label
Friend WithEvents Label49 As Label
Friend WithEvents PictureBox2 As PictureBox
- Friend WithEvents DateTimePicker1 As DateTimePicker
Friend WithEvents Label50 As Label
End Class
diff --git a/VECTO/GUI/VectoJobForm.resx b/VECTO/GUI/VectoJobForm.resx
index ab5039f4688f77c51b17c24a8a8d5e5c98394a29..f12d8dae59b3e0e8c97de8ad92ede838cd9fa863 100644
--- a/VECTO/GUI/VectoJobForm.resx
+++ b/VECTO/GUI/VectoJobForm.resx
@@ -1,64 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
diff --git a/VECTO/GUI/VectoJobForm.vb b/VECTO/GUI/VectoJobForm.vb
index ef55202ec7c99dca21574a0fd82014457d97f3dc..33f371ecaa654e62ced1fe651adf07b343aa1cca 100644
--- a/VECTO/GUI/VectoJobForm.vb
+++ b/VECTO/GUI/VectoJobForm.vb
@@ -21,6 +21,7 @@ Imports TUGraz.VectoCommon.Models
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.InputData.FileIO.JSON
Imports TUGraz.VectoCore.InputData.Reader.ComponentData
+Imports TUGraz.VectoCore.InputData.Reader.DataObjectAdapter.SimulationComponents
Imports TUGraz.VectoCore.Models.Declaration
Imports TUGraz.VectoCore.Models.Declaration.Auxiliaries
Imports TUGraz.VectoCore.Models.Simulation.Impl
@@ -84,7 +85,7 @@ Public Class VectoJobForm
PnEcoRoll.Enabled = Not Cfg.DeclMode
gbEcoRoll.Enabled = not Cfg.DeclMode
- gbEngineStopStart.Visible = Not Cfg.DeclMode
+ gbEngineStopStart.Enabled = Not Cfg.DeclMode
gbPCC.Enabled = Not Cfg.DeclMode
_changed = False
@@ -119,7 +120,7 @@ Public Class VectoJobForm
Case VectoSimulationJobType.IEPC_E
lblTitle.Text = prefix + "IEPC-E Vehicle"
gbElectricAux.Enabled = True
- GrAuxMech.Enabled = False
+ GrAuxMech.Enabled = Cfg.DeclMode
case VectoSimulationJobType.IEPC_S
lblTitle.Text = prefix + "IEPC-S Vehicle"
gbElectricAux.Enabled = True
@@ -157,27 +158,52 @@ Public Class VectoJobForm
' cDeclaration.Underspeed
TbVmin.Text = DeclarationData.Driver.OverSpeed.MinSpeed.AsKmph.ToGUIFormat() 'cDeclaration.ECvmin
TbAuxPAuxICEOn.Text = ""
- If _
- LvAux.Items.Count <> 5 OrElse
- (LvAux.Items(0).Text <> VectoCore.Configuration.Constants.Auxiliaries.IDs.Fan OrElse
- LvAux.Items(1).Text <> VectoCore.Configuration.Constants.Auxiliaries.IDs.SteeringPump OrElse
- LvAux.Items(2).Text <> VectoCore.Configuration.Constants.Auxiliaries.IDs.HeatingVentilationAirCondition OrElse
- LvAux.Items(3).Text <> VectoCore.Configuration.Constants.Auxiliaries.IDs.ElectricSystem OrElse
- LvAux.Items(4).Text <> VectoCore.Configuration.Constants.Auxiliaries.IDs.PneumaticSystem) Then
- LvAux.Items.Clear()
+ Dim auxList As List(Of AuxiliaryType)
+ Select case JobType
+ Case VectoSimulationJobType.ConventionalVehicle, VectoSimulationJobType.ParallelHybridVehicle, VectoSimulationJobType.IHPC, VectoSimulationJobType.SerialHybridVehicle, VectoSimulationJobType.IEPC_S
+ auxList = New HeavyLorryAuxiliaryDataAdapter().AuxiliaryTypes.OrderBy(Function(x) x).ToList()
+ Case VectoSimulationJobType.BatteryElectricVehicle, VectoSimulationJobType.IEPC_E
+ auxList = new HeavyLorryPEVAuxiliaryDataAdapter().AuxiliaryTypes.OrderBy(Function(x) x).ToList()
+ End Select
+
+ Dim auxTechs = New Dictionary(Of AuxiliaryType, IDeclarationAuxiliaryTable) from {
+ {AuxiliaryType.Fan, DeclarationData.Fan},
+ {AuxiliaryType.SteeringPump, DeclarationData.SteeringPump},
+ {AuxiliaryType.HVAC, DeclarationData.HeatingVentilationAirConditioning},
+ {AuxiliaryType.ElectricSystem, DeclarationData.ElectricSystem},
+ {AuxiliaryType.PneumaticSystem, DeclarationData.PneumaticSystem}
+ }
- LvAux.Items.Add(GetTechListForAux(AuxiliaryType.Fan, DeclarationData.Fan))
+ Dim toRemove As List(Of ListViewItem) = new List(Of ListViewItem)
+
+ For Each item As ListViewItem In LvAux.Items
+ If not auxTechs.Keys.Select(Function(x) x.Key()).Contains(item.Text) then
+ toRemove.Add(item)
+ End If
+ Next
+ For Each item As ListViewItem In toRemove
+ item.Remove()
+ Next
- LvAux.Items.Add(GetTechListForAux(AuxiliaryType.SteeringPump, DeclarationData.SteeringPump))
+ For Each entry As AuxiliaryType In auxList
+ dim found = false
+ For Each item As ListViewItem In LvAux.Items
+ If item.Text.Equals(entry.Key(), StringComparison.CurrentCultureIgnoreCase) Then
+ found = true
+ exit For
+ End If
+ Next
+ if found Then continue for
- LvAux.Items.Add(GetTechListForAux(AuxiliaryType.HVAC, DeclarationData.HeatingVentilationAirConditioning))
+ LvAux.Items.Add(GetTechListForAux(entry, auxTechs(entry)))
- LvAux.Items.Add(GetTechListForAux(AuxiliaryType.ElectricSystem, DeclarationData.ElectricSystem))
+ Next
- LvAux.Items.Add(GetTechListForAux(AuxiliaryType.PneumaticSystem, DeclarationData.PneumaticSystem))
+ 'For Each auxiliaryType As AuxiliaryType In auxList
+ ' LvAux.Items.Add(GetTechListForAux(auxiliaryType, auxTechs(auxiliaryType)))
+ 'Next
- End If
End Sub
Protected Function GetTechListForAux(type As AuxiliaryType, aux As IDeclarationAuxiliaryTable) _
@@ -490,12 +516,13 @@ Public Class VectoJobForm
Else
TbGBX.Text = ""
End If
- If (inputData.DriverInputData.GearshiftInputData Is Nothing) Then
+ If (cfg.DeclMode OrElse inputData.DriverInputData.GearshiftInputData Is Nothing) Then
TbShiftStrategyParams.Text = ""
Else
TbShiftStrategyParams.Text = GetRelativePath(inputData.DriverInputData.GearshiftInputData.Source, _basePath)
End If
- If (JobType = VectoSimulationJobType.ParallelHybridVehicle OrElse JobType = VectoSimulationJobType.SerialHybridVehicle OrElse JobType = VectoSimulationJobType.IEPC_S OrElse JobType = VectoSimulationJobType.IHPC) Then
+ If (not Cfg.DeclMode AndAlso ( JobType = VectoSimulationJobType.ParallelHybridVehicle OrElse JobType = VectoSimulationJobType.SerialHybridVehicle _
+ OrElse JobType = VectoSimulationJobType.IEPC_S OrElse JobType = VectoSimulationJobType.IHPC)) Then
tbHybridStrategyParams.Text = GetRelativePath(inputData.JobInputData.HybridStrategyParameters.Source, _basePath)
End If
@@ -902,6 +929,9 @@ Public Class VectoJobForm
End If
+ _auxDialog.JobType = JobType
+ ' clear and set selected item to force re-init of tech dropdown (apply filter for electric-only aux)
+ _auxDialog.CbType.SelectedIndex = -1
_auxDialog.CbType.SelectedValue = selItem.SubItems(AuxViewColumns.AuxID).Text ' last call, updates GUI
If selItem.SubItems(AuxViewColumns.AuxID).Text = AuxiliaryTypeHelper.GetAuxKey(AuxiliaryType.SteeringPump) Then
@@ -1029,15 +1059,14 @@ Public Class VectoJobForm
pnVehicle.Enabled = True
pnGearbox.Enabled = True
- pnShiftParams.Enabled = True
+ pnShiftParams.Enabled = not Cfg.DeclMode
TabPgADAS.Enabled = True
tpAuxiliaries.Enabled = True
gbElectricAux.Enabled = True
GrAuxMech.Enabled = True
pnEngine.Enabled = True
- pnShiftParams.Enabled = True
- pnHybridStrategy.Enabled = False
- gbEngineStopStart.Visible = True
+ pnHybridStrategy.Enabled = not Cfg.DeclMode
+ gbEngineStopStart.Enabled = not Cfg.DeclMode
lblESSUtilityFactorDriving.Visible = True
tbESSUtilityFactorDriving.Visible = True
lblESSUtilityFactorDrivingUnit.Visible = True
@@ -1051,7 +1080,7 @@ Public Class VectoJobForm
TabPgADAS.Enabled = False
tpAuxiliaries.Enabled = False
pnShiftParams.Enabled = False
- gbEngineStopStart.Visible = False
+ gbEngineStopStart.Enabled = False
Case VectoSimulationJobType.ParallelHybridVehicle
pnHybridStrategy.Enabled = Not Cfg.DeclMode
lblESSUtilityFactorDriving.Visible = False
@@ -1059,33 +1088,33 @@ Public Class VectoJobForm
lblESSUtilityFactorDrivingUnit.Visible = False
Case VectoSimulationJobType.SerialHybridVehicle
pnHybridStrategy.Enabled = Not Cfg.DeclMode
- gbEngineStopStart.Visible = False
+ gbEngineStopStart.Enabled = False
Case VectoSimulationJobType.BatteryElectricVehicle
pnEngine.Enabled = False
pnGearbox.Enabled = True
GrAuxMech.Enabled = False
- pnShiftParams.Enabled = True
- gbEngineStopStart.Visible = False
+ pnShiftParams.Enabled = not Cfg.DeclMode
+ gbEngineStopStart.Enabled = False
Case VectoSimulationJobType.IHPC
pnEngine.Enabled = True
pnGearbox.Enabled = True
GrAuxMech.Enabled = True
- pnShiftParams.Enabled = True
- gbEngineStopStart.Visible = False
- pnHybridStrategy.Enabled = true
+ pnShiftParams.Enabled = not Cfg.DeclMode
+ gbEngineStopStart.Enabled = False
+ pnHybridStrategy.Enabled = not cfg.DeclMode
Case VectoSimulationJobType.IEPC_E
pnEngine.Enabled = False
pnGearbox.Enabled = True
- GrAuxMech.Enabled = False
- pnShiftParams.Enabled = True
- gbEngineStopStart.Visible = False
+ GrAuxMech.Enabled = Cfg.DeclMode
+ pnShiftParams.Enabled = not Cfg.DeclMode
+ gbEngineStopStart.Enabled = False
Case VectoSimulationJobType.IEPC_S
pnEngine.Enabled = True
pnGearbox.Enabled = True
GrAuxMech.Enabled = False
- pnShiftParams.Enabled = True
- gbEngineStopStart.Visible = False
- pnHybridStrategy.Enabled = true
+ pnShiftParams.Enabled = not Cfg.DeclMode
+ gbEngineStopStart.Enabled = False
+ pnHybridStrategy.Enabled = not Cfg.DeclMode
End Select
End Sub
@@ -1745,6 +1774,10 @@ Public Class VectoJobForm
Private Sub Label5_Click(sender As Object, e As EventArgs) Handles Label5.Click
End Sub
+
+ Private Sub LvAux_SelectedIndexChanged(sender As Object, e As EventArgs) Handles LvAux.SelectedIndexChanged
+
+ End Sub
End Class
diff --git a/VECTO/GUI/VehicleAuxiliariesDialog.vb b/VECTO/GUI/VehicleAuxiliariesDialog.vb
index fc86575b501eb45eb621eb6948002b6c7ba4782f..6c2cfd5dbe631999a05560bd0d8fe3ab654d28b2 100644
--- a/VECTO/GUI/VehicleAuxiliariesDialog.vb
+++ b/VECTO/GUI/VehicleAuxiliariesDialog.vb
@@ -12,7 +12,9 @@ Option Infer On
Imports System.Linq
Imports System.Windows.Forms
+Imports TUGraz.VectoCommon.InputData
Imports TUGraz.VectoCommon.Models
+Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.Models.Declaration
Imports TUGraz.VectoCore.Models.Declaration.Auxiliaries
@@ -23,7 +25,8 @@ Imports TUGraz.VectoCore.Models.Declaration.Auxiliaries
Public Class VehicleAuxiliariesDialog
Public VehPath As String = ""
Public NumAxles As Integer
- Public Const AxleNotSteered As String = "Not steered"
+ Public JobType As VectoSimulationJobType
+ Public Const AxleNotSteered As String = "Not steered"
Public Sub New()
InitializeComponent()
@@ -69,14 +72,15 @@ Public Class VehicleAuxiliariesDialog
If CbType.SelectedItem Is Nothing Then Exit Sub
+ dim batteryElectricAuxOnly = JobType.IsOneOf(VectoSimulationJobType.BatteryElectricVehicle, VectoSimulationJobType.IEPC_E)
Select Case CbType.SelectedValue.ToString()
Case VectoCore.Configuration.Constants.Auxiliaries.IDs.Fan
CbTech.DataSource =
- DeclarationData.Fan.GetTechnologies().Select(Function(x) New With {.Caption = x, .Value = x}).ToArray()
+ if(batteryElectricAuxOnly, DeclarationData.Fan.FullyElectricTechnologies(), DeclarationData.Fan.GetTechnologies()).Select(Function(x) New With {.Caption = x, .Value = x}).ToArray()
Case VectoCore.Configuration.Constants.Auxiliaries.IDs.SteeringPump
- Dim notSteered = (New String() {AxleNotSteered}).Concat(DeclarationData.SteeringPump.GetTechnologies()).ToArray()
+ Dim notSteered = (New String() {AxleNotSteered}).Concat(If(batteryElectricAuxOnly,DeclarationData.SteeringPump.FullyElectricTechnologies() ,DeclarationData.SteeringPump.GetTechnologies())).ToArray()
CbTech.DataSource =
- DeclarationData.SteeringPump.GetTechnologies().Select(Function(x) New With {.Caption = x, .Value = x}).ToArray()
+ If(batteryElectricAuxOnly,DeclarationData.SteeringPump.FullyElectricTechnologies() ,DeclarationData.SteeringPump.GetTechnologies()).Select(Function(x) New With {.Caption = x, .Value = x}).ToArray()
CbTech2.DataSource = notSteered.Select(Function(x) New With {.Caption = x, .Value = x}).ToArray()
CbTech3.DataSource = notSteered.Select(Function(x) New With {.Caption = x, .Value = x}).ToArray()
@@ -90,7 +94,7 @@ Public Class VehicleAuxiliariesDialog
DeclarationData.ElectricSystem.GetTechnologies().Select(Function(x) New With {.Caption = x, .Value = x}).ToArray()
Case VectoCore.Configuration.Constants.Auxiliaries.IDs.PneumaticSystem
CbTech.DataSource =
- DeclarationData.PneumaticSystem.GetTechnologies().Select(Function(x) New With {.Caption = x, .Value = x}).ToArray()
+ if(batteryElectricAuxOnly, DeclarationData.PneumaticSystem.FullyElectricTechnologies(), DeclarationData.PneumaticSystem.GetTechnologies()).Select(Function(x) New With {.Caption = x, .Value = x}).ToArray()
End Select
If CbTech.Items.Count > 0 Then
'CbTech.SelectedIndex = 0
diff --git a/VECTO/GUI/VehicleForm.Designer.vb b/VECTO/GUI/VehicleForm.Designer.vb
index 1f544cf63cba3b0caffdc96664ac4540422e95ae..e3f04ff17d04b8f950262188d2099c6063f7f435 100644
--- a/VECTO/GUI/VehicleForm.Designer.vb
+++ b/VECTO/GUI/VehicleForm.Designer.vb
@@ -173,6 +173,10 @@ Partial Class VehicleForm
Me.btIHPCFile = New System.Windows.Forms.Button()
Me.tpReess = New System.Windows.Forms.TabPage()
Me.gbBattery = New System.Windows.Forms.GroupBox()
+ Me.pnInitialSoC = New System.Windows.Forms.Panel()
+ Me.tbInitialSoC = New System.Windows.Forms.TextBox()
+ Me.lblInitialSoC = New System.Windows.Forms.Label()
+ Me.lblInitialSoCUnit = New System.Windows.Forms.Label()
Me.lvREESSPacks = New System.Windows.Forms.ListView()
Me.chReessPackPack = New System.Windows.Forms.ColumnHeader()
Me.chReessPackCount = New System.Windows.Forms.ColumnHeader()
@@ -180,9 +184,6 @@ Partial Class VehicleForm
Me.btnAddReessPack = New System.Windows.Forms.Button()
Me.lblEditReessPack = New System.Windows.Forms.Label()
Me.btnRemoveReessPack = New System.Windows.Forms.Button()
- Me.lblInitialSoCUnit = New System.Windows.Forms.Label()
- Me.tbInitialSoC = New System.Windows.Forms.TextBox()
- Me.lblInitialSoC = New System.Windows.Forms.Label()
Me.tpGensetComponents = New System.Windows.Forms.TabPage()
Me.Label30 = New System.Windows.Forms.Label()
Me.gbGenSet = New System.Windows.Forms.GroupBox()
@@ -250,6 +251,13 @@ Partial Class VehicleForm
Me.cbLegislativeClass = New System.Windows.Forms.ComboBox()
Me.Label21 = New System.Windows.Forms.Label()
Me.lblTitle = New System.Windows.Forms.Label()
+ Me.pnOvcHEV = New System.Windows.Forms.Panel()
+ Me.lblOvcChg = New System.Windows.Forms.Label()
+ Me.pnMaxChargingPwr = New System.Windows.Forms.Panel()
+ Me.tbMaxChargingPwr = New System.Windows.Forms.TextBox()
+ Me.lblMaxChargingPwr = New System.Windows.Forms.Label()
+ Me.lblMaxChargingPwrUnit = New System.Windows.Forms.Label()
+ Me.cbOvc = New System.Windows.Forms.CheckBox()
Me.GroupBox6.SuspendLayout
Me.ToolStrip1.SuspendLayout
Me.gbRetarderLosses.SuspendLayout
@@ -283,6 +291,7 @@ Partial Class VehicleForm
Me.FlowLayoutPanel2.SuspendLayout
Me.tpReess.SuspendLayout
Me.gbBattery.SuspendLayout
+ Me.pnInitialSoC.SuspendLayout
Me.tpGensetComponents.SuspendLayout
Me.gbGenSet.SuspendLayout
Me.pnGenSetEM.SuspendLayout
@@ -306,6 +315,8 @@ Partial Class VehicleForm
Me.gbPTOLossmap.SuspendLayout
Me.gbEPTO.SuspendLayout
Me.GroupBox5.SuspendLayout
+ Me.pnOvcHEV.SuspendLayout
+ Me.pnMaxChargingPwr.SuspendLayout
Me.SuspendLayout
'
'Label1
@@ -1766,22 +1777,61 @@ Partial Class VehicleForm
'
'gbBattery
'
+ Me.gbBattery.Controls.Add(Me.pnMaxChargingPwr)
+ Me.gbBattery.Controls.Add(Me.pnOvcHEV)
+ Me.gbBattery.Controls.Add(Me.pnInitialSoC)
Me.gbBattery.Controls.Add(Me.lvREESSPacks)
Me.gbBattery.Controls.Add(Me.btnAddReessPack)
Me.gbBattery.Controls.Add(Me.lblEditReessPack)
Me.gbBattery.Controls.Add(Me.btnRemoveReessPack)
- Me.gbBattery.Controls.Add(Me.lblInitialSoCUnit)
- Me.gbBattery.Controls.Add(Me.tbInitialSoC)
- Me.gbBattery.Controls.Add(Me.lblInitialSoC)
Me.gbBattery.Location = New System.Drawing.Point(7, 7)
Me.gbBattery.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.gbBattery.Name = "gbBattery"
Me.gbBattery.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
- Me.gbBattery.Size = New System.Drawing.Size(738, 216)
+ Me.gbBattery.Size = New System.Drawing.Size(738, 296)
Me.gbBattery.TabIndex = 3
Me.gbBattery.TabStop = false
Me.gbBattery.Text = "Electric Energy Storage system"
'
+ 'pnInitialSoC
+ '
+ Me.pnInitialSoC.Controls.Add(Me.tbInitialSoC)
+ Me.pnInitialSoC.Controls.Add(Me.lblInitialSoC)
+ Me.pnInitialSoC.Controls.Add(Me.lblInitialSoCUnit)
+ Me.pnInitialSoC.Location = New System.Drawing.Point(7, 22)
+ Me.pnInitialSoC.Name = "pnInitialSoC"
+ Me.pnInitialSoC.Size = New System.Drawing.Size(351, 28)
+ Me.pnInitialSoC.TabIndex = 4
+ '
+ 'tbInitialSoC
+ '
+ Me.tbInitialSoC.Location = New System.Drawing.Point(233, 3)
+ Me.tbInitialSoC.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.tbInitialSoC.Name = "tbInitialSoC"
+ Me.tbInitialSoC.Size = New System.Drawing.Size(68, 23)
+ Me.tbInitialSoC.TabIndex = 0
+ '
+ 'lblInitialSoC
+ '
+ Me.lblInitialSoC.AutoSize = true
+ Me.lblInitialSoC.Location = New System.Drawing.Point(3, 6)
+ Me.lblInitialSoC.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblInitialSoC.Name = "lblInitialSoC"
+ Me.lblInitialSoC.RightToLeft = System.Windows.Forms.RightToLeft.Yes
+ Me.lblInitialSoC.Size = New System.Drawing.Size(60, 15)
+ Me.lblInitialSoC.TabIndex = 25
+ Me.lblInitialSoC.Text = "Initial SoC"
+ '
+ 'lblInitialSoCUnit
+ '
+ Me.lblInitialSoCUnit.AutoSize = true
+ Me.lblInitialSoCUnit.Location = New System.Drawing.Point(304, 5)
+ Me.lblInitialSoCUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblInitialSoCUnit.Name = "lblInitialSoCUnit"
+ Me.lblInitialSoCUnit.Size = New System.Drawing.Size(25, 15)
+ Me.lblInitialSoCUnit.TabIndex = 27
+ Me.lblInitialSoCUnit.Text = "[%]"
+ '
'lvREESSPacks
'
Me.lvREESSPacks.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
@@ -1789,7 +1839,7 @@ Partial Class VehicleForm
Me.lvREESSPacks.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.chReessPackPack, Me.chReessPackCount, Me.chReessPackStringId})
Me.lvREESSPacks.FullRowSelect = true
Me.lvREESSPacks.GridLines = true
- Me.lvREESSPacks.Location = New System.Drawing.Point(7, 52)
+ Me.lvREESSPacks.Location = New System.Drawing.Point(7, 89)
Me.lvREESSPacks.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.lvREESSPacks.MultiSelect = false
Me.lvREESSPacks.Name = "lvREESSPacks"
@@ -1817,7 +1867,7 @@ Partial Class VehicleForm
'btnAddReessPack
'
Me.btnAddReessPack.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
- Me.btnAddReessPack.Location = New System.Drawing.Point(7, 177)
+ Me.btnAddReessPack.Location = New System.Drawing.Point(7, 214)
Me.btnAddReessPack.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btnAddReessPack.Name = "btnAddReessPack"
Me.btnAddReessPack.Size = New System.Drawing.Size(28, 28)
@@ -1827,7 +1877,7 @@ Partial Class VehicleForm
'lblEditReessPack
'
Me.lblEditReessPack.AutoSize = true
- Me.lblEditReessPack.Location = New System.Drawing.Point(527, 171)
+ Me.lblEditReessPack.Location = New System.Drawing.Point(527, 208)
Me.lblEditReessPack.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblEditReessPack.Name = "lblEditReessPack"
Me.lblEditReessPack.Size = New System.Drawing.Size(121, 15)
@@ -1837,42 +1887,13 @@ Partial Class VehicleForm
'btnRemoveReessPack
'
Me.btnRemoveReessPack.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
- Me.btnRemoveReessPack.Location = New System.Drawing.Point(38, 177)
+ Me.btnRemoveReessPack.Location = New System.Drawing.Point(38, 214)
Me.btnRemoveReessPack.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btnRemoveReessPack.Name = "btnRemoveReessPack"
Me.btnRemoveReessPack.Size = New System.Drawing.Size(28, 28)
Me.btnRemoveReessPack.TabIndex = 2
Me.btnRemoveReessPack.UseVisualStyleBackColor = true
'
- 'lblInitialSoCUnit
- '
- Me.lblInitialSoCUnit.AutoSize = true
- Me.lblInitialSoCUnit.Location = New System.Drawing.Point(309, 24)
- Me.lblInitialSoCUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
- Me.lblInitialSoCUnit.Name = "lblInitialSoCUnit"
- Me.lblInitialSoCUnit.Size = New System.Drawing.Size(25, 15)
- Me.lblInitialSoCUnit.TabIndex = 27
- Me.lblInitialSoCUnit.Text = "[%]"
- '
- 'tbInitialSoC
- '
- Me.tbInitialSoC.Location = New System.Drawing.Point(238, 22)
- Me.tbInitialSoC.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
- Me.tbInitialSoC.Name = "tbInitialSoC"
- Me.tbInitialSoC.Size = New System.Drawing.Size(68, 23)
- Me.tbInitialSoC.TabIndex = 0
- '
- 'lblInitialSoC
- '
- Me.lblInitialSoC.AutoSize = true
- Me.lblInitialSoC.Location = New System.Drawing.Point(8, 25)
- Me.lblInitialSoC.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
- Me.lblInitialSoC.Name = "lblInitialSoC"
- Me.lblInitialSoC.RightToLeft = System.Windows.Forms.RightToLeft.Yes
- Me.lblInitialSoC.Size = New System.Drawing.Size(60, 15)
- Me.lblInitialSoC.TabIndex = 25
- Me.lblInitialSoC.Text = "Initial SoC"
- '
'tpGensetComponents
'
Me.tpGensetComponents.Controls.Add(Me.Label30)
@@ -2641,6 +2662,74 @@ Partial Class VehicleForm
Me.lblTitle.TabIndex = 43
Me.lblTitle.Text = "Vehicle TITLE"
'
+ 'pnOvcHEV
+ '
+ Me.pnOvcHEV.Controls.Add(Me.cbOvc)
+ Me.pnOvcHEV.Controls.Add(Me.lblOvcChg)
+ Me.pnOvcHEV.Location = New System.Drawing.Point(7, 54)
+ Me.pnOvcHEV.Name = "pnOvcHEV"
+ Me.pnOvcHEV.Size = New System.Drawing.Size(351, 28)
+ Me.pnOvcHEV.TabIndex = 28
+ '
+ 'lblOvcChg
+ '
+ Me.lblOvcChg.AutoSize = true
+ Me.lblOvcChg.Location = New System.Drawing.Point(3, 6)
+ Me.lblOvcChg.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblOvcChg.Name = "lblOvcChg"
+ Me.lblOvcChg.RightToLeft = System.Windows.Forms.RightToLeft.Yes
+ Me.lblOvcChg.Size = New System.Drawing.Size(118, 15)
+ Me.lblOvcChg.TabIndex = 25
+ Me.lblOvcChg.Text = "Off-Vehicle Charging"
+ '
+ 'pnMaxChargingPwr
+ '
+ Me.pnMaxChargingPwr.Controls.Add(Me.tbMaxChargingPwr)
+ Me.pnMaxChargingPwr.Controls.Add(Me.lblMaxChargingPwr)
+ Me.pnMaxChargingPwr.Controls.Add(Me.lblMaxChargingPwrUnit)
+ Me.pnMaxChargingPwr.Location = New System.Drawing.Point(364, 54)
+ Me.pnMaxChargingPwr.Name = "pnMaxChargingPwr"
+ Me.pnMaxChargingPwr.Size = New System.Drawing.Size(288, 28)
+ Me.pnMaxChargingPwr.TabIndex = 29
+ '
+ 'tbMaxChargingPwr
+ '
+ Me.tbMaxChargingPwr.Location = New System.Drawing.Point(176, 3)
+ Me.tbMaxChargingPwr.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.tbMaxChargingPwr.Name = "tbMaxChargingPwr"
+ Me.tbMaxChargingPwr.Size = New System.Drawing.Size(68, 23)
+ Me.tbMaxChargingPwr.TabIndex = 0
+ '
+ 'lblMaxChargingPwr
+ '
+ Me.lblMaxChargingPwr.AutoSize = true
+ Me.lblMaxChargingPwr.Location = New System.Drawing.Point(3, 6)
+ Me.lblMaxChargingPwr.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblMaxChargingPwr.Name = "lblMaxChargingPwr"
+ Me.lblMaxChargingPwr.RightToLeft = System.Windows.Forms.RightToLeft.Yes
+ Me.lblMaxChargingPwr.Size = New System.Drawing.Size(121, 15)
+ Me.lblMaxChargingPwr.TabIndex = 25
+ Me.lblMaxChargingPwr.Text = "Max. Charging Power"
+ '
+ 'lblMaxChargingPwrUnit
+ '
+ Me.lblMaxChargingPwrUnit.AutoSize = true
+ Me.lblMaxChargingPwrUnit.Location = New System.Drawing.Point(252, 6)
+ Me.lblMaxChargingPwrUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblMaxChargingPwrUnit.Name = "lblMaxChargingPwrUnit"
+ Me.lblMaxChargingPwrUnit.Size = New System.Drawing.Size(32, 15)
+ Me.lblMaxChargingPwrUnit.TabIndex = 27
+ Me.lblMaxChargingPwrUnit.Text = "[kW]"
+ '
+ 'cbOvc
+ '
+ Me.cbOvc.AutoSize = true
+ Me.cbOvc.Location = New System.Drawing.Point(286, 7)
+ Me.cbOvc.Name = "cbOvc"
+ Me.cbOvc.Size = New System.Drawing.Size(15, 14)
+ Me.cbOvc.TabIndex = 26
+ Me.cbOvc.UseVisualStyleBackColor = true
+ '
'VehicleForm
'
Me.AcceptButton = Me.ButOK
@@ -2723,6 +2812,8 @@ Partial Class VehicleForm
Me.tpReess.ResumeLayout(false)
Me.gbBattery.ResumeLayout(false)
Me.gbBattery.PerformLayout
+ Me.pnInitialSoC.ResumeLayout(false)
+ Me.pnInitialSoC.PerformLayout
Me.tpGensetComponents.ResumeLayout(false)
Me.tpGensetComponents.PerformLayout
Me.gbGenSet.ResumeLayout(false)
@@ -2760,6 +2851,10 @@ Partial Class VehicleForm
Me.gbEPTO.ResumeLayout(false)
Me.GroupBox5.ResumeLayout(false)
Me.GroupBox5.PerformLayout
+ Me.pnOvcHEV.ResumeLayout(false)
+ Me.pnOvcHEV.PerformLayout
+ Me.pnMaxChargingPwr.ResumeLayout(false)
+ Me.pnMaxChargingPwr.PerformLayout
Me.ResumeLayout(false)
Me.PerformLayout
@@ -2996,5 +3091,13 @@ End Sub
Friend WithEvents gbPTOICEGroupBox As GroupBox
Friend WithEvents cbPTOStandstillCycleType As ComboBox
Friend WithEvents FlowLayoutPanel4 As FlowLayoutPanel
+ Friend WithEvents pnInitialSoC As Panel
+ Friend WithEvents pnMaxChargingPwr As Panel
+ Friend WithEvents tbMaxChargingPwr As TextBox
+ Friend WithEvents lblMaxChargingPwr As Label
+ Friend WithEvents lblMaxChargingPwrUnit As Label
+ Friend WithEvents pnOvcHEV As Panel
+ Friend WithEvents cbOvc As CheckBox
+ Friend WithEvents lblOvcChg As Label
'>>>>>>> VECTO_CERT/master
End Class
diff --git a/VECTO/GUI/VehicleForm.vb b/VECTO/GUI/VehicleForm.vb
index 2e3c9356fbf6a4b1784e2f6f7433a066431ee16b..c9c639088196dbc8452968256118e7928bb90fb1 100644
--- a/VECTO/GUI/VehicleForm.vb
+++ b/VECTO/GUI/VehicleForm.vb
@@ -148,7 +148,8 @@ Public Class VehicleForm
'VehicleType
End If
-
+ pnInitialSoC.Enabled = not cfg.DeclMode
+
cbLegislativeClass.DataSource = EnumHelper.GetKeyValuePairs(Of LegislativeClass)(Function(t) t.GetLabel())
@@ -215,6 +216,9 @@ Public Class VehicleForm
Dim axleCount As Integer = s0.Missions(0).AxleWeightDistribution.Count()
Dim i0 As Integer = LvRRC.Items.Count
+ TbHDVclass.Text = _hdVclass.GetClassNumber()
+ PicVehicle.Image = ConvPicPath(_hdVclass, False)
+
Dim i As Integer
If axleCount > i0 Then
For i = 1 To axleCount - LvRRC.Items.Count
@@ -496,28 +500,49 @@ Public Class VehicleForm
If (vehicle.VehicleType <> VectoSimulationJobType.ConventionalVehicle AndAlso vehicle.VehicleType <> VectoSimulationJobType.EngineOnlySimulation) Then
lvREESSPacks.Items.Clear()
For Each entry As IElectricStorageEngineeringInputData In vehicle.Components.ElectricStorage.ElectricStorageElements.OrderBy(Function(x) x.StringId)
- lvREESSPacks.Items.Add(CreateREESSPackListViewItem(GetRelativePath(entry.REESSPack.DataSource.SourceFile, basePath), entry.Count, entry.StringId))
+ lvREESSPacks.Items.Add(CreateREESSPackListViewItem(entry.REESSPack.DataSource.SourceFile, entry.Count, entry.StringId))
Next
- tbInitialSoC.Text = (vehicle.InitialSOC * 100).ToGUIFormat()
+ if (cfg.DeclMode) Then
+ tbInitialSoC.Text = string.Empty
+ pnOvcHEV.Enabled = True
+ if vehicle.VehicleType.IsOneOf(VectoSimulationJobType.BatteryElectricVehicle, VectoSimulationJobType.IEPC_E) Then
+ pnOvcHEV.Enabled = False
+ cbOvc.Checked = false
+ pnMaxChargingPwr.Enabled = False
+ tbMaxChargingPwr.Text = string.Empty
+ Else
+ cbOvc.Checked = vehicle.OvcHev
+ pnMaxChargingPwr.Enabled = vehicle.OvcHev
+ If vehicle.OvcHev Then
+ tbMaxChargingPwr.Text = vehicle.MaxChargingPower.ConvertToKiloWatt().Value.ToGUIFormat()
+ End If
+ End If
+ Else
+ tbInitialSoC.Text = (vehicle.InitialSOC * 100).ToGUIFormat()
+ pnOvcHEV.Enabled =false
+ pnMaxChargingPwr.Enabled = false
+ tbMaxChargingPwr.Text = string.Empty
+ cbOvc.Checked = false
+ End If
if (vehicle.VehicleType = VectoSimulationJobType.ParallelHybridVehicle OrElse vehicle.VehicleType = VectoSimulationJobType.BatteryElectricVehicle OrElse vehicle.VehicleType = VectoSimulationJobType.SerialHybridVehicle) then
- Dim em As ElectricMachineEntry(Of IElectricMotorEngineeringInputData) = vehicle.Components.ElectricMachines.Entries.First(Function(x) x.Position <> PowertrainPosition.GEN)
- tbElectricMotor.Text = GetRelativePath(em.ElectricMachine.DataSource.SourceFile, basePath)
- tbEmCount.Text = em.Count.ToGUIFormat()
- tbEmADCLossMap.Text = If(em.MechanicalTransmissionLossMap Is Nothing, em.MechanicalTransmissionEfficiency.ToGUIFormat(),
- GetRelativePath(em.MechanicalTransmissionLossMap.Source, basePath))
- tbRatioEm.Text = em.RatioADC.ToGUIFormat()
-
- cbEmPos.SelectedValue = em.Position
-
- If (em.Position = PowertrainPosition.HybridP2_5) AndAlso Not em.RatioPerGear Is Nothing Then
- lvRatioPerGear.Items.Clear()
- Dim gear As Integer = 1
- For Each entry As Double In em.RatioPerGear
- lvRatioPerGear.Items.Add(CreateRatioPerGearListViewItem(gear, entry))
- gear += 1
- Next
- End If
+ Dim em As ElectricMachineEntry(Of IElectricMotorEngineeringInputData) = vehicle.Components.ElectricMachines.Entries.First(Function(x) x.Position <> PowertrainPosition.GEN)
+ tbElectricMotor.Text = GetRelativePath(em.ElectricMachine.DataSource.SourceFile, basePath)
+ tbEmCount.Text = em.Count.ToGUIFormat()
+ tbEmADCLossMap.Text = If(em.MechanicalTransmissionLossMap Is Nothing, em.MechanicalTransmissionEfficiency.ToGUIFormat(),
+ GetRelativePath(em.MechanicalTransmissionLossMap.Source, basePath))
+ tbRatioEm.Text = em.RatioADC.ToGUIFormat()
+
+ cbEmPos.SelectedValue = em.Position
+
+ If (em.Position = PowertrainPosition.HybridP2_5) AndAlso Not em.RatioPerGear Is Nothing Then
+ lvRatioPerGear.Items.Clear()
+ Dim gear As Integer = 1
+ For Each entry As Double In em.RatioPerGear
+ lvRatioPerGear.Items.Add(CreateRatioPerGearListViewItem(gear, entry))
+ gear += 1
+ Next
+ End If
end If
if vehicle.VehicleType = VectoSimulationJobType.IEPC_E OrElse vehicle.VehicleType = VectoSimulationJobType.IEPC_S Then
Dim iepc = vehicle.Components.IEPCEngineeringInputData
@@ -879,7 +904,7 @@ Public Class VehicleForm
tcVehicleComponents.SelectedTab = tpGeneral
Return False
End If
- If (relCheck < 1) Or (relCheck > 1) Then
+ If not cfg.DeclMode andalso ((relCheck < 1) Or (relCheck > 1)) Then
MsgBox("Relative Weight distribution on axle does not sum to 1")
tcVehicleComponents.SelectedTab = tpGeneral
Return False
@@ -912,13 +937,13 @@ Public Class VehicleForm
veh.VehicleTankSystem = CType(If(cbTankSystem.SelectedIndex > 0, cbTankSystem.SelectedValue, Nothing), TankSystem?)
End If
-
- If(cbPTOStandstillCycleType.SelectedValue.ToString() = PTOStandStillType.Mechanical.ToString())
- veh.PtoCycleStandstill.Init(GetPath(file), tbPTOCycle.Text)
- Else
- veh.EPtoCycleStandstill.Init(GetPath(file), tbPTOElectricCycle.Text)
- End If
-
+ if (not cfg.DeclMode) then
+ If(cbPTOStandstillCycleType.SelectedValue.ToString() = PTOStandStillType.Mechanical.ToString())
+ veh.PtoCycleStandstill.Init(GetPath(file), tbPTOCycle.Text)
+ Else
+ veh.EPtoCycleStandstill.Init(GetPath(file), tbPTOElectricCycle.Text)
+ End If
+ end if
if (VehicleType = VectoSimulationJobType.BatteryElectricVehicle) Then
veh.PtoType = CType(cbPTOType.SelectedValue, String)
@@ -931,8 +956,8 @@ Public Class VehicleForm
veh.ReessPacks.Add(Tuple.Create(reess.SubItems(REESPackTbl.ReessFile).Text, reess.SubItems(REESPackTbl.Count).Text.ToInt(), reess.SubItems(REESPackTbl.StringId).Text.ToInt()))
Next
veh.InitialSOC = tbInitialSoC.Text.ToDouble(80) / 100.0
-
-
+ veh.OvcHev = cbOvc.Checked
+ veh.MaxChargingPower = tbMaxChargingPwr.Text.ToDouble(0).SI(unit.SI.Kilo.Watt).Cast(of Watt)
If (VehicleType = VectoSimulationJobType.ParallelHybridVehicle OrElse
VehicleType = VectoSimulationJobType.BatteryElectricVehicle OrElse
@@ -1818,4 +1843,8 @@ Public Class VehicleForm
gbPTOICEGroupBox.Enabled = (val = PTOStandStillType.Mechanical)
gbEPTO.Enabled = (val = PTOStandStillType.Electrical)
End Sub
+
+ Private Sub cbOvc_CheckedChanged(sender As Object, e As EventArgs) Handles cbOvc.CheckedChanged
+ pnMaxChargingPwr.Enabled = cbOvc.Checked
+ End Sub
End Class
\ No newline at end of file
diff --git a/VECTO/Input Files/Battery.vb b/VECTO/Input Files/Battery.vb
index f145e65e0e12d0ac890f2a69b9a613b0169ce62d..b3decfc43005fe43764f36c5fa4c42a288fabe1f 100644
--- a/VECTO/Input Files/Battery.vb
+++ b/VECTO/Input Files/Battery.vb
@@ -231,9 +231,9 @@ Public Class Battery
End Get
End Property
- Public ReadOnly Property ConnectorsSubsystemsIncluded As Boolean Implements IBatteryPackDeclarationInputData.ConnectorsSubsystemsIncluded
- Public ReadOnly Property JunctionboxIncluded As Boolean Implements IBatteryPackDeclarationInputData.JunctionboxIncluded
- Public ReadOnly Property TestingTemperature As Kelvin Implements IBatteryPackDeclarationInputData.TestingTemperature
+ Public Property ConnectorsSubsystemsIncluded As Boolean Implements IBatteryPackDeclarationInputData.ConnectorsSubsystemsIncluded
+ Public Property JunctionboxIncluded As Boolean Implements IBatteryPackDeclarationInputData.JunctionboxIncluded
+ Public Property TestingTemperature As Kelvin Implements IBatteryPackDeclarationInputData.TestingTemperature
Public ReadOnly Property InternalResistanceCurve As TableData Implements IBatteryPackDeclarationInputData.InternalResistanceCurve
Get
diff --git a/VECTO/Input Files/ElectricMachine.vb b/VECTO/Input Files/ElectricMachine.vb
index 14bf115c329bb1356f8793dc277fd458ab91bb43..74bb0eaf258ea8fc131e3469329273d372004954 100644
--- a/VECTO/Input Files/ElectricMachine.vb
+++ b/VECTO/Input Files/ElectricMachine.vb
@@ -273,8 +273,8 @@ Public Class ElectricMachine
End Get
End Property
- Public ReadOnly Property ElectricMachineType As ElectricMachineType Implements IElectricMotorDeclarationInputData.ElectricMachineType
- Public ReadOnly Property R85RatedPower As Watt Implements IElectricMotorDeclarationInputData.R85RatedPower
+ Public Property ElectricMachineType As ElectricMachineType Implements IElectricMotorDeclarationInputData.ElectricMachineType
+ Public Property R85RatedPower As Watt Implements IElectricMotorDeclarationInputData.R85RatedPower
Public ReadOnly Property Inertia As KilogramSquareMeter Implements IElectricMotorDeclarationInputData.Inertia
Get
diff --git a/VECTO/Input Files/IEPCInputData.vb b/VECTO/Input Files/IEPCInputData.vb
index f135608ae98f1fbae5d1f149be32e5799baca9e1..2d78c5e3b859f25dd29026f3e08f6490bfdabf0c 100644
--- a/VECTO/Input Files/IEPCInputData.vb
+++ b/VECTO/Input Files/IEPCInputData.vb
@@ -49,7 +49,7 @@ Public Class IEPCInputData
_wheelMotorMeasured = designTypeWheelMotorMeasured
_nrDesignTypeWheelMotor = nrOfDesignTypeWheelMotorMeasured.ToInt(Nothing)
_differentialIncluded = differentialIncluded
- _overloadRecoverFactor = thermalOverloadRecoverFactor.ToDouble()
+ _overloadRecoverFactor = thermalOverloadRecoverFactor.ToDouble(0)
End Sub
@@ -189,17 +189,10 @@ Public Class IEPCInputData
End Get
End Property
- Public ReadOnly Property ElectricMachineType As ElectricMachineType Implements IIEPCDeclarationInputData.ElectricMachineType
- Get
- Return Nothing
- End Get
- End Property
+ Public Property ElectricMachineType As ElectricMachineType Implements IIEPCDeclarationInputData.ElectricMachineType
- Public ReadOnly Property R85RatedPower As Watt Implements IIEPCDeclarationInputData.R85RatedPower
- Get
- Return Nothing
- End Get
- End Property
+ Public Property R85RatedPower As Watt Implements IIEPCDeclarationInputData.R85RatedPower
+
Public ReadOnly Property Inertia As KilogramSquareMeter Implements IIEPCDeclarationInputData.Inertia
Get
diff --git a/VECTO/Input Files/IHPCInputData.vb b/VECTO/Input Files/IHPCInputData.vb
index 69f24a0f6175b4c3854aaecff61c52406f5adbb2..308a942db24890f88c63ae2ee377de53f6da9dad 100644
--- a/VECTO/Input Files/IHPCInputData.vb
+++ b/VECTO/Input Files/IHPCInputData.vb
@@ -158,11 +158,7 @@ Public Class IHPCInputData
End Get
End Property
- Public ReadOnly Property R85RatedPower As Watt Implements IElectricMotorDeclarationInputData.R85RatedPower
- Get
- Return Nothing
- End Get
- End Property
+ Public Property R85RatedPower As Watt Implements IElectricMotorDeclarationInputData.R85RatedPower
Public ReadOnly Property Inertia As KilogramSquareMeter Implements IElectricMotorDeclarationInputData.Inertia
Get
diff --git a/VECTO/Input Files/SuperCap.vb b/VECTO/Input Files/SuperCap.vb
index fde413439982e0da8b7c7607b7f30780decfbc58..7084d1d79fc4a014a1ee74715c8f3a9825b99578 100644
--- a/VECTO/Input Files/SuperCap.vb
+++ b/VECTO/Input Files/SuperCap.vb
@@ -122,7 +122,7 @@ Public Class SuperCap
End Get
End Property
- Public ReadOnly Property TestingTemperature As Kelvin Implements ISuperCapDeclarationInputData.TestingTemperature
+ Public Property TestingTemperature As Kelvin Implements ISuperCapDeclarationInputData.TestingTemperature
Public Property FilePath() As String
Get
diff --git a/VECTO/Input Files/VectoJob.vb b/VECTO/Input Files/VectoJob.vb
index c153748e960c72c8191702c389a501fce00528d3..4e76eaa5643a210a5a559f5726de38a49b7b0232 100644
--- a/VECTO/Input Files/VectoJob.vb
+++ b/VECTO/Input Files/VectoJob.vb
@@ -551,10 +551,11 @@ Public Class VectoJob
If Not vehicleInputData.SavedInDeclarationMode Then
result.Add(New ValidationResult("Vehicle File is not in Declaration Mode"))
End If
- If Not engineInputData.SavedInDeclarationMode Then
+ If Not (vectoJob.JobType = VectoSimulationJobType.BatteryElectricVehicle OrElse vectoJob.JobType = VectoSimulationJobType.IEPC_E) AndAlso Not engineInputData.SavedInDeclarationMode Then
result.Add(New ValidationResult("Engine File is not in Declaration Mode"))
End If
- If Not gearboxInputData.SavedInDeclarationMode Then
+ If Not vectoJob.JobType = VectoSimulationJobType.BatteryElectricVehicle _
+ AndAlso gearboxInputData IsNot Nothing AndAlso Not gearboxInputData.SavedInDeclarationMode Then
result.Add(New ValidationResult("Gearbox File is not in Declaration Mode"))
End If
If result.Any() Then
diff --git a/VECTO/Input Files/Vehicle.vb b/VECTO/Input Files/Vehicle.vb
index 71a6b8bafefbafe857628b624a6d35b499980427..869df8dbe284f10e4cf6e5e0c90c2de56b5e66e8 100644
--- a/VECTO/Input Files/Vehicle.vb
+++ b/VECTO/Input Files/Vehicle.vb
@@ -947,8 +947,8 @@ end Property
Public ReadOnly Property XMLSource As XmlNode Implements IAdvancedDriverAssistantSystemDeclarationInputData.XMLSource
Public ReadOnly Property VehicleTypeApprovalNumber As String Implements IVehicleDeclarationInputData.VehicleTypeApprovalNumber
Public ReadOnly Property ArchitectureID As ArchitectureID Implements IVehicleDeclarationInputData.ArchitectureID
- Public ReadOnly Property OvcHev As Boolean Implements IVehicleDeclarationInputData.OvcHev
- Public ReadOnly Property MaxChargingPower As Watt Implements IVehicleDeclarationInputData.MaxChargingPower
+ Public Property OvcHev As Boolean Implements IVehicleDeclarationInputData.OvcHev
+ Public Property MaxChargingPower As Watt Implements IVehicleDeclarationInputData.MaxChargingPower
Public ReadOnly Property IVehicleDeclarationInputData_VehicleType As VectoSimulationJobType Implements IVehicleDeclarationInputData.VehicleType
Public ReadOnly Property IAdvancedDriverAssistantSystemsEngineering_DataSource As DataSource Implements IAdvancedDriverAssistantSystemsEngineering.DataSource
diff --git a/VECTO/MainModule.vb b/VECTO/MainModule.vb
index d95fd515ff23d7e369782c910e8e5d8739377223..08f7e5345aece10723bb9d8570b0a2f2fd8555c9 100644
--- a/VECTO/MainModule.vb
+++ b/VECTO/MainModule.vb
@@ -137,15 +137,16 @@ Module MainModule
End Function
Public Function GetRelativePath(filePath As String, basePath As String) As String
- If (String.IsNullOrEmpty(filePath)) then
- Return ""
- End If
- If (string.isnullOrempty(basePath)) Then
- Return filePath
- End If
- If (Path.GetDirectoryName(Path.GetFullPath(filePath)).StartsWith(basePath, StringComparison.OrdinalIgnoreCase)) Then
- Return Path.GetFullPath(filePath).Substring(basePath.Length + If(basePath.EndsWith("\"), 0, 1))
- End If
- Return filePath
+ Return JSONFileWriter.GetRelativePath(filePath, basePath)
+ 'If (String.IsNullOrEmpty(filePath)) then
+ ' Return ""
+ 'End If
+ ' If (string.isnullOrempty(basePath)) Then
+ ' Return filePath
+ ' End If
+ 'If (Path.GetDirectoryName(Path.GetFullPath(filePath)).StartsWith(basePath, StringComparison.OrdinalIgnoreCase)) Then
+ ' Return Path.GetFullPath(filePath).Substring(basePath.Length + If(basePath.EndsWith("\"), 0, 1))
+ 'End If
+ 'Return filePath
End Function
End Module
diff --git a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
index 9041915e16d55ef2788ae855c8d1b5f79d578a58..48c907878c1909efe191ab68408a956b4f742340 100644
--- a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
@@ -1242,6 +1242,14 @@ namespace TUGraz.VectoCommon.InputData
RM
}
+ public static class ElectricMachineTypeHelper
+ {
+ public static string GetLabel(this ElectricMachineType type)
+ {
+ return type.ToString();
+ }
+ }
+
public enum BatteryType
{
HPBS,
diff --git a/VectoCommon/VectoCommon/Utils/DoubleExtensionMethods.cs b/VectoCommon/VectoCommon/Utils/DoubleExtensionMethods.cs
index 9c1e08b9ca2e514378e6049e2bac91c79df26a44..f01c1192cd965d30855845029dc87268c14b5891 100644
--- a/VectoCommon/VectoCommon/Utils/DoubleExtensionMethods.cs
+++ b/VectoCommon/VectoCommon/Utils/DoubleExtensionMethods.cs
@@ -203,6 +203,11 @@ namespace TUGraz.VectoCommon.Utils
return SI<Kelvin>(self + 273.16);
}
+ public static Kelvin DegCelsiusToKelvin(this int self)
+ {
+ return SI<Kelvin>(self + 273.16);
+ }
+
/// <summary>
/// Converts the double-value from RPM (rounds per minute) to the SI Unit PerSecond.
/// </summary>
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONBattery.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONBattery.cs
index 7fa174a6300370c58107d40c1b742872d88a5042..fb0b35237ac147a93e896324d7469df3a123610f 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONBattery.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONBattery.cs
@@ -32,9 +32,12 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
public BatteryType BatteryType { get; }
AmpereSecond IBatteryPackDeclarationInputData.Capacity => Body.GetEx<double>("Capacity").SI(Unit.SI.Ampere.Hour).Cast<AmpereSecond>();
- public bool ConnectorsSubsystemsIncluded { get; }
- public bool JunctionboxIncluded { get; }
- public Kelvin TestingTemperature => null;
+ public bool ConnectorsSubsystemsIncluded => Body.ContainsKey("ConnectorsSubsystemsIncluded") && Body.GetEx<bool>("ConnectorsSubsystemsIncluded");
+ public bool JunctionboxIncluded => Body.ContainsKey("JunctionboxIncluded") && Body.GetEx<bool>("JunctionboxIncluded");
+
+ public Kelvin TestingTemperature => Body.ContainsKey("TestingTemperature")
+ ? Body.GetEx<double>("TestingTemperature").DegCelsiusToKelvin()
+ : 20.DegCelsiusToKelvin();
Farad ISuperCapDeclarationInputData.Capacity => Body.GetEx<double>("Capacity").SI<Farad>();
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONElectricMotor.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONElectricMotor.cs
index d31536374c86c532f179ab069970064f7c6f4620..8b7bca92608930057345eca936436396d7574ccc 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONElectricMotor.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONElectricMotor.cs
@@ -219,8 +219,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
ReadTableData(Body.GetEx<string>("Conditioning"), "ElectricMotor Conditioning", false);
- public ElectricMachineType ElectricMachineType { get; }
- public Watt R85RatedPower => !SavedInDeclarationMode ? null : Body.GetEx<double>("R85RatedPower").SI<Watt>();
+ public ElectricMachineType ElectricMachineType => Body.ContainsKey(JsonKeys.EM_ElectricMachineType)
+ ? Body.GetEx<string>(JsonKeys.EM_ElectricMachineType).ParseEnum<ElectricMachineType>()
+ : ElectricMachineType.PSM;
+
+ public Watt R85RatedPower => Body.ContainsKey(JsonKeys.EM_RatedPower) ? Body.GetEx<double>(JsonKeys.EM_RatedPower).SI(Unit.SI.Kilo.Watt).Cast<Watt>() : 0.SI<Watt>();
public virtual KilogramSquareMeter Inertia => Body.GetEx<double>("Inertia").SI<KilogramSquareMeter>();
//public virtual Joule OverloadBuffer => Body.GetValueOrDefault<double>("ThermalOverloadBuffer")?.SI(Unit.SI.Mega.Joule).Cast<Joule>() ?? 1e18.SI<Joule>();
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONIEPCData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONIEPCData.cs
index 8dfbb6da4f22e3b4a006f1472d3b6252450aa2c2..e9efb2011ee464b3ffee079d9aa579a0dd92d650 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONIEPCData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONIEPCData.cs
@@ -42,8 +42,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
#region Implementation of IIEPCDeclarationInputData
- public ElectricMachineType ElectricMachineType { get; }
- public Watt R85RatedPower => null;
+ public ElectricMachineType ElectricMachineType => Body.ContainsKey(JsonKeys.EM_ElectricMachineType)
+ ? Body.GetEx<string>(JsonKeys.EM_ElectricMachineType).ParseEnum<ElectricMachineType>()
+ : ElectricMachineType.PSM;
+
+ public Watt R85RatedPower => Body.ContainsKey(JsonKeys.EM_RatedPower) ? Body.GetEx<double>(JsonKeys.EM_RatedPower).SI(Unit.SI.Kilo.Watt).Cast<Watt>() : 0.SI<Watt>();
public KilogramSquareMeter Inertia => Body.GetEx<double>(JsonKeys.IEPC_Inertia).SI<KilogramSquareMeter>();
public bool DifferentialIncluded => Body.GetEx<bool>(JsonKeys.IEPC_DifferentialIncluded);
public bool DesignTypeWheelMotor => Body.GetEx<bool>(JsonKeys.IEPC_DesignTypeWheelMotor);
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
index 3b5edb6105833629d51da880c46dec8ef598bec0..81b0596532da6a4f2f31b8c0f181689467a9f776 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
@@ -235,7 +235,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
public virtual IPrimaryVehicleInformationInputDataProvider PrimaryVehicleData => null;
- public XElement XMLHash => new XElement(XMLNames.DI_Signature);
+ public XElement XMLHash => XMLHelper.CreateDummySig("http://www.w3.org/2000/09/xmldsig#"); //new XElement(XMLNames.DI_Signature);
IDeclarationJobInputData IDeclarationInputDataProvider.JobInputData => this;
@@ -415,6 +415,13 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
public virtual IOverSpeedEngineeringInputData OverSpeedData
{
get {
+ if (!Body.ContainsKey(JsonKeys.DriverData_OverspeedEcoRoll)) {
+ return new OverSpeedInputData() {
+ Enabled = true,
+ MinSpeed = DeclarationData.Driver.OverSpeed.MinSpeed,
+ OverSpeed = DeclarationData.Driver.OverSpeed.AllowedOverSpeed
+ };
+ }
var overspeed = Body.GetEx(JsonKeys.DriverData_OverspeedEcoRoll);
return new OverSpeedInputData() {
Enabled = DriverData.ParseDriverMode(
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
index d8d4376f24ad9b1e207827f6680be2c3931da8ce..3573f8d5bc7236f57e035720c70e2c5fe964f64f 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
@@ -65,6 +65,14 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
public override ArchitectureID ArchitectureID { get => VehicleType.GetArchitectureID(PowertrainPosition.IEPC); }
+ #region Overrides of JSONVehicleDataV7
+
+ //public override bool OvcHev => true;
+
+ //public override Watt MaxChargingPower => 0.SI<Watt>();
+
+ #endregion
+
#endregion
}
@@ -81,6 +89,12 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
public override double InitialSOC => Body.GetEx<double>("InitialSoC") / 100.0;
+ public override bool OvcHev =>
+ VehicleType.IsOneOf(VectoSimulationJobType.BatteryElectricVehicle, VectoSimulationJobType.IEPC_E) ||
+ Body.ContainsKey("OvcHev") && Body.GetEx<bool>("OvcHev");
+
+ public override Watt MaxChargingPower => OvcHev && Body.ContainsKey("MaxChargingPower") ? Body.GetEx<double>("MaxChargingPower").SI(Unit.SI.Kilo.Watt).Cast<Watt>() : 0.SI<Watt>();
+
protected override IRetarderInputData GetRetarder => _retarderInputData ?? (_retarderInputData = new JSONRetarderInputData(this));
protected override IElectricMachinesEngineeringInputData GetElectricMachines()
@@ -356,8 +370,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
XmlNode IVehicleDeclarationInputData.XMLSource => null;
public virtual string VehicleTypeApprovalNumber { get; }
public virtual ArchitectureID ArchitectureID { get; }
- public bool OvcHev { get; }
- public Watt MaxChargingPower { get; }
+ public virtual bool OvcHev { get; }
+ public virtual Watt MaxChargingPower { get; }
public GearshiftPosition PTO_DriveGear => Body["GearDuringPTODrive"] != null ? new GearshiftPosition(Body["GearDuringPTODrive"].Value<uint>()) : null;
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/SimulationComponents/AuxiliaryDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/SimulationComponents/AuxiliaryDataAdapter.cs
index f360449d8bd1d153dac06708f58c2ca812e43dbf..e35b7b26c42015625b2d4dd89224145fe28affa3 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/SimulationComponents/AuxiliaryDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/SimulationComponents/AuxiliaryDataAdapter.cs
@@ -102,7 +102,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter.SimulationComponen
public class HeavyLorryPEVAuxiliaryDataAdapter : HeavyLorryAuxiliaryDataAdapter
{
- protected override HashSet<AuxiliaryType> AuxiliaryTypes { get; } = new HashSet<AuxiliaryType>() {
+ protected internal override HashSet<AuxiliaryType> AuxiliaryTypes { get; } = new HashSet<AuxiliaryType>() {
AuxiliaryType.ElectricSystem,
AuxiliaryType.HVAC,
AuxiliaryType.PneumaticSystem,
@@ -114,7 +114,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter.SimulationComponen
public class HeavyLorryAuxiliaryDataAdapter : AuxiliaryDataAdapter
{
- protected virtual HashSet<AuxiliaryType> AuxiliaryTypes { get; } = new HashSet<AuxiliaryType>() {
+ protected internal virtual HashSet<AuxiliaryType> AuxiliaryTypes { get; } = new HashSet<AuxiliaryType>() {
AuxiliaryType.ElectricSystem,
AuxiliaryType.HVAC,
AuxiliaryType.PneumaticSystem,
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationMode/HeavyLorryRunDataFactory/DeclarationModeHeavyLorryRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationMode/HeavyLorryRunDataFactory/DeclarationModeHeavyLorryRunDataFactory.cs
index 4c88c81d3fb638faa72298c8a372c5c8b8db5758..6bfafce382c1f7ffffcd68b9fb0c888b637275ec 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationMode/HeavyLorryRunDataFactory/DeclarationModeHeavyLorryRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationMode/HeavyLorryRunDataFactory/DeclarationModeHeavyLorryRunDataFactory.cs
@@ -131,6 +131,11 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl.DeclarationMode.HeavyLorryRunDa
{
return;
}
+ if (!vehicle.LegislativeClass.IsOneOf(LegislativeClass.M3,
+ LegislativeClass.N2, LegislativeClass.N3)) {
+ throw new VectoException("Unsupported Legislative class '{0}'",
+ InputDataProvider.JobInputData.Vehicle.LegislativeClass.ToString());
+ }
_segment = GetSegment(vehicle);
_driverdata = DataAdapter.CreateDriverData(_segment);
@@ -484,6 +489,11 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl.DeclarationMode.HeavyLorryRunDa
protected override void Initialize()
{
+ if (!InputDataProvider.JobInputData.Vehicle.LegislativeClass.IsOneOf(LegislativeClass.M3,
+ LegislativeClass.N2, LegislativeClass.N3)) {
+ throw new VectoException("Unsupported Legislative class '{0}'",
+ InputDataProvider.JobInputData.Vehicle.LegislativeClass.ToString());
+ }
_segment = GetSegment(InputDataProvider.JobInputData.Vehicle, true);
}
diff --git a/VectoCore/VectoCore/JsonKeys.Designer.cs b/VectoCore/VectoCore/JsonKeys.Designer.cs
index a070a10d4834686e8c7461bd4022c939d77d8d11..0eb9315a56a400a2d4bddd28a290e47709576ce3 100644
--- a/VectoCore/VectoCore/JsonKeys.Designer.cs
+++ b/VectoCore/VectoCore/JsonKeys.Designer.cs
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
// <auto-generated>
-// Dieser Code wurde von einem Tool generiert.
-// Laufzeitversion:4.0.30319.42000
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.42000
//
-// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-// der Code erneut generiert wird.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
@@ -13,12 +13,12 @@ namespace TUGraz.VectoCore {
/// <summary>
- /// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
+ /// A strongly-typed resource class, for looking up localized strings, etc.
/// </summary>
- // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
- // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
- // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
- // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
+ // This class was auto-generated by the StronglyTypedResourceBuilder
+ // class via a tool like ResGen or Visual Studio.
+ // To add or remove a member, edit your .ResX file then rerun ResGen
+ // with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
@@ -33,7 +33,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
+ /// Returns the cached ResourceManager instance used by this class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager {
@@ -47,8 +47,8 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
- /// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
+ /// Overrides the current thread's CurrentUICulture property for all
+ /// resource lookups using this strongly typed resource class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
@@ -61,7 +61,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die AppVersion ähnelt.
+ /// Looks up a localized string similar to AppVersion.
/// </summary>
internal static string AppVersion {
get {
@@ -70,7 +70,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die RunSimulation ähnelt.
+ /// Looks up a localized string similar to RunSimulation.
/// </summary>
internal static string BUS_RunSimulation {
get {
@@ -79,7 +79,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die Completed ähnelt.
+ /// Looks up a localized string similar to Completed.
/// </summary>
internal static string Completed {
get {
@@ -88,7 +88,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die Model ähnelt.
+ /// Looks up a localized string similar to Model.
/// </summary>
internal static string Component_Model {
get {
@@ -97,7 +97,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die VACC ähnelt.
+ /// Looks up a localized string similar to VACC.
/// </summary>
internal static string DriverData_AccelerationCurve {
get {
@@ -106,7 +106,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die Dec ähnelt.
+ /// Looks up a localized string similar to Dec.
/// </summary>
internal static string DriverData_Lookahead_Deceleration {
get {
@@ -115,7 +115,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die Enabled ähnelt.
+ /// Looks up a localized string similar to Enabled.
/// </summary>
internal static string DriverData_Lookahead_Enabled {
get {
@@ -124,7 +124,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die MinSpeed ähnelt.
+ /// Looks up a localized string similar to MinSpeed.
/// </summary>
internal static string DriverData_Lookahead_MinSpeed {
get {
@@ -133,7 +133,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die LAC ähnelt.
+ /// Looks up a localized string similar to LAC.
/// </summary>
internal static string DriverData_LookaheadCoasting {
get {
@@ -142,7 +142,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die OverSpeedEcoRoll ähnelt.
+ /// Looks up a localized string similar to OverSpeedEcoRoll.
/// </summary>
internal static string DriverData_OverspeedEcoRoll {
get {
@@ -151,7 +151,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die MinSpeed ähnelt.
+ /// Looks up a localized string similar to MinSpeed.
/// </summary>
internal static string DriverData_OverspeedEcoRoll_MinSpeed {
get {
@@ -160,7 +160,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die Mode ähnelt.
+ /// Looks up a localized string similar to Mode.
/// </summary>
internal static string DriverData_OverspeedEcoRoll_Mode {
get {
@@ -169,7 +169,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die OverSpeed ähnelt.
+ /// Looks up a localized string similar to OverSpeed.
/// </summary>
internal static string DriverData_OverspeedEcoRoll_OverSpeed {
get {
@@ -178,7 +178,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die UnderSpeed ähnelt.
+ /// Looks up a localized string similar to UnderSpeed.
/// </summary>
internal static string DriverData_OverspeedEcoRoll_UnderSpeed {
get {
@@ -187,7 +187,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die StartStop ähnelt.
+ /// Looks up a localized string similar to StartStop.
/// </summary>
internal static string DriverData_StartStop {
get {
@@ -196,7 +196,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die Delay ähnelt.
+ /// Looks up a localized string similar to Delay.
/// </summary>
internal static string DriverData_StartStop_Delay {
get {
@@ -205,7 +205,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die Enabled ähnelt.
+ /// Looks up a localized string similar to Enabled.
/// </summary>
internal static string DriverData_StartStop_Enabled {
get {
@@ -214,7 +214,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die MaxSpeed ähnelt.
+ /// Looks up a localized string similar to MaxSpeed.
/// </summary>
internal static string DriverData_StartStop_MaxSpeed {
get {
@@ -223,7 +223,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die MinTime ähnelt.
+ /// Looks up a localized string similar to MinTime.
/// </summary>
internal static string DriverData_StartStop_MinTime {
get {
@@ -232,7 +232,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die ContinuousTorque ähnelt.
+ /// Looks up a localized string similar to ContinuousTorque.
/// </summary>
internal static string EM_ContinuousTorque {
get {
@@ -241,7 +241,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die ContinuousTorqueSpeed ähnelt.
+ /// Looks up a localized string similar to ContinuousTorqueSpeed.
/// </summary>
internal static string EM_ContinuousTorqueSpeed {
get {
@@ -250,7 +250,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die DragCurve ähnelt.
+ /// Looks up a localized string similar to DragCurve.
/// </summary>
internal static string EM_DragCurve {
get {
@@ -259,7 +259,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die EfficiencyMap ähnelt.
+ /// Looks up a localized string similar to EfficiencyMap.
/// </summary>
internal static string EM_EfficiencyMap {
get {
@@ -268,7 +268,16 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die FullLoadCurve ähnelt.
+ /// Looks up a localized string similar to ElectricMachineType.
+ /// </summary>
+ internal static string EM_ElectricMachineType {
+ get {
+ return ResourceManager.GetString("EM_ElectricMachineType", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to FullLoadCurve.
/// </summary>
internal static string EM_FullLoadCurve {
get {
@@ -277,7 +286,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die OverloadTime ähnelt.
+ /// Looks up a localized string similar to OverloadTime.
/// </summary>
internal static string EM_OverloadTime {
get {
@@ -286,7 +295,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die OverloadTorque ähnelt.
+ /// Looks up a localized string similar to OverloadTorque.
/// </summary>
internal static string EM_OverloadTorque {
get {
@@ -295,7 +304,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die OverloadTorqueSpeed ähnelt.
+ /// Looks up a localized string similar to OverloadTorqueSpeed.
/// </summary>
internal static string EM_OverloadTorqueSpeed {
get {
@@ -304,7 +313,16 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die ThermalOverloadRecoveryFactor ähnelt.
+ /// Looks up a localized string similar to R85RatedPower.
+ /// </summary>
+ internal static string EM_RatedPower {
+ get {
+ return ResourceManager.GetString("EM_RatedPower", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to ThermalOverloadRecoveryFactor.
/// </summary>
internal static string EM_ThermalOverloadRecoveryFactor {
get {
@@ -313,7 +331,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die Voltage ähnelt.
+ /// Looks up a localized string similar to Voltage.
/// </summary>
internal static string EM_Voltage {
get {
@@ -322,7 +340,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die VoltageLevels ähnelt.
+ /// Looks up a localized string similar to VoltageLevels.
/// </summary>
internal static string EM_VoltageLevels {
get {
@@ -331,7 +349,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die Displacement ähnelt.
+ /// Looks up a localized string similar to Displacement.
/// </summary>
internal static string Engine_Displacement {
get {
@@ -340,7 +358,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die FuelMap ähnelt.
+ /// Looks up a localized string similar to FuelMap.
/// </summary>
internal static string Engine_FuelConsumptionMap {
get {
@@ -349,7 +367,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die FullLoadCurve ähnelt.
+ /// Looks up a localized string similar to FullLoadCurve.
/// </summary>
internal static string Engine_FullLoadCurveFile {
get {
@@ -358,7 +376,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die IdlingSpeed ähnelt.
+ /// Looks up a localized string similar to IdlingSpeed.
/// </summary>
internal static string Engine_IdleSpeed {
get {
@@ -367,7 +385,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die Inertia ähnelt.
+ /// Looks up a localized string similar to Inertia.
/// </summary>
internal static string Engine_Inertia {
get {
@@ -376,7 +394,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die ModelName ähnelt.
+ /// Looks up a localized string similar to ModelName.
/// </summary>
internal static string Engine_ModelName {
get {
@@ -385,7 +403,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die WHTC-Motorway ähnelt.
+ /// Looks up a localized string similar to WHTC-Motorway.
/// </summary>
internal static string Engine_WHTC_Motorway {
get {
@@ -394,7 +412,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die WHTC-Rural ähnelt.
+ /// Looks up a localized string similar to WHTC-Rural.
/// </summary>
internal static string Engine_WHTC_Rural {
get {
@@ -403,7 +421,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die WHTC-Urban ähnelt.
+ /// Looks up a localized string similar to WHTC-Urban.
/// </summary>
internal static string Engine_WHTC_Urban {
get {
@@ -412,7 +430,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die EaryShiftUp ähnelt.
+ /// Looks up a localized string similar to EaryShiftUp.
/// </summary>
internal static string Gearbox_EarlyShiftUp {
get {
@@ -421,7 +439,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die Efficiency ähnelt.
+ /// Looks up a localized string similar to Efficiency.
/// </summary>
internal static string Gearbox_Gear_Efficiency {
get {
@@ -430,7 +448,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die FullLoadCurve ähnelt.
+ /// Looks up a localized string similar to FullLoadCurve.
/// </summary>
internal static string Gearbox_Gear_FullLoadCurveFile {
get {
@@ -439,7 +457,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die LossMap ähnelt.
+ /// Looks up a localized string similar to LossMap.
/// </summary>
internal static string Gearbox_Gear_LossMapFile {
get {
@@ -448,7 +466,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die MaxOutShaftSpeed ähnelt.
+ /// Looks up a localized string similar to MaxOutShaftSpeed.
/// </summary>
internal static string Gearbox_Gear_MaxOutShaftSpeed {
get {
@@ -457,7 +475,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die MaxOutShaftTorque ähnelt.
+ /// Looks up a localized string similar to MaxOutShaftTorque.
/// </summary>
internal static string Gearbox_Gear_MaxOutShaftTorque {
get {
@@ -466,7 +484,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die Ratio ähnelt.
+ /// Looks up a localized string similar to Ratio.
/// </summary>
internal static string Gearbox_Gear_Ratio {
get {
@@ -475,7 +493,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die ShiftPolygon ähnelt.
+ /// Looks up a localized string similar to ShiftPolygon.
/// </summary>
internal static string Gearbox_Gear_ShiftPolygonFile {
get {
@@ -484,7 +502,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die TCactive ähnelt.
+ /// Looks up a localized string similar to TCactive.
/// </summary>
internal static string Gearbox_Gear_TCactive {
get {
@@ -493,7 +511,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die GearboxType ähnelt.
+ /// Looks up a localized string similar to GearboxType.
/// </summary>
internal static string Gearbox_GearboxType {
get {
@@ -502,7 +520,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die Gears ähnelt.
+ /// Looks up a localized string similar to Gears.
/// </summary>
internal static string Gearbox_Gears {
get {
@@ -511,7 +529,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die Inertia ähnelt.
+ /// Looks up a localized string similar to Inertia.
/// </summary>
internal static string Gearbox_Inertia {
get {
@@ -520,7 +538,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die ModelName ähnelt.
+ /// Looks up a localized string similar to ModelName.
/// </summary>
internal static string Gearbox_ModelName {
get {
@@ -529,7 +547,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die ShiftTime ähnelt.
+ /// Looks up a localized string similar to ShiftTime.
/// </summary>
internal static string Gearbox_ShiftTime {
get {
@@ -538,7 +556,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die SkipGears ähnelt.
+ /// Looks up a localized string similar to SkipGears.
/// </summary>
internal static string Gearbox_SkipGears {
get {
@@ -547,7 +565,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die StartAcc ähnelt.
+ /// Looks up a localized string similar to StartAcc.
/// </summary>
internal static string Gearbox_StartAcceleration {
get {
@@ -556,7 +574,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die StartSpeed ähnelt.
+ /// Looks up a localized string similar to StartSpeed.
/// </summary>
internal static string Gearbox_StartSpeed {
get {
@@ -565,7 +583,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die StartTqReserve ähnelt.
+ /// Looks up a localized string similar to StartTqReserve.
/// </summary>
internal static string Gearbox_StartTorqueReserve {
get {
@@ -574,7 +592,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die TorqueConverter ähnelt.
+ /// Looks up a localized string similar to TorqueConverter.
/// </summary>
internal static string Gearbox_TorqueConverter {
get {
@@ -583,7 +601,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die Inertia ähnelt.
+ /// Looks up a localized string similar to Inertia.
/// </summary>
internal static string Gearbox_TorqueConverter_Inertia {
get {
@@ -592,7 +610,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die RefRPM ähnelt.
+ /// Looks up a localized string similar to RefRPM.
/// </summary>
internal static string Gearbox_TorqueConverter_ReferenceRPM {
get {
@@ -601,7 +619,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die File ähnelt.
+ /// Looks up a localized string similar to File.
/// </summary>
internal static string Gearbox_TorqueConverter_TCMap {
get {
@@ -610,7 +628,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die TqReserve ähnelt.
+ /// Looks up a localized string similar to TqReserve.
/// </summary>
internal static string Gearbox_TorqueReserve {
get {
@@ -619,7 +637,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die TracInt ähnelt.
+ /// Looks up a localized string similar to TracInt.
/// </summary>
internal static string Gearbox_TractionInterruption {
get {
@@ -628,7 +646,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die MaxDrivetrainPower ähnelt.
+ /// Looks up a localized string similar to MaxDrivetrainPower.
/// </summary>
internal static string HEV_Vehicle_MaxDrivetrainPower {
get {
@@ -637,7 +655,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die ContinuousTorque ähnelt.
+ /// Looks up a localized string similar to ContinuousTorque.
/// </summary>
internal static string IEPC_ContinuousTorque {
get {
@@ -646,7 +664,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die ContinuousTorqueSpeed ähnelt.
+ /// Looks up a localized string similar to ContinuousTorqueSpeed.
/// </summary>
internal static string IEPC_ContinuousTorqueSpeed {
get {
@@ -655,7 +673,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die DesignTypeWheelMotor ähnelt.
+ /// Looks up a localized string similar to DesignTypeWheelMotor.
/// </summary>
internal static string IEPC_DesignTypeWheelMotor {
get {
@@ -664,7 +682,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die DifferentialIncluded ähnelt.
+ /// Looks up a localized string similar to DifferentialIncluded.
/// </summary>
internal static string IEPC_DifferentialIncluded {
get {
@@ -673,7 +691,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die DragCurves ähnelt.
+ /// Looks up a localized string similar to DragCurves.
/// </summary>
internal static string IEPC_DragCurves {
get {
@@ -682,7 +700,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die FullLoadCurve ähnelt.
+ /// Looks up a localized string similar to FullLoadCurve.
/// </summary>
internal static string IEPC_FullLoadCurve {
get {
@@ -691,7 +709,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die Inertia ähnelt.
+ /// Looks up a localized string similar to Inertia.
/// </summary>
internal static string IEPC_Inertia {
get {
@@ -700,7 +718,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die NrOfDesignTypeWheelMotorMeasured ähnelt.
+ /// Looks up a localized string similar to NrOfDesignTypeWheelMotorMeasured.
/// </summary>
internal static string IEPC_NrOfDesignTypeWheelMotorMeasured {
get {
@@ -709,7 +727,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die OverloadTime ähnelt.
+ /// Looks up a localized string similar to OverloadTime.
/// </summary>
internal static string IEPC_OverloadTime {
get {
@@ -718,7 +736,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die OverloadTorque ähnelt.
+ /// Looks up a localized string similar to OverloadTorque.
/// </summary>
internal static string IEPC_OverloadTorque {
get {
@@ -727,7 +745,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die OverloadTorqueSpeed ähnelt.
+ /// Looks up a localized string similar to OverloadTorqueSpeed.
/// </summary>
internal static string IEPC_OverloadTorqueSpeed {
get {
@@ -736,7 +754,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die PowerMaps ähnelt.
+ /// Looks up a localized string similar to PowerMaps.
/// </summary>
internal static string IEPC_PowerMaps {
get {
@@ -745,7 +763,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die ThermalOverloadRecoveryFactor ähnelt.
+ /// Looks up a localized string similar to ThermalOverloadRecoveryFactor.
/// </summary>
internal static string IEPC_ThermalOverloadRecoveryFactor {
get {
@@ -754,7 +772,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die Voltage ähnelt.
+ /// Looks up a localized string similar to Voltage.
/// </summary>
internal static string IEPC_Voltage {
get {
@@ -763,7 +781,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die VoltageLevels ähnelt.
+ /// Looks up a localized string similar to VoltageLevels.
/// </summary>
internal static string IEPC_VoltageLevels {
get {
@@ -772,7 +790,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die InterimStep ähnelt.
+ /// Looks up a localized string similar to InterimStep.
/// </summary>
internal static string InterimStep {
get {
@@ -781,7 +799,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die Cycles ähnelt.
+ /// Looks up a localized string similar to Cycles.
/// </summary>
internal static string Job_Cycles {
get {
@@ -790,7 +808,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die EngineOnlyMode ähnelt.
+ /// Looks up a localized string similar to EngineOnlyMode.
/// </summary>
internal static string Job_EngineOnlyMode {
get {
@@ -799,7 +817,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die Body ähnelt.
+ /// Looks up a localized string similar to Body.
/// </summary>
internal static string JsonBody {
get {
@@ -808,7 +826,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die Header ähnelt.
+ /// Looks up a localized string similar to Header.
/// </summary>
internal static string JsonHeader {
get {
@@ -817,7 +835,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die CreatedBy ähnelt.
+ /// Looks up a localized string similar to CreatedBy.
/// </summary>
internal static string JsonHeader_CreatedBy {
get {
@@ -826,7 +844,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die Date ähnelt.
+ /// Looks up a localized string similar to Date.
/// </summary>
internal static string JsonHeader_Date {
get {
@@ -835,7 +853,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die FileVersion ähnelt.
+ /// Looks up a localized string similar to FileVersion.
/// </summary>
internal static string JsonHeader_FileVersion {
get {
@@ -844,7 +862,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die PrimaryVehicle ähnelt.
+ /// Looks up a localized string similar to PrimaryVehicle.
/// </summary>
internal static string PrimaryVehicle {
get {
@@ -853,7 +871,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die SavedInDeclMode ähnelt.
+ /// Looks up a localized string similar to SavedInDeclMode.
/// </summary>
internal static string SavedInDeclMode {
get {
@@ -862,7 +880,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die Angledrive ähnelt.
+ /// Looks up a localized string similar to Angledrive.
/// </summary>
internal static string Vehicle_Angledrive {
get {
@@ -871,7 +889,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die Efficiency ähnelt.
+ /// Looks up a localized string similar to Efficiency.
/// </summary>
internal static string Vehicle_Angledrive_Efficiency {
get {
@@ -880,7 +898,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die LossMap ähnelt.
+ /// Looks up a localized string similar to LossMap.
/// </summary>
internal static string Vehicle_Angledrive_LossMapFile {
get {
@@ -889,7 +907,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die Ratio ähnelt.
+ /// Looks up a localized string similar to Ratio.
/// </summary>
internal static string Vehicle_Angledrive_Ratio {
get {
@@ -898,7 +916,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die Type ähnelt.
+ /// Looks up a localized string similar to Type.
/// </summary>
internal static string Vehicle_Angledrive_Type {
get {
@@ -907,7 +925,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die AxleConfig ähnelt.
+ /// Looks up a localized string similar to AxleConfig.
/// </summary>
internal static string Vehicle_AxleConfiguration {
get {
@@ -916,7 +934,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die Axles ähnelt.
+ /// Looks up a localized string similar to Axles.
/// </summary>
internal static string Vehicle_AxleConfiguration_Axles {
get {
@@ -925,7 +943,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die Type ähnelt.
+ /// Looks up a localized string similar to Type.
/// </summary>
internal static string Vehicle_AxleConfiguration_Type {
get {
@@ -934,7 +952,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die Inertia ähnelt.
+ /// Looks up a localized string similar to Inertia.
/// </summary>
internal static string Vehicle_Axles_Inertia {
get {
@@ -943,7 +961,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die RRCISO ähnelt.
+ /// Looks up a localized string similar to RRCISO.
/// </summary>
internal static string Vehicle_Axles_RollResistanceCoefficient {
get {
@@ -970,7 +988,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die FzISO ähnelt.
+ /// Looks up a localized string similar to FzISO.
/// </summary>
internal static string Vehicle_Axles_TyreTestLoad {
get {
@@ -979,7 +997,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die Wheels ähnelt.
+ /// Looks up a localized string similar to Wheels.
/// </summary>
internal static string Vehicle_Axles_Wheels {
get {
@@ -988,7 +1006,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die CurbWeight ähnelt.
+ /// Looks up a localized string similar to CurbWeight.
/// </summary>
internal static string Vehicle_CurbWeight {
get {
@@ -997,7 +1015,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die CurbWeightExtra ähnelt.
+ /// Looks up a localized string similar to CurbWeightExtra.
/// </summary>
internal static string Vehicle_CurbWeightExtra {
get {
@@ -1006,7 +1024,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die CdA ähnelt.
+ /// Looks up a localized string similar to CdA.
/// </summary>
internal static string Vehicle_DragCoefficient {
get {
@@ -1015,7 +1033,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die CdA2 ähnelt.
+ /// Looks up a localized string similar to CdA2.
/// </summary>
internal static string Vehicle_DragCoefficientRigidTruck {
get {
@@ -1024,7 +1042,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die rdyn ähnelt.
+ /// Looks up a localized string similar to rdyn.
/// </summary>
internal static string Vehicle_DynamicTyreRadius {
get {
@@ -1033,7 +1051,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die EngineFile ähnelt.
+ /// Looks up a localized string similar to EngineFile.
/// </summary>
internal static string Vehicle_EngineFile {
get {
@@ -1042,7 +1060,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die CycleEPTO ähnelt.
+ /// Looks up a localized string similar to CycleEPTO.
/// </summary>
internal static string Vehicle_EPTO_Cycle {
get {
@@ -1051,7 +1069,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die GearboxFile ähnelt.
+ /// Looks up a localized string similar to GearboxFile.
/// </summary>
internal static string Vehicle_GearboxFile {
get {
@@ -1060,7 +1078,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die MassMax ähnelt.
+ /// Looks up a localized string similar to MassMax.
/// </summary>
internal static string Vehicle_GrossVehicleMassRating {
get {
@@ -1069,7 +1087,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die Loading ähnelt.
+ /// Looks up a localized string similar to Loading.
/// </summary>
internal static string Vehicle_Loading {
get {
@@ -1078,7 +1096,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die PTO ähnelt.
+ /// Looks up a localized string similar to PTO.
/// </summary>
internal static string Vehicle_PTO {
get {
@@ -1087,7 +1105,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die Cycle ähnelt.
+ /// Looks up a localized string similar to Cycle.
/// </summary>
internal static string Vehicle_PTO_Cycle {
get {
@@ -1096,7 +1114,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die CycleDriving ähnelt.
+ /// Looks up a localized string similar to CycleDriving.
/// </summary>
internal static string Vehicle_PTO_CycleDriving {
get {
@@ -1105,7 +1123,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die LossMap ähnelt.
+ /// Looks up a localized string similar to LossMap.
/// </summary>
internal static string Vehicle_PTO_LossMapFile {
get {
@@ -1114,7 +1132,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die Type ähnelt.
+ /// Looks up a localized string similar to Type.
/// </summary>
internal static string Vehicle_PTO_Type {
get {
@@ -1123,7 +1141,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die Retarder ähnelt.
+ /// Looks up a localized string similar to Retarder.
/// </summary>
internal static string Vehicle_Retarder {
get {
@@ -1132,7 +1150,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die File ähnelt.
+ /// Looks up a localized string similar to File.
/// </summary>
internal static string Vehicle_Retarder_LossMapFile {
get {
@@ -1141,7 +1159,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die Ratio ähnelt.
+ /// Looks up a localized string similar to Ratio.
/// </summary>
internal static string Vehicle_Retarder_Ratio {
get {
@@ -1150,7 +1168,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die Type ähnelt.
+ /// Looks up a localized string similar to Type.
/// </summary>
internal static string Vehicle_Retarder_Type {
get {
@@ -1159,7 +1177,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die Rim ähnelt.
+ /// Looks up a localized string similar to Rim.
/// </summary>
internal static string Vehicle_Rim {
get {
@@ -1168,7 +1186,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die VehCat ähnelt.
+ /// Looks up a localized string similar to VehCat.
/// </summary>
internal static string Vehicle_VehicleCategory {
get {
@@ -1177,7 +1195,7 @@ namespace TUGraz.VectoCore {
}
/// <summary>
- /// Sucht eine lokalisierte Zeichenfolge, die VehicleFile ähnelt.
+ /// Looks up a localized string similar to VehicleFile.
/// </summary>
internal static string Vehicle_VehicleFile {
get {
diff --git a/VectoCore/VectoCore/JsonKeys.resx b/VectoCore/VectoCore/JsonKeys.resx
index 57d20dbd4b726a323c37476f28cddc28c6ef8c75..70eafc0af400a2a642a7ac4e94618caf3aec80ec 100644
--- a/VectoCore/VectoCore/JsonKeys.resx
+++ b/VectoCore/VectoCore/JsonKeys.resx
@@ -492,4 +492,10 @@
<data name="BUS_RunSimulation" xml:space="preserve">
<value>RunSimulation</value>
</data>
+<data name="EM_RatedPower" xml:space="preserve">
+ <value>R85RatedPower</value>
+</data>
+<data name="EM_ElectricMachineType" xml:space="preserve">
+ <value>ElectricMachineType</value>
+</data>
</root>
\ No newline at end of file
diff --git a/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs b/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
index 2d88a8752a6a1a6eba64662049df446dacf294a8..7faf3d6091895ff4adc1e606d18c06b52caba182 100644
--- a/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
+++ b/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
@@ -13,6 +13,7 @@ using TUGraz.VectoCore;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Models.Declaration.Auxiliaries;
+using TUGraz.VectoCore.Utils;
public class JSONFileWriter : IOutputFileWriter
{
@@ -66,6 +67,15 @@ public class JSONFileWriter : IOutputFileWriter
return filePath;
}
+ var filePathNormalized = new Uri(Path.GetFullPath(filePath));
+ var basePathNormalized = new Uri(Path.GetFullPath(basePath) + (Path.GetFullPath(basePath).EndsWith(Path.DirectorySeparatorChar.ToString()) ? "" : Path.DirectorySeparatorChar.ToString()));
+ var commonPrefix = PathHelper.GetLongestCommonPrefix(basePathNormalized.AbsolutePath, filePathNormalized.AbsolutePath);
+ if (commonPrefix.Length > 3) {
+ // at least on the same drive...
+ var relative = basePathNormalized.MakeRelativeUri(filePathNormalized);
+ return relative.ToString();
+ }
+
if (Path.GetDirectoryName(Path.GetFullPath(filePath)).StartsWith(basePath, StringComparison.OrdinalIgnoreCase)) {
return Path.GetFullPath(filePath).Substring(basePath.Length + (basePath.EndsWith(@"\") ? 0 : 1));
}
@@ -73,6 +83,7 @@ public class JSONFileWriter : IOutputFileWriter
return filePath;
}
+
public void SaveElectricMotor(IElectricMotorEngineeringInputData electricMachine, string filename, bool declMode)
{
var header = GetHeader(ElectricMotorFormatVersion);
@@ -81,7 +92,9 @@ public class JSONFileWriter : IOutputFileWriter
{ JsonKeys.SavedInDeclMode, declMode },
{ JsonKeys.Component_Model, electricMachine.Model },
{ JsonKeys.Engine_Inertia, electricMachine.Inertia.Value() },
- { JsonKeys.EM_ThermalOverloadRecoveryFactor, electricMachine.OverloadRecoveryFactor }
+ { JsonKeys.EM_ElectricMachineType, electricMachine.ElectricMachineType.ToString() },
+ { JsonKeys.EM_ThermalOverloadRecoveryFactor, electricMachine.OverloadRecoveryFactor },
+ { JsonKeys.EM_RatedPower, electricMachine.R85RatedPower.ConvertToKiloWatt().Value }
};
var vlevels = GetVoltageLevelEntries(electricMachine.VoltageLevels, filename);
@@ -100,7 +113,9 @@ public class JSONFileWriter : IOutputFileWriter
{ JsonKeys.Component_Model, electricMachine.Model },
{ JsonKeys.EM_DragCurve, GetRelativePath(electricMachine.DragCurve.Source, Path.GetDirectoryName(filename))},
{ JsonKeys.Engine_Inertia, electricMachine.Inertia.Value() },
- { JsonKeys.EM_ThermalOverloadRecoveryFactor, electricMachine.OverloadRecoveryFactor }
+ { JsonKeys.EM_ThermalOverloadRecoveryFactor, electricMachine.OverloadRecoveryFactor },
+ { JsonKeys.EM_RatedPower, electricMachine.R85RatedPower.ConvertToKiloWatt().Value }
+
};
var vlevels = GetVoltageLevelEntries(electricMachine.VoltageLevels, filename);
@@ -116,7 +131,7 @@ public class JSONFileWriter : IOutputFileWriter
var vlevel = new Dictionary<string, object> {
{ JsonKeys.EM_Voltage, entry.VoltageLevel.Value() },
{ JsonKeys.EM_ContinuousTorque, entry.ContinuousTorque.Value() },
- { JsonKeys.EM_ContinuousTorqueSpeed, entry.ContinuousTorqueSpeed.AsRPM },
+ { JsonKeys.EM_ContinuousTorqueSpeed, entry.ContinuousTorqueSpeed.AsRPM.ToGUIFormat() },
{ JsonKeys.EM_OverloadTorque, entry.OverloadTorque.Value() },
{ JsonKeys.EM_OverloadTorqueSpeed, entry.OverloadTestSpeed.AsRPM },
{ JsonKeys.EM_OverloadTime, entry.OverloadTime.Value() },
@@ -143,11 +158,13 @@ public class JSONFileWriter : IOutputFileWriter
{
{JsonKeys.SavedInDeclMode, declMode},
{JsonKeys.Component_Model, iepc.Model},
+ { JsonKeys.EM_ElectricMachineType, iepc.ElectricMachineType.ToString() },
{JsonKeys.IEPC_Inertia, iepc.Inertia.Value()},
{JsonKeys.IEPC_DifferentialIncluded, iepc.DifferentialIncluded},
{JsonKeys.IEPC_DesignTypeWheelMotor, iepc.DesignTypeWheelMotor},
{JsonKeys.IEPC_NrOfDesignTypeWheelMotorMeasured, iepc.NrOfDesignTypeWheelMotorMeasured},
- {JsonKeys.IEPC_ThermalOverloadRecoveryFactor, iepc.OverloadRecoveryFactor}
+ {JsonKeys.IEPC_ThermalOverloadRecoveryFactor, iepc.OverloadRecoveryFactor},
+ { JsonKeys.EM_RatedPower, iepc.R85RatedPower.ConvertToKiloWatt().Value }
};
var gears = new List<Dictionary<string, object>>();
@@ -211,7 +228,10 @@ public class JSONFileWriter : IOutputFileWriter
{ "SOC_max", battery.MaxSOC * 100.0 },
{ "MaxCurrentMap", GetRelativePath(battery.MaxCurrentMap.Source, Path.GetDirectoryName(filename)) },
{ "InternalResistanceCurve", GetRelativePath(battery.InternalResistanceCurve.Source, Path.GetDirectoryName(filename)) },
- { "SoCCurve", GetRelativePath(battery.VoltageCurve.Source, Path.GetDirectoryName(filename)) }
+ { "SoCCurve", GetRelativePath(battery.VoltageCurve.Source, Path.GetDirectoryName(filename)) },
+ { "TestingTemperature", battery.TestingTemperature.AsDegCelsius},
+ { "JunctionboxIncluded", battery.JunctionboxIncluded },
+ { "ConnectorsSubsystemsIncluded", battery.ConnectorsSubsystemsIncluded }
};
WriteFile(header, body, filename);
@@ -230,7 +250,8 @@ public class JSONFileWriter : IOutputFileWriter
{ "U_min", superCap.MinVoltage.Value() },
{ "U_max", superCap.MaxVoltage.Value() },
{ "I_maxCharge", superCap.MaxCurrentCharge.Value() },
- { "I_maxDischarge", superCap.MaxCurrentDischarge.Value() }
+ { "I_maxDischarge", superCap.MaxCurrentDischarge.Value() },
+ { "TestingTemperature", superCap.TestingTemperature.AsDegCelsius },
};
WriteFile(header, body, filename);
@@ -580,7 +601,8 @@ public class JSONFileWriter : IOutputFileWriter
body.Add("PowertrainConfiguration", vehicle.VehicleType == VectoSimulationJobType.SerialHybridVehicle ? "SerialHybrid" : vehicle.VehicleType == VectoSimulationJobType.IHPC ? "IHPC": "ParallelHybrid");
body.Add("ElectricMotors", GetElectricMotors(vehicle, basePath));
body.Add("Batteries", GetBattery(vehicle, basePath));
-
+ body.Add("OvcHev", true);
+ body.Add("MaxChargingPower", vehicle.MaxChargingPower.ConvertToKiloWatt().Value);
WriteFile(header, body, filename);
}
@@ -605,6 +627,7 @@ public class JSONFileWriter : IOutputFileWriter
body.Add("PowertrainConfiguration", "BatteryElectric");
body.Add("ElectricMotors", electricMotorsOut);
body.Add("Batteries", battery);
+ //body.Add("OvcHev", true);
//body.Add("IdlingSpeed", vehicle.EngineIdleSpeed.AsRPM);
if (retarder.Type != RetarderType.None)
@@ -644,9 +667,13 @@ public class JSONFileWriter : IOutputFileWriter
}
body.Add("Batteries", battery);
+ if (vehicle.VehicleType == VectoSimulationJobType.IEPC_S) {
+ body.Add("OvcHev", vehicle.OvcHev);
+ body.Add("MaxChargingPower", vehicle.MaxChargingPower.ConvertToKiloWatt().Value);
+ }
//body.Add("IdlingSpeed", vehicle.EngineIdleSpeed.AsRPM);
- if (retarder.Type != RetarderType.None)
+ if (retarder.Type != RetarderType.None)
body.Add("Retarder", retarderOut);
//body.Add("Angledrive", angledriveOut);
body.Add("PTO", ptoOut);
@@ -1183,7 +1210,27 @@ public class JSONFileWriter : IOutputFileWriter
basePath));
}
}
-
+
+ if (job.SavedInDeclarationMode && job.Vehicle is IVehicleDeclarationInputData declVehicle) {
+ var aux = declVehicle.Components.AuxiliaryInputData;
+ var auxList = new List<object>();
+ foreach (var auxEntry in aux.Auxiliaries) {
+ var auxOut = new Dictionary<string, object>();
+ var engineeringAuxEntry = auxEntry;
+ if (!job.SavedInDeclarationMode) {
+ auxOut.Add("Type", auxEntry.Type.Name());
+ auxOut.Add("Technology", new string[] { });
+ } else {
+ auxOut.Add("ID", auxEntry.Type.Key());
+ auxOut.Add("Type", auxEntry.Type.Name());
+ auxOut.Add("Technology", engineeringAuxEntry.Technology);
+ }
+
+ auxList.Add(auxOut);
+ }
+ body.Add("Aux", auxList);
+ }
+
var driver = input.DriverInputData;
if (!job.SavedInDeclarationMode) {
@@ -1227,14 +1274,16 @@ public class JSONFileWriter : IOutputFileWriter
});
}
- // Overspeed / EcoRoll
- var overspeedDic = new Dictionary<string, object> {
- { "Mode", driver.OverSpeedData.Enabled ? "Overspeed" : "Off" },
- { "MinSpeed", driver.OverSpeedData.MinSpeed.AsKmph },
- { "OverSpeed", driver.OverSpeedData.OverSpeed.AsKmph }
- };
+ if (!job.SavedInDeclarationMode) {
+ // Overspeed / EcoRoll
+ var overspeedDic = new Dictionary<string, object> {
+ { "Mode", driver.OverSpeedData.Enabled ? "Overspeed" : "Off" },
+ { "MinSpeed", driver.OverSpeedData.MinSpeed.AsKmph },
+ { "OverSpeed", driver.OverSpeedData.OverSpeed.AsKmph }
+ };
- body.Add("OverSpeedEcoRoll", overspeedDic);
+ body.Add("OverSpeedEcoRoll", overspeedDic);
+ }
// Cycles
if (!job.SavedInDeclarationMode)
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportGroupWriter/Common/PEV-VehicleSequenceGroup .cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportGroupWriter/Common/PEV-VehicleSequenceGroup .cs
index 2b0c365285fbdb44ab68d8b2770886e1ff263896..9e8e6e5f6132d3d6a32022f1c907b4948088cfe0 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportGroupWriter/Common/PEV-VehicleSequenceGroup .cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportGroupWriter/Common/PEV-VehicleSequenceGroup .cs
@@ -24,7 +24,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.
{
new XElement(_mrf + "PEVArchitecture", vehicleData.ArchitectureID.GetLabel()),
new XElement(_mrf + "OffVehicleChargingCapability", vehicleData.OvcHev),
- vehicleData.MaxChargingPower != null ? new XElement(_mrf + "OffVehicleChargingMaxPower", vehicleData.MaxChargingPower.ValueAsUnit("kW", 1)) : null,
+ //vehicleData.MaxChargingPower != null ? new XElement(_mrf + "OffVehicleChargingMaxPower", vehicleData.MaxChargingPower.ValueAsUnit("kW", 1)) : null,
};
result.Add(_mrfFactory.GetPEVADASType().GetXmlType(inputData.JobInputData.Vehicle.ADAS));
result.Add(_mrfFactory.GetBoostingLimitationsType().GetElement(inputData.JobInputData.Vehicle));
diff --git a/VectoCore/VectoCore/Utils/PathHelper.cs b/VectoCore/VectoCore/Utils/PathHelper.cs
index 2459f872dbc37fd28167a8fe1f6155bd3756367d..e5b64cc6eff9076d17828db9845afdc28cd205b7 100644
--- a/VectoCore/VectoCore/Utils/PathHelper.cs
+++ b/VectoCore/VectoCore/Utils/PathHelper.cs
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
+using TUGraz.VectoCommon.Utils;
namespace TUGraz.VectoCore.Utils
{
@@ -34,6 +35,20 @@ namespace TUGraz.VectoCore.Utils
return Path.Combine(result, pathFileName);
}
+ public static string GetLongestCommonPrefix(params string[] s)
+ {
+ if (s.Length == 0)
+ return "";
+ var prefix = s[0];
+ for (var i = 1; i < s.Length; i++)
+ while (s[i].IndexOf(prefix) != 0) {
+ prefix = prefix.Substring(0, prefix.Length - 1);
+ if (prefix.IsNullOrEmpty())
+ return "";
+ }
+ return prefix;
+ }
+
public static string GetAbsolutePath(string relativeTo, string relativePath)
{
return Path.GetFullPath(Path.Combine(Path.GetDirectoryName(relativeTo), relativePath));
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/Common/GenericBattery_243kWh_750V.vbat b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/Common/GenericBattery_243kWh_750V.vbat
index 627c162a5eeb36115ff72cfc1aeeaf87e28fc565..d3c72722774b317f19d3748b35db04bb8769db35 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/Common/GenericBattery_243kWh_750V.vbat
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/Common/GenericBattery_243kWh_750V.vbat
@@ -1,18 +1,22 @@
-{
- "Header": {
- "CreatedBy": " ()",
- "Date": "2016-10-13T08:54:28.7387223Z",
- "AppVersion": "3",
- "FileVersion": 1
- },
- "Body": {
- "SavedInDeclMode": true,
- "Model": "Generic Battery",
- "InternalResistanceCurve": "GenericBattery_243kWh.vbatr",
- "SOC_min": 10,
- "SOC_max": 90,
- "MaxCurrentMap": "MaxCurrent.vimax",
- "Capacity": 324,
- "SoCCurve": "GenericBattery_243kWh.vbatv"
- }
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2023-02-09T15:28:18.9980418Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": true,
+ "REESSType": "Battery",
+ "Model": "Generic Battery",
+ "Capacity": 324.0,
+ "SOC_min": 10.0,
+ "SOC_max": 90.0,
+ "MaxCurrentMap": "MaxCurrent.vimax",
+ "InternalResistanceCurve": "GenericBattery_243kWh.vbatr",
+ "SoCCurve": "GenericBattery_243kWh.vbatv",
+ "TestingTemperature": 40.0,
+ "JunctionboxIncluded": false,
+ "ConnectorsSubsystemsIncluded": true
+ }
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl1/GenericIEPC_Gbx3Whl1.viepc b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl1/GenericIEPC_Gbx3Whl1.viepc
index d5c2628009f1e62db0e14129dd2a950572194c84..c5e5b14dc7b0adca8b08c86f241916db663fccbe 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl1/GenericIEPC_Gbx3Whl1.viepc
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl1/GenericIEPC_Gbx3Whl1.viepc
@@ -1,18 +1,20 @@
-{
+{
"Header": {
- "CreatedBy": " ()",
- "Date": "2016-10-13T08:54:28.7387223Z",
+ "CreatedBy": "",
+ "Date": "2023-02-10T08:21:36.4723115Z",
"AppVersion": "3",
"FileVersion": 1
},
"Body": {
"SavedInDeclMode": true,
"Model": "Generic IEPC",
+ "ElectricMachineType": "ASM",
"Inertia": 0.5,
"DifferentialIncluded": false,
"DesignTypeWheelMotor": true,
"NrOfDesignTypeWheelMotorMeasured": 1,
- "ThermalOverloadRecoveryFactor": 0.9,
+ "ThermalOverloadRecoveryFactor": 0.0,
+ "R85RatedPower": 250.0,
"Gears": [
{
"Ratio": 21.9384
@@ -26,12 +28,12 @@
],
"VoltageLevels": [
{
- "Voltage": 500,
+ "Voltage": 500.0,
"ContinuousTorque": 3222.24,
"ContinuousTorqueSpeed": 748.18,
"OverloadTorque": 3839.84,
- "OverloadTorqueSpeed": 743.80,
- "OverloadTime": 312,
+ "OverloadTorqueSpeed": 743.8,
+ "OverloadTime": 312.0,
"FullLoadCurve": "IEPC_Gbx3Whl1_FLD_min.viepcp",
"PowerMaps": {
"1": "IEPC_Gbx3Whl1_1.viepco",
@@ -40,12 +42,12 @@
}
},
{
- "Voltage": 900,
+ "Voltage": 900.0,
"ContinuousTorque": 3490.76,
"ContinuousTorqueSpeed": 755.47,
- "OverloadTorque": 4027.80,
+ "OverloadTorque": 4027.8,
"OverloadTorqueSpeed": 762.41,
- "OverloadTime": 345,
+ "OverloadTime": 345.0,
"FullLoadCurve": "IEPC_Gbx3Whl1_FLD_max.viepcp",
"PowerMaps": {
"1": "IEPC_Gbx3Whl1_1.viepco",
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPCVehicle_Gbx3Whl1.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPCVehicle_Gbx3Whl1.vveh
index 892b8e494761d9eb0333db2b0da18b0077cd4664..f9dfee2907ba728758b8317022b37feee6c15da7 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPCVehicle_Gbx3Whl1.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPCVehicle_Gbx3Whl1.vveh
@@ -1,84 +1,71 @@
-{
- "Header": {
- "CreatedBy": "",
- "Date": "2017-07-13T14:14:29.3226830Z",
- "AppVersion": "3",
- "FileVersion": 11
- },
- "Body": {
- "SavedInDeclMode": true,
- "VehCat": "RigidTruck",
- "LegislativeClass": "Unknown",
- "CurbWeight": 4670.0,
- "CurbWeightExtra": 1900.0,
- "Loading": 3020.0,
- "MassMax": 11.99,
- "rdyn": 421.0,
- "PowertrainConfiguration": "IEPC",
- "CdCorrMode": "CdofVdecl",
- "CdCorrFile": "",
- "IEPC": "GenericIEPC_Gbx3Whl1.viepc",
- "Batteries": [
- {
- "NumPacks": 1,
- "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
- "StreamId": 0
- },
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2023-02-10T08:21:37.3799846Z",
+ "AppVersion": "3",
+ "FileVersion": 11
+ },
+ "Body": {
+ "SavedInDeclMode": true,
+ "VehCat": "RigidTruck",
+ "LegislativeClass": "M3",
+ "CurbWeight": 4670.0,
+ "CurbWeightExtra": 0.0,
+ "MassMax": 11.99,
+ "Loading": 0.0,
+ "rdyn": 0.0,
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.0,
+ "TwinTyres": false,
+ "RRCISO": 0.0065,
+ "FzISO": 20850.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.0,
+ "TwinTyres": true,
+ "RRCISO": 0.0075,
+ "FzISO": 20850.0,
+ "Type": "VehicleDriven"
+ }
+ ]
+ },
+ "EngineStopStart": false,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 4.83,
+ "VehicleHeight": 3.0,
+ "InitialSoC": 80.0,
+ "PowertrainConfiguration": "IEPC_E",
+ "IEPC": "E:\\QUAM\\Workspace\\VECTO_DEV_Buses\\VectoCore\\VectoCoreTest\\TestData\\Integration\\DeclarationMode\\2nd_AmendmDeclMode\\JSON\\PEV\\GenericIEPC\\IEPC_Gbx3Speed-Whl1\\GenericIEPC_Gbx3Whl1.viepc",
+ "Batteries": [
+ {
+ "NumPacks": 1,
+ "BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
+ "StreamId": 0
+ },
{
"NumPacks": 1,
"BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
"StreamId": 1
}
- ],
- "InitialSoC": 80,
- "TorqueLimits": {},
- "IdlingSpeed": 0.0,
- "AxleConfig": {
- "Type": "4x2",
- "Axles": [
- {
- "Inertia": 6.5,
- "Wheels": "265/70 R19.5",
- "AxleWeightShare": 0.2,
- "TwinTyres": false,
- "RRCISO": 0.0065,
- "FzISO": 20850.0,
- "Type": "VehicleNonDriven"
- },
- {
- "Inertia": 6.5,
- "Wheels": "265/70 R19.5",
- "AxleWeightShare": 0.3,
- "TwinTyres": true,
- "RRCISO": 0.0075,
- "FzISO": 20850.0,
- "Type": "VehicleDriven"
- },
- {
- "Inertia": 4.5,
- "Wheels": "235/75 R17.5",
- "AxleWeightShare": 0.25,
- "TwinTyres": false,
- "RRCISO": 0.0055,
- "FzISO": 16680.0,
- "Type": "VehicleNonDriven"
- },
- {
- "Inertia": 4.5,
- "Wheels": "235/75 R17.5",
- "AxleWeightShare": 0.25,
- "TwinTyres": false,
- "RRCISO": 0.0055,
- "FzISO": 16680.0,
- "Type": "VehicleNonDriven"
- }
- ]
- },
- "EngineStopStart": true,
- "EcoRoll": "None",
- "PredictiveCruiseControl": "None",
- "ATEcoRollReleaseLockupClutch": false,
- "CdA": 4.83,
- "VehicleHeight": 3.0
- }
+ ],
+ "PTO": {
+ "Type": "None",
+ "LossMap": "",
+ "Cycle": "",
+ "CycleEPTO": "",
+ "CycleDriving": ""
+ }
+ }
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_ENG_Gbx3Whl1.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_ENG_Gbx3Whl1.vecto
index 1a3d309f35ea702420ecc2fe916c98e71318207f..c093f7d411bb59d76795cffb20a76be0a7b0a11d 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_ENG_Gbx3Whl1.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/PEV/GenericIEPC/IEPC_Gbx3Speed-Whl1/IEPC_ENG_Gbx3Whl1.vecto
@@ -1,45 +1,14 @@
-{
+{
"Header": {
- "CreatedBy": " ()",
- "Date": "2016-10-13T08:55:18.2100810Z",
+ "CreatedBy": "",
+ "Date": "2023-02-10T08:21:42.1951204Z",
"AppVersion": "3",
"FileVersion": 12
},
"Body": {
"SavedInDeclMode": true,
- "EngineOnlyMode": false,
"VehicleFile": "IEPCVehicle_Gbx3Whl1.vveh",
- "GearboxFile": "",
- "TCU": "../Common/ShiftParameters.vtcu",
"Padd_electric": 0.0,
-
- "VACC": "../Common/Truck.vacc",
-
- "LAC": {
- "Enabled": true,
- "PreviewDistanceFactor": 10.0,
- "DF_offset": 2.5,
- "DF_scaling": 1.5,
- "DF_targetSpeedLookup": "",
- "Df_velocityDropLookup": ""
- },
- "OverSpeedEcoRoll": {
- "Mode": "Off",
- "MinSpeed": 50.0,
- "OverSpeed": 5.0,
- "UnderSpeed": 5.0
- },
- "Cycles": [
- "LongHaul",
- "Coach",
- "Construction",
- "HeavyUrban",
- "Interurban",
- "RegionalDelivery",
- "Suburban",
- "Urban",
- "UrbanDelivery"
- ],
"Aux": [
{
"ID": "STP",
@@ -69,6 +38,6 @@
"Vacuum pump + elec. driven"
]
}
- ],
+ ]
}
}
\ No newline at end of file