diff --git a/VECTO/GUI/VehicleForm.Designer.vb b/VECTO/GUI/VehicleForm.Designer.vb
index 16b57c70cd33faae13fee42f8bfb4a998fd4ade7..d1e4d049a2afcaefce1036a6439d3448295ebaae 100644
--- a/VECTO/GUI/VehicleForm.Designer.vb
+++ b/VECTO/GUI/VehicleForm.Designer.vb
@@ -142,9 +142,6 @@ Partial Class VehicleForm
Me.cbTankSystem = New System.Windows.Forms.ComboBox()
Me.Label23 = New System.Windows.Forms.Label()
Me.tpElectricComponents = New System.Windows.Forms.TabPage()
- Me.lblMaxDrivetrainPwrUnit = New System.Windows.Forms.Label()
- Me.tbMaxDrivetrainPwr = New System.Windows.Forms.TextBox()
- Me.lblMaxDrivetrainPwr = New System.Windows.Forms.Label()
Me.gbBattery = New System.Windows.Forms.GroupBox()
Me.lblInitialSoCUnit = New System.Windows.Forms.Label()
Me.tbInitialSoC = New System.Windows.Forms.TextBox()
@@ -186,6 +183,10 @@ 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.bgVehicleTorqueLimits = New System.Windows.Forms.GroupBox()
+ Me.gbEMTorqueLimits = New System.Windows.Forms.GroupBox()
+ Me.btnEmTorqueLimits = New System.Windows.Forms.Button()
+ Me.tbEmTorqueLimits = New System.Windows.Forms.TextBox()
Me.GroupBox6.SuspendLayout
Me.ToolStrip1.SuspendLayout
Me.GroupBox7.SuspendLayout
@@ -219,87 +220,80 @@ Partial Class VehicleForm
Me.tpTorqueLimits.SuspendLayout
Me.tpADAS.SuspendLayout
Me.GroupBox5.SuspendLayout
+ Me.bgVehicleTorqueLimits.SuspendLayout
+ Me.gbEMTorqueLimits.SuspendLayout
Me.SuspendLayout
'
'Label1
'
Me.Label1.AutoSize = true
- Me.Label1.Location = New System.Drawing.Point(9, 34)
- Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label1.Location = New System.Drawing.Point(6, 22)
Me.Label1.Name = "Label1"
- Me.Label1.Size = New System.Drawing.Size(264, 20)
+ Me.Label1.Size = New System.Drawing.Size(177, 13)
Me.Label1.TabIndex = 0
Me.Label1.Text = "Corrected Actual Curb Mass Vehicle"
'
'TbMass
'
- Me.TbMass.Location = New System.Drawing.Point(282, 29)
- Me.TbMass.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TbMass.Location = New System.Drawing.Point(188, 19)
Me.TbMass.Name = "TbMass"
- Me.TbMass.Size = New System.Drawing.Size(84, 26)
+ Me.TbMass.Size = New System.Drawing.Size(57, 20)
Me.TbMass.TabIndex = 0
'
'Label2
'
Me.Label2.AutoSize = true
- Me.Label2.Location = New System.Drawing.Point(192, 48)
- Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label2.Location = New System.Drawing.Point(128, 31)
Me.Label2.Name = "Label2"
- Me.Label2.Size = New System.Drawing.Size(66, 20)
+ Me.Label2.Size = New System.Drawing.Size(45, 13)
Me.Label2.TabIndex = 2
Me.Label2.Text = "Loading"
'
'TbLoad
'
- Me.TbLoad.Location = New System.Drawing.Point(273, 43)
- Me.TbLoad.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TbLoad.Location = New System.Drawing.Point(182, 28)
Me.TbLoad.Name = "TbLoad"
- Me.TbLoad.Size = New System.Drawing.Size(84, 26)
+ Me.TbLoad.Size = New System.Drawing.Size(57, 20)
Me.TbLoad.TabIndex = 1
'
'Label3
'
Me.Label3.AutoSize = true
- Me.Label3.Location = New System.Drawing.Point(112, 9)
- Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label3.Location = New System.Drawing.Point(75, 6)
Me.Label3.Name = "Label3"
- Me.Label3.Size = New System.Drawing.Size(55, 20)
+ Me.Label3.Size = New System.Drawing.Size(38, 13)
Me.Label3.TabIndex = 8
Me.Label3.Text = "Cd x A"
'
'TBcdA
'
- Me.TBcdA.Location = New System.Drawing.Point(178, 5)
- Me.TBcdA.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TBcdA.Location = New System.Drawing.Point(119, 3)
Me.TBcdA.Name = "TBcdA"
- Me.TBcdA.Size = New System.Drawing.Size(84, 26)
+ Me.TBcdA.Size = New System.Drawing.Size(57, 20)
Me.TBcdA.TabIndex = 0
'
'Label13
'
Me.Label13.AutoSize = true
- Me.Label13.Location = New System.Drawing.Point(204, 9)
- Me.Label13.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label13.Location = New System.Drawing.Point(136, 6)
Me.Label13.Name = "Label13"
- Me.Label13.Size = New System.Drawing.Size(59, 20)
+ Me.Label13.Size = New System.Drawing.Size(40, 13)
Me.Label13.TabIndex = 6
Me.Label13.Text = "Radius"
'
'TBrdyn
'
- Me.TBrdyn.Location = New System.Drawing.Point(278, 5)
- Me.TBrdyn.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TBrdyn.Location = New System.Drawing.Point(185, 3)
Me.TBrdyn.Name = "TBrdyn"
- Me.TBrdyn.Size = New System.Drawing.Size(84, 26)
+ Me.TBrdyn.Size = New System.Drawing.Size(57, 20)
Me.TBrdyn.TabIndex = 0
'
'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(646, 862)
- Me.ButOK.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.ButOK.Location = New System.Drawing.Point(431, 560)
Me.ButOK.Name = "ButOK"
- Me.ButOK.Size = New System.Drawing.Size(112, 35)
+ Me.ButOK.Size = New System.Drawing.Size(75, 23)
Me.ButOK.TabIndex = 5
Me.ButOK.Text = "Save"
Me.ButOK.UseVisualStyleBackColor = true
@@ -308,10 +302,9 @@ Partial Class VehicleForm
'
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(768, 862)
- Me.ButCancel.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.ButCancel.Location = New System.Drawing.Point(512, 560)
Me.ButCancel.Name = "ButCancel"
- Me.ButCancel.Size = New System.Drawing.Size(112, 35)
+ Me.ButCancel.Size = New System.Drawing.Size(75, 23)
Me.ButCancel.TabIndex = 6
Me.ButCancel.Text = "Cancel"
Me.ButCancel.UseVisualStyleBackColor = true
@@ -319,30 +312,27 @@ Partial Class VehicleForm
'Label14
'
Me.Label14.AutoSize = true
- Me.Label14.Location = New System.Drawing.Point(370, 34)
- Me.Label14.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label14.Location = New System.Drawing.Point(247, 22)
Me.Label14.Name = "Label14"
- Me.Label14.Size = New System.Drawing.Size(34, 20)
+ Me.Label14.Size = New System.Drawing.Size(25, 13)
Me.Label14.TabIndex = 24
Me.Label14.Text = "[kg]"
'
'Label31
'
Me.Label31.AutoSize = true
- Me.Label31.Location = New System.Drawing.Point(362, 48)
- Me.Label31.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label31.Location = New System.Drawing.Point(241, 31)
Me.Label31.Name = "Label31"
- Me.Label31.Size = New System.Drawing.Size(34, 20)
+ Me.Label31.Size = New System.Drawing.Size(25, 13)
Me.Label31.TabIndex = 24
Me.Label31.Text = "[kg]"
'
'Label35
'
Me.Label35.AutoSize = true
- Me.Label35.Location = New System.Drawing.Point(366, 9)
- Me.Label35.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label35.Location = New System.Drawing.Point(244, 6)
Me.Label35.Name = "Label35"
- Me.Label35.Size = New System.Drawing.Size(43, 20)
+ Me.Label35.Size = New System.Drawing.Size(29, 13)
Me.Label35.TabIndex = 24
Me.Label35.Text = "[mm]"
'
@@ -351,20 +341,18 @@ Partial Class VehicleForm
Me.CbCdMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
Me.CbCdMode.FormattingEnabled = true
Me.CbCdMode.Items.AddRange(New Object() {"No Correction", "Speed dependent (User-defined)", "Speed dependent (Declaration Mode)", "Vair & Beta Input"})
- Me.CbCdMode.Location = New System.Drawing.Point(9, 29)
- Me.CbCdMode.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.CbCdMode.Location = New System.Drawing.Point(6, 19)
Me.CbCdMode.Name = "CbCdMode"
- Me.CbCdMode.Size = New System.Drawing.Size(398, 28)
+ Me.CbCdMode.Size = New System.Drawing.Size(267, 21)
Me.CbCdMode.TabIndex = 0
'
'TbCdFile
'
Me.TbCdFile.Anchor = System.Windows.Forms.AnchorStyles.None
Me.TbCdFile.Enabled = false
- Me.TbCdFile.Location = New System.Drawing.Point(14, 100)
- Me.TbCdFile.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TbCdFile.Location = New System.Drawing.Point(9, 65)
Me.TbCdFile.Name = "TbCdFile"
- Me.TbCdFile.Size = New System.Drawing.Size(313, 26)
+ Me.TbCdFile.Size = New System.Drawing.Size(210, 20)
Me.TbCdFile.TabIndex = 1
'
'BtCdFileBrowse
@@ -372,10 +360,9 @@ Partial Class VehicleForm
Me.BtCdFileBrowse.Anchor = System.Windows.Forms.AnchorStyles.None
Me.BtCdFileBrowse.Enabled = false
Me.BtCdFileBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.BtCdFileBrowse.Location = New System.Drawing.Point(338, 95)
- Me.BtCdFileBrowse.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.BtCdFileBrowse.Location = New System.Drawing.Point(225, 62)
Me.BtCdFileBrowse.Name = "BtCdFileBrowse"
- Me.BtCdFileBrowse.Size = New System.Drawing.Size(36, 37)
+ Me.BtCdFileBrowse.Size = New System.Drawing.Size(24, 24)
Me.BtCdFileBrowse.TabIndex = 2
Me.BtCdFileBrowse.UseVisualStyleBackColor = true
'
@@ -386,11 +373,9 @@ Partial Class VehicleForm
Me.GroupBox6.Controls.Add(Me.CbCdMode)
Me.GroupBox6.Controls.Add(Me.BtCdFileBrowse)
Me.GroupBox6.Controls.Add(Me.TbCdFile)
- Me.GroupBox6.Location = New System.Drawing.Point(435, 129)
- Me.GroupBox6.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox6.Location = New System.Drawing.Point(290, 84)
Me.GroupBox6.Name = "GroupBox6"
- Me.GroupBox6.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.GroupBox6.Size = New System.Drawing.Size(422, 148)
+ Me.GroupBox6.Size = New System.Drawing.Size(281, 96)
Me.GroupBox6.TabIndex = 5
Me.GroupBox6.TabStop = false
Me.GroupBox6.Text = "Cross Wind Correction"
@@ -400,10 +385,9 @@ Partial Class VehicleForm
Me.BtCdFileOpen.Anchor = System.Windows.Forms.AnchorStyles.None
Me.BtCdFileOpen.Enabled = false
Me.BtCdFileOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.BtCdFileOpen.Location = New System.Drawing.Point(374, 95)
- Me.BtCdFileOpen.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.BtCdFileOpen.Location = New System.Drawing.Point(249, 62)
Me.BtCdFileOpen.Name = "BtCdFileOpen"
- Me.BtCdFileOpen.Size = New System.Drawing.Size(36, 37)
+ Me.BtCdFileOpen.Size = New System.Drawing.Size(24, 24)
Me.BtCdFileOpen.TabIndex = 3
Me.BtCdFileOpen.TabStop = false
Me.BtCdFileOpen.UseVisualStyleBackColor = true
@@ -411,10 +395,9 @@ Partial Class VehicleForm
'LbCdMode
'
Me.LbCdMode.AutoSize = true
- Me.LbCdMode.Location = New System.Drawing.Point(9, 72)
- Me.LbCdMode.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.LbCdMode.Location = New System.Drawing.Point(6, 47)
Me.LbCdMode.Name = "LbCdMode"
- Me.LbCdMode.Size = New System.Drawing.Size(87, 20)
+ Me.LbCdMode.Size = New System.Drawing.Size(59, 13)
Me.LbCdMode.TabIndex = 28
Me.LbCdMode.Text = "LbCdMode"
Me.LbCdMode.TextAlign = System.Drawing.ContentAlignment.TopRight
@@ -426,8 +409,8 @@ Partial Class VehicleForm
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.Padding = New System.Windows.Forms.Padding(0, 0, 3, 0)
- Me.ToolStrip1.Size = New System.Drawing.Size(898, 31)
+ Me.ToolStrip1.Padding = New System.Windows.Forms.Padding(0, 0, 2, 0)
+ Me.ToolStrip1.Size = New System.Drawing.Size(599, 31)
Me.ToolStrip1.TabIndex = 29
Me.ToolStrip1.Text = "ToolStrip1"
'
@@ -504,11 +487,9 @@ Partial Class VehicleForm
'
Me.GroupBox7.Controls.Add(Me.PnRt)
Me.GroupBox7.Controls.Add(Me.CbRtType)
- Me.GroupBox7.Location = New System.Drawing.Point(9, 117)
- Me.GroupBox7.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox7.Location = New System.Drawing.Point(6, 76)
Me.GroupBox7.Name = "GroupBox7"
- Me.GroupBox7.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.GroupBox7.Size = New System.Drawing.Size(418, 171)
+ Me.GroupBox7.Size = New System.Drawing.Size(279, 111)
Me.GroupBox7.TabIndex = 3
Me.GroupBox7.TabStop = false
Me.GroupBox7.Text = "Retarder Losses"
@@ -521,18 +502,16 @@ Partial Class VehicleForm
Me.PnRt.Controls.Add(Me.Label45)
Me.PnRt.Controls.Add(Me.LbRtRatio)
Me.PnRt.Controls.Add(Me.TbRtRatio)
- Me.PnRt.Location = New System.Drawing.Point(4, 65)
- Me.PnRt.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.PnRt.Location = New System.Drawing.Point(3, 42)
Me.PnRt.Name = "PnRt"
- Me.PnRt.Size = New System.Drawing.Size(402, 97)
+ Me.PnRt.Size = New System.Drawing.Size(268, 63)
Me.PnRt.TabIndex = 1
'
'Label15
'
- Me.Label15.Location = New System.Drawing.Point(9, 35)
- Me.Label15.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label15.Location = New System.Drawing.Point(6, 23)
Me.Label15.Name = "Label15"
- Me.Label15.Size = New System.Drawing.Size(302, 25)
+ Me.Label15.Size = New System.Drawing.Size(201, 16)
Me.Label15.TabIndex = 15
Me.Label15.Text = "Retarder Loss Map"
Me.Label15.TextAlign = System.Drawing.ContentAlignment.BottomLeft
@@ -541,39 +520,35 @@ Partial Class VehicleForm
'
Me.BtRtBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
Me.BtRtBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.BtRtBrowse.Location = New System.Drawing.Point(354, 60)
- Me.BtRtBrowse.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.BtRtBrowse.Location = New System.Drawing.Point(236, 39)
Me.BtRtBrowse.Name = "BtRtBrowse"
- Me.BtRtBrowse.Size = New System.Drawing.Size(36, 37)
+ Me.BtRtBrowse.Size = New System.Drawing.Size(24, 24)
Me.BtRtBrowse.TabIndex = 14
Me.BtRtBrowse.UseVisualStyleBackColor = true
'
'TbRtPath
'
Me.TbRtPath.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
- Me.TbRtPath.Location = New System.Drawing.Point(9, 63)
- Me.TbRtPath.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TbRtPath.Location = New System.Drawing.Point(6, 41)
Me.TbRtPath.Name = "TbRtPath"
- Me.TbRtPath.Size = New System.Drawing.Size(334, 26)
+ Me.TbRtPath.Size = New System.Drawing.Size(224, 20)
Me.TbRtPath.TabIndex = 13
'
'Label45
'
Me.Label45.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.Label45.AutoSize = true
- Me.Label45.Location = New System.Drawing.Point(348, 8)
- Me.Label45.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label45.Location = New System.Drawing.Point(232, 5)
Me.Label45.Name = "Label45"
- Me.Label45.Size = New System.Drawing.Size(22, 20)
+ Me.Label45.Size = New System.Drawing.Size(16, 13)
Me.Label45.TabIndex = 10
Me.Label45.Text = "[-]"
'
'LbRtRatio
'
- Me.LbRtRatio.Location = New System.Drawing.Point(6, 8)
- Me.LbRtRatio.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.LbRtRatio.Location = New System.Drawing.Point(4, 5)
Me.LbRtRatio.Name = "LbRtRatio"
- Me.LbRtRatio.Size = New System.Drawing.Size(250, 26)
+ Me.LbRtRatio.Size = New System.Drawing.Size(167, 17)
Me.LbRtRatio.TabIndex = 5
Me.LbRtRatio.Text = "Ratio"
Me.LbRtRatio.TextAlign = System.Drawing.ContentAlignment.TopRight
@@ -581,10 +556,9 @@ Partial Class VehicleForm
'TbRtRatio
'
Me.TbRtRatio.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.TbRtRatio.Location = New System.Drawing.Point(261, 5)
- Me.TbRtRatio.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TbRtRatio.Location = New System.Drawing.Point(174, 3)
Me.TbRtRatio.Name = "TbRtRatio"
- Me.TbRtRatio.Size = New System.Drawing.Size(82, 26)
+ Me.TbRtRatio.Size = New System.Drawing.Size(56, 20)
Me.TbRtRatio.TabIndex = 0
'
'CbRtType
@@ -592,38 +566,34 @@ Partial Class VehicleForm
Me.CbRtType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
Me.CbRtType.FormattingEnabled = true
Me.CbRtType.Items.AddRange(New Object() {"Included in Transmission Loss Maps", "Primary Retarder", "Secondary Retarder"})
- Me.CbRtType.Location = New System.Drawing.Point(9, 29)
- Me.CbRtType.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.CbRtType.Location = New System.Drawing.Point(6, 19)
Me.CbRtType.Name = "CbRtType"
- Me.CbRtType.Size = New System.Drawing.Size(397, 28)
+ Me.CbRtType.Size = New System.Drawing.Size(266, 21)
Me.CbRtType.TabIndex = 0
'
'Label46
'
Me.Label46.AutoSize = true
- Me.Label46.Location = New System.Drawing.Point(48, 8)
- Me.Label46.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label46.Location = New System.Drawing.Point(32, 5)
Me.Label46.Name = "Label46"
- Me.Label46.Size = New System.Drawing.Size(213, 20)
+ Me.Label46.Size = New System.Drawing.Size(145, 13)
Me.Label46.TabIndex = 31
Me.Label46.Text = "Curb Mass Extra Trailer/Body"
'
'Label50
'
Me.Label50.AutoSize = true
- Me.Label50.Location = New System.Drawing.Point(362, 8)
- Me.Label50.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label50.Location = New System.Drawing.Point(241, 5)
Me.Label50.Name = "Label50"
- Me.Label50.Size = New System.Drawing.Size(34, 20)
+ Me.Label50.Size = New System.Drawing.Size(25, 13)
Me.Label50.TabIndex = 24
Me.Label50.Text = "[kg]"
'
'TbMassExtra
'
- Me.TbMassExtra.Location = New System.Drawing.Point(273, 3)
- Me.TbMassExtra.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TbMassExtra.Location = New System.Drawing.Point(182, 2)
Me.TbMassExtra.Name = "TbMassExtra"
- Me.TbMassExtra.Size = New System.Drawing.Size(84, 26)
+ Me.TbMassExtra.Size = New System.Drawing.Size(57, 20)
Me.TbMassExtra.TabIndex = 0
'
'GroupBox8
@@ -632,11 +602,9 @@ Partial Class VehicleForm
Me.GroupBox8.Controls.Add(Me.ButAxlRem)
Me.GroupBox8.Controls.Add(Me.LvRRC)
Me.GroupBox8.Controls.Add(Me.ButAxlAdd)
- Me.GroupBox8.Location = New System.Drawing.Point(9, 286)
- Me.GroupBox8.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox8.Location = New System.Drawing.Point(6, 186)
Me.GroupBox8.Name = "GroupBox8"
- Me.GroupBox8.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.GroupBox8.Size = New System.Drawing.Size(846, 232)
+ Me.GroupBox8.Size = New System.Drawing.Size(564, 151)
Me.GroupBox8.TabIndex = 2
Me.GroupBox8.TabStop = false
Me.GroupBox8.Text = "Axles / Wheels"
@@ -644,20 +612,18 @@ Partial Class VehicleForm
'Label6
'
Me.Label6.AutoSize = true
- Me.Label6.Location = New System.Drawing.Point(675, 186)
- Me.Label6.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label6.Location = New System.Drawing.Point(450, 121)
Me.Label6.Name = "Label6"
- Me.Label6.Size = New System.Drawing.Size(158, 20)
+ Me.Label6.Size = New System.Drawing.Size(106, 13)
Me.Label6.TabIndex = 3
Me.Label6.Text = "(Double-Click to Edit)"
'
'ButAxlRem
'
Me.ButAxlRem.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
- Me.ButAxlRem.Location = New System.Drawing.Point(44, 188)
- Me.ButAxlRem.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.ButAxlRem.Location = New System.Drawing.Point(29, 122)
Me.ButAxlRem.Name = "ButAxlRem"
- Me.ButAxlRem.Size = New System.Drawing.Size(36, 37)
+ Me.ButAxlRem.Size = New System.Drawing.Size(24, 24)
Me.ButAxlRem.TabIndex = 2
Me.ButAxlRem.UseVisualStyleBackColor = true
'
@@ -669,11 +635,10 @@ Partial Class VehicleForm
Me.LvRRC.FullRowSelect = true
Me.LvRRC.GridLines = true
Me.LvRRC.HideSelection = false
- Me.LvRRC.Location = New System.Drawing.Point(9, 29)
- Me.LvRRC.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.LvRRC.Location = New System.Drawing.Point(6, 19)
Me.LvRRC.MultiSelect = false
Me.LvRRC.Name = "LvRRC"
- Me.LvRRC.Size = New System.Drawing.Size(826, 155)
+ Me.LvRRC.Size = New System.Drawing.Size(552, 102)
Me.LvRRC.TabIndex = 0
Me.LvRRC.TabStop = false
Me.LvRRC.UseCompatibleStateImageBehavior = false
@@ -721,10 +686,9 @@ Partial Class VehicleForm
'ButAxlAdd
'
Me.ButAxlAdd.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
- Me.ButAxlAdd.Location = New System.Drawing.Point(8, 188)
- Me.ButAxlAdd.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.ButAxlAdd.Location = New System.Drawing.Point(5, 122)
Me.ButAxlAdd.Name = "ButAxlAdd"
- Me.ButAxlAdd.Size = New System.Drawing.Size(36, 37)
+ Me.ButAxlAdd.Size = New System.Drawing.Size(24, 24)
Me.ButAxlAdd.TabIndex = 1
Me.ButAxlAdd.UseVisualStyleBackColor = true
'
@@ -734,10 +698,9 @@ Partial Class VehicleForm
Me.PnWheelDiam.Controls.Add(Me.TBrdyn)
Me.PnWheelDiam.Controls.Add(Me.Label35)
Me.PnWheelDiam.Dock = System.Windows.Forms.DockStyle.Fill
- Me.PnWheelDiam.Location = New System.Drawing.Point(4, 24)
- Me.PnWheelDiam.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.PnWheelDiam.Location = New System.Drawing.Point(3, 16)
Me.PnWheelDiam.Name = "PnWheelDiam"
- Me.PnWheelDiam.Size = New System.Drawing.Size(409, 48)
+ Me.PnWheelDiam.Size = New System.Drawing.Size(272, 31)
Me.PnWheelDiam.TabIndex = 5
'
'CbAxleConfig
@@ -745,10 +708,9 @@ Partial Class VehicleForm
Me.CbAxleConfig.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
Me.CbAxleConfig.FormattingEnabled = true
Me.CbAxleConfig.Items.AddRange(New Object() {"-", "4x2", "4x4", "6x2", "6x4", "6x6", "8x2", "8x4", "8x6", "8x8"})
- Me.CbAxleConfig.Location = New System.Drawing.Point(230, 123)
- Me.CbAxleConfig.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.CbAxleConfig.Location = New System.Drawing.Point(153, 80)
Me.CbAxleConfig.Name = "CbAxleConfig"
- Me.CbAxleConfig.Size = New System.Drawing.Size(88, 28)
+ Me.CbAxleConfig.Size = New System.Drawing.Size(60, 21)
Me.CbAxleConfig.TabIndex = 1
'
'CbCat
@@ -756,49 +718,44 @@ Partial Class VehicleForm
Me.CbCat.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
Me.CbCat.FormattingEnabled = true
Me.CbCat.Items.AddRange(New Object() {"-", "Rigid Truck", "Tractor", "City Bus", "Interurban Bus", "Coach"})
- Me.CbCat.Location = New System.Drawing.Point(18, 123)
- Me.CbCat.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.CbCat.Location = New System.Drawing.Point(12, 80)
Me.CbCat.Name = "CbCat"
- Me.CbCat.Size = New System.Drawing.Size(200, 28)
+ Me.CbCat.Size = New System.Drawing.Size(135, 21)
Me.CbCat.TabIndex = 0
'
'Label5
'
Me.Label5.AutoSize = true
- Me.Label5.Location = New System.Drawing.Point(46, 166)
- Me.Label5.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label5.Location = New System.Drawing.Point(31, 108)
Me.Label5.Name = "Label5"
- Me.Label5.Size = New System.Drawing.Size(170, 20)
+ Me.Label5.Size = New System.Drawing.Size(116, 13)
Me.Label5.TabIndex = 2
Me.Label5.Text = "Technically Permissible"
'
'Label9
'
Me.Label9.AutoSize = true
- Me.Label9.Location = New System.Drawing.Point(296, 175)
- Me.Label9.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label9.Location = New System.Drawing.Point(197, 114)
Me.Label9.Name = "Label9"
- Me.Label9.Size = New System.Drawing.Size(22, 20)
+ Me.Label9.Size = New System.Drawing.Size(16, 13)
Me.Label9.TabIndex = 3
Me.Label9.Text = "[t]"
Me.Label9.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
'
'TbMassMass
'
- Me.TbMassMass.Location = New System.Drawing.Point(230, 171)
- Me.TbMassMass.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TbMassMass.Location = New System.Drawing.Point(153, 111)
Me.TbMassMass.Name = "TbMassMass"
- Me.TbMassMass.Size = New System.Drawing.Size(61, 26)
+ Me.TbMassMass.Size = New System.Drawing.Size(42, 20)
Me.TbMassMass.TabIndex = 2
'
'StatusStrip1
'
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, 913)
+ Me.StatusStrip1.Location = New System.Drawing.Point(0, 586)
Me.StatusStrip1.Name = "StatusStrip1"
- Me.StatusStrip1.Padding = New System.Windows.Forms.Padding(2, 0, 21, 0)
- Me.StatusStrip1.Size = New System.Drawing.Size(898, 22)
+ Me.StatusStrip1.Size = New System.Drawing.Size(599, 22)
Me.StatusStrip1.SizingGrip = false
Me.StatusStrip1.TabIndex = 36
Me.StatusStrip1.Text = "StatusStrip1"
@@ -811,11 +768,10 @@ Partial Class VehicleForm
'
'TbHDVclass
'
- Me.TbHDVclass.Location = New System.Drawing.Point(230, 217)
- Me.TbHDVclass.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TbHDVclass.Location = New System.Drawing.Point(153, 141)
Me.TbHDVclass.Name = "TbHDVclass"
Me.TbHDVclass.ReadOnly = true
- Me.TbHDVclass.Size = New System.Drawing.Size(61, 26)
+ Me.TbHDVclass.Size = New System.Drawing.Size(42, 20)
Me.TbHDVclass.TabIndex = 3
Me.TbHDVclass.TabStop = false
Me.TbHDVclass.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
@@ -826,11 +782,9 @@ Partial Class VehicleForm
Me.GroupBox1.Controls.Add(Me.TbMass)
Me.GroupBox1.Controls.Add(Me.Label1)
Me.GroupBox1.Controls.Add(Me.Label14)
- Me.GroupBox1.Location = New System.Drawing.Point(9, 9)
- Me.GroupBox1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox1.Location = New System.Drawing.Point(6, 6)
Me.GroupBox1.Name = "GroupBox1"
- Me.GroupBox1.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.GroupBox1.Size = New System.Drawing.Size(417, 182)
+ Me.GroupBox1.Size = New System.Drawing.Size(278, 118)
Me.GroupBox1.TabIndex = 0
Me.GroupBox1.TabStop = false
Me.GroupBox1.Text = "Masses / Loading"
@@ -843,20 +797,17 @@ Partial Class VehicleForm
Me.PnLoad.Controls.Add(Me.TbMassExtra)
Me.PnLoad.Controls.Add(Me.Label50)
Me.PnLoad.Controls.Add(Me.Label46)
- Me.PnLoad.Location = New System.Drawing.Point(9, 66)
- Me.PnLoad.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.PnLoad.Location = New System.Drawing.Point(6, 43)
Me.PnLoad.Name = "PnLoad"
- Me.PnLoad.Size = New System.Drawing.Size(404, 89)
+ Me.PnLoad.Size = New System.Drawing.Size(269, 58)
Me.PnLoad.TabIndex = 1
'
'GrAirRes
'
Me.GrAirRes.Controls.Add(Me.PnCdATrTr)
- Me.GrAirRes.Location = New System.Drawing.Point(435, 9)
- Me.GrAirRes.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GrAirRes.Location = New System.Drawing.Point(290, 6)
Me.GrAirRes.Name = "GrAirRes"
- Me.GrAirRes.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.GrAirRes.Size = New System.Drawing.Size(420, 111)
+ Me.GrAirRes.Size = New System.Drawing.Size(280, 72)
Me.GrAirRes.TabIndex = 1
Me.GrAirRes.TabStop = false
Me.GrAirRes.Text = "Air Resistance"
@@ -870,47 +821,42 @@ Partial Class VehicleForm
Me.PnCdATrTr.Controls.Add(Me.Label38)
Me.PnCdATrTr.Controls.Add(Me.Label3)
Me.PnCdATrTr.Dock = System.Windows.Forms.DockStyle.Fill
- Me.PnCdATrTr.Location = New System.Drawing.Point(4, 24)
- Me.PnCdATrTr.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.PnCdATrTr.Location = New System.Drawing.Point(3, 16)
Me.PnCdATrTr.Name = "PnCdATrTr"
- Me.PnCdATrTr.Size = New System.Drawing.Size(412, 82)
+ Me.PnCdATrTr.Size = New System.Drawing.Size(274, 53)
Me.PnCdATrTr.TabIndex = 0
'
'tbVehicleHeight
'
- Me.tbVehicleHeight.Location = New System.Drawing.Point(178, 45)
- Me.tbVehicleHeight.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbVehicleHeight.Location = New System.Drawing.Point(119, 29)
Me.tbVehicleHeight.Name = "tbVehicleHeight"
- Me.tbVehicleHeight.Size = New System.Drawing.Size(84, 26)
+ Me.tbVehicleHeight.Size = New System.Drawing.Size(57, 20)
Me.tbVehicleHeight.TabIndex = 25
'
'Label11
'
Me.Label11.AutoSize = true
- Me.Label11.Location = New System.Drawing.Point(273, 49)
- Me.Label11.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label11.Location = New System.Drawing.Point(182, 32)
Me.Label11.Name = "Label11"
- Me.Label11.Size = New System.Drawing.Size(30, 20)
+ Me.Label11.Size = New System.Drawing.Size(21, 13)
Me.Label11.TabIndex = 27
Me.Label11.Text = "[m]"
'
'Label20
'
Me.Label20.AutoSize = true
- Me.Label20.Location = New System.Drawing.Point(112, 49)
- Me.Label20.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label20.Location = New System.Drawing.Point(75, 32)
Me.Label20.Name = "Label20"
- Me.Label20.Size = New System.Drawing.Size(56, 20)
+ Me.Label20.Size = New System.Drawing.Size(38, 13)
Me.Label20.TabIndex = 26
Me.Label20.Text = "Height"
'
'Label38
'
Me.Label38.AutoSize = true
- Me.Label38.Location = New System.Drawing.Point(273, 9)
- Me.Label38.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label38.Location = New System.Drawing.Point(182, 6)
Me.Label38.Name = "Label38"
- Me.Label38.Size = New System.Drawing.Size(35, 20)
+ Me.Label38.Size = New System.Drawing.Size(24, 13)
Me.Label38.TabIndex = 24
Me.Label38.Text = "[m²]"
'
@@ -918,10 +864,9 @@ Partial Class VehicleForm
'
Me.PictureBox1.BackColor = System.Drawing.Color.White
Me.PictureBox1.Image = Global.TUGraz.VECTO.My.Resources.Resources.VECTO_VEH
- Me.PictureBox1.Location = New System.Drawing.Point(0, 43)
- Me.PictureBox1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.PictureBox1.Location = New System.Drawing.Point(0, 28)
Me.PictureBox1.Name = "PictureBox1"
- Me.PictureBox1.Size = New System.Drawing.Size(906, 62)
+ Me.PictureBox1.Size = New System.Drawing.Size(604, 40)
Me.PictureBox1.TabIndex = 37
Me.PictureBox1.TabStop = false
'
@@ -949,11 +894,9 @@ Partial Class VehicleForm
'
Me.gbPTO.Controls.Add(Me.pnPTO)
Me.gbPTO.Controls.Add(Me.cbPTOType)
- Me.gbPTO.Location = New System.Drawing.Point(9, 297)
- Me.gbPTO.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbPTO.Location = New System.Drawing.Point(6, 193)
Me.gbPTO.Name = "gbPTO"
- Me.gbPTO.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.gbPTO.Size = New System.Drawing.Size(846, 132)
+ Me.gbPTO.Size = New System.Drawing.Size(564, 86)
Me.gbPTO.TabIndex = 4
Me.gbPTO.TabStop = false
Me.gbPTO.Text = "PTO Transmission"
@@ -967,30 +910,27 @@ Partial Class VehicleForm
Me.pnPTO.Controls.Add(Me.Label7)
Me.pnPTO.Controls.Add(Me.tbPTOLossMap)
Me.pnPTO.Dock = System.Windows.Forms.DockStyle.Bottom
- Me.pnPTO.Location = New System.Drawing.Point(4, 64)
- Me.pnPTO.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.pnPTO.Location = New System.Drawing.Point(3, 42)
Me.pnPTO.Name = "pnPTO"
- Me.pnPTO.Size = New System.Drawing.Size(838, 63)
+ Me.pnPTO.Size = New System.Drawing.Size(558, 41)
Me.pnPTO.TabIndex = 4
'
'btPTOCycle
'
Me.btPTOCycle.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
Me.btPTOCycle.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btPTOCycle.Location = New System.Drawing.Point(794, 25)
- Me.btPTOCycle.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btPTOCycle.Location = New System.Drawing.Point(529, 16)
Me.btPTOCycle.Name = "btPTOCycle"
- Me.btPTOCycle.Size = New System.Drawing.Size(36, 37)
+ Me.btPTOCycle.Size = New System.Drawing.Size(24, 24)
Me.btPTOCycle.TabIndex = 17
Me.btPTOCycle.UseVisualStyleBackColor = true
'
'Label16
'
Me.Label16.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
- Me.Label16.Location = New System.Drawing.Point(430, -2)
- Me.Label16.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label16.Location = New System.Drawing.Point(287, -1)
Me.Label16.Name = "Label16"
- Me.Label16.Size = New System.Drawing.Size(302, 25)
+ Me.Label16.Size = New System.Drawing.Size(201, 16)
Me.Label16.TabIndex = 18
Me.Label16.Text = "PTO Cycle (.vptoc)"
Me.Label16.TextAlign = System.Drawing.ContentAlignment.BottomLeft
@@ -998,10 +938,9 @@ Partial Class VehicleForm
'tbPTOCycle
'
Me.tbPTOCycle.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
- Me.tbPTOCycle.Location = New System.Drawing.Point(435, 28)
- Me.tbPTOCycle.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbPTOCycle.Location = New System.Drawing.Point(290, 18)
Me.tbPTOCycle.Name = "tbPTOCycle"
- Me.tbPTOCycle.Size = New System.Drawing.Size(356, 26)
+ Me.tbPTOCycle.Size = New System.Drawing.Size(239, 20)
Me.tbPTOCycle.TabIndex = 16
Me.ToolTip1.SetToolTip(Me.tbPTOCycle, "PTO Consumer Loss Map")
'
@@ -1009,20 +948,18 @@ Partial Class VehicleForm
'
Me.btPTOLossMapBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
Me.btPTOLossMapBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btPTOLossMapBrowse.Location = New System.Drawing.Point(368, 25)
- Me.btPTOLossMapBrowse.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btPTOLossMapBrowse.Location = New System.Drawing.Point(245, 16)
Me.btPTOLossMapBrowse.Name = "btPTOLossMapBrowse"
- Me.btPTOLossMapBrowse.Size = New System.Drawing.Size(36, 37)
+ Me.btPTOLossMapBrowse.Size = New System.Drawing.Size(24, 24)
Me.btPTOLossMapBrowse.TabIndex = 14
Me.btPTOLossMapBrowse.UseVisualStyleBackColor = true
'
'Label7
'
Me.Label7.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
- Me.Label7.Location = New System.Drawing.Point(4, -2)
- Me.Label7.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label7.Location = New System.Drawing.Point(3, -1)
Me.Label7.Name = "Label7"
- Me.Label7.Size = New System.Drawing.Size(302, 25)
+ Me.Label7.Size = New System.Drawing.Size(201, 16)
Me.Label7.TabIndex = 15
Me.Label7.Text = "PTO Consumer Loss Map (.vptol)"
Me.Label7.TextAlign = System.Drawing.ContentAlignment.BottomLeft
@@ -1030,31 +967,27 @@ Partial Class VehicleForm
'tbPTOLossMap
'
Me.tbPTOLossMap.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
- Me.tbPTOLossMap.Location = New System.Drawing.Point(9, 28)
- Me.tbPTOLossMap.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbPTOLossMap.Location = New System.Drawing.Point(6, 18)
Me.tbPTOLossMap.Name = "tbPTOLossMap"
- Me.tbPTOLossMap.Size = New System.Drawing.Size(356, 26)
+ Me.tbPTOLossMap.Size = New System.Drawing.Size(239, 20)
Me.tbPTOLossMap.TabIndex = 13
Me.ToolTip1.SetToolTip(Me.tbPTOLossMap, "PTO Consumer Loss Map")
'
'cbPTOType
'
Me.cbPTOType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
- Me.cbPTOType.Location = New System.Drawing.Point(9, 26)
- Me.cbPTOType.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.cbPTOType.Location = New System.Drawing.Point(6, 17)
Me.cbPTOType.Name = "cbPTOType"
- Me.cbPTOType.Size = New System.Drawing.Size(823, 28)
+ Me.cbPTOType.Size = New System.Drawing.Size(550, 21)
Me.cbPTOType.TabIndex = 0
Me.ToolTip1.SetToolTip(Me.cbPTOType, "Transmission type to the PTO consumer")
'
'GroupBox3
'
Me.GroupBox3.Controls.Add(Me.PnWheelDiam)
- Me.GroupBox3.Location = New System.Drawing.Point(9, 200)
- Me.GroupBox3.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox3.Location = New System.Drawing.Point(6, 130)
Me.GroupBox3.Name = "GroupBox3"
- Me.GroupBox3.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.GroupBox3.Size = New System.Drawing.Size(417, 77)
+ Me.GroupBox3.Size = New System.Drawing.Size(278, 50)
Me.GroupBox3.TabIndex = 6
Me.GroupBox3.TabStop = false
Me.GroupBox3.Text = "Dynamic Tyre Radius"
@@ -1063,11 +996,9 @@ Partial Class VehicleForm
'
Me.GroupBox2.Controls.Add(Me.pnAngledriveFields)
Me.GroupBox2.Controls.Add(Me.cbAngledriveType)
- Me.GroupBox2.Location = New System.Drawing.Point(436, 117)
- Me.GroupBox2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox2.Location = New System.Drawing.Point(291, 76)
Me.GroupBox2.Name = "GroupBox2"
- Me.GroupBox2.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.GroupBox2.Size = New System.Drawing.Size(423, 171)
+ Me.GroupBox2.Size = New System.Drawing.Size(282, 111)
Me.GroupBox2.TabIndex = 4
Me.GroupBox2.TabStop = false
Me.GroupBox2.Text = "Angledrive"
@@ -1080,39 +1011,35 @@ Partial Class VehicleForm
Me.pnAngledriveFields.Controls.Add(Me.tbAngledriveRatio)
Me.pnAngledriveFields.Controls.Add(Me.btAngledriveLossMapBrowse)
Me.pnAngledriveFields.Controls.Add(Me.tbAngledriveLossMapPath)
- Me.pnAngledriveFields.Location = New System.Drawing.Point(4, 65)
- Me.pnAngledriveFields.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.pnAngledriveFields.Location = New System.Drawing.Point(3, 42)
Me.pnAngledriveFields.Name = "pnAngledriveFields"
- Me.pnAngledriveFields.Size = New System.Drawing.Size(408, 97)
+ Me.pnAngledriveFields.Size = New System.Drawing.Size(272, 63)
Me.pnAngledriveFields.TabIndex = 6
'
'Label4
'
Me.Label4.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.Label4.AutoSize = true
- Me.Label4.Location = New System.Drawing.Point(369, 9)
- Me.Label4.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label4.Location = New System.Drawing.Point(246, 6)
Me.Label4.Name = "Label4"
- Me.Label4.Size = New System.Drawing.Size(22, 20)
+ Me.Label4.Size = New System.Drawing.Size(16, 13)
Me.Label4.TabIndex = 16
Me.Label4.Text = "[-]"
'
'Label12
'
- Me.Label12.Location = New System.Drawing.Point(9, 35)
- Me.Label12.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label12.Location = New System.Drawing.Point(6, 23)
Me.Label12.Name = "Label12"
- Me.Label12.Size = New System.Drawing.Size(394, 25)
+ Me.Label12.Size = New System.Drawing.Size(263, 16)
Me.Label12.TabIndex = 17
Me.Label12.Text = "Transmission Loss Map or Efficiency Value [0..1]"
Me.Label12.TextAlign = System.Drawing.ContentAlignment.BottomLeft
'
'Label10
'
- Me.Label10.Location = New System.Drawing.Point(208, 9)
- Me.Label10.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label10.Location = New System.Drawing.Point(139, 6)
Me.Label10.Name = "Label10"
- Me.Label10.Size = New System.Drawing.Size(66, 28)
+ Me.Label10.Size = New System.Drawing.Size(44, 18)
Me.Label10.TabIndex = 15
Me.Label10.Text = "Ratio"
Me.Label10.TextAlign = System.Drawing.ContentAlignment.TopRight
@@ -1120,50 +1047,45 @@ Partial Class VehicleForm
'tbAngledriveRatio
'
Me.tbAngledriveRatio.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.tbAngledriveRatio.Location = New System.Drawing.Point(282, 6)
- Me.tbAngledriveRatio.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbAngledriveRatio.Location = New System.Drawing.Point(188, 4)
Me.tbAngledriveRatio.Name = "tbAngledriveRatio"
- Me.tbAngledriveRatio.Size = New System.Drawing.Size(82, 26)
+ Me.tbAngledriveRatio.Size = New System.Drawing.Size(56, 20)
Me.tbAngledriveRatio.TabIndex = 12
'
'btAngledriveLossMapBrowse
'
Me.btAngledriveLossMapBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
Me.btAngledriveLossMapBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btAngledriveLossMapBrowse.Location = New System.Drawing.Point(368, 60)
- Me.btAngledriveLossMapBrowse.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btAngledriveLossMapBrowse.Location = New System.Drawing.Point(245, 39)
Me.btAngledriveLossMapBrowse.Name = "btAngledriveLossMapBrowse"
- Me.btAngledriveLossMapBrowse.Size = New System.Drawing.Size(36, 37)
+ Me.btAngledriveLossMapBrowse.Size = New System.Drawing.Size(24, 24)
Me.btAngledriveLossMapBrowse.TabIndex = 14
Me.btAngledriveLossMapBrowse.UseVisualStyleBackColor = true
'
'tbAngledriveLossMapPath
'
Me.tbAngledriveLossMapPath.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
- Me.tbAngledriveLossMapPath.Location = New System.Drawing.Point(9, 63)
- Me.tbAngledriveLossMapPath.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbAngledriveLossMapPath.Location = New System.Drawing.Point(6, 41)
Me.tbAngledriveLossMapPath.Name = "tbAngledriveLossMapPath"
- Me.tbAngledriveLossMapPath.Size = New System.Drawing.Size(356, 26)
+ Me.tbAngledriveLossMapPath.Size = New System.Drawing.Size(239, 20)
Me.tbAngledriveLossMapPath.TabIndex = 13
'
'cbAngledriveType
'
Me.cbAngledriveType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
Me.cbAngledriveType.FormattingEnabled = true
- Me.cbAngledriveType.Location = New System.Drawing.Point(9, 29)
- Me.cbAngledriveType.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.cbAngledriveType.Location = New System.Drawing.Point(6, 19)
Me.cbAngledriveType.Name = "cbAngledriveType"
- Me.cbAngledriveType.Size = New System.Drawing.Size(397, 28)
+ Me.cbAngledriveType.Size = New System.Drawing.Size(266, 21)
Me.cbAngledriveType.TabIndex = 0
'
'PicVehicle
'
Me.PicVehicle.BackColor = System.Drawing.Color.LightGray
Me.PicVehicle.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
- Me.PicVehicle.Location = New System.Drawing.Point(422, 108)
- Me.PicVehicle.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.PicVehicle.Location = New System.Drawing.Point(281, 70)
Me.PicVehicle.Name = "PicVehicle"
- Me.PicVehicle.Size = New System.Drawing.Size(449, 134)
+ Me.PicVehicle.Size = New System.Drawing.Size(300, 88)
Me.PicVehicle.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
Me.PicVehicle.TabIndex = 39
Me.PicVehicle.TabStop = false
@@ -1171,10 +1093,9 @@ Partial Class VehicleForm
'Label8
'
Me.Label8.AutoSize = true
- Me.Label8.Location = New System.Drawing.Point(128, 222)
- Me.Label8.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label8.Location = New System.Drawing.Point(85, 144)
Me.Label8.Name = "Label8"
- Me.Label8.Size = New System.Drawing.Size(93, 20)
+ Me.Label8.Size = New System.Drawing.Size(62, 13)
Me.Label8.TabIndex = 10
Me.Label8.Text = "HDV Group"
'
@@ -1185,11 +1106,10 @@ Partial Class VehicleForm
Me.tcVehicleComponents.Controls.Add(Me.tpElectricComponents)
Me.tcVehicleComponents.Controls.Add(Me.tpTorqueLimits)
Me.tcVehicleComponents.Controls.Add(Me.tpADAS)
- Me.tcVehicleComponents.Location = New System.Drawing.Point(9, 266)
- Me.tcVehicleComponents.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tcVehicleComponents.Location = New System.Drawing.Point(6, 173)
Me.tcVehicleComponents.Name = "tcVehicleComponents"
Me.tcVehicleComponents.SelectedIndex = 0
- Me.tcVehicleComponents.Size = New System.Drawing.Size(880, 586)
+ Me.tcVehicleComponents.Size = New System.Drawing.Size(587, 381)
Me.tcVehicleComponents.TabIndex = 40
'
'tpGeneral
@@ -1199,11 +1119,10 @@ Partial Class VehicleForm
Me.tpGeneral.Controls.Add(Me.GroupBox6)
Me.tpGeneral.Controls.Add(Me.GroupBox8)
Me.tpGeneral.Controls.Add(Me.GrAirRes)
- Me.tpGeneral.Location = New System.Drawing.Point(4, 29)
- Me.tpGeneral.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tpGeneral.Location = New System.Drawing.Point(4, 22)
Me.tpGeneral.Name = "tpGeneral"
- Me.tpGeneral.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.tpGeneral.Size = New System.Drawing.Size(872, 553)
+ Me.tpGeneral.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3)
+ Me.tpGeneral.Size = New System.Drawing.Size(579, 355)
Me.tpGeneral.TabIndex = 0
Me.tpGeneral.Text = "General"
Me.tpGeneral.UseVisualStyleBackColor = true
@@ -1215,11 +1134,10 @@ Partial Class VehicleForm
Me.tpPowertrain.Controls.Add(Me.gbPTO)
Me.tpPowertrain.Controls.Add(Me.GroupBox7)
Me.tpPowertrain.Controls.Add(Me.GroupBox2)
- Me.tpPowertrain.Location = New System.Drawing.Point(4, 29)
- Me.tpPowertrain.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tpPowertrain.Location = New System.Drawing.Point(4, 22)
Me.tpPowertrain.Name = "tpPowertrain"
- Me.tpPowertrain.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.tpPowertrain.Size = New System.Drawing.Size(872, 553)
+ Me.tpPowertrain.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3)
+ Me.tpPowertrain.Size = New System.Drawing.Size(579, 355)
Me.tpPowertrain.TabIndex = 1
Me.tpPowertrain.Text = "Powertrain"
Me.tpPowertrain.UseVisualStyleBackColor = true
@@ -1227,11 +1145,9 @@ Partial Class VehicleForm
'GroupBox4
'
Me.GroupBox4.Controls.Add(Me.Panel1)
- Me.GroupBox4.Location = New System.Drawing.Point(9, 11)
- Me.GroupBox4.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox4.Location = New System.Drawing.Point(6, 7)
Me.GroupBox4.Name = "GroupBox4"
- Me.GroupBox4.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.GroupBox4.Size = New System.Drawing.Size(418, 97)
+ Me.GroupBox4.Size = New System.Drawing.Size(279, 63)
Me.GroupBox4.TabIndex = 6
Me.GroupBox4.TabStop = false
Me.GroupBox4.Text = "Vehicle Idling Speed"
@@ -1242,37 +1158,33 @@ Partial Class VehicleForm
Me.Panel1.Controls.Add(Me.Label18)
Me.Panel1.Controls.Add(Me.Label19)
Me.Panel1.Dock = System.Windows.Forms.DockStyle.Fill
- Me.Panel1.Location = New System.Drawing.Point(4, 24)
- Me.Panel1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.Panel1.Location = New System.Drawing.Point(3, 16)
Me.Panel1.Name = "Panel1"
- Me.Panel1.Size = New System.Drawing.Size(410, 68)
+ Me.Panel1.Size = New System.Drawing.Size(273, 44)
Me.Panel1.TabIndex = 0
'
'tbVehIdlingSpeed
'
- Me.tbVehIdlingSpeed.Location = New System.Drawing.Point(260, 5)
- Me.tbVehIdlingSpeed.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbVehIdlingSpeed.Location = New System.Drawing.Point(173, 3)
Me.tbVehIdlingSpeed.Name = "tbVehIdlingSpeed"
- Me.tbVehIdlingSpeed.Size = New System.Drawing.Size(84, 26)
+ Me.tbVehIdlingSpeed.Size = New System.Drawing.Size(57, 20)
Me.tbVehIdlingSpeed.TabIndex = 0
'
'Label18
'
Me.Label18.AutoSize = true
- Me.Label18.Location = New System.Drawing.Point(350, 9)
- Me.Label18.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label18.Location = New System.Drawing.Point(233, 6)
Me.Label18.Name = "Label18"
- Me.Label18.Size = New System.Drawing.Size(44, 20)
+ Me.Label18.Size = New System.Drawing.Size(30, 13)
Me.Label18.TabIndex = 24
Me.Label18.Text = "[rpm]"
'
'Label19
'
Me.Label19.AutoSize = true
- Me.Label19.Location = New System.Drawing.Point(110, 9)
- Me.Label19.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label19.Location = New System.Drawing.Point(73, 6)
Me.Label19.Name = "Label19"
- Me.Label19.Size = New System.Drawing.Size(140, 20)
+ Me.Label19.Size = New System.Drawing.Size(94, 13)
Me.Label19.TabIndex = 8
Me.Label19.Text = "Engine Idle Speed"
'
@@ -1280,11 +1192,9 @@ Partial Class VehicleForm
'
Me.GroupBox9.Controls.Add(Me.cbTankSystem)
Me.GroupBox9.Controls.Add(Me.Label23)
- Me.GroupBox9.Location = New System.Drawing.Point(436, 11)
- Me.GroupBox9.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox9.Location = New System.Drawing.Point(291, 7)
Me.GroupBox9.Name = "GroupBox9"
- Me.GroupBox9.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.GroupBox9.Size = New System.Drawing.Size(418, 97)
+ Me.GroupBox9.Size = New System.Drawing.Size(279, 63)
Me.GroupBox9.TabIndex = 5
Me.GroupBox9.TabStop = false
Me.GroupBox9.Text = "Tank System"
@@ -1292,18 +1202,16 @@ Partial Class VehicleForm
'cbTankSystem
'
Me.cbTankSystem.FormattingEnabled = true
- Me.cbTankSystem.Location = New System.Drawing.Point(14, 51)
- Me.cbTankSystem.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.cbTankSystem.Location = New System.Drawing.Point(9, 33)
Me.cbTankSystem.Name = "cbTankSystem"
- Me.cbTankSystem.Size = New System.Drawing.Size(368, 28)
+ Me.cbTankSystem.Size = New System.Drawing.Size(247, 21)
Me.cbTankSystem.TabIndex = 1
'
'Label23
'
Me.Label23.AutoSize = true
Me.Label23.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- Me.Label23.Location = New System.Drawing.Point(9, 25)
- Me.Label23.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label23.Location = New System.Drawing.Point(6, 16)
Me.Label23.Name = "Label23"
Me.Label23.Size = New System.Drawing.Size(187, 13)
Me.Label23.TabIndex = 0
@@ -1311,48 +1219,16 @@ Partial Class VehicleForm
'
'tpElectricComponents
'
- Me.tpElectricComponents.Controls.Add(Me.lblMaxDrivetrainPwrUnit)
- Me.tpElectricComponents.Controls.Add(Me.tbMaxDrivetrainPwr)
- Me.tpElectricComponents.Controls.Add(Me.lblMaxDrivetrainPwr)
Me.tpElectricComponents.Controls.Add(Me.gbBattery)
Me.tpElectricComponents.Controls.Add(Me.gpElectricMotor)
- Me.tpElectricComponents.Location = New System.Drawing.Point(4, 29)
- Me.tpElectricComponents.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tpElectricComponents.Location = New System.Drawing.Point(4, 22)
Me.tpElectricComponents.Name = "tpElectricComponents"
- Me.tpElectricComponents.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.tpElectricComponents.Size = New System.Drawing.Size(872, 553)
+ Me.tpElectricComponents.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3)
+ Me.tpElectricComponents.Size = New System.Drawing.Size(579, 355)
Me.tpElectricComponents.TabIndex = 4
Me.tpElectricComponents.Text = "Electric Components"
Me.tpElectricComponents.UseVisualStyleBackColor = true
'
- 'lblMaxDrivetrainPwrUnit
- '
- Me.lblMaxDrivetrainPwrUnit.AutoSize = true
- Me.lblMaxDrivetrainPwrUnit.Location = New System.Drawing.Point(414, 467)
- Me.lblMaxDrivetrainPwrUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
- Me.lblMaxDrivetrainPwrUnit.Name = "lblMaxDrivetrainPwrUnit"
- Me.lblMaxDrivetrainPwrUnit.Size = New System.Drawing.Size(27, 13)
- Me.lblMaxDrivetrainPwrUnit.TabIndex = 30
- Me.lblMaxDrivetrainPwrUnit.Text = "[kW]"
- '
- 'tbMaxDrivetrainPwr
- '
- Me.tbMaxDrivetrainPwr.Location = New System.Drawing.Point(316, 462)
- Me.tbMaxDrivetrainPwr.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.tbMaxDrivetrainPwr.Name = "tbMaxDrivetrainPwr"
- Me.tbMaxDrivetrainPwr.Size = New System.Drawing.Size(86, 26)
- Me.tbMaxDrivetrainPwr.TabIndex = 29
- '
- 'lblMaxDrivetrainPwr
- '
- Me.lblMaxDrivetrainPwr.AutoSize = true
- Me.lblMaxDrivetrainPwr.Location = New System.Drawing.Point(20, 467)
- Me.lblMaxDrivetrainPwr.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
- Me.lblMaxDrivetrainPwr.Name = "lblMaxDrivetrainPwr"
- Me.lblMaxDrivetrainPwr.Size = New System.Drawing.Size(161, 20)
- Me.lblMaxDrivetrainPwr.TabIndex = 28
- Me.lblMaxDrivetrainPwr.Text = "Max. Drivetrain Power"
- '
'gbBattery
'
Me.gbBattery.Controls.Add(Me.lblInitialSoCUnit)
@@ -1361,11 +1237,9 @@ Partial Class VehicleForm
Me.gbBattery.Controls.Add(Me.tbBatteryPackCnt)
Me.gbBattery.Controls.Add(Me.lblBatteryPackCnt)
Me.gbBattery.Controls.Add(Me.Panel2)
- Me.gbBattery.Location = New System.Drawing.Point(9, 269)
- Me.gbBattery.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbBattery.Location = New System.Drawing.Point(6, 175)
Me.gbBattery.Name = "gbBattery"
- Me.gbBattery.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.gbBattery.Size = New System.Drawing.Size(848, 182)
+ Me.gbBattery.Size = New System.Drawing.Size(565, 118)
Me.gbBattery.TabIndex = 27
Me.gbBattery.TabStop = false
Me.gbBattery.Text = "Electric Energy Storage system"
@@ -1373,47 +1247,42 @@ Partial Class VehicleForm
'lblInitialSoCUnit
'
Me.lblInitialSoCUnit.AutoSize = true
- Me.lblInitialSoCUnit.Location = New System.Drawing.Point(404, 125)
- Me.lblInitialSoCUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblInitialSoCUnit.Location = New System.Drawing.Point(269, 81)
Me.lblInitialSoCUnit.Name = "lblInitialSoCUnit"
- Me.lblInitialSoCUnit.Size = New System.Drawing.Size(31, 20)
+ Me.lblInitialSoCUnit.Size = New System.Drawing.Size(21, 13)
Me.lblInitialSoCUnit.TabIndex = 27
Me.lblInitialSoCUnit.Text = "[%]"
'
'tbInitialSoC
'
- Me.tbInitialSoC.Location = New System.Drawing.Point(306, 120)
- Me.tbInitialSoC.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbInitialSoC.Location = New System.Drawing.Point(204, 78)
Me.tbInitialSoC.Name = "tbInitialSoC"
- Me.tbInitialSoC.Size = New System.Drawing.Size(86, 26)
+ Me.tbInitialSoC.Size = New System.Drawing.Size(59, 20)
Me.tbInitialSoC.TabIndex = 26
'
'lblInitialSoC
'
Me.lblInitialSoC.AutoSize = true
- Me.lblInitialSoC.Location = New System.Drawing.Point(10, 125)
- Me.lblInitialSoC.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblInitialSoC.Location = New System.Drawing.Point(7, 81)
Me.lblInitialSoC.Name = "lblInitialSoC"
Me.lblInitialSoC.RightToLeft = System.Windows.Forms.RightToLeft.Yes
- Me.lblInitialSoC.Size = New System.Drawing.Size(81, 20)
+ Me.lblInitialSoC.Size = New System.Drawing.Size(54, 13)
Me.lblInitialSoC.TabIndex = 25
Me.lblInitialSoC.Text = "Initial SoC"
'
'tbBatteryPackCnt
'
- Me.tbBatteryPackCnt.Location = New System.Drawing.Point(306, 80)
- Me.tbBatteryPackCnt.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbBatteryPackCnt.Location = New System.Drawing.Point(204, 52)
Me.tbBatteryPackCnt.Name = "tbBatteryPackCnt"
- Me.tbBatteryPackCnt.Size = New System.Drawing.Size(86, 26)
+ Me.tbBatteryPackCnt.Size = New System.Drawing.Size(59, 20)
Me.tbBatteryPackCnt.TabIndex = 24
'
'lblBatteryPackCnt
'
Me.lblBatteryPackCnt.AutoSize = true
- Me.lblBatteryPackCnt.Location = New System.Drawing.Point(10, 85)
- Me.lblBatteryPackCnt.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblBatteryPackCnt.Location = New System.Drawing.Point(7, 55)
Me.lblBatteryPackCnt.Name = "lblBatteryPackCnt"
- Me.lblBatteryPackCnt.Size = New System.Drawing.Size(183, 20)
+ Me.lblBatteryPackCnt.Size = New System.Drawing.Size(124, 13)
Me.lblBatteryPackCnt.TabIndex = 23
Me.lblBatteryPackCnt.Text = "Number of RESS Packs:"
'
@@ -1422,18 +1291,16 @@ Partial Class VehicleForm
Me.Panel2.Controls.Add(Me.btnOpenBattery)
Me.Panel2.Controls.Add(Me.btnBrowseBattery)
Me.Panel2.Controls.Add(Me.tbBattery)
- Me.Panel2.Location = New System.Drawing.Point(9, 29)
- Me.Panel2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.Panel2.Location = New System.Drawing.Point(6, 19)
Me.Panel2.Name = "Panel2"
- Me.Panel2.Size = New System.Drawing.Size(830, 42)
+ Me.Panel2.Size = New System.Drawing.Size(553, 27)
Me.Panel2.TabIndex = 19
'
'btnOpenBattery
'
- Me.btnOpenBattery.Location = New System.Drawing.Point(6, 5)
- Me.btnOpenBattery.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnOpenBattery.Location = New System.Drawing.Point(4, 3)
Me.btnOpenBattery.Name = "btnOpenBattery"
- Me.btnOpenBattery.Size = New System.Drawing.Size(141, 32)
+ Me.btnOpenBattery.Size = New System.Drawing.Size(94, 21)
Me.btnOpenBattery.TabIndex = 0
Me.btnOpenBattery.TabStop = false
Me.btnOpenBattery.Text = "REESS Pack"
@@ -1443,10 +1310,9 @@ Partial Class VehicleForm
'
Me.btnBrowseBattery.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.btnBrowseBattery.Image = CType(resources.GetObject("btnBrowseBattery.Image"),System.Drawing.Image)
- Me.btnBrowseBattery.Location = New System.Drawing.Point(790, 3)
- Me.btnBrowseBattery.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnBrowseBattery.Location = New System.Drawing.Point(527, 2)
Me.btnBrowseBattery.Name = "btnBrowseBattery"
- Me.btnBrowseBattery.Size = New System.Drawing.Size(36, 37)
+ Me.btnBrowseBattery.Size = New System.Drawing.Size(24, 24)
Me.btnBrowseBattery.TabIndex = 2
Me.btnBrowseBattery.TabStop = false
Me.btnBrowseBattery.UseVisualStyleBackColor = true
@@ -1455,10 +1321,9 @@ Partial Class VehicleForm
'
Me.tbBattery.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.tbBattery.Location = New System.Drawing.Point(156, 6)
- Me.tbBattery.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbBattery.Location = New System.Drawing.Point(104, 4)
Me.tbBattery.Name = "tbBattery"
- Me.tbBattery.Size = New System.Drawing.Size(624, 26)
+ Me.tbBattery.Size = New System.Drawing.Size(417, 20)
Me.tbBattery.TabIndex = 1
'
'gpElectricMotor
@@ -1472,85 +1337,75 @@ Partial Class VehicleForm
Me.gpElectricMotor.Controls.Add(Me.lblEmCount)
Me.gpElectricMotor.Controls.Add(Me.lblEmPosition)
Me.gpElectricMotor.Controls.Add(Me.pnElectricMotor)
- Me.gpElectricMotor.Location = New System.Drawing.Point(9, 9)
- Me.gpElectricMotor.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gpElectricMotor.Location = New System.Drawing.Point(6, 6)
Me.gpElectricMotor.Name = "gpElectricMotor"
- Me.gpElectricMotor.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.gpElectricMotor.Size = New System.Drawing.Size(848, 251)
+ Me.gpElectricMotor.Size = New System.Drawing.Size(565, 163)
Me.gpElectricMotor.TabIndex = 0
Me.gpElectricMotor.TabStop = false
Me.gpElectricMotor.Text = "Electric Motor"
'
'tbEmEfficiency
'
- Me.tbEmEfficiency.Location = New System.Drawing.Point(306, 202)
- Me.tbEmEfficiency.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbEmEfficiency.Location = New System.Drawing.Point(204, 131)
Me.tbEmEfficiency.Name = "tbEmEfficiency"
- Me.tbEmEfficiency.Size = New System.Drawing.Size(86, 26)
+ Me.tbEmEfficiency.Size = New System.Drawing.Size(59, 20)
Me.tbEmEfficiency.TabIndex = 26
'
'lblEmEfficiency
'
Me.lblEmEfficiency.AutoSize = true
- Me.lblEmEfficiency.Location = New System.Drawing.Point(10, 206)
- Me.lblEmEfficiency.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblEmEfficiency.Location = New System.Drawing.Point(7, 134)
Me.lblEmEfficiency.Name = "lblEmEfficiency"
- Me.lblEmEfficiency.Size = New System.Drawing.Size(198, 20)
+ Me.lblEmEfficiency.Size = New System.Drawing.Size(135, 13)
Me.lblEmEfficiency.TabIndex = 25
Me.lblEmEfficiency.Text = "Efficiency EM to Drivetrain:"
'
'tbRatioEm
'
- Me.tbRatioEm.Location = New System.Drawing.Point(306, 162)
- Me.tbRatioEm.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbRatioEm.Location = New System.Drawing.Point(204, 105)
Me.tbRatioEm.Name = "tbRatioEm"
- Me.tbRatioEm.Size = New System.Drawing.Size(86, 26)
+ Me.tbRatioEm.Size = New System.Drawing.Size(59, 20)
Me.tbRatioEm.TabIndex = 24
'
'lblRatioEm
'
Me.lblRatioEm.AutoSize = true
- Me.lblRatioEm.Location = New System.Drawing.Point(10, 166)
- Me.lblRatioEm.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblRatioEm.Location = New System.Drawing.Point(7, 108)
Me.lblRatioEm.Name = "lblRatioEm"
- Me.lblRatioEm.Size = New System.Drawing.Size(168, 20)
+ Me.lblRatioEm.Size = New System.Drawing.Size(114, 13)
Me.lblRatioEm.TabIndex = 23
Me.lblRatioEm.Text = "Ratio EM to Drivetrain:"
'
'tbEmCount
'
- Me.tbEmCount.Location = New System.Drawing.Point(306, 122)
- Me.tbEmCount.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbEmCount.Location = New System.Drawing.Point(204, 79)
Me.tbEmCount.Name = "tbEmCount"
- Me.tbEmCount.Size = New System.Drawing.Size(86, 26)
+ Me.tbEmCount.Size = New System.Drawing.Size(59, 20)
Me.tbEmCount.TabIndex = 22
'
'cbEmPos
'
Me.cbEmPos.FormattingEnabled = true
- Me.cbEmPos.Location = New System.Drawing.Point(213, 80)
- Me.cbEmPos.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.cbEmPos.Location = New System.Drawing.Point(142, 52)
Me.cbEmPos.Name = "cbEmPos"
- Me.cbEmPos.Size = New System.Drawing.Size(180, 28)
+ Me.cbEmPos.Size = New System.Drawing.Size(121, 21)
Me.cbEmPos.TabIndex = 21
'
'lblEmCount
'
Me.lblEmCount.AutoSize = true
- Me.lblEmCount.Location = New System.Drawing.Point(10, 126)
- Me.lblEmCount.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblEmCount.Location = New System.Drawing.Point(7, 82)
Me.lblEmCount.Name = "lblEmCount"
- Me.lblEmCount.Size = New System.Drawing.Size(123, 20)
+ Me.lblEmCount.Size = New System.Drawing.Size(83, 13)
Me.lblEmCount.TabIndex = 20
Me.lblEmCount.Text = "Number of EMs:"
'
'lblEmPosition
'
Me.lblEmPosition.AutoSize = true
- Me.lblEmPosition.Location = New System.Drawing.Point(10, 86)
- Me.lblEmPosition.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblEmPosition.Location = New System.Drawing.Point(7, 56)
Me.lblEmPosition.Name = "lblEmPosition"
- Me.lblEmPosition.Size = New System.Drawing.Size(69, 20)
+ Me.lblEmPosition.Size = New System.Drawing.Size(47, 13)
Me.lblEmPosition.TabIndex = 19
Me.lblEmPosition.Text = "Position:"
'
@@ -1559,18 +1414,16 @@ Partial Class VehicleForm
Me.pnElectricMotor.Controls.Add(Me.btnOpenElectricMotor)
Me.pnElectricMotor.Controls.Add(Me.btnBrowseElectricMotor)
Me.pnElectricMotor.Controls.Add(Me.tbElectricMotor)
- Me.pnElectricMotor.Location = New System.Drawing.Point(9, 29)
- Me.pnElectricMotor.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.pnElectricMotor.Location = New System.Drawing.Point(6, 19)
Me.pnElectricMotor.Name = "pnElectricMotor"
- Me.pnElectricMotor.Size = New System.Drawing.Size(830, 42)
+ Me.pnElectricMotor.Size = New System.Drawing.Size(553, 27)
Me.pnElectricMotor.TabIndex = 18
'
'btnOpenElectricMotor
'
- Me.btnOpenElectricMotor.Location = New System.Drawing.Point(6, 5)
- Me.btnOpenElectricMotor.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnOpenElectricMotor.Location = New System.Drawing.Point(4, 3)
Me.btnOpenElectricMotor.Name = "btnOpenElectricMotor"
- Me.btnOpenElectricMotor.Size = New System.Drawing.Size(141, 32)
+ Me.btnOpenElectricMotor.Size = New System.Drawing.Size(94, 21)
Me.btnOpenElectricMotor.TabIndex = 0
Me.btnOpenElectricMotor.TabStop = false
Me.btnOpenElectricMotor.Text = "Electric Motor"
@@ -1580,10 +1433,9 @@ Partial Class VehicleForm
'
Me.btnBrowseElectricMotor.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.btnBrowseElectricMotor.Image = CType(resources.GetObject("btnBrowseElectricMotor.Image"),System.Drawing.Image)
- Me.btnBrowseElectricMotor.Location = New System.Drawing.Point(790, 3)
- Me.btnBrowseElectricMotor.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnBrowseElectricMotor.Location = New System.Drawing.Point(527, 2)
Me.btnBrowseElectricMotor.Name = "btnBrowseElectricMotor"
- Me.btnBrowseElectricMotor.Size = New System.Drawing.Size(36, 37)
+ Me.btnBrowseElectricMotor.Size = New System.Drawing.Size(24, 24)
Me.btnBrowseElectricMotor.TabIndex = 2
Me.btnBrowseElectricMotor.TabStop = false
Me.btnBrowseElectricMotor.UseVisualStyleBackColor = true
@@ -1592,22 +1444,18 @@ Partial Class VehicleForm
'
Me.tbElectricMotor.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.tbElectricMotor.Location = New System.Drawing.Point(156, 6)
- Me.tbElectricMotor.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbElectricMotor.Location = New System.Drawing.Point(104, 4)
Me.tbElectricMotor.Name = "tbElectricMotor"
- Me.tbElectricMotor.Size = New System.Drawing.Size(624, 26)
+ Me.tbElectricMotor.Size = New System.Drawing.Size(417, 20)
Me.tbElectricMotor.TabIndex = 1
'
'tpTorqueLimits
'
- Me.tpTorqueLimits.Controls.Add(Me.lvTorqueLimits)
- Me.tpTorqueLimits.Controls.Add(Me.Label17)
- Me.tpTorqueLimits.Controls.Add(Me.btDelMaxTorqueEntry)
- Me.tpTorqueLimits.Controls.Add(Me.btAddMaxTorqueEntry)
- Me.tpTorqueLimits.Location = New System.Drawing.Point(4, 29)
- Me.tpTorqueLimits.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tpTorqueLimits.Controls.Add(Me.gbEMTorqueLimits)
+ Me.tpTorqueLimits.Controls.Add(Me.bgVehicleTorqueLimits)
+ Me.tpTorqueLimits.Location = New System.Drawing.Point(4, 22)
Me.tpTorqueLimits.Name = "tpTorqueLimits"
- Me.tpTorqueLimits.Size = New System.Drawing.Size(872, 553)
+ Me.tpTorqueLimits.Size = New System.Drawing.Size(579, 355)
Me.tpTorqueLimits.TabIndex = 2
Me.tpTorqueLimits.Text = "Torque Limits"
Me.tpTorqueLimits.UseVisualStyleBackColor = true
@@ -1620,11 +1468,10 @@ Partial Class VehicleForm
Me.lvTorqueLimits.FullRowSelect = true
Me.lvTorqueLimits.GridLines = true
Me.lvTorqueLimits.HideSelection = false
- Me.lvTorqueLimits.Location = New System.Drawing.Point(10, 12)
- Me.lvTorqueLimits.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.lvTorqueLimits.Location = New System.Drawing.Point(6, 19)
Me.lvTorqueLimits.MultiSelect = false
Me.lvTorqueLimits.Name = "lvTorqueLimits"
- Me.lvTorqueLimits.Size = New System.Drawing.Size(421, 155)
+ Me.lvTorqueLimits.Size = New System.Drawing.Size(282, 102)
Me.lvTorqueLimits.TabIndex = 7
Me.lvTorqueLimits.TabStop = false
Me.lvTorqueLimits.UseCompatibleStateImageBehavior = false
@@ -1633,51 +1480,47 @@ Partial Class VehicleForm
'ColumnHeader5
'
Me.ColumnHeader5.Text = "Gear #"
- Me.ColumnHeader5.Width = 67
+ Me.ColumnHeader5.Width = 83
'
'ColumnHeader6
'
Me.ColumnHeader6.Text = "Max. Torque"
- Me.ColumnHeader6.Width = 146
+ Me.ColumnHeader6.Width = 172
'
'Label17
'
Me.Label17.AutoSize = true
- Me.Label17.Location = New System.Drawing.Point(274, 174)
- Me.Label17.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label17.Location = New System.Drawing.Point(182, 124)
Me.Label17.Name = "Label17"
- Me.Label17.Size = New System.Drawing.Size(158, 20)
+ Me.Label17.Size = New System.Drawing.Size(106, 13)
Me.Label17.TabIndex = 6
Me.Label17.Text = "(Double-Click to Edit)"
'
'btDelMaxTorqueEntry
'
Me.btDelMaxTorqueEntry.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
- Me.btDelMaxTorqueEntry.Location = New System.Drawing.Point(46, 178)
- Me.btDelMaxTorqueEntry.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btDelMaxTorqueEntry.Location = New System.Drawing.Point(30, 127)
Me.btDelMaxTorqueEntry.Name = "btDelMaxTorqueEntry"
- Me.btDelMaxTorqueEntry.Size = New System.Drawing.Size(36, 37)
+ Me.btDelMaxTorqueEntry.Size = New System.Drawing.Size(24, 24)
Me.btDelMaxTorqueEntry.TabIndex = 5
Me.btDelMaxTorqueEntry.UseVisualStyleBackColor = true
'
'btAddMaxTorqueEntry
'
Me.btAddMaxTorqueEntry.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
- Me.btAddMaxTorqueEntry.Location = New System.Drawing.Point(10, 178)
- Me.btAddMaxTorqueEntry.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btAddMaxTorqueEntry.Location = New System.Drawing.Point(6, 127)
Me.btAddMaxTorqueEntry.Name = "btAddMaxTorqueEntry"
- Me.btAddMaxTorqueEntry.Size = New System.Drawing.Size(36, 37)
+ Me.btAddMaxTorqueEntry.Size = New System.Drawing.Size(24, 24)
Me.btAddMaxTorqueEntry.TabIndex = 4
Me.btAddMaxTorqueEntry.UseVisualStyleBackColor = true
'
'tpADAS
'
Me.tpADAS.Controls.Add(Me.GroupBox5)
- Me.tpADAS.Location = New System.Drawing.Point(4, 29)
- Me.tpADAS.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tpADAS.Location = New System.Drawing.Point(4, 22)
Me.tpADAS.Name = "tpADAS"
- Me.tpADAS.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.tpADAS.Size = New System.Drawing.Size(872, 553)
+ Me.tpADAS.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3)
+ Me.tpADAS.Size = New System.Drawing.Size(579, 355)
Me.tpADAS.TabIndex = 3
Me.tpADAS.Text = "ADAS"
Me.tpADAS.UseVisualStyleBackColor = true
@@ -1690,11 +1533,9 @@ Partial Class VehicleForm
Me.GroupBox5.Controls.Add(Me.Label22)
Me.GroupBox5.Controls.Add(Me.cbEngineStopStart)
Me.GroupBox5.Controls.Add(Me.lblPCC)
- Me.GroupBox5.Location = New System.Drawing.Point(9, 9)
- Me.GroupBox5.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox5.Location = New System.Drawing.Point(6, 6)
Me.GroupBox5.Name = "GroupBox5"
- Me.GroupBox5.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.GroupBox5.Size = New System.Drawing.Size(848, 209)
+ Me.GroupBox5.Size = New System.Drawing.Size(565, 136)
Me.GroupBox5.TabIndex = 0
Me.GroupBox5.TabStop = false
Me.GroupBox5.Text = "ADAS Options"
@@ -1702,10 +1543,9 @@ Partial Class VehicleForm
'cbAtEcoRollReleaseLockupClutch
'
Me.cbAtEcoRollReleaseLockupClutch.AutoSize = true
- Me.cbAtEcoRollReleaseLockupClutch.Location = New System.Drawing.Point(398, 29)
- Me.cbAtEcoRollReleaseLockupClutch.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.cbAtEcoRollReleaseLockupClutch.Location = New System.Drawing.Point(265, 19)
Me.cbAtEcoRollReleaseLockupClutch.Name = "cbAtEcoRollReleaseLockupClutch"
- Me.cbAtEcoRollReleaseLockupClutch.Size = New System.Drawing.Size(349, 24)
+ Me.cbAtEcoRollReleaseLockupClutch.Size = New System.Drawing.Size(243, 17)
Me.cbAtEcoRollReleaseLockupClutch.TabIndex = 9
Me.cbAtEcoRollReleaseLockupClutch.Text = "AT Gearbox: Eco-Roll Release Lockup Clutch"
Me.cbAtEcoRollReleaseLockupClutch.UseVisualStyleBackColor = true
@@ -1713,38 +1553,34 @@ Partial Class VehicleForm
'cbPcc
'
Me.cbPcc.FormattingEnabled = true
- Me.cbPcc.Location = New System.Drawing.Point(27, 160)
- Me.cbPcc.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.cbPcc.Location = New System.Drawing.Point(18, 104)
Me.cbPcc.Name = "cbPcc"
- Me.cbPcc.Size = New System.Drawing.Size(266, 28)
+ Me.cbPcc.Size = New System.Drawing.Size(179, 21)
Me.cbPcc.TabIndex = 8
'
'cbEcoRoll
'
Me.cbEcoRoll.FormattingEnabled = true
- Me.cbEcoRoll.Location = New System.Drawing.Point(27, 89)
- Me.cbEcoRoll.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.cbEcoRoll.Location = New System.Drawing.Point(18, 58)
Me.cbEcoRoll.Name = "cbEcoRoll"
- Me.cbEcoRoll.Size = New System.Drawing.Size(266, 28)
+ Me.cbEcoRoll.Size = New System.Drawing.Size(179, 21)
Me.cbEcoRoll.TabIndex = 7
'
'Label22
'
Me.Label22.AutoSize = true
- Me.Label22.Location = New System.Drawing.Point(9, 65)
- Me.Label22.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label22.Location = New System.Drawing.Point(6, 42)
Me.Label22.Name = "Label22"
- Me.Label22.Size = New System.Drawing.Size(69, 20)
+ Me.Label22.Size = New System.Drawing.Size(47, 13)
Me.Label22.TabIndex = 6
Me.Label22.Text = "Eco-Roll"
'
'cbEngineStopStart
'
Me.cbEngineStopStart.AutoSize = true
- Me.cbEngineStopStart.Location = New System.Drawing.Point(9, 29)
- Me.cbEngineStopStart.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.cbEngineStopStart.Location = New System.Drawing.Point(6, 19)
Me.cbEngineStopStart.Name = "cbEngineStopStart"
- Me.cbEngineStopStart.Size = New System.Drawing.Size(290, 24)
+ Me.cbEngineStopStart.Size = New System.Drawing.Size(203, 17)
Me.cbEngineStopStart.TabIndex = 4
Me.cbEngineStopStart.Text = "Engine Stop/Start during vehicle stop"
Me.cbEngineStopStart.UseVisualStyleBackColor = true
@@ -1752,10 +1588,9 @@ Partial Class VehicleForm
'lblPCC
'
Me.lblPCC.AutoSize = true
- Me.lblPCC.Location = New System.Drawing.Point(9, 135)
- Me.lblPCC.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblPCC.Location = New System.Drawing.Point(6, 88)
Me.lblPCC.Name = "lblPCC"
- Me.lblPCC.Size = New System.Drawing.Size(181, 20)
+ Me.lblPCC.Size = New System.Drawing.Size(122, 13)
Me.lblPCC.TabIndex = 3
Me.lblPCC.Text = "Predictive Cruise Control"
'
@@ -1763,19 +1598,17 @@ Partial Class VehicleForm
'
Me.cbLegislativeClass.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
Me.cbLegislativeClass.FormattingEnabled = true
- Me.cbLegislativeClass.Location = New System.Drawing.Point(330, 215)
- Me.cbLegislativeClass.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.cbLegislativeClass.Location = New System.Drawing.Point(220, 140)
Me.cbLegislativeClass.Name = "cbLegislativeClass"
- Me.cbLegislativeClass.Size = New System.Drawing.Size(76, 28)
+ Me.cbLegislativeClass.Size = New System.Drawing.Size(52, 21)
Me.cbLegislativeClass.TabIndex = 41
'
'Label21
'
Me.Label21.AutoSize = true
- Me.Label21.Location = New System.Drawing.Point(48, 189)
- Me.Label21.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label21.Location = New System.Drawing.Point(32, 123)
Me.Label21.Name = "Label21"
- Me.Label21.Size = New System.Drawing.Size(167, 20)
+ Me.Label21.Size = New System.Drawing.Size(112, 13)
Me.Label21.TabIndex = 42
Me.Label21.Text = "Maximum Laden Mass"
'
@@ -1784,20 +1617,59 @@ Partial Class VehicleForm
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(182, 52)
- Me.lblTitle.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblTitle.Location = New System.Drawing.Point(121, 34)
Me.lblTitle.Name = "lblTitle"
Me.lblTitle.Size = New System.Drawing.Size(166, 29)
Me.lblTitle.TabIndex = 43
Me.lblTitle.Text = "Vehicle TITLE"
'
+ 'bgVehicleTorqueLimits
+ '
+ Me.bgVehicleTorqueLimits.Controls.Add(Me.lvTorqueLimits)
+ Me.bgVehicleTorqueLimits.Controls.Add(Me.btAddMaxTorqueEntry)
+ Me.bgVehicleTorqueLimits.Controls.Add(Me.Label17)
+ Me.bgVehicleTorqueLimits.Controls.Add(Me.btDelMaxTorqueEntry)
+ Me.bgVehicleTorqueLimits.Location = New System.Drawing.Point(3, 9)
+ Me.bgVehicleTorqueLimits.Name = "bgVehicleTorqueLimits"
+ Me.bgVehicleTorqueLimits.Size = New System.Drawing.Size(407, 163)
+ Me.bgVehicleTorqueLimits.TabIndex = 8
+ Me.bgVehicleTorqueLimits.TabStop = false
+ Me.bgVehicleTorqueLimits.Text = "ICE Torque Limits"
+ '
+ 'gbEMTorqueLimits
+ '
+ Me.gbEMTorqueLimits.Controls.Add(Me.btnEmTorqueLimits)
+ Me.gbEMTorqueLimits.Controls.Add(Me.tbEmTorqueLimits)
+ Me.gbEMTorqueLimits.Location = New System.Drawing.Point(3, 178)
+ Me.gbEMTorqueLimits.Name = "gbEMTorqueLimits"
+ Me.gbEMTorqueLimits.Size = New System.Drawing.Size(407, 52)
+ Me.gbEMTorqueLimits.TabIndex = 9
+ Me.gbEMTorqueLimits.TabStop = false
+ Me.gbEMTorqueLimits.Text = "Electric Machine Torque Limits"
+ '
+ 'btnEmTorqueLimits
+ '
+ Me.btnEmTorqueLimits.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
+ Me.btnEmTorqueLimits.Location = New System.Drawing.Point(331, 17)
+ Me.btnEmTorqueLimits.Name = "btnEmTorqueLimits"
+ Me.btnEmTorqueLimits.Size = New System.Drawing.Size(24, 24)
+ Me.btnEmTorqueLimits.TabIndex = 16
+ Me.btnEmTorqueLimits.UseVisualStyleBackColor = true
+ '
+ 'tbEmTorqueLimits
+ '
+ Me.tbEmTorqueLimits.Location = New System.Drawing.Point(6, 20)
+ Me.tbEmTorqueLimits.Name = "tbEmTorqueLimits"
+ Me.tbEmTorqueLimits.Size = New System.Drawing.Size(319, 20)
+ Me.tbEmTorqueLimits.TabIndex = 15
+ '
'VehicleForm
'
Me.AcceptButton = Me.ButOK
- Me.AutoScaleDimensions = New System.Drawing.SizeF(9!, 20!)
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.CancelButton = Me.ButCancel
- Me.ClientSize = New System.Drawing.Size(898, 935)
+ Me.ClientSize = New System.Drawing.Size(599, 608)
Me.Controls.Add(Me.lblTitle)
Me.Controls.Add(Me.Label21)
Me.Controls.Add(Me.cbLegislativeClass)
@@ -1817,7 +1689,6 @@ Partial Class VehicleForm
Me.Controls.Add(Me.ToolStrip1)
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, 5, 4, 5)
Me.MaximizeBox = false
Me.Name = "VehicleForm"
Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
@@ -1861,7 +1732,6 @@ Partial Class VehicleForm
Me.GroupBox9.ResumeLayout(false)
Me.GroupBox9.PerformLayout
Me.tpElectricComponents.ResumeLayout(false)
- Me.tpElectricComponents.PerformLayout
Me.gbBattery.ResumeLayout(false)
Me.gbBattery.PerformLayout
Me.Panel2.ResumeLayout(false)
@@ -1871,10 +1741,13 @@ Partial Class VehicleForm
Me.pnElectricMotor.ResumeLayout(false)
Me.pnElectricMotor.PerformLayout
Me.tpTorqueLimits.ResumeLayout(false)
- Me.tpTorqueLimits.PerformLayout
Me.tpADAS.ResumeLayout(false)
Me.GroupBox5.ResumeLayout(false)
Me.GroupBox5.PerformLayout
+ Me.bgVehicleTorqueLimits.ResumeLayout(false)
+ Me.bgVehicleTorqueLimits.PerformLayout
+ Me.gbEMTorqueLimits.ResumeLayout(false)
+ Me.gbEMTorqueLimits.PerformLayout
Me.ResumeLayout(false)
Me.PerformLayout
@@ -2028,7 +1901,8 @@ End Sub
Friend WithEvents lblInitialSoCUnit As Label
Friend WithEvents tbInitialSoC As TextBox
Friend WithEvents lblInitialSoC As Label
- Friend WithEvents lblMaxDrivetrainPwrUnit As Label
- Friend WithEvents tbMaxDrivetrainPwr As TextBox
- Friend WithEvents lblMaxDrivetrainPwr As Label
+ Friend WithEvents gbEMTorqueLimits As GroupBox
+ Friend WithEvents btnEmTorqueLimits As Button
+ Friend WithEvents tbEmTorqueLimits As TextBox
+ Friend WithEvents bgVehicleTorqueLimits As GroupBox
End Class
diff --git a/VECTO/GUI/VehicleForm.vb b/VECTO/GUI/VehicleForm.vb
index 2fc3a0bf9c5ce06c450d7f78ab366a5a8f7b8d9c..d9644d3af769201ddb87cf4afd9f3279054445e3 100644
--- a/VECTO/GUI/VehicleForm.vb
+++ b/VECTO/GUI/VehicleForm.vb
@@ -20,6 +20,7 @@ Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.InputData.FileIO.JSON
Imports TUGraz.VectoCore.InputData.Impl
Imports TUGraz.VectoCore.Models.Declaration
+Imports TUGraz.VectoCore.Models.SimulationComponent.Data
''' <summary>
''' Vehicle Editor.
@@ -473,7 +474,8 @@ Public Class VehicleForm
End If
If (vehicle.VehicleType = VectoSimulationJobType.ParallelHybridVehicle) Then
- tbMaxDrivetrainPwr.Text = vehicle.MaxDrivetrainPower.ConvertToKiloWatt().Value.ToXMLFormat(2)
+ 'tbMaxDrivetrainPwr.Text = vehicle.MaxDrivetrainPower.ConvertToKiloWatt().Value.ToXMLFormat(2)
+ tbEmTorqueLimits.Text = if (Not vehicle.ElectricMotorTorqueLimits Is Nothing, GetRelativePath(vehicle.ElectricMotorTorqueLimits.Source, basePath), "")
End If
DeclInit()
@@ -497,14 +499,14 @@ Public Class VehicleForm
'cbEngineStopStart.Checked = False
cbEngineStopStart.Enabled = True
cbEcoRoll.DataSource = [Enum].GetValues(GetType(EcoRollType)).Cast(Of EcoRollType).Select(Function(ecoRoll) New With {Key .Value = ecoRoll, .Label = ecoRoll.GetName()}).ToList()
- tbMaxDrivetrainPwr.Enabled = false
+ gbEMTorqueLimits.Enabled = false
Case VectoSimulationJobType.ParallelHybridVehicle
lblTitle.Text = "Parallel Hybrid Vehicle"
cbEmPos.DataSource = [Enum].GetValues(GetType(PowertrainPosition)).Cast(Of PowertrainPosition).Where(Function(x) x.IsParallelHybrid()).Select(Function(x) New With {Key .Value = x, .Label = x.GetLabel()}).ToList()
'cbEngineStopStart.Checked = False
'cbEngineStopStart.Enabled = False
'cbEcoRoll.DataSource = [Enum].GetValues(GetType(EcoRollType)).Cast(Of EcoRollType).Select(Function(ecoRoll) New With {Key .Value = ecoRoll, .Label = ecoRoll.GetName()}).ToList()
- tbMaxDrivetrainPwr.Enabled = True
+ gbEMTorqueLimits.Enabled = True
Case VectoSimulationJobType.BatteryElectricVehicle
lblTitle.Text = "Battery Electric Vehicle"
tpPowertrain.Enabled = False
@@ -513,7 +515,7 @@ Public Class VehicleForm
cbEngineStopStart.Checked = False
cbEngineStopStart.Enabled = False
cbEcoRoll.DataSource = New EcoRollType() {EcoRollType.None}.Select(Function(ecoRoll) New With {Key .Value = ecoRoll, .Label = ecoRoll.GetName()}).ToList()
- tbMaxDrivetrainPwr.Enabled = False
+ gbEMTorqueLimits.Enabled = False
End Select
End Sub
@@ -614,8 +616,8 @@ Public Class VehicleForm
veh.ElectricMotorMechEff = tbEmEfficiency.Text.ToDouble()
End If
- If (VehicleType = VectoSimulationJobType.ParallelHybridVehicle) Then
- veh.MaxPower = tbMaxDrivetrainPwr.Text.ToDouble(0)
+ If (VehicleType = VectoSimulationJobType.ParallelHybridVehicle) AndAlso not String.IsNullOrWhiteSpace(tbEmTorqueLimits.Text) Then
+ veh.EmTorqueLimitsFile.Init(GetPath(file), tbEmTorqueLimits.Text)
End If
veh.EcoRollType = CType(cbEcoRoll.SelectedValue, EcoRollType)
@@ -1126,5 +1128,10 @@ Public Class VehicleForm
End Try
End If
End Sub
+
+ Private Sub btnEmTorqueLimits_Click(sender As Object, e As EventArgs) Handles btnEmTorqueLimits.Click
+ If ElectricMachineMaxTorqueFileBrowser.OpenDialog(FileRepl(tbEmTorqueLimits.Text, GetPath(_vehFile))) Then _
+ tbEmTorqueLimits.Text = GetFilenameWithoutDirectory(ElectricMachineMaxTorqueFileBrowser.Files(0), GetPath(_vehFile))
+ End Sub
End Class
diff --git a/VECTO/Input Files/Engine.vb b/VECTO/Input Files/Engine.vb
index 785de6030f2a491fcbeb1d359addef4ac9b3ed15..334080e3f18f8f77873d210bea90484f461c0abc 100644
--- a/VECTO/Input Files/Engine.vb
+++ b/VECTO/Input Files/Engine.vb
@@ -642,7 +642,6 @@ Public Class DummyVehicle
End Property
Public Property ADAS As IAdvancedDriverAssistantSystemDeclarationInputData Implements IVehicleDeclarationInputData.ADAS
Public ReadOnly Property InitialSOC As Double Implements IVehicleEngineeringInputData.InitialSOC
- Public ReadOnly Property MaxDrivetrainPower As Watt Implements IVehicleEngineeringInputData.MaxDrivetrainPower
Public ReadOnly Property VehicleType As VectoSimulationJobType Implements IVehicleEngineeringInputData.VehicleType
Public Property ZeroEmissionVehicle As Boolean Implements IVehicleDeclarationInputData.ZeroEmissionVehicle
Public Property HybridElectricHDV As Boolean Implements IVehicleDeclarationInputData.HybridElectricHDV
diff --git a/VECTO/Input Files/Gearbox.vb b/VECTO/Input Files/Gearbox.vb
index c7556807cf958cb40fe3337a47fc443fc8685bb5..4fa9cb9a05881d79ed0fe23271c3835a9dea1b1e 100644
--- a/VECTO/Input Files/Gearbox.vb
+++ b/VECTO/Input Files/Gearbox.vb
@@ -827,7 +827,6 @@ Public Class MockEngineeringVehicle
Implements IVehicleDeclarationInputData.ADAS
Public ReadOnly Property InitialSOC As Double Implements IVehicleEngineeringInputData.InitialSOC
- Public ReadOnly Property MaxDrivetrainPower As Watt Implements IVehicleEngineeringInputData.MaxDrivetrainPower
Public ReadOnly Property VehicleType As VectoSimulationJobType Implements IVehicleEngineeringInputData.VehicleType
Public Property ZeroEmissionVehicle As Boolean Implements IVehicleDeclarationInputData.ZeroEmissionVehicle
diff --git a/VECTO/Input Files/Vehicle.vb b/VECTO/Input Files/Vehicle.vb
index 3556f5af9f181ea66097c9be94d96f516c9e51a6..230389b1bc16df1f208be1b742d30f27dc6c0edc 100644
--- a/VECTO/Input Files/Vehicle.vb
+++ b/VECTO/Input Files/Vehicle.vb
@@ -47,6 +47,7 @@ Public Class Vehicle
<ValidateObject> Public RetarderType As RetarderType
Public RetarderRatio As Double = 0
Public ReadOnly RetarderLossMapFile As SubPath
+ Public ReadOnly EmTorqueLimitsFile As SubPath
Public DynamicTyreRadius As Double
Public ReadOnly Axles As List(Of AxleInputData)
@@ -84,7 +85,6 @@ Public Class Vehicle
Public ElectricMotorCount As Integer
Public ElectricMotorRatio As Double
Public ElectricMotorMechEff As Double
- Public MaxPower As Double
Public Sub New()
_path = ""
@@ -93,6 +93,7 @@ Public Class Vehicle
RetarderLossMapFile = New SubPath
AngledriveLossMapFile = New SubPath()
+ EmTorqueLimitsFile = new SubPath()
Axles = New List(Of AxleInputData)
torqueLimitsList = New List(Of ITorqueLimitInputData)
@@ -205,6 +206,7 @@ Public Class Vehicle
RetarderRatio = 1
RetarderLossMapFile.Clear()
AngledriveLossMapFile.Clear()
+ EmTorqueLimitsFile.Clear()
AngledriveType = AngledriveType.None
AngledriveLossMapFile.Clear()
@@ -438,6 +440,13 @@ Public Class Vehicle
End Property
Public ReadOnly Property ElectricMotorTorqueLimits As TableData Implements IVehicleEngineeringInputData.ElectricMotorTorqueLimits
+ get
+ If (String.IsNullOrWhiteSpace(EmTorqueLimitsFile.FullPath))
+ return Nothing
+ End If
+ Return VectoCSVFile.Read(EmTorqueLimitsFile.FullPath)
+ End Get
+ End Property
Public ReadOnly Property MaxPropulsionTorque As TableData Implements IVehicleEngineeringInputData.MaxPropulsionTorque
Public ReadOnly Property Length As Meter Implements IVehicleDeclarationInputData.Length
@@ -761,12 +770,7 @@ Public Class Vehicle
End Property
Public Property InitialSOC As Double Implements IVehicleEngineeringInputData.InitialSOC
- Public ReadOnly Property MaxDrivetrainPower As Watt Implements IVehicleEngineeringInputData.MaxDrivetrainPower
- Get
- Return (MaxPower * 1000).SI(Of Watt)
- End Get
- End Property
- Public Property VehicleType As VectoSimulationJobType Implements IVehicleEngineeringInputData.VehicleType
+ Public Property VehicleType As VectoSimulationJobType Implements IVehicleEngineeringInputData.VehicleType
Public ReadOnly Property ZeroEmissionVehicle As Boolean Implements IVehicleDeclarationInputData.ZeroEmissionVehicle
diff --git a/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs b/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs
index 544afc1a10728e6e4dfbcaeb9d23bda2346c2491..ca40e0c66fda11ee36ea95696dd11235cb116872 100644
--- a/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs
@@ -118,8 +118,6 @@ namespace TUGraz.VectoCommon.InputData
double InitialSOC { get; }
- Watt MaxDrivetrainPower { get; }
-
VectoSimulationJobType VehicleType { get; }
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
index 997894188572d39cce4bb8e6a7c3a01d30e17006..8cb6d1704f23ce25e865cf91a1321f477b8bd81b 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
@@ -381,11 +381,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
get { return VehicleData.InitialSOC; }
}
- public Watt MaxDrivetrainPower
- {
- get { return VehicleData.MaxDrivetrainPower; }
- }
-
public VectoSimulationJobType VehicleType
{
get { return VehicleData.VehicleType; }
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
index 1f46a043092786b018d7d7630feb95def4a63aea..00d82fe5ca500146e71b4e3a9f64388786cd32be 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
@@ -93,18 +93,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
}
}
- public override Watt MaxDrivetrainPower
- {
- get
- {
- if (Body[JsonKeys.HEV_Vehicle_MaxDrivetrainPower] != null) {
- return Body.GetEx<double>(JsonKeys.HEV_Vehicle_MaxDrivetrainPower).SI(Unit.SI.Kilo.Watt).Cast<Watt>();
- }
-
- return null;
- }
- }
-
protected virtual JSONElectricMotors ReadMotors()
{
var retVal = new List<ElectricMachineEntry<IElectricMotorEngineeringInputData>>();
@@ -369,11 +357,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
get { return double.NaN; }
}
- public virtual Watt MaxDrivetrainPower
- {
- get { return null; }
- }
-
public virtual VectoSimulationJobType VehicleType
{
get { return VectoSimulationJobType.ConventionalVehicle; }
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleDataProvider.cs
index 4d6b1bfad9987dc5aa2779b7c39eed52a81604e4..7d9663b34c8339bc0e65b33e728f86dbe8255434 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleDataProvider.cs
@@ -197,8 +197,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
get { return double.NaN; }
}
- public virtual Watt MaxDrivetrainPower { get { return null; } }
-
public VectoSimulationJobType VehicleType
{
get { return VectoSimulationJobType.ConventionalVehicle; }
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
index e95d7c44d2508ce2c81c57c90510937162dcd0b0..5a5ea5ff76b296394ffcc562efeb55b6c1f068e3 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
@@ -806,7 +806,6 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
MinICEOnTime = hybridStrategyParameters.MinimumICEOnTime,
AuxReserveTime = hybridStrategyParameters.AuxBufferTime,
AuxReserveChargeTime = hybridStrategyParameters.AuxBufferChargeTime,
- MaxDrivetrainPower = inputData.JobInputData.Vehicle.MaxDrivetrainPower,
};
return retVal;
}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/HybridStrategyParameters.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/HybridStrategyParameters.cs
index 5b55c23f29756dbe91359d024ceabed313fc9542..5da938fd0c0f13588df402380f24c81b2b674551 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/HybridStrategyParameters.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/HybridStrategyParameters.cs
@@ -19,6 +19,6 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data {
public Second MinICEOnTime { get; set; }
- public Watt MaxDrivetrainPower { get; set; }
+ //public Watt MaxDrivetrainPower { get; set; }
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs
index 1ed7b6e9bcceacc0736dd060302397e27cdd0d94..28b4cefd5ea0597052d3581cb501b55cc8ad496e 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs
@@ -437,11 +437,11 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
public virtual IHybridStrategyResponse Request(Second absTime, Second dt, NewtonMeter outTorque, PerSecond outAngularVelocity, bool dryRun)
{
- if (DataBus.DriverInfo.DrivingAction == DrivingAction.Accelerate &&
- (outTorque * outAngularVelocity).IsGreater(StrategyParameters.MaxDrivetrainPower,
- Constants.SimulationSettings.LineSearchTolerance)) {
- return HandleRequestExceedsMaxPower(absTime, dt, outTorque, outAngularVelocity, dryRun);
- }
+ //if (DataBus.DriverInfo.DrivingAction == DrivingAction.Accelerate &&
+ // (outTorque * outAngularVelocity).IsGreater(StrategyParameters.MaxDrivetrainPower,
+ // Constants.SimulationSettings.LineSearchTolerance)) {
+ // return HandleRequestExceedsMaxPower(absTime, dt, outTorque, outAngularVelocity, dryRun);
+ //}
var currentGear = PreviousState.GearboxEngaged ? DataBus.GearboxInfo.Gear : Controller.ShiftStrategy.NextGear;
@@ -543,15 +543,15 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
//CurrentState.ICEStartTStmp = absTime;
}
}
- if (DataBus.DriverInfo.DrivingAction == DrivingAction.Accelerate &&
- (outTorque * outAngularVelocity).IsEqual(StrategyParameters.MaxDrivetrainPower,
- Constants.SimulationSettings.LineSearchTolerance.SI<Watt>())) {
- if (dryRun && response is ResponseDryRun responseDryRun) {
- if (responseDryRun.DeltaFullLoad.IsSmaller(0)) {
- return new ResponseDryRun(this, responseDryRun) { DeltaFullLoad = 0.SI<Watt>() };
- }
- }
- }
+ //if (DataBus.DriverInfo.DrivingAction == DrivingAction.Accelerate &&
+ // (outTorque * outAngularVelocity).IsEqual(StrategyParameters.MaxDrivetrainPower,
+ // Constants.SimulationSettings.LineSearchTolerance.SI<Watt>())) {
+ // if (dryRun && response is ResponseDryRun responseDryRun) {
+ // if (responseDryRun.DeltaFullLoad.IsSmaller(0)) {
+ // return new ResponseDryRun(this, responseDryRun) { DeltaFullLoad = 0.SI<Watt>() };
+ // }
+ // }
+ //}
return response;
}
@@ -571,76 +571,76 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
protected abstract IResponse RequestDryRun(Second absTime, Second dt, NewtonMeter outTorque,
PerSecond outAngularVelocity, GearshiftPosition nextGear, HybridStrategyResponse cfg);
- private IHybridStrategyResponse HandleRequestExceedsMaxPower(Second absTime, Second dt, NewtonMeter outTorque, PerSecond outAngularVelocity, bool dryRun)
- {
- // issue dry-run to get max available power from EM and ICE,
- // Search PWheel with max available EM power with ICE operating point on MaxTorque
- // return overload with Delta as P_out - PWheelMax
-
- //var responses = new List<HybridResultEntry>();
- var emPos = ModelData.ElectricMachinesData.First().Item1;
- var currentGear = PreviousState.GearboxEngaged ? DataBus.GearboxInfo.Gear : Controller.ShiftStrategy.NextGear;
-
- var emOffSetting = new HybridStrategyResponse()
- {
- CombustionEngineOn = true,
- GearboxInNeutral = false,
- MechanicalAssistPower = ElectricMotorsOff
- };
- var emOffResponse = RequestDryRun(absTime, dt, outTorque, outAngularVelocity, currentGear, emOffSetting);
-
- var maxEmDriveSetting = new HybridStrategyResponse() {
- CombustionEngineOn = true,
- GearboxInNeutral = false,
- MechanicalAssistPower = new Dictionary<PowertrainPosition, Tuple<PerSecond ,NewtonMeter>>() {
- {emPos , Tuple.Create(emOffResponse.ElectricMotor.AngularVelocity, emOffResponse.ElectricMotor.MaxDriveTorque)}
- },
- };
- var maxEmDriveResponse =
- RequestDryRun(absTime, dt, outTorque, outAngularVelocity, currentGear, maxEmDriveSetting);
- var deltaFullLoadTq = (maxEmDriveResponse.Engine.TotalTorqueDemand -
- maxEmDriveResponse.Engine.DynamicFullLoadTorque);
- var maxEngineSpeed =
- maxEmDriveResponse.Gearbox.Gear.Gear == 0 || !DataBus.ClutchInfo.ClutchClosed(absTime) ||
- !DataBus.GearboxInfo.TCLocked
- ? ModelData.EngineData.FullLoadCurves[0].N95hSpeed :
- VectoMath.Min(DataBus.GearboxInfo.GetGearData(DataBus.GearboxInfo.Gear.Gear).MaxSpeed, ModelData.EngineData.FullLoadCurves[0].N95hSpeed);
-
- if (deltaFullLoadTq.IsSmallerOrEqual(0)) {
+ //private IHybridStrategyResponse HandleRequestExceedsMaxPower(Second absTime, Second dt, NewtonMeter outTorque, PerSecond outAngularVelocity, bool dryRun)
+ //{
+ // // issue dry-run to get max available power from EM and ICE,
+ // // Search PWheel with max available EM power with ICE operating point on MaxTorque
+ // // return overload with Delta as P_out - PWheelMax
+
+ // //var responses = new List<HybridResultEntry>();
+ // var emPos = ModelData.ElectricMachinesData.First().Item1;
+ // var currentGear = PreviousState.GearboxEngaged ? DataBus.GearboxInfo.Gear : Controller.ShiftStrategy.NextGear;
+
+ // var emOffSetting = new HybridStrategyResponse()
+ // {
+ // CombustionEngineOn = true,
+ // GearboxInNeutral = false,
+ // MechanicalAssistPower = ElectricMotorsOff
+ // };
+ // var emOffResponse = RequestDryRun(absTime, dt, outTorque, outAngularVelocity, currentGear, emOffSetting);
+
+ // var maxEmDriveSetting = new HybridStrategyResponse() {
+ // CombustionEngineOn = true,
+ // GearboxInNeutral = false,
+ // MechanicalAssistPower = new Dictionary<PowertrainPosition, Tuple<PerSecond ,NewtonMeter>>() {
+ // {emPos , Tuple.Create(emOffResponse.ElectricMotor.AngularVelocity, emOffResponse.ElectricMotor.MaxDriveTorque)}
+ // },
+ // };
+ // var maxEmDriveResponse =
+ // RequestDryRun(absTime, dt, outTorque, outAngularVelocity, currentGear, maxEmDriveSetting);
+ // var deltaFullLoadTq = (maxEmDriveResponse.Engine.TotalTorqueDemand -
+ // maxEmDriveResponse.Engine.DynamicFullLoadTorque);
+ // var maxEngineSpeed =
+ // maxEmDriveResponse.Gearbox.Gear.Gear == 0 || !DataBus.ClutchInfo.ClutchClosed(absTime) ||
+ // !DataBus.GearboxInfo.TCLocked
+ // ? ModelData.EngineData.FullLoadCurves[0].N95hSpeed :
+ // VectoMath.Min(DataBus.GearboxInfo.GetGearData(DataBus.GearboxInfo.Gear.Gear).MaxSpeed, ModelData.EngineData.FullLoadCurves[0].N95hSpeed);
+
+ // if (deltaFullLoadTq.IsSmallerOrEqual(0)) {
- return new HybridStrategyLimitedResponse() {
- Delta = outTorque * outAngularVelocity - StrategyParameters.MaxDrivetrainPower,
- DeltaEngineSpeed = maxEmDriveResponse.Engine.EngineSpeed - maxEngineSpeed, // .DeltaEngineSpeed
- };
- }
-
- var avgEngineSpeed = (maxEmDriveResponse.Engine.EngineSpeed + DataBus.EngineInfo.EngineSpeed) / 2;
- var maxTorque = SearchAlgorithm.Search(outTorque, deltaFullLoadTq * avgEngineSpeed, -outTorque * 0.1,
- getYValue: resp => {
- var r = resp as IResponse;
- var deltaMaxTq = (r.Engine.TotalTorqueDemand -
- r.Engine.DynamicFullLoadTorque);
- return deltaMaxTq * avgEngineSpeed;
- },
- evaluateFunction: x => {
- return RequestDryRun(absTime, dt, x, outAngularVelocity, currentGear, maxEmDriveSetting);
- },
- criterion: resp => {
- var r = resp as IResponse;
- var deltaMaxTq = (r.Engine.TotalTorqueDemand -
- r.Engine.DynamicFullLoadTorque);
- return (deltaMaxTq * avgEngineSpeed).Value();
- });
- var delta = outTorque * outAngularVelocity - StrategyParameters.MaxDrivetrainPower;
- if ((maxTorque * outAngularVelocity).IsSmaller(StrategyParameters.MaxDrivetrainPower)) {
- delta = (outTorque - maxTorque) * outAngularVelocity;
- }
-
- return new HybridStrategyLimitedResponse() {
- Delta = delta,
- DeltaEngineSpeed = maxEmDriveResponse.Engine.EngineSpeed - maxEngineSpeed
- };
- }
+ // return new HybridStrategyLimitedResponse() {
+ // Delta = outTorque * outAngularVelocity - StrategyParameters.MaxDrivetrainPower,
+ // DeltaEngineSpeed = maxEmDriveResponse.Engine.EngineSpeed - maxEngineSpeed, // .DeltaEngineSpeed
+ // };
+ // }
+
+ // var avgEngineSpeed = (maxEmDriveResponse.Engine.EngineSpeed + DataBus.EngineInfo.EngineSpeed) / 2;
+ // var maxTorque = SearchAlgorithm.Search(outTorque, deltaFullLoadTq * avgEngineSpeed, -outTorque * 0.1,
+ // getYValue: resp => {
+ // var r = resp as IResponse;
+ // var deltaMaxTq = (r.Engine.TotalTorqueDemand -
+ // r.Engine.DynamicFullLoadTorque);
+ // return deltaMaxTq * avgEngineSpeed;
+ // },
+ // evaluateFunction: x => {
+ // return RequestDryRun(absTime, dt, x, outAngularVelocity, currentGear, maxEmDriveSetting);
+ // },
+ // criterion: resp => {
+ // var r = resp as IResponse;
+ // var deltaMaxTq = (r.Engine.TotalTorqueDemand -
+ // r.Engine.DynamicFullLoadTorque);
+ // return (deltaMaxTq * avgEngineSpeed).Value();
+ // });
+ // var delta = outTorque * outAngularVelocity - StrategyParameters.MaxDrivetrainPower;
+ // if ((maxTorque * outAngularVelocity).IsSmaller(StrategyParameters.MaxDrivetrainPower)) {
+ // delta = (outTorque - maxTorque) * outAngularVelocity;
+ // }
+
+ // return new HybridStrategyLimitedResponse() {
+ // Delta = delta,
+ // DeltaEngineSpeed = maxEmDriveResponse.Engine.EngineSpeed - maxEngineSpeed
+ // };
+ //}
protected HybridResultEntry ResponseEmOff
{
diff --git a/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs b/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
index 9889929af855f025cb8d1998c665e1604c447fc8..b05381877dc5242e185ea3bc2e09d7547da51c6d 100644
--- a/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
+++ b/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
@@ -493,7 +493,11 @@ public class JSONFileWriter : IOutputFileWriter
if ((vehicle.TankSystem.HasValue))
body["TankSystem"] = vehicle.TankSystem.Value.ToString();
- body.Add(JsonKeys.HEV_Vehicle_MaxDrivetrainPower, vehicle.MaxDrivetrainPower.ConvertToKiloWatt().Value);
+ //body.Add(JsonKeys.HEV_Vehicle_MaxDrivetrainPower, vehicle.MaxDrivetrainPower.ConvertToKiloWatt().Value);
+ if (vehicle.ElectricMotorTorqueLimits != null) {
+ body.Add("EMTorqueLimits", GetRelativePath(vehicle.ElectricMotorTorqueLimits.Source, basePath));
+ }
+
body.Add("InitialSoC", vehicle.InitialSOC * 100);
body.Add("PowertrainConfiguration", "ParallelHybrid");
body.Add("ElectricMotors", electricMotorsOut);
diff --git a/VectoCore/VectoCoreTest/Integration/Hybrid/ParallelHybridTest.cs b/VectoCore/VectoCoreTest/Integration/Hybrid/ParallelHybridTest.cs
index 546a6791dd088c52b749f03cf18b3f48a02f27a7..b30caef4ba838ade42691a464609f31afe7e5051 100644
--- a/VectoCore/VectoCoreTest/Integration/Hybrid/ParallelHybridTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/Hybrid/ParallelHybridTest.cs
@@ -1251,7 +1251,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid
AuxReserveTime = 5.SI<Second>(),
AuxReserveChargeTime = 2.SI<Second>(),
MinICEOnTime = 3.SI<Second>(),
- MaxDrivetrainPower = maxDriveTrainPower ?? 1e12.SI<Watt>(),
+ //MaxDrivetrainPower = maxDriveTrainPower ?? 1e12.SI<Watt>(),
};
}
diff --git a/VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs b/VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs
index dbd171aed2abe8e8c3c9ed62efa26359e9f8f95d..8048eb3f142ca727649c6077943d83b9a9646e1b 100644
--- a/VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs
@@ -150,7 +150,6 @@ namespace TUGraz.VectoCore.Tests.Utils {
}
public double InitialSOC { get; }
- public Watt MaxDrivetrainPower { get; }
public VectoSimulationJobType VehicleType { get; }
public bool ZeroEmissionVehicle { get; }