diff --git a/VECTO/GUI/ElectricMotorForm.Designer.vb b/VECTO/GUI/ElectricMotorForm.Designer.vb
index 787eda5c704162d2e97bb52640985ff27f3fec1f..c0ed54b7cd2369e7a111800b38782d0c5905ce7f 100644
--- a/VECTO/GUI/ElectricMotorForm.Designer.vb
+++ b/VECTO/GUI/ElectricMotorForm.Designer.vb
@@ -103,10 +103,6 @@ Partial Class ElectricMotorForm
Me.lblVoltageLowUnit = New System.Windows.Forms.Label()
Me.tbVoltageLow = New System.Windows.Forms.TextBox()
Me.lblMaxTorqueLow = New System.Windows.Forms.Label()
- Me.tbDragTorqueLow = New System.Windows.Forms.TextBox()
- Me.lblDragTorqueLow = New System.Windows.Forms.Label()
- Me.btnBrowseDragCurveLow = New System.Windows.Forms.Button()
- Me.btnDragCurveOpenLow = New System.Windows.Forms.Button()
Me.tbMapLow = New System.Windows.Forms.TextBox()
Me.lblPowerMapLow = New System.Windows.Forms.Label()
Me.btnBrowseEmMapLow = New System.Windows.Forms.Button()
@@ -114,6 +110,10 @@ Partial Class ElectricMotorForm
Me.tbMaxTorqueLow = New System.Windows.Forms.TextBox()
Me.btnMaxTorqueCurveOpenLow = New System.Windows.Forms.Button()
Me.btnBrowseMaxTorqueLow = New System.Windows.Forms.Button()
+ Me.tbDragTorqueLow = New System.Windows.Forms.TextBox()
+ Me.lblDragTorqueLow = New System.Windows.Forms.Label()
+ Me.btnBrowseDragCurveLow = New System.Windows.Forms.Button()
+ Me.btnDragCurveOpenLow = New System.Windows.Forms.Button()
Me.ToolStrip1.SuspendLayout
Me.StatusStrip1.SuspendLayout
CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).BeginInit
@@ -132,26 +132,29 @@ Partial Class ElectricMotorForm
'
'tbInertia
'
- Me.tbInertia.Location = New System.Drawing.Point(127, 5)
+ Me.tbInertia.Location = New System.Drawing.Point(190, 8)
+ Me.tbInertia.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbInertia.Name = "tbInertia"
- Me.tbInertia.Size = New System.Drawing.Size(49, 20)
+ Me.tbInertia.Size = New System.Drawing.Size(72, 26)
Me.tbInertia.TabIndex = 3
'
'lblinertiaUnit
'
Me.lblinertiaUnit.AutoSize = true
- Me.lblinertiaUnit.Location = New System.Drawing.Point(182, 8)
+ Me.lblinertiaUnit.Location = New System.Drawing.Point(273, 12)
+ Me.lblinertiaUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblinertiaUnit.Name = "lblinertiaUnit"
- Me.lblinertiaUnit.Size = New System.Drawing.Size(36, 13)
+ Me.lblinertiaUnit.Size = New System.Drawing.Size(52, 20)
Me.lblinertiaUnit.TabIndex = 24
Me.lblinertiaUnit.Text = "[kgm²]"
'
'lblInertia
'
Me.lblInertia.AutoSize = true
- Me.lblInertia.Location = New System.Drawing.Point(3, 7)
+ Me.lblInertia.Location = New System.Drawing.Point(4, 11)
+ Me.lblInertia.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblInertia.Name = "lblInertia"
- Me.lblInertia.Size = New System.Drawing.Size(36, 13)
+ Me.lblInertia.Size = New System.Drawing.Size(54, 20)
Me.lblInertia.TabIndex = 0
Me.lblInertia.Text = "Inertia"
'
@@ -159,9 +162,10 @@ Partial Class ElectricMotorForm
'
Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.ButCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
- Me.ButCancel.Location = New System.Drawing.Point(839, 567)
+ Me.ButCancel.Location = New System.Drawing.Point(1362, 696)
+ Me.ButCancel.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.ButCancel.Name = "ButCancel"
- Me.ButCancel.Size = New System.Drawing.Size(75, 23)
+ Me.ButCancel.Size = New System.Drawing.Size(112, 35)
Me.ButCancel.TabIndex = 99
Me.ButCancel.Text = "Cancel"
Me.ButCancel.UseVisualStyleBackColor = true
@@ -169,9 +173,10 @@ Partial Class ElectricMotorForm
'ButOK
'
Me.ButOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.ButOK.Location = New System.Drawing.Point(758, 567)
+ Me.ButOK.Location = New System.Drawing.Point(1241, 696)
+ Me.ButOK.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.ButOK.Name = "ButOK"
- Me.ButOK.Size = New System.Drawing.Size(75, 23)
+ Me.ButOK.Size = New System.Drawing.Size(112, 35)
Me.ButOK.TabIndex = 98
Me.ButOK.Text = "Save"
Me.ButOK.UseVisualStyleBackColor = true
@@ -183,8 +188,8 @@ Partial Class ElectricMotorForm
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, 2, 0)
- Me.ToolStrip1.Size = New System.Drawing.Size(926, 31)
+ Me.ToolStrip1.Padding = New System.Windows.Forms.Padding(0, 0, 3, 0)
+ Me.ToolStrip1.Size = New System.Drawing.Size(1493, 33)
Me.ToolStrip1.TabIndex = 30
Me.ToolStrip1.Text = "ToolStrip1"
'
@@ -194,7 +199,7 @@ Partial Class ElectricMotorForm
Me.ToolStripBtNew.Image = Global.TUGraz.VECTO.My.Resources.Resources.blue_document_icon
Me.ToolStripBtNew.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripBtNew.Name = "ToolStripBtNew"
- Me.ToolStripBtNew.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripBtNew.Size = New System.Drawing.Size(34, 28)
Me.ToolStripBtNew.Text = "ToolStripButton1"
Me.ToolStripBtNew.ToolTipText = "New"
'
@@ -204,7 +209,7 @@ Partial Class ElectricMotorForm
Me.ToolStripBtOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
Me.ToolStripBtOpen.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripBtOpen.Name = "ToolStripBtOpen"
- Me.ToolStripBtOpen.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripBtOpen.Size = New System.Drawing.Size(34, 28)
Me.ToolStripBtOpen.Text = "ToolStripButton1"
Me.ToolStripBtOpen.ToolTipText = "Open..."
'
@@ -214,7 +219,7 @@ Partial Class ElectricMotorForm
Me.ToolStripBtSave.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_document_save_icon
Me.ToolStripBtSave.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripBtSave.Name = "ToolStripBtSave"
- Me.ToolStripBtSave.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripBtSave.Size = New System.Drawing.Size(34, 28)
Me.ToolStripBtSave.Text = "ToolStripButton1"
Me.ToolStripBtSave.ToolTipText = "Save"
'
@@ -224,14 +229,14 @@ Partial Class ElectricMotorForm
Me.ToolStripBtSaveAs.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_document_save_as_icon
Me.ToolStripBtSaveAs.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripBtSaveAs.Name = "ToolStripBtSaveAs"
- Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(34, 28)
Me.ToolStripBtSaveAs.Text = "ToolStripButton1"
Me.ToolStripBtSaveAs.ToolTipText = "Save As..."
'
'ToolStripSeparator3
'
Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
- Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 31)
+ Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 33)
'
'ToolStripBtSendTo
'
@@ -239,14 +244,14 @@ Partial Class ElectricMotorForm
Me.ToolStripBtSendTo.Image = Global.TUGraz.VECTO.My.Resources.Resources.export_icon
Me.ToolStripBtSendTo.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripBtSendTo.Name = "ToolStripBtSendTo"
- Me.ToolStripBtSendTo.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripBtSendTo.Size = New System.Drawing.Size(34, 28)
Me.ToolStripBtSendTo.Text = "Send to Job Editor"
Me.ToolStripBtSendTo.ToolTipText = "Send to Job Editor"
'
'ToolStripSeparator1
'
Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
- Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 31)
+ Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 33)
'
'ToolStripButton1
'
@@ -254,16 +259,17 @@ Partial Class ElectricMotorForm
Me.ToolStripButton1.Image = Global.TUGraz.VECTO.My.Resources.Resources.Help_icon
Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripButton1.Name = "ToolStripButton1"
- Me.ToolStripButton1.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripButton1.Size = New System.Drawing.Size(34, 28)
Me.ToolStripButton1.Text = "Help"
'
'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, 592)
+ Me.StatusStrip1.Location = New System.Drawing.Point(0, 737)
Me.StatusStrip1.Name = "StatusStrip1"
- Me.StatusStrip1.Size = New System.Drawing.Size(926, 22)
+ Me.StatusStrip1.Padding = New System.Windows.Forms.Padding(2, 0, 21, 0)
+ Me.StatusStrip1.Size = New System.Drawing.Size(1493, 32)
Me.StatusStrip1.SizingGrip = false
Me.StatusStrip1.TabIndex = 37
Me.StatusStrip1.Text = "StatusStrip1"
@@ -271,22 +277,24 @@ Partial Class ElectricMotorForm
'LbStatus
'
Me.LbStatus.Name = "LbStatus"
- Me.LbStatus.Size = New System.Drawing.Size(39, 17)
+ Me.LbStatus.Size = New System.Drawing.Size(60, 25)
Me.LbStatus.Text = "Status"
'
'tbMakeModel
'
- Me.tbMakeModel.Location = New System.Drawing.Point(109, 82)
+ Me.tbMakeModel.Location = New System.Drawing.Point(164, 126)
+ Me.tbMakeModel.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbMakeModel.Name = "tbMakeModel"
- Me.tbMakeModel.Size = New System.Drawing.Size(370, 20)
+ Me.tbMakeModel.Size = New System.Drawing.Size(553, 26)
Me.tbMakeModel.TabIndex = 0
'
'lblMakeModel
'
Me.lblMakeModel.AutoSize = true
- Me.lblMakeModel.Location = New System.Drawing.Point(16, 85)
+ Me.lblMakeModel.Location = New System.Drawing.Point(24, 131)
+ Me.lblMakeModel.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblMakeModel.Name = "lblMakeModel"
- Me.lblMakeModel.Size = New System.Drawing.Size(87, 13)
+ Me.lblMakeModel.Size = New System.Drawing.Size(126, 20)
Me.lblMakeModel.TabIndex = 11
Me.lblMakeModel.Text = "Make and Model"
'
@@ -294,9 +302,10 @@ Partial Class ElectricMotorForm
'
Me.PictureBox1.BackColor = System.Drawing.Color.White
Me.PictureBox1.Image = Global.TUGraz.VECTO.My.Resources.Resources.VECTO_ENG
- Me.PictureBox1.Location = New System.Drawing.Point(0, 28)
+ Me.PictureBox1.Location = New System.Drawing.Point(0, 43)
+ Me.PictureBox1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.PictureBox1.Name = "PictureBox1"
- Me.PictureBox1.Size = New System.Drawing.Size(502, 40)
+ Me.PictureBox1.Size = New System.Drawing.Size(753, 62)
Me.PictureBox1.TabIndex = 39
Me.PictureBox1.TabStop = false
'
@@ -305,18 +314,18 @@ Partial Class ElectricMotorForm
Me.CmOpenFile.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
Me.CmOpenFile.Name = "CmOpenFile"
- Me.CmOpenFile.Size = New System.Drawing.Size(153, 48)
+ Me.CmOpenFile.Size = New System.Drawing.Size(203, 68)
'
'OpenWithToolStripMenuItem
'
Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem"
- Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
+ Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(202, 32)
Me.OpenWithToolStripMenuItem.Text = "Open with ..."
'
'ShowInFolderToolStripMenuItem
'
Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem"
- Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
+ Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(202, 32)
Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
'
'pnInertia
@@ -324,77 +333,86 @@ Partial Class ElectricMotorForm
Me.pnInertia.Controls.Add(Me.lblInertia)
Me.pnInertia.Controls.Add(Me.lblinertiaUnit)
Me.pnInertia.Controls.Add(Me.tbInertia)
- Me.pnInertia.Location = New System.Drawing.Point(12, 108)
+ Me.pnInertia.Location = New System.Drawing.Point(18, 166)
+ Me.pnInertia.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.pnInertia.Name = "pnInertia"
- Me.pnInertia.Size = New System.Drawing.Size(221, 30)
+ Me.pnInertia.Size = New System.Drawing.Size(332, 46)
Me.pnInertia.TabIndex = 1
'
'btnEmMapOpenHi
'
Me.btnEmMapOpenHi.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btnEmMapOpenHi.Location = New System.Drawing.Point(443, 102)
+ Me.btnEmMapOpenHi.Location = New System.Drawing.Point(664, 157)
+ Me.btnEmMapOpenHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.btnEmMapOpenHi.Name = "btnEmMapOpenHi"
- Me.btnEmMapOpenHi.Size = New System.Drawing.Size(24, 24)
+ Me.btnEmMapOpenHi.Size = New System.Drawing.Size(36, 37)
Me.btnEmMapOpenHi.TabIndex = 9
Me.btnEmMapOpenHi.UseVisualStyleBackColor = true
'
'btnBrowseEmMapHi
'
Me.btnBrowseEmMapHi.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnBrowseEmMapHi.Location = New System.Drawing.Point(420, 102)
+ Me.btnBrowseEmMapHi.Location = New System.Drawing.Point(630, 157)
+ Me.btnBrowseEmMapHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.btnBrowseEmMapHi.Name = "btnBrowseEmMapHi"
- Me.btnBrowseEmMapHi.Size = New System.Drawing.Size(24, 24)
+ Me.btnBrowseEmMapHi.Size = New System.Drawing.Size(36, 37)
Me.btnBrowseEmMapHi.TabIndex = 8
Me.btnBrowseEmMapHi.UseVisualStyleBackColor = true
'
'lblPowerMapHi
'
Me.lblPowerMapHi.AutoSize = true
- Me.lblPowerMapHi.Location = New System.Drawing.Point(6, 89)
+ Me.lblPowerMapHi.Location = New System.Drawing.Point(9, 137)
+ Me.lblPowerMapHi.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblPowerMapHi.Name = "lblPowerMapHi"
- Me.lblPowerMapHi.Size = New System.Drawing.Size(163, 13)
+ Me.lblPowerMapHi.Size = New System.Drawing.Size(242, 20)
Me.lblPowerMapHi.TabIndex = 43
Me.lblPowerMapHi.Text = "Electric Power Consumption Map"
'
'tbMapHi
'
- Me.tbMapHi.Location = New System.Drawing.Point(6, 105)
+ Me.tbMapHi.Location = New System.Drawing.Point(9, 162)
+ Me.tbMapHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbMapHi.Name = "tbMapHi"
- Me.tbMapHi.Size = New System.Drawing.Size(406, 20)
+ Me.tbMapHi.Size = New System.Drawing.Size(607, 26)
Me.tbMapHi.TabIndex = 7
'
'btnMaxTorqueCurveOpenHi
'
Me.btnMaxTorqueCurveOpenHi.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btnMaxTorqueCurveOpenHi.Location = New System.Drawing.Point(443, 60)
+ Me.btnMaxTorqueCurveOpenHi.Location = New System.Drawing.Point(664, 92)
+ Me.btnMaxTorqueCurveOpenHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.btnMaxTorqueCurveOpenHi.Name = "btnMaxTorqueCurveOpenHi"
- Me.btnMaxTorqueCurveOpenHi.Size = New System.Drawing.Size(24, 24)
+ Me.btnMaxTorqueCurveOpenHi.Size = New System.Drawing.Size(36, 37)
Me.btnMaxTorqueCurveOpenHi.TabIndex = 3
Me.btnMaxTorqueCurveOpenHi.UseVisualStyleBackColor = true
'
'btnBrowseMaxTorqueHi
'
Me.btnBrowseMaxTorqueHi.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnBrowseMaxTorqueHi.Location = New System.Drawing.Point(420, 60)
+ Me.btnBrowseMaxTorqueHi.Location = New System.Drawing.Point(630, 92)
+ Me.btnBrowseMaxTorqueHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.btnBrowseMaxTorqueHi.Name = "btnBrowseMaxTorqueHi"
- Me.btnBrowseMaxTorqueHi.Size = New System.Drawing.Size(24, 24)
+ Me.btnBrowseMaxTorqueHi.Size = New System.Drawing.Size(36, 37)
Me.btnBrowseMaxTorqueHi.TabIndex = 2
Me.btnBrowseMaxTorqueHi.UseVisualStyleBackColor = true
'
'lblMaxTorqueHi
'
Me.lblMaxTorqueHi.AutoSize = true
- Me.lblMaxTorqueHi.Location = New System.Drawing.Point(6, 46)
+ Me.lblMaxTorqueHi.Location = New System.Drawing.Point(9, 71)
+ Me.lblMaxTorqueHi.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblMaxTorqueHi.Name = "lblMaxTorqueHi"
- Me.lblMaxTorqueHi.Size = New System.Drawing.Size(222, 13)
+ Me.lblMaxTorqueHi.Size = New System.Drawing.Size(325, 20)
Me.lblMaxTorqueHi.TabIndex = 47
Me.lblMaxTorqueHi.Text = "Max Drive and Max Generation Torque Curve"
'
'tbMaxTorqueHi
'
- Me.tbMaxTorqueHi.Location = New System.Drawing.Point(6, 62)
+ Me.tbMaxTorqueHi.Location = New System.Drawing.Point(9, 97)
+ Me.tbMaxTorqueHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbMaxTorqueHi.Name = "tbMaxTorqueHi"
- Me.tbMaxTorqueHi.Size = New System.Drawing.Size(406, 20)
+ Me.tbMaxTorqueHi.Size = New System.Drawing.Size(607, 26)
Me.tbMaxTorqueHi.TabIndex = 1
'
'lblTitle
@@ -402,9 +420,10 @@ Partial Class ElectricMotorForm
Me.lblTitle.AutoSize = true
Me.lblTitle.BackColor = System.Drawing.Color.White
Me.lblTitle.Font = New System.Drawing.Font("Microsoft Sans Serif", 18!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- Me.lblTitle.Location = New System.Drawing.Point(115, 34)
+ Me.lblTitle.Location = New System.Drawing.Point(172, 52)
+ Me.lblTitle.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblTitle.Name = "lblTitle"
- Me.lblTitle.Size = New System.Drawing.Size(190, 29)
+ Me.lblTitle.Size = New System.Drawing.Size(281, 40)
Me.lblTitle.TabIndex = 48
Me.lblTitle.Text = "Electric Machine"
'
@@ -412,9 +431,10 @@ Partial Class ElectricMotorForm
'
Me.PicBox.BackColor = System.Drawing.Color.LightGray
Me.PicBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
- Me.PicBox.Location = New System.Drawing.Point(508, 28)
+ Me.PicBox.Location = New System.Drawing.Point(762, 43)
+ Me.PicBox.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.PicBox.Name = "PicBox"
- Me.PicBox.Size = New System.Drawing.Size(382, 266)
+ Me.PicBox.Size = New System.Drawing.Size(710, 408)
Me.PicBox.TabIndex = 49
Me.PicBox.TabStop = false
'
@@ -423,34 +443,38 @@ Partial Class ElectricMotorForm
Me.Panel1.Controls.Add(Me.lblContTq)
Me.Panel1.Controls.Add(Me.lblContTqUnit)
Me.Panel1.Controls.Add(Me.tbContTq)
- Me.Panel1.Location = New System.Drawing.Point(12, 144)
+ Me.Panel1.Location = New System.Drawing.Point(18, 222)
+ Me.Panel1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.Panel1.Name = "Panel1"
- Me.Panel1.Size = New System.Drawing.Size(221, 30)
+ Me.Panel1.Size = New System.Drawing.Size(332, 46)
Me.Panel1.TabIndex = 2
'
'lblContTq
'
Me.lblContTq.AutoSize = true
- Me.lblContTq.Location = New System.Drawing.Point(3, 7)
+ Me.lblContTq.Location = New System.Drawing.Point(4, 11)
+ Me.lblContTq.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblContTq.Name = "lblContTq"
- Me.lblContTq.Size = New System.Drawing.Size(100, 13)
+ Me.lblContTq.Size = New System.Drawing.Size(148, 20)
Me.lblContTq.TabIndex = 0
Me.lblContTq.Text = "Continuous Torque:"
'
'lblContTqUnit
'
Me.lblContTqUnit.AutoSize = true
- Me.lblContTqUnit.Location = New System.Drawing.Point(182, 8)
+ Me.lblContTqUnit.Location = New System.Drawing.Point(273, 12)
+ Me.lblContTqUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblContTqUnit.Name = "lblContTqUnit"
- Me.lblContTqUnit.Size = New System.Drawing.Size(29, 13)
+ Me.lblContTqUnit.Size = New System.Drawing.Size(41, 20)
Me.lblContTqUnit.TabIndex = 24
Me.lblContTqUnit.Text = "[Nm]"
'
'tbContTq
'
- Me.tbContTq.Location = New System.Drawing.Point(127, 5)
+ Me.tbContTq.Location = New System.Drawing.Point(190, 8)
+ Me.tbContTq.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbContTq.Name = "tbContTq"
- Me.tbContTq.Size = New System.Drawing.Size(49, 20)
+ Me.tbContTq.Size = New System.Drawing.Size(72, 26)
Me.tbContTq.TabIndex = 3
'
'Panel2
@@ -458,34 +482,38 @@ Partial Class ElectricMotorForm
Me.Panel2.Controls.Add(Me.lblOvlTime)
Me.Panel2.Controls.Add(Me.lblOvltimeUnit)
Me.Panel2.Controls.Add(Me.tbOvlTime)
- Me.Panel2.Location = New System.Drawing.Point(12, 206)
+ Me.Panel2.Location = New System.Drawing.Point(18, 317)
+ Me.Panel2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.Panel2.Name = "Panel2"
- Me.Panel2.Size = New System.Drawing.Size(221, 30)
+ Me.Panel2.Size = New System.Drawing.Size(332, 46)
Me.Panel2.TabIndex = 4
'
'lblOvlTime
'
Me.lblOvlTime.AutoSize = true
- Me.lblOvlTime.Location = New System.Drawing.Point(3, 7)
+ Me.lblOvlTime.Location = New System.Drawing.Point(4, 11)
+ Me.lblOvlTime.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblOvlTime.Name = "lblOvlTime"
- Me.lblOvlTime.Size = New System.Drawing.Size(96, 13)
+ Me.lblOvlTime.Size = New System.Drawing.Size(141, 20)
Me.lblOvlTime.TabIndex = 0
Me.lblOvlTime.Text = "Overload Duration:"
'
'lblOvltimeUnit
'
Me.lblOvltimeUnit.AutoSize = true
- Me.lblOvltimeUnit.Location = New System.Drawing.Point(180, 7)
+ Me.lblOvltimeUnit.Location = New System.Drawing.Point(270, 11)
+ Me.lblOvltimeUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblOvltimeUnit.Name = "lblOvltimeUnit"
- Me.lblOvltimeUnit.Size = New System.Drawing.Size(18, 13)
+ Me.lblOvltimeUnit.Size = New System.Drawing.Size(25, 20)
Me.lblOvltimeUnit.TabIndex = 24
Me.lblOvltimeUnit.Text = "[s]"
'
'tbOvlTime
'
- Me.tbOvlTime.Location = New System.Drawing.Point(127, 5)
+ Me.tbOvlTime.Location = New System.Drawing.Point(190, 8)
+ Me.tbOvlTime.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbOvlTime.Name = "tbOvlTime"
- Me.tbOvlTime.Size = New System.Drawing.Size(49, 20)
+ Me.tbOvlTime.Size = New System.Drawing.Size(72, 26)
Me.tbOvlTime.TabIndex = 3
'
'Panel3
@@ -493,34 +521,38 @@ Partial Class ElectricMotorForm
Me.Panel3.Controls.Add(Me.lblOvlRecovery)
Me.Panel3.Controls.Add(Me.lblOvlRecoveryFactorUnit)
Me.Panel3.Controls.Add(Me.tbOverloadRecoveryFactor)
- Me.Panel3.Location = New System.Drawing.Point(233, 206)
+ Me.Panel3.Location = New System.Drawing.Point(350, 317)
+ Me.Panel3.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.Panel3.Name = "Panel3"
- Me.Panel3.Size = New System.Drawing.Size(261, 30)
+ Me.Panel3.Size = New System.Drawing.Size(392, 46)
Me.Panel3.TabIndex = 7
'
'lblOvlRecovery
'
Me.lblOvlRecovery.AutoSize = true
- Me.lblOvlRecovery.Location = New System.Drawing.Point(-2, 8)
+ Me.lblOvlRecovery.Location = New System.Drawing.Point(-3, 12)
+ Me.lblOvlRecovery.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblOvlRecovery.Name = "lblOvlRecovery"
- Me.lblOvlRecovery.Size = New System.Drawing.Size(176, 13)
+ Me.lblOvlRecovery.Size = New System.Drawing.Size(257, 20)
Me.lblOvlRecovery.TabIndex = 0
Me.lblOvlRecovery.Text = "Thermal Overload Recovery Factor:"
'
'lblOvlRecoveryFactorUnit
'
Me.lblOvlRecoveryFactorUnit.AutoSize = true
- Me.lblOvlRecoveryFactorUnit.Location = New System.Drawing.Point(230, 7)
+ Me.lblOvlRecoveryFactorUnit.Location = New System.Drawing.Point(345, 11)
+ Me.lblOvlRecoveryFactorUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblOvlRecoveryFactorUnit.Name = "lblOvlRecoveryFactorUnit"
- Me.lblOvlRecoveryFactorUnit.Size = New System.Drawing.Size(16, 13)
+ Me.lblOvlRecoveryFactorUnit.Size = New System.Drawing.Size(22, 20)
Me.lblOvlRecoveryFactorUnit.TabIndex = 24
Me.lblOvlRecoveryFactorUnit.Text = "[-]"
'
'tbOverloadRecoveryFactor
'
- Me.tbOverloadRecoveryFactor.Location = New System.Drawing.Point(177, 5)
+ Me.tbOverloadRecoveryFactor.Location = New System.Drawing.Point(266, 8)
+ Me.tbOverloadRecoveryFactor.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbOverloadRecoveryFactor.Name = "tbOverloadRecoveryFactor"
- Me.tbOverloadRecoveryFactor.Size = New System.Drawing.Size(49, 20)
+ Me.tbOverloadRecoveryFactor.Size = New System.Drawing.Size(72, 26)
Me.tbOverloadRecoveryFactor.TabIndex = 3
'
'Panel4
@@ -528,34 +560,38 @@ Partial Class ElectricMotorForm
Me.Panel4.Controls.Add(Me.lblRatedSpeed)
Me.Panel4.Controls.Add(Me.lblRatedSpeedUnit)
Me.Panel4.Controls.Add(Me.tbRatedSpeed)
- Me.Panel4.Location = New System.Drawing.Point(233, 144)
+ Me.Panel4.Location = New System.Drawing.Point(350, 222)
+ Me.Panel4.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.Panel4.Name = "Panel4"
- Me.Panel4.Size = New System.Drawing.Size(261, 30)
+ Me.Panel4.Size = New System.Drawing.Size(392, 46)
Me.Panel4.TabIndex = 5
'
'lblRatedSpeed
'
Me.lblRatedSpeed.AutoSize = true
- Me.lblRatedSpeed.Location = New System.Drawing.Point(3, 7)
+ Me.lblRatedSpeed.Location = New System.Drawing.Point(4, 11)
+ Me.lblRatedSpeed.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblRatedSpeed.Name = "lblRatedSpeed"
- Me.lblRatedSpeed.Size = New System.Drawing.Size(158, 13)
+ Me.lblRatedSpeed.Size = New System.Drawing.Size(234, 20)
Me.lblRatedSpeed.TabIndex = 0
Me.lblRatedSpeed.Text = "Test Speed Continuous Torque:"
'
'lblRatedSpeedUnit
'
Me.lblRatedSpeedUnit.AutoSize = true
- Me.lblRatedSpeedUnit.Location = New System.Drawing.Point(229, 7)
+ Me.lblRatedSpeedUnit.Location = New System.Drawing.Point(344, 11)
+ Me.lblRatedSpeedUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblRatedSpeedUnit.Name = "lblRatedSpeedUnit"
- Me.lblRatedSpeedUnit.Size = New System.Drawing.Size(30, 13)
+ Me.lblRatedSpeedUnit.Size = New System.Drawing.Size(44, 20)
Me.lblRatedSpeedUnit.TabIndex = 24
Me.lblRatedSpeedUnit.Text = "[rpm]"
'
'tbRatedSpeed
'
- Me.tbRatedSpeed.Location = New System.Drawing.Point(177, 5)
+ Me.tbRatedSpeed.Location = New System.Drawing.Point(266, 8)
+ Me.tbRatedSpeed.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbRatedSpeed.Name = "tbRatedSpeed"
- Me.tbRatedSpeed.Size = New System.Drawing.Size(49, 20)
+ Me.tbRatedSpeed.Size = New System.Drawing.Size(72, 26)
Me.tbRatedSpeed.TabIndex = 3
'
'pnOverloadTq
@@ -563,34 +599,38 @@ Partial Class ElectricMotorForm
Me.pnOverloadTq.Controls.Add(Me.lblOverloadTq)
Me.pnOverloadTq.Controls.Add(Me.lblOverloadTqUnit)
Me.pnOverloadTq.Controls.Add(Me.tbOverloadTq)
- Me.pnOverloadTq.Location = New System.Drawing.Point(12, 175)
+ Me.pnOverloadTq.Location = New System.Drawing.Point(18, 269)
+ Me.pnOverloadTq.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.pnOverloadTq.Name = "pnOverloadTq"
- Me.pnOverloadTq.Size = New System.Drawing.Size(221, 30)
+ Me.pnOverloadTq.Size = New System.Drawing.Size(332, 46)
Me.pnOverloadTq.TabIndex = 3
'
'lblOverloadTq
'
Me.lblOverloadTq.AutoSize = true
- Me.lblOverloadTq.Location = New System.Drawing.Point(3, 7)
+ Me.lblOverloadTq.Location = New System.Drawing.Point(4, 11)
+ Me.lblOverloadTq.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblOverloadTq.Name = "lblOverloadTq"
- Me.lblOverloadTq.Size = New System.Drawing.Size(90, 13)
+ Me.lblOverloadTq.Size = New System.Drawing.Size(130, 20)
Me.lblOverloadTq.TabIndex = 0
Me.lblOverloadTq.Text = "Overload Torque:"
'
'lblOverloadTqUnit
'
Me.lblOverloadTqUnit.AutoSize = true
- Me.lblOverloadTqUnit.Location = New System.Drawing.Point(182, 8)
+ Me.lblOverloadTqUnit.Location = New System.Drawing.Point(273, 12)
+ Me.lblOverloadTqUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblOverloadTqUnit.Name = "lblOverloadTqUnit"
- Me.lblOverloadTqUnit.Size = New System.Drawing.Size(29, 13)
+ Me.lblOverloadTqUnit.Size = New System.Drawing.Size(41, 20)
Me.lblOverloadTqUnit.TabIndex = 24
Me.lblOverloadTqUnit.Text = "[Nm]"
'
'tbOverloadTq
'
- Me.tbOverloadTq.Location = New System.Drawing.Point(127, 5)
+ Me.tbOverloadTq.Location = New System.Drawing.Point(190, 8)
+ Me.tbOverloadTq.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbOverloadTq.Name = "tbOverloadTq"
- Me.tbOverloadTq.Size = New System.Drawing.Size(49, 20)
+ Me.tbOverloadTq.Size = New System.Drawing.Size(72, 26)
Me.tbOverloadTq.TabIndex = 3
'
'Panel6
@@ -598,34 +638,38 @@ Partial Class ElectricMotorForm
Me.Panel6.Controls.Add(Me.lblOverloadSpeed)
Me.Panel6.Controls.Add(Me.lblOverloadSpeedUnit)
Me.Panel6.Controls.Add(Me.tbOvlSpeed)
- Me.Panel6.Location = New System.Drawing.Point(233, 175)
+ Me.Panel6.Location = New System.Drawing.Point(350, 269)
+ Me.Panel6.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.Panel6.Name = "Panel6"
- Me.Panel6.Size = New System.Drawing.Size(261, 30)
+ Me.Panel6.Size = New System.Drawing.Size(392, 46)
Me.Panel6.TabIndex = 6
'
'lblOverloadSpeed
'
Me.lblOverloadSpeed.AutoSize = true
- Me.lblOverloadSpeed.Location = New System.Drawing.Point(3, 7)
+ Me.lblOverloadSpeed.Location = New System.Drawing.Point(4, 11)
+ Me.lblOverloadSpeed.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblOverloadSpeed.Name = "lblOverloadSpeed"
- Me.lblOverloadSpeed.Size = New System.Drawing.Size(148, 13)
+ Me.lblOverloadSpeed.Size = New System.Drawing.Size(216, 20)
Me.lblOverloadSpeed.TabIndex = 0
Me.lblOverloadSpeed.Text = "Test Speed Overload Torque:"
'
'lblOverloadSpeedUnit
'
Me.lblOverloadSpeedUnit.AutoSize = true
- Me.lblOverloadSpeedUnit.Location = New System.Drawing.Point(229, 7)
+ Me.lblOverloadSpeedUnit.Location = New System.Drawing.Point(344, 11)
+ Me.lblOverloadSpeedUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblOverloadSpeedUnit.Name = "lblOverloadSpeedUnit"
- Me.lblOverloadSpeedUnit.Size = New System.Drawing.Size(30, 13)
+ Me.lblOverloadSpeedUnit.Size = New System.Drawing.Size(44, 20)
Me.lblOverloadSpeedUnit.TabIndex = 24
Me.lblOverloadSpeedUnit.Text = "[rpm]"
'
'tbOvlSpeed
'
- Me.tbOvlSpeed.Location = New System.Drawing.Point(177, 5)
+ Me.tbOvlSpeed.Location = New System.Drawing.Point(266, 8)
+ Me.tbOvlSpeed.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbOvlSpeed.Name = "tbOvlSpeed"
- Me.tbOvlSpeed.Size = New System.Drawing.Size(49, 20)
+ Me.tbOvlSpeed.Size = New System.Drawing.Size(72, 26)
Me.tbOvlSpeed.TabIndex = 3
'
'gbVoltageLevelHi
@@ -641,36 +685,41 @@ Partial Class ElectricMotorForm
Me.gbVoltageLevelHi.Controls.Add(Me.tbMaxTorqueHi)
Me.gbVoltageLevelHi.Controls.Add(Me.btnMaxTorqueCurveOpenHi)
Me.gbVoltageLevelHi.Controls.Add(Me.btnBrowseMaxTorqueHi)
- Me.gbVoltageLevelHi.Location = New System.Drawing.Point(12, 382)
+ Me.gbVoltageLevelHi.Location = New System.Drawing.Point(749, 473)
+ Me.gbVoltageLevelHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.gbVoltageLevelHi.Name = "gbVoltageLevelHi"
- Me.gbVoltageLevelHi.Size = New System.Drawing.Size(482, 136)
- Me.gbVoltageLevelHi.TabIndex = 9
+ Me.gbVoltageLevelHi.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbVoltageLevelHi.Size = New System.Drawing.Size(723, 206)
+ Me.gbVoltageLevelHi.TabIndex = 12
Me.gbVoltageLevelHi.TabStop = false
Me.gbVoltageLevelHi.Text = "Voltage Level High"
'
'lblVoltageHi
'
Me.lblVoltageHi.AutoSize = true
- Me.lblVoltageHi.Location = New System.Drawing.Point(12, 21)
+ Me.lblVoltageHi.Location = New System.Drawing.Point(18, 32)
+ Me.lblVoltageHi.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblVoltageHi.Name = "lblVoltageHi"
- Me.lblVoltageHi.Size = New System.Drawing.Size(43, 13)
+ Me.lblVoltageHi.Size = New System.Drawing.Size(64, 20)
Me.lblVoltageHi.TabIndex = 48
Me.lblVoltageHi.Text = "Voltage"
'
'lblVoltageHiUnit
'
Me.lblVoltageHiUnit.AutoSize = true
- Me.lblVoltageHiUnit.Location = New System.Drawing.Point(189, 21)
+ Me.lblVoltageHiUnit.Location = New System.Drawing.Point(284, 32)
+ Me.lblVoltageHiUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblVoltageHiUnit.Name = "lblVoltageHiUnit"
- Me.lblVoltageHiUnit.Size = New System.Drawing.Size(20, 13)
+ Me.lblVoltageHiUnit.Size = New System.Drawing.Size(28, 20)
Me.lblVoltageHiUnit.TabIndex = 50
Me.lblVoltageHiUnit.Text = "[V]"
'
'tbVoltageHi
'
- Me.tbVoltageHi.Location = New System.Drawing.Point(136, 19)
+ Me.tbVoltageHi.Location = New System.Drawing.Point(204, 29)
+ Me.tbVoltageHi.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbVoltageHi.Name = "tbVoltageHi"
- Me.tbVoltageHi.Size = New System.Drawing.Size(49, 20)
+ Me.tbVoltageHi.Size = New System.Drawing.Size(72, 26)
Me.tbVoltageHi.TabIndex = 0
'
'gbVoltageLevelLow
@@ -686,147 +735,164 @@ Partial Class ElectricMotorForm
Me.gbVoltageLevelLow.Controls.Add(Me.tbMaxTorqueLow)
Me.gbVoltageLevelLow.Controls.Add(Me.btnMaxTorqueCurveOpenLow)
Me.gbVoltageLevelLow.Controls.Add(Me.btnBrowseMaxTorqueLow)
- Me.gbVoltageLevelLow.Location = New System.Drawing.Point(12, 242)
+ Me.gbVoltageLevelLow.Location = New System.Drawing.Point(18, 473)
+ Me.gbVoltageLevelLow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.gbVoltageLevelLow.Name = "gbVoltageLevelLow"
- Me.gbVoltageLevelLow.Size = New System.Drawing.Size(482, 134)
- Me.gbVoltageLevelLow.TabIndex = 8
+ Me.gbVoltageLevelLow.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbVoltageLevelLow.Size = New System.Drawing.Size(723, 206)
+ Me.gbVoltageLevelLow.TabIndex = 11
Me.gbVoltageLevelLow.TabStop = false
Me.gbVoltageLevelLow.Text = "Voltage Level Low"
'
'lblVoltageLow
'
Me.lblVoltageLow.AutoSize = true
- Me.lblVoltageLow.Location = New System.Drawing.Point(12, 21)
+ Me.lblVoltageLow.Location = New System.Drawing.Point(18, 32)
+ Me.lblVoltageLow.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblVoltageLow.Name = "lblVoltageLow"
- Me.lblVoltageLow.Size = New System.Drawing.Size(43, 13)
+ Me.lblVoltageLow.Size = New System.Drawing.Size(64, 20)
Me.lblVoltageLow.TabIndex = 48
Me.lblVoltageLow.Text = "Voltage"
'
'lblVoltageLowUnit
'
Me.lblVoltageLowUnit.AutoSize = true
- Me.lblVoltageLowUnit.Location = New System.Drawing.Point(189, 21)
+ Me.lblVoltageLowUnit.Location = New System.Drawing.Point(284, 32)
+ Me.lblVoltageLowUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblVoltageLowUnit.Name = "lblVoltageLowUnit"
- Me.lblVoltageLowUnit.Size = New System.Drawing.Size(20, 13)
+ Me.lblVoltageLowUnit.Size = New System.Drawing.Size(28, 20)
Me.lblVoltageLowUnit.TabIndex = 50
Me.lblVoltageLowUnit.Text = "[V]"
'
'tbVoltageLow
'
- Me.tbVoltageLow.Location = New System.Drawing.Point(136, 19)
+ Me.tbVoltageLow.Location = New System.Drawing.Point(204, 29)
+ Me.tbVoltageLow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbVoltageLow.Name = "tbVoltageLow"
- Me.tbVoltageLow.Size = New System.Drawing.Size(49, 20)
+ Me.tbVoltageLow.Size = New System.Drawing.Size(72, 26)
Me.tbVoltageLow.TabIndex = 0
'
'lblMaxTorqueLow
'
Me.lblMaxTorqueLow.AutoSize = true
- Me.lblMaxTorqueLow.Location = New System.Drawing.Point(6, 46)
+ Me.lblMaxTorqueLow.Location = New System.Drawing.Point(9, 71)
+ Me.lblMaxTorqueLow.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblMaxTorqueLow.Name = "lblMaxTorqueLow"
- Me.lblMaxTorqueLow.Size = New System.Drawing.Size(222, 13)
+ Me.lblMaxTorqueLow.Size = New System.Drawing.Size(325, 20)
Me.lblMaxTorqueLow.TabIndex = 47
Me.lblMaxTorqueLow.Text = "Max Drive and Max Generation Torque Curve"
'
- 'tbDragTorqueLow
- '
- Me.tbDragTorqueLow.Location = New System.Drawing.Point(19, 543)
- Me.tbDragTorqueLow.Name = "tbDragTorqueLow"
- Me.tbDragTorqueLow.Size = New System.Drawing.Size(406, 20)
- Me.tbDragTorqueLow.TabIndex = 10
- '
- 'lblDragTorqueLow
- '
- Me.lblDragTorqueLow.AutoSize = true
- Me.lblDragTorqueLow.Location = New System.Drawing.Point(19, 527)
- Me.lblDragTorqueLow.Name = "lblDragTorqueLow"
- Me.lblDragTorqueLow.Size = New System.Drawing.Size(98, 13)
- Me.lblDragTorqueLow.TabIndex = 38
- Me.lblDragTorqueLow.Text = "Drag Torque Curve"
- '
- 'btnBrowseDragCurveLow
- '
- Me.btnBrowseDragCurveLow.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnBrowseDragCurveLow.Location = New System.Drawing.Point(433, 540)
- Me.btnBrowseDragCurveLow.Name = "btnBrowseDragCurveLow"
- Me.btnBrowseDragCurveLow.Size = New System.Drawing.Size(24, 24)
- Me.btnBrowseDragCurveLow.TabIndex = 11
- Me.btnBrowseDragCurveLow.UseVisualStyleBackColor = true
- '
- 'btnDragCurveOpenLow
- '
- Me.btnDragCurveOpenLow.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btnDragCurveOpenLow.Location = New System.Drawing.Point(456, 540)
- Me.btnDragCurveOpenLow.Name = "btnDragCurveOpenLow"
- Me.btnDragCurveOpenLow.Size = New System.Drawing.Size(24, 24)
- Me.btnDragCurveOpenLow.TabIndex = 12
- Me.btnDragCurveOpenLow.UseVisualStyleBackColor = true
- '
'tbMapLow
'
- Me.tbMapLow.Location = New System.Drawing.Point(6, 104)
+ Me.tbMapLow.Location = New System.Drawing.Point(9, 160)
+ Me.tbMapLow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbMapLow.Name = "tbMapLow"
- Me.tbMapLow.Size = New System.Drawing.Size(406, 20)
+ Me.tbMapLow.Size = New System.Drawing.Size(607, 26)
Me.tbMapLow.TabIndex = 7
'
'lblPowerMapLow
'
Me.lblPowerMapLow.AutoSize = true
- Me.lblPowerMapLow.Location = New System.Drawing.Point(6, 88)
+ Me.lblPowerMapLow.Location = New System.Drawing.Point(9, 135)
+ Me.lblPowerMapLow.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblPowerMapLow.Name = "lblPowerMapLow"
- Me.lblPowerMapLow.Size = New System.Drawing.Size(163, 13)
+ Me.lblPowerMapLow.Size = New System.Drawing.Size(242, 20)
Me.lblPowerMapLow.TabIndex = 43
Me.lblPowerMapLow.Text = "Electric Power Consumption Map"
'
'btnBrowseEmMapLow
'
Me.btnBrowseEmMapLow.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnBrowseEmMapLow.Location = New System.Drawing.Point(420, 101)
+ Me.btnBrowseEmMapLow.Location = New System.Drawing.Point(630, 155)
+ Me.btnBrowseEmMapLow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.btnBrowseEmMapLow.Name = "btnBrowseEmMapLow"
- Me.btnBrowseEmMapLow.Size = New System.Drawing.Size(24, 24)
+ Me.btnBrowseEmMapLow.Size = New System.Drawing.Size(36, 37)
Me.btnBrowseEmMapLow.TabIndex = 8
Me.btnBrowseEmMapLow.UseVisualStyleBackColor = true
'
'btnEmMapOpenLow
'
Me.btnEmMapOpenLow.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btnEmMapOpenLow.Location = New System.Drawing.Point(443, 101)
+ Me.btnEmMapOpenLow.Location = New System.Drawing.Point(664, 155)
+ Me.btnEmMapOpenLow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.btnEmMapOpenLow.Name = "btnEmMapOpenLow"
- Me.btnEmMapOpenLow.Size = New System.Drawing.Size(24, 24)
+ Me.btnEmMapOpenLow.Size = New System.Drawing.Size(36, 37)
Me.btnEmMapOpenLow.TabIndex = 9
Me.btnEmMapOpenLow.UseVisualStyleBackColor = true
'
'tbMaxTorqueLow
'
- Me.tbMaxTorqueLow.Location = New System.Drawing.Point(6, 62)
+ Me.tbMaxTorqueLow.Location = New System.Drawing.Point(9, 95)
+ Me.tbMaxTorqueLow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbMaxTorqueLow.Name = "tbMaxTorqueLow"
- Me.tbMaxTorqueLow.Size = New System.Drawing.Size(406, 20)
+ Me.tbMaxTorqueLow.Size = New System.Drawing.Size(607, 26)
Me.tbMaxTorqueLow.TabIndex = 1
'
'btnMaxTorqueCurveOpenLow
'
Me.btnMaxTorqueCurveOpenLow.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btnMaxTorqueCurveOpenLow.Location = New System.Drawing.Point(443, 60)
+ Me.btnMaxTorqueCurveOpenLow.Location = New System.Drawing.Point(664, 92)
+ Me.btnMaxTorqueCurveOpenLow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.btnMaxTorqueCurveOpenLow.Name = "btnMaxTorqueCurveOpenLow"
- Me.btnMaxTorqueCurveOpenLow.Size = New System.Drawing.Size(24, 24)
+ Me.btnMaxTorqueCurveOpenLow.Size = New System.Drawing.Size(36, 37)
Me.btnMaxTorqueCurveOpenLow.TabIndex = 3
Me.btnMaxTorqueCurveOpenLow.UseVisualStyleBackColor = true
'
'btnBrowseMaxTorqueLow
'
Me.btnBrowseMaxTorqueLow.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnBrowseMaxTorqueLow.Location = New System.Drawing.Point(420, 60)
+ Me.btnBrowseMaxTorqueLow.Location = New System.Drawing.Point(630, 92)
+ Me.btnBrowseMaxTorqueLow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.btnBrowseMaxTorqueLow.Name = "btnBrowseMaxTorqueLow"
- Me.btnBrowseMaxTorqueLow.Size = New System.Drawing.Size(24, 24)
+ Me.btnBrowseMaxTorqueLow.Size = New System.Drawing.Size(36, 37)
Me.btnBrowseMaxTorqueLow.TabIndex = 2
Me.btnBrowseMaxTorqueLow.UseVisualStyleBackColor = true
'
+ 'tbDragTorqueLow
+ '
+ Me.tbDragTorqueLow.Location = New System.Drawing.Point(24, 409)
+ Me.tbDragTorqueLow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbDragTorqueLow.Name = "tbDragTorqueLow"
+ Me.tbDragTorqueLow.Size = New System.Drawing.Size(607, 26)
+ Me.tbDragTorqueLow.TabIndex = 8
+ '
+ 'lblDragTorqueLow
+ '
+ Me.lblDragTorqueLow.AutoSize = true
+ Me.lblDragTorqueLow.Location = New System.Drawing.Point(24, 385)
+ Me.lblDragTorqueLow.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblDragTorqueLow.Name = "lblDragTorqueLow"
+ Me.lblDragTorqueLow.Size = New System.Drawing.Size(143, 20)
+ Me.lblDragTorqueLow.TabIndex = 38
+ Me.lblDragTorqueLow.Text = "Drag Torque Curve"
+ '
+ 'btnBrowseDragCurveLow
+ '
+ Me.btnBrowseDragCurveLow.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
+ Me.btnBrowseDragCurveLow.Location = New System.Drawing.Point(646, 405)
+ Me.btnBrowseDragCurveLow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnBrowseDragCurveLow.Name = "btnBrowseDragCurveLow"
+ Me.btnBrowseDragCurveLow.Size = New System.Drawing.Size(36, 37)
+ Me.btnBrowseDragCurveLow.TabIndex = 9
+ Me.btnBrowseDragCurveLow.UseVisualStyleBackColor = true
+ '
+ 'btnDragCurveOpenLow
+ '
+ Me.btnDragCurveOpenLow.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
+ Me.btnDragCurveOpenLow.Location = New System.Drawing.Point(680, 405)
+ Me.btnDragCurveOpenLow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnDragCurveOpenLow.Name = "btnDragCurveOpenLow"
+ Me.btnDragCurveOpenLow.Size = New System.Drawing.Size(36, 37)
+ Me.btnDragCurveOpenLow.TabIndex = 10
+ Me.btnDragCurveOpenLow.UseVisualStyleBackColor = true
+ '
'ElectricMotorForm
'
Me.AcceptButton = Me.ButOK
- Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(9!, 20!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.CancelButton = Me.ButCancel
- Me.ClientSize = New System.Drawing.Size(926, 614)
+ Me.ClientSize = New System.Drawing.Size(1493, 769)
Me.Controls.Add(Me.gbVoltageLevelLow)
Me.Controls.Add(Me.gbVoltageLevelHi)
Me.Controls.Add(Me.Panel6)
@@ -851,6 +917,7 @@ Partial Class ElectricMotorForm
Me.Controls.Add(Me.tbMakeModel)
Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
Me.Icon = CType(resources.GetObject("$this.Icon"),System.Drawing.Icon)
+ Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.MaximizeBox = false
Me.Name = "ElectricMotorForm"
Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide
diff --git a/VECTO/GUI/GearboxForm.vb b/VECTO/GUI/GearboxForm.vb
index d261178ed42e1a51d5c1b723e38b526813b9d858..68dc635f4918f2289257a9aa54c00b7997ac8b1f 100644
--- a/VECTO/GUI/GearboxForm.vb
+++ b/VECTO/GUI/GearboxForm.vb
@@ -837,7 +837,7 @@ Public Class GearboxForm
'Dim fullLoadCurve As FullLoadCurve = ConvertToFullLoadCurve(FLD0.LnU, FLD0.LTq)
Dim gears As IList(Of ITransmissionInputData) = ConvertToGears(LvGears.Items)
- Dim shiftLines As ShiftPolygon = GetShiftLines(engine.EngineModes.First().IdleSpeed, engineFld, vehicle, gears, gear, inputData.JobInputData.ShiftStrategy)
+ Dim shiftLines As ShiftPolygon = GetShiftLines(engine.EngineModes.First().IdleSpeed, engineFld, vehicle, gears, gear)
If (Not IsNothing(shiftLines)) Then
@@ -906,7 +906,7 @@ Public Class GearboxForm
End Sub
- Private Function GetShiftLines(idleSpeed As PerSecond, engineFullLoadCurve As EngineFullLoadCurve, vehicle As IVehicleEngineeringInputData, gears As IList(Of ITransmissionInputData), gear As Integer, shiftStrategy As String) _
+ Private Function GetShiftLines(idleSpeed As PerSecond, engineFullLoadCurve As EngineFullLoadCurve, vehicle As IVehicleEngineeringInputData, gears As IList(Of ITransmissionInputData), gear As Integer) _
As ShiftPolygon
Dim maxTqStr As String = LvGears.Items(gear).SubItems(GearboxTbl.MaxTorque).Text
Dim engine As CombustionEngineData = ConvertToEngineData(engineFullLoadCurve, idleSpeed, gear,
@@ -928,7 +928,6 @@ Public Class GearboxForm
End If
Dim tmpRunData as VectoRunData = New VectoRunData() With {
- .ShiftStrategy = shiftStrategy,
.GearboxData = New GearboxData() with {
.Type = CType(CbGStype.SelectedValue, GearboxType)
}
@@ -1085,7 +1084,7 @@ Public Class GearboxForm
If VectoJobForm.Visible AndAlso engine.EngineModes.First().IdleSpeed > 0 Then
Dim gears As IList(Of ITransmissionInputData) = ConvertToGears(LvGears.Items)
- Dim shiftLines As ShiftPolygon = GetShiftLines(engine.EngineModes.First().IdleSpeed, engineFld, vehicle, gears, gear, inputData.JobInputData.ShiftStrategy)
+ Dim shiftLines As ShiftPolygon = GetShiftLines(engine.EngineModes.First().IdleSpeed, engineFld, vehicle, gears, gear)
If (Not IsNothing(shiftLines)) Then
ShiftPolygonExport.WriteShiftPolygon(shiftLines, jobFile & "_Gear " & gear & ".vgbs")
End If
diff --git a/VECTO/GUI/VectoJobForm.Designer.vb b/VECTO/GUI/VectoJobForm.Designer.vb
index 34893b3f40027a86e89b2671901c8ebee273bd4b..6f2a747b32adc43b956eecd87cc72983549a5992 100644
--- a/VECTO/GUI/VectoJobForm.Designer.vb
+++ b/VECTO/GUI/VectoJobForm.Designer.vb
@@ -97,8 +97,6 @@ Partial Class VectoJobForm
Me.lblElAuxConst = New System.Windows.Forms.Label()
Me.tpCycles = New System.Windows.Forms.TabPage()
Me.TabPgDriver = New System.Windows.Forms.TabPage()
- Me.gbShiftStrategy = New System.Windows.Forms.GroupBox()
- Me.cbGearshiftStrategy = New System.Windows.Forms.ComboBox()
Me.GrVACC = New System.Windows.Forms.GroupBox()
Me.Label15 = New System.Windows.Forms.Label()
Me.TbDesMaxFile = New System.Windows.Forms.TextBox()
@@ -231,7 +229,6 @@ Partial Class VectoJobForm
Me.gbElectricAux.SuspendLayout
Me.tpCycles.SuspendLayout
Me.TabPgDriver.SuspendLayout
- Me.gbShiftStrategy.SuspendLayout
Me.GrVACC.SuspendLayout
Me.GrLAC.SuspendLayout
Me.pnLookAheadCoasting.SuspendLayout
@@ -257,10 +254,11 @@ Partial Class VectoJobForm
Me.TabPgGen.Controls.Add(Me.pnEngine)
Me.TabPgGen.Controls.Add(Me.pnGearbox)
Me.TabPgGen.Controls.Add(Me.pnShiftParams)
- Me.TabPgGen.Location = New System.Drawing.Point(4, 22)
+ Me.TabPgGen.Location = New System.Drawing.Point(4, 29)
+ Me.TabPgGen.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.TabPgGen.Name = "TabPgGen"
- Me.TabPgGen.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPgGen.Size = New System.Drawing.Size(525, 494)
+ Me.TabPgGen.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TabPgGen.Size = New System.Drawing.Size(792, 767)
Me.TabPgGen.TabIndex = 0
Me.TabPgGen.Text = "General"
Me.TabPgGen.UseVisualStyleBackColor = true
@@ -270,16 +268,18 @@ Partial Class VectoJobForm
Me.pnHybridStrategy.Controls.Add(Me.btnOpenHybridStrategyParameters)
Me.pnHybridStrategy.Controls.Add(Me.tbHybridStrategyParams)
Me.pnHybridStrategy.Controls.Add(Me.btnBrowseHybridStrategyParams)
- Me.pnHybridStrategy.Location = New System.Drawing.Point(4, 125)
+ Me.pnHybridStrategy.Location = New System.Drawing.Point(6, 192)
+ Me.pnHybridStrategy.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.pnHybridStrategy.Name = "pnHybridStrategy"
- Me.pnHybridStrategy.Size = New System.Drawing.Size(516, 26)
+ Me.pnHybridStrategy.Size = New System.Drawing.Size(774, 40)
Me.pnHybridStrategy.TabIndex = 4
'
'btnOpenHybridStrategyParameters
'
- Me.btnOpenHybridStrategyParameters.Location = New System.Drawing.Point(3, 3)
+ Me.btnOpenHybridStrategyParameters.Location = New System.Drawing.Point(4, 5)
+ Me.btnOpenHybridStrategyParameters.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.btnOpenHybridStrategyParameters.Name = "btnOpenHybridStrategyParameters"
- Me.btnOpenHybridStrategyParameters.Size = New System.Drawing.Size(72, 21)
+ Me.btnOpenHybridStrategyParameters.Size = New System.Drawing.Size(108, 32)
Me.btnOpenHybridStrategyParameters.TabIndex = 0
Me.btnOpenHybridStrategyParameters.Text = "Hyb. Str. P."
Me.btnOpenHybridStrategyParameters.UseVisualStyleBackColor = true
@@ -288,18 +288,20 @@ Partial Class VectoJobForm
'
Me.tbHybridStrategyParams.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.tbHybridStrategyParams.Location = New System.Drawing.Point(81, 3)
+ Me.tbHybridStrategyParams.Location = New System.Drawing.Point(122, 5)
+ Me.tbHybridStrategyParams.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbHybridStrategyParams.Name = "tbHybridStrategyParams"
- Me.tbHybridStrategyParams.Size = New System.Drawing.Size(406, 20)
+ Me.tbHybridStrategyParams.Size = New System.Drawing.Size(607, 26)
Me.tbHybridStrategyParams.TabIndex = 1
'
'btnBrowseHybridStrategyParams
'
Me.btnBrowseHybridStrategyParams.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.btnBrowseHybridStrategyParams.Image = CType(resources.GetObject("btnBrowseHybridStrategyParams.Image"),System.Drawing.Image)
- Me.btnBrowseHybridStrategyParams.Location = New System.Drawing.Point(489, 1)
+ Me.btnBrowseHybridStrategyParams.Location = New System.Drawing.Point(734, 2)
+ Me.btnBrowseHybridStrategyParams.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.btnBrowseHybridStrategyParams.Name = "btnBrowseHybridStrategyParams"
- Me.btnBrowseHybridStrategyParams.Size = New System.Drawing.Size(24, 24)
+ Me.btnBrowseHybridStrategyParams.Size = New System.Drawing.Size(36, 37)
Me.btnBrowseHybridStrategyParams.TabIndex = 2
Me.btnBrowseHybridStrategyParams.UseVisualStyleBackColor = true
'
@@ -308,16 +310,18 @@ Partial Class VectoJobForm
Me.pnVehicle.Controls.Add(Me.ButOpenVEH)
Me.pnVehicle.Controls.Add(Me.ButtonVEH)
Me.pnVehicle.Controls.Add(Me.TbVEH)
- Me.pnVehicle.Location = New System.Drawing.Point(4, 7)
+ Me.pnVehicle.Location = New System.Drawing.Point(6, 11)
+ Me.pnVehicle.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.pnVehicle.Name = "pnVehicle"
- Me.pnVehicle.Size = New System.Drawing.Size(518, 27)
+ Me.pnVehicle.Size = New System.Drawing.Size(777, 42)
Me.pnVehicle.TabIndex = 0
'
'ButOpenVEH
'
- Me.ButOpenVEH.Location = New System.Drawing.Point(4, 3)
+ Me.ButOpenVEH.Location = New System.Drawing.Point(6, 5)
+ Me.ButOpenVEH.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.ButOpenVEH.Name = "ButOpenVEH"
- Me.ButOpenVEH.Size = New System.Drawing.Size(72, 21)
+ Me.ButOpenVEH.Size = New System.Drawing.Size(108, 32)
Me.ButOpenVEH.TabIndex = 0
Me.ButOpenVEH.Text = "Vehicle"
Me.ButOpenVEH.UseVisualStyleBackColor = true
@@ -326,9 +330,10 @@ Partial Class VectoJobForm
'
Me.ButtonVEH.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.ButtonVEH.Image = CType(resources.GetObject("ButtonVEH.Image"),System.Drawing.Image)
- Me.ButtonVEH.Location = New System.Drawing.Point(492, 2)
+ Me.ButtonVEH.Location = New System.Drawing.Point(738, 3)
+ Me.ButtonVEH.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.ButtonVEH.Name = "ButtonVEH"
- Me.ButtonVEH.Size = New System.Drawing.Size(24, 24)
+ Me.ButtonVEH.Size = New System.Drawing.Size(36, 37)
Me.ButtonVEH.TabIndex = 2
Me.ButtonVEH.UseVisualStyleBackColor = true
'
@@ -336,9 +341,10 @@ Partial Class VectoJobForm
'
Me.TbVEH.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.TbVEH.Location = New System.Drawing.Point(82, 4)
+ Me.TbVEH.Location = New System.Drawing.Point(123, 6)
+ Me.TbVEH.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.TbVEH.Name = "TbVEH"
- Me.TbVEH.Size = New System.Drawing.Size(404, 20)
+ Me.TbVEH.Size = New System.Drawing.Size(604, 26)
Me.TbVEH.TabIndex = 1
'
'pnEngine
@@ -346,16 +352,18 @@ Partial Class VectoJobForm
Me.pnEngine.Controls.Add(Me.ButOpenENG)
Me.pnEngine.Controls.Add(Me.ButtonMAP)
Me.pnEngine.Controls.Add(Me.TbENG)
- Me.pnEngine.Location = New System.Drawing.Point(4, 37)
+ Me.pnEngine.Location = New System.Drawing.Point(6, 57)
+ Me.pnEngine.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.pnEngine.Name = "pnEngine"
- Me.pnEngine.Size = New System.Drawing.Size(519, 27)
+ Me.pnEngine.Size = New System.Drawing.Size(778, 42)
Me.pnEngine.TabIndex = 1
'
'ButOpenENG
'
- Me.ButOpenENG.Location = New System.Drawing.Point(4, 3)
+ Me.ButOpenENG.Location = New System.Drawing.Point(6, 5)
+ Me.ButOpenENG.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.ButOpenENG.Name = "ButOpenENG"
- Me.ButOpenENG.Size = New System.Drawing.Size(72, 21)
+ Me.ButOpenENG.Size = New System.Drawing.Size(108, 32)
Me.ButOpenENG.TabIndex = 0
Me.ButOpenENG.Text = "Engine"
Me.ButOpenENG.UseVisualStyleBackColor = true
@@ -364,9 +372,10 @@ Partial Class VectoJobForm
'
Me.ButtonMAP.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.ButtonMAP.Image = CType(resources.GetObject("ButtonMAP.Image"),System.Drawing.Image)
- Me.ButtonMAP.Location = New System.Drawing.Point(492, 1)
+ Me.ButtonMAP.Location = New System.Drawing.Point(738, 2)
+ Me.ButtonMAP.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.ButtonMAP.Name = "ButtonMAP"
- Me.ButtonMAP.Size = New System.Drawing.Size(24, 24)
+ Me.ButtonMAP.Size = New System.Drawing.Size(36, 37)
Me.ButtonMAP.TabIndex = 2
Me.ButtonMAP.UseVisualStyleBackColor = true
'
@@ -374,9 +383,10 @@ Partial Class VectoJobForm
'
Me.TbENG.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.TbENG.Location = New System.Drawing.Point(82, 3)
+ Me.TbENG.Location = New System.Drawing.Point(123, 5)
+ Me.TbENG.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.TbENG.Name = "TbENG"
- Me.TbENG.Size = New System.Drawing.Size(404, 20)
+ Me.TbENG.Size = New System.Drawing.Size(604, 26)
Me.TbENG.TabIndex = 1
'
'pnGearbox
@@ -384,16 +394,18 @@ Partial Class VectoJobForm
Me.pnGearbox.Controls.Add(Me.ButOpenGBX)
Me.pnGearbox.Controls.Add(Me.ButtonGBX)
Me.pnGearbox.Controls.Add(Me.TbGBX)
- Me.pnGearbox.Location = New System.Drawing.Point(3, 66)
+ Me.pnGearbox.Location = New System.Drawing.Point(4, 102)
+ Me.pnGearbox.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.pnGearbox.Name = "pnGearbox"
- Me.pnGearbox.Size = New System.Drawing.Size(517, 28)
+ Me.pnGearbox.Size = New System.Drawing.Size(776, 43)
Me.pnGearbox.TabIndex = 2
'
'ButOpenGBX
'
- Me.ButOpenGBX.Location = New System.Drawing.Point(4, 3)
+ Me.ButOpenGBX.Location = New System.Drawing.Point(6, 5)
+ Me.ButOpenGBX.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.ButOpenGBX.Name = "ButOpenGBX"
- Me.ButOpenGBX.Size = New System.Drawing.Size(72, 21)
+ Me.ButOpenGBX.Size = New System.Drawing.Size(108, 32)
Me.ButOpenGBX.TabIndex = 0
Me.ButOpenGBX.Text = "Gearbox"
Me.ButOpenGBX.UseVisualStyleBackColor = true
@@ -402,9 +414,10 @@ Partial Class VectoJobForm
'
Me.ButtonGBX.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.ButtonGBX.Image = CType(resources.GetObject("ButtonGBX.Image"),System.Drawing.Image)
- Me.ButtonGBX.Location = New System.Drawing.Point(492, 1)
+ Me.ButtonGBX.Location = New System.Drawing.Point(738, 2)
+ Me.ButtonGBX.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.ButtonGBX.Name = "ButtonGBX"
- Me.ButtonGBX.Size = New System.Drawing.Size(24, 24)
+ Me.ButtonGBX.Size = New System.Drawing.Size(36, 37)
Me.ButtonGBX.TabIndex = 2
Me.ButtonGBX.UseVisualStyleBackColor = true
'
@@ -412,9 +425,10 @@ Partial Class VectoJobForm
'
Me.TbGBX.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.TbGBX.Location = New System.Drawing.Point(82, 3)
+ Me.TbGBX.Location = New System.Drawing.Point(123, 5)
+ Me.TbGBX.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.TbGBX.Name = "TbGBX"
- Me.TbGBX.Size = New System.Drawing.Size(404, 20)
+ Me.TbGBX.Size = New System.Drawing.Size(604, 26)
Me.TbGBX.TabIndex = 1
'
'pnShiftParams
@@ -422,16 +436,18 @@ Partial Class VectoJobForm
Me.pnShiftParams.Controls.Add(Me.BtnShiftParamsForm)
Me.pnShiftParams.Controls.Add(Me.TbShiftStrategyParams)
Me.pnShiftParams.Controls.Add(Me.BtnShiftStrategyParams)
- Me.pnShiftParams.Location = New System.Drawing.Point(4, 96)
+ Me.pnShiftParams.Location = New System.Drawing.Point(6, 148)
+ Me.pnShiftParams.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.pnShiftParams.Name = "pnShiftParams"
- Me.pnShiftParams.Size = New System.Drawing.Size(516, 26)
+ Me.pnShiftParams.Size = New System.Drawing.Size(774, 40)
Me.pnShiftParams.TabIndex = 3
'
'BtnShiftParamsForm
'
- Me.BtnShiftParamsForm.Location = New System.Drawing.Point(3, 3)
+ Me.BtnShiftParamsForm.Location = New System.Drawing.Point(4, 5)
+ Me.BtnShiftParamsForm.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.BtnShiftParamsForm.Name = "BtnShiftParamsForm"
- Me.BtnShiftParamsForm.Size = New System.Drawing.Size(72, 21)
+ Me.BtnShiftParamsForm.Size = New System.Drawing.Size(108, 32)
Me.BtnShiftParamsForm.TabIndex = 0
Me.BtnShiftParamsForm.Text = "Shift Parameters"
Me.BtnShiftParamsForm.UseVisualStyleBackColor = true
@@ -440,18 +456,20 @@ Partial Class VectoJobForm
'
Me.TbShiftStrategyParams.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.TbShiftStrategyParams.Location = New System.Drawing.Point(81, 3)
+ Me.TbShiftStrategyParams.Location = New System.Drawing.Point(122, 5)
+ Me.TbShiftStrategyParams.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.TbShiftStrategyParams.Name = "TbShiftStrategyParams"
- Me.TbShiftStrategyParams.Size = New System.Drawing.Size(406, 20)
+ Me.TbShiftStrategyParams.Size = New System.Drawing.Size(607, 26)
Me.TbShiftStrategyParams.TabIndex = 1
'
'BtnShiftStrategyParams
'
Me.BtnShiftStrategyParams.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.BtnShiftStrategyParams.Image = CType(resources.GetObject("BtnShiftStrategyParams.Image"),System.Drawing.Image)
- Me.BtnShiftStrategyParams.Location = New System.Drawing.Point(489, 1)
+ Me.BtnShiftStrategyParams.Location = New System.Drawing.Point(734, 2)
+ Me.BtnShiftStrategyParams.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.BtnShiftStrategyParams.Name = "BtnShiftStrategyParams"
- Me.BtnShiftStrategyParams.Size = New System.Drawing.Size(24, 24)
+ Me.BtnShiftStrategyParams.Size = New System.Drawing.Size(36, 37)
Me.BtnShiftStrategyParams.TabIndex = 2
Me.BtnShiftStrategyParams.UseVisualStyleBackColor = true
'
@@ -463,9 +481,11 @@ Partial Class VectoJobForm
Me.GrCycles.Controls.Add(Me.LvCycles)
Me.GrCycles.Controls.Add(Me.BtDRIrem)
Me.GrCycles.Controls.Add(Me.BtDRIadd)
- Me.GrCycles.Location = New System.Drawing.Point(6, 6)
+ Me.GrCycles.Location = New System.Drawing.Point(9, 9)
+ Me.GrCycles.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.GrCycles.Name = "GrCycles"
- Me.GrCycles.Size = New System.Drawing.Size(515, 138)
+ Me.GrCycles.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GrCycles.Size = New System.Drawing.Size(772, 212)
Me.GrCycles.TabIndex = 0
Me.GrCycles.TabStop = false
Me.GrCycles.Text = "Cycles"
@@ -475,9 +495,10 @@ Partial Class VectoJobForm
Me.Label2.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.Label2.AutoSize = true
- Me.Label2.Location = New System.Drawing.Point(391, 109)
+ Me.Label2.Location = New System.Drawing.Point(586, 168)
+ Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label2.Name = "Label2"
- Me.Label2.Size = New System.Drawing.Size(118, 13)
+ Me.Label2.Size = New System.Drawing.Size(177, 20)
Me.Label2.TabIndex = 3
Me.Label2.Text = "(Right-Click for Options)"
'
@@ -492,10 +513,11 @@ Partial Class VectoJobForm
Me.LvCycles.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None
Me.LvCycles.HideSelection = false
Me.LvCycles.LabelEdit = true
- Me.LvCycles.Location = New System.Drawing.Point(6, 19)
+ Me.LvCycles.Location = New System.Drawing.Point(9, 29)
+ Me.LvCycles.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.LvCycles.MultiSelect = false
Me.LvCycles.Name = "LvCycles"
- Me.LvCycles.Size = New System.Drawing.Size(503, 89)
+ Me.LvCycles.Size = New System.Drawing.Size(752, 135)
Me.LvCycles.TabIndex = 0
Me.LvCycles.TabStop = false
Me.LvCycles.UseCompatibleStateImageBehavior = false
@@ -511,9 +533,10 @@ Partial Class VectoJobForm
Me.BtDRIrem.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.BtDRIrem.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
- Me.BtDRIrem.Location = New System.Drawing.Point(29, 109)
+ Me.BtDRIrem.Location = New System.Drawing.Point(44, 168)
+ Me.BtDRIrem.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.BtDRIrem.Name = "BtDRIrem"
- Me.BtDRIrem.Size = New System.Drawing.Size(24, 24)
+ Me.BtDRIrem.Size = New System.Drawing.Size(36, 37)
Me.BtDRIrem.TabIndex = 2
Me.BtDRIrem.UseVisualStyleBackColor = true
'
@@ -522,9 +545,10 @@ Partial Class VectoJobForm
Me.BtDRIadd.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.BtDRIadd.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
- Me.BtDRIadd.Location = New System.Drawing.Point(5, 109)
+ Me.BtDRIadd.Location = New System.Drawing.Point(8, 168)
+ Me.BtDRIadd.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.BtDRIadd.Name = "BtDRIadd"
- Me.BtDRIadd.Size = New System.Drawing.Size(24, 24)
+ Me.BtDRIadd.Size = New System.Drawing.Size(36, 37)
Me.BtDRIadd.TabIndex = 1
Me.BtDRIadd.UseVisualStyleBackColor = true
'
@@ -534,9 +558,11 @@ Partial Class VectoJobForm
Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.GrAuxMech.Controls.Add(Me.pnAuxDeclarationMode)
Me.GrAuxMech.Controls.Add(Me.pnAuxEngineering)
- Me.GrAuxMech.Location = New System.Drawing.Point(6, 16)
+ Me.GrAuxMech.Location = New System.Drawing.Point(9, 25)
+ Me.GrAuxMech.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.GrAuxMech.Name = "GrAuxMech"
- Me.GrAuxMech.Size = New System.Drawing.Size(515, 280)
+ Me.GrAuxMech.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GrAuxMech.Size = New System.Drawing.Size(772, 431)
Me.GrAuxMech.TabIndex = 0
Me.GrAuxMech.TabStop = false
Me.GrAuxMech.Text = "Mechanical Auxiliaries"
@@ -545,9 +571,10 @@ Partial Class VectoJobForm
'
Me.pnAuxDeclarationMode.Controls.Add(Me.LvAux)
Me.pnAuxDeclarationMode.Controls.Add(Me.Label32)
- Me.pnAuxDeclarationMode.Location = New System.Drawing.Point(6, 104)
+ Me.pnAuxDeclarationMode.Location = New System.Drawing.Point(9, 160)
+ Me.pnAuxDeclarationMode.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.pnAuxDeclarationMode.Name = "pnAuxDeclarationMode"
- Me.pnAuxDeclarationMode.Size = New System.Drawing.Size(503, 170)
+ Me.pnAuxDeclarationMode.Size = New System.Drawing.Size(754, 262)
Me.pnAuxDeclarationMode.TabIndex = 40
'
'LvAux
@@ -559,10 +586,11 @@ Partial Class VectoJobForm
Me.LvAux.FullRowSelect = true
Me.LvAux.GridLines = true
Me.LvAux.HideSelection = false
- Me.LvAux.Location = New System.Drawing.Point(3, 3)
+ Me.LvAux.Location = New System.Drawing.Point(4, 5)
+ Me.LvAux.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.LvAux.MultiSelect = false
Me.LvAux.Name = "LvAux"
- Me.LvAux.Size = New System.Drawing.Size(504, 145)
+ Me.LvAux.Size = New System.Drawing.Size(754, 221)
Me.LvAux.TabIndex = 0
Me.LvAux.TabStop = false
Me.LvAux.UseCompatibleStateImageBehavior = false
@@ -588,9 +616,10 @@ Partial Class VectoJobForm
Me.Label32.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.Label32.AutoSize = true
- Me.Label32.Location = New System.Drawing.Point(9, 151)
+ Me.Label32.Location = New System.Drawing.Point(14, 232)
+ Me.Label32.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label32.Name = "Label32"
- Me.Label32.Size = New System.Drawing.Size(106, 13)
+ Me.Label32.Size = New System.Drawing.Size(158, 20)
Me.Label32.TabIndex = 3
Me.Label32.Text = "(Double-Click to Edit)"
'
@@ -605,83 +634,93 @@ Partial Class VectoJobForm
Me.pnAuxEngineering.Controls.Add(Me.TbAuxPAuxICEOn)
Me.pnAuxEngineering.Controls.Add(Me.lblAuxICEOnUnit)
Me.pnAuxEngineering.Controls.Add(Me.lblAuxICEOn)
- Me.pnAuxEngineering.Location = New System.Drawing.Point(6, 19)
+ Me.pnAuxEngineering.Location = New System.Drawing.Point(9, 29)
+ Me.pnAuxEngineering.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.pnAuxEngineering.Name = "pnAuxEngineering"
- Me.pnAuxEngineering.Size = New System.Drawing.Size(500, 80)
+ Me.pnAuxEngineering.Size = New System.Drawing.Size(750, 123)
Me.pnAuxEngineering.TabIndex = 0
'
'tbPAuxStandstillICEOff
'
- Me.tbPAuxStandstillICEOff.Location = New System.Drawing.Point(170, 55)
+ Me.tbPAuxStandstillICEOff.Location = New System.Drawing.Point(255, 85)
+ Me.tbPAuxStandstillICEOff.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbPAuxStandstillICEOff.Name = "tbPAuxStandstillICEOff"
- Me.tbPAuxStandstillICEOff.Size = New System.Drawing.Size(76, 20)
+ Me.tbPAuxStandstillICEOff.Size = New System.Drawing.Size(112, 26)
Me.tbPAuxStandstillICEOff.TabIndex = 2
'
'lblAuxStandstillICEOffUnit
'
Me.lblAuxStandstillICEOffUnit.AutoSize = true
- Me.lblAuxStandstillICEOffUnit.Location = New System.Drawing.Point(252, 58)
+ Me.lblAuxStandstillICEOffUnit.Location = New System.Drawing.Point(378, 89)
+ Me.lblAuxStandstillICEOffUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblAuxStandstillICEOffUnit.Name = "lblAuxStandstillICEOffUnit"
- Me.lblAuxStandstillICEOffUnit.Size = New System.Drawing.Size(24, 13)
+ Me.lblAuxStandstillICEOffUnit.Size = New System.Drawing.Size(32, 20)
Me.lblAuxStandstillICEOffUnit.TabIndex = 50
Me.lblAuxStandstillICEOffUnit.Text = "[W]"
'
'lblAuxStandstillICEOff
'
Me.lblAuxStandstillICEOff.AutoSize = true
- Me.lblAuxStandstillICEOff.Location = New System.Drawing.Point(3, 58)
+ Me.lblAuxStandstillICEOff.Location = New System.Drawing.Point(4, 89)
+ Me.lblAuxStandstillICEOff.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblAuxStandstillICEOff.Name = "lblAuxStandstillICEOff"
- Me.lblAuxStandstillICEOff.Size = New System.Drawing.Size(143, 13)
+ Me.lblAuxStandstillICEOff.Size = New System.Drawing.Size(216, 20)
Me.lblAuxStandstillICEOff.TabIndex = 48
Me.lblAuxStandstillICEOff.Text = "Aux Load (Standstill, ICE Off)"
'
'tbPAuxDrivingICEOff
'
- Me.tbPAuxDrivingICEOff.Location = New System.Drawing.Point(170, 29)
+ Me.tbPAuxDrivingICEOff.Location = New System.Drawing.Point(255, 45)
+ Me.tbPAuxDrivingICEOff.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbPAuxDrivingICEOff.Name = "tbPAuxDrivingICEOff"
- Me.tbPAuxDrivingICEOff.Size = New System.Drawing.Size(76, 20)
+ Me.tbPAuxDrivingICEOff.Size = New System.Drawing.Size(112, 26)
Me.tbPAuxDrivingICEOff.TabIndex = 1
'
'lblAuxDrivingICEOffUnit
'
Me.lblAuxDrivingICEOffUnit.AutoSize = true
- Me.lblAuxDrivingICEOffUnit.Location = New System.Drawing.Point(252, 32)
+ Me.lblAuxDrivingICEOffUnit.Location = New System.Drawing.Point(378, 49)
+ Me.lblAuxDrivingICEOffUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblAuxDrivingICEOffUnit.Name = "lblAuxDrivingICEOffUnit"
- Me.lblAuxDrivingICEOffUnit.Size = New System.Drawing.Size(24, 13)
+ Me.lblAuxDrivingICEOffUnit.Size = New System.Drawing.Size(32, 20)
Me.lblAuxDrivingICEOffUnit.TabIndex = 47
Me.lblAuxDrivingICEOffUnit.Text = "[W]"
'
'lblAuxDrivingICEOff
'
Me.lblAuxDrivingICEOff.AutoSize = true
- Me.lblAuxDrivingICEOff.Location = New System.Drawing.Point(3, 32)
+ Me.lblAuxDrivingICEOff.Location = New System.Drawing.Point(4, 49)
+ Me.lblAuxDrivingICEOff.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblAuxDrivingICEOff.Name = "lblAuxDrivingICEOff"
- Me.lblAuxDrivingICEOff.Size = New System.Drawing.Size(134, 13)
+ Me.lblAuxDrivingICEOff.Size = New System.Drawing.Size(199, 20)
Me.lblAuxDrivingICEOff.TabIndex = 45
Me.lblAuxDrivingICEOff.Text = "Aux Load (Driving, ICE Off)"
'
'TbAuxPAuxICEOn
'
- Me.TbAuxPAuxICEOn.Location = New System.Drawing.Point(170, 3)
+ Me.TbAuxPAuxICEOn.Location = New System.Drawing.Point(255, 5)
+ Me.TbAuxPAuxICEOn.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.TbAuxPAuxICEOn.Name = "TbAuxPAuxICEOn"
- Me.TbAuxPAuxICEOn.Size = New System.Drawing.Size(76, 20)
+ Me.TbAuxPAuxICEOn.Size = New System.Drawing.Size(112, 26)
Me.TbAuxPAuxICEOn.TabIndex = 0
'
'lblAuxICEOnUnit
'
Me.lblAuxICEOnUnit.AutoSize = true
- Me.lblAuxICEOnUnit.Location = New System.Drawing.Point(252, 6)
+ Me.lblAuxICEOnUnit.Location = New System.Drawing.Point(378, 9)
+ Me.lblAuxICEOnUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblAuxICEOnUnit.Name = "lblAuxICEOnUnit"
- Me.lblAuxICEOnUnit.Size = New System.Drawing.Size(24, 13)
+ Me.lblAuxICEOnUnit.Size = New System.Drawing.Size(32, 20)
Me.lblAuxICEOnUnit.TabIndex = 44
Me.lblAuxICEOnUnit.Text = "[W]"
'
'lblAuxICEOn
'
Me.lblAuxICEOn.AutoSize = true
- Me.lblAuxICEOn.Location = New System.Drawing.Point(3, 6)
+ Me.lblAuxICEOn.Location = New System.Drawing.Point(4, 9)
+ Me.lblAuxICEOn.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblAuxICEOn.Name = "lblAuxICEOn"
- Me.lblAuxICEOn.Size = New System.Drawing.Size(95, 13)
+ Me.lblAuxICEOn.Size = New System.Drawing.Size(142, 20)
Me.lblAuxICEOn.TabIndex = 42
Me.lblAuxICEOn.Text = "Aux Load (ICE On)"
'
@@ -704,7 +743,7 @@ Partial Class VectoJobForm
'
Me.TbAuxPAdd.Location = New System.Drawing.Point(0, 0)
Me.TbAuxPAdd.Name = "TbAuxPAdd"
- Me.TbAuxPAdd.Size = New System.Drawing.Size(100, 20)
+ Me.TbAuxPAdd.Size = New System.Drawing.Size(100, 26)
Me.TbAuxPAdd.TabIndex = 0
'
'Label8
@@ -739,7 +778,7 @@ Partial Class VectoJobForm
'
Me.txtAdvancedAuxiliaryFile.Location = New System.Drawing.Point(0, 0)
Me.txtAdvancedAuxiliaryFile.Name = "txtAdvancedAuxiliaryFile"
- Me.txtAdvancedAuxiliaryFile.Size = New System.Drawing.Size(100, 20)
+ Me.txtAdvancedAuxiliaryFile.Size = New System.Drawing.Size(100, 26)
Me.txtAdvancedAuxiliaryFile.TabIndex = 0
'
'picAuxInfo
@@ -754,7 +793,7 @@ Partial Class VectoJobForm
'
Me.cboAdvancedAuxiliaries.Location = New System.Drawing.Point(0, 0)
Me.cboAdvancedAuxiliaries.Name = "cboAdvancedAuxiliaries"
- Me.cboAdvancedAuxiliaries.Size = New System.Drawing.Size(121, 21)
+ Me.cboAdvancedAuxiliaries.Size = New System.Drawing.Size(121, 28)
Me.cboAdvancedAuxiliaries.TabIndex = 0
'
'lbAdvancedAuxiliaries
@@ -773,10 +812,11 @@ Partial Class VectoJobForm
Me.tcJob.Controls.Add(Me.tpCycles)
Me.tcJob.Controls.Add(Me.TabPgDriver)
Me.tcJob.Controls.Add(Me.TabPgADAS)
- Me.tcJob.Location = New System.Drawing.Point(1, 78)
+ Me.tcJob.Location = New System.Drawing.Point(2, 120)
+ Me.tcJob.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tcJob.Name = "tcJob"
Me.tcJob.SelectedIndex = 0
- Me.tcJob.Size = New System.Drawing.Size(533, 520)
+ Me.tcJob.Size = New System.Drawing.Size(800, 800)
Me.tcJob.SizeMode = System.Windows.Forms.TabSizeMode.Fixed
Me.tcJob.TabIndex = 0
'
@@ -785,10 +825,11 @@ Partial Class VectoJobForm
Me.tpAuxiliaries.Controls.Add(Me.gbBusAux)
Me.tpAuxiliaries.Controls.Add(Me.gbElectricAux)
Me.tpAuxiliaries.Controls.Add(Me.GrAuxMech)
- Me.tpAuxiliaries.Location = New System.Drawing.Point(4, 22)
+ Me.tpAuxiliaries.Location = New System.Drawing.Point(4, 29)
+ Me.tpAuxiliaries.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tpAuxiliaries.Name = "tpAuxiliaries"
- Me.tpAuxiliaries.Padding = New System.Windows.Forms.Padding(3)
- Me.tpAuxiliaries.Size = New System.Drawing.Size(525, 494)
+ Me.tpAuxiliaries.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tpAuxiliaries.Size = New System.Drawing.Size(792, 767)
Me.tpAuxiliaries.TabIndex = 9
Me.tpAuxiliaries.Text = "Auxiliaries"
Me.tpAuxiliaries.UseVisualStyleBackColor = true
@@ -797,9 +838,11 @@ Partial Class VectoJobForm
'
Me.gbBusAux.Controls.Add(Me.cbEnableBusAux)
Me.gbBusAux.Controls.Add(Me.pnBusAux)
- Me.gbBusAux.Location = New System.Drawing.Point(6, 302)
+ Me.gbBusAux.Location = New System.Drawing.Point(9, 465)
+ Me.gbBusAux.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.gbBusAux.Name = "gbBusAux"
- Me.gbBusAux.Size = New System.Drawing.Size(515, 78)
+ Me.gbBusAux.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbBusAux.Size = New System.Drawing.Size(772, 120)
Me.gbBusAux.TabIndex = 1
Me.gbBusAux.TabStop = false
Me.gbBusAux.Text = "Bus Auxiliaries"
@@ -807,9 +850,10 @@ Partial Class VectoJobForm
'cbEnableBusAux
'
Me.cbEnableBusAux.AutoSize = true
- Me.cbEnableBusAux.Location = New System.Drawing.Point(10, 17)
+ Me.cbEnableBusAux.Location = New System.Drawing.Point(15, 26)
+ Me.cbEnableBusAux.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.cbEnableBusAux.Name = "cbEnableBusAux"
- Me.cbEnableBusAux.Size = New System.Drawing.Size(115, 17)
+ Me.cbEnableBusAux.Size = New System.Drawing.Size(170, 24)
Me.cbEnableBusAux.TabIndex = 0
Me.cbEnableBusAux.Text = "Use Bus Auxiliaries"
Me.cbEnableBusAux.UseVisualStyleBackColor = true
@@ -820,16 +864,18 @@ Partial Class VectoJobForm
Me.pnBusAux.Controls.Add(Me.tbBusAuxParams)
Me.pnBusAux.Controls.Add(Me.btnBrowsBusAuxParams)
Me.pnBusAux.Enabled = false
- Me.pnBusAux.Location = New System.Drawing.Point(6, 40)
+ Me.pnBusAux.Location = New System.Drawing.Point(9, 62)
+ Me.pnBusAux.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.pnBusAux.Name = "pnBusAux"
- Me.pnBusAux.Size = New System.Drawing.Size(503, 26)
+ Me.pnBusAux.Size = New System.Drawing.Size(754, 40)
Me.pnBusAux.TabIndex = 1
'
'btnBusAuxP
'
- Me.btnBusAuxP.Location = New System.Drawing.Point(3, 3)
+ Me.btnBusAuxP.Location = New System.Drawing.Point(4, 5)
+ Me.btnBusAuxP.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.btnBusAuxP.Name = "btnBusAuxP"
- Me.btnBusAuxP.Size = New System.Drawing.Size(72, 21)
+ Me.btnBusAuxP.Size = New System.Drawing.Size(108, 32)
Me.btnBusAuxP.TabIndex = 0
Me.btnBusAuxP.TabStop = false
Me.btnBusAuxP.Text = "BusAux P."
@@ -839,18 +885,20 @@ Partial Class VectoJobForm
'
Me.tbBusAuxParams.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.tbBusAuxParams.Location = New System.Drawing.Point(81, 3)
+ Me.tbBusAuxParams.Location = New System.Drawing.Point(122, 5)
+ Me.tbBusAuxParams.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbBusAuxParams.Name = "tbBusAuxParams"
- Me.tbBusAuxParams.Size = New System.Drawing.Size(393, 20)
+ Me.tbBusAuxParams.Size = New System.Drawing.Size(588, 26)
Me.tbBusAuxParams.TabIndex = 1
'
'btnBrowsBusAuxParams
'
Me.btnBrowsBusAuxParams.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.btnBrowsBusAuxParams.Image = CType(resources.GetObject("btnBrowsBusAuxParams.Image"),System.Drawing.Image)
- Me.btnBrowsBusAuxParams.Location = New System.Drawing.Point(476, 1)
+ Me.btnBrowsBusAuxParams.Location = New System.Drawing.Point(714, 2)
+ Me.btnBrowsBusAuxParams.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.btnBrowsBusAuxParams.Name = "btnBrowsBusAuxParams"
- Me.btnBrowsBusAuxParams.Size = New System.Drawing.Size(24, 24)
+ Me.btnBrowsBusAuxParams.Size = New System.Drawing.Size(36, 37)
Me.btnBrowsBusAuxParams.TabIndex = 2
Me.btnBrowsBusAuxParams.UseVisualStyleBackColor = true
'
@@ -860,9 +908,11 @@ Partial Class VectoJobForm
Me.gbElectricAux.Controls.Add(Me.lblElAuxConstUnit)
Me.gbElectricAux.Controls.Add(Me.tbElectricAuxConstant)
Me.gbElectricAux.Controls.Add(Me.lblElAuxConst)
- Me.gbElectricAux.Location = New System.Drawing.Point(6, 386)
+ Me.gbElectricAux.Location = New System.Drawing.Point(9, 594)
+ Me.gbElectricAux.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.gbElectricAux.Name = "gbElectricAux"
- Me.gbElectricAux.Size = New System.Drawing.Size(515, 55)
+ Me.gbElectricAux.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbElectricAux.Size = New System.Drawing.Size(772, 85)
Me.gbElectricAux.TabIndex = 2
Me.gbElectricAux.TabStop = false
Me.gbElectricAux.Text = "Electric Auxiliaries"
@@ -872,89 +922,78 @@ Partial Class VectoJobForm
'
Me.Label46.AutoSize = true
Me.Label46.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- Me.Label46.Location = New System.Drawing.Point(235, 22)
+ Me.Label46.Location = New System.Drawing.Point(352, 34)
+ Me.Label46.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label46.Name = "Label46"
- Me.Label46.Size = New System.Drawing.Size(106, 13)
+ Me.Label46.Size = New System.Drawing.Size(169, 20)
Me.Label46.TabIndex = 48
Me.Label46.Text = "(high voltage system)"
'
'lblElAuxConstUnit
'
Me.lblElAuxConstUnit.AutoSize = true
- Me.lblElAuxConstUnit.Location = New System.Drawing.Point(191, 22)
+ Me.lblElAuxConstUnit.Location = New System.Drawing.Point(286, 34)
+ Me.lblElAuxConstUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblElAuxConstUnit.Name = "lblElAuxConstUnit"
- Me.lblElAuxConstUnit.Size = New System.Drawing.Size(24, 13)
+ Me.lblElAuxConstUnit.Size = New System.Drawing.Size(32, 20)
Me.lblElAuxConstUnit.TabIndex = 47
Me.lblElAuxConstUnit.Text = "[W]"
'
'tbElectricAuxConstant
'
- Me.tbElectricAuxConstant.Location = New System.Drawing.Point(109, 19)
+ Me.tbElectricAuxConstant.Location = New System.Drawing.Point(164, 29)
+ Me.tbElectricAuxConstant.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbElectricAuxConstant.Name = "tbElectricAuxConstant"
- Me.tbElectricAuxConstant.Size = New System.Drawing.Size(76, 20)
+ Me.tbElectricAuxConstant.Size = New System.Drawing.Size(112, 26)
Me.tbElectricAuxConstant.TabIndex = 0
'
'lblElAuxConst
'
Me.lblElAuxConst.AutoSize = true
- Me.lblElAuxConst.Location = New System.Drawing.Point(7, 22)
+ Me.lblElAuxConst.Location = New System.Drawing.Point(10, 34)
+ Me.lblElAuxConst.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblElAuxConst.Name = "lblElAuxConst"
- Me.lblElAuxConst.Size = New System.Drawing.Size(97, 13)
+ Me.lblElAuxConst.Size = New System.Drawing.Size(145, 20)
Me.lblElAuxConst.TabIndex = 45
Me.lblElAuxConst.Text = "Constant Aux Load"
'
'tpCycles
'
Me.tpCycles.Controls.Add(Me.GrCycles)
- Me.tpCycles.Location = New System.Drawing.Point(4, 22)
+ Me.tpCycles.Location = New System.Drawing.Point(4, 29)
+ Me.tpCycles.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tpCycles.Name = "tpCycles"
- Me.tpCycles.Padding = New System.Windows.Forms.Padding(3)
- Me.tpCycles.Size = New System.Drawing.Size(525, 494)
+ Me.tpCycles.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tpCycles.Size = New System.Drawing.Size(792, 767)
Me.tpCycles.TabIndex = 10
Me.tpCycles.Text = "Cycles"
Me.tpCycles.UseVisualStyleBackColor = true
'
'TabPgDriver
'
- Me.TabPgDriver.Controls.Add(Me.gbShiftStrategy)
Me.TabPgDriver.Controls.Add(Me.GrVACC)
Me.TabPgDriver.Controls.Add(Me.GrLAC)
Me.TabPgDriver.Controls.Add(Me.gbOverspeed)
- Me.TabPgDriver.Location = New System.Drawing.Point(4, 22)
+ Me.TabPgDriver.Location = New System.Drawing.Point(4, 29)
+ Me.TabPgDriver.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.TabPgDriver.Name = "TabPgDriver"
- Me.TabPgDriver.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPgDriver.Size = New System.Drawing.Size(525, 494)
+ Me.TabPgDriver.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TabPgDriver.Size = New System.Drawing.Size(792, 767)
Me.TabPgDriver.TabIndex = 7
Me.TabPgDriver.Text = "Driver Model"
Me.TabPgDriver.UseVisualStyleBackColor = true
'
- 'gbShiftStrategy
- '
- Me.gbShiftStrategy.Controls.Add(Me.cbGearshiftStrategy)
- Me.gbShiftStrategy.Location = New System.Drawing.Point(9, 347)
- Me.gbShiftStrategy.Name = "gbShiftStrategy"
- Me.gbShiftStrategy.Size = New System.Drawing.Size(514, 50)
- Me.gbShiftStrategy.TabIndex = 3
- Me.gbShiftStrategy.TabStop = false
- Me.gbShiftStrategy.Text = "Gearshift Strategy"
- '
- 'cbGearshiftStrategy
- '
- Me.cbGearshiftStrategy.FormattingEnabled = true
- Me.cbGearshiftStrategy.Location = New System.Drawing.Point(6, 19)
- Me.cbGearshiftStrategy.Name = "cbGearshiftStrategy"
- Me.cbGearshiftStrategy.Size = New System.Drawing.Size(270, 21)
- Me.cbGearshiftStrategy.TabIndex = 0
- '
'GrVACC
'
Me.GrVACC.Controls.Add(Me.Label15)
Me.GrVACC.Controls.Add(Me.TbDesMaxFile)
Me.GrVACC.Controls.Add(Me.BtDesMaxBr)
Me.GrVACC.Controls.Add(Me.BtAccOpen)
- Me.GrVACC.Location = New System.Drawing.Point(9, 271)
+ Me.GrVACC.Location = New System.Drawing.Point(14, 417)
+ Me.GrVACC.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.GrVACC.Name = "GrVACC"
- Me.GrVACC.Size = New System.Drawing.Size(515, 69)
+ Me.GrVACC.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GrVACC.Size = New System.Drawing.Size(772, 106)
Me.GrVACC.TabIndex = 2
Me.GrVACC.TabStop = false
Me.GrVACC.Text = "Max. acceleration and brake curves"
@@ -962,9 +1001,10 @@ Partial Class VectoJobForm
'Label15
'
Me.Label15.AutoSize = true
- Me.Label15.Location = New System.Drawing.Point(3, 20)
+ Me.Label15.Location = New System.Drawing.Point(4, 31)
+ Me.Label15.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label15.Name = "Label15"
- Me.Label15.Size = New System.Drawing.Size(220, 13)
+ Me.Label15.Size = New System.Drawing.Size(319, 20)
Me.Label15.TabIndex = 4
Me.Label15.Text = "Driver Acceleration/Deceleration File (.vacc):"
'
@@ -972,18 +1012,20 @@ Partial Class VectoJobForm
'
Me.TbDesMaxFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.TbDesMaxFile.Location = New System.Drawing.Point(6, 36)
+ Me.TbDesMaxFile.Location = New System.Drawing.Point(9, 55)
+ Me.TbDesMaxFile.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.TbDesMaxFile.Name = "TbDesMaxFile"
- Me.TbDesMaxFile.Size = New System.Drawing.Size(450, 20)
+ Me.TbDesMaxFile.Size = New System.Drawing.Size(673, 26)
Me.TbDesMaxFile.TabIndex = 0
'
'BtDesMaxBr
'
Me.BtDesMaxBr.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.BtDesMaxBr.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.BtDesMaxBr.Location = New System.Drawing.Point(457, 34)
+ Me.BtDesMaxBr.Location = New System.Drawing.Point(686, 52)
+ Me.BtDesMaxBr.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.BtDesMaxBr.Name = "BtDesMaxBr"
- Me.BtDesMaxBr.Size = New System.Drawing.Size(24, 24)
+ Me.BtDesMaxBr.Size = New System.Drawing.Size(36, 37)
Me.BtDesMaxBr.TabIndex = 1
Me.BtDesMaxBr.UseVisualStyleBackColor = true
'
@@ -991,9 +1033,10 @@ Partial Class VectoJobForm
'
Me.BtAccOpen.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.BtAccOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.BtAccOpen.Location = New System.Drawing.Point(481, 34)
+ Me.BtAccOpen.Location = New System.Drawing.Point(722, 52)
+ Me.BtAccOpen.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.BtAccOpen.Name = "BtAccOpen"
- Me.BtAccOpen.Size = New System.Drawing.Size(24, 24)
+ Me.BtAccOpen.Size = New System.Drawing.Size(36, 37)
Me.BtAccOpen.TabIndex = 2
Me.BtAccOpen.UseVisualStyleBackColor = true
'
@@ -1001,9 +1044,11 @@ Partial Class VectoJobForm
'
Me.GrLAC.Controls.Add(Me.pnLookAheadCoasting)
Me.GrLAC.Controls.Add(Me.CbLookAhead)
- Me.GrLAC.Location = New System.Drawing.Point(9, 92)
+ Me.GrLAC.Location = New System.Drawing.Point(14, 142)
+ Me.GrLAC.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.GrLAC.Name = "GrLAC"
- Me.GrLAC.Size = New System.Drawing.Size(514, 173)
+ Me.GrLAC.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GrLAC.Size = New System.Drawing.Size(771, 266)
Me.GrLAC.TabIndex = 1
Me.GrLAC.TabStop = false
Me.GrLAC.Text = "Look-Ahead Coasting"
@@ -1026,113 +1071,126 @@ Partial Class VectoJobForm
Me.pnLookAheadCoasting.Controls.Add(Me.btnDfTargetSpeed)
Me.pnLookAheadCoasting.Controls.Add(Me.tbLacPreviewFactor)
Me.pnLookAheadCoasting.Controls.Add(Me.tbLacDfVelocityDropFile)
- Me.pnLookAheadCoasting.Location = New System.Drawing.Point(15, 19)
+ Me.pnLookAheadCoasting.Location = New System.Drawing.Point(22, 29)
+ Me.pnLookAheadCoasting.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.pnLookAheadCoasting.Name = "pnLookAheadCoasting"
- Me.pnLookAheadCoasting.Size = New System.Drawing.Size(493, 129)
+ Me.pnLookAheadCoasting.Size = New System.Drawing.Size(740, 198)
Me.pnLookAheadCoasting.TabIndex = 0
'
'Label7
'
Me.Label7.AutoSize = true
- Me.Label7.Location = New System.Drawing.Point(245, 6)
+ Me.Label7.Location = New System.Drawing.Point(368, 9)
+ Me.Label7.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label7.Name = "Label7"
- Me.Label7.Size = New System.Drawing.Size(38, 13)
+ Me.Label7.Size = New System.Drawing.Size(51, 20)
Me.Label7.TabIndex = 4
Me.Label7.Text = "[km/h]"
'
'Label6
'
Me.Label6.AutoSize = true
- Me.Label6.Location = New System.Drawing.Point(106, 5)
+ Me.Label6.Location = New System.Drawing.Point(159, 8)
+ Me.Label6.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label6.Name = "Label6"
- Me.Label6.Size = New System.Drawing.Size(67, 13)
+ Me.Label6.Size = New System.Drawing.Size(97, 20)
Me.Label6.TabIndex = 33
Me.Label6.Text = "Min. Velocity"
Me.Label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight
'
'tbLacMinSpeed
'
- Me.tbLacMinSpeed.Location = New System.Drawing.Point(179, 3)
+ Me.tbLacMinSpeed.Location = New System.Drawing.Point(268, 5)
+ Me.tbLacMinSpeed.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbLacMinSpeed.Name = "tbLacMinSpeed"
- Me.tbLacMinSpeed.Size = New System.Drawing.Size(64, 20)
+ Me.tbLacMinSpeed.Size = New System.Drawing.Size(94, 26)
Me.tbLacMinSpeed.TabIndex = 0
'
'btnDfVelocityDrop
'
Me.btnDfVelocityDrop.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.btnDfVelocityDrop.Image = CType(resources.GetObject("btnDfVelocityDrop.Image"),System.Drawing.Image)
- Me.btnDfVelocityDrop.Location = New System.Drawing.Point(466, 78)
+ Me.btnDfVelocityDrop.Location = New System.Drawing.Point(699, 120)
+ Me.btnDfVelocityDrop.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.btnDfVelocityDrop.Name = "btnDfVelocityDrop"
- Me.btnDfVelocityDrop.Size = New System.Drawing.Size(24, 24)
+ Me.btnDfVelocityDrop.Size = New System.Drawing.Size(36, 37)
Me.btnDfVelocityDrop.TabIndex = 5
Me.btnDfVelocityDrop.UseVisualStyleBackColor = true
'
'Label12
'
Me.Label12.AutoSize = true
- Me.Label12.Location = New System.Drawing.Point(284, 110)
+ Me.Label12.Location = New System.Drawing.Point(426, 169)
+ Me.Label12.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label12.Name = "Label12"
- Me.Label12.Size = New System.Drawing.Size(130, 13)
+ Me.Label12.Size = New System.Drawing.Size(190, 20)
Me.Label12.TabIndex = 31
Me.Label12.Text = "* DF_vTarget * DF_vDrop"
'
'tbDfCoastingScale
'
- Me.tbDfCoastingScale.Location = New System.Drawing.Point(241, 107)
+ Me.tbDfCoastingScale.Location = New System.Drawing.Point(362, 165)
+ Me.tbDfCoastingScale.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbDfCoastingScale.Name = "tbDfCoastingScale"
- Me.tbDfCoastingScale.Size = New System.Drawing.Size(37, 20)
+ Me.tbDfCoastingScale.Size = New System.Drawing.Size(54, 26)
Me.tbDfCoastingScale.TabIndex = 7
'
'Label11
'
Me.Label11.AutoSize = true
- Me.Label11.Location = New System.Drawing.Point(224, 109)
+ Me.Label11.Location = New System.Drawing.Point(336, 168)
+ Me.Label11.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label11.Name = "Label11"
- Me.Label11.Size = New System.Drawing.Size(13, 13)
+ Me.Label11.Size = New System.Drawing.Size(18, 20)
Me.Label11.TabIndex = 29
Me.Label11.Text = "- "
'
'Label3
'
Me.Label3.AutoSize = true
- Me.Label3.Location = New System.Drawing.Point(55, 30)
+ Me.Label3.Location = New System.Drawing.Point(82, 46)
+ Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label3.Name = "Label3"
- Me.Label3.Size = New System.Drawing.Size(118, 13)
+ Me.Label3.Size = New System.Drawing.Size(172, 20)
Me.Label3.TabIndex = 20
Me.Label3.Text = "Preview distance factor"
Me.Label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight
'
'tbDfCoastingOffset
'
- Me.tbDfCoastingOffset.Location = New System.Drawing.Point(180, 107)
+ Me.tbDfCoastingOffset.Location = New System.Drawing.Point(270, 165)
+ Me.tbDfCoastingOffset.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbDfCoastingOffset.Name = "tbDfCoastingOffset"
- Me.tbDfCoastingOffset.Size = New System.Drawing.Size(37, 20)
+ Me.tbDfCoastingOffset.Size = New System.Drawing.Size(54, 26)
Me.tbDfCoastingOffset.TabIndex = 6
'
'tbLacDfTargetSpeedFile
'
Me.tbLacDfTargetSpeedFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.tbLacDfTargetSpeedFile.Location = New System.Drawing.Point(179, 54)
+ Me.tbLacDfTargetSpeedFile.Location = New System.Drawing.Point(268, 83)
+ Me.tbLacDfTargetSpeedFile.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbLacDfTargetSpeedFile.Name = "tbLacDfTargetSpeedFile"
- Me.tbLacDfTargetSpeedFile.Size = New System.Drawing.Size(286, 20)
+ Me.tbLacDfTargetSpeedFile.Size = New System.Drawing.Size(427, 26)
Me.tbLacDfTargetSpeedFile.TabIndex = 2
'
'Label10
'
Me.Label10.AutoSize = true
- Me.Label10.Location = New System.Drawing.Point(94, 109)
+ Me.Label10.Location = New System.Drawing.Point(141, 168)
+ Me.Label10.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label10.Name = "Label10"
- Me.Label10.Size = New System.Drawing.Size(79, 13)
+ Me.Label10.Size = New System.Drawing.Size(117, 20)
Me.Label10.TabIndex = 27
Me.Label10.Text = "DF_coasting = "
'
'Label4
'
Me.Label4.AutoSize = true
- Me.Label4.Location = New System.Drawing.Point(18, 56)
+ Me.Label4.Location = New System.Drawing.Point(27, 86)
+ Me.Label4.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label4.Name = "Label4"
- Me.Label4.Size = New System.Drawing.Size(155, 13)
+ Me.Label4.Size = New System.Drawing.Size(230, 20)
Me.Label4.TabIndex = 24
Me.Label4.Text = "Decision Factor - Target Speed"
Me.Label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight
@@ -1140,9 +1198,10 @@ Partial Class VectoJobForm
'Label5
'
Me.Label5.AutoSize = true
- Me.Label5.Location = New System.Drawing.Point(20, 83)
+ Me.Label5.Location = New System.Drawing.Point(30, 128)
+ Me.Label5.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label5.Name = "Label5"
- Me.Label5.Size = New System.Drawing.Size(153, 13)
+ Me.Label5.Size = New System.Drawing.Size(227, 20)
Me.Label5.TabIndex = 26
Me.Label5.Text = "Decision Factor - Velocity Drop"
Me.Label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight
@@ -1151,26 +1210,29 @@ Partial Class VectoJobForm
'
Me.btnDfTargetSpeed.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.btnDfTargetSpeed.Image = CType(resources.GetObject("btnDfTargetSpeed.Image"),System.Drawing.Image)
- Me.btnDfTargetSpeed.Location = New System.Drawing.Point(466, 52)
+ Me.btnDfTargetSpeed.Location = New System.Drawing.Point(699, 80)
+ Me.btnDfTargetSpeed.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.btnDfTargetSpeed.Name = "btnDfTargetSpeed"
- Me.btnDfTargetSpeed.Size = New System.Drawing.Size(24, 24)
+ Me.btnDfTargetSpeed.Size = New System.Drawing.Size(36, 37)
Me.btnDfTargetSpeed.TabIndex = 3
Me.btnDfTargetSpeed.UseVisualStyleBackColor = true
'
'tbLacPreviewFactor
'
- Me.tbLacPreviewFactor.Location = New System.Drawing.Point(179, 28)
+ Me.tbLacPreviewFactor.Location = New System.Drawing.Point(268, 43)
+ Me.tbLacPreviewFactor.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbLacPreviewFactor.Name = "tbLacPreviewFactor"
- Me.tbLacPreviewFactor.Size = New System.Drawing.Size(64, 20)
+ Me.tbLacPreviewFactor.Size = New System.Drawing.Size(94, 26)
Me.tbLacPreviewFactor.TabIndex = 1
'
'tbLacDfVelocityDropFile
'
Me.tbLacDfVelocityDropFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.tbLacDfVelocityDropFile.Location = New System.Drawing.Point(179, 81)
+ Me.tbLacDfVelocityDropFile.Location = New System.Drawing.Point(268, 125)
+ Me.tbLacDfVelocityDropFile.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbLacDfVelocityDropFile.Name = "tbLacDfVelocityDropFile"
- Me.tbLacDfVelocityDropFile.Size = New System.Drawing.Size(286, 20)
+ Me.tbLacDfVelocityDropFile.Size = New System.Drawing.Size(427, 26)
Me.tbLacDfVelocityDropFile.TabIndex = 4
'
'CbLookAhead
@@ -1178,9 +1240,10 @@ Partial Class VectoJobForm
Me.CbLookAhead.AutoSize = true
Me.CbLookAhead.Checked = true
Me.CbLookAhead.CheckState = System.Windows.Forms.CheckState.Checked
- Me.CbLookAhead.Location = New System.Drawing.Point(16, 21)
+ Me.CbLookAhead.Location = New System.Drawing.Point(24, 32)
+ Me.CbLookAhead.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.CbLookAhead.Name = "CbLookAhead"
- Me.CbLookAhead.Size = New System.Drawing.Size(65, 17)
+ Me.CbLookAhead.Size = New System.Drawing.Size(94, 24)
Me.CbLookAhead.TabIndex = 0
Me.CbLookAhead.Text = "Enabled"
Me.CbLookAhead.UseVisualStyleBackColor = true
@@ -1190,9 +1253,11 @@ Partial Class VectoJobForm
Me.gbOverspeed.Controls.Add(Me.PnEcoRoll)
Me.gbOverspeed.Controls.Add(Me.RdOverspeed)
Me.gbOverspeed.Controls.Add(Me.RdOff)
- Me.gbOverspeed.Location = New System.Drawing.Point(9, 9)
+ Me.gbOverspeed.Location = New System.Drawing.Point(14, 14)
+ Me.gbOverspeed.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.gbOverspeed.Name = "gbOverspeed"
- Me.gbOverspeed.Size = New System.Drawing.Size(515, 77)
+ Me.gbOverspeed.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbOverspeed.Size = New System.Drawing.Size(772, 118)
Me.gbOverspeed.TabIndex = 0
Me.gbOverspeed.TabStop = false
Me.gbOverspeed.Text = "Overspeed"
@@ -1205,58 +1270,65 @@ Partial Class VectoJobForm
Me.PnEcoRoll.Controls.Add(Me.TbOverspeed)
Me.PnEcoRoll.Controls.Add(Me.Label23)
Me.PnEcoRoll.Controls.Add(Me.Label13)
- Me.PnEcoRoll.Location = New System.Drawing.Point(91, 17)
+ Me.PnEcoRoll.Location = New System.Drawing.Point(136, 26)
+ Me.PnEcoRoll.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.PnEcoRoll.Name = "PnEcoRoll"
- Me.PnEcoRoll.Size = New System.Drawing.Size(232, 54)
+ Me.PnEcoRoll.Size = New System.Drawing.Size(348, 83)
Me.PnEcoRoll.TabIndex = 2
'
'Label21
'
Me.Label21.AutoSize = true
- Me.Label21.Location = New System.Drawing.Point(170, 31)
+ Me.Label21.Location = New System.Drawing.Point(255, 48)
+ Me.Label21.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label21.Name = "Label21"
- Me.Label21.Size = New System.Drawing.Size(38, 13)
+ Me.Label21.Size = New System.Drawing.Size(51, 20)
Me.Label21.TabIndex = 3
Me.Label21.Text = "[km/h]"
'
'Label14
'
Me.Label14.AutoSize = true
- Me.Label14.Location = New System.Drawing.Point(170, 5)
+ Me.Label14.Location = New System.Drawing.Point(255, 8)
+ Me.Label14.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label14.Name = "Label14"
- Me.Label14.Size = New System.Drawing.Size(38, 13)
+ Me.Label14.Size = New System.Drawing.Size(51, 20)
Me.Label14.TabIndex = 3
Me.Label14.Text = "[km/h]"
'
'TbVmin
'
- Me.TbVmin.Location = New System.Drawing.Point(104, 28)
+ Me.TbVmin.Location = New System.Drawing.Point(156, 43)
+ Me.TbVmin.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.TbVmin.Name = "TbVmin"
- Me.TbVmin.Size = New System.Drawing.Size(64, 20)
+ Me.TbVmin.Size = New System.Drawing.Size(94, 26)
Me.TbVmin.TabIndex = 1
'
'TbOverspeed
'
- Me.TbOverspeed.Location = New System.Drawing.Point(104, 2)
+ Me.TbOverspeed.Location = New System.Drawing.Point(156, 3)
+ Me.TbOverspeed.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.TbOverspeed.Name = "TbOverspeed"
- Me.TbOverspeed.Size = New System.Drawing.Size(64, 20)
+ Me.TbOverspeed.Size = New System.Drawing.Size(94, 26)
Me.TbOverspeed.TabIndex = 0
'
'Label23
'
Me.Label23.AutoSize = true
- Me.Label23.Location = New System.Drawing.Point(18, 31)
+ Me.Label23.Location = New System.Drawing.Point(27, 48)
+ Me.Label23.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label23.Name = "Label23"
- Me.Label23.Size = New System.Drawing.Size(80, 13)
+ Me.Label23.Size = New System.Drawing.Size(120, 20)
Me.Label23.TabIndex = 1
Me.Label23.Text = "Minimum speed"
'
'Label13
'
Me.Label13.AutoSize = true
- Me.Label13.Location = New System.Drawing.Point(13, 5)
+ Me.Label13.Location = New System.Drawing.Point(20, 8)
+ Me.Label13.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label13.Name = "Label13"
- Me.Label13.Size = New System.Drawing.Size(85, 13)
+ Me.Label13.Size = New System.Drawing.Size(123, 20)
Me.Label13.TabIndex = 1
Me.Label13.Text = "Max. Overspeed"
'
@@ -1264,9 +1336,10 @@ Partial Class VectoJobForm
'
Me.RdOverspeed.AutoSize = true
Me.RdOverspeed.Checked = true
- Me.RdOverspeed.Location = New System.Drawing.Point(16, 44)
+ Me.RdOverspeed.Location = New System.Drawing.Point(24, 68)
+ Me.RdOverspeed.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.RdOverspeed.Name = "RdOverspeed"
- Me.RdOverspeed.Size = New System.Drawing.Size(77, 17)
+ Me.RdOverspeed.Size = New System.Drawing.Size(111, 24)
Me.RdOverspeed.TabIndex = 1
Me.RdOverspeed.TabStop = true
Me.RdOverspeed.Text = "Overspeed"
@@ -1275,9 +1348,10 @@ Partial Class VectoJobForm
'RdOff
'
Me.RdOff.AutoSize = true
- Me.RdOff.Location = New System.Drawing.Point(16, 21)
+ Me.RdOff.Location = New System.Drawing.Point(24, 32)
+ Me.RdOff.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.RdOff.Name = "RdOff"
- Me.RdOff.Size = New System.Drawing.Size(39, 17)
+ Me.RdOff.Size = New System.Drawing.Size(56, 24)
Me.RdOff.TabIndex = 0
Me.RdOff.Text = "Off"
Me.RdOff.UseVisualStyleBackColor = true
@@ -1287,9 +1361,10 @@ Partial Class VectoJobForm
Me.TabPgADAS.Controls.Add(Me.gbPCC)
Me.TabPgADAS.Controls.Add(Me.gbEcoRoll)
Me.TabPgADAS.Controls.Add(Me.gbEngineStopStart)
- Me.TabPgADAS.Location = New System.Drawing.Point(4, 22)
+ Me.TabPgADAS.Location = New System.Drawing.Point(4, 29)
+ Me.TabPgADAS.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.TabPgADAS.Name = "TabPgADAS"
- Me.TabPgADAS.Size = New System.Drawing.Size(525, 494)
+ Me.TabPgADAS.Size = New System.Drawing.Size(792, 767)
Me.TabPgADAS.TabIndex = 8
Me.TabPgADAS.Text = "ADAS Parameters"
Me.TabPgADAS.UseVisualStyleBackColor = true
@@ -1316,9 +1391,11 @@ Partial Class VectoJobForm
Me.gbPCC.Controls.Add(Me.Label20)
Me.gbPCC.Controls.Add(Me.Label22)
Me.gbPCC.Controls.Add(Me.tbPCCUnderspeed)
- Me.gbPCC.Location = New System.Drawing.Point(7, 269)
+ Me.gbPCC.Location = New System.Drawing.Point(10, 414)
+ Me.gbPCC.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.gbPCC.Name = "gbPCC"
- Me.gbPCC.Size = New System.Drawing.Size(515, 217)
+ Me.gbPCC.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbPCC.Size = New System.Drawing.Size(772, 334)
Me.gbPCC.TabIndex = 2
Me.gbPCC.TabStop = false
Me.gbPCC.Text = "Predictive Cruise Control"
@@ -1327,9 +1404,10 @@ Partial Class VectoJobForm
'
Me.Label43.AutoSize = true
Me.Label43.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- Me.Label43.Location = New System.Drawing.Point(39, 196)
+ Me.Label43.Location = New System.Drawing.Point(58, 302)
+ Me.Label43.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label43.Name = "Label43"
- Me.Label43.Size = New System.Drawing.Size(157, 13)
+ Me.Label43.Size = New System.Drawing.Size(248, 20)
Me.Label43.TabIndex = 30
Me.Label43.Text = "(cf. column HW in driving cycle)"
'
@@ -1337,9 +1415,10 @@ Partial Class VectoJobForm
'
Me.Label42.AutoSize = true
Me.Label42.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- Me.Label42.Location = New System.Drawing.Point(7, 181)
+ Me.Label42.Location = New System.Drawing.Point(10, 278)
+ Me.Label42.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label42.Name = "Label42"
- Me.Label42.Size = New System.Drawing.Size(400, 13)
+ Me.Label42.Size = New System.Drawing.Size(631, 20)
Me.Label42.TabIndex = 29
Me.Label42.Text = "Note: Predictive cruise conrol is only activated on highway parts of the driving "& _
"cycle"
@@ -1347,151 +1426,169 @@ Partial Class VectoJobForm
'Label40
'
Me.Label40.AutoSize = true
- Me.Label40.Location = New System.Drawing.Point(305, 152)
+ Me.Label40.Location = New System.Drawing.Point(458, 234)
+ Me.Label40.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label40.Name = "Label40"
- Me.Label40.Size = New System.Drawing.Size(21, 13)
+ Me.Label40.Size = New System.Drawing.Size(30, 20)
Me.Label40.TabIndex = 28
Me.Label40.Text = "[m]"
'
'Label41
'
Me.Label41.AutoSize = true
- Me.Label41.Location = New System.Drawing.Point(7, 152)
+ Me.Label41.Location = New System.Drawing.Point(10, 234)
+ Me.Label41.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label41.Name = "Label41"
- Me.Label41.Size = New System.Drawing.Size(146, 13)
+ Me.Label41.Size = New System.Drawing.Size(212, 20)
Me.Label41.TabIndex = 26
Me.Label41.Text = "Preview distance use case 2:"
'
'tbPCCPreviewUseCase2
'
- Me.tbPCCPreviewUseCase2.Location = New System.Drawing.Point(247, 149)
+ Me.tbPCCPreviewUseCase2.Location = New System.Drawing.Point(370, 229)
+ Me.tbPCCPreviewUseCase2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbPCCPreviewUseCase2.Name = "tbPCCPreviewUseCase2"
- Me.tbPCCPreviewUseCase2.Size = New System.Drawing.Size(52, 20)
+ Me.tbPCCPreviewUseCase2.Size = New System.Drawing.Size(76, 26)
Me.tbPCCPreviewUseCase2.TabIndex = 5
'
'Label38
'
Me.Label38.AutoSize = true
- Me.Label38.Location = New System.Drawing.Point(305, 126)
+ Me.Label38.Location = New System.Drawing.Point(458, 194)
+ Me.Label38.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label38.Name = "Label38"
- Me.Label38.Size = New System.Drawing.Size(21, 13)
+ Me.Label38.Size = New System.Drawing.Size(30, 20)
Me.Label38.TabIndex = 25
Me.Label38.Text = "[m]"
'
'Label39
'
Me.Label39.AutoSize = true
- Me.Label39.Location = New System.Drawing.Point(7, 126)
+ Me.Label39.Location = New System.Drawing.Point(10, 194)
+ Me.Label39.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label39.Name = "Label39"
- Me.Label39.Size = New System.Drawing.Size(146, 13)
+ Me.Label39.Size = New System.Drawing.Size(212, 20)
Me.Label39.TabIndex = 23
Me.Label39.Text = "Preview distance use case 1:"
'
'tbPCCPreviewUseCase1
'
- Me.tbPCCPreviewUseCase1.Location = New System.Drawing.Point(247, 123)
+ Me.tbPCCPreviewUseCase1.Location = New System.Drawing.Point(370, 189)
+ Me.tbPCCPreviewUseCase1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbPCCPreviewUseCase1.Name = "tbPCCPreviewUseCase1"
- Me.tbPCCPreviewUseCase1.Size = New System.Drawing.Size(52, 20)
+ Me.tbPCCPreviewUseCase1.Size = New System.Drawing.Size(76, 26)
Me.tbPCCPreviewUseCase1.TabIndex = 4
'
'Label36
'
Me.Label36.AutoSize = true
- Me.Label36.Location = New System.Drawing.Point(305, 100)
+ Me.Label36.Location = New System.Drawing.Point(458, 154)
+ Me.Label36.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label36.Name = "Label36"
- Me.Label36.Size = New System.Drawing.Size(38, 13)
+ Me.Label36.Size = New System.Drawing.Size(51, 20)
Me.Label36.TabIndex = 22
Me.Label36.Text = "[km/h]"
'
'Label37
'
Me.Label37.AutoSize = true
- Me.Label37.Location = New System.Drawing.Point(7, 100)
+ Me.Label37.Location = New System.Drawing.Point(10, 154)
+ Me.Label37.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label37.Name = "Label37"
- Me.Label37.Size = New System.Drawing.Size(83, 13)
+ Me.Label37.Size = New System.Drawing.Size(124, 20)
Me.Label37.TabIndex = 20
Me.Label37.Text = "Minimum speed:"
'
'tbPCCMinSpeed
'
- Me.tbPCCMinSpeed.Location = New System.Drawing.Point(247, 97)
+ Me.tbPCCMinSpeed.Location = New System.Drawing.Point(370, 149)
+ Me.tbPCCMinSpeed.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbPCCMinSpeed.Name = "tbPCCMinSpeed"
- Me.tbPCCMinSpeed.Size = New System.Drawing.Size(52, 20)
+ Me.tbPCCMinSpeed.Size = New System.Drawing.Size(76, 26)
Me.tbPCCMinSpeed.TabIndex = 3
'
'Label34
'
Me.Label34.AutoSize = true
- Me.Label34.Location = New System.Drawing.Point(305, 74)
+ Me.Label34.Location = New System.Drawing.Point(458, 114)
+ Me.Label34.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label34.Name = "Label34"
- Me.Label34.Size = New System.Drawing.Size(38, 13)
+ Me.Label34.Size = New System.Drawing.Size(51, 20)
Me.Label34.TabIndex = 19
Me.Label34.Text = "[km/h]"
'
'Label35
'
Me.Label35.AutoSize = true
- Me.Label35.Location = New System.Drawing.Point(7, 74)
+ Me.Label35.Location = New System.Drawing.Point(10, 114)
+ Me.Label35.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label35.Name = "Label35"
- Me.Label35.Size = New System.Drawing.Size(113, 13)
+ Me.Label35.Size = New System.Drawing.Size(164, 20)
Me.Label35.TabIndex = 17
Me.Label35.Text = "PCC enabling velocity:"
'
'tbPCCEnableSpeed
'
- Me.tbPCCEnableSpeed.Location = New System.Drawing.Point(247, 71)
+ Me.tbPCCEnableSpeed.Location = New System.Drawing.Point(370, 109)
+ Me.tbPCCEnableSpeed.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbPCCEnableSpeed.Name = "tbPCCEnableSpeed"
- Me.tbPCCEnableSpeed.Size = New System.Drawing.Size(52, 20)
+ Me.tbPCCEnableSpeed.Size = New System.Drawing.Size(76, 26)
Me.tbPCCEnableSpeed.TabIndex = 2
'
'Label31
'
Me.Label31.AutoSize = true
- Me.Label31.Location = New System.Drawing.Point(305, 48)
+ Me.Label31.Location = New System.Drawing.Point(458, 74)
+ Me.Label31.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label31.Name = "Label31"
- Me.Label31.Size = New System.Drawing.Size(38, 13)
+ Me.Label31.Size = New System.Drawing.Size(51, 20)
Me.Label31.TabIndex = 16
Me.Label31.Text = "[km/h]"
'
'Label33
'
Me.Label33.AutoSize = true
- Me.Label33.Location = New System.Drawing.Point(7, 48)
+ Me.Label33.Location = New System.Drawing.Point(10, 74)
+ Me.Label33.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label33.Name = "Label33"
- Me.Label33.Size = New System.Drawing.Size(100, 13)
+ Me.Label33.Size = New System.Drawing.Size(146, 20)
Me.Label33.TabIndex = 14
Me.Label33.Text = "Allowed overspeed:"
'
'tbPCCOverspeed
'
- Me.tbPCCOverspeed.Location = New System.Drawing.Point(247, 45)
+ Me.tbPCCOverspeed.Location = New System.Drawing.Point(370, 69)
+ Me.tbPCCOverspeed.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbPCCOverspeed.Name = "tbPCCOverspeed"
- Me.tbPCCOverspeed.Size = New System.Drawing.Size(52, 20)
+ Me.tbPCCOverspeed.Size = New System.Drawing.Size(76, 26)
Me.tbPCCOverspeed.TabIndex = 1
'
'Label20
'
Me.Label20.AutoSize = true
- Me.Label20.Location = New System.Drawing.Point(305, 22)
+ Me.Label20.Location = New System.Drawing.Point(458, 34)
+ Me.Label20.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label20.Name = "Label20"
- Me.Label20.Size = New System.Drawing.Size(38, 13)
+ Me.Label20.Size = New System.Drawing.Size(51, 20)
Me.Label20.TabIndex = 13
Me.Label20.Text = "[km/h]"
'
'Label22
'
Me.Label22.AutoSize = true
- Me.Label22.Location = New System.Drawing.Point(7, 22)
+ Me.Label22.Location = New System.Drawing.Point(10, 34)
+ Me.Label22.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label22.Name = "Label22"
- Me.Label22.Size = New System.Drawing.Size(106, 13)
+ Me.Label22.Size = New System.Drawing.Size(157, 20)
Me.Label22.TabIndex = 11
Me.Label22.Text = "Allowed underspeed:"
'
'tbPCCUnderspeed
'
- Me.tbPCCUnderspeed.Location = New System.Drawing.Point(247, 19)
+ Me.tbPCCUnderspeed.Location = New System.Drawing.Point(370, 29)
+ Me.tbPCCUnderspeed.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbPCCUnderspeed.Name = "tbPCCUnderspeed"
- Me.tbPCCUnderspeed.Size = New System.Drawing.Size(52, 20)
+ Me.tbPCCUnderspeed.Size = New System.Drawing.Size(76, 26)
Me.tbPCCUnderspeed.TabIndex = 0
'
'gbEcoRoll
@@ -1508,9 +1605,11 @@ Partial Class VectoJobForm
Me.gbEcoRoll.Controls.Add(Me.Label25)
Me.gbEcoRoll.Controls.Add(Me.Label26)
Me.gbEcoRoll.Controls.Add(Me.tbEcoRollMinSpeed)
- Me.gbEcoRoll.Location = New System.Drawing.Point(7, 136)
+ Me.gbEcoRoll.Location = New System.Drawing.Point(10, 209)
+ Me.gbEcoRoll.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.gbEcoRoll.Name = "gbEcoRoll"
- Me.gbEcoRoll.Size = New System.Drawing.Size(515, 127)
+ Me.gbEcoRoll.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbEcoRoll.Size = New System.Drawing.Size(772, 195)
Me.gbEcoRoll.TabIndex = 1
Me.gbEcoRoll.TabStop = false
Me.gbEcoRoll.Text = "Eco-Roll"
@@ -1518,34 +1617,38 @@ Partial Class VectoJobForm
'Label44
'
Me.Label44.AutoSize = true
- Me.Label44.Location = New System.Drawing.Point(305, 75)
+ Me.Label44.Location = New System.Drawing.Point(458, 115)
+ Me.Label44.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label44.Name = "Label44"
- Me.Label44.Size = New System.Drawing.Size(34, 13)
+ Me.Label44.Size = New System.Drawing.Size(47, 20)
Me.Label44.TabIndex = 19
Me.Label44.Text = "[m/s²]"
'
'Label45
'
Me.Label45.AutoSize = true
- Me.Label45.Location = New System.Drawing.Point(7, 75)
+ Me.Label45.Location = New System.Drawing.Point(10, 115)
+ Me.Label45.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label45.Name = "Label45"
- Me.Label45.Size = New System.Drawing.Size(125, 13)
+ Me.Label45.Size = New System.Drawing.Size(186, 20)
Me.Label45.TabIndex = 17
Me.Label45.Text = "Upper Acceleration Limit:"
'
'tbEcoRollMaxAcc
'
- Me.tbEcoRollMaxAcc.Location = New System.Drawing.Point(247, 72)
+ Me.tbEcoRollMaxAcc.Location = New System.Drawing.Point(370, 111)
+ Me.tbEcoRollMaxAcc.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbEcoRollMaxAcc.Name = "tbEcoRollMaxAcc"
- Me.tbEcoRollMaxAcc.Size = New System.Drawing.Size(52, 20)
+ Me.tbEcoRollMaxAcc.Size = New System.Drawing.Size(76, 26)
Me.tbEcoRollMaxAcc.TabIndex = 2
'
'Label29
'
Me.Label29.AutoSize = true
- Me.Label29.Location = New System.Drawing.Point(305, 100)
+ Me.Label29.Location = New System.Drawing.Point(458, 154)
+ Me.Label29.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label29.Name = "Label29"
- Me.Label29.Size = New System.Drawing.Size(38, 13)
+ Me.Label29.Size = New System.Drawing.Size(51, 20)
Me.Label29.TabIndex = 16
Me.Label29.Text = "[km/h]"
Me.Label29.Visible = false
@@ -1553,69 +1656,77 @@ Partial Class VectoJobForm
'Label30
'
Me.Label30.AutoSize = true
- Me.Label30.Location = New System.Drawing.Point(7, 100)
+ Me.Label30.Location = New System.Drawing.Point(10, 154)
+ Me.Label30.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label30.Name = "Label30"
- Me.Label30.Size = New System.Drawing.Size(114, 13)
+ Me.Label30.Size = New System.Drawing.Size(171, 20)
Me.Label30.TabIndex = 14
Me.Label30.Text = "Underspeed threshold:"
Me.Label30.Visible = false
'
'tbEcoRollUnderspeed
'
- Me.tbEcoRollUnderspeed.Location = New System.Drawing.Point(247, 97)
+ Me.tbEcoRollUnderspeed.Location = New System.Drawing.Point(370, 149)
+ Me.tbEcoRollUnderspeed.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbEcoRollUnderspeed.Name = "tbEcoRollUnderspeed"
- Me.tbEcoRollUnderspeed.Size = New System.Drawing.Size(52, 20)
+ Me.tbEcoRollUnderspeed.Size = New System.Drawing.Size(76, 26)
Me.tbEcoRollUnderspeed.TabIndex = 3
Me.tbEcoRollUnderspeed.Visible = false
'
'Label27
'
Me.Label27.AutoSize = true
- Me.Label27.Location = New System.Drawing.Point(305, 48)
+ Me.Label27.Location = New System.Drawing.Point(458, 74)
+ Me.Label27.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label27.Name = "Label27"
- Me.Label27.Size = New System.Drawing.Size(18, 13)
+ Me.Label27.Size = New System.Drawing.Size(25, 20)
Me.Label27.TabIndex = 13
Me.Label27.Text = "[s]"
'
'Label28
'
Me.Label28.AutoSize = true
- Me.Label28.Location = New System.Drawing.Point(7, 48)
+ Me.Label28.Location = New System.Drawing.Point(10, 74)
+ Me.Label28.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label28.Name = "Label28"
- Me.Label28.Size = New System.Drawing.Size(85, 13)
+ Me.Label28.Size = New System.Drawing.Size(123, 20)
Me.Label28.TabIndex = 11
Me.Label28.Text = "Activation delay:"
'
'tbEcoRollActivationDelay
'
- Me.tbEcoRollActivationDelay.Location = New System.Drawing.Point(247, 45)
+ Me.tbEcoRollActivationDelay.Location = New System.Drawing.Point(370, 69)
+ Me.tbEcoRollActivationDelay.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbEcoRollActivationDelay.Name = "tbEcoRollActivationDelay"
- Me.tbEcoRollActivationDelay.Size = New System.Drawing.Size(52, 20)
+ Me.tbEcoRollActivationDelay.Size = New System.Drawing.Size(76, 26)
Me.tbEcoRollActivationDelay.TabIndex = 1
'
'Label25
'
Me.Label25.AutoSize = true
- Me.Label25.Location = New System.Drawing.Point(305, 22)
+ Me.Label25.Location = New System.Drawing.Point(458, 34)
+ Me.Label25.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label25.Name = "Label25"
- Me.Label25.Size = New System.Drawing.Size(38, 13)
+ Me.Label25.Size = New System.Drawing.Size(51, 20)
Me.Label25.TabIndex = 10
Me.Label25.Text = "[km/h]"
'
'Label26
'
Me.Label26.AutoSize = true
- Me.Label26.Location = New System.Drawing.Point(7, 22)
+ Me.Label26.Location = New System.Drawing.Point(10, 34)
+ Me.Label26.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label26.Name = "Label26"
- Me.Label26.Size = New System.Drawing.Size(83, 13)
+ Me.Label26.Size = New System.Drawing.Size(124, 20)
Me.Label26.TabIndex = 8
Me.Label26.Text = "Minimum speed:"
'
'tbEcoRollMinSpeed
'
- Me.tbEcoRollMinSpeed.Location = New System.Drawing.Point(247, 19)
+ Me.tbEcoRollMinSpeed.Location = New System.Drawing.Point(370, 29)
+ Me.tbEcoRollMinSpeed.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbEcoRollMinSpeed.Name = "tbEcoRollMinSpeed"
- Me.tbEcoRollMinSpeed.Size = New System.Drawing.Size(52, 20)
+ Me.tbEcoRollMinSpeed.Size = New System.Drawing.Size(76, 26)
Me.tbEcoRollMinSpeed.TabIndex = 0
'
'gbEngineStopStart
@@ -1630,92 +1741,104 @@ Partial Class VectoJobForm
Me.gbEngineStopStart.Controls.Add(Me.Label17)
Me.gbEngineStopStart.Controls.Add(Me.tbEngineStopStartActivationDelay)
Me.gbEngineStopStart.Controls.Add(Me.Label16)
- Me.gbEngineStopStart.Location = New System.Drawing.Point(7, 9)
+ Me.gbEngineStopStart.Location = New System.Drawing.Point(10, 14)
+ Me.gbEngineStopStart.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.gbEngineStopStart.Name = "gbEngineStopStart"
- Me.gbEngineStopStart.Size = New System.Drawing.Size(515, 121)
+ Me.gbEngineStopStart.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbEngineStopStart.Size = New System.Drawing.Size(772, 186)
Me.gbEngineStopStart.TabIndex = 0
Me.gbEngineStopStart.TabStop = false
Me.gbEngineStopStart.Text = "Engine Stop/Start"
'
'tbESSUtilityFactorDriving
'
- Me.tbESSUtilityFactorDriving.Location = New System.Drawing.Point(247, 95)
+ Me.tbESSUtilityFactorDriving.Location = New System.Drawing.Point(370, 146)
+ Me.tbESSUtilityFactorDriving.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbESSUtilityFactorDriving.Name = "tbESSUtilityFactorDriving"
- Me.tbESSUtilityFactorDriving.Size = New System.Drawing.Size(52, 20)
+ Me.tbESSUtilityFactorDriving.Size = New System.Drawing.Size(76, 26)
Me.tbESSUtilityFactorDriving.TabIndex = 3
'
'lblESSUtilityFactorDriving
'
Me.lblESSUtilityFactorDriving.AutoSize = true
- Me.lblESSUtilityFactorDriving.Location = New System.Drawing.Point(7, 98)
+ Me.lblESSUtilityFactorDriving.Location = New System.Drawing.Point(10, 151)
+ Me.lblESSUtilityFactorDriving.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblESSUtilityFactorDriving.Name = "lblESSUtilityFactorDriving"
- Me.lblESSUtilityFactorDriving.Size = New System.Drawing.Size(208, 13)
+ Me.lblESSUtilityFactorDriving.Size = New System.Drawing.Size(307, 20)
Me.lblESSUtilityFactorDriving.TabIndex = 8
Me.lblESSUtilityFactorDriving.Text = "Engie stop/start utility factor (while driving):"
'
'tbEssUtility
'
- Me.tbEssUtility.Location = New System.Drawing.Point(247, 69)
+ Me.tbEssUtility.Location = New System.Drawing.Point(370, 106)
+ Me.tbEssUtility.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbEssUtility.Name = "tbEssUtility"
- Me.tbEssUtility.Size = New System.Drawing.Size(52, 20)
+ Me.tbEssUtility.Size = New System.Drawing.Size(76, 26)
Me.tbEssUtility.TabIndex = 2
'
'Label24
'
Me.Label24.AutoSize = true
- Me.Label24.Location = New System.Drawing.Point(7, 72)
+ Me.Label24.Location = New System.Drawing.Point(10, 111)
+ Me.Label24.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label24.Name = "Label24"
- Me.Label24.Size = New System.Drawing.Size(207, 13)
+ Me.Label24.Size = New System.Drawing.Size(306, 20)
Me.Label24.TabIndex = 6
Me.Label24.Text = "Engie stop/start utility factor (vehicle stop):"
'
'Label18
'
Me.Label18.AutoSize = true
- Me.Label18.Location = New System.Drawing.Point(305, 46)
+ Me.Label18.Location = New System.Drawing.Point(458, 71)
+ Me.Label18.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label18.Name = "Label18"
- Me.Label18.Size = New System.Drawing.Size(18, 13)
+ Me.Label18.Size = New System.Drawing.Size(25, 20)
Me.Label18.TabIndex = 5
Me.Label18.Text = "[s]"
'
'tbMaxEngineOffTimespan
'
- Me.tbMaxEngineOffTimespan.Location = New System.Drawing.Point(247, 43)
+ Me.tbMaxEngineOffTimespan.Location = New System.Drawing.Point(370, 66)
+ Me.tbMaxEngineOffTimespan.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbMaxEngineOffTimespan.Name = "tbMaxEngineOffTimespan"
- Me.tbMaxEngineOffTimespan.Size = New System.Drawing.Size(52, 20)
+ Me.tbMaxEngineOffTimespan.Size = New System.Drawing.Size(76, 26)
Me.tbMaxEngineOffTimespan.TabIndex = 1
'
'Label19
'
Me.Label19.AutoSize = true
- Me.Label19.Location = New System.Drawing.Point(7, 46)
+ Me.Label19.Location = New System.Drawing.Point(10, 71)
+ Me.Label19.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label19.Name = "Label19"
- Me.Label19.Size = New System.Drawing.Size(105, 13)
+ Me.Label19.Size = New System.Drawing.Size(156, 20)
Me.Label19.TabIndex = 3
Me.Label19.Text = "Max. engine-off time:"
'
'Label17
'
Me.Label17.AutoSize = true
- Me.Label17.Location = New System.Drawing.Point(305, 20)
+ Me.Label17.Location = New System.Drawing.Point(458, 31)
+ Me.Label17.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label17.Name = "Label17"
- Me.Label17.Size = New System.Drawing.Size(18, 13)
+ Me.Label17.Size = New System.Drawing.Size(25, 20)
Me.Label17.TabIndex = 2
Me.Label17.Text = "[s]"
'
'tbEngineStopStartActivationDelay
'
- Me.tbEngineStopStartActivationDelay.Location = New System.Drawing.Point(247, 17)
+ Me.tbEngineStopStartActivationDelay.Location = New System.Drawing.Point(370, 26)
+ Me.tbEngineStopStartActivationDelay.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.tbEngineStopStartActivationDelay.Name = "tbEngineStopStartActivationDelay"
- Me.tbEngineStopStartActivationDelay.Size = New System.Drawing.Size(52, 20)
+ Me.tbEngineStopStartActivationDelay.Size = New System.Drawing.Size(76, 26)
Me.tbEngineStopStartActivationDelay.TabIndex = 0
'
'Label16
'
Me.Label16.AutoSize = true
- Me.Label16.Location = New System.Drawing.Point(7, 20)
+ Me.Label16.Location = New System.Drawing.Point(10, 31)
+ Me.Label16.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label16.Name = "Label16"
- Me.Label16.Size = New System.Drawing.Size(87, 13)
+ Me.Label16.Size = New System.Drawing.Size(129, 20)
Me.Label16.TabIndex = 0
Me.Label16.Text = "Delay engine-off:"
'
@@ -1753,16 +1876,17 @@ Partial Class VectoJobForm
'
Me.TbUnderSpeed.Location = New System.Drawing.Point(0, 0)
Me.TbUnderSpeed.Name = "TbUnderSpeed"
- Me.TbUnderSpeed.Size = New System.Drawing.Size(100, 20)
+ Me.TbUnderSpeed.Size = New System.Drawing.Size(100, 26)
Me.TbUnderSpeed.TabIndex = 0
'
'StatusStrip1
'
Me.StatusStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripStatusLabelGEN})
- Me.StatusStrip1.Location = New System.Drawing.Point(0, 609)
+ Me.StatusStrip1.Location = New System.Drawing.Point(0, 939)
Me.StatusStrip1.Name = "StatusStrip1"
- Me.StatusStrip1.Size = New System.Drawing.Size(944, 22)
+ Me.StatusStrip1.Padding = New System.Windows.Forms.Padding(2, 0, 21, 0)
+ Me.StatusStrip1.Size = New System.Drawing.Size(1416, 32)
Me.StatusStrip1.SizingGrip = false
Me.StatusStrip1.TabIndex = 6
Me.StatusStrip1.Text = "StatusStrip1"
@@ -1770,15 +1894,16 @@ Partial Class VectoJobForm
'ToolStripStatusLabelGEN
'
Me.ToolStripStatusLabelGEN.Name = "ToolStripStatusLabelGEN"
- Me.ToolStripStatusLabelGEN.Size = New System.Drawing.Size(119, 17)
+ Me.ToolStripStatusLabelGEN.Size = New System.Drawing.Size(180, 25)
Me.ToolStripStatusLabelGEN.Text = "ToolStripStatusLabel1"
'
'ButOK
'
Me.ButOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.ButOK.Location = New System.Drawing.Point(776, 563)
+ Me.ButOK.Location = New System.Drawing.Point(1164, 866)
+ Me.ButOK.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.ButOK.Name = "ButOK"
- Me.ButOK.Size = New System.Drawing.Size(75, 23)
+ Me.ButOK.Size = New System.Drawing.Size(112, 35)
Me.ButOK.TabIndex = 1
Me.ButOK.Text = "Save"
Me.ButOK.UseVisualStyleBackColor = true
@@ -1787,9 +1912,10 @@ Partial Class VectoJobForm
'
Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.ButCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
- Me.ButCancel.Location = New System.Drawing.Point(857, 563)
+ Me.ButCancel.Location = New System.Drawing.Point(1286, 866)
+ Me.ButCancel.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.ButCancel.Name = "ButCancel"
- Me.ButCancel.Size = New System.Drawing.Size(75, 23)
+ Me.ButCancel.Size = New System.Drawing.Size(112, 35)
Me.ButCancel.TabIndex = 2
Me.ButCancel.Text = "Cancel"
Me.ButCancel.UseVisualStyleBackColor = true
@@ -1801,7 +1927,8 @@ Partial Class VectoJobForm
Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator1, Me.ToolStripBtSendTo, Me.ToolStripSeparator2, Me.ToolStripButton1})
Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
Me.ToolStrip1.Name = "ToolStrip1"
- Me.ToolStrip1.Size = New System.Drawing.Size(944, 31)
+ Me.ToolStrip1.Padding = New System.Windows.Forms.Padding(0, 0, 3, 0)
+ Me.ToolStrip1.Size = New System.Drawing.Size(1416, 38)
Me.ToolStrip1.TabIndex = 20
Me.ToolStrip1.Text = "ToolStrip1"
'
@@ -1811,7 +1938,7 @@ Partial Class VectoJobForm
Me.ToolStripBtNew.Image = Global.TUGraz.VECTO.My.Resources.Resources.blue_document_icon
Me.ToolStripBtNew.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripBtNew.Name = "ToolStripBtNew"
- Me.ToolStripBtNew.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripBtNew.Size = New System.Drawing.Size(34, 33)
Me.ToolStripBtNew.Text = "New"
Me.ToolStripBtNew.ToolTipText = "New"
'
@@ -1821,7 +1948,7 @@ Partial Class VectoJobForm
Me.ToolStripBtOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
Me.ToolStripBtOpen.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripBtOpen.Name = "ToolStripBtOpen"
- Me.ToolStripBtOpen.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripBtOpen.Size = New System.Drawing.Size(34, 33)
Me.ToolStripBtOpen.Text = "Open"
Me.ToolStripBtOpen.ToolTipText = "Open..."
'
@@ -1831,7 +1958,7 @@ Partial Class VectoJobForm
Me.ToolStripBtSave.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_document_save_icon
Me.ToolStripBtSave.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripBtSave.Name = "ToolStripBtSave"
- Me.ToolStripBtSave.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripBtSave.Size = New System.Drawing.Size(34, 33)
Me.ToolStripBtSave.Text = "Save"
Me.ToolStripBtSave.ToolTipText = "Save"
'
@@ -1841,14 +1968,14 @@ Partial Class VectoJobForm
Me.ToolStripBtSaveAs.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_document_save_as_icon
Me.ToolStripBtSaveAs.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripBtSaveAs.Name = "ToolStripBtSaveAs"
- Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(34, 33)
Me.ToolStripBtSaveAs.Text = "Save As"
Me.ToolStripBtSaveAs.ToolTipText = "Save As..."
'
'ToolStripSeparator1
'
Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
- Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 31)
+ Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 38)
'
'ToolStripBtSendTo
'
@@ -1856,14 +1983,14 @@ Partial Class VectoJobForm
Me.ToolStripBtSendTo.Image = Global.TUGraz.VECTO.My.Resources.Resources.export_icon
Me.ToolStripBtSendTo.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripBtSendTo.Name = "ToolStripBtSendTo"
- Me.ToolStripBtSendTo.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripBtSendTo.Size = New System.Drawing.Size(34, 33)
Me.ToolStripBtSendTo.Text = "Send to Job List"
Me.ToolStripBtSendTo.ToolTipText = "Send to Job List"
'
'ToolStripSeparator2
'
Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
- Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 31)
+ Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 38)
'
'ToolStripButton1
'
@@ -1871,7 +1998,7 @@ Partial Class VectoJobForm
Me.ToolStripButton1.Image = Global.TUGraz.VECTO.My.Resources.Resources.Help_icon
Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripButton1.Name = "ToolStripButton1"
- Me.ToolStripButton1.Size = New System.Drawing.Size(28, 28)
+ Me.ToolStripButton1.Size = New System.Drawing.Size(34, 33)
Me.ToolStripButton1.Text = "Help"
'
'PictureBox1
@@ -1880,9 +2007,10 @@ Partial Class VectoJobForm
Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.PictureBox1.BackColor = System.Drawing.Color.White
Me.PictureBox1.Image = Global.TUGraz.VECTO.My.Resources.Resources.VECTO_VECTO
- Me.PictureBox1.Location = New System.Drawing.Point(0, 28)
+ Me.PictureBox1.Location = New System.Drawing.Point(0, 43)
+ Me.PictureBox1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.PictureBox1.Name = "PictureBox1"
- Me.PictureBox1.Size = New System.Drawing.Size(942, 40)
+ Me.PictureBox1.Size = New System.Drawing.Size(1413, 62)
Me.PictureBox1.TabIndex = 21
Me.PictureBox1.TabStop = false
'
@@ -1892,27 +2020,28 @@ Partial Class VectoJobForm
Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
Me.CmOpenFile.Name = "CmOpenFile"
Me.CmOpenFile.ShowImageMargin = false
- Me.CmOpenFile.Size = New System.Drawing.Size(128, 48)
+ Me.CmOpenFile.Size = New System.Drawing.Size(178, 68)
'
'OpenWithToolStripMenuItem
'
Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem"
- Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(127, 22)
+ Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(177, 32)
Me.OpenWithToolStripMenuItem.Text = "Open with ..."
'
'ShowInFolderToolStripMenuItem
'
Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem"
- Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(127, 22)
+ Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(177, 32)
Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
'
'PicVehicle
'
Me.PicVehicle.BackColor = System.Drawing.Color.LightGray
Me.PicVehicle.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
- Me.PicVehicle.Location = New System.Drawing.Point(4, 3)
+ Me.PicVehicle.Location = New System.Drawing.Point(6, 5)
+ Me.PicVehicle.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.PicVehicle.Name = "PicVehicle"
- Me.PicVehicle.Size = New System.Drawing.Size(300, 88)
+ Me.PicVehicle.Size = New System.Drawing.Size(449, 134)
Me.PicVehicle.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
Me.PicVehicle.TabIndex = 36
Me.PicVehicle.TabStop = false
@@ -1921,66 +2050,74 @@ Partial Class VectoJobForm
'
Me.PicBox.BackColor = System.Drawing.Color.LightGray
Me.PicBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
- Me.PicBox.Location = New System.Drawing.Point(4, 144)
+ Me.PicBox.Location = New System.Drawing.Point(6, 222)
+ Me.PicBox.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.PicBox.Name = "PicBox"
- Me.PicBox.Size = New System.Drawing.Size(390, 296)
+ Me.PicBox.Size = New System.Drawing.Size(584, 454)
Me.PicBox.TabIndex = 36
Me.PicBox.TabStop = false
'
'TbEngTxt
'
- Me.TbEngTxt.Location = New System.Drawing.Point(4, 93)
+ Me.TbEngTxt.Location = New System.Drawing.Point(6, 143)
+ Me.TbEngTxt.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.TbEngTxt.Name = "TbEngTxt"
Me.TbEngTxt.ReadOnly = true
- Me.TbEngTxt.Size = New System.Drawing.Size(390, 20)
+ Me.TbEngTxt.Size = New System.Drawing.Size(583, 26)
Me.TbEngTxt.TabIndex = 6
'
'TbVehCat
'
- Me.TbVehCat.Location = New System.Drawing.Point(307, 3)
+ Me.TbVehCat.Location = New System.Drawing.Point(460, 5)
+ Me.TbVehCat.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.TbVehCat.Name = "TbVehCat"
Me.TbVehCat.ReadOnly = true
- Me.TbVehCat.Size = New System.Drawing.Size(87, 20)
+ Me.TbVehCat.Size = New System.Drawing.Size(128, 26)
Me.TbVehCat.TabIndex = 2
'
'TbAxleConf
'
- Me.TbAxleConf.Location = New System.Drawing.Point(363, 29)
+ Me.TbAxleConf.Location = New System.Drawing.Point(544, 45)
+ Me.TbAxleConf.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.TbAxleConf.Name = "TbAxleConf"
Me.TbAxleConf.ReadOnly = true
- Me.TbAxleConf.Size = New System.Drawing.Size(31, 20)
+ Me.TbAxleConf.Size = New System.Drawing.Size(44, 26)
Me.TbAxleConf.TabIndex = 4
'
'TbHVCclass
'
- Me.TbHVCclass.Location = New System.Drawing.Point(307, 66)
+ Me.TbHVCclass.Location = New System.Drawing.Point(460, 102)
+ Me.TbHVCclass.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.TbHVCclass.Name = "TbHVCclass"
Me.TbHVCclass.ReadOnly = true
- Me.TbHVCclass.Size = New System.Drawing.Size(87, 20)
+ Me.TbHVCclass.Size = New System.Drawing.Size(128, 26)
Me.TbHVCclass.TabIndex = 5
'
'TbGbxTxt
'
- Me.TbGbxTxt.Location = New System.Drawing.Point(4, 118)
+ Me.TbGbxTxt.Location = New System.Drawing.Point(6, 182)
+ Me.TbGbxTxt.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.TbGbxTxt.Name = "TbGbxTxt"
Me.TbGbxTxt.ReadOnly = true
- Me.TbGbxTxt.Size = New System.Drawing.Size(390, 20)
+ Me.TbGbxTxt.Size = New System.Drawing.Size(583, 26)
Me.TbGbxTxt.TabIndex = 7
'
'TbMass
'
- Me.TbMass.Location = New System.Drawing.Point(307, 29)
+ Me.TbMass.Location = New System.Drawing.Point(460, 45)
+ Me.TbMass.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.TbMass.Name = "TbMass"
Me.TbMass.ReadOnly = true
- Me.TbMass.Size = New System.Drawing.Size(50, 20)
+ Me.TbMass.Size = New System.Drawing.Size(73, 26)
Me.TbMass.TabIndex = 3
'
'lblEngineCharacteristics
'
Me.lblEngineCharacteristics.AutoSize = true
- Me.lblEngineCharacteristics.Location = New System.Drawing.Point(7, 445)
+ Me.lblEngineCharacteristics.Location = New System.Drawing.Point(10, 685)
+ Me.lblEngineCharacteristics.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblEngineCharacteristics.Name = "lblEngineCharacteristics"
- Me.lblEngineCharacteristics.Size = New System.Drawing.Size(0, 13)
+ Me.lblEngineCharacteristics.Size = New System.Drawing.Size(0, 20)
Me.lblEngineCharacteristics.TabIndex = 37
'
'lblTitle
@@ -1988,9 +2125,10 @@ Partial Class VectoJobForm
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(114, 32)
+ Me.lblTitle.Location = New System.Drawing.Point(171, 49)
+ Me.lblTitle.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblTitle.Name = "lblTitle"
- Me.lblTitle.Size = New System.Drawing.Size(320, 29)
+ Me.lblTitle.Size = New System.Drawing.Size(477, 40)
Me.lblTitle.TabIndex = 38
Me.lblTitle.Text = "Job Editor - VEHICLE_TYPE"
'
@@ -2004,18 +2142,19 @@ Partial Class VectoJobForm
Me.pnJobInfo.Controls.Add(Me.PicBox)
Me.pnJobInfo.Controls.Add(Me.TbGbxTxt)
Me.pnJobInfo.Controls.Add(Me.TbEngTxt)
- Me.pnJobInfo.Location = New System.Drawing.Point(532, 78)
+ Me.pnJobInfo.Location = New System.Drawing.Point(798, 120)
+ Me.pnJobInfo.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.pnJobInfo.Name = "pnJobInfo"
- Me.pnJobInfo.Size = New System.Drawing.Size(397, 471)
+ Me.pnJobInfo.Size = New System.Drawing.Size(596, 725)
Me.pnJobInfo.TabIndex = 39
'
'VectoJobForm
'
Me.AcceptButton = Me.ButOK
- Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(9!, 20!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.CancelButton = Me.ButCancel
- Me.ClientSize = New System.Drawing.Size(944, 631)
+ Me.ClientSize = New System.Drawing.Size(1416, 971)
Me.Controls.Add(Me.pnJobInfo)
Me.Controls.Add(Me.lblTitle)
Me.Controls.Add(Me.tcJob)
@@ -2027,6 +2166,7 @@ Partial Class VectoJobForm
Me.Controls.Add(Me.StatusStrip1)
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 = "VectoJobForm"
Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
@@ -2060,7 +2200,6 @@ Partial Class VectoJobForm
Me.gbElectricAux.PerformLayout
Me.tpCycles.ResumeLayout(false)
Me.TabPgDriver.ResumeLayout(false)
- Me.gbShiftStrategy.ResumeLayout(false)
Me.GrVACC.ResumeLayout(false)
Me.GrVACC.PerformLayout
Me.GrLAC.ResumeLayout(false)
@@ -2210,8 +2349,6 @@ End Sub
Friend WithEvents TbShiftStrategyParams As TextBox
Friend WithEvents BtnShiftParamsForm As Button
Friend WithEvents BtnShiftStrategyParams As Button
- Friend WithEvents gbShiftStrategy As GroupBox
- Friend WithEvents cbGearshiftStrategy As ComboBox
Friend WithEvents tpAuxiliaries As TabPage
Friend WithEvents tpCycles As TabPage
Friend WithEvents gbElectricAux As GroupBox
diff --git a/VECTO/GUI/VectoJobForm.vb b/VECTO/GUI/VectoJobForm.vb
index 394ff85f5feb58df86de87006205890319139f72..2feaeb0e1a7272912dbecf29d9776ea1b7fd6fa3 100644
--- a/VECTO/GUI/VectoJobForm.vb
+++ b/VECTO/GUI/VectoJobForm.vb
@@ -88,10 +88,6 @@ Public Class VectoJobForm
_changed = False
- cbGearshiftStrategy.DataSource = PowertrainBuilder.GetRegisteredShiftStrategies(Nothing).Select(Function(entry) New With {.Value = entry.Item1, .Label = entry.Item2}).ToList()
- cbGearshiftStrategy.DisplayMember = "Label"
- cbGearshiftStrategy.ValueMember = "Value"
-
'Attempt to select that found in Config
UpdateEnabledControls()
@@ -570,17 +566,6 @@ Public Class VectoJobForm
'-------------------------------------------------------------
- If (JobType <> VectoSimulationJobType.BatteryElectricVehicle OrElse Not IsNothing(inputData.JobInputData.Vehicle.Components.GearboxInputData)) Then
- cbGearshiftStrategy.DataSource = PowertrainBuilder.GetRegisteredShiftStrategies(inputData.JobInputData.Vehicle.Components.GearboxInputData.Type) _
- .Concat({Tuple.Create("", "Not specified - use default")}) _
- .Select(Function(entry) New With {.Value = entry.Item1, .Label = entry.Item2}).ToList()
- cbGearshiftStrategy.DisplayMember = "Label"
- cbGearshiftStrategy.ValueMember = "Value"
- End If
- If (Not inputData.JobInputData.ShiftStrategy Is Nothing) Then
- cbGearshiftStrategy.SelectedValue = inputData.JobInputData.ShiftStrategy
- End If
-
if (Not inputData.JobInputData.Vehicle.Components.AuxiliaryInputData.BusAuxiliariesData Is nothing) Then
cbEnableBusAux.Checked = True
tbBusAuxParams.Text = GetRelativePath(inputData.JobInputData.Vehicle.Components.AuxiliaryInputData.BusAuxiliariesData.DataSource.SourceFile, _basePath)
@@ -641,7 +626,6 @@ Public Class VectoJobForm
vectoJob.PathGbx = TbGBX.Text
vectoJob.PathShiftParams = TbShiftStrategyParams.Text
- vectoJob.ShiftStrategy = cbGearshiftStrategy.SelectedValue?.ToString()
vectoJob.PathHybridStrategyParams = tbHybridStrategyParams.Text
'a_DesMax
vectoJob.DesMaxFile = TbDesMaxFile.Text
diff --git a/VECTO/Input Files/Gearbox.vb b/VECTO/Input Files/Gearbox.vb
index bf6f9e02a5698748b6ac0d36fd900b2d07616875..dfaa82cda6bdbe13af38d781bdb5d2ba8ecc1678 100644
--- a/VECTO/Input Files/Gearbox.vb
+++ b/VECTO/Input Files/Gearbox.vb
@@ -923,7 +923,6 @@ Public Class MockJobInputData
Public Property JobType As VectoSimulationJobType Implements IEngineeringJobInputData.JobType
Public Property EngineOnly As IEngineEngineeringInputData Implements IEngineeringJobInputData.EngineOnly
Public Property JobName As String Implements IDeclarationJobInputData.JobName
- Public Property ShiftStrategy As String Implements IDeclarationJobInputData.ShiftStrategy
End Class
Public Class MockDriverInputData
diff --git a/VECTO/Input Files/VectoJob.vb b/VECTO/Input Files/VectoJob.vb
index dabb1917dae964f03779cf95f5dde58502bfbf95..e320cf5692035089f8a2c3955ae9c02c707ada29 100644
--- a/VECTO/Input Files/VectoJob.vb
+++ b/VECTO/Input Files/VectoJob.vb
@@ -72,7 +72,6 @@ Public Class VectoJob
Public LookAheadMinSpeed As Double
Public EngineStopStartActivationThreshold As Double
- Private _shiftStrategy As String
public EngineOffTimeLimit As double
public EngineStStUtilityFactor As Double
public EngineStStUtilityFactorDriving as Double
@@ -698,15 +697,7 @@ Public Class VectoJob
End Get
End Property
- Public Property ShiftStrategy As String Implements IDeclarationJobInputData.ShiftStrategy
- Get
- Return _shiftStrategy
- End Get
- set (value as string)
- _shiftStrategy = value
- End set
- End Property
-
+
Public Property AuxPwrICEOn As Double
Public ReadOnly Property IAuxiliariesDeclarationInputData_SavedInDeclarationMode As Boolean _
diff --git a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
index f1f03f28f88cdc52b3e6a39dee733dc033d3a0bd..9dc542755814da2a20f4e59226230c48d3846cdd 100644
--- a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
@@ -50,8 +50,6 @@ namespace TUGraz.VectoCommon.InputData
string JobName { get; }
- string ShiftStrategy { get; }
-
VectoSimulationJobType JobType { get; }
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
index 07b455244ee1071c6a1bfc3ddcc45dab63b541d7..a6f6cd859655c1093fdfe4cd88c708c22f4c738c 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
@@ -175,8 +175,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
public string JobName => "";
- public string ShiftStrategy => "";
-
public string Identifier => Vehicle.Identifier;
public bool ExemptedVehicle => false;
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
index ac929d5fa3a8c07016a778cec4f5aa569a8766c1..ca85ead7b68a461a9f879513e333f1b921acc0e8 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
@@ -327,18 +327,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
public virtual VectoSimulationJobType JobType => Body.GetEx(JsonKeys.Job_EngineOnlyMode).Value<bool>() ? VectoSimulationJobType.EngineOnlySimulation : VectoSimulationJobType.ConventionalVehicle;
public virtual string JobName => _jobname;
-
- public string ShiftStrategy
- {
- get {
- if (Body["ShiftStrategy"] == null) {
- return "";
- }
-
- return Body.GetEx<string>("ShiftStrategy");
- }
- }
-
+
#endregion
#region DriverInputData
@@ -1018,8 +1007,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
public IVehicleDeclarationInputData Vehicle => PrimaryVehicle;
public string JobName { get; }
- public string ShiftStrategy => "";
-
+
public VectoSimulationJobType JobType => VectoSimulationJobType.ConventionalVehicle;
#endregion
@@ -1076,8 +1064,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
public IVehicleDeclarationInputData Vehicle { get; }
public string JobName { get; }
- public string ShiftStrategy => "";
-
+
public VectoSimulationJobType JobType => VectoSimulationJobType.ConventionalVehicle;
#endregion
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationJobInputDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationJobInputDataProvider.cs
index 119c1e6dc82479ad25437bfdda817dbd215ac9e0..1f1d6320a08a1f50b1caa15311bf38abe042c065 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationJobInputDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationJobInputDataProvider.cs
@@ -71,8 +71,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public virtual string JobName => Vehicle.Identifier;
- public virtual string ShiftStrategy => null;
-
public VectoSimulationJobType JobType => VectoSimulationJobType.ConventionalVehicle;
#endregion
@@ -126,8 +124,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
protected override DataSourceType SourceType { get; }
public bool SavedInDeclarationMode { get; }
public string JobName { get; }
- public string ShiftStrategy => null;
-
+
public VectoSimulationJobType JobType => VectoSimulationJobType.ConventionalVehicle;
public IXMLJobDataReader Reader { protected get; set; }
public IXMLPrimaryVehicleBusInputData InputData { get; }
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringJobInputDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringJobInputDataProvider.cs
index c69db5c51fa67e9ae9c1808d0ddf9f464150717a..a2b2ff5232acf3ce5b1a401736f9a6dd9cfecf5e 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringJobInputDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringJobInputDataProvider.cs
@@ -79,8 +79,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
public virtual TableData PTOCycleWhileDrive => null;
- public string ShiftStrategy => null;
-
public virtual VectoSimulationJobType JobType { get; }
diff --git a/VectoCore/VectoCore/InputData/Reader/ComponentData/ElectricMotorMapReader.cs b/VectoCore/VectoCore/InputData/Reader/ComponentData/ElectricMotorMapReader.cs
index 7b819b5d8a8deb2ef6724dfbc58c88fd5b2c6bed..11a6fa9eb43056ee72fa505a125de89467736788 100644
--- a/VectoCore/VectoCore/InputData/Reader/ComponentData/ElectricMotorMapReader.cs
+++ b/VectoCore/VectoCore/InputData/Reader/ComponentData/ElectricMotorMapReader.cs
@@ -1,4 +1,5 @@
using System;
+using System.Collections.Generic;
using System.Data;
using System.IO;
using System.Linq;
@@ -11,6 +12,7 @@ using TUGraz.VectoCore.Models.SimulationComponent.Data.Engine;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.InputData.Reader.ComponentData {
+
public static class ElectricMotorMapReader
{
public static EfficiencyMap Create(Stream data, int count)
@@ -21,42 +23,44 @@ namespace TUGraz.VectoCore.InputData.Reader.ComponentData {
public static EfficiencyMap Create(DataTable data, int count)
{
var headerValid = HeaderIsValid(data.Columns);
- if (!headerValid)
- {
+ if (!headerValid) {
LoggingObject.Logger<FuelConsumptionMap>().Warn(
"Efficiency Map: Header Line is not valid. Expected: '{0}, {1}, {2}', Got: {3}. Falling back to column index.",
- Fields.MotorSpeed,
- Fields.Torque,
+ Fields.MotorSpeed,
+ Fields.Torque,
Fields.PowerElectrical,
data.Columns.Cast<DataColumn>().Select(c => c.ColumnName).Join());
data.Columns[0].ColumnName = Fields.MotorSpeed;
data.Columns[1].ColumnName = Fields.Torque;
data.Columns[2].ColumnName = Fields.PowerElectrical;
}
+
+ var entries = (from DataRow row in data.Rows select CreateEntry(row)).ToList();
+
+ var speeds = entries.Select(x => x.MotorSpeed).Distinct().Where(x => x.IsGreater(0)).ToList();
+ var minSpeed = speeds.OrderBy(x => x).First();
+ var torques = entries.Where(x => x.MotorSpeed.IsEqual(minSpeed)).ToList();
+
var delaunayMap = new DelaunayMap("ElectricMotorEfficiencyMap Mechanical to Electric");
- foreach (DataRow row in data.Rows)
- {
- try
- {
- var entry = CreateEntry(row);
- if (entry.Torque.IsGreaterOrEqual(0)) {
- delaunayMap.AddPoint(-entry.Torque.Value() * count,
- entry.MotorSpeed.Value(),
- -entry.PowerElectrical.Value() * count);
- } else {
- delaunayMap.AddPoint(-entry.Torque.Value() * count,
- entry.MotorSpeed.Value(),
- -entry.PowerElectrical.Value() * count);
- }
- }
- catch (Exception e)
- {
- throw new VectoException($"EfficiencyMap - Line {data.Rows.IndexOf(row)}: {e.Message}", e);
+ var retVal = new EfficiencyMapNew(delaunayMap);
+ foreach (var entry in torques) {
+ delaunayMap.AddPoint(-entry.Torque.Value() * count,
+ 0, retVal.GetDelaunayZValue(entry));
+ }
+
+ foreach (var entry in entries.Where(x => x.MotorSpeed.IsGreater(0)).OrderBy(x => x.MotorSpeed)
+ .ThenBy(x => x.Torque)) {
+ try {
+ delaunayMap.AddPoint(-entry.Torque.Value() * count,
+ entry.MotorSpeed.Value(),
+ retVal.GetDelaunayZValue(entry) * count);
+ } catch (Exception e) {
+ throw new VectoException($"EfficiencyMap - Entry {entry}: {e.Message}", e);
}
}
delaunayMap.Triangulate();
- return new EfficiencyMap(delaunayMap);
+ return retVal;
}
private static EfficiencyMap.Entry CreateEntry(DataRow row)
@@ -81,4 +85,7 @@ namespace TUGraz.VectoCore.InputData.Reader.ComponentData {
public const string PowerElectrical = "P_el";
}
}
+
+
+
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/AbstractDeclarationVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/AbstractDeclarationVectoRunDataFactory.cs
index d44192f30de611101a4582c890d06ef44753edf9..9293aea13597a2a2fae540b96b605cc1e99a04b4 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/AbstractDeclarationVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/AbstractDeclarationVectoRunDataFactory.cs
@@ -88,7 +88,6 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl {
}
_angledriveData = DataAdapter.CreateAngledriveData(InputDataProvider.JobInputData.Vehicle.Components.AngledriveInputData);
var tmpRunData = new VectoRunData() {
- ShiftStrategy = InputDataProvider.JobInputData.ShiftStrategy,
GearboxData = new GearboxData() {
Type = vehicle.Components.GearboxInputData.Type,
}
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedBusVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedBusVectoRunDataFactory.cs
index 0c80a04dc1391fa8cf5c98a5fc10437da45260c8..cff53cabf0bd778f76a8c67e0e5bcfdc959193eb 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedBusVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedBusVectoRunDataFactory.cs
@@ -101,7 +101,6 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
_angledriveData = DataAdapterGeneric.CreateAngledriveData(PrimaryVehicle.Components.AngledriveInputData);
var tmpRunData = new VectoRunData() {
- ShiftStrategy = InputDataProvider.JobInputData.ShiftStrategy,
GearboxData = new GearboxData() {
Type = PrimaryVehicle.Components.GearboxInputData.Type,
}
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeHeavyLorryVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeHeavyLorryVectoRunDataFactory.cs
index 4ed79040dd64ab2e778037b54b89135b97289ca9..873e10d9cfc5324d4d5c9fba961eb4571d3969cd 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeHeavyLorryVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeHeavyLorryVectoRunDataFactory.cs
@@ -178,7 +178,6 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
InputDataHash = InputDataProvider.XMLHash,
SimulationType = SimulationType.DistanceCycle,
GearshiftParameters = _gearshiftData,
- ShiftStrategy = InputDataProvider.JobInputData.ShiftStrategy
};
simulationRunData.EngineData.FuelMode = modeIdx;
simulationRunData.VehicleData.VehicleClass = _segment.VehicleClass;
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModePrimaryBusVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModePrimaryBusVectoRunDataFactory.cs
index d33f31097ffa9008afa82978f1beb124c488885c..e31992dcbd25af88c878ff8ec817e0d8af8f204c 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModePrimaryBusVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModePrimaryBusVectoRunDataFactory.cs
@@ -132,7 +132,6 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
InputDataHash = InputDataProvider.XMLHash,
SimulationType = SimulationType.DistanceCycle,
GearshiftParameters = _gearshiftData,
- ShiftStrategy = InputDataProvider.JobInputData.ShiftStrategy
};
simulationRunData.EngineData.FuelMode = modeIdx;
simulationRunData.VehicleData.VehicleClass = _segment.VehicleClass;
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
index 81672e0310bc0921f001bfeee3c8d72ab173d394..fef487cdc638b9a7a7e9a7deb3278dc02d72d277 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
@@ -102,7 +102,6 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
axlegearData.AxleGear.Ratio * (angledriveData?.Angledrive.Ratio ?? 1.0), null);
var tmpRunData = new VectoRunData() {
JobType = VectoSimulationJobType.BatteryElectricVehicle,
- ShiftStrategy = InputDataProvider.JobInputData.ShiftStrategy,
GearboxData = new GearboxData() {
Type = vehicle.Components.GearboxInputData.Type,
},
@@ -157,7 +156,6 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
SuperCapData = dao.CreateSuperCapData(vehicle.Components.ElectricStorage, vehicle.InitialSOC),
SimulationType = SimulationType.DistanceCycle | SimulationType.MeasuredSpeedCycle | SimulationType.PWheel,
GearshiftParameters = gearshiftParams,
- ShiftStrategy = InputDataProvider.JobInputData.ShiftStrategy,
ElectricAuxDemand = InputDataProvider.JobInputData.Vehicle.Components.AuxiliaryInputData.Auxiliaries.ElectricPowerDemand,
};
}
@@ -183,7 +181,6 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
var axlegearData = dao.CreateAxleGearData(vehicle.Components.AxleGearInputData);
var tmpRunData = new VectoRunData() {
- ShiftStrategy = InputDataProvider.JobInputData.ShiftStrategy,
GearboxData = new GearboxData() {
Type = vehicle.Components.GearboxInputData.Type,
}
@@ -281,7 +278,6 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
SimulationType = SimulationType.DistanceCycle | SimulationType.MeasuredSpeedCycle |
SimulationType.PWheel,
GearshiftParameters = gearshiftParams,
- ShiftStrategy = InputDataProvider.JobInputData.ShiftStrategy,
ElectricAuxDemand = InputDataProvider.JobInputData.Vehicle.Components.AuxiliaryInputData
.Auxiliaries.ElectricPowerDemand,
};
diff --git a/VectoCore/VectoCore/Models/Declaration/CompletedBusSegments.cs b/VectoCore/VectoCore/Models/Declaration/CompletedBusSegments.cs
index 2de6f3c9d7e43588390d7debae43a4fb8676ef77..ab6d222bd64e6d3074946f9b017bcc87a1aa4d6d 100644
--- a/VectoCore/VectoCore/Models/Declaration/CompletedBusSegments.cs
+++ b/VectoCore/VectoCore/Models/Declaration/CompletedBusSegments.cs
@@ -112,19 +112,29 @@ namespace TUGraz.VectoCore.Models.Declaration
if (string.IsNullOrWhiteSpace(row.Field<string>(missionType.ToString()))){
continue;
}
-
+
+ // TODO: MQ 2021-11-30: REMOVE IN PRODUCTION
+ Stream cycle;
+ var cycleFile = Path.Combine("DeclarationMissions",
+ missionType.ToString().Replace("EMS", "") + ".vdri");
+ if (File.Exists(cycleFile)) {
+ cycle = File.OpenRead(cycleFile);
+ } else {
+ cycle = RessourceHelper.ReadStream(DeclarationData.DeclarationDataResourcePrefix +
+ ".MissionCycles." +
+ missionType.ToString().Replace("EMS", "") +
+ Constants.FileExtensions.CycleFile);
+ }
+
var mission = new Mission {
MissionType = missionType,
CrossWindCorrectionParameters = row.Field<string>("crosswindcorrection"),
-#if USE_EXTENAL_DECLARATION_DATA
- CycleFile = File.OpenRead(Path.Combine("DeclarationMissions", missionType.ToString().Replace("EMS", "") + ".vdri")),
-#else
- CycleFile =
- RessourceHelper.ReadStream(
- DeclarationData.DeclarationDataResourcePrefix + ".MissionCycles." +
- missionType.ToString().Replace("EMS", "") +
- Constants.FileExtensions.CycleFile),
-#endif
+ CycleFile = cycle,
+ //CycleFile =
+ // RessourceHelper.ReadStream(
+ // DeclarationData.DeclarationDataResourcePrefix + ".MissionCycles." +
+ // missionType.ToString().Replace("EMS", "") +
+ // Constants.FileExtensions.CycleFile),
AxleWeightDistribution = GetAxleWeightDistribution(row),
BodyCurbWeight = 0.SI<Kilogram>(),
Trailer = new List<MissionTrailer>(),
diff --git a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
index bc25fc5446f01baafdfa8c4517cfd5058a09e823..29fe96ac780b689cc4362368a0862d732e964298 100644
--- a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
+++ b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
@@ -482,7 +482,6 @@ namespace TUGraz.VectoCore.Models.Declaration
public const double DownhillSlope = -5;
public const double UphillSlope = 5;
- public static string DefaultShiftStrategy = "";
public const double DragMarginFactor = 0.7;
@@ -531,10 +530,6 @@ namespace TUGraz.VectoCore.Models.Declaration
if (tcuData.MinEngineSpeedPostUpshift != null) {
MinEngineSpeedPostUpshift = tcuData.MinEngineSpeedPostUpshift;
}
- var tmp = tcuData as JSONFile;
- if (tmp != null && tmp.Body["ShiftStrategy"] != null) {
- DefaultShiftStrategy = tmp.Body["ShiftStrategy"].Value<string>();
- }
//#endif
}
}
diff --git a/VectoCore/VectoCore/Models/Declaration/PrimaryBusSegments.cs b/VectoCore/VectoCore/Models/Declaration/PrimaryBusSegments.cs
index 3e49f3feba00410aacb10458a7a98a96dadb82d5..4fd58baff0d80ecafd1f36ddb2786d940742edcc 100644
--- a/VectoCore/VectoCore/Models/Declaration/PrimaryBusSegments.cs
+++ b/VectoCore/VectoCore/Models/Declaration/PrimaryBusSegments.cs
@@ -92,18 +92,28 @@ namespace TUGraz.VectoCore.Models.Declaration
var passengerDensityLow = passDensities.First().ToDouble().SI<PerSquareMeter>();
var passengerCountLow = busFloorArea * passengerDensityLow; // weight of driver is included in curb mass
var passengerCountRef = busFloorArea * passengerDensityRef; // weight of driver is included in curb mass
- //var refLoad = passengerCountRef * missionType.GetAveragePassengerMass();
+ //var refLoad = passengerCountRef * missionType.GetAveragePassengerMass();
+
+ // TODO: MQ 2021-11-30: REMOVE IN PRODUCTION
+ Stream cycle;
+ var cycleFile = Path.Combine("DeclarationMissions",
+ missionType.ToString().Replace("EMS", "") + ".vdri");
+ if (File.Exists(cycleFile)) {
+ cycle = File.OpenRead(cycleFile);
+ } else {
+ cycle = RessourceHelper.ReadStream(DeclarationData.DeclarationDataResourcePrefix +
+ ".MissionCycles." +
+ missionType.ToString().Replace("EMS", "") +
+ Constants.FileExtensions.CycleFile);
+ }
var mission = new Mission {
MissionType = missionType,
CrossWindCorrectionParameters = row.Field<string>("crosswindcorrection"),
-#if USE_EXTENAL_DECLARATION_DATA
- CycleFile = File.OpenRead(Path.Combine("DeclarationMissions", missionType.ToString().Replace("EMS", "") + ".vdri")),
-#else
- CycleFile = RessourceHelper.ReadStream(
- DeclarationData.DeclarationDataResourcePrefix + ".MissionCycles." +
- missionType.ToString().Replace("EMS", "") +
- Constants.FileExtensions.CycleFile),
-#endif
+ CycleFile = cycle,
+ //CycleFile = RessourceHelper.ReadStream(
+ // DeclarationData.DeclarationDataResourcePrefix + ".MissionCycles." +
+ // missionType.ToString().Replace("EMS", "") +
+ // Constants.FileExtensions.CycleFile),
AxleWeightDistribution = GetAxleWeightDistribution(row),
CurbMass = row.ParseDouble("curbmass").SI<Kilogram>(),
BodyCurbWeight = 0.SI<Kilogram>(),
diff --git a/VectoCore/VectoCore/Models/Declaration/TruckSegments.cs b/VectoCore/VectoCore/Models/Declaration/TruckSegments.cs
index 9b098394ba95734529ae143e8eeb26884e69dccb..9c831442efc7579f8b8469564226a20281addb54 100644
--- a/VectoCore/VectoCore/Models/Declaration/TruckSegments.cs
+++ b/VectoCore/VectoCore/Models/Declaration/TruckSegments.cs
@@ -199,16 +199,26 @@ namespace TUGraz.VectoCore.Models.Declaration
GetLoadings(
out var lowLoad, out var refLoad, payloads, (p, l) => GetLoading(p, weight, vehicleWeight, trailers, l), maxLoad);
+ // TODO: MQ 2021-11-30: REMOVE IN PRODUCTION
+ Stream cycle;
+ var cycleFile = Path.Combine("DeclarationMissions",
+ missionType.ToString().Replace("EMS", "") + ".vdri");
+ if (File.Exists(cycleFile)) {
+ cycle = File.OpenRead(cycleFile);
+ } else {
+ cycle = RessourceHelper.ReadStream(DeclarationData.DeclarationDataResourcePrefix +
+ ".MissionCycles." +
+ missionType.ToString().Replace("EMS", "") +
+ Constants.FileExtensions.CycleFile);
+ }
+
var mission = new Mission {
MissionType = missionType,
CrossWindCorrectionParameters = row.Field<string>("crosswindcorrection" + GetMissionSuffix(missionType, true)),
-#if USE_EXTENAL_DECLARATION_DATA
- CycleFile = File.OpenRead(Path.Combine("DeclarationMissions", missionType.ToString().Replace("EMS", "") + ".vdri")),
-#else
- CycleFile = RessourceHelper.ReadStream(DeclarationData.DeclarationDataResourcePrefix + ".MissionCycles." +
- missionType.ToString().Replace("EMS", "") +
- Constants.FileExtensions.CycleFile),
-#endif
+ CycleFile = cycle,
+ //CycleFile = RessourceHelper.ReadStream(DeclarationData.DeclarationDataResourcePrefix + ".MissionCycles." +
+ // missionType.ToString().Replace("EMS", "") +
+ // Constants.FileExtensions.CycleFile),
AxleWeightDistribution = GetAxleWeightDistribution(row, missionType),
BodyCurbWeight = body.CurbWeight,
Trailer = trailers,
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
index f785ba4ed0e9b1709858ea66921a214a03b0dcbd..d1e2e6beb3db1b56243f637af5ace3db557b361f 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
@@ -69,30 +69,30 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
private readonly IModalDataContainer _modData;
private readonly WriteSumData _sumWriter;
- private static List<Tuple<GbxTypeList, string, string, StrategyCreator>> ShiftStrategies =
- new List<Tuple<GbxTypeList, string, string, StrategyCreator>> {
- Tuple.Create<GbxTypeList, string, string, StrategyCreator>(new GbxTypeList { GearboxType.MT },
- typeof(MTShiftStrategy).FullName, MTShiftStrategy.Name, c => new MTShiftStrategy(c)),
- Tuple.Create<GbxTypeList, string, string, StrategyCreator>(new GbxTypeList { GearboxType.AMT },
- typeof(AMTShiftStrategy).FullName, AMTShiftStrategy.Name, c => new AMTShiftStrategy(c)),
- Tuple.Create<GbxTypeList, string, string, StrategyCreator>(new GbxTypeList { GearboxType.AMT },
- typeof(AMTShiftStrategyOptimized).FullName, AMTShiftStrategyOptimized.Name,
- c => new AMTShiftStrategyOptimized(c)),
- //Tuple.Create<GbxTypeList, string, string, StrategyCreator>(new GbxTypeList { GearboxType.AMT },
- // typeof(AMTShiftStrategyACEA).FullName, AMTShiftStrategyACEA.Name,
- // c => new AMTShiftStrategyACEA(c)),
- Tuple.Create<GbxTypeList, string, string, StrategyCreator>(
- new GbxTypeList { GearboxType.ATPowerSplit, GearboxType.ATSerial },
- typeof(ATShiftStrategy).FullName, ATShiftStrategy.Name, c => new ATShiftStrategy(c)),
- //Tuple.Create<GbxTypeList, string, string, StrategyCreator>(
- // new GbxTypeList { GearboxType.ATPowerSplit, GearboxType.ATSerial },
- // typeof(ATShiftStrategyVoith).FullName, ATShiftStrategyVoith.Name,
- // c => new ATShiftStrategyVoith(c)),
- Tuple.Create<GbxTypeList, string, string, StrategyCreator>(
- new GbxTypeList { GearboxType.ATPowerSplit, GearboxType.ATSerial },
- typeof(ATShiftStrategyOptimized).FullName, ATShiftStrategyOptimized.Name,
- c => new ATShiftStrategyOptimized(c)),
- };
+ //private static List<Tuple<GbxTypeList, string, string, StrategyCreator>> ShiftStrategies =
+ // new List<Tuple<GbxTypeList, string, string, StrategyCreator>> {
+ // Tuple.Create<GbxTypeList, string, string, StrategyCreator>(new GbxTypeList { GearboxType.MT },
+ // typeof(MTShiftStrategy).FullName, MTShiftStrategy.Name, c => new MTShiftStrategy(c)),
+ // Tuple.Create<GbxTypeList, string, string, StrategyCreator>(new GbxTypeList { GearboxType.AMT },
+ // typeof(AMTShiftStrategy).FullName, AMTShiftStrategy.Name, c => new AMTShiftStrategy(c)),
+ // Tuple.Create<GbxTypeList, string, string, StrategyCreator>(new GbxTypeList { GearboxType.AMT },
+ // typeof(AMTShiftStrategyOptimized).FullName, AMTShiftStrategyOptimized.Name,
+ // c => new AMTShiftStrategyOptimized(c)),
+ // //Tuple.Create<GbxTypeList, string, string, StrategyCreator>(new GbxTypeList { GearboxType.AMT },
+ // // typeof(AMTShiftStrategyACEA).FullName, AMTShiftStrategyACEA.Name,
+ // // c => new AMTShiftStrategyACEA(c)),
+ // Tuple.Create<GbxTypeList, string, string, StrategyCreator>(
+ // new GbxTypeList { GearboxType.ATPowerSplit, GearboxType.ATSerial },
+ // typeof(ATShiftStrategy).FullName, ATShiftStrategy.Name, c => new ATShiftStrategy(c)),
+ // //Tuple.Create<GbxTypeList, string, string, StrategyCreator>(
+ // // new GbxTypeList { GearboxType.ATPowerSplit, GearboxType.ATSerial },
+ // // typeof(ATShiftStrategyVoith).FullName, ATShiftStrategyVoith.Name,
+ // // c => new ATShiftStrategyVoith(c)),
+ // Tuple.Create<GbxTypeList, string, string, StrategyCreator>(
+ // new GbxTypeList { GearboxType.ATPowerSplit, GearboxType.ATSerial },
+ // typeof(ATShiftStrategyOptimized).FullName, ATShiftStrategyOptimized.Name,
+ // c => new ATShiftStrategyOptimized(c)),
+ // };
public PowertrainBuilder(IModalDataContainer modData, WriteSumData sumWriter = null)
@@ -1001,49 +1001,35 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
public static IShiftStrategy GetShiftStrategy(IVehicleContainer container)
{
var runData = container.RunData;
- var shiftStrategy = runData.ShiftStrategy;
- if (string.IsNullOrWhiteSpace(shiftStrategy)) {
- shiftStrategy = DeclarationData.GearboxTCU.DefaultShiftStrategy;
- }
- if (string.IsNullOrWhiteSpace(shiftStrategy)) {
- switch (runData.GearboxData.Type) {
- case GearboxType.AMT:
- if (runData.JobType == VectoSimulationJobType.ConventionalVehicle) {
- runData.ShiftStrategy = AMTShiftStrategyOptimized.Name;
- return new AMTShiftStrategyOptimized(container);
- }
+ switch (runData.GearboxData.Type) {
+ case GearboxType.AMT:
+ if (runData.JobType == VectoSimulationJobType.ConventionalVehicle) {
+ runData.ShiftStrategy = AMTShiftStrategyOptimized.Name;
+ return new AMTShiftStrategyOptimized(container);
+ }
- if (runData.JobType == VectoSimulationJobType.BatteryElectricVehicle) {
- runData.ShiftStrategy = PEVAMTShiftStrategy.Name;
- return new PEVAMTShiftStrategy(container);
- }
- throw new VectoException("no default gearshift strategy available for gearbox type {0} and job type {1}", runData.GearboxData.Type, runData.JobType);
- //return new AMTShiftStrategy(runData, container);
- case GearboxType.MT:
- runData.ShiftStrategy = MTShiftStrategy.Name;
- return new MTShiftStrategy(container);
- case GearboxType.ATPowerSplit:
- case GearboxType.ATSerial:
- runData.ShiftStrategy = ATShiftStrategyOptimized.Name;
- return new ATShiftStrategyOptimized(container);
- //return new ATShiftStrategy(runData, container);
- default:
- throw new ArgumentOutOfRangeException("GearboxType",
- $"Unknown Gearbox Type {runData.GearboxData.Type.ToString()}");
- }
- }
+ if (runData.JobType == VectoSimulationJobType.BatteryElectricVehicle) {
+ runData.ShiftStrategy = PEVAMTShiftStrategy.Name;
+ return new PEVAMTShiftStrategy(container);
+ }
- var selected = ShiftStrategies.FirstOrDefault(x =>
- x.Item1.Contains(runData.GearboxData.Type) &&
- x.Item2.Equals(shiftStrategy, StringComparison.InvariantCultureIgnoreCase));
- if (selected == null) {
- throw new ArgumentOutOfRangeException("ShiftStrategy",
- $"Unknown Shiftstrategy {shiftStrategy} for Gearbox Type {runData.GearboxData.Type.ToString()}");
+ throw new VectoException(
+ "no default gearshift strategy available for gearbox type {0} and job type {1}",
+ runData.GearboxData.Type, runData.JobType);
+ //return new AMTShiftStrategy(runData, container);
+ case GearboxType.MT:
+ runData.ShiftStrategy = MTShiftStrategy.Name;
+ return new MTShiftStrategy(container);
+ case GearboxType.ATPowerSplit:
+ case GearboxType.ATSerial:
+ runData.ShiftStrategy = ATShiftStrategyOptimized.Name;
+ return new ATShiftStrategyOptimized(container);
+ //return new ATShiftStrategy(runData, container);
+ default:
+ throw new ArgumentOutOfRangeException("GearboxType",
+ $"Unknown Gearbox Type {runData.GearboxData.Type.ToString()}");
}
-
- runData.ShiftStrategy = selected.Item3;
- return selected.Item4(container);
}
private static IGearbox GetSimpleGearbox(IVehicleContainer container, VectoRunData runData)
@@ -1056,16 +1042,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
}
- public static IEnumerable<Tuple<string, string>> GetRegisteredShiftStrategies(GearboxType? type)
- {
- if (!type.HasValue) {
- return new List<Tuple<string, string>>();
- }
-
- return ShiftStrategies.Where(x => x.Item1.Contains(type.Value)).Select(x => Tuple.Create(x.Item2, x.Item3))
- .ToList();
- }
- }
+ }
internal class DummyEngineInfo : VectoSimulationComponent, IEngineInfo, IEngineControl
{
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/EfficiencyMap.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/EfficiencyMap.cs
index ad4a03b385679a4282cdb8bd174029bbea5644db..d6f5cdc1164d2dcc14dcf7d115914fe53a4fc886 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/EfficiencyMap.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/EfficiencyMap.cs
@@ -9,9 +9,44 @@ using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.SimulationComponent.Data.ElectricMotor
{
+
+ public class EfficiencyMapNew : EfficiencyMap
+ {
+
+ protected internal EfficiencyMapNew(DelaunayMap efficiencyMapMech2El) : base(efficiencyMapMech2El) { }
+
+ public override EfficiencyResult LookupElectricPower(PerSecond angularSpeed, NewtonMeter torque, bool allowExtrapolation = false)
+ {
+ var result = new EfficiencyResult();
+ result.Torque = torque;
+ result.Speed = angularSpeed;
+ var value = _efficiencyMapMech2El.Interpolate(torque, angularSpeed);
+ if (!value.IsNaN()) {
+ result.ElectricalPower = value.SI<NewtonMeter>() * (angularSpeed) + angularSpeed * torque;
+ return result;
+ }
+ if (allowExtrapolation) {
+ value = _efficiencyMapMech2El.Extrapolate(torque, angularSpeed);
+ result.ElectricalPower = value.SI<NewtonMeter>() * (angularSpeed) + angularSpeed * torque;
+ result.Extrapolated = true;
+ return result;
+ }
+ return result;
+ }
+
+ public double GetDelaunayZValue(Entry entry)
+ {
+ if (entry.MotorSpeed.IsEqual(0)) {
+ throw new VectoException("Electric motor speed has to be greater than 0");
+ }
+ return - ((entry.PowerElectrical - entry.MotorSpeed * entry.Torque) /
+ (entry.MotorSpeed)).Value();
+ }
+ }
+
public class EfficiencyMap : LoggingObject
{
- private readonly DelaunayMap _efficiencyMapMech2El;
+ protected readonly DelaunayMap _efficiencyMapMech2El;
private PerSecond _maxSpeed;
protected internal EfficiencyMap(DelaunayMap efficiencyMapMech2El)
@@ -20,7 +55,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data.ElectricMotor
}
- public EfficiencyResult LookupElectricPower(PerSecond angularSpeed, NewtonMeter torque, bool allowExtrapolation = false)
+ public virtual EfficiencyResult LookupElectricPower(PerSecond angularSpeed, NewtonMeter torque, bool allowExtrapolation = false)
{
var result = new EfficiencyResult();
result.Torque = torque;
@@ -40,34 +75,6 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data.ElectricMotor
return result;
}
- public EfficiencyResult SearchMechanicalPower(Watt electricPower, PerSecond angularSpeed,
- bool allowExtrapolation = false)
- {
- if (electricPower.IsEqual(0))
- {
- return new EfficiencyResult
- {
- ElectricalPower = electricPower,
- Speed = angularSpeed,
- Torque = 0.SI<NewtonMeter>()
- };
- }
- var torque = electricPower / angularSpeed;
- var response = LookupElectricPower(angularSpeed, torque, true);
- var delta = response.ElectricalPower - electricPower;
- torque = SearchAlgorithm.Search(torque, delta, torque * 0.1,
- getYValue: result => ((EfficiencyResult)result).ElectricalPower - electricPower,
- evaluateFunction: x => LookupElectricPower(angularSpeed, x, true),
- criterion: result => (((EfficiencyResult)result).ElectricalPower - electricPower).Value());
-
- return new EfficiencyResult
- {
- ElectricalPower = electricPower,
- Speed = angularSpeed,
- Torque = torque
- };
- }
-
public string[] SerializedEntries
{
get { return _efficiencyMapMech2El.Entries.Select(
@@ -104,6 +111,11 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data.ElectricMotor
public readonly PerSecond MotorSpeed;
public readonly NewtonMeter Torque;
public readonly Watt PowerElectrical;
+
+ public override string ToString()
+ {
+ return $"{MotorSpeed.AsRPM} / {Torque} / {PowerElectrical}";
+ }
}
public class EfficiencyResult
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/ElectricMotorData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/ElectricMotorData.cs
index 91e17a240c5e61f4b6ce7e201d4bcc45717d3160..b10be1b872608b53624e211d9141f6e023087fbf 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/ElectricMotorData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/ElectricMotorData.cs
@@ -80,9 +80,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
var searchResult = SearchAlgorithm.Search(retVal, electricPower - elPwr.ElectricalPower,
interval: 10.SI<NewtonMeter>(),
- getYValue: x => (Watt)x,
+ getYValue: x => (Watt)x - electricPower,
evaluateFunction: x => LookupElectricPower(voltage, avgSpeed, x, true).ElectricalPower,
- criterion: x => ((Watt)x).Value()
+ criterion: x => ((Watt)x - electricPower).Value()
);
return searchResult;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/BatteryElectricMotorController.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/BatteryElectricMotorController.cs
index 9a3609cfb983ec56cc95c4c4602a563fff13d1a0..351066623b58cf4e5684d9fb4f403c6d26fb70c7 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/BatteryElectricMotorController.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/BatteryElectricMotorController.cs
@@ -1,6 +1,8 @@
using System.Linq;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
+using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.Simulation.Impl;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.Utils;
@@ -34,12 +36,16 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl {
//var dragTorque = ElectricMotorData.DragCurve.Lookup()
return (-inertiaTorqueLoss); //.LimitTo(maxDriveTorque, maxRecuperationTorque);
}
- if (DataBus.DriverInfo.DrivingAction == DrivingAction.Coast ||
- DataBus.DriverInfo.DrivingAction == DrivingAction.Roll) {
- return null;
- }
+ if (DataBus.DriverInfo.DrivingAction == DrivingAction.Coast ||
+ DataBus.DriverInfo.DrivingAction == DrivingAction.Roll) {
+ return null;
+ }
+
+ if (DataBus.VehicleInfo.VehicleSpeed.IsSmallerOrEqual(Constants.SimulationSettings.ClutchDisengageWhenHaltingSpeed) && outTorque.IsSmaller(0)) {
+ return null;
+ }
- if (maxDriveTorque == null) {
+ if (maxDriveTorque == null) {
return null;
}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
index ddd51308dc06011661cdd1c0595ae16d90034920..79f76c00a893cd75fa0965ea3240f9af8663f334 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
@@ -369,11 +369,11 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
protected virtual PerSecond GetEngineSpeedLimit(Second absTime)
{
- if (DataBus.GearboxInfo.Gear.Gear == 0 || !DataBus.ClutchInfo.ClutchClosed(absTime) || !DataBus.GearboxInfo.TCLocked) {
+ if (DataBus.GearboxInfo.Gear.Gear == 0 || !DataBus.ClutchInfo.ClutchClosed(absTime)) {
return ModelData.FullLoadCurves[0].N95hSpeed;
}
- return VectoMath.Min(DataBus.GearboxInfo.GetGearData(DataBus.GearboxInfo.Gear.Gear).MaxSpeed, ModelData.FullLoadCurves[0].N95hSpeed);
+ return VectoMath.Min(DataBus.GearboxInfo.GetGearData(DataBus.GearboxInfo.Gear.Gear)?.MaxSpeed, ModelData.FullLoadCurves[0].N95hSpeed);
}
public virtual IResponse Initialize(NewtonMeter outTorque, PerSecond outAngularVelocity)
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/HybridController.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/HybridController.cs
index 10723ec1b2fabcb5acb8d896b6115642904f7867..03f7d5f96e8ca44bfa7c49d880061090aedd8c68 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/HybridController.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/HybridController.cs
@@ -181,18 +181,18 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
continue;
}
- var gear = DataBus.GearboxInfo.Gear;
- var maxSpeed = VectoMath.Min(DataBus.GearboxInfo.GetGearData(gear.Gear).MaxSpeed,
- DataBus.EngineInfo.EngineN95hSpeed);
- if (!dryRun && retVal is ResponseSuccess && DataBus.GearboxInfo.GearEngaged(absTime) && retVal.Gearbox.InputSpeed.IsGreater(maxSpeed)) {
- Strategy.AllowEmergencyShift = true;
- retryCount++;
- retry = true;
- Strategy.OperatingpointChangedDuringRequest(absTime, dt, outTorque, outAngularVelocity, false, retVal);
- continue;
- }
-
- if (!dryRun && strategySettings.CombustionEngineOn && retVal is ResponseEngineSpeedTooHigh && !strategySettings.ProhibitGearshift) {
+ var gear = DataBus.GearboxInfo.Gear;
+ var maxSpeed = VectoMath.Min(DataBus.GearboxInfo.GetGearData(gear.Gear).MaxSpeed,
+ DataBus.EngineInfo.EngineN95hSpeed);
+ if (!dryRun && retVal is ResponseSuccess && DataBus.GearboxInfo.GearEngaged(absTime) && retVal.Gearbox.InputSpeed.IsGreater(maxSpeed)) {
+ Strategy.AllowEmergencyShift = true;
+ retryCount++;
+ retry = true;
+ Strategy.OperatingpointChangedDuringRequest(absTime, dt, outTorque, outAngularVelocity, false, retVal);
+ continue;
+ }
+
+ if (!dryRun && strategySettings.CombustionEngineOn && retVal is ResponseEngineSpeedTooHigh && !strategySettings.ProhibitGearshift) {
retryCount++;
retry = true;
Strategy.AllowEmergencyShift = true;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs
index 0683ea1db800a1f74d264993f5b5b7cebf1fe74b..3d572afbbfb4a2c27b60bbcd3928deae27e5d094 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs
@@ -1452,7 +1452,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
if (best == null) {
return null;
}
- if (!best.IgnoreReason.InvalidEngineSpeed() || best.ICEOff ||
+ if (!best.IgnoreReason.InvalidEngineSpeed() || /*best.ICEOff ||*/
eval.Select(x => x.Gear).Distinct().Count() <= 1) {
best.SimulationInterval = dt;
return best;
diff --git a/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs b/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
index e8eea0d5a7f55dda529e23567cc7cf5119538fce..d2208265aed40716d25f2c24dd96f1b6fb498f7e 100644
--- a/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
+++ b/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
@@ -664,7 +664,6 @@ public class JSONFileWriter : IOutputFileWriter
body.Add("TCU", GetRelativePath(input.DriverInputData.GearshiftInputData.Source, basePath));
}
- body.Add("ShiftStrategy", input.JobInputData.ShiftStrategy);
body.Add("HybridStrategyParams", GetRelativePath(input.JobInputData.HybridStrategyParameters.Source, basePath));
var auxList = new List<object>();
@@ -980,9 +979,7 @@ public class JSONFileWriter : IOutputFileWriter
body.Add("TCU", GetRelativePath(input.DriverInputData.GearshiftInputData.Source, basePath));
}
- body.Add("ShiftStrategy", input.JobInputData.ShiftStrategy);
-
-
+
if (job.SavedInDeclarationMode && job.Vehicle is IVehicleDeclarationInputData declVehicle) {
var aux = declVehicle.Components.AuxiliaryInputData;
var auxList = new List<object>();
diff --git a/VectoCore/VectoCore/OutputData/ModalDataContainer.cs b/VectoCore/VectoCore/OutputData/ModalDataContainer.cs
index a5622e6202cdc5ecc629a7b5f2c2b68d61033dea..644197b8c6d7ba1d4260eab778f9d8c4564f8bf8 100644
--- a/VectoCore/VectoCore/OutputData/ModalDataContainer.cs
+++ b/VectoCore/VectoCore/OutputData/ModalDataContainer.cs
@@ -277,7 +277,7 @@ namespace TUGraz.VectoCore.OutputData
E_EM = r.Field<Watt>(string.Format(ModalResultField.P_EM_mech_.GetCaption(), emPos.GetName())) *
dt
};
- }).Where(x => x.EM_off.IsEqual(0) && x.E_EM.IsSmaller(0)).Sum(x => x.E_EM);
+ }).Where(x => x.EM_off.IsEqual(0) && x.E_EM.IsSmaller(0)).Sum(x => x.E_EM) ?? 0.SI<WattSecond>();
return -_eEmDrive.GetOrAdd(emPos, _ => eEmDrive);
}
}
@@ -300,7 +300,7 @@ namespace TUGraz.VectoCore.OutputData
E_EM = r.Field<Watt>(string.Format(ModalResultField.P_EM_mech_.GetCaption(), emPos.GetName())) *
dt
};
- }).Where(x => x.EM_off.IsEqual(0) && x.E_EM.IsGreater(0)).Sum(x => x.E_EM);
+ }).Where(x => x.EM_off.IsEqual(0) && x.E_EM.IsGreater(0)).Sum(x => x.E_EM) ?? 0.SI<WattSecond>();
return _eEmRecuperate.GetOrAdd(emPos, _ => eEmRecup);
}
}
@@ -387,7 +387,7 @@ namespace TUGraz.VectoCore.OutputData
});
var eMech = 0.SI<WattSecond>();
var eEl = 0.SI<WattSecond>();
- foreach (var entry in selected.Where(x => x.P_em.IsGreater(0) && !x.EM_off.IsEqual(0))) {
+ foreach (var entry in selected.Where(x => x.P_em.IsGreater(0) && x.EM_off.IsEqual(0))) {
eMech += entry.E_mech;
eEl += entry.E_el;
}
diff --git a/VectoCore/VectoCoreTest/FileIO/JsonReadHybridTest.cs b/VectoCore/VectoCoreTest/FileIO/JsonReadHybridTest.cs
index fff7330b5f4ef65f141cab70210848663d01b52a..ea60ff7aae91bd7d6fd9a574374cdbc49e299a99 100644
--- a/VectoCore/VectoCoreTest/FileIO/JsonReadHybridTest.cs
+++ b/VectoCore/VectoCoreTest/FileIO/JsonReadHybridTest.cs
@@ -72,9 +72,10 @@ namespace TUGraz.VectoCore.Tests.FileIO
Assert.AreEqual("9.8449", pwr.Rows[0][ElectricMotorMapReader.Fields.PowerElectrical]);
var pwrMap = ElectricMotorMapReader.Create(pwr, 1);
- Assert.AreEqual(-10171.0, pwrMap.LookupElectricPower(-0.RPMtoRad(), -800.SI<NewtonMeter>()).ElectricalPower.Value(), 1e-3);
+ Assert.AreEqual(0, pwrMap.LookupElectricPower(-0.RPMtoRad(), -800.SI<NewtonMeter>()).ElectricalPower.Value(), 1e-3);
+ Assert.AreEqual(-298.4752, pwrMap.LookupElectricPower(1.RPMtoRad(), -800.SI<NewtonMeter>()).ElectricalPower.Value(), 1e-3);
- Assert.AreEqual(-20430.186, pwrMap.LookupElectricPower(120.RPMtoRad(), -800.SI<NewtonMeter>()).ElectricalPower.Value(), 1e-3);
+ Assert.AreEqual(-20853.4819, pwrMap.LookupElectricPower(120.RPMtoRad(), -800.SI<NewtonMeter>()).ElectricalPower.Value(), 1e-3);
}
@@ -103,9 +104,10 @@ namespace TUGraz.VectoCore.Tests.FileIO
Assert.AreEqual("9.8449", pwrLow.Rows[0][ElectricMotorMapReader.Fields.PowerElectrical]);
var pwrMapLow = ElectricMotorMapReader.Create(pwrLow, 1);
- Assert.AreEqual(-10171.0, pwrMapLow.LookupElectricPower(-0.RPMtoRad(), -800.SI<NewtonMeter>()).ElectricalPower.Value(), 1e-3);
+ Assert.AreEqual(-0, pwrMapLow.LookupElectricPower(-0.RPMtoRad(), -800.SI<NewtonMeter>()).ElectricalPower.Value(), 1e-3);
+ Assert.AreEqual(-298.4752, pwrMapLow.LookupElectricPower(1.RPMtoRad(), -800.SI<NewtonMeter>()).ElectricalPower.Value(), 1e-3);
- Assert.AreEqual(-20430.186, pwrMapLow.LookupElectricPower(120.RPMtoRad(), -800.SI<NewtonMeter>()).ElectricalPower.Value(), 1e-3);
+ Assert.AreEqual(-20853.4819, pwrMapLow.LookupElectricPower(120.RPMtoRad(), -800.SI<NewtonMeter>()).ElectricalPower.Value(), 1e-3);
@@ -126,9 +128,10 @@ namespace TUGraz.VectoCore.Tests.FileIO
Assert.AreEqual("8.86041", pwrHi.Rows[0][ElectricMotorMapReader.Fields.PowerElectrical]);
var pwrMap = ElectricMotorMapReader.Create(pwrHi, 1);
- Assert.AreEqual(-9153.9, pwrMap.LookupElectricPower(-0.RPMtoRad(), -800.SI<NewtonMeter>()).ElectricalPower.Value(), 1e-3);
+ Assert.AreEqual(0, pwrMap.LookupElectricPower(-0.RPMtoRad(), -800.SI<NewtonMeter>()).ElectricalPower.Value(), 1e-3);
+ Assert.AreEqual(-268.6277, pwrMap.LookupElectricPower(1.RPMtoRad(), -800.SI<NewtonMeter>()).ElectricalPower.Value(), 1e-3);
- Assert.AreEqual(-18387.16730, pwrMap.LookupElectricPower(120.RPMtoRad(), -800.SI<NewtonMeter>()).ElectricalPower.Value(), 1e-3);
+ Assert.AreEqual(-18768.1337, pwrMap.LookupElectricPower(120.RPMtoRad(), -800.SI<NewtonMeter>()).ElectricalPower.Value(), 1e-3);
}
[TestCase()]
@@ -142,10 +145,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
Assert.AreEqual(26, emData.DragCurve.Lookup(2000.RPMtoRad()).Value());
- Assert.AreEqual(33, emData.DragCurve.Lookup(2000.RPMtoRad()).Value());
- Assert.AreEqual(29.5, emData.DragCurve.Lookup(2000.RPMtoRad()).Value());
- Assert.AreEqual(31.25, emData.DragCurve.Lookup(2000.RPMtoRad()).Value());
-
+
var em = emData.EfficiencyData;
Assert.AreEqual(-334.2300, em.FullLoadDriveTorque(400.SI<Volt>(), 2000.RPMtoRad()).Value());
@@ -158,10 +158,17 @@ namespace TUGraz.VectoCore.Tests.FileIO
Assert.AreEqual(370.153, em.FullGenerationTorque(500.SI<Volt>(), 2000.RPMtoRad()).Value());
Assert.AreEqual(388.1145, em.FullGenerationTorque(550.SI<Volt>(), 2000.RPMtoRad()).Value());
- Assert.AreEqual(-101.760, em.EfficiencyMapLookupTorque(400.SI<Volt>(), -25000.SI<Watt>(), 2000.RPMtoRad(), -300.SI<NewtonMeter>()).Value(), 1e-3);
- Assert.AreEqual(-115.1818, em.EfficiencyMapLookupTorque(600.SI<Volt>(), -25000.SI<Watt>(), 2000.RPMtoRad(), -300.SI<NewtonMeter>()).Value(), 1e-3);
- Assert.AreEqual(14.5383, em.EfficiencyMapLookupTorque(500.SI<Volt>(), -25000.SI<Watt>(), 2000.RPMtoRad(), -300.SI<NewtonMeter>()).Value(), 1e-3);
- Assert.AreEqual(14.5383, em.EfficiencyMapLookupTorque(550.SI<Volt>(), -25000.SI<Watt>(), 2000.RPMtoRad(), -300.SI<NewtonMeter>()).Value(), 1e-3);
+ Assert.AreEqual(-101.70072, em.EfficiencyMapLookupTorque(400.SI<Volt>(), -25000.SI<Watt>(), 2000.RPMtoRad(), -300.SI<NewtonMeter>()).Value(), 1e-3);
+ Assert.AreEqual(-25000, em.LookupElectricPower(400.SI<Volt>(), 2000.RPMtoRad(), -101.70072.SI<NewtonMeter>()).ElectricalPower.Value(), 1e-1);
+
+ Assert.AreEqual(-114.51788, em.EfficiencyMapLookupTorque(600.SI<Volt>(), -25000.SI<Watt>(), 2000.RPMtoRad(), -300.SI<NewtonMeter>()).Value(), 1e-3);
+ Assert.AreEqual(-25000, em.LookupElectricPower(600.SI<Volt>(), 2000.RPMtoRad(), -114.51788.SI<NewtonMeter>()).ElectricalPower.Value(), 1e-1);
+
+ Assert.AreEqual(-107.772009, em.EfficiencyMapLookupTorque(500.SI<Volt>(), -25000.SI<Watt>(), 2000.RPMtoRad(), -300.SI<NewtonMeter>()).Value(), 1e-3);
+ Assert.AreEqual(-25000, em.LookupElectricPower(500.SI<Volt>(), 2000.RPMtoRad(), -107.772009.SI<NewtonMeter>()).ElectricalPower.Value(), 1e-1);
+
+ Assert.AreEqual(-111.053784, em.EfficiencyMapLookupTorque(550.SI<Volt>(), -25000.SI<Watt>(), 2000.RPMtoRad(), -300.SI<NewtonMeter>()).Value(), 1e-3);
+ Assert.AreEqual(-25000, em.LookupElectricPower(550.SI<Volt>(), 2000.RPMtoRad(), -111.053784.SI<NewtonMeter>()).ElectricalPower.Value(), 1e-1);
}
@@ -192,9 +199,11 @@ namespace TUGraz.VectoCore.Tests.FileIO
Assert.AreEqual("9.8449", pwr.Rows[0][ElectricMotorMapReader.Fields.PowerElectrical]);
var pwrMap = ElectricMotorMapReader.Create(pwr, 2);
- Assert.AreEqual(-5816.6, pwrMap.LookupElectricPower(-0.RPMtoRad(), -800.SI<NewtonMeter>()).ElectricalPower.Value(), 1e-3);
+ Assert.AreEqual(0, pwrMap.LookupElectricPower(-0.RPMtoRad(), -800.SI<NewtonMeter>()).ElectricalPower.Value(), 1e-3);
+ Assert.AreEqual(-147.2105, pwrMap.LookupElectricPower(1.RPMtoRad(), -800.SI<NewtonMeter>()).ElectricalPower.Value(), 1e-3);
+
- Assert.AreEqual(-16170.5166, pwrMap.LookupElectricPower(120.RPMtoRad(), -800.SI<NewtonMeter>()).ElectricalPower.Value(), 1e-3);
+ Assert.AreEqual(-16412.2624, pwrMap.LookupElectricPower(120.RPMtoRad(), -800.SI<NewtonMeter>()).ElectricalPower.Value(), 1e-3);
}
diff --git a/VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs b/VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs
index 23d9cd95117599bfc8597e221cc16851766857e4..a4cbee9cb65133d3aca0f4c1d488dd95bd9d45cb 100644
--- a/VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs
+++ b/VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs
@@ -541,8 +541,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
IVehicleDeclarationInputData IDeclarationJobInputData.Vehicle => Vehicle;
public string JobName { get; set; }
- public string ShiftStrategy { get; set; }
-
+
#endregion
}
diff --git a/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsConventional.cs b/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsConventional.cs
index 5e3c0639d4a77e09646e9e5bf44b6621b5c274d9..a76168ec48d425f9577c3d0d0cca0f2d838ee66c 100644
--- a/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsConventional.cs
+++ b/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsConventional.cs
@@ -1031,8 +1031,8 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
(3410, 3468, OutsideSegment, Coast), // len: 58m
(3468, 3854, OutsideSegment, Roll), // len: 386m
(3854, 3864, OutsideSegment, Brake), // len: 10m
- (3864, 3884, OutsideSegment, Coast), // len: 20m
- (3884, 5012, OutsideSegment, Brake), // len: 1128m
+ (3864, 3915, OutsideSegment, Coast), // len: 20m
+ (3915, 5012, OutsideSegment, Brake), // len: 1128m
(5012, 5420, OutsideSegment, Coast), // len: 408m
(5420, 1e6, OutsideSegment, Accelerate));
@@ -1232,9 +1232,9 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
public void Class5_PCC123EcoRollEngineStop_CaseA_Conventional() => TestPCC(MethodBase.GetCurrentMethod().Name,
(0, 4025, OutsideSegment, Accelerate), // len: 4025m
(4025, 5309, WithinSegment, Accelerate), // len: 1284m
- (5309, 5908, UseCase1, Roll), // len: 599m
- (5908, 5932, OutsideSegment, Coast), // len: 24m
- (5932, 1e6, OutsideSegment, Accelerate));
+ (5309, 5920, UseCase1, Roll), // len: 599m
+ //(5920, 5932, OutsideSegment, Coast), // len: 24m
+ (5920, 1e6, OutsideSegment, Accelerate));
[TestCase]
public void Class5_PCC123EcoRollEngineStop_CaseB_Conventional() => TestPCC(MethodBase.GetCurrentMethod().Name,
@@ -1243,7 +1243,7 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
(5216, 6698, UseCase1, Roll), // len: 1482m
(6698, 6757, WithinSegment, Coast), // len: 59m
(6757, 7158, WithinSegment, Roll), // len: 401m
- (7158, 7170, WithinSegment, Brake), // len: 12m
+ //(7158, 7170, WithinSegment, Brake), // len: 12m
(7170, 7552, WithinSegment, Coast), // len: 382m
(7552, 7912, OutsideSegment, Coast), // len: 360m
(7912, 1e6, OutsideSegment, Accelerate));
@@ -1370,8 +1370,8 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
(3410, 3468, OutsideSegment, Coast), // len: 58m
(3468, 3854, OutsideSegment, Roll), // len: 386m
(3854, 3864, OutsideSegment, Brake), // len: 10m
- (3864, 3884, OutsideSegment, Coast), // len: 20m
- (3884, 5012, OutsideSegment, Brake), // len: 1128m
+ (3864, 3915, OutsideSegment, Coast), // len: 20m
+ (3915, 5012, OutsideSegment, Brake), // len: 1128m
(5012, 5420, OutsideSegment, Coast), // len: 408m
(5420, 1e6, OutsideSegment, Accelerate));
diff --git a/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsPEV.cs b/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsPEV.cs
index 39251c77028b1d30074beb826b36537dbaa4e58e..e287cf0ee70a30149660b1e24bbfae910c4d9988 100644
--- a/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsPEV.cs
+++ b/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsPEV.cs
@@ -132,19 +132,19 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
(4837, 4845, OutsideSegment, Roll), // len: 8m
(4845, 4881, OutsideSegment, Accelerate), // len: 36m
(4881, 4887, OutsideSegment, Roll), // len: 6m
- (4887, 4903, OutsideSegment, Accelerate), // len: 16m
- (4903, 4909, OutsideSegment, Roll), // len: 6m
- (4909, 5041, OutsideSegment, Accelerate), // len: 46m
+ (4887, 4900, OutsideSegment, Accelerate), // len: 16m
+ (4900, 4905, OutsideSegment, Roll), // len: 6m
+ (4905, 5082, OutsideSegment, Accelerate), // len: 46m
//(4955, 5041, OutsideSegment, Roll), // len: 7m
//(4962, 4983, OutsideSegment, Accelerate), // len: 21m
//(4983, 4991, OutsideSegment, Roll), // len: 8m
//(4991, 5015, OutsideSegment, Accelerate), // len: 24m
//(5015, 5025, OutsideSegment, Roll), // len: 10m
- (5041, 5054, OutsideSegment, Roll), // len: 28m
- (5054, 5087, OutsideSegment, Accelerate), // len: 12m
- (5087, 5102, OutsideSegment, Roll), // len: 392m
- (5102, 5437, OutsideSegment, Accelerate),
- (5437, 5532, OutsideSegment, Coast), // len: 107m
+ (5082, 5097, OutsideSegment, Roll), // len: 28m
+ (5097, 5135, OutsideSegment, Accelerate), // len: 12m
+ (5135, 5152, OutsideSegment, Roll), // len: 392m
+ (5152, 5431, OutsideSegment, Accelerate),
+ (5431, 5537, OutsideSegment, Coast), // len: 107m
(5564, 6084, OutsideSegment, Brake) // len: 517m
//(6081, 6366, OutsideSegment, Coast), // len: 285m
//(6366, 1e6, OutsideSegment, Accelerate)
@@ -152,18 +152,18 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
[TestCase]
public void Class5_E2_NoADAS_CrestCoast1() => TestPCC(MethodBase.GetCurrentMethod().Name.Split('_').Slice(0, -1).Join("_"), MethodBase.GetCurrentMethod().Name.Split('_').Last(),
- (0, 0, OutsideSegment, Halt), // len: 0m
- (0, 13, OutsideSegment, Accelerate), // len: 13m
- (13, 18, OutsideSegment, Roll), // len: 5m
- (18, 36, OutsideSegment, Accelerate), // len: 18m
- (36, 43, OutsideSegment, Roll), // len: 7m
- (43, 78, OutsideSegment, Accelerate), // len: 35m
- (78, 87, OutsideSegment, Roll), // len: 9m
- (87, 169, OutsideSegment, Accelerate), // len: 82m
- (169, 182, OutsideSegment, Roll), // len: 13m
- (182, 278, OutsideSegment, Accelerate), // len: 96m
- (278, 295, OutsideSegment, Roll), // len: 17m
- (295, 3809, OutsideSegment, Accelerate), // len: 3514m
+ //(0, 0, OutsideSegment, Halt), // len: 0m
+ //(0, 13, OutsideSegment, Accelerate), // len: 13m
+ //(13, 18, OutsideSegment, Roll), // len: 5m
+ //(18, 36, OutsideSegment, Accelerate), // len: 18m
+ //(36, 43, OutsideSegment, Roll), // len: 7m
+ //(43, 78, OutsideSegment, Accelerate), // len: 35m
+ //(78, 87, OutsideSegment, Roll), // len: 9m
+ //(87, 169, OutsideSegment, Accelerate), // len: 82m
+ //(169, 182, OutsideSegment, Roll), // len: 13m
+ //(182, 278, OutsideSegment, Accelerate), // len: 96m
+ //(278, 295, OutsideSegment, Roll), // len: 17m
+ (500, 3809, OutsideSegment, Accelerate), // len: 3514m
(3809, 4568, OutsideSegment, Coast), // len: 759m
(4568, 5001, OutsideSegment, Brake), // len: 433m
(5001, 5408, OutsideSegment, Coast), // len: 407m
@@ -183,7 +183,7 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
//(169, 182, OutsideSegment, Roll), // len: 13m
//(182, 278, OutsideSegment, Accelerate), // len: 96m
//(278, 295, OutsideSegment, Roll), // len: 17m
- (442, 3615, OutsideSegment, Accelerate), // len: 3320m
+ (500, 3615, OutsideSegment, Accelerate), // len: 3320m
(3615, 4248, OutsideSegment, Coast), // len: 633m
(4248, 4509, OutsideSegment, Brake), // len: 261m
(4509, 4717, OutsideSegment, Coast), // len: 208m
@@ -280,19 +280,21 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
(4837, 4845, WithinSegment, Roll), // len: 8m
(4845, 4881, WithinSegment, Accelerate), // len: 36m
(4881, 4887, WithinSegment, Roll), // len: 6m
- (4887, 4903, WithinSegment, Accelerate), // len: 16m
- (4903, 4909, WithinSegment, Roll), // len: 6m
- (4909, 5041, WithinSegment, Accelerate), // len: 46m
- (5041, 5054, WithinSegment, Roll), // len: 7m
- (5054, 5087, WithinSegment, Accelerate), // len: 21m
- (5087, 5102, WithinSegment, Roll), // len: 8m
+ (4887, 4900, WithinSegment, Accelerate), // len: 16m
+ (4900, 4905, WithinSegment, Roll), // len: 6m
+ (4905, 5082, WithinSegment, Accelerate), // len: 46m
+ (5082, 5097, WithinSegment, Roll), // len: 7m
+ (5097, 5135, WithinSegment, Accelerate), // len: 21m
+ (5135, 5152, WithinSegment, Roll), // len: 8m
//(4991, 5015, WithinSegment, Accelerate), // len: 24m
//(5015, 5025, WithinSegment, Roll), // len: 10m
//(5025, 5053, WithinSegment, Accelerate), // len: 28m
//(5053, 5065, WithinSegment, Roll), // len: 12m
- (5102, 5356, WithinSegment, Accelerate), // len: 291m
+ (5152, 5356, WithinSegment, Accelerate), // len: 291m
(5356, 5684, UseCase2, Coast), // len: 328m
- (5684, 6135, WithinSegment, Coast), // len: 451m
+ (5684, 6010, WithinSegment, Coast), // len: 451m
+ (6010, 6072, WithinSegment, Brake), // len: 451m
+ (6072, 6135, WithinSegment, Coast), // len: 451m
(6135, 6473, OutsideSegment, Coast), // len: 338m
(6473, 1e6, OutsideSegment, Accelerate));
@@ -309,7 +311,7 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
//(169, 182, OutsideSegment, Roll), // len: 13m
//(182, 278, OutsideSegment, Accelerate), // len: 96m
//(278, 295, OutsideSegment, Roll), // len: 17m
- (422, 3809, OutsideSegment, Accelerate), // len: 3514m
+ (500, 3809, OutsideSegment, Accelerate), // len: 3514m
(3809, 4568, OutsideSegment, Coast), // len: 759m
(4568, 5001, OutsideSegment, Brake), // len: 433m
(5001, 5408, OutsideSegment, Coast), // len: 407m
@@ -329,7 +331,7 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
//(169, 182, OutsideSegment, Roll), // len: 13m
//(182, 278, OutsideSegment, Accelerate), // len: 96m
//(278, 295, OutsideSegment, Roll), // len: 17m
- (422, 3615, OutsideSegment, Accelerate), // len: 3320m
+ (500, 3615, OutsideSegment, Accelerate), // len: 3320m
(3615, 4248, OutsideSegment, Coast), // len: 633m
(4248, 4509, OutsideSegment, Brake), // len: 261m
(4509, 4717, OutsideSegment, Coast), // len: 208m
@@ -433,17 +435,17 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
(4837, 4845, WithinSegment, Roll), // len: 8m
(4845, 4881, WithinSegment, Accelerate), // len: 36m
(4881, 4887, WithinSegment, Roll), // len: 6m
- (4887, 4903, WithinSegment, Accelerate), // len: 16m
- (4903, 4909, WithinSegment, Roll), // len: 6m
- (4909, 5041, WithinSegment, Accelerate), // len: 46m
- (5041, 5054, WithinSegment, Roll), // len: 7m
- (5054, 5087, WithinSegment, Accelerate), // len: 21m
- (5087, 5102, WithinSegment, Roll), // len: 8m
+ (4887, 4900, WithinSegment, Accelerate), // len: 16m
+ (4900, 4905, WithinSegment, Roll), // len: 6m
+ (4905, 5082, WithinSegment, Accelerate), // len: 46m
+ (5082, 5097, WithinSegment, Roll), // len: 7m
+ (5097, 5135, WithinSegment, Accelerate), // len: 21m
+ (5135, 5152, WithinSegment, Roll), // len: 8m
//(4991, 5015, WithinSegment, Accelerate), // len: 24m
//(5015, 5025, WithinSegment, Roll), // len: 10m
//(5025, 5053, WithinSegment, Accelerate), // len: 28m
//(5053, 5065, WithinSegment, Roll), // len: 12m
- (5065, 5356, WithinSegment, Accelerate), // len: 291m
+ (5152, 5356, WithinSegment, Accelerate), // len: 291m
(5356, 5684, UseCase2, Coast), // len: 328m
(5684, 5755, WithinSegment, Coast), // len: 71m
(5755, 6080, WithinSegment, Brake), // len: 325m
@@ -464,7 +466,7 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
//(169, 182, OutsideSegment, Roll), // len: 13m
//(182, 278, OutsideSegment, Accelerate), // len: 96m
//(278, 295, OutsideSegment, Roll), // len: 17m
- (422, 3809, OutsideSegment, Accelerate), // len: 3514m
+ (500, 3809, OutsideSegment, Accelerate), // len: 3514m
(3809, 4568, OutsideSegment, Coast), // len: 759m
(4568, 5001, OutsideSegment, Brake), // len: 433m
(5001, 5408, OutsideSegment, Coast), // len: 407m
diff --git a/VectoCore/VectoCoreTest/Integration/AMTShiftStrategyTests.cs b/VectoCore/VectoCoreTest/Integration/AMTShiftStrategyTests.cs
index 73d27a4a754efa732b8ab124d30c565bb522631a..2d5182ad5d4742fc932298ee4b4b8e571802b233 100644
--- a/VectoCore/VectoCoreTest/Integration/AMTShiftStrategyTests.cs
+++ b/VectoCore/VectoCoreTest/Integration/AMTShiftStrategyTests.cs
@@ -37,7 +37,7 @@ namespace TUGraz.VectoCore.Tests.Integration
// RunJob_DeclSingle(jobName, 9);
//}
- public void RunJob_DeclSingle(string jobName, int runIdx)
+ public void RunJob_DeclSingle(string jobName, int runIdx)
{
var relativeJobPath = jobName;
var writer = new FileOutputWriter(relativeJobPath);
diff --git a/VectoCore/VectoCoreTest/Integration/BatteryElectric/BatteryElectricTest.cs b/VectoCore/VectoCoreTest/Integration/BatteryElectric/BatteryElectricTest.cs
index 74c7a4be0eff40a02e9a6d00a9465af43b071a54..07f03834046a689d8807d044383a23ea6311c309 100644
--- a/VectoCore/VectoCoreTest/Integration/BatteryElectric/BatteryElectricTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/BatteryElectric/BatteryElectricTest.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Data;
using System.IO;
using System.Linq;
using NUnit.Framework;
@@ -163,6 +164,47 @@ namespace TUGraz.VectoCore.Tests.Integration.BatteryElectric
graphWriter.Write(modFilename + ".vmod");
}
+ [
+ TestCase(30, 0.5, 0, TestName = "PEV E4 Halt 30km/h SoC: 0.5, level"),
+ TestCase(50, 0.5, 0, TestName = "PEV E4 Halt 50km/h SoC: 0.5, level"),
+ //TestCase(80, 0.5, 0, TestName = "PEV E4 Halt 80km/h SoC: 0.5, level"), // max vehicle speed: 56
+ TestCase(30, 0.25, 0, TestName = "PEV E4 Halt 30km/h SoC: 0.25, level"),
+
+ TestCase(50, 0.5, 12, TestName = "PEV E4 Halt 50km/h SoC: 0.5, uphill 12"),
+
+ ]
+ public void B4PEVHalt(double vmax, double initialSoC, double slope)
+ {
+ var cycleData = string.Format(
+ @" 0, {0}, {1}, 0
+ 900, 0, {1}, 3", vmax, slope);
+ var cycle = SimpleDrivingCycles.CreateCycleData(cycleData);
+
+ var modFilename = $"SimpleBatteryElectric-B4_stop_{vmax}-{initialSoC}_{slope}";
+ const PowertrainPosition pos = PowertrainPosition.BatteryElectricE4;
+ var job = CreateEngineeringRun(
+ cycle, modFilename, initialSoC, pos, 2, 22.6, largeMotor: true);
+ var run = job.Runs.First().Run;
+ var modData = ((ModalDataContainer)((VehicleContainer)run.GetContainer()).ModData).Data;
+
+ run.Run();
+ Assert.IsTrue(run.FinishedWithoutErrors);
+
+ Assert.IsTrue(modData.Rows.Count > 0);
+
+ if (slope.IsSmallerOrEqual(0) && vmax > 30) {
+ ((ModalDataContainer)((VehicleContainer)run.GetContainer()).ModData).Data = modData;
+ var selected = ((VehicleContainer)run.GetContainer()).ModData.GetValues(r => new {
+ speed = r.Field<SI>(ModalResultField.v_act.GetName()),
+ brakePwr = r.Field<SI>(ModalResultField.P_brake_loss.GetName())
+ }).Where(x => x.speed.IsSmaller(7.KMPHtoMeterPerSecond()) && x.speed.IsGreater(0));
+ Assert.IsTrue(selected.All(x => x.brakePwr.IsGreater(0)));
+ }
+
+ var graphWriter = GetGraphWriter(new[] { ModalResultField.P_electricMotor_mech_B4 });
+ graphWriter.Write(modFilename + ".vmod");
+ }
+
[
TestCase("LongHaul", 2000, 0.8, 0, TestName = "PEV E4 DriveCycle LongHaul, SoC: 0.8 Payload: 2t P_auxEl: 0kW"),
TestCase("RegionalDelivery", 2000, 0.8, 0, TestName = "PEV E4 DriveCycle RegionalDelivery, SoC: 0.8 Payload: 2t P_auxEl: 0kW"),
@@ -314,6 +356,47 @@ namespace TUGraz.VectoCore.Tests.Integration.BatteryElectric
graphWriter.Write(modFilename + ".vmod");
}
+ [
+ TestCase(30, 0.5, 0, TestName = "PEV E3 Halt 30km/h SoC: 0.5, level"),
+ TestCase(50, 0.5, 0, TestName = "PEV E3 Halt 50km/h SoC: 0.5, level"),
+ //TestCase(80, 0.5, 0, TestName = "PEV E3 Halt 80km/h SoC: 0.5, level"), // max vehicle speed: 56 km/h
+ TestCase(30, 0.25, 0, TestName = "PEV E3 Halt 30km/h SoC: 0.25, level"),
+
+ TestCase(50, 0.5, 12, TestName = "PEV E3 Halt 50km/h SoC: 0.5, uphill 12"),
+
+ ]
+ public void B3PEVHalt(double vmax, double initialSoC, double slope)
+ {
+ var cycleData = string.Format(
+ @" 0, {0}, {1}, 0
+ 900, 0, {1}, 3", vmax, slope);
+ var cycle = SimpleDrivingCycles.CreateCycleData(cycleData);
+
+ var modFilename = $"SimpleBatteryElectric-B3_halt_{vmax}-{initialSoC}_{slope}";
+ const PowertrainPosition pos = PowertrainPosition.BatteryElectricE3;
+ var job = CreateEngineeringRun(
+ cycle, modFilename, initialSoC, pos, 2, 22.6, largeMotor: true);
+ var run = job.Runs.First().Run;
+ var modData = ((ModalDataContainer)((VehicleContainer)run.GetContainer()).ModData).Data;
+
+ run.Run();
+ Assert.IsTrue(run.FinishedWithoutErrors);
+
+ Assert.IsTrue(modData.Rows.Count > 0);
+
+ if (slope.IsSmallerOrEqual(0) && vmax > 30) {
+ ((ModalDataContainer)((VehicleContainer)run.GetContainer()).ModData).Data = modData;
+ var selected = ((VehicleContainer)run.GetContainer()).ModData.GetValues(r => new {
+ speed = r.Field<SI>(ModalResultField.v_act.GetName()),
+ brakePwr = r.Field<SI>(ModalResultField.P_brake_loss.GetName())
+ }).Where(x => x.speed.IsSmaller(7.KMPHtoMeterPerSecond()) && x.speed.IsGreater(0));
+ Assert.IsTrue(selected.All(x => x.brakePwr.IsGreater(0)));
+ }
+
+ var graphWriter = GetGraphWriter(new[] { ModalResultField.P_electricMotor_mech_B3 });
+ graphWriter.Write(modFilename + ".vmod");
+ }
+
[
TestCase("LongHaul", 2000, 0.8, 0, TestName = "PEV E3 DriveCycle LongHaul, SoC: 0.8 Payload: 2t P_auxEl: 0kW"),
TestCase("RegionalDelivery", 2000, 0.8, 0, TestName = "PEV E3 DriveCycle RegionalDelivery, SoC: 0.8 Payload: 2t P_auxEl: 0kW"),
diff --git a/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs b/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs
index f289608c9bdfa5cd0a9d2e7deccbc32692798f84..9b65b85b7f144e343c306dcf06cdbaa8c10599e7 100644
--- a/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs
@@ -376,7 +376,6 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
Assert.AreEqual(6, genericGearbox.Gears.Count);
Assert.AreEqual(genericGearbox.Gears.Count, specificGearbox.Gears.Count);
- AssertGearShiftParameters(relatedRun);
AssertGears(genericGearbox.Gears.Values.ToList());
AssertGears(specificGearbox.Gears.Values.ToList());
AssertGearsLossmap(
@@ -410,12 +409,7 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
}
}
- private void AssertGearShiftParameters(RelatedRun relatedRun)
- {
- Assert.AreEqual(relatedRun.VectoRunDataGenericBody.ShiftStrategy, relatedRun.VectoRunDataSpezificBody.ShiftStrategy);
- }
-
-
+
#endregion
#region Torque Converter Asserts
@@ -1272,7 +1266,6 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
public bool SavedInDeclarationMode => true;
public IVehicleDeclarationInputData Vehicle => PrimaryVehicle;
public string JobName { get; }
- public string ShiftStrategy => "";
public VectoSimulationJobType JobType => VectoSimulationJobType.ConventionalVehicle;
#endregion
diff --git a/VectoCore/VectoCoreTest/Integration/Declaration/NaturalGasVehicles.cs b/VectoCore/VectoCoreTest/Integration/Declaration/NaturalGasVehicles.cs
index 83f6dc0b74b0c029d96daadd99b499c06260b1d7..09c976b8f6216edaeda053c67befee98795be010 100644
--- a/VectoCore/VectoCoreTest/Integration/Declaration/NaturalGasVehicles.cs
+++ b/VectoCore/VectoCoreTest/Integration/Declaration/NaturalGasVehicles.cs
@@ -74,8 +74,8 @@ namespace TUGraz.VectoCore.Tests.Integration.Declaration
[
TestCase(Class5NG, 2, TankSystem.Liquefied, 253.8, 703.2, TestName = "Class5 LNG 2"),
TestCase(Class5NG, 2, TankSystem.Compressed, 259.7, 698.6 , TestName = "Class5 CNG 2"),
- TestCase(Class5NG, 6, TankSystem.Liquefied, 253.3, 701.64, TestName = "Class5 LNG 6"),
- TestCase(Class5NG, 6, TankSystem.Compressed, 259.1, 696.99, TestName = "Class5 CNG 6"),
+ TestCase(Class5NG, 6, TankSystem.Liquefied, 253.2, 701.43, TestName = "Class5 LNG 6"),
+ TestCase(Class5NG, 6, TankSystem.Compressed, 259.0, 696.78, TestName = "Class5 CNG 6"),
]
public void NaturalGasTankSystemTest(string filename, int runIdx, TankSystem tankSystem, double expectedFc, double expectedCo2)
{
diff --git a/VectoCore/VectoCoreTest/Integration/TorqueLimitsTest.cs b/VectoCore/VectoCoreTest/Integration/TorqueLimitsTest.cs
index 9449a675a886eafe6928c8b8c4157e62ca1b9da5..6cc856913e867c5980f3ac1b39b2538e7b3f6d6f 100644
--- a/VectoCore/VectoCoreTest/Integration/TorqueLimitsTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/TorqueLimitsTest.cs
@@ -263,12 +263,13 @@ namespace TUGraz.VectoCore.Tests.Integration
Assert.IsTrue(jobContainer.Runs.All(r => r.Success), string.Concat(jobContainer.Runs.Select(r => r.ExecException)));
var view = new DataView(sumData.Table, "", SummaryDataContainer.Fields.SORT, DataViewRowState.CurrentRows).ToTable();
Console.WriteLine(string.Join("; ", view.AsEnumerable().Select(x => x[string.Format(SummaryDataContainer.Fields.FCMAP_KM, "")].ToString().ToDouble())));
- Assert.AreEqual(201.34762, view.Rows[0][string.Format(SummaryDataContainer.Fields.FCMAP_KM, "")].ToString().ToDouble(), 1e-3);
+ //201.361576994368; 239.289343483313; 169.755876536437; 182.846813110234; 219.963573213321; 251.22381935842
+ Assert.AreEqual(201.36157, view.Rows[0][string.Format(SummaryDataContainer.Fields.FCMAP_KM, "")].ToString().ToDouble(), 1e-3);
Assert.AreEqual(239.28934, view.Rows[1][string.Format(SummaryDataContainer.Fields.FCMAP_KM, "")].ToString().ToDouble(), 1e-3);
- Assert.AreEqual(169.94310, view.Rows[2][string.Format(SummaryDataContainer.Fields.FCMAP_KM, "")].ToString().ToDouble(), 1e-3);
- Assert.AreEqual(182.88093, view.Rows[3][string.Format(SummaryDataContainer.Fields.FCMAP_KM, "")].ToString().ToDouble(), 1e-3);
- Assert.AreEqual(221.72701, view.Rows[4][string.Format(SummaryDataContainer.Fields.FCMAP_KM, "")].ToString().ToDouble(), 1e-3);
- Assert.AreEqual(251.83813, view.Rows[5][string.Format(SummaryDataContainer.Fields.FCMAP_KM, "")].ToString().ToDouble(), 1e-3);
+ Assert.AreEqual(169.75587, view.Rows[2][string.Format(SummaryDataContainer.Fields.FCMAP_KM, "")].ToString().ToDouble(), 1e-3);
+ Assert.AreEqual(182.84681, view.Rows[3][string.Format(SummaryDataContainer.Fields.FCMAP_KM, "")].ToString().ToDouble(), 1e-3);
+ Assert.AreEqual(219.96357, view.Rows[4][string.Format(SummaryDataContainer.Fields.FCMAP_KM, "")].ToString().ToDouble(), 1e-3);
+ Assert.AreEqual(251.22381, view.Rows[5][string.Format(SummaryDataContainer.Fields.FCMAP_KM, "")].ToString().ToDouble(), 1e-3);
}
[TestCase(EngineSpeedLimitJobATDecl)]
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/AuxTests.cs b/VectoCore/VectoCoreTest/Models/Simulation/AuxTests.cs
index 190a47b6deb99a84a88d9cf41fe91d35b8cc69c7..4c7eec9bc69935a663a82177b6277ea3c39b6c96 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/AuxTests.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/AuxTests.cs
@@ -108,6 +108,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
new ZeroMileageCounter(container);
new DummyDriverInfo(container);
var aux = new EngineAuxiliary(container);
+ new MockEngine(container);
var hdvClass = VehicleClass.Class5;
var mission = MissionType.LongHaul;
@@ -159,6 +160,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
var container = new VehicleContainer(ExecutionMode.Engineering, dataWriter);
//var port = new MockTnOutPort();
var aux = new EngineAuxiliary(container);
+ new MockEngine(container);
var constPower = 1200.SI<Watt>();
aux.AddConstant("CONSTANT", constPower);
@@ -194,6 +196,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
var cycle = new MockDrivingCycle(container, data);
var aux = new EngineAuxiliary(container);
+ new MockEngine(container);
aux.AddCycle("CYCLE");
container.ModalData.AddAuxiliary("CYCLE");
@@ -229,7 +232,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
var cycle = new MockDrivingCycle(container, data);
var aux = new EngineAuxiliary(container);
-
+ new MockEngine(container);
aux.AddCycle("CYCLE");
var constPower = 1200.SI<Watt>();
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/ClutchTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/ClutchTest.cs
index 3425be82fd5865c6476e814eda75b6c5742cfc0c..61ebd645060df5cc22713548d901acc0c11499aa 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/ClutchTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/ClutchTest.cs
@@ -196,7 +196,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
public PerSecond EngineN95hSpeed { get; set; }
public PerSecond EngineN80hSpeed { get; set; }
- public bool EngineOn => throw new System.NotImplementedException();
+ public bool EngineOn { get; set; }
protected override void DoWriteModalResults(Second time, Second simulationInterval, IModalDataContainer container)
{
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/ElectricMotorTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/ElectricMotorTest.cs
index fce37835bec5d61e96b89c4fb634ccaf569561df..f6da8e1e92b7e8f95d3adeffabf92461feb4650d 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/ElectricMotorTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/ElectricMotorTest.cs
@@ -36,13 +36,13 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory);
}
- [TestCase(100, 100, -1479.601019),
- TestCase(100, 30, -494.148831),
- TestCase(100, 300, -5033.132712),
- TestCase(600, 100, -7290.510011),
- TestCase(600, 300, -21431.717255),
- TestCase(800, -100, 7178.770573),
- TestCase(800, -300, 22444.155535)]
+ [TestCase(100, 100, -1484.401151),
+ TestCase(100, 30, -498.336701),
+ TestCase(100, 300, -5058.393920),
+ TestCase(600, 100, -7292.591952),
+ TestCase(600, 300, -21459.016866),
+ TestCase(800, -100, 7174.730264),
+ TestCase(800, -300, 22354.108093)]
public void ElectricMotorOnlyRequestTest(double speed, double torque, double expectedBatteryPower)
{
var container = new MockVehicleContainer();
@@ -83,13 +83,13 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
Assert.IsTrue(response.ElectricSystem.ConsumerPower.Value() < enginePower.Value());
}
- [TestCase(100, 100, -1557.958914),
- TestCase(100, 30, -514.409252),
- TestCase(100, 300, -5354.8590277),
- TestCase(600, 100, -7634.931063),
- TestCase(600, 300, -22551.5067289),
- TestCase(800, -100, 6899.830573),
- TestCase(800, -300, 21495.107228)]
+ [TestCase(100, 100, -1566.457317),
+ TestCase(100, 30, -519.553356),
+ TestCase(100, 300, -5395.304809),
+ TestCase(600, 100, -7653.267447),
+ TestCase(600, 300, -22631.653148),
+ TestCase(800, -100, 6785.258050),
+ TestCase(800, -300, 21273.378603)]
public void ElectricMotorOnlyRequestTestMechLoss(double speed, double torque, double expectedBatteryPower)
{
var container = new MockVehicleContainer();
@@ -130,12 +130,12 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
Assert.IsTrue(response.ElectricSystem.ConsumerPower.Value() < enginePower.Value());
}
- [TestCase(100, 100, -30, -494.148831),
- TestCase(100, 300, -150, -2265.054223),
- TestCase(600, 100, 100, 5368.366615),
- TestCase(600, 300, -50, -3926.835416),
- TestCase(800, -100, 200, 14945.984737),
- TestCase(800, -300, 200, 14945.984737),]
+ [TestCase(100, 100, -30, -498.33670),
+ TestCase(100, 300, -150, -2273.504629),
+ TestCase(600, 100, 100, 5367.264248),
+ TestCase(600, 300, -50, -3925.642046),
+ TestCase(800, -100, 200, 14907.629627),
+ TestCase(800, -300, 200, 14907.629627),]
public void ElectricMotorAssistingRequestTest(double speed, double torque, double electricTorque, double expectedBatteryPower)
{
var container = new MockVehicleContainer();
@@ -181,12 +181,12 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
Assert.IsTrue(response.ElectricSystem.ConsumerPower.Value() < response.ElectricMotor.ElectricMotorPowerMech.Value());
}
- [TestCase(100, 100, -30, -514.409252),
- TestCase(100, 300, -150, -2393.422644),
- TestCase(600, 100, 100, 5089.426615),
- TestCase(600, 300, -50, -4095.4354163),
- TestCase(800, -100, 200, 14414.8247370),
- TestCase(800, -300, 200, 14414.8247370),]
+ [TestCase(100, 100, -30, -519.553356),
+ TestCase(100, 300, -150, -2407.931677),
+ TestCase(600, 100, 100, 5075.160087),
+ TestCase(600, 300, -50, -4102.198874),
+ TestCase(800, -100, 200, 14165.993213),
+ TestCase(800, -300, 200, 14165.993213),]
public void ElectricMotorAssistingRequestTestMechLoss(double speed, double torque, double electricTorque, double expectedBatteryPower)
{
var container = new MockVehicleContainer();
@@ -287,12 +287,12 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
battery.CommitSimulationStep(absTime, dt, modData);
}
- [TestCase(0.5, 100, 100, -1479.601019, 2.674905),
- TestCase(0.5, 100, 300, -5033.132712, 31.224759),
- TestCase(0.5, 600, 100, -7290.510011, 65.884061),
- TestCase(0.5, 600, 300, -21431.717255, 590.431866),
- TestCase(0.5, 800, -100, 7178.770573, 61.667578),
- TestCase(0.5, 800, -300, 22444.155535, 581.889779)
+ [TestCase(0.5, 100, 100, -1484.401151, 2.69232),
+ TestCase(0.5, 100, 300, -5058.393920, 31.54095),
+ TestCase(0.5, 600, 100, -7292.591952, 65.92202),
+ TestCase(0.5, 600, 300, -21459.016866, 591.97964),
+ TestCase(0.5, 800, -100, 7174.730264, 61.59876),
+ TestCase(0.5, 800, -300, 22354.108093, 577.346990)
]
public void ElectricMotorOnlyWithBatteryRequestTest(double initialSoc, double speed, double torque, double expectedBatteryPower, double expectedBatteryLoss)
{
@@ -401,7 +401,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
var i = 0;
var t1 = 21;
- var t2 = 13;
+ var t2 = 14;
var t3 = 20;
try {
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponentData/ElectricMotorEfficienyMapTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/ElectricMotorEfficienyMapTest.cs
index 02fb6a03f74f114462d8370efd1ade46096dc254..298d539c57724dd8c80a8a5b210fd7f5a4ef1224 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponentData/ElectricMotorEfficienyMapTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponentData/ElectricMotorEfficienyMapTest.cs
@@ -1,9 +1,14 @@
-using System.IO;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
using System.Linq;
using NUnit.Framework;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.InputData.FileIO.JSON;
using TUGraz.VectoCore.InputData.Reader.ComponentData;
+using TUGraz.VectoCore.Models.SimulationComponent.Data.ElectricMotor;
+using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData {
[TestFixture]
@@ -18,10 +23,10 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData {
}
- [TestCase(-10000, 700, -120.6737), // EM drive has negative torque and thus negative electric power
- TestCase(-20000, 1200, -141.5367),
- TestCase(10000, 700, 153.5121),
- TestCase(20000, 1200, 177.4109)]
+ [TestCase(-10000, 700, -118.916545), // EM drive has negative torque and thus negative electric power
+ TestCase(-20000, 1200, -141.451404),
+ TestCase(10000, 700, 155.046977),
+ TestCase(20000, 1200, 177.530544)]
public void TestLookupTorqueForBatPower(double batPwr, double emSpeed, double expectedTq)
{
var inputProvider =
@@ -66,5 +71,43 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData {
Assert.IsNull(tq);
}
+
+ [TestCase(@"TestData\Components\ElectricMotor\vem_P_inverter_DC_90_fine.vemo", 0.8999, 0.9001),
+ TestCase(@"TestData\Components\ElectricMotor\vem_P_inverter_DC_90_coarse.vemo", 0.8999, 0.9001),
+ TestCase(@"TestData\Components\ElectricMotor\vem_P_inverter_DC_std.vemo", 0, 1)]
+ public void TestInterpolationMethod_PowerMap(string filename, double etaMin, double etaMax)
+ {
+ EfficiencyMap emMap;
+ using (var fs = File.OpenRead(filename)) {
+ emMap = ElectricMotorMapReader.Create(fs, 1);
+ }
+
+ var efficiencies = new List<double>();
+ for (var n = 10.RPMtoRad(); n < 4000.RPMtoRad(); n += 10.RPMtoRad()) {
+ for (var tq = -2800.SI<NewtonMeter>(); tq <= 2800.SI<NewtonMeter>(); tq += 100.SI<NewtonMeter>()) {
+ if (tq.IsEqual(0)) {
+ continue;
+ }
+ try {
+ var pwr = emMap.LookupElectricPower(n, tq);
+ if (pwr.ElectricalPower == null) {
+ continue;
+ }
+ Console.WriteLine($"{pwr.Speed.AsRPM}, {pwr.Torque.Value()}, {pwr.ElectricalPower.Value()}, {pwr.Extrapolated}, {(n * tq).Value()}");
+ var efficiency = tq < 0
+ ? pwr.Speed * pwr.Torque / pwr.ElectricalPower
+ : pwr.ElectricalPower / (pwr.Speed * pwr.Torque);
+ // set efficiencies close to 0 to exactly 0 because later assertion uses sharp bounds without tolerance
+ efficiencies.Add(efficiency.IsEqual(0) ? 0.0 : efficiency);
+ } catch (Exception e) {
+ Console.WriteLine(e.Message);
+ }
+ }
+ }
+
+ Assert.IsTrue(efficiencies.All(x => x.IsBetween(etaMin, etaMax)), $"{efficiencies.Min()} - {efficiencies.Max()}");
+ }
+
+
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/Reports/ModDataPostprocessingTest.cs b/VectoCore/VectoCoreTest/Reports/ModDataPostprocessingTest.cs
index c0331eab1a7aba44d01841baf940925d46c274eb..8bbb6b9db598474954cd4aa2b882facc9e01ed43 100644
--- a/VectoCore/VectoCoreTest/Reports/ModDataPostprocessingTest.cs
+++ b/VectoCore/VectoCoreTest/Reports/ModDataPostprocessingTest.cs
@@ -1200,6 +1200,7 @@ namespace TUGraz.VectoCore.Tests.Reports
modData[ModalResultField.P_EM_electricMotor_el_, emPos] = 120.SI<Watt>() * emEff;
modData[ModalResultField.P_EM_mech_, emPos] = 120.SI<Watt>();
+ modData[ModalResultField.EM_Off_, emPos] = 0.SI<Scalar>();
// WHR
modData[ModalResultField.P_WHR_el_corr] = 0.SI<Watt>();
@@ -1237,6 +1238,7 @@ namespace TUGraz.VectoCore.Tests.Reports
modData[ModalResultField.P_EM_electricMotor_el_, emPos] = 120.SI<Watt>() * emEff;
modData[ModalResultField.P_EM_mech_, emPos] = 120.SI<Watt>();
+ modData[ModalResultField.EM_Off_, emPos] = 0.SI<Scalar>();
// WHR
modData[ModalResultField.P_WHR_el_corr] = 0.SI<Watt>();
@@ -1279,6 +1281,7 @@ namespace TUGraz.VectoCore.Tests.Reports
modData[ModalResultField.P_EM_electricMotor_el_, emPos] = 120.SI<Watt>() * emEff;
modData[ModalResultField.P_EM_mech_, emPos] = 120.SI<Watt>();
+ modData[ModalResultField.EM_Off_, emPos] = 0.SI<Scalar>();
// WHR
modData[ModalResultField.P_WHR_el_corr] = 0.SI<Watt>();
@@ -1380,7 +1383,7 @@ namespace TUGraz.VectoCore.Tests.Reports
modData[ModalResultField.P_EM_electricMotor_el_, emPos] = 120.SI<Watt>() * emEff;
modData[ModalResultField.P_EM_mech_, emPos] = 120.SI<Watt>();
-
+ modData[ModalResultField.EM_Off_, emPos] = 0.SI<Scalar>();
// WHR
modData[ModalResultField.P_WHR_el_corr] = 0.SI<Watt>();
@@ -1418,6 +1421,7 @@ namespace TUGraz.VectoCore.Tests.Reports
modData[ModalResultField.P_EM_electricMotor_el_, emPos] = 120.SI<Watt>() * emEff;
modData[ModalResultField.P_EM_mech_, emPos] = 120.SI<Watt>();
+ modData[ModalResultField.EM_Off_, emPos] = 0.SI<Scalar>();
// WHR
modData[ModalResultField.P_WHR_el_corr] = 0.SI<Watt>();
@@ -1460,6 +1464,7 @@ namespace TUGraz.VectoCore.Tests.Reports
modData[ModalResultField.P_EM_electricMotor_el_, emPos] = 120.SI<Watt>() * emEff;
modData[ModalResultField.P_EM_mech_, emPos] = 120.SI<Watt>();
+ modData[ModalResultField.EM_Off_, emPos] = 0.SI<Scalar>();
// WHR
modData[ModalResultField.P_WHR_el_corr] = 0.SI<Watt>();
@@ -2227,6 +2232,7 @@ namespace TUGraz.VectoCore.Tests.Reports
modData[ModalResultField.P_EM_electricMotor_el_, emPos] = 120.SI<Watt>() * emEff;
modData[ModalResultField.P_EM_mech_, emPos] = 120.SI<Watt>();
+ modData[ModalResultField.EM_Off_, emPos] = 0.SI<Scalar>();
// WHR
@@ -2270,6 +2276,7 @@ namespace TUGraz.VectoCore.Tests.Reports
modData[ModalResultField.P_EM_electricMotor_el_, emPos] = 120.SI<Watt>() * emEff;
modData[ModalResultField.P_EM_mech_, emPos] = 120.SI<Watt>();
+ modData[ModalResultField.EM_Off_, emPos] = 0.SI<Scalar>();
// WHR
modData[ModalResultField.P_WHR_el_corr] = P_WHR;
@@ -2501,6 +2508,7 @@ namespace TUGraz.VectoCore.Tests.Reports
modData[ModalResultField.P_EM_electricMotor_el_, emPos] = 120.SI<Watt>() * emEff;
modData[ModalResultField.P_EM_mech_, emPos] = 120.SI<Watt>();
+ modData[ModalResultField.EM_Off_, emPos] = 0.SI<Scalar>();
modData[ModalResultField.P_reess_int] = P_bat;
modData[ModalResultField.P_reess_terminal] = P_bat * (P_bat < 0 ? batEff : 1/batEff);
@@ -2551,6 +2559,7 @@ namespace TUGraz.VectoCore.Tests.Reports
modData[ModalResultField.P_EM_electricMotor_el_, emPos] = -120.SI<Watt>() / emEff;
modData[ModalResultField.P_EM_mech_, emPos] = -120.SI<Watt>();
+ modData[ModalResultField.EM_Off_, emPos] = 0.SI<Scalar>();
modData[ModalResultField.P_reess_int] = P_bat;
modData[ModalResultField.P_reess_terminal] = P_bat * (P_bat < 0 ? batEff : 1 / batEff);
diff --git a/VectoCore/VectoCoreTest/TestData/Components/ElectricMotor/vem_P_inverter_DC_90_coarse.vemo b/VectoCore/VectoCoreTest/TestData/Components/ElectricMotor/vem_P_inverter_DC_90_coarse.vemo
new file mode 100644
index 0000000000000000000000000000000000000000..b9a07a399d42cf058b8bbf59ce87128250c9ef0d
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Components/ElectricMotor/vem_P_inverter_DC_90_coarse.vemo
@@ -0,0 +1,167 @@
+n [rpm] , T [Nm] , P_el [kW]
+0 , -2800 , 0.000
+0 , -2400 , 0.000
+0 , -2000 , 0.000
+0 , -1600 , 0.000
+0 , -1200 , 0.000
+0 , -800 , 0.000
+0 , -400 , 0.000
+0 , 0 , 0.000
+0 , 400 , 0.000
+0 , 800 , 0.000
+0 , 1200 , 0.000
+0 , 1600 , 0.000
+0 , 2000 , 0.000
+0 , 2400 , 0.000
+0 , 2800 , 0.000
+400 , -2800 , -105.558
+400 , -2400 , -90.478
+400 , -2000 , -75.398
+400 , -1600 , -60.319
+400 , -1200 , -45.239
+400 , -800 , -30.159
+400 , -400 , -15.080
+400 , 0 , 0.000
+400 , 400 , 18.617
+400 , 800 , 37.234
+400 , 1200 , 55.851
+400 , 1600 , 74.467
+400 , 2000 , 93.084
+400 , 2400 , 111.701
+400 , 2800 , 130.318
+800 , -2800 , -211.115
+800 , -2400 , -180.956
+800 , -2000 , -150.796
+800 , -1600 , -120.637
+800 , -1200 , -90.478
+800 , -800 , -60.319
+800 , -400 , -30.159
+800 , 0 , 0.000
+800 , 400 , 37.234
+800 , 800 , 74.467
+800 , 1200 , 111.701
+800 , 1600 , 148.935
+800 , 2000 , 186.168
+800 , 2400 , 223.402
+800 , 2800 , 260.636
+1200 , -2800 , -316.673
+1200 , -2400 , -271.434
+1200 , -2000 , -226.195
+1200 , -1600 , -180.956
+1200 , -1200 , -135.717
+1200 , -800 , -90.478
+1200 , -400 , -45.239
+1200 , 0 , 0.000
+1200 , 400 , 55.851
+1200 , 800 , 111.701
+1200 , 1200 , 167.552
+1200 , 1600 , 223.402
+1200 , 2000 , 279.253
+1200 , 2400 , 335.103
+1200 , 2800 , 390.954
+1600 , -2800 , -422.230
+1600 , -2400 , -361.911
+1600 , -2000 , -301.593
+1600 , -1600 , -241.274
+1600 , -1200 , -180.956
+1600 , -800 , -120.637
+1600 , -400 , -60.319
+1600 , 0 , 0.000
+1600 , 400 , 74.467
+1600 , 800 , 148.935
+1600 , 1200 , 223.402
+1600 , 1600 , 297.870
+1600 , 2000 , 372.337
+1600 , 2400 , 446.804
+1600 , 2800 , 521.272
+2000 , -2800 , -527.788
+2000 , -2400 , -452.389
+2000 , -2000 , -376.991
+2000 , -1600 , -301.593
+2000 , -1200 , -226.195
+2000 , -800 , -150.796
+2000 , -400 , -75.398
+2000 , 0 , 0.000
+2000 , 400 , 93.084
+2000 , 800 , 186.168
+2000 , 1200 , 279.253
+2000 , 1600 , 372.337
+2000 , 2000 , 465.421
+2000 , 2400 , 558.505
+2000 , 2800 , 651.590
+2400 , -2800 , -633.345
+2400 , -2400 , -542.867
+2400 , -2000 , -452.389
+2400 , -1600 , -361.911
+2400 , -1200 , -271.434
+2400 , -800 , -180.956
+2400 , -400 , -90.478
+2400 , 0 , 0.000
+2400 , 400 , 111.701
+2400 , 800 , 223.402
+2400 , 1200 , 335.103
+2400 , 1600 , 446.804
+2400 , 2000 , 558.505
+2400 , 2400 , 670.206
+2400 , 2800 , 781.908
+2800 , -2800 , -738.903
+2800 , -2400 , -633.345
+2800 , -2000 , -527.788
+2800 , -1600 , -422.230
+2800 , -1200 , -316.673
+2800 , -800 , -211.115
+2800 , -400 , -105.558
+2800 , 0 , 0.000
+2800 , 400 , 130.318
+2800 , 800 , 260.636
+2800 , 1200 , 390.954
+2800 , 1600 , 521.272
+2800 , 2000 , 651.590
+2800 , 2400 , 781.908
+2800 , 2800 , 912.225
+3200 , -2800 , -844.460
+3200 , -2400 , -723.823
+3200 , -2000 , -603.186
+3200 , -1600 , -482.549
+3200 , -1200 , -361.911
+3200 , -800 , -241.274
+3200 , -400 , -120.637
+3200 , 0 , 0.000
+3200 , 400 , 148.935
+3200 , 800 , 297.870
+3200 , 1200 , 446.804
+3200 , 1600 , 595.739
+3200 , 2000 , 744.674
+3200 , 2400 , 893.609
+3200 , 2800 , 1042.543
+3600 , -2800 , -950.018
+3600 , -2400 , -814.301
+3600 , -2000 , -678.584
+3600 , -1600 , -542.867
+3600 , -1200 , -407.150
+3600 , -800 , -271.434
+3600 , -400 , -135.717
+3600 , 0 , 0.000
+3600 , 400 , 167.552
+3600 , 800 , 335.103
+3600 , 1200 , 502.655
+3600 , 1600 , 670.206
+3600 , 2000 , 837.758
+3600 , 2400 , 1005.310
+3600 , 2800 , 1172.861
+4000 , -2800 , -1055.575
+4000 , -2400 , -904.779
+4000 , -2000 , -753.982
+4000 , -1600 , -603.186
+4000 , -1200 , -452.389
+4000 , -800 , -301.593
+4000 , -400 , -150.796
+4000 , 0 , 0.000
+4000 , 400 , 186.168
+4000 , 800 , 372.337
+4000 , 1200 , 558.505
+4000 , 1600 , 744.674
+4000 , 2000 , 930.842
+4000 , 2400 , 1117.011
+4000 , 2800 , 1303.179
+
diff --git a/VectoCore/VectoCoreTest/TestData/Components/ElectricMotor/vem_P_inverter_DC_90_fine.vemo b/VectoCore/VectoCoreTest/TestData/Components/ElectricMotor/vem_P_inverter_DC_90_fine.vemo
new file mode 100644
index 0000000000000000000000000000000000000000..b9a07a399d42cf058b8bbf59ce87128250c9ef0d
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Components/ElectricMotor/vem_P_inverter_DC_90_fine.vemo
@@ -0,0 +1,167 @@
+n [rpm] , T [Nm] , P_el [kW]
+0 , -2800 , 0.000
+0 , -2400 , 0.000
+0 , -2000 , 0.000
+0 , -1600 , 0.000
+0 , -1200 , 0.000
+0 , -800 , 0.000
+0 , -400 , 0.000
+0 , 0 , 0.000
+0 , 400 , 0.000
+0 , 800 , 0.000
+0 , 1200 , 0.000
+0 , 1600 , 0.000
+0 , 2000 , 0.000
+0 , 2400 , 0.000
+0 , 2800 , 0.000
+400 , -2800 , -105.558
+400 , -2400 , -90.478
+400 , -2000 , -75.398
+400 , -1600 , -60.319
+400 , -1200 , -45.239
+400 , -800 , -30.159
+400 , -400 , -15.080
+400 , 0 , 0.000
+400 , 400 , 18.617
+400 , 800 , 37.234
+400 , 1200 , 55.851
+400 , 1600 , 74.467
+400 , 2000 , 93.084
+400 , 2400 , 111.701
+400 , 2800 , 130.318
+800 , -2800 , -211.115
+800 , -2400 , -180.956
+800 , -2000 , -150.796
+800 , -1600 , -120.637
+800 , -1200 , -90.478
+800 , -800 , -60.319
+800 , -400 , -30.159
+800 , 0 , 0.000
+800 , 400 , 37.234
+800 , 800 , 74.467
+800 , 1200 , 111.701
+800 , 1600 , 148.935
+800 , 2000 , 186.168
+800 , 2400 , 223.402
+800 , 2800 , 260.636
+1200 , -2800 , -316.673
+1200 , -2400 , -271.434
+1200 , -2000 , -226.195
+1200 , -1600 , -180.956
+1200 , -1200 , -135.717
+1200 , -800 , -90.478
+1200 , -400 , -45.239
+1200 , 0 , 0.000
+1200 , 400 , 55.851
+1200 , 800 , 111.701
+1200 , 1200 , 167.552
+1200 , 1600 , 223.402
+1200 , 2000 , 279.253
+1200 , 2400 , 335.103
+1200 , 2800 , 390.954
+1600 , -2800 , -422.230
+1600 , -2400 , -361.911
+1600 , -2000 , -301.593
+1600 , -1600 , -241.274
+1600 , -1200 , -180.956
+1600 , -800 , -120.637
+1600 , -400 , -60.319
+1600 , 0 , 0.000
+1600 , 400 , 74.467
+1600 , 800 , 148.935
+1600 , 1200 , 223.402
+1600 , 1600 , 297.870
+1600 , 2000 , 372.337
+1600 , 2400 , 446.804
+1600 , 2800 , 521.272
+2000 , -2800 , -527.788
+2000 , -2400 , -452.389
+2000 , -2000 , -376.991
+2000 , -1600 , -301.593
+2000 , -1200 , -226.195
+2000 , -800 , -150.796
+2000 , -400 , -75.398
+2000 , 0 , 0.000
+2000 , 400 , 93.084
+2000 , 800 , 186.168
+2000 , 1200 , 279.253
+2000 , 1600 , 372.337
+2000 , 2000 , 465.421
+2000 , 2400 , 558.505
+2000 , 2800 , 651.590
+2400 , -2800 , -633.345
+2400 , -2400 , -542.867
+2400 , -2000 , -452.389
+2400 , -1600 , -361.911
+2400 , -1200 , -271.434
+2400 , -800 , -180.956
+2400 , -400 , -90.478
+2400 , 0 , 0.000
+2400 , 400 , 111.701
+2400 , 800 , 223.402
+2400 , 1200 , 335.103
+2400 , 1600 , 446.804
+2400 , 2000 , 558.505
+2400 , 2400 , 670.206
+2400 , 2800 , 781.908
+2800 , -2800 , -738.903
+2800 , -2400 , -633.345
+2800 , -2000 , -527.788
+2800 , -1600 , -422.230
+2800 , -1200 , -316.673
+2800 , -800 , -211.115
+2800 , -400 , -105.558
+2800 , 0 , 0.000
+2800 , 400 , 130.318
+2800 , 800 , 260.636
+2800 , 1200 , 390.954
+2800 , 1600 , 521.272
+2800 , 2000 , 651.590
+2800 , 2400 , 781.908
+2800 , 2800 , 912.225
+3200 , -2800 , -844.460
+3200 , -2400 , -723.823
+3200 , -2000 , -603.186
+3200 , -1600 , -482.549
+3200 , -1200 , -361.911
+3200 , -800 , -241.274
+3200 , -400 , -120.637
+3200 , 0 , 0.000
+3200 , 400 , 148.935
+3200 , 800 , 297.870
+3200 , 1200 , 446.804
+3200 , 1600 , 595.739
+3200 , 2000 , 744.674
+3200 , 2400 , 893.609
+3200 , 2800 , 1042.543
+3600 , -2800 , -950.018
+3600 , -2400 , -814.301
+3600 , -2000 , -678.584
+3600 , -1600 , -542.867
+3600 , -1200 , -407.150
+3600 , -800 , -271.434
+3600 , -400 , -135.717
+3600 , 0 , 0.000
+3600 , 400 , 167.552
+3600 , 800 , 335.103
+3600 , 1200 , 502.655
+3600 , 1600 , 670.206
+3600 , 2000 , 837.758
+3600 , 2400 , 1005.310
+3600 , 2800 , 1172.861
+4000 , -2800 , -1055.575
+4000 , -2400 , -904.779
+4000 , -2000 , -753.982
+4000 , -1600 , -603.186
+4000 , -1200 , -452.389
+4000 , -800 , -301.593
+4000 , -400 , -150.796
+4000 , 0 , 0.000
+4000 , 400 , 186.168
+4000 , 800 , 372.337
+4000 , 1200 , 558.505
+4000 , 1600 , 744.674
+4000 , 2000 , 930.842
+4000 , 2400 , 1117.011
+4000 , 2800 , 1303.179
+
diff --git a/VectoCore/VectoCoreTest/TestData/Components/ElectricMotor/vem_P_inverter_DC_std.vemo b/VectoCore/VectoCoreTest/TestData/Components/ElectricMotor/vem_P_inverter_DC_std.vemo
new file mode 100644
index 0000000000000000000000000000000000000000..f84a72621a2804648ebee9052b332a2f033a302f
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Components/ElectricMotor/vem_P_inverter_DC_std.vemo
@@ -0,0 +1,925 @@
+n [rpm] , T [Nm] , P_el [kW]
+0, -1050, 0.000
+0, -998, 0.000
+0, -945, 0.000
+0, -893, 0.000
+0, -840, 0.000
+0, -788, 0.000
+0, -735, 0.000
+0, -683, 0.000
+0, -630, -0.069
+0, -578, -0.171
+0, -525, -0.253
+0, -473, -0.316
+0, -420, -0.358
+0, -367, -0.381
+0, -315, -0.383
+0, -262, -0.366
+0, -210, -0.328
+0, -157, -0.271
+0, -105, -0.194
+0, -52, -0.097
+0, -11, -0.005
+0, 11, 0.082
+0, 52, 0.331
+0, 105, 0.662
+0, 157, 1.015
+0, 210, 1.389
+0, 262, 1.785
+0, 315, 2.202
+0, 367, 2.641
+0, 420, 3.102
+0, 473, 3.584
+0, 525, 4.088
+0, 578, 4.614
+0, 630, 5.161
+0, 683, 5.730
+0, 735, 6.320
+0, 788, 6.932
+0, 840, 7.566
+0, 893, 8.221
+0, 945, 8.898
+0, 998, 9.597
+0, 1050, 10.317
+25, -1050, 0.000
+25, -998, 0.000
+25, -945, 0.000
+25, -893, 0.000
+25, -840, 0.000
+25, -788, 0.000
+25, -735, -0.050
+25, -683, -0.124
+25, -630, -0.186
+25, -578, -0.236
+25, -525, -0.274
+25, -473, -0.300
+25, -420, -0.314
+25, -367, -0.315
+25, -315, -0.305
+25, -262, -0.282
+25, -210, -0.247
+25, -157, -0.200
+25, -105, -0.141
+25, -52, -0.070
+25, -11, -0.004
+25, 11, 0.054
+25, 52, 0.216
+25, 105, 0.430
+25, 157, 0.658
+25, 210, 0.899
+25, 262, 1.153
+25, 315, 1.420
+25, 367, 1.700
+25, 420, 1.993
+25, 473, 2.299
+25, 525, 2.619
+25, 578, 2.952
+25, 630, 3.298
+25, 683, 3.657
+25, 735, 4.029
+25, 788, 4.414
+25, 840, 4.813
+25, 893, 5.224
+25, 945, 5.649
+25, 998, 6.087
+25, 1050, 6.538
+255, -1050, -23.221
+255, -998, -22.176
+255, -945, -21.119
+255, -893, -20.048
+255, -840, -18.964
+255, -788, -17.867
+255, -735, -16.757
+255, -683, -15.634
+255, -630, -14.498
+255, -578, -13.349
+255, -525, -12.187
+255, -473, -11.012
+255, -420, -9.824
+255, -367, -8.622
+255, -315, -7.408
+255, -262, -6.181
+255, -210, -4.941
+255, -157, -3.687
+255, -105, -2.421
+255, -52, -1.141
+255, -11, -0.108
+255, 11, 0.466
+255, 52, 1.678
+255, 105, 3.207
+255, 157, 4.749
+255, 210, 6.306
+255, 262, 7.877
+255, 315, 9.462
+255, 367, 11.061
+255, 420, 12.674
+255, 473, 14.302
+255, 525, 15.943
+255, 578, 17.599
+255, 630, 19.269
+255, 683, 20.953
+255, 735, 22.651
+255, 788, 24.363
+255, 840, 26.090
+255, 893, 27.830
+255, 945, 29.585
+255, 998, 31.354
+255, 1050, 33.137
+509, -1050, -49.393
+509, -998, -47.054
+509, -945, -44.700
+509, -893, -42.329
+509, -840, -39.944
+509, -788, -37.542
+509, -735, -35.125
+509, -683, -32.693
+509, -630, -30.245
+509, -578, -27.781
+509, -525, -25.302
+509, -473, -22.807
+509, -420, -20.297
+509, -367, -17.771
+509, -315, -15.229
+509, -262, -12.672
+509, -210, -10.099
+509, -157, -7.510
+509, -105, -4.906
+509, -52, -2.287
+509, -11, -0.180
+509, 11, 0.971
+509, 52, 3.352
+509, 105, 6.343
+509, 157, 9.351
+509, 210, 12.375
+509, 262, 15.417
+509, 315, 18.476
+509, 367, 21.551
+509, 420, 24.643
+509, 473, 27.753
+509, 525, 30.879
+509, 578, 34.022
+509, 630, 37.182
+509, 683, 40.359
+509, 735, 43.553
+509, 788, 46.764
+509, 840, 49.992
+509, 893, 53.236
+509, 945, 56.498
+509, 998, 59.776
+509, 1050, 63.072
+764, -1050, -75.177
+764, -998, -71.575
+764, -945, -67.954
+764, -893, -64.312
+764, -840, -60.651
+764, -788, -56.971
+764, -735, -53.270
+764, -683, -49.550
+764, -630, -45.810
+764, -578, -42.050
+764, -525, -38.271
+764, -473, -34.471
+764, -420, -30.652
+764, -367, -26.814
+764, -315, -22.955
+764, -262, -19.077
+764, -210, -15.179
+764, -157, -11.261
+764, -105, -7.323
+764, -52, -3.366
+764, -11, -0.186
+764, 11, 1.548
+764, 52, 5.098
+764, 105, 9.554
+764, 157, 14.031
+764, 210, 18.530
+764, 262, 23.050
+764, 315, 27.592
+764, 367, 32.155
+764, 420, 36.740
+764, 473, 41.346
+764, 525, 45.974
+764, 578, 50.623
+764, 630, 55.293
+764, 683, 59.985
+764, 735, 64.698
+764, 788, 69.433
+764, 840, 74.189
+764, 893, 78.966
+764, 945, 83.766
+764, 998, 88.586
+764, 1050, 93.428
+1019, -1050, -100.553
+1019, -998, -95.720
+1019, -945, -90.862
+1019, -893, -85.978
+1019, -840, -81.068
+1019, -788, -76.133
+1019, -735, -71.172
+1019, -683, -66.186
+1019, -630, -61.174
+1019, -578, -56.137
+1019, -525, -51.074
+1019, -473, -45.985
+1019, -420, -40.872
+1019, -367, -35.732
+1019, -315, -30.567
+1019, -262, -25.377
+1019, -210, -20.161
+1019, -157, -14.919
+1019, -105, -9.652
+1019, -52, -4.359
+1019, -11, -0.107
+1019, 11, 2.218
+1019, 52, 6.937
+1019, 105, 12.860
+1019, 157, 18.812
+1019, 210, 24.791
+1019, 262, 30.798
+1019, 315, 36.833
+1019, 367, 42.895
+1019, 420, 48.985
+1019, 473, 55.103
+1019, 525, 61.248
+1019, 578, 67.421
+1019, 630, 73.622
+1019, 683, 79.850
+1019, 735, 86.107
+1019, 788, 92.391
+1019, 840, 98.702
+1019, 893, 105.042
+1019, 945, 111.409
+1019, 998, 117.804
+1019, 1050, 124.226
+1273, -1050, -125.503
+1273, -998, -119.470
+1273, -945, -113.404
+1273, -893, -107.305
+1273, -840, -101.174
+1273, -788, -95.009
+1273, -735, -88.812
+1273, -683, -82.581
+1273, -630, -76.318
+1273, -578, -70.021
+1273, -525, -63.692
+1273, -473, -57.330
+1273, -420, -50.935
+1273, -367, -44.507
+1273, -315, -38.046
+1273, -262, -31.552
+1273, -210, -25.025
+1273, -157, -18.466
+1273, -105, -11.873
+1273, -52, -5.247
+1273, -11, 0.000
+1273, 11, 3.000
+1273, 52, 8.890
+1273, 105, 16.284
+1273, 157, 23.714
+1273, 210, 31.179
+1273, 262, 38.680
+1273, 315, 46.217
+1273, 367, 53.790
+1273, 420, 61.399
+1273, 473, 69.043
+1273, 525, 76.723
+1273, 578, 84.439
+1273, 630, 92.190
+1273, 683, 99.977
+1273, 735, 107.800
+1273, 788, 115.659
+1273, 840, 123.553
+1273, 893, 131.483
+1273, 945, 139.449
+1273, 998, 147.450
+1273, 1050, 155.488
+1528, -1050, -150.006
+1528, -998, -142.805
+1528, -945, -135.561
+1528, -893, -128.276
+1528, -840, -120.949
+1528, -788, -113.580
+1528, -735, -106.169
+1528, -683, -98.716
+1528, -630, -91.222
+1528, -578, -83.685
+1528, -525, -76.106
+1528, -473, -68.486
+1528, -420, -60.823
+1528, -367, -53.119
+1528, -315, -45.372
+1528, -262, -37.584
+1528, -210, -29.753
+1528, -157, -21.881
+1528, -105, -13.967
+1528, -52, -6.011
+1528, -11, 0.000
+1528, 11, 3.917
+1528, 52, 10.978
+1528, 105, 19.845
+1528, 157, 28.757
+1528, 210, 37.715
+1528, 262, 46.719
+1528, 315, 55.768
+1528, 367, 64.863
+1528, 420, 74.003
+1528, 473, 83.188
+1528, 525, 92.420
+1528, 578, 101.696
+1528, 630, 111.018
+1528, 683, 120.386
+1528, 735, 129.799
+1528, 788, 139.258
+1528, 840, 148.762
+1528, 893, 158.311
+1528, 945, 167.906
+1528, 998, 177.547
+1528, 1050, 187.233
+1783, -1050, -174.044
+1783, -998, -165.705
+1783, -945, -157.315
+1783, -893, -148.871
+1783, -840, -140.375
+1783, -788, -131.827
+1783, -735, -123.226
+1783, -683, -114.572
+1783, -630, -105.866
+1783, -578, -97.108
+1783, -525, -88.296
+1783, -473, -79.433
+1783, -420, -70.516
+1783, -367, -61.548
+1783, -315, -52.526
+1783, -262, -43.452
+1783, -210, -34.326
+1783, -157, -25.147
+1783, -105, -15.915
+1783, -52, -6.631
+1783, -11, 0.000
+1783, 11, 4.988
+1783, 52, 13.222
+1783, 105, 23.564
+1783, 157, 33.964
+1783, 210, 44.421
+1783, 262, 54.935
+1783, 315, 65.505
+1783, 367, 76.133
+1783, 420, 86.818
+1783, 473, 97.560
+1783, 525, 108.359
+1783, 578, 119.215
+1783, 630, 130.128
+1783, 683, 141.098
+1783, 735, 152.125
+1783, 788, 163.209
+1783, 840, 174.350
+1783, 893, 185.548
+1783, 945, 196.803
+1783, 998, 208.115
+1783, 1050, 219.484
+2037, -1050, -197.596
+2037, -998, -188.153
+2037, -945, -178.644
+2037, -893, -169.071
+2037, -840, -159.433
+2037, -788, -149.730
+2037, -735, -139.962
+2037, -683, -130.130
+2037, -630, -120.233
+2037, -578, -110.271
+2037, -525, -100.244
+2037, -473, -90.152
+2037, -420, -79.996
+2037, -367, -69.775
+2037, -315, -59.489
+2037, -262, -49.138
+2037, -210, -38.723
+2037, -157, -28.243
+2037, -105, -17.698
+2037, -52, -7.088
+2037, -11, 0.000
+2037, 11, 6.237
+2037, 52, 15.643
+2037, 105, 27.464
+2037, 157, 39.355
+2037, 210, 51.316
+2037, 262, 63.348
+2037, 315, 75.450
+2037, 367, 87.623
+2037, 420, 99.865
+2037, 473, 112.179
+2037, 525, 124.562
+2037, 578, 137.015
+2037, 630, 149.539
+2037, 683, 162.133
+2037, 735, 174.798
+2037, 788, 187.533
+2037, 840, 200.338
+2037, 893, 213.213
+2037, 945, 226.159
+2037, 998, 239.175
+2037, 1050, 252.261
+2292, -1050, -220.645
+2292, -998, -210.127
+2292, -945, -199.531
+2292, -893, -188.856
+2292, -840, -178.102
+2292, -788, -167.270
+2292, -735, -156.359
+2292, -683, -145.369
+2292, -630, -134.301
+2292, -578, -123.154
+2292, -525, -111.929
+2292, -473, -100.625
+2292, -420, -89.242
+2292, -367, -77.781
+2292, -315, -66.241
+2292, -262, -54.622
+2292, -210, -42.925
+2292, -157, -31.149
+2292, -105, -19.295
+2292, -52, -7.362
+2292, -11, 0.000
+2292, 11, 7.682
+2292, 52, 18.262
+2292, 105, 31.564
+2292, 157, 44.951
+2292, 210, 58.423
+2292, 262, 71.981
+2292, 315, 85.624
+2292, 367, 99.352
+2292, 420, 113.166
+2292, 473, 127.065
+2292, 525, 141.049
+2292, 578, 155.119
+2292, 630, 169.274
+2292, 683, 183.514
+2292, 735, 197.840
+2292, 788, 212.251
+2292, 840, 226.747
+2292, 893, 241.328
+2292, 945, 255.995
+2292, 998, 270.747
+2292, 1050, 285.585
+2546, -1050, -243.170
+2546, -998, -231.610
+2546, -945, -219.955
+2546, -893, -208.206
+2546, -840, -196.364
+2546, -788, -184.427
+2546, -735, -172.396
+2546, -683, -160.271
+2546, -630, -148.052
+2546, -578, -135.739
+2546, -525, -123.332
+2546, -473, -110.831
+2546, -420, -98.236
+2546, -367, -85.546
+2546, -315, -72.763
+2546, -262, -59.885
+2546, -210, -46.914
+2546, -157, -33.848
+2546, -105, -20.688
+2546, -52, -7.434
+2546, -11, 0.000
+2546, 11, 9.345
+2546, 52, 21.100
+2546, 105, 35.885
+2546, 157, 50.773
+2546, 210, 65.762
+2546, 262, 80.854
+2546, 315, 96.047
+2546, 367, 111.343
+2546, 420, 126.741
+2546, 473, 142.241
+2546, 525, 157.843
+2546, 578, 173.547
+2546, 630, 189.353
+2546, 683, 205.261
+2546, 735, 221.271
+2546, 788, 237.384
+2546, 840, 253.598
+2546, 893, 269.915
+2546, 945, 286.334
+2546, 998, 302.854
+2546, 1050, 319.477
+2801, -1050, -265.152
+2801, -998, -252.580
+2801, -945, -239.898
+2801, -893, -227.104
+2801, -840, -214.199
+2801, -788, -201.182
+2801, -735, -188.055
+2801, -683, -174.817
+2801, -630, -161.467
+2801, -578, -148.006
+2801, -525, -134.434
+2801, -473, -120.751
+2801, -420, -106.957
+2801, -367, -93.052
+2801, -315, -79.035
+2801, -262, -64.908
+2801, -210, -50.669
+2801, -157, -36.319
+2801, -105, -21.858
+2801, -52, -7.285
+2801, -11, 0.000
+2801, 11, 11.248
+2801, 52, 24.178
+2801, 105, 40.449
+2801, 157, 56.842
+2801, 210, 73.354
+2801, 262, 89.987
+2801, 315, 106.741
+2801, 367, 123.616
+2801, 420, 140.611
+2801, 473, 157.726
+2801, 525, 174.963
+2801, 578, 192.320
+2801, 630, 209.797
+2801, 683, 227.395
+2801, 735, 245.114
+2801, 788, 262.953
+2801, 840, 280.913
+2801, 893, 298.993
+2801, 945, 317.195
+2801, 998, 335.516
+2801, 1050, 353.959
+3056, -1050, -286.571
+3056, -998, -273.020
+3056, -945, -259.339
+3056, -893, -245.528
+3056, -840, -231.587
+3056, -788, -217.517
+3056, -735, -203.316
+3056, -683, -188.986
+3056, -630, -174.526
+3056, -578, -159.936
+3056, -525, -145.216
+3056, -473, -130.367
+3056, -420, -115.387
+3056, -367, -100.278
+3056, -315, -85.039
+3056, -262, -69.670
+3056, -210, -54.171
+3056, -157, -38.543
+3056, -105, -22.784
+3056, -52, -6.896
+3056, -11, 0.000
+3056, 11, 13.411
+3056, 52, 27.517
+3056, 105, 45.277
+3056, 157, 63.178
+3056, 210, 81.220
+3056, 262, 99.403
+3056, 315, 117.727
+3056, 367, 136.191
+3056, 420, 154.797
+3056, 473, 173.543
+3056, 525, 192.430
+3056, 578, 211.458
+3056, 630, 230.627
+3056, 683, 249.937
+3056, 735, 269.388
+3056, 788, 288.979
+3056, 840, 308.712
+3056, 893, 328.585
+3056, 945, 348.599
+3056, 998, 368.754
+3056, 1050, 389.050
+3310, -1050, -307.409
+3310, -998, -292.910
+3310, -945, -278.260
+3310, -893, -263.460
+3310, -840, -248.510
+3310, -788, -233.410
+3310, -735, -218.160
+3310, -683, -202.760
+3310, -630, -187.210
+3310, -578, -171.509
+3310, -525, -155.658
+3310, -473, -139.658
+3310, -420, -123.507
+3310, -367, -107.206
+3310, -315, -90.754
+3310, -262, -74.153
+3310, -210, -57.402
+3310, -157, -40.500
+3310, -105, -23.448
+3310, -52, -6.247
+3310, -11, 0.000
+3310, 11, 15.855
+3310, 52, 31.139
+3310, 105, 50.390
+3310, 157, 69.805
+3310, 210, 89.382
+3310, 262, 109.122
+3310, 315, 129.025
+3310, 367, 149.091
+3310, 420, 169.320
+3310, 473, 189.712
+3310, 525, 210.267
+3310, 578, 230.984
+3310, 630, 251.865
+3310, 683, 272.908
+3310, 735, 294.114
+3310, 788, 315.484
+3310, 840, 337.016
+3310, 893, 358.711
+3310, 945, 380.568
+3310, 998, 402.589
+3310, 1050, 424.773
+3565, -1050, -327.646
+3565, -998, -312.230
+3565, -945, -296.641
+3565, -893, -280.881
+3565, -840, -264.949
+3565, -788, -248.844
+3565, -735, -232.568
+3565, -683, -216.119
+3565, -630, -199.499
+3565, -578, -182.706
+3565, -525, -165.741
+3565, -473, -148.605
+3565, -420, -131.296
+3565, -367, -113.815
+3565, -315, -96.162
+3565, -262, -78.338
+3565, -210, -60.341
+3565, -157, -42.172
+3565, -105, -23.831
+3565, -52, -5.318
+3565, -11, 0.000
+3565, 11, 18.601
+3565, 52, 35.063
+3565, 105, 55.808
+3565, 157, 76.741
+3565, 210, 97.859
+3565, 262, 119.165
+3565, 315, 140.657
+3565, 367, 162.336
+3565, 420, 184.202
+3565, 473, 206.254
+3565, 525, 228.493
+3565, 578, 250.918
+3565, 630, 273.530
+3565, 683, 296.329
+3565, 735, 319.315
+3565, 788, 342.487
+3565, 840, 365.846
+3565, 893, 389.391
+3565, 945, 413.123
+3565, 998, 437.042
+3565, 1050, 461.148
+3820, -1050, -347.263
+3820, -998, -330.961
+3820, -945, -314.464
+3820, -893, -297.771
+3820, -840, -280.883
+3820, -788, -263.799
+3820, -735, -246.519
+3820, -683, -229.044
+3820, -630, -211.374
+3820, -578, -193.507
+3820, -525, -175.446
+3820, -473, -157.189
+3820, -420, -138.736
+3820, -367, -120.087
+3820, -315, -101.244
+3820, -262, -82.204
+3820, -210, -62.969
+3820, -157, -43.539
+3820, -105, -23.912
+3820, -52, -4.091
+3820, -11, 0.000
+3820, 11, 21.670
+3820, 52, 39.311
+3820, 105, 61.553
+3820, 157, 84.008
+3820, 210, 106.674
+3820, 262, 129.553
+3820, 315, 152.644
+3820, 367, 175.947
+3820, 420, 199.462
+3820, 473, 223.190
+3820, 525, 247.129
+3820, 578, 271.281
+3820, 630, 295.645
+3820, 683, 320.221
+3820, 735, 345.010
+3820, 788, 370.010
+3820, 840, 395.223
+3820, 893, 420.648
+3820, 945, 446.285
+3820, 998, 472.134
+3820, 1050, 498.196
+4074, -1050, -366.239
+4074, -998, -349.084
+4074, -945, -331.708
+4074, -893, -314.111
+4074, -840, -296.293
+4074, -788, -278.255
+4074, -735, -259.995
+4074, -683, -241.516
+4074, -630, -222.815
+4074, -578, -203.894
+4074, -525, -184.752
+4074, -473, -165.390
+4074, -420, -145.807
+4074, -367, -126.003
+4074, -315, -105.978
+4074, -262, -85.733
+4074, -210, -65.267
+4074, -157, -44.581
+4074, -105, -23.673
+4074, -52, -2.546
+4074, -11, 0.000
+4074, 11, 25.084
+4074, 52, 43.905
+4074, 105, 67.646
+4074, 157, 91.627
+4074, 210, 115.847
+4074, 262, 140.307
+4074, 315, 165.006
+4074, 367, 189.945
+4074, 420, 215.123
+4074, 473, 240.540
+4074, 525, 266.197
+4074, 578, 292.094
+4074, 630, 318.230
+4074, 683, 344.605
+4074, 735, 371.220
+4074, 788, 398.075
+4074, 840, 425.168
+4074, 893, 452.502
+4074, 945, 480.074
+4074, 998, 507.886
+4074, 1050, 535.938
+4329, -1050, -384.557
+4329, -998, -366.579
+4329, -945, -348.354
+4329, -893, -329.881
+4329, -840, -311.160
+4329, -788, -292.192
+4329, -735, -272.977
+4329, -683, -253.514
+4329, -630, -233.804
+4329, -578, -213.847
+4329, -525, -193.642
+4329, -473, -173.190
+4329, -420, -152.490
+4329, -367, -131.542
+4329, -315, -110.348
+4329, -262, -88.906
+4329, -210, -67.216
+4329, -157, -45.279
+4329, -105, -23.095
+4329, -52, -0.663
+4329, -11, 0.000
+4329, 11, 28.863
+4329, 52, 48.864
+4329, 105, 74.107
+4329, 157, 99.619
+4329, 210, 125.399
+4329, 262, 151.448
+4329, 315, 177.765
+4329, 367, 204.351
+4329, 420, 231.205
+4329, 473, 258.327
+4329, 525, 285.718
+4329, 578, 313.378
+4329, 630, 341.306
+4329, 683, 369.503
+4329, 735, 397.968
+4329, 788, 426.701
+4329, 840, 455.703
+4329, 893, 484.973
+4329, 945, 514.512
+4329, 998, 544.320
+4329, 1050, 574.396
+4584, -1050, -402.196
+4584, -998, -383.427
+4584, -945, -364.382
+4584, -893, -345.062
+4584, -840, -325.465
+4584, -788, -305.593
+4584, -735, -285.445
+4584, -683, -265.021
+4584, -630, -244.321
+4584, -578, -223.346
+4584, -525, -202.095
+4584, -473, -180.568
+4584, -420, -158.765
+4584, -367, -136.687
+4584, -315, -114.332
+4584, -262, -91.702
+4584, -210, -68.796
+4584, -157, -45.614
+4584, -105, -22.157
+4584, -52, 0.000
+4584, -11, 0.000
+4584, 11, 33.028
+4584, 52, 54.210
+4584, 105, 80.958
+4584, 157, 108.005
+4584, 210, 135.351
+4584, 262, 162.997
+4584, 315, 190.942
+4584, 367, 219.186
+4584, 420, 247.729
+4584, 473, 276.571
+4584, 525, 305.713
+4584, 578, 335.154
+4584, 630, 364.894
+4584, 683, 394.934
+4584, 735, 425.272
+4584, 788, 455.910
+4584, 840, 486.848
+4584, 893, 518.084
+4584, 945, 549.620
+4584, 998, 581.455
+4584, 1050, 613.589
+4838, -1050, -419.138
+4838, -998, -399.609
+4838, -945, -379.775
+4838, -893, -359.634
+4838, -840, -339.189
+4838, -788, -318.437
+4838, -735, -297.379
+4838, -683, -276.016
+4838, -630, -254.347
+4838, -578, -232.372
+4838, -525, -210.092
+4838, -473, -187.506
+4838, -420, -164.614
+4838, -367, -141.416
+4838, -315, -117.912
+4838, -262, -94.103
+4838, -210, -69.988
+4838, -157, -45.567
+4838, -105, -20.841
+4838, -52, 0.000
+4838, -11, 0.000
+4838, 11, 37.600
+4838, 52, 59.965
+4838, 105, 88.220
+4838, 157, 116.806
+4838, 210, 145.725
+4838, 262, 174.975
+4838, 315, 204.557
+4838, 367, 234.471
+4838, 420, 264.716
+4838, 473, 295.293
+4838, 525, 326.202
+4838, 578, 357.443
+4838, 630, 389.016
+4838, 683, 420.920
+4838, 735, 453.156
+4838, 788, 485.724
+4838, 840, 518.624
+4838, 893, 551.855
+4838, 945, 585.418
+4838, 998, 619.313
+4838, 1050, 653.540
+5093, -1050, -435.362
+5093, -998, -415.105
+5093, -945, -394.511
+5093, -893, -373.580
+5093, -840, -352.311
+5093, -788, -330.705
+5093, -735, -308.761
+5093, -683, -286.480
+5093, -630, -263.862
+5093, -578, -240.907
+5093, -525, -217.614
+5093, -473, -193.984
+5093, -420, -170.016
+5093, -367, -145.711
+5093, -315, -121.069
+5093, -262, -96.089
+5093, -210, -70.772
+5093, -157, -45.118
+5093, -105, -19.126
+5093, -52, 0.000
+5093, -11, 0.000
+5093, 11, 42.600
+5093, 52, 66.149
+5093, 105, 95.913
+5093, 157, 126.044
+5093, 210, 156.540
+5093, 262, 187.403
+5093, 315, 218.632
+5093, 367, 250.227
+5093, 420, 282.187
+5093, 473, 314.514
+5093, 525, 347.207
+5093, 578, 380.266
+5093, 630, 413.691
+5093, 683, 447.482
+5093, 735, 481.639
+5093, 788, 516.163
+5093, 840, 551.052
+5093, 893, 586.307
+5093, 945, 621.928
+5093, 998, 657.915
+5093, 1050, 694.269
diff --git a/VectoCore/VectoCoreTest/VectoCoreTest.csproj b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
index e9502c85ba4b5465fb10cd0202fb9e52b8fcdd0f..3faf7e0509d51e23b4518f239cdcfed63201f7b3 100644
--- a/VectoCore/VectoCoreTest/VectoCoreTest.csproj
+++ b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
@@ -451,6 +451,15 @@
<None Include="TestData\Components\AT_GBX\GearboxSerial8Spd.vgbx">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
+ <None Include="TestData\Components\ElectricMotor\vem_P_inverter_DC_90_coarse.vemo">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Components\ElectricMotor\vem_P_inverter_DC_90_fine.vemo">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Components\ElectricMotor\vem_P_inverter_DC_std.vemo">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
<None Include="TestData\Components\GearshiftLinesVoith.vgsv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
diff --git a/VectoCore/VectoCoreTest/XML/XMLWritingTest.cs b/VectoCore/VectoCoreTest/XML/XMLWritingTest.cs
index 44e26ea93718324461a98dd1abccbb16caf2970b..e5ba6ea7cfe7aeb1aa654a47819740b4fe25b594 100644
--- a/VectoCore/VectoCoreTest/XML/XMLWritingTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLWritingTest.cs
@@ -102,7 +102,7 @@ namespace TUGraz.VectoCore.Tests.XML
var xml = xmlInputReader.CreateEngineering(outFile);
Assert.IsNotNull(xml);
- Assert.AreEqual("325kW 12.7l Engine", xml.JobInputData.JobName);
+ Assert.AreEqual("N/A N/A", xml.JobInputData.JobName);
}
[Category("LongRunning")]
@@ -118,7 +118,7 @@ namespace TUGraz.VectoCore.Tests.XML
var xml = xmlInputReader.CreateEngineering(outFile);
Assert.IsNotNull(xml);
- Assert.AreEqual("325kW 12.7l Engine", xml.JobInputData.JobName);
+ Assert.AreEqual("N/A N/A", xml.JobInputData.JobName);
}
[Category("LongRunning")]
@@ -136,7 +136,7 @@ namespace TUGraz.VectoCore.Tests.XML
var xml = xmlInputReader.CreateEngineering(Path.Combine(outDir, outFile));
Assert.IsNotNull(xml);
- Assert.AreEqual("325kW 12.7l Engine", xml.JobInputData.JobName);
+ Assert.AreEqual("N/A N/A", xml.JobInputData.JobName);
}
[Category("LongRunning")]