diff --git a/VECTO/GUI/BatteryForm.Designer.vb b/VECTO/GUI/BatteryForm.Designer.vb
index 553552e108f794351c5a591c31a3fed26ab7cd93..b83c072c1e761b873c1735012a23d367c5d736b5 100644
--- a/VECTO/GUI/BatteryForm.Designer.vb
+++ b/VECTO/GUI/BatteryForm.Designer.vb
@@ -135,7 +135,7 @@ Partial Class BatteryForm
Me.tbCapacity.Location = New System.Drawing.Point(90, 4)
Me.tbCapacity.Name = "tbCapacity"
Me.tbCapacity.Size = New System.Drawing.Size(57, 20)
- Me.tbCapacity.TabIndex = 3
+ Me.tbCapacity.TabIndex = 0
'
'lblCapacityUnit
'
@@ -159,20 +159,20 @@ Partial Class BatteryForm
'
Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.ButCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
- Me.ButCancel.Location = New System.Drawing.Point(811, 323)
+ Me.ButCancel.Location = New System.Drawing.Point(811, 321)
Me.ButCancel.Name = "ButCancel"
Me.ButCancel.Size = New System.Drawing.Size(75, 23)
- Me.ButCancel.TabIndex = 13
+ Me.ButCancel.TabIndex = 4
Me.ButCancel.Text = "Cancel"
Me.ButCancel.UseVisualStyleBackColor = true
'
'ButOK
'
Me.ButOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.ButOK.Location = New System.Drawing.Point(730, 323)
+ Me.ButOK.Location = New System.Drawing.Point(730, 321)
Me.ButOK.Name = "ButOK"
Me.ButOK.Size = New System.Drawing.Size(75, 23)
- Me.ButOK.TabIndex = 12
+ Me.ButOK.TabIndex = 3
Me.ButOK.Text = "Save"
Me.ButOK.UseVisualStyleBackColor = true
'
@@ -261,7 +261,7 @@ Partial Class BatteryForm
'
Me.StatusStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LbStatus})
- Me.StatusStrip1.Location = New System.Drawing.Point(0, 349)
+ Me.StatusStrip1.Location = New System.Drawing.Point(0, 347)
Me.StatusStrip1.Name = "StatusStrip1"
Me.StatusStrip1.Size = New System.Drawing.Size(898, 22)
Me.StatusStrip1.SizingGrip = false
@@ -327,14 +327,14 @@ Partial Class BatteryForm
Me.pnInertia.Location = New System.Drawing.Point(3, 3)
Me.pnInertia.Name = "pnInertia"
Me.pnInertia.Size = New System.Drawing.Size(212, 30)
- Me.pnInertia.TabIndex = 3
+ Me.pnInertia.TabIndex = 0
'
'tbSoCCurve
'
Me.tbSoCCurve.Location = New System.Drawing.Point(3, 123)
Me.tbSoCCurve.Name = "tbSoCCurve"
Me.tbSoCCurve.Size = New System.Drawing.Size(434, 20)
- Me.tbSoCCurve.TabIndex = 5
+ Me.tbSoCCurve.TabIndex = 6
'
'lblSoCCurve
'
@@ -351,8 +351,7 @@ Partial Class BatteryForm
Me.btnBrowseSoCCurve.Location = New System.Drawing.Point(437, 122)
Me.btnBrowseSoCCurve.Name = "btnBrowseSoCCurve"
Me.btnBrowseSoCCurve.Size = New System.Drawing.Size(24, 24)
- Me.btnBrowseSoCCurve.TabIndex = 6
- Me.btnBrowseSoCCurve.TabStop = false
+ Me.btnBrowseSoCCurve.TabIndex = 7
Me.btnBrowseSoCCurve.UseVisualStyleBackColor = true
'
'btnSoCCurveOpen
@@ -361,8 +360,7 @@ Partial Class BatteryForm
Me.btnSoCCurveOpen.Location = New System.Drawing.Point(460, 122)
Me.btnSoCCurveOpen.Name = "btnSoCCurveOpen"
Me.btnSoCCurveOpen.Size = New System.Drawing.Size(24, 24)
- Me.btnSoCCurveOpen.TabIndex = 7
- Me.btnSoCCurveOpen.TabStop = false
+ Me.btnSoCCurveOpen.TabIndex = 8
Me.btnSoCCurveOpen.UseVisualStyleBackColor = true
'
'btnRiMapOpen
@@ -371,8 +369,7 @@ Partial Class BatteryForm
Me.btnRiMapOpen.Location = New System.Drawing.Point(460, 159)
Me.btnRiMapOpen.Name = "btnRiMapOpen"
Me.btnRiMapOpen.Size = New System.Drawing.Size(24, 24)
- Me.btnRiMapOpen.TabIndex = 42
- Me.btnRiMapOpen.TabStop = false
+ Me.btnRiMapOpen.TabIndex = 11
Me.btnRiMapOpen.UseVisualStyleBackColor = true
'
'btnBrowseRiMap
@@ -381,8 +378,7 @@ Partial Class BatteryForm
Me.btnBrowseRiMap.Location = New System.Drawing.Point(437, 159)
Me.btnBrowseRiMap.Name = "btnBrowseRiMap"
Me.btnBrowseRiMap.Size = New System.Drawing.Size(24, 24)
- Me.btnBrowseRiMap.TabIndex = 41
- Me.btnBrowseRiMap.TabStop = false
+ Me.btnBrowseRiMap.TabIndex = 10
Me.btnBrowseRiMap.UseVisualStyleBackColor = true
'
'lblRiMap
@@ -399,7 +395,7 @@ Partial Class BatteryForm
Me.tbRiCurve.Location = New System.Drawing.Point(3, 161)
Me.tbRiCurve.Name = "tbRiCurve"
Me.tbRiCurve.Size = New System.Drawing.Size(434, 20)
- Me.tbRiCurve.TabIndex = 40
+ Me.tbRiCurve.TabIndex = 9
'
'lblTitle
'
@@ -430,7 +426,7 @@ Partial Class BatteryForm
Me.Panel1.Location = New System.Drawing.Point(3, 36)
Me.Panel1.Name = "Panel1"
Me.Panel1.Size = New System.Drawing.Size(212, 30)
- Me.Panel1.TabIndex = 25
+ Me.Panel1.TabIndex = 1
'
'lblMinSoc
'
@@ -455,7 +451,7 @@ Partial Class BatteryForm
Me.tbSoCMin.Location = New System.Drawing.Point(90, 4)
Me.tbSoCMin.Name = "tbSoCMin"
Me.tbSoCMin.Size = New System.Drawing.Size(57, 20)
- Me.tbSoCMin.TabIndex = 3
+ Me.tbSoCMin.TabIndex = 0
'
'Panel2
'
@@ -465,7 +461,7 @@ Partial Class BatteryForm
Me.Panel2.Location = New System.Drawing.Point(225, 36)
Me.Panel2.Name = "Panel2"
Me.Panel2.Size = New System.Drawing.Size(212, 30)
- Me.Panel2.TabIndex = 25
+ Me.Panel2.TabIndex = 2
'
'lblSoCMax
'
@@ -490,17 +486,17 @@ Partial Class BatteryForm
Me.tbSoCMax.Location = New System.Drawing.Point(90, 4)
Me.tbSoCMax.Name = "tbSoCMax"
Me.tbSoCMax.Size = New System.Drawing.Size(57, 20)
- Me.tbSoCMax.TabIndex = 3
+ Me.tbSoCMax.TabIndex = 0
'
'FlowLayoutPanel1
'
Me.FlowLayoutPanel1.Controls.Add(Me.pnBattery)
Me.FlowLayoutPanel1.Controls.Add(Me.pnSuperCap)
Me.FlowLayoutPanel1.Location = New System.Drawing.Point(8, 136)
- Me.FlowLayoutPanel1.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
+ Me.FlowLayoutPanel1.Margin = New System.Windows.Forms.Padding(2)
Me.FlowLayoutPanel1.Name = "FlowLayoutPanel1"
Me.FlowLayoutPanel1.Size = New System.Drawing.Size(495, 200)
- Me.FlowLayoutPanel1.TabIndex = 50
+ Me.FlowLayoutPanel1.TabIndex = 2
'
'pnBattery
'
@@ -520,7 +516,7 @@ Partial Class BatteryForm
Me.pnBattery.Controls.Add(Me.btnRiMapOpen)
Me.pnBattery.Controls.Add(Me.btnBrowseRiMap)
Me.pnBattery.Location = New System.Drawing.Point(2, 2)
- Me.pnBattery.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
+ Me.pnBattery.Margin = New System.Windows.Forms.Padding(2)
Me.pnBattery.Name = "pnBattery"
Me.pnBattery.Size = New System.Drawing.Size(489, 188)
Me.pnBattery.TabIndex = 0
@@ -530,7 +526,7 @@ Partial Class BatteryForm
Me.tbMaxCurrentMap.Location = New System.Drawing.Point(4, 87)
Me.tbMaxCurrentMap.Name = "tbMaxCurrentMap"
Me.tbMaxCurrentMap.Size = New System.Drawing.Size(434, 20)
- Me.tbMaxCurrentMap.TabIndex = 44
+ Me.tbMaxCurrentMap.TabIndex = 3
'
'lblMaxCurrentMap
'
@@ -547,8 +543,7 @@ Partial Class BatteryForm
Me.btnBrowseMaxCurrentMap.Location = New System.Drawing.Point(438, 85)
Me.btnBrowseMaxCurrentMap.Name = "btnBrowseMaxCurrentMap"
Me.btnBrowseMaxCurrentMap.Size = New System.Drawing.Size(24, 24)
- Me.btnBrowseMaxCurrentMap.TabIndex = 45
- Me.btnBrowseMaxCurrentMap.TabStop = false
+ Me.btnBrowseMaxCurrentMap.TabIndex = 4
Me.btnBrowseMaxCurrentMap.UseVisualStyleBackColor = true
'
'btnMaxCurrentMapOpen
@@ -557,8 +552,7 @@ Partial Class BatteryForm
Me.btnMaxCurrentMapOpen.Location = New System.Drawing.Point(461, 85)
Me.btnMaxCurrentMapOpen.Name = "btnMaxCurrentMapOpen"
Me.btnMaxCurrentMapOpen.Size = New System.Drawing.Size(24, 24)
- Me.btnMaxCurrentMapOpen.TabIndex = 46
- Me.btnMaxCurrentMapOpen.TabStop = false
+ Me.btnMaxCurrentMapOpen.TabIndex = 5
Me.btnMaxCurrentMapOpen.UseVisualStyleBackColor = true
'
'pnSuperCap
@@ -570,7 +564,7 @@ Partial Class BatteryForm
Me.pnSuperCap.Controls.Add(Me.pnSuperCapResistance)
Me.pnSuperCap.Controls.Add(Me.pnSuperCapCapacity)
Me.pnSuperCap.Location = New System.Drawing.Point(2, 194)
- Me.pnSuperCap.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
+ Me.pnSuperCap.Margin = New System.Windows.Forms.Padding(2)
Me.pnSuperCap.Name = "pnSuperCap"
Me.pnSuperCap.Size = New System.Drawing.Size(489, 110)
Me.pnSuperCap.TabIndex = 1
@@ -583,7 +577,7 @@ Partial Class BatteryForm
Me.Panel4.Location = New System.Drawing.Point(225, 76)
Me.Panel4.Name = "Panel4"
Me.Panel4.Size = New System.Drawing.Size(212, 30)
- Me.Panel4.TabIndex = 27
+ Me.Panel4.TabIndex = 5
'
'lblMaxCurrentDischarge
'
@@ -608,7 +602,7 @@ Partial Class BatteryForm
Me.tbSuperCapMaxCurrentDischarge.Location = New System.Drawing.Point(108, 5)
Me.tbSuperCapMaxCurrentDischarge.Name = "tbSuperCapMaxCurrentDischarge"
Me.tbSuperCapMaxCurrentDischarge.Size = New System.Drawing.Size(57, 20)
- Me.tbSuperCapMaxCurrentDischarge.TabIndex = 3
+ Me.tbSuperCapMaxCurrentDischarge.TabIndex = 0
'
'Panel3
'
@@ -618,7 +612,7 @@ Partial Class BatteryForm
Me.Panel3.Location = New System.Drawing.Point(3, 76)
Me.Panel3.Name = "Panel3"
Me.Panel3.Size = New System.Drawing.Size(212, 30)
- Me.Panel3.TabIndex = 26
+ Me.Panel3.TabIndex = 2
'
'lblMaxCurrentChg
'
@@ -643,7 +637,7 @@ Partial Class BatteryForm
Me.tbSuperCapMaxCurrentCharge.Location = New System.Drawing.Point(90, 4)
Me.tbSuperCapMaxCurrentCharge.Name = "tbSuperCapMaxCurrentCharge"
Me.tbSuperCapMaxCurrentCharge.Size = New System.Drawing.Size(57, 20)
- Me.tbSuperCapMaxCurrentCharge.TabIndex = 3
+ Me.tbSuperCapMaxCurrentCharge.TabIndex = 0
'
'pnSuperCapMaxV
'
@@ -653,7 +647,7 @@ Partial Class BatteryForm
Me.pnSuperCapMaxV.Location = New System.Drawing.Point(225, 40)
Me.pnSuperCapMaxV.Name = "pnSuperCapMaxV"
Me.pnSuperCapMaxV.Size = New System.Drawing.Size(212, 30)
- Me.pnSuperCapMaxV.TabIndex = 26
+ Me.pnSuperCapMaxV.TabIndex = 4
'
'lblSuperCapMaxV
'
@@ -678,7 +672,7 @@ Partial Class BatteryForm
Me.tbSuperCapMaxV.Location = New System.Drawing.Point(108, 5)
Me.tbSuperCapMaxV.Name = "tbSuperCapMaxV"
Me.tbSuperCapMaxV.Size = New System.Drawing.Size(57, 20)
- Me.tbSuperCapMaxV.TabIndex = 3
+ Me.tbSuperCapMaxV.TabIndex = 0
'
'pnSuperCapMinV
'
@@ -688,7 +682,7 @@ Partial Class BatteryForm
Me.pnSuperCapMinV.Location = New System.Drawing.Point(3, 40)
Me.pnSuperCapMinV.Name = "pnSuperCapMinV"
Me.pnSuperCapMinV.Size = New System.Drawing.Size(212, 30)
- Me.pnSuperCapMinV.TabIndex = 25
+ Me.pnSuperCapMinV.TabIndex = 1
'
'lblSuperCapMinV
'
@@ -713,7 +707,7 @@ Partial Class BatteryForm
Me.tbSuperCapMinV.Location = New System.Drawing.Point(90, 4)
Me.tbSuperCapMinV.Name = "tbSuperCapMinV"
Me.tbSuperCapMinV.Size = New System.Drawing.Size(57, 20)
- Me.tbSuperCapMinV.TabIndex = 3
+ Me.tbSuperCapMinV.TabIndex = 0
'
'pnSuperCapResistance
'
@@ -723,7 +717,7 @@ Partial Class BatteryForm
Me.pnSuperCapResistance.Location = New System.Drawing.Point(225, 3)
Me.pnSuperCapResistance.Name = "pnSuperCapResistance"
Me.pnSuperCapResistance.Size = New System.Drawing.Size(212, 30)
- Me.pnSuperCapResistance.TabIndex = 25
+ Me.pnSuperCapResistance.TabIndex = 3
'
'lblSuperCapRi
'
@@ -748,7 +742,7 @@ Partial Class BatteryForm
Me.tbSuperCapRi.Location = New System.Drawing.Point(108, 5)
Me.tbSuperCapRi.Name = "tbSuperCapRi"
Me.tbSuperCapRi.Size = New System.Drawing.Size(57, 20)
- Me.tbSuperCapRi.TabIndex = 3
+ Me.tbSuperCapRi.TabIndex = 0
'
'pnSuperCapCapacity
'
@@ -758,7 +752,7 @@ Partial Class BatteryForm
Me.pnSuperCapCapacity.Location = New System.Drawing.Point(3, 3)
Me.pnSuperCapCapacity.Name = "pnSuperCapCapacity"
Me.pnSuperCapCapacity.Size = New System.Drawing.Size(212, 30)
- Me.pnSuperCapCapacity.TabIndex = 4
+ Me.pnSuperCapCapacity.TabIndex = 0
'
'lblSuperCapCapacity
'
@@ -783,16 +777,16 @@ Partial Class BatteryForm
Me.tbSuperCapCapacity.Location = New System.Drawing.Point(90, 4)
Me.tbSuperCapCapacity.Name = "tbSuperCapCapacity"
Me.tbSuperCapCapacity.Size = New System.Drawing.Size(57, 20)
- Me.tbSuperCapCapacity.TabIndex = 3
+ Me.tbSuperCapCapacity.TabIndex = 0
'
'cbRESSType
'
Me.cbRESSType.FormattingEnabled = true
Me.cbRESSType.Location = New System.Drawing.Point(111, 107)
- Me.cbRESSType.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
+ Me.cbRESSType.Margin = New System.Windows.Forms.Padding(2)
Me.cbRESSType.Name = "cbRESSType"
Me.cbRESSType.Size = New System.Drawing.Size(142, 21)
- Me.cbRESSType.TabIndex = 51
+ Me.cbRESSType.TabIndex = 1
'
'lblRessType
'
@@ -809,7 +803,7 @@ Partial Class BatteryForm
Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.CancelButton = Me.ButCancel
- Me.ClientSize = New System.Drawing.Size(898, 371)
+ Me.ClientSize = New System.Drawing.Size(898, 369)
Me.Controls.Add(Me.lblRessType)
Me.Controls.Add(Me.cbRESSType)
Me.Controls.Add(Me.FlowLayoutPanel1)
diff --git a/VECTO/GUI/BusAuxiliariesEngParametersForm.Designer.vb b/VECTO/GUI/BusAuxiliariesEngParametersForm.Designer.vb
index 4b8a111e7e7ce45b1b8139841d467ef52836d4f9..33db7a9710096b07132a3d4ca1d0ab4d4bd6960a 100644
--- a/VECTO/GUI/BusAuxiliariesEngParametersForm.Designer.vb
+++ b/VECTO/GUI/BusAuxiliariesEngParametersForm.Designer.vb
@@ -158,30 +158,31 @@ Partial Class BusAuxiliariesEngParametersForm
'
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(936, 505)
+ Me.ButCancel.Location = New System.Drawing.Point(936, 398)
Me.ButCancel.Name = "ButCancel"
Me.ButCancel.Size = New System.Drawing.Size(75, 23)
- Me.ButCancel.TabIndex = 13
+ Me.ButCancel.TabIndex = 4
Me.ButCancel.Text = "Cancel"
Me.ButCancel.UseVisualStyleBackColor = true
'
'ButOK
'
Me.ButOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.ButOK.Location = New System.Drawing.Point(855, 505)
+ Me.ButOK.Location = New System.Drawing.Point(855, 398)
Me.ButOK.Name = "ButOK"
Me.ButOK.Size = New System.Drawing.Size(75, 23)
- Me.ButOK.TabIndex = 12
+ Me.ButOK.TabIndex = 3
Me.ButOK.Text = "Save"
Me.ButOK.UseVisualStyleBackColor = true
'
'ToolStrip1
'
Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
+ Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator3, Me.ToolStripBtSendTo, Me.ToolStripSeparator1, Me.ToolStripButton1})
Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
Me.ToolStrip1.Name = "ToolStrip1"
- Me.ToolStrip1.Size = New System.Drawing.Size(1023, 25)
+ Me.ToolStrip1.Size = New System.Drawing.Size(1023, 31)
Me.ToolStrip1.TabIndex = 30
Me.ToolStrip1.Text = "ToolStrip1"
'
@@ -191,7 +192,7 @@ Partial Class BusAuxiliariesEngParametersForm
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(23, 22)
+ Me.ToolStripBtNew.Size = New System.Drawing.Size(28, 28)
Me.ToolStripBtNew.Text = "ToolStripButton1"
Me.ToolStripBtNew.ToolTipText = "New"
'
@@ -201,7 +202,7 @@ Partial Class BusAuxiliariesEngParametersForm
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(23, 22)
+ Me.ToolStripBtOpen.Size = New System.Drawing.Size(28, 28)
Me.ToolStripBtOpen.Text = "ToolStripButton1"
Me.ToolStripBtOpen.ToolTipText = "Open..."
'
@@ -211,7 +212,7 @@ Partial Class BusAuxiliariesEngParametersForm
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(23, 22)
+ Me.ToolStripBtSave.Size = New System.Drawing.Size(28, 28)
Me.ToolStripBtSave.Text = "ToolStripButton1"
Me.ToolStripBtSave.ToolTipText = "Save"
'
@@ -221,14 +222,14 @@ Partial Class BusAuxiliariesEngParametersForm
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(23, 22)
+ Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(28, 28)
Me.ToolStripBtSaveAs.Text = "ToolStripButton1"
Me.ToolStripBtSaveAs.ToolTipText = "Save As..."
'
'ToolStripSeparator3
'
Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
- Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 25)
+ Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 31)
'
'ToolStripBtSendTo
'
@@ -236,14 +237,14 @@ Partial Class BusAuxiliariesEngParametersForm
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(23, 22)
+ Me.ToolStripBtSendTo.Size = New System.Drawing.Size(28, 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, 25)
+ Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 31)
'
'ToolStripButton1
'
@@ -251,13 +252,14 @@ Partial Class BusAuxiliariesEngParametersForm
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(23, 22)
+ Me.ToolStripButton1.Size = New System.Drawing.Size(28, 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, 531)
+ Me.StatusStrip1.Location = New System.Drawing.Point(0, 424)
Me.StatusStrip1.Name = "StatusStrip1"
Me.StatusStrip1.Size = New System.Drawing.Size(1023, 22)
Me.StatusStrip1.SizingGrip = false
@@ -282,6 +284,7 @@ Partial Class BusAuxiliariesEngParametersForm
'
'CmOpenFile
'
+ Me.CmOpenFile.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
Me.CmOpenFile.Name = "CmOpenFile"
Me.CmOpenFile.Size = New System.Drawing.Size(153, 48)
@@ -321,8 +324,8 @@ Partial Class BusAuxiliariesEngParametersForm
Me.gbElectricSystem.Controls.Add(Me.pnCurrentDemand)
Me.gbElectricSystem.Location = New System.Drawing.Point(12, 74)
Me.gbElectricSystem.Name = "gbElectricSystem"
- Me.gbElectricSystem.Size = New System.Drawing.Size(317, 403)
- Me.gbElectricSystem.TabIndex = 49
+ Me.gbElectricSystem.Size = New System.Drawing.Size(317, 339)
+ Me.gbElectricSystem.TabIndex = 0
Me.gbElectricSystem.TabStop = false
Me.gbElectricSystem.Text = "Electric System"
'
@@ -334,7 +337,7 @@ Partial Class BusAuxiliariesEngParametersForm
Me.pnDCDCEff.Location = New System.Drawing.Point(10, 294)
Me.pnDCDCEff.Name = "pnDCDCEff"
Me.pnDCDCEff.Size = New System.Drawing.Size(288, 28)
- Me.pnDCDCEff.TabIndex = 26
+ Me.pnDCDCEff.TabIndex = 9
'
'lblDCDCEff
'
@@ -367,7 +370,7 @@ Partial Class BusAuxiliariesEngParametersForm
Me.pnES_HEVREESS.Location = New System.Drawing.Point(10, 265)
Me.pnES_HEVREESS.Name = "pnES_HEVREESS"
Me.pnES_HEVREESS.Size = New System.Drawing.Size(288, 28)
- Me.pnES_HEVREESS.TabIndex = 54
+ Me.pnES_HEVREESS.TabIndex = 8
'
'cbES_HEVREESS
'
@@ -386,7 +389,7 @@ Partial Class BusAuxiliariesEngParametersForm
Me.pnAlternatorTechnology.Location = New System.Drawing.Point(10, 139)
Me.pnAlternatorTechnology.Name = "pnAlternatorTechnology"
Me.pnAlternatorTechnology.Size = New System.Drawing.Size(288, 28)
- Me.pnAlternatorTechnology.TabIndex = 26
+ Me.pnAlternatorTechnology.TabIndex = 4
'
'cbAlternatorTechnology
'
@@ -413,7 +416,7 @@ Partial Class BusAuxiliariesEngParametersForm
Me.pnSmartElectricParams.Location = New System.Drawing.Point(10, 168)
Me.pnSmartElectricParams.Name = "pnSmartElectricParams"
Me.pnSmartElectricParams.Size = New System.Drawing.Size(288, 96)
- Me.pnSmartElectricParams.TabIndex = 27
+ Me.pnSmartElectricParams.TabIndex = 5
'
'pnBattEfficiency
'
@@ -423,7 +426,7 @@ Partial Class BusAuxiliariesEngParametersForm
Me.pnBattEfficiency.Location = New System.Drawing.Point(0, 63)
Me.pnBattEfficiency.Name = "pnBattEfficiency"
Me.pnBattEfficiency.Size = New System.Drawing.Size(300, 28)
- Me.pnBattEfficiency.TabIndex = 28
+ Me.pnBattEfficiency.TabIndex = 2
'
'lblBatEfficiency
'
@@ -458,7 +461,7 @@ Partial Class BusAuxiliariesEngParametersForm
Me.pnElectricStorageCapacity.Location = New System.Drawing.Point(0, 33)
Me.pnElectricStorageCapacity.Name = "pnElectricStorageCapacity"
Me.pnElectricStorageCapacity.Size = New System.Drawing.Size(300, 28)
- Me.pnElectricStorageCapacity.TabIndex = 27
+ Me.pnElectricStorageCapacity.TabIndex = 1
'
'lblElectricStorageCapacity
'
@@ -493,7 +496,7 @@ Partial Class BusAuxiliariesEngParametersForm
Me.pnMaxAlternatorPower.Location = New System.Drawing.Point(0, 3)
Me.pnMaxAlternatorPower.Name = "pnMaxAlternatorPower"
Me.pnMaxAlternatorPower.Size = New System.Drawing.Size(288, 28)
- Me.pnMaxAlternatorPower.TabIndex = 26
+ Me.pnMaxAlternatorPower.TabIndex = 0
'
'lblMaxAlternatorPower
'
@@ -528,7 +531,7 @@ Partial Class BusAuxiliariesEngParametersForm
Me.pnAlternatorEfficiency.Location = New System.Drawing.Point(10, 109)
Me.pnAlternatorEfficiency.Name = "pnAlternatorEfficiency"
Me.pnAlternatorEfficiency.Size = New System.Drawing.Size(288, 28)
- Me.pnAlternatorEfficiency.TabIndex = 25
+ Me.pnAlternatorEfficiency.TabIndex = 3
'
'lblAlternatorEfficiency
'
@@ -563,7 +566,7 @@ Partial Class BusAuxiliariesEngParametersForm
Me.pnCurrentDemandEngineOffStandstill.Location = New System.Drawing.Point(10, 79)
Me.pnCurrentDemandEngineOffStandstill.Name = "pnCurrentDemandEngineOffStandstill"
Me.pnCurrentDemandEngineOffStandstill.Size = New System.Drawing.Size(288, 28)
- Me.pnCurrentDemandEngineOffStandstill.TabIndex = 26
+ Me.pnCurrentDemandEngineOffStandstill.TabIndex = 2
'
'lblCurrentDemandEngineIffStandstill
'
@@ -598,7 +601,7 @@ Partial Class BusAuxiliariesEngParametersForm
Me.pnCurrentDemandEngineOffDriving.Location = New System.Drawing.Point(10, 49)
Me.pnCurrentDemandEngineOffDriving.Name = "pnCurrentDemandEngineOffDriving"
Me.pnCurrentDemandEngineOffDriving.Size = New System.Drawing.Size(288, 28)
- Me.pnCurrentDemandEngineOffDriving.TabIndex = 25
+ Me.pnCurrentDemandEngineOffDriving.TabIndex = 1
'
'lblCurrentDemandEngineOffDriving
'
@@ -633,7 +636,7 @@ Partial Class BusAuxiliariesEngParametersForm
Me.pnCurrentDemand.Location = New System.Drawing.Point(10, 19)
Me.pnCurrentDemand.Name = "pnCurrentDemand"
Me.pnCurrentDemand.Size = New System.Drawing.Size(288, 28)
- Me.pnCurrentDemand.TabIndex = 4
+ Me.pnCurrentDemand.TabIndex = 0
'
'lblCurrentDemand
'
@@ -669,7 +672,7 @@ Partial Class BusAuxiliariesEngParametersForm
Me.bgPneumaticSystem.Location = New System.Drawing.Point(335, 74)
Me.bgPneumaticSystem.Name = "bgPneumaticSystem"
Me.bgPneumaticSystem.Size = New System.Drawing.Size(317, 181)
- Me.bgPneumaticSystem.TabIndex = 51
+ Me.bgPneumaticSystem.TabIndex = 1
Me.bgPneumaticSystem.TabStop = false
Me.bgPneumaticSystem.Text = "Pneumatic System"
'
@@ -679,7 +682,7 @@ Partial Class BusAuxiliariesEngParametersForm
Me.pnSmartCompressor.Location = New System.Drawing.Point(10, 141)
Me.pnSmartCompressor.Name = "pnSmartCompressor"
Me.pnSmartCompressor.Size = New System.Drawing.Size(288, 28)
- Me.pnSmartCompressor.TabIndex = 53
+ Me.pnSmartCompressor.TabIndex = 3
'
'cbSmartCompressor
'
@@ -699,7 +702,7 @@ Partial Class BusAuxiliariesEngParametersForm
Me.pnCompressorRatio.Location = New System.Drawing.Point(10, 111)
Me.pnCompressorRatio.Name = "pnCompressorRatio"
Me.pnCompressorRatio.Size = New System.Drawing.Size(288, 28)
- Me.pnCompressorRatio.TabIndex = 52
+ Me.pnCompressorRatio.TabIndex = 2
'
'lblCompressorRatio
'
@@ -734,7 +737,7 @@ Partial Class BusAuxiliariesEngParametersForm
Me.pnCompressorMap.Location = New System.Drawing.Point(10, 19)
Me.pnCompressorMap.Name = "pnCompressorMap"
Me.pnCompressorMap.Size = New System.Drawing.Size(288, 56)
- Me.pnCompressorMap.TabIndex = 52
+ Me.pnCompressorMap.TabIndex = 0
'
'lblCompressorMap
'
@@ -753,7 +756,6 @@ Partial Class BusAuxiliariesEngParametersForm
Me.btnBrowseCompressorMap.Name = "btnBrowseCompressorMap"
Me.btnBrowseCompressorMap.Size = New System.Drawing.Size(24, 24)
Me.btnBrowseCompressorMap.TabIndex = 2
- Me.btnBrowseCompressorMap.TabStop = false
Me.btnBrowseCompressorMap.UseVisualStyleBackColor = true
'
'tbCompressorMap
@@ -773,7 +775,7 @@ Partial Class BusAuxiliariesEngParametersForm
Me.pnAverageAirDemand.Location = New System.Drawing.Point(10, 81)
Me.pnAverageAirDemand.Name = "pnAverageAirDemand"
Me.pnAverageAirDemand.Size = New System.Drawing.Size(300, 28)
- Me.pnAverageAirDemand.TabIndex = 51
+ Me.pnAverageAirDemand.TabIndex = 1
'
'lblAverageAirDemand
'
@@ -809,7 +811,7 @@ Partial Class BusAuxiliariesEngParametersForm
Me.gbHVAC.Location = New System.Drawing.Point(658, 74)
Me.gbHVAC.Name = "gbHVAC"
Me.gbHVAC.Size = New System.Drawing.Size(317, 160)
- Me.gbHVAC.TabIndex = 52
+ Me.gbHVAC.TabIndex = 2
Me.gbHVAC.TabStop = false
Me.gbHVAC.Text = "HVAC System"
'
@@ -821,7 +823,7 @@ Partial Class BusAuxiliariesEngParametersForm
Me.pnHvacHeatingDemand.Location = New System.Drawing.Point(10, 109)
Me.pnHvacHeatingDemand.Name = "pnHvacHeatingDemand"
Me.pnHvacHeatingDemand.Size = New System.Drawing.Size(288, 28)
- Me.pnHvacHeatingDemand.TabIndex = 27
+ Me.pnHvacHeatingDemand.TabIndex = 3
'
'lblHvacHeatingDemand
'
@@ -856,7 +858,7 @@ Partial Class BusAuxiliariesEngParametersForm
Me.pnHvacAuxHeaterPwr.Location = New System.Drawing.Point(10, 79)
Me.pnHvacAuxHeaterPwr.Name = "pnHvacAuxHeaterPwr"
Me.pnHvacAuxHeaterPwr.Size = New System.Drawing.Size(288, 28)
- Me.pnHvacAuxHeaterPwr.TabIndex = 27
+ Me.pnHvacAuxHeaterPwr.TabIndex = 2
'
'lblHvacAuxHEaterPwr
'
@@ -891,7 +893,7 @@ Partial Class BusAuxiliariesEngParametersForm
Me.pnHvacElecPowerDemand.Location = New System.Drawing.Point(10, 49)
Me.pnHvacElecPowerDemand.Name = "pnHvacElecPowerDemand"
Me.pnHvacElecPowerDemand.Size = New System.Drawing.Size(288, 28)
- Me.pnHvacElecPowerDemand.TabIndex = 27
+ Me.pnHvacElecPowerDemand.TabIndex = 1
'
'lblHvacElectricPowerDemand
'
@@ -926,7 +928,7 @@ Partial Class BusAuxiliariesEngParametersForm
Me.pnHvacMechPowerDemand.Location = New System.Drawing.Point(10, 19)
Me.pnHvacMechPowerDemand.Name = "pnHvacMechPowerDemand"
Me.pnHvacMechPowerDemand.Size = New System.Drawing.Size(288, 28)
- Me.pnHvacMechPowerDemand.TabIndex = 27
+ Me.pnHvacMechPowerDemand.TabIndex = 0
'
'lblHvacMechPowerDemand
'
@@ -959,7 +961,7 @@ Partial Class BusAuxiliariesEngParametersForm
Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.CancelButton = Me.ButCancel
- Me.ClientSize = New System.Drawing.Size(1023, 553)
+ Me.ClientSize = New System.Drawing.Size(1023, 446)
Me.Controls.Add(Me.gbHVAC)
Me.Controls.Add(Me.bgPneumaticSystem)
Me.Controls.Add(Me.gbElectricSystem)
diff --git a/VECTO/GUI/EMGearRatioDialog.Designer.vb b/VECTO/GUI/EMGearRatioDialog.Designer.vb
index 1e407e203f3f59bc089b30cb353dda99277d105e..2cbecc5a7122a375531dbd689e74d3ba04eef5bb 100644
--- a/VECTO/GUI/EMGearRatioDialog.Designer.vb
+++ b/VECTO/GUI/EMGearRatioDialog.Designer.vb
@@ -67,7 +67,7 @@ Partial Class EMGearRatioDialog
Me.OK_Button.Location = New System.Drawing.Point(3, 3)
Me.OK_Button.Name = "OK_Button"
Me.OK_Button.Size = New System.Drawing.Size(67, 23)
- Me.OK_Button.TabIndex = 0
+ Me.OK_Button.TabIndex = 2
Me.OK_Button.Text = "OK"
'
'Cancel_Button
@@ -77,7 +77,7 @@ Partial Class EMGearRatioDialog
Me.Cancel_Button.Location = New System.Drawing.Point(76, 3)
Me.Cancel_Button.Name = "Cancel_Button"
Me.Cancel_Button.Size = New System.Drawing.Size(67, 23)
- Me.Cancel_Button.TabIndex = 1
+ Me.Cancel_Button.TabIndex = 3
Me.Cancel_Button.Text = "Cancel"
'
'Label3
@@ -94,7 +94,7 @@ Partial Class EMGearRatioDialog
Me.tbGear.Location = New System.Drawing.Point(70, 12)
Me.tbGear.Name = "tbGear"
Me.tbGear.Size = New System.Drawing.Size(41, 20)
- Me.tbGear.TabIndex = 2
+ Me.tbGear.TabIndex = 0
Me.tbGear.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
'
'Label5
@@ -120,7 +120,7 @@ Partial Class EMGearRatioDialog
Me.tbGearRatio.Location = New System.Drawing.Point(241, 13)
Me.tbGearRatio.Name = "tbGearRatio"
Me.tbGearRatio.Size = New System.Drawing.Size(84, 20)
- Me.tbGearRatio.TabIndex = 3
+ Me.tbGearRatio.TabIndex = 1
Me.tbGearRatio.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
'
'EMGearRatioDialog
diff --git a/VECTO/GUI/ElectricMotorForm.Designer.vb b/VECTO/GUI/ElectricMotorForm.Designer.vb
index 70818ca19372d4782f72896991e797ce838f401e..787eda5c704162d2e97bb52640985ff27f3fec1f 100644
--- a/VECTO/GUI/ElectricMotorForm.Designer.vb
+++ b/VECTO/GUI/ElectricMotorForm.Designer.vb
@@ -60,10 +60,6 @@ Partial Class ElectricMotorForm
Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.pnInertia = New System.Windows.Forms.Panel()
- Me.tbDragTorqueHi = New System.Windows.Forms.TextBox()
- Me.lblDragTorqueHi = New System.Windows.Forms.Label()
- Me.btnBrowseDragCurveHi = New System.Windows.Forms.Button()
- Me.btnDragCurveOpenHi = New System.Windows.Forms.Button()
Me.btnEmMapOpenHi = New System.Windows.Forms.Button()
Me.btnBrowseEmMapHi = New System.Windows.Forms.Button()
Me.lblPowerMapHi = New System.Windows.Forms.Label()
@@ -163,20 +159,20 @@ 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(811, 574)
+ Me.ButCancel.Location = New System.Drawing.Point(839, 567)
Me.ButCancel.Name = "ButCancel"
Me.ButCancel.Size = New System.Drawing.Size(75, 23)
- Me.ButCancel.TabIndex = 13
+ Me.ButCancel.TabIndex = 99
Me.ButCancel.Text = "Cancel"
Me.ButCancel.UseVisualStyleBackColor = true
'
'ButOK
'
Me.ButOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.ButOK.Location = New System.Drawing.Point(730, 574)
+ Me.ButOK.Location = New System.Drawing.Point(758, 567)
Me.ButOK.Name = "ButOK"
Me.ButOK.Size = New System.Drawing.Size(75, 23)
- Me.ButOK.TabIndex = 12
+ Me.ButOK.TabIndex = 98
Me.ButOK.Text = "Save"
Me.ButOK.UseVisualStyleBackColor = true
'
@@ -188,7 +184,7 @@ Partial Class ElectricMotorForm
Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
Me.ToolStrip1.Name = "ToolStrip1"
Me.ToolStrip1.Padding = New System.Windows.Forms.Padding(0, 0, 2, 0)
- Me.ToolStrip1.Size = New System.Drawing.Size(898, 31)
+ Me.ToolStrip1.Size = New System.Drawing.Size(926, 31)
Me.ToolStrip1.TabIndex = 30
Me.ToolStrip1.Text = "ToolStrip1"
'
@@ -265,9 +261,9 @@ Partial Class ElectricMotorForm
'
Me.StatusStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LbStatus})
- Me.StatusStrip1.Location = New System.Drawing.Point(0, 599)
+ Me.StatusStrip1.Location = New System.Drawing.Point(0, 592)
Me.StatusStrip1.Name = "StatusStrip1"
- Me.StatusStrip1.Size = New System.Drawing.Size(898, 22)
+ Me.StatusStrip1.Size = New System.Drawing.Size(926, 22)
Me.StatusStrip1.SizingGrip = false
Me.StatusStrip1.TabIndex = 37
Me.StatusStrip1.Text = "StatusStrip1"
@@ -331,68 +327,30 @@ Partial Class ElectricMotorForm
Me.pnInertia.Location = New System.Drawing.Point(12, 108)
Me.pnInertia.Name = "pnInertia"
Me.pnInertia.Size = New System.Drawing.Size(221, 30)
- Me.pnInertia.TabIndex = 3
- '
- 'tbDragTorqueHi
- '
- Me.tbDragTorqueHi.Location = New System.Drawing.Point(6, 103)
- Me.tbDragTorqueHi.Name = "tbDragTorqueHi"
- Me.tbDragTorqueHi.Size = New System.Drawing.Size(406, 20)
- Me.tbDragTorqueHi.TabIndex = 5
- '
- 'lblDragTorqueHi
- '
- Me.lblDragTorqueHi.AutoSize = true
- Me.lblDragTorqueHi.Location = New System.Drawing.Point(6, 87)
- Me.lblDragTorqueHi.Name = "lblDragTorqueHi"
- Me.lblDragTorqueHi.Size = New System.Drawing.Size(98, 13)
- Me.lblDragTorqueHi.TabIndex = 38
- Me.lblDragTorqueHi.Text = "Drag Torque Curve"
- '
- 'btnBrowseDragCurveHi
- '
- Me.btnBrowseDragCurveHi.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnBrowseDragCurveHi.Location = New System.Drawing.Point(420, 100)
- Me.btnBrowseDragCurveHi.Name = "btnBrowseDragCurveHi"
- Me.btnBrowseDragCurveHi.Size = New System.Drawing.Size(24, 24)
- Me.btnBrowseDragCurveHi.TabIndex = 6
- Me.btnBrowseDragCurveHi.TabStop = false
- Me.btnBrowseDragCurveHi.UseVisualStyleBackColor = true
- '
- 'btnDragCurveOpenHi
- '
- Me.btnDragCurveOpenHi.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btnDragCurveOpenHi.Location = New System.Drawing.Point(443, 100)
- Me.btnDragCurveOpenHi.Name = "btnDragCurveOpenHi"
- Me.btnDragCurveOpenHi.Size = New System.Drawing.Size(24, 24)
- Me.btnDragCurveOpenHi.TabIndex = 7
- Me.btnDragCurveOpenHi.TabStop = false
- Me.btnDragCurveOpenHi.UseVisualStyleBackColor = true
+ 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, 141)
+ Me.btnEmMapOpenHi.Location = New System.Drawing.Point(443, 102)
Me.btnEmMapOpenHi.Name = "btnEmMapOpenHi"
Me.btnEmMapOpenHi.Size = New System.Drawing.Size(24, 24)
- Me.btnEmMapOpenHi.TabIndex = 42
- Me.btnEmMapOpenHi.TabStop = false
+ 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, 141)
+ Me.btnBrowseEmMapHi.Location = New System.Drawing.Point(420, 102)
Me.btnBrowseEmMapHi.Name = "btnBrowseEmMapHi"
Me.btnBrowseEmMapHi.Size = New System.Drawing.Size(24, 24)
- Me.btnBrowseEmMapHi.TabIndex = 41
- Me.btnBrowseEmMapHi.TabStop = false
+ Me.btnBrowseEmMapHi.TabIndex = 8
Me.btnBrowseEmMapHi.UseVisualStyleBackColor = true
'
'lblPowerMapHi
'
Me.lblPowerMapHi.AutoSize = true
- Me.lblPowerMapHi.Location = New System.Drawing.Point(6, 128)
+ Me.lblPowerMapHi.Location = New System.Drawing.Point(6, 89)
Me.lblPowerMapHi.Name = "lblPowerMapHi"
Me.lblPowerMapHi.Size = New System.Drawing.Size(163, 13)
Me.lblPowerMapHi.TabIndex = 43
@@ -400,10 +358,10 @@ Partial Class ElectricMotorForm
'
'tbMapHi
'
- Me.tbMapHi.Location = New System.Drawing.Point(6, 144)
+ Me.tbMapHi.Location = New System.Drawing.Point(6, 105)
Me.tbMapHi.Name = "tbMapHi"
Me.tbMapHi.Size = New System.Drawing.Size(406, 20)
- Me.tbMapHi.TabIndex = 40
+ Me.tbMapHi.TabIndex = 7
'
'btnMaxTorqueCurveOpenHi
'
@@ -411,8 +369,7 @@ Partial Class ElectricMotorForm
Me.btnMaxTorqueCurveOpenHi.Location = New System.Drawing.Point(443, 60)
Me.btnMaxTorqueCurveOpenHi.Name = "btnMaxTorqueCurveOpenHi"
Me.btnMaxTorqueCurveOpenHi.Size = New System.Drawing.Size(24, 24)
- Me.btnMaxTorqueCurveOpenHi.TabIndex = 46
- Me.btnMaxTorqueCurveOpenHi.TabStop = false
+ Me.btnMaxTorqueCurveOpenHi.TabIndex = 3
Me.btnMaxTorqueCurveOpenHi.UseVisualStyleBackColor = true
'
'btnBrowseMaxTorqueHi
@@ -421,8 +378,7 @@ Partial Class ElectricMotorForm
Me.btnBrowseMaxTorqueHi.Location = New System.Drawing.Point(420, 60)
Me.btnBrowseMaxTorqueHi.Name = "btnBrowseMaxTorqueHi"
Me.btnBrowseMaxTorqueHi.Size = New System.Drawing.Size(24, 24)
- Me.btnBrowseMaxTorqueHi.TabIndex = 45
- Me.btnBrowseMaxTorqueHi.TabStop = false
+ Me.btnBrowseMaxTorqueHi.TabIndex = 2
Me.btnBrowseMaxTorqueHi.UseVisualStyleBackColor = true
'
'lblMaxTorqueHi
@@ -439,14 +395,14 @@ Partial Class ElectricMotorForm
Me.tbMaxTorqueHi.Location = New System.Drawing.Point(6, 62)
Me.tbMaxTorqueHi.Name = "tbMaxTorqueHi"
Me.tbMaxTorqueHi.Size = New System.Drawing.Size(406, 20)
- Me.tbMaxTorqueHi.TabIndex = 44
+ Me.tbMaxTorqueHi.TabIndex = 1
'
'lblTitle
'
Me.lblTitle.AutoSize = true
Me.lblTitle.BackColor = System.Drawing.Color.White
Me.lblTitle.Font = New System.Drawing.Font("Microsoft Sans Serif", 18!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- Me.lblTitle.Location = New System.Drawing.Point(84, 34)
+ Me.lblTitle.Location = New System.Drawing.Point(115, 34)
Me.lblTitle.Name = "lblTitle"
Me.lblTitle.Size = New System.Drawing.Size(190, 29)
Me.lblTitle.TabIndex = 48
@@ -470,7 +426,7 @@ Partial Class ElectricMotorForm
Me.Panel1.Location = New System.Drawing.Point(12, 144)
Me.Panel1.Name = "Panel1"
Me.Panel1.Size = New System.Drawing.Size(221, 30)
- Me.Panel1.TabIndex = 25
+ Me.Panel1.TabIndex = 2
'
'lblContTq
'
@@ -505,7 +461,7 @@ Partial Class ElectricMotorForm
Me.Panel2.Location = New System.Drawing.Point(12, 206)
Me.Panel2.Name = "Panel2"
Me.Panel2.Size = New System.Drawing.Size(221, 30)
- Me.Panel2.TabIndex = 25
+ Me.Panel2.TabIndex = 4
'
'lblOvlTime
'
@@ -540,7 +496,7 @@ Partial Class ElectricMotorForm
Me.Panel3.Location = New System.Drawing.Point(233, 206)
Me.Panel3.Name = "Panel3"
Me.Panel3.Size = New System.Drawing.Size(261, 30)
- Me.Panel3.TabIndex = 26
+ Me.Panel3.TabIndex = 7
'
'lblOvlRecovery
'
@@ -575,7 +531,7 @@ Partial Class ElectricMotorForm
Me.Panel4.Location = New System.Drawing.Point(233, 144)
Me.Panel4.Name = "Panel4"
Me.Panel4.Size = New System.Drawing.Size(261, 30)
- Me.Panel4.TabIndex = 26
+ Me.Panel4.TabIndex = 5
'
'lblRatedSpeed
'
@@ -610,7 +566,7 @@ Partial Class ElectricMotorForm
Me.pnOverloadTq.Location = New System.Drawing.Point(12, 175)
Me.pnOverloadTq.Name = "pnOverloadTq"
Me.pnOverloadTq.Size = New System.Drawing.Size(221, 30)
- Me.pnOverloadTq.TabIndex = 26
+ Me.pnOverloadTq.TabIndex = 3
'
'lblOverloadTq
'
@@ -645,7 +601,7 @@ Partial Class ElectricMotorForm
Me.Panel6.Location = New System.Drawing.Point(233, 175)
Me.Panel6.Name = "Panel6"
Me.Panel6.Size = New System.Drawing.Size(261, 30)
- Me.Panel6.TabIndex = 27
+ Me.Panel6.TabIndex = 6
'
'lblOverloadSpeed
'
@@ -678,10 +634,6 @@ Partial Class ElectricMotorForm
Me.gbVoltageLevelHi.Controls.Add(Me.lblVoltageHiUnit)
Me.gbVoltageLevelHi.Controls.Add(Me.tbVoltageHi)
Me.gbVoltageLevelHi.Controls.Add(Me.lblMaxTorqueHi)
- Me.gbVoltageLevelHi.Controls.Add(Me.tbDragTorqueHi)
- Me.gbVoltageLevelHi.Controls.Add(Me.lblDragTorqueHi)
- Me.gbVoltageLevelHi.Controls.Add(Me.btnBrowseDragCurveHi)
- Me.gbVoltageLevelHi.Controls.Add(Me.btnDragCurveOpenHi)
Me.gbVoltageLevelHi.Controls.Add(Me.tbMapHi)
Me.gbVoltageLevelHi.Controls.Add(Me.lblPowerMapHi)
Me.gbVoltageLevelHi.Controls.Add(Me.btnBrowseEmMapHi)
@@ -689,10 +641,10 @@ 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, 418)
+ Me.gbVoltageLevelHi.Location = New System.Drawing.Point(12, 382)
Me.gbVoltageLevelHi.Name = "gbVoltageLevelHi"
- Me.gbVoltageLevelHi.Size = New System.Drawing.Size(482, 170)
- Me.gbVoltageLevelHi.TabIndex = 50
+ Me.gbVoltageLevelHi.Size = New System.Drawing.Size(482, 136)
+ Me.gbVoltageLevelHi.TabIndex = 9
Me.gbVoltageLevelHi.TabStop = false
Me.gbVoltageLevelHi.Text = "Voltage Level High"
'
@@ -719,7 +671,7 @@ Partial Class ElectricMotorForm
Me.tbVoltageHi.Location = New System.Drawing.Point(136, 19)
Me.tbVoltageHi.Name = "tbVoltageHi"
Me.tbVoltageHi.Size = New System.Drawing.Size(49, 20)
- Me.tbVoltageHi.TabIndex = 49
+ Me.tbVoltageHi.TabIndex = 0
'
'gbVoltageLevelLow
'
@@ -727,10 +679,6 @@ Partial Class ElectricMotorForm
Me.gbVoltageLevelLow.Controls.Add(Me.lblVoltageLowUnit)
Me.gbVoltageLevelLow.Controls.Add(Me.tbVoltageLow)
Me.gbVoltageLevelLow.Controls.Add(Me.lblMaxTorqueLow)
- Me.gbVoltageLevelLow.Controls.Add(Me.tbDragTorqueLow)
- Me.gbVoltageLevelLow.Controls.Add(Me.lblDragTorqueLow)
- Me.gbVoltageLevelLow.Controls.Add(Me.btnBrowseDragCurveLow)
- Me.gbVoltageLevelLow.Controls.Add(Me.btnDragCurveOpenLow)
Me.gbVoltageLevelLow.Controls.Add(Me.tbMapLow)
Me.gbVoltageLevelLow.Controls.Add(Me.lblPowerMapLow)
Me.gbVoltageLevelLow.Controls.Add(Me.btnBrowseEmMapLow)
@@ -740,8 +688,8 @@ Partial Class ElectricMotorForm
Me.gbVoltageLevelLow.Controls.Add(Me.btnBrowseMaxTorqueLow)
Me.gbVoltageLevelLow.Location = New System.Drawing.Point(12, 242)
Me.gbVoltageLevelLow.Name = "gbVoltageLevelLow"
- Me.gbVoltageLevelLow.Size = New System.Drawing.Size(482, 170)
- Me.gbVoltageLevelLow.TabIndex = 51
+ Me.gbVoltageLevelLow.Size = New System.Drawing.Size(482, 134)
+ Me.gbVoltageLevelLow.TabIndex = 8
Me.gbVoltageLevelLow.TabStop = false
Me.gbVoltageLevelLow.Text = "Voltage Level Low"
'
@@ -768,7 +716,7 @@ Partial Class ElectricMotorForm
Me.tbVoltageLow.Location = New System.Drawing.Point(136, 19)
Me.tbVoltageLow.Name = "tbVoltageLow"
Me.tbVoltageLow.Size = New System.Drawing.Size(49, 20)
- Me.tbVoltageLow.TabIndex = 49
+ Me.tbVoltageLow.TabIndex = 0
'
'lblMaxTorqueLow
'
@@ -781,15 +729,15 @@ Partial Class ElectricMotorForm
'
'tbDragTorqueLow
'
- Me.tbDragTorqueLow.Location = New System.Drawing.Point(6, 103)
+ 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 = 5
+ Me.tbDragTorqueLow.TabIndex = 10
'
'lblDragTorqueLow
'
Me.lblDragTorqueLow.AutoSize = true
- Me.lblDragTorqueLow.Location = New System.Drawing.Point(6, 87)
+ 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
@@ -798,34 +746,32 @@ Partial Class ElectricMotorForm
'btnBrowseDragCurveLow
'
Me.btnBrowseDragCurveLow.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnBrowseDragCurveLow.Location = New System.Drawing.Point(420, 100)
+ 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 = 6
- Me.btnBrowseDragCurveLow.TabStop = false
+ 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(443, 100)
+ 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 = 7
- Me.btnDragCurveOpenLow.TabStop = false
+ Me.btnDragCurveOpenLow.TabIndex = 12
Me.btnDragCurveOpenLow.UseVisualStyleBackColor = true
'
'tbMapLow
'
- Me.tbMapLow.Location = New System.Drawing.Point(6, 144)
+ Me.tbMapLow.Location = New System.Drawing.Point(6, 104)
Me.tbMapLow.Name = "tbMapLow"
Me.tbMapLow.Size = New System.Drawing.Size(406, 20)
- Me.tbMapLow.TabIndex = 40
+ Me.tbMapLow.TabIndex = 7
'
'lblPowerMapLow
'
Me.lblPowerMapLow.AutoSize = true
- Me.lblPowerMapLow.Location = New System.Drawing.Point(6, 128)
+ Me.lblPowerMapLow.Location = New System.Drawing.Point(6, 88)
Me.lblPowerMapLow.Name = "lblPowerMapLow"
Me.lblPowerMapLow.Size = New System.Drawing.Size(163, 13)
Me.lblPowerMapLow.TabIndex = 43
@@ -834,21 +780,19 @@ Partial Class ElectricMotorForm
'btnBrowseEmMapLow
'
Me.btnBrowseEmMapLow.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnBrowseEmMapLow.Location = New System.Drawing.Point(420, 141)
+ Me.btnBrowseEmMapLow.Location = New System.Drawing.Point(420, 101)
Me.btnBrowseEmMapLow.Name = "btnBrowseEmMapLow"
Me.btnBrowseEmMapLow.Size = New System.Drawing.Size(24, 24)
- Me.btnBrowseEmMapLow.TabIndex = 41
- Me.btnBrowseEmMapLow.TabStop = false
+ 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, 141)
+ Me.btnEmMapOpenLow.Location = New System.Drawing.Point(443, 101)
Me.btnEmMapOpenLow.Name = "btnEmMapOpenLow"
Me.btnEmMapOpenLow.Size = New System.Drawing.Size(24, 24)
- Me.btnEmMapOpenLow.TabIndex = 42
- Me.btnEmMapOpenLow.TabStop = false
+ Me.btnEmMapOpenLow.TabIndex = 9
Me.btnEmMapOpenLow.UseVisualStyleBackColor = true
'
'tbMaxTorqueLow
@@ -856,7 +800,7 @@ Partial Class ElectricMotorForm
Me.tbMaxTorqueLow.Location = New System.Drawing.Point(6, 62)
Me.tbMaxTorqueLow.Name = "tbMaxTorqueLow"
Me.tbMaxTorqueLow.Size = New System.Drawing.Size(406, 20)
- Me.tbMaxTorqueLow.TabIndex = 44
+ Me.tbMaxTorqueLow.TabIndex = 1
'
'btnMaxTorqueCurveOpenLow
'
@@ -864,8 +808,7 @@ Partial Class ElectricMotorForm
Me.btnMaxTorqueCurveOpenLow.Location = New System.Drawing.Point(443, 60)
Me.btnMaxTorqueCurveOpenLow.Name = "btnMaxTorqueCurveOpenLow"
Me.btnMaxTorqueCurveOpenLow.Size = New System.Drawing.Size(24, 24)
- Me.btnMaxTorqueCurveOpenLow.TabIndex = 46
- Me.btnMaxTorqueCurveOpenLow.TabStop = false
+ Me.btnMaxTorqueCurveOpenLow.TabIndex = 3
Me.btnMaxTorqueCurveOpenLow.UseVisualStyleBackColor = true
'
'btnBrowseMaxTorqueLow
@@ -874,8 +817,7 @@ Partial Class ElectricMotorForm
Me.btnBrowseMaxTorqueLow.Location = New System.Drawing.Point(420, 60)
Me.btnBrowseMaxTorqueLow.Name = "btnBrowseMaxTorqueLow"
Me.btnBrowseMaxTorqueLow.Size = New System.Drawing.Size(24, 24)
- Me.btnBrowseMaxTorqueLow.TabIndex = 45
- Me.btnBrowseMaxTorqueLow.TabStop = false
+ Me.btnBrowseMaxTorqueLow.TabIndex = 2
Me.btnBrowseMaxTorqueLow.UseVisualStyleBackColor = true
'
'ElectricMotorForm
@@ -884,12 +826,16 @@ Partial Class ElectricMotorForm
Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.CancelButton = Me.ButCancel
- Me.ClientSize = New System.Drawing.Size(898, 621)
+ Me.ClientSize = New System.Drawing.Size(926, 614)
Me.Controls.Add(Me.gbVoltageLevelLow)
Me.Controls.Add(Me.gbVoltageLevelHi)
Me.Controls.Add(Me.Panel6)
+ Me.Controls.Add(Me.tbDragTorqueLow)
+ Me.Controls.Add(Me.lblDragTorqueLow)
Me.Controls.Add(Me.pnOverloadTq)
+ Me.Controls.Add(Me.btnBrowseDragCurveLow)
Me.Controls.Add(Me.Panel4)
+ Me.Controls.Add(Me.btnDragCurveOpenLow)
Me.Controls.Add(Me.Panel3)
Me.Controls.Add(Me.Panel2)
Me.Controls.Add(Me.Panel1)
@@ -962,10 +908,6 @@ End Sub
Friend WithEvents OpenWithToolStripMenuItem As ToolStripMenuItem
Friend WithEvents ShowInFolderToolStripMenuItem As ToolStripMenuItem
Friend WithEvents pnInertia As Panel
- Friend WithEvents tbDragTorqueHi As TextBox
- Friend WithEvents lblDragTorqueHi As Label
- Friend WithEvents btnBrowseDragCurveHi As Button
- Friend WithEvents btnDragCurveOpenHi As Button
Friend WithEvents btnEmMapOpenHi As Button
Friend WithEvents btnBrowseEmMapHi As Button
Friend WithEvents lblPowerMapHi As Label
diff --git a/VECTO/GUI/ElectricMotorForm.vb b/VECTO/GUI/ElectricMotorForm.vb
index e2e982126fee3127c60b74b036541b2a25715bdc..b1b93a450f00c8f1ec7c889dbe0afca779676ef4 100644
--- a/VECTO/GUI/ElectricMotorForm.vb
+++ b/VECTO/GUI/ElectricMotorForm.vb
@@ -133,7 +133,6 @@ Public Class ElectricMotorForm
tbMakeModel.Text = ""
tbInertia.Text = ""
tbMapHi.Text = ""
- tbDragTorqueHi.Text = ""
tbMaxTorqueHi.Text = ""
DeclInit()
@@ -180,16 +179,17 @@ Public Class ElectricMotorForm
tbRatedSpeed.Text = engine.ContinuousTorqueSpeed.AsRPM.ToGUIFormat()
tbOverloadRecoveryFactor.Text = engine.OverloadRecoveryFactor.ToGUIFormat()
+ tbDragTorqueLow.Text = GetRelativePath(engine.DragCurve.Source, basePath)
+
Dim voltageLevelHigh As IElectricMotorVoltageLevel = engine.VoltageLevels.MaxBy(function(level) level.VoltageLevel.Value())
- tbDragTorqueHi.Text = GetRelativePath(voltageLevelHigh.DragCurve.Source, basePath)
tbMaxTorqueHi.Text = GetRelativePath(voltageLevelHigh.FullLoadCurve.Source, basePath)
tbMapHi.Text = GetRelativePath(voltageLevelHigh.EfficiencyMap.Source, basePath)
tbVoltageHi.Text = voltageLevelHigh.VoltageLevel.Value().ToGUIFormat()
Dim voltageLevelLow As IElectricMotorVoltageLevel = engine.VoltageLevels.MinBy(function(level) level.VoltageLevel.Value())
- tbDragTorqueLow.Text = GetRelativePath(voltageLevelLow.DragCurve.Source, basePath)
+
tbMaxTorqueLow.Text = GetRelativePath(voltageLevelLow.FullLoadCurve.Source, basePath)
tbMapLow.Text = GetRelativePath(voltageLevelLow.EfficiencyMap.Source, basePath)
tbVoltageLow.Text = voltageLevelLow.VoltageLevel.Value().ToGUIFormat()
@@ -236,12 +236,11 @@ Public Class ElectricMotorForm
em.OverloadRecoveryFactor = tbOverloadRecoveryFactor.Text.ToDouble(0)
em.PathMaxTorqueLow = tbMaxTorqueLow.Text
- em.PathDragLow = tbDragTorqueLow.Text
+ em.PathDrag = tbDragTorqueLow.Text
em.PathMapLow = tbMapLow.Text
em.VoltageLevelLow = tbVoltageLow.Text.ToDouble(0)
em.PathMaxTorqueHi = tbMaxTorqueHi.Text
- em.PathDragHi = tbDragTorqueHi.Text
em.PathMapHi = tbMapHi.Text
em.VoltageLevelHigh = tbVoltageHi.Text.ToDouble(0)
@@ -304,7 +303,7 @@ Public Class ElectricMotorForm
End Sub
Private Sub DataChangedUpdatePic(sender As Object, e As EventArgs) _
- Handles tbDragTorqueHi.TextChanged, tbMaxTorqueLow.TextChanged, tbMaxTorqueHi.TextChanged, tbDragTorqueLow.TextChanged
+ Handles tbMaxTorqueLow.TextChanged, tbMaxTorqueHi.TextChanged, tbDragTorqueLow.TextChanged
UpdatePic()
Change()
End Sub
@@ -335,7 +334,7 @@ Public Class ElectricMotorForm
Try
Dim fldFile As String =
- If(Not String.IsNullOrWhiteSpace(_emFile), Path.Combine(Path.GetDirectoryName(_emFile), tbMaxTorqueHi.Text), tbDragTorqueHi.Text)
+ If(Not String.IsNullOrWhiteSpace(_emFile), Path.Combine(Path.GetDirectoryName(_emFile), tbMaxTorqueHi.Text), tbDragTorqueLow.Text)
If File.Exists(fldFile) Then _
fullLoadCurve = ElectricFullLoadCurveReader.Create(VectoCSVFile.Read(fldFile), 1)
Catch ex As Exception
@@ -350,7 +349,7 @@ Public Class ElectricMotorForm
Try
Dim dragFile As String =
- If(Not String.IsNullOrWhiteSpace(_emFile), Path.Combine(Path.GetDirectoryName(_emFile), tbDragTorqueHi.Text), tbMapHi.Text)
+ If(Not String.IsNullOrWhiteSpace(_emFile), Path.Combine(Path.GetDirectoryName(_emFile), tbDragTorqueLow.Text), tbMapHi.Text)
If File.Exists(dragFile) Then dragCurve = ElectricMotorDragCurveReader.Create(VectoCSVFile.Read(dragFile), 1)
Catch ex As Exception
End Try
@@ -371,7 +370,7 @@ Public Class ElectricMotorForm
series.ChartType = SeriesChartType.FastLine
series.BorderWidth = 2
series.Color = Color.DarkBlue
- series.Name = "Max drive torque (" & tbDragTorqueHi.Text & ")"
+ series.Name = "Max drive torque (" & tbDragTorqueLow.Text & ")"
chart.Series.Add(series)
series = New Series
@@ -495,9 +494,6 @@ Public Class ElectricMotorForm
CreateNewFile(tbMaxTorqueHi)
End Sub
- Private Sub btnDragCurveOpen_Click(sender As Object, e As EventArgs) Handles btnDragCurveOpenHi.Click
- CreateNewFile(tbDragTorqueHi)
- End Sub
Private Sub btnEmMapOpen_Click(sender As Object, e As EventArgs) Handles btnEmMapOpenHi.Click
CreateNewFile(tbMapHi)
@@ -519,11 +515,7 @@ Public Class ElectricMotorForm
SelectFile(ElectricMachineMaxTorqueFileBrowser, tbMaxTorqueHi)
End Sub
- Private Sub btnBrowseDragCurve_Click(sender As Object, e As EventArgs) Handles btnBrowseDragCurveHi.Click
- SelectFile(ElectricMachineDragTorqueFileBrowser, tbDragTorqueHi)
- End Sub
-
- Private Sub btnBrowseEmMap_Click(sender As Object, e As EventArgs) Handles btnBrowseEmMapHi.Click
+ Private Sub btnBrowseEmMap_Click(sender As Object, e As EventArgs) Handles btnBrowseEmMapHi.Click
SelectFile(ElectricMachineEfficiencyMapFileBrowser, tbMapHi)
End Sub
diff --git a/VECTO/GUI/EngineForm.Designer.vb b/VECTO/GUI/EngineForm.Designer.vb
index a030550927d7fffc10ca79946d0cafcb237d1796..742146d7d413aeb0016eae1ff340decd70638739 100644
--- a/VECTO/GUI/EngineForm.Designer.vb
+++ b/VECTO/GUI/EngineForm.Designer.vb
@@ -130,8 +130,11 @@ Partial Class EngineForm
Me.Label35 = New System.Windows.Forms.Label()
Me.cbDualFuel = New System.Windows.Forms.CheckBox()
Me.tbWHR = New System.Windows.Forms.TabControl()
+ Me.TabPage1 = New System.Windows.Forms.TabPage()
+ Me.cbElWHR = New System.Windows.Forms.CheckBox()
+ Me.cbMechWHRNotConnectedCrankshaft = New System.Windows.Forms.CheckBox()
+ Me.cbMechWHRInMap = New System.Windows.Forms.CheckBox()
Me.tbElectricalWHR = New System.Windows.Forms.TabPage()
- Me.tbMechanicalWHR = New System.Windows.Forms.TabPage()
Me.Label36 = New System.Windows.Forms.Label()
Me.pnElWHRDeclaration = New System.Windows.Forms.Panel()
Me.lblWHRRegPer = New System.Windows.Forms.Label()
@@ -148,6 +151,7 @@ Partial Class EngineForm
Me.pnElWhrEngineering = New System.Windows.Forms.Panel()
Me.tbElWHREngineering = New System.Windows.Forms.TextBox()
Me.Label26 = New System.Windows.Forms.Label()
+ Me.tbMechanicalWHR = New System.Windows.Forms.TabPage()
Me.Label37 = New System.Windows.Forms.Label()
Me.pnMechWhrDeclaration = New System.Windows.Forms.Panel()
Me.Label38 = New System.Windows.Forms.Label()
@@ -164,10 +168,6 @@ Partial Class EngineForm
Me.pnMechWhrEngineering = New System.Windows.Forms.Panel()
Me.tbMechWHREngineering = New System.Windows.Forms.TextBox()
Me.Label46 = New System.Windows.Forms.Label()
- Me.TabPage1 = New System.Windows.Forms.TabPage()
- Me.cbMechWHRInMap = New System.Windows.Forms.CheckBox()
- Me.cbMechWHRNotConnectedCrankshaft = New System.Windows.Forms.CheckBox()
- Me.cbElWHR = New System.Windows.Forms.CheckBox()
Me.ToolStrip1.SuspendLayout
Me.StatusStrip1.SuspendLayout
CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).BeginInit
@@ -184,13 +184,13 @@ Partial Class EngineForm
Me.pnWhtcFuel2.SuspendLayout
Me.pnEngCFFuel2.SuspendLayout
Me.tbWHR.SuspendLayout
+ Me.TabPage1.SuspendLayout
Me.tbElectricalWHR.SuspendLayout
- Me.tbMechanicalWHR.SuspendLayout
Me.pnElWHRDeclaration.SuspendLayout
Me.pnElWhrEngineering.SuspendLayout
+ Me.tbMechanicalWHR.SuspendLayout
Me.pnMechWhrDeclaration.SuspendLayout
Me.pnMechWhrEngineering.SuspendLayout
- Me.TabPage1.SuspendLayout
Me.SuspendLayout
'
'TbIdleSpeed
@@ -214,7 +214,7 @@ Partial Class EngineForm
Me.TbInertia.Location = New System.Drawing.Point(111, 4)
Me.TbInertia.Name = "TbInertia"
Me.TbInertia.Size = New System.Drawing.Size(57, 20)
- Me.TbInertia.TabIndex = 3
+ Me.TbInertia.TabIndex = 0
'
'Label41
'
@@ -250,7 +250,7 @@ Partial Class EngineForm
Me.ButCancel.Location = New System.Drawing.Point(916, 552)
Me.ButCancel.Name = "ButCancel"
Me.ButCancel.Size = New System.Drawing.Size(75, 23)
- Me.ButCancel.TabIndex = 13
+ Me.ButCancel.TabIndex = 14
Me.ButCancel.Text = "Cancel"
Me.ButCancel.UseVisualStyleBackColor = true
'
@@ -260,17 +260,18 @@ Partial Class EngineForm
Me.ButOK.Location = New System.Drawing.Point(835, 552)
Me.ButOK.Name = "ButOK"
Me.ButOK.Size = New System.Drawing.Size(75, 23)
- Me.ButOK.TabIndex = 12
+ Me.ButOK.TabIndex = 13
Me.ButOK.Text = "Save"
Me.ButOK.UseVisualStyleBackColor = true
'
'ToolStrip1
'
Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
+ Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator3, Me.ToolStripBtSendTo, Me.ToolStripSeparator1, Me.ToolStripButton1})
Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
Me.ToolStrip1.Name = "ToolStrip1"
- Me.ToolStrip1.Size = New System.Drawing.Size(1003, 25)
+ Me.ToolStrip1.Size = New System.Drawing.Size(1003, 31)
Me.ToolStrip1.TabIndex = 30
Me.ToolStrip1.Text = "ToolStrip1"
'
@@ -280,7 +281,7 @@ Partial Class EngineForm
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(23, 22)
+ Me.ToolStripBtNew.Size = New System.Drawing.Size(28, 28)
Me.ToolStripBtNew.Text = "ToolStripButton1"
Me.ToolStripBtNew.ToolTipText = "New"
'
@@ -290,7 +291,7 @@ Partial Class EngineForm
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(23, 22)
+ Me.ToolStripBtOpen.Size = New System.Drawing.Size(28, 28)
Me.ToolStripBtOpen.Text = "ToolStripButton1"
Me.ToolStripBtOpen.ToolTipText = "Open..."
'
@@ -300,7 +301,7 @@ Partial Class EngineForm
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(23, 22)
+ Me.ToolStripBtSave.Size = New System.Drawing.Size(28, 28)
Me.ToolStripBtSave.Text = "ToolStripButton1"
Me.ToolStripBtSave.ToolTipText = "Save"
'
@@ -310,14 +311,14 @@ Partial Class EngineForm
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(23, 22)
+ Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(28, 28)
Me.ToolStripBtSaveAs.Text = "ToolStripButton1"
Me.ToolStripBtSaveAs.ToolTipText = "Save As..."
'
'ToolStripSeparator3
'
Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
- Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 25)
+ Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 31)
'
'ToolStripBtSendTo
'
@@ -325,14 +326,14 @@ Partial Class EngineForm
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(23, 22)
+ Me.ToolStripBtSendTo.Size = New System.Drawing.Size(28, 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, 25)
+ Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 31)
'
'ToolStripButton1
'
@@ -340,11 +341,12 @@ Partial Class EngineForm
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(23, 22)
+ Me.ToolStripButton1.Size = New System.Drawing.Size(28, 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, 578)
Me.StatusStrip1.Name = "StatusStrip1"
@@ -405,7 +407,7 @@ Partial Class EngineForm
Me.TbMAP.Location = New System.Drawing.Point(6, 57)
Me.TbMAP.Name = "TbMAP"
Me.TbMAP.Size = New System.Drawing.Size(406, 20)
- Me.TbMAP.TabIndex = 5
+ Me.TbMAP.TabIndex = 1
'
'Label6
'
@@ -422,8 +424,7 @@ Partial Class EngineForm
Me.BtMAP.Location = New System.Drawing.Point(418, 55)
Me.BtMAP.Name = "BtMAP"
Me.BtMAP.Size = New System.Drawing.Size(24, 24)
- Me.BtMAP.TabIndex = 6
- Me.BtMAP.TabStop = false
+ Me.BtMAP.TabIndex = 2
Me.BtMAP.UseVisualStyleBackColor = true
'
'PictureBox1
@@ -438,6 +439,7 @@ Partial Class EngineForm
'
'CmOpenFile
'
+ Me.CmOpenFile.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
Me.CmOpenFile.Name = "CmOpenFile"
Me.CmOpenFile.Size = New System.Drawing.Size(153, 48)
@@ -460,8 +462,7 @@ Partial Class EngineForm
Me.BtMAPopen.Location = New System.Drawing.Point(441, 55)
Me.BtMAPopen.Name = "BtMAPopen"
Me.BtMAPopen.Size = New System.Drawing.Size(24, 24)
- Me.BtMAPopen.TabIndex = 7
- Me.BtMAPopen.TabStop = false
+ Me.BtMAPopen.TabIndex = 3
Me.BtMAPopen.UseVisualStyleBackColor = true
'
'PnInertia
@@ -472,7 +473,7 @@ Partial Class EngineForm
Me.PnInertia.Location = New System.Drawing.Point(272, 188)
Me.PnInertia.Name = "PnInertia"
Me.PnInertia.Size = New System.Drawing.Size(212, 30)
- Me.PnInertia.TabIndex = 3
+ Me.PnInertia.TabIndex = 7
'
'GrWHTC
'
@@ -481,7 +482,7 @@ Partial Class EngineForm
Me.GrWHTC.Location = New System.Drawing.Point(3, 94)
Me.GrWHTC.Name = "GrWHTC"
Me.GrWHTC.Size = New System.Drawing.Size(462, 135)
- Me.GrWHTC.TabIndex = 9
+ Me.GrWHTC.TabIndex = 4
Me.GrWHTC.TabStop = false
Me.GrWHTC.Text = "Fuel Consumption Correction Factors"
'
@@ -501,7 +502,7 @@ Partial Class EngineForm
Me.PnWhtcDeclaration.Location = New System.Drawing.Point(3, 19)
Me.PnWhtcDeclaration.Name = "PnWhtcDeclaration"
Me.PnWhtcDeclaration.Size = New System.Drawing.Size(455, 74)
- Me.PnWhtcDeclaration.TabIndex = 8
+ Me.PnWhtcDeclaration.TabIndex = 1
'
'Label20
'
@@ -517,7 +518,7 @@ Partial Class EngineForm
Me.tbRegPerCorrFactor.Location = New System.Drawing.Point(391, 46)
Me.tbRegPerCorrFactor.Name = "tbRegPerCorrFactor"
Me.tbRegPerCorrFactor.Size = New System.Drawing.Size(57, 20)
- Me.tbRegPerCorrFactor.TabIndex = 10
+ Me.tbRegPerCorrFactor.TabIndex = 4
'
'lblColdHotFactor
'
@@ -533,7 +534,7 @@ Partial Class EngineForm
Me.TbColdHotFactor.Location = New System.Drawing.Point(225, 46)
Me.TbColdHotFactor.Name = "TbColdHotFactor"
Me.TbColdHotFactor.Size = New System.Drawing.Size(57, 20)
- Me.TbColdHotFactor.TabIndex = 6
+ Me.TbColdHotFactor.TabIndex = 3
'
'Label4
'
@@ -600,14 +601,14 @@ Partial Class EngineForm
Me.PnWhtcEngineering.Location = New System.Drawing.Point(3, 99)
Me.PnWhtcEngineering.Name = "PnWhtcEngineering"
Me.PnWhtcEngineering.Size = New System.Drawing.Size(455, 30)
- Me.PnWhtcEngineering.TabIndex = 7
+ Me.PnWhtcEngineering.TabIndex = 2
'
'TbWHTCEngineering
'
Me.TbWHTCEngineering.Location = New System.Drawing.Point(225, 3)
Me.TbWHTCEngineering.Name = "TbWHTCEngineering"
Me.TbWHTCEngineering.Size = New System.Drawing.Size(57, 20)
- Me.TbWHTCEngineering.TabIndex = 5
+ Me.TbWHTCEngineering.TabIndex = 0
'
'lblWhtcEngineering
'
@@ -633,7 +634,7 @@ Partial Class EngineForm
Me.TbFLD.Location = New System.Drawing.Point(12, 241)
Me.TbFLD.Name = "TbFLD"
Me.TbFLD.Size = New System.Drawing.Size(434, 20)
- Me.TbFLD.TabIndex = 5
+ Me.TbFLD.TabIndex = 8
'
'Label14
'
@@ -650,8 +651,7 @@ Partial Class EngineForm
Me.BtFLD.Location = New System.Drawing.Point(446, 239)
Me.BtFLD.Name = "BtFLD"
Me.BtFLD.Size = New System.Drawing.Size(24, 24)
- Me.BtFLD.TabIndex = 6
- Me.BtFLD.TabStop = false
+ Me.BtFLD.TabIndex = 9
Me.BtFLD.UseVisualStyleBackColor = true
'
'BtFLDopen
@@ -660,8 +660,7 @@ Partial Class EngineForm
Me.BtFLDopen.Location = New System.Drawing.Point(469, 239)
Me.BtFLDopen.Name = "BtFLDopen"
Me.BtFLDopen.Size = New System.Drawing.Size(24, 24)
- Me.BtFLDopen.TabIndex = 7
- Me.BtFLDopen.TabStop = false
+ Me.BtFLDopen.TabIndex = 10
Me.BtFLDopen.UseVisualStyleBackColor = true
'
'tbRatedSpeed
@@ -669,7 +668,7 @@ Partial Class EngineForm
Me.tbRatedSpeed.Location = New System.Drawing.Point(381, 108)
Me.tbRatedSpeed.Name = "tbRatedSpeed"
Me.tbRatedSpeed.Size = New System.Drawing.Size(57, 20)
- Me.tbRatedSpeed.TabIndex = 41
+ Me.tbRatedSpeed.TabIndex = 4
'
'Label9
'
@@ -694,7 +693,7 @@ Partial Class EngineForm
Me.tbRatedPower.Location = New System.Drawing.Point(381, 134)
Me.tbRatedPower.Name = "tbRatedPower"
Me.tbRatedPower.Size = New System.Drawing.Size(57, 20)
- Me.tbRatedPower.TabIndex = 44
+ Me.tbRatedPower.TabIndex = 5
'
'Label12
'
@@ -719,7 +718,7 @@ Partial Class EngineForm
Me.tbMaxTorque.Location = New System.Drawing.Point(381, 158)
Me.tbMaxTorque.Name = "tbMaxTorque"
Me.tbMaxTorque.Size = New System.Drawing.Size(57, 20)
- Me.tbMaxTorque.TabIndex = 47
+ Me.tbMaxTorque.TabIndex = 6
'
'Label16
'
@@ -754,7 +753,7 @@ Partial Class EngineForm
Me.cbFuelType.Location = New System.Drawing.Point(71, 10)
Me.cbFuelType.Name = "cbFuelType"
Me.cbFuelType.Size = New System.Drawing.Size(143, 21)
- Me.cbFuelType.TabIndex = 51
+ Me.cbFuelType.TabIndex = 0
'
'lblEngineCharacteristics
'
@@ -772,7 +771,7 @@ Partial Class EngineForm
Me.tbDualFuel.Name = "tbDualFuel"
Me.tbDualFuel.SelectedIndex = 0
Me.tbDualFuel.Size = New System.Drawing.Size(481, 279)
- Me.tbDualFuel.TabIndex = 56
+ Me.tbDualFuel.TabIndex = 11
'
'tpPrimaryfuel
'
@@ -815,7 +814,7 @@ Partial Class EngineForm
Me.GroupBox1.Location = New System.Drawing.Point(3, 85)
Me.GroupBox1.Name = "GroupBox1"
Me.GroupBox1.Size = New System.Drawing.Size(462, 135)
- Me.GroupBox1.TabIndex = 55
+ Me.GroupBox1.TabIndex = 4
Me.GroupBox1.TabStop = false
Me.GroupBox1.Text = "Fuel Consumption Correction Factors"
'
@@ -835,7 +834,7 @@ Partial Class EngineForm
Me.pnWhtcFuel2.Location = New System.Drawing.Point(3, 19)
Me.pnWhtcFuel2.Name = "pnWhtcFuel2"
Me.pnWhtcFuel2.Size = New System.Drawing.Size(455, 74)
- Me.pnWhtcFuel2.TabIndex = 8
+ Me.pnWhtcFuel2.TabIndex = 1
'
'Label27
'
@@ -851,7 +850,7 @@ Partial Class EngineForm
Me.tbRegPerFuel2.Location = New System.Drawing.Point(391, 46)
Me.tbRegPerFuel2.Name = "tbRegPerFuel2"
Me.tbRegPerFuel2.Size = New System.Drawing.Size(57, 20)
- Me.tbRegPerFuel2.TabIndex = 10
+ Me.tbRegPerFuel2.TabIndex = 4
'
'Label28
'
@@ -867,7 +866,7 @@ Partial Class EngineForm
Me.tbColdHotFuel2.Location = New System.Drawing.Point(225, 46)
Me.tbColdHotFuel2.Name = "tbColdHotFuel2"
Me.tbColdHotFuel2.Size = New System.Drawing.Size(57, 20)
- Me.tbColdHotFuel2.TabIndex = 6
+ Me.tbColdHotFuel2.TabIndex = 3
'
'Label29
'
@@ -934,14 +933,14 @@ Partial Class EngineForm
Me.pnEngCFFuel2.Location = New System.Drawing.Point(3, 99)
Me.pnEngCFFuel2.Name = "pnEngCFFuel2"
Me.pnEngCFFuel2.Size = New System.Drawing.Size(455, 30)
- Me.pnEngCFFuel2.TabIndex = 7
+ Me.pnEngCFFuel2.TabIndex = 2
'
'tbEngineeringCFFuel2
'
Me.tbEngineeringCFFuel2.Location = New System.Drawing.Point(225, 3)
Me.tbEngineeringCFFuel2.Name = "tbEngineeringCFFuel2"
Me.tbEngineeringCFFuel2.Size = New System.Drawing.Size(57, 20)
- Me.tbEngineeringCFFuel2.TabIndex = 5
+ Me.tbEngineeringCFFuel2.TabIndex = 0
'
'Label33
'
@@ -957,7 +956,7 @@ Partial Class EngineForm
Me.tbMapFuel2.Location = New System.Drawing.Point(6, 54)
Me.tbMapFuel2.Name = "tbMapFuel2"
Me.tbMapFuel2.Size = New System.Drawing.Size(406, 20)
- Me.tbMapFuel2.TabIndex = 52
+ Me.tbMapFuel2.TabIndex = 1
'
'Label34
'
@@ -974,8 +973,7 @@ Partial Class EngineForm
Me.btMapFuel2.Location = New System.Drawing.Point(418, 52)
Me.btMapFuel2.Name = "btMapFuel2"
Me.btMapFuel2.Size = New System.Drawing.Size(24, 24)
- Me.btMapFuel2.TabIndex = 53
- Me.btMapFuel2.TabStop = false
+ Me.btMapFuel2.TabIndex = 2
Me.btMapFuel2.UseVisualStyleBackColor = true
'
'btMapOpenFuel2
@@ -984,8 +982,7 @@ Partial Class EngineForm
Me.btMapOpenFuel2.Location = New System.Drawing.Point(441, 52)
Me.btMapOpenFuel2.Name = "btMapOpenFuel2"
Me.btMapOpenFuel2.Size = New System.Drawing.Size(24, 24)
- Me.btMapOpenFuel2.TabIndex = 54
- Me.btMapOpenFuel2.TabStop = false
+ Me.btMapOpenFuel2.TabIndex = 3
Me.btMapOpenFuel2.UseVisualStyleBackColor = true
'
'cbFuelType2
@@ -994,7 +991,7 @@ Partial Class EngineForm
Me.cbFuelType2.Location = New System.Drawing.Point(71, 6)
Me.cbFuelType2.Name = "cbFuelType2"
Me.cbFuelType2.Size = New System.Drawing.Size(143, 21)
- Me.cbFuelType2.TabIndex = 58
+ Me.cbFuelType2.TabIndex = 0
'
'Label35
'
@@ -1012,7 +1009,7 @@ Partial Class EngineForm
Me.cbDualFuel.Location = New System.Drawing.Point(30, 160)
Me.cbDualFuel.Name = "cbDualFuel"
Me.cbDualFuel.Size = New System.Drawing.Size(107, 17)
- Me.cbDualFuel.TabIndex = 58
+ Me.cbDualFuel.TabIndex = 3
Me.cbDualFuel.Text = "Dual Fuel Engine"
Me.cbDualFuel.UseVisualStyleBackColor = true
'
@@ -1025,7 +1022,49 @@ Partial Class EngineForm
Me.tbWHR.Name = "tbWHR"
Me.tbWHR.SelectedIndex = 0
Me.tbWHR.Size = New System.Drawing.Size(482, 171)
- Me.tbWHR.TabIndex = 59
+ Me.tbWHR.TabIndex = 12
+ '
+ 'TabPage1
+ '
+ Me.TabPage1.Controls.Add(Me.cbElWHR)
+ Me.TabPage1.Controls.Add(Me.cbMechWHRNotConnectedCrankshaft)
+ Me.TabPage1.Controls.Add(Me.cbMechWHRInMap)
+ Me.TabPage1.Location = New System.Drawing.Point(4, 22)
+ Me.TabPage1.Name = "TabPage1"
+ Me.TabPage1.Size = New System.Drawing.Size(474, 145)
+ Me.TabPage1.TabIndex = 2
+ Me.TabPage1.Text = "WHR Type"
+ Me.TabPage1.UseVisualStyleBackColor = true
+ '
+ 'cbElWHR
+ '
+ Me.cbElWHR.AutoSize = true
+ Me.cbElWHR.Location = New System.Drawing.Point(17, 58)
+ Me.cbElWHR.Name = "cbElWHR"
+ Me.cbElWHR.Size = New System.Drawing.Size(136, 17)
+ Me.cbElWHR.TabIndex = 2
+ Me.cbElWHR.Text = "Electrical WHR System"
+ Me.cbElWHR.UseVisualStyleBackColor = true
+ '
+ 'cbMechWHRNotConnectedCrankshaft
+ '
+ Me.cbMechWHRNotConnectedCrankshaft.AutoSize = true
+ Me.cbMechWHRNotConnectedCrankshaft.Location = New System.Drawing.Point(17, 35)
+ Me.cbMechWHRNotConnectedCrankshaft.Name = "cbMechWHRNotConnectedCrankshaft"
+ Me.cbMechWHRNotConnectedCrankshaft.Size = New System.Drawing.Size(303, 17)
+ Me.cbMechWHRNotConnectedCrankshaft.TabIndex = 1
+ Me.cbMechWHRNotConnectedCrankshaft.Text = "Mechanical WHR System not connected to the crankshaft"
+ Me.cbMechWHRNotConnectedCrankshaft.UseVisualStyleBackColor = true
+ '
+ 'cbMechWHRInMap
+ '
+ Me.cbMechWHRInMap.AutoSize = true
+ Me.cbMechWHRInMap.Location = New System.Drawing.Point(17, 12)
+ Me.cbMechWHRInMap.Name = "cbMechWHRInMap"
+ Me.cbMechWHRInMap.Size = New System.Drawing.Size(287, 17)
+ Me.cbMechWHRInMap.TabIndex = 0
+ Me.cbMechWHRInMap.Text = "Mechanical WHR System incuded in FC measurements"
+ Me.cbMechWHRInMap.UseVisualStyleBackColor = true
'
'tbElectricalWHR
'
@@ -1040,19 +1079,6 @@ Partial Class EngineForm
Me.tbElectricalWHR.Text = "Correction Factors Electrical WHR"
Me.tbElectricalWHR.UseVisualStyleBackColor = true
'
- 'tbMechanicalWHR
- '
- Me.tbMechanicalWHR.Controls.Add(Me.Label37)
- Me.tbMechanicalWHR.Controls.Add(Me.pnMechWhrDeclaration)
- Me.tbMechanicalWHR.Controls.Add(Me.pnMechWhrEngineering)
- Me.tbMechanicalWHR.Location = New System.Drawing.Point(4, 22)
- Me.tbMechanicalWHR.Name = "tbMechanicalWHR"
- Me.tbMechanicalWHR.Padding = New System.Windows.Forms.Padding(3)
- Me.tbMechanicalWHR.Size = New System.Drawing.Size(474, 145)
- Me.tbMechanicalWHR.TabIndex = 1
- Me.tbMechanicalWHR.Text = "Correction Factors Mechanical WHR"
- Me.tbMechanicalWHR.UseVisualStyleBackColor = true
- '
'Label36
'
Me.Label36.AutoSize = true
@@ -1079,7 +1105,7 @@ Partial Class EngineForm
Me.pnElWHRDeclaration.Location = New System.Drawing.Point(6, 6)
Me.pnElWHRDeclaration.Name = "pnElWHRDeclaration"
Me.pnElWHRDeclaration.Size = New System.Drawing.Size(458, 74)
- Me.pnElWHRDeclaration.TabIndex = 13
+ Me.pnElWHRDeclaration.TabIndex = 0
'
'lblWHRRegPer
'
@@ -1095,7 +1121,7 @@ Partial Class EngineForm
Me.tbElWHRRegPer.Location = New System.Drawing.Point(376, 46)
Me.tbElWHRRegPer.Name = "tbElWHRRegPer"
Me.tbElWHRRegPer.Size = New System.Drawing.Size(57, 20)
- Me.tbElWHRRegPer.TabIndex = 10
+ Me.tbElWHRRegPer.TabIndex = 4
'
'Label21
'
@@ -1111,7 +1137,7 @@ Partial Class EngineForm
Me.tbElWHRColdHot.Location = New System.Drawing.Point(194, 46)
Me.tbElWHRColdHot.Name = "tbElWHRColdHot"
Me.tbElWHRColdHot.Size = New System.Drawing.Size(57, 20)
- Me.tbElWHRColdHot.TabIndex = 6
+ Me.tbElWHRColdHot.TabIndex = 3
'
'Label22
'
@@ -1178,14 +1204,14 @@ Partial Class EngineForm
Me.pnElWhrEngineering.Location = New System.Drawing.Point(6, 86)
Me.pnElWhrEngineering.Name = "pnElWhrEngineering"
Me.pnElWhrEngineering.Size = New System.Drawing.Size(458, 30)
- Me.pnElWhrEngineering.TabIndex = 12
+ Me.pnElWhrEngineering.TabIndex = 1
'
'tbElWHREngineering
'
Me.tbElWHREngineering.Location = New System.Drawing.Point(194, 3)
Me.tbElWHREngineering.Name = "tbElWHREngineering"
Me.tbElWHREngineering.Size = New System.Drawing.Size(57, 20)
- Me.tbElWHREngineering.TabIndex = 5
+ Me.tbElWHREngineering.TabIndex = 0
'
'Label26
'
@@ -1196,6 +1222,19 @@ Partial Class EngineForm
Me.Label26.TabIndex = 6
Me.Label26.Text = "Engineering"
'
+ 'tbMechanicalWHR
+ '
+ Me.tbMechanicalWHR.Controls.Add(Me.Label37)
+ Me.tbMechanicalWHR.Controls.Add(Me.pnMechWhrDeclaration)
+ Me.tbMechanicalWHR.Controls.Add(Me.pnMechWhrEngineering)
+ Me.tbMechanicalWHR.Location = New System.Drawing.Point(4, 22)
+ Me.tbMechanicalWHR.Name = "tbMechanicalWHR"
+ Me.tbMechanicalWHR.Padding = New System.Windows.Forms.Padding(3)
+ Me.tbMechanicalWHR.Size = New System.Drawing.Size(474, 145)
+ Me.tbMechanicalWHR.TabIndex = 1
+ Me.tbMechanicalWHR.Text = "Correction Factors Mechanical WHR"
+ Me.tbMechanicalWHR.UseVisualStyleBackColor = true
+ '
'Label37
'
Me.Label37.AutoSize = true
@@ -1222,7 +1261,7 @@ Partial Class EngineForm
Me.pnMechWhrDeclaration.Location = New System.Drawing.Point(6, 6)
Me.pnMechWhrDeclaration.Name = "pnMechWhrDeclaration"
Me.pnMechWhrDeclaration.Size = New System.Drawing.Size(458, 74)
- Me.pnMechWhrDeclaration.TabIndex = 13
+ Me.pnMechWhrDeclaration.TabIndex = 0
'
'Label38
'
@@ -1238,7 +1277,7 @@ Partial Class EngineForm
Me.tbMechWHRRegPerCF.Location = New System.Drawing.Point(376, 46)
Me.tbMechWHRRegPerCF.Name = "tbMechWHRRegPerCF"
Me.tbMechWHRRegPerCF.Size = New System.Drawing.Size(57, 20)
- Me.tbMechWHRRegPerCF.TabIndex = 10
+ Me.tbMechWHRRegPerCF.TabIndex = 4
'
'Label39
'
@@ -1254,7 +1293,7 @@ Partial Class EngineForm
Me.tbMechWHRBFColdHot.Location = New System.Drawing.Point(194, 46)
Me.tbMechWHRBFColdHot.Name = "tbMechWHRBFColdHot"
Me.tbMechWHRBFColdHot.Size = New System.Drawing.Size(57, 20)
- Me.tbMechWHRBFColdHot.TabIndex = 6
+ Me.tbMechWHRBFColdHot.TabIndex = 3
'
'Label42
'
@@ -1321,14 +1360,14 @@ Partial Class EngineForm
Me.pnMechWhrEngineering.Location = New System.Drawing.Point(6, 86)
Me.pnMechWhrEngineering.Name = "pnMechWhrEngineering"
Me.pnMechWhrEngineering.Size = New System.Drawing.Size(458, 30)
- Me.pnMechWhrEngineering.TabIndex = 12
+ Me.pnMechWhrEngineering.TabIndex = 1
'
'tbMechWHREngineering
'
Me.tbMechWHREngineering.Location = New System.Drawing.Point(194, 3)
Me.tbMechWHREngineering.Name = "tbMechWHREngineering"
Me.tbMechWHREngineering.Size = New System.Drawing.Size(57, 20)
- Me.tbMechWHREngineering.TabIndex = 5
+ Me.tbMechWHREngineering.TabIndex = 0
'
'Label46
'
@@ -1339,48 +1378,6 @@ Partial Class EngineForm
Me.Label46.TabIndex = 6
Me.Label46.Text = "Engineering"
'
- 'TabPage1
- '
- Me.TabPage1.Controls.Add(Me.cbElWHR)
- Me.TabPage1.Controls.Add(Me.cbMechWHRNotConnectedCrankshaft)
- Me.TabPage1.Controls.Add(Me.cbMechWHRInMap)
- Me.TabPage1.Location = New System.Drawing.Point(4, 22)
- Me.TabPage1.Name = "TabPage1"
- Me.TabPage1.Size = New System.Drawing.Size(474, 145)
- Me.TabPage1.TabIndex = 2
- Me.TabPage1.Text = "WHR Type"
- Me.TabPage1.UseVisualStyleBackColor = true
- '
- 'cbMechWHRInMap
- '
- Me.cbMechWHRInMap.AutoSize = true
- Me.cbMechWHRInMap.Location = New System.Drawing.Point(17, 12)
- Me.cbMechWHRInMap.Name = "cbMechWHRInMap"
- Me.cbMechWHRInMap.Size = New System.Drawing.Size(287, 17)
- Me.cbMechWHRInMap.TabIndex = 0
- Me.cbMechWHRInMap.Text = "Mechanical WHR System incuded in FC measurements"
- Me.cbMechWHRInMap.UseVisualStyleBackColor = true
- '
- 'cbMechWHRNotConnectedCrankshaft
- '
- Me.cbMechWHRNotConnectedCrankshaft.AutoSize = true
- Me.cbMechWHRNotConnectedCrankshaft.Location = New System.Drawing.Point(17, 35)
- Me.cbMechWHRNotConnectedCrankshaft.Name = "cbMechWHRNotConnectedCrankshaft"
- Me.cbMechWHRNotConnectedCrankshaft.Size = New System.Drawing.Size(303, 17)
- Me.cbMechWHRNotConnectedCrankshaft.TabIndex = 1
- Me.cbMechWHRNotConnectedCrankshaft.Text = "Mechanical WHR System not connected to the crankshaft"
- Me.cbMechWHRNotConnectedCrankshaft.UseVisualStyleBackColor = true
- '
- 'cbElWHR
- '
- Me.cbElWHR.AutoSize = true
- Me.cbElWHR.Location = New System.Drawing.Point(17, 58)
- Me.cbElWHR.Name = "cbElWHR"
- Me.cbElWHR.Size = New System.Drawing.Size(136, 17)
- Me.cbElWHR.TabIndex = 2
- Me.cbElWHR.Text = "Electrical WHR System"
- Me.cbElWHR.UseVisualStyleBackColor = true
- '
'EngineForm
'
Me.AcceptButton = Me.ButOK
@@ -1452,20 +1449,20 @@ Partial Class EngineForm
Me.pnEngCFFuel2.ResumeLayout(false)
Me.pnEngCFFuel2.PerformLayout
Me.tbWHR.ResumeLayout(false)
+ Me.TabPage1.ResumeLayout(false)
+ Me.TabPage1.PerformLayout
Me.tbElectricalWHR.ResumeLayout(false)
Me.tbElectricalWHR.PerformLayout
- Me.tbMechanicalWHR.ResumeLayout(false)
- Me.tbMechanicalWHR.PerformLayout
Me.pnElWHRDeclaration.ResumeLayout(false)
Me.pnElWHRDeclaration.PerformLayout
Me.pnElWhrEngineering.ResumeLayout(false)
Me.pnElWhrEngineering.PerformLayout
+ Me.tbMechanicalWHR.ResumeLayout(false)
+ Me.tbMechanicalWHR.PerformLayout
Me.pnMechWhrDeclaration.ResumeLayout(false)
Me.pnMechWhrDeclaration.PerformLayout
Me.pnMechWhrEngineering.ResumeLayout(false)
Me.pnMechWhrEngineering.PerformLayout
- Me.TabPage1.ResumeLayout(false)
- Me.TabPage1.PerformLayout
Me.ResumeLayout(false)
Me.PerformLayout
diff --git a/VECTO/GUI/GearboxForm.Designer.vb b/VECTO/GUI/GearboxForm.Designer.vb
index 0d8df6abcc01fefb6747905338efaef9148123dc..5dff87bd762f4f2009152dc1999c33932e80c56e 100644
--- a/VECTO/GUI/GearboxForm.Designer.vb
+++ b/VECTO/GUI/GearboxForm.Designer.vb
@@ -35,1123 +35,1123 @@ Partial Class GearboxForm
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<DebuggerStepThrough()> _
Private Sub InitializeComponent()
- Me.components = New System.ComponentModel.Container()
- Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(GearboxForm))
- Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
- Me.ToolStripBtNew = New System.Windows.Forms.ToolStripButton()
- Me.ToolStripBtOpen = New System.Windows.Forms.ToolStripButton()
- Me.ToolStripBtSave = New System.Windows.Forms.ToolStripButton()
- Me.ToolStripBtSaveAs = New System.Windows.Forms.ToolStripButton()
- Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
- Me.ToolStripBtSendTo = New System.Windows.Forms.ToolStripButton()
- Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
- Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
- Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
- Me.LbStatus = New System.Windows.Forms.ToolStripStatusLabel()
- Me.ButCancel = New System.Windows.Forms.Button()
- Me.ButOK = New System.Windows.Forms.Button()
- Me.TbTracInt = New System.Windows.Forms.TextBox()
- Me.LvGears = New System.Windows.Forms.ListView()
- Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
- Me.ColumnHeader2 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
- Me.ColumnHeader3 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
- Me.ColumnHeader5 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
- Me.ColumnHeader6 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
- Me.ColumnHeader7 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
- Me.TBI_getr = New System.Windows.Forms.TextBox()
- Me.Label49 = New System.Windows.Forms.Label()
- Me.Label33 = New System.Windows.Forms.Label()
- Me.Label48 = New System.Windows.Forms.Label()
- Me.Label6 = New System.Windows.Forms.Label()
- Me.Label3 = New System.Windows.Forms.Label()
- Me.TbName = New System.Windows.Forms.TextBox()
- Me.PictureBox1 = New System.Windows.Forms.PictureBox()
- Me.BtRemGear = New System.Windows.Forms.Button()
- Me.GrGearShift = New System.Windows.Forms.GroupBox()
- Me.GroupBox1 = New System.Windows.Forms.GroupBox()
- Me.tbUpshiftMinAcceleration = New System.Windows.Forms.TextBox()
- Me.tbUpshiftAfterDownshift = New System.Windows.Forms.TextBox()
- Me.tbDownshiftAfterUpshift = New System.Windows.Forms.TextBox()
- Me.Label24 = New System.Windows.Forms.Label()
- Me.Label23 = New System.Windows.Forms.Label()
- Me.Label22 = New System.Windows.Forms.Label()
- Me.Label21 = New System.Windows.Forms.Label()
- Me.Label20 = New System.Windows.Forms.Label()
- Me.Label19 = New System.Windows.Forms.Label()
- Me.PnTorqRes = New System.Windows.Forms.Panel()
- Me.Label25 = New System.Windows.Forms.Label()
- Me.Label2 = New System.Windows.Forms.Label()
- Me.Label4 = New System.Windows.Forms.Label()
- Me.TbTqResv = New System.Windows.Forms.TextBox()
- Me.TbMinTimeBetweenShifts = New System.Windows.Forms.TextBox()
- Me.Label12 = New System.Windows.Forms.Label()
- Me.Label13 = New System.Windows.Forms.Label()
- Me.GroupBox2 = New System.Windows.Forms.GroupBox()
- Me.TbStartAcc = New System.Windows.Forms.TextBox()
- Me.Label11 = New System.Windows.Forms.Label()
- Me.TbStartSpeed = New System.Windows.Forms.TextBox()
- Me.Label9 = New System.Windows.Forms.Label()
- Me.Label10 = New System.Windows.Forms.Label()
- Me.TbTqResvStart = New System.Windows.Forms.TextBox()
- Me.Label8 = New System.Windows.Forms.Label()
- Me.Label5 = New System.Windows.Forms.Label()
- Me.Label7 = New System.Windows.Forms.Label()
- Me.CmOpenFile = New System.Windows.Forms.ContextMenuStrip(Me.components)
- Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
- Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
- Me.gbTC = New System.Windows.Forms.GroupBox()
- Me.pnTcEngineering = New System.Windows.Forms.Panel()
- Me.Label26 = New System.Windows.Forms.Label()
- Me.TBTCShiftPolygon = New System.Windows.Forms.TextBox()
- Me.tbTCmaxSpeed = New System.Windows.Forms.TextBox()
- Me.TbTCrefrpm = New System.Windows.Forms.TextBox()
- Me.Label27 = New System.Windows.Forms.Label()
- Me.Label14 = New System.Windows.Forms.Label()
- Me.BtTCShiftFileBrowse = New System.Windows.Forms.Button()
- Me.Label1 = New System.Windows.Forms.Label()
- Me.TbTCinertia = New System.Windows.Forms.TextBox()
- Me.Label15 = New System.Windows.Forms.Label()
- Me.Label18 = New System.Windows.Forms.Label()
- Me.LblTCShiftFile = New System.Windows.Forms.Label()
- Me.BtTCfileOpen = New System.Windows.Forms.Button()
- Me.TbTCfile = New System.Windows.Forms.TextBox()
- Me.BtTCfileBrowse = New System.Windows.Forms.Button()
- Me.Label17 = New System.Windows.Forms.Label()
- Me.tbTCLUpshiftMinAcceleration = New System.Windows.Forms.TextBox()
- Me.Label30 = New System.Windows.Forms.Label()
- Me.Label31 = New System.Windows.Forms.Label()
- Me.Label16 = New System.Windows.Forms.Label()
- Me.CbGStype = New System.Windows.Forms.ComboBox()
- Me.BtAddGear = New System.Windows.Forms.Button()
- Me.GroupBox4 = New System.Windows.Forms.GroupBox()
- Me.Label32 = New System.Windows.Forms.Label()
- Me.PnInertiaTI = New System.Windows.Forms.Panel()
- Me.PicBox = New System.Windows.Forms.PictureBox()
- Me.gbPowershiftLosses = New System.Windows.Forms.GroupBox()
- Me.lbAtShiftTime = New System.Windows.Forms.Label()
- Me.tbATShiftTime = New System.Windows.Forms.TextBox()
- Me.Label28 = New System.Windows.Forms.Label()
- Me.tbTCCUpshiftMinAcceleration = New System.Windows.Forms.TextBox()
- Me.Label34 = New System.Windows.Forms.Label()
- Me.Label35 = New System.Windows.Forms.Label()
- Me.gbTCAccMin = New System.Windows.Forms.GroupBox()
- Me.lblGbxInfo = New System.Windows.Forms.Label()
- Me.btnExportXML = New System.Windows.Forms.Button()
- Me.btnExportAxlGearXML = New System.Windows.Forms.Button()
- Me.btExportVGBS = New System.Windows.Forms.Button()
- Me.ToolStrip1.SuspendLayout()
- Me.StatusStrip1.SuspendLayout()
- CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
- Me.GrGearShift.SuspendLayout()
- Me.GroupBox1.SuspendLayout()
- Me.PnTorqRes.SuspendLayout()
- Me.GroupBox2.SuspendLayout()
- Me.CmOpenFile.SuspendLayout()
- Me.gbTC.SuspendLayout()
- Me.pnTcEngineering.SuspendLayout()
- Me.GroupBox4.SuspendLayout()
- Me.PnInertiaTI.SuspendLayout()
- CType(Me.PicBox, System.ComponentModel.ISupportInitialize).BeginInit()
- Me.gbPowershiftLosses.SuspendLayout()
- Me.gbTCAccMin.SuspendLayout()
- Me.SuspendLayout()
- '
- 'ToolStrip1
- '
- Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
- Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator3, Me.ToolStripBtSendTo, Me.ToolStripSeparator1, Me.ToolStripButton1})
- Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
- Me.ToolStrip1.Name = "ToolStrip1"
- Me.ToolStrip1.Size = New System.Drawing.Size(877, 25)
- Me.ToolStrip1.TabIndex = 30
- Me.ToolStrip1.Text = "ToolStrip1"
- '
- 'ToolStripBtNew
- '
- Me.ToolStripBtNew.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
- 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(23, 22)
- Me.ToolStripBtNew.Text = "ToolStripButton1"
- Me.ToolStripBtNew.ToolTipText = "New"
- '
- 'ToolStripBtOpen
- '
- Me.ToolStripBtOpen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
- 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(23, 22)
- Me.ToolStripBtOpen.Text = "ToolStripButton1"
- Me.ToolStripBtOpen.ToolTipText = "Open..."
- '
- 'ToolStripBtSave
- '
- Me.ToolStripBtSave.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
- 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(23, 22)
- Me.ToolStripBtSave.Text = "ToolStripButton1"
- Me.ToolStripBtSave.ToolTipText = "Save"
- '
- 'ToolStripBtSaveAs
- '
- Me.ToolStripBtSaveAs.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
- 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(23, 22)
- Me.ToolStripBtSaveAs.Text = "ToolStripButton1"
- Me.ToolStripBtSaveAs.ToolTipText = "Save As..."
- '
- 'ToolStripSeparator3
- '
- Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
- Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 25)
- '
- 'ToolStripBtSendTo
- '
- Me.ToolStripBtSendTo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
- 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(23, 22)
- 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, 25)
- '
- 'ToolStripButton1
- '
- Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
- 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(23, 22)
- Me.ToolStripButton1.Text = "Help"
- '
- 'StatusStrip1
- '
- Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LbStatus})
- Me.StatusStrip1.Location = New System.Drawing.Point(0, 674)
- Me.StatusStrip1.Name = "StatusStrip1"
- Me.StatusStrip1.Size = New System.Drawing.Size(877, 22)
- Me.StatusStrip1.SizingGrip = False
- Me.StatusStrip1.TabIndex = 37
- Me.StatusStrip1.Text = "StatusStrip1"
- '
- 'LbStatus
- '
- Me.LbStatus.Name = "LbStatus"
- Me.LbStatus.Size = New System.Drawing.Size(39, 17)
- Me.LbStatus.Text = "Status"
- '
- 'ButCancel
- '
- 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(798, 648)
- Me.ButCancel.Name = "ButCancel"
- Me.ButCancel.Size = New System.Drawing.Size(75, 23)
- Me.ButCancel.TabIndex = 7
- Me.ButCancel.Text = "Cancel"
- Me.ButCancel.UseVisualStyleBackColor = True
- '
- 'ButOK
- '
- Me.ButOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.ButOK.Location = New System.Drawing.Point(717, 648)
- Me.ButOK.Name = "ButOK"
- Me.ButOK.Size = New System.Drawing.Size(75, 23)
- Me.ButOK.TabIndex = 6
- Me.ButOK.Text = "Save"
- Me.ButOK.UseVisualStyleBackColor = True
- '
- 'TbTracInt
- '
- Me.TbTracInt.Location = New System.Drawing.Point(299, 3)
- Me.TbTracInt.Name = "TbTracInt"
- Me.TbTracInt.Size = New System.Drawing.Size(57, 20)
- Me.TbTracInt.TabIndex = 1
- '
- 'LvGears
- '
- Me.LvGears.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader2, Me.ColumnHeader3, Me.ColumnHeader5, Me.ColumnHeader6, Me.ColumnHeader7})
- Me.LvGears.FullRowSelect = True
- Me.LvGears.GridLines = True
- Me.LvGears.HideSelection = False
- Me.LvGears.Location = New System.Drawing.Point(6, 18)
- Me.LvGears.MultiSelect = False
- Me.LvGears.Name = "LvGears"
- Me.LvGears.Size = New System.Drawing.Size(429, 183)
- Me.LvGears.TabIndex = 0
- Me.LvGears.TabStop = False
- Me.LvGears.UseCompatibleStateImageBehavior = False
- Me.LvGears.View = System.Windows.Forms.View.Details
- '
- 'ColumnHeader1
- '
- Me.ColumnHeader1.Text = "Gear"
- Me.ColumnHeader1.Width = 38
- '
- 'ColumnHeader2
- '
- Me.ColumnHeader2.Text = "Ratio"
- Me.ColumnHeader2.Width = 42
- '
- 'ColumnHeader3
- '
- Me.ColumnHeader3.Text = "Loss Map or Efficiency"
- Me.ColumnHeader3.Width = 111
- '
- 'ColumnHeader5
- '
- Me.ColumnHeader5.Text = "Shift Polygons"
- Me.ColumnHeader5.Width = 79
- '
- 'ColumnHeader6
- '
- Me.ColumnHeader6.Text = "Max Torque"
- Me.ColumnHeader6.Width = 78
- '
- 'ColumnHeader7
- '
- Me.ColumnHeader7.Text = "Max Speed"
- Me.ColumnHeader7.Width = 76
- '
- 'TBI_getr
- '
- Me.TBI_getr.Location = New System.Drawing.Point(78, 3)
- Me.TBI_getr.Name = "TBI_getr"
- Me.TBI_getr.Size = New System.Drawing.Size(57, 20)
- Me.TBI_getr.TabIndex = 0
- '
- 'Label49
- '
- Me.Label49.AutoSize = True
- Me.Label49.Location = New System.Drawing.Point(362, 6)
- Me.Label49.Name = "Label49"
- Me.Label49.Size = New System.Drawing.Size(18, 13)
- Me.Label49.TabIndex = 2
- Me.Label49.Text = "[s]"
- '
- 'Label33
- '
- Me.Label33.AutoSize = True
- Me.Label33.Location = New System.Drawing.Point(141, 6)
- Me.Label33.Name = "Label33"
- Me.Label33.Size = New System.Drawing.Size(36, 13)
- Me.Label33.TabIndex = 2
- Me.Label33.Text = "[kgm²]"
- '
- 'Label48
- '
- Me.Label48.AutoSize = True
- Me.Label48.Location = New System.Drawing.Point(191, 6)
- Me.Label48.Name = "Label48"
- Me.Label48.Size = New System.Drawing.Size(102, 13)
- Me.Label48.TabIndex = 2
- Me.Label48.Text = "Traction Interruption"
- '
- 'Label6
- '
- Me.Label6.AutoSize = True
- Me.Label6.Location = New System.Drawing.Point(6, 6)
- Me.Label6.Name = "Label6"
- Me.Label6.Size = New System.Drawing.Size(36, 13)
- Me.Label6.TabIndex = 2
- Me.Label6.Text = "Inertia"
- '
- 'Label3
- '
- Me.Label3.AutoSize = True
- Me.Label3.Location = New System.Drawing.Point(26, 79)
- Me.Label3.Name = "Label3"
- Me.Label3.Size = New System.Drawing.Size(87, 13)
- Me.Label3.TabIndex = 42
- Me.Label3.Text = "Make and Model"
- '
- 'TbName
- '
- Me.TbName.Location = New System.Drawing.Point(119, 76)
- Me.TbName.Name = "TbName"
- Me.TbName.Size = New System.Drawing.Size(334, 20)
- Me.TbName.TabIndex = 0
- '
- 'PictureBox1
- '
- Me.PictureBox1.BackColor = System.Drawing.Color.White
- Me.PictureBox1.Image = Global.TUGraz.VECTO.My.Resources.Resources.VECTO_GBX
- Me.PictureBox1.Location = New System.Drawing.Point(0, 28)
- Me.PictureBox1.Name = "PictureBox1"
- Me.PictureBox1.Size = New System.Drawing.Size(453, 40)
- Me.PictureBox1.TabIndex = 43
- Me.PictureBox1.TabStop = False
- '
- 'BtRemGear
- '
- Me.BtRemGear.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
- Me.BtRemGear.Location = New System.Drawing.Point(30, 202)
- Me.BtRemGear.Name = "BtRemGear"
- Me.BtRemGear.Size = New System.Drawing.Size(24, 24)
- Me.BtRemGear.TabIndex = 2
- Me.BtRemGear.UseVisualStyleBackColor = True
- '
- 'GrGearShift
- '
- Me.GrGearShift.Controls.Add(Me.GroupBox1)
- Me.GrGearShift.Controls.Add(Me.PnTorqRes)
- Me.GrGearShift.Controls.Add(Me.TbMinTimeBetweenShifts)
- Me.GrGearShift.Controls.Add(Me.Label12)
- Me.GrGearShift.Controls.Add(Me.Label13)
- Me.GrGearShift.Controls.Add(Me.GroupBox2)
- Me.GrGearShift.Location = New System.Drawing.Point(12, 377)
- Me.GrGearShift.Name = "GrGearShift"
- Me.GrGearShift.Size = New System.Drawing.Size(441, 291)
- Me.GrGearShift.TabIndex = 3
- Me.GrGearShift.TabStop = False
- Me.GrGearShift.Text = "Gear shift parameters"
- '
- 'GroupBox1
- '
- Me.GroupBox1.Controls.Add(Me.tbUpshiftMinAcceleration)
- Me.GroupBox1.Controls.Add(Me.tbUpshiftAfterDownshift)
- Me.GroupBox1.Controls.Add(Me.tbDownshiftAfterUpshift)
- Me.GroupBox1.Controls.Add(Me.Label24)
- Me.GroupBox1.Controls.Add(Me.Label23)
- Me.GroupBox1.Controls.Add(Me.Label22)
- Me.GroupBox1.Controls.Add(Me.Label21)
- Me.GroupBox1.Controls.Add(Me.Label20)
- Me.GroupBox1.Controls.Add(Me.Label19)
- Me.GroupBox1.Location = New System.Drawing.Point(6, 82)
- Me.GroupBox1.Name = "GroupBox1"
- Me.GroupBox1.Size = New System.Drawing.Size(429, 100)
- Me.GroupBox1.TabIndex = 10
- Me.GroupBox1.TabStop = False
- Me.GroupBox1.Text = "Shift Strategy Parameters"
- '
- 'tbUpshiftMinAcceleration
- '
- Me.tbUpshiftMinAcceleration.Location = New System.Drawing.Point(209, 71)
- Me.tbUpshiftMinAcceleration.Name = "tbUpshiftMinAcceleration"
- Me.tbUpshiftMinAcceleration.Size = New System.Drawing.Size(57, 20)
- Me.tbUpshiftMinAcceleration.TabIndex = 8
- '
- 'tbUpshiftAfterDownshift
- '
- Me.tbUpshiftAfterDownshift.Location = New System.Drawing.Point(209, 45)
- Me.tbUpshiftAfterDownshift.Name = "tbUpshiftAfterDownshift"
- Me.tbUpshiftAfterDownshift.Size = New System.Drawing.Size(57, 20)
- Me.tbUpshiftAfterDownshift.TabIndex = 7
- '
- 'tbDownshiftAfterUpshift
- '
- Me.tbDownshiftAfterUpshift.Location = New System.Drawing.Point(209, 20)
- Me.tbDownshiftAfterUpshift.Name = "tbDownshiftAfterUpshift"
- Me.tbDownshiftAfterUpshift.Size = New System.Drawing.Size(57, 20)
- Me.tbDownshiftAfterUpshift.TabIndex = 6
- '
- 'Label24
- '
- Me.Label24.AutoSize = True
- Me.Label24.Location = New System.Drawing.Point(275, 74)
- Me.Label24.Name = "Label24"
- Me.Label24.Size = New System.Drawing.Size(34, 13)
- Me.Label24.TabIndex = 5
- Me.Label24.Text = "[m/s²]"
- '
- 'Label23
- '
- Me.Label23.AutoSize = True
- Me.Label23.Location = New System.Drawing.Point(275, 48)
- Me.Label23.Name = "Label23"
- Me.Label23.Size = New System.Drawing.Size(18, 13)
- Me.Label23.TabIndex = 4
- Me.Label23.Text = "[s]"
- '
- 'Label22
- '
- Me.Label22.AutoSize = True
- Me.Label22.Location = New System.Drawing.Point(275, 25)
- Me.Label22.Name = "Label22"
- Me.Label22.Size = New System.Drawing.Size(18, 13)
- Me.Label22.TabIndex = 3
- Me.Label22.Text = "[s]"
- '
- 'Label21
- '
- Me.Label21.AutoSize = True
- Me.Label21.Location = New System.Drawing.Point(20, 74)
- Me.Label21.Name = "Label21"
- Me.Label21.Size = New System.Drawing.Size(146, 13)
- Me.Label21.TabIndex = 2
- Me.Label21.Text = "Min. acceleration after upshift"
- '
- 'Label20
- '
- Me.Label20.AutoSize = True
- Me.Label20.Location = New System.Drawing.Point(20, 48)
- Me.Label20.Name = "Label20"
- Me.Label20.Size = New System.Drawing.Size(140, 13)
- Me.Label20.TabIndex = 1
- Me.Label20.Text = "Upshift after downshift delay"
- '
- 'Label19
- '
- Me.Label19.AutoSize = True
- Me.Label19.Location = New System.Drawing.Point(20, 25)
- Me.Label19.Name = "Label19"
- Me.Label19.Size = New System.Drawing.Size(140, 13)
- Me.Label19.TabIndex = 0
- Me.Label19.Text = "Downshift after upshift delay"
- '
- 'PnTorqRes
- '
- Me.PnTorqRes.Controls.Add(Me.Label25)
- Me.PnTorqRes.Controls.Add(Me.Label2)
- Me.PnTorqRes.Controls.Add(Me.Label4)
- Me.PnTorqRes.Controls.Add(Me.TbTqResv)
- Me.PnTorqRes.Location = New System.Drawing.Point(9, 20)
- Me.PnTorqRes.Name = "PnTorqRes"
- Me.PnTorqRes.Size = New System.Drawing.Size(426, 32)
- Me.PnTorqRes.TabIndex = 2
- '
- 'Label25
- '
- Me.Label25.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.Label25.AutoSize = True
- Me.Label25.Location = New System.Drawing.Point(294, 9)
- Me.Label25.Name = "Label25"
- Me.Label25.Size = New System.Drawing.Size(129, 13)
- Me.Label25.TabIndex = 1
- Me.Label25.Text = "(Early shift-up, Skip gears)"
- '
- 'Label2
- '
- Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.Label2.AutoSize = True
- Me.Label2.Location = New System.Drawing.Point(18, 9)
- Me.Label2.Name = "Label2"
- Me.Label2.Size = New System.Drawing.Size(79, 13)
- Me.Label2.TabIndex = 0
- Me.Label2.Text = "Torque reserve"
- '
- 'Label4
- '
- Me.Label4.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.Label4.AutoSize = True
- Me.Label4.Location = New System.Drawing.Point(272, 9)
- Me.Label4.Name = "Label4"
- Me.Label4.Size = New System.Drawing.Size(21, 13)
- Me.Label4.TabIndex = 0
- Me.Label4.Text = "[%]"
- '
- 'TbTqResv
- '
- Me.TbTqResv.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.TbTqResv.Location = New System.Drawing.Point(206, 6)
- Me.TbTqResv.Name = "TbTqResv"
- Me.TbTqResv.Size = New System.Drawing.Size(57, 20)
- Me.TbTqResv.TabIndex = 0
- '
- 'TbMinTimeBetweenShifts
- '
- Me.TbMinTimeBetweenShifts.Location = New System.Drawing.Point(215, 52)
- Me.TbMinTimeBetweenShifts.Name = "TbMinTimeBetweenShifts"
- Me.TbMinTimeBetweenShifts.Size = New System.Drawing.Size(57, 20)
- Me.TbMinTimeBetweenShifts.TabIndex = 3
- '
- 'Label12
- '
- Me.Label12.AutoSize = True
- Me.Label12.Location = New System.Drawing.Point(281, 55)
- Me.Label12.Name = "Label12"
- Me.Label12.Size = New System.Drawing.Size(18, 13)
- Me.Label12.TabIndex = 9
- Me.Label12.Text = "[s]"
- '
- 'Label13
- '
- Me.Label13.AutoSize = True
- Me.Label13.Location = New System.Drawing.Point(27, 55)
- Me.Label13.Name = "Label13"
- Me.Label13.Size = New System.Drawing.Size(162, 13)
- Me.Label13.TabIndex = 8
- Me.Label13.Text = "Minimum time between gearshifts"
- '
- 'GroupBox2
- '
- Me.GroupBox2.Controls.Add(Me.TbStartAcc)
- Me.GroupBox2.Controls.Add(Me.Label11)
- Me.GroupBox2.Controls.Add(Me.TbStartSpeed)
- Me.GroupBox2.Controls.Add(Me.Label9)
- Me.GroupBox2.Controls.Add(Me.Label10)
- Me.GroupBox2.Controls.Add(Me.TbTqResvStart)
- Me.GroupBox2.Controls.Add(Me.Label8)
- Me.GroupBox2.Controls.Add(Me.Label5)
- Me.GroupBox2.Controls.Add(Me.Label7)
- Me.GroupBox2.Location = New System.Drawing.Point(6, 186)
- Me.GroupBox2.Name = "GroupBox2"
- Me.GroupBox2.Size = New System.Drawing.Size(429, 99)
- Me.GroupBox2.TabIndex = 4
- Me.GroupBox2.TabStop = False
- Me.GroupBox2.Text = "Start Gear"
- '
- 'TbStartAcc
- '
- Me.TbStartAcc.Location = New System.Drawing.Point(209, 71)
- Me.TbStartAcc.Name = "TbStartAcc"
- Me.TbStartAcc.Size = New System.Drawing.Size(57, 20)
- Me.TbStartAcc.TabIndex = 2
- Me.TbStartAcc.Visible = False
- '
- 'Label11
- '
- Me.Label11.AutoSize = True
- Me.Label11.Location = New System.Drawing.Point(20, 74)
- Me.Label11.Name = "Label11"
- Me.Label11.Size = New System.Drawing.Size(173, 13)
- Me.Label11.TabIndex = 0
- Me.Label11.Text = "Reference acceleration at clutch-in"
- Me.Label11.Visible = False
- '
- 'TbStartSpeed
- '
- Me.TbStartSpeed.Location = New System.Drawing.Point(209, 45)
- Me.TbStartSpeed.Name = "TbStartSpeed"
- Me.TbStartSpeed.Size = New System.Drawing.Size(57, 20)
- Me.TbStartSpeed.TabIndex = 1
- '
- 'Label9
- '
- Me.Label9.AutoSize = True
- Me.Label9.Location = New System.Drawing.Point(20, 48)
- Me.Label9.Name = "Label9"
- Me.Label9.Size = New System.Drawing.Size(181, 13)
- Me.Label9.TabIndex = 0
- Me.Label9.Text = "Reference vehicle speed at clutch-in"
- '
- 'Label10
- '
- Me.Label10.AutoSize = True
- Me.Label10.Location = New System.Drawing.Point(272, 74)
- Me.Label10.Name = "Label10"
- Me.Label10.Size = New System.Drawing.Size(34, 13)
- Me.Label10.TabIndex = 0
- Me.Label10.Text = "[m/s²]"
- Me.Label10.Visible = False
- '
- 'TbTqResvStart
- '
- Me.TbTqResvStart.Location = New System.Drawing.Point(209, 19)
- Me.TbTqResvStart.Name = "TbTqResvStart"
- Me.TbTqResvStart.Size = New System.Drawing.Size(57, 20)
- Me.TbTqResvStart.TabIndex = 0
- '
- 'Label8
- '
- Me.Label8.AutoSize = True
- Me.Label8.Location = New System.Drawing.Point(272, 48)
- Me.Label8.Name = "Label8"
- Me.Label8.Size = New System.Drawing.Size(31, 13)
- Me.Label8.TabIndex = 0
- Me.Label8.Text = "[m/s]"
- '
- 'Label5
- '
- Me.Label5.AutoSize = True
- Me.Label5.Location = New System.Drawing.Point(20, 22)
- Me.Label5.Name = "Label5"
- Me.Label5.Size = New System.Drawing.Size(79, 13)
- Me.Label5.TabIndex = 0
- Me.Label5.Text = "Torque reserve"
- '
- 'Label7
- '
- Me.Label7.AutoSize = True
- Me.Label7.Location = New System.Drawing.Point(272, 22)
- Me.Label7.Name = "Label7"
- Me.Label7.Size = New System.Drawing.Size(21, 13)
- Me.Label7.TabIndex = 0
- Me.Label7.Text = "[%]"
- '
- 'CmOpenFile
- '
- 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)
- '
- 'OpenWithToolStripMenuItem
- '
- Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem"
- Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
- Me.OpenWithToolStripMenuItem.Text = "Open with ..."
- '
- 'ShowInFolderToolStripMenuItem
- '
- Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem"
- Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
- Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
- '
- 'gbTC
- '
- Me.gbTC.Controls.Add(Me.pnTcEngineering)
- Me.gbTC.Controls.Add(Me.BtTCfileOpen)
- Me.gbTC.Controls.Add(Me.TbTCfile)
- Me.gbTC.Controls.Add(Me.BtTCfileBrowse)
- Me.gbTC.Controls.Add(Me.Label17)
- Me.gbTC.Location = New System.Drawing.Point(459, 377)
- Me.gbTC.Name = "gbTC"
- Me.gbTC.Size = New System.Drawing.Size(414, 162)
- Me.gbTC.TabIndex = 5
- Me.gbTC.TabStop = False
- Me.gbTC.Text = "Torque Converter"
- '
- 'pnTcEngineering
- '
- Me.pnTcEngineering.Controls.Add(Me.Label26)
- Me.pnTcEngineering.Controls.Add(Me.TBTCShiftPolygon)
- Me.pnTcEngineering.Controls.Add(Me.tbTCmaxSpeed)
- Me.pnTcEngineering.Controls.Add(Me.TbTCrefrpm)
- Me.pnTcEngineering.Controls.Add(Me.Label27)
- Me.pnTcEngineering.Controls.Add(Me.Label14)
- Me.pnTcEngineering.Controls.Add(Me.BtTCShiftFileBrowse)
- Me.pnTcEngineering.Controls.Add(Me.Label1)
- Me.pnTcEngineering.Controls.Add(Me.TbTCinertia)
- Me.pnTcEngineering.Controls.Add(Me.Label15)
- Me.pnTcEngineering.Controls.Add(Me.Label18)
- Me.pnTcEngineering.Controls.Add(Me.LblTCShiftFile)
- Me.pnTcEngineering.Location = New System.Drawing.Point(7, 63)
- Me.pnTcEngineering.Name = "pnTcEngineering"
- Me.pnTcEngineering.Size = New System.Drawing.Size(399, 93)
- Me.pnTcEngineering.TabIndex = 3
- '
- 'Label26
- '
- Me.Label26.AutoSize = True
- Me.Label26.Location = New System.Drawing.Point(1, 29)
- Me.Label26.Name = "Label26"
- Me.Label26.Size = New System.Drawing.Size(64, 13)
- Me.Label26.TabIndex = 50
- Me.Label26.Text = "Max. Speed"
- '
- 'TBTCShiftPolygon
- '
- Me.TBTCShiftPolygon.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.TBTCShiftPolygon.Location = New System.Drawing.Point(4, 70)
- Me.TBTCShiftPolygon.Name = "TBTCShiftPolygon"
- Me.TBTCShiftPolygon.Size = New System.Drawing.Size(349, 20)
- Me.TBTCShiftPolygon.TabIndex = 49
- '
- 'tbTCmaxSpeed
- '
- Me.tbTCmaxSpeed.Location = New System.Drawing.Point(75, 26)
- Me.tbTCmaxSpeed.Name = "tbTCmaxSpeed"
- Me.tbTCmaxSpeed.Size = New System.Drawing.Size(57, 20)
- Me.tbTCmaxSpeed.TabIndex = 52
- '
- 'TbTCrefrpm
- '
- Me.TbTCrefrpm.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.TbTCrefrpm.Location = New System.Drawing.Point(296, 0)
- Me.TbTCrefrpm.Name = "TbTCrefrpm"
- Me.TbTCrefrpm.Size = New System.Drawing.Size(57, 20)
- Me.TbTCrefrpm.TabIndex = 46
- '
- 'Label27
- '
- Me.Label27.AutoSize = True
- Me.Label27.Location = New System.Drawing.Point(138, 29)
- Me.Label27.Name = "Label27"
- Me.Label27.Size = New System.Drawing.Size(30, 13)
- Me.Label27.TabIndex = 51
- Me.Label27.Text = "[rpm]"
- '
- 'Label14
- '
- Me.Label14.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.Label14.AutoSize = True
- Me.Label14.Location = New System.Drawing.Point(357, 3)
- Me.Label14.Name = "Label14"
- Me.Label14.Size = New System.Drawing.Size(40, 13)
- Me.Label14.TabIndex = 41
- Me.Label14.Text = "[1/min]"
- '
- 'BtTCShiftFileBrowse
- '
- Me.BtTCShiftFileBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.BtTCShiftFileBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.BtTCShiftFileBrowse.Location = New System.Drawing.Point(354, 68)
- Me.BtTCShiftFileBrowse.Name = "BtTCShiftFileBrowse"
- Me.BtTCShiftFileBrowse.Size = New System.Drawing.Size(24, 24)
- Me.BtTCShiftFileBrowse.TabIndex = 47
- Me.BtTCShiftFileBrowse.TabStop = False
- Me.BtTCShiftFileBrowse.UseVisualStyleBackColor = True
- '
- 'Label1
- '
- Me.Label1.AutoSize = True
- Me.Label1.Location = New System.Drawing.Point(138, 3)
- Me.Label1.Name = "Label1"
- Me.Label1.Size = New System.Drawing.Size(36, 13)
- Me.Label1.TabIndex = 43
- Me.Label1.Text = "[kgm²]"
- '
- 'TbTCinertia
- '
- Me.TbTCinertia.Location = New System.Drawing.Point(75, 0)
- Me.TbTCinertia.Name = "TbTCinertia"
- Me.TbTCinertia.Size = New System.Drawing.Size(57, 20)
- Me.TbTCinertia.TabIndex = 45
- '
- 'Label15
- '
- Me.Label15.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.Label15.AutoSize = True
- Me.Label15.Location = New System.Drawing.Point(213, 3)
- Me.Label15.Name = "Label15"
- Me.Label15.Size = New System.Drawing.Size(77, 13)
- Me.Label15.TabIndex = 42
- Me.Label15.Text = "Reference rpm"
- '
- 'Label18
- '
- Me.Label18.AutoSize = True
- Me.Label18.Location = New System.Drawing.Point(1, 3)
- Me.Label18.Name = "Label18"
- Me.Label18.Size = New System.Drawing.Size(36, 13)
- Me.Label18.TabIndex = 44
- Me.Label18.Text = "Inertia"
- '
- 'LblTCShiftFile
- '
- Me.LblTCShiftFile.AutoSize = True
- Me.LblTCShiftFile.Location = New System.Drawing.Point(1, 55)
- Me.LblTCShiftFile.Name = "LblTCShiftFile"
- Me.LblTCShiftFile.Size = New System.Drawing.Size(207, 13)
- Me.LblTCShiftFile.TabIndex = 48
- Me.LblTCShiftFile.Text = "Torque converter shift polygons file (.vgbs)"
- '
- 'BtTCfileOpen
- '
- Me.BtTCfileOpen.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.BtTCfileOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.BtTCfileOpen.Location = New System.Drawing.Point(383, 35)
- Me.BtTCfileOpen.Name = "BtTCfileOpen"
- Me.BtTCfileOpen.Size = New System.Drawing.Size(24, 24)
- Me.BtTCfileOpen.TabIndex = 2
- Me.BtTCfileOpen.TabStop = False
- Me.BtTCfileOpen.UseVisualStyleBackColor = True
- '
- 'TbTCfile
- '
- Me.TbTCfile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.TbTCfile.Location = New System.Drawing.Point(9, 37)
- Me.TbTCfile.Name = "TbTCfile"
- Me.TbTCfile.Size = New System.Drawing.Size(349, 20)
- Me.TbTCfile.TabIndex = 0
- '
- 'BtTCfileBrowse
- '
- Me.BtTCfileBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.BtTCfileBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.BtTCfileBrowse.Location = New System.Drawing.Point(359, 35)
- Me.BtTCfileBrowse.Name = "BtTCfileBrowse"
- Me.BtTCfileBrowse.Size = New System.Drawing.Size(24, 24)
- Me.BtTCfileBrowse.TabIndex = 1
- Me.BtTCfileBrowse.TabStop = False
- Me.BtTCfileBrowse.UseVisualStyleBackColor = True
- '
- 'Label17
- '
- Me.Label17.AutoSize = True
- Me.Label17.Location = New System.Drawing.Point(6, 21)
- Me.Label17.Name = "Label17"
- Me.Label17.Size = New System.Drawing.Size(209, 13)
- Me.Label17.TabIndex = 0
- Me.Label17.Text = "Torque converter characteristics file (.vtcc)"
- '
- 'tbTCLUpshiftMinAcceleration
- '
- Me.tbTCLUpshiftMinAcceleration.Location = New System.Drawing.Point(78, 19)
- Me.tbTCLUpshiftMinAcceleration.Name = "tbTCLUpshiftMinAcceleration"
- Me.tbTCLUpshiftMinAcceleration.Size = New System.Drawing.Size(57, 20)
- Me.tbTCLUpshiftMinAcceleration.TabIndex = 43
- '
- 'Label30
- '
- Me.Label30.AutoSize = True
- Me.Label30.Location = New System.Drawing.Point(141, 22)
- Me.Label30.Name = "Label30"
- Me.Label30.Size = New System.Drawing.Size(34, 13)
- Me.Label30.TabIndex = 42
- Me.Label30.Text = "[m/s²]"
- '
- 'Label31
- '
- Me.Label31.AutoSize = True
- Me.Label31.Location = New System.Drawing.Point(6, 22)
- Me.Label31.Name = "Label31"
- Me.Label31.Size = New System.Drawing.Size(69, 13)
- Me.Label31.TabIndex = 41
- Me.Label31.Text = "Acc. for C->L"
- '
- 'Label16
- '
- Me.Label16.AutoSize = True
- Me.Label16.Location = New System.Drawing.Point(18, 105)
- Me.Label16.Name = "Label16"
- Me.Label16.Size = New System.Drawing.Size(95, 13)
- Me.Label16.TabIndex = 45
- Me.Label16.Text = "Transmission Type"
- '
- 'CbGStype
- '
- Me.CbGStype.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
- Me.CbGStype.FormattingEnabled = True
- Me.CbGStype.Location = New System.Drawing.Point(119, 102)
- Me.CbGStype.Name = "CbGStype"
- Me.CbGStype.Size = New System.Drawing.Size(227, 21)
- Me.CbGStype.TabIndex = 1
- '
- 'BtAddGear
- '
- Me.BtAddGear.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
- Me.BtAddGear.Location = New System.Drawing.Point(6, 202)
- Me.BtAddGear.Name = "BtAddGear"
- Me.BtAddGear.Size = New System.Drawing.Size(24, 24)
- Me.BtAddGear.TabIndex = 1
- Me.BtAddGear.UseVisualStyleBackColor = True
- '
- 'GroupBox4
- '
- Me.GroupBox4.Controls.Add(Me.btExportVGBS)
- Me.GroupBox4.Controls.Add(Me.Label32)
- Me.GroupBox4.Controls.Add(Me.LvGears)
- Me.GroupBox4.Controls.Add(Me.BtRemGear)
- Me.GroupBox4.Controls.Add(Me.BtAddGear)
- Me.GroupBox4.Location = New System.Drawing.Point(12, 135)
- Me.GroupBox4.Name = "GroupBox4"
- Me.GroupBox4.Size = New System.Drawing.Size(441, 232)
- Me.GroupBox4.TabIndex = 2
- Me.GroupBox4.TabStop = False
- Me.GroupBox4.Text = "Gears"
- '
- 'Label32
- '
- Me.Label32.AutoSize = True
- Me.Label32.Location = New System.Drawing.Point(331, 202)
- Me.Label32.Name = "Label32"
- Me.Label32.Size = New System.Drawing.Size(106, 13)
- Me.Label32.TabIndex = 3
- Me.Label32.Text = "(Double-Click to Edit)"
- '
- 'PnInertiaTI
- '
- Me.PnInertiaTI.Controls.Add(Me.Label6)
- Me.PnInertiaTI.Controls.Add(Me.TBI_getr)
- Me.PnInertiaTI.Controls.Add(Me.Label33)
- Me.PnInertiaTI.Controls.Add(Me.Label48)
- Me.PnInertiaTI.Controls.Add(Me.Label49)
- Me.PnInertiaTI.Controls.Add(Me.TbTracInt)
- Me.PnInertiaTI.Location = New System.Drawing.Point(459, 344)
- Me.PnInertiaTI.Name = "PnInertiaTI"
- Me.PnInertiaTI.Size = New System.Drawing.Size(411, 30)
- Me.PnInertiaTI.TabIndex = 4
- '
- 'PicBox
- '
- Me.PicBox.BackColor = System.Drawing.Color.LightGray
- Me.PicBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
- Me.PicBox.Location = New System.Drawing.Point(459, 28)
- Me.PicBox.Name = "PicBox"
- Me.PicBox.Size = New System.Drawing.Size(414, 308)
- Me.PicBox.TabIndex = 48
- Me.PicBox.TabStop = False
- '
- 'gbPowershiftLosses
- '
- Me.gbPowershiftLosses.Controls.Add(Me.lbAtShiftTime)
- Me.gbPowershiftLosses.Controls.Add(Me.tbATShiftTime)
- Me.gbPowershiftLosses.Controls.Add(Me.Label28)
- Me.gbPowershiftLosses.Location = New System.Drawing.Point(459, 598)
- Me.gbPowershiftLosses.Name = "gbPowershiftLosses"
- Me.gbPowershiftLosses.Size = New System.Drawing.Size(414, 47)
- Me.gbPowershiftLosses.TabIndex = 49
- Me.gbPowershiftLosses.TabStop = False
- Me.gbPowershiftLosses.Text = "Power shift losses"
- '
- 'lbAtShiftTime
- '
- Me.lbAtShiftTime.AutoSize = True
- Me.lbAtShiftTime.Location = New System.Drawing.Point(6, 22)
- Me.lbAtShiftTime.Name = "lbAtShiftTime"
- Me.lbAtShiftTime.Size = New System.Drawing.Size(50, 13)
- Me.lbAtShiftTime.TabIndex = 0
- Me.lbAtShiftTime.Text = "Shift time"
- '
- 'tbATShiftTime
- '
- Me.tbATShiftTime.Location = New System.Drawing.Point(78, 19)
- Me.tbATShiftTime.Name = "tbATShiftTime"
- Me.tbATShiftTime.Size = New System.Drawing.Size(57, 20)
- Me.tbATShiftTime.TabIndex = 4
- '
- 'Label28
- '
- Me.Label28.AutoSize = True
- Me.Label28.Location = New System.Drawing.Point(141, 22)
- Me.Label28.Name = "Label28"
- Me.Label28.Size = New System.Drawing.Size(18, 13)
- Me.Label28.TabIndex = 41
- Me.Label28.Text = "[s]"
- '
- 'tbTCCUpshiftMinAcceleration
- '
- Me.tbTCCUpshiftMinAcceleration.Location = New System.Drawing.Point(299, 19)
- Me.tbTCCUpshiftMinAcceleration.Name = "tbTCCUpshiftMinAcceleration"
- Me.tbTCCUpshiftMinAcceleration.Size = New System.Drawing.Size(57, 20)
- Me.tbTCCUpshiftMinAcceleration.TabIndex = 46
- '
- 'Label34
- '
- Me.Label34.AutoSize = True
- Me.Label34.Location = New System.Drawing.Point(362, 22)
- Me.Label34.Name = "Label34"
- Me.Label34.Size = New System.Drawing.Size(34, 13)
- Me.Label34.TabIndex = 45
- Me.Label34.Text = "[m/s²]"
- '
- 'Label35
- '
- Me.Label35.AutoSize = True
- Me.Label35.Location = New System.Drawing.Point(211, 22)
- Me.Label35.Name = "Label35"
- Me.Label35.Size = New System.Drawing.Size(70, 13)
- Me.Label35.TabIndex = 44
- Me.Label35.Text = "Acc. for C->C"
- '
- 'gbTCAccMin
- '
- Me.gbTCAccMin.Controls.Add(Me.tbTCLUpshiftMinAcceleration)
- Me.gbTCAccMin.Controls.Add(Me.tbTCCUpshiftMinAcceleration)
- Me.gbTCAccMin.Controls.Add(Me.Label34)
- Me.gbTCAccMin.Controls.Add(Me.Label31)
- Me.gbTCAccMin.Controls.Add(Me.Label35)
- Me.gbTCAccMin.Controls.Add(Me.Label30)
- Me.gbTCAccMin.Location = New System.Drawing.Point(459, 545)
- Me.gbTCAccMin.Name = "gbTCAccMin"
- Me.gbTCAccMin.Size = New System.Drawing.Size(414, 47)
- Me.gbTCAccMin.TabIndex = 50
- Me.gbTCAccMin.TabStop = False
- Me.gbTCAccMin.Text = "Torque Converter: Min. acceleration after upshift"
- '
- 'lblGbxInfo
- '
- Me.lblGbxInfo.AutoSize = True
- Me.lblGbxInfo.Location = New System.Drawing.Point(121, 126)
- Me.lblGbxInfo.Name = "lblGbxInfo"
- Me.lblGbxInfo.Size = New System.Drawing.Size(0, 13)
- Me.lblGbxInfo.TabIndex = 51
- '
- 'btnExportXML
- '
- Me.btnExportXML.Location = New System.Drawing.Point(459, 648)
- Me.btnExportXML.Name = "btnExportXML"
- Me.btnExportXML.Size = New System.Drawing.Size(119, 23)
- Me.btnExportXML.TabIndex = 52
- Me.btnExportXML.Text = "Exp. Gearbox as XML"
- Me.btnExportXML.UseVisualStyleBackColor = True
- '
- 'btnExportAxlGearXML
- '
- Me.btnExportAxlGearXML.Location = New System.Drawing.Point(584, 648)
- Me.btnExportAxlGearXML.Name = "btnExportAxlGearXML"
- Me.btnExportAxlGearXML.Size = New System.Drawing.Size(118, 23)
- Me.btnExportAxlGearXML.TabIndex = 53
- Me.btnExportAxlGearXML.Text = "Exp. AxlGear as XML"
- Me.btnExportAxlGearXML.UseVisualStyleBackColor = True
- '
- 'btExportVGBS
- '
- Me.btExportVGBS.Enabled = False
- Me.btExportVGBS.Location = New System.Drawing.Point(55, 202)
- Me.btExportVGBS.Name = "btExportVGBS"
- Me.btExportVGBS.Size = New System.Drawing.Size(153, 24)
- Me.btExportVGBS.TabIndex = 4
- Me.btExportVGBS.Text = "Export Shiftcurve as VGBS"
- Me.btExportVGBS.UseVisualStyleBackColor = True
- '
- 'GearboxForm
- '
- Me.AcceptButton = Me.ButOK
- Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
- Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
- Me.CancelButton = Me.ButCancel
- Me.ClientSize = New System.Drawing.Size(877, 696)
- Me.Controls.Add(Me.btnExportAxlGearXML)
- Me.Controls.Add(Me.btnExportXML)
- Me.Controls.Add(Me.lblGbxInfo)
- Me.Controls.Add(Me.gbTCAccMin)
- Me.Controls.Add(Me.gbPowershiftLosses)
- Me.Controls.Add(Me.PicBox)
- Me.Controls.Add(Me.PnInertiaTI)
- Me.Controls.Add(Me.GroupBox4)
- Me.Controls.Add(Me.CbGStype)
- Me.Controls.Add(Me.Label16)
- Me.Controls.Add(Me.PictureBox1)
- Me.Controls.Add(Me.GrGearShift)
- Me.Controls.Add(Me.gbTC)
- Me.Controls.Add(Me.Label3)
- Me.Controls.Add(Me.TbName)
- Me.Controls.Add(Me.ButCancel)
- Me.Controls.Add(Me.ButOK)
- Me.Controls.Add(Me.StatusStrip1)
- Me.Controls.Add(Me.ToolStrip1)
- Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
- Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
- Me.MaximizeBox = False
- Me.Name = "GearboxForm"
- Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
- Me.Text = "F_GBX"
- Me.ToolStrip1.ResumeLayout(False)
- Me.ToolStrip1.PerformLayout()
- Me.StatusStrip1.ResumeLayout(False)
- Me.StatusStrip1.PerformLayout()
- CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
- Me.GrGearShift.ResumeLayout(False)
- Me.GrGearShift.PerformLayout()
- Me.GroupBox1.ResumeLayout(False)
- Me.GroupBox1.PerformLayout()
- Me.PnTorqRes.ResumeLayout(False)
- Me.PnTorqRes.PerformLayout()
- Me.GroupBox2.ResumeLayout(False)
- Me.GroupBox2.PerformLayout()
- Me.CmOpenFile.ResumeLayout(False)
- Me.gbTC.ResumeLayout(False)
- Me.gbTC.PerformLayout()
- Me.pnTcEngineering.ResumeLayout(False)
- Me.pnTcEngineering.PerformLayout()
- Me.GroupBox4.ResumeLayout(False)
- Me.GroupBox4.PerformLayout()
- Me.PnInertiaTI.ResumeLayout(False)
- Me.PnInertiaTI.PerformLayout()
- CType(Me.PicBox, System.ComponentModel.ISupportInitialize).EndInit()
- Me.gbPowershiftLosses.ResumeLayout(False)
- Me.gbPowershiftLosses.PerformLayout()
- Me.gbTCAccMin.ResumeLayout(False)
- Me.gbTCAccMin.PerformLayout()
- Me.ResumeLayout(False)
- Me.PerformLayout()
+ Me.components = New System.ComponentModel.Container()
+ Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(GearboxForm))
+ Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
+ Me.ToolStripBtNew = New System.Windows.Forms.ToolStripButton()
+ Me.ToolStripBtOpen = New System.Windows.Forms.ToolStripButton()
+ Me.ToolStripBtSave = New System.Windows.Forms.ToolStripButton()
+ Me.ToolStripBtSaveAs = New System.Windows.Forms.ToolStripButton()
+ Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
+ Me.ToolStripBtSendTo = New System.Windows.Forms.ToolStripButton()
+ Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
+ Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
+ Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
+ Me.LbStatus = New System.Windows.Forms.ToolStripStatusLabel()
+ Me.ButCancel = New System.Windows.Forms.Button()
+ Me.ButOK = New System.Windows.Forms.Button()
+ Me.TbTracInt = New System.Windows.Forms.TextBox()
+ Me.LvGears = New System.Windows.Forms.ListView()
+ Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader2 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader3 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader5 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader6 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader7 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.TBI_getr = New System.Windows.Forms.TextBox()
+ Me.Label49 = New System.Windows.Forms.Label()
+ Me.Label33 = New System.Windows.Forms.Label()
+ Me.Label48 = New System.Windows.Forms.Label()
+ Me.Label6 = New System.Windows.Forms.Label()
+ Me.Label3 = New System.Windows.Forms.Label()
+ Me.TbName = New System.Windows.Forms.TextBox()
+ Me.PictureBox1 = New System.Windows.Forms.PictureBox()
+ Me.BtRemGear = New System.Windows.Forms.Button()
+ Me.GrGearShift = New System.Windows.Forms.GroupBox()
+ Me.GroupBox1 = New System.Windows.Forms.GroupBox()
+ Me.tbUpshiftMinAcceleration = New System.Windows.Forms.TextBox()
+ Me.tbUpshiftAfterDownshift = New System.Windows.Forms.TextBox()
+ Me.tbDownshiftAfterUpshift = New System.Windows.Forms.TextBox()
+ Me.Label24 = New System.Windows.Forms.Label()
+ Me.Label23 = New System.Windows.Forms.Label()
+ Me.Label22 = New System.Windows.Forms.Label()
+ Me.Label21 = New System.Windows.Forms.Label()
+ Me.Label20 = New System.Windows.Forms.Label()
+ Me.Label19 = New System.Windows.Forms.Label()
+ Me.PnTorqRes = New System.Windows.Forms.Panel()
+ Me.Label25 = New System.Windows.Forms.Label()
+ Me.Label2 = New System.Windows.Forms.Label()
+ Me.Label4 = New System.Windows.Forms.Label()
+ Me.TbTqResv = New System.Windows.Forms.TextBox()
+ Me.TbMinTimeBetweenShifts = New System.Windows.Forms.TextBox()
+ Me.Label12 = New System.Windows.Forms.Label()
+ Me.Label13 = New System.Windows.Forms.Label()
+ Me.GroupBox2 = New System.Windows.Forms.GroupBox()
+ Me.TbStartAcc = New System.Windows.Forms.TextBox()
+ Me.Label11 = New System.Windows.Forms.Label()
+ Me.TbStartSpeed = New System.Windows.Forms.TextBox()
+ Me.Label9 = New System.Windows.Forms.Label()
+ Me.Label10 = New System.Windows.Forms.Label()
+ Me.TbTqResvStart = New System.Windows.Forms.TextBox()
+ Me.Label8 = New System.Windows.Forms.Label()
+ Me.Label5 = New System.Windows.Forms.Label()
+ Me.Label7 = New System.Windows.Forms.Label()
+ Me.CmOpenFile = New System.Windows.Forms.ContextMenuStrip(Me.components)
+ Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.gbTC = New System.Windows.Forms.GroupBox()
+ Me.pnTcEngineering = New System.Windows.Forms.Panel()
+ Me.Label26 = New System.Windows.Forms.Label()
+ Me.TBTCShiftPolygon = New System.Windows.Forms.TextBox()
+ Me.tbTCmaxSpeed = New System.Windows.Forms.TextBox()
+ Me.TbTCrefrpm = New System.Windows.Forms.TextBox()
+ Me.Label27 = New System.Windows.Forms.Label()
+ Me.Label14 = New System.Windows.Forms.Label()
+ Me.BtTCShiftFileBrowse = New System.Windows.Forms.Button()
+ Me.Label1 = New System.Windows.Forms.Label()
+ Me.TbTCinertia = New System.Windows.Forms.TextBox()
+ Me.Label15 = New System.Windows.Forms.Label()
+ Me.Label18 = New System.Windows.Forms.Label()
+ Me.LblTCShiftFile = New System.Windows.Forms.Label()
+ Me.BtTCfileOpen = New System.Windows.Forms.Button()
+ Me.TbTCfile = New System.Windows.Forms.TextBox()
+ Me.BtTCfileBrowse = New System.Windows.Forms.Button()
+ Me.Label17 = New System.Windows.Forms.Label()
+ Me.tbTCLUpshiftMinAcceleration = New System.Windows.Forms.TextBox()
+ Me.Label30 = New System.Windows.Forms.Label()
+ Me.Label31 = New System.Windows.Forms.Label()
+ Me.Label16 = New System.Windows.Forms.Label()
+ Me.CbGStype = New System.Windows.Forms.ComboBox()
+ Me.BtAddGear = New System.Windows.Forms.Button()
+ Me.GroupBox4 = New System.Windows.Forms.GroupBox()
+ Me.btExportVGBS = New System.Windows.Forms.Button()
+ Me.Label32 = New System.Windows.Forms.Label()
+ Me.PnInertiaTI = New System.Windows.Forms.Panel()
+ Me.PicBox = New System.Windows.Forms.PictureBox()
+ Me.gbPowershiftLosses = New System.Windows.Forms.GroupBox()
+ Me.lbAtShiftTime = New System.Windows.Forms.Label()
+ Me.tbATShiftTime = New System.Windows.Forms.TextBox()
+ Me.Label28 = New System.Windows.Forms.Label()
+ Me.tbTCCUpshiftMinAcceleration = New System.Windows.Forms.TextBox()
+ Me.Label34 = New System.Windows.Forms.Label()
+ Me.Label35 = New System.Windows.Forms.Label()
+ Me.gbTCAccMin = New System.Windows.Forms.GroupBox()
+ Me.lblGbxInfo = New System.Windows.Forms.Label()
+ Me.btnExportXML = New System.Windows.Forms.Button()
+ Me.btnExportAxlGearXML = New System.Windows.Forms.Button()
+ Me.ToolStrip1.SuspendLayout
+ Me.StatusStrip1.SuspendLayout
+ CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).BeginInit
+ Me.GrGearShift.SuspendLayout
+ Me.GroupBox1.SuspendLayout
+ Me.PnTorqRes.SuspendLayout
+ Me.GroupBox2.SuspendLayout
+ Me.CmOpenFile.SuspendLayout
+ Me.gbTC.SuspendLayout
+ Me.pnTcEngineering.SuspendLayout
+ Me.GroupBox4.SuspendLayout
+ Me.PnInertiaTI.SuspendLayout
+ CType(Me.PicBox,System.ComponentModel.ISupportInitialize).BeginInit
+ Me.gbPowershiftLosses.SuspendLayout
+ Me.gbTCAccMin.SuspendLayout
+ Me.SuspendLayout
+ '
+ 'ToolStrip1
+ '
+ Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
+ Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
+ Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator3, Me.ToolStripBtSendTo, Me.ToolStripSeparator1, Me.ToolStripButton1})
+ Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
+ Me.ToolStrip1.Name = "ToolStrip1"
+ Me.ToolStrip1.Size = New System.Drawing.Size(877, 31)
+ Me.ToolStrip1.TabIndex = 30
+ Me.ToolStrip1.Text = "ToolStrip1"
+ '
+ 'ToolStripBtNew
+ '
+ Me.ToolStripBtNew.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+ 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.Text = "ToolStripButton1"
+ Me.ToolStripBtNew.ToolTipText = "New"
+ '
+ 'ToolStripBtOpen
+ '
+ Me.ToolStripBtOpen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+ 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.Text = "ToolStripButton1"
+ Me.ToolStripBtOpen.ToolTipText = "Open..."
+ '
+ 'ToolStripBtSave
+ '
+ Me.ToolStripBtSave.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+ 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.Text = "ToolStripButton1"
+ Me.ToolStripBtSave.ToolTipText = "Save"
+ '
+ 'ToolStripBtSaveAs
+ '
+ Me.ToolStripBtSaveAs.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+ 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.Text = "ToolStripButton1"
+ Me.ToolStripBtSaveAs.ToolTipText = "Save As..."
+ '
+ 'ToolStripSeparator3
+ '
+ Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
+ Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 31)
+ '
+ 'ToolStripBtSendTo
+ '
+ Me.ToolStripBtSendTo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+ 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.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)
+ '
+ 'ToolStripButton1
+ '
+ Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+ 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.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, 674)
+ Me.StatusStrip1.Name = "StatusStrip1"
+ Me.StatusStrip1.Size = New System.Drawing.Size(877, 22)
+ Me.StatusStrip1.SizingGrip = false
+ Me.StatusStrip1.TabIndex = 37
+ Me.StatusStrip1.Text = "StatusStrip1"
+ '
+ 'LbStatus
+ '
+ Me.LbStatus.Name = "LbStatus"
+ Me.LbStatus.Size = New System.Drawing.Size(39, 17)
+ Me.LbStatus.Text = "Status"
+ '
+ 'ButCancel
+ '
+ 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(798, 648)
+ Me.ButCancel.Name = "ButCancel"
+ Me.ButCancel.Size = New System.Drawing.Size(75, 23)
+ Me.ButCancel.TabIndex = 8
+ Me.ButCancel.Text = "Cancel"
+ Me.ButCancel.UseVisualStyleBackColor = true
+ '
+ 'ButOK
+ '
+ Me.ButOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.ButOK.Location = New System.Drawing.Point(717, 648)
+ Me.ButOK.Name = "ButOK"
+ Me.ButOK.Size = New System.Drawing.Size(75, 23)
+ Me.ButOK.TabIndex = 7
+ Me.ButOK.Text = "Save"
+ Me.ButOK.UseVisualStyleBackColor = true
+ '
+ 'TbTracInt
+ '
+ Me.TbTracInt.Location = New System.Drawing.Point(299, 3)
+ Me.TbTracInt.Name = "TbTracInt"
+ Me.TbTracInt.Size = New System.Drawing.Size(57, 20)
+ Me.TbTracInt.TabIndex = 1
+ '
+ 'LvGears
+ '
+ Me.LvGears.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader2, Me.ColumnHeader3, Me.ColumnHeader5, Me.ColumnHeader6, Me.ColumnHeader7})
+ Me.LvGears.FullRowSelect = true
+ Me.LvGears.GridLines = true
+ Me.LvGears.HideSelection = false
+ Me.LvGears.Location = New System.Drawing.Point(6, 18)
+ Me.LvGears.MultiSelect = false
+ Me.LvGears.Name = "LvGears"
+ Me.LvGears.Size = New System.Drawing.Size(429, 183)
+ Me.LvGears.TabIndex = 0
+ Me.LvGears.TabStop = false
+ Me.LvGears.UseCompatibleStateImageBehavior = false
+ Me.LvGears.View = System.Windows.Forms.View.Details
+ '
+ 'ColumnHeader1
+ '
+ Me.ColumnHeader1.Text = "Gear"
+ Me.ColumnHeader1.Width = 38
+ '
+ 'ColumnHeader2
+ '
+ Me.ColumnHeader2.Text = "Ratio"
+ Me.ColumnHeader2.Width = 42
+ '
+ 'ColumnHeader3
+ '
+ Me.ColumnHeader3.Text = "Loss Map or Efficiency"
+ Me.ColumnHeader3.Width = 111
+ '
+ 'ColumnHeader5
+ '
+ Me.ColumnHeader5.Text = "Shift Polygons"
+ Me.ColumnHeader5.Width = 79
+ '
+ 'ColumnHeader6
+ '
+ Me.ColumnHeader6.Text = "Max Torque"
+ Me.ColumnHeader6.Width = 78
+ '
+ 'ColumnHeader7
+ '
+ Me.ColumnHeader7.Text = "Max Speed"
+ Me.ColumnHeader7.Width = 76
+ '
+ 'TBI_getr
+ '
+ Me.TBI_getr.Location = New System.Drawing.Point(78, 3)
+ Me.TBI_getr.Name = "TBI_getr"
+ Me.TBI_getr.Size = New System.Drawing.Size(57, 20)
+ Me.TBI_getr.TabIndex = 0
+ '
+ 'Label49
+ '
+ Me.Label49.AutoSize = true
+ Me.Label49.Location = New System.Drawing.Point(362, 6)
+ Me.Label49.Name = "Label49"
+ Me.Label49.Size = New System.Drawing.Size(18, 13)
+ Me.Label49.TabIndex = 2
+ Me.Label49.Text = "[s]"
+ '
+ 'Label33
+ '
+ Me.Label33.AutoSize = true
+ Me.Label33.Location = New System.Drawing.Point(141, 6)
+ Me.Label33.Name = "Label33"
+ Me.Label33.Size = New System.Drawing.Size(36, 13)
+ Me.Label33.TabIndex = 2
+ Me.Label33.Text = "[kgm²]"
+ '
+ 'Label48
+ '
+ Me.Label48.AutoSize = true
+ Me.Label48.Location = New System.Drawing.Point(191, 6)
+ Me.Label48.Name = "Label48"
+ Me.Label48.Size = New System.Drawing.Size(102, 13)
+ Me.Label48.TabIndex = 2
+ Me.Label48.Text = "Traction Interruption"
+ '
+ 'Label6
+ '
+ Me.Label6.AutoSize = true
+ Me.Label6.Location = New System.Drawing.Point(6, 6)
+ Me.Label6.Name = "Label6"
+ Me.Label6.Size = New System.Drawing.Size(36, 13)
+ Me.Label6.TabIndex = 2
+ Me.Label6.Text = "Inertia"
+ '
+ 'Label3
+ '
+ Me.Label3.AutoSize = true
+ Me.Label3.Location = New System.Drawing.Point(26, 79)
+ Me.Label3.Name = "Label3"
+ Me.Label3.Size = New System.Drawing.Size(87, 13)
+ Me.Label3.TabIndex = 42
+ Me.Label3.Text = "Make and Model"
+ '
+ 'TbName
+ '
+ Me.TbName.Location = New System.Drawing.Point(119, 76)
+ Me.TbName.Name = "TbName"
+ Me.TbName.Size = New System.Drawing.Size(334, 20)
+ Me.TbName.TabIndex = 0
+ '
+ 'PictureBox1
+ '
+ Me.PictureBox1.BackColor = System.Drawing.Color.White
+ Me.PictureBox1.Image = Global.TUGraz.VECTO.My.Resources.Resources.VECTO_GBX
+ Me.PictureBox1.Location = New System.Drawing.Point(0, 28)
+ Me.PictureBox1.Name = "PictureBox1"
+ Me.PictureBox1.Size = New System.Drawing.Size(453, 40)
+ Me.PictureBox1.TabIndex = 43
+ Me.PictureBox1.TabStop = false
+ '
+ 'BtRemGear
+ '
+ Me.BtRemGear.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
+ Me.BtRemGear.Location = New System.Drawing.Point(30, 202)
+ Me.BtRemGear.Name = "BtRemGear"
+ Me.BtRemGear.Size = New System.Drawing.Size(24, 24)
+ Me.BtRemGear.TabIndex = 2
+ Me.BtRemGear.UseVisualStyleBackColor = true
+ '
+ 'GrGearShift
+ '
+ Me.GrGearShift.Controls.Add(Me.GroupBox1)
+ Me.GrGearShift.Controls.Add(Me.PnTorqRes)
+ Me.GrGearShift.Controls.Add(Me.TbMinTimeBetweenShifts)
+ Me.GrGearShift.Controls.Add(Me.Label12)
+ Me.GrGearShift.Controls.Add(Me.Label13)
+ Me.GrGearShift.Controls.Add(Me.GroupBox2)
+ Me.GrGearShift.Location = New System.Drawing.Point(12, 377)
+ Me.GrGearShift.Name = "GrGearShift"
+ Me.GrGearShift.Size = New System.Drawing.Size(441, 291)
+ Me.GrGearShift.TabIndex = 3
+ Me.GrGearShift.TabStop = false
+ Me.GrGearShift.Text = "Gear shift parameters"
+ '
+ 'GroupBox1
+ '
+ Me.GroupBox1.Controls.Add(Me.tbUpshiftMinAcceleration)
+ Me.GroupBox1.Controls.Add(Me.tbUpshiftAfterDownshift)
+ Me.GroupBox1.Controls.Add(Me.tbDownshiftAfterUpshift)
+ Me.GroupBox1.Controls.Add(Me.Label24)
+ Me.GroupBox1.Controls.Add(Me.Label23)
+ Me.GroupBox1.Controls.Add(Me.Label22)
+ Me.GroupBox1.Controls.Add(Me.Label21)
+ Me.GroupBox1.Controls.Add(Me.Label20)
+ Me.GroupBox1.Controls.Add(Me.Label19)
+ Me.GroupBox1.Location = New System.Drawing.Point(6, 82)
+ Me.GroupBox1.Name = "GroupBox1"
+ Me.GroupBox1.Size = New System.Drawing.Size(429, 100)
+ Me.GroupBox1.TabIndex = 2
+ Me.GroupBox1.TabStop = false
+ Me.GroupBox1.Text = "Shift Strategy Parameters"
+ '
+ 'tbUpshiftMinAcceleration
+ '
+ Me.tbUpshiftMinAcceleration.Location = New System.Drawing.Point(209, 71)
+ Me.tbUpshiftMinAcceleration.Name = "tbUpshiftMinAcceleration"
+ Me.tbUpshiftMinAcceleration.Size = New System.Drawing.Size(57, 20)
+ Me.tbUpshiftMinAcceleration.TabIndex = 2
+ '
+ 'tbUpshiftAfterDownshift
+ '
+ Me.tbUpshiftAfterDownshift.Location = New System.Drawing.Point(209, 45)
+ Me.tbUpshiftAfterDownshift.Name = "tbUpshiftAfterDownshift"
+ Me.tbUpshiftAfterDownshift.Size = New System.Drawing.Size(57, 20)
+ Me.tbUpshiftAfterDownshift.TabIndex = 1
+ '
+ 'tbDownshiftAfterUpshift
+ '
+ Me.tbDownshiftAfterUpshift.Location = New System.Drawing.Point(209, 20)
+ Me.tbDownshiftAfterUpshift.Name = "tbDownshiftAfterUpshift"
+ Me.tbDownshiftAfterUpshift.Size = New System.Drawing.Size(57, 20)
+ Me.tbDownshiftAfterUpshift.TabIndex = 0
+ '
+ 'Label24
+ '
+ Me.Label24.AutoSize = true
+ Me.Label24.Location = New System.Drawing.Point(275, 74)
+ Me.Label24.Name = "Label24"
+ Me.Label24.Size = New System.Drawing.Size(34, 13)
+ Me.Label24.TabIndex = 5
+ Me.Label24.Text = "[m/s²]"
+ '
+ 'Label23
+ '
+ Me.Label23.AutoSize = true
+ Me.Label23.Location = New System.Drawing.Point(275, 48)
+ Me.Label23.Name = "Label23"
+ Me.Label23.Size = New System.Drawing.Size(18, 13)
+ Me.Label23.TabIndex = 4
+ Me.Label23.Text = "[s]"
+ '
+ 'Label22
+ '
+ Me.Label22.AutoSize = true
+ Me.Label22.Location = New System.Drawing.Point(275, 25)
+ Me.Label22.Name = "Label22"
+ Me.Label22.Size = New System.Drawing.Size(18, 13)
+ Me.Label22.TabIndex = 3
+ Me.Label22.Text = "[s]"
+ '
+ 'Label21
+ '
+ Me.Label21.AutoSize = true
+ Me.Label21.Location = New System.Drawing.Point(20, 74)
+ Me.Label21.Name = "Label21"
+ Me.Label21.Size = New System.Drawing.Size(146, 13)
+ Me.Label21.TabIndex = 2
+ Me.Label21.Text = "Min. acceleration after upshift"
+ '
+ 'Label20
+ '
+ Me.Label20.AutoSize = true
+ Me.Label20.Location = New System.Drawing.Point(20, 48)
+ Me.Label20.Name = "Label20"
+ Me.Label20.Size = New System.Drawing.Size(140, 13)
+ Me.Label20.TabIndex = 1
+ Me.Label20.Text = "Upshift after downshift delay"
+ '
+ 'Label19
+ '
+ Me.Label19.AutoSize = true
+ Me.Label19.Location = New System.Drawing.Point(20, 25)
+ Me.Label19.Name = "Label19"
+ Me.Label19.Size = New System.Drawing.Size(140, 13)
+ Me.Label19.TabIndex = 0
+ Me.Label19.Text = "Downshift after upshift delay"
+ '
+ 'PnTorqRes
+ '
+ Me.PnTorqRes.Controls.Add(Me.Label25)
+ Me.PnTorqRes.Controls.Add(Me.Label2)
+ Me.PnTorqRes.Controls.Add(Me.Label4)
+ Me.PnTorqRes.Controls.Add(Me.TbTqResv)
+ Me.PnTorqRes.Location = New System.Drawing.Point(9, 20)
+ Me.PnTorqRes.Name = "PnTorqRes"
+ Me.PnTorqRes.Size = New System.Drawing.Size(426, 32)
+ Me.PnTorqRes.TabIndex = 0
+ '
+ 'Label25
+ '
+ Me.Label25.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.Label25.AutoSize = true
+ Me.Label25.Location = New System.Drawing.Point(294, 9)
+ Me.Label25.Name = "Label25"
+ Me.Label25.Size = New System.Drawing.Size(129, 13)
+ Me.Label25.TabIndex = 1
+ Me.Label25.Text = "(Early shift-up, Skip gears)"
+ '
+ 'Label2
+ '
+ Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.Label2.AutoSize = true
+ Me.Label2.Location = New System.Drawing.Point(18, 9)
+ Me.Label2.Name = "Label2"
+ Me.Label2.Size = New System.Drawing.Size(79, 13)
+ Me.Label2.TabIndex = 0
+ Me.Label2.Text = "Torque reserve"
+ '
+ 'Label4
+ '
+ Me.Label4.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.Label4.AutoSize = true
+ Me.Label4.Location = New System.Drawing.Point(272, 9)
+ Me.Label4.Name = "Label4"
+ Me.Label4.Size = New System.Drawing.Size(21, 13)
+ Me.Label4.TabIndex = 0
+ Me.Label4.Text = "[%]"
+ '
+ 'TbTqResv
+ '
+ Me.TbTqResv.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.TbTqResv.Location = New System.Drawing.Point(206, 6)
+ Me.TbTqResv.Name = "TbTqResv"
+ Me.TbTqResv.Size = New System.Drawing.Size(57, 20)
+ Me.TbTqResv.TabIndex = 0
+ '
+ 'TbMinTimeBetweenShifts
+ '
+ Me.TbMinTimeBetweenShifts.Location = New System.Drawing.Point(215, 52)
+ Me.TbMinTimeBetweenShifts.Name = "TbMinTimeBetweenShifts"
+ Me.TbMinTimeBetweenShifts.Size = New System.Drawing.Size(57, 20)
+ Me.TbMinTimeBetweenShifts.TabIndex = 1
+ '
+ 'Label12
+ '
+ Me.Label12.AutoSize = true
+ Me.Label12.Location = New System.Drawing.Point(281, 55)
+ Me.Label12.Name = "Label12"
+ Me.Label12.Size = New System.Drawing.Size(18, 13)
+ Me.Label12.TabIndex = 9
+ Me.Label12.Text = "[s]"
+ '
+ 'Label13
+ '
+ Me.Label13.AutoSize = true
+ Me.Label13.Location = New System.Drawing.Point(27, 55)
+ Me.Label13.Name = "Label13"
+ Me.Label13.Size = New System.Drawing.Size(162, 13)
+ Me.Label13.TabIndex = 8
+ Me.Label13.Text = "Minimum time between gearshifts"
+ '
+ 'GroupBox2
+ '
+ Me.GroupBox2.Controls.Add(Me.TbStartAcc)
+ Me.GroupBox2.Controls.Add(Me.Label11)
+ Me.GroupBox2.Controls.Add(Me.TbStartSpeed)
+ Me.GroupBox2.Controls.Add(Me.Label9)
+ Me.GroupBox2.Controls.Add(Me.Label10)
+ Me.GroupBox2.Controls.Add(Me.TbTqResvStart)
+ Me.GroupBox2.Controls.Add(Me.Label8)
+ Me.GroupBox2.Controls.Add(Me.Label5)
+ Me.GroupBox2.Controls.Add(Me.Label7)
+ Me.GroupBox2.Location = New System.Drawing.Point(6, 186)
+ Me.GroupBox2.Name = "GroupBox2"
+ Me.GroupBox2.Size = New System.Drawing.Size(429, 99)
+ Me.GroupBox2.TabIndex = 3
+ Me.GroupBox2.TabStop = false
+ Me.GroupBox2.Text = "Start Gear"
+ '
+ 'TbStartAcc
+ '
+ Me.TbStartAcc.Location = New System.Drawing.Point(209, 71)
+ Me.TbStartAcc.Name = "TbStartAcc"
+ Me.TbStartAcc.Size = New System.Drawing.Size(57, 20)
+ Me.TbStartAcc.TabIndex = 2
+ Me.TbStartAcc.Visible = false
+ '
+ 'Label11
+ '
+ Me.Label11.AutoSize = true
+ Me.Label11.Location = New System.Drawing.Point(20, 74)
+ Me.Label11.Name = "Label11"
+ Me.Label11.Size = New System.Drawing.Size(173, 13)
+ Me.Label11.TabIndex = 0
+ Me.Label11.Text = "Reference acceleration at clutch-in"
+ Me.Label11.Visible = false
+ '
+ 'TbStartSpeed
+ '
+ Me.TbStartSpeed.Location = New System.Drawing.Point(209, 45)
+ Me.TbStartSpeed.Name = "TbStartSpeed"
+ Me.TbStartSpeed.Size = New System.Drawing.Size(57, 20)
+ Me.TbStartSpeed.TabIndex = 1
+ '
+ 'Label9
+ '
+ Me.Label9.AutoSize = true
+ Me.Label9.Location = New System.Drawing.Point(20, 48)
+ Me.Label9.Name = "Label9"
+ Me.Label9.Size = New System.Drawing.Size(181, 13)
+ Me.Label9.TabIndex = 0
+ Me.Label9.Text = "Reference vehicle speed at clutch-in"
+ '
+ 'Label10
+ '
+ Me.Label10.AutoSize = true
+ Me.Label10.Location = New System.Drawing.Point(272, 74)
+ Me.Label10.Name = "Label10"
+ Me.Label10.Size = New System.Drawing.Size(34, 13)
+ Me.Label10.TabIndex = 0
+ Me.Label10.Text = "[m/s²]"
+ Me.Label10.Visible = false
+ '
+ 'TbTqResvStart
+ '
+ Me.TbTqResvStart.Location = New System.Drawing.Point(209, 19)
+ Me.TbTqResvStart.Name = "TbTqResvStart"
+ Me.TbTqResvStart.Size = New System.Drawing.Size(57, 20)
+ Me.TbTqResvStart.TabIndex = 0
+ '
+ 'Label8
+ '
+ Me.Label8.AutoSize = true
+ Me.Label8.Location = New System.Drawing.Point(272, 48)
+ Me.Label8.Name = "Label8"
+ Me.Label8.Size = New System.Drawing.Size(31, 13)
+ Me.Label8.TabIndex = 0
+ Me.Label8.Text = "[m/s]"
+ '
+ 'Label5
+ '
+ Me.Label5.AutoSize = true
+ Me.Label5.Location = New System.Drawing.Point(20, 22)
+ Me.Label5.Name = "Label5"
+ Me.Label5.Size = New System.Drawing.Size(79, 13)
+ Me.Label5.TabIndex = 0
+ Me.Label5.Text = "Torque reserve"
+ '
+ 'Label7
+ '
+ Me.Label7.AutoSize = true
+ Me.Label7.Location = New System.Drawing.Point(272, 22)
+ Me.Label7.Name = "Label7"
+ Me.Label7.Size = New System.Drawing.Size(21, 13)
+ Me.Label7.TabIndex = 0
+ Me.Label7.Text = "[%]"
+ '
+ 'CmOpenFile
+ '
+ Me.CmOpenFile.ImageScalingSize = New System.Drawing.Size(24, 24)
+ Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
+ Me.CmOpenFile.Name = "CmOpenFile"
+ Me.CmOpenFile.Size = New System.Drawing.Size(153, 48)
+ '
+ 'OpenWithToolStripMenuItem
+ '
+ Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem"
+ Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
+ Me.OpenWithToolStripMenuItem.Text = "Open with ..."
+ '
+ 'ShowInFolderToolStripMenuItem
+ '
+ Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem"
+ Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
+ Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
+ '
+ 'gbTC
+ '
+ Me.gbTC.Controls.Add(Me.pnTcEngineering)
+ Me.gbTC.Controls.Add(Me.BtTCfileOpen)
+ Me.gbTC.Controls.Add(Me.TbTCfile)
+ Me.gbTC.Controls.Add(Me.BtTCfileBrowse)
+ Me.gbTC.Controls.Add(Me.Label17)
+ Me.gbTC.Location = New System.Drawing.Point(459, 377)
+ Me.gbTC.Name = "gbTC"
+ Me.gbTC.Size = New System.Drawing.Size(414, 162)
+ Me.gbTC.TabIndex = 5
+ Me.gbTC.TabStop = false
+ Me.gbTC.Text = "Torque Converter"
+ '
+ 'pnTcEngineering
+ '
+ Me.pnTcEngineering.Controls.Add(Me.Label26)
+ Me.pnTcEngineering.Controls.Add(Me.TBTCShiftPolygon)
+ Me.pnTcEngineering.Controls.Add(Me.tbTCmaxSpeed)
+ Me.pnTcEngineering.Controls.Add(Me.TbTCrefrpm)
+ Me.pnTcEngineering.Controls.Add(Me.Label27)
+ Me.pnTcEngineering.Controls.Add(Me.Label14)
+ Me.pnTcEngineering.Controls.Add(Me.BtTCShiftFileBrowse)
+ Me.pnTcEngineering.Controls.Add(Me.Label1)
+ Me.pnTcEngineering.Controls.Add(Me.TbTCinertia)
+ Me.pnTcEngineering.Controls.Add(Me.Label15)
+ Me.pnTcEngineering.Controls.Add(Me.Label18)
+ Me.pnTcEngineering.Controls.Add(Me.LblTCShiftFile)
+ Me.pnTcEngineering.Location = New System.Drawing.Point(7, 63)
+ Me.pnTcEngineering.Name = "pnTcEngineering"
+ Me.pnTcEngineering.Size = New System.Drawing.Size(399, 93)
+ Me.pnTcEngineering.TabIndex = 3
+ '
+ 'Label26
+ '
+ Me.Label26.AutoSize = true
+ Me.Label26.Location = New System.Drawing.Point(1, 29)
+ Me.Label26.Name = "Label26"
+ Me.Label26.Size = New System.Drawing.Size(64, 13)
+ Me.Label26.TabIndex = 50
+ Me.Label26.Text = "Max. Speed"
+ '
+ 'TBTCShiftPolygon
+ '
+ Me.TBTCShiftPolygon.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.TBTCShiftPolygon.Location = New System.Drawing.Point(4, 70)
+ Me.TBTCShiftPolygon.Name = "TBTCShiftPolygon"
+ Me.TBTCShiftPolygon.Size = New System.Drawing.Size(349, 20)
+ Me.TBTCShiftPolygon.TabIndex = 3
+ '
+ 'tbTCmaxSpeed
+ '
+ Me.tbTCmaxSpeed.Location = New System.Drawing.Point(75, 26)
+ Me.tbTCmaxSpeed.Name = "tbTCmaxSpeed"
+ Me.tbTCmaxSpeed.Size = New System.Drawing.Size(57, 20)
+ Me.tbTCmaxSpeed.TabIndex = 2
+ '
+ 'TbTCrefrpm
+ '
+ Me.TbTCrefrpm.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.TbTCrefrpm.Location = New System.Drawing.Point(296, 0)
+ Me.TbTCrefrpm.Name = "TbTCrefrpm"
+ Me.TbTCrefrpm.Size = New System.Drawing.Size(57, 20)
+ Me.TbTCrefrpm.TabIndex = 1
+ '
+ 'Label27
+ '
+ Me.Label27.AutoSize = true
+ Me.Label27.Location = New System.Drawing.Point(138, 29)
+ Me.Label27.Name = "Label27"
+ Me.Label27.Size = New System.Drawing.Size(30, 13)
+ Me.Label27.TabIndex = 51
+ Me.Label27.Text = "[rpm]"
+ '
+ 'Label14
+ '
+ Me.Label14.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.Label14.AutoSize = true
+ Me.Label14.Location = New System.Drawing.Point(357, 3)
+ Me.Label14.Name = "Label14"
+ Me.Label14.Size = New System.Drawing.Size(40, 13)
+ Me.Label14.TabIndex = 41
+ Me.Label14.Text = "[1/min]"
+ '
+ 'BtTCShiftFileBrowse
+ '
+ Me.BtTCShiftFileBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.BtTCShiftFileBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
+ Me.BtTCShiftFileBrowse.Location = New System.Drawing.Point(354, 68)
+ Me.BtTCShiftFileBrowse.Name = "BtTCShiftFileBrowse"
+ Me.BtTCShiftFileBrowse.Size = New System.Drawing.Size(24, 24)
+ Me.BtTCShiftFileBrowse.TabIndex = 4
+ Me.BtTCShiftFileBrowse.UseVisualStyleBackColor = true
+ '
+ 'Label1
+ '
+ Me.Label1.AutoSize = true
+ Me.Label1.Location = New System.Drawing.Point(138, 3)
+ Me.Label1.Name = "Label1"
+ Me.Label1.Size = New System.Drawing.Size(36, 13)
+ Me.Label1.TabIndex = 43
+ Me.Label1.Text = "[kgm²]"
+ '
+ 'TbTCinertia
+ '
+ Me.TbTCinertia.Location = New System.Drawing.Point(75, 0)
+ Me.TbTCinertia.Name = "TbTCinertia"
+ Me.TbTCinertia.Size = New System.Drawing.Size(57, 20)
+ Me.TbTCinertia.TabIndex = 0
+ '
+ 'Label15
+ '
+ Me.Label15.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.Label15.AutoSize = true
+ Me.Label15.Location = New System.Drawing.Point(213, 3)
+ Me.Label15.Name = "Label15"
+ Me.Label15.Size = New System.Drawing.Size(77, 13)
+ Me.Label15.TabIndex = 42
+ Me.Label15.Text = "Reference rpm"
+ '
+ 'Label18
+ '
+ Me.Label18.AutoSize = true
+ Me.Label18.Location = New System.Drawing.Point(1, 3)
+ Me.Label18.Name = "Label18"
+ Me.Label18.Size = New System.Drawing.Size(36, 13)
+ Me.Label18.TabIndex = 44
+ Me.Label18.Text = "Inertia"
+ '
+ 'LblTCShiftFile
+ '
+ Me.LblTCShiftFile.AutoSize = true
+ Me.LblTCShiftFile.Location = New System.Drawing.Point(1, 55)
+ Me.LblTCShiftFile.Name = "LblTCShiftFile"
+ Me.LblTCShiftFile.Size = New System.Drawing.Size(207, 13)
+ Me.LblTCShiftFile.TabIndex = 48
+ Me.LblTCShiftFile.Text = "Torque converter shift polygons file (.vgbs)"
+ '
+ 'BtTCfileOpen
+ '
+ Me.BtTCfileOpen.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.BtTCfileOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
+ Me.BtTCfileOpen.Location = New System.Drawing.Point(383, 35)
+ Me.BtTCfileOpen.Name = "BtTCfileOpen"
+ Me.BtTCfileOpen.Size = New System.Drawing.Size(24, 24)
+ Me.BtTCfileOpen.TabIndex = 2
+ Me.BtTCfileOpen.UseVisualStyleBackColor = true
+ '
+ 'TbTCfile
+ '
+ Me.TbTCfile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.TbTCfile.Location = New System.Drawing.Point(9, 37)
+ Me.TbTCfile.Name = "TbTCfile"
+ Me.TbTCfile.Size = New System.Drawing.Size(349, 20)
+ Me.TbTCfile.TabIndex = 0
+ '
+ 'BtTCfileBrowse
+ '
+ Me.BtTCfileBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.BtTCfileBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
+ Me.BtTCfileBrowse.Location = New System.Drawing.Point(359, 35)
+ Me.BtTCfileBrowse.Name = "BtTCfileBrowse"
+ Me.BtTCfileBrowse.Size = New System.Drawing.Size(24, 24)
+ Me.BtTCfileBrowse.TabIndex = 1
+ Me.BtTCfileBrowse.UseVisualStyleBackColor = true
+ '
+ 'Label17
+ '
+ Me.Label17.AutoSize = true
+ Me.Label17.Location = New System.Drawing.Point(6, 21)
+ Me.Label17.Name = "Label17"
+ Me.Label17.Size = New System.Drawing.Size(209, 13)
+ Me.Label17.TabIndex = 0
+ Me.Label17.Text = "Torque converter characteristics file (.vtcc)"
+ '
+ 'tbTCLUpshiftMinAcceleration
+ '
+ Me.tbTCLUpshiftMinAcceleration.Location = New System.Drawing.Point(78, 19)
+ Me.tbTCLUpshiftMinAcceleration.Name = "tbTCLUpshiftMinAcceleration"
+ Me.tbTCLUpshiftMinAcceleration.Size = New System.Drawing.Size(57, 20)
+ Me.tbTCLUpshiftMinAcceleration.TabIndex = 0
+ '
+ 'Label30
+ '
+ Me.Label30.AutoSize = true
+ Me.Label30.Location = New System.Drawing.Point(141, 22)
+ Me.Label30.Name = "Label30"
+ Me.Label30.Size = New System.Drawing.Size(34, 13)
+ Me.Label30.TabIndex = 42
+ Me.Label30.Text = "[m/s²]"
+ '
+ 'Label31
+ '
+ Me.Label31.AutoSize = true
+ Me.Label31.Location = New System.Drawing.Point(6, 22)
+ Me.Label31.Name = "Label31"
+ Me.Label31.Size = New System.Drawing.Size(69, 13)
+ Me.Label31.TabIndex = 41
+ Me.Label31.Text = "Acc. for C->L"
+ '
+ 'Label16
+ '
+ Me.Label16.AutoSize = true
+ Me.Label16.Location = New System.Drawing.Point(18, 105)
+ Me.Label16.Name = "Label16"
+ Me.Label16.Size = New System.Drawing.Size(95, 13)
+ Me.Label16.TabIndex = 45
+ Me.Label16.Text = "Transmission Type"
+ '
+ 'CbGStype
+ '
+ Me.CbGStype.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+ Me.CbGStype.FormattingEnabled = true
+ Me.CbGStype.Location = New System.Drawing.Point(119, 102)
+ Me.CbGStype.Name = "CbGStype"
+ Me.CbGStype.Size = New System.Drawing.Size(227, 21)
+ Me.CbGStype.TabIndex = 1
+ '
+ 'BtAddGear
+ '
+ Me.BtAddGear.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
+ Me.BtAddGear.Location = New System.Drawing.Point(6, 202)
+ Me.BtAddGear.Name = "BtAddGear"
+ Me.BtAddGear.Size = New System.Drawing.Size(24, 24)
+ Me.BtAddGear.TabIndex = 1
+ Me.BtAddGear.UseVisualStyleBackColor = true
+ '
+ 'GroupBox4
+ '
+ Me.GroupBox4.Controls.Add(Me.btExportVGBS)
+ Me.GroupBox4.Controls.Add(Me.Label32)
+ Me.GroupBox4.Controls.Add(Me.LvGears)
+ Me.GroupBox4.Controls.Add(Me.BtRemGear)
+ Me.GroupBox4.Controls.Add(Me.BtAddGear)
+ Me.GroupBox4.Location = New System.Drawing.Point(12, 135)
+ Me.GroupBox4.Name = "GroupBox4"
+ Me.GroupBox4.Size = New System.Drawing.Size(441, 232)
+ Me.GroupBox4.TabIndex = 2
+ Me.GroupBox4.TabStop = false
+ Me.GroupBox4.Text = "Gears"
+ '
+ 'btExportVGBS
+ '
+ Me.btExportVGBS.Enabled = false
+ Me.btExportVGBS.Location = New System.Drawing.Point(55, 202)
+ Me.btExportVGBS.Name = "btExportVGBS"
+ Me.btExportVGBS.Size = New System.Drawing.Size(153, 24)
+ Me.btExportVGBS.TabIndex = 4
+ Me.btExportVGBS.Text = "Export Shiftcurve as VGBS"
+ Me.btExportVGBS.UseVisualStyleBackColor = true
+ '
+ 'Label32
+ '
+ Me.Label32.AutoSize = true
+ Me.Label32.Location = New System.Drawing.Point(331, 202)
+ Me.Label32.Name = "Label32"
+ Me.Label32.Size = New System.Drawing.Size(106, 13)
+ Me.Label32.TabIndex = 3
+ Me.Label32.Text = "(Double-Click to Edit)"
+ '
+ 'PnInertiaTI
+ '
+ Me.PnInertiaTI.Controls.Add(Me.Label6)
+ Me.PnInertiaTI.Controls.Add(Me.TBI_getr)
+ Me.PnInertiaTI.Controls.Add(Me.Label33)
+ Me.PnInertiaTI.Controls.Add(Me.Label48)
+ Me.PnInertiaTI.Controls.Add(Me.Label49)
+ Me.PnInertiaTI.Controls.Add(Me.TbTracInt)
+ Me.PnInertiaTI.Location = New System.Drawing.Point(459, 344)
+ Me.PnInertiaTI.Name = "PnInertiaTI"
+ Me.PnInertiaTI.Size = New System.Drawing.Size(411, 30)
+ Me.PnInertiaTI.TabIndex = 4
+ '
+ 'PicBox
+ '
+ Me.PicBox.BackColor = System.Drawing.Color.LightGray
+ Me.PicBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+ Me.PicBox.Location = New System.Drawing.Point(459, 28)
+ Me.PicBox.Name = "PicBox"
+ Me.PicBox.Size = New System.Drawing.Size(414, 308)
+ Me.PicBox.TabIndex = 48
+ Me.PicBox.TabStop = false
+ '
+ 'gbPowershiftLosses
+ '
+ Me.gbPowershiftLosses.Controls.Add(Me.lbAtShiftTime)
+ Me.gbPowershiftLosses.Controls.Add(Me.tbATShiftTime)
+ Me.gbPowershiftLosses.Controls.Add(Me.Label28)
+ Me.gbPowershiftLosses.Location = New System.Drawing.Point(459, 598)
+ Me.gbPowershiftLosses.Name = "gbPowershiftLosses"
+ Me.gbPowershiftLosses.Size = New System.Drawing.Size(414, 47)
+ Me.gbPowershiftLosses.TabIndex = 6
+ Me.gbPowershiftLosses.TabStop = false
+ Me.gbPowershiftLosses.Text = "Power shift losses"
+ '
+ 'lbAtShiftTime
+ '
+ Me.lbAtShiftTime.AutoSize = true
+ Me.lbAtShiftTime.Location = New System.Drawing.Point(6, 22)
+ Me.lbAtShiftTime.Name = "lbAtShiftTime"
+ Me.lbAtShiftTime.Size = New System.Drawing.Size(50, 13)
+ Me.lbAtShiftTime.TabIndex = 0
+ Me.lbAtShiftTime.Text = "Shift time"
+ '
+ 'tbATShiftTime
+ '
+ Me.tbATShiftTime.Location = New System.Drawing.Point(78, 19)
+ Me.tbATShiftTime.Name = "tbATShiftTime"
+ Me.tbATShiftTime.Size = New System.Drawing.Size(57, 20)
+ Me.tbATShiftTime.TabIndex = 0
+ '
+ 'Label28
+ '
+ Me.Label28.AutoSize = true
+ Me.Label28.Location = New System.Drawing.Point(141, 22)
+ Me.Label28.Name = "Label28"
+ Me.Label28.Size = New System.Drawing.Size(18, 13)
+ Me.Label28.TabIndex = 41
+ Me.Label28.Text = "[s]"
+ '
+ 'tbTCCUpshiftMinAcceleration
+ '
+ Me.tbTCCUpshiftMinAcceleration.Location = New System.Drawing.Point(299, 19)
+ Me.tbTCCUpshiftMinAcceleration.Name = "tbTCCUpshiftMinAcceleration"
+ Me.tbTCCUpshiftMinAcceleration.Size = New System.Drawing.Size(57, 20)
+ Me.tbTCCUpshiftMinAcceleration.TabIndex = 1
+ '
+ 'Label34
+ '
+ Me.Label34.AutoSize = true
+ Me.Label34.Location = New System.Drawing.Point(362, 22)
+ Me.Label34.Name = "Label34"
+ Me.Label34.Size = New System.Drawing.Size(34, 13)
+ Me.Label34.TabIndex = 45
+ Me.Label34.Text = "[m/s²]"
+ '
+ 'Label35
+ '
+ Me.Label35.AutoSize = true
+ Me.Label35.Location = New System.Drawing.Point(211, 22)
+ Me.Label35.Name = "Label35"
+ Me.Label35.Size = New System.Drawing.Size(70, 13)
+ Me.Label35.TabIndex = 44
+ Me.Label35.Text = "Acc. for C->C"
+ '
+ 'gbTCAccMin
+ '
+ Me.gbTCAccMin.Controls.Add(Me.tbTCLUpshiftMinAcceleration)
+ Me.gbTCAccMin.Controls.Add(Me.tbTCCUpshiftMinAcceleration)
+ Me.gbTCAccMin.Controls.Add(Me.Label34)
+ Me.gbTCAccMin.Controls.Add(Me.Label31)
+ Me.gbTCAccMin.Controls.Add(Me.Label35)
+ Me.gbTCAccMin.Controls.Add(Me.Label30)
+ Me.gbTCAccMin.Location = New System.Drawing.Point(459, 545)
+ Me.gbTCAccMin.Name = "gbTCAccMin"
+ Me.gbTCAccMin.Size = New System.Drawing.Size(414, 47)
+ Me.gbTCAccMin.TabIndex = 6
+ Me.gbTCAccMin.TabStop = false
+ Me.gbTCAccMin.Text = "Torque Converter: Min. acceleration after upshift"
+ '
+ 'lblGbxInfo
+ '
+ Me.lblGbxInfo.AutoSize = true
+ Me.lblGbxInfo.Location = New System.Drawing.Point(121, 126)
+ Me.lblGbxInfo.Name = "lblGbxInfo"
+ Me.lblGbxInfo.Size = New System.Drawing.Size(0, 13)
+ Me.lblGbxInfo.TabIndex = 51
+ '
+ 'btnExportXML
+ '
+ Me.btnExportXML.Location = New System.Drawing.Point(459, 648)
+ Me.btnExportXML.Name = "btnExportXML"
+ Me.btnExportXML.Size = New System.Drawing.Size(119, 23)
+ Me.btnExportXML.TabIndex = 9
+ Me.btnExportXML.Text = "Exp. Gearbox as XML"
+ Me.btnExportXML.UseVisualStyleBackColor = true
+ '
+ 'btnExportAxlGearXML
+ '
+ Me.btnExportAxlGearXML.Location = New System.Drawing.Point(584, 648)
+ Me.btnExportAxlGearXML.Name = "btnExportAxlGearXML"
+ Me.btnExportAxlGearXML.Size = New System.Drawing.Size(118, 23)
+ Me.btnExportAxlGearXML.TabIndex = 10
+ Me.btnExportAxlGearXML.Text = "Exp. AxlGear as XML"
+ Me.btnExportAxlGearXML.UseVisualStyleBackColor = true
+ '
+ 'GearboxForm
+ '
+ Me.AcceptButton = Me.ButOK
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
+ Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+ Me.CancelButton = Me.ButCancel
+ Me.ClientSize = New System.Drawing.Size(877, 696)
+ Me.Controls.Add(Me.btnExportAxlGearXML)
+ Me.Controls.Add(Me.btnExportXML)
+ Me.Controls.Add(Me.lblGbxInfo)
+ Me.Controls.Add(Me.gbTCAccMin)
+ Me.Controls.Add(Me.gbPowershiftLosses)
+ Me.Controls.Add(Me.PicBox)
+ Me.Controls.Add(Me.PnInertiaTI)
+ Me.Controls.Add(Me.GroupBox4)
+ Me.Controls.Add(Me.CbGStype)
+ Me.Controls.Add(Me.Label16)
+ Me.Controls.Add(Me.PictureBox1)
+ Me.Controls.Add(Me.GrGearShift)
+ Me.Controls.Add(Me.gbTC)
+ Me.Controls.Add(Me.Label3)
+ Me.Controls.Add(Me.TbName)
+ Me.Controls.Add(Me.ButCancel)
+ Me.Controls.Add(Me.ButOK)
+ Me.Controls.Add(Me.StatusStrip1)
+ Me.Controls.Add(Me.ToolStrip1)
+ Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
+ Me.Icon = CType(resources.GetObject("$this.Icon"),System.Drawing.Icon)
+ Me.MaximizeBox = false
+ Me.Name = "GearboxForm"
+ Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+ Me.Text = "F_GBX"
+ Me.ToolStrip1.ResumeLayout(false)
+ Me.ToolStrip1.PerformLayout
+ Me.StatusStrip1.ResumeLayout(false)
+ Me.StatusStrip1.PerformLayout
+ CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).EndInit
+ Me.GrGearShift.ResumeLayout(false)
+ Me.GrGearShift.PerformLayout
+ Me.GroupBox1.ResumeLayout(false)
+ Me.GroupBox1.PerformLayout
+ Me.PnTorqRes.ResumeLayout(false)
+ Me.PnTorqRes.PerformLayout
+ Me.GroupBox2.ResumeLayout(false)
+ Me.GroupBox2.PerformLayout
+ Me.CmOpenFile.ResumeLayout(false)
+ Me.gbTC.ResumeLayout(false)
+ Me.gbTC.PerformLayout
+ Me.pnTcEngineering.ResumeLayout(false)
+ Me.pnTcEngineering.PerformLayout
+ Me.GroupBox4.ResumeLayout(false)
+ Me.GroupBox4.PerformLayout
+ Me.PnInertiaTI.ResumeLayout(false)
+ Me.PnInertiaTI.PerformLayout
+ CType(Me.PicBox,System.ComponentModel.ISupportInitialize).EndInit
+ Me.gbPowershiftLosses.ResumeLayout(false)
+ Me.gbPowershiftLosses.PerformLayout
+ Me.gbTCAccMin.ResumeLayout(false)
+ Me.gbTCAccMin.PerformLayout
+ Me.ResumeLayout(false)
+ Me.PerformLayout
- End Sub
+End Sub
Friend WithEvents ToolStrip1 As ToolStrip
Friend WithEvents ToolStripBtNew As ToolStripButton
Friend WithEvents ToolStripBtOpen As ToolStripButton
diff --git a/VECTO/GUI/GearboxGearDialog.Designer.vb b/VECTO/GUI/GearboxGearDialog.Designer.vb
index da689eb1855830f64f440725e71bb65b45c3032d..eaf0f774aa49d222b1dd5ab90c60ad9e7294d896 100644
--- a/VECTO/GUI/GearboxGearDialog.Designer.vb
+++ b/VECTO/GUI/GearboxGearDialog.Designer.vb
@@ -27,284 +27,283 @@ Partial Class GearboxGearDialog
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<DebuggerStepThrough()> _
Private Sub InitializeComponent()
- Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(GearboxGearDialog))
- Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
- Me.OK_Button = New System.Windows.Forms.Button()
- Me.Cancel_Button = New System.Windows.Forms.Button()
- Me.TbGear = New System.Windows.Forms.TextBox()
- Me.Label1 = New System.Windows.Forms.Label()
- Me.TbRatio = New System.Windows.Forms.TextBox()
- Me.Label2 = New System.Windows.Forms.Label()
- Me.TbMapPath = New System.Windows.Forms.TextBox()
- Me.Label3 = New System.Windows.Forms.Label()
- Me.BtBrowse = New System.Windows.Forms.Button()
- Me.BtNext = New System.Windows.Forms.Button()
- Me.TbShiftPolyFile = New System.Windows.Forms.TextBox()
- Me.BtShiftPolyBrowse = New System.Windows.Forms.Button()
- Me.Label4 = New System.Windows.Forms.Label()
- Me.PnShiftPoly = New System.Windows.Forms.Panel()
- Me.Label5 = New System.Windows.Forms.Label()
- Me.TbMaxTorque = New System.Windows.Forms.TextBox()
- Me.PnFld = New System.Windows.Forms.Panel()
- Me.Label6 = New System.Windows.Forms.Label()
- Me.BtPrevious = New System.Windows.Forms.Button()
- Me.Label7 = New System.Windows.Forms.Label()
- Me.tbMaxSpeed = New System.Windows.Forms.TextBox()
- Me.Label8 = New System.Windows.Forms.Label()
- Me.TableLayoutPanel1.SuspendLayout()
- Me.PnShiftPoly.SuspendLayout()
- Me.PnFld.SuspendLayout()
- Me.SuspendLayout()
- '
- 'TableLayoutPanel1
- '
- Me.TableLayoutPanel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.TableLayoutPanel1.ColumnCount = 2
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
- Me.TableLayoutPanel1.Controls.Add(Me.OK_Button, 0, 0)
- Me.TableLayoutPanel1.Controls.Add(Me.Cancel_Button, 1, 0)
- Me.TableLayoutPanel1.Location = New System.Drawing.Point(370, 177)
- Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
- Me.TableLayoutPanel1.RowCount = 1
- Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
- Me.TableLayoutPanel1.Size = New System.Drawing.Size(146, 29)
- Me.TableLayoutPanel1.TabIndex = 12
- '
- 'OK_Button
- '
- Me.OK_Button.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.OK_Button.Location = New System.Drawing.Point(3, 3)
- Me.OK_Button.Name = "OK_Button"
- Me.OK_Button.Size = New System.Drawing.Size(67, 23)
- Me.OK_Button.TabIndex = 0
- Me.OK_Button.Text = "OK"
- '
- 'Cancel_Button
- '
- Me.Cancel_Button.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel
- Me.Cancel_Button.Location = New System.Drawing.Point(76, 3)
- Me.Cancel_Button.Name = "Cancel_Button"
- Me.Cancel_Button.Size = New System.Drawing.Size(67, 23)
- Me.Cancel_Button.TabIndex = 1
- Me.Cancel_Button.Text = "Cancel"
- '
- 'TbGear
- '
- Me.TbGear.Location = New System.Drawing.Point(48, 6)
- Me.TbGear.Name = "TbGear"
- Me.TbGear.ReadOnly = True
- Me.TbGear.Size = New System.Drawing.Size(37, 20)
- Me.TbGear.TabIndex = 1
- Me.TbGear.TabStop = False
- '
- 'Label1
- '
- Me.Label1.AutoSize = True
- Me.Label1.Location = New System.Drawing.Point(12, 9)
- Me.Label1.Name = "Label1"
- Me.Label1.Size = New System.Drawing.Size(30, 13)
- Me.Label1.TabIndex = 0
- Me.Label1.Text = "Gear"
- '
- 'TbRatio
- '
- Me.TbRatio.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.TbRatio.Location = New System.Drawing.Point(139, 6)
- Me.TbRatio.Name = "TbRatio"
- Me.TbRatio.Size = New System.Drawing.Size(66, 20)
- Me.TbRatio.TabIndex = 3
- '
- 'Label2
- '
- Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.Label2.AutoSize = True
- Me.Label2.Location = New System.Drawing.Point(101, 9)
- Me.Label2.Name = "Label2"
- Me.Label2.Size = New System.Drawing.Size(32, 13)
- Me.Label2.TabIndex = 2
- Me.Label2.Text = "Ratio"
- '
- 'TbMapPath
- '
- Me.TbMapPath.Location = New System.Drawing.Point(12, 51)
- Me.TbMapPath.Name = "TbMapPath"
- Me.TbMapPath.Size = New System.Drawing.Size(476, 20)
- Me.TbMapPath.TabIndex = 6
- '
- 'Label3
- '
- Me.Label3.AutoSize = True
- Me.Label3.Location = New System.Drawing.Point(11, 37)
- Me.Label3.Name = "Label3"
- Me.Label3.Size = New System.Drawing.Size(187, 13)
- Me.Label3.TabIndex = 5
- Me.Label3.Text = "Loss Map file or Efficiency Value [0..1]"
- '
- 'BtBrowse
- '
- Me.BtBrowse.Image = CType(resources.GetObject("BtBrowse.Image"), System.Drawing.Image)
- Me.BtBrowse.Location = New System.Drawing.Point(489, 49)
- Me.BtBrowse.Name = "BtBrowse"
- Me.BtBrowse.Size = New System.Drawing.Size(24, 24)
- Me.BtBrowse.TabIndex = 7
- Me.BtBrowse.UseVisualStyleBackColor = True
- '
- 'BtNext
- '
- Me.BtNext.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
- Me.BtNext.Location = New System.Drawing.Point(196, 180)
- Me.BtNext.Name = "BtNext"
- Me.BtNext.Size = New System.Drawing.Size(67, 23)
- Me.BtNext.TabIndex = 11
- Me.BtNext.Text = "&Next >"
- Me.BtNext.UseVisualStyleBackColor = True
- '
- 'TbShiftPolyFile
- '
- Me.TbShiftPolyFile.Location = New System.Drawing.Point(2, 17)
- Me.TbShiftPolyFile.Name = "TbShiftPolyFile"
- Me.TbShiftPolyFile.Size = New System.Drawing.Size(476, 20)
- Me.TbShiftPolyFile.TabIndex = 1
- '
- 'BtShiftPolyBrowse
- '
- Me.BtShiftPolyBrowse.Image = CType(resources.GetObject("BtShiftPolyBrowse.Image"), System.Drawing.Image)
- Me.BtShiftPolyBrowse.Location = New System.Drawing.Point(479, 16)
- Me.BtShiftPolyBrowse.Name = "BtShiftPolyBrowse"
- Me.BtShiftPolyBrowse.Size = New System.Drawing.Size(24, 24)
- Me.BtShiftPolyBrowse.TabIndex = 2
- Me.BtShiftPolyBrowse.TabStop = False
- Me.BtShiftPolyBrowse.UseVisualStyleBackColor = True
- '
- 'Label4
- '
- Me.Label4.AutoSize = True
- Me.Label4.Location = New System.Drawing.Point(1, 3)
- Me.Label4.Name = "Label4"
- Me.Label4.Size = New System.Drawing.Size(89, 13)
- Me.Label4.TabIndex = 0
- Me.Label4.Text = "Shift polygons file"
- '
- 'PnShiftPoly
- '
- Me.PnShiftPoly.Controls.Add(Me.TbShiftPolyFile)
- Me.PnShiftPoly.Controls.Add(Me.BtShiftPolyBrowse)
- Me.PnShiftPoly.Controls.Add(Me.Label4)
- Me.PnShiftPoly.Location = New System.Drawing.Point(10, 79)
- Me.PnShiftPoly.Name = "PnShiftPoly"
- Me.PnShiftPoly.Size = New System.Drawing.Size(513, 41)
- Me.PnShiftPoly.TabIndex = 8
- '
- 'Label5
- '
- Me.Label5.AutoSize = True
- Me.Label5.Location = New System.Drawing.Point(1, 5)
- Me.Label5.Name = "Label5"
- Me.Label5.Size = New System.Drawing.Size(123, 13)
- Me.Label5.TabIndex = 0
- Me.Label5.Text = "Maximum allowed torque"
- '
- 'TbMaxTorque
- '
- Me.TbMaxTorque.Location = New System.Drawing.Point(2, 19)
- Me.TbMaxTorque.Name = "TbMaxTorque"
- Me.TbMaxTorque.Size = New System.Drawing.Size(88, 20)
- Me.TbMaxTorque.TabIndex = 1
- '
- 'PnFld
- '
- Me.PnFld.Controls.Add(Me.Label7)
- Me.PnFld.Controls.Add(Me.tbMaxSpeed)
- Me.PnFld.Controls.Add(Me.Label8)
- Me.PnFld.Controls.Add(Me.Label6)
- Me.PnFld.Controls.Add(Me.TbMaxTorque)
- Me.PnFld.Controls.Add(Me.Label5)
- Me.PnFld.Location = New System.Drawing.Point(10, 126)
- Me.PnFld.Name = "PnFld"
- Me.PnFld.Size = New System.Drawing.Size(513, 46)
- Me.PnFld.TabIndex = 9
- '
- 'Label6
- '
- Me.Label6.AutoSize = True
- Me.Label6.Location = New System.Drawing.Point(96, 22)
- Me.Label6.Name = "Label6"
- Me.Label6.Size = New System.Drawing.Size(29, 13)
- Me.Label6.TabIndex = 2
- Me.Label6.Text = "[Nm]"
- '
- 'BtPrevious
- '
- Me.BtPrevious.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
- Me.BtPrevious.Location = New System.Drawing.Point(129, 180)
- Me.BtPrevious.Name = "BtPrevious"
- Me.BtPrevious.Size = New System.Drawing.Size(67, 23)
- Me.BtPrevious.TabIndex = 10
- Me.BtPrevious.Text = "< &Previous"
- Me.BtPrevious.UseVisualStyleBackColor = True
- '
- 'Label7
- '
- Me.Label7.AutoSize = True
- Me.Label7.Location = New System.Drawing.Point(360, 22)
- Me.Label7.Name = "Label7"
- Me.Label7.Size = New System.Drawing.Size(30, 13)
- Me.Label7.TabIndex = 5
- Me.Label7.Text = "[rpm]"
- '
- 'tbMaxSpeed
- '
- Me.tbMaxSpeed.Location = New System.Drawing.Point(266, 19)
- Me.tbMaxSpeed.Name = "tbMaxSpeed"
- Me.tbMaxSpeed.Size = New System.Drawing.Size(88, 20)
- Me.tbMaxSpeed.TabIndex = 4
- '
- 'Label8
- '
- Me.Label8.AutoSize = True
- Me.Label8.Location = New System.Drawing.Point(265, 5)
- Me.Label8.Name = "Label8"
- Me.Label8.Size = New System.Drawing.Size(122, 13)
- Me.Label8.TabIndex = 3
- Me.Label8.Text = "Maximum allowed speed"
- '
- 'GearboxGearDialog
- '
- Me.AcceptButton = Me.OK_Button
- Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
- Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
- Me.CancelButton = Me.Cancel_Button
- Me.ClientSize = New System.Drawing.Size(528, 218)
- Me.Controls.Add(Me.BtPrevious)
- Me.Controls.Add(Me.PnFld)
- Me.Controls.Add(Me.PnShiftPoly)
- Me.Controls.Add(Me.BtNext)
- Me.Controls.Add(Me.BtBrowse)
- Me.Controls.Add(Me.Label3)
- Me.Controls.Add(Me.TbMapPath)
- Me.Controls.Add(Me.Label2)
- Me.Controls.Add(Me.TbRatio)
- Me.Controls.Add(Me.Label1)
- Me.Controls.Add(Me.TbGear)
- Me.Controls.Add(Me.TableLayoutPanel1)
- Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow
- Me.MaximizeBox = False
- Me.MinimizeBox = False
- Me.Name = "GearboxGearDialog"
- Me.ShowInTaskbar = False
- Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
- Me.Text = "Edit Gears"
- Me.TableLayoutPanel1.ResumeLayout(False)
- Me.PnShiftPoly.ResumeLayout(False)
- Me.PnShiftPoly.PerformLayout()
- Me.PnFld.ResumeLayout(False)
- Me.PnFld.PerformLayout()
- Me.ResumeLayout(False)
- Me.PerformLayout()
+ Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(GearboxGearDialog))
+ Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
+ Me.OK_Button = New System.Windows.Forms.Button()
+ Me.Cancel_Button = New System.Windows.Forms.Button()
+ Me.TbGear = New System.Windows.Forms.TextBox()
+ Me.Label1 = New System.Windows.Forms.Label()
+ Me.TbRatio = New System.Windows.Forms.TextBox()
+ Me.Label2 = New System.Windows.Forms.Label()
+ Me.TbMapPath = New System.Windows.Forms.TextBox()
+ Me.Label3 = New System.Windows.Forms.Label()
+ Me.BtBrowse = New System.Windows.Forms.Button()
+ Me.BtNext = New System.Windows.Forms.Button()
+ Me.TbShiftPolyFile = New System.Windows.Forms.TextBox()
+ Me.BtShiftPolyBrowse = New System.Windows.Forms.Button()
+ Me.Label4 = New System.Windows.Forms.Label()
+ Me.PnShiftPoly = New System.Windows.Forms.Panel()
+ Me.Label5 = New System.Windows.Forms.Label()
+ Me.TbMaxTorque = New System.Windows.Forms.TextBox()
+ Me.PnFld = New System.Windows.Forms.Panel()
+ Me.Label7 = New System.Windows.Forms.Label()
+ Me.tbMaxSpeed = New System.Windows.Forms.TextBox()
+ Me.Label8 = New System.Windows.Forms.Label()
+ Me.Label6 = New System.Windows.Forms.Label()
+ Me.BtPrevious = New System.Windows.Forms.Button()
+ Me.TableLayoutPanel1.SuspendLayout
+ Me.PnShiftPoly.SuspendLayout
+ Me.PnFld.SuspendLayout
+ Me.SuspendLayout
+ '
+ 'TableLayoutPanel1
+ '
+ Me.TableLayoutPanel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.TableLayoutPanel1.ColumnCount = 2
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50!))
+ Me.TableLayoutPanel1.Controls.Add(Me.OK_Button, 0, 0)
+ Me.TableLayoutPanel1.Controls.Add(Me.Cancel_Button, 1, 0)
+ Me.TableLayoutPanel1.Location = New System.Drawing.Point(370, 177)
+ Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
+ Me.TableLayoutPanel1.RowCount = 1
+ Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50!))
+ Me.TableLayoutPanel1.Size = New System.Drawing.Size(146, 29)
+ Me.TableLayoutPanel1.TabIndex = 12
+ '
+ 'OK_Button
+ '
+ Me.OK_Button.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.OK_Button.Location = New System.Drawing.Point(3, 3)
+ Me.OK_Button.Name = "OK_Button"
+ Me.OK_Button.Size = New System.Drawing.Size(67, 23)
+ Me.OK_Button.TabIndex = 6
+ Me.OK_Button.Text = "OK"
+ '
+ 'Cancel_Button
+ '
+ Me.Cancel_Button.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel
+ Me.Cancel_Button.Location = New System.Drawing.Point(76, 3)
+ Me.Cancel_Button.Name = "Cancel_Button"
+ Me.Cancel_Button.Size = New System.Drawing.Size(67, 23)
+ Me.Cancel_Button.TabIndex = 7
+ Me.Cancel_Button.Text = "Cancel"
+ '
+ 'TbGear
+ '
+ Me.TbGear.Location = New System.Drawing.Point(48, 6)
+ Me.TbGear.Name = "TbGear"
+ Me.TbGear.ReadOnly = true
+ Me.TbGear.Size = New System.Drawing.Size(37, 20)
+ Me.TbGear.TabIndex = 0
+ Me.TbGear.TabStop = false
+ '
+ 'Label1
+ '
+ Me.Label1.AutoSize = true
+ Me.Label1.Location = New System.Drawing.Point(12, 9)
+ Me.Label1.Name = "Label1"
+ Me.Label1.Size = New System.Drawing.Size(30, 13)
+ Me.Label1.TabIndex = 0
+ Me.Label1.Text = "Gear"
+ '
+ 'TbRatio
+ '
+ Me.TbRatio.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.TbRatio.Location = New System.Drawing.Point(139, 6)
+ Me.TbRatio.Name = "TbRatio"
+ Me.TbRatio.Size = New System.Drawing.Size(66, 20)
+ Me.TbRatio.TabIndex = 1
+ '
+ 'Label2
+ '
+ Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.Label2.AutoSize = true
+ Me.Label2.Location = New System.Drawing.Point(101, 9)
+ Me.Label2.Name = "Label2"
+ Me.Label2.Size = New System.Drawing.Size(32, 13)
+ Me.Label2.TabIndex = 2
+ Me.Label2.Text = "Ratio"
+ '
+ 'TbMapPath
+ '
+ Me.TbMapPath.Location = New System.Drawing.Point(12, 51)
+ Me.TbMapPath.Name = "TbMapPath"
+ Me.TbMapPath.Size = New System.Drawing.Size(476, 20)
+ Me.TbMapPath.TabIndex = 2
+ '
+ 'Label3
+ '
+ Me.Label3.AutoSize = true
+ Me.Label3.Location = New System.Drawing.Point(11, 37)
+ Me.Label3.Name = "Label3"
+ Me.Label3.Size = New System.Drawing.Size(187, 13)
+ Me.Label3.TabIndex = 5
+ Me.Label3.Text = "Loss Map file or Efficiency Value [0..1]"
+ '
+ 'BtBrowse
+ '
+ Me.BtBrowse.Image = CType(resources.GetObject("BtBrowse.Image"),System.Drawing.Image)
+ Me.BtBrowse.Location = New System.Drawing.Point(489, 49)
+ Me.BtBrowse.Name = "BtBrowse"
+ Me.BtBrowse.Size = New System.Drawing.Size(24, 24)
+ Me.BtBrowse.TabIndex = 3
+ Me.BtBrowse.UseVisualStyleBackColor = false
+ '
+ 'BtNext
+ '
+ Me.BtNext.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
+ Me.BtNext.Location = New System.Drawing.Point(196, 180)
+ Me.BtNext.Name = "BtNext"
+ Me.BtNext.Size = New System.Drawing.Size(67, 23)
+ Me.BtNext.TabIndex = 9
+ Me.BtNext.Text = "&Next >"
+ Me.BtNext.UseVisualStyleBackColor = true
+ '
+ 'TbShiftPolyFile
+ '
+ Me.TbShiftPolyFile.Location = New System.Drawing.Point(2, 17)
+ Me.TbShiftPolyFile.Name = "TbShiftPolyFile"
+ Me.TbShiftPolyFile.Size = New System.Drawing.Size(476, 20)
+ Me.TbShiftPolyFile.TabIndex = 0
+ '
+ 'BtShiftPolyBrowse
+ '
+ Me.BtShiftPolyBrowse.Image = CType(resources.GetObject("BtShiftPolyBrowse.Image"),System.Drawing.Image)
+ Me.BtShiftPolyBrowse.Location = New System.Drawing.Point(479, 16)
+ Me.BtShiftPolyBrowse.Name = "BtShiftPolyBrowse"
+ Me.BtShiftPolyBrowse.Size = New System.Drawing.Size(24, 24)
+ Me.BtShiftPolyBrowse.TabIndex = 1
+ Me.BtShiftPolyBrowse.UseVisualStyleBackColor = false
+ '
+ 'Label4
+ '
+ Me.Label4.AutoSize = true
+ Me.Label4.Location = New System.Drawing.Point(1, 3)
+ Me.Label4.Name = "Label4"
+ Me.Label4.Size = New System.Drawing.Size(89, 13)
+ Me.Label4.TabIndex = 0
+ Me.Label4.Text = "Shift polygons file"
+ '
+ 'PnShiftPoly
+ '
+ Me.PnShiftPoly.Controls.Add(Me.TbShiftPolyFile)
+ Me.PnShiftPoly.Controls.Add(Me.BtShiftPolyBrowse)
+ Me.PnShiftPoly.Controls.Add(Me.Label4)
+ Me.PnShiftPoly.Location = New System.Drawing.Point(10, 79)
+ Me.PnShiftPoly.Name = "PnShiftPoly"
+ Me.PnShiftPoly.Size = New System.Drawing.Size(513, 41)
+ Me.PnShiftPoly.TabIndex = 4
+ '
+ 'Label5
+ '
+ Me.Label5.AutoSize = true
+ Me.Label5.Location = New System.Drawing.Point(1, 5)
+ Me.Label5.Name = "Label5"
+ Me.Label5.Size = New System.Drawing.Size(123, 13)
+ Me.Label5.TabIndex = 0
+ Me.Label5.Text = "Maximum allowed torque"
+ '
+ 'TbMaxTorque
+ '
+ Me.TbMaxTorque.Location = New System.Drawing.Point(2, 19)
+ Me.TbMaxTorque.Name = "TbMaxTorque"
+ Me.TbMaxTorque.Size = New System.Drawing.Size(88, 20)
+ Me.TbMaxTorque.TabIndex = 0
+ '
+ 'PnFld
+ '
+ Me.PnFld.Controls.Add(Me.Label7)
+ Me.PnFld.Controls.Add(Me.tbMaxSpeed)
+ Me.PnFld.Controls.Add(Me.Label8)
+ Me.PnFld.Controls.Add(Me.Label6)
+ Me.PnFld.Controls.Add(Me.TbMaxTorque)
+ Me.PnFld.Controls.Add(Me.Label5)
+ Me.PnFld.Location = New System.Drawing.Point(10, 126)
+ Me.PnFld.Name = "PnFld"
+ Me.PnFld.Size = New System.Drawing.Size(513, 46)
+ Me.PnFld.TabIndex = 5
+ '
+ 'Label7
+ '
+ Me.Label7.AutoSize = true
+ Me.Label7.Location = New System.Drawing.Point(360, 22)
+ Me.Label7.Name = "Label7"
+ Me.Label7.Size = New System.Drawing.Size(30, 13)
+ Me.Label7.TabIndex = 5
+ Me.Label7.Text = "[rpm]"
+ '
+ 'tbMaxSpeed
+ '
+ Me.tbMaxSpeed.Location = New System.Drawing.Point(266, 19)
+ Me.tbMaxSpeed.Name = "tbMaxSpeed"
+ Me.tbMaxSpeed.Size = New System.Drawing.Size(88, 20)
+ Me.tbMaxSpeed.TabIndex = 1
+ '
+ 'Label8
+ '
+ Me.Label8.AutoSize = true
+ Me.Label8.Location = New System.Drawing.Point(265, 5)
+ Me.Label8.Name = "Label8"
+ Me.Label8.Size = New System.Drawing.Size(122, 13)
+ Me.Label8.TabIndex = 3
+ Me.Label8.Text = "Maximum allowed speed"
+ '
+ 'Label6
+ '
+ Me.Label6.AutoSize = true
+ Me.Label6.Location = New System.Drawing.Point(96, 22)
+ Me.Label6.Name = "Label6"
+ Me.Label6.Size = New System.Drawing.Size(29, 13)
+ Me.Label6.TabIndex = 2
+ Me.Label6.Text = "[Nm]"
+ '
+ 'BtPrevious
+ '
+ Me.BtPrevious.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
+ Me.BtPrevious.Location = New System.Drawing.Point(129, 180)
+ Me.BtPrevious.Name = "BtPrevious"
+ Me.BtPrevious.Size = New System.Drawing.Size(67, 23)
+ Me.BtPrevious.TabIndex = 8
+ Me.BtPrevious.Text = "< &Previous"
+ Me.BtPrevious.UseVisualStyleBackColor = true
+ '
+ 'GearboxGearDialog
+ '
+ Me.AcceptButton = Me.OK_Button
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
+ Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+ Me.CancelButton = Me.Cancel_Button
+ Me.ClientSize = New System.Drawing.Size(528, 218)
+ Me.Controls.Add(Me.BtPrevious)
+ Me.Controls.Add(Me.PnFld)
+ Me.Controls.Add(Me.PnShiftPoly)
+ Me.Controls.Add(Me.BtNext)
+ Me.Controls.Add(Me.BtBrowse)
+ Me.Controls.Add(Me.Label3)
+ Me.Controls.Add(Me.TbMapPath)
+ Me.Controls.Add(Me.Label2)
+ Me.Controls.Add(Me.TbRatio)
+ Me.Controls.Add(Me.Label1)
+ Me.Controls.Add(Me.TbGear)
+ Me.Controls.Add(Me.TableLayoutPanel1)
+ Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow
+ Me.MaximizeBox = false
+ Me.MinimizeBox = false
+ Me.Name = "GearboxGearDialog"
+ Me.ShowInTaskbar = false
+ Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+ Me.Text = "Edit Gears"
+ Me.TableLayoutPanel1.ResumeLayout(false)
+ Me.PnShiftPoly.ResumeLayout(false)
+ Me.PnShiftPoly.PerformLayout
+ Me.PnFld.ResumeLayout(false)
+ Me.PnFld.PerformLayout
+ Me.ResumeLayout(false)
+ Me.PerformLayout
- End Sub
+End Sub
Friend WithEvents TableLayoutPanel1 As TableLayoutPanel
Friend WithEvents OK_Button As Button
Friend WithEvents Cancel_Button As Button
diff --git a/VECTO/GUI/GearboxGearDialog.resx b/VECTO/GUI/GearboxGearDialog.resx
index 1191d47a08a36f72e882ef236badbd8f7cf38e7f..4f77f2d6bffe3c96b9ca9eac09daac80ad8cda0e 100644
--- a/VECTO/GUI/GearboxGearDialog.resx
+++ b/VECTO/GUI/GearboxGearDialog.resx
@@ -120,38 +120,38 @@
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="BtBrowse.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADr8AAA6/ATgFUyQAAALVSURBVDhPhZJrSJNhGIYXOs1Nc8o8gJWZ+UNEEupPxDAw
- 0kIrs5JsTOcKRANNEs0827KM0BA1MlSo0G3o1DxkEsso1JqH8rBUSlPzPOfSeajkbu+7NSl/9MD147u/
- 776eF96P0VbB7+6Q8tFZJcCH2gj01wsx0BD5F5+aRFA1iTR99ZERjH+HlKHLxexgEoZao0Geh96mY2FC
- AkBpYlX7HL3PhBpjbXNIYWP5DjaWDKwv3MKMKomKMHIXGDWikaGu5gw8n3LhUWKXZ6wbBL+0tyk/Fwk5
- FJKv98Rjo/ca0J9AqakKxr5ye7iU7sCufBuFSfBjIYduXldvQnKdMg5r3fEmQVe1AO7FtkecH1rDvtAK
- TtnsDCpYmxNjddbIjBgreki+2BELXWccVEoRAqu8EPTEC2Sp03223KqUCbsMSw0VrEzfhG4qG7rJbCwb
- Ifnsmyt4/1oAX5kHqtUSnKj2pQIHsZWCCKzTLUAFSxNZWBrPwnfCWCa0ekiuaL6As408yNVSxPYI4FbI
- gWM2u4ybxwIRsJKZBoH2ayYWRzOg+ULQX+HndMikpxDSxINC9wJRyiAcatiJPQUcuBTawOGxQWCZYG4Q
- kIJ6OA3qoTTMD6bhW08iAmp98GqlBdHKABxrcacCb7kj3CQcKmAVM8G8vE1BBfODqZhTpWJ2IIUevV3C
- x1HZfkS1+yOk1XOLgFvGgmWcuYYZzvChAlKc7ruBqY/JVNBYEobiB4HgFbnCv9HdJPCs4MIxl43tMWYj
- zEv6MhlSIMXJnuuY6DL8gTVFoajMP4+68ovg5bvisHw3FXDTWBDn8ehNmKatIlSjehmDcWUSxt4lUkF5
- znEUpPhBmncStY+CcSDLGT4VzrBPtkJz2TnD5j/TLQ/ndEjD5F01Qgy3XkWnXIj4yIOx+ld7DV8wGLax
- DI5ltLncQmRWZoy2Tnsl/zQ5DTnBvRQ/b2P8n2EwfgPZDDiygt3V8AAAAABJRU5ErkJggg==
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ vwAADr8BOAVTJAAAAtVJREFUOE+FkmtIk2EYhhc6zU1zyjyAlZn5Q0QS6k/EMDDSQiuzkmxM5wpEA00S
+ zTzbsozQEDUyVKjQbejUPGQSyyjUmofysFRKU/M859J5qORu77s1KX/0wPXju7/vvp4X3o/RVsHv7pDy
+ 0VklwIfaCPTXCzHQEPkXn5pEUDWJNH31kRGMf4eUocvF7GAShlqjQZ6H3qZjYUICQGliVfscvc+EGmNt
+ c0hhY/kONpYMrC/cwowqiYowchcYNaKRoa7mDDyfcuFRYpdnrBsEv7S3KT8XCTkUkq/3xGOj9xrQn0Cp
+ qQrGvnJ7uJTuwK58G4VJ8GMhh25eV29Ccp0yDmvd8SZBV7UA7sW2R5wfWsO+0ApO2ewMKlibE2N11siM
+ GCt6SL7YEQtdZxxUShECq7wQ9MQLZKnTfbbcqpQJuwxLDRWsTN+EbiobuslsLBsh+eybK3j/WgBfmQeq
+ 1RKcqPalAgexlYIIrNMtQAVLE1lYGs/Cd8JYJrR6SK5ovoCzjTzI1VLE9gjgVsiBYza7jJvHAhGwkpkG
+ gfZrJhZHM6D5QtBf4ed0yKSnENLEg0L3AlHKIBxq2Ik9BRy4FNrA4bFBYJlgbhCQgno4DeqhNMwPpuFb
+ TyICan3waqUF0coAHGtxpwJvuSPcJBwqYBUzwby8TUEF84OpmFOlYnYghR69XcLHUdl+RLX7I6TVc4uA
+ W8aCZZy5hhnO8KECUpzuu4Gpj8lU0FgShuIHgeAVucK/0d0k8KzgwjGXje0xZiPMS/oyGVIgxcme65jo
+ MvyBNUWhqMw/j7ryi+Dlu+KwfDcVcNNYEOfx6E2Ypq0iVKN6GYNxZRLG3iVSQXnOcRSk+EGadxK1j4Jx
+ IMsZPhXOsE+2QnPZOcPmP9MtD+d0SMPkXTVCDLdeRadciPjIg7H6V3sNXzAYtrEMjmW0udxCZFZmjLZO
+ eyX/NDkNOcG9FD9vY/yfYTB+A9kMOLKC3dXwAAAAAElFTkSuQmCC
</value>
</data>
<data name="BtShiftPolyBrowse.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADr8AAA6/ATgFUyQAAALVSURBVDhPhZJrSJNhGIYXOs1Nc8o8gJWZ+UNEEupPxDAw
- 0kIrs5JsTOcKRANNEs0827KM0BA1MlSo0G3o1DxkEsso1JqH8rBUSlPzPOfSeajkbu+7NSl/9MD147u/
- 776eF96P0VbB7+6Q8tFZJcCH2gj01wsx0BD5F5+aRFA1iTR99ZERjH+HlKHLxexgEoZao0Geh96mY2FC
- AkBpYlX7HL3PhBpjbXNIYWP5DjaWDKwv3MKMKomKMHIXGDWikaGu5gw8n3LhUWKXZ6wbBL+0tyk/Fwk5
- FJKv98Rjo/ca0J9AqakKxr5ye7iU7sCufBuFSfBjIYduXldvQnKdMg5r3fEmQVe1AO7FtkecH1rDvtAK
- TtnsDCpYmxNjddbIjBgreki+2BELXWccVEoRAqu8EPTEC2Sp03223KqUCbsMSw0VrEzfhG4qG7rJbCwb
- Ifnsmyt4/1oAX5kHqtUSnKj2pQIHsZWCCKzTLUAFSxNZWBrPwnfCWCa0ekiuaL6As408yNVSxPYI4FbI
- gWM2u4ybxwIRsJKZBoH2ayYWRzOg+ULQX+HndMikpxDSxINC9wJRyiAcatiJPQUcuBTawOGxQWCZYG4Q
- kIJ6OA3qoTTMD6bhW08iAmp98GqlBdHKABxrcacCb7kj3CQcKmAVM8G8vE1BBfODqZhTpWJ2IIUevV3C
- x1HZfkS1+yOk1XOLgFvGgmWcuYYZzvChAlKc7ruBqY/JVNBYEobiB4HgFbnCv9HdJPCs4MIxl43tMWYj
- zEv6MhlSIMXJnuuY6DL8gTVFoajMP4+68ovg5bvisHw3FXDTWBDn8ehNmKatIlSjehmDcWUSxt4lUkF5
- znEUpPhBmncStY+CcSDLGT4VzrBPtkJz2TnD5j/TLQ/ndEjD5F01Qgy3XkWnXIj4yIOx+ld7DV8wGLax
- DI5ltLncQmRWZoy2Tnsl/zQ5DTnBvRQ/b2P8n2EwfgPZDDiygt3V8AAAAABJRU5ErkJggg==
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ vwAADr8BOAVTJAAAAtVJREFUOE+FkmtIk2EYhhc6zU1zyjyAlZn5Q0QS6k/EMDDSQiuzkmxM5wpEA00S
+ zTzbsozQEDUyVKjQbejUPGQSyyjUmofysFRKU/M859J5qORu77s1KX/0wPXju7/vvp4X3o/RVsHv7pDy
+ 0VklwIfaCPTXCzHQEPkXn5pEUDWJNH31kRGMf4eUocvF7GAShlqjQZ6H3qZjYUICQGliVfscvc+EGmNt
+ c0hhY/kONpYMrC/cwowqiYowchcYNaKRoa7mDDyfcuFRYpdnrBsEv7S3KT8XCTkUkq/3xGOj9xrQn0Cp
+ qQrGvnJ7uJTuwK58G4VJ8GMhh25eV29Ccp0yDmvd8SZBV7UA7sW2R5wfWsO+0ApO2ewMKlibE2N11siM
+ GCt6SL7YEQtdZxxUShECq7wQ9MQLZKnTfbbcqpQJuwxLDRWsTN+EbiobuslsLBsh+eybK3j/WgBfmQeq
+ 1RKcqPalAgexlYIIrNMtQAVLE1lYGs/Cd8JYJrR6SK5ovoCzjTzI1VLE9gjgVsiBYza7jJvHAhGwkpkG
+ gfZrJhZHM6D5QtBf4ed0yKSnENLEg0L3AlHKIBxq2Ik9BRy4FNrA4bFBYJlgbhCQgno4DeqhNMwPpuFb
+ TyICan3waqUF0coAHGtxpwJvuSPcJBwqYBUzwby8TUEF84OpmFOlYnYghR69XcLHUdl+RLX7I6TVc4uA
+ W8aCZZy5hhnO8KECUpzuu4Gpj8lU0FgShuIHgeAVucK/0d0k8KzgwjGXje0xZiPMS/oyGVIgxcme65jo
+ MvyBNUWhqMw/j7ryi+Dlu+KwfDcVcNNYEOfx6E2Ypq0iVKN6GYNxZRLG3iVSQXnOcRSk+EGadxK1j4Jx
+ IMsZPhXOsE+2QnPZOcPmP9MtD+d0SMPkXTVCDLdeRadciPjIg7H6V3sNXzAYtrEMjmW0udxCZFZmjLZO
+ eyX/NDkNOcG9FD9vY/yfYTB+A9kMOLKC3dXwAAAAAElFTkSuQmCC
</value>
</data>
</root>
\ No newline at end of file
diff --git a/VECTO/GUI/HybridStrategyParamsForm.Designer.vb b/VECTO/GUI/HybridStrategyParamsForm.Designer.vb
index 995fc66fe3c561090bb213771f6725d9f8f6bedb..90c1d30d22d3b75da81bdb6725d5d79dcc5d6d09 100644
--- a/VECTO/GUI/HybridStrategyParamsForm.Designer.vb
+++ b/VECTO/GUI/HybridStrategyParamsForm.Designer.vb
@@ -143,7 +143,7 @@ Partial Class HybridStrategyParamsForm
Me.ButCancel.Location = New System.Drawing.Point(362, 381)
Me.ButCancel.Name = "ButCancel"
Me.ButCancel.Size = New System.Drawing.Size(75, 23)
- Me.ButCancel.TabIndex = 13
+ Me.ButCancel.TabIndex = 11
Me.ButCancel.Text = "Cancel"
Me.ButCancel.UseVisualStyleBackColor = true
'
@@ -153,17 +153,18 @@ Partial Class HybridStrategyParamsForm
Me.ButOK.Location = New System.Drawing.Point(281, 381)
Me.ButOK.Name = "ButOK"
Me.ButOK.Size = New System.Drawing.Size(75, 23)
- Me.ButOK.TabIndex = 12
+ Me.ButOK.TabIndex = 10
Me.ButOK.Text = "Save"
Me.ButOK.UseVisualStyleBackColor = true
'
'ToolStrip1
'
Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
+ Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator3, Me.ToolStripBtSendTo, Me.ToolStripSeparator1, Me.ToolStripButton1})
Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
Me.ToolStrip1.Name = "ToolStrip1"
- Me.ToolStrip1.Size = New System.Drawing.Size(449, 25)
+ Me.ToolStrip1.Size = New System.Drawing.Size(449, 31)
Me.ToolStrip1.TabIndex = 30
Me.ToolStrip1.Text = "ToolStrip1"
'
@@ -173,7 +174,7 @@ Partial Class HybridStrategyParamsForm
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(23, 22)
+ Me.ToolStripBtNew.Size = New System.Drawing.Size(28, 28)
Me.ToolStripBtNew.Text = "ToolStripButton1"
Me.ToolStripBtNew.ToolTipText = "New"
'
@@ -183,7 +184,7 @@ Partial Class HybridStrategyParamsForm
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(23, 22)
+ Me.ToolStripBtOpen.Size = New System.Drawing.Size(28, 28)
Me.ToolStripBtOpen.Text = "ToolStripButton1"
Me.ToolStripBtOpen.ToolTipText = "Open..."
'
@@ -193,7 +194,7 @@ Partial Class HybridStrategyParamsForm
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(23, 22)
+ Me.ToolStripBtSave.Size = New System.Drawing.Size(28, 28)
Me.ToolStripBtSave.Text = "ToolStripButton1"
Me.ToolStripBtSave.ToolTipText = "Save"
'
@@ -203,14 +204,14 @@ Partial Class HybridStrategyParamsForm
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(23, 22)
+ Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(28, 28)
Me.ToolStripBtSaveAs.Text = "ToolStripButton1"
Me.ToolStripBtSaveAs.ToolTipText = "Save As..."
'
'ToolStripSeparator3
'
Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
- Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 25)
+ Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 31)
'
'ToolStripBtSendTo
'
@@ -218,14 +219,14 @@ Partial Class HybridStrategyParamsForm
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(23, 22)
+ Me.ToolStripBtSendTo.Size = New System.Drawing.Size(28, 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, 25)
+ Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 31)
'
'ToolStripButton1
'
@@ -233,11 +234,12 @@ Partial Class HybridStrategyParamsForm
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(23, 22)
+ Me.ToolStripButton1.Size = New System.Drawing.Size(28, 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, 407)
Me.StatusStrip1.Name = "StatusStrip1"
@@ -264,6 +266,7 @@ Partial Class HybridStrategyParamsForm
'
'CmOpenFile
'
+ Me.CmOpenFile.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
Me.CmOpenFile.Name = "CmOpenFile"
Me.CmOpenFile.Size = New System.Drawing.Size(153, 48)
@@ -288,7 +291,7 @@ Partial Class HybridStrategyParamsForm
Me.pnEquivFactor.Location = New System.Drawing.Point(12, 74)
Me.pnEquivFactor.Name = "pnEquivFactor"
Me.pnEquivFactor.Size = New System.Drawing.Size(288, 28)
- Me.pnEquivFactor.TabIndex = 3
+ Me.pnEquivFactor.TabIndex = 0
'
'lblTitle
'
@@ -309,7 +312,7 @@ Partial Class HybridStrategyParamsForm
Me.pnMinSoC.Location = New System.Drawing.Point(12, 134)
Me.pnMinSoC.Name = "pnMinSoC"
Me.pnMinSoC.Size = New System.Drawing.Size(288, 28)
- Me.pnMinSoC.TabIndex = 25
+ Me.pnMinSoC.TabIndex = 2
'
'lblMinSoC
'
@@ -344,7 +347,7 @@ Partial Class HybridStrategyParamsForm
Me.pnMaxSoC.Location = New System.Drawing.Point(12, 164)
Me.pnMaxSoC.Name = "pnMaxSoC"
Me.pnMaxSoC.Size = New System.Drawing.Size(288, 28)
- Me.pnMaxSoC.TabIndex = 26
+ Me.pnMaxSoC.TabIndex = 3
'
'lblMaxSoC
'
@@ -379,7 +382,7 @@ Partial Class HybridStrategyParamsForm
Me.pnTargetSoC.Location = New System.Drawing.Point(12, 194)
Me.pnTargetSoC.Name = "pnTargetSoC"
Me.pnTargetSoC.Size = New System.Drawing.Size(288, 28)
- Me.pnTargetSoC.TabIndex = 27
+ Me.pnTargetSoC.TabIndex = 4
'
'lblTargetSoC
'
@@ -414,7 +417,7 @@ Partial Class HybridStrategyParamsForm
Me.pnAuxBufferTime.Location = New System.Drawing.Point(12, 254)
Me.pnAuxBufferTime.Name = "pnAuxBufferTime"
Me.pnAuxBufferTime.Size = New System.Drawing.Size(288, 28)
- Me.pnAuxBufferTime.TabIndex = 28
+ Me.pnAuxBufferTime.TabIndex = 6
'
'lblAuxBufferTime
'
@@ -449,7 +452,7 @@ Partial Class HybridStrategyParamsForm
Me.pnAuxBufferChgTime.Location = New System.Drawing.Point(12, 284)
Me.pnAuxBufferChgTime.Name = "pnAuxBufferChgTime"
Me.pnAuxBufferChgTime.Size = New System.Drawing.Size(288, 28)
- Me.pnAuxBufferChgTime.TabIndex = 29
+ Me.pnAuxBufferChgTime.TabIndex = 7
'
'Label1
'
@@ -484,7 +487,7 @@ Partial Class HybridStrategyParamsForm
Me.Panel1.Location = New System.Drawing.Point(12, 224)
Me.Panel1.Name = "Panel1"
Me.Panel1.Size = New System.Drawing.Size(288, 28)
- Me.Panel1.TabIndex = 29
+ Me.Panel1.TabIndex = 5
'
'lblMinIceOnTime
'
@@ -519,7 +522,7 @@ Partial Class HybridStrategyParamsForm
Me.Panel2.Location = New System.Drawing.Point(12, 104)
Me.Panel2.Name = "Panel2"
Me.Panel2.Size = New System.Drawing.Size(288, 28)
- Me.Panel2.TabIndex = 25
+ Me.Panel2.TabIndex = 1
'
'EquivalenceFactorChg
'
@@ -554,7 +557,7 @@ Partial Class HybridStrategyParamsForm
Me.pnICEStartPenaltyFactor.Location = New System.Drawing.Point(12, 314)
Me.pnICEStartPenaltyFactor.Name = "pnICEStartPenaltyFactor"
Me.pnICEStartPenaltyFactor.Size = New System.Drawing.Size(288, 28)
- Me.pnICEStartPenaltyFactor.TabIndex = 30
+ Me.pnICEStartPenaltyFactor.TabIndex = 8
'
'lblICEStartPenaltyFactor
'
@@ -589,7 +592,7 @@ Partial Class HybridStrategyParamsForm
Me.pnCostFactorSoCExponent.Location = New System.Drawing.Point(12, 344)
Me.pnCostFactorSoCExponent.Name = "pnCostFactorSoCExponent"
Me.pnCostFactorSoCExponent.Size = New System.Drawing.Size(288, 28)
- Me.pnCostFactorSoCExponent.TabIndex = 31
+ Me.pnCostFactorSoCExponent.TabIndex = 9
'
'lblCostFactorSoCExponent
'
diff --git a/VECTO/GUI/MainForm.Designer.vb b/VECTO/GUI/MainForm.Designer.vb
index f2a9671807edae1073c42823ed05436210a75d98..883e66e0d823092a94c6834335e9c47b944d5c6d 100644
--- a/VECTO/GUI/MainForm.Designer.vb
+++ b/VECTO/GUI/MainForm.Designer.vb
@@ -142,6 +142,7 @@ Partial Class MainForm
'
'StatusBAR
'
+ Me.StatusBAR.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.StatusBAR.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripLbStatus, Me.ToolStripProgBarJob, Me.ToolStripProgBarOverall})
Me.StatusBAR.Location = New System.Drawing.Point(0, 648)
Me.StatusBAR.Name = "StatusBAR"
@@ -442,9 +443,9 @@ Partial Class MainForm
Me.Label2.AutoSize = true
Me.Label2.Location = New System.Drawing.Point(7, 19)
Me.Label2.Name = "Label2"
- Me.Label2.Size = New System.Drawing.Size(84, 13)
+ Me.Label2.Size = New System.Drawing.Size(61, 13)
Me.Label2.TabIndex = 1
- Me.Label2.Text = "Output Directory"
+ Me.Label2.Text = "Min Speed:"
'
'GroupBox4
'
@@ -586,6 +587,7 @@ Partial Class MainForm
'
'ConMenFilelist
'
+ Me.ConMenFilelist.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.ConMenFilelist.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ShowInFolderMenuItem, Me.SaveListToolStripMenuItem, Me.LoadListToolStripMenuItem, Me.LoadDefaultListToolStripMenuItem, Me.ClearListToolStripMenuItem})
Me.ConMenFilelist.Name = "ConMenFilelist"
Me.ConMenFilelist.ShowImageMargin = false
@@ -682,10 +684,11 @@ Partial Class MainForm
'
Me.ToolStrip1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
+ Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripSeparator2, Me.ToolStripDrDnBtTools, Me.ToolStripDrDnBtInfo})
Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
Me.ToolStrip1.Name = "ToolStrip1"
- Me.ToolStrip1.Size = New System.Drawing.Size(1045, 25)
+ Me.ToolStrip1.Size = New System.Drawing.Size(1045, 31)
Me.ToolStrip1.TabIndex = 11
Me.ToolStrip1.Text = "ToolStrip1"
'
@@ -695,7 +698,7 @@ Partial Class MainForm
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(23, 22)
+ Me.ToolStripBtNew.Size = New System.Drawing.Size(28, 28)
Me.ToolStripBtNew.Text = "ToolStripBtNew"
Me.ToolStripBtNew.ToolTipText = "New Job File"
'
@@ -705,14 +708,14 @@ Partial Class MainForm
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(23, 22)
+ Me.ToolStripBtOpen.Size = New System.Drawing.Size(28, 28)
Me.ToolStripBtOpen.Text = "ToolStripButton1"
Me.ToolStripBtOpen.ToolTipText = "Open File..."
'
'ToolStripSeparator2
'
Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
- Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 25)
+ Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 31)
'
'ToolStripDrDnBtTools
'
@@ -720,7 +723,7 @@ Partial Class MainForm
Me.ToolStripDrDnBtTools.Image = Global.TUGraz.VECTO.My.Resources.Resources.Misc_Tools_icon
Me.ToolStripDrDnBtTools.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripDrDnBtTools.Name = "ToolStripDrDnBtTools"
- Me.ToolStripDrDnBtTools.Size = New System.Drawing.Size(63, 22)
+ Me.ToolStripDrDnBtTools.Size = New System.Drawing.Size(71, 28)
Me.ToolStripDrDnBtTools.Text = "Tools"
'
'GENEditorToolStripMenuItem1
@@ -809,7 +812,7 @@ Partial Class MainForm
Me.ToolStripDrDnBtInfo.Image = Global.TUGraz.VECTO.My.Resources.Resources.Help_icon
Me.ToolStripDrDnBtInfo.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripDrDnBtInfo.Name = "ToolStripDrDnBtInfo"
- Me.ToolStripDrDnBtInfo.Size = New System.Drawing.Size(61, 22)
+ Me.ToolStripDrDnBtInfo.Size = New System.Drawing.Size(69, 28)
Me.ToolStripDrDnBtInfo.Text = "Help"
'
'UserManualToolStripMenuItem
@@ -843,6 +846,7 @@ Partial Class MainForm
'
'CmDEV
'
+ Me.CmDEV.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.CmDEV.Name = "CmDEV"
Me.CmDEV.ShowImageMargin = false
Me.CmDEV.Size = New System.Drawing.Size(36, 4)
@@ -853,6 +857,7 @@ Partial Class MainForm
'
'CmOpenFile
'
+ Me.CmOpenFile.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.OpenInGraphWindowToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
Me.CmOpenFile.Name = "CmOpenFile"
Me.CmOpenFile.ShowImageMargin = false
diff --git a/VECTO/GUI/REESSPackDialog.Designer.vb b/VECTO/GUI/REESSPackDialog.Designer.vb
index 17cfbbf3359d0fd6d857e8227e456bbaf934aee8..3e601ae842ec2c208f0d9cda9b3a62c50bef41f8 100644
--- a/VECTO/GUI/REESSPackDialog.Designer.vb
+++ b/VECTO/GUI/REESSPackDialog.Designer.vb
@@ -72,7 +72,7 @@ Partial Class REESSPackDialog
Me.OK_Button.Location = New System.Drawing.Point(3, 3)
Me.OK_Button.Name = "OK_Button"
Me.OK_Button.Size = New System.Drawing.Size(67, 23)
- Me.OK_Button.TabIndex = 0
+ Me.OK_Button.TabIndex = 3
Me.OK_Button.Text = "OK"
'
'Cancel_Button
@@ -82,7 +82,7 @@ Partial Class REESSPackDialog
Me.Cancel_Button.Location = New System.Drawing.Point(76, 3)
Me.Cancel_Button.Name = "Cancel_Button"
Me.Cancel_Button.Size = New System.Drawing.Size(67, 23)
- Me.Cancel_Button.TabIndex = 1
+ Me.Cancel_Button.TabIndex = 4
Me.Cancel_Button.Text = "Cancel"
'
'pnREESSPack
@@ -93,7 +93,7 @@ Partial Class REESSPackDialog
Me.pnREESSPack.Location = New System.Drawing.Point(12, 12)
Me.pnREESSPack.Name = "pnREESSPack"
Me.pnREESSPack.Size = New System.Drawing.Size(553, 27)
- Me.pnREESSPack.TabIndex = 20
+ Me.pnREESSPack.TabIndex = 0
'
'btnOpenBattery
'
@@ -112,8 +112,7 @@ Partial Class REESSPackDialog
Me.btnBrowseBattery.Location = New System.Drawing.Point(527, 2)
Me.btnBrowseBattery.Name = "btnBrowseBattery"
Me.btnBrowseBattery.Size = New System.Drawing.Size(24, 24)
- Me.btnBrowseBattery.TabIndex = 2
- Me.btnBrowseBattery.TabStop = false
+ Me.btnBrowseBattery.TabIndex = 1
Me.btnBrowseBattery.UseVisualStyleBackColor = true
'
'tbBattery
@@ -123,14 +122,14 @@ Partial Class REESSPackDialog
Me.tbBattery.Location = New System.Drawing.Point(104, 4)
Me.tbBattery.Name = "tbBattery"
Me.tbBattery.Size = New System.Drawing.Size(417, 20)
- Me.tbBattery.TabIndex = 1
+ Me.tbBattery.TabIndex = 0
'
'tbBatteryPackCnt
'
Me.tbBatteryPackCnt.Location = New System.Drawing.Point(214, 45)
Me.tbBatteryPackCnt.Name = "tbBatteryPackCnt"
Me.tbBatteryPackCnt.Size = New System.Drawing.Size(59, 20)
- Me.tbBatteryPackCnt.TabIndex = 26
+ Me.tbBatteryPackCnt.TabIndex = 1
'
'lblBatteryPackCnt
'
@@ -146,7 +145,7 @@ Partial Class REESSPackDialog
Me.tbStreamId.Location = New System.Drawing.Point(214, 71)
Me.tbStreamId.Name = "tbStreamId"
Me.tbStreamId.Size = New System.Drawing.Size(59, 20)
- Me.tbStreamId.TabIndex = 28
+ Me.tbStreamId.TabIndex = 2
'
'lblStreamId
'
diff --git a/VECTO/GUI/REESSPackDialog.vb b/VECTO/GUI/REESSPackDialog.vb
index c61480932e5ec2a110bf7c042396c14834a5795e..235410f231786c15e4d43802b7ec7c58aace5419 100644
--- a/VECTO/GUI/REESSPackDialog.vb
+++ b/VECTO/GUI/REESSPackDialog.vb
@@ -83,9 +83,13 @@ Public Class REESSPackDialog
End If
End If
- if BatteryForm.ShowDialog() = DialogResult.OK then
- tbBattery.Text = BatteryForm.BatteryFile
- end if
+ if Not BatteryForm.Visible Then
+ BatteryForm.Show()
+ Else
+ If BatteryForm.WindowState = FormWindowState.Minimized Then BatteryForm.WindowState = FormWindowState.Normal
+ BatteryForm.BringToFront()
+ End If
+
If Not Trim(f) = "" Then
Try
BatteryForm.OpenBatteryFile(f)
diff --git a/VECTO/GUI/VectoJobForm.Designer.vb b/VECTO/GUI/VectoJobForm.Designer.vb
index ecbdc5007ce9a2a87862ea469d3ef27aa3085500..34893b3f40027a86e89b2671901c8ebee273bd4b 100644
--- a/VECTO/GUI/VectoJobForm.Designer.vb
+++ b/VECTO/GUI/VectoJobForm.Designer.vb
@@ -273,15 +273,14 @@ Partial Class VectoJobForm
Me.pnHybridStrategy.Location = New System.Drawing.Point(4, 125)
Me.pnHybridStrategy.Name = "pnHybridStrategy"
Me.pnHybridStrategy.Size = New System.Drawing.Size(516, 26)
- Me.pnHybridStrategy.TabIndex = 15
+ Me.pnHybridStrategy.TabIndex = 4
'
'btnOpenHybridStrategyParameters
'
Me.btnOpenHybridStrategyParameters.Location = New System.Drawing.Point(3, 3)
Me.btnOpenHybridStrategyParameters.Name = "btnOpenHybridStrategyParameters"
Me.btnOpenHybridStrategyParameters.Size = New System.Drawing.Size(72, 21)
- Me.btnOpenHybridStrategyParameters.TabIndex = 11
- Me.btnOpenHybridStrategyParameters.TabStop = false
+ Me.btnOpenHybridStrategyParameters.TabIndex = 0
Me.btnOpenHybridStrategyParameters.Text = "Hyb. Str. P."
Me.btnOpenHybridStrategyParameters.UseVisualStyleBackColor = true
'
@@ -292,7 +291,7 @@ Partial Class VectoJobForm
Me.tbHybridStrategyParams.Location = New System.Drawing.Point(81, 3)
Me.tbHybridStrategyParams.Name = "tbHybridStrategyParams"
Me.tbHybridStrategyParams.Size = New System.Drawing.Size(406, 20)
- Me.tbHybridStrategyParams.TabIndex = 12
+ Me.tbHybridStrategyParams.TabIndex = 1
'
'btnBrowseHybridStrategyParams
'
@@ -301,8 +300,7 @@ Partial Class VectoJobForm
Me.btnBrowseHybridStrategyParams.Location = New System.Drawing.Point(489, 1)
Me.btnBrowseHybridStrategyParams.Name = "btnBrowseHybridStrategyParams"
Me.btnBrowseHybridStrategyParams.Size = New System.Drawing.Size(24, 24)
- Me.btnBrowseHybridStrategyParams.TabIndex = 13
- Me.btnBrowseHybridStrategyParams.TabStop = false
+ Me.btnBrowseHybridStrategyParams.TabIndex = 2
Me.btnBrowseHybridStrategyParams.UseVisualStyleBackColor = true
'
'pnVehicle
@@ -313,7 +311,7 @@ Partial Class VectoJobForm
Me.pnVehicle.Location = New System.Drawing.Point(4, 7)
Me.pnVehicle.Name = "pnVehicle"
Me.pnVehicle.Size = New System.Drawing.Size(518, 27)
- Me.pnVehicle.TabIndex = 17
+ Me.pnVehicle.TabIndex = 0
'
'ButOpenVEH
'
@@ -321,7 +319,6 @@ Partial Class VectoJobForm
Me.ButOpenVEH.Name = "ButOpenVEH"
Me.ButOpenVEH.Size = New System.Drawing.Size(72, 21)
Me.ButOpenVEH.TabIndex = 0
- Me.ButOpenVEH.TabStop = false
Me.ButOpenVEH.Text = "Vehicle"
Me.ButOpenVEH.UseVisualStyleBackColor = true
'
@@ -333,7 +330,6 @@ Partial Class VectoJobForm
Me.ButtonVEH.Name = "ButtonVEH"
Me.ButtonVEH.Size = New System.Drawing.Size(24, 24)
Me.ButtonVEH.TabIndex = 2
- Me.ButtonVEH.TabStop = false
Me.ButtonVEH.UseVisualStyleBackColor = true
'
'TbVEH
@@ -353,15 +349,14 @@ Partial Class VectoJobForm
Me.pnEngine.Location = New System.Drawing.Point(4, 37)
Me.pnEngine.Name = "pnEngine"
Me.pnEngine.Size = New System.Drawing.Size(519, 27)
- Me.pnEngine.TabIndex = 16
+ Me.pnEngine.TabIndex = 1
'
'ButOpenENG
'
Me.ButOpenENG.Location = New System.Drawing.Point(4, 3)
Me.ButOpenENG.Name = "ButOpenENG"
Me.ButOpenENG.Size = New System.Drawing.Size(72, 21)
- Me.ButOpenENG.TabIndex = 3
- Me.ButOpenENG.TabStop = false
+ Me.ButOpenENG.TabIndex = 0
Me.ButOpenENG.Text = "Engine"
Me.ButOpenENG.UseVisualStyleBackColor = true
'
@@ -372,8 +367,7 @@ Partial Class VectoJobForm
Me.ButtonMAP.Location = New System.Drawing.Point(492, 1)
Me.ButtonMAP.Name = "ButtonMAP"
Me.ButtonMAP.Size = New System.Drawing.Size(24, 24)
- Me.ButtonMAP.TabIndex = 5
- Me.ButtonMAP.TabStop = false
+ Me.ButtonMAP.TabIndex = 2
Me.ButtonMAP.UseVisualStyleBackColor = true
'
'TbENG
@@ -383,7 +377,7 @@ Partial Class VectoJobForm
Me.TbENG.Location = New System.Drawing.Point(82, 3)
Me.TbENG.Name = "TbENG"
Me.TbENG.Size = New System.Drawing.Size(404, 20)
- Me.TbENG.TabIndex = 4
+ Me.TbENG.TabIndex = 1
'
'pnGearbox
'
@@ -393,15 +387,14 @@ Partial Class VectoJobForm
Me.pnGearbox.Location = New System.Drawing.Point(3, 66)
Me.pnGearbox.Name = "pnGearbox"
Me.pnGearbox.Size = New System.Drawing.Size(517, 28)
- Me.pnGearbox.TabIndex = 15
+ Me.pnGearbox.TabIndex = 2
'
'ButOpenGBX
'
Me.ButOpenGBX.Location = New System.Drawing.Point(4, 3)
Me.ButOpenGBX.Name = "ButOpenGBX"
Me.ButOpenGBX.Size = New System.Drawing.Size(72, 21)
- Me.ButOpenGBX.TabIndex = 6
- Me.ButOpenGBX.TabStop = false
+ Me.ButOpenGBX.TabIndex = 0
Me.ButOpenGBX.Text = "Gearbox"
Me.ButOpenGBX.UseVisualStyleBackColor = true
'
@@ -412,8 +405,7 @@ Partial Class VectoJobForm
Me.ButtonGBX.Location = New System.Drawing.Point(492, 1)
Me.ButtonGBX.Name = "ButtonGBX"
Me.ButtonGBX.Size = New System.Drawing.Size(24, 24)
- Me.ButtonGBX.TabIndex = 8
- Me.ButtonGBX.TabStop = false
+ Me.ButtonGBX.TabIndex = 2
Me.ButtonGBX.UseVisualStyleBackColor = true
'
'TbGBX
@@ -423,7 +415,7 @@ Partial Class VectoJobForm
Me.TbGBX.Location = New System.Drawing.Point(82, 3)
Me.TbGBX.Name = "TbGBX"
Me.TbGBX.Size = New System.Drawing.Size(404, 20)
- Me.TbGBX.TabIndex = 7
+ Me.TbGBX.TabIndex = 1
'
'pnShiftParams
'
@@ -433,15 +425,14 @@ Partial Class VectoJobForm
Me.pnShiftParams.Location = New System.Drawing.Point(4, 96)
Me.pnShiftParams.Name = "pnShiftParams"
Me.pnShiftParams.Size = New System.Drawing.Size(516, 26)
- Me.pnShiftParams.TabIndex = 14
+ Me.pnShiftParams.TabIndex = 3
'
'BtnShiftParamsForm
'
Me.BtnShiftParamsForm.Location = New System.Drawing.Point(3, 3)
Me.BtnShiftParamsForm.Name = "BtnShiftParamsForm"
Me.BtnShiftParamsForm.Size = New System.Drawing.Size(72, 21)
- Me.BtnShiftParamsForm.TabIndex = 11
- Me.BtnShiftParamsForm.TabStop = false
+ Me.BtnShiftParamsForm.TabIndex = 0
Me.BtnShiftParamsForm.Text = "Shift Parameters"
Me.BtnShiftParamsForm.UseVisualStyleBackColor = true
'
@@ -452,7 +443,7 @@ Partial Class VectoJobForm
Me.TbShiftStrategyParams.Location = New System.Drawing.Point(81, 3)
Me.TbShiftStrategyParams.Name = "TbShiftStrategyParams"
Me.TbShiftStrategyParams.Size = New System.Drawing.Size(406, 20)
- Me.TbShiftStrategyParams.TabIndex = 12
+ Me.TbShiftStrategyParams.TabIndex = 1
'
'BtnShiftStrategyParams
'
@@ -461,8 +452,7 @@ Partial Class VectoJobForm
Me.BtnShiftStrategyParams.Location = New System.Drawing.Point(489, 1)
Me.BtnShiftStrategyParams.Name = "BtnShiftStrategyParams"
Me.BtnShiftStrategyParams.Size = New System.Drawing.Size(24, 24)
- Me.BtnShiftStrategyParams.TabIndex = 13
- Me.BtnShiftStrategyParams.TabStop = false
+ Me.BtnShiftStrategyParams.TabIndex = 2
Me.BtnShiftStrategyParams.UseVisualStyleBackColor = true
'
'GrCycles
@@ -476,7 +466,7 @@ Partial Class VectoJobForm
Me.GrCycles.Location = New System.Drawing.Point(6, 6)
Me.GrCycles.Name = "GrCycles"
Me.GrCycles.Size = New System.Drawing.Size(515, 138)
- Me.GrCycles.TabIndex = 10
+ Me.GrCycles.TabIndex = 0
Me.GrCycles.TabStop = false
Me.GrCycles.Text = "Cycles"
'
@@ -547,7 +537,7 @@ Partial Class VectoJobForm
Me.GrAuxMech.Location = New System.Drawing.Point(6, 16)
Me.GrAuxMech.Name = "GrAuxMech"
Me.GrAuxMech.Size = New System.Drawing.Size(515, 280)
- Me.GrAuxMech.TabIndex = 9
+ Me.GrAuxMech.TabIndex = 0
Me.GrAuxMech.TabStop = false
Me.GrAuxMech.Text = "Mechanical Auxiliaries"
'
@@ -618,14 +608,14 @@ Partial Class VectoJobForm
Me.pnAuxEngineering.Location = New System.Drawing.Point(6, 19)
Me.pnAuxEngineering.Name = "pnAuxEngineering"
Me.pnAuxEngineering.Size = New System.Drawing.Size(500, 80)
- Me.pnAuxEngineering.TabIndex = 45
+ Me.pnAuxEngineering.TabIndex = 0
'
'tbPAuxStandstillICEOff
'
Me.tbPAuxStandstillICEOff.Location = New System.Drawing.Point(170, 55)
Me.tbPAuxStandstillICEOff.Name = "tbPAuxStandstillICEOff"
Me.tbPAuxStandstillICEOff.Size = New System.Drawing.Size(76, 20)
- Me.tbPAuxStandstillICEOff.TabIndex = 49
+ Me.tbPAuxStandstillICEOff.TabIndex = 2
'
'lblAuxStandstillICEOffUnit
'
@@ -650,7 +640,7 @@ Partial Class VectoJobForm
Me.tbPAuxDrivingICEOff.Location = New System.Drawing.Point(170, 29)
Me.tbPAuxDrivingICEOff.Name = "tbPAuxDrivingICEOff"
Me.tbPAuxDrivingICEOff.Size = New System.Drawing.Size(76, 20)
- Me.tbPAuxDrivingICEOff.TabIndex = 46
+ Me.tbPAuxDrivingICEOff.TabIndex = 1
'
'lblAuxDrivingICEOffUnit
'
@@ -675,7 +665,7 @@ Partial Class VectoJobForm
Me.TbAuxPAuxICEOn.Location = New System.Drawing.Point(170, 3)
Me.TbAuxPAuxICEOn.Name = "TbAuxPAuxICEOn"
Me.TbAuxPAuxICEOn.Size = New System.Drawing.Size(76, 20)
- Me.TbAuxPAuxICEOn.TabIndex = 43
+ Me.TbAuxPAuxICEOn.TabIndex = 0
'
'lblAuxICEOnUnit
'
@@ -810,7 +800,7 @@ Partial Class VectoJobForm
Me.gbBusAux.Location = New System.Drawing.Point(6, 302)
Me.gbBusAux.Name = "gbBusAux"
Me.gbBusAux.Size = New System.Drawing.Size(515, 78)
- Me.gbBusAux.TabIndex = 11
+ Me.gbBusAux.TabIndex = 1
Me.gbBusAux.TabStop = false
Me.gbBusAux.Text = "Bus Auxiliaries"
'
@@ -820,7 +810,7 @@ Partial Class VectoJobForm
Me.cbEnableBusAux.Location = New System.Drawing.Point(10, 17)
Me.cbEnableBusAux.Name = "cbEnableBusAux"
Me.cbEnableBusAux.Size = New System.Drawing.Size(115, 17)
- Me.cbEnableBusAux.TabIndex = 17
+ Me.cbEnableBusAux.TabIndex = 0
Me.cbEnableBusAux.Text = "Use Bus Auxiliaries"
Me.cbEnableBusAux.UseVisualStyleBackColor = true
'
@@ -829,18 +819,18 @@ Partial Class VectoJobForm
Me.pnBusAux.Controls.Add(Me.btnBusAuxP)
Me.pnBusAux.Controls.Add(Me.tbBusAuxParams)
Me.pnBusAux.Controls.Add(Me.btnBrowsBusAuxParams)
- Me.pnBusAux.Location = New System.Drawing.Point(6, 40)
Me.pnBusAux.Enabled = false
+ Me.pnBusAux.Location = New System.Drawing.Point(6, 40)
Me.pnBusAux.Name = "pnBusAux"
Me.pnBusAux.Size = New System.Drawing.Size(503, 26)
- Me.pnBusAux.TabIndex = 16
+ Me.pnBusAux.TabIndex = 1
'
'btnBusAuxP
'
Me.btnBusAuxP.Location = New System.Drawing.Point(3, 3)
Me.btnBusAuxP.Name = "btnBusAuxP"
Me.btnBusAuxP.Size = New System.Drawing.Size(72, 21)
- Me.btnBusAuxP.TabIndex = 11
+ Me.btnBusAuxP.TabIndex = 0
Me.btnBusAuxP.TabStop = false
Me.btnBusAuxP.Text = "BusAux P."
Me.btnBusAuxP.UseVisualStyleBackColor = true
@@ -852,7 +842,7 @@ Partial Class VectoJobForm
Me.tbBusAuxParams.Location = New System.Drawing.Point(81, 3)
Me.tbBusAuxParams.Name = "tbBusAuxParams"
Me.tbBusAuxParams.Size = New System.Drawing.Size(393, 20)
- Me.tbBusAuxParams.TabIndex = 12
+ Me.tbBusAuxParams.TabIndex = 1
'
'btnBrowsBusAuxParams
'
@@ -861,8 +851,7 @@ Partial Class VectoJobForm
Me.btnBrowsBusAuxParams.Location = New System.Drawing.Point(476, 1)
Me.btnBrowsBusAuxParams.Name = "btnBrowsBusAuxParams"
Me.btnBrowsBusAuxParams.Size = New System.Drawing.Size(24, 24)
- Me.btnBrowsBusAuxParams.TabIndex = 13
- Me.btnBrowsBusAuxParams.TabStop = false
+ Me.btnBrowsBusAuxParams.TabIndex = 2
Me.btnBrowsBusAuxParams.UseVisualStyleBackColor = true
'
'gbElectricAux
@@ -874,7 +863,7 @@ Partial Class VectoJobForm
Me.gbElectricAux.Location = New System.Drawing.Point(6, 386)
Me.gbElectricAux.Name = "gbElectricAux"
Me.gbElectricAux.Size = New System.Drawing.Size(515, 55)
- Me.gbElectricAux.TabIndex = 10
+ Me.gbElectricAux.TabIndex = 2
Me.gbElectricAux.TabStop = false
Me.gbElectricAux.Text = "Electric Auxiliaries"
Me.gbElectricAux.Visible = false
@@ -903,7 +892,7 @@ Partial Class VectoJobForm
Me.tbElectricAuxConstant.Location = New System.Drawing.Point(109, 19)
Me.tbElectricAuxConstant.Name = "tbElectricAuxConstant"
Me.tbElectricAuxConstant.Size = New System.Drawing.Size(76, 20)
- Me.tbElectricAuxConstant.TabIndex = 46
+ Me.tbElectricAuxConstant.TabIndex = 0
'
'lblElAuxConst
'
@@ -945,7 +934,7 @@ Partial Class VectoJobForm
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 = 4
+ Me.gbShiftStrategy.TabIndex = 3
Me.gbShiftStrategy.TabStop = false
Me.gbShiftStrategy.Text = "Gearshift Strategy"
'
@@ -966,7 +955,7 @@ Partial Class VectoJobForm
Me.GrVACC.Location = New System.Drawing.Point(9, 271)
Me.GrVACC.Name = "GrVACC"
Me.GrVACC.Size = New System.Drawing.Size(515, 69)
- Me.GrVACC.TabIndex = 3
+ Me.GrVACC.TabIndex = 2
Me.GrVACC.TabStop = false
Me.GrVACC.Text = "Max. acceleration and brake curves"
'
@@ -1006,7 +995,6 @@ Partial Class VectoJobForm
Me.BtAccOpen.Name = "BtAccOpen"
Me.BtAccOpen.Size = New System.Drawing.Size(24, 24)
Me.BtAccOpen.TabIndex = 2
- Me.BtAccOpen.TabStop = false
Me.BtAccOpen.UseVisualStyleBackColor = true
'
'GrLAC
@@ -1016,7 +1004,7 @@ Partial Class VectoJobForm
Me.GrLAC.Location = New System.Drawing.Point(9, 92)
Me.GrLAC.Name = "GrLAC"
Me.GrLAC.Size = New System.Drawing.Size(514, 173)
- Me.GrLAC.TabIndex = 2
+ Me.GrLAC.TabIndex = 1
Me.GrLAC.TabStop = false
Me.GrLAC.Text = "Look-Ahead Coasting"
'
@@ -1041,7 +1029,7 @@ Partial Class VectoJobForm
Me.pnLookAheadCoasting.Location = New System.Drawing.Point(15, 19)
Me.pnLookAheadCoasting.Name = "pnLookAheadCoasting"
Me.pnLookAheadCoasting.Size = New System.Drawing.Size(493, 129)
- Me.pnLookAheadCoasting.TabIndex = 20
+ Me.pnLookAheadCoasting.TabIndex = 0
'
'Label7
'
@@ -1067,7 +1055,7 @@ Partial Class VectoJobForm
Me.tbLacMinSpeed.Location = New System.Drawing.Point(179, 3)
Me.tbLacMinSpeed.Name = "tbLacMinSpeed"
Me.tbLacMinSpeed.Size = New System.Drawing.Size(64, 20)
- Me.tbLacMinSpeed.TabIndex = 34
+ Me.tbLacMinSpeed.TabIndex = 0
'
'btnDfVelocityDrop
'
@@ -1076,8 +1064,7 @@ Partial Class VectoJobForm
Me.btnDfVelocityDrop.Location = New System.Drawing.Point(466, 78)
Me.btnDfVelocityDrop.Name = "btnDfVelocityDrop"
Me.btnDfVelocityDrop.Size = New System.Drawing.Size(24, 24)
- Me.btnDfVelocityDrop.TabIndex = 32
- Me.btnDfVelocityDrop.TabStop = false
+ Me.btnDfVelocityDrop.TabIndex = 5
Me.btnDfVelocityDrop.UseVisualStyleBackColor = true
'
'Label12
@@ -1094,7 +1081,7 @@ Partial Class VectoJobForm
Me.tbDfCoastingScale.Location = New System.Drawing.Point(241, 107)
Me.tbDfCoastingScale.Name = "tbDfCoastingScale"
Me.tbDfCoastingScale.Size = New System.Drawing.Size(37, 20)
- Me.tbDfCoastingScale.TabIndex = 30
+ Me.tbDfCoastingScale.TabIndex = 7
'
'Label11
'
@@ -1120,7 +1107,7 @@ Partial Class VectoJobForm
Me.tbDfCoastingOffset.Location = New System.Drawing.Point(180, 107)
Me.tbDfCoastingOffset.Name = "tbDfCoastingOffset"
Me.tbDfCoastingOffset.Size = New System.Drawing.Size(37, 20)
- Me.tbDfCoastingOffset.TabIndex = 28
+ Me.tbDfCoastingOffset.TabIndex = 6
'
'tbLacDfTargetSpeedFile
'
@@ -1129,7 +1116,7 @@ Partial Class VectoJobForm
Me.tbLacDfTargetSpeedFile.Location = New System.Drawing.Point(179, 54)
Me.tbLacDfTargetSpeedFile.Name = "tbLacDfTargetSpeedFile"
Me.tbLacDfTargetSpeedFile.Size = New System.Drawing.Size(286, 20)
- Me.tbLacDfTargetSpeedFile.TabIndex = 22
+ Me.tbLacDfTargetSpeedFile.TabIndex = 2
'
'Label10
'
@@ -1167,8 +1154,7 @@ Partial Class VectoJobForm
Me.btnDfTargetSpeed.Location = New System.Drawing.Point(466, 52)
Me.btnDfTargetSpeed.Name = "btnDfTargetSpeed"
Me.btnDfTargetSpeed.Size = New System.Drawing.Size(24, 24)
- Me.btnDfTargetSpeed.TabIndex = 23
- Me.btnDfTargetSpeed.TabStop = false
+ Me.btnDfTargetSpeed.TabIndex = 3
Me.btnDfTargetSpeed.UseVisualStyleBackColor = true
'
'tbLacPreviewFactor
@@ -1176,7 +1162,7 @@ Partial Class VectoJobForm
Me.tbLacPreviewFactor.Location = New System.Drawing.Point(179, 28)
Me.tbLacPreviewFactor.Name = "tbLacPreviewFactor"
Me.tbLacPreviewFactor.Size = New System.Drawing.Size(64, 20)
- Me.tbLacPreviewFactor.TabIndex = 21
+ Me.tbLacPreviewFactor.TabIndex = 1
'
'tbLacDfVelocityDropFile
'
@@ -1185,7 +1171,7 @@ Partial Class VectoJobForm
Me.tbLacDfVelocityDropFile.Location = New System.Drawing.Point(179, 81)
Me.tbLacDfVelocityDropFile.Name = "tbLacDfVelocityDropFile"
Me.tbLacDfVelocityDropFile.Size = New System.Drawing.Size(286, 20)
- Me.tbLacDfVelocityDropFile.TabIndex = 25
+ Me.tbLacDfVelocityDropFile.TabIndex = 4
'
'CbLookAhead
'
@@ -1207,7 +1193,7 @@ Partial Class VectoJobForm
Me.gbOverspeed.Location = New System.Drawing.Point(9, 9)
Me.gbOverspeed.Name = "gbOverspeed"
Me.gbOverspeed.Size = New System.Drawing.Size(515, 77)
- Me.gbOverspeed.TabIndex = 1
+ Me.gbOverspeed.TabIndex = 0
Me.gbOverspeed.TabStop = false
Me.gbOverspeed.Text = "Overspeed"
'
@@ -1222,7 +1208,7 @@ Partial Class VectoJobForm
Me.PnEcoRoll.Location = New System.Drawing.Point(91, 17)
Me.PnEcoRoll.Name = "PnEcoRoll"
Me.PnEcoRoll.Size = New System.Drawing.Size(232, 54)
- Me.PnEcoRoll.TabIndex = 3
+ Me.PnEcoRoll.TabIndex = 2
'
'Label21
'
@@ -1247,7 +1233,7 @@ Partial Class VectoJobForm
Me.TbVmin.Location = New System.Drawing.Point(104, 28)
Me.TbVmin.Name = "TbVmin"
Me.TbVmin.Size = New System.Drawing.Size(64, 20)
- Me.TbVmin.TabIndex = 2
+ Me.TbVmin.TabIndex = 1
'
'TbOverspeed
'
@@ -1333,7 +1319,7 @@ Partial Class VectoJobForm
Me.gbPCC.Location = New System.Drawing.Point(7, 269)
Me.gbPCC.Name = "gbPCC"
Me.gbPCC.Size = New System.Drawing.Size(515, 217)
- Me.gbPCC.TabIndex = 7
+ Me.gbPCC.TabIndex = 2
Me.gbPCC.TabStop = false
Me.gbPCC.Text = "Predictive Cruise Control"
'
@@ -1381,7 +1367,7 @@ Partial Class VectoJobForm
Me.tbPCCPreviewUseCase2.Location = New System.Drawing.Point(247, 149)
Me.tbPCCPreviewUseCase2.Name = "tbPCCPreviewUseCase2"
Me.tbPCCPreviewUseCase2.Size = New System.Drawing.Size(52, 20)
- Me.tbPCCPreviewUseCase2.TabIndex = 27
+ Me.tbPCCPreviewUseCase2.TabIndex = 5
'
'Label38
'
@@ -1406,7 +1392,7 @@ Partial Class VectoJobForm
Me.tbPCCPreviewUseCase1.Location = New System.Drawing.Point(247, 123)
Me.tbPCCPreviewUseCase1.Name = "tbPCCPreviewUseCase1"
Me.tbPCCPreviewUseCase1.Size = New System.Drawing.Size(52, 20)
- Me.tbPCCPreviewUseCase1.TabIndex = 24
+ Me.tbPCCPreviewUseCase1.TabIndex = 4
'
'Label36
'
@@ -1431,7 +1417,7 @@ Partial Class VectoJobForm
Me.tbPCCMinSpeed.Location = New System.Drawing.Point(247, 97)
Me.tbPCCMinSpeed.Name = "tbPCCMinSpeed"
Me.tbPCCMinSpeed.Size = New System.Drawing.Size(52, 20)
- Me.tbPCCMinSpeed.TabIndex = 21
+ Me.tbPCCMinSpeed.TabIndex = 3
'
'Label34
'
@@ -1456,7 +1442,7 @@ Partial Class VectoJobForm
Me.tbPCCEnableSpeed.Location = New System.Drawing.Point(247, 71)
Me.tbPCCEnableSpeed.Name = "tbPCCEnableSpeed"
Me.tbPCCEnableSpeed.Size = New System.Drawing.Size(52, 20)
- Me.tbPCCEnableSpeed.TabIndex = 18
+ Me.tbPCCEnableSpeed.TabIndex = 2
'
'Label31
'
@@ -1481,7 +1467,7 @@ Partial Class VectoJobForm
Me.tbPCCOverspeed.Location = New System.Drawing.Point(247, 45)
Me.tbPCCOverspeed.Name = "tbPCCOverspeed"
Me.tbPCCOverspeed.Size = New System.Drawing.Size(52, 20)
- Me.tbPCCOverspeed.TabIndex = 15
+ Me.tbPCCOverspeed.TabIndex = 1
'
'Label20
'
@@ -1506,7 +1492,7 @@ Partial Class VectoJobForm
Me.tbPCCUnderspeed.Location = New System.Drawing.Point(247, 19)
Me.tbPCCUnderspeed.Name = "tbPCCUnderspeed"
Me.tbPCCUnderspeed.Size = New System.Drawing.Size(52, 20)
- Me.tbPCCUnderspeed.TabIndex = 12
+ Me.tbPCCUnderspeed.TabIndex = 0
'
'gbEcoRoll
'
@@ -1525,7 +1511,7 @@ Partial Class VectoJobForm
Me.gbEcoRoll.Location = New System.Drawing.Point(7, 136)
Me.gbEcoRoll.Name = "gbEcoRoll"
Me.gbEcoRoll.Size = New System.Drawing.Size(515, 127)
- Me.gbEcoRoll.TabIndex = 6
+ Me.gbEcoRoll.TabIndex = 1
Me.gbEcoRoll.TabStop = false
Me.gbEcoRoll.Text = "Eco-Roll"
'
@@ -1552,7 +1538,7 @@ Partial Class VectoJobForm
Me.tbEcoRollMaxAcc.Location = New System.Drawing.Point(247, 72)
Me.tbEcoRollMaxAcc.Name = "tbEcoRollMaxAcc"
Me.tbEcoRollMaxAcc.Size = New System.Drawing.Size(52, 20)
- Me.tbEcoRollMaxAcc.TabIndex = 18
+ Me.tbEcoRollMaxAcc.TabIndex = 2
'
'Label29
'
@@ -1579,7 +1565,7 @@ Partial Class VectoJobForm
Me.tbEcoRollUnderspeed.Location = New System.Drawing.Point(247, 97)
Me.tbEcoRollUnderspeed.Name = "tbEcoRollUnderspeed"
Me.tbEcoRollUnderspeed.Size = New System.Drawing.Size(52, 20)
- Me.tbEcoRollUnderspeed.TabIndex = 15
+ Me.tbEcoRollUnderspeed.TabIndex = 3
Me.tbEcoRollUnderspeed.Visible = false
'
'Label27
@@ -1605,7 +1591,7 @@ Partial Class VectoJobForm
Me.tbEcoRollActivationDelay.Location = New System.Drawing.Point(247, 45)
Me.tbEcoRollActivationDelay.Name = "tbEcoRollActivationDelay"
Me.tbEcoRollActivationDelay.Size = New System.Drawing.Size(52, 20)
- Me.tbEcoRollActivationDelay.TabIndex = 12
+ Me.tbEcoRollActivationDelay.TabIndex = 1
'
'Label25
'
@@ -1630,7 +1616,7 @@ Partial Class VectoJobForm
Me.tbEcoRollMinSpeed.Location = New System.Drawing.Point(247, 19)
Me.tbEcoRollMinSpeed.Name = "tbEcoRollMinSpeed"
Me.tbEcoRollMinSpeed.Size = New System.Drawing.Size(52, 20)
- Me.tbEcoRollMinSpeed.TabIndex = 9
+ Me.tbEcoRollMinSpeed.TabIndex = 0
'
'gbEngineStopStart
'
@@ -1647,7 +1633,7 @@ Partial Class VectoJobForm
Me.gbEngineStopStart.Location = New System.Drawing.Point(7, 9)
Me.gbEngineStopStart.Name = "gbEngineStopStart"
Me.gbEngineStopStart.Size = New System.Drawing.Size(515, 121)
- Me.gbEngineStopStart.TabIndex = 5
+ Me.gbEngineStopStart.TabIndex = 0
Me.gbEngineStopStart.TabStop = false
Me.gbEngineStopStart.Text = "Engine Stop/Start"
'
@@ -1656,7 +1642,7 @@ Partial Class VectoJobForm
Me.tbESSUtilityFactorDriving.Location = New System.Drawing.Point(247, 95)
Me.tbESSUtilityFactorDriving.Name = "tbESSUtilityFactorDriving"
Me.tbESSUtilityFactorDriving.Size = New System.Drawing.Size(52, 20)
- Me.tbESSUtilityFactorDriving.TabIndex = 9
+ Me.tbESSUtilityFactorDriving.TabIndex = 3
'
'lblESSUtilityFactorDriving
'
@@ -1672,7 +1658,7 @@ Partial Class VectoJobForm
Me.tbEssUtility.Location = New System.Drawing.Point(247, 69)
Me.tbEssUtility.Name = "tbEssUtility"
Me.tbEssUtility.Size = New System.Drawing.Size(52, 20)
- Me.tbEssUtility.TabIndex = 7
+ Me.tbEssUtility.TabIndex = 2
'
'Label24
'
@@ -1697,7 +1683,7 @@ Partial Class VectoJobForm
Me.tbMaxEngineOffTimespan.Location = New System.Drawing.Point(247, 43)
Me.tbMaxEngineOffTimespan.Name = "tbMaxEngineOffTimespan"
Me.tbMaxEngineOffTimespan.Size = New System.Drawing.Size(52, 20)
- Me.tbMaxEngineOffTimespan.TabIndex = 4
+ Me.tbMaxEngineOffTimespan.TabIndex = 1
'
'Label19
'
@@ -1722,7 +1708,7 @@ Partial Class VectoJobForm
Me.tbEngineStopStartActivationDelay.Location = New System.Drawing.Point(247, 17)
Me.tbEngineStopStartActivationDelay.Name = "tbEngineStopStartActivationDelay"
Me.tbEngineStopStartActivationDelay.Size = New System.Drawing.Size(52, 20)
- Me.tbEngineStopStartActivationDelay.TabIndex = 1
+ Me.tbEngineStopStartActivationDelay.TabIndex = 0
'
'Label16
'
@@ -1772,6 +1758,7 @@ Partial Class VectoJobForm
'
'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.Name = "StatusStrip1"
@@ -1792,7 +1779,7 @@ Partial Class VectoJobForm
Me.ButOK.Location = New System.Drawing.Point(776, 563)
Me.ButOK.Name = "ButOK"
Me.ButOK.Size = New System.Drawing.Size(75, 23)
- Me.ButOK.TabIndex = 0
+ Me.ButOK.TabIndex = 1
Me.ButOK.Text = "Save"
Me.ButOK.UseVisualStyleBackColor = true
'
@@ -1803,17 +1790,18 @@ Partial Class VectoJobForm
Me.ButCancel.Location = New System.Drawing.Point(857, 563)
Me.ButCancel.Name = "ButCancel"
Me.ButCancel.Size = New System.Drawing.Size(75, 23)
- Me.ButCancel.TabIndex = 1
+ Me.ButCancel.TabIndex = 2
Me.ButCancel.Text = "Cancel"
Me.ButCancel.UseVisualStyleBackColor = true
'
'ToolStrip1
'
Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
+ Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
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, 25)
+ Me.ToolStrip1.Size = New System.Drawing.Size(944, 31)
Me.ToolStrip1.TabIndex = 20
Me.ToolStrip1.Text = "ToolStrip1"
'
@@ -1823,7 +1811,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(23, 22)
+ Me.ToolStripBtNew.Size = New System.Drawing.Size(28, 28)
Me.ToolStripBtNew.Text = "New"
Me.ToolStripBtNew.ToolTipText = "New"
'
@@ -1833,7 +1821,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(23, 22)
+ Me.ToolStripBtOpen.Size = New System.Drawing.Size(28, 28)
Me.ToolStripBtOpen.Text = "Open"
Me.ToolStripBtOpen.ToolTipText = "Open..."
'
@@ -1843,7 +1831,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(23, 22)
+ Me.ToolStripBtSave.Size = New System.Drawing.Size(28, 28)
Me.ToolStripBtSave.Text = "Save"
Me.ToolStripBtSave.ToolTipText = "Save"
'
@@ -1853,14 +1841,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(23, 22)
+ Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(28, 28)
Me.ToolStripBtSaveAs.Text = "Save As"
Me.ToolStripBtSaveAs.ToolTipText = "Save As..."
'
'ToolStripSeparator1
'
Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
- Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 25)
+ Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 31)
'
'ToolStripBtSendTo
'
@@ -1868,14 +1856,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(23, 22)
+ Me.ToolStripBtSendTo.Size = New System.Drawing.Size(28, 28)
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, 25)
+ Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 31)
'
'ToolStripButton1
'
@@ -1883,7 +1871,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(23, 22)
+ Me.ToolStripButton1.Size = New System.Drawing.Size(28, 28)
Me.ToolStripButton1.Text = "Help"
'
'PictureBox1
@@ -1900,6 +1888,7 @@ Partial Class VectoJobForm
'
'CmOpenFile
'
+ Me.CmOpenFile.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
Me.CmOpenFile.Name = "CmOpenFile"
Me.CmOpenFile.ShowImageMargin = false
diff --git a/VECTO/GUI/VectoVTPJobForm.Designer.vb b/VECTO/GUI/VectoVTPJobForm.Designer.vb
index 1d86c0331b9d1827846458b8d584700443883c61..f2ba7144b43084f2d1493903c02a379a50ef669c 100644
--- a/VECTO/GUI/VectoVTPJobForm.Designer.vb
+++ b/VECTO/GUI/VectoVTPJobForm.Designer.vb
@@ -70,7 +70,10 @@ Partial Class VectoVTPJobForm
Me.lblEngineCharacteristics = New System.Windows.Forms.Label()
Me.PictureBox2 = New System.Windows.Forms.PictureBox()
Me.GroupBox1 = New System.Windows.Forms.GroupBox()
+ Me.Label13 = New System.Windows.Forms.Label()
Me.tbFanDiameter = New System.Windows.Forms.TextBox()
+ Me.tbC4 = New System.Windows.Forms.TextBox()
+ Me.Label14 = New System.Windows.Forms.Label()
Me.Label7 = New System.Windows.Forms.Label()
Me.pnFanParameters = New System.Windows.Forms.Panel()
Me.Label11 = New System.Windows.Forms.Label()
@@ -91,9 +94,6 @@ Partial Class VectoVTPJobForm
Me.Label8 = New System.Windows.Forms.Label()
Me.tbManufacturerRecord = New System.Windows.Forms.TextBox()
Me.ButtonManR = New System.Windows.Forms.Button()
- Me.Label13 = New System.Windows.Forms.Label()
- Me.tbC4 = New System.Windows.Forms.TextBox()
- Me.Label14 = New System.Windows.Forms.Label()
Me.GrCycles.SuspendLayout
Me.GrAux.SuspendLayout
Me.StatusStrip1.SuspendLayout
@@ -120,7 +120,7 @@ Partial Class VectoVTPJobForm
Me.GrCycles.Location = New System.Drawing.Point(11, 324)
Me.GrCycles.Name = "GrCycles"
Me.GrCycles.Size = New System.Drawing.Size(515, 166)
- Me.GrCycles.TabIndex = 10
+ Me.GrCycles.TabIndex = 3
Me.GrCycles.TabStop = false
Me.GrCycles.Text = "Cycles"
'
@@ -202,7 +202,7 @@ Partial Class VectoVTPJobForm
Me.GrAux.Location = New System.Drawing.Point(11, 178)
Me.GrAux.Name = "GrAux"
Me.GrAux.Size = New System.Drawing.Size(515, 140)
- Me.GrAux.TabIndex = 9
+ Me.GrAux.TabIndex = 2
Me.GrAux.TabStop = false
Me.GrAux.Text = "Auxiliaries"
'
@@ -246,7 +246,7 @@ Partial Class VectoVTPJobForm
Me.TbVEH.Location = New System.Drawing.Point(128, 86)
Me.TbVEH.Name = "TbVEH"
Me.TbVEH.Size = New System.Drawing.Size(373, 20)
- Me.TbVEH.TabIndex = 1
+ Me.TbVEH.TabIndex = 0
'
'ButtonVEH
'
@@ -256,11 +256,11 @@ Partial Class VectoVTPJobForm
Me.ButtonVEH.Name = "ButtonVEH"
Me.ButtonVEH.Size = New System.Drawing.Size(24, 24)
Me.ButtonVEH.TabIndex = 2
- Me.ButtonVEH.TabStop = false
Me.ButtonVEH.UseVisualStyleBackColor = true
'
'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, 660)
Me.StatusStrip1.Name = "StatusStrip1"
@@ -281,7 +281,7 @@ Partial Class VectoVTPJobForm
Me.ButOK.Location = New System.Drawing.Point(778, 633)
Me.ButOK.Name = "ButOK"
Me.ButOK.Size = New System.Drawing.Size(75, 23)
- Me.ButOK.TabIndex = 0
+ Me.ButOK.TabIndex = 5
Me.ButOK.Text = "Save"
Me.ButOK.UseVisualStyleBackColor = true
'
@@ -292,17 +292,18 @@ Partial Class VectoVTPJobForm
Me.ButCancel.Location = New System.Drawing.Point(859, 633)
Me.ButCancel.Name = "ButCancel"
Me.ButCancel.Size = New System.Drawing.Size(75, 23)
- Me.ButCancel.TabIndex = 1
+ Me.ButCancel.TabIndex = 6
Me.ButCancel.Text = "Cancel"
Me.ButCancel.UseVisualStyleBackColor = true
'
'ToolStrip1
'
Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
+ Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
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, 25)
+ Me.ToolStrip1.Size = New System.Drawing.Size(944, 31)
Me.ToolStrip1.TabIndex = 20
Me.ToolStrip1.Text = "ToolStrip1"
'
@@ -312,7 +313,7 @@ Partial Class VectoVTPJobForm
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(23, 22)
+ Me.ToolStripBtNew.Size = New System.Drawing.Size(28, 28)
Me.ToolStripBtNew.Text = "New"
Me.ToolStripBtNew.ToolTipText = "New"
'
@@ -322,7 +323,7 @@ Partial Class VectoVTPJobForm
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(23, 22)
+ Me.ToolStripBtOpen.Size = New System.Drawing.Size(28, 28)
Me.ToolStripBtOpen.Text = "Open"
Me.ToolStripBtOpen.ToolTipText = "Open..."
'
@@ -332,7 +333,7 @@ Partial Class VectoVTPJobForm
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(23, 22)
+ Me.ToolStripBtSave.Size = New System.Drawing.Size(28, 28)
Me.ToolStripBtSave.Text = "Save"
Me.ToolStripBtSave.ToolTipText = "Save"
'
@@ -342,14 +343,14 @@ Partial Class VectoVTPJobForm
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(23, 22)
+ Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(28, 28)
Me.ToolStripBtSaveAs.Text = "Save As"
Me.ToolStripBtSaveAs.ToolTipText = "Save As..."
'
'ToolStripSeparator1
'
Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
- Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 25)
+ Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 31)
'
'ToolStripBtSendTo
'
@@ -357,14 +358,14 @@ Partial Class VectoVTPJobForm
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(23, 22)
+ Me.ToolStripBtSendTo.Size = New System.Drawing.Size(28, 28)
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, 25)
+ Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 31)
'
'ToolStripButton1
'
@@ -372,7 +373,7 @@ Partial Class VectoVTPJobForm
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(23, 22)
+ Me.ToolStripButton1.Size = New System.Drawing.Size(28, 28)
Me.ToolStripButton1.Text = "Help"
'
'PictureBox1
@@ -389,6 +390,7 @@ Partial Class VectoVTPJobForm
'
'CmOpenFile
'
+ Me.CmOpenFile.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
Me.CmOpenFile.Name = "CmOpenFile"
Me.CmOpenFile.ShowImageMargin = false
@@ -507,16 +509,41 @@ Partial Class VectoVTPJobForm
Me.GroupBox1.Location = New System.Drawing.Point(10, 496)
Me.GroupBox1.Name = "GroupBox1"
Me.GroupBox1.Size = New System.Drawing.Size(517, 144)
- Me.GroupBox1.TabIndex = 39
+ Me.GroupBox1.TabIndex = 4
Me.GroupBox1.TabStop = false
Me.GroupBox1.Text = "Fan Power"
'
+ 'Label13
+ '
+ Me.Label13.AutoSize = true
+ Me.Label13.Location = New System.Drawing.Point(463, 120)
+ Me.Label13.Name = "Label13"
+ Me.Label13.Size = New System.Drawing.Size(16, 13)
+ Me.Label13.TabIndex = 53
+ Me.Label13.Text = "[-]"
+ '
'tbFanDiameter
'
Me.tbFanDiameter.Location = New System.Drawing.Point(371, 13)
Me.tbFanDiameter.Name = "tbFanDiameter"
Me.tbFanDiameter.Size = New System.Drawing.Size(86, 20)
- Me.tbFanDiameter.TabIndex = 46
+ Me.tbFanDiameter.TabIndex = 0
+ '
+ 'tbC4
+ '
+ Me.tbC4.Location = New System.Drawing.Point(371, 117)
+ Me.tbC4.Name = "tbC4"
+ Me.tbC4.Size = New System.Drawing.Size(86, 20)
+ Me.tbC4.TabIndex = 2
+ '
+ 'Label14
+ '
+ Me.Label14.AutoSize = true
+ Me.Label14.Location = New System.Drawing.Point(342, 120)
+ Me.Label14.Name = "Label14"
+ Me.Label14.Size = New System.Drawing.Size(23, 13)
+ Me.Label14.TabIndex = 51
+ Me.Label14.Text = "C4:"
'
'Label7
'
@@ -541,7 +568,7 @@ Partial Class VectoVTPJobForm
Me.pnFanParameters.Location = New System.Drawing.Point(290, 36)
Me.pnFanParameters.Name = "pnFanParameters"
Me.pnFanParameters.Size = New System.Drawing.Size(218, 78)
- Me.pnFanParameters.TabIndex = 48
+ Me.pnFanParameters.TabIndex = 1
'
'Label11
'
@@ -584,7 +611,7 @@ Partial Class VectoVTPJobForm
Me.tbC1.Location = New System.Drawing.Point(81, 3)
Me.tbC1.Name = "tbC1"
Me.tbC1.Size = New System.Drawing.Size(86, 20)
- Me.tbC1.TabIndex = 40
+ Me.tbC1.TabIndex = 0
'
'Label3
'
@@ -600,14 +627,14 @@ Partial Class VectoVTPJobForm
Me.tbC3.Location = New System.Drawing.Point(81, 55)
Me.tbC3.Name = "tbC3"
Me.tbC3.Size = New System.Drawing.Size(86, 20)
- Me.tbC3.TabIndex = 44
+ Me.tbC3.TabIndex = 2
'
'tbC2
'
Me.tbC2.Location = New System.Drawing.Point(81, 29)
Me.tbC2.Name = "tbC2"
Me.tbC2.Size = New System.Drawing.Size(86, 20)
- Me.tbC2.TabIndex = 42
+ Me.tbC2.TabIndex = 1
'
'Label4
'
@@ -647,7 +674,7 @@ Partial Class VectoVTPJobForm
Me.pnManufacturerRecord.Location = New System.Drawing.Point(11, 112)
Me.pnManufacturerRecord.Name = "pnManufacturerRecord"
Me.pnManufacturerRecord.Size = New System.Drawing.Size(525, 66)
- Me.pnManufacturerRecord.TabIndex = 41
+ Me.pnManufacturerRecord.TabIndex = 1
'
'lblMileageUnit
'
@@ -665,7 +692,7 @@ Partial Class VectoVTPJobForm
Me.tbMileage.Location = New System.Drawing.Point(117, 40)
Me.tbMileage.Name = "tbMileage"
Me.tbMileage.Size = New System.Drawing.Size(76, 20)
- Me.tbMileage.TabIndex = 48
+ Me.tbMileage.TabIndex = 2
'
'lblMileage
'
@@ -692,7 +719,7 @@ Partial Class VectoVTPJobForm
Me.tbManufacturerRecord.Location = New System.Drawing.Point(117, 8)
Me.tbManufacturerRecord.Name = "tbManufacturerRecord"
Me.tbManufacturerRecord.Size = New System.Drawing.Size(374, 20)
- Me.tbManufacturerRecord.TabIndex = 41
+ Me.tbManufacturerRecord.TabIndex = 0
'
'ButtonManR
'
@@ -701,35 +728,9 @@ Partial Class VectoVTPJobForm
Me.ButtonManR.Location = New System.Drawing.Point(492, 6)
Me.ButtonManR.Name = "ButtonManR"
Me.ButtonManR.Size = New System.Drawing.Size(24, 24)
- Me.ButtonManR.TabIndex = 42
- Me.ButtonManR.TabStop = false
+ Me.ButtonManR.TabIndex = 1
Me.ButtonManR.UseVisualStyleBackColor = true
'
- 'Label13
- '
- Me.Label13.AutoSize = true
- Me.Label13.Location = New System.Drawing.Point(463, 120)
- Me.Label13.Name = "Label13"
- Me.Label13.Size = New System.Drawing.Size(16, 13)
- Me.Label13.TabIndex = 53
- Me.Label13.Text = "[-]"
- '
- 'tbC4
- '
- Me.tbC4.Location = New System.Drawing.Point(371, 117)
- Me.tbC4.Name = "tbC4"
- Me.tbC4.Size = New System.Drawing.Size(86, 20)
- Me.tbC4.TabIndex = 52
- '
- 'Label14
- '
- Me.Label14.AutoSize = true
- Me.Label14.Location = New System.Drawing.Point(342, 120)
- Me.Label14.Name = "Label14"
- Me.Label14.Size = New System.Drawing.Size(23, 13)
- Me.Label14.TabIndex = 51
- Me.Label14.Text = "C4:"
- '
'VectoVTPJobForm
'
Me.AcceptButton = Me.ButOK
diff --git a/VECTO/GUI/VehicleAuxiliariesDialog.Designer.vb b/VECTO/GUI/VehicleAuxiliariesDialog.Designer.vb
index 5db90ec58a56da973e5f2d5decf6daa7203889ca..6568277f0c77319c9549e3d6a910d7a18d2c7c27 100644
--- a/VECTO/GUI/VehicleAuxiliariesDialog.Designer.vb
+++ b/VECTO/GUI/VehicleAuxiliariesDialog.Designer.vb
@@ -77,7 +77,7 @@ Partial Class VehicleAuxiliariesDialog
Me.OK_Button.Location = New System.Drawing.Point(3, 3)
Me.OK_Button.Name = "OK_Button"
Me.OK_Button.Size = New System.Drawing.Size(67, 23)
- Me.OK_Button.TabIndex = 0
+ Me.OK_Button.TabIndex = 5
Me.OK_Button.Text = "OK"
'
'Cancel_Button
@@ -87,7 +87,7 @@ Partial Class VehicleAuxiliariesDialog
Me.Cancel_Button.Location = New System.Drawing.Point(76, 3)
Me.Cancel_Button.Name = "Cancel_Button"
Me.Cancel_Button.Size = New System.Drawing.Size(67, 23)
- Me.Cancel_Button.TabIndex = 1
+ Me.Cancel_Button.TabIndex = 6
Me.Cancel_Button.Text = "Cancel"
'
'Label1
@@ -140,7 +140,7 @@ Partial Class VehicleAuxiliariesDialog
Me.CbTech.Location = New System.Drawing.Point(75, 6)
Me.CbTech.Name = "CbTech"
Me.CbTech.Size = New System.Drawing.Size(352, 21)
- Me.CbTech.TabIndex = 27
+ Me.CbTech.TabIndex = 1
'
'PnTech
'
@@ -191,7 +191,7 @@ Partial Class VehicleAuxiliariesDialog
Me.CbTech4.Location = New System.Drawing.Point(75, 87)
Me.CbTech4.Name = "CbTech4"
Me.CbTech4.Size = New System.Drawing.Size(352, 21)
- Me.CbTech4.TabIndex = 30
+ Me.CbTech4.TabIndex = 4
'
'CbTech3
'
@@ -200,7 +200,7 @@ Partial Class VehicleAuxiliariesDialog
Me.CbTech3.Location = New System.Drawing.Point(75, 60)
Me.CbTech3.Name = "CbTech3"
Me.CbTech3.Size = New System.Drawing.Size(352, 21)
- Me.CbTech3.TabIndex = 29
+ Me.CbTech3.TabIndex = 3
'
'CbTech2
'
@@ -209,7 +209,7 @@ Partial Class VehicleAuxiliariesDialog
Me.CbTech2.Location = New System.Drawing.Point(75, 33)
Me.CbTech2.Name = "CbTech2"
Me.CbTech2.Size = New System.Drawing.Size(352, 21)
- Me.CbTech2.TabIndex = 28
+ Me.CbTech2.TabIndex = 2
'
'VehicleAuxiliariesDialog
'
diff --git a/VECTO/GUI/VehicleAxleDialog.Designer.vb b/VECTO/GUI/VehicleAxleDialog.Designer.vb
index fccfd299c47df79b5bd4a178c574ad533e06a968..42d49d159769b2a24db553470f069a3205d699b7 100644
--- a/VECTO/GUI/VehicleAxleDialog.Designer.vb
+++ b/VECTO/GUI/VehicleAxleDialog.Designer.vb
@@ -35,291 +35,291 @@ Partial Class VehicleAxleDialog
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<DebuggerStepThrough()> _
Private Sub InitializeComponent()
- Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
- Me.OK_Button = New System.Windows.Forms.Button()
- Me.Cancel_Button = New System.Windows.Forms.Button()
- Me.Label1 = New System.Windows.Forms.Label()
- Me.TbAxleShare = New System.Windows.Forms.TextBox()
- Me.Label2 = New System.Windows.Forms.Label()
- Me.Label3 = New System.Windows.Forms.Label()
- Me.Label4 = New System.Windows.Forms.Label()
- Me.TbRRC = New System.Windows.Forms.TextBox()
- Me.Label5 = New System.Windows.Forms.Label()
- Me.Label6 = New System.Windows.Forms.Label()
- Me.TbFzISO = New System.Windows.Forms.TextBox()
- Me.Label9 = New System.Windows.Forms.Label()
- Me.Label10 = New System.Windows.Forms.Label()
- Me.CbTwinT = New System.Windows.Forms.CheckBox()
- Me.PnAxle = New System.Windows.Forms.Panel()
- Me.TbI_wheels = New System.Windows.Forms.TextBox()
- Me.Label7 = New System.Windows.Forms.Label()
- Me.Label32 = New System.Windows.Forms.Label()
- Me.Label8 = New System.Windows.Forms.Label()
- Me.CbWheels = New System.Windows.Forms.ComboBox()
- Me.cbAxleType = New System.Windows.Forms.ComboBox()
- Me.Label11 = New System.Windows.Forms.Label()
- Me.Label12 = New System.Windows.Forms.Label()
- Me.TableLayoutPanel1.SuspendLayout()
- Me.PnAxle.SuspendLayout()
- Me.SuspendLayout()
- '
- 'TableLayoutPanel1
- '
- Me.TableLayoutPanel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.TableLayoutPanel1.ColumnCount = 2
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
- Me.TableLayoutPanel1.Controls.Add(Me.OK_Button, 0, 0)
- Me.TableLayoutPanel1.Controls.Add(Me.Cancel_Button, 1, 0)
- Me.TableLayoutPanel1.Location = New System.Drawing.Point(309, 161)
- Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
- Me.TableLayoutPanel1.RowCount = 1
- Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
- Me.TableLayoutPanel1.Size = New System.Drawing.Size(146, 29)
- Me.TableLayoutPanel1.TabIndex = 4
- '
- 'OK_Button
- '
- Me.OK_Button.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.OK_Button.Location = New System.Drawing.Point(3, 3)
- Me.OK_Button.Name = "OK_Button"
- Me.OK_Button.Size = New System.Drawing.Size(67, 23)
- Me.OK_Button.TabIndex = 0
- Me.OK_Button.Text = "OK"
- '
- 'Cancel_Button
- '
- Me.Cancel_Button.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel
- Me.Cancel_Button.Location = New System.Drawing.Point(76, 3)
- Me.Cancel_Button.Name = "Cancel_Button"
- Me.Cancel_Button.Size = New System.Drawing.Size(67, 23)
- Me.Cancel_Button.TabIndex = 1
- Me.Cancel_Button.Text = "Cancel"
- '
- 'Label1
- '
- Me.Label1.AutoSize = True
- Me.Label1.Location = New System.Drawing.Point(3, 3)
- Me.Label1.Name = "Label1"
- Me.Label1.Size = New System.Drawing.Size(96, 13)
- Me.Label1.TabIndex = 1
- Me.Label1.Text = "Relative Axle Load"
- '
- 'TbAxleShare
- '
- Me.TbAxleShare.Location = New System.Drawing.Point(105, 0)
- Me.TbAxleShare.Name = "TbAxleShare"
- Me.TbAxleShare.Size = New System.Drawing.Size(84, 20)
- Me.TbAxleShare.TabIndex = 0
- '
- 'Label2
- '
- Me.Label2.AutoSize = True
- Me.Label2.Location = New System.Drawing.Point(195, 3)
- Me.Label2.Name = "Label2"
- Me.Label2.Size = New System.Drawing.Size(40, 13)
- Me.Label2.TabIndex = 1
- Me.Label2.Text = "[-][0..1]"
- '
- 'Label3
- '
- Me.Label3.AutoSize = True
- Me.Label3.Location = New System.Drawing.Point(55, 94)
- Me.Label3.Name = "Label3"
- Me.Label3.Size = New System.Drawing.Size(51, 13)
- Me.Label3.TabIndex = 1
- Me.Label3.Text = "RRC ISO"
- '
- 'Label4
- '
- Me.Label4.AutoSize = True
- Me.Label4.Location = New System.Drawing.Point(202, 66)
- Me.Label4.Name = "Label4"
- Me.Label4.Size = New System.Drawing.Size(16, 13)
- Me.Label4.TabIndex = 1
- Me.Label4.Text = "[-]"
- '
- 'TbRRC
- '
- Me.TbRRC.Location = New System.Drawing.Point(112, 91)
- Me.TbRRC.Name = "TbRRC"
- Me.TbRRC.Size = New System.Drawing.Size(84, 20)
- Me.TbRRC.TabIndex = 2
- '
- 'Label5
- '
- Me.Label5.AutoSize = True
- Me.Label5.Location = New System.Drawing.Point(67, 120)
- Me.Label5.Name = "Label5"
- Me.Label5.Size = New System.Drawing.Size(39, 13)
- Me.Label5.TabIndex = 1
- Me.Label5.Text = "Fz ISO"
- '
- 'Label6
- '
- Me.Label6.AutoSize = True
- Me.Label6.Location = New System.Drawing.Point(202, 120)
- Me.Label6.Name = "Label6"
- Me.Label6.Size = New System.Drawing.Size(21, 13)
- Me.Label6.TabIndex = 1
- Me.Label6.Text = "[N]"
- '
- 'TbFzISO
- '
- Me.TbFzISO.Location = New System.Drawing.Point(112, 117)
- Me.TbFzISO.Name = "TbFzISO"
- Me.TbFzISO.Size = New System.Drawing.Size(84, 20)
- Me.TbFzISO.TabIndex = 3
- '
- 'Label9
- '
- Me.Label9.AutoSize = True
- Me.Label9.Location = New System.Drawing.Point(248, 94)
- Me.Label9.Name = "Label9"
- Me.Label9.Size = New System.Drawing.Size(146, 13)
- Me.Label9.TabIndex = 1
- Me.Label9.Text = "RRC according to ISO 28580"
- '
- 'Label10
- '
- Me.Label10.AutoSize = True
- Me.Label10.Location = New System.Drawing.Point(248, 117)
- Me.Label10.Name = "Label10"
- Me.Label10.Size = New System.Drawing.Size(167, 26)
- Me.Label10.TabIndex = 1
- Me.Label10.Text = "Test load according to ISO 28580" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "(85% of max. tyre load capacity)"
- '
- 'CbTwinT
- '
- Me.CbTwinT.AutoSize = True
- Me.CbTwinT.Location = New System.Drawing.Point(285, 39)
- Me.CbTwinT.Name = "CbTwinT"
- Me.CbTwinT.Size = New System.Drawing.Size(78, 17)
- Me.CbTwinT.TabIndex = 1
- Me.CbTwinT.Text = "Twin Tyres"
- Me.CbTwinT.UseVisualStyleBackColor = True
- '
- 'PnAxle
- '
- Me.PnAxle.Controls.Add(Me.TbI_wheels)
- Me.PnAxle.Controls.Add(Me.Label1)
- Me.PnAxle.Controls.Add(Me.Label7)
- Me.PnAxle.Controls.Add(Me.Label2)
- Me.PnAxle.Controls.Add(Me.Label32)
- Me.PnAxle.Controls.Add(Me.TbAxleShare)
- Me.PnAxle.Location = New System.Drawing.Point(7, 65)
- Me.PnAxle.Name = "PnAxle"
- Me.PnAxle.Size = New System.Drawing.Size(450, 23)
- Me.PnAxle.TabIndex = 5
- '
- 'TbI_wheels
- '
- Me.TbI_wheels.Location = New System.Drawing.Point(322, 0)
- Me.TbI_wheels.Name = "TbI_wheels"
- Me.TbI_wheels.Size = New System.Drawing.Size(84, 20)
- Me.TbI_wheels.TabIndex = 26
- '
- 'Label7
- '
- Me.Label7.AutoSize = True
- Me.Label7.Location = New System.Drawing.Point(241, 3)
- Me.Label7.Name = "Label7"
- Me.Label7.Size = New System.Drawing.Size(75, 13)
- Me.Label7.TabIndex = 25
- Me.Label7.Text = "Wheels Inertia"
- '
- 'Label32
- '
- Me.Label32.AutoSize = True
- Me.Label32.Location = New System.Drawing.Point(412, 3)
- Me.Label32.Name = "Label32"
- Me.Label32.Size = New System.Drawing.Size(36, 13)
- Me.Label32.TabIndex = 27
- Me.Label32.Text = "[kgm²]"
- '
- 'Label8
- '
- Me.Label8.AutoSize = True
- Me.Label8.Location = New System.Drawing.Point(4, 13)
- Me.Label8.Name = "Label8"
- Me.Label8.Size = New System.Drawing.Size(80, 13)
- Me.Label8.TabIndex = 6
- Me.Label8.Text = "Tyre Dimension"
- '
- 'CbWheels
- '
- Me.CbWheels.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
- Me.CbWheels.FormattingEnabled = True
- Me.CbWheels.Location = New System.Drawing.Point(90, 10)
- Me.CbWheels.Name = "CbWheels"
- Me.CbWheels.Size = New System.Drawing.Size(176, 21)
- Me.CbWheels.TabIndex = 7
- '
- 'cbAxleType
- '
- Me.cbAxleType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
- Me.cbAxleType.FormattingEnabled = True
- Me.cbAxleType.Location = New System.Drawing.Point(90, 37)
- Me.cbAxleType.Name = "cbAxleType"
- Me.cbAxleType.Size = New System.Drawing.Size(176, 21)
- Me.cbAxleType.TabIndex = 8
- '
- 'Label11
- '
- Me.Label11.AutoSize = True
- Me.Label11.Location = New System.Drawing.Point(4, 40)
- Me.Label11.Name = "Label11"
- Me.Label11.Size = New System.Drawing.Size(69, 13)
- Me.Label11.TabIndex = 9
- Me.Label11.Text = "Configuration"
- '
- 'Label12
- '
- Me.Label12.AutoSize = True
- Me.Label12.Location = New System.Drawing.Point(202, 94)
- Me.Label12.Name = "Label12"
- Me.Label12.Size = New System.Drawing.Size(16, 13)
- Me.Label12.TabIndex = 10
- Me.Label12.Text = "[-]"
- '
- 'VehicleAxleDialog
- '
- Me.AcceptButton = Me.OK_Button
- Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
- Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
- Me.CancelButton = Me.Cancel_Button
- Me.ClientSize = New System.Drawing.Size(467, 202)
- Me.Controls.Add(Me.Label12)
- Me.Controls.Add(Me.Label11)
- Me.Controls.Add(Me.cbAxleType)
- Me.Controls.Add(Me.CbWheels)
- Me.Controls.Add(Me.Label8)
- Me.Controls.Add(Me.PnAxle)
- Me.Controls.Add(Me.CbTwinT)
- Me.Controls.Add(Me.TbFzISO)
- Me.Controls.Add(Me.Label6)
- Me.Controls.Add(Me.TbRRC)
- Me.Controls.Add(Me.Label4)
- Me.Controls.Add(Me.Label10)
- Me.Controls.Add(Me.Label5)
- Me.Controls.Add(Me.Label9)
- Me.Controls.Add(Me.Label3)
- Me.Controls.Add(Me.TableLayoutPanel1)
- Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow
- Me.MaximizeBox = False
- Me.MinimizeBox = False
- Me.Name = "VehicleAxleDialog"
- Me.ShowInTaskbar = False
- Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
- Me.Text = "Axle configuration"
- Me.TableLayoutPanel1.ResumeLayout(False)
- Me.PnAxle.ResumeLayout(False)
- Me.PnAxle.PerformLayout()
- Me.ResumeLayout(False)
- Me.PerformLayout()
+ Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
+ Me.OK_Button = New System.Windows.Forms.Button()
+ Me.Cancel_Button = New System.Windows.Forms.Button()
+ Me.Label1 = New System.Windows.Forms.Label()
+ Me.TbAxleShare = New System.Windows.Forms.TextBox()
+ Me.Label2 = New System.Windows.Forms.Label()
+ Me.Label3 = New System.Windows.Forms.Label()
+ Me.Label4 = New System.Windows.Forms.Label()
+ Me.TbRRC = New System.Windows.Forms.TextBox()
+ Me.Label5 = New System.Windows.Forms.Label()
+ Me.Label6 = New System.Windows.Forms.Label()
+ Me.TbFzISO = New System.Windows.Forms.TextBox()
+ Me.Label9 = New System.Windows.Forms.Label()
+ Me.Label10 = New System.Windows.Forms.Label()
+ Me.CbTwinT = New System.Windows.Forms.CheckBox()
+ Me.PnAxle = New System.Windows.Forms.Panel()
+ Me.TbI_wheels = New System.Windows.Forms.TextBox()
+ Me.Label7 = New System.Windows.Forms.Label()
+ Me.Label32 = New System.Windows.Forms.Label()
+ Me.Label8 = New System.Windows.Forms.Label()
+ Me.CbWheels = New System.Windows.Forms.ComboBox()
+ Me.cbAxleType = New System.Windows.Forms.ComboBox()
+ Me.Label11 = New System.Windows.Forms.Label()
+ Me.Label12 = New System.Windows.Forms.Label()
+ Me.TableLayoutPanel1.SuspendLayout
+ Me.PnAxle.SuspendLayout
+ Me.SuspendLayout
+ '
+ 'TableLayoutPanel1
+ '
+ Me.TableLayoutPanel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.TableLayoutPanel1.ColumnCount = 2
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50!))
+ Me.TableLayoutPanel1.Controls.Add(Me.OK_Button, 0, 0)
+ Me.TableLayoutPanel1.Controls.Add(Me.Cancel_Button, 1, 0)
+ Me.TableLayoutPanel1.Location = New System.Drawing.Point(309, 161)
+ Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
+ Me.TableLayoutPanel1.RowCount = 1
+ Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50!))
+ Me.TableLayoutPanel1.Size = New System.Drawing.Size(146, 29)
+ Me.TableLayoutPanel1.TabIndex = 6
+ '
+ 'OK_Button
+ '
+ Me.OK_Button.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.OK_Button.Location = New System.Drawing.Point(3, 3)
+ Me.OK_Button.Name = "OK_Button"
+ Me.OK_Button.Size = New System.Drawing.Size(67, 23)
+ Me.OK_Button.TabIndex = 6
+ Me.OK_Button.Text = "OK"
+ '
+ 'Cancel_Button
+ '
+ Me.Cancel_Button.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel
+ Me.Cancel_Button.Location = New System.Drawing.Point(76, 3)
+ Me.Cancel_Button.Name = "Cancel_Button"
+ Me.Cancel_Button.Size = New System.Drawing.Size(67, 23)
+ Me.Cancel_Button.TabIndex = 7
+ Me.Cancel_Button.Text = "Cancel"
+ '
+ 'Label1
+ '
+ Me.Label1.AutoSize = true
+ Me.Label1.Location = New System.Drawing.Point(3, 3)
+ Me.Label1.Name = "Label1"
+ Me.Label1.Size = New System.Drawing.Size(96, 13)
+ Me.Label1.TabIndex = 1
+ Me.Label1.Text = "Relative Axle Load"
+ '
+ 'TbAxleShare
+ '
+ Me.TbAxleShare.Location = New System.Drawing.Point(105, 0)
+ Me.TbAxleShare.Name = "TbAxleShare"
+ Me.TbAxleShare.Size = New System.Drawing.Size(84, 20)
+ Me.TbAxleShare.TabIndex = 0
+ '
+ 'Label2
+ '
+ Me.Label2.AutoSize = true
+ Me.Label2.Location = New System.Drawing.Point(195, 3)
+ Me.Label2.Name = "Label2"
+ Me.Label2.Size = New System.Drawing.Size(40, 13)
+ Me.Label2.TabIndex = 1
+ Me.Label2.Text = "[-][0..1]"
+ '
+ 'Label3
+ '
+ Me.Label3.AutoSize = true
+ Me.Label3.Location = New System.Drawing.Point(55, 94)
+ Me.Label3.Name = "Label3"
+ Me.Label3.Size = New System.Drawing.Size(51, 13)
+ Me.Label3.TabIndex = 1
+ Me.Label3.Text = "RRC ISO"
+ '
+ 'Label4
+ '
+ Me.Label4.AutoSize = true
+ Me.Label4.Location = New System.Drawing.Point(202, 66)
+ Me.Label4.Name = "Label4"
+ Me.Label4.Size = New System.Drawing.Size(16, 13)
+ Me.Label4.TabIndex = 1
+ Me.Label4.Text = "[-]"
+ '
+ 'TbRRC
+ '
+ Me.TbRRC.Location = New System.Drawing.Point(112, 91)
+ Me.TbRRC.Name = "TbRRC"
+ Me.TbRRC.Size = New System.Drawing.Size(84, 20)
+ Me.TbRRC.TabIndex = 4
+ '
+ 'Label5
+ '
+ Me.Label5.AutoSize = true
+ Me.Label5.Location = New System.Drawing.Point(67, 120)
+ Me.Label5.Name = "Label5"
+ Me.Label5.Size = New System.Drawing.Size(39, 13)
+ Me.Label5.TabIndex = 1
+ Me.Label5.Text = "Fz ISO"
+ '
+ 'Label6
+ '
+ Me.Label6.AutoSize = true
+ Me.Label6.Location = New System.Drawing.Point(202, 120)
+ Me.Label6.Name = "Label6"
+ Me.Label6.Size = New System.Drawing.Size(21, 13)
+ Me.Label6.TabIndex = 1
+ Me.Label6.Text = "[N]"
+ '
+ 'TbFzISO
+ '
+ Me.TbFzISO.Location = New System.Drawing.Point(112, 117)
+ Me.TbFzISO.Name = "TbFzISO"
+ Me.TbFzISO.Size = New System.Drawing.Size(84, 20)
+ Me.TbFzISO.TabIndex = 5
+ '
+ 'Label9
+ '
+ Me.Label9.AutoSize = true
+ Me.Label9.Location = New System.Drawing.Point(248, 94)
+ Me.Label9.Name = "Label9"
+ Me.Label9.Size = New System.Drawing.Size(146, 13)
+ Me.Label9.TabIndex = 1
+ Me.Label9.Text = "RRC according to ISO 28580"
+ '
+ 'Label10
+ '
+ Me.Label10.AutoSize = true
+ Me.Label10.Location = New System.Drawing.Point(248, 117)
+ Me.Label10.Name = "Label10"
+ Me.Label10.Size = New System.Drawing.Size(167, 26)
+ Me.Label10.TabIndex = 1
+ Me.Label10.Text = "Test load according to ISO 28580"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"(85% of max. tyre load capacity)"
+ '
+ 'CbTwinT
+ '
+ Me.CbTwinT.AutoSize = true
+ Me.CbTwinT.Location = New System.Drawing.Point(285, 39)
+ Me.CbTwinT.Name = "CbTwinT"
+ Me.CbTwinT.Size = New System.Drawing.Size(78, 17)
+ Me.CbTwinT.TabIndex = 2
+ Me.CbTwinT.Text = "Twin Tyres"
+ Me.CbTwinT.UseVisualStyleBackColor = true
+ '
+ 'PnAxle
+ '
+ Me.PnAxle.Controls.Add(Me.TbI_wheels)
+ Me.PnAxle.Controls.Add(Me.Label1)
+ Me.PnAxle.Controls.Add(Me.Label7)
+ Me.PnAxle.Controls.Add(Me.Label2)
+ Me.PnAxle.Controls.Add(Me.Label32)
+ Me.PnAxle.Controls.Add(Me.TbAxleShare)
+ Me.PnAxle.Location = New System.Drawing.Point(7, 65)
+ Me.PnAxle.Name = "PnAxle"
+ Me.PnAxle.Size = New System.Drawing.Size(450, 23)
+ Me.PnAxle.TabIndex = 3
+ '
+ 'TbI_wheels
+ '
+ Me.TbI_wheels.Location = New System.Drawing.Point(322, 0)
+ Me.TbI_wheels.Name = "TbI_wheels"
+ Me.TbI_wheels.Size = New System.Drawing.Size(84, 20)
+ Me.TbI_wheels.TabIndex = 1
+ '
+ 'Label7
+ '
+ Me.Label7.AutoSize = true
+ Me.Label7.Location = New System.Drawing.Point(241, 3)
+ Me.Label7.Name = "Label7"
+ Me.Label7.Size = New System.Drawing.Size(75, 13)
+ Me.Label7.TabIndex = 25
+ Me.Label7.Text = "Wheels Inertia"
+ '
+ 'Label32
+ '
+ Me.Label32.AutoSize = true
+ Me.Label32.Location = New System.Drawing.Point(412, 3)
+ Me.Label32.Name = "Label32"
+ Me.Label32.Size = New System.Drawing.Size(36, 13)
+ Me.Label32.TabIndex = 27
+ Me.Label32.Text = "[kgm²]"
+ '
+ 'Label8
+ '
+ Me.Label8.AutoSize = true
+ Me.Label8.Location = New System.Drawing.Point(4, 13)
+ Me.Label8.Name = "Label8"
+ Me.Label8.Size = New System.Drawing.Size(80, 13)
+ Me.Label8.TabIndex = 6
+ Me.Label8.Text = "Tyre Dimension"
+ '
+ 'CbWheels
+ '
+ Me.CbWheels.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+ Me.CbWheels.FormattingEnabled = true
+ Me.CbWheels.Location = New System.Drawing.Point(90, 10)
+ Me.CbWheels.Name = "CbWheels"
+ Me.CbWheels.Size = New System.Drawing.Size(176, 21)
+ Me.CbWheels.TabIndex = 0
+ '
+ 'cbAxleType
+ '
+ Me.cbAxleType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+ Me.cbAxleType.FormattingEnabled = true
+ Me.cbAxleType.Location = New System.Drawing.Point(90, 37)
+ Me.cbAxleType.Name = "cbAxleType"
+ Me.cbAxleType.Size = New System.Drawing.Size(176, 21)
+ Me.cbAxleType.TabIndex = 1
+ '
+ 'Label11
+ '
+ Me.Label11.AutoSize = true
+ Me.Label11.Location = New System.Drawing.Point(4, 40)
+ Me.Label11.Name = "Label11"
+ Me.Label11.Size = New System.Drawing.Size(69, 13)
+ Me.Label11.TabIndex = 9
+ Me.Label11.Text = "Configuration"
+ '
+ 'Label12
+ '
+ Me.Label12.AutoSize = true
+ Me.Label12.Location = New System.Drawing.Point(202, 94)
+ Me.Label12.Name = "Label12"
+ Me.Label12.Size = New System.Drawing.Size(16, 13)
+ Me.Label12.TabIndex = 10
+ Me.Label12.Text = "[-]"
+ '
+ 'VehicleAxleDialog
+ '
+ Me.AcceptButton = Me.OK_Button
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
+ Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+ Me.CancelButton = Me.Cancel_Button
+ Me.ClientSize = New System.Drawing.Size(467, 202)
+ Me.Controls.Add(Me.Label12)
+ Me.Controls.Add(Me.Label11)
+ Me.Controls.Add(Me.cbAxleType)
+ Me.Controls.Add(Me.CbWheels)
+ Me.Controls.Add(Me.Label8)
+ Me.Controls.Add(Me.PnAxle)
+ Me.Controls.Add(Me.CbTwinT)
+ Me.Controls.Add(Me.TbFzISO)
+ Me.Controls.Add(Me.Label6)
+ Me.Controls.Add(Me.TbRRC)
+ Me.Controls.Add(Me.Label4)
+ Me.Controls.Add(Me.Label10)
+ Me.Controls.Add(Me.Label5)
+ Me.Controls.Add(Me.Label9)
+ Me.Controls.Add(Me.Label3)
+ Me.Controls.Add(Me.TableLayoutPanel1)
+ Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow
+ Me.MaximizeBox = false
+ Me.MinimizeBox = false
+ Me.Name = "VehicleAxleDialog"
+ Me.ShowInTaskbar = false
+ Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+ Me.Text = "Axle configuration"
+ Me.TableLayoutPanel1.ResumeLayout(false)
+ Me.PnAxle.ResumeLayout(false)
+ Me.PnAxle.PerformLayout
+ Me.ResumeLayout(false)
+ Me.PerformLayout
- End Sub
+End Sub
Friend WithEvents TableLayoutPanel1 As TableLayoutPanel
Friend WithEvents OK_Button As Button
Friend WithEvents Cancel_Button As Button
diff --git a/VECTO/GUI/VehicleForm.Designer.vb b/VECTO/GUI/VehicleForm.Designer.vb
index 958e40bb6ee1a86ec3a742613c16eadf37a73f0d..5d94cf6ae1a7ad210b86d50df57e2d2283c84a09 100644
--- a/VECTO/GUI/VehicleForm.Designer.vb
+++ b/VECTO/GUI/VehicleForm.Designer.vb
@@ -320,7 +320,7 @@ Partial Class VehicleForm
Me.ButOK.Location = New System.Drawing.Point(498, 577)
Me.ButOK.Name = "ButOK"
Me.ButOK.Size = New System.Drawing.Size(75, 23)
- Me.ButOK.TabIndex = 5
+ Me.ButOK.TabIndex = 6
Me.ButOK.Text = "Save"
Me.ButOK.UseVisualStyleBackColor = true
'
@@ -331,7 +331,7 @@ Partial Class VehicleForm
Me.ButCancel.Location = New System.Drawing.Point(579, 577)
Me.ButCancel.Name = "ButCancel"
Me.ButCancel.Size = New System.Drawing.Size(75, 23)
- Me.ButCancel.TabIndex = 6
+ Me.ButCancel.TabIndex = 7
Me.ButCancel.Text = "Cancel"
Me.ButCancel.UseVisualStyleBackColor = true
'
@@ -402,7 +402,7 @@ Partial Class VehicleForm
Me.GroupBox6.Location = New System.Drawing.Point(290, 84)
Me.GroupBox6.Name = "GroupBox6"
Me.GroupBox6.Size = New System.Drawing.Size(281, 96)
- Me.GroupBox6.TabIndex = 5
+ Me.GroupBox6.TabIndex = 3
Me.GroupBox6.TabStop = false
Me.GroupBox6.Text = "Cross Wind Correction"
'
@@ -415,7 +415,6 @@ Partial Class VehicleForm
Me.BtCdFileOpen.Name = "BtCdFileOpen"
Me.BtCdFileOpen.Size = New System.Drawing.Size(24, 24)
Me.BtCdFileOpen.TabIndex = 3
- Me.BtCdFileOpen.TabStop = false
Me.BtCdFileOpen.UseVisualStyleBackColor = true
'
'LbCdMode
@@ -516,7 +515,7 @@ Partial Class VehicleForm
Me.GroupBox7.Location = New System.Drawing.Point(6, 76)
Me.GroupBox7.Name = "GroupBox7"
Me.GroupBox7.Size = New System.Drawing.Size(279, 111)
- Me.GroupBox7.TabIndex = 3
+ Me.GroupBox7.TabIndex = 1
Me.GroupBox7.TabStop = false
Me.GroupBox7.Text = "Retarder Losses"
'
@@ -549,7 +548,7 @@ Partial Class VehicleForm
Me.BtRtBrowse.Location = New System.Drawing.Point(236, 39)
Me.BtRtBrowse.Name = "BtRtBrowse"
Me.BtRtBrowse.Size = New System.Drawing.Size(24, 24)
- Me.BtRtBrowse.TabIndex = 14
+ Me.BtRtBrowse.TabIndex = 2
Me.BtRtBrowse.UseVisualStyleBackColor = true
'
'TbRtPath
@@ -558,7 +557,7 @@ Partial Class VehicleForm
Me.TbRtPath.Location = New System.Drawing.Point(6, 41)
Me.TbRtPath.Name = "TbRtPath"
Me.TbRtPath.Size = New System.Drawing.Size(224, 20)
- Me.TbRtPath.TabIndex = 13
+ Me.TbRtPath.TabIndex = 1
'
'Label45
'
@@ -575,7 +574,7 @@ Partial Class VehicleForm
Me.LbRtRatio.Location = New System.Drawing.Point(4, 5)
Me.LbRtRatio.Name = "LbRtRatio"
Me.LbRtRatio.Size = New System.Drawing.Size(167, 17)
- Me.LbRtRatio.TabIndex = 5
+ Me.LbRtRatio.TabIndex = 1
Me.LbRtRatio.Text = "Ratio"
Me.LbRtRatio.TextAlign = System.Drawing.ContentAlignment.TopRight
'
@@ -631,7 +630,7 @@ Partial Class VehicleForm
Me.GroupBox8.Location = New System.Drawing.Point(6, 186)
Me.GroupBox8.Name = "GroupBox8"
Me.GroupBox8.Size = New System.Drawing.Size(564, 151)
- Me.GroupBox8.TabIndex = 2
+ Me.GroupBox8.TabIndex = 4
Me.GroupBox8.TabStop = false
Me.GroupBox8.Text = "Axles / Wheels"
'
@@ -727,7 +726,7 @@ Partial Class VehicleForm
Me.PnWheelDiam.Location = New System.Drawing.Point(3, 16)
Me.PnWheelDiam.Name = "PnWheelDiam"
Me.PnWheelDiam.Size = New System.Drawing.Size(272, 31)
- Me.PnWheelDiam.TabIndex = 5
+ Me.PnWheelDiam.TabIndex = 0
'
'CbAxleConfig
'
@@ -834,7 +833,7 @@ Partial Class VehicleForm
Me.GrAirRes.Location = New System.Drawing.Point(290, 6)
Me.GrAirRes.Name = "GrAirRes"
Me.GrAirRes.Size = New System.Drawing.Size(280, 72)
- Me.GrAirRes.TabIndex = 1
+ Me.GrAirRes.TabIndex = 2
Me.GrAirRes.TabStop = false
Me.GrAirRes.Text = "Air Resistance"
'
@@ -857,7 +856,7 @@ Partial Class VehicleForm
Me.tbVehicleHeight.Location = New System.Drawing.Point(119, 29)
Me.tbVehicleHeight.Name = "tbVehicleHeight"
Me.tbVehicleHeight.Size = New System.Drawing.Size(57, 20)
- Me.tbVehicleHeight.TabIndex = 25
+ Me.tbVehicleHeight.TabIndex = 1
'
'Label11
'
@@ -922,7 +921,7 @@ Partial Class VehicleForm
Me.GroupBox3.Location = New System.Drawing.Point(6, 130)
Me.GroupBox3.Name = "GroupBox3"
Me.GroupBox3.Size = New System.Drawing.Size(278, 50)
- Me.GroupBox3.TabIndex = 6
+ Me.GroupBox3.TabIndex = 1
Me.GroupBox3.TabStop = false
Me.GroupBox3.Text = "Dynamic Tyre Radius"
'
@@ -933,7 +932,7 @@ Partial Class VehicleForm
Me.GroupBox2.Location = New System.Drawing.Point(291, 76)
Me.GroupBox2.Name = "GroupBox2"
Me.GroupBox2.Size = New System.Drawing.Size(282, 111)
- Me.GroupBox2.TabIndex = 4
+ Me.GroupBox2.TabIndex = 3
Me.GroupBox2.TabStop = false
Me.GroupBox2.Text = "Angledrive"
'
@@ -948,7 +947,7 @@ Partial Class VehicleForm
Me.pnAngledriveFields.Location = New System.Drawing.Point(3, 42)
Me.pnAngledriveFields.Name = "pnAngledriveFields"
Me.pnAngledriveFields.Size = New System.Drawing.Size(272, 63)
- Me.pnAngledriveFields.TabIndex = 6
+ Me.pnAngledriveFields.TabIndex = 1
'
'Label4
'
@@ -984,7 +983,7 @@ Partial Class VehicleForm
Me.tbAngledriveRatio.Location = New System.Drawing.Point(188, 4)
Me.tbAngledriveRatio.Name = "tbAngledriveRatio"
Me.tbAngledriveRatio.Size = New System.Drawing.Size(56, 20)
- Me.tbAngledriveRatio.TabIndex = 12
+ Me.tbAngledriveRatio.TabIndex = 0
'
'btAngledriveLossMapBrowse
'
@@ -993,7 +992,7 @@ Partial Class VehicleForm
Me.btAngledriveLossMapBrowse.Location = New System.Drawing.Point(245, 39)
Me.btAngledriveLossMapBrowse.Name = "btAngledriveLossMapBrowse"
Me.btAngledriveLossMapBrowse.Size = New System.Drawing.Size(24, 24)
- Me.btAngledriveLossMapBrowse.TabIndex = 14
+ Me.btAngledriveLossMapBrowse.TabIndex = 2
Me.btAngledriveLossMapBrowse.UseVisualStyleBackColor = true
'
'tbAngledriveLossMapPath
@@ -1002,7 +1001,7 @@ Partial Class VehicleForm
Me.tbAngledriveLossMapPath.Location = New System.Drawing.Point(6, 41)
Me.tbAngledriveLossMapPath.Name = "tbAngledriveLossMapPath"
Me.tbAngledriveLossMapPath.Size = New System.Drawing.Size(239, 20)
- Me.tbAngledriveLossMapPath.TabIndex = 13
+ Me.tbAngledriveLossMapPath.TabIndex = 1
'
'cbAngledriveType
'
@@ -1047,7 +1046,7 @@ Partial Class VehicleForm
Me.tbPTOCycle.Location = New System.Drawing.Point(6, 71)
Me.tbPTOCycle.Name = "tbPTOCycle"
Me.tbPTOCycle.Size = New System.Drawing.Size(239, 20)
- Me.tbPTOCycle.TabIndex = 16
+ Me.tbPTOCycle.TabIndex = 2
Me.ToolTip1.SetToolTip(Me.tbPTOCycle, "PTO Consumer Loss Map")
'
'tbPTOLossMap
@@ -1055,7 +1054,7 @@ Partial Class VehicleForm
Me.tbPTOLossMap.Location = New System.Drawing.Point(6, 24)
Me.tbPTOLossMap.Name = "tbPTOLossMap"
Me.tbPTOLossMap.Size = New System.Drawing.Size(239, 20)
- Me.tbPTOLossMap.TabIndex = 13
+ Me.tbPTOLossMap.TabIndex = 0
Me.ToolTip1.SetToolTip(Me.tbPTOLossMap, "PTO Consumer Loss Map")
'
'tbPTODrive
@@ -1063,7 +1062,7 @@ Partial Class VehicleForm
Me.tbPTODrive.Location = New System.Drawing.Point(6, 183)
Me.tbPTODrive.Name = "tbPTODrive"
Me.tbPTODrive.Size = New System.Drawing.Size(239, 20)
- Me.tbPTODrive.TabIndex = 19
+ Me.tbPTODrive.TabIndex = 5
Me.ToolTip1.SetToolTip(Me.tbPTODrive, "PTO Consumer Loss Map")
'
'tcVehicleComponents
@@ -1078,7 +1077,7 @@ Partial Class VehicleForm
Me.tcVehicleComponents.Name = "tcVehicleComponents"
Me.tcVehicleComponents.SelectedIndex = 0
Me.tcVehicleComponents.Size = New System.Drawing.Size(656, 400)
- Me.tcVehicleComponents.TabIndex = 40
+ Me.tcVehicleComponents.TabIndex = 5
'
'tpGeneral
'
@@ -1115,7 +1114,7 @@ Partial Class VehicleForm
Me.GroupBox4.Location = New System.Drawing.Point(6, 7)
Me.GroupBox4.Name = "GroupBox4"
Me.GroupBox4.Size = New System.Drawing.Size(279, 63)
- Me.GroupBox4.TabIndex = 6
+ Me.GroupBox4.TabIndex = 0
Me.GroupBox4.TabStop = false
Me.GroupBox4.Text = "Vehicle Idling Speed"
'
@@ -1162,7 +1161,7 @@ Partial Class VehicleForm
Me.GroupBox9.Location = New System.Drawing.Point(306, 7)
Me.GroupBox9.Name = "GroupBox9"
Me.GroupBox9.Size = New System.Drawing.Size(264, 63)
- Me.GroupBox9.TabIndex = 5
+ Me.GroupBox9.TabIndex = 2
Me.GroupBox9.TabStop = false
Me.GroupBox9.Text = "Tank System"
'
@@ -1208,7 +1207,7 @@ Partial Class VehicleForm
Me.gbBattery.Location = New System.Drawing.Point(6, 175)
Me.gbBattery.Name = "gbBattery"
Me.gbBattery.Size = New System.Drawing.Size(633, 187)
- Me.gbBattery.TabIndex = 27
+ Me.gbBattery.TabIndex = 2
Me.gbBattery.TabStop = false
Me.gbBattery.Text = "Electric Energy Storage system"
'
@@ -1250,7 +1249,7 @@ Partial Class VehicleForm
Me.btnAddReessPack.Location = New System.Drawing.Point(6, 153)
Me.btnAddReessPack.Name = "btnAddReessPack"
Me.btnAddReessPack.Size = New System.Drawing.Size(24, 24)
- Me.btnAddReessPack.TabIndex = 28
+ Me.btnAddReessPack.TabIndex = 1
Me.btnAddReessPack.UseVisualStyleBackColor = true
'
'lblEditReessPack
@@ -1268,7 +1267,7 @@ Partial Class VehicleForm
Me.btnRemoveReessPack.Location = New System.Drawing.Point(33, 153)
Me.btnRemoveReessPack.Name = "btnRemoveReessPack"
Me.btnRemoveReessPack.Size = New System.Drawing.Size(24, 24)
- Me.btnRemoveReessPack.TabIndex = 29
+ Me.btnRemoveReessPack.TabIndex = 2
Me.btnRemoveReessPack.UseVisualStyleBackColor = true
'
'lblInitialSoCUnit
@@ -1285,7 +1284,7 @@ Partial Class VehicleForm
Me.tbInitialSoC.Location = New System.Drawing.Point(204, 19)
Me.tbInitialSoC.Name = "tbInitialSoC"
Me.tbInitialSoC.Size = New System.Drawing.Size(59, 20)
- Me.tbInitialSoC.TabIndex = 26
+ Me.tbInitialSoC.TabIndex = 0
'
'lblInitialSoC
'
@@ -1326,7 +1325,7 @@ Partial Class VehicleForm
Me.gbRatiosPerGear.Location = New System.Drawing.Point(444, 12)
Me.gbRatiosPerGear.Name = "gbRatiosPerGear"
Me.gbRatiosPerGear.Size = New System.Drawing.Size(181, 145)
- Me.gbRatiosPerGear.TabIndex = 29
+ Me.gbRatiosPerGear.TabIndex = 1
Me.gbRatiosPerGear.TabStop = false
Me.gbRatiosPerGear.Text = "Transmission Ratio per Gear"
'
@@ -1391,7 +1390,7 @@ Partial Class VehicleForm
Me.btnEmADCLossMap.Location = New System.Drawing.Point(414, 127)
Me.btnEmADCLossMap.Name = "btnEmADCLossMap"
Me.btnEmADCLossMap.Size = New System.Drawing.Size(24, 24)
- Me.btnEmADCLossMap.TabIndex = 28
+ Me.btnEmADCLossMap.TabIndex = 5
Me.btnEmADCLossMap.UseVisualStyleBackColor = true
'
'tbEmADCLossMap
@@ -1399,7 +1398,7 @@ Partial Class VehicleForm
Me.tbEmADCLossMap.Location = New System.Drawing.Point(204, 131)
Me.tbEmADCLossMap.Name = "tbEmADCLossMap"
Me.tbEmADCLossMap.Size = New System.Drawing.Size(202, 20)
- Me.tbEmADCLossMap.TabIndex = 26
+ Me.tbEmADCLossMap.TabIndex = 4
'
'lblEmADCLossmap
'
@@ -1415,7 +1414,7 @@ Partial Class VehicleForm
Me.tbRatioEm.Location = New System.Drawing.Point(204, 105)
Me.tbRatioEm.Name = "tbRatioEm"
Me.tbRatioEm.Size = New System.Drawing.Size(59, 20)
- Me.tbRatioEm.TabIndex = 24
+ Me.tbRatioEm.TabIndex = 3
'
'lblRatioEm
'
@@ -1431,7 +1430,7 @@ Partial Class VehicleForm
Me.tbEmCount.Location = New System.Drawing.Point(204, 79)
Me.tbEmCount.Name = "tbEmCount"
Me.tbEmCount.Size = New System.Drawing.Size(59, 20)
- Me.tbEmCount.TabIndex = 22
+ Me.tbEmCount.TabIndex = 2
'
'cbEmPos
'
@@ -1439,7 +1438,7 @@ Partial Class VehicleForm
Me.cbEmPos.Location = New System.Drawing.Point(142, 52)
Me.cbEmPos.Name = "cbEmPos"
Me.cbEmPos.Size = New System.Drawing.Size(121, 21)
- Me.cbEmPos.TabIndex = 21
+ Me.cbEmPos.TabIndex = 1
'
'lblEmCount
'
@@ -1467,7 +1466,7 @@ Partial Class VehicleForm
Me.pnElectricMotor.Location = New System.Drawing.Point(6, 19)
Me.pnElectricMotor.Name = "pnElectricMotor"
Me.pnElectricMotor.Size = New System.Drawing.Size(432, 27)
- Me.pnElectricMotor.TabIndex = 18
+ Me.pnElectricMotor.TabIndex = 0
'
'btnOpenElectricMotor
'
@@ -1475,7 +1474,6 @@ Partial Class VehicleForm
Me.btnOpenElectricMotor.Name = "btnOpenElectricMotor"
Me.btnOpenElectricMotor.Size = New System.Drawing.Size(94, 21)
Me.btnOpenElectricMotor.TabIndex = 0
- Me.btnOpenElectricMotor.TabStop = false
Me.btnOpenElectricMotor.Text = "Electric Motor"
Me.btnOpenElectricMotor.UseVisualStyleBackColor = true
'
@@ -1487,7 +1485,6 @@ Partial Class VehicleForm
Me.btnBrowseElectricMotor.Name = "btnBrowseElectricMotor"
Me.btnBrowseElectricMotor.Size = New System.Drawing.Size(24, 24)
Me.btnBrowseElectricMotor.TabIndex = 2
- Me.btnBrowseElectricMotor.TabStop = false
Me.btnBrowseElectricMotor.UseVisualStyleBackColor = true
'
'tbElectricMotor
@@ -1506,7 +1503,7 @@ Partial Class VehicleForm
Me.tpTorqueLimits.Controls.Add(Me.bgVehicleTorqueLimits)
Me.tpTorqueLimits.Location = New System.Drawing.Point(4, 22)
Me.tpTorqueLimits.Name = "tpTorqueLimits"
- Me.tpTorqueLimits.Size = New System.Drawing.Size(648, 655)
+ Me.tpTorqueLimits.Size = New System.Drawing.Size(648, 374)
Me.tpTorqueLimits.TabIndex = 2
Me.tpTorqueLimits.Text = "Torque Limits"
Me.tpTorqueLimits.UseVisualStyleBackColor = true
@@ -1518,7 +1515,7 @@ Partial Class VehicleForm
Me.gbPropulsionTorque.Location = New System.Drawing.Point(3, 236)
Me.gbPropulsionTorque.Name = "gbPropulsionTorque"
Me.gbPropulsionTorque.Size = New System.Drawing.Size(407, 52)
- Me.gbPropulsionTorque.TabIndex = 17
+ Me.gbPropulsionTorque.TabIndex = 2
Me.gbPropulsionTorque.TabStop = false
Me.gbPropulsionTorque.Text = "Propulsion Torque Limit"
'
@@ -1528,7 +1525,7 @@ Partial Class VehicleForm
Me.btnPropulsionTorqueLimit.Location = New System.Drawing.Point(331, 17)
Me.btnPropulsionTorqueLimit.Name = "btnPropulsionTorqueLimit"
Me.btnPropulsionTorqueLimit.Size = New System.Drawing.Size(24, 24)
- Me.btnPropulsionTorqueLimit.TabIndex = 16
+ Me.btnPropulsionTorqueLimit.TabIndex = 1
Me.btnPropulsionTorqueLimit.UseVisualStyleBackColor = true
'
'tbPropulsionTorqueLimit
@@ -1536,7 +1533,7 @@ Partial Class VehicleForm
Me.tbPropulsionTorqueLimit.Location = New System.Drawing.Point(6, 20)
Me.tbPropulsionTorqueLimit.Name = "tbPropulsionTorqueLimit"
Me.tbPropulsionTorqueLimit.Size = New System.Drawing.Size(319, 20)
- Me.tbPropulsionTorqueLimit.TabIndex = 15
+ Me.tbPropulsionTorqueLimit.TabIndex = 0
'
'gbEMTorqueLimits
'
@@ -1545,7 +1542,7 @@ Partial Class VehicleForm
Me.gbEMTorqueLimits.Location = New System.Drawing.Point(3, 178)
Me.gbEMTorqueLimits.Name = "gbEMTorqueLimits"
Me.gbEMTorqueLimits.Size = New System.Drawing.Size(407, 52)
- Me.gbEMTorqueLimits.TabIndex = 9
+ Me.gbEMTorqueLimits.TabIndex = 1
Me.gbEMTorqueLimits.TabStop = false
Me.gbEMTorqueLimits.Text = "Electric Machine Torque Limits"
'
@@ -1555,7 +1552,7 @@ Partial Class VehicleForm
Me.btnEmTorqueLimits.Location = New System.Drawing.Point(331, 17)
Me.btnEmTorqueLimits.Name = "btnEmTorqueLimits"
Me.btnEmTorqueLimits.Size = New System.Drawing.Size(24, 24)
- Me.btnEmTorqueLimits.TabIndex = 16
+ Me.btnEmTorqueLimits.TabIndex = 1
Me.btnEmTorqueLimits.UseVisualStyleBackColor = true
'
'tbEmTorqueLimits
@@ -1563,7 +1560,7 @@ Partial Class VehicleForm
Me.tbEmTorqueLimits.Location = New System.Drawing.Point(6, 20)
Me.tbEmTorqueLimits.Name = "tbEmTorqueLimits"
Me.tbEmTorqueLimits.Size = New System.Drawing.Size(319, 20)
- Me.tbEmTorqueLimits.TabIndex = 15
+ Me.tbEmTorqueLimits.TabIndex = 0
'
'bgVehicleTorqueLimits
'
@@ -1574,7 +1571,7 @@ Partial Class VehicleForm
Me.bgVehicleTorqueLimits.Location = New System.Drawing.Point(3, 9)
Me.bgVehicleTorqueLimits.Name = "bgVehicleTorqueLimits"
Me.bgVehicleTorqueLimits.Size = New System.Drawing.Size(407, 163)
- Me.bgVehicleTorqueLimits.TabIndex = 8
+ Me.bgVehicleTorqueLimits.TabIndex = 0
Me.bgVehicleTorqueLimits.TabStop = false
Me.bgVehicleTorqueLimits.Text = "ICE Torque Limits"
'
@@ -1638,7 +1635,7 @@ Partial Class VehicleForm
Me.tpADAS.Location = New System.Drawing.Point(4, 22)
Me.tpADAS.Name = "tpADAS"
Me.tpADAS.Padding = New System.Windows.Forms.Padding(3)
- Me.tpADAS.Size = New System.Drawing.Size(648, 655)
+ Me.tpADAS.Size = New System.Drawing.Size(648, 374)
Me.tpADAS.TabIndex = 3
Me.tpADAS.Text = "ADAS"
Me.tpADAS.UseVisualStyleBackColor = true
@@ -1664,7 +1661,7 @@ Partial Class VehicleForm
Me.cbAtEcoRollReleaseLockupClutch.Location = New System.Drawing.Point(265, 19)
Me.cbAtEcoRollReleaseLockupClutch.Name = "cbAtEcoRollReleaseLockupClutch"
Me.cbAtEcoRollReleaseLockupClutch.Size = New System.Drawing.Size(243, 17)
- Me.cbAtEcoRollReleaseLockupClutch.TabIndex = 9
+ Me.cbAtEcoRollReleaseLockupClutch.TabIndex = 3
Me.cbAtEcoRollReleaseLockupClutch.Text = "AT Gearbox: Eco-Roll Release Lockup Clutch"
Me.cbAtEcoRollReleaseLockupClutch.UseVisualStyleBackColor = true
'
@@ -1674,7 +1671,7 @@ Partial Class VehicleForm
Me.cbPcc.Location = New System.Drawing.Point(18, 104)
Me.cbPcc.Name = "cbPcc"
Me.cbPcc.Size = New System.Drawing.Size(179, 21)
- Me.cbPcc.TabIndex = 8
+ Me.cbPcc.TabIndex = 2
'
'cbEcoRoll
'
@@ -1682,7 +1679,7 @@ Partial Class VehicleForm
Me.cbEcoRoll.Location = New System.Drawing.Point(18, 58)
Me.cbEcoRoll.Name = "cbEcoRoll"
Me.cbEcoRoll.Size = New System.Drawing.Size(179, 21)
- Me.cbEcoRoll.TabIndex = 7
+ Me.cbEcoRoll.TabIndex = 1
'
'Label22
'
@@ -1699,7 +1696,7 @@ Partial Class VehicleForm
Me.cbEngineStopStart.Location = New System.Drawing.Point(6, 19)
Me.cbEngineStopStart.Name = "cbEngineStopStart"
Me.cbEngineStopStart.Size = New System.Drawing.Size(203, 17)
- Me.cbEngineStopStart.TabIndex = 4
+ Me.cbEngineStopStart.TabIndex = 0
Me.cbEngineStopStart.Text = "Engine Stop/Start during vehicle stop"
Me.cbEngineStopStart.UseVisualStyleBackColor = true
'
@@ -1714,12 +1711,11 @@ Partial Class VehicleForm
'
'tpRoadSweeper
'
- Me.tpRoadSweeper.Controls.Add(Me.gbPTODrive)
Me.tpRoadSweeper.Controls.Add(Me.pnPTO)
Me.tpRoadSweeper.Controls.Add(Me.gbPTO)
Me.tpRoadSweeper.Location = New System.Drawing.Point(4, 22)
Me.tpRoadSweeper.Name = "tpRoadSweeper"
- Me.tpRoadSweeper.Size = New System.Drawing.Size(648, 655)
+ Me.tpRoadSweeper.Size = New System.Drawing.Size(648, 374)
Me.tpRoadSweeper.TabIndex = 4
Me.tpRoadSweeper.Text = "PTO"
Me.tpRoadSweeper.UseVisualStyleBackColor = true
@@ -1732,10 +1728,10 @@ Partial Class VehicleForm
Me.gbPTODrive.Controls.Add(Me.tbPtoEngineSpeed)
Me.gbPTODrive.Controls.Add(Me.Label25)
Me.gbPTODrive.Controls.Add(Me.Label24)
- Me.gbPTODrive.Location = New System.Drawing.Point(5, 172)
+ Me.gbPTODrive.Location = New System.Drawing.Point(3, 99)
Me.gbPTODrive.Name = "gbPTODrive"
- Me.gbPTODrive.Size = New System.Drawing.Size(566, 55)
- Me.gbPTODrive.TabIndex = 0
+ Me.gbPTODrive.Size = New System.Drawing.Size(556, 55)
+ Me.gbPTODrive.TabIndex = 4
Me.gbPTODrive.TabStop = false
Me.gbPTODrive.Text = "Working operation settings (PTO mode 2)"
'
@@ -1754,7 +1750,7 @@ Partial Class VehicleForm
Me.tbPtoGear.Location = New System.Drawing.Point(371, 21)
Me.tbPtoGear.Name = "tbPtoGear"
Me.tbPtoGear.Size = New System.Drawing.Size(70, 20)
- Me.tbPtoGear.TabIndex = 5
+ Me.tbPtoGear.TabIndex = 1
'
'Label26
'
@@ -1771,7 +1767,7 @@ Partial Class VehicleForm
Me.tbPtoEngineSpeed.Location = New System.Drawing.Point(120, 21)
Me.tbPtoEngineSpeed.Name = "tbPtoEngineSpeed"
Me.tbPtoEngineSpeed.Size = New System.Drawing.Size(70, 20)
- Me.tbPtoEngineSpeed.TabIndex = 2
+ Me.tbPtoEngineSpeed.TabIndex = 0
'
'Label25
'
@@ -1793,6 +1789,7 @@ Partial Class VehicleForm
'
'pnPTO
'
+ Me.pnPTO.Controls.Add(Me.gbPTODrive)
Me.pnPTO.Controls.Add(Me.btPTOCycleDrive)
Me.pnPTO.Controls.Add(Me.Label28)
Me.pnPTO.Controls.Add(Me.tbPTODrive)
@@ -1805,7 +1802,7 @@ Partial Class VehicleForm
Me.pnPTO.Location = New System.Drawing.Point(5, 73)
Me.pnPTO.Name = "pnPTO"
Me.pnPTO.Size = New System.Drawing.Size(566, 211)
- Me.pnPTO.TabIndex = 6
+ Me.pnPTO.TabIndex = 1
'
'btPTOCycleDrive
'
@@ -1813,7 +1810,7 @@ Partial Class VehicleForm
Me.btPTOCycleDrive.Location = New System.Drawing.Point(245, 181)
Me.btPTOCycleDrive.Name = "btPTOCycleDrive"
Me.btPTOCycleDrive.Size = New System.Drawing.Size(24, 24)
- Me.btPTOCycleDrive.TabIndex = 20
+ Me.btPTOCycleDrive.TabIndex = 6
Me.btPTOCycleDrive.UseVisualStyleBackColor = true
'
'Label28
@@ -1831,7 +1828,7 @@ Partial Class VehicleForm
Me.btPTOCycle.Location = New System.Drawing.Point(245, 69)
Me.btPTOCycle.Name = "btPTOCycle"
Me.btPTOCycle.Size = New System.Drawing.Size(24, 24)
- Me.btPTOCycle.TabIndex = 17
+ Me.btPTOCycle.TabIndex = 3
Me.btPTOCycle.UseVisualStyleBackColor = true
'
'Label16
@@ -1849,7 +1846,7 @@ Partial Class VehicleForm
Me.btPTOLossMapBrowse.Location = New System.Drawing.Point(245, 22)
Me.btPTOLossMapBrowse.Name = "btPTOLossMapBrowse"
Me.btPTOLossMapBrowse.Size = New System.Drawing.Size(24, 24)
- Me.btPTOLossMapBrowse.TabIndex = 14
+ Me.btPTOLossMapBrowse.TabIndex = 1
Me.btPTOLossMapBrowse.UseVisualStyleBackColor = true
'
'Label7
@@ -1867,7 +1864,7 @@ Partial Class VehicleForm
Me.gbPTO.Location = New System.Drawing.Point(5, 10)
Me.gbPTO.Name = "gbPTO"
Me.gbPTO.Size = New System.Drawing.Size(564, 57)
- Me.gbPTO.TabIndex = 5
+ Me.gbPTO.TabIndex = 0
Me.gbPTO.TabStop = false
Me.gbPTO.Text = "PTO Design Variant"
'
@@ -1878,7 +1875,7 @@ Partial Class VehicleForm
Me.cbLegislativeClass.Location = New System.Drawing.Point(220, 140)
Me.cbLegislativeClass.Name = "cbLegislativeClass"
Me.cbLegislativeClass.Size = New System.Drawing.Size(52, 21)
- Me.cbLegislativeClass.TabIndex = 41
+ Me.cbLegislativeClass.TabIndex = 4
'
'Label21
'
diff --git a/VECTO/GUI/VehicleTorqueLimitsDialog.Designer.vb b/VECTO/GUI/VehicleTorqueLimitsDialog.Designer.vb
index 0e5ba01347f6b845ce8e2ef681ce150fc6582078..4a788326d5f339080294b502ed6410fd694f55d7 100644
--- a/VECTO/GUI/VehicleTorqueLimitsDialog.Designer.vb
+++ b/VECTO/GUI/VehicleTorqueLimitsDialog.Designer.vb
@@ -35,117 +35,117 @@ Partial Class VehicleTorqueLimitDialog
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<DebuggerStepThrough()> _
Private Sub InitializeComponent()
- Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
- Me.OK_Button = New System.Windows.Forms.Button()
- Me.Cancel_Button = New System.Windows.Forms.Button()
- Me.Label3 = New System.Windows.Forms.Label()
- Me.tbGear = New System.Windows.Forms.TextBox()
- Me.Label5 = New System.Windows.Forms.Label()
- Me.Label6 = New System.Windows.Forms.Label()
- Me.tbMaxTorque = New System.Windows.Forms.TextBox()
- Me.TableLayoutPanel1.SuspendLayout
- Me.SuspendLayout
- '
- 'TableLayoutPanel1
- '
- Me.TableLayoutPanel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.TableLayoutPanel1.ColumnCount = 2
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50!))
- Me.TableLayoutPanel1.Controls.Add(Me.OK_Button, 0, 0)
- Me.TableLayoutPanel1.Controls.Add(Me.Cancel_Button, 1, 0)
- Me.TableLayoutPanel1.Location = New System.Drawing.Point(303, 44)
- Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
- Me.TableLayoutPanel1.RowCount = 1
- Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50!))
- Me.TableLayoutPanel1.Size = New System.Drawing.Size(146, 29)
- Me.TableLayoutPanel1.TabIndex = 4
- '
- 'OK_Button
- '
- Me.OK_Button.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.OK_Button.Location = New System.Drawing.Point(3, 3)
- Me.OK_Button.Name = "OK_Button"
- Me.OK_Button.Size = New System.Drawing.Size(67, 23)
- Me.OK_Button.TabIndex = 0
- Me.OK_Button.Text = "OK"
- '
- 'Cancel_Button
- '
- Me.Cancel_Button.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel
- Me.Cancel_Button.Location = New System.Drawing.Point(76, 3)
- Me.Cancel_Button.Name = "Cancel_Button"
- Me.Cancel_Button.Size = New System.Drawing.Size(67, 23)
- Me.Cancel_Button.TabIndex = 1
- Me.Cancel_Button.Text = "Cancel"
- '
- 'Label3
- '
- Me.Label3.AutoSize = true
- Me.Label3.Location = New System.Drawing.Point(13, 15)
- Me.Label3.Name = "Label3"
- Me.Label3.Size = New System.Drawing.Size(30, 13)
- Me.Label3.TabIndex = 1
- Me.Label3.Text = "Gear"
- '
- 'tbGear
- '
- Me.tbGear.Location = New System.Drawing.Point(70, 12)
- Me.tbGear.Name = "tbGear"
- Me.tbGear.Size = New System.Drawing.Size(41, 20)
- Me.tbGear.TabIndex = 2
- Me.tbGear.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
- '
- 'Label5
- '
- Me.Label5.AutoSize = True
- Me.Label5.Location = New System.Drawing.Point(171, 15)
- Me.Label5.Name = "Label5"
- Me.Label5.Size = New System.Drawing.Size(66, 13)
- Me.Label5.TabIndex = 1
- Me.Label5.Text = "max. Torque"
- '
- 'Label6
- '
- Me.Label6.AutoSize = True
- Me.Label6.Location = New System.Drawing.Point(331, 15)
- Me.Label6.Name = "Label6"
- Me.Label6.Size = New System.Drawing.Size(29, 13)
- Me.Label6.TabIndex = 1
- Me.Label6.Text = "[Nm]"
- '
- 'tbMaxTorque
- '
- Me.tbMaxTorque.Location = New System.Drawing.Point(241, 13)
- Me.tbMaxTorque.Name = "tbMaxTorque"
- Me.tbMaxTorque.Size = New System.Drawing.Size(84, 20)
- Me.tbMaxTorque.TabIndex = 3
- Me.tbMaxTorque.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
- '
- 'VehicleTorqueLimitDialog
- '
- Me.AcceptButton = Me.OK_Button
- Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
- Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
- Me.CancelButton = Me.Cancel_Button
- Me.ClientSize = New System.Drawing.Size(461, 85)
- Me.Controls.Add(Me.tbMaxTorque)
- Me.Controls.Add(Me.Label6)
- Me.Controls.Add(Me.tbGear)
- Me.Controls.Add(Me.Label5)
- Me.Controls.Add(Me.Label3)
- Me.Controls.Add(Me.TableLayoutPanel1)
- Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow
- Me.MaximizeBox = false
- Me.MinimizeBox = false
- Me.Name = "VehicleTorqueLimitDialog"
- Me.ShowInTaskbar = false
- Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
- Me.Text = "Torque Limits"
- Me.TableLayoutPanel1.ResumeLayout(false)
- Me.ResumeLayout(false)
- Me.PerformLayout
+ Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
+ Me.OK_Button = New System.Windows.Forms.Button()
+ Me.Cancel_Button = New System.Windows.Forms.Button()
+ Me.Label3 = New System.Windows.Forms.Label()
+ Me.tbGear = New System.Windows.Forms.TextBox()
+ Me.Label5 = New System.Windows.Forms.Label()
+ Me.Label6 = New System.Windows.Forms.Label()
+ Me.tbMaxTorque = New System.Windows.Forms.TextBox()
+ Me.TableLayoutPanel1.SuspendLayout
+ Me.SuspendLayout
+ '
+ 'TableLayoutPanel1
+ '
+ Me.TableLayoutPanel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.TableLayoutPanel1.ColumnCount = 2
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50!))
+ Me.TableLayoutPanel1.Controls.Add(Me.OK_Button, 0, 0)
+ Me.TableLayoutPanel1.Controls.Add(Me.Cancel_Button, 1, 0)
+ Me.TableLayoutPanel1.Location = New System.Drawing.Point(303, 44)
+ Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
+ Me.TableLayoutPanel1.RowCount = 1
+ Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50!))
+ Me.TableLayoutPanel1.Size = New System.Drawing.Size(146, 29)
+ Me.TableLayoutPanel1.TabIndex = 2
+ '
+ 'OK_Button
+ '
+ Me.OK_Button.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.OK_Button.Location = New System.Drawing.Point(3, 3)
+ Me.OK_Button.Name = "OK_Button"
+ Me.OK_Button.Size = New System.Drawing.Size(67, 23)
+ Me.OK_Button.TabIndex = 0
+ Me.OK_Button.Text = "OK"
+ '
+ 'Cancel_Button
+ '
+ Me.Cancel_Button.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel
+ Me.Cancel_Button.Location = New System.Drawing.Point(76, 3)
+ Me.Cancel_Button.Name = "Cancel_Button"
+ Me.Cancel_Button.Size = New System.Drawing.Size(67, 23)
+ Me.Cancel_Button.TabIndex = 1
+ Me.Cancel_Button.Text = "Cancel"
+ '
+ 'Label3
+ '
+ Me.Label3.AutoSize = true
+ Me.Label3.Location = New System.Drawing.Point(13, 15)
+ Me.Label3.Name = "Label3"
+ Me.Label3.Size = New System.Drawing.Size(30, 13)
+ Me.Label3.TabIndex = 1
+ Me.Label3.Text = "Gear"
+ '
+ 'tbGear
+ '
+ Me.tbGear.Location = New System.Drawing.Point(70, 12)
+ Me.tbGear.Name = "tbGear"
+ Me.tbGear.Size = New System.Drawing.Size(41, 20)
+ Me.tbGear.TabIndex = 0
+ Me.tbGear.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
+ '
+ 'Label5
+ '
+ Me.Label5.AutoSize = true
+ Me.Label5.Location = New System.Drawing.Point(171, 15)
+ Me.Label5.Name = "Label5"
+ Me.Label5.Size = New System.Drawing.Size(66, 13)
+ Me.Label5.TabIndex = 1
+ Me.Label5.Text = "max. Torque"
+ '
+ 'Label6
+ '
+ Me.Label6.AutoSize = true
+ Me.Label6.Location = New System.Drawing.Point(331, 15)
+ Me.Label6.Name = "Label6"
+ Me.Label6.Size = New System.Drawing.Size(29, 13)
+ Me.Label6.TabIndex = 1
+ Me.Label6.Text = "[Nm]"
+ '
+ 'tbMaxTorque
+ '
+ Me.tbMaxTorque.Location = New System.Drawing.Point(241, 13)
+ Me.tbMaxTorque.Name = "tbMaxTorque"
+ Me.tbMaxTorque.Size = New System.Drawing.Size(84, 20)
+ Me.tbMaxTorque.TabIndex = 1
+ Me.tbMaxTorque.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
+ '
+ 'VehicleTorqueLimitDialog
+ '
+ Me.AcceptButton = Me.OK_Button
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
+ Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+ Me.CancelButton = Me.Cancel_Button
+ Me.ClientSize = New System.Drawing.Size(461, 85)
+ Me.Controls.Add(Me.tbMaxTorque)
+ Me.Controls.Add(Me.Label6)
+ Me.Controls.Add(Me.tbGear)
+ Me.Controls.Add(Me.Label5)
+ Me.Controls.Add(Me.Label3)
+ Me.Controls.Add(Me.TableLayoutPanel1)
+ Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow
+ Me.MaximizeBox = false
+ Me.MinimizeBox = false
+ Me.Name = "VehicleTorqueLimitDialog"
+ Me.ShowInTaskbar = false
+ Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+ Me.Text = "Torque Limits"
+ Me.TableLayoutPanel1.ResumeLayout(false)
+ Me.ResumeLayout(false)
+ Me.PerformLayout
End Sub
Friend WithEvents TableLayoutPanel1 As TableLayoutPanel
diff --git a/VECTO/GUI/XMLExportJobDialog.Designer.vb b/VECTO/GUI/XMLExportJobDialog.Designer.vb
index 49e75db030f68deb02b84cd10affaa91fcd84085..fc21f135f3baf1060677caa68163cf13a239fdab 100644
--- a/VECTO/GUI/XMLExportJobDialog.Designer.vb
+++ b/VECTO/GUI/XMLExportJobDialog.Designer.vb
@@ -22,159 +22,158 @@ Partial Class XMLExportJobDialog
'Do not modify it using the code editor.
<System.Diagnostics.DebuggerStepThrough()> _
Private Sub InitializeComponent()
- Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(XMLExportJobDialog))
- Me.lbVendor = New System.Windows.Forms.Label()
- Me.tbVendor = New System.Windows.Forms.TextBox()
- Me.btnExport = New System.Windows.Forms.Button()
- Me.cbSingleFile = New System.Windows.Forms.CheckBox()
- Me.label1 = New System.Windows.Forms.Label()
- Me.tbJobfile = New System.Windows.Forms.TextBox()
- Me.tbMode = New System.Windows.Forms.TextBox()
- Me.lblJobfile = New System.Windows.Forms.Label()
- Me.lblDstDir = New System.Windows.Forms.Label()
- Me.tbDestination = New System.Windows.Forms.TextBox()
- Me.lblMode = New System.Windows.Forms.Label()
- Me.btnCancel = New System.Windows.Forms.Button()
- Me.BtTCfileBrowse = New System.Windows.Forms.Button()
- Me.SuspendLayout()
- '
- 'lbVendor
- '
- Me.lbVendor.AutoSize = True
- Me.lbVendor.Location = New System.Drawing.Point(10, 97)
- Me.lbVendor.Name = "lbVendor"
- Me.lbVendor.Size = New System.Drawing.Size(44, 13)
- Me.lbVendor.TabIndex = 25
- Me.lbVendor.Text = "Vendor:"
- '
- 'tbVendor
- '
- Me.tbVendor.Location = New System.Drawing.Point(131, 94)
- Me.tbVendor.Name = "tbVendor"
- Me.tbVendor.Size = New System.Drawing.Size(231, 20)
- Me.tbVendor.TabIndex = 24
- '
- 'btnExport
- '
- Me.btnExport.Location = New System.Drawing.Point(224, 150)
- Me.btnExport.Name = "btnExport"
- Me.btnExport.Size = New System.Drawing.Size(75, 23)
- Me.btnExport.TabIndex = 23
- Me.btnExport.Text = "Export"
- Me.btnExport.UseVisualStyleBackColor = True
- '
- 'cbSingleFile
- '
- Me.cbSingleFile.AutoSize = True
- Me.cbSingleFile.Location = New System.Drawing.Point(132, 121)
- Me.cbSingleFile.Name = "cbSingleFile"
- Me.cbSingleFile.Size = New System.Drawing.Size(15, 14)
- Me.cbSingleFile.TabIndex = 22
- Me.cbSingleFile.UseVisualStyleBackColor = True
- '
- 'label1
- '
- Me.label1.AutoSize = True
- Me.label1.Location = New System.Drawing.Point(10, 121)
- Me.label1.Name = "label1"
- Me.label1.Size = New System.Drawing.Size(116, 13)
- Me.label1.TabIndex = 21
- Me.label1.Text = "Output single XML File:"
- '
- 'tbJobfile
- '
- Me.tbJobfile.Location = New System.Drawing.Point(131, 20)
- Me.tbJobfile.Name = "tbJobfile"
- Me.tbJobfile.ReadOnly = True
- Me.tbJobfile.Size = New System.Drawing.Size(231, 20)
- Me.tbJobfile.TabIndex = 19
- '
- 'tbMode
- '
- Me.tbMode.Location = New System.Drawing.Point(131, 43)
- Me.tbMode.Name = "tbMode"
- Me.tbMode.ReadOnly = True
- Me.tbMode.Size = New System.Drawing.Size(231, 20)
- Me.tbMode.TabIndex = 18
- '
- 'lblJobfile
- '
- Me.lblJobfile.AutoSize = True
- Me.lblJobfile.Location = New System.Drawing.Point(10, 23)
- Me.lblJobfile.Name = "lblJobfile"
- Me.lblJobfile.Size = New System.Drawing.Size(58, 13)
- Me.lblJobfile.TabIndex = 17
- Me.lblJobfile.Text = "Vecto Job:"
- '
- 'lblDstDir
- '
- Me.lblDstDir.AutoSize = True
- Me.lblDstDir.Location = New System.Drawing.Point(10, 71)
- Me.lblDstDir.Name = "lblDstDir"
- Me.lblDstDir.Size = New System.Drawing.Size(87, 13)
- Me.lblDstDir.TabIndex = 16
- Me.lblDstDir.Text = "Output Directory:"
- '
- 'tbDestination
- '
- Me.tbDestination.Location = New System.Drawing.Point(131, 68)
- Me.tbDestination.Name = "tbDestination"
- Me.tbDestination.Size = New System.Drawing.Size(231, 20)
- Me.tbDestination.TabIndex = 15
- '
- 'lblMode
- '
- Me.lblMode.AutoSize = True
- Me.lblMode.Location = New System.Drawing.Point(10, 46)
- Me.lblMode.Name = "lblMode"
- Me.lblMode.Size = New System.Drawing.Size(68, 13)
- Me.lblMode.TabIndex = 14
- Me.lblMode.Text = "Vecto Mode:"
- '
- 'btnCancel
- '
- Me.btnCancel.Location = New System.Drawing.Point(305, 150)
- Me.btnCancel.Name = "btnCancel"
- Me.btnCancel.Size = New System.Drawing.Size(75, 23)
- Me.btnCancel.TabIndex = 13
- Me.btnCancel.Text = "Cancel"
- Me.btnCancel.UseVisualStyleBackColor = True
- '
- 'BtTCfileBrowse
- '
- Me.BtTCfileBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.BtTCfileBrowse.Location = New System.Drawing.Point(362, 66)
- Me.BtTCfileBrowse.Name = "BtTCfileBrowse"
- Me.BtTCfileBrowse.Size = New System.Drawing.Size(24, 24)
- Me.BtTCfileBrowse.TabIndex = 26
- Me.BtTCfileBrowse.TabStop = False
- Me.BtTCfileBrowse.UseVisualStyleBackColor = True
- '
- 'XMLExportJobDialog
- '
- Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
- Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
- Me.ClientSize = New System.Drawing.Size(392, 185)
- Me.Controls.Add(Me.BtTCfileBrowse)
- Me.Controls.Add(Me.lbVendor)
- Me.Controls.Add(Me.tbVendor)
- Me.Controls.Add(Me.btnExport)
- Me.Controls.Add(Me.cbSingleFile)
- Me.Controls.Add(Me.label1)
- Me.Controls.Add(Me.tbJobfile)
- Me.Controls.Add(Me.tbMode)
- Me.Controls.Add(Me.lblJobfile)
- Me.Controls.Add(Me.lblDstDir)
- Me.Controls.Add(Me.tbDestination)
- Me.Controls.Add(Me.lblMode)
- Me.Controls.Add(Me.btnCancel)
- Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
- Me.Name = "XMLExportJobDialog"
- Me.Text = "VECTO XML Export"
- Me.ResumeLayout(False)
- Me.PerformLayout()
-
- End Sub
+ Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(XMLExportJobDialog))
+ Me.lbVendor = New System.Windows.Forms.Label()
+ Me.tbVendor = New System.Windows.Forms.TextBox()
+ Me.btnExport = New System.Windows.Forms.Button()
+ Me.cbSingleFile = New System.Windows.Forms.CheckBox()
+ Me.label1 = New System.Windows.Forms.Label()
+ Me.tbJobfile = New System.Windows.Forms.TextBox()
+ Me.tbMode = New System.Windows.Forms.TextBox()
+ Me.lblJobfile = New System.Windows.Forms.Label()
+ Me.lblDstDir = New System.Windows.Forms.Label()
+ Me.tbDestination = New System.Windows.Forms.TextBox()
+ Me.lblMode = New System.Windows.Forms.Label()
+ Me.btnCancel = New System.Windows.Forms.Button()
+ Me.BtTCfileBrowse = New System.Windows.Forms.Button()
+ Me.SuspendLayout
+ '
+ 'lbVendor
+ '
+ Me.lbVendor.AutoSize = true
+ Me.lbVendor.Location = New System.Drawing.Point(10, 97)
+ Me.lbVendor.Name = "lbVendor"
+ Me.lbVendor.Size = New System.Drawing.Size(44, 13)
+ Me.lbVendor.TabIndex = 25
+ Me.lbVendor.Text = "Vendor:"
+ '
+ 'tbVendor
+ '
+ Me.tbVendor.Location = New System.Drawing.Point(131, 94)
+ Me.tbVendor.Name = "tbVendor"
+ Me.tbVendor.Size = New System.Drawing.Size(231, 20)
+ Me.tbVendor.TabIndex = 4
+ '
+ 'btnExport
+ '
+ Me.btnExport.Location = New System.Drawing.Point(224, 150)
+ Me.btnExport.Name = "btnExport"
+ Me.btnExport.Size = New System.Drawing.Size(75, 23)
+ Me.btnExport.TabIndex = 6
+ Me.btnExport.Text = "Export"
+ Me.btnExport.UseVisualStyleBackColor = true
+ '
+ 'cbSingleFile
+ '
+ Me.cbSingleFile.AutoSize = true
+ Me.cbSingleFile.Location = New System.Drawing.Point(132, 121)
+ Me.cbSingleFile.Name = "cbSingleFile"
+ Me.cbSingleFile.Size = New System.Drawing.Size(15, 14)
+ Me.cbSingleFile.TabIndex = 22
+ Me.cbSingleFile.UseVisualStyleBackColor = true
+ '
+ 'label1
+ '
+ Me.label1.AutoSize = true
+ Me.label1.Location = New System.Drawing.Point(10, 121)
+ Me.label1.Name = "label1"
+ Me.label1.Size = New System.Drawing.Size(116, 13)
+ Me.label1.TabIndex = 5
+ Me.label1.Text = "Output single XML File:"
+ '
+ 'tbJobfile
+ '
+ Me.tbJobfile.Location = New System.Drawing.Point(131, 20)
+ Me.tbJobfile.Name = "tbJobfile"
+ Me.tbJobfile.ReadOnly = true
+ Me.tbJobfile.Size = New System.Drawing.Size(231, 20)
+ Me.tbJobfile.TabIndex = 0
+ '
+ 'tbMode
+ '
+ Me.tbMode.Location = New System.Drawing.Point(131, 43)
+ Me.tbMode.Name = "tbMode"
+ Me.tbMode.ReadOnly = true
+ Me.tbMode.Size = New System.Drawing.Size(231, 20)
+ Me.tbMode.TabIndex = 1
+ '
+ 'lblJobfile
+ '
+ Me.lblJobfile.AutoSize = true
+ Me.lblJobfile.Location = New System.Drawing.Point(10, 23)
+ Me.lblJobfile.Name = "lblJobfile"
+ Me.lblJobfile.Size = New System.Drawing.Size(58, 13)
+ Me.lblJobfile.TabIndex = 17
+ Me.lblJobfile.Text = "Vecto Job:"
+ '
+ 'lblDstDir
+ '
+ Me.lblDstDir.AutoSize = true
+ Me.lblDstDir.Location = New System.Drawing.Point(10, 71)
+ Me.lblDstDir.Name = "lblDstDir"
+ Me.lblDstDir.Size = New System.Drawing.Size(87, 13)
+ Me.lblDstDir.TabIndex = 16
+ Me.lblDstDir.Text = "Output Directory:"
+ '
+ 'tbDestination
+ '
+ Me.tbDestination.Location = New System.Drawing.Point(131, 68)
+ Me.tbDestination.Name = "tbDestination"
+ Me.tbDestination.Size = New System.Drawing.Size(231, 20)
+ Me.tbDestination.TabIndex = 2
+ '
+ 'lblMode
+ '
+ Me.lblMode.AutoSize = true
+ Me.lblMode.Location = New System.Drawing.Point(10, 46)
+ Me.lblMode.Name = "lblMode"
+ Me.lblMode.Size = New System.Drawing.Size(68, 13)
+ Me.lblMode.TabIndex = 14
+ Me.lblMode.Text = "Vecto Mode:"
+ '
+ 'btnCancel
+ '
+ Me.btnCancel.Location = New System.Drawing.Point(305, 150)
+ Me.btnCancel.Name = "btnCancel"
+ Me.btnCancel.Size = New System.Drawing.Size(75, 23)
+ Me.btnCancel.TabIndex = 7
+ Me.btnCancel.Text = "Cancel"
+ Me.btnCancel.UseVisualStyleBackColor = true
+ '
+ 'BtTCfileBrowse
+ '
+ Me.BtTCfileBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
+ Me.BtTCfileBrowse.Location = New System.Drawing.Point(362, 66)
+ Me.BtTCfileBrowse.Name = "BtTCfileBrowse"
+ Me.BtTCfileBrowse.Size = New System.Drawing.Size(24, 24)
+ Me.BtTCfileBrowse.TabIndex = 3
+ Me.BtTCfileBrowse.UseVisualStyleBackColor = true
+ '
+ 'XMLExportJobDialog
+ '
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
+ Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+ Me.ClientSize = New System.Drawing.Size(392, 185)
+ Me.Controls.Add(Me.BtTCfileBrowse)
+ Me.Controls.Add(Me.lbVendor)
+ Me.Controls.Add(Me.tbVendor)
+ Me.Controls.Add(Me.btnExport)
+ Me.Controls.Add(Me.cbSingleFile)
+ Me.Controls.Add(Me.label1)
+ Me.Controls.Add(Me.tbJobfile)
+ Me.Controls.Add(Me.tbMode)
+ Me.Controls.Add(Me.lblJobfile)
+ Me.Controls.Add(Me.lblDstDir)
+ Me.Controls.Add(Me.tbDestination)
+ Me.Controls.Add(Me.lblMode)
+ Me.Controls.Add(Me.btnCancel)
+ Me.Icon = CType(resources.GetObject("$this.Icon"),System.Drawing.Icon)
+ Me.Name = "XMLExportJobDialog"
+ Me.Text = "VECTO XML Export"
+ Me.ResumeLayout(false)
+ Me.PerformLayout
+
+End Sub
Private WithEvents lbVendor As System.Windows.Forms.Label
Private WithEvents tbVendor As System.Windows.Forms.TextBox
Private WithEvents btnExport As System.Windows.Forms.Button
diff --git a/VECTO/GUI/XMLImportJobDialog.Designer.vb b/VECTO/GUI/XMLImportJobDialog.Designer.vb
index ecc7eb7dff1212f672c955cd1a123d8297d2515d..1312df14e2cabd0a10354f39d5b95e13946a04bb 100644
--- a/VECTO/GUI/XMLImportJobDialog.Designer.vb
+++ b/VECTO/GUI/XMLImportJobDialog.Designer.vb
@@ -22,105 +22,105 @@ Partial Class XMLImportJobDialog
'Do not modify it using the code editor.
<System.Diagnostics.DebuggerStepThrough()> _
Private Sub InitializeComponent()
- Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(XMLImportJobDialog))
- Me.btnClose = New System.Windows.Forms.Button()
- Me.btnImport = New System.Windows.Forms.Button()
- Me.btnBrowseOutput = New System.Windows.Forms.Button()
- Me.btnBrowseJob = New System.Windows.Forms.Button()
- Me.tbDestination = New System.Windows.Forms.TextBox()
- Me.tbJobFile = New System.Windows.Forms.TextBox()
- Me.label2 = New System.Windows.Forms.Label()
- Me.label1 = New System.Windows.Forms.Label()
- Me.SuspendLayout()
- '
- 'btnClose
- '
- Me.btnClose.Location = New System.Drawing.Point(391, 92)
- Me.btnClose.Name = "btnClose"
- Me.btnClose.Size = New System.Drawing.Size(75, 23)
- Me.btnClose.TabIndex = 15
- Me.btnClose.Text = "Cancel"
- Me.btnClose.UseVisualStyleBackColor = True
- '
- 'btnImport
- '
- Me.btnImport.Location = New System.Drawing.Point(310, 92)
- Me.btnImport.Name = "btnImport"
- Me.btnImport.Size = New System.Drawing.Size(75, 23)
- Me.btnImport.TabIndex = 14
- Me.btnImport.Text = "Import"
- Me.btnImport.UseVisualStyleBackColor = True
- '
- 'btnBrowseOutput
- '
- Me.btnBrowseOutput.Location = New System.Drawing.Point(345, 41)
- Me.btnBrowseOutput.Name = "btnBrowseOutput"
- Me.btnBrowseOutput.Size = New System.Drawing.Size(75, 23)
- Me.btnBrowseOutput.TabIndex = 13
- Me.btnBrowseOutput.Text = "Browse"
- Me.btnBrowseOutput.UseVisualStyleBackColor = True
- '
- 'btnBrowseJob
- '
- Me.btnBrowseJob.Location = New System.Drawing.Point(345, 12)
- Me.btnBrowseJob.Name = "btnBrowseJob"
- Me.btnBrowseJob.Size = New System.Drawing.Size(75, 23)
- Me.btnBrowseJob.TabIndex = 12
- Me.btnBrowseJob.Text = "Browse"
- Me.btnBrowseJob.UseVisualStyleBackColor = True
- '
- 'tbDestination
- '
- Me.tbDestination.Location = New System.Drawing.Point(105, 43)
- Me.tbDestination.Name = "tbDestination"
- Me.tbDestination.Size = New System.Drawing.Size(224, 20)
- Me.tbDestination.TabIndex = 11
- '
- 'tbJobFile
- '
- Me.tbJobFile.Location = New System.Drawing.Point(105, 14)
- Me.tbJobFile.Name = "tbJobFile"
- Me.tbJobFile.Size = New System.Drawing.Size(224, 20)
- Me.tbJobFile.TabIndex = 10
- '
- 'label2
- '
- Me.label2.AutoSize = True
- Me.label2.Location = New System.Drawing.Point(11, 46)
- Me.label2.Name = "label2"
- Me.label2.Size = New System.Drawing.Size(87, 13)
- Me.label2.TabIndex = 9
- Me.label2.Text = "Output Directory:"
- '
- 'label1
- '
- Me.label1.AutoSize = True
- Me.label1.Location = New System.Drawing.Point(11, 17)
- Me.label1.Name = "label1"
- Me.label1.Size = New System.Drawing.Size(46, 13)
- Me.label1.TabIndex = 8
- Me.label1.Text = "Job File:"
- '
- 'XMLImportJobDialog
- '
- Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
- Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
- Me.ClientSize = New System.Drawing.Size(480, 130)
- Me.Controls.Add(Me.btnClose)
- Me.Controls.Add(Me.btnImport)
- Me.Controls.Add(Me.btnBrowseOutput)
- Me.Controls.Add(Me.btnBrowseJob)
- Me.Controls.Add(Me.tbDestination)
- Me.Controls.Add(Me.tbJobFile)
- Me.Controls.Add(Me.label2)
- Me.Controls.Add(Me.label1)
- Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
- Me.Name = "XMLImportJobDialog"
- Me.Text = "VECTO Import Job"
- Me.ResumeLayout(False)
- Me.PerformLayout()
+ Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(XMLImportJobDialog))
+ Me.btnClose = New System.Windows.Forms.Button()
+ Me.btnImport = New System.Windows.Forms.Button()
+ Me.btnBrowseOutput = New System.Windows.Forms.Button()
+ Me.btnBrowseJob = New System.Windows.Forms.Button()
+ Me.tbDestination = New System.Windows.Forms.TextBox()
+ Me.tbJobFile = New System.Windows.Forms.TextBox()
+ Me.label2 = New System.Windows.Forms.Label()
+ Me.label1 = New System.Windows.Forms.Label()
+ Me.SuspendLayout
+ '
+ 'btnClose
+ '
+ Me.btnClose.Location = New System.Drawing.Point(391, 92)
+ Me.btnClose.Name = "btnClose"
+ Me.btnClose.Size = New System.Drawing.Size(75, 23)
+ Me.btnClose.TabIndex = 5
+ Me.btnClose.Text = "Cancel"
+ Me.btnClose.UseVisualStyleBackColor = true
+ '
+ 'btnImport
+ '
+ Me.btnImport.Location = New System.Drawing.Point(310, 92)
+ Me.btnImport.Name = "btnImport"
+ Me.btnImport.Size = New System.Drawing.Size(75, 23)
+ Me.btnImport.TabIndex = 4
+ Me.btnImport.Text = "Import"
+ Me.btnImport.UseVisualStyleBackColor = true
+ '
+ 'btnBrowseOutput
+ '
+ Me.btnBrowseOutput.Location = New System.Drawing.Point(345, 41)
+ Me.btnBrowseOutput.Name = "btnBrowseOutput"
+ Me.btnBrowseOutput.Size = New System.Drawing.Size(75, 23)
+ Me.btnBrowseOutput.TabIndex = 3
+ Me.btnBrowseOutput.Text = "Browse"
+ Me.btnBrowseOutput.UseVisualStyleBackColor = true
+ '
+ 'btnBrowseJob
+ '
+ Me.btnBrowseJob.Location = New System.Drawing.Point(345, 12)
+ Me.btnBrowseJob.Name = "btnBrowseJob"
+ Me.btnBrowseJob.Size = New System.Drawing.Size(75, 23)
+ Me.btnBrowseJob.TabIndex = 1
+ Me.btnBrowseJob.Text = "Browse"
+ Me.btnBrowseJob.UseVisualStyleBackColor = true
+ '
+ 'tbDestination
+ '
+ Me.tbDestination.Location = New System.Drawing.Point(105, 43)
+ Me.tbDestination.Name = "tbDestination"
+ Me.tbDestination.Size = New System.Drawing.Size(224, 20)
+ Me.tbDestination.TabIndex = 2
+ '
+ 'tbJobFile
+ '
+ Me.tbJobFile.Location = New System.Drawing.Point(105, 14)
+ Me.tbJobFile.Name = "tbJobFile"
+ Me.tbJobFile.Size = New System.Drawing.Size(224, 20)
+ Me.tbJobFile.TabIndex = 0
+ '
+ 'label2
+ '
+ Me.label2.AutoSize = true
+ Me.label2.Location = New System.Drawing.Point(11, 46)
+ Me.label2.Name = "label2"
+ Me.label2.Size = New System.Drawing.Size(87, 13)
+ Me.label2.TabIndex = 9
+ Me.label2.Text = "Output Directory:"
+ '
+ 'label1
+ '
+ Me.label1.AutoSize = true
+ Me.label1.Location = New System.Drawing.Point(11, 17)
+ Me.label1.Name = "label1"
+ Me.label1.Size = New System.Drawing.Size(46, 13)
+ Me.label1.TabIndex = 8
+ Me.label1.Text = "Job File:"
+ '
+ 'XMLImportJobDialog
+ '
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
+ Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+ Me.ClientSize = New System.Drawing.Size(480, 130)
+ Me.Controls.Add(Me.btnClose)
+ Me.Controls.Add(Me.btnImport)
+ Me.Controls.Add(Me.btnBrowseOutput)
+ Me.Controls.Add(Me.btnBrowseJob)
+ Me.Controls.Add(Me.tbDestination)
+ Me.Controls.Add(Me.tbJobFile)
+ Me.Controls.Add(Me.label2)
+ Me.Controls.Add(Me.label1)
+ Me.Icon = CType(resources.GetObject("$this.Icon"),System.Drawing.Icon)
+ Me.Name = "XMLImportJobDialog"
+ Me.Text = "VECTO Import Job"
+ Me.ResumeLayout(false)
+ Me.PerformLayout
- End Sub
+End Sub
Private WithEvents btnClose As System.Windows.Forms.Button
Private WithEvents btnImport As System.Windows.Forms.Button
Private WithEvents btnBrowseOutput As System.Windows.Forms.Button
diff --git a/VECTO/Input Files/ElectricMachine.vb b/VECTO/Input Files/ElectricMachine.vb
index 72740e0b4baef10958552e0971d3baf1ccd6041d..6c0136cbb970ff63155f44a665944de5f825acac 100644
--- a/VECTO/Input Files/ElectricMachine.vb
+++ b/VECTO/Input Files/ElectricMachine.vb
@@ -17,12 +17,11 @@ Public Class ElectricMachine
public VoltageLevelLow As Double
Private ReadOnly _fullLoadCurvePathLow As SubPath
- Private ReadOnly _dragCurvePathLow As SubPath
+ Private ReadOnly _dragCurvePath As SubPath
Private ReadOnly _efficiencyMapLow As SubPath
public VoltageLevelHigh as Double
Private ReadOnly _fullLoadCurvePathHi As SubPath
- Private ReadOnly _dragCurvePathHi As SubPath
Private ReadOnly _efficiencyMapHi As SubPath
''' <summary>
@@ -54,12 +53,11 @@ Public Class ElectricMachine
_filePath = ""
_fullLoadCurvePathLow = New SubPath
- _dragCurvePathLow = New SubPath()
+ _dragCurvePath = New SubPath()
_efficiencyMapLow = New SubPath()
_fullLoadCurvePathHi = New SubPath
- _dragCurvePathHi = New SubPath()
- _efficiencyMapHi = New SubPath()
+ _efficiencyMapHi = New SubPath()
SetDefault()
End Sub
@@ -213,17 +211,17 @@ Public Class ElectricMachine
Return VectoCSVFile.Read(_fullLoadCurvePathLow.FullPath)
End Get
End Property
- protected ReadOnly Property DragCurvLow As TableData
- Get
- If Not File.Exists(_dragCurvePathLow.FullPath) Then _
- Throw New VectoException("Drag Curve is missing or invalid")
- Return VectoCSVFile.Read(_dragCurvePathLow.FullPath)
- End Get
- End Property
+ 'protected ReadOnly Property DragCurvLow As TableData
+ ' Get
+ ' If Not File.Exists(_dragCurvePathLow.FullPath) Then _
+ ' Throw New VectoException("Drag Curve is missing or invalid")
+ ' Return VectoCSVFile.Read(_dragCurvePathLow.FullPath)
+ ' End Get
+ 'End Property
protected ReadOnly Property EfficiencyMapLow As TableData
Get
If Not File.Exists(_efficiencyMapLow.FullPath) Then _
- Throw New VectoException("Drag Curve is missing or invalid")
+ Throw New VectoException("EfficiencyMap is missing or invalid")
Return VectoCSVFile.Read(_efficiencyMapLow.FullPath)
End Get
End Property
@@ -234,17 +232,17 @@ Public Class ElectricMachine
Return VectoCSVFile.Read(_fullLoadCurvePathHi.FullPath)
End Get
End Property
- protected ReadOnly Property DragCurvHi As TableData
- Get
- If Not File.Exists(_dragCurvePathHi.FullPath) Then _
- Throw New VectoException("Drag Curve is missing or invalid")
- Return VectoCSVFile.Read(_dragCurvePathHi.FullPath)
- End Get
- End Property
+ 'protected ReadOnly Property DragCurvHi As TableData
+ ' Get
+ ' If Not File.Exists(_dragCurvePathHi.FullPath) Then _
+ ' Throw New VectoException("Drag Curve is missing or invalid")
+ ' Return VectoCSVFile.Read(_dragCurvePathHi.FullPath)
+ ' End Get
+ 'End Property
protected ReadOnly Property EfficiencyMapHi As TableData
Get
If Not File.Exists(_efficiencyMapHi.FullPath) Then _
- Throw New VectoException("Drag Curve is missing or invalid")
+ Throw New VectoException("EfficiencyMap is missing or invalid")
Return VectoCSVFile.Read(_efficiencyMapHi.FullPath)
End Get
End Property
@@ -255,17 +253,23 @@ Public Class ElectricMachine
New ElectricMotorVoltageLevel() With {
.VoltageLevel = VoltageLevelLow.SI(of Volt),
.EfficiencyMap = EfficiencyMapLow,
- .DragCurve = DragCurvLow,
.FullLoadCurve = FullLoadCurveLow},
New ElectricMotorVoltageLevel() With {
.VoltageLevel = VoltageLevelHigh.SI(of Volt),
.EfficiencyMap = EfficiencyMapHi,
- .DragCurve = DragCurvHi,
.FullLoadCurve = FullLoadCurveHi}
}
End Get
End Property
+ Public ReadOnly Property DragCurve As TableData Implements IElectricMotorDeclarationInputData.DragCurve
+ Get
+ If Not File.Exists(_dragCurvePath.FullPath) Then _
+ Throw New VectoException("Drag Curve is missing or invalid")
+ Return VectoCSVFile.Read(_dragCurvePath.FullPath)
+ End Get
+ end Property
+
Public ReadOnly Property Inertia As KilogramSquareMeter Implements IElectricMotorDeclarationInputData.Inertia
Get
Return MotorInertia.SI(Of KilogramSquareMeter)
@@ -317,16 +321,16 @@ Public Class ElectricMachine
End Set
End Property
- Public Property PathDragLow(Optional ByVal original As Boolean = False) As String
+ Public Property PathDrag(Optional ByVal original As Boolean = False) As String
Get
If original Then
- Return _dragCurvePathLow.OriginalPath
+ Return _dragCurvePath.OriginalPath
Else
- Return _dragCurvePathLow.FullPath
+ Return _dragCurvePath.FullPath
End If
End Get
Set(ByVal value As String)
- _dragCurvePathLow.Init(_myPath, value)
+ _dragCurvePath.Init(_myPath, value)
End Set
End Property
@@ -356,18 +360,6 @@ Public Class ElectricMachine
End Set
End Property
- Public Property PathDragHi(Optional ByVal original As Boolean = False) As String
- Get
- If original Then
- Return _dragCurvePathHi.OriginalPath
- Else
- Return _dragCurvePathHi.FullPath
- End If
- End Get
- Set(ByVal value As String)
- _dragCurvePathHi.Init(_myPath, value)
- End Set
- End Property
Public Property PathMapHi(Optional ByVal original As Boolean = False) As String
Get
diff --git a/VECTO/Input Files/Vehicle.vb b/VECTO/Input Files/Vehicle.vb
index 5aca52896b85570b2b554c551b5a91baab43b162..0a2ea94fe774442baed7be20e9f696bca1c3d4dd 100644
--- a/VECTO/Input Files/Vehicle.vb
+++ b/VECTO/Input Files/Vehicle.vb
@@ -1043,6 +1043,7 @@ Public Class ElectricMachineWrapper
Public ReadOnly Property DigestValue As DigestData Implements IComponentInputData.DigestValue
Public ReadOnly Property VoltageLevels As IList(Of IElectricMotorVoltageLevel) Implements IElectricMotorDeclarationInputData.VoltageLevels
+ Public ReadOnly Property DragCurve As TableData Implements IElectricMotorDeclarationInputData.DragCurve
Public ReadOnly Property Inertia As KilogramSquareMeter Implements IElectricMotorDeclarationInputData.Inertia
Public ReadOnly Property OverloadTime As Second Implements IElectricMotorDeclarationInputData.OverloadTime
Public ReadOnly Property ContinuousTorqueSpeed As PerSecond Implements IElectricMotorDeclarationInputData.ContinuousTorqueSpeed
diff --git a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
index d8d748873feca24f29444a10f3225a68bced3a9a..f1f03f28f88cdc52b3e6a39dee733dc033d3a0bd 100644
--- a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
@@ -713,6 +713,8 @@ namespace TUGraz.VectoCommon.InputData
{
IList<IElectricMotorVoltageLevel> VoltageLevels { get; }
+ TableData DragCurve { get; }
+
KilogramSquareMeter Inertia { get; }
Second OverloadTime { get; }
@@ -734,8 +736,6 @@ namespace TUGraz.VectoCommon.InputData
TableData FullLoadCurve { get; }
- TableData DragCurve { get; }
-
TableData EfficiencyMap { get; }
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONElectricMotor.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONElectricMotor.cs
index 2e537cda6e410bae087b96e8a050f1453046a4e3..111a8cc108be9dbbecb36f869b076438cb521023 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONElectricMotor.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONElectricMotor.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Configuration;
using System.Linq;
using Newtonsoft.Json.Linq;
using TUGraz.VectoCommon.InputData;
@@ -7,10 +8,19 @@ using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.InputData.Impl;
+using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.InputData.FileIO.JSON
{
+ public class JSONElectricMotorV4 : JSONElectricMotorV3
+ {
+ public JSONElectricMotorV4(JObject data, string filename, bool tolerateMissing = false) : base(data, filename, tolerateMissing) { }
+
+ public override TableData DragCurve => ReadTableData(Body.GetEx<string>("DragCurve"), "ElectricMotor DragCurve");
+
+ }
+
public class JSONElectricMotorV3 : JSONElectricMotorV2
{
public JSONElectricMotorV3(JObject data, string filename, bool tolerateMissing = false) : base(data, filename, tolerateMissing) { }
@@ -22,11 +32,14 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
return Body["VoltageLevels"].Select(entry => new ElectricMotorVoltageLevel() {
VoltageLevel = entry.GetEx<double>("Voltage").SI<Volt>(),
EfficiencyMap = ReadTableData(entry.GetEx<string>("EfficiencyMap"), "ElectricMotor Map"),
- DragCurve = ReadTableData(entry.GetEx<string>("DragCurve"), "ElectricMotor DragCurve"),
+ //DragCurve = ReadTableData(entry.GetEx<string>("DragCurve"), "ElectricMotor DragCurve"),
FullLoadCurve = ReadTableData(entry.GetEx<string>("FullLoadCurve"), "ElectricMotor FullLoadCurve")
}).Cast<IElectricMotorVoltageLevel>().ToList();
}
+ public override TableData DragCurve=> Body["VoltageLevels"].Select(x => ReadTableData(x.GetEx<string>("DragCurve"), "ElectricMotor DragCurve")).First();
+
+
#endregion
}
@@ -64,13 +77,13 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
new ElectricMotorVoltageLevel() {
VoltageLevel = 0.SI<Volt>(),
EfficiencyMap = ReadTableData(Body.GetEx<string>("EfficiencyMap"), "ElectricMotor Map"),
- DragCurve = ReadTableData(Body.GetEx<string>("DragCurve"), "ElectricMotor DragCurve"),
+ //DragCurve = ReadTableData(Body.GetEx<string>("DragCurve"), "ElectricMotor DragCurve"),
FullLoadCurve = ReadTableData(Body.GetEx<string>("FullLoadCurve"), "ElectricMotor FullLoadCurve")
},
new ElectricMotorVoltageLevel() {
VoltageLevel = 1e9.SI<Volt>(),
EfficiencyMap = ReadTableData(Body.GetEx<string>("EfficiencyMap"), "ElectricMotor Map"),
- DragCurve = ReadTableData(Body.GetEx<string>("DragCurve"), "ElectricMotor DragCurve"),
+ //DragCurve = ReadTableData(Body.GetEx<string>("DragCurve"), "ElectricMotor DragCurve"),
FullLoadCurve = ReadTableData(Body.GetEx<string>("FullLoadCurve"), "ElectricMotor FullLoadCurve")
},
};
@@ -78,15 +91,15 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
public DigestData DigestValue => null;
- public virtual TableData FullLoadCurve => ReadTableData(Body.GetEx<string>("FullLoadCurve"), "ElectricMotor FullLoadCurve");
+ //public virtual TableData FullLoadCurve => ReadTableData(Body.GetEx<string>("FullLoadCurve"), "ElectricMotor FullLoadCurve");
public virtual TableData DragCurve => ReadTableData(Body.GetEx<string>("DragCurve"), "ElectricMotor DragCurve");
- public virtual TableData EfficiencyMap => ReadTableData(Body.GetEx<string>("EfficiencyMap"), "ElectricMotor Map");
+ //public virtual TableData EfficiencyMap => ReadTableData(Body.GetEx<string>("EfficiencyMap"), "ElectricMotor Map");
public virtual KilogramSquareMeter Inertia => Body.GetEx<double>("Inertia").SI<KilogramSquareMeter>();
- public virtual Joule OverloadBuffer => Body.GetValueOrDefault<double>("ThermalOverloadBuffer")?.SI(Unit.SI.Mega.Joule).Cast<Joule>() ?? 1e18.SI<Joule>();
+ //public virtual Joule OverloadBuffer => Body.GetValueOrDefault<double>("ThermalOverloadBuffer")?.SI(Unit.SI.Mega.Joule).Cast<Joule>() ?? 1e18.SI<Joule>();
public virtual double OverloadRecoveryFactor => Body.GetValueOrDefault<double>("ThermalOverloadRecoveryFactor") ?? 0.9;
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs
index 4e9c56a7f2ad3a515057f9cccbd11c5b6f0df851..08573d70a716091588bfaf761a7373bb440cde39 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs
@@ -214,6 +214,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
return new JSONElectricMotorV2(json, filename, tolerateMissing);
case 3:
return new JSONElectricMotorV3(json, filename, tolerateMissing);
+ case 4:
+ return new JSONElectricMotorV4(json, filename, tolerateMissing);
default:
throw new VectoException("ElectricMotor-File: Unsupported FileVersion. Got {0}", version);
}
diff --git a/VectoCore/VectoCore/InputData/Impl/InputData.cs b/VectoCore/VectoCore/InputData/Impl/InputData.cs
index 2468d3d0bdc5fb7ce9ab4f070712e2139e73f950..386b4c6ff0188df6af1cf9bf7b5bfa6f64766317 100644
--- a/VectoCore/VectoCore/InputData/Impl/InputData.cs
+++ b/VectoCore/VectoCore/InputData/Impl/InputData.cs
@@ -299,7 +299,7 @@ namespace TUGraz.VectoCore.InputData.Impl
public Volt VoltageLevel { get; internal set; }
public TableData FullLoadCurve { get; internal set; }
- public TableData DragCurve { get; internal set; }
+ //public TableData DragCurve { get; internal set; }
public TableData EfficiencyMap { get; internal set; }
#endregion
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
index 8b613d79b179aa919a43779509b90cf953ac3157..e803c63d34de47c33ee208a139368f048ad42e94 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
@@ -889,7 +889,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
voltageLevels.Add(new ElectricMotorVoltageLevelData() {
Voltage = entry.VoltageLevel,
FullLoadCurve = fullLoadCurveCombined,
- DragCurve = ElectricMotorDragCurveReader.Create(entry.DragCurve, count),
+ //DragCurve = ElectricMotorDragCurveReader.Create(entry.DragCurve, count),
EfficiencyMap = ElectricMotorMapReader.Create(entry.EfficiencyMap, count),
});
}
@@ -901,6 +901,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
return new ElectricMotorData() {
EfficiencyData = new VoltageLevelData() { VoltageLevels = voltageLevels},
+ DragCurve = ElectricMotorDragCurveReader.Create(motorData.DragCurve, count),
Inertia = motorData.Inertia,
ContinuousTorque = motorData.ContinuousTorque * count,
ContinuousTorqueSpeed = motorData.ContinuousTorqueSpeed,
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/ElectricMotorData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/ElectricMotorData.cs
index 67ec469a5dda78b937555de8f3c41d08a603a26f..91e17a240c5e61f4b6ce7e201d4bcc45717d3160 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/ElectricMotorData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/ElectricMotorData.cs
@@ -41,6 +41,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
[ValidateObject]
public VoltageLevelData EfficiencyData { get; internal set; }
+
+ [ValidateObject]
+ public DragCurve DragCurve { get; internal set; }
}
public class VoltageLevelData
@@ -54,12 +57,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
_maxSpeed ?? (_maxSpeed = VoltageLevels
.Min(v => VectoMath.Min(v.EfficiencyMap.MaxSpeed, v.FullLoadCurve.MaxSpeed)));
- public NewtonMeter LookupDragTorque(Volt voltage, PerSecond avgSpeed) {
- var (a, b) = GetSection(voltage);
- return VectoMath.Interpolate(a.Voltage, b.Voltage,
- a.DragCurve.Lookup(avgSpeed), b.DragCurve.Lookup(avgSpeed), voltage);
- }
-
+
public NewtonMeter EfficiencyMapLookupTorque(Volt voltage, Watt electricPower, PerSecond avgSpeed, NewtonMeter maxEmTorque)
{
if (avgSpeed.IsGreaterOrEqual(MaxSpeed)) {
@@ -157,9 +155,6 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
[ValidateObject]
public ElectricMotorFullLoadCurve FullLoadCurve { get; internal set; }
- [ValidateObject]
- public DragCurve DragCurve { get; internal set; }
-
[ValidateObject]
public EfficiencyMap EfficiencyMap { get; internal set; }
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Clutch.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Clutch.cs
index a467759ffd57e6bd395573c3bc997c78e0cbf072..d0451b85a6fab446872ff7b24820c696e67315c5 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Clutch.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Clutch.cs
@@ -180,7 +180,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
Formulas.TorqueToPower(torqueIn, angularVelocityIn));
var avgOutAngularVelocity = (PreviousState.OutAngularVelocity + outAngularVelocity) / 2.0;
- var avgInAngularVelocity = (PreviousState.InAngularVelocity + angularVelocityIn) / 2.0;
+ var iceOn = !DataBus.EngineInfo.EngineOn && DataBus.EngineCtl.CombustionEngineOn;
+ var prevInAngularVelocity = iceOn ? DataBus.EngineInfo.EngineSpeed : PreviousState.InAngularVelocity;
+ var avgInAngularVelocity = (prevInAngularVelocity + angularVelocityIn) / 2.0;
var clutchLoss = torqueIn * avgInAngularVelocity - outTorque * avgOutAngularVelocity;
if (!startClutch && !clutchLoss.IsEqual(0) && (DataBus.GearboxInfo.Gear.Gear != 1 || clutchLoss.IsSmaller(0))) {
// we don't want to have negative clutch losses, so adapt input torque to match the average output power
@@ -191,6 +193,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
if (!dryRun) {
CurrentState.SetState(torqueIn, angularVelocityIn, outTorque, outAngularVelocity);
CurrentState.ClutchLoss = torqueIn * avgInAngularVelocity - outTorque * avgOutAngularVelocity;
+ CurrentState.ICEOn = iceOn;
+ CurrentState.ICEOnSpeed = DataBus.EngineInfo.EngineSpeed;
}
retVal.Clutch.PowerRequest = outTorque *
((PreviousState.OutAngularVelocity ?? 0.SI<PerSecond>()) + CurrentState.OutAngularVelocity) / 2.0;
@@ -224,7 +228,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
container[ModalResultField.P_clutch_loss] = 0.SI<Watt>();
} else {
var avgOutAngularVelocity = (PreviousState.OutAngularVelocity + CurrentState.OutAngularVelocity) / 2.0;
- var avgInAngularVelocity = (PreviousState.InAngularVelocity + CurrentState.InAngularVelocity) / 2.0;
+ var prevInAngularVelocity = CurrentState.ICEOn ? CurrentState.ICEOnSpeed : PreviousState.InAngularVelocity;
+ var avgInAngularVelocity = (prevInAngularVelocity + CurrentState.InAngularVelocity) / 2.0;
container[ModalResultField.P_clutch_out] = CurrentState.OutTorque * avgOutAngularVelocity;
container[ModalResultField.P_clutch_loss] = CurrentState.InTorque * avgInAngularVelocity -
CurrentState.OutTorque * avgOutAngularVelocity;
@@ -245,6 +250,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
ClutchLoss = 0.SI<Watt>();
}
public Watt ClutchLoss { get; set; }
+ public bool ICEOn { get; set; }
+ public PerSecond ICEOnSpeed { get; set; }
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ElectricMotor.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ElectricMotor.cs
index 48c59fab359ce6f5212f3a813dcf3379e827a8c9..c9c30009eb506810106e3665c88041e2ecbb9a25 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ElectricMotor.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ElectricMotor.cs
@@ -77,7 +77,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public Watt DragPower(Volt volt, PerSecond electricMotorSpeed)
{
- return ModelData.EfficiencyData.LookupDragTorque(volt, electricMotorSpeed) * electricMotorSpeed;
+ return ModelData.DragCurve.Lookup(electricMotorSpeed) * electricMotorSpeed;
}
public Watt MaxPowerDrive(Volt volt, PerSecond electricMotorSpeed)
@@ -166,10 +166,15 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
{
var voltage = DataBus.BatteryInfo.InternalVoltage;
- var avgDtSpeed = (PreviousState.DrivetrainSpeed + outAngularVelocity) / 2;
+ var iceOn = Position == PowertrainPosition.HybridP1 &&
+ !DataBus.EngineInfo.EngineOn && DataBus.EngineCtl.CombustionEngineOn;
+ var prevDtSpeed = iceOn ? DataBus.EngineInfo.EngineSpeed : PreviousState.DrivetrainSpeed;
+ var prevEmSpeed = iceOn ? prevDtSpeed * ModelData.RatioADC : PreviousState.EMSpeed;
+
+ var avgDtSpeed = (prevDtSpeed + outAngularVelocity) / 2;
var emSpeed = outAngularVelocity * ModelData.RatioADC;
- var avgEmSpeed = (PreviousState.EMSpeed + emSpeed) / 2;
+ var avgEmSpeed = (prevEmSpeed + emSpeed) / 2;
var inertiaTorqueEm = avgEmSpeed.IsEqual(0)
? 0.SI<NewtonMeter>()
: Formulas.InertiaPower(avgEmSpeed, PreviousState.EMSpeed, ModelData.Inertia, dt) / avgEmSpeed;
@@ -255,7 +260,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
// no electric system or EM shall be off - apply drag only
// if EM is off, calculate EM drag torque 'forward' to be applied on drivetrain
// add inertia, drag is positive
- emTorque = ModelData.EfficiencyData.LookupDragTorque(voltage, avgEmSpeed) + inertiaTorqueEm;
+ emTorque = ModelData.DragCurve.Lookup(avgEmSpeed) + inertiaTorqueEm;
emTorqueDt = ConvertEmTorqueToDrivetrain(avgEmSpeed, emTorque);
emOff = true;
}
@@ -269,7 +274,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
emTorqueMap = null;
}
- var electricPower = emOff || (ModelData.EfficiencyData.LookupDragTorque(voltage, avgEmSpeed) + inertiaTorqueEm).IsEqual(emTorque, 1e-3.SI<NewtonMeter>())
+ var electricPower = emOff || (ModelData.DragCurve.Lookup(avgEmSpeed) + inertiaTorqueEm).IsEqual(emTorque, 1e-3.SI<NewtonMeter>())
? 0.SI<Watt>()
: ModelData.EfficiencyData
.LookupElectricPower(voltage, avgEmSpeed, emTorqueMap, DataBus.ExecutionMode != ExecutionMode.Declaration)
@@ -368,6 +373,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
retVal.ElectricSystem = electricSupplyResponse;
if (!dryRun) {
+ CurrentState.IceSwitchedOn = iceOn;
+ CurrentState.ICEOnSpeed = DataBus.EngineInfo.EngineSpeed;
CurrentState.EMSpeed = emSpeed;
CurrentState.EMTorque = emOff ? null : emTorque;
CurrentState.EmTorqueMap = emTorqueMap;
@@ -402,7 +409,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
}
var maxBatRecuperationTorque = maxBatPower.IsEqual(0, 1e-3)
- ? ModelData.EfficiencyData.LookupDragTorque(volt, avgSpeed)
+ ? ModelData.DragCurve.Lookup(avgSpeed)
: ModelData.EfficiencyData.EfficiencyMapLookupTorque(volt, maxBatPower, avgSpeed, maxEmTorque);
var maxTorqueRecuperate = VectoMath.Min(maxEmTorque, maxBatRecuperationTorque);
if (maxTorqueRecuperate < 0) {
@@ -430,7 +437,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
}
var maxBatDriveTorque = maxBatPower.IsEqual(0, 1e-3)
- ? ModelData.EfficiencyData.LookupDragTorque(volt, avgSpeed)
+ ? ModelData.DragCurve.Lookup(avgSpeed)
: ModelData.EfficiencyData.EfficiencyMapLookupTorque(volt, maxBatPower, avgSpeed, maxEmTorque);
var maxTorqueDrive = VectoMath.Max(maxEmTorque, maxBatDriveTorque);
@@ -474,8 +481,11 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
protected override void DoWriteModalResults(Second time, Second simulationInterval, IModalDataContainer container)
{
- var avgEMSpeed = (PreviousState.EMSpeed + CurrentState.EMSpeed) / 2;
- var avgDTSpeed = (PreviousState.DrivetrainSpeed + CurrentState.DrivetrainSpeed) / 2;
+ var prevDtSpeed = CurrentState.IceSwitchedOn ? CurrentState.ICEOnSpeed : PreviousState.DrivetrainSpeed;
+ var prevEmSpeed = CurrentState.IceSwitchedOn ? prevDtSpeed * ModelData.RatioADC : PreviousState.EMSpeed;
+
+ var avgEMSpeed = (prevEmSpeed + CurrentState.EMSpeed) / 2;
+ var avgDTSpeed = (prevDtSpeed + CurrentState.DrivetrainSpeed) / 2;
container[ModalResultField.EM_ratio_, Position] = ModelData.RatioADC.SI<Scalar>();
container[ModalResultField.n_EM_electricMotor_, Position] = avgEMSpeed;
@@ -570,6 +580,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public NewtonMeter TransmissionTorqueLoss;
public PerSecond EMSpeed { get; set; }
+ public bool IceSwitchedOn { get; set; }
+ public PerSecond ICEOnSpeed { get; set; }
+
public NewtonMeter EMTorque;
public NewtonMeter EmTorqueMap;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/EngineAuxiliary.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/EngineAuxiliary.cs
index 0ceb2ce33e9ba04bd3fe0705d4fc930e74cc7f60..e7f82a552ccc70b5474a6cd02d3b8de041e16a0b 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/EngineAuxiliary.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/EngineAuxiliary.cs
@@ -121,8 +121,11 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
/// <returns></returns>
public NewtonMeter TorqueDemand(Second absTime, Second dt, NewtonMeter torquePowerTrain, PerSecond angularSpeed, bool dryRun = false)
{
- var avgAngularSpeed = PreviousState.AngularSpeed != null
- ? (angularSpeed + PreviousState.AngularSpeed) / 2.0
+ var iceOn = !DataBus.EngineInfo.EngineOn && DataBus.EngineCtl.CombustionEngineOn;
+ var prevAngularSpeed = iceOn ? DataBus.EngineInfo.EngineSpeed : PreviousState.AngularSpeed;
+
+ var avgAngularSpeed = prevAngularSpeed != null
+ ? (angularSpeed + prevAngularSpeed) / 2.0
: angularSpeed;
if (!dryRun) {
CurrentState.AngularSpeed = angularSpeed;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs
index 9264e039e32ffd7598e5da1f74353f839e1fa158..0683ea1db800a1f74d264993f5b5b7cebf1fe74b 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs
@@ -1871,7 +1871,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
var emDriveTorque = DataBus.ElectricMotorInfo(emPos).GetTorqueForElectricPower(voltage, emDrivePower, firstResponse.ElectricMotor.AngularVelocity, dt);
var emDragTorque = ModelData.ElectricMachinesData.First(x => x.Item1 == emPos).Item2
- .EfficiencyData.LookupDragTorque(voltage, firstResponse.ElectricMotor.AngularVelocity);
+ .DragCurve.Lookup(firstResponse.ElectricMotor.AngularVelocity);
if (emDriveTorque != null &&
emDriveTorque.IsBetween(
firstResponse.ElectricMotor.MaxRecuperationTorque, firstResponse.ElectricMotor.MaxDriveTorque) &&
diff --git a/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs b/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
index ff256764d9e7401d11fbfb540570642ffd6304a6..e8eea0d5a7f55dda529e23567cc7cf5119538fce 100644
--- a/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
+++ b/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
@@ -11,6 +11,7 @@ using TUGraz.VectoCommon.OutputData;
using TUGraz.VectoCore;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Models.SimulationComponent.Data;
public class JSONFileWriter : IOutputFileWriter
{
@@ -34,7 +35,7 @@ public class JSONFileWriter : IOutputFileWriter
private const int VectoVTPJobFormatVersion = 4;
- private const int ElectricMotorFormatVersion = 3;
+ private const int ElectricMotorFormatVersion = 4;
private const int REESSFormatVersion = 1;
@@ -89,13 +90,14 @@ public class JSONFileWriter : IOutputFileWriter
body.Add("OverloadTorqueSpeed", electricMachine.OverloadTestSpeed.AsRPM);
body.Add("OverloadTime", electricMachine.OverloadTime.Value());
body.Add("ThermalOverloadRecoveryFactor", electricMachine.OverloadRecoveryFactor);
+ body.Add("DragCurve", GetRelativePath(electricMachine.DragCurve.Source, Path.GetDirectoryName(filename)));
var vlevels = new List<Dictionary<string, object>>();
foreach (var entry in electricMachine.VoltageLevels) {
var vlevel = new Dictionary<string, object>();
vlevel.Add("Voltage", entry.VoltageLevel.Value());
vlevel.Add("FullLoadCurve", GetRelativePath(entry.FullLoadCurve.Source, Path.GetDirectoryName(filename)));
- vlevel.Add("DragCurve", GetRelativePath(entry.DragCurve.Source, Path.GetDirectoryName(filename)));
+ //vlevel.Add("DragCurve", GetRelativePath(entry.DragCurve.Source, Path.GetDirectoryName(filename)));
vlevel.Add("EfficiencyMap", GetRelativePath(entry.EfficiencyMap.Source, Path.GetDirectoryName(filename)));
vlevels.Add(vlevel);
}
diff --git a/VectoCore/VectoCore/OutputData/ModalDataContainer.cs b/VectoCore/VectoCore/OutputData/ModalDataContainer.cs
index 4c07b9db644baa32b13ce6f31f73682958dd4503..a5622e6202cdc5ecc629a7b5f2c2b68d61033dea 100644
--- a/VectoCore/VectoCore/OutputData/ModalDataContainer.cs
+++ b/VectoCore/VectoCore/OutputData/ModalDataContainer.cs
@@ -265,11 +265,22 @@ namespace TUGraz.VectoCore.OutputData
public bool HasCombustionEngine => _runData.JobType != VectoSimulationJobType.BatteryElectricVehicle;
- public WattSecond TotalElectricMotorWorkDrive(PowertrainPosition emPos) =>
- !ElectricMotors.Contains(emPos)
- ? null
- : -_eEmDrive.GetOrAdd(emPos, _ => TimeIntegral<WattSecond>(
- string.Format(ModalResultField.P_EM_mech_.GetCaption(), emPos.GetName()), x => x < 0));
+ public WattSecond TotalElectricMotorWorkDrive(PowertrainPosition emPos)
+ {
+ if (!ElectricMotors.Contains(emPos))
+ return null;
+ else {
+ var eEmDrive = Data.AsEnumerable().Select(r => {
+ var dt = r.Field<Second>(ModalResultField.simulationInterval.GetName());
+ return new {
+ EM_off = r.Field<Scalar>(string.Format(ModalResultField.EM_Off_.GetCaption(), emPos.GetName())),
+ 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);
+ return -_eEmDrive.GetOrAdd(emPos, _ => eEmDrive);
+ }
+ }
public WattSecond TotalElectricMotorMotWorkDrive(PowertrainPosition emPos) =>
!ElectricMotors.Contains(emPos)
@@ -277,11 +288,22 @@ namespace TUGraz.VectoCore.OutputData
: -_eEmDriveMot.GetOrAdd(emPos, _ => TimeIntegral<WattSecond>(
string.Format(ModalResultField.P_EM_electricMotor_em_mech_.GetCaption(), emPos.GetName()), x => x < 0));
- public WattSecond TotalElectricMotorWorkRecuperate(PowertrainPosition emPos) =>
- !ElectricMotors.Contains(emPos)
- ? null
- : _eEmRecuperate.GetOrAdd(emPos, _ => TimeIntegral<WattSecond>(
- string.Format(ModalResultField.P_EM_mech_.GetCaption(), emPos.GetName()), x => x > 0));
+ public WattSecond TotalElectricMotorWorkRecuperate(PowertrainPosition emPos)
+ {
+ if (!ElectricMotors.Contains(emPos))
+ return null;
+ else {
+ var eEmRecup = Data.AsEnumerable().Select(r => {
+ var dt = r.Field<Second>(ModalResultField.simulationInterval.GetName());
+ return new {
+ EM_off = r.Field<Scalar>(string.Format(ModalResultField.EM_Off_.GetCaption(), emPos.GetName())),
+ 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);
+ return _eEmRecuperate.GetOrAdd(emPos, _ => eEmRecup);
+ }
+ }
public WattSecond TotalElectricMotorMotWorkRecuperate(PowertrainPosition emPos) =>
!ElectricMotors.Contains(emPos)
diff --git a/VectoCore/VectoCoreTest/FileIO/JsonReadHybridTest.cs b/VectoCore/VectoCoreTest/FileIO/JsonReadHybridTest.cs
index ce7a39972d809b1159e887e5f43ee05d725f3b2c..fff7330b5f4ef65f141cab70210848663d01b52a 100644
--- a/VectoCore/VectoCoreTest/FileIO/JsonReadHybridTest.cs
+++ b/VectoCore/VectoCoreTest/FileIO/JsonReadHybridTest.cs
@@ -140,6 +140,12 @@ namespace TUGraz.VectoCore.Tests.FileIO
var daa = new EngineeringDataAdapter();
var emData = daa.CreateElectricMachines(inputProvider.ElectricMachines, null).First().Item2;
+
+ 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());
@@ -152,11 +158,6 @@ 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(26, em.LookupDragTorque(400.SI<Volt>(), 2000.RPMtoRad()).Value());
- Assert.AreEqual(33, em.LookupDragTorque(600.SI<Volt>(), 2000.RPMtoRad()).Value());
- Assert.AreEqual(29.5, em.LookupDragTorque(500.SI<Volt>(), 2000.RPMtoRad()).Value());
- Assert.AreEqual(31.25, em.LookupDragTorque(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);
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/ElectricMotorTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/ElectricMotorTest.cs
index f8861e6e389997e169f7775fc18ba2138558aa16..fce37835bec5d61e96b89c4fb634ccaf569561df 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/ElectricMotorTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/ElectricMotorTest.cs
@@ -276,7 +276,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
var response = motor.Request(absTime, dt, torque.SI<NewtonMeter>(), speed.RPMtoRad());
Assert.IsInstanceOf<ResponseSuccess>(response);
- var dragTorque = data.First().Item2.EfficiencyData.VoltageLevels.First().DragCurve.Lookup(speed.RPMtoRad());
+ var dragTorque = data.First().Item2.DragCurve.Lookup(speed.RPMtoRad());
var enginePower = speed.RPMtoRad() * (torque.SI<NewtonMeter>() + dragTorque);
var motorMechPower = dragTorque * speed.RPMtoRad();
Assert.AreEqual(enginePower.Value(), response.Engine.PowerRequest.Value(), 1e-6);
diff --git a/VectoCore/VectoCoreTest/Reports/ModDataTest.cs b/VectoCore/VectoCoreTest/Reports/ModDataTest.cs
index adaabffb41e672f0e19cb1a1e399b1f47952726a..6b34b38543cb10ade68cf561347b4a7c83aa4159 100644
--- a/VectoCore/VectoCoreTest/Reports/ModDataTest.cs
+++ b/VectoCore/VectoCoreTest/Reports/ModDataTest.cs
@@ -140,6 +140,21 @@ namespace TUGraz.VectoCore.Tests.Reports
RunSimulation(jobName, ExecutionMode.Declaration);
}
+ [Category("LongRunning")]
+ [TestCase(@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2_ESS\Class2_RigidTruck_DECL.vecto")]
+ public void TestFullCycleModDataIntegrityDeclESS(string jobName)
+ {
+ RunSimulation(jobName, ExecutionMode.Declaration);
+ }
+
+ [Category("LongRunning")]
+ [TestCase(@"TestData\Integration\EngineeringMode\P1_Group5_AMT\P1_Group5_s2c0_rep_Payload.vecto")]
+ public void TestFullCycleModDataIntegrityDecl_P1ESS(string jobName)
+ {
+ RunSimulation(jobName, ExecutionMode.Engineering);
+ }
+
+
[TestCase(@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto")]
public void TestVSUM_VMOD_FormatDecl(string jobName)
{
@@ -352,8 +367,13 @@ namespace TUGraz.VectoCore.Tests.Reports
}
var disatanceBased =
((VehicleContainer)(jobContainer.Runs.First().Run.GetContainer())).DrivingCycleInfo is DistanceBasedDrivingCycle;
+ var em = jobContainer.Runs.First().Run.GetContainer().RunData.ElectricMachinesData;
foreach (var modalResults in modData) {
- AssertModDataIntegrity(modalResults.Item1, auxKeys, modalResults.Item2,fcMap, disatanceBased);
+ if (em.Any(x => x.Item1 == PowertrainPosition.HybridP1)) {
+ AssertModDataIntegrityP1(modalResults.Item1, auxKeys, modalResults.Item2, fcMap, disatanceBased);
+ } else {
+ AssertModDataIntegrity(modalResults.Item1, auxKeys, modalResults.Item2, fcMap, disatanceBased);
+ }
}
AssertSumDataIntegrity(sumData, mode, disatanceBased);
@@ -373,6 +393,18 @@ namespace TUGraz.VectoCore.Tests.Reports
? string.Format(SummaryDataContainer.Fields.E_FORMAT, Constants.Auxiliaries.IDs.PTOConsumer)
: null;
+ var emPos = EnumHelper.GetValues<PowertrainPosition>().FirstOrDefault(p =>
+ sumData.Table.Columns.Contains(string.Format(SummaryDataContainer.Fields.EM_AVG_SPEED_FORMAT, p.GetName())));
+ var emDriveCol = emPos != PowertrainPosition.HybridPositionNotSet
+ ? string.Format(string.Format(SummaryDataContainer.Fields.E_EM_DRIVE_FORMAT, emPos.GetName()))
+ : null;
+ var emRecupCol = emPos != PowertrainPosition.HybridPositionNotSet
+ ? string.Format(SummaryDataContainer.Fields.E_EM_GENERATE_FORMAT, emPos.GetName())
+ : null;
+ var emDragCol = emPos != PowertrainPosition.HybridPositionNotSet
+ ? string.Format(SummaryDataContainer.Fields.E_EM_OFF_Loss_Format, emPos.GetName())
+ : null;
+
foreach (DataRow row in sumData.Table.Rows) {
var inputFile = row[SummaryDataContainer.Fields.INPUTFILE].ToString();
var cycle = row[SummaryDataContainer.Fields.CYCLE].ToString();
@@ -409,11 +441,16 @@ namespace TUGraz.VectoCore.Tests.Reports
var ePTOtransm = ptoTransmissionColumn != null ? ((ConvertedSI)row[ptoTransmissionColumn]) : 0.0;
var ePTOconsumer = ptoConsumerColumn != null ? ((ConvertedSI)row[ptoConsumerColumn]) : 0.0;
+ var eEmDrive = emDriveCol != null ? ((ConvertedSI)row[emDriveCol]) : 0.0;
+ var eEmRecup = emRecupCol != null ? ((ConvertedSI)row[emRecupCol]) : 0.0;
+ var eEmDrag = emDragCol != null ? ((ConvertedSI)row[emDragCol]) : 0.0;
+
+
if (distanceBased) {
// E_fcmap_pos = E_fcmap_neg + E_powertrain_inertia + E_aux_xxx + E_aux_sum + E_clutch_loss + E_tc_loss + E_gbx_loss + E_shift_loss + E_ret_loss + E_angle_loss + E_axl_loss + E_brake + E_vehicle_inertia + E_air + E_roll + E_grad + E_PTO_CONSUM + E_PTO_TRANSM
Assert.AreEqual(eFcMapPos,
eFcMapNeg + ePowertrainInertia + eAux + eClutchLoss + eTcLoss + eGbxLoss + eRetLoss + eAngleLoss +
- eAxlLoss + eBrakeLoss + eVehInertia + eAir + eRoll + eGrad + ePTOconsumer + ePTOtransm, 1e-5,
+ eAxlLoss + eBrakeLoss + eVehInertia + eAir + eRoll + eGrad + ePTOconsumer + ePTOtransm - eEmDrive + eEmRecup + eEmDrag, 1e-5,
"input file: {0} cycle: {1} loading: {2}",
inputFile, cycle, loading);
} else {
@@ -598,6 +635,170 @@ namespace TUGraz.VectoCore.Tests.Reports
}
}
+
+ private static void AssertModDataIntegrityP1(ModalResults modData, Dictionary<string, DataColumn> auxKeys,
+ double totalDistance, FuelConsumptionMap consumptionMap, bool distanceBased)
+ {
+ Assert.IsTrue(modData.Rows.Count > 0);
+
+ var ptoTransmissionColumn = auxKeys.GetValueOrDefault(Constants.Auxiliaries.IDs.PTOTransmission);
+ var ptoConsumerColumn = auxKeys.GetValueOrDefault(Constants.Auxiliaries.IDs.PTOConsumer);
+
+ var p1OutColumn =
+ modData.Columns[string.Format(ModalResultField.P_EM_out_.GetCaption(), PowertrainPosition.HybridP1.GetName())];
+ Assert.NotNull(p1OutColumn);
+ var p1InColumn =
+ modData.Columns[string.Format(ModalResultField.P_EM_in_.GetCaption(), PowertrainPosition.HybridP1.GetName())];
+ Assert.NotNull(p1InColumn);
+ var p1LossColumn =
+ modData.Columns[string.Format(ModalResultField.P_EM_loss_.GetCaption(), PowertrainPosition.HybridP1.GetName())];
+ Assert.NotNull(p1LossColumn);
+ var p1MechColumn =
+ modData.Columns[string.Format(ModalResultField.P_EM_mech_.GetCaption(), PowertrainPosition.HybridP1.GetName())];
+ Assert.NotNull(p1MechColumn);
+ var p1ElColumn =
+ modData.Columns[string.Format(ModalResultField.P_EM_electricMotor_el_.GetCaption(), PowertrainPosition.HybridP1.GetName())];
+ Assert.NotNull(p1ElColumn);
+
+
+ foreach (DataRow row in modData.Rows) {
+ if (distanceBased && totalDistance.IsEqual(((Meter)row[ModalResultField.dist.GetName()]).Value())) {
+ continue;
+ }
+ var gear = (uint)row[ModalResultField.Gear.GetName()];
+ var time = (Second)row[ModalResultField.time.GetName()];
+
+ Meter distance = 0.SI<Meter>();
+ if (distanceBased) {
+ distance = (Meter)row[ModalResultField.dist.GetName()];
+ }
+ var tqEngFcmap = (NewtonMeter)row[ModalResultField.T_ice_fcmap.GetName()];
+ var nEngFcMap = (PerSecond)row[ModalResultField.n_ice_avg.GetName()];
+
+ // check fuel consumption interpolation
+ var fuelConsumption = (SI)row[ModalResultField.FCMap.GetName()];
+ Assert.AreEqual(fuelConsumption.Value(),
+ consumptionMap.GetFuelConsumption(tqEngFcmap, nEngFcMap, true).Value.Value(), 1E-3, "time: {0} distance: {1}",
+ time, distance);
+
+ // check P_eng_FCmap = T_eng_fcmap * n_eng
+ var pEngFcmap = (SI)row[ModalResultField.P_ice_fcmap.GetName()];
+ Assert.AreEqual(pEngFcmap.Value(), (tqEngFcmap * nEngFcMap).Value(), 1E-3, "time: {0} distance: {1}", time,
+ distance);
+
+ var pWheelIn = (Watt)row[ModalResultField.P_wheel_in.GetName()];
+ var pAir = distanceBased ? (Watt)row[ModalResultField.P_air.GetName()] : 0.SI<Watt>();
+ var pRoll = distanceBased ? (Watt)row[ModalResultField.P_roll.GetName()] : 0.SI<Watt>();
+ var pGrad = distanceBased ? (Watt)row[ModalResultField.P_slope.GetName()] : 0.SI<Watt>();
+ var pVehInertia = distanceBased ? (Watt)row[ModalResultField.P_veh_inertia.GetName()] : 0.SI<Watt>();
+ var pTrac = distanceBased ? (Watt)row[ModalResultField.P_trac.GetName()] : pWheelIn;
+
+ // P_eng_out = P_wheel + P_lossgearbox + P_lossaxle + P_lossretarder + P_agbx + Pa_eng + P_aux_mech - P_brake_loss
+ var pEngOut = (Watt)row[ModalResultField.P_ice_out.GetName()];
+ var pLossGbx = (Watt)row[ModalResultField.P_gbx_loss.GetName()];
+ var pGbxIn = (Watt)row[ModalResultField.P_gbx_in.GetName()];
+ var pLossAxle = (Watt)row[ModalResultField.P_axle_loss.GetName()];
+ var pLossAngle = row[ModalResultField.P_angle_loss.GetName()] is DBNull
+ ? 0.SI<Watt>()
+ : (Watt)row[ModalResultField.P_angle_loss.GetName()];
+ var pAxleIn = (Watt)row[ModalResultField.P_axle_in.GetName()];
+ var pLossRet = (Watt)row[ModalResultField.P_ret_loss.GetName()];
+ var pRetIn = (Watt)row[ModalResultField.P_retarder_in.GetName()];
+ var pGbxInertia = (Watt)row[ModalResultField.P_gbx_inertia.GetName()];
+ var pShiftLoss = row[ModalResultField.P_gbx_shift_loss.GetName()] is DBNull
+ ? 0.SI<Watt>()
+ : (Watt)row[ModalResultField.P_gbx_shift_loss.GetName()];
+ var pEngInertia = (Watt)row[ModalResultField.P_ice_inertia.GetName()];
+ var pAux =
+ (Watt)(row[ModalResultField.P_aux_mech.GetName()] != DBNull.Value ? row[ModalResultField.P_aux_mech.GetName()] : 0.SI<Watt>());
+ var pBrakeLoss = distanceBased ? (Watt)row[ModalResultField.P_brake_loss.GetName()] : 0.SI<Watt>();
+ var pBrakeIn = distanceBased ? (Watt)row[ModalResultField.P_brake_in.GetName()] : pWheelIn;
+
+ var pWheelInertia = distanceBased ? (Watt)row[ModalResultField.P_wheel_inertia.GetName()] : 0.SI<Watt>();
+ var pPTOconsumer = ptoConsumerColumn == null || row[ptoConsumerColumn.ColumnName] is DBNull
+ ? 0.SI<Watt>()
+ : (Watt)row[ptoConsumerColumn.ColumnName];
+ var pPTOtransm = ptoTransmissionColumn == null || row[ptoTransmissionColumn.ColumnName] is DBNull
+ ? 0.SI<Watt>()
+ : (Watt)row[ptoTransmissionColumn.ColumnName];
+
+ if (distanceBased) {
+ // P_trac = P_veh_inertia + P_roll + P_air + P_slope
+ Assert.AreEqual(pTrac.Value(), (pAir + pRoll + pGrad + pVehInertia).Value(), 1E-3, "time: {0} distance: {1}",
+ time,
+ distance);
+ }
+
+ if (distanceBased) {
+ // P_wheel_in = P_trac + P_wheel_inertia
+ Assert.AreEqual(pWheelIn.Value(), (pTrac + pWheelInertia).Value(), 1E-3, "time: {0} distance: {1}", time,
+ distance);
+ }
+ Assert.AreEqual(pBrakeIn.Value(), (pWheelIn + pBrakeLoss).Value(), 1E-3, "time: {0} distance: {1}", time,
+ distance);
+
+ Assert.AreEqual(pAxleIn.Value(), (pBrakeIn + pLossAxle).Value(), 1E-3, "time: {0} distance: {1}", time, distance);
+
+ Assert.AreEqual(pRetIn.Value(), (pAxleIn + pLossRet).Value(), 1E-3, "time: {0} distance: {1}", time, distance);
+
+ var pClutchLoss = (Watt)(row[ModalResultField.P_clutch_loss.GetName()] != DBNull.Value
+ ? row[ModalResultField.P_clutch_loss.GetName()]
+ : 0.SI<Watt>());
+
+ var pClutchOut = row[ModalResultField.P_clutch_out.GetName()];
+ //if (pClutchOut != DBNull.Value) {
+ Assert.AreEqual(pGbxIn.Value(), (pClutchOut as Watt).Value(), 1E-3, "time: {0} distance: {1}", time, distance);
+ var pP1Out = row[p1OutColumn] as Watt;
+ Assert.AreEqual(pP1Out.Value(), (pClutchOut as Watt + pClutchLoss).Value(), 1E-3, "time: {0} distance: {1}",
+ time, distance);
+
+ var pP1Loss = row[p1LossColumn] as Watt;
+ var pP1Mech = row[p1MechColumn] as Watt;
+ var pP1In = row[p1InColumn] as Watt;
+ var pP1El = row[p1ElColumn] as Watt;
+ Assert.AreEqual(pP1In.Value(), (pP1Out + pP1Mech).Value(), 1E-3, "time: {0} distance: {1}",
+ time, distance);
+
+ Assert.AreEqual(pP1Loss.Value(), (pP1In - pP1Out - pP1El).Value(), 1E-3, "time: {0} distance: {1}", time, distance);
+
+ //}
+
+ var pTC_Loss = (Watt)(row[ModalResultField.P_TC_loss.GetName()] != DBNull.Value
+ ? row[ModalResultField.P_TC_loss.GetName()]
+ : 0.SI<Watt>());
+
+ var pTCOut = row[ModalResultField.P_clutch_out.GetName()];
+ if (pTCOut != DBNull.Value) {
+ Assert.AreEqual(pGbxIn.Value(), (pTCOut as Watt).Value(), 1E-3, "time: {0} distance: {1}", time, distance);
+ //Assert.AreEqual(pEngOut.Value(), (pTCOut as Watt + pTC_Loss).Value(), 1E-3, "time: {0} distance: {1}",
+ // time, distance);
+ }
+
+ Assert.IsTrue(pLossGbx.IsGreaterOrEqual(pShiftLoss + pGbxInertia), "time: {0} distance: {1}", time,
+ distance);
+
+ Assert.AreEqual(pGbxIn.Value(), (pRetIn + pLossGbx + pGbxInertia).Value(), gear != 0 ? 1E-3 : 0.5,
+ "time: {0} distance: {1}", time,
+ distance);
+
+ // P_eng_fcmap = P_eng_out + P_AUX + P_eng_inertia ( + P_PTO_Transm + P_PTO_Consumer )
+ Assert.AreEqual(pEngFcmap.Value(), (pEngOut + pAux + pEngInertia + pPTOtransm + pPTOconsumer).Value(), 0.5,
+ "time: {0} distance: {1}", time, distance);
+
+ // P_eng_fcmap = sum(Losses Powertrain)
+ var pLossTot = pClutchLoss + pTC_Loss + pLossGbx + pLossRet + pGbxInertia + pLossAngle + pLossAxle + (distanceBased ? (pBrakeLoss +
+ pWheelInertia + pAir + pRoll + pGrad + pVehInertia) : pTrac) + pPTOconsumer + pPTOtransm + pP1Mech;
+ var pEngFcmapCalc = (pLossTot + pEngInertia + pAux).Value();
+ Assert.AreEqual(pEngFcmap.Value(), pEngFcmapCalc, 0.5, "time: {0} distance: {1}", time, distance);
+
+ Assert.AreEqual(pEngFcmap.Value(),
+ (pTrac + pWheelInertia + pBrakeLoss + pLossAxle + pLossRet + pLossGbx + pGbxInertia + pEngInertia + pAux +
+ pClutchLoss + pTC_Loss + pPTOtransm + pPTOconsumer + pP1Mech).Value(), 0.5, "time: {0} distance: {1}", time, distance);
+ }
+ }
+
+
+
[Category("LongRunning")]
[
TestCase(@"TestData\Integration\EngineeringMode\CityBus_AT\CityBus_AT_Ser.vecto"),
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/175kW.vfld b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/175kW.vfld
new file mode 100644
index 0000000000000000000000000000000000000000..c18c5c3cae86325fc562fc5a4ec0d10239f2a882
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/175kW.vfld
@@ -0,0 +1,252 @@
+engine speed [1/min], full load torque [Nm], motoring torque [Nm]
+600,478,-35
+608,485.52,-35.31693
+616,493.04,-35.63385
+624,500.56,-35.95077
+632,508.08,-36.26769
+640,515.6,-36.58462
+648,523.12,-36.90154
+656,530.64,-37.21846
+664,538.16,-37.53539
+672,545.68,-37.85231
+680,553.2,-38.16923
+688,560.72,-38.48615
+696,568.24,-38.80308
+704,575.76,-39.12
+712,583.28,-39.43692
+720,590.8,-39.75385
+728,598.32,-40.07077
+736,605.84,-40.3877
+744,613.36,-40.70462
+752,620.88,-41.02154
+760,628.4,-41.33846
+768,635.92,-41.65539
+776,643.44,-41.97231
+784,650.96,-42.28923
+792,658.48,-42.60616
+800,666,-42.92308
+808,673.44,-43.24
+816,680.88,-43.48
+824,688.32,-43.72
+832,695.76,-43.96
+840,703.2,-44.2
+848,710.64,-44.44
+856,718.08,-44.68
+864,725.52,-44.92
+872,732.96,-45.16
+880,740.4,-45.4
+888,747.84,-45.64
+896,755.28,-45.88
+904,762.72,-46.12
+912,770.16,-46.36
+920,777.6,-46.6
+928,785.04,-46.84
+936,792.48,-47.08
+944,799.92,-47.32
+952,807.36,-47.56
+960,814.8,-47.8
+968,822.24,-48.04
+976,829.68,-48.28
+984,837.12,-48.52
+992,844.56,-48.76
+1000,852,-49
+1008,856.16,-49.4
+1016,860.32,-49.8
+1024,864.48,-50.19579
+1032,868.64,-50.59098
+1040,872.8,-50.98618
+1048,876.96,-51.38137
+1056,881.12,-51.77656
+1064,885.28,-52.17175
+1072,889.44,-52.56694
+1080,893.6,-52.96214
+1088,897.76,-53.35733
+1096,901.92,-53.75252
+1104,906.08,-54.14772
+1112,910.24,-54.54291
+1120,914.4,-54.9381
+1128,918.56,-55.33329
+1136,922.72,-55.72849
+1144,926.88,-56.12368
+1152,931.04,-56.51887
+1160,935.2,-56.91406
+1168,939.36,-57.30925
+1176,943.52,-57.70444
+1184,947.68,-58.09964
+1192,951.84,-58.49483
+1200,956,-58.89002
+1208,956,-59.28522
+1216,956,-59.68041
+1224,956,-60.0756
+1232,956,-60.44
+1240,956,-60.8
+1248,956,-61.16
+1256,956,-61.52
+1264,956,-61.88
+1272,956,-62.24
+1280,956,-62.6
+1288,956,-62.96
+1296,956,-63.32
+1304,956,-63.68
+1312,956,-64.04
+1320,956,-64.4
+1328,956,-64.76
+1336,956,-65.12
+1344,956,-65.48
+1352,956,-65.84
+1360,956,-66.2
+1368,956,-66.56
+1376,956,-66.92
+1384,956,-67.28
+1392,956,-67.64
+1400,956,-68
+1408,956,-68.36
+1416,956,-68.72
+1424,956,-69.08
+1432,956,-69.44
+1440,956,-69.76736
+1448,956,-70.08386
+1456,956,-70.40035
+1464,956,-70.71684
+1472,956,-71.03333
+1480,956,-71.34982
+1488,956,-71.66631
+1496,956,-71.9828
+1504,956,-72.2993
+1512,956,-72.61579
+1520,956,-72.93228
+1528,956,-73.24877
+1536,956,-73.56526
+1544,956,-73.88175
+1552,956,-74.19825
+1560,956,-74.51474
+1568,956,-74.83123
+1576,956,-75.14772
+1584,956,-75.46421
+1592,956,-75.7807
+1600,956,-76.0972
+1608,953.56,-76.41369
+1616,951.12,-76.73018
+1624,948.68,-77.04667
+1632,946.24,-77.36316
+1640,943.8,-77.67965
+1648,941.36,-77.99614
+1656,938.92,-78.31264
+1664,936.48,-78.6
+1672,934.04,-78.8
+1680,931.6,-79
+1688,929.16,-79.2
+1696,926.72,-79.4
+1704,924.28,-79.6
+1712,921.84,-79.8
+1720,919.4,-80
+1728,916.96,-80.2
+1736,914.52,-80.4
+1744,912.08,-80.6
+1752,909.64,-80.8
+1760,907.2,-81
+1768,904.76,-81.2
+1776,902.32,-81.4
+1784,899.88,-81.6
+1792,897.44,-81.8
+1800,895,-82
+1808,892.24,-82.24
+1816,889.48,-82.48
+1824,886.72,-82.72
+1832,883.96,-82.96
+1840,881.2,-83.2
+1848,878.44,-83.44
+1856,875.68,-83.68
+1864,872.92,-83.92
+1872,870.16,-84.16
+1880,867.4,-84.4
+1888,864.64,-84.64
+1896,861.88,-84.88
+1904,859.12,-85.12
+1912,856.36,-85.36
+1920,853.6,-85.6
+1928,850.84,-85.84
+1936,848.08,-86.08
+1944,845.32,-86.32
+1952,842.56,-86.56
+1960,839.8,-86.8
+1968,837.04,-87.04
+1976,834.28,-87.28
+1984,831.52,-87.52
+1992,828.76,-87.76
+2000,826,-88
+2008,823.36,-88.44
+2016,820.72,-88.88
+2024,818.08,-89.32
+2032,815.44,-89.76
+2040,812.8,-90.2
+2048,810.16,-90.64
+2056,807.52,-91.08
+2064,804.88,-91.52
+2072,802.24,-91.96
+2080,799.6,-92.4
+2088,796.96,-92.84
+2096,794.32,-93.28
+2104,791.68,-93.72
+2112,789.04,-94.16
+2120,786.4,-94.6
+2128,783.76,-95.04
+2136,781.12,-95.48
+2144,778.48,-95.92
+2152,775.84,-96.36
+2160,773.2,-96.8
+2168,770.56,-97.24
+2176,767.92,-97.68
+2184,765.28,-98.06694
+2192,762.64,-98.40081
+2200,760,-98.73468
+2208,755.56,-99.06856
+2216,751.12,-99.40243
+2224,746.68,-99.73631
+2232,742.24,-100.0702
+2240,737.8,-100.404
+2248,733.36,-100.7379
+2256,728.92,-101.0718
+2264,724.48,-101.4057
+2272,720.04,-101.7395
+2280,715.6,-102.0734
+2288,711.16,-102.4073
+2296,706.72,-102.7412
+2304,702.28,-103.075
+2312,697.84,-103.4089
+2320,693.4,-103.7428
+2328,688.96,-104.0767
+2336,684.52,-104.4105
+2344,680.08,-104.7444
+2352,675.64,-105.0783
+2360,671.2,-105.4
+2368,666.76,-105.72
+2376,662.32,-106.04
+2384,657.88,-106.36
+2392,653.44,-106.68
+2400,649,-107
+2408,642.36,-107.32
+2416,635.72,-107.64
+2424,629.08,-107.96
+2432,622.44,-108.28
+2440,615.8,-108.6
+2448,609.16,-108.92
+2456,602.52,-109.24
+2464,595.88,-109.56
+2472,589.24,-109.88
+2480,582.6,-110.2
+2488,575.96,-110.52
+2496,569.32,-110.84
+2504,543.36,-111.16
+2512,498.08,-111.48
+2520,452.8,-111.8
+2528,407.52,-112.12
+2536,362.24,-112.44
+2544,316.96,-112.76
+2552,271.68,-113.08
+2560,226.4,-113.4
+2568,181.12,-113.72
+2576,135.84,-114.04
+2584,90.56,-114.36
+2592,45.28,-114.68
+2600,0,-115
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/175kW.vmap b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/175kW.vmap
new file mode 100644
index 0000000000000000000000000000000000000000..2cb356074807c6c2a1576af4a68ae166746eaf06
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/175kW.vmap
@@ -0,0 +1,137 @@
+engine speed [rpm], torque [Nm], fuel consumption [g/h]
+500,-31,0
+500,0,508
+500,95.6,1814.959
+500,191.2,3075.43
+500,286.8,4327.79
+500,382.4,6036.866
+500,478,7983
+500,573.6,9771.095
+600,-35,0
+600,0,508
+600,95.6,1814.959
+600,191.2,3075.43
+600,286.8,4327.79
+600,382.4,6036.866
+600,478,7983
+600,573.6,9771.095
+808,-43.24,0
+808.5,0,737.35
+808.5,95.6,2156.667
+808.5,191.2,3750.051
+808.5,286.8,5348.091
+808.5,382.4,7281.769
+808.5,478,9331.995
+808.5,573.6,11361.22
+808.5,669.2,13292.96
+808.5,673.905,13387.96
+808,769.505,15319.69
+1017,-49.85,0
+1017,0,966.7
+1017,95.6,2499.359
+1017,191.2,4425.586
+1017,286.8,6368.761
+1017,382.4,8527.475
+1017,478,10681.08
+1017,573.6,12806.98
+1017,669.2,14926.89
+1017,764.8,17075.42
+1017,860.4,19211.62
+1017,860.84,19221.39
+1017,956.44,21357.58
+1225,-60.125,0
+1225.4,0,1216.133
+1225.4,95.6,2867.396
+1225.4,191.2,5129.114
+1225.4,286.8,7421.546
+1225.4,382.4,9808.684
+1225.4,478,12096.76
+1225.4,573.6,14371.23
+1225.4,669.2,16697.39
+1225.4,764.8,19043.79
+1225.4,860.4,21380.34
+1225.4,956,23976.15
+1225,1051.6,26399.12
+1434,-69.53,0
+1433.9,0,1607.511
+1433.9,95.6,3422.282
+1433.9,191.2,6045.75
+1433.9,286.8,8717.55
+1433.9,382.4,11388.84
+1433.9,478,14040.14
+1433.9,573.6,16812.16
+1433.9,669.2,19499.88
+1433.9,764.8,22089.68
+1433.9,860.4,24706.84
+1433.9,956,27415.66
+1434,1051.6,30063.37
+1662,-78.55,0
+1661.8,0,2026.982
+1661.8,95.6,4054.852
+1661.8,191.2,7064.631
+1661.8,286.8,10168.59
+1661.8,382.4,13313.27
+1661.8,478,16389.77
+1661.8,573.6,19514.32
+1661.8,669.2,22625.12
+1661.8,764.8,25652.52
+1661.8,860.4,28788.1
+1661.8,937.151,31372.42
+1662,1032.751,34529.97
+1835,-83.05,0
+1834.7,0,2385.627
+1834.7,95.6,4596.783
+1834.7,191.2,7871.156
+1834.7,286.8,11300.52
+1834.7,382.4,14757.68
+1834.7,478,18117.38
+1834.7,573.6,21557.68
+1834.7,669.2,25079.78
+1834.7,764.8,28600.34
+1834.7,860.4,32191.22
+1834.7,883.0285,33047.82
+1835,978.6285,36639.92
+2008,-88.44,0
+2007.5,0,2806.425
+2007.5,95.6,5238.11
+2007.5,191.2,8755.323
+2007.5,286.8,12501.62
+2007.5,382.4,16278.62
+2007.5,478,20040.57
+2007.5,573.6,23826.03
+2007.5,669.2,27760.66
+2007.5,764.8,31692.9
+2007.5,823.525,34019.71
+2008,919.125,37924.6
+2180,-97.9,0
+2180.3,0,3323.097
+2180.3,95.6,5859.055
+2180.3,191.2,9668.133
+2180.3,286.8,13730.37
+2180.3,382.4,17786.81
+2180.3,478,21943.1
+2180.3,573.6,26354.73
+2180.3,669.2,30668.08
+2180.3,764.8,34924.28
+2180.3,766.501,35000.3
+2180,862.101,39256.51
+2353,-105.12,0
+2353.2,0,3807.896
+2353.2,95.6,6495.978
+2353.2,191.2,10634.86
+2353.2,286.8,15048
+2353.2,382.4,19654.95
+2353.2,478,24298.67
+2353.2,573.6,29311.43
+2353.2,669.2,34144.93
+2353,764.8,39097.94
+2453,-109.12,0
+2453.2,0,3807.896
+2453.2,95.6,6495.978
+2453.2,191.2,10634.86
+2453.2,286.8,15048
+2453.2,382.4,19654.95
+2453.2,478,24298.67
+2453.2,573.6,29311.43
+2453.2,669.2,34144.93
+2453,764.8,39097.94
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Axle_4x2.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Axle_4x2.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..8058a032dacb31c5833883a6d3cd179cc0b2f7c1
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Axle_4x2.vtlm
@@ -0,0 +1,834 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-6993.8,41.6
+0,-6525.1,44.1
+0,-6056.4,46.5
+0,-5587.7,51.4
+0,-5119.0,56.3
+0,-4650.3,61.2
+0,-4181.6,66.0
+0,-3712.9,70.9
+0,-3244.2,75.8
+0,-2775.5,80.7
+0,-2306.8,85.6
+0,-2072.4,80.7
+0,-1838.1,75.8
+0,-1603.7,70.9
+0,-1369.4,66.0
+0,-1135.0,61.2
+0,-900.7,56.3
+0,-666.3,51.4
+0,-432.0,46.5
+0,-314.8,44.1
+0,-197.6,41.6
+0,-139.0,40.4
+0,-80.4,39.2
+0,-21.8,38.0
+0,38.0,38.0
+0,97.8,38.0
+0,158.8,39.2
+0,219.8,40.4
+0,280.9,41.6
+0,402.9,44.1
+0,525.0,46.5
+0,769.1,51.4
+0,1013.2,56.3
+0,1257.3,61.2
+0,1501.4,66.0
+0,1745.6,70.9
+0,1989.7,75.8
+0,2233.8,80.7
+0,2477.9,85.6
+0,2966.1,95.3
+0,3454.4,105.1
+0,3942.6,114.9
+0,4430.8,124.6
+0,4919.1,134.4
+0,5407.3,144.2
+0,5895.5,153.9
+0,6383.8,163.7
+0,6872.0,173.5
+0,7360.2,183.2
+209,-6993.8,41.6
+209,-6525.1,44.1
+209,-6056.4,46.5
+209,-5587.7,51.4
+209,-5119.0,56.3
+209,-4650.3,61.2
+209,-4181.6,66.0
+209,-3712.9,70.9
+209,-3244.2,75.8
+209,-2775.5,80.7
+209,-2306.8,85.6
+209,-2072.4,80.7
+209,-1838.1,75.8
+209,-1603.7,70.9
+209,-1369.4,66.0
+209,-1135.0,61.2
+209,-900.7,56.3
+209,-666.3,51.4
+209,-432.0,46.5
+209,-314.8,44.1
+209,-197.6,41.6
+209,-139.0,40.4
+209,-80.4,39.2
+209,-21.8,38.0
+209,38.0,38.0
+209,97.8,38.0
+209,158.8,39.2
+209,219.8,40.4
+209,280.9,41.6
+209,402.9,44.1
+209,525.0,46.5
+209,769.1,51.4
+209,1013.2,56.3
+209,1257.3,61.2
+209,1501.4,66.0
+209,1745.6,70.9
+209,1989.7,75.8
+209,2233.8,80.7
+209,2477.9,85.6
+209,2966.1,95.3
+209,3454.4,105.1
+209,3942.6,114.9
+209,4430.8,124.6
+209,4919.1,134.4
+209,5407.3,144.2
+209,5895.5,153.9
+209,6383.8,163.7
+209,6872.0,173.5
+209,7360.2,183.2
+418,-6993.8,41.6
+418,-6525.1,44.1
+418,-6056.4,46.5
+418,-5587.7,51.4
+418,-5119.0,56.3
+418,-4650.3,61.2
+418,-4181.6,66.0
+418,-3712.9,70.9
+418,-3244.2,75.8
+418,-2775.5,80.7
+418,-2306.8,85.6
+418,-2072.4,80.7
+418,-1838.1,75.8
+418,-1603.7,70.9
+418,-1369.4,66.0
+418,-1135.0,61.2
+418,-900.7,56.3
+418,-666.3,51.4
+418,-432.0,46.5
+418,-314.8,44.1
+418,-197.6,41.6
+418,-139.0,40.4
+418,-80.4,39.2
+418,-21.8,38.0
+418,38.0,38.0
+418,97.8,38.0
+418,158.8,39.2
+418,219.8,40.4
+418,280.9,41.6
+418,402.9,44.1
+418,525.0,46.5
+418,769.1,51.4
+418,1013.2,56.3
+418,1257.3,61.2
+418,1501.4,66.0
+418,1745.6,70.9
+418,1989.7,75.8
+418,2233.8,80.7
+418,2477.9,85.6
+418,2966.1,95.3
+418,3454.4,105.1
+418,3942.6,114.9
+418,4430.8,124.6
+418,4919.1,134.4
+418,5407.3,144.2
+418,5895.5,153.9
+418,6383.8,163.7
+418,6872.0,173.5
+418,7360.2,183.2
+627,-6993.8,41.6
+627,-6525.1,44.1
+627,-6056.4,46.5
+627,-5587.7,51.4
+627,-5119.0,56.3
+627,-4650.3,61.2
+627,-4181.6,66.0
+627,-3712.9,70.9
+627,-3244.2,75.8
+627,-2775.5,80.7
+627,-2306.8,85.6
+627,-2072.4,80.7
+627,-1838.1,75.8
+627,-1603.7,70.9
+627,-1369.4,66.0
+627,-1135.0,61.2
+627,-900.7,56.3
+627,-666.3,51.4
+627,-432.0,46.5
+627,-314.8,44.1
+627,-197.6,41.6
+627,-139.0,40.4
+627,-80.4,39.2
+627,-21.8,38.0
+627,38.0,38.0
+627,97.8,38.0
+627,158.8,39.2
+627,219.8,40.4
+627,280.9,41.6
+627,402.9,44.1
+627,525.0,46.5
+627,769.1,51.4
+627,1013.2,56.3
+627,1257.3,61.2
+627,1501.4,66.0
+627,1745.6,70.9
+627,1989.7,75.8
+627,2233.8,80.7
+627,2477.9,85.6
+627,2966.1,95.3
+627,3454.4,105.1
+627,3942.6,114.9
+627,4430.8,124.6
+627,4919.1,134.4
+627,5407.3,144.2
+627,5895.5,153.9
+627,6383.8,163.7
+627,6872.0,173.5
+627,7360.2,183.2
+836,-6993.8,41.6
+836,-6525.1,44.1
+836,-6056.4,46.5
+836,-5587.7,51.4
+836,-5119.0,56.3
+836,-4650.3,61.2
+836,-4181.6,66.0
+836,-3712.9,70.9
+836,-3244.2,75.8
+836,-2775.5,80.7
+836,-2306.8,85.6
+836,-2072.4,80.7
+836,-1838.1,75.8
+836,-1603.7,70.9
+836,-1369.4,66.0
+836,-1135.0,61.2
+836,-900.7,56.3
+836,-666.3,51.4
+836,-432.0,46.5
+836,-314.8,44.1
+836,-197.6,41.6
+836,-139.0,40.4
+836,-80.4,39.2
+836,-21.8,38.0
+836,38.0,38.0
+836,97.8,38.0
+836,158.8,39.2
+836,219.8,40.4
+836,280.9,41.6
+836,402.9,44.1
+836,525.0,46.5
+836,769.1,51.4
+836,1013.2,56.3
+836,1257.3,61.2
+836,1501.4,66.0
+836,1745.6,70.9
+836,1989.7,75.8
+836,2233.8,80.7
+836,2477.9,85.6
+836,2966.1,95.3
+836,3454.4,105.1
+836,3942.6,114.9
+836,4430.8,124.6
+836,4919.1,134.4
+836,5407.3,144.2
+836,5895.5,153.9
+836,6383.8,163.7
+836,6872.0,173.5
+836,7360.2,183.2
+1045,-6993.8,41.6
+1045,-6525.1,44.1
+1045,-6056.4,46.5
+1045,-5587.7,51.4
+1045,-5119.0,56.3
+1045,-4650.3,61.2
+1045,-4181.6,66.0
+1045,-3712.9,70.9
+1045,-3244.2,75.8
+1045,-2775.5,80.7
+1045,-2306.8,85.6
+1045,-2072.4,80.7
+1045,-1838.1,75.8
+1045,-1603.7,70.9
+1045,-1369.4,66.0
+1045,-1135.0,61.2
+1045,-900.7,56.3
+1045,-666.3,51.4
+1045,-432.0,46.5
+1045,-314.8,44.1
+1045,-197.6,41.6
+1045,-139.0,40.4
+1045,-80.4,39.2
+1045,-21.8,38.0
+1045,38.0,38.0
+1045,97.8,38.0
+1045,158.8,39.2
+1045,219.8,40.4
+1045,280.9,41.6
+1045,402.9,44.1
+1045,525.0,46.5
+1045,769.1,51.4
+1045,1013.2,56.3
+1045,1257.3,61.2
+1045,1501.4,66.0
+1045,1745.6,70.9
+1045,1989.7,75.8
+1045,2233.8,80.7
+1045,2477.9,85.6
+1045,2966.1,95.3
+1045,3454.4,105.1
+1045,3942.6,114.9
+1045,4430.8,124.6
+1045,4919.1,134.4
+1045,5407.3,144.2
+1045,5895.5,153.9
+1045,6383.8,163.7
+1045,6872.0,173.5
+1045,7360.2,183.2
+1254,-6993.8,41.6
+1254,-6525.1,44.1
+1254,-6056.4,46.5
+1254,-5587.7,51.4
+1254,-5119.0,56.3
+1254,-4650.3,61.2
+1254,-4181.6,66.0
+1254,-3712.9,70.9
+1254,-3244.2,75.8
+1254,-2775.5,80.7
+1254,-2306.8,85.6
+1254,-2072.4,80.7
+1254,-1838.1,75.8
+1254,-1603.7,70.9
+1254,-1369.4,66.0
+1254,-1135.0,61.2
+1254,-900.7,56.3
+1254,-666.3,51.4
+1254,-432.0,46.5
+1254,-314.8,44.1
+1254,-197.6,41.6
+1254,-139.0,40.4
+1254,-80.4,39.2
+1254,-21.8,38.0
+1254,38.0,38.0
+1254,97.8,38.0
+1254,158.8,39.2
+1254,219.8,40.4
+1254,280.9,41.6
+1254,402.9,44.1
+1254,525.0,46.5
+1254,769.1,51.4
+1254,1013.2,56.3
+1254,1257.3,61.2
+1254,1501.4,66.0
+1254,1745.6,70.9
+1254,1989.7,75.8
+1254,2233.8,80.7
+1254,2477.9,85.6
+1254,2966.1,95.3
+1254,3454.4,105.1
+1254,3942.6,114.9
+1254,4430.8,124.6
+1254,4919.1,134.4
+1254,5407.3,144.2
+1254,5895.5,153.9
+1254,6383.8,163.7
+1254,6872.0,173.5
+1254,7360.2,183.2
+1463,-6993.8,41.6
+1463,-6525.1,44.1
+1463,-6056.4,46.5
+1463,-5587.7,51.4
+1463,-5119.0,56.3
+1463,-4650.3,61.2
+1463,-4181.6,66.0
+1463,-3712.9,70.9
+1463,-3244.2,75.8
+1463,-2775.5,80.7
+1463,-2306.8,85.6
+1463,-2072.4,80.7
+1463,-1838.1,75.8
+1463,-1603.7,70.9
+1463,-1369.4,66.0
+1463,-1135.0,61.2
+1463,-900.7,56.3
+1463,-666.3,51.4
+1463,-432.0,46.5
+1463,-314.8,44.1
+1463,-197.6,41.6
+1463,-139.0,40.4
+1463,-80.4,39.2
+1463,-21.8,38.0
+1463,38.0,38.0
+1463,97.8,38.0
+1463,158.8,39.2
+1463,219.8,40.4
+1463,280.9,41.6
+1463,402.9,44.1
+1463,525.0,46.5
+1463,769.1,51.4
+1463,1013.2,56.3
+1463,1257.3,61.2
+1463,1501.4,66.0
+1463,1745.6,70.9
+1463,1989.7,75.8
+1463,2233.8,80.7
+1463,2477.9,85.6
+1463,2966.1,95.3
+1463,3454.4,105.1
+1463,3942.6,114.9
+1463,4430.8,124.6
+1463,4919.1,134.4
+1463,5407.3,144.2
+1463,5895.5,153.9
+1463,6383.8,163.7
+1463,6872.0,173.5
+1463,7360.2,183.2
+1672,-6993.8,41.6
+1672,-6525.1,44.1
+1672,-6056.4,46.5
+1672,-5587.7,51.4
+1672,-5119.0,56.3
+1672,-4650.3,61.2
+1672,-4181.6,66.0
+1672,-3712.9,70.9
+1672,-3244.2,75.8
+1672,-2775.5,80.7
+1672,-2306.8,85.6
+1672,-2072.4,80.7
+1672,-1838.1,75.8
+1672,-1603.7,70.9
+1672,-1369.4,66.0
+1672,-1135.0,61.2
+1672,-900.7,56.3
+1672,-666.3,51.4
+1672,-432.0,46.5
+1672,-314.8,44.1
+1672,-197.6,41.6
+1672,-139.0,40.4
+1672,-80.4,39.2
+1672,-21.8,38.0
+1672,38.0,38.0
+1672,97.8,38.0
+1672,158.8,39.2
+1672,219.8,40.4
+1672,280.9,41.6
+1672,402.9,44.1
+1672,525.0,46.5
+1672,769.1,51.4
+1672,1013.2,56.3
+1672,1257.3,61.2
+1672,1501.4,66.0
+1672,1745.6,70.9
+1672,1989.7,75.8
+1672,2233.8,80.7
+1672,2477.9,85.6
+1672,2966.1,95.3
+1672,3454.4,105.1
+1672,3942.6,114.9
+1672,4430.8,124.6
+1672,4919.1,134.4
+1672,5407.3,144.2
+1672,5895.5,153.9
+1672,6383.8,163.7
+1672,6872.0,173.5
+1672,7360.2,183.2
+1881,-6993.8,41.6
+1881,-6525.1,44.1
+1881,-6056.4,46.5
+1881,-5587.7,51.4
+1881,-5119.0,56.3
+1881,-4650.3,61.2
+1881,-4181.6,66.0
+1881,-3712.9,70.9
+1881,-3244.2,75.8
+1881,-2775.5,80.7
+1881,-2306.8,85.6
+1881,-2072.4,80.7
+1881,-1838.1,75.8
+1881,-1603.7,70.9
+1881,-1369.4,66.0
+1881,-1135.0,61.2
+1881,-900.7,56.3
+1881,-666.3,51.4
+1881,-432.0,46.5
+1881,-314.8,44.1
+1881,-197.6,41.6
+1881,-139.0,40.4
+1881,-80.4,39.2
+1881,-21.8,38.0
+1881,38.0,38.0
+1881,97.8,38.0
+1881,158.8,39.2
+1881,219.8,40.4
+1881,280.9,41.6
+1881,402.9,44.1
+1881,525.0,46.5
+1881,769.1,51.4
+1881,1013.2,56.3
+1881,1257.3,61.2
+1881,1501.4,66.0
+1881,1745.6,70.9
+1881,1989.7,75.8
+1881,2233.8,80.7
+1881,2477.9,85.6
+1881,2966.1,95.3
+1881,3454.4,105.1
+1881,3942.6,114.9
+1881,4430.8,124.6
+1881,4919.1,134.4
+1881,5407.3,144.2
+1881,5895.5,153.9
+1881,6383.8,163.7
+1881,6872.0,173.5
+1881,7360.2,183.2
+2090,-6993.8,41.6
+2090,-6525.1,44.1
+2090,-6056.4,46.5
+2090,-5587.7,51.4
+2090,-5119.0,56.3
+2090,-4650.3,61.2
+2090,-4181.6,66.0
+2090,-3712.9,70.9
+2090,-3244.2,75.8
+2090,-2775.5,80.7
+2090,-2306.8,85.6
+2090,-2072.4,80.7
+2090,-1838.1,75.8
+2090,-1603.7,70.9
+2090,-1369.4,66.0
+2090,-1135.0,61.2
+2090,-900.7,56.3
+2090,-666.3,51.4
+2090,-432.0,46.5
+2090,-314.8,44.1
+2090,-197.6,41.6
+2090,-139.0,40.4
+2090,-80.4,39.2
+2090,-21.8,38.0
+2090,38.0,38.0
+2090,97.8,38.0
+2090,158.8,39.2
+2090,219.8,40.4
+2090,280.9,41.6
+2090,402.9,44.1
+2090,525.0,46.5
+2090,769.1,51.4
+2090,1013.2,56.3
+2090,1257.3,61.2
+2090,1501.4,66.0
+2090,1745.6,70.9
+2090,1989.7,75.8
+2090,2233.8,80.7
+2090,2477.9,85.6
+2090,2966.1,95.3
+2090,3454.4,105.1
+2090,3942.6,114.9
+2090,4430.8,124.6
+2090,4919.1,134.4
+2090,5407.3,144.2
+2090,5895.5,153.9
+2090,6383.8,163.7
+2090,6872.0,173.5
+2090,7360.2,183.2
+2299,-6993.8,41.6
+2299,-6525.1,44.1
+2299,-6056.4,46.5
+2299,-5587.7,51.4
+2299,-5119.0,56.3
+2299,-4650.3,61.2
+2299,-4181.6,66.0
+2299,-3712.9,70.9
+2299,-3244.2,75.8
+2299,-2775.5,80.7
+2299,-2306.8,85.6
+2299,-2072.4,80.7
+2299,-1838.1,75.8
+2299,-1603.7,70.9
+2299,-1369.4,66.0
+2299,-1135.0,61.2
+2299,-900.7,56.3
+2299,-666.3,51.4
+2299,-432.0,46.5
+2299,-314.8,44.1
+2299,-197.6,41.6
+2299,-139.0,40.4
+2299,-80.4,39.2
+2299,-21.8,38.0
+2299,38.0,38.0
+2299,97.8,38.0
+2299,158.8,39.2
+2299,219.8,40.4
+2299,280.9,41.6
+2299,402.9,44.1
+2299,525.0,46.5
+2299,769.1,51.4
+2299,1013.2,56.3
+2299,1257.3,61.2
+2299,1501.4,66.0
+2299,1745.6,70.9
+2299,1989.7,75.8
+2299,2233.8,80.7
+2299,2477.9,85.6
+2299,2966.1,95.3
+2299,3454.4,105.1
+2299,3942.6,114.9
+2299,4430.8,124.6
+2299,4919.1,134.4
+2299,5407.3,144.2
+2299,5895.5,153.9
+2299,6383.8,163.7
+2299,6872.0,173.5
+2299,7360.2,183.2
+2508,-6993.8,41.6
+2508,-6525.1,44.1
+2508,-6056.4,46.5
+2508,-5587.7,51.4
+2508,-5119.0,56.3
+2508,-4650.3,61.2
+2508,-4181.6,66.0
+2508,-3712.9,70.9
+2508,-3244.2,75.8
+2508,-2775.5,80.7
+2508,-2306.8,85.6
+2508,-2072.4,80.7
+2508,-1838.1,75.8
+2508,-1603.7,70.9
+2508,-1369.4,66.0
+2508,-1135.0,61.2
+2508,-900.7,56.3
+2508,-666.3,51.4
+2508,-432.0,46.5
+2508,-314.8,44.1
+2508,-197.6,41.6
+2508,-139.0,40.4
+2508,-80.4,39.2
+2508,-21.8,38.0
+2508,38.0,38.0
+2508,97.8,38.0
+2508,158.8,39.2
+2508,219.8,40.4
+2508,280.9,41.6
+2508,402.9,44.1
+2508,525.0,46.5
+2508,769.1,51.4
+2508,1013.2,56.3
+2508,1257.3,61.2
+2508,1501.4,66.0
+2508,1745.6,70.9
+2508,1989.7,75.8
+2508,2233.8,80.7
+2508,2477.9,85.6
+2508,2966.1,95.3
+2508,3454.4,105.1
+2508,3942.6,114.9
+2508,4430.8,124.6
+2508,4919.1,134.4
+2508,5407.3,144.2
+2508,5895.5,153.9
+2508,6383.8,163.7
+2508,6872.0,173.5
+2508,7360.2,183.2
+2717,-6993.8,41.6
+2717,-6525.1,44.1
+2717,-6056.4,46.5
+2717,-5587.7,51.4
+2717,-5119.0,56.3
+2717,-4650.3,61.2
+2717,-4181.6,66.0
+2717,-3712.9,70.9
+2717,-3244.2,75.8
+2717,-2775.5,80.7
+2717,-2306.8,85.6
+2717,-2072.4,80.7
+2717,-1838.1,75.8
+2717,-1603.7,70.9
+2717,-1369.4,66.0
+2717,-1135.0,61.2
+2717,-900.7,56.3
+2717,-666.3,51.4
+2717,-432.0,46.5
+2717,-314.8,44.1
+2717,-197.6,41.6
+2717,-139.0,40.4
+2717,-80.4,39.2
+2717,-21.8,38.0
+2717,38.0,38.0
+2717,97.8,38.0
+2717,158.8,39.2
+2717,219.8,40.4
+2717,280.9,41.6
+2717,402.9,44.1
+2717,525.0,46.5
+2717,769.1,51.4
+2717,1013.2,56.3
+2717,1257.3,61.2
+2717,1501.4,66.0
+2717,1745.6,70.9
+2717,1989.7,75.8
+2717,2233.8,80.7
+2717,2477.9,85.6
+2717,2966.1,95.3
+2717,3454.4,105.1
+2717,3942.6,114.9
+2717,4430.8,124.6
+2717,4919.1,134.4
+2717,5407.3,144.2
+2717,5895.5,153.9
+2717,6383.8,163.7
+2717,6872.0,173.5
+2717,7360.2,183.2
+2926,-6993.8,41.6
+2926,-6525.1,44.1
+2926,-6056.4,46.5
+2926,-5587.7,51.4
+2926,-5119.0,56.3
+2926,-4650.3,61.2
+2926,-4181.6,66.0
+2926,-3712.9,70.9
+2926,-3244.2,75.8
+2926,-2775.5,80.7
+2926,-2306.8,85.6
+2926,-2072.4,80.7
+2926,-1838.1,75.8
+2926,-1603.7,70.9
+2926,-1369.4,66.0
+2926,-1135.0,61.2
+2926,-900.7,56.3
+2926,-666.3,51.4
+2926,-432.0,46.5
+2926,-314.8,44.1
+2926,-197.6,41.6
+2926,-139.0,40.4
+2926,-80.4,39.2
+2926,-21.8,38.0
+2926,38.0,38.0
+2926,97.8,38.0
+2926,158.8,39.2
+2926,219.8,40.4
+2926,280.9,41.6
+2926,402.9,44.1
+2926,525.0,46.5
+2926,769.1,51.4
+2926,1013.2,56.3
+2926,1257.3,61.2
+2926,1501.4,66.0
+2926,1745.6,70.9
+2926,1989.7,75.8
+2926,2233.8,80.7
+2926,2477.9,85.6
+2926,2966.1,95.3
+2926,3454.4,105.1
+2926,3942.6,114.9
+2926,4430.8,124.6
+2926,4919.1,134.4
+2926,5407.3,144.2
+2926,5895.5,153.9
+2926,6383.8,163.7
+2926,6872.0,173.5
+2926,7360.2,183.2
+3135,-6993.8,41.6
+3135,-6525.1,44.1
+3135,-6056.4,46.5
+3135,-5587.7,51.4
+3135,-5119.0,56.3
+3135,-4650.3,61.2
+3135,-4181.6,66.0
+3135,-3712.9,70.9
+3135,-3244.2,75.8
+3135,-2775.5,80.7
+3135,-2306.8,85.6
+3135,-2072.4,80.7
+3135,-1838.1,75.8
+3135,-1603.7,70.9
+3135,-1369.4,66.0
+3135,-1135.0,61.2
+3135,-900.7,56.3
+3135,-666.3,51.4
+3135,-432.0,46.5
+3135,-314.8,44.1
+3135,-197.6,41.6
+3135,-139.0,40.4
+3135,-80.4,39.2
+3135,-21.8,38.0
+3135,38.0,38.0
+3135,97.8,38.0
+3135,158.8,39.2
+3135,219.8,40.4
+3135,280.9,41.6
+3135,402.9,44.1
+3135,525.0,46.5
+3135,769.1,51.4
+3135,1013.2,56.3
+3135,1257.3,61.2
+3135,1501.4,66.0
+3135,1745.6,70.9
+3135,1989.7,75.8
+3135,2233.8,80.7
+3135,2477.9,85.6
+3135,2966.1,95.3
+3135,3454.4,105.1
+3135,3942.6,114.9
+3135,4430.8,124.6
+3135,4919.1,134.4
+3135,5407.3,144.2
+3135,5895.5,153.9
+3135,6383.8,163.7
+3135,6872.0,173.5
+3135,7360.2,183.2
+3344,-6993.8,41.6
+3344,-6525.1,44.1
+3344,-6056.4,46.5
+3344,-5587.7,51.4
+3344,-5119.0,56.3
+3344,-4650.3,61.2
+3344,-4181.6,66.0
+3344,-3712.9,70.9
+3344,-3244.2,75.8
+3344,-2775.5,80.7
+3344,-2306.8,85.6
+3344,-2072.4,80.7
+3344,-1838.1,75.8
+3344,-1603.7,70.9
+3344,-1369.4,66.0
+3344,-1135.0,61.2
+3344,-900.7,56.3
+3344,-666.3,51.4
+3344,-432.0,46.5
+3344,-314.8,44.1
+3344,-197.6,41.6
+3344,-139.0,40.4
+3344,-80.4,39.2
+3344,-21.8,38.0
+3344,38.0,38.0
+3344,97.8,38.0
+3344,158.8,39.2
+3344,219.8,40.4
+3344,280.9,41.6
+3344,402.9,44.1
+3344,525.0,46.5
+3344,769.1,51.4
+3344,1013.2,56.3
+3344,1257.3,61.2
+3344,1501.4,66.0
+3344,1745.6,70.9
+3344,1989.7,75.8
+3344,2233.8,80.7
+3344,2477.9,85.6
+3344,2966.1,95.3
+3344,3454.4,105.1
+3344,3942.6,114.9
+3344,4430.8,124.6
+3344,4919.1,134.4
+3344,5407.3,144.2
+3344,5895.5,153.9
+3344,6383.8,163.7
+3344,6872.0,173.5
+3344,7360.2,183.2
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Axle_4x2_orig.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Axle_4x2_orig.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..a3a48d41fa70ad13bcb1a39c12f25e9cbb166a2f
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Axle_4x2_orig.vtlm
@@ -0,0 +1,157 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-1000,25
+0,0,5
+0,1000,25
+0,2000,45
+0,3000,65
+0,4000,85
+0,5000,105
+0,6000,125
+0,7000,145
+0,8000,165
+0,9000,185
+0,10000,205
+238,-1000,25.2
+238,0,5.2
+238,1000,25.2
+238,2000,45.2
+238,3000,65.2
+238,4000,85.2
+238,5000,105.2
+238,6000,125.2
+238,7000,145.2
+238,8000,165.2
+238,9000,185.2
+238,10000,205.2
+475,-1000,25.5
+475,0,5.5
+475,551,16.5
+475,1102,27.5
+475,1653,38.5
+475,2204,49.5
+475,2755,60.6
+475,3306,71.6
+475,3857,82.6
+475,4408,93.6
+475,4959,104.6
+475,5510,115.7
+713,-1000,25.7
+713,0,5.7
+713,346,12.6
+713,692,19.5
+713,1038,26.5
+713,1384,33.4
+713,1730,40.3
+713,2076,47.2
+713,2422,54.1
+713,2768,61
+713,3114,68
+713,3460,74.9
+950,-1000,25.9
+950,0,5.9
+950,278,11.5
+950,555,17
+950,833,22.6
+950,1111,28.1
+950,1389,33.7
+950,1666,39.3
+950,1944,44.8
+950,2222,50.4
+950,2500,55.9
+950,2777,61.5
+1188,-1000,26.2
+1188,0,6.2
+1188,221,10.6
+1188,443,15
+1188,664,19.4
+1188,886,23.9
+1188,1107,28.3
+1188,1329,32.7
+1188,1550,37.2
+1188,1772,41.6
+1188,1993,46
+1188,2215,50.4
+1425,-1000,26.4
+1425,0,6.4
+1425,180,10
+1425,361,13.6
+1425,541,17.2
+1425,721,20.8
+1425,902,24.4
+1425,1082,28
+1425,1262,31.6
+1425,1443,35.2
+1425,1623,38.8
+1425,1804,42.5
+1663,-1000,26.6
+1663,0,6.6
+1663,146,9.5
+1663,292,12.4
+1663,437,15.4
+1663,583,18.3
+1663,729,21.2
+1663,875,24.1
+1663,1020,27
+1663,1166,29.9
+1663,1312,32.9
+1663,1458,35.8
+1900,-1000,26.8
+1900,0,6.8
+1900,130,9.4
+1900,260,12
+1900,390,14.6
+1900,520,17.2
+1900,650,19.8
+1900,780,22.4
+1900,909,25
+1900,1039,27.6
+1900,1169,30.2
+1900,1299,32.8
+2138,-1000,27.1
+2138,0,7.1
+2138,114,9.4
+2138,228,11.6
+2138,342,13.9
+2138,456,16.2
+2138,570,18.5
+2138,684,20.8
+2138,798,23
+2138,912,25.3
+2138,1026,27.6
+2138,1140,29.9
+2375,-1000,27.3
+2375,0,7.3
+2375,110,9.5
+2375,220,11.7
+2375,330,13.9
+2375,440,16.1
+2375,550,18.3
+2375,660,20.5
+2375,770,22.7
+2375,880,24.9
+2375,990,27.1
+2375,1100,29.3
+2613,-1000,27.5
+2613,0,7.5
+2613,110,9.7
+2613,220,11.9
+2613,330,14.1
+2613,440,16.3
+2613,550,18.5
+2613,660,20.7
+2613,770,22.9
+2613,880,25.1
+2613,990,27.3
+2613,1100,29.5
+3088,-1000,28
+3088,0,8
+3088,110,10.2
+3088,220,12.4
+3088,330,14.6
+3088,440,16.8
+3088,550,19
+3088,660,21.2
+3088,770,23.4
+3088,880,25.6
+3088,990,27.8
+3088,1100,30
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Class2_RigidTruck.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Class2_RigidTruck.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..732ccaf202df4d0981b0b2495cb235ebf8553a6d
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Class2_RigidTruck.vveh
@@ -0,0 +1,60 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T10:06:43.0936564Z",
+ "AppVersion": "3",
+ "FileVersion": 8
+ },
+ "Body": {
+ "SavedInDeclMode": true,
+ "VehCat": "RigidTruck",
+ "CurbWeight": 4670.0,
+ "CurbWeightExtra": 0.0,
+ "Loading": 0.0,
+ "MassMax": 11.99,
+ "CdA": 4.83,
+ "rdyn": 0.0,
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "Retarder": {
+ "Type": "None",
+ "Ratio": 0.0,
+ "File": ""
+ },
+ "Angledrive": {
+ "Type": "None",
+ "Ratio": 0.0,
+ "LossMap": ""
+ },
+ "PTO": {
+ "Type": "None",
+ "LossMap": "",
+ "Cycle": ""
+ },
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.0,
+ "TwinTyres": false,
+ "RRCISO": 0.0065,
+ "FzISO": 20850.0
+ },
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.0,
+ "TwinTyres": true,
+ "RRCISO": 0.0075,
+ "FzISO": 20850.0
+ }
+ ]
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "None",
+ "ATEcoRollReleaseLockupClutch": false
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Class2_RigidTruck_DECL.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Class2_RigidTruck_DECL.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..cf83ebd7702bd89b404896591776610c27e80b25
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Class2_RigidTruck_DECL.vecto
@@ -0,0 +1,67 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T15:21:02.8206564Z",
+ "AppVersion": "3",
+ "FileVersion": 3
+ },
+ "Body": {
+ "SavedInDeclMode": true,
+ "EngineOnlyMode": false,
+ "VehicleFile": "Class2_RigidTruck.vveh",
+ "EngineFile": "Engine_175kW_6.8l.veng",
+ "GearboxFile": "MT_6.vgbx",
+ "AuxiliaryAssembly": "Classic",
+ "AuxiliaryVersion": "CLASSIC",
+ "AdvancedAuxiliaryFilePath": "",
+ "Aux": [
+ {
+ "ID": "FAN",
+ "Type": "Fan",
+ "Technology": [
+ "Belt driven or driven via transm. - Electronically controlled visco clutch"
+ ]
+ },
+ {
+ "ID": "STP",
+ "Type": "Steering pump",
+ "Technology": [
+ "Fixed displacement with elec. control"
+ ]
+ },
+ {
+ "ID": "AC",
+ "Type": "HVAC",
+ "Technology": [
+ "Default"
+ ]
+ },
+ {
+ "ID": "ES",
+ "Type": "Electric System",
+ "Technology": [
+ "Standard technology"
+ ]
+ },
+ {
+ "ID": "PS",
+ "Type": "Pneumatic System",
+ "Technology": [
+ "Medium Supply 1-stage + ESS + AMS"
+ ]
+ }
+ ],
+ "StartStop": {
+ "Enabled": false,
+ "MaxSpeed": 5.0,
+ "MinTime": 5.0,
+ "Delay": 5.0
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Overspeed",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Class2_RigidTruck_NoAirdrag.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Class2_RigidTruck_NoAirdrag.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..e4417aadc5129ad5a6f0258acd4a08b748c7b7c6
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Class2_RigidTruck_NoAirdrag.vveh
@@ -0,0 +1,55 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T10:06:43.0936564Z",
+ "AppVersion": "3",
+ "FileVersion": 7
+ },
+ "Body": {
+ "SavedInDeclMode": true,
+ "VehCat": "RigidTruck",
+ "CurbWeight": 4670.0,
+ "CurbWeightExtra": 0.0,
+ "Loading": 0.0,
+ "MassMax": 11.99,
+ "rdyn": 0.0,
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "Retarder": {
+ "Type": "None",
+ "Ratio": 0.0,
+ "File": ""
+ },
+ "Angledrive": {
+ "Type": "None",
+ "Ratio": 0.0,
+ "LossMap": ""
+ },
+ "PTO": {
+ "Type": "None",
+ "LossMap": "",
+ "Cycle": ""
+ },
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.0,
+ "TwinTyres": false,
+ "RRCISO": 0.0065,
+ "FzISO": 20850.0
+ },
+ {
+ "Inertia": 6.5,
+ "Wheels": "265/70 R19.5",
+ "AxleWeightShare": 0.0,
+ "TwinTyres": true,
+ "RRCISO": 0.0075,
+ "FzISO": 20850.0
+ }
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Class2_RigidTruck_NoAirdrag_DECL.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Class2_RigidTruck_NoAirdrag_DECL.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..d4dcaa469fb0330e304f2f269f778718c8cabb35
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Class2_RigidTruck_NoAirdrag_DECL.vecto
@@ -0,0 +1,67 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T15:21:02.8206564Z",
+ "AppVersion": "3",
+ "FileVersion": 3
+ },
+ "Body": {
+ "SavedInDeclMode": true,
+ "EngineOnlyMode": false,
+ "VehicleFile": "Class2_RigidTruck_NoAirdrag.vveh",
+ "EngineFile": "Engine_175kW_6.8l.veng",
+ "GearboxFile": "MT_6.vgbx",
+ "AuxiliaryAssembly": "Classic",
+ "AuxiliaryVersion": "CLASSIC",
+ "AdvancedAuxiliaryFilePath": "",
+ "Aux": [
+ {
+ "ID": "FAN",
+ "Type": "Fan",
+ "Technology": [
+ "Belt driven or driven via transm. - Electronically controlled visco clutch"
+ ]
+ },
+ {
+ "ID": "STP",
+ "Type": "Steering pump",
+ "Technology": [
+ "Fixed displacement with elec. control"
+ ]
+ },
+ {
+ "ID": "AC",
+ "Type": "HVAC",
+ "Technology": [
+ "Default"
+ ]
+ },
+ {
+ "ID": "ES",
+ "Type": "Electric System",
+ "Technology": [
+ "Standard technology"
+ ]
+ },
+ {
+ "ID": "PS",
+ "Type": "Pneumatic System",
+ "Technology": [
+ "Medium Supply 1-stage + ESS + AMS"
+ ]
+ }
+ ],
+ "StartStop": {
+ "Enabled": false,
+ "MaxSpeed": 5.0,
+ "MinTime": 5.0,
+ "Delay": 5.0
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Overspeed",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Engine_175kW_6.8l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Engine_175kW_6.8l.veng
new file mode 100644
index 0000000000000000000000000000000000000000..f10c2b595f3e0d850b503dcc6a99ed8574396aa5
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Engine_175kW_6.8l.veng
@@ -0,0 +1,21 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T10:06:50.6286564Z",
+ "AppVersion": "3",
+ "FileVersion": 3
+ },
+ "Body": {
+ "SavedInDeclMode": true,
+ "ModelName": "175kW 6.8l Engine",
+ "Displacement": "6871",
+ "IdlingSpeed": 600.0,
+ "Inertia": 3.56517,
+ "FullLoadCurve": "175kW.vfld",
+ "FuelMap": "175kW.vmap",
+ "WHTC-Urban": 1.0,
+ "WHTC-Rural": 1.0,
+ "WHTC-Motorway": 1.0,
+ "ColdHotBalancingFactor": 1.0
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Gear_1.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Gear_1.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..b4274373230f50e6df7eb9702010c7a868dc967e
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Gear_1.vtlm
@@ -0,0 +1,233 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5500.0,229.6
+0,-5000.0,209.6
+0,-4500.0,169.6
+0,-4000.0,169.6
+0,-3500.0,149.6
+0,-3000.0,129.6
+0,-2500.0,109.6
+0,-2000.0,89.6
+0,-1600.0,73.6
+0,-1200.0,57.6
+0,-900.0,45.6
+0,-600.0,33.6
+0,-400.0,25.6
+0,-200.0,17.6
+0,0.0,17.6
+0,200.0,17.6
+0,400.0,25.6
+0,600.0,33.6
+0,900.0,45.6
+0,1200.0,57.6
+0,1600.0,73.6
+0,2000.0,89.6
+0,2500.0,109.6
+0,3000.0,129.6
+0,3500.0,149.6
+0,4000.0,169.6
+0,4500.0,189.6
+0,5000.0,209.6
+0,5500.0,229.6
+600,-5500.0,229.6
+600,-5000.0,209.6
+600,-4500.0,169.6
+600,-4000.0,169.6
+600,-3500.0,149.6
+600,-3000.0,129.6
+600,-2500.0,109.6
+600,-2000.0,89.6
+600,-1600.0,73.6
+600,-1200.0,57.6
+600,-900.0,45.6
+600,-600.0,33.6
+600,-400.0,25.6
+600,-200.0,17.6
+600,0.0,17.6
+600,200.0,17.6
+600,400.0,25.6
+600,600.0,33.6
+600,900.0,45.6
+600,1200.0,57.6
+600,1600.0,73.6
+600,2000.0,89.6
+600,2500.0,109.6
+600,3000.0,129.6
+600,3500.0,149.6
+600,4000.0,169.6
+600,4500.0,189.6
+600,5000.0,209.6
+600,5500.0,229.6
+900,-5500.0,231.4
+900,-5000.0,211.4
+900,-4500.0,171.4
+900,-4000.0,171.4
+900,-3500.0,151.4
+900,-3000.0,131.4
+900,-2500.0,111.4
+900,-2000.0,91.4
+900,-1600.0,75.4
+900,-1200.0,59.4
+900,-900.0,47.4
+900,-600.0,35.4
+900,-400.0,27.4
+900,-200.0,19.4
+900,0.0,19.4
+900,200.0,19.4
+900,400.0,27.4
+900,600.0,35.4
+900,900.0,47.4
+900,1200.0,59.4
+900,1600.0,75.4
+900,2000.0,91.4
+900,2500.0,111.4
+900,3000.0,131.4
+900,3500.0,151.4
+900,4000.0,171.4
+900,4500.0,191.4
+900,5000.0,211.4
+900,5500.0,231.4
+1200,-5500.0,233.2
+1200,-5000.0,213.2
+1200,-4500.0,173.2
+1200,-4000.0,173.2
+1200,-3500.0,153.2
+1200,-3000.0,133.2
+1200,-2500.0,113.2
+1200,-2000.0,93.2
+1200,-1600.0,77.2
+1200,-1200.0,61.2
+1200,-900.0,49.2
+1200,-600.0,37.2
+1200,-400.0,29.2
+1200,-200.0,21.2
+1200,0.0,21.2
+1200,200.0,21.2
+1200,400.0,29.2
+1200,600.0,37.2
+1200,900.0,49.2
+1200,1200.0,61.2
+1200,1600.0,77.2
+1200,2000.0,93.2
+1200,2500.0,113.2
+1200,3000.0,133.2
+1200,3500.0,153.2
+1200,4000.0,173.2
+1200,4500.0,193.2
+1200,5000.0,213.2
+1200,5500.0,233.2
+1600,-5500.0,235.6
+1600,-5000.0,215.6
+1600,-4500.0,175.6
+1600,-4000.0,175.6
+1600,-3500.0,155.6
+1600,-3000.0,135.6
+1600,-2500.0,115.6
+1600,-2000.0,95.6
+1600,-1600.0,79.6
+1600,-1200.0,63.6
+1600,-900.0,51.6
+1600,-600.0,39.6
+1600,-400.0,31.6
+1600,-200.0,23.6
+1600,0.0,23.6
+1600,200.0,23.6
+1600,400.0,31.6
+1600,600.0,39.6
+1600,900.0,51.6
+1600,1200.0,63.6
+1600,1600.0,79.6
+1600,2000.0,95.6
+1600,2500.0,115.6
+1600,3000.0,135.6
+1600,3500.0,155.6
+1600,4000.0,175.6
+1600,4500.0,195.6
+1600,5000.0,215.6
+1600,5500.0,235.6
+2000,-5500.0,238.0
+2000,-5000.0,218.0
+2000,-4500.0,178.0
+2000,-4000.0,178.0
+2000,-3500.0,158.0
+2000,-3000.0,138.0
+2000,-2500.0,118.0
+2000,-2000.0,98.0
+2000,-1600.0,82.0
+2000,-1200.0,66.0
+2000,-900.0,54.0
+2000,-600.0,42.0
+2000,-400.0,34.0
+2000,-200.0,26.0
+2000,0.0,26.0
+2000,200.0,26.0
+2000,400.0,34.0
+2000,600.0,42.0
+2000,900.0,54.0
+2000,1200.0,66.0
+2000,1600.0,82.0
+2000,2000.0,98.0
+2000,2500.0,118.0
+2000,3000.0,138.0
+2000,3500.0,158.0
+2000,4000.0,178.0
+2000,4500.0,198.0
+2000,5000.0,218.0
+2000,5500.0,238.0
+2500,-5500.0,241.0
+2500,-5000.0,221.0
+2500,-4500.0,181.0
+2500,-4000.0,181.0
+2500,-3500.0,161.0
+2500,-3000.0,141.0
+2500,-2500.0,121.0
+2500,-2000.0,101.0
+2500,-1600.0,85.0
+2500,-1200.0,69.0
+2500,-900.0,57.0
+2500,-600.0,45.0
+2500,-400.0,37.0
+2500,-200.0,29.0
+2500,0.0,29.0
+2500,200.0,29.0
+2500,400.0,37.0
+2500,600.0,45.0
+2500,900.0,57.0
+2500,1200.0,69.0
+2500,1600.0,85.0
+2500,2000.0,101.0
+2500,2500.0,121.0
+2500,3000.0,141.0
+2500,3500.0,161.0
+2500,4000.0,181.0
+2500,4500.0,201.0
+2500,5000.0,221.0
+2500,5500.0,241.0
+3000,-5500.0,244.0
+3000,-5000.0,224.0
+3000,-4500.0,184.0
+3000,-4000.0,184.0
+3000,-3500.0,164.0
+3000,-3000.0,144.0
+3000,-2500.0,124.0
+3000,-2000.0,104.0
+3000,-1600.0,88.0
+3000,-1200.0,72.0
+3000,-900.0,60.0
+3000,-600.0,48.0
+3000,-400.0,40.0
+3000,-200.0,32.0
+3000,0.0,32.0
+3000,200.0,32.0
+3000,400.0,40.0
+3000,600.0,48.0
+3000,900.0,60.0
+3000,1200.0,72.0
+3000,1600.0,88.0
+3000,2000.0,104.0
+3000,2500.0,124.0
+3000,3000.0,144.0
+3000,3500.0,164.0
+3000,4000.0,184.0
+3000,4500.0,204.0
+3000,5000.0,224.0
+3000,5500.0,244.0
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Gear_2.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Gear_2.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..b4274373230f50e6df7eb9702010c7a868dc967e
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Gear_2.vtlm
@@ -0,0 +1,233 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5500.0,229.6
+0,-5000.0,209.6
+0,-4500.0,169.6
+0,-4000.0,169.6
+0,-3500.0,149.6
+0,-3000.0,129.6
+0,-2500.0,109.6
+0,-2000.0,89.6
+0,-1600.0,73.6
+0,-1200.0,57.6
+0,-900.0,45.6
+0,-600.0,33.6
+0,-400.0,25.6
+0,-200.0,17.6
+0,0.0,17.6
+0,200.0,17.6
+0,400.0,25.6
+0,600.0,33.6
+0,900.0,45.6
+0,1200.0,57.6
+0,1600.0,73.6
+0,2000.0,89.6
+0,2500.0,109.6
+0,3000.0,129.6
+0,3500.0,149.6
+0,4000.0,169.6
+0,4500.0,189.6
+0,5000.0,209.6
+0,5500.0,229.6
+600,-5500.0,229.6
+600,-5000.0,209.6
+600,-4500.0,169.6
+600,-4000.0,169.6
+600,-3500.0,149.6
+600,-3000.0,129.6
+600,-2500.0,109.6
+600,-2000.0,89.6
+600,-1600.0,73.6
+600,-1200.0,57.6
+600,-900.0,45.6
+600,-600.0,33.6
+600,-400.0,25.6
+600,-200.0,17.6
+600,0.0,17.6
+600,200.0,17.6
+600,400.0,25.6
+600,600.0,33.6
+600,900.0,45.6
+600,1200.0,57.6
+600,1600.0,73.6
+600,2000.0,89.6
+600,2500.0,109.6
+600,3000.0,129.6
+600,3500.0,149.6
+600,4000.0,169.6
+600,4500.0,189.6
+600,5000.0,209.6
+600,5500.0,229.6
+900,-5500.0,231.4
+900,-5000.0,211.4
+900,-4500.0,171.4
+900,-4000.0,171.4
+900,-3500.0,151.4
+900,-3000.0,131.4
+900,-2500.0,111.4
+900,-2000.0,91.4
+900,-1600.0,75.4
+900,-1200.0,59.4
+900,-900.0,47.4
+900,-600.0,35.4
+900,-400.0,27.4
+900,-200.0,19.4
+900,0.0,19.4
+900,200.0,19.4
+900,400.0,27.4
+900,600.0,35.4
+900,900.0,47.4
+900,1200.0,59.4
+900,1600.0,75.4
+900,2000.0,91.4
+900,2500.0,111.4
+900,3000.0,131.4
+900,3500.0,151.4
+900,4000.0,171.4
+900,4500.0,191.4
+900,5000.0,211.4
+900,5500.0,231.4
+1200,-5500.0,233.2
+1200,-5000.0,213.2
+1200,-4500.0,173.2
+1200,-4000.0,173.2
+1200,-3500.0,153.2
+1200,-3000.0,133.2
+1200,-2500.0,113.2
+1200,-2000.0,93.2
+1200,-1600.0,77.2
+1200,-1200.0,61.2
+1200,-900.0,49.2
+1200,-600.0,37.2
+1200,-400.0,29.2
+1200,-200.0,21.2
+1200,0.0,21.2
+1200,200.0,21.2
+1200,400.0,29.2
+1200,600.0,37.2
+1200,900.0,49.2
+1200,1200.0,61.2
+1200,1600.0,77.2
+1200,2000.0,93.2
+1200,2500.0,113.2
+1200,3000.0,133.2
+1200,3500.0,153.2
+1200,4000.0,173.2
+1200,4500.0,193.2
+1200,5000.0,213.2
+1200,5500.0,233.2
+1600,-5500.0,235.6
+1600,-5000.0,215.6
+1600,-4500.0,175.6
+1600,-4000.0,175.6
+1600,-3500.0,155.6
+1600,-3000.0,135.6
+1600,-2500.0,115.6
+1600,-2000.0,95.6
+1600,-1600.0,79.6
+1600,-1200.0,63.6
+1600,-900.0,51.6
+1600,-600.0,39.6
+1600,-400.0,31.6
+1600,-200.0,23.6
+1600,0.0,23.6
+1600,200.0,23.6
+1600,400.0,31.6
+1600,600.0,39.6
+1600,900.0,51.6
+1600,1200.0,63.6
+1600,1600.0,79.6
+1600,2000.0,95.6
+1600,2500.0,115.6
+1600,3000.0,135.6
+1600,3500.0,155.6
+1600,4000.0,175.6
+1600,4500.0,195.6
+1600,5000.0,215.6
+1600,5500.0,235.6
+2000,-5500.0,238.0
+2000,-5000.0,218.0
+2000,-4500.0,178.0
+2000,-4000.0,178.0
+2000,-3500.0,158.0
+2000,-3000.0,138.0
+2000,-2500.0,118.0
+2000,-2000.0,98.0
+2000,-1600.0,82.0
+2000,-1200.0,66.0
+2000,-900.0,54.0
+2000,-600.0,42.0
+2000,-400.0,34.0
+2000,-200.0,26.0
+2000,0.0,26.0
+2000,200.0,26.0
+2000,400.0,34.0
+2000,600.0,42.0
+2000,900.0,54.0
+2000,1200.0,66.0
+2000,1600.0,82.0
+2000,2000.0,98.0
+2000,2500.0,118.0
+2000,3000.0,138.0
+2000,3500.0,158.0
+2000,4000.0,178.0
+2000,4500.0,198.0
+2000,5000.0,218.0
+2000,5500.0,238.0
+2500,-5500.0,241.0
+2500,-5000.0,221.0
+2500,-4500.0,181.0
+2500,-4000.0,181.0
+2500,-3500.0,161.0
+2500,-3000.0,141.0
+2500,-2500.0,121.0
+2500,-2000.0,101.0
+2500,-1600.0,85.0
+2500,-1200.0,69.0
+2500,-900.0,57.0
+2500,-600.0,45.0
+2500,-400.0,37.0
+2500,-200.0,29.0
+2500,0.0,29.0
+2500,200.0,29.0
+2500,400.0,37.0
+2500,600.0,45.0
+2500,900.0,57.0
+2500,1200.0,69.0
+2500,1600.0,85.0
+2500,2000.0,101.0
+2500,2500.0,121.0
+2500,3000.0,141.0
+2500,3500.0,161.0
+2500,4000.0,181.0
+2500,4500.0,201.0
+2500,5000.0,221.0
+2500,5500.0,241.0
+3000,-5500.0,244.0
+3000,-5000.0,224.0
+3000,-4500.0,184.0
+3000,-4000.0,184.0
+3000,-3500.0,164.0
+3000,-3000.0,144.0
+3000,-2500.0,124.0
+3000,-2000.0,104.0
+3000,-1600.0,88.0
+3000,-1200.0,72.0
+3000,-900.0,60.0
+3000,-600.0,48.0
+3000,-400.0,40.0
+3000,-200.0,32.0
+3000,0.0,32.0
+3000,200.0,32.0
+3000,400.0,40.0
+3000,600.0,48.0
+3000,900.0,60.0
+3000,1200.0,72.0
+3000,1600.0,88.0
+3000,2000.0,104.0
+3000,2500.0,124.0
+3000,3000.0,144.0
+3000,3500.0,164.0
+3000,4000.0,184.0
+3000,4500.0,204.0
+3000,5000.0,224.0
+3000,5500.0,244.0
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Gear_3.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Gear_3.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..b4274373230f50e6df7eb9702010c7a868dc967e
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Gear_3.vtlm
@@ -0,0 +1,233 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5500.0,229.6
+0,-5000.0,209.6
+0,-4500.0,169.6
+0,-4000.0,169.6
+0,-3500.0,149.6
+0,-3000.0,129.6
+0,-2500.0,109.6
+0,-2000.0,89.6
+0,-1600.0,73.6
+0,-1200.0,57.6
+0,-900.0,45.6
+0,-600.0,33.6
+0,-400.0,25.6
+0,-200.0,17.6
+0,0.0,17.6
+0,200.0,17.6
+0,400.0,25.6
+0,600.0,33.6
+0,900.0,45.6
+0,1200.0,57.6
+0,1600.0,73.6
+0,2000.0,89.6
+0,2500.0,109.6
+0,3000.0,129.6
+0,3500.0,149.6
+0,4000.0,169.6
+0,4500.0,189.6
+0,5000.0,209.6
+0,5500.0,229.6
+600,-5500.0,229.6
+600,-5000.0,209.6
+600,-4500.0,169.6
+600,-4000.0,169.6
+600,-3500.0,149.6
+600,-3000.0,129.6
+600,-2500.0,109.6
+600,-2000.0,89.6
+600,-1600.0,73.6
+600,-1200.0,57.6
+600,-900.0,45.6
+600,-600.0,33.6
+600,-400.0,25.6
+600,-200.0,17.6
+600,0.0,17.6
+600,200.0,17.6
+600,400.0,25.6
+600,600.0,33.6
+600,900.0,45.6
+600,1200.0,57.6
+600,1600.0,73.6
+600,2000.0,89.6
+600,2500.0,109.6
+600,3000.0,129.6
+600,3500.0,149.6
+600,4000.0,169.6
+600,4500.0,189.6
+600,5000.0,209.6
+600,5500.0,229.6
+900,-5500.0,231.4
+900,-5000.0,211.4
+900,-4500.0,171.4
+900,-4000.0,171.4
+900,-3500.0,151.4
+900,-3000.0,131.4
+900,-2500.0,111.4
+900,-2000.0,91.4
+900,-1600.0,75.4
+900,-1200.0,59.4
+900,-900.0,47.4
+900,-600.0,35.4
+900,-400.0,27.4
+900,-200.0,19.4
+900,0.0,19.4
+900,200.0,19.4
+900,400.0,27.4
+900,600.0,35.4
+900,900.0,47.4
+900,1200.0,59.4
+900,1600.0,75.4
+900,2000.0,91.4
+900,2500.0,111.4
+900,3000.0,131.4
+900,3500.0,151.4
+900,4000.0,171.4
+900,4500.0,191.4
+900,5000.0,211.4
+900,5500.0,231.4
+1200,-5500.0,233.2
+1200,-5000.0,213.2
+1200,-4500.0,173.2
+1200,-4000.0,173.2
+1200,-3500.0,153.2
+1200,-3000.0,133.2
+1200,-2500.0,113.2
+1200,-2000.0,93.2
+1200,-1600.0,77.2
+1200,-1200.0,61.2
+1200,-900.0,49.2
+1200,-600.0,37.2
+1200,-400.0,29.2
+1200,-200.0,21.2
+1200,0.0,21.2
+1200,200.0,21.2
+1200,400.0,29.2
+1200,600.0,37.2
+1200,900.0,49.2
+1200,1200.0,61.2
+1200,1600.0,77.2
+1200,2000.0,93.2
+1200,2500.0,113.2
+1200,3000.0,133.2
+1200,3500.0,153.2
+1200,4000.0,173.2
+1200,4500.0,193.2
+1200,5000.0,213.2
+1200,5500.0,233.2
+1600,-5500.0,235.6
+1600,-5000.0,215.6
+1600,-4500.0,175.6
+1600,-4000.0,175.6
+1600,-3500.0,155.6
+1600,-3000.0,135.6
+1600,-2500.0,115.6
+1600,-2000.0,95.6
+1600,-1600.0,79.6
+1600,-1200.0,63.6
+1600,-900.0,51.6
+1600,-600.0,39.6
+1600,-400.0,31.6
+1600,-200.0,23.6
+1600,0.0,23.6
+1600,200.0,23.6
+1600,400.0,31.6
+1600,600.0,39.6
+1600,900.0,51.6
+1600,1200.0,63.6
+1600,1600.0,79.6
+1600,2000.0,95.6
+1600,2500.0,115.6
+1600,3000.0,135.6
+1600,3500.0,155.6
+1600,4000.0,175.6
+1600,4500.0,195.6
+1600,5000.0,215.6
+1600,5500.0,235.6
+2000,-5500.0,238.0
+2000,-5000.0,218.0
+2000,-4500.0,178.0
+2000,-4000.0,178.0
+2000,-3500.0,158.0
+2000,-3000.0,138.0
+2000,-2500.0,118.0
+2000,-2000.0,98.0
+2000,-1600.0,82.0
+2000,-1200.0,66.0
+2000,-900.0,54.0
+2000,-600.0,42.0
+2000,-400.0,34.0
+2000,-200.0,26.0
+2000,0.0,26.0
+2000,200.0,26.0
+2000,400.0,34.0
+2000,600.0,42.0
+2000,900.0,54.0
+2000,1200.0,66.0
+2000,1600.0,82.0
+2000,2000.0,98.0
+2000,2500.0,118.0
+2000,3000.0,138.0
+2000,3500.0,158.0
+2000,4000.0,178.0
+2000,4500.0,198.0
+2000,5000.0,218.0
+2000,5500.0,238.0
+2500,-5500.0,241.0
+2500,-5000.0,221.0
+2500,-4500.0,181.0
+2500,-4000.0,181.0
+2500,-3500.0,161.0
+2500,-3000.0,141.0
+2500,-2500.0,121.0
+2500,-2000.0,101.0
+2500,-1600.0,85.0
+2500,-1200.0,69.0
+2500,-900.0,57.0
+2500,-600.0,45.0
+2500,-400.0,37.0
+2500,-200.0,29.0
+2500,0.0,29.0
+2500,200.0,29.0
+2500,400.0,37.0
+2500,600.0,45.0
+2500,900.0,57.0
+2500,1200.0,69.0
+2500,1600.0,85.0
+2500,2000.0,101.0
+2500,2500.0,121.0
+2500,3000.0,141.0
+2500,3500.0,161.0
+2500,4000.0,181.0
+2500,4500.0,201.0
+2500,5000.0,221.0
+2500,5500.0,241.0
+3000,-5500.0,244.0
+3000,-5000.0,224.0
+3000,-4500.0,184.0
+3000,-4000.0,184.0
+3000,-3500.0,164.0
+3000,-3000.0,144.0
+3000,-2500.0,124.0
+3000,-2000.0,104.0
+3000,-1600.0,88.0
+3000,-1200.0,72.0
+3000,-900.0,60.0
+3000,-600.0,48.0
+3000,-400.0,40.0
+3000,-200.0,32.0
+3000,0.0,32.0
+3000,200.0,32.0
+3000,400.0,40.0
+3000,600.0,48.0
+3000,900.0,60.0
+3000,1200.0,72.0
+3000,1600.0,88.0
+3000,2000.0,104.0
+3000,2500.0,124.0
+3000,3000.0,144.0
+3000,3500.0,164.0
+3000,4000.0,184.0
+3000,4500.0,204.0
+3000,5000.0,224.0
+3000,5500.0,244.0
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Gear_4.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Gear_4.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..b4274373230f50e6df7eb9702010c7a868dc967e
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Gear_4.vtlm
@@ -0,0 +1,233 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5500.0,229.6
+0,-5000.0,209.6
+0,-4500.0,169.6
+0,-4000.0,169.6
+0,-3500.0,149.6
+0,-3000.0,129.6
+0,-2500.0,109.6
+0,-2000.0,89.6
+0,-1600.0,73.6
+0,-1200.0,57.6
+0,-900.0,45.6
+0,-600.0,33.6
+0,-400.0,25.6
+0,-200.0,17.6
+0,0.0,17.6
+0,200.0,17.6
+0,400.0,25.6
+0,600.0,33.6
+0,900.0,45.6
+0,1200.0,57.6
+0,1600.0,73.6
+0,2000.0,89.6
+0,2500.0,109.6
+0,3000.0,129.6
+0,3500.0,149.6
+0,4000.0,169.6
+0,4500.0,189.6
+0,5000.0,209.6
+0,5500.0,229.6
+600,-5500.0,229.6
+600,-5000.0,209.6
+600,-4500.0,169.6
+600,-4000.0,169.6
+600,-3500.0,149.6
+600,-3000.0,129.6
+600,-2500.0,109.6
+600,-2000.0,89.6
+600,-1600.0,73.6
+600,-1200.0,57.6
+600,-900.0,45.6
+600,-600.0,33.6
+600,-400.0,25.6
+600,-200.0,17.6
+600,0.0,17.6
+600,200.0,17.6
+600,400.0,25.6
+600,600.0,33.6
+600,900.0,45.6
+600,1200.0,57.6
+600,1600.0,73.6
+600,2000.0,89.6
+600,2500.0,109.6
+600,3000.0,129.6
+600,3500.0,149.6
+600,4000.0,169.6
+600,4500.0,189.6
+600,5000.0,209.6
+600,5500.0,229.6
+900,-5500.0,231.4
+900,-5000.0,211.4
+900,-4500.0,171.4
+900,-4000.0,171.4
+900,-3500.0,151.4
+900,-3000.0,131.4
+900,-2500.0,111.4
+900,-2000.0,91.4
+900,-1600.0,75.4
+900,-1200.0,59.4
+900,-900.0,47.4
+900,-600.0,35.4
+900,-400.0,27.4
+900,-200.0,19.4
+900,0.0,19.4
+900,200.0,19.4
+900,400.0,27.4
+900,600.0,35.4
+900,900.0,47.4
+900,1200.0,59.4
+900,1600.0,75.4
+900,2000.0,91.4
+900,2500.0,111.4
+900,3000.0,131.4
+900,3500.0,151.4
+900,4000.0,171.4
+900,4500.0,191.4
+900,5000.0,211.4
+900,5500.0,231.4
+1200,-5500.0,233.2
+1200,-5000.0,213.2
+1200,-4500.0,173.2
+1200,-4000.0,173.2
+1200,-3500.0,153.2
+1200,-3000.0,133.2
+1200,-2500.0,113.2
+1200,-2000.0,93.2
+1200,-1600.0,77.2
+1200,-1200.0,61.2
+1200,-900.0,49.2
+1200,-600.0,37.2
+1200,-400.0,29.2
+1200,-200.0,21.2
+1200,0.0,21.2
+1200,200.0,21.2
+1200,400.0,29.2
+1200,600.0,37.2
+1200,900.0,49.2
+1200,1200.0,61.2
+1200,1600.0,77.2
+1200,2000.0,93.2
+1200,2500.0,113.2
+1200,3000.0,133.2
+1200,3500.0,153.2
+1200,4000.0,173.2
+1200,4500.0,193.2
+1200,5000.0,213.2
+1200,5500.0,233.2
+1600,-5500.0,235.6
+1600,-5000.0,215.6
+1600,-4500.0,175.6
+1600,-4000.0,175.6
+1600,-3500.0,155.6
+1600,-3000.0,135.6
+1600,-2500.0,115.6
+1600,-2000.0,95.6
+1600,-1600.0,79.6
+1600,-1200.0,63.6
+1600,-900.0,51.6
+1600,-600.0,39.6
+1600,-400.0,31.6
+1600,-200.0,23.6
+1600,0.0,23.6
+1600,200.0,23.6
+1600,400.0,31.6
+1600,600.0,39.6
+1600,900.0,51.6
+1600,1200.0,63.6
+1600,1600.0,79.6
+1600,2000.0,95.6
+1600,2500.0,115.6
+1600,3000.0,135.6
+1600,3500.0,155.6
+1600,4000.0,175.6
+1600,4500.0,195.6
+1600,5000.0,215.6
+1600,5500.0,235.6
+2000,-5500.0,238.0
+2000,-5000.0,218.0
+2000,-4500.0,178.0
+2000,-4000.0,178.0
+2000,-3500.0,158.0
+2000,-3000.0,138.0
+2000,-2500.0,118.0
+2000,-2000.0,98.0
+2000,-1600.0,82.0
+2000,-1200.0,66.0
+2000,-900.0,54.0
+2000,-600.0,42.0
+2000,-400.0,34.0
+2000,-200.0,26.0
+2000,0.0,26.0
+2000,200.0,26.0
+2000,400.0,34.0
+2000,600.0,42.0
+2000,900.0,54.0
+2000,1200.0,66.0
+2000,1600.0,82.0
+2000,2000.0,98.0
+2000,2500.0,118.0
+2000,3000.0,138.0
+2000,3500.0,158.0
+2000,4000.0,178.0
+2000,4500.0,198.0
+2000,5000.0,218.0
+2000,5500.0,238.0
+2500,-5500.0,241.0
+2500,-5000.0,221.0
+2500,-4500.0,181.0
+2500,-4000.0,181.0
+2500,-3500.0,161.0
+2500,-3000.0,141.0
+2500,-2500.0,121.0
+2500,-2000.0,101.0
+2500,-1600.0,85.0
+2500,-1200.0,69.0
+2500,-900.0,57.0
+2500,-600.0,45.0
+2500,-400.0,37.0
+2500,-200.0,29.0
+2500,0.0,29.0
+2500,200.0,29.0
+2500,400.0,37.0
+2500,600.0,45.0
+2500,900.0,57.0
+2500,1200.0,69.0
+2500,1600.0,85.0
+2500,2000.0,101.0
+2500,2500.0,121.0
+2500,3000.0,141.0
+2500,3500.0,161.0
+2500,4000.0,181.0
+2500,4500.0,201.0
+2500,5000.0,221.0
+2500,5500.0,241.0
+3000,-5500.0,244.0
+3000,-5000.0,224.0
+3000,-4500.0,184.0
+3000,-4000.0,184.0
+3000,-3500.0,164.0
+3000,-3000.0,144.0
+3000,-2500.0,124.0
+3000,-2000.0,104.0
+3000,-1600.0,88.0
+3000,-1200.0,72.0
+3000,-900.0,60.0
+3000,-600.0,48.0
+3000,-400.0,40.0
+3000,-200.0,32.0
+3000,0.0,32.0
+3000,200.0,32.0
+3000,400.0,40.0
+3000,600.0,48.0
+3000,900.0,60.0
+3000,1200.0,72.0
+3000,1600.0,88.0
+3000,2000.0,104.0
+3000,2500.0,124.0
+3000,3000.0,144.0
+3000,3500.0,164.0
+3000,4000.0,184.0
+3000,4500.0,204.0
+3000,5000.0,224.0
+3000,5500.0,244.0
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Gear_5.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Gear_5.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..981092222c94b37a692b22b8d5c4087055fb14e2
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Gear_5.vtlm
@@ -0,0 +1,233 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5500.0,64.6
+0,-5000.0,59.6
+0,-4500.0,49.6
+0,-4000.0,49.6
+0,-3500.0,44.6
+0,-3000.0,39.6
+0,-2500.0,34.6
+0,-2000.0,29.6
+0,-1600.0,25.6
+0,-1200.0,21.6
+0,-900.0,18.6
+0,-600.0,15.6
+0,-400.0,13.6
+0,-200.0,11.6
+0,0.0,11.6
+0,200.0,11.6
+0,400.0,13.6
+0,600.0,15.6
+0,900.0,18.6
+0,1200.0,21.6
+0,1600.0,25.6
+0,2000.0,29.6
+0,2500.0,34.6
+0,3000.0,39.6
+0,3500.0,44.6
+0,4000.0,49.6
+0,4500.0,54.6
+0,5000.0,59.6
+0,5500.0,64.6
+600,-5500.0,64.6
+600,-5000.0,59.6
+600,-4500.0,49.6
+600,-4000.0,49.6
+600,-3500.0,44.6
+600,-3000.0,39.6
+600,-2500.0,34.6
+600,-2000.0,29.6
+600,-1600.0,25.6
+600,-1200.0,21.6
+600,-900.0,18.6
+600,-600.0,15.6
+600,-400.0,13.6
+600,-200.0,11.6
+600,0.0,11.6
+600,200.0,11.6
+600,400.0,13.6
+600,600.0,15.6
+600,900.0,18.6
+600,1200.0,21.6
+600,1600.0,25.6
+600,2000.0,29.6
+600,2500.0,34.6
+600,3000.0,39.6
+600,3500.0,44.6
+600,4000.0,49.6
+600,4500.0,54.6
+600,5000.0,59.6
+600,5500.0,64.6
+900,-5500.0,66.4
+900,-5000.0,61.4
+900,-4500.0,51.4
+900,-4000.0,51.4
+900,-3500.0,46.4
+900,-3000.0,41.4
+900,-2500.0,36.4
+900,-2000.0,31.4
+900,-1600.0,27.4
+900,-1200.0,23.4
+900,-900.0,20.4
+900,-600.0,17.4
+900,-400.0,15.4
+900,-200.0,13.4
+900,0.0,13.4
+900,200.0,13.4
+900,400.0,15.4
+900,600.0,17.4
+900,900.0,20.4
+900,1200.0,23.4
+900,1600.0,27.4
+900,2000.0,31.4
+900,2500.0,36.4
+900,3000.0,41.4
+900,3500.0,46.4
+900,4000.0,51.4
+900,4500.0,56.4
+900,5000.0,61.4
+900,5500.0,66.4
+1200,-5500.0,68.2
+1200,-5000.0,63.2
+1200,-4500.0,53.2
+1200,-4000.0,53.2
+1200,-3500.0,48.2
+1200,-3000.0,43.2
+1200,-2500.0,38.2
+1200,-2000.0,33.2
+1200,-1600.0,29.2
+1200,-1200.0,25.2
+1200,-900.0,22.2
+1200,-600.0,19.2
+1200,-400.0,17.2
+1200,-200.0,15.2
+1200,0.0,15.2
+1200,200.0,15.2
+1200,400.0,17.2
+1200,600.0,19.2
+1200,900.0,22.2
+1200,1200.0,25.2
+1200,1600.0,29.2
+1200,2000.0,33.2
+1200,2500.0,38.2
+1200,3000.0,43.2
+1200,3500.0,48.2
+1200,4000.0,53.2
+1200,4500.0,58.2
+1200,5000.0,63.2
+1200,5500.0,68.2
+1600,-5500.0,70.6
+1600,-5000.0,65.6
+1600,-4500.0,55.6
+1600,-4000.0,55.6
+1600,-3500.0,50.6
+1600,-3000.0,45.6
+1600,-2500.0,40.6
+1600,-2000.0,35.6
+1600,-1600.0,31.6
+1600,-1200.0,27.6
+1600,-900.0,24.6
+1600,-600.0,21.6
+1600,-400.0,19.6
+1600,-200.0,17.6
+1600,0.0,17.6
+1600,200.0,17.6
+1600,400.0,19.6
+1600,600.0,21.6
+1600,900.0,24.6
+1600,1200.0,27.6
+1600,1600.0,31.6
+1600,2000.0,35.6
+1600,2500.0,40.6
+1600,3000.0,45.6
+1600,3500.0,50.6
+1600,4000.0,55.6
+1600,4500.0,60.6
+1600,5000.0,65.6
+1600,5500.0,70.6
+2000,-5500.0,73.0
+2000,-5000.0,68.0
+2000,-4500.0,58.0
+2000,-4000.0,58.0
+2000,-3500.0,53.0
+2000,-3000.0,48.0
+2000,-2500.0,43.0
+2000,-2000.0,38.0
+2000,-1600.0,34.0
+2000,-1200.0,30.0
+2000,-900.0,27.0
+2000,-600.0,24.0
+2000,-400.0,22.0
+2000,-200.0,20.0
+2000,0.0,20.0
+2000,200.0,20.0
+2000,400.0,22.0
+2000,600.0,24.0
+2000,900.0,27.0
+2000,1200.0,30.0
+2000,1600.0,34.0
+2000,2000.0,38.0
+2000,2500.0,43.0
+2000,3000.0,48.0
+2000,3500.0,53.0
+2000,4000.0,58.0
+2000,4500.0,63.0
+2000,5000.0,68.0
+2000,5500.0,73.0
+2500,-5500.0,76.0
+2500,-5000.0,71.0
+2500,-4500.0,61.0
+2500,-4000.0,61.0
+2500,-3500.0,56.0
+2500,-3000.0,51.0
+2500,-2500.0,46.0
+2500,-2000.0,41.0
+2500,-1600.0,37.0
+2500,-1200.0,33.0
+2500,-900.0,30.0
+2500,-600.0,27.0
+2500,-400.0,25.0
+2500,-200.0,23.0
+2500,0.0,23.0
+2500,200.0,23.0
+2500,400.0,25.0
+2500,600.0,27.0
+2500,900.0,30.0
+2500,1200.0,33.0
+2500,1600.0,37.0
+2500,2000.0,41.0
+2500,2500.0,46.0
+2500,3000.0,51.0
+2500,3500.0,56.0
+2500,4000.0,61.0
+2500,4500.0,66.0
+2500,5000.0,71.0
+2500,5500.0,76.0
+3000,-5500.0,79.0
+3000,-5000.0,74.0
+3000,-4500.0,64.0
+3000,-4000.0,64.0
+3000,-3500.0,59.0
+3000,-3000.0,54.0
+3000,-2500.0,49.0
+3000,-2000.0,44.0
+3000,-1600.0,40.0
+3000,-1200.0,36.0
+3000,-900.0,33.0
+3000,-600.0,30.0
+3000,-400.0,28.0
+3000,-200.0,26.0
+3000,0.0,26.0
+3000,200.0,26.0
+3000,400.0,28.0
+3000,600.0,30.0
+3000,900.0,33.0
+3000,1200.0,36.0
+3000,1600.0,40.0
+3000,2000.0,44.0
+3000,2500.0,49.0
+3000,3000.0,54.0
+3000,3500.0,59.0
+3000,4000.0,64.0
+3000,4500.0,69.0
+3000,5000.0,74.0
+3000,5500.0,79.0
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Gear_6.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Gear_6.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..b4274373230f50e6df7eb9702010c7a868dc967e
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/Gear_6.vtlm
@@ -0,0 +1,233 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5500.0,229.6
+0,-5000.0,209.6
+0,-4500.0,169.6
+0,-4000.0,169.6
+0,-3500.0,149.6
+0,-3000.0,129.6
+0,-2500.0,109.6
+0,-2000.0,89.6
+0,-1600.0,73.6
+0,-1200.0,57.6
+0,-900.0,45.6
+0,-600.0,33.6
+0,-400.0,25.6
+0,-200.0,17.6
+0,0.0,17.6
+0,200.0,17.6
+0,400.0,25.6
+0,600.0,33.6
+0,900.0,45.6
+0,1200.0,57.6
+0,1600.0,73.6
+0,2000.0,89.6
+0,2500.0,109.6
+0,3000.0,129.6
+0,3500.0,149.6
+0,4000.0,169.6
+0,4500.0,189.6
+0,5000.0,209.6
+0,5500.0,229.6
+600,-5500.0,229.6
+600,-5000.0,209.6
+600,-4500.0,169.6
+600,-4000.0,169.6
+600,-3500.0,149.6
+600,-3000.0,129.6
+600,-2500.0,109.6
+600,-2000.0,89.6
+600,-1600.0,73.6
+600,-1200.0,57.6
+600,-900.0,45.6
+600,-600.0,33.6
+600,-400.0,25.6
+600,-200.0,17.6
+600,0.0,17.6
+600,200.0,17.6
+600,400.0,25.6
+600,600.0,33.6
+600,900.0,45.6
+600,1200.0,57.6
+600,1600.0,73.6
+600,2000.0,89.6
+600,2500.0,109.6
+600,3000.0,129.6
+600,3500.0,149.6
+600,4000.0,169.6
+600,4500.0,189.6
+600,5000.0,209.6
+600,5500.0,229.6
+900,-5500.0,231.4
+900,-5000.0,211.4
+900,-4500.0,171.4
+900,-4000.0,171.4
+900,-3500.0,151.4
+900,-3000.0,131.4
+900,-2500.0,111.4
+900,-2000.0,91.4
+900,-1600.0,75.4
+900,-1200.0,59.4
+900,-900.0,47.4
+900,-600.0,35.4
+900,-400.0,27.4
+900,-200.0,19.4
+900,0.0,19.4
+900,200.0,19.4
+900,400.0,27.4
+900,600.0,35.4
+900,900.0,47.4
+900,1200.0,59.4
+900,1600.0,75.4
+900,2000.0,91.4
+900,2500.0,111.4
+900,3000.0,131.4
+900,3500.0,151.4
+900,4000.0,171.4
+900,4500.0,191.4
+900,5000.0,211.4
+900,5500.0,231.4
+1200,-5500.0,233.2
+1200,-5000.0,213.2
+1200,-4500.0,173.2
+1200,-4000.0,173.2
+1200,-3500.0,153.2
+1200,-3000.0,133.2
+1200,-2500.0,113.2
+1200,-2000.0,93.2
+1200,-1600.0,77.2
+1200,-1200.0,61.2
+1200,-900.0,49.2
+1200,-600.0,37.2
+1200,-400.0,29.2
+1200,-200.0,21.2
+1200,0.0,21.2
+1200,200.0,21.2
+1200,400.0,29.2
+1200,600.0,37.2
+1200,900.0,49.2
+1200,1200.0,61.2
+1200,1600.0,77.2
+1200,2000.0,93.2
+1200,2500.0,113.2
+1200,3000.0,133.2
+1200,3500.0,153.2
+1200,4000.0,173.2
+1200,4500.0,193.2
+1200,5000.0,213.2
+1200,5500.0,233.2
+1600,-5500.0,235.6
+1600,-5000.0,215.6
+1600,-4500.0,175.6
+1600,-4000.0,175.6
+1600,-3500.0,155.6
+1600,-3000.0,135.6
+1600,-2500.0,115.6
+1600,-2000.0,95.6
+1600,-1600.0,79.6
+1600,-1200.0,63.6
+1600,-900.0,51.6
+1600,-600.0,39.6
+1600,-400.0,31.6
+1600,-200.0,23.6
+1600,0.0,23.6
+1600,200.0,23.6
+1600,400.0,31.6
+1600,600.0,39.6
+1600,900.0,51.6
+1600,1200.0,63.6
+1600,1600.0,79.6
+1600,2000.0,95.6
+1600,2500.0,115.6
+1600,3000.0,135.6
+1600,3500.0,155.6
+1600,4000.0,175.6
+1600,4500.0,195.6
+1600,5000.0,215.6
+1600,5500.0,235.6
+2000,-5500.0,238.0
+2000,-5000.0,218.0
+2000,-4500.0,178.0
+2000,-4000.0,178.0
+2000,-3500.0,158.0
+2000,-3000.0,138.0
+2000,-2500.0,118.0
+2000,-2000.0,98.0
+2000,-1600.0,82.0
+2000,-1200.0,66.0
+2000,-900.0,54.0
+2000,-600.0,42.0
+2000,-400.0,34.0
+2000,-200.0,26.0
+2000,0.0,26.0
+2000,200.0,26.0
+2000,400.0,34.0
+2000,600.0,42.0
+2000,900.0,54.0
+2000,1200.0,66.0
+2000,1600.0,82.0
+2000,2000.0,98.0
+2000,2500.0,118.0
+2000,3000.0,138.0
+2000,3500.0,158.0
+2000,4000.0,178.0
+2000,4500.0,198.0
+2000,5000.0,218.0
+2000,5500.0,238.0
+2500,-5500.0,241.0
+2500,-5000.0,221.0
+2500,-4500.0,181.0
+2500,-4000.0,181.0
+2500,-3500.0,161.0
+2500,-3000.0,141.0
+2500,-2500.0,121.0
+2500,-2000.0,101.0
+2500,-1600.0,85.0
+2500,-1200.0,69.0
+2500,-900.0,57.0
+2500,-600.0,45.0
+2500,-400.0,37.0
+2500,-200.0,29.0
+2500,0.0,29.0
+2500,200.0,29.0
+2500,400.0,37.0
+2500,600.0,45.0
+2500,900.0,57.0
+2500,1200.0,69.0
+2500,1600.0,85.0
+2500,2000.0,101.0
+2500,2500.0,121.0
+2500,3000.0,141.0
+2500,3500.0,161.0
+2500,4000.0,181.0
+2500,4500.0,201.0
+2500,5000.0,221.0
+2500,5500.0,241.0
+3000,-5500.0,244.0
+3000,-5000.0,224.0
+3000,-4500.0,184.0
+3000,-4000.0,184.0
+3000,-3500.0,164.0
+3000,-3000.0,144.0
+3000,-2500.0,124.0
+3000,-2000.0,104.0
+3000,-1600.0,88.0
+3000,-1200.0,72.0
+3000,-900.0,60.0
+3000,-600.0,48.0
+3000,-400.0,40.0
+3000,-200.0,32.0
+3000,0.0,32.0
+3000,200.0,32.0
+3000,400.0,40.0
+3000,600.0,48.0
+3000,900.0,60.0
+3000,1200.0,72.0
+3000,1600.0,88.0
+3000,2000.0,104.0
+3000,2500.0,124.0
+3000,3000.0,144.0
+3000,3500.0,164.0
+3000,4000.0,184.0
+3000,4500.0,204.0
+3000,5000.0,224.0
+3000,5500.0,244.0
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/MT_6.vgbx b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/MT_6.vgbx
new file mode 100644
index 0000000000000000000000000000000000000000..45172bccabbd3088bda716d799fb7e38da3bc72e
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class2_RigidTruck_4x2_ESS/MT_6.vgbx
@@ -0,0 +1,68 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2016-10-13T10:07:39.5626564Z",
+ "AppVersion": "3",
+ "FileVersion": 6
+ },
+ "Body": {
+ "SavedInDeclMode": true,
+ "ModelName": "Generic 6speed MT GBX",
+ "Inertia": 0.0,
+ "TracInt": 2.0,
+ "Gears": [
+ {
+ "Ratio": 4.18,
+ "LossMap": "Axle_4x2.vtlm"
+ },
+ {
+ "Ratio": 6.7,
+ "LossMap": "Gear_1.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": ""
+ },
+ {
+ "Ratio": 3.8,
+ "LossMap": "Gear_2.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": ""
+ },
+ {
+ "Ratio": 2.29,
+ "LossMap": "Gear_3.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": ""
+ },
+ {
+ "Ratio": 1.48,
+ "LossMap": "Gear_4.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": ""
+ },
+ {
+ "Ratio": 1.0,
+ "LossMap": "Gear_5.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": ""
+ },
+ {
+ "Ratio": 0.73,
+ "LossMap": "Gear_6.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": ""
+ }
+ ],
+ "TqReserve": 20.0,
+ "ShiftTime": 2.0,
+ "StartTqReserve": 20.0,
+ "StartSpeed": 2.0,
+ "StartAcc": 0.6,
+ "GearboxType": "MT",
+ "TorqueConverter": {
+ "Enabled": false
+ },
+ "DownshiftAferUpshiftDelay": 10.0,
+ "UpshiftAfterDownshiftDelay": 10.0,
+ "UpshiftMinAcceleration": 0.1
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/AMT_12.vgbx b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/AMT_12.vgbx
new file mode 100644
index 0000000000000000000000000000000000000000..b994ea6654b53d86e291eb0dfe3c084eccda359b
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/AMT_12.vgbx
@@ -0,0 +1,117 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2021-06-15T14:36:23.3474902Z",
+ "AppVersion": "3",
+ "FileVersion": 6
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "ModelName": "tractor_12gear_example",
+ "Inertia": 0.0,
+ "TracInt": 1.0,
+ "Gears": [
+ {
+ "Ratio": 2.53,
+ "LossMap": "Axle_4x2_Tractor.vtlm"
+ },
+ {
+ "Ratio": 14.93,
+ "LossMap": "Gear_1.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 11.64,
+ "LossMap": "Gear_2.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 9.02,
+ "LossMap": "Gear_3.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 7.04,
+ "LossMap": "Gear_4.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 5.64,
+ "LossMap": "Gear_5.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 4.4,
+ "LossMap": "Gear_6.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 3.39,
+ "LossMap": "Gear_7.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 2.65,
+ "LossMap": "Gear_8.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 2.05,
+ "LossMap": "Gear_9.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 1.6,
+ "LossMap": "Gear_10.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 1.28,
+ "LossMap": "Gear_11.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 1.0,
+ "LossMap": "Gear_12.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ }
+ ],
+ "TqReserve": 0.0,
+ "ShiftTime": 2.0,
+ "StartTqReserve": 20.0,
+ "StartSpeed": 2.0,
+ "StartAcc": 0.6,
+ "GearboxType": "AMT",
+ "TorqueConverter": {
+ "Enabled": false
+ },
+ "DownshiftAfterUpshiftDelay": 6.0,
+ "UpshiftAfterDownshiftDelay": 6.0,
+ "UpshiftMinAcceleration": 0.1,
+ "PowershiftShiftTime": 0.8
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Axle_4x2_Tractor.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Axle_4x2_Tractor.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..5511ba318a23adca2b3800ecdc38fc690fc8c9a7
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Axle_4x2_Tractor.vtlm
@@ -0,0 +1,13 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-3868.60567879326,83.9634911672181
+0,-93.4987980963136,5.31543115269823
+0,104.12966040171,5.31543115269823
+0,4036.53266112769,83.9634911672181
+126.5,-3868.60567879326,83.9634911672181
+126.5,-93.4987980963136,5.31543115269823
+126.5,104.12966040171,5.31543115269823
+126.5,4036.53266112769,83.9634911672181
+2530,-3854.1416471727,98.4275227877718
+2530,-79.0347664757603,19.7794627732516
+2530,118.593692022263,19.7794627732516
+2530,4050.99669274825,98.4275227877718
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Default.vrlm b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Default.vrlm
new file mode 100644
index 0000000000000000000000000000000000000000..eb575b99973291e5414c4826da086c1f03a7f179
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Default.vrlm
@@ -0,0 +1,32 @@
+Retarder Speed [1/min],Torque Loss [Nm]
+0,10
+100,10
+200,10.1
+300,10.2
+400,10.3
+500,10.5
+600,10.7
+700,11
+800,11.3
+900,11.6
+1000,12
+1100,12.4
+1200,12.9
+1300,13.4
+1400,13.9
+1500,14.5
+1600,15.1
+1700,15.8
+1800,16.5
+1900,17.2
+2000,18
+2100,18.8
+2200,19.7
+2300,20.6
+2400,21.5
+2500,22.5
+2600,23.5
+2700,24.6
+2800,25.7
+2900,26.8
+3000,28
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/EM_Map.vemo b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/EM_Map.vemo
new file mode 100644
index 0000000000000000000000000000000000000000..46fd20980fc5785fe982102403aa402a00b450c4
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/EM_Map.vemo
@@ -0,0 +1,925 @@
+n [rpm] , T [Nm] , P_el [kW]
+0.00,-150.00,0.000
+0.00,-142.50,0.000
+0.00,-135.00,0.000
+0.00,-127.50,0.000
+0.00,-120.00,0.000
+0.00,-112.50,0.000
+0.00,-105.00,0.000
+0.00,-97.50,-0.007
+0.00,-90.00,-0.142
+0.00,-82.50,-0.249
+0.00,-75.00,-0.331
+0.00,-67.50,-0.390
+0.00,-60.00,-0.427
+0.00,-52.50,-0.442
+0.00,-45.00,-0.436
+0.00,-37.50,-0.409
+0.00,-30.00,-0.362
+0.00,-22.50,-0.296
+0.00,-15.00,-0.210
+0.00,-7.50,-0.105
+0.00,-1.50,-0.006
+0.00,1.50,0.077
+0.00,7.50,0.316
+0.00,15.00,0.633
+0.00,22.50,0.968
+0.00,30.00,1.321
+0.00,37.50,1.693
+0.00,45.00,2.084
+0.00,52.50,2.492
+0.00,60.00,2.919
+0.00,67.50,3.364
+0.00,75.00,3.828
+0.00,82.50,4.309
+0.00,90.00,4.808
+0.00,97.50,5.325
+0.00,105.00,5.860
+0.00,112.50,6.413
+0.00,120.00,6.984
+0.00,127.50,7.572
+0.00,135.00,8.178
+0.00,142.50,8.801
+0.00,150.00,9.443
+25.46,-150.00,0.000
+25.46,-142.50,0.000
+25.46,-135.00,0.000
+25.46,-127.50,0.000
+25.46,-120.00,0.000
+25.46,-112.50,0.000
+25.46,-105.00,-0.010
+25.46,-97.50,-0.023
+25.46,-90.00,-0.033
+25.46,-82.50,-0.041
+25.46,-75.00,-0.046
+25.46,-67.50,-0.049
+25.46,-60.00,-0.051
+25.46,-52.50,-0.050
+25.46,-45.00,-0.048
+25.46,-37.50,-0.044
+25.46,-30.00,-0.038
+25.46,-22.50,-0.031
+25.46,-15.00,-0.022
+25.46,-7.50,-0.011
+25.46,-1.50,-0.001
+25.46,1.50,0.007
+25.46,7.50,0.030
+25.46,15.00,0.059
+25.46,22.50,0.090
+25.46,30.00,0.122
+25.46,37.50,0.157
+25.46,45.00,0.192
+25.46,52.50,0.230
+25.46,60.00,0.269
+25.46,67.50,0.309
+25.46,75.00,0.351
+25.46,82.50,0.395
+25.46,90.00,0.440
+25.46,97.50,0.487
+25.46,105.00,0.536
+25.46,112.50,0.585
+25.46,120.00,0.637
+25.46,127.50,0.690
+25.46,135.00,0.744
+25.46,142.50,0.800
+25.46,150.00,0.858
+254.65,-150.00,-3.380
+254.65,-142.50,-3.226
+254.65,-135.00,-3.071
+254.65,-127.50,-2.914
+254.65,-120.00,-2.755
+254.65,-112.50,-2.594
+254.65,-105.00,-2.432
+254.65,-97.50,-2.268
+254.65,-90.00,-2.102
+254.65,-82.50,-1.934
+254.65,-75.00,-1.765
+254.65,-67.50,-1.594
+254.65,-60.00,-1.422
+254.65,-52.50,-1.248
+254.65,-45.00,-1.072
+254.65,-37.50,-0.894
+254.65,-30.00,-0.715
+254.65,-22.50,-0.534
+254.65,-15.00,-0.351
+254.65,-7.50,-0.166
+254.65,-1.50,-0.017
+254.65,1.50,0.063
+254.65,7.50,0.235
+254.65,15.00,0.452
+254.65,22.50,0.670
+254.65,30.00,0.890
+254.65,37.50,1.112
+254.65,45.00,1.336
+254.65,52.50,1.561
+254.65,60.00,1.788
+254.65,67.50,2.017
+254.65,75.00,2.248
+254.65,82.50,2.481
+254.65,90.00,2.715
+254.65,97.50,2.951
+254.65,105.00,3.189
+254.65,112.50,3.429
+254.65,120.00,3.671
+254.65,127.50,3.914
+254.65,135.00,4.159
+254.65,142.50,4.406
+254.65,150.00,4.655
+509.30,-150.00,-7.145
+509.30,-142.50,-6.805
+509.30,-135.00,-6.463
+509.30,-127.50,-6.118
+509.30,-120.00,-5.772
+509.30,-112.50,-5.424
+509.30,-105.00,-5.073
+509.30,-97.50,-4.721
+509.30,-90.00,-4.366
+509.30,-82.50,-4.010
+509.30,-75.00,-3.651
+509.30,-67.50,-3.291
+509.30,-60.00,-2.928
+509.30,-52.50,-2.564
+509.30,-45.00,-2.197
+509.30,-37.50,-1.828
+509.30,-30.00,-1.458
+509.30,-22.50,-1.085
+509.30,-15.00,-0.710
+509.30,-7.50,-0.333
+509.30,-1.50,-0.029
+509.30,1.50,0.131
+509.30,7.50,0.470
+509.30,15.00,0.895
+509.30,22.50,1.322
+509.30,30.00,1.750
+509.30,37.50,2.181
+509.30,45.00,2.614
+509.30,52.50,3.050
+509.30,60.00,3.487
+509.30,67.50,3.927
+509.30,75.00,4.368
+509.30,82.50,4.812
+509.30,90.00,5.258
+509.30,97.50,5.706
+509.30,105.00,6.157
+509.30,112.50,6.609
+509.30,120.00,7.064
+509.30,127.50,7.521
+509.30,135.00,7.979
+509.30,142.50,8.441
+509.30,150.00,8.904
+763.94,-150.00,-10.859
+763.94,-142.50,-10.337
+763.94,-135.00,-9.812
+763.94,-127.50,-9.284
+763.94,-120.00,-8.754
+763.94,-112.50,-8.221
+763.94,-105.00,-7.686
+763.94,-97.50,-7.148
+763.94,-90.00,-6.607
+763.94,-82.50,-6.064
+763.94,-75.00,-5.518
+763.94,-67.50,-4.970
+763.94,-60.00,-4.419
+763.94,-52.50,-3.866
+763.94,-45.00,-3.310
+763.94,-37.50,-2.752
+763.94,-30.00,-2.190
+763.94,-22.50,-1.627
+763.94,-15.00,-1.061
+763.94,-7.50,-0.492
+763.94,-1.50,-0.031
+763.94,1.50,0.208
+763.94,7.50,0.714
+763.94,15.00,1.347
+763.94,22.50,1.983
+763.94,30.00,2.621
+763.94,37.50,3.262
+763.94,45.00,3.906
+763.94,52.50,4.553
+763.94,60.00,5.202
+763.94,67.50,5.854
+763.94,75.00,6.509
+763.94,82.50,7.166
+763.94,90.00,7.826
+763.94,97.50,8.489
+763.94,105.00,9.155
+763.94,112.50,9.823
+763.94,120.00,10.494
+763.94,127.50,11.168
+763.94,135.00,11.844
+763.94,142.50,12.524
+763.94,150.00,13.206
+1018.59,-150.00,-14.520
+1018.59,-142.50,-13.820
+1018.59,-135.00,-13.116
+1018.59,-127.50,-12.408
+1018.59,-120.00,-11.698
+1018.59,-112.50,-10.984
+1018.59,-105.00,-10.266
+1018.59,-97.50,-9.546
+1018.59,-90.00,-8.822
+1018.59,-82.50,-8.094
+1018.59,-75.00,-7.364
+1018.59,-67.50,-6.630
+1018.59,-60.00,-5.893
+1018.59,-52.50,-5.152
+1018.59,-45.00,-4.408
+1018.59,-37.50,-3.661
+1018.59,-30.00,-2.911
+1018.59,-22.50,-2.157
+1018.59,-15.00,-1.399
+1018.59,-7.50,-0.639
+1018.59,-1.50,-0.019
+1018.59,1.50,0.296
+1018.59,7.50,0.970
+1018.59,15.00,1.812
+1018.59,22.50,2.657
+1018.59,30.00,3.506
+1018.59,37.50,4.358
+1018.59,45.00,5.214
+1018.59,52.50,6.073
+1018.59,60.00,6.936
+1018.59,67.50,7.802
+1018.59,75.00,8.672
+1018.59,82.50,9.545
+1018.59,90.00,10.422
+1018.59,97.50,11.302
+1018.59,105.00,12.186
+1018.59,112.50,13.074
+1018.59,120.00,13.965
+1018.59,127.50,14.859
+1018.59,135.00,15.757
+1018.59,142.50,16.659
+1018.59,150.00,17.564
+1273.24,-150.00,-18.126
+1273.24,-142.50,-17.251
+1273.24,-135.00,-16.372
+1273.24,-127.50,-15.489
+1273.24,-120.00,-14.601
+1273.24,-112.50,-13.709
+1273.24,-105.00,-12.813
+1273.24,-97.50,-11.912
+1273.24,-90.00,-11.008
+1273.24,-82.50,-10.099
+1273.24,-75.00,-9.185
+1273.24,-67.50,-8.268
+1273.24,-60.00,-7.346
+1273.24,-52.50,-6.420
+1273.24,-45.00,-5.489
+1273.24,-37.50,-4.554
+1273.24,-30.00,-3.615
+1273.24,-22.50,-2.672
+1273.24,-15.00,-1.724
+1273.24,-7.50,-0.772
+1273.24,-1.50,0.000
+1273.24,1.50,0.397
+1273.24,7.50,1.240
+1273.24,15.00,2.291
+1273.24,22.50,3.347
+1273.24,30.00,4.407
+1273.24,37.50,5.471
+1273.24,45.00,6.540
+1273.24,52.50,7.613
+1273.24,60.00,8.691
+1273.24,67.50,9.773
+1273.24,75.00,10.860
+1273.24,82.50,11.952
+1273.24,90.00,13.048
+1273.24,97.50,14.149
+1273.24,105.00,15.254
+1273.24,112.50,16.364
+1273.24,120.00,17.478
+1273.24,127.50,18.597
+1273.24,135.00,19.720
+1273.24,142.50,20.848
+1273.24,150.00,21.981
+1527.89,-150.00,-21.674
+1527.89,-142.50,-20.629
+1527.89,-135.00,-19.579
+1527.89,-127.50,-18.523
+1527.89,-120.00,-17.462
+1527.89,-112.50,-16.395
+1527.89,-105.00,-15.323
+1527.89,-97.50,-14.245
+1527.89,-90.00,-13.162
+1527.89,-82.50,-12.074
+1527.89,-75.00,-10.980
+1527.89,-67.50,-9.881
+1527.89,-60.00,-8.776
+1527.89,-52.50,-7.666
+1527.89,-45.00,-6.550
+1527.89,-37.50,-5.429
+1527.89,-30.00,-4.302
+1527.89,-22.50,-3.170
+1527.89,-15.00,-2.032
+1527.89,-7.50,-0.888
+1527.89,-1.50,0.000
+1527.89,1.50,0.514
+1527.89,7.50,1.527
+1527.89,15.00,2.788
+1527.89,22.50,4.054
+1527.89,30.00,5.326
+1527.89,37.50,6.603
+1527.89,45.00,7.887
+1527.89,52.50,9.176
+1527.89,60.00,10.470
+1527.89,67.50,11.771
+1527.89,75.00,13.077
+1527.89,82.50,14.389
+1527.89,90.00,15.707
+1527.89,97.50,17.031
+1527.89,105.00,18.361
+1527.89,112.50,19.696
+1527.89,120.00,21.037
+1527.89,127.50,22.384
+1527.89,135.00,23.737
+1527.89,142.50,25.095
+1527.89,150.00,26.459
+1782.54,-150.00,-25.161
+1782.54,-142.50,-23.950
+1782.54,-135.00,-22.732
+1782.54,-127.50,-21.508
+1782.54,-120.00,-20.277
+1782.54,-112.50,-19.039
+1782.54,-105.00,-17.794
+1782.54,-97.50,-16.542
+1782.54,-90.00,-15.284
+1782.54,-82.50,-14.018
+1782.54,-75.00,-12.746
+1782.54,-67.50,-11.467
+1782.54,-60.00,-10.181
+1782.54,-52.50,-8.888
+1782.54,-45.00,-7.589
+1782.54,-37.50,-6.283
+1782.54,-30.00,-4.969
+1782.54,-22.50,-3.649
+1782.54,-15.00,-2.321
+1782.54,-7.50,-0.985
+1782.54,-1.50,0.000
+1782.54,1.50,0.649
+1782.54,7.50,1.833
+1782.54,15.00,3.305
+1782.54,22.50,4.782
+1782.54,30.00,6.267
+1782.54,37.50,7.759
+1782.54,45.00,9.257
+1782.54,52.50,10.763
+1782.54,60.00,12.277
+1782.54,67.50,13.797
+1782.54,75.00,15.325
+1782.54,82.50,16.860
+1782.54,90.00,18.402
+1782.54,97.50,19.952
+1782.54,105.00,21.509
+1782.54,112.50,23.073
+1782.54,120.00,24.644
+1782.54,127.50,26.223
+1782.54,135.00,27.809
+1782.54,142.50,29.402
+1782.54,150.00,31.002
+2037.18,-150.00,-28.584
+2037.18,-142.50,-27.212
+2037.18,-135.00,-25.831
+2037.18,-127.50,-24.442
+2037.18,-120.00,-23.044
+2037.18,-112.50,-21.638
+2037.18,-105.00,-20.223
+2037.18,-97.50,-18.800
+2037.18,-90.00,-17.368
+2037.18,-82.50,-15.929
+2037.18,-75.00,-14.480
+2037.18,-67.50,-13.023
+2037.18,-60.00,-11.558
+2037.18,-52.50,-10.085
+2037.18,-45.00,-8.603
+2037.18,-37.50,-7.112
+2037.18,-30.00,-5.613
+2037.18,-22.50,-4.105
+2037.18,-15.00,-2.588
+2037.18,-7.50,-1.060
+2037.18,-1.50,0.000
+2037.18,1.50,0.804
+2037.18,7.50,2.161
+2037.18,15.00,3.844
+2037.18,22.50,5.534
+2037.18,30.00,7.232
+2037.18,37.50,8.939
+2037.18,45.00,10.655
+2037.18,52.50,12.379
+2037.18,60.00,14.113
+2037.18,67.50,15.855
+2037.18,75.00,17.606
+2037.18,82.50,19.367
+2037.18,90.00,21.136
+2037.18,97.50,22.914
+2037.18,105.00,24.701
+2037.18,112.50,26.497
+2037.18,120.00,28.302
+2037.18,127.50,30.116
+2037.18,135.00,31.939
+2037.18,142.50,33.771
+2037.18,150.00,35.612
+2291.83,-150.00,-31.942
+2291.83,-142.50,-30.412
+2291.83,-135.00,-28.872
+2291.83,-127.50,-27.321
+2291.83,-120.00,-25.760
+2291.83,-112.50,-24.189
+2291.83,-105.00,-22.608
+2291.83,-97.50,-21.016
+2291.83,-90.00,-19.415
+2291.83,-82.50,-17.803
+2291.83,-75.00,-16.180
+2291.83,-67.50,-14.548
+2291.83,-60.00,-12.905
+2291.83,-52.50,-11.252
+2291.83,-45.00,-9.589
+2291.83,-37.50,-7.915
+2291.83,-30.00,-6.231
+2291.83,-22.50,-4.537
+2291.83,-15.00,-2.831
+2291.83,-7.50,-1.110
+2291.83,-1.50,0.000
+2291.83,1.50,0.982
+2291.83,7.50,2.514
+2291.83,15.00,4.409
+2291.83,22.50,6.311
+2291.83,30.00,8.224
+2291.83,37.50,10.147
+2291.83,45.00,12.081
+2291.83,52.50,14.025
+2291.83,60.00,15.981
+2291.83,67.50,17.947
+2291.83,75.00,19.924
+2291.83,82.50,21.912
+2291.83,90.00,23.910
+2291.83,97.50,25.920
+2291.83,105.00,27.941
+2291.83,112.50,29.972
+2291.83,120.00,32.014
+2291.83,127.50,34.067
+2291.83,135.00,36.131
+2291.83,142.50,38.205
+2291.83,150.00,40.291
+2546.48,-150.00,-35.232
+2546.48,-142.50,-33.548
+2546.48,-135.00,-31.852
+2546.48,-127.50,-30.144
+2546.48,-120.00,-28.424
+2546.48,-112.50,-26.691
+2546.48,-105.00,-24.946
+2546.48,-97.50,-23.189
+2546.48,-90.00,-21.419
+2546.48,-82.50,-19.638
+2546.48,-75.00,-17.844
+2546.48,-67.50,-16.037
+2546.48,-60.00,-14.219
+2546.48,-52.50,-12.388
+2546.48,-45.00,-10.545
+2546.48,-37.50,-8.690
+2546.48,-30.00,-6.822
+2546.48,-22.50,-4.941
+2546.48,-15.00,-3.046
+2546.48,-7.50,-1.131
+2546.48,-1.50,0.000
+2546.48,1.50,1.183
+2546.48,7.50,2.893
+2546.48,15.00,5.001
+2546.48,22.50,7.117
+2546.48,30.00,9.245
+2546.48,37.50,11.385
+2546.48,45.00,13.538
+2546.48,52.50,15.704
+2546.48,60.00,17.883
+2546.48,67.50,20.075
+2546.48,75.00,22.280
+2546.48,82.50,24.498
+2546.48,90.00,26.729
+2546.48,97.50,28.972
+2546.48,105.00,31.229
+2546.48,112.50,33.499
+2546.48,120.00,35.781
+2546.48,127.50,38.077
+2546.48,135.00,40.386
+2546.48,142.50,42.707
+2546.48,150.00,45.042
+2801.13,-150.00,-38.451
+2801.13,-142.50,-36.618
+2801.13,-135.00,-34.770
+2801.13,-127.50,-32.908
+2801.13,-120.00,-31.031
+2801.13,-112.50,-29.140
+2801.13,-105.00,-27.235
+2801.13,-97.50,-25.315
+2801.13,-90.00,-23.380
+2801.13,-82.50,-21.431
+2801.13,-75.00,-19.468
+2801.13,-67.50,-17.490
+2801.13,-60.00,-15.497
+2801.13,-52.50,-13.490
+2801.13,-45.00,-11.469
+2801.13,-37.50,-9.432
+2801.13,-30.00,-7.381
+2801.13,-22.50,-5.315
+2801.13,-15.00,-3.231
+2801.13,-7.50,-1.122
+2801.13,-1.50,0.000
+2801.13,1.50,1.412
+2801.13,7.50,3.302
+2801.13,15.00,5.623
+2801.13,22.50,7.954
+2801.13,30.00,10.298
+2801.13,37.50,12.657
+2801.13,45.00,15.030
+2801.13,52.50,17.419
+2801.13,60.00,19.823
+2801.13,67.50,22.243
+2801.13,75.00,24.678
+2801.13,82.50,27.128
+2801.13,90.00,29.593
+2801.13,97.50,32.074
+2801.13,105.00,34.570
+2801.13,112.50,37.081
+2801.13,120.00,39.608
+2801.13,127.50,42.150
+2801.13,135.00,44.707
+2801.13,142.50,47.279
+2801.13,150.00,49.867
+3055.77,-150.00,-41.595
+3055.77,-142.50,-39.617
+3055.77,-135.00,-37.622
+3055.77,-127.50,-35.610
+3055.77,-120.00,-33.581
+3055.77,-112.50,-31.534
+3055.77,-105.00,-29.471
+3055.77,-97.50,-27.391
+3055.77,-90.00,-25.294
+3055.77,-82.50,-23.181
+3055.77,-75.00,-21.050
+3055.77,-67.50,-18.902
+3055.77,-60.00,-16.737
+3055.77,-52.50,-14.556
+3055.77,-45.00,-12.357
+3055.77,-37.50,-10.141
+3055.77,-30.00,-7.907
+3055.77,-22.50,-5.656
+3055.77,-15.00,-3.384
+3055.77,-7.50,-1.077
+3055.77,-1.50,0.000
+3055.77,1.50,1.668
+3055.77,7.50,3.742
+3055.77,15.00,6.278
+3055.77,22.50,8.824
+3055.77,30.00,11.385
+3055.77,37.50,13.963
+3055.77,45.00,16.559
+3055.77,52.50,19.172
+3055.77,60.00,21.804
+3055.77,67.50,24.453
+3055.77,75.00,27.119
+3055.77,82.50,29.804
+3055.77,90.00,32.507
+3055.77,97.50,35.227
+3055.77,105.00,37.965
+3055.77,112.50,40.721
+3055.77,120.00,43.495
+3055.77,127.50,46.287
+3055.77,135.00,49.097
+3055.77,142.50,51.924
+3055.77,150.00,54.770
+3310.42,-150.00,-44.664
+3310.42,-142.50,-42.545
+3310.42,-135.00,-40.406
+3310.42,-127.50,-38.247
+3310.42,-120.00,-36.069
+3310.42,-112.50,-33.871
+3310.42,-105.00,-31.653
+3310.42,-97.50,-29.416
+3310.42,-90.00,-27.160
+3310.42,-82.50,-24.883
+3310.42,-75.00,-22.587
+3310.42,-67.50,-20.272
+3310.42,-60.00,-17.937
+3310.42,-52.50,-15.582
+3310.42,-45.00,-13.207
+3310.42,-37.50,-10.812
+3310.42,-30.00,-8.397
+3310.42,-22.50,-5.961
+3310.42,-15.00,-3.500
+3310.42,-7.50,-0.993
+3310.42,-1.50,0.000
+3310.42,1.50,1.955
+3310.42,7.50,4.216
+3310.42,15.00,6.968
+3310.42,22.50,9.730
+3310.42,30.00,12.509
+3310.42,37.50,15.308
+3310.42,45.00,18.127
+3310.42,52.50,20.966
+3310.42,60.00,23.826
+3310.42,67.50,26.707
+3310.42,75.00,29.608
+3310.42,82.50,32.529
+3310.42,90.00,35.471
+3310.42,97.50,38.434
+3310.42,105.00,41.418
+3310.42,112.50,44.422
+3310.42,120.00,47.447
+3310.42,127.50,50.492
+3310.42,135.00,53.558
+3310.42,142.50,56.645
+3310.42,150.00,59.752
+3565.07,-150.00,-47.654
+3565.07,-142.50,-45.397
+3565.07,-135.00,-43.118
+3565.07,-127.50,-40.817
+3565.07,-120.00,-38.493
+3565.07,-112.50,-36.147
+3565.07,-105.00,-33.778
+3565.07,-97.50,-31.387
+3565.07,-90.00,-28.973
+3565.07,-82.50,-26.537
+3565.07,-75.00,-24.078
+3565.07,-67.50,-21.596
+3565.07,-60.00,-19.092
+3565.07,-52.50,-16.566
+3565.07,-45.00,-14.017
+3565.07,-37.50,-11.445
+3565.07,-30.00,-8.849
+3565.07,-22.50,-6.228
+3565.07,-15.00,-3.578
+3565.07,-7.50,-0.866
+3565.07,-1.50,0.000
+3565.07,1.50,2.274
+3565.07,7.50,4.726
+3565.07,15.00,7.696
+3565.07,22.50,10.675
+3565.07,30.00,13.673
+3565.07,37.50,16.694
+3565.07,45.00,19.737
+3565.07,52.50,22.804
+3565.07,60.00,25.894
+3565.07,67.50,29.008
+3565.07,75.00,32.145
+3565.07,82.50,35.306
+3565.07,90.00,38.490
+3565.07,97.50,41.698
+3565.07,105.00,44.930
+3565.07,112.50,48.185
+3565.07,120.00,51.464
+3565.07,127.50,54.767
+3565.07,135.00,58.093
+3565.07,142.50,61.443
+3565.07,150.00,64.817
+3819.72,-150.00,-50.561
+3819.72,-142.50,-48.172
+3819.72,-135.00,-45.758
+3819.72,-127.50,-43.317
+3819.72,-120.00,-40.852
+3819.72,-112.50,-38.360
+3819.72,-105.00,-35.843
+3819.72,-97.50,-33.300
+3819.72,-90.00,-30.732
+3819.72,-82.50,-28.138
+3819.72,-75.00,-25.518
+3819.72,-67.50,-22.873
+3819.72,-60.00,-20.202
+3819.72,-52.50,-17.506
+3819.72,-45.00,-14.783
+3819.72,-37.50,-12.034
+3819.72,-30.00,-9.259
+3819.72,-22.50,-6.454
+3819.72,-15.00,-3.614
+3819.72,-7.50,-0.688
+3819.72,-1.50,0.000
+3819.72,1.50,2.627
+3819.72,7.50,5.275
+3819.72,15.00,8.464
+3819.72,22.50,11.661
+3819.72,30.00,14.879
+3819.72,37.50,18.123
+3819.72,45.00,21.392
+3819.72,52.50,24.687
+3819.72,60.00,28.010
+3819.72,67.50,31.358
+3819.72,75.00,34.734
+3819.72,82.50,38.136
+3819.72,90.00,41.566
+3819.72,97.50,45.022
+3819.72,105.00,48.505
+3819.72,112.50,52.015
+3819.72,120.00,55.551
+3819.72,127.50,59.115
+3819.72,135.00,62.705
+3819.72,142.50,66.322
+3819.72,150.00,69.966
+4074.37,-150.00,-53.385
+4074.37,-142.50,-50.867
+4074.37,-135.00,-48.321
+4074.37,-127.50,-45.745
+4074.37,-120.00,-43.141
+4074.37,-112.50,-40.507
+4074.37,-105.00,-37.845
+4074.37,-97.50,-35.154
+4074.37,-90.00,-32.434
+4074.37,-82.50,-29.685
+4074.37,-75.00,-26.907
+4074.37,-67.50,-24.100
+4074.37,-60.00,-21.264
+4074.37,-52.50,-18.398
+4074.37,-45.00,-15.504
+4074.37,-37.50,-12.579
+4074.37,-30.00,-9.624
+4074.37,-22.50,-6.635
+4074.37,-15.00,-3.605
+4074.37,-7.50,-0.452
+4074.37,-1.50,0.000
+4074.37,1.50,3.016
+4074.37,7.50,5.864
+4074.37,15.00,9.274
+4074.37,22.50,12.690
+4074.37,30.00,16.130
+4074.37,37.50,19.597
+4074.37,45.00,23.094
+4074.37,52.50,26.620
+4074.37,60.00,30.175
+4074.37,67.50,33.761
+4074.37,75.00,37.378
+4074.37,82.50,41.024
+4074.37,90.00,44.700
+4074.37,97.50,48.407
+4074.37,105.00,52.144
+4074.37,112.50,55.912
+4074.37,120.00,59.710
+4074.37,127.50,63.537
+4074.37,135.00,67.396
+4074.37,142.50,71.284
+4074.37,150.00,75.203
+4329.01,-150.00,-56.121
+4329.01,-142.50,-53.479
+4329.01,-135.00,-50.805
+4329.01,-127.50,-48.098
+4329.01,-120.00,-45.358
+4329.01,-112.50,-42.586
+4329.01,-105.00,-39.782
+4329.01,-97.50,-36.945
+4329.01,-90.00,-34.076
+4329.01,-82.50,-31.174
+4329.01,-75.00,-28.240
+4329.01,-67.50,-25.273
+4329.01,-60.00,-22.273
+4329.01,-52.50,-19.241
+4329.01,-45.00,-16.176
+4329.01,-37.50,-13.077
+4329.01,-30.00,-9.942
+4329.01,-22.50,-6.770
+4329.01,-15.00,-3.547
+4329.01,-7.50,-0.135
+4329.01,-1.50,0.000
+4329.01,1.50,3.443
+4329.01,7.50,6.496
+4329.01,15.00,10.128
+4329.01,22.50,13.765
+4329.01,30.00,17.427
+4329.01,37.50,21.120
+4329.01,45.00,24.845
+4329.01,52.50,28.603
+4329.01,60.00,32.394
+4329.01,67.50,36.219
+4329.01,75.00,40.078
+4329.01,82.50,43.970
+4329.01,90.00,47.897
+4329.01,97.50,51.857
+4329.01,105.00,55.852
+4329.01,112.50,59.880
+4329.01,120.00,63.942
+4329.01,127.50,68.038
+4329.01,135.00,72.168
+4329.01,142.50,76.331
+4329.01,150.00,80.529
+4583.66,-150.00,-58.768
+4583.66,-142.50,-56.006
+4583.66,-135.00,-53.207
+4583.66,-127.50,-50.373
+4583.66,-120.00,-47.502
+4583.66,-112.50,-44.594
+4583.66,-105.00,-41.651
+4583.66,-97.50,-38.671
+4583.66,-90.00,-35.655
+4583.66,-82.50,-32.603
+4583.66,-75.00,-29.515
+4583.66,-67.50,-26.390
+4583.66,-60.00,-23.229
+4583.66,-52.50,-20.031
+4583.66,-45.00,-16.796
+4583.66,-37.50,-13.523
+4583.66,-30.00,-10.211
+4583.66,-22.50,-6.854
+4583.66,-15.00,-3.436
+4583.66,-7.50,0.000
+4583.66,-1.50,0.000
+4583.66,1.50,3.910
+4583.66,7.50,7.173
+4583.66,15.00,11.030
+4583.66,22.50,14.889
+4583.66,30.00,18.774
+4583.66,37.50,22.693
+4583.66,45.00,26.648
+4583.66,52.50,30.640
+4583.66,60.00,34.668
+4583.66,67.50,38.734
+4583.66,75.00,42.838
+4583.66,82.50,46.979
+4583.66,90.00,51.158
+4583.66,97.50,55.374
+4583.66,105.00,59.629
+4583.66,112.50,63.921
+4583.66,120.00,68.251
+4583.66,127.50,72.618
+4583.66,135.00,77.024
+4583.66,142.50,81.467
+4583.66,150.00,85.948
+4838.31,-150.00,-61.322
+4838.31,-142.50,-58.444
+4838.31,-135.00,-55.525
+4838.31,-127.50,-52.567
+4838.31,-120.00,-49.568
+4838.31,-112.50,-46.529
+4838.31,-105.00,-43.449
+4838.31,-97.50,-40.330
+4838.31,-90.00,-37.170
+4838.31,-82.50,-33.970
+4838.31,-75.00,-30.730
+4838.31,-67.50,-27.449
+4838.31,-60.00,-24.128
+4838.31,-52.50,-20.766
+4838.31,-45.00,-17.362
+4838.31,-37.50,-13.917
+4838.31,-30.00,-10.426
+4838.31,-22.50,-6.885
+4838.31,-15.00,-3.270
+4838.31,-7.50,0.000
+4838.31,-1.50,0.000
+4838.31,1.50,4.417
+4838.31,7.50,7.898
+4838.31,15.00,11.981
+4838.31,22.50,16.063
+4838.31,30.00,20.173
+4838.31,37.50,24.320
+4838.31,45.00,28.506
+4838.31,52.50,32.733
+4838.31,60.00,37.000
+4838.31,67.50,41.309
+4838.31,75.00,45.659
+4838.31,82.50,50.051
+4838.31,90.00,54.485
+4838.31,97.50,58.961
+4838.31,105.00,63.478
+4838.31,112.50,68.038
+4838.31,120.00,72.639
+4838.31,127.50,77.282
+4838.31,135.00,81.967
+4838.31,142.50,86.693
+4838.31,150.00,91.461
+5092.96,-150.00,-63.780
+5092.96,-142.50,-60.790
+5092.96,-135.00,-57.756
+5092.96,-127.50,-54.677
+5092.96,-120.00,-51.554
+5092.96,-112.50,-48.386
+5092.96,-105.00,-45.174
+5092.96,-97.50,-41.918
+5092.96,-90.00,-38.617
+5092.96,-82.50,-35.271
+5092.96,-75.00,-31.881
+5092.96,-67.50,-28.447
+5092.96,-60.00,-24.967
+5092.96,-52.50,-21.442
+5092.96,-45.00,-17.872
+5092.96,-37.50,-14.254
+5092.96,-30.00,-10.585
+5092.96,-22.50,-6.859
+5092.96,-15.00,-3.042
+5092.96,-7.50,0.000
+5092.96,-1.50,0.000
+5092.96,1.50,4.968
+5092.96,7.50,8.671
+5092.96,15.00,12.984
+5092.96,22.50,17.290
+5092.96,30.00,21.627
+5092.96,37.50,26.002
+5092.96,45.00,30.421
+5092.96,52.50,34.884
+5092.96,60.00,39.392
+5092.96,67.50,43.946
+5092.96,75.00,48.545
+5092.96,82.50,53.191
+5092.96,90.00,57.882
+5092.96,97.50,62.620
+5092.96,105.00,67.403
+5092.96,112.50,72.233
+5092.96,120.00,77.109
+5092.96,127.50,82.030
+5092.96,135.00,86.998
+5092.96,142.50,92.012
+5092.96,150.00,97.072
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/EM_drag.vemd b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/EM_drag.vemd
new file mode 100644
index 0000000000000000000000000000000000000000..794a67609fe1dab8a292fb0bfca05299662d3411
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/EM_drag.vemd
@@ -0,0 +1,24 @@
+n [rpm] , T_drag [Nm]
+0, -0.62
+25.4647908947033, -0.65
+254.647908947033, -0.88
+509.295817894065, -1.14
+763.943726841098, -1.39
+1018.59163578813, -1.65
+1273.23954473516, -1.91
+1527.8874536822, -2.16
+1782.53536262923, -2.42
+2037.18327157626, -2.68
+2291.83118052329, -2.93
+2546.47908947033, -3.19
+2801.12699841736, -3.45
+3055.77490736439, -3.7
+3310.42281631142, -3.96
+3565.07072525846, -4.22
+3819.71863420549, -4.47
+4074.36654315252, -4.73
+4329.01445209955, -4.99
+4583.66236104659, -5.24
+4838.31026999362, -5.5
+5092.95817894065, -5.76
+
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/EM_fld.vemp b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/EM_fld.vemp
new file mode 100644
index 0000000000000000000000000000000000000000..1633112a97f17c1ab5db7d8780a7de63082f663b
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/EM_fld.vemp
@@ -0,0 +1,24 @@
+n [rpm] , T_drive [Nm] , T_drag [Nm]
+0, 150.00, -150.00
+25, 150.00, -150.00
+255, 150.00, -150.00
+509, 150.00, -150.00
+764, 150.00, -150.00
+1019, 150.00, -150.00
+1273, 150.00, -150.00
+1528, 125.00, -125.00
+1783, 107.14, -107.14
+2037, 93.75, -93.75
+2292, 83.33, -83.33
+2546, 75.00, -75.00
+2801, 68.18, -68.18
+3056, 62.50, -62.50
+3310, 57.69, -57.69
+3565, 53.57, -53.57
+3820, 50.00, -50.00
+4074, 46.88, -46.88
+4329, 44.12, -44.12
+4584, 41.67, -41.67
+4838, 39.47, -39.47
+5093, 37.50, -37.50
+
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Gear_1.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Gear_1.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..c9d45b071b4f64f4a4bd86a57ae350bb607d8b6d
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Gear_1.vtlm
@@ -0,0 +1,7 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,100000,3500
+0,-100000,3500
+0,0,0
+10000,0,0
+10000,-100000,3500
+10000,100000,3500
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Gear_10.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Gear_10.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..c9d45b071b4f64f4a4bd86a57ae350bb607d8b6d
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Gear_10.vtlm
@@ -0,0 +1,7 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,100000,3500
+0,-100000,3500
+0,0,0
+10000,0,0
+10000,-100000,3500
+10000,100000,3500
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Gear_11.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Gear_11.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..c9d45b071b4f64f4a4bd86a57ae350bb607d8b6d
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Gear_11.vtlm
@@ -0,0 +1,7 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,100000,3500
+0,-100000,3500
+0,0,0
+10000,0,0
+10000,-100000,3500
+10000,100000,3500
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Gear_12.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Gear_12.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..199761fac22cc011d829b656b53fbcb651c24412
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Gear_12.vtlm
@@ -0,0 +1,7 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,100000,1500
+0,-100000,1500
+0,0,0
+10000,0,0
+10000,-100000,1500
+10000,100000,1500
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Gear_2.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Gear_2.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..c9d45b071b4f64f4a4bd86a57ae350bb607d8b6d
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Gear_2.vtlm
@@ -0,0 +1,7 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,100000,3500
+0,-100000,3500
+0,0,0
+10000,0,0
+10000,-100000,3500
+10000,100000,3500
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Gear_3.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Gear_3.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..c9d45b071b4f64f4a4bd86a57ae350bb607d8b6d
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Gear_3.vtlm
@@ -0,0 +1,7 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,100000,3500
+0,-100000,3500
+0,0,0
+10000,0,0
+10000,-100000,3500
+10000,100000,3500
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Gear_4.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Gear_4.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..c9d45b071b4f64f4a4bd86a57ae350bb607d8b6d
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Gear_4.vtlm
@@ -0,0 +1,7 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,100000,3500
+0,-100000,3500
+0,0,0
+10000,0,0
+10000,-100000,3500
+10000,100000,3500
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Gear_5.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Gear_5.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..c9d45b071b4f64f4a4bd86a57ae350bb607d8b6d
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Gear_5.vtlm
@@ -0,0 +1,7 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,100000,3500
+0,-100000,3500
+0,0,0
+10000,0,0
+10000,-100000,3500
+10000,100000,3500
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Gear_6.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Gear_6.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..c9d45b071b4f64f4a4bd86a57ae350bb607d8b6d
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Gear_6.vtlm
@@ -0,0 +1,7 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,100000,3500
+0,-100000,3500
+0,0,0
+10000,0,0
+10000,-100000,3500
+10000,100000,3500
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Gear_7.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Gear_7.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..c9d45b071b4f64f4a4bd86a57ae350bb607d8b6d
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Gear_7.vtlm
@@ -0,0 +1,7 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,100000,3500
+0,-100000,3500
+0,0,0
+10000,0,0
+10000,-100000,3500
+10000,100000,3500
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Gear_8.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Gear_8.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..c9d45b071b4f64f4a4bd86a57ae350bb607d8b6d
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Gear_8.vtlm
@@ -0,0 +1,7 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,100000,3500
+0,-100000,3500
+0,0,0
+10000,0,0
+10000,-100000,3500
+10000,100000,3500
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Gear_9.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Gear_9.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..c9d45b071b4f64f4a4bd86a57ae350bb607d8b6d
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Gear_9.vtlm
@@ -0,0 +1,7 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,100000,3500
+0,-100000,3500
+0,0,0
+10000,0,0
+10000,-100000,3500
+10000,100000,3500
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Group5_ICE_Map.vmap b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Group5_ICE_Map.vmap
new file mode 100644
index 0000000000000000000000000000000000000000..3b030ade6a2698367084ec4492da6cfac6f0a187
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Group5_ICE_Map.vmap
@@ -0,0 +1,183 @@
+engine speed [rpm], torque [Nm], fuel consumption [g/h]
+454,0,1050.48
+454,240.787665198238,3184.875
+454,481.575330396476,5936.91
+454,722.362995594714,8584.95
+454,963.150660792951,10708.27
+454,1203.93832599119,13054
+454,1444.72599118943,15575.45
+454,1685.51365638766,18097.57
+454,1926.3013215859,20619.68
+454,2167.08898678414,23141.8
+454,2407.87665198238,25663.92
+454,3611.81497797357,38495.88
+550,0,1050.48
+550,236.618181818182,3184.875
+550,473.236363636364,5936.91
+550,709.854545454545,8584.95
+550,946.472727272727,10708.27
+550,1183.09090909091,13054
+550,1419.70909090909,15575.45
+550,1656.32727272727,18097.57
+550,1892.94545454545,20619.68
+550,2129.56363636364,23141.8
+550,2366.18181818182,25663.92
+550,3549.27272727273,38495.88
+698.9,0,1211.83596
+698.9,232.41724137931,3781.81314
+698.9,464.834482758621,7145.8335
+698.9,697.251724137931,10252.92
+698.9,929.668965517241,13214.55
+698.9,1162.08620689655,16271.09
+698.9,1394.50344827586,19504.44
+698.9,1626.92068965517,22715.9
+698.9,1859.33793103448,26067.02
+698.9,2091.75517241379,29381.05
+698.9,2324.1724137931,32699.96
+698.9,3486.25862068966,49049.94
+847.8,0,1615.0266
+847.8,229.691932059448,4447.59372
+847.8,459.383864118896,8528.74425
+847.8,689.075796178344,12019.87
+847.8,918.767728237792,15642.49
+847.8,1148.45966029724,19348.62
+847.8,1378.15159235669,23071.1
+847.8,1607.84352441614,26864.31
+847.8,1837.53545647558,30815.18
+847.8,2067.22738853503,34854.4
+847.8,2296.91932059448,39155.09
+847.8,3445.37898089172,58732.635
+996.7,0,2030.25564
+996.7,227.780906993077,5229.771579
+996.7,455.561813986154,9850.10325
+996.7,683.342720979231,13853.76
+996.7,911.123627972309,18068.71
+996.7,1138.90453496539,22383.7
+996.7,1366.68544195846,26543.4
+996.7,1594.46634895154,30847.65
+996.7,1822.24725594462,35304.67
+996.7,2050.02816293769,40046.29
+996.7,2277.80906993077,45162.72
+996.7,3416.71360489616,67744.08
+1145.57,0,2255.29164
+1145.57,226.366902939148,6019.32735
+1145.57,452.733805878296,11007.2625
+1145.57,679.100708817445,15720.59
+1145.57,905.467611756593,20580.22
+1145.57,1131.83451469574,25484.81
+1145.57,1358.20141763489,30222.77
+1145.57,1584.56832057404,35006.22
+1145.57,1810.93522351319,40026.6
+1145.57,2037.30212645233,45496.89
+1145.57,2263.66902939148,50854.1
+1145.57,3395.50354408722,76281.15
+1309.19,0,2805.8706
+1309.19,225.1837479663,6914.05524
+1309.19,450.3674959326,12755.379
+1309.19,675.551243898899,18126.41
+1309.19,900.734991865199,23245.61
+1309.19,1125.9187398315,28611.71
+1309.19,1351.1024877978,34186.01
+1309.19,1576.2862357641,39773.96
+1309.19,1801.4699837304,45940.37
+1309.19,2026.6537316967,52485.97
+1309.19,2251.837479663,58360.23
+1309.19,3377.7562194945,87540.345
+1434,0,3204.43056
+1434,224.462761506276,7692.6996
+1434,448.925523012552,14094.29775
+1434,673.388284518829,19929.18
+1434,897.851046025105,25556.3
+1434,1122.31380753138,31326.33
+1434,1346.77656903766,37363.82
+1434,1571.23933054393,43571.91
+1434,1795.70209205021,50460.82
+1434,2020.16485355649,57604.52
+1434,2244.62761506276,64181.14
+1434,3366.94142259414,96271.71
+1558.9,0,3598.7976
+1558.9,223.85682853294,8537.32467
+1558.9,447.71365706588,15450.03525
+1558.9,671.57048559882,21747.18
+1558.9,895.42731413176,28037.21
+1558.9,1119.2841426647,34232.36
+1558.9,1343.14097119764,40669.25
+1558.9,1566.99779973058,47498.48
+1558.9,1790.85462826352,55015.01
+1558.9,2014.71145679646,62654.92
+1558.9,2238.5682853294,70071.75
+1558.9,3357.8524279941,105107.625
+1683.8,0,4111.3872
+1683.8,223.340788692244,9655.70767317
+1683.8,446.681577384487,17042.07559275
+1683.8,670.022366076731,23999.55661
+1683.8,893.363154768975,30943.61996
+1683.8,1116.70394346122,37482.51196
+1683.8,1340.04473215346,44617.51433
+1683.8,1563.38552084571,52071.24802
+1683.8,1786.72630953795,60004.28553
+1683.8,2010.06709823019,68251.45222
+1683.8,2233.40788692244,76381.08579
+1683.8,3350.11183038366,114571.628685
+1808.61,0,4927.8847716
+1808.61,222.896317614079,11001.15063855
+1808.61,445.792635228159,18855.489471
+1808.61,668.688952842238,26272.45949
+1808.61,891.585270456317,33838.93845
+1808.61,1114.4815880704,41281.1028
+1808.61,1337.37790568448,49065.70608
+1808.61,1560.27422329856,57066.14659
+1808.61,1783.17054091263,65324.34568
+1808.61,2006.06685852671,73876.09648
+1808.61,2228.96317614079,82384.30247
+1808.61,3343.44476421119,123576.453705
+1933.42,0,5744.3823432
+1933.42,222.509231310321,12346.59360393
+1933.42,445.018462620641,20668.90334925
+1933.42,667.527693930962,28545.36237
+1933.42,890.036925241282,36734.25694
+1933.42,1112.5461565516,45079.69364
+1933.42,1335.05538786192,53513.89783
+1933.42,1557.56461917224,62061.04516
+1933.42,1780.07385048256,70644.40583
+1933.42,2002.58308179289,79500.74074
+1933.42,2225.09231310321,88387.51915
+1933.42,3337.63846965481,132581.278725
+2058.23,0,6560.8799148
+2058.23,222.16909043207,13692.03656931
+2058.23,444.338180864141,22482.3172275
+2058.23,666.507271296211,30818.26525
+2058.23,888.676361728281,39629.57543
+2058.23,1110.84545216035,48878.28448
+2058.23,1333.01454259242,57962.08958
+2058.23,1555.18363302449,67055.94373
+2058.23,1777.35272345656,75964.46598
+2058.23,1999.52181388863,85125.385
+2058.23,2221.6909043207,94390.73583
+2058.23,3332.53635648106,141586.103745
+454,-132.999892473118,0
+550,-136.287634408602,0
+698.9,-141.387059139785,0
+847.8,-146.486483870968,0
+996.7,-154.959741568349,0
+1145.57,-166.781867309602,0
+1309.19,-179.775326124566,0
+1434,-194.150966312961,0
+1558.9,-211.039273001479,0
+1683.8,-227.927579689998,0
+1808.61,-247.09759476584,0
+1933.42,-268.858544903581,0
+2058.23,-290.619495041322,0
+454,-152.999892473118,0
+550,-156.287634408602,0
+698.9,-161.387059139785,0
+847.8,-166.486483870968,0
+996.7,-174.959741568349,0
+1145.57,-186.781867309602,0
+1309.19,-199.775326124566,0
+1434,-214.150966312961,0
+1558.9,-231.039273001479,0
+1683.8,-247.927579689998,0
+1808.61,-267.09759476584,0
+1933.42,-288.858544903581,0
+2058.23,-310.619495041322,0
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Group5_ICE_fld.vfld b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Group5_ICE_fld.vfld
new file mode 100644
index 0000000000000000000000000000000000000000..4274d2cd558cd5088ca9a7749ea42c93fdb77682
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Group5_ICE_fld.vfld
@@ -0,0 +1,6 @@
+engine speed [1/min], full load torque [Nm], motoring torque [Nm]
+550,810.92,-136.287634408602
+922,2134,-149.027634408602
+1354,2134,-183.333796296296
+1750,1909.85931710274,-236.878787878788
+2410,0,-351.951515151515
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/HEV_Parameter.vhctl b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/HEV_Parameter.vhctl
new file mode 100644
index 0000000000000000000000000000000000000000..3b90919380a0ffa09f5f52d6172a4fde6ec06a32
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/HEV_Parameter.vhctl
@@ -0,0 +1,20 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2021-06-16T09:26:18.2012105Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "EquivalenceFactorDischarge": 2.35294117647059,
+ "EquivalenceFactorCharge": 1.7,
+ "MinSoC": 30,
+ "MaxSoC": 70,
+ "TargetSoC": 50.0,
+ "AuxBufferTime": 5.0,
+ "AuxBufferChgTime": 5.0,
+ "MinICEOnTime": 10.0,
+ "ICEStartPenaltyFactor": 0.1,
+ "CostFactorSOCExponent": 1
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/LongHaul_mod5_id_2.vdri b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/LongHaul_mod5_id_2.vdri
new file mode 100644
index 0000000000000000000000000000000000000000..e63c500aa35f91dc33f290fe8c5575ddb78cc346
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/LongHaul_mod5_id_2.vdri
@@ -0,0 +1,4752 @@
+<s>,<v>,<grad>,<stop>,HW
+0,0,-0.762754,5,1
+1,83,-0.763099,0,1
+2,83,-0.763445,0,1
+3,83,-0.763790,0,1
+4,83,-0.764136,0,1
+5,83,-0.764481,0,1
+6,83,-0.764827,0,1
+7,83,-0.765173,0,1
+8,83,-0.765518,0,1
+9,83,-0.765864,0,1
+10,83,-0.766209,0,1
+11,83,-0.766555,0,1
+12,85,-0.766900,0,1
+13,85,-0.767246,0,1
+14,85,-0.767592,0,1
+15,85,-0.767937,0,1
+16,85,-0.768283,0,1
+17,85,-0.768628,0,1
+18,85,-0.768974,0,1
+19,85,-0.769319,0,1
+20,85,-0.769665,0,1
+21,85,-0.770356,0,1
+22,85,-0.771046,0,1
+23,85,-0.771737,0,1
+24,85,-0.772428,0,1
+25,85,-0.773119,0,1
+26,85,-0.773809,0,1
+27,85,-0.774500,0,1
+28,85,-0.775191,0,1
+29,85,-0.775881,0,1
+30,85,-0.776572,0,1
+31,85,-0.777263,0,1
+32,85,-0.777954,0,1
+33,85,-0.778644,0,1
+34,85,-0.779335,0,1
+35,85,-0.780026,0,1
+36,85,-0.780717,0,1
+37,85,-0.781407,0,1
+38,85,-0.782098,0,1
+39,85,-0.782789,0,1
+40,85,-0.783480,0,1
+41,85,-0.784453,0,1
+42,85,-0.785426,0,1
+43,85,-0.786400,0,1
+44,85,-0.787373,0,1
+45,85,-0.788347,0,1
+46,85,-0.789320,0,1
+47,85,-0.790294,0,1
+48,85,-0.791267,0,1
+49,85,-0.792240,0,1
+50,85,-0.793214,0,1
+51,85,-0.794187,0,1
+52,85,-0.795161,0,1
+53,85,-0.796134,0,1
+54,85,-0.797108,0,1
+55,85,-0.798081,0,1
+56,85,-0.799054,0,1
+57,85,-0.800028,0,1
+58,85,-0.801001,0,1
+59,85,-0.801975,0,1
+60,85,-0.802948,0,1
+61,85,-0.804173,0,1
+62,85,-0.805398,0,1
+63,85,-0.806623,0,1
+64,85,-0.807848,0,1
+65,85,-0.809073,0,1
+66,85,-0.810297,0,1
+67,85,-0.811522,0,1
+68,85,-0.812747,0,1
+69,85,-0.813972,0,1
+70,85,-0.815197,0,1
+71,85,-0.816422,0,1
+72,85,-0.817647,0,1
+73,85,-0.818871,0,1
+74,85,-0.820096,0,1
+75,85,-0.821321,0,1
+76,85,-0.822546,0,1
+77,85,-0.823771,0,1
+78,85,-0.824996,0,1
+79,85,-0.826221,0,1
+80,85,-0.827446,0,1
+81,85,-0.828910,0,1
+82,85,-0.830375,0,1
+83,85,-0.831840,0,1
+84,85,-0.833305,0,1
+85,85,-0.834770,0,1
+86,85,-0.836234,0,1
+87,85,-0.837699,0,1
+88,85,-0.839164,0,1
+89,85,-0.840629,0,1
+90,85,-0.842094,0,1
+91,85,-0.843558,0,1
+92,85,-0.845023,0,1
+93,85,-0.846488,0,1
+94,85,-0.847953,0,1
+95,85,-0.849418,0,1
+96,85,-0.850882,0,1
+97,85,-0.852347,0,1
+98,85,-0.853812,0,1
+99,85,-0.855277,0,1
+100,85,-0.856742,0,1
+101,85,-0.858565,0,1
+102,85,-0.860387,0,1
+103,85,-0.862210,0,1
+104,85,-0.864033,0,1
+105,85,-0.865856,0,1
+106,85,-0.867679,0,1
+107,85,-0.869502,0,1
+108,85,-0.871325,0,1
+109,85,-0.873148,0,1
+110,85,-0.874971,0,1
+111,85,-0.876794,0,1
+112,85,-0.878617,0,1
+113,85,-0.880440,0,1
+114,85,-0.882263,0,1
+115,85,-0.884086,0,1
+116,85,-0.885909,0,1
+117,85,-0.887731,0,1
+118,85,-0.889554,0,1
+119,85,-0.891377,0,1
+120,85,-0.893200,0,1
+121,85,-0.895521,0,1
+122,85,-0.897841,0,1
+123,85,-0.900161,0,1
+124,85,-0.902481,0,1
+125,85,-0.904802,0,1
+126,85,-0.907122,0,1
+127,85,-0.909442,0,1
+128,85,-0.911763,0,1
+129,85,-0.914083,0,1
+130,85,-0.916403,0,1
+131,85,-0.918723,0,1
+132,85,-0.921044,0,1
+133,85,-0.923364,0,1
+134,85,-0.925684,0,1
+135,85,-0.928005,0,1
+136,85,-0.930325,0,1
+137,85,-0.932645,0,1
+138,85,-0.934966,0,1
+139,85,-0.937286,0,1
+140,85,-0.939606,0,1
+141,85,-0.942253,0,1
+142,85,-0.944899,0,1
+143,85,-0.947546,0,1
+144,85,-0.950192,0,1
+145,85,-0.952838,0,1
+146,85,-0.955485,0,1
+147,85,-0.958131,0,1
+148,85,-0.960778,0,1
+149,85,-0.963424,0,1
+150,85,-0.966071,0,1
+151,85,-0.968717,0,1
+152,85,-0.971364,0,1
+153,85,-0.974010,0,1
+154,85,-0.976657,0,1
+155,85,-0.979303,0,1
+156,85,-0.981950,0,1
+157,85,-0.984596,0,1
+158,85,-0.987243,0,1
+159,85,-0.989889,0,1
+160,85,-0.992535,0,1
+161,85,-0.995274,0,1
+162,85,-0.998013,0,1
+163,85,-1.000751,0,1
+164,85,-1.003490,0,1
+165,85,-1.006229,0,1
+166,85,-1.008968,0,1
+167,85,-1.011706,0,1
+168,85,-1.014445,0,1
+169,85,-1.017184,0,1
+170,85,-1.019922,0,1
+171,85,-1.022661,0,1
+172,85,-1.025400,0,1
+173,85,-1.028138,0,1
+174,85,-1.030877,0,1
+175,85,-1.033616,0,1
+176,85,-1.036354,0,1
+177,85,-1.039093,0,1
+178,85,-1.041832,0,1
+179,85,-1.044570,0,1
+180,85,-1.047309,0,1
+181,85,-1.050336,0,1
+182,85,-1.053362,0,1
+183,85,-1.056389,0,1
+184,85,-1.059415,0,1
+185,85,-1.062442,0,1
+186,85,-1.065468,0,1
+187,85,-1.068495,0,1
+188,85,-1.071521,0,1
+189,85,-1.074548,0,1
+190,85,-1.077575,0,1
+191,85,-1.080601,0,1
+192,85,-1.083628,0,1
+193,85,-1.086654,0,1
+194,85,-1.089681,0,1
+195,85,-1.092707,0,1
+196,85,-1.095734,0,1
+197,85,-1.098760,0,1
+198,85,-1.101787,0,1
+199,85,-1.104813,0,1
+200,85,-1.107840,0,1
+201,85,-1.111275,0,1
+202,85,-1.114709,0,1
+203,85,-1.118144,0,1
+204,85,-1.121578,0,1
+205,85,-1.125013,0,1
+206,85,-1.128448,0,1
+207,85,-1.131882,0,1
+208,85,-1.135317,0,1
+209,85,-1.138752,0,1
+210,85,-1.142186,0,1
+211,85,-1.145621,0,1
+212,85,-1.149055,0,1
+213,85,-1.152490,0,1
+214,85,-1.155925,0,1
+215,85,-1.159359,0,1
+216,85,-1.162794,0,1
+217,85,-1.166229,0,1
+218,85,-1.169663,0,1
+219,85,-1.173098,0,1
+220,85,-1.176533,0,1
+221,85,-1.179620,0,1
+222,85,-1.182707,0,1
+223,85,-1.185794,0,1
+224,85,-1.188881,0,1
+225,85,-1.191969,0,1
+226,85,-1.195056,0,1
+227,85,-1.198143,0,1
+228,85,-1.201230,0,1
+229,85,-1.204318,0,1
+230,85,-1.207405,0,1
+231,85,-1.210492,0,1
+232,85,-1.213579,0,1
+233,85,-1.216666,0,1
+234,85,-1.219754,0,1
+235,85,-1.222841,0,1
+236,85,-1.225928,0,1
+237,85,-1.229015,0,1
+238,85,-1.232103,0,1
+239,85,-1.235190,0,1
+240,85,-1.238277,0,1
+241,85,-1.240096,0,1
+242,85,-1.241914,0,1
+243,85,-1.243733,0,1
+244,85,-1.245552,0,1
+245,85,-1.247370,0,1
+246,85,-1.249189,0,1
+247,85,-1.251008,0,1
+248,85,-1.252827,0,1
+249,85,-1.254645,0,1
+250,85,-1.256464,0,1
+251,85,-1.258283,0,1
+252,85,-1.260101,0,1
+253,85,-1.261920,0,1
+254,85,-1.263739,0,1
+255,85,-1.265557,0,1
+256,85,-1.267376,0,1
+257,85,-1.269195,0,1
+258,85,-1.271013,0,1
+259,85,-1.272832,0,1
+260,85,-1.274651,0,1
+261,85,-1.275369,0,1
+262,85,-1.276087,0,1
+263,85,-1.276806,0,1
+264,85,-1.277524,0,1
+265,85,-1.278242,0,1
+266,85,-1.278960,0,1
+267,85,-1.279678,0,1
+268,85,-1.280397,0,1
+269,85,-1.281115,0,1
+270,85,-1.281833,0,1
+271,85,-1.282551,0,1
+272,85,-1.283269,0,1
+273,85,-1.283988,0,1
+274,85,-1.284706,0,1
+275,85,-1.285424,0,1
+276,85,-1.286142,0,1
+277,85,-1.286860,0,1
+278,85,-1.287579,0,1
+279,85,-1.288297,0,1
+280,85,-1.289015,0,1
+281,85,-1.289642,0,1
+282,85,-1.290268,0,1
+283,85,-1.290895,0,1
+284,85,-1.291522,0,1
+285,85,-1.292148,0,1
+286,85,-1.292775,0,1
+287,85,-1.293401,0,1
+288,85,-1.294028,0,1
+289,85,-1.294655,0,1
+290,85,-1.295281,0,1
+291,85,-1.295908,0,1
+292,85,-1.296534,0,1
+293,85,-1.297161,0,1
+294,85,-1.297788,0,1
+295,85,-1.298414,0,1
+296,85,-1.299041,0,1
+297,85,-1.299667,0,1
+298,85,-1.300294,0,1
+299,85,-1.300921,0,1
+300,85,-1.301547,0,1
+301,85,-1.302818,0,1
+302,85,-1.304088,0,1
+303,85,-1.305359,0,1
+304,85,-1.306629,0,1
+305,85,-1.307900,0,1
+306,85,-1.309170,0,1
+307,85,-1.310441,0,1
+308,85,-1.311711,0,1
+309,85,-1.312982,0,1
+310,85,-1.314252,0,1
+311,85,-1.315523,0,1
+312,85,-1.316793,0,1
+313,85,-1.318064,0,1
+314,85,-1.319335,0,1
+315,85,-1.320605,0,1
+316,85,-1.321876,0,1
+317,85,-1.323146,0,1
+318,85,-1.324417,0,1
+319,85,-1.325687,0,1
+320,85,-1.326958,0,1
+321,85,-1.328894,0,1
+322,85,-1.330829,0,1
+323,85,-1.332765,0,1
+324,85,-1.334701,0,1
+325,85,-1.336637,0,1
+326,85,-1.338573,0,1
+327,85,-1.340509,0,1
+328,85,-1.342445,0,1
+329,85,-1.344381,0,1
+330,85,-1.346317,0,1
+331,85,-1.348253,0,1
+332,85,-1.350188,0,1
+333,85,-1.352124,0,1
+334,85,-1.354060,0,1
+335,85,-1.355996,0,1
+336,85,-1.357932,0,1
+337,85,-1.359868,0,1
+338,85,-1.361804,0,1
+339,85,-1.363740,0,1
+340,85,-1.365676,0,1
+341,85,-1.368168,0,1
+342,85,-1.370661,0,1
+343,85,-1.373154,0,1
+344,85,-1.375646,0,1
+345,85,-1.378139,0,1
+346,85,-1.380632,0,1
+347,85,-1.383124,0,1
+348,85,-1.385617,0,1
+349,85,-1.388110,0,1
+350,85,-1.390602,0,1
+351,85,-1.393095,0,1
+352,85,-1.395588,0,1
+353,85,-1.398080,0,1
+354,85,-1.400573,0,1
+355,85,-1.403066,0,1
+356,85,-1.405558,0,1
+357,85,-1.408051,0,1
+358,85,-1.410544,0,1
+359,85,-1.413036,0,1
+360,85,-1.415529,0,1
+361,85,-1.418874,0,1
+362,85,-1.422220,0,1
+363,85,-1.425565,0,1
+364,85,-1.428910,0,1
+365,85,-1.432256,0,1
+366,85,-1.435601,0,1
+367,85,-1.438946,0,1
+368,85,-1.442292,0,1
+369,85,-1.445637,0,1
+370,85,-1.448983,0,1
+371,85,-1.452328,0,1
+372,85,-1.455673,0,1
+373,85,-1.459019,0,1
+374,85,-1.462364,0,1
+375,85,-1.465709,0,1
+376,85,-1.469055,0,1
+377,85,-1.472400,0,1
+378,85,-1.475745,0,1
+379,85,-1.479091,0,1
+380,85,-1.482436,0,1
+381,85,-1.486683,0,1
+382,85,-1.490931,0,1
+383,85,-1.495178,0,1
+384,85,-1.499425,0,1
+385,85,-1.503672,0,1
+386,85,-1.507919,0,1
+387,85,-1.512166,0,1
+388,85,-1.516414,0,1
+389,85,-1.520661,0,1
+390,85,-1.524908,0,1
+391,85,-1.529155,0,1
+392,85,-1.533402,0,1
+393,85,-1.537650,0,1
+394,85,-1.541897,0,1
+395,85,-1.546144,0,1
+396,85,-1.550391,0,1
+397,85,-1.554638,0,1
+398,85,-1.558885,0,1
+399,85,-1.563133,0,1
+400,85,-1.567380,0,1
+401,85,-1.571447,0,1
+402,85,-1.575513,0,1
+403,85,-1.579580,0,1
+404,85,-1.583647,0,1
+405,85,-1.587714,0,1
+406,85,-1.591781,0,1
+407,85,-1.595847,0,1
+408,85,-1.599914,0,1
+409,85,-1.603981,0,1
+410,85,-1.608048,0,1
+411,85,-1.612115,0,1
+412,85,-1.616181,0,1
+413,85,-1.620248,0,1
+414,85,-1.624315,0,1
+415,85,-1.628382,0,1
+416,85,-1.632449,0,1
+417,85,-1.636515,0,1
+418,85,-1.640582,0,1
+419,85,-1.644649,0,1
+420,85,-1.648716,0,1
+421,85,-1.650831,0,1
+422,85,-1.652946,0,1
+423,85,-1.655061,0,1
+424,85,-1.657176,0,1
+425,85,-1.659291,0,1
+426,85,-1.661406,0,1
+427,85,-1.663521,0,1
+428,85,-1.665636,0,1
+429,85,-1.667751,0,1
+430,85,-1.669866,0,1
+431,85,-1.671981,0,1
+432,85,-1.674096,0,1
+433,85,-1.676211,0,1
+434,85,-1.678326,0,1
+435,85,-1.680441,0,1
+436,85,-1.682556,0,1
+437,85,-1.684671,0,1
+438,85,-1.686786,0,1
+439,85,-1.688901,0,1
+440,85,-1.691016,0,1
+441,85,-1.689823,0,1
+442,85,-1.688629,0,1
+443,85,-1.687435,0,1
+444,85,-1.686242,0,1
+445,85,-1.685048,0,1
+446,85,-1.683855,0,1
+447,85,-1.682661,0,1
+448,85,-1.681467,0,1
+449,85,-1.680274,0,1
+450,85,-1.679080,0,1
+451,85,-1.677886,0,1
+452,85,-1.676693,0,1
+453,85,-1.675499,0,1
+454,85,-1.674306,0,1
+455,85,-1.673112,0,1
+456,85,-1.671918,0,1
+457,85,-1.670725,0,1
+458,85,-1.669531,0,1
+459,85,-1.668337,0,1
+460,85,-1.667144,0,1
+461,85,-1.662307,0,1
+462,85,-1.657470,0,1
+463,85,-1.652633,0,1
+464,85,-1.647797,0,1
+465,85,-1.642960,0,1
+466,85,-1.638123,0,1
+467,85,-1.633286,0,1
+468,85,-1.628450,0,1
+469,85,-1.623613,0,1
+470,85,-1.618776,0,1
+471,85,-1.613939,0,1
+472,85,-1.609103,0,1
+473,85,-1.604266,0,1
+474,85,-1.599429,0,1
+475,85,-1.594592,0,1
+476,85,-1.589756,0,1
+477,85,-1.584919,0,1
+478,85,-1.580082,0,1
+479,85,-1.575245,0,1
+480,85,-1.570409,0,1
+481,85,-1.563743,0,1
+482,85,-1.557077,0,1
+483,85,-1.550411,0,1
+484,85,-1.543746,0,1
+485,85,-1.537080,0,1
+486,85,-1.530414,0,1
+487,85,-1.523748,0,1
+488,85,-1.517083,0,1
+489,85,-1.510417,0,1
+490,85,-1.503751,0,1
+491,85,-1.497085,0,1
+492,85,-1.490420,0,1
+493,85,-1.483754,0,1
+494,85,-1.477088,0,1
+495,85,-1.470422,0,1
+496,85,-1.463757,0,1
+497,85,-1.457091,0,1
+498,85,-1.450425,0,1
+499,85,-1.443759,0,1
+500,85,-1.437094,0,1
+501,85,-1.432473,0,1
+502,85,-1.427853,0,1
+503,85,-1.423233,0,1
+504,85,-1.418612,0,1
+505,85,-1.413992,0,1
+506,85,-1.409371,0,1
+507,85,-1.404751,0,1
+508,85,-1.400131,0,1
+509,85,-1.395510,0,1
+510,85,-1.390890,0,1
+511,85,-1.386270,0,1
+512,85,-1.381649,0,1
+513,85,-1.377029,0,1
+514,85,-1.372408,0,1
+515,85,-1.367788,0,1
+516,85,-1.363168,0,1
+517,85,-1.358547,0,1
+518,85,-1.353927,0,1
+519,85,-1.349307,0,1
+520,85,-1.344686,0,1
+521,85,-1.344232,0,1
+522,85,-1.343777,0,1
+523,85,-1.343323,0,1
+524,85,-1.342869,0,1
+525,85,-1.342414,0,1
+526,85,-1.341960,0,1
+527,85,-1.341505,0,1
+528,85,-1.341051,0,1
+529,85,-1.340597,0,1
+530,85,-1.340142,0,1
+531,85,-1.339688,0,1
+532,85,-1.339234,0,1
+533,85,-1.338779,0,1
+534,85,-1.338325,0,1
+535,85,-1.337870,0,1
+536,85,-1.337416,0,1
+537,85,-1.336962,0,1
+538,85,-1.336507,0,1
+539,85,-1.336053,0,1
+540,85,-1.335598,0,1
+541,85,-1.338154,0,1
+542,85,-1.340710,0,1
+543,85,-1.343266,0,1
+544,85,-1.345822,0,1
+545,85,-1.348378,0,1
+546,85,-1.350934,0,1
+547,85,-1.353490,0,1
+548,85,-1.356046,0,1
+549,85,-1.358602,0,1
+550,85,-1.361158,0,1
+551,85,-1.363714,0,1
+552,85,-1.366270,0,1
+553,85,-1.368826,0,1
+554,85,-1.371382,0,1
+555,85,-1.373938,0,1
+556,85,-1.376494,0,1
+557,85,-1.379050,0,1
+558,85,-1.381606,0,1
+559,85,-1.384162,0,1
+560,85,-1.386718,0,1
+561,85,-1.389781,0,1
+562,85,-1.392844,0,1
+563,85,-1.395906,0,1
+564,85,-1.398969,0,1
+565,85,-1.402032,0,1
+566,85,-1.405094,0,1
+567,85,-1.408157,0,1
+568,85,-1.411220,0,1
+569,85,-1.414283,0,1
+570,85,-1.417345,0,1
+571,85,-1.420408,0,1
+572,85,-1.423471,0,1
+573,85,-1.426533,0,1
+574,85,-1.429596,0,1
+575,85,-1.432659,0,1
+576,85,-1.435722,0,1
+577,85,-1.438784,0,1
+578,85,-1.441847,0,1
+579,85,-1.444910,0,1
+580,85,-1.447972,0,1
+581,85,-1.447845,0,1
+582,85,-1.447717,0,1
+583,85,-1.447590,0,1
+584,85,-1.447462,0,1
+585,85,-1.447335,0,1
+586,85,-1.447207,0,1
+587,85,-1.447080,0,1
+588,85,-1.446952,0,1
+589,85,-1.446824,0,1
+590,85,-1.446697,0,1
+591,85,-1.446569,0,1
+592,85,-1.446442,0,1
+593,85,-1.446314,0,1
+594,85,-1.446187,0,1
+595,85,-1.446059,0,1
+596,85,-1.445932,0,1
+597,85,-1.445804,0,1
+598,85,-1.445677,0,1
+599,85,-1.445549,0,1
+600,85,-1.445421,0,1
+601,85,-1.439565,0,1
+602,85,-1.433709,0,1
+603,85,-1.427853,0,1
+604,85,-1.421997,0,1
+605,85,-1.416141,0,1
+606,85,-1.410285,0,1
+607,85,-1.404429,0,1
+608,85,-1.398573,0,1
+609,85,-1.392717,0,1
+610,85,-1.386861,0,1
+611,85,-1.381005,0,1
+612,85,-1.375149,0,1
+613,85,-1.369293,0,1
+614,85,-1.363437,0,1
+615,85,-1.357581,0,1
+616,85,-1.351725,0,1
+617,85,-1.345869,0,1
+618,85,-1.340013,0,1
+619,85,-1.334157,0,1
+620,85,-1.328301,0,1
+621,85,-1.317594,0,1
+622,85,-1.306886,0,1
+623,85,-1.296178,0,1
+624,85,-1.285470,0,1
+625,85,-1.274762,0,1
+626,85,-1.264054,0,1
+627,85,-1.253346,0,1
+628,85,-1.242638,0,1
+629,85,-1.231931,0,1
+630,85,-1.221223,0,1
+631,85,-1.210515,0,1
+632,85,-1.199807,0,1
+703,85,-0.333910,0,1
+704,85,-0.328709,0,1
+705,85,-0.323508,0,1
+706,85,-0.318307,0,1
+707,85,-0.313106,0,1
+708,85,-0.307905,0,1
+709,85,-0.302704,0,1
+710,85,-0.297503,0,1
+711,85,-0.292302,0,1
+712,85,-0.287102,0,1
+713,85,-0.281901,0,1
+714,85,-0.276700,0,1
+715,85,-0.271499,0,1
+716,85,-0.266298,0,1
+717,85,-0.261097,0,1
+718,85,-0.255896,0,1
+719,85,-0.250695,0,1
+720,85,-0.245494,0,1
+721,85,-0.242819,0,1
+722,85,-0.240145,0,1
+723,85,-0.237470,0,1
+724,85,-0.234795,0,1
+725,85,-0.232120,0,1
+726,85,-0.229446,0,1
+727,85,-0.226771,0,1
+728,85,-0.224096,0,1
+729,85,-0.221421,0,1
+730,85,-0.218747,0,1
+731,85,-0.216072,0,1
+732,85,-0.213397,0,1
+733,85,-0.210722,0,1
+734,85,-0.208048,0,1
+735,85,-0.205373,0,1
+736,85,-0.202698,0,1
+737,85,-0.200023,0,1
+738,85,-0.197349,0,1
+739,85,-0.194674,0,1
+740,85,-0.191999,0,1
+741,85,-0.188616,0,1
+742,85,-0.185232,0,1
+743,85,-0.181849,0,1
+744,85,-0.178465,0,1
+745,85,-0.175082,0,1
+746,85,-0.171698,0,1
+747,85,-0.168315,0,1
+748,85,-0.164931,0,1
+749,85,-0.161548,0,1
+750,85,-0.158164,0,1
+751,85,-0.154781,0,1
+752,85,-0.151397,0,1
+753,85,-0.148014,0,1
+754,85,-0.144630,0,1
+755,85,-0.141247,0,1
+756,85,-0.137863,0,1
+757,85,-0.134480,0,1
+758,85,-0.131096,0,1
+759,85,-0.127713,0,1
+760,85,-0.124329,0,1
+761,85,-0.120314,0,1
+762,85,-0.116299,0,1
+763,85,-0.112284,0,1
+764,85,-0.108270,0,1
+765,85,-0.104255,0,1
+766,85,-0.100240,0,1
+767,85,-0.096225,0,1
+768,85,-0.092210,0,1
+769,85,-0.088195,0,1
+770,85,-0.084180,0,1
+771,85,-0.080165,0,1
+772,85,-0.076150,0,1
+773,85,-0.072135,0,1
+774,85,-0.068121,0,1
+775,85,-0.064106,0,1
+776,85,-0.060091,0,1
+777,85,-0.056076,0,1
+778,85,-0.052061,0,1
+779,85,-0.048046,0,1
+780,85,-0.044031,0,1
+781,85,-0.041589,0,1
+782,85,-0.039148,0,1
+783,85,-0.036706,0,1
+784,85,-0.034264,0,1
+785,85,-0.031823,0,1
+786,85,-0.029381,0,1
+787,85,-0.026939,0,1
+788,85,-0.024498,0,1
+789,85,-0.022056,0,1
+790,85,-0.019614,0,1
+791,85,-0.017173,0,1
+792,85,-0.014731,0,1
+793,85,-0.012289,0,1
+794,85,-0.009848,0,1
+795,85,-0.007406,0,1
+796,85,-0.004964,0,1
+797,85,-0.002523,0,1
+798,85,-0.000081,0,1
+799,85,0.002361,0,1
+800,85,0.004802,0,1
+801,85,0.005588,0,1
+802,85,0.006374,0,1
+803,85,0.007159,0,1
+804,85,0.007945,0,1
+805,85,0.008730,0,1
+806,85,0.009516,0,1
+807,85,0.010301,0,1
+808,85,0.011087,0,1
+809,85,0.011872,0,1
+810,85,0.012658,0,1
+811,85,0.013443,0,1
+812,85,0.014229,0,1
+813,85,0.015014,0,1
+814,85,0.015800,0,1
+815,85,0.016586,0,1
+816,85,0.017371,0,1
+817,85,0.018157,0,1
+818,85,0.018942,0,1
+819,85,0.019728,0,1
+820,85,0.020513,0,1
+821,85,0.022874,0,1
+822,85,0.025235,0,1
+823,85,0.027596,0,1
+824,85,0.029957,0,1
+825,85,0.032318,0,1
+826,85,0.034679,0,1
+827,85,0.037039,0,1
+828,85,0.039400,0,1
+829,85,0.041761,0,1
+830,85,0.044122,0,1
+831,85,0.046483,0,1
+832,85,0.048844,0,1
+833,85,0.051205,0,1
+834,85,0.053566,0,1
+835,85,0.055927,0,1
+836,85,0.058287,0,1
+837,85,0.060648,0,1
+838,85,0.063009,0,1
+839,85,0.065370,0,1
+840,85,0.067731,0,1
+841,85,0.073389,0,1
+842,85,0.079046,0,1
+843,85,0.084704,0,1
+844,85,0.090361,0,1
+845,85,0.096019,0,1
+846,85,0.101676,0,1
+847,85,0.107334,0,1
+848,85,0.112991,0,1
+849,85,0.118649,0,1
+850,85,0.124306,0,1
+851,85,0.129964,0,1
+852,85,0.135621,0,1
+853,85,0.141279,0,1
+854,85,0.146936,0,1
+855,85,0.152594,0,1
+856,85,0.158252,0,1
+857,85,0.163909,0,1
+858,85,0.169567,0,1
+859,85,0.175224,0,1
+860,85,0.180882,0,1
+861,85,0.185827,0,1
+862,85,0.190773,0,1
+863,85,0.195718,0,1
+864,85,0.200664,0,1
+865,85,0.205610,0,1
+866,85,0.210555,0,1
+867,85,0.215501,0,1
+868,85,0.220446,0,1
+869,85,0.225392,0,1
+870,85,0.230337,0,1
+871,85,0.235283,0,1
+872,85,0.240228,0,1
+873,85,0.245174,0,1
+874,85,0.250120,0,1
+875,85,0.255065,0,1
+876,85,0.260011,0,1
+877,85,0.264956,0,1
+878,85,0.269902,0,1
+879,85,0.274847,0,1
+880,85,0.279793,0,1
+881,85,0.279123,0,1
+882,85,0.278454,0,1
+903,85,0.250463,0,1
+904,85,0.245151,0,1
+905,85,0.239838,0,1
+906,85,0.234525,0,1
+907,85,0.229213,0,1
+908,85,0.223900,0,1
+909,85,0.218587,0,1
+910,85,0.213275,0,1
+911,85,0.207962,0,1
+912,85,0.202650,0,1
+913,85,0.197337,0,1
+914,85,0.192024,0,1
+915,85,0.186712,0,1
+916,85,0.181399,0,1
+917,85,0.176086,0,1
+918,85,0.170774,0,1
+919,85,0.165461,0,1
+920,85,0.160148,0,1
+921,85,0.157259,0,1
+922,85,0.154369,0,1
+923,85,0.151480,0,1
+924,85,0.148590,0,1
+925,85,0.145700,0,1
+926,85,0.142811,0,1
+927,85,0.139921,0,1
+928,85,0.137032,0,1
+929,85,0.134142,0,1
+930,85,0.131252,0,1
+931,85,0.128363,0,1
+932,85,0.125473,0,1
+933,85,0.122583,0,1
+934,85,0.119694,0,1
+935,85,0.116804,0,1
+936,85,0.113915,0,1
+937,85,0.111025,0,1
+938,85,0.108135,0,1
+939,85,0.105246,0,1
+940,85,0.102356,0,1
+941,85,0.109137,0,1
+942,85,0.115918,0,1
+943,85,0.122698,0,1
+944,85,0.129479,0,1
+945,85,0.136260,0,1
+946,85,0.143040,0,1
+947,85,0.149821,0,1
+948,85,0.156602,0,1
+949,85,0.163382,0,1
+950,85,0.170163,0,1
+951,85,0.176944,0,1
+952,85,0.183724,0,1
+953,85,0.190505,0,1
+954,85,0.197286,0,1
+955,85,0.204067,0,1
+956,85,0.210847,0,1
+957,85,0.217628,0,1
+958,85,0.224409,0,1
+959,85,0.231189,0,1
+960,85,0.237970,0,1
+961,85,0.253810,0,1
+962,85,0.269651,0,1
+963,85,0.285491,0,1
+964,85,0.301331,0,1
+965,85,0.317171,0,1
+966,85,0.333012,0,1
+967,85,0.348852,0,1
+968,85,0.364692,0,1
+969,85,0.380533,0,1
+970,85,0.396373,0,1
+971,85,0.412213,0,1
+972,85,0.428054,0,1
+973,85,0.443894,0,1
+974,85,0.459734,0,1
+975,85,0.475575,0,1
+976,85,0.491415,0,1
+977,85,0.507255,0,1
+978,85,0.523095,0,1
+979,85,0.538936,0,1
+980,85,0.554776,0,1
+981,85,0.572811,0,1
+982,85,0.590847,0,1
+983,85,0.608882,0,1
+984,85,0.626917,0,1
+985,85,0.644952,0,1
+986,85,0.662988,0,1
+987,85,0.681023,0,1
+988,85,0.699058,0,1
+989,85,0.717093,0,1
+990,85,0.735129,0,1
+991,85,0.753164,0,1
+992,85,0.771199,0,1
+993,85,0.789235,0,1
+994,85,0.807270,0,1
+995,85,0.825305,0,1
+996,85,0.843340,0,1
+997,85,0.861376,0,1
+998,85,0.879411,0,1
+999,85,0.897446,0,1
+1000,85,0.915481,0,1
+1001,85,0.929909,0,1
+1002,85,0.944338,0,1
+1003,85,0.958766,0,1
+1004,85,0.973194,0,1
+1005,85,0.987622,0,1
+1006,85,1.002050,0,1
+1007,85,1.016478,0,1
+1008,85,1.030906,0,1
+1009,85,1.045334,0,1
+1010,85,1.059762,0,1
+1011,85,1.074190,0,1
+1012,85,1.088618,0,1
+1013,85,1.103046,0,1
+1014,85,1.117475,0,1
+1015,85,1.131903,0,1
+1016,85,1.146331,0,1
+1017,85,1.160759,0,1
+1018,85,1.175187,0,1
+1019,85,1.189615,0,1
+1020,85,1.204043,0,1
+1021,85,1.211875,0,1
+1022,85,1.219708,0,1
+1023,85,1.227540,0,1
+1024,85,1.235373,0,1
+1025,85,1.243205,0,1
+1026,85,1.251038,0,1
+1027,85,1.258870,0,1
+1028,85,1.266703,0,1
+1029,85,1.274535,0,1
+1030,85,1.282368,0,1
+1031,85,1.290200,0,1
+1032,85,1.298033,0,1
+1033,85,1.305865,0,1
+1034,85,1.313698,0,1
+1035,85,1.321530,0,1
+1036,85,1.329363,0,1
+1037,85,1.337195,0,1
+1038,85,1.345028,0,1
+1039,85,1.352860,0,1
+1040,85,1.360693,0,1
+1041,85,1.361991,0,1
+1042,85,1.363290,0,1
+1043,85,1.364588,0,1
+1044,85,1.365887,0,1
+1045,85,1.367185,0,1
+1046,85,1.368484,0,1
+1047,85,1.369782,0,1
+1048,85,1.371081,0,1
+1049,85,1.372379,0,1
+1050,85,1.373678,0,1
+1051,85,1.374976,0,1
+1052,85,1.376275,0,1
+1053,85,1.377573,0,1
+1054,85,1.378872,0,1
+1055,85,1.380170,0,1
+1056,85,1.381469,0,1
+1057,85,1.382768,0,1
+1058,85,1.384066,0,1
+1059,85,1.385365,0,1
+1060,85,1.386663,0,1
+1061,85,1.383728,0,1
+1062,85,1.380792,0,1
+1063,85,1.377857,0,1
+1064,85,1.374921,0,1
+1065,85,1.371986,0,1
+1066,85,1.369050,0,1
+1067,85,1.366115,0,1
+1068,85,1.363179,0,1
+1069,85,1.360244,0,1
+1070,85,1.357308,0,1
+1071,85,1.354373,0,1
+1072,85,1.351437,0,1
+1073,85,1.348502,0,1
+1074,85,1.345566,0,1
+1075,85,1.342631,0,1
+1076,85,1.339695,0,1
+1077,85,1.336759,0,1
+1078,85,1.333824,0,1
+1079,85,1.330888,0,1
+1080,85,1.327953,0,1
+1081,85,1.323536,0,1
+1082,85,1.319118,0,1
+1083,85,1.314701,0,1
+1084,85,1.310283,0,1
+1085,85,1.305866,0,1
+1086,85,1.301449,0,1
+1087,85,1.297031,0,1
+1088,85,1.292614,0,1
+1089,85,1.288196,0,1
+1090,85,1.283779,0,1
+1091,85,1.279361,0,1
+1092,85,1.274944,0,1
+1093,85,1.270527,0,1
+1094,85,1.266109,0,1
+1095,85,1.261692,0,1
+1096,85,1.257274,0,1
+1097,85,1.252857,0,1
+1098,85,1.248440,0,1
+1099,85,1.244022,0,1
+1100,85,1.239605,0,1
+1101,85,1.236591,0,1
+1102,85,1.233578,0,1
+1103,85,1.230565,0,1
+1104,85,1.227551,0,1
+1105,85,1.224538,0,1
+1106,85,1.221524,0,1
+1107,85,1.218511,0,1
+1108,85,1.215498,0,1
+1109,85,1.212484,0,1
+1110,85,1.209471,0,1
+1111,85,1.206457,0,1
+1112,85,1.203444,0,1
+1113,85,1.200430,0,1
+1114,85,1.197417,0,1
+1115,85,1.194404,0,1
+1116,85,1.191390,0,1
+1117,85,1.188377,0,1
+1118,85,1.185363,0,1
+1119,85,1.182350,0,1
+1120,85,1.179337,0,1
+1121,85,1.181090,0,1
+1122,85,1.182844,0,1
+1123,85,1.184598,0,1
+1124,85,1.186352,0,1
+1125,85,1.188106,0,1
+1126,85,1.189859,0,1
+1127,85,1.191613,0,1
+1128,85,1.193367,0,1
+1129,85,1.195121,0,1
+1130,85,1.196874,0,1
+1131,85,1.198628,0,1
+1132,85,1.200382,0,1
+1133,85,1.202136,0,1
+1134,85,1.203890,0,1
+1135,85,1.205643,0,1
+1136,85,1.207397,0,1
+1137,85,1.209151,0,1
+1138,85,1.210905,0,1
+1139,85,1.212659,0,1
+1140,85,1.214412,0,1
+1141,85,1.223684,0,1
+1142,85,1.232955,0,1
+1143,85,1.242227,0,1
+1144,85,1.251498,0,1
+1145,85,1.260770,0,1
+1146,85,1.270041,0,1
+1147,85,1.279313,0,1
+1148,85,1.288584,0,1
+1149,85,1.297856,0,1
+1150,85,1.307127,0,1
+1151,85,1.316398,0,1
+1152,85,1.325670,0,1
+1153,85,1.334941,0,1
+1154,85,1.344213,0,1
+1155,85,1.353484,0,1
+1156,85,1.362756,0,1
+1157,85,1.372027,0,1
+1158,85,1.381299,0,1
+1159,85,1.390570,0,1
+1160,85,1.399842,0,1
+1161,85,1.415680,0,1
+1162,85,1.431518,0,1
+1163,85,1.447356,0,1
+1164,85,1.463194,0,1
+1165,85,1.479032,0,1
+1166,85,1.494871,0,1
+1167,85,1.510709,0,1
+1168,85,1.526547,0,1
+1169,85,1.542385,0,1
+1170,85,1.558223,0,1
+1171,85,1.574061,0,1
+1172,85,1.589899,0,1
+1173,85,1.605738,0,1
+1174,85,1.621576,0,1
+1175,85,1.637414,0,1
+1176,85,1.653252,0,1
+1177,85,1.669090,0,1
+1178,85,1.684928,0,1
+1179,85,1.700766,0,1
+1180,85,1.716605,0,1
+1181,85,1.734189,0,1
+1182,85,1.751773,0,1
+1203,85,2.107329,0,1
+1204,85,2.120341,0,1
+1205,85,2.133353,0,1
+1206,85,2.146365,0,1
+1207,85,2.159377,0,1
+1208,85,2.172389,0,1
+1209,85,2.185401,0,1
+1210,85,2.198413,0,1
+1211,85,2.211425,0,1
+1212,85,2.224438,0,1
+1213,85,2.237450,0,1
+1214,85,2.250462,0,1
+1215,85,2.263474,0,1
+1216,85,2.276486,0,1
+1217,85,2.289498,0,1
+1218,85,2.302510,0,1
+1219,85,2.315522,0,1
+1220,85,2.328535,0,1
+1221,85,2.333977,0,1
+1222,85,2.339419,0,1
+1223,85,2.344861,0,1
+1224,85,2.350304,0,1
+1225,85,2.355746,0,1
+1226,85,2.361188,0,1
+1227,85,2.366631,0,1
+1228,85,2.372073,0,1
+1229,85,2.377515,0,1
+1230,85,2.382958,0,1
+1231,85,2.388400,0,1
+1232,85,2.393842,0,1
+1233,85,2.399284,0,1
+1234,85,2.404727,0,1
+1235,85,2.410169,0,1
+1236,85,2.415611,0,1
+1237,85,2.421054,0,1
+1238,85,2.426496,0,1
+1239,85,2.431938,0,1
+1240,85,2.437381,0,1
+1241,85,2.439186,0,1
+1242,85,2.440991,0,1
+1243,85,2.442796,0,1
+1244,85,2.444602,0,1
+1245,85,2.446407,0,1
+1246,85,2.448212,0,1
+1247,85,2.450017,0,1
+1248,85,2.451823,0,1
+1249,85,2.453628,0,1
+1250,85,2.455433,0,1
+1251,85,2.457238,0,1
+1252,85,2.459044,0,1
+1253,85,2.460849,0,1
+1254,85,2.462654,0,1
+1255,85,2.464460,0,1
+1256,85,2.466265,0,1
+1257,85,2.468070,0,1
+1258,85,2.469875,0,1
+1259,85,2.471681,0,1
+1260,85,2.473486,0,1
+1261,85,2.475742,0,1
+1262,85,2.477997,0,1
+1263,85,2.480253,0,1
+1264,85,2.482509,0,1
+1265,85,2.484764,0,1
+1266,85,2.487020,0,1
+1267,85,2.489276,0,1
+1268,85,2.491532,0,1
+1269,85,2.493787,0,1
+1270,85,2.496043,0,1
+1271,85,2.498299,0,1
+1272,85,2.500555,0,1
+1273,85,2.502810,0,1
+1274,85,2.505066,0,1
+1275,85,2.507322,0,1
+1276,85,2.509578,0,1
+1277,85,2.511833,0,1
+1278,85,2.514089,0,1
+1279,85,2.516345,0,1
+1280,85,2.518600,0,1
+1281,85,2.522135,0,1
+1282,85,2.525670,0,1
+1283,85,2.529204,0,1
+1284,85,2.532739,0,1
+1285,85,2.536273,0,1
+1286,85,2.539808,0,1
+1287,85,2.543342,0,1
+1288,85,2.546877,0,1
+1289,85,2.550411,0,1
+1290,85,2.553946,0,1
+1291,85,2.557480,0,1
+1292,85,2.561015,0,1
+1293,85,2.564549,0,1
+1294,85,2.568084,0,1
+1295,85,2.571618,0,1
+1296,85,2.575153,0,1
+1297,85,2.578687,0,1
+1298,85,2.582222,0,1
+1299,85,2.585757,0,1
+1300,85,2.589291,0,1
+1301,85,2.595388,0,1
+1302,85,2.601485,0,1
+1303,85,2.607582,0,1
+1304,85,2.613678,0,1
+1305,85,2.619775,0,1
+1306,85,2.625872,0,1
+1307,85,2.631969,0,1
+1308,85,2.638066,0,1
+1309,85,2.644163,0,1
+1310,85,2.650260,0,1
+1311,85,2.656356,0,1
+1312,85,2.662453,0,1
+1313,85,2.668550,0,1
+1314,85,2.674647,0,1
+1315,85,2.680744,0,1
+1316,85,2.686841,0,1
+1317,85,2.692938,0,1
+1318,85,2.699034,0,1
+1319,85,2.705131,0,1
+1320,85,2.711228,0,1
+1321,85,2.718787,0,1
+1322,85,2.726346,0,1
+1323,85,2.733905,0,1
+1324,85,2.741464,0,1
+1325,85,2.749023,0,1
+1326,85,2.756583,0,1
+1327,85,2.764142,0,1
+1328,85,2.771701,0,1
+1329,85,2.779260,0,1
+1330,85,2.786819,0,1
+1331,85,2.794378,0,1
+1332,85,2.801937,0,1
+1333,85,2.809496,0,1
+1334,85,2.817055,0,1
+1335,85,2.824614,0,1
+1336,85,2.832173,0,1
+1337,85,2.839732,0,1
+1338,85,2.847291,0,1
+1339,85,2.854850,0,1
+1340,85,2.862409,0,1
+1341,85,2.867938,0,1
+1342,85,2.873467,0,1
+1343,85,2.878996,0,1
+1344,85,2.884525,0,1
+1345,85,2.890053,0,1
+1346,85,2.895582,0,1
+1347,85,2.901111,0,1
+1348,85,2.906640,0,1
+1349,85,2.912169,0,1
+1350,85,2.917697,0,1
+1351,85,2.923226,0,1
+1352,85,2.928755,0,1
+1353,85,2.934284,0,1
+1354,85,2.939813,0,1
+1355,85,2.945342,0,1
+1356,85,2.950870,0,1
+1357,85,2.956399,0,1
+1358,85,2.961928,0,1
+1359,85,2.967457,0,1
+1360,85,2.972986,0,1
+1361,85,2.973519,0,1
+1362,85,2.974052,0,1
+1363,85,2.974586,0,1
+1364,85,2.975119,0,1
+1365,85,2.975652,0,1
+1366,85,2.976186,0,1
+1367,85,2.976719,0,1
+1368,85,2.977252,0,1
+1369,85,2.977786,0,1
+1370,85,2.978319,0,1
+1371,85,2.978853,0,1
+1372,85,2.979386,0,1
+1373,85,2.979919,0,1
+1374,85,2.980453,0,1
+1375,85,2.980986,0,1
+1376,85,2.981519,0,1
+1377,85,2.982053,0,1
+1378,85,2.982586,0,1
+1379,85,2.983119,0,1
+1380,85,2.983653,0,1
+1381,85,2.977422,0,1
+1382,85,2.971190,0,1
+1383,85,2.964959,0,1
+1384,85,2.958728,0,1
+1385,85,2.952497,0,1
+1386,85,2.946266,0,1
+1387,85,2.940035,0,1
+1388,85,2.933803,0,1
+1389,85,2.927572,0,1
+1390,85,2.921341,0,1
+1391,85,2.915110,0,1
+1392,85,2.908879,0,1
+1393,85,2.902647,0,1
+1394,85,2.896416,0,1
+1395,85,2.890185,0,1
+1396,85,2.883954,0,1
+1397,85,2.877723,0,1
+1398,85,2.871491,0,1
+1399,85,2.865260,0,1
+1400,85,2.859029,0,1
+1401,85,2.849425,0,1
+1402,85,2.839822,0,1
+1403,85,2.830218,0,1
+1404,85,2.820614,0,1
+1405,85,2.811010,0,1
+1406,85,2.801407,0,1
+1407,85,2.791803,0,1
+1408,85,2.782199,0,1
+1409,85,2.772595,0,1
+1410,85,2.762992,0,1
+1411,85,2.753388,0,1
+1412,85,2.743784,0,1
+1413,85,2.734180,0,1
+1414,85,2.724577,0,1
+1415,85,2.714973,0,1
+1416,85,2.705369,0,1
+1417,85,2.695765,0,1
+1418,85,2.686162,0,1
+1419,85,2.676558,0,1
+1420,85,2.666954,0,1
+1421,85,2.660029,0,1
+1422,85,2.653104,0,1
+1423,85,2.646179,0,1
+1424,85,2.639254,0,1
+1425,85,2.632329,0,1
+1426,85,2.625405,0,1
+1427,85,2.618480,0,1
+1428,85,2.611555,0,1
+1429,85,2.604630,0,1
+1430,85,2.597705,0,1
+1431,85,2.590780,0,1
+1432,85,2.583855,0,1
+1433,85,2.576930,0,1
+1434,85,2.570005,0,1
+1435,85,2.563080,0,1
+1436,85,2.556155,0,1
+1437,85,2.549230,0,1
+1438,85,2.542305,0,1
+1439,85,2.535381,0,1
+1440,85,2.528456,0,1
+1441,85,2.526626,0,1
+1442,85,2.524796,0,1
+1443,85,2.522967,0,1
+1444,85,2.521137,0,1
+1445,85,2.519307,0,1
+1446,85,2.517478,0,1
+1447,85,2.515648,0,1
+1448,85,2.513818,0,1
+1449,85,2.511989,0,1
+1450,85,2.510159,0,1
+1451,85,2.508329,0,1
+1452,85,2.506500,0,1
+1453,85,2.504670,0,1
+1454,85,2.502840,0,1
+1455,85,2.501011,0,1
+1456,85,2.499181,0,1
+1457,85,2.497351,0,1
+1458,85,2.495522,0,1
+1459,85,2.493692,0,1
+1460,85,2.491863,0,1
+1461,85,2.494672,0,1
+1462,85,2.497481,0,1
+1463,85,2.500290,0,1
+1464,85,2.503099,0,1
+1465,85,2.505908,0,1
+1466,85,2.508718,0,1
+1467,85,2.511527,0,1
+1468,85,2.514336,0,1
+1469,85,2.517145,0,1
+1470,85,2.519954,0,1
+1471,85,2.522764,0,1
+1472,85,2.525573,0,1
+1473,85,2.528382,0,1
+1474,85,2.531191,0,1
+1475,85,2.534000,0,1
+1476,85,2.536810,0,1
+1477,85,2.539619,0,1
+1478,85,2.542428,0,1
+1479,85,2.545237,0,1
+1480,85,2.548046,0,1
+1481,85,2.552906,0,1
+1482,85,2.557766,0,1
+1483,85,2.562626,0,1
+1484,85,2.567486,0,1
+1485,85,2.572346,0,1
+1486,85,2.577206,0,1
+1487,85,2.582066,0,1
+1488,85,2.586926,0,1
+1489,85,2.591786,0,1
+1490,85,2.596646,0,1
+1491,85,2.601506,0,1
+1492,85,2.606366,0,1
+1493,85,2.611226,0,1
+1494,85,2.616086,0,1
+1495,85,2.620946,0,1
+1496,85,2.625806,0,1
+1497,85,2.630666,0,1
+1498,85,2.635526,0,1
+1499,85,2.640387,0,1
+1500,85,2.645247,0,1
+1501,85,2.649072,0,1
+1502,85,2.652897,0,1
+1503,85,2.656722,0,1
+1504,85,2.660547,0,1
+1505,85,2.664372,0,1
+1506,85,2.668197,0,1
+1507,85,2.672023,0,1
+1508,85,2.675848,0,1
+1509,85,2.679673,0,1
+1510,85,2.683498,0,1
+1511,85,2.687323,0,1
+1512,85,2.691148,0,1
+1513,85,2.694973,0,1
+1514,85,2.698798,0,1
+1515,85,2.702624,0,1
+1516,85,2.706449,0,1
+1517,85,2.710274,0,1
+1518,85,2.714099,0,1
+1519,85,2.717924,0,1
+1520,85,2.721749,0,1
+1521,85,2.722967,0,1
+1522,85,2.724186,0,1
+1523,85,2.725404,0,1
+1524,85,2.726622,0,1
+1525,85,2.727840,0,1
+1526,85,2.729058,0,1
+1527,85,2.730276,0,1
+1528,85,2.731494,0,1
+1529,85,2.732712,0,1
+1530,85,2.733930,0,1
+1531,85,2.735148,0,1
+1532,85,2.736367,0,1
+1533,85,2.737585,0,1
+1534,85,2.738803,0,1
+1535,85,2.740021,0,1
+1536,85,2.741239,0,1
+1537,85,2.742457,0,1
+1538,85,2.743675,0,1
+1539,85,2.744893,0,1
+1540,85,2.746111,0,1
+1541,85,2.743632,0,1
+1542,85,2.741153,0,1
+1543,85,2.738674,0,1
+1544,85,2.736195,0,1
+1545,85,2.733715,0,1
+1546,85,2.731236,0,1
+1547,85,2.728757,0,1
+1548,85,2.726278,0,1
+1549,85,2.723799,0,1
+1550,85,2.721319,0,1
+1551,85,2.718840,0,1
+1552,85,2.716361,0,1
+1553,85,2.713882,0,1
+1554,85,2.711403,0,1
+1555,85,2.708923,0,1
+1556,85,2.706444,0,1
+1557,85,2.703965,0,1
+1558,85,2.701486,0,1
+1559,85,2.699007,0,1
+1560,85,2.696527,0,1
+1561,85,2.692243,0,1
+1562,85,2.687958,0,1
+1563,85,2.683673,0,1
+1564,85,2.679389,0,1
+1565,85,2.675104,0,1
+1566,85,2.670819,0,1
+1567,85,2.666535,0,1
+1568,85,2.662250,0,1
+1569,85,2.657966,0,1
+1570,85,2.653681,0,1
+1571,85,2.649396,0,1
+1572,85,2.645112,0,1
+1573,85,2.640827,0,1
+1574,85,2.636542,0,1
+1575,85,2.632258,0,1
+1576,85,2.627973,0,1
+1577,85,2.623688,0,1
+1578,85,2.619404,0,1
+1579,85,2.615119,0,1
+1580,85,2.610835,0,1
+1581,85,2.608361,0,1
+1582,85,2.605887,0,1
+1583,85,2.603414,0,1
+1584,85,2.600940,0,1
+1585,85,2.598467,0,1
+1586,85,2.595993,0,1
+1587,85,2.593520,0,1
+1588,85,2.591046,0,1
+1589,85,2.588572,0,1
+1590,85,2.586099,0,1
+1591,85,2.583625,0,1
+1592,85,2.581152,0,1
+1593,85,2.578678,0,1
+1594,85,2.576205,0,1
+1595,85,2.573731,0,1
+1596,85,2.571257,0,1
+1597,85,2.568784,0,1
+1598,85,2.566310,0,1
+1599,85,2.563837,0,1
+1600,85,2.561363,0,1
+1601,85,2.561212,0,1
+1602,85,2.561061,0,1
+1603,85,2.560909,0,1
+1604,85,2.560758,0,1
+1605,85,2.560607,0,1
+1606,85,2.560455,0,1
+1607,85,2.560304,0,1
+1608,85,2.560153,0,1
+1609,85,2.560001,0,1
+1610,85,2.559850,0,1
+1611,85,2.559699,0,1
+1612,85,2.559547,0,1
+1613,85,2.559396,0,1
+1614,85,2.559245,0,1
+1615,85,2.559093,0,1
+1616,85,2.558942,0,1
+1617,85,2.558791,0,1
+1618,85,2.558639,0,1
+1619,85,2.558488,0,1
+1620,85,2.558337,0,1
+1621,85,2.559118,0,1
+1622,85,2.559899,0,1
+1623,85,2.560680,0,1
+1624,85,2.561462,0,1
+1625,85,2.562243,0,1
+1626,85,2.563024,0,1
+1627,85,2.563805,0,1
+1628,85,2.564586,0,1
+1629,85,2.565368,0,1
+1630,85,2.566149,0,1
+1631,85,2.566930,0,1
+1632,85,2.567711,0,1
+1633,85,2.568492,0,1
+1634,85,2.569274,0,1
+1635,85,2.570055,0,1
+1636,85,2.570836,0,1
+1637,85,2.571617,0,1
+1638,85,2.572398,0,1
+1639,85,2.573180,0,1
+1640,85,2.573961,0,1
+1641,85,2.575310,0,1
+1642,85,2.576659,0,1
+1643,85,2.578007,0,1
+1644,85,2.579356,0,1
+1645,85,2.580705,0,1
+1646,85,2.582054,0,1
+1647,85,2.583403,0,1
+1648,85,2.584752,0,1
+1649,85,2.586101,0,1
+1650,85,2.587450,0,1
+1651,85,2.588799,0,1
+1652,85,2.590148,0,1
+1653,85,2.591497,0,1
+1654,85,2.592846,0,1
+1655,85,2.594194,0,1
+1656,85,2.595543,0,1
+1657,85,2.596892,0,1
+1658,85,2.598241,0,1
+1659,85,2.599590,0,1
+1660,85,2.600939,0,1
+1661,85,2.603449,0,1
+1662,85,2.605958,0,1
+1663,85,2.608468,0,1
+1664,85,2.610978,0,1
+1665,85,2.613487,0,1
+1666,85,2.615997,0,1
+1667,85,2.618507,0,1
+1668,85,2.621016,0,1
+1669,85,2.623526,0,1
+1670,85,2.626036,0,1
+1671,85,2.628545,0,1
+1672,85,2.631055,0,1
+1673,85,2.633564,0,1
+1674,85,2.636074,0,1
+1675,85,2.638584,0,1
+1676,85,2.641093,0,1
+1677,85,2.643603,0,1
+1678,85,2.646113,0,1
+1679,85,2.648622,0,1
+1680,85,2.651132,0,1
+1681,85,2.653018,0,1
+1682,85,2.654904,0,1
+1683,85,2.656790,0,1
+1684,85,2.658676,0,1
+1685,85,2.660562,0,1
+1686,85,2.662448,0,1
+1687,85,2.664334,0,1
+1688,85,2.666220,0,1
+1689,85,2.668107,0,1
+1690,85,2.669993,0,1
+1691,85,2.671879,0,1
+1692,85,2.673765,0,1
+1693,85,2.675651,0,1
+1694,85,2.677537,0,1
+1695,85,2.679423,0,1
+1696,85,2.681309,0,1
+1697,85,2.683195,0,1
+1698,85,2.685081,0,1
+1699,85,2.686967,0,1
+1700,85,2.688853,0,1
+1701,85,2.688039,0,1
+1702,85,2.687224,0,1
+1703,85,2.686410,0,1
+1704,85,2.685595,0,1
+1705,85,2.684780,0,1
+1706,85,2.683966,0,1
+1707,85,2.683151,0,1
+1708,85,2.682337,0,1
+1709,85,2.681522,0,1
+1710,85,2.680708,0,1
+1711,85,2.679893,0,1
+1712,85,2.679079,0,1
+1713,85,2.678264,0,1
+1714,85,2.677450,0,1
+1715,85,2.676635,0,1
+1716,85,2.675821,0,1
+1717,85,2.675006,0,1
+1718,85,2.674191,0,1
+1719,85,2.673377,0,1
+1720,85,2.672562,0,1
+1721,85,2.670696,0,1
+1722,85,2.668831,0,1
+1723,85,2.666965,0,1
+1724,85,2.665099,0,1
+1725,85,2.663233,0,1
+1726,85,2.661367,0,1
+1727,85,2.659501,0,1
+1728,85,2.657635,0,1
+1729,85,2.655769,0,1
+1730,85,2.653903,0,1
+1731,85,2.652037,0,1
+1732,85,2.650171,0,1
+1733,85,2.648305,0,1
+1734,85,2.646439,0,1
+1735,85,2.644573,0,1
+1736,85,2.642707,0,1
+1737,85,2.640842,0,1
+1738,85,2.638976,0,1
+1739,85,2.637110,0,1
+1740,85,2.635244,0,1
+1741,85,2.633353,0,1
+1742,85,2.631462,0,1
+1743,85,2.629572,0,1
+1744,85,2.627681,0,1
+1745,85,2.625791,0,1
+1746,85,2.623900,0,1
+1747,85,2.622009,0,1
+1748,85,2.620119,0,1
+1749,85,2.618228,0,1
+1750,85,2.616337,0,1
+1751,85,2.614447,0,1
+1752,85,2.612556,0,1
+1753,85,2.610665,0,1
+1754,85,2.608775,0,1
+1755,85,2.606884,0,1
+1756,85,2.604993,0,1
+1757,85,2.603103,0,1
+1758,85,2.601212,0,1
+1759,85,2.599322,0,1
+1760,85,2.597431,0,1
+1761,85,2.593347,0,1
+1762,85,2.589262,0,1
+1763,85,2.585178,0,1
+1764,85,2.581094,0,1
+1765,85,2.577010,0,1
+1766,85,2.572926,0,1
+1767,85,2.568841,0,1
+1768,85,2.564757,0,1
+1769,85,2.560673,0,1
+1770,85,2.556589,0,1
+1771,85,2.552504,0,1
+1772,85,2.548420,0,1
+1773,85,2.544336,0,1
+1774,85,2.540252,0,1
+1775,85,2.536167,0,1
+1776,85,2.532083,0,1
+1777,85,2.527999,0,1
+1778,85,2.523915,0,1
+1779,85,2.519831,0,1
+1780,85,2.515746,0,1
+1781,85,2.507689,0,1
+1782,85,2.499631,0,1
+1783,85,2.491573,0,1
+1784,85,2.483516,0,1
+1785,85,2.475458,0,1
+1786,85,2.467400,0,1
+1787,85,2.459343,0,1
+1788,85,2.451285,0,1
+1789,85,2.443227,0,1
+1790,85,2.435170,0,1
+1791,85,2.427112,0,1
+1792,85,2.419054,0,1
+1793,85,2.410997,0,1
+1794,85,2.402939,0,1
+1795,85,2.394881,0,1
+1796,85,2.386824,0,1
+1797,85,2.378766,0,1
+1798,85,2.370708,0,1
+1799,85,2.362650,0,1
+1800,85,2.354593,0,1
+1801,85,2.344431,0,1
+1802,85,2.334268,0,1
+1803,85,2.324106,0,1
+1804,85,2.313944,0,1
+1805,85,2.303782,0,1
+1806,85,2.293619,0,1
+1807,85,2.283457,0,1
+1808,85,2.273295,0,1
+1809,85,2.263133,0,1
+1810,85,2.252971,0,1
+1811,85,2.242808,0,1
+1812,85,2.232646,0,1
+1813,85,2.222484,0,1
+1814,85,2.212322,0,1
+1815,85,2.202160,0,1
+1816,85,2.191997,0,1
+1817,85,2.181835,0,1
+1818,85,2.171673,0,1
+1819,85,2.161511,0,1
+1820,85,2.151348,0,1
+1821,85,2.143733,0,1
+1822,85,2.136117,0,1
+1823,85,2.128502,0,1
+1824,85,2.120886,0,1
+1825,85,2.113271,0,1
+1826,85,2.105655,0,1
+1827,85,2.098039,0,1
+1828,85,2.090424,0,1
+1829,85,2.082808,0,1
+1830,85,2.075193,0,1
+1831,85,2.067577,0,1
+1832,85,2.059961,0,1
+1833,85,2.052346,0,1
+1834,85,2.044730,0,1
+1835,85,2.037115,0,1
+1836,85,2.029499,0,1
+1837,85,2.021884,0,1
+1838,85,2.014268,0,1
+1839,85,2.006652,0,1
+1840,85,1.999037,0,1
+1841,85,1.997348,0,1
+1842,85,1.995659,0,1
+1843,85,1.993970,0,1
+1844,85,1.992281,0,1
+1845,85,1.990592,0,1
+1846,85,1.988903,0,1
+1847,85,1.987214,0,1
+1848,85,1.985525,0,1
+1849,85,1.983836,0,1
+1850,85,1.982148,0,1
+1851,85,1.980459,0,1
+1852,85,1.978770,0,1
+1853,85,1.977081,0,1
+1854,85,1.975392,0,1
+1855,85,1.973703,0,1
+1856,85,1.972014,0,1
+1857,85,1.970325,0,1
+1858,85,1.968636,0,1
+1859,85,1.966947,0,1
+1860,85,1.965258,0,1
+1861,85,1.969450,0,1
+1862,85,1.973641,0,1
+1863,85,1.977833,0,1
+1864,85,1.982024,0,1
+1865,85,1.986216,0,1
+1866,85,1.990407,0,1
+1867,85,1.994598,0,1
+1868,85,1.998790,0,1
+1869,85,2.002981,0,1
+1870,85,2.007173,0,1
+1871,85,2.011364,0,1
+1872,85,2.015556,0,1
+1873,85,2.019747,0,1
+1874,85,2.023939,0,1
+1875,85,2.028130,0,1
+1876,85,2.032321,0,1
+1877,85,2.036513,0,1
+1878,85,2.040704,0,1
+1879,85,2.044896,0,1
+1880,85,2.049087,0,1
+1881,85,2.055892,0,1
+1882,85,2.062697,0,1
+1883,85,2.069501,0,1
+1884,85,2.076306,0,1
+1885,85,2.083111,0,1
+1886,85,2.089915,0,1
+1887,85,2.096720,0,1
+1888,85,2.103525,0,1
+1889,85,2.110329,0,1
+1890,85,2.117134,0,1
+1891,85,2.123939,0,1
+1892,85,2.130743,0,1
+1893,85,2.137548,0,1
+1894,85,2.144353,0,1
+1895,85,2.151157,0,1
+1896,85,2.157962,0,1
+1897,85,2.164767,0,1
+1898,85,2.171571,0,1
+1899,85,2.178376,0,1
+1900,85,2.185181,0,1
+1901,85,2.190485,0,1
+1902,85,2.195789,0,1
+1903,85,2.201093,0,1
+1904,85,2.206398,0,1
+1905,85,2.211702,0,1
+1906,85,2.217006,0,1
+1907,85,2.222310,0,1
+1908,85,2.227614,0,1
+1909,85,2.232918,0,1
+1910,85,2.238223,0,1
+1911,85,2.243527,0,1
+1912,85,2.248831,0,1
+1913,85,2.254135,0,1
+1914,85,2.259439,0,1
+1915,85,2.264744,0,1
+1916,85,2.270048,0,1
+1917,85,2.275352,0,1
+1918,85,2.280656,0,1
+1919,85,2.285960,0,1
+1920,85,2.291264,0,1
+1921,85,2.293144,0,1
+1922,85,2.295023,0,1
+1923,85,2.296903,0,1
+1924,85,2.298782,0,1
+1925,85,2.300661,0,1
+1926,85,2.302541,0,1
+1927,85,2.304420,0,1
+1928,85,2.306299,0,1
+1929,85,2.308179,0,1
+1930,85,2.310058,0,1
+1931,85,2.311938,0,1
+1932,85,2.313817,0,1
+1933,85,2.315696,0,1
+1934,85,2.317576,0,1
+1935,85,2.319455,0,1
+1936,85,2.321335,0,1
+1937,85,2.323214,0,1
+1938,85,2.325093,0,1
+1939,85,2.326973,0,1
+1940,85,2.328852,0,1
+1941,85,2.327097,0,1
+1942,85,2.325342,0,1
+1943,85,2.323587,0,1
+1944,85,2.321832,0,1
+1945,85,2.320076,0,1
+1946,85,2.318321,0,1
+1947,85,2.316566,0,1
+1948,85,2.314811,0,1
+1949,85,2.313056,0,1
+1950,85,2.311301,0,1
+1951,85,2.309546,0,1
+1952,85,2.307791,0,1
+1953,85,2.306036,0,1
+1954,85,2.304281,0,1
+1955,85,2.302525,0,1
+1956,85,2.300770,0,1
+1957,85,2.299015,0,1
+1958,85,2.297260,0,1
+1959,85,2.295505,0,1
+1960,85,2.293750,0,1
+1961,85,2.288201,0,1
+1962,85,2.282653,0,1
+2033,85,1.855638,0,1
+2034,85,1.853459,0,1
+2035,85,1.851280,0,1
+2036,85,1.849101,0,1
+2037,85,1.846922,0,1
+2038,85,1.844743,0,1
+2039,85,1.842564,0,1
+2040,85,1.840385,0,1
+2041,85,1.844117,0,1
+2042,85,1.847849,0,1
+2043,85,1.851581,0,1
+2044,85,1.855313,0,1
+2045,85,1.859046,0,1
+2046,85,1.862778,0,1
+2047,85,1.866510,0,1
+2048,85,1.870242,0,1
+2049,85,1.873974,0,1
+2050,85,1.877706,0,1
+2051,85,1.881438,0,1
+2052,85,1.885170,0,1
+2053,85,1.888902,0,1
+2054,85,1.892635,0,1
+2055,85,1.896367,0,1
+2056,85,1.900099,0,1
+2057,85,1.903831,0,1
+2058,85,1.907563,0,1
+2059,85,1.911295,0,1
+2060,85,1.915027,0,1
+2061,85,1.921967,0,1
+2062,85,1.928906,0,1
+2063,85,1.935846,0,1
+2064,85,1.942785,0,1
+2065,85,1.949725,0,1
+2066,85,1.956664,0,1
+2067,85,1.963603,0,1
+2068,85,1.970543,0,1
+2069,85,1.977482,0,1
+2070,85,1.984422,0,1
+2071,85,1.991361,0,1
+2072,85,1.998301,0,1
+2073,85,2.005240,0,1
+2074,85,2.012180,0,1
+2075,85,2.019119,0,1
+2076,85,2.026059,0,1
+2077,85,2.032998,0,1
+2078,85,2.039938,0,1
+2079,85,2.046877,0,1
+2080,85,2.053817,0,1
+2081,85,2.057311,0,1
+2082,85,2.060806,0,1
+2083,85,2.064300,0,1
+2084,85,2.067795,0,1
+2085,85,2.071289,0,1
+2086,85,2.074784,0,1
+2087,85,2.078278,0,1
+2088,85,2.081773,0,1
+2089,85,2.085268,0,1
+2090,85,2.088762,0,1
+2091,85,2.092257,0,1
+2092,85,2.095751,0,1
+2093,85,2.099246,0,1
+2094,85,2.102740,0,1
+2095,85,2.106235,0,1
+2096,85,2.109729,0,1
+2097,85,2.113224,0,1
+2098,85,2.116719,0,1
+2099,85,2.120213,0,1
+2100,85,2.123708,0,1
+2101,85,2.119878,0,1
+2102,85,2.116048,0,1
+2103,85,2.112218,0,1
+2104,85,2.108388,0,1
+2105,85,2.104558,0,1
+2106,85,2.100728,0,1
+2107,85,2.096898,0,1
+2108,85,2.093068,0,1
+2109,85,2.089238,0,1
+2110,85,2.085408,0,1
+2111,85,2.081578,0,1
+2112,85,2.077748,0,1
+2113,85,2.073918,0,1
+2114,85,2.070088,0,1
+2115,85,2.066258,0,1
+2116,85,2.062428,0,1
+2117,85,2.058598,0,1
+2118,85,2.054768,0,1
+2119,85,2.050938,0,1
+2120,85,2.047109,0,1
+2121,85,2.038872,0,1
+2122,85,2.030636,0,1
+2123,85,2.022400,0,1
+2124,85,2.014164,0,1
+2125,85,2.005928,0,1
+2126,85,1.997692,0,1
+2127,85,1.989455,0,1
+2128,85,1.981219,0,1
+2129,85,1.972983,0,1
+2130,85,1.964747,0,1
+2131,85,1.956511,0,1
+2132,85,1.948275,0,1
+2133,85,1.940038,0,1
+2134,85,1.931802,0,1
+2135,85,1.923566,0,1
+2136,85,1.915330,0,1
+2137,85,1.907094,0,1
+2138,85,1.898858,0,1
+2139,85,1.890621,0,1
+2140,85,1.882385,0,1
+2141,85,1.875150,0,1
+2142,85,1.867915,0,1
+2143,85,1.860679,0,1
+2144,85,1.853444,0,1
+2145,85,1.846209,0,1
+2146,85,1.838973,0,1
+2147,85,1.831738,0,1
+2148,85,1.824503,0,1
+2149,85,1.817267,0,1
+2150,85,1.810032,0,1
+2151,85,1.802797,0,1
+2152,85,1.795561,0,1
+2153,85,1.788326,0,1
+2154,85,1.781091,0,1
+2155,85,1.773855,0,1
+2156,85,1.766620,0,1
+2157,85,1.759385,0,1
+2158,85,1.752149,0,1
+2159,85,1.744914,0,1
+2160,85,1.737679,0,1
+2161,85,1.734138,0,1
+2162,85,1.730598,0,1
+2163,85,1.727058,0,1
+2164,85,1.723518,0,1
+2165,85,1.719977,0,1
+2166,85,1.716437,0,1
+2167,85,1.712897,0,1
+2168,85,1.709356,0,1
+2169,85,1.705816,0,1
+2170,85,1.702276,0,1
+2171,85,1.698735,0,1
+2172,85,1.695195,0,1
+2173,85,1.691655,0,1
+2174,85,1.688115,0,1
+2175,85,1.684574,0,1
+2176,85,1.681034,0,1
+2177,85,1.677494,0,1
+2178,85,1.673953,0,1
+2179,85,1.670413,0,1
+2180,85,1.666873,0,1
+2181,85,1.665791,0,1
+2182,85,1.664710,0,1
+2183,85,1.663628,0,1
+2184,85,1.662547,0,1
+2185,85,1.661465,0,1
+2186,85,1.660383,0,1
+2187,85,1.659302,0,1
+2188,85,1.658220,0,1
+2189,85,1.657139,0,1
+2190,85,1.656057,0,1
+2191,85,1.654975,0,1
+2192,85,1.653894,0,1
+2193,85,1.652812,0,1
+2194,85,1.651731,0,1
+2195,85,1.650649,0,1
+2196,85,1.649568,0,1
+2197,85,1.648486,0,1
+2198,85,1.647404,0,1
+2199,85,1.646323,0,1
+2200,85,1.645241,0,1
+2201,85,1.643475,0,1
+2202,85,1.641709,0,1
+2203,85,1.639943,0,1
+2204,85,1.638177,0,1
+2205,85,1.636411,0,1
+2206,85,1.634645,0,1
+2207,85,1.632879,0,1
+2208,85,1.631113,0,1
+2209,85,1.629347,0,1
+2210,85,1.627581,0,1
+2211,85,1.625815,0,1
+2212,85,1.624049,0,1
+2213,85,1.622283,0,1
+2214,85,1.620517,0,1
+2215,85,1.618751,0,1
+2216,85,1.616985,0,1
+2217,85,1.615219,0,1
+2218,85,1.613453,0,1
+2219,85,1.611687,0,1
+2220,85,1.609921,0,1
+2221,85,1.604847,0,1
+2222,85,1.599773,0,1
+2223,85,1.594699,0,1
+2224,85,1.589625,0,1
+2225,85,1.584551,0,1
+2226,85,1.579477,0,1
+2227,85,1.574403,0,1
+2228,85,1.569329,0,1
+2229,85,1.564255,0,1
+2230,85,1.559181,0,1
+2231,85,1.554107,0,1
+2232,85,1.549033,0,1
+2233,85,1.543959,0,1
+2234,85,1.538885,0,1
+2235,85,1.533811,0,1
+2236,85,1.528737,0,1
+2237,85,1.523663,0,1
+2238,85,1.518589,0,1
+2239,85,1.513515,0,1
+2240,85,1.508441,0,1
+2241,85,1.499047,0,1
+2242,85,1.489653,0,1
+2263,85,1.278905,0,1
+2264,85,1.265018,0,1
+2265,85,1.251131,0,1
+2266,85,1.237244,0,1
+2267,85,1.223357,0,1
+2268,85,1.209470,0,1
+2269,85,1.195583,0,1
+2270,85,1.181696,0,1
+2271,85,1.167809,0,1
+2272,85,1.153922,0,1
+2273,85,1.140035,0,1
+2274,85,1.126148,0,1
+2275,85,1.112261,0,1
+2276,85,1.098374,0,1
+2277,85,1.084487,0,1
+2278,85,1.070600,0,1
+2279,85,1.056713,0,1
+2280,85,1.042826,0,1
+2281,85,1.025823,0,1
+2282,85,1.008820,0,1
+2283,85,0.991817,0,1
+2284,85,0.974814,0,1
+2285,85,0.957811,0,1
+2286,85,0.940809,0,1
+2287,85,0.923806,0,1
+2288,85,0.906803,0,1
+2289,85,0.889800,0,1
+2290,85,0.872797,0,1
+2291,85,0.855795,0,1
+2292,85,0.838792,0,1
+2293,85,0.821789,0,1
+2294,85,0.804786,0,1
+2295,85,0.787783,0,1
+2296,85,0.770780,0,1
+2297,85,0.753778,0,1
+2298,85,0.736775,0,1
+2299,85,0.719772,0,1
+2300,85,0.702769,0,1
+2301,85,0.687445,0,1
+2302,85,0.672121,0,1
+2303,85,0.656797,0,1
+2304,85,0.641473,0,1
+2305,85,0.626148,0,1
+2306,85,0.610824,0,1
+2307,85,0.595500,0,1
+2308,85,0.580176,0,1
+2309,85,0.564852,0,1
+2310,85,0.549528,0,1
+2311,85,0.534203,0,1
+2312,85,0.518879,0,1
+2333,85,0.265887,0,1
+2334,85,0.255856,0,1
+2335,85,0.245825,0,1
+2336,85,0.235794,0,1
+2337,85,0.225764,0,1
+2338,85,0.215733,0,1
+2339,85,0.205702,0,1
+2340,85,0.195671,0,1
+2341,85,0.186808,0,1
+2342,85,0.177944,0,1
+2343,85,0.169081,0,1
+2344,85,0.160217,0,1
+2345,85,0.151354,0,1
+2346,85,0.142490,0,1
+2347,85,0.133627,0,1
+2348,85,0.124763,0,1
+2349,85,0.115900,0,1
+2350,85,0.107036,0,1
+2351,85,0.098173,0,1
+2352,85,0.089309,0,1
+2353,85,0.080446,0,1
+2354,85,0.071582,0,1
+2355,85,0.062719,0,1
+2356,85,0.053855,0,1
+2357,85,0.044992,0,1
+2358,85,0.036128,0,1
+2359,85,0.027265,0,1
+2360,85,0.018401,0,1
+2361,85,0.004867,0,1
+2362,85,-0.008667,0,1
+2363,85,-0.022201,0,1
+2364,85,-0.035736,0,1
+2365,85,-0.049270,0,1
+2366,85,-0.062804,0,1
+2367,85,-0.076338,0,1
+2368,85,-0.089873,0,1
+2369,85,-0.103407,0,1
+2370,85,-0.116941,0,1
+2371,85,-0.130476,0,1
+2372,85,-0.144010,0,1
+2373,85,-0.157544,0,1
+2374,85,-0.171078,0,1
+2375,85,-0.184613,0,1
+2376,85,-0.198147,0,1
+2377,85,-0.211681,0,1
+2378,85,-0.225215,0,1
+2379,85,-0.238750,0,1
+2380,85,-0.252284,0,1
+2381,85,-0.269755,0,1
+2382,85,-0.287226,0,1
+2383,85,-0.304697,0,1
+2384,85,-0.322168,0,1
+2385,85,-0.339639,0,1
+2386,85,-0.357111,0,1
+2387,85,-0.374582,0,1
+2388,85,-0.392053,0,1
+2389,85,-0.409524,0,1
+2390,85,-0.426995,0,1
+2391,85,-0.444466,0,1
+2392,85,-0.461937,0,1
+2393,85,-0.479408,0,1
+2394,85,-0.496879,0,1
+2395,85,-0.514350,0,1
+2396,85,-0.531822,0,1
+2397,85,-0.549293,0,1
+2398,85,-0.566764,0,1
+2399,85,-0.584235,0,1
+2400,85,-0.601706,0,1
+2401,85,-0.618795,0,1
+2402,85,-0.635884,0,1
+2403,85,-0.652973,0,1
+2404,85,-0.670061,0,1
+2405,85,-0.687150,0,1
+2406,85,-0.704239,0,1
+2407,85,-0.721328,0,1
+2408,85,-0.738417,0,1
+2409,85,-0.755506,0,1
+2410,85,-0.772595,0,1
+2411,85,-0.789684,0,1
+2412,85,-0.806772,0,1
+2413,85,-0.823861,0,1
+2414,85,-0.840950,0,1
+2415,85,-0.858039,0,1
+2416,85,-0.875128,0,1
+2417,85,-0.892217,0,1
+2418,85,-0.909306,0,1
+2419,85,-0.926395,0,1
+2420,85,-0.943483,0,1
+2421,85,-0.955067,0,1
+2422,85,-0.966651,0,1
+2423,85,-0.978234,0,1
+2424,85,-0.989818,0,1
+2425,85,-1.001401,0,1
+2426,85,-1.012985,0,1
+2427,85,-1.024568,0,1
+2428,85,-1.036152,0,1
+2429,85,-1.047735,0,1
+2430,85,-1.059319,0,1
+2431,85,-1.070902,0,1
+2432,85,-1.082486,0,1
+2433,85,-1.094069,0,1
+2434,85,-1.105653,0,1
+2435,85,-1.117236,0,1
+2436,85,-1.128820,0,1
+2437,85,-1.140403,0,1
+2438,85,-1.151987,0,1
+2439,85,-1.163570,0,1
+2440,85,-1.175154,0,1
+2441,85,-1.178414,0,1
+2442,85,-1.181674,0,1
+2443,85,-1.184935,0,1
+2444,85,-1.188195,0,1
+2445,85,-1.191455,0,1
+2446,85,-1.194715,0,1
+2447,85,-1.197975,0,1
+2448,85,-1.201236,0,1
+2449,85,-1.204496,0,1
+2450,85,-1.207756,0,1
+2451,85,-1.211016,0,1
+2452,85,-1.214276,0,1
+2453,85,-1.217537,0,1
+2454,85,-1.220797,0,1
+2455,85,-1.224057,0,1
+2456,85,-1.227317,0,1
+2457,85,-1.230577,0,1
+2458,85,-1.233838,0,1
+2459,85,-1.237098,0,1
+2460,85,-1.240358,0,1
+2461,85,-1.238217,0,1
+2462,85,-1.236075,0,1
+2463,85,-1.233934,0,1
+2464,85,-1.231793,0,1
+2465,85,-1.229651,0,1
+2466,85,-1.227510,0,1
+2467,85,-1.225368,0,1
+2468,85,-1.223227,0,1
+2469,85,-1.221086,0,1
+2470,85,-1.218944,0,1
+2471,85,-1.216803,0,1
+2472,85,-1.214661,0,1
+2473,85,-1.212520,0,1
+2474,85,-1.210379,0,1
+2475,85,-1.208237,0,1
+2476,85,-1.206096,0,1
+2477,85,-1.203954,0,1
+2478,85,-1.201813,0,1
+2479,85,-1.199672,0,1
+2480,85,-1.197530,0,1
+2481,85,-1.193308,0,1
+2482,85,-1.189086,0,1
+2483,85,-1.184864,0,1
+2484,85,-1.180642,0,1
+2485,85,-1.176420,0,1
+2486,85,-1.172198,0,1
+2487,85,-1.167976,0,1
+2488,85,-1.163754,0,1
+2489,85,-1.159532,0,1
+2490,85,-1.155310,0,1
+2491,85,-1.151088,0,1
+2492,85,-1.146866,0,1
+2493,85,-1.142644,0,1
+2494,85,-1.138422,0,1
+2495,85,-1.134200,0,1
+2496,85,-1.129978,0,1
+2497,85,-1.125756,0,1
+2498,85,-1.121534,0,1
+2499,85,-1.117312,0,1
+2500,85,-1.113090,0,1
+2501,85,-1.106050,0,1
+2502,85,-1.099009,0,1
+2503,85,-1.091969,0,1
+2504,85,-1.084928,0,1
+2505,85,-1.077887,0,1
+2506,85,-1.070847,0,1
+2507,85,-1.063806,0,1
+2508,85,-1.056766,0,1
+2509,85,-1.049725,0,1
+2510,85,-1.042684,0,1
+2511,85,-1.035644,0,1
+2512,85,-1.028603,0,1
+2513,85,-1.021563,0,1
+2514,85,-1.014522,0,1
+2515,85,-1.007482,0,1
+2516,85,-1.000441,0,1
+2517,85,-0.993400,0,1
+2518,85,-0.986360,0,1
+2519,85,-0.979319,0,1
+2520,85,-0.972279,0,1
+2521,85,-0.961838,0,1
+2522,85,-0.951398,0,1
+2523,85,-0.940958,0,1
+2524,85,-0.930518,0,1
+2525,85,-0.920078,0,1
+2526,85,-0.909638,0,1
+2527,85,-0.899198,0,1
+2528,85,-0.888758,0,1
+2529,85,-0.878318,0,1
+2530,85,-0.867878,0,1
+2531,85,-0.857438,0,1
+2532,85,-0.846998,0,1
+2533,85,-0.836558,0,1
+2534,85,-0.826117,0,1
+2535,85,-0.815677,0,1
+2536,85,-0.805237,0,1
+2537,85,-0.794797,0,1
+2538,85,-0.784357,0,1
+2539,85,-0.773917,0,1
+2540,85,-0.763477,0,1
+2541,85,-0.754449,0,1
+2542,85,-0.745421,0,1
+2543,85,-0.736393,0,1
+2544,85,-0.727365,0,1
+2545,85,-0.718337,0,1
+2546,85,-0.709309,0,1
+2547,85,-0.700282,0,1
+2548,85,-0.691254,0,1
+2549,85,-0.682226,0,1
+2550,85,-0.673198,0,1
+2551,85,-0.664170,0,1
+2552,85,-0.655142,0,1
+2553,85,-0.646114,0,1
+2554,85,-0.637086,0,1
+2555,85,-0.628058,0,1
+2556,85,-0.619030,0,1
+2557,85,-0.610002,0,1
+2558,85,-0.600974,0,1
+2559,85,-0.591946,0,1
+2560,85,-0.582918,0,1
+2561,85,-0.581507,0,1
+2562,85,-0.580095,0,1
+2563,85,-0.578684,0,1
+2564,85,-0.577272,0,1
+2565,85,-0.575861,0,1
+2566,85,-0.574449,0,1
+2567,85,-0.573038,0,1
+2568,85,-0.571626,0,1
+2569,85,-0.570215,0,1
+2570,85,-0.568803,0,1
+2571,85,-0.567391,0,1
+2572,85,-0.565980,0,1
+2573,85,-0.564568,0,1
+2574,85,-0.563157,0,1
+2575,85,-0.561745,0,1
+2576,85,-0.560334,0,1
+2577,85,-0.558922,0,1
+2578,85,-0.557511,0,1
+2579,85,-0.556099,0,1
+2580,85,-0.554688,0,1
+2581,85,-0.561644,0,1
+2582,85,-0.568601,0,1
+2583,85,-0.575558,0,1
+2584,85,-0.582515,0,1
+2585,85,-0.589472,0,1
+2586,85,-0.596429,0,1
+2587,85,-0.603386,0,1
+2588,85,-0.610342,0,1
+2589,85,-0.617299,0,1
+2590,85,-0.624256,0,1
+2591,85,-0.631213,0,1
+2592,85,-0.638170,0,1
+2593,85,-0.645127,0,1
+2594,85,-0.652084,0,1
+2595,85,-0.659040,0,1
+2596,85,-0.665997,0,1
+2597,85,-0.672954,0,1
+2598,85,-0.679911,0,1
+2599,85,-0.686868,0,1
+2600,85,-0.693825,0,1
+2601,85,-0.704906,0,1
+2602,85,-0.715987,0,1
+2603,85,-0.727068,0,1
+2604,85,-0.738149,0,1
+2605,85,-0.749229,0,1
+2606,85,-0.760310,0,1
+2607,85,-0.771391,0,1
+2608,85,-0.782472,0,1
+2609,85,-0.793553,0,1
+2610,85,-0.804634,0,1
+2611,85,-0.815715,0,1
+2612,85,-0.826796,0,1
+2613,85,-0.837877,0,1
+2614,85,-0.848958,0,1
+2615,85,-0.860039,0,1
+2616,85,-0.871120,0,1
+2617,85,-0.882201,0,1
+2618,85,-0.893282,0,1
+2619,85,-0.904363,0,1
+2620,85,-0.915444,0,1
+2621,85,-0.925409,0,1
+2622,85,-0.935375,0,1
+2623,85,-0.945341,0,1
+2624,85,-0.955307,0,1
+2625,85,-0.965273,0,1
+2626,85,-0.975238,0,1
+2627,85,-0.985204,0,1
+2628,85,-0.995170,0,1
+2629,85,-1.005136,0,1
+2630,85,-1.015102,0,1
+2631,85,-1.025067,0,1
+2632,85,-1.035033,0,1
+2633,85,-1.044999,0,1
+2634,85,-1.054965,0,1
+2635,85,-1.064930,0,1
+2636,85,-1.074896,0,1
+2637,85,-1.084862,0,1
+2638,85,-1.094828,0,1
+2639,85,-1.104794,0,1
+2640,85,-1.114759,0,1
+2641,85,-1.123859,0,1
+2642,85,-1.132958,0,1
+2643,85,-1.142057,0,1
+2644,85,-1.151157,0,1
+2645,85,-1.160256,0,1
+2646,85,-1.169355,0,1
+2647,85,-1.178455,0,1
+2648,85,-1.187554,0,1
+2649,85,-1.196653,0,1
+2650,85,-1.205753,0,1
+2651,85,-1.214852,0,1
+2652,85,-1.223951,0,1
+2653,85,-1.233051,0,1
+2654,85,-1.242150,0,1
+2655,85,-1.251249,0,1
+2656,85,-1.260348,0,1
+2657,85,-1.269448,0,1
+2658,85,-1.278547,0,1
+2659,85,-1.287646,0,1
+2660,85,-1.296746,0,1
+2661,85,-1.309614,0,1
+2662,85,-1.322481,0,1
+2663,85,-1.335349,0,1
+2664,85,-1.348217,0,1
+2665,85,-1.361085,0,1
+2666,85,-1.373953,0,1
+2667,85,-1.386821,0,1
+2668,85,-1.399688,0,1
+2669,85,-1.412556,0,1
+2670,85,-1.425424,0,1
+2671,85,-1.438292,0,1
+2672,85,-1.451160,0,1
+2673,85,-1.464027,0,1
+2674,85,-1.476895,0,1
+2675,85,-1.489763,0,1
+2676,85,-1.502631,0,1
+2677,85,-1.515499,0,1
+2678,85,-1.528367,0,1
+2679,85,-1.541234,0,1
+2680,85,-1.554102,0,1
+2681,85,-1.569509,0,1
+2682,85,-1.584917,0,1
+2683,85,-1.600324,0,1
+2684,85,-1.615731,0,1
+2685,85,-1.631138,0,1
+2686,85,-1.646545,0,1
+2687,85,-1.661953,0,1
+2688,85,-1.677360,0,1
+2689,85,-1.692767,0,1
+2690,85,-1.708174,0,1
+2691,85,-1.723581,0,1
+2692,85,-1.738989,0,1
+2693,85,-1.754396,0,1
+2694,85,-1.769803,0,1
+2695,85,-1.785210,0,1
+2696,85,-1.800617,0,1
+2697,85,-1.816025,0,1
+2698,85,-1.831432,0,1
+2699,85,-1.846839,0,1
+2700,85,-1.862246,0,1
+2701,85,-1.873517,0,1
+2702,85,-1.884788,0,1
+2703,85,-1.896059,0,1
+2704,85,-1.907330,0,1
+2705,85,-1.918601,0,1
+2706,85,-1.929872,0,1
+2707,85,-1.941143,0,1
+2708,85,-1.952414,0,1
+2709,85,-1.963685,0,1
+2710,85,-1.974956,0,1
+2711,85,-1.986227,0,1
+2712,85,-1.997498,0,1
+2713,85,-2.008769,0,1
+2714,85,-2.020040,0,1
+2715,85,-2.031311,0,1
+2716,85,-2.042582,0,1
+2717,85,-2.053853,0,1
+2718,85,-2.065124,0,1
+2719,85,-2.076395,0,1
+2720,85,-2.087666,0,1
+2721,85,-2.091522,0,1
+2722,85,-2.095377,0,1
+2723,85,-2.099233,0,1
+2724,85,-2.103088,0,1
+2725,85,-2.106943,0,1
+2726,85,-2.110799,0,1
+2727,85,-2.114654,0,1
+2728,85,-2.118510,0,1
+2729,85,-2.122365,0,1
+2730,85,-2.126221,0,1
+2731,85,-2.130076,0,1
+2732,85,-2.133931,0,1
+2733,85,-2.137787,0,1
+2734,85,-2.141642,0,1
+2735,85,-2.145498,0,1
+2736,85,-2.149353,0,1
+2737,85,-2.153209,0,1
+2738,85,-2.157064,0,1
+2739,85,-2.160920,0,1
+2740,85,-2.164775,0,1
+2741,85,-2.164447,0,1
+2742,85,-2.164118,0,1
+2743,85,-2.163790,0,1
+2744,85,-2.163462,0,1
+2745,85,-2.163134,0,1
+2746,85,-2.162805,0,1
+2747,85,-2.162477,0,1
+2748,85,-2.162149,0,1
+2749,85,-2.161821,0,1
+2750,85,-2.161492,0,1
+2751,85,-2.161164,0,1
+2752,85,-2.160836,0,1
+2753,85,-2.160508,0,1
+2754,85,-2.160179,0,1
+2755,85,-2.159851,0,1
+2756,85,-2.159523,0,1
+2757,85,-2.159195,0,1
+2758,85,-2.158866,0,1
+2759,85,-2.158538,0,1
+2760,85,-2.158210,0,1
+2761,85,-2.157627,0,1
+2762,85,-2.157044,0,1
+2763,85,-2.156461,0,1
+2764,85,-2.155878,0,1
+2765,85,-2.155295,0,1
+2766,85,-2.154712,0,1
+2767,85,-2.154129,0,1
+2768,85,-2.153546,0,1
+2769,85,-2.152963,0,1
+2770,85,-2.152380,0,1
+2771,85,-2.151797,0,1
+2772,85,-2.151214,0,1
+2773,85,-2.150631,0,1
+2774,85,-2.150048,0,1
+2775,85,-2.149465,0,1
+2776,85,-2.148882,0,1
+2777,85,-2.148299,0,1
+2778,85,-2.147716,0,1
+2779,85,-2.147133,0,1
+2780,85,-2.146549,0,1
+2781,85,-2.143750,0,1
+2782,85,-2.140951,0,1
+2783,85,-2.138152,0,1
+2784,85,-2.135353,0,1
+2785,85,-2.132554,0,1
+2786,85,-2.129755,0,1
+2787,85,-2.126956,0,1
+2788,85,-2.124157,0,1
+2789,85,-2.121358,0,1
+2790,85,-2.118559,0,1
+2791,85,-2.115760,0,1
+2792,85,-2.112961,0,1
+2793,85,-2.110162,0,1
+2794,85,-2.107363,0,1
+2795,85,-2.104564,0,1
+2796,85,-2.101764,0,1
+2797,85,-2.098965,0,1
+2798,85,-2.096166,0,1
+2799,85,-2.093367,0,1
+2800,85,-2.090568,0,1
+2801,85,-2.080710,0,1
+2802,85,-2.070853,0,1
+2803,85,-2.060995,0,1
+2804,85,-2.051137,0,1
+2805,85,-2.041279,0,1
+2806,85,-2.031421,0,1
+2807,85,-2.021563,0,1
+2808,85,-2.011706,0,1
+2809,85,-2.001848,0,1
+2810,85,-1.991990,0,1
+2811,85,-1.982132,0,1
+2812,85,-1.972274,0,1
+2813,85,-1.962417,0,1
+2814,85,-1.952559,0,1
+2815,85,-1.942701,0,1
+2816,85,-1.932843,0,1
+2817,85,-1.922985,0,1
+2818,85,-1.913127,0,1
+2819,85,-1.903270,0,1
+2820,85,-1.893412,0,1
+2821,85,-1.875552,0,1
+2822,85,-1.857693,0,1
+2823,85,-1.839834,0,1
+2824,85,-1.821974,0,1
+2825,85,-1.804115,0,1
+2826,85,-1.786256,0,1
+2827,85,-1.768396,0,1
+2828,85,-1.750537,0,1
+2829,85,-1.732678,0,1
+2830,85,-1.714818,0,1
+2831,85,-1.696959,0,1
+2832,85,-1.679100,0,1
+2833,85,-1.661241,0,1
+2834,85,-1.643381,0,1
+2835,85,-1.625522,0,1
+2836,85,-1.607663,0,1
+2837,85,-1.589803,0,1
+2838,85,-1.571944,0,1
+2839,85,-1.554085,0,1
+2840,85,-1.536225,0,1
+2841,85,-1.515667,0,1
+2842,85,-1.495108,0,1
+2843,85,-1.474550,0,1
+2844,85,-1.453992,0,1
+2845,85,-1.433433,0,1
+2846,85,-1.412875,0,1
+2847,85,-1.392316,0,1
+2848,85,-1.371758,0,1
+2849,85,-1.351199,0,1
+2850,85,-1.330641,0,1
+2851,85,-1.310082,0,1
+2852,85,-1.289524,0,1
+2853,85,-1.268966,0,1
+2854,85,-1.248407,0,1
+2855,85,-1.227849,0,1
+2856,85,-1.207290,0,1
+2857,85,-1.186732,0,1
+2858,85,-1.166173,0,1
+2859,85,-1.145615,0,1
+2860,85,-1.125057,0,1
+2861,85,-1.109817,0,1
+2862,85,-1.094578,0,1
+2863,85,-1.079339,0,1
+2864,85,-1.064099,0,1
+2865,85,-1.048860,0,1
+2866,85,-1.033621,0,1
+2867,85,-1.018381,0,1
+2868,85,-1.003142,0,1
+2869,85,-0.987903,0,1
+2870,85,-0.972663,0,1
+2871,85,-0.957424,0,1
+2872,85,-0.942184,0,1
+2873,85,-0.926945,0,1
+2874,85,-0.911706,0,1
+2875,85,-0.896466,0,1
+2876,85,-0.881227,0,1
+2877,85,-0.865988,0,1
+2878,85,-0.850748,0,1
+2879,85,-0.835509,0,1
+2880,85,-0.820270,0,1
+2881,85,-0.815009,0,1
+2882,85,-0.809748,0,1
+2883,85,-0.804487,0,1
+2884,85,-0.799226,0,1
+2885,85,-0.793965,0,1
+2886,85,-0.788704,0,1
+2887,85,-0.783443,0,1
+2888,85,-0.778182,0,1
+2889,85,-0.772921,0,1
+2890,85,-0.767660,0,1
+2891,85,-0.762399,0,1
+2892,85,-0.757138,0,1
+2893,85,-0.751877,0,1
+2894,85,-0.746616,0,1
+2895,85,-0.741355,0,1
+2896,85,-0.736094,0,1
+2897,85,-0.730833,0,1
+2898,85,-0.725572,0,1
+2899,85,-0.720311,0,1
+2900,85,-0.715050,0,1
+2901,85,-0.718241,0,1
+2902,85,-0.721431,0,1
+2903,85,-0.724621,0,1
+2904,85,-0.727811,0,1
+2905,85,-0.731001,0,1
+2906,85,-0.734191,0,1
+2907,85,-0.737381,0,1
+2908,85,-0.740571,0,1
+2909,85,-0.743761,0,1
+2910,85,-0.746951,0,1
+2911,85,-0.750141,0,1
+2912,85,-0.753331,0,1
+2913,85,-0.756521,0,1
+2914,85,-0.759711,0,1
+2915,85,-0.762901,0,1
+2916,85,-0.766091,0,1
+2917,0,-0.769281,45,1
+2918,79,-0.772471,0,1
+2919,79,-0.775661,0,1
+2920,79,-0.778852,0,1
+2921,79,-0.784182,0,1
+2922,79,-0.789512,0,1
+2923,79,-0.794842,0,1
+2924,79,-0.800173,0,1
+2925,79,-0.805503,0,1
+2926,79,-0.810833,0,1
+2927,79,-0.816164,0,1
+2928,79,-0.821494,0,1
+2929,79,-0.826824,0,1
+2930,79,-0.832154,0,1
+2931,79,-0.837485,0,1
+2932,79,-0.842815,0,1
+2933,79,-0.848145,0,1
+2934,79,-0.853476,0,1
+2935,79,-0.858806,0,1
+2936,79,-0.864136,0,1
+2937,79,-0.869466,0,1
+2938,79,-0.874797,0,1
+2939,79,-0.880127,0,1
+2940,79,-0.885457,0,1
+2941,79,-0.887247,0,1
+2942,79,-0.889037,0,1
+2943,79,-0.890828,0,1
+2944,79,-0.892618,0,1
+2945,79,-0.894408,0,1
+2946,79,-0.896198,0,1
+2947,79,-0.897988,0,1
+2948,79,-0.899778,0,1
+2949,79,-0.901568,0,1
+2950,79,-0.903358,0,1
+2951,79,-0.905148,0,1
+2952,79,-0.906938,0,1
+2953,79,-0.908728,0,1
+2954,79,-0.910518,0,1
+2955,79,-0.912309,0,1
+2956,79,-0.914099,0,1
+2957,79,-0.915889,0,1
+2958,79,-0.917679,0,1
+2959,79,-0.919469,0,1
+2960,79,-0.921259,0,1
+2961,79,-0.918510,0,1
+2962,79,-0.915761,0,1
+2963,79,-0.913012,0,1
+2964,79,-0.910264,0,1
+2965,79,-0.907515,0,1
+2966,79,-0.904766,0,1
+2967,79,-0.902017,0,1
+2968,79,-0.899268,0,1
+2969,79,-0.896519,0,1
+2970,79,-0.893770,0,1
+2971,79,-0.891022,0,1
+2972,79,-0.888273,0,1
+2973,79,-0.885524,0,1
+2974,79,-0.882775,0,1
+2975,79,-0.880026,0,1
+2976,79,-0.877277,0,1
+2977,79,-0.874528,0,1
+2978,79,-0.871780,0,1
+2979,79,-0.869031,0,1
+2980,79,-0.866282,0,1
+2981,79,-0.860478,0,1
+2982,79,-0.854675,0,1
+2983,79,-0.848871,0,1
+2984,79,-0.843067,0,1
+2985,79,-0.837264,0,1
+2986,79,-0.831460,0,1
+2987,79,-0.825657,0,1
+2988,79,-0.819853,0,1
+2989,79,-0.814050,0,1
+2990,79,-0.808246,0,1
+2991,79,-0.802442,0,1
+2992,79,-0.796639,0,1
+2993,79,-0.790835,0,1
+2994,79,-0.785032,0,1
+2995,79,-0.779228,0,1
+2996,79,-0.773425,0,1
+2997,79,-0.767621,0,1
+2998,79,-0.761817,0,1
+2999,79,-0.756014,0,1
+3000,79,-0.750210,0,1
+3001,79,-0.743295,0,1
+3002,79,-0.736380,0,1
+3003,79,-0.729464,0,1
+3004,79,-0.722549,0,1
+3005,79,-0.715634,0,1
+3006,79,-0.708718,0,1
+3007,79,-0.701803,0,1
+3008,79,-0.694888,0,1
+3009,79,-0.687972,0,1
+3010,79,-0.681057,0,1
+3011,79,-0.674142,0,1
+3012,79,-0.667226,0,1
+3013,79,-0.660311,0,1
+3014,79,-0.653396,0,1
+3015,79,-0.646480,0,1
+3016,79,-0.639565,0,1
+3017,79,-0.632650,0,1
+3018,79,-0.625735,0,1
+3019,79,-0.618819,0,1
+3020,79,-0.611904,0,1
+3021,79,-0.605392,0,1
+3022,79,-0.598881,0,1
+3023,79,-0.592369,0,1
+3024,79,-0.585857,0,1
+3025,79,-0.579346,0,1
+3026,79,-0.572834,0,1
+3027,79,-0.566323,0,1
+3028,79,-0.559811,0,1
+3029,79,-0.553299,0,1
+3030,79,-0.546788,0,1
+3031,79,-0.540276,0,1
+3032,79,-0.533764,0,1
+3033,79,-0.527253,0,1
+3034,79,-0.520741,0,1
+3035,79,-0.514230,0,1
+3036,79,-0.507718,0,1
+3037,79,-0.501206,0,1
+3038,79,-0.494695,0,1
+3039,79,-0.488183,0,1
+3040,79,-0.481672,0,1
+3041,79,-0.475028,0,1
+3042,79,-0.468385,0,1
+3043,79,-0.461742,0,1
+3044,79,-0.455099,0,1
+3045,79,-0.448456,0,1
+3046,79,-0.441813,0,1
+3047,79,-0.435170,0,1
+3048,79,-0.428527,0,1
+3049,79,-0.421884,0,1
+3050,79,-0.415241,0,1
+3051,79,-0.408598,0,1
+3052,79,-0.401954,0,1
+3053,79,-0.395311,0,1
+3054,79,-0.388668,0,1
+3055,79,-0.382025,0,1
+3056,79,-0.375382,0,1
+3057,79,-0.368739,0,1
+3058,79,-0.362096,0,1
+3059,79,-0.355453,0,1
+3060,79,-0.348810,0,1
+3061,79,-0.340529,0,1
+3062,79,-0.332248,0,1
+3063,79,-0.323967,0,1
+3064,79,-0.315686,0,1
+3065,79,-0.307405,0,1
+3066,79,-0.299125,0,1
+3067,79,-0.290844,0,1
+3068,79,-0.282563,0,1
+3069,79,-0.274282,0,1
+3070,79,-0.266001,0,1
+3071,79,-0.257720,0,1
+3072,79,-0.249440,0,1
+3073,79,-0.241159,0,1
+3074,79,-0.232878,0,1
+3075,79,-0.224597,0,1
+3076,79,-0.216316,0,1
+3077,79,-0.208035,0,1
+3078,79,-0.199754,0,1
+3079,79,-0.191474,0,1
+3080,79,-0.183193,0,1
+3081,79,-0.172038,0,1
+3082,79,-0.160882,0,1
+3083,79,-0.149727,0,1
+3084,79,-0.138572,0,1
+3085,79,-0.127417,0,1
+3086,79,-0.116262,0,1
+3087,79,-0.105106,0,1
+3088,79,-0.093951,0,1
+3089,79,-0.082796,0,1
+3090,79,-0.071641,0,1
+3091,79,-0.060486,0,1
+3092,79,-0.049330,0,1
+3093,79,-0.038175,0,1
+3094,79,-0.027020,0,1
+3095,79,-0.015865,0,1
+3096,79,-0.004710,0,1
+3097,79,0.006446,0,1
+3098,79,0.017601,0,1
+3099,79,0.028756,0,1
+3100,79,0.039911,0,1
+3101,79,0.052623,0,1
+3102,79,0.065334,0,1
+3103,79,0.078046,0,1
+3104,79,0.090757,0,1
+3105,79,0.103468,0,1
+3106,79,0.116180,0,1
+3107,79,0.128891,0,1
+3108,79,0.141603,0,1
+3109,79,0.154314,0,1
+3110,79,0.167026,0,1
+3111,79,0.179737,0,1
+3112,79,0.192449,0,1
+3113,79,0.205160,0,1
+3114,79,0.217872,0,1
+3115,79,0.230583,0,1
+3116,79,0.243295,0,1
+3117,79,0.256006,0,1
+3118,79,0.268718,0,1
+3119,79,0.281429,0,1
+3120,79,0.294141,0,1
+3121,79,0.304040,0,1
+3122,79,0.313940,0,1
+3123,79,0.323840,0,1
+3124,79,0.333740,0,1
+3125,79,0.343640,0,1
+3126,79,0.353540,0,1
+3127,79,0.363440,0,1
+3128,79,0.373340,0,1
+3129,79,0.383240,0,1
+3130,79,0.393139,0,1
+3131,79,0.403039,0,1
+3132,79,0.412939,0,1
+3133,79,0.422839,0,1
+3134,79,0.432739,0,1
+3135,79,0.442639,0,1
+3136,79,0.452539,0,1
+3137,79,0.462439,0,1
+3138,79,0.472338,0,1
+3139,79,0.482238,0,1
+3140,79,0.492138,0,1
+3141,79,0.497163,0,1
+3142,79,0.502188,0,1
+3143,79,0.507212,0,1
+3144,79,0.512237,0,1
+3145,79,0.517262,0,1
+3146,79,0.522286,0,1
+3147,79,0.527311,0,1
+3148,79,0.532336,0,1
+3149,79,0.537360,0,1
+3150,79,0.542385,0,1
+3151,79,0.547410,0,1
+3152,79,0.552434,0,1
+3153,79,0.557459,0,1
+3154,79,0.562484,0,1
+3155,79,0.567508,0,1
+3156,79,0.572533,0,1
+3157,79,0.577558,0,1
+3158,79,0.582582,0,1
+3159,79,0.587607,0,1
+3160,79,0.592632,0,1
+3161,79,0.594474,0,1
+3162,79,0.596317,0,1
+3163,79,0.598160,0,1
+3164,79,0.600003,0,1
+3165,79,0.601845,0,1
+3166,79,0.603688,0,1
+3167,79,0.605531,0,1
+3168,79,0.607374,0,1
+3169,79,0.609217,0,1
+3170,79,0.611059,0,1
+3171,79,0.612902,0,1
+3172,79,0.614745,0,1
+3173,79,0.616588,0,1
+3174,79,0.618430,0,1
+3175,79,0.620273,0,1
+3176,79,0.622116,0,1
+3177,79,0.623959,0,1
+3178,79,0.625802,0,1
+3179,79,0.627644,0,1
+3180,79,0.629487,0,1
+3181,79,0.630837,0,1
+3182,79,0.632188,0,1
+3183,79,0.633538,0,1
+3184,79,0.634888,0,1
+3185,79,0.636239,0,1
+3186,79,0.637589,0,1
+3187,79,0.638939,0,1
+3188,79,0.640290,0,1
+3189,79,0.641640,0,1
+3190,79,0.642990,0,1
+3191,79,0.644341,0,1
+3192,79,0.645691,0,1
+3193,79,0.647041,0,1
+3194,79,0.648392,0,1
+3195,79,0.649742,0,1
+3196,79,0.651092,0,1
+3197,79,0.652443,0,1
+3198,79,0.653793,0,1
+3199,79,0.655143,0,1
+3200,79,0.656494,0,1
+3201,79,0.659207,0,1
+3202,79,0.661919,0,1
+3203,79,0.664632,0,1
+3204,79,0.667345,0,1
+3205,79,0.670057,0,1
+3206,79,0.672770,0,1
+3207,79,0.675483,0,1
+3208,79,0.678196,0,1
+3209,79,0.680908,0,1
+3210,79,0.683621,0,1
+3211,79,0.686334,0,1
+3212,79,0.689046,0,1
+3213,79,0.691759,0,1
+3214,79,0.694472,0,1
+3215,79,0.697185,0,1
+3216,79,0.699897,0,1
+3217,79,0.702610,0,1
+3218,79,0.705323,0,1
+3219,79,0.708035,0,1
+3220,79,0.710748,0,1
+3221,79,0.715498,0,1
+3222,79,0.720247,0,1
+3223,79,0.724996,0,1
+3224,79,0.729746,0,1
+3225,79,0.734495,0,1
+3226,79,0.739245,0,1
+3227,79,0.743994,0,1
+3228,79,0.748743,0,1
+3229,79,0.753493,0,1
+3230,79,0.758242,0,1
+3231,79,0.762992,0,1
+3232,79,0.767741,0,1
+3233,79,0.772491,0,1
+3234,79,0.777240,0,1
+3235,79,0.781989,0,1
+3236,79,0.786739,0,1
+3237,79,0.791488,0,1
+3238,79,0.796238,0,1
+3239,79,0.800987,0,1
+3240,79,0.805736,0,1
+3241,79,0.814111,0,1
+3242,79,0.822485,0,1
+3243,79,0.830860,0,1
+3244,79,0.839234,0,1
+3245,79,0.847609,0,1
+3246,79,0.855983,0,1
+3247,79,0.864358,0,1
+3248,79,0.872732,0,1
+3249,79,0.881107,0,1
+3250,79,0.889481,0,1
+3251,79,0.897856,0,1
+3252,79,0.906230,0,1
+3253,79,0.914604,0,1
+3254,79,0.922979,0,1
+3255,79,0.931353,0,1
+3256,79,0.939728,0,1
+3257,79,0.948102,0,1
+3258,79,0.956477,0,1
+3259,79,0.964851,0,1
+3260,79,0.973226,0,1
+3261,79,0.986307,0,1
+3262,79,0.999388,0,1
+3263,79,1.012470,0,1
+3264,79,1.025551,0,1
+3265,79,1.038632,0,1
+3266,79,1.051714,0,1
+3267,79,1.064795,0,1
+3268,79,1.077877,0,1
+3269,79,1.090958,0,1
+3270,79,1.104039,0,1
+3271,79,1.117121,0,1
+3272,79,1.130202,0,1
+3273,79,1.143283,0,1
+3274,79,1.156365,0,1
+3275,79,1.169446,0,1
+3276,79,1.182528,0,1
+3277,79,1.195609,0,1
+3278,79,1.208690,0,1
+3279,79,1.221772,0,1
+3280,79,1.234853,0,1
+3281,79,1.248025,0,1
+3282,79,1.261196,0,1
+3283,79,1.274368,0,1
+3284,79,1.287539,0,1
+3285,79,1.300711,0,1
+3286,79,1.313882,0,1
+3287,79,1.327054,0,1
+3288,79,1.340226,0,1
+3289,79,1.353397,0,1
+3290,79,1.366569,0,1
+3291,79,1.379740,0,1
+3292,79,1.392912,0,1
+3293,79,1.406083,0,1
+3294,79,1.419255,0,1
+3295,79,1.432426,0,1
+3296,79,1.445598,0,1
+3297,79,1.458770,0,1
+3298,79,1.471941,0,1
+3299,79,1.485113,0,1
+3300,79,1.498284,0,1
+3301,79,1.504351,0,1
+3302,79,1.510419,0,1
+3303,79,1.516486,0,1
+3304,79,1.522553,0,1
+3305,79,1.528620,0,1
+3306,79,1.534687,0,1
+3307,79,1.540754,0,1
+3308,79,1.546822,0,1
+3309,79,1.552889,0,1
+3310,79,1.558956,0,1
+3311,79,1.565023,0,1
+3312,79,1.571090,0,1
+3313,79,1.577157,0,1
+3314,79,1.583225,0,1
+3315,79,1.589292,0,1
+3316,79,1.595359,0,1
+3317,79,1.601426,0,1
+3318,79,1.607493,0,1
+3319,79,1.613560,0,1
+3320,79,1.619628,0,1
+3321,79,1.618250,0,1
+3322,79,1.616872,0,1
+3323,79,1.615494,0,1
+3324,79,1.614116,0,1
+3325,79,1.612738,0,1
+3326,79,1.611360,0,1
+3327,79,1.609983,0,1
+3328,79,1.608605,0,1
+3329,79,1.607227,0,1
+3330,79,1.605849,0,1
+3331,79,1.604471,0,1
+3332,79,1.603093,0,1
+3333,79,1.601715,0,1
+3334,79,1.600338,0,1
+3335,79,1.598960,0,1
+3336,79,1.597582,0,1
+3337,79,1.596204,0,1
+3338,79,1.594826,0,1
+3339,79,1.593448,0,1
+3340,79,1.592070,0,1
+3341,79,1.588224,0,1
+3342,79,1.584378,0,1
+3343,79,1.580532,0,1
+3344,79,1.576686,0,1
+3345,79,1.572839,0,1
+3346,79,1.568993,0,1
+3347,79,1.565147,0,1
+3348,79,1.561301,0,1
+3349,79,1.557454,0,1
+3350,79,1.553608,0,1
+3351,79,1.549762,0,1
+3352,79,1.545916,0,1
+3353,79,1.542070,0,1
+3354,79,1.538223,0,1
+3355,79,1.534377,0,1
+3356,79,1.530531,0,1
+3357,79,1.526685,0,1
+3358,79,1.522839,0,1
+3359,79,1.518992,0,1
+3360,79,1.515146,0,1
+3361,79,1.511937,0,1
+3362,79,1.508729,0,1
+3363,79,1.505520,0,1
+3364,79,1.502311,0,1
+3365,79,1.499102,0,1
+3366,79,1.495893,0,1
+3367,79,1.492684,0,1
+3368,79,1.489476,0,1
+3369,79,1.486267,0,1
+3370,79,1.483058,0,1
+3371,79,1.479849,0,1
+3372,79,1.476640,0,1
+3373,79,1.473432,0,1
+3374,79,1.470223,0,1
+3375,79,1.467014,0,1
+3376,79,1.463805,0,1
+3377,79,1.460596,0,1
+3378,79,1.457387,0,1
+3379,79,1.454179,0,1
+3380,79,1.450970,0,1
+3381,79,1.448641,0,1
+3382,79,1.446311,0,1
+3383,79,1.443982,0,1
+3384,79,1.441653,0,1
+3385,79,1.439324,0,1
+3386,79,1.436995,0,1
+3387,79,1.434665,0,1
+3388,79,1.432336,0,1
+3389,79,1.430007,0,1
+3390,79,1.427678,0,1
+3391,79,1.425349,0,1
+3392,79,1.423019,0,1
+3393,79,1.420690,0,1
+3394,79,1.418361,0,1
+3395,79,1.416032,0,1
+3396,79,1.413702,0,1
+3397,79,1.411373,0,1
+3398,79,1.409044,0,1
+3399,79,1.406715,0,1
+3400,79,1.404386,0,1
+3401,79,1.401328,0,1
+3402,79,1.398270,0,1
+3403,79,1.395212,0,1
+3404,79,1.392154,0,1
+3405,79,1.389096,0,1
+3406,79,1.386038,0,1
+3407,79,1.382980,0,1
+3408,79,1.379923,0,1
+3409,79,1.376865,0,1
+3410,79,1.373807,0,1
+3411,79,1.370749,0,1
+3412,79,1.367691,0,1
+3413,79,1.364633,0,1
+3414,79,1.361575,0,1
+3415,79,1.358518,0,1
+3416,79,1.355460,0,1
+3417,79,1.352402,0,1
+3418,79,1.349344,0,1
+3419,79,1.346286,0,1
+3420,79,1.343228,0,1
+3421,79,1.338182,0,1
+3422,79,1.333135,0,1
+3423,79,1.328089,0,1
+3424,79,1.323043,0,1
+3425,79,1.317996,0,1
+3426,79,1.312950,0,1
+3427,79,1.307903,0,1
+3428,79,1.302857,0,1
+3429,79,1.297811,0,1
+3430,79,1.292764,0,1
+3431,79,1.287718,0,1
+3432,79,1.282671,0,1
+3433,79,1.277625,0,1
+3434,79,1.272578,0,1
+3435,79,1.267532,0,1
+3436,79,1.262486,0,1
+3437,79,1.257439,0,1
+3438,79,1.252393,0,1
+3439,79,1.247346,0,1
+3440,79,1.242300,0,1
+3441,79,1.234487,0,1
+3442,79,1.226674,0,1
+3443,79,1.218860,0,1
+3444,79,1.211047,0,1
+3445,79,1.203234,0,1
+3446,79,1.195421,0,1
+3447,79,1.187607,0,1
+3448,79,1.179794,0,1
+3449,79,1.171981,0,1
+3450,79,1.164168,0,1
+3451,79,1.156355,0,1
+3452,79,1.148541,0,1
+3453,79,1.140728,0,1
+3454,79,1.132915,0,1
+3455,79,1.125102,0,1
+3456,79,1.117288,0,1
+3457,79,1.109475,0,1
+3458,79,1.101662,0,1
+3459,79,1.093849,0,1
+3460,79,1.086035,0,1
+3461,79,1.074398,0,1
+3462,79,1.062761,0,1
+3463,79,1.051124,0,1
+3464,79,1.039487,0,1
+3465,79,1.027850,0,1
+3466,79,1.016213,0,1
+3467,79,1.004576,0,1
+3468,79,0.992939,0,1
+3469,79,0.981302,0,1
+3470,79,0.969664,0,1
+3471,79,0.958027,0,1
+3472,79,0.946390,0,1
+3473,79,0.934753,0,1
+3474,79,0.923116,0,1
+3475,79,0.911479,0,1
+3476,79,0.899842,0,1
+3477,79,0.888205,0,1
+3478,79,0.876568,0,1
+3479,79,0.864931,0,1
+3480,79,0.853294,0,1
+3481,79,0.838187,0,1
+3482,79,0.823081,0,1
+3483,79,0.807975,0,1
+3484,79,0.792868,0,1
+3485,79,0.777762,0,1
+3486,79,0.762655,0,1
+3487,79,0.747549,0,1
+3488,79,0.732443,0,1
+3489,79,0.717336,0,1
+3490,79,0.702230,0,1
+3491,79,0.687124,0,1
+3492,79,0.672017,0,1
+3493,79,0.656911,0,1
+3494,79,0.641805,0,1
+3495,79,0.626698,0,1
+3496,79,0.611592,0,1
+3497,79,0.596486,0,1
+3498,79,0.581379,0,1
+3499,79,0.566273,0,1
+3500,79,0.551167,0,1
+3501,79,0.532788,0,1
+3502,79,0.514410,0,1
+3503,79,0.496031,0,1
+3504,79,0.477653,0,1
+3505,79,0.459274,0,1
+3506,79,0.440895,0,1
+3507,79,0.422517,0,1
+3508,79,0.404138,0,1
+3509,79,0.385760,0,1
+3510,79,0.367381,0,1
+3511,79,0.349003,0,1
+3512,79,0.330624,0,1
+3513,79,0.312246,0,1
+3514,79,0.293867,0,1
+3515,79,0.275489,0,1
+3516,79,0.257110,0,1
+3517,79,0.238732,0,1
+3518,79,0.220353,0,1
+3519,79,0.201975,0,1
+3520,79,0.183596,0,1
+3521,79,0.161351,0,1
+3522,79,0.139106,0,1
+3523,79,0.116862,0,1
+3524,79,0.094617,0,1
+3525,79,0.072372,0,1
+3526,79,0.050127,0,1
+3527,79,0.027882,0,1
+3528,79,0.005637,0,1
+3529,79,-0.016607,0,1
+3530,79,-0.038852,0,1
+3531,79,-0.061097,0,1
+3532,79,-0.083342,0,1
+3533,79,-0.105587,0,1
+3534,79,-0.127832,0,1
+3535,79,-0.150076,0,1
+3536,79,-0.172321,0,1
+3537,79,-0.194566,0,1
+3538,79,-0.216811,0,1
+3539,79,-0.239056,0,1
+3540,79,-0.261301,0,1
+3541,79,-0.285281,0,1
+3542,79,-0.309262,0,1
+3543,79,-0.333243,0,1
+3544,79,-0.357223,0,1
+3545,79,-0.381204,0,1
+3546,79,-0.405185,0,1
+3547,79,-0.429166,0,1
+3548,79,-0.453146,0,1
+3549,79,-0.477127,0,1
+3550,79,-0.501108,0,1
+3551,79,-0.525088,0,1
+3552,79,-0.549069,0,1
+3553,79,-0.573050,0,1
+3554,79,-0.597030,0,1
+3555,79,-0.621011,0,1
+3556,79,-0.644992,0,1
+3557,79,-0.668973,0,1
+3558,79,-0.692953,0,1
+3559,79,-0.716934,0,1
+3560,79,-0.740915,0,1
+3561,79,-0.762595,0,1
+3562,79,-0.784275,0,1
+3563,79,-0.805955,0,1
+3564,79,-0.827636,0,1
+3565,79,-0.849316,0,1
+3566,79,-0.870996,0,1
+3567,79,-0.892676,0,1
+3568,79,-0.914356,0,1
+3569,79,-0.936037,0,1
+3570,79,-0.957717,0,1
+3571,79,-0.979397,0,1
+3572,79,-1.001077,0,1
+3573,79,-1.022758,0,1
+3574,79,-1.044438,0,1
+3575,79,-1.066118,0,1
+3576,79,-1.087798,0,1
+3577,79,-1.109478,0,1
+3578,79,-1.131159,0,1
+3579,79,-1.152839,0,1
+3580,79,-1.174519,0,1
+3581,79,-1.191234,0,1
+3582,79,-1.207950,0,1
+3583,79,-1.224665,0,1
+3584,79,-1.241381,0,1
+3585,79,-1.258096,0,1
+3586,79,-1.274811,0,1
+3587,79,-1.291527,0,1
+3588,79,-1.308242,0,1
+3589,79,-1.324958,0,1
+3590,79,-1.341673,0,1
+3591,79,-1.358388,0,1
+3592,79,-1.375104,0,1
+3593,79,-1.391819,0,1
+3594,79,-1.408535,0,1
+3595,79,-1.425250,0,1
+3596,79,-1.441965,0,1
+3597,79,-1.458681,0,1
+3598,79,-1.475396,0,1
+3599,79,-1.492112,0,1
+3600,79,-1.508827,0,1
+3601,79,-1.519847,0,1
+3602,79,-1.530868,0,1
+3603,79,-1.541888,0,1
+3604,79,-1.552909,0,1
+3605,79,-1.563929,0,1
+3606,79,-1.574949,0,1
+3607,79,-1.585970,0,1
+3608,79,-1.596990,0,1
+3609,79,-1.608010,0,1
+3610,79,-1.619031,0,1
+3611,79,-1.630051,0,1
+3612,79,-1.641072,0,1
+3613,79,-1.652092,0,1
+3614,79,-1.663112,0,1
+3615,79,-1.674133,0,1
+3616,79,-1.685153,0,1
+3617,79,-1.696173,0,1
+3618,79,-1.707194,0,1
+3619,79,-1.718214,0,1
+3620,79,-1.729234,0,1
+3621,79,-1.735649,0,1
+3622,79,-1.742064,0,1
+3623,79,-1.748479,0,1
+3624,79,-1.754894,0,1
+3625,79,-1.761308,0,1
+3626,79,-1.767723,0,1
+3627,79,-1.774138,0,1
+3628,79,-1.780553,0,1
+3629,79,-1.786968,0,1
+3630,79,-1.793382,0,1
+3631,79,-1.799797,0,1
+3632,79,-1.806212,0,1
+3633,79,-1.812627,0,1
+3634,79,-1.819042,0,1
+3635,79,-1.825456,0,1
+3636,79,-1.831871,0,1
+3637,79,-1.838286,0,1
+3638,79,-1.844701,0,1
+3639,79,-1.851116,0,1
+3640,79,-1.857530,0,1
+3641,79,-1.860050,0,1
+3642,79,-1.862570,0,1
+3643,79,-1.865089,0,1
+3644,79,-1.867609,0,1
+3645,79,-1.870128,0,1
+3646,79,-1.872648,0,1
+3647,79,-1.875168,0,1
+3648,79,-1.877687,0,1
+3649,79,-1.880207,0,1
+3650,79,-1.882727,0,1
+3651,79,-1.885246,0,1
+3652,79,-1.887766,0,1
+3653,79,-1.890285,0,1
+3654,79,-1.892805,0,1
+3655,79,-1.895325,0,1
+3656,79,-1.897844,0,1
+3657,79,-1.900364,0,1
+3658,79,-1.902884,0,1
+3659,79,-1.905403,0,1
+3660,79,-1.907923,0,1
+3661,79,-1.906535,0,1
+3662,79,-1.905148,0,1
+3663,79,-1.903761,0,1
+3664,79,-1.902373,0,1
+3665,79,-1.900986,0,1
+3666,79,-1.899598,0,1
+3667,79,-1.898211,0,1
+3668,79,-1.896824,0,1
+3669,79,-1.895436,0,1
+3670,79,-1.894049,0,1
+3671,79,-1.892661,0,1
+3672,79,-1.891274,0,1
+3673,79,-1.889886,0,1
+3674,79,-1.888499,0,1
+3675,79,-1.887112,0,1
+3676,79,-1.885724,0,1
+3677,79,-1.884337,0,1
+3678,79,-1.882949,0,1
+3679,79,-1.881562,0,1
+3680,79,-1.880174,0,1
+3681,79,-1.878103,0,1
+3682,79,-1.876032,0,1
+3683,79,-1.873961,0,1
+3684,79,-1.871889,0,1
+3685,79,-1.869818,0,1
+3686,79,-1.867747,0,1
+3687,79,-1.865676,0,1
+3688,79,-1.863604,0,1
+3689,79,-1.861533,0,1
+3690,79,-1.859462,0,1
+3691,79,-1.857391,0,1
+3692,79,-1.855319,0,1
+3693,79,-1.853248,0,1
+3694,79,-1.851177,0,1
+3695,79,-1.849106,0,1
+3696,79,-1.847034,0,1
+3697,79,-1.844963,0,1
+3698,79,-1.842892,0,1
+3699,79,-1.840821,0,1
+3700,79,-1.838749,0,1
+3701,79,-1.841413,0,1
+3702,79,-1.844077,0,1
+3703,79,-1.846741,0,1
+3704,79,-1.849406,0,1
+3705,79,-1.852070,0,1
+3706,79,-1.854734,0,1
+3707,79,-1.857398,0,1
+3708,79,-1.860062,0,1
+3709,79,-1.862726,0,1
+3710,79,-1.865390,0,1
+3711,79,-1.868054,0,1
+3712,79,-1.870718,0,1
+3713,79,-1.873382,0,1
+3714,79,-1.876046,0,1
+3715,79,-1.878710,0,1
+3716,79,-1.881374,0,1
+3717,79,-1.884038,0,1
+3718,79,-1.886702,0,1
+3719,79,-1.889366,0,1
+3720,79,-1.892030,0,1
+3721,79,-1.900506,0,1
+3722,79,-1.908981,0,1
+3723,79,-1.917456,0,1
+3724,79,-1.925932,0,1
+3725,79,-1.934407,0,1
+3726,79,-1.942882,0,1
+3727,79,-1.951358,0,1
+3728,79,-1.959833,0,1
+3729,79,-1.968309,0,1
+3730,79,-1.976784,0,1
+3731,79,-1.985259,0,1
+3732,79,-1.993735,0,1
+3733,79,-2.002210,0,1
+3734,79,-2.010685,0,1
+3735,79,-2.019161,0,1
+3736,79,-2.027636,0,1
+3737,79,-2.036111,0,1
+3738,79,-2.044587,0,1
+3739,79,-2.053062,0,1
+3740,79,-2.061537,0,1
+3741,79,-2.071675,0,1
+3742,79,-2.081813,0,1
+3743,79,-2.091952,0,1
+3744,79,-2.102090,0,1
+3745,79,-2.112228,0,1
+3746,79,-2.122366,0,1
+3747,79,-2.132504,0,1
+3748,79,-2.142642,0,1
+3749,79,-2.152780,0,1
+3750,79,-2.162919,0,1
+3751,79,-2.173057,0,1
+3752,79,-2.183195,0,1
+3753,79,-2.193333,0,1
+3754,79,-2.203471,0,1
+3755,79,-2.213609,0,1
+3756,79,-2.223747,0,1
+3757,79,-2.233886,0,1
+3758,79,-2.244024,0,1
+3759,79,-2.254162,0,1
+3760,79,-2.264300,0,1
+3761,79,-2.272168,0,1
+3762,79,-2.280036,0,1
+3763,79,-2.287904,0,1
+3764,79,-2.295772,0,1
+3765,79,-2.303640,0,1
+3766,79,-2.311508,0,1
+3767,79,-2.319377,0,1
+3768,79,-2.327245,0,1
+3769,79,-2.335113,0,1
+3770,79,-2.342981,0,1
+3771,79,-2.350849,0,1
+3772,79,-2.358717,0,1
+3773,79,-2.366585,0,1
+3774,79,-2.374453,0,1
+3775,79,-2.382321,0,1
+3776,79,-2.390189,0,1
+3777,79,-2.398057,0,1
+3778,79,-2.405925,0,1
+3779,79,-2.413794,0,1
+3780,79,-2.421662,0,1
+3781,79,-2.427540,0,1
+3782,79,-2.433419,0,1
+3783,79,-2.439298,0,1
+3784,79,-2.445177,0,1
+3785,79,-2.451056,0,1
+3786,79,-2.456935,0,1
+3787,79,-2.462813,0,1
+3788,79,-2.468692,0,1
+3789,79,-2.474571,0,1
+3790,79,-2.480450,0,1
+3791,79,-2.486329,0,1
+3792,79,-2.492208,0,1
+3793,79,-2.498086,0,1
+3794,79,-2.503965,0,1
+3795,79,-2.509844,0,1
+3796,79,-2.515723,0,1
+3797,79,-2.521602,0,1
+3798,79,-2.527481,0,1
+3799,79,-2.533359,0,1
+3800,79,-2.539238,0,1
+3801,79,-2.545744,0,1
+3802,79,-2.552250,0,1
+3803,79,-2.558756,0,1
+3804,79,-2.565262,0,1
+3805,79,-2.571768,0,1
+3806,79,-2.578274,0,1
+3807,79,-2.584780,0,1
+3808,79,-2.591286,0,1
+3809,79,-2.597792,0,1
+3810,79,-2.604298,0,1
+3811,79,-2.610804,0,1
+3812,79,-2.617310,0,1
+3813,79,-2.623815,0,1
+3814,79,-2.630321,0,1
+3815,79,-2.636827,0,1
+3816,79,-2.643333,0,1
+3817,79,-2.649839,0,1
+3818,79,-2.656345,0,1
+3819,79,-2.662851,0,1
+3820,79,-2.669357,0,1
+3821,79,-2.675784,0,1
+3822,79,-2.682210,0,1
+3823,79,-2.688637,0,1
+3824,79,-2.695064,0,1
+3825,79,-2.701490,0,1
+3826,79,-2.707917,0,1
+3827,79,-2.714343,0,1
+3828,79,-2.720770,0,1
+3829,79,-2.727197,0,1
+3830,79,-2.733623,0,1
+3831,79,-2.740050,0,1
+3832,79,-2.746476,0,1
+3833,79,-2.752903,0,1
+3834,79,-2.759330,0,1
+3835,79,-2.765756,0,1
+3836,79,-2.772183,0,1
+3837,79,-2.778609,0,1
+3838,79,-2.785036,0,1
+3839,79,-2.791463,0,1
+3840,79,-2.797889,0,1
+3841,79,-2.799763,0,1
+3842,79,-2.801636,0,1
+3843,79,-2.803510,0,1
+3844,79,-2.805383,0,1
+3845,79,-2.807257,0,1
+3846,79,-2.809130,0,1
+3847,79,-2.811003,0,1
+3848,79,-2.812877,0,1
+3849,79,-2.814750,0,1
+3850,79,-2.816624,0,1
+3851,79,-2.818497,0,1
+3852,79,-2.820371,0,1
+3853,79,-2.822244,0,1
+3854,79,-2.824118,0,1
+3855,79,-2.825991,0,1
+3856,79,-2.827864,0,1
+3857,79,-2.829738,0,1
+3858,79,-2.831611,0,1
+3859,79,-2.833485,0,1
+3860,79,-2.835358,0,1
+3861,79,-2.830548,0,1
+3862,79,-2.825738,0,1
+3863,79,-2.820927,0,1
+3864,79,-2.816117,0,1
+3865,79,-2.811307,0,1
+3866,79,-2.806496,0,1
+3867,79,-2.801686,0,1
+3868,79,-2.796876,0,1
+3869,79,-2.792065,0,1
+3870,79,-2.787255,0,1
+3871,79,-2.782444,0,1
+3872,79,-2.777634,0,1
+3873,79,-2.772824,0,1
+3874,79,-2.768013,0,1
+3875,79,-2.763203,0,1
+3876,79,-2.758393,0,1
+3877,79,-2.753582,0,1
+3878,79,-2.748772,0,1
+3879,79,-2.743962,0,1
+3880,79,-2.739151,0,1
+3881,79,-2.732017,0,1
+3882,79,-2.724883,0,1
+3883,79,-2.717748,0,1
+3884,79,-2.710614,0,1
+3885,79,-2.703480,0,1
+3886,79,-2.696345,0,1
+3887,79,-2.689211,0,1
+3888,79,-2.682077,0,1
+3889,79,-2.674942,0,1
+3890,79,-2.667808,0,1
+3891,79,-2.660674,0,1
+3892,79,-2.653539,0,1
+3893,79,-2.646405,0,1
+3894,79,-2.639271,0,1
+3895,79,-2.632136,0,1
+3896,79,-2.625002,0,1
+3897,79,-2.617868,0,1
+3898,79,-2.610733,0,1
+3899,79,-2.603599,0,1
+3900,79,-2.596465,0,1
+3901,79,-2.593143,0,1
+3902,79,-2.589820,0,1
+3903,79,-2.586498,0,1
+3904,79,-2.583176,0,1
+3905,79,-2.579854,0,1
+3906,79,-2.576532,0,1
+3907,79,-2.573210,0,1
+3908,79,-2.569888,0,1
+3909,79,-2.566565,0,1
+3910,79,-2.563243,0,1
+3911,79,-2.559921,0,1
+3912,79,-2.556599,0,1
+3913,79,-2.553277,0,1
+3914,79,-2.549955,0,1
+3915,79,-2.546632,0,1
+3916,79,-2.543310,0,1
+3917,79,-2.539988,0,1
+3918,79,-2.536666,0,1
+3919,79,-2.533344,0,1
+3920,79,-2.530022,0,1
+3921,79,-2.531983,0,1
+3922,79,-2.533943,0,1
+3923,79,-2.535904,0,1
+3924,79,-2.537865,0,1
+3925,79,-2.539826,0,1
+3926,79,-2.541787,0,1
+3927,79,-2.543748,0,1
+3928,79,-2.545709,0,1
+3929,79,-2.547669,0,1
+3930,79,-2.549630,0,1
+3931,79,-2.551591,0,1
+3932,79,-2.553552,0,1
+3933,84,-2.555513,0,1
+3934,84,-2.557474,0,1
+3935,84,-2.559435,0,1
+3936,84,-2.561395,0,1
+3937,84,-2.563356,0,1
+3938,84,-2.565317,0,1
+3939,84,-2.567278,0,1
+3940,84,-2.569239,0,1
+3941,84,-2.575233,0,1
+3942,84,-2.581228,0,1
+3943,84,-2.587223,0,1
+3944,84,-2.593217,0,1
+3945,84,-2.599212,0,1
+3946,84,-2.605207,0,1
+3947,84,-2.611201,0,1
+3948,84,-2.617196,0,1
+3949,84,-2.623191,0,1
+3950,84,-2.629185,0,1
+3951,84,-2.635180,0,1
+3952,84,-2.641175,0,1
+3953,84,-2.647169,0,1
+3954,84,-2.653164,0,1
+3955,84,-2.659159,0,1
+3956,84,-2.665153,0,1
+3957,84,-2.671148,0,1
+3958,84,-2.677143,0,1
+3959,84,-2.683137,0,1
+3960,84,-2.689132,0,1
+3961,84,-2.698526,0,1
+3962,84,-2.707921,0,1
+3963,84,-2.717316,0,1
+3964,84,-2.726710,0,1
+3965,84,-2.736105,0,1
+3966,84,-2.745499,0,1
+3967,84,-2.754894,0,1
+3968,84,-2.764288,0,1
+3969,84,-2.773683,0,1
+3970,84,-2.783078,0,1
+3971,84,-2.792472,0,1
+3972,84,-2.801867,0,1
+3973,84,-2.811261,0,1
+3974,84,-2.820656,0,1
+3975,84,-2.830050,0,1
+3976,84,-2.839445,0,1
+3977,84,-2.848840,0,1
+3978,84,-2.858234,0,1
+3979,84,-2.867629,0,1
+3980,84,-2.877023,0,1
+3981,84,-2.888895,0,1
+3982,84,-2.900767,0,1
+3983,84,-2.912639,0,1
+3984,84,-2.924511,0,1
+3985,84,-2.936383,0,1
+3986,84,-2.948255,0,1
+3987,84,-2.960127,0,1
+3988,84,-2.971999,0,1
+3989,84,-2.983871,0,1
+3990,84,-2.995743,0,1
+3991,84,-3.007615,0,1
+3992,84,-3.019487,0,1
+3993,84,-3.031359,0,1
+3994,84,-3.043231,0,1
+3995,84,-3.055103,0,1
+3996,84,-3.066975,0,1
+3997,84,-3.078847,0,1
+3998,84,-3.090719,0,1
+3999,84,-3.102591,0,1
+4000,84,-3.114463,0,1
+4001,84,-3.127281,0,1
+4002,84,-3.140099,0,1
+4003,84,-3.152917,0,1
+4004,84,-3.165735,0,1
+4005,84,-3.178553,0,1
+4006,84,-3.191371,0,1
+4007,84,-3.204189,0,1
+4008,84,-3.217007,0,1
+4009,84,-3.229825,0,1
+4010,84,-3.242643,0,1
+4011,84,-3.255461,0,1
+4012,84,-3.268279,0,1
+4013,84,-3.281097,0,1
+4014,84,-3.293915,0,1
+4015,84,-3.306733,0,1
+4016,84,-3.319550,0,1
+4017,84,-3.332368,0,1
+4018,84,-3.345186,0,1
+4019,84,-3.358004,0,1
+4020,84,-3.370822,0,1
+4021,84,-3.381929,0,1
+4022,84,-3.393036,0,1
+4023,84,-3.404143,0,1
+4024,84,-3.415249,0,1
+4025,84,-3.426356,0,1
+4026,84,-3.437463,0,1
+4027,84,-3.448570,0,1
+4028,84,-3.459677,0,1
+4029,84,-3.470783,0,1
+4030,84,-3.481890,0,1
+4031,84,-3.492997,0,1
+4032,84,-3.504104,0,1
+4033,84,-3.515211,0,1
+4034,84,-3.526317,0,1
+4035,84,-3.537424,0,1
+4036,84,-3.548531,0,1
+4037,84,-3.559638,0,1
+4038,84,-3.570744,0,1
+4039,84,-3.581851,0,1
+4040,84,-3.592958,0,1
+4041,84,-3.597680,0,1
+4042,84,-3.602402,0,1
+4043,84,-3.607123,0,1
+4044,84,-3.611845,0,1
+4045,84,-3.616567,0,1
+4046,84,-3.621289,0,1
+4047,84,-3.626011,0,1
+4048,84,-3.630733,0,1
+4049,84,-3.635454,0,1
+4050,84,-3.640176,0,1
+4051,84,-3.644898,0,1
+4052,84,-3.649620,0,1
+4053,84,-3.654342,0,1
+4054,84,-3.659064,0,1
+4055,84,-3.663785,0,1
+4056,84,-3.668507,0,1
+4057,84,-3.673229,0,1
+4058,84,-3.677951,0,1
+4059,84,-3.682673,0,1
+4060,84,-3.687394,0,1
+4061,84,-3.682675,0,1
+4062,84,-3.677955,0,1
+4063,84,-3.673235,0,1
+4064,84,-3.668516,0,1
+4065,84,-3.663796,0,1
+4066,84,-3.659076,0,1
+4067,84,-3.654357,0,1
+4068,84,-3.649637,0,1
+4069,84,-3.644917,0,1
+4070,84,-3.640198,0,1
+4071,84,-3.635478,0,1
+4072,84,-3.630758,0,1
+4073,84,-3.626038,0,1
+4074,84,-3.621319,0,1
+4075,84,-3.616599,0,1
+4076,84,-3.611879,0,1
+4077,84,-3.607160,0,1
+4078,84,-3.602440,0,1
+4079,84,-3.597720,0,1
+4080,84,-3.593001,0,1
+4081,84,-3.581719,0,1
+4082,84,-3.570437,0,1
+4083,84,-3.559154,0,1
+4084,84,-3.547872,0,1
+4085,84,-3.536590,0,1
+4086,84,-3.525308,0,1
+4087,84,-3.514026,0,1
+4088,84,-3.502744,0,1
+4089,84,-3.491462,0,1
+4090,84,-3.480180,0,1
+4091,84,-3.468898,0,1
+4092,84,-3.457616,0,1
+4093,84,-3.446334,0,1
+4094,84,-3.435052,0,1
+4095,84,-3.423770,0,1
+4096,84,-3.412488,0,1
+4097,84,-3.401206,0,1
+4098,84,-3.389924,0,1
+4099,84,-3.378642,0,1
+4100,84,-3.367360,0,1
+4101,84,-3.355824,0,1
+4102,84,-3.344288,0,1
+4103,84,-3.332753,0,1
+4104,84,-3.321217,0,1
+4105,84,-3.309681,0,1
+4106,84,-3.298146,0,1
+4107,84,-3.286610,0,1
+4108,84,-3.275074,0,1
+4109,84,-3.263539,0,1
+4110,84,-3.252003,0,1
+4111,84,-3.240467,0,1
+4112,84,-3.228932,0,1
+4113,84,-3.217396,0,1
+4114,84,-3.205860,0,1
+4115,84,-3.194325,0,1
+4116,84,-3.182789,0,1
+4117,84,-3.171253,0,1
+4118,84,-3.159718,0,1
+4119,84,-3.148182,0,1
+4120,84,-3.136646,0,1
+4121,84,-3.128363,0,1
+4122,84,-3.120079,0,1
+4123,84,-3.111796,0,1
+4124,84,-3.103512,0,1
+4125,84,-3.095229,0,1
+4126,84,-3.086945,0,1
+4127,84,-3.078662,0,1
+4128,84,-3.070378,0,1
+4129,84,-3.062095,0,1
+4130,84,-3.053811,0,1
+4131,84,-3.045528,0,1
+4132,84,-3.037244,0,1
+4133,84,-3.028961,0,1
+4134,84,-3.020677,0,1
+4135,84,-3.012394,0,1
+4136,84,-3.004110,0,1
+4137,84,-2.995827,0,1
+4138,84,-2.987543,0,1
+4139,84,-2.979260,0,1
+4140,84,-2.970976,0,1
+4141,84,-2.964421,0,1
+4142,84,-2.957865,0,1
+4143,84,-2.951310,0,1
+4144,84,-2.944754,0,1
+4145,84,-2.938199,0,1
+4146,84,-2.931644,0,1
+4147,84,-2.925088,0,1
+4148,84,-2.918533,0,1
+4149,84,-2.911977,0,1
+4150,84,-2.905422,0,1
+4151,84,-2.898866,0,1
+4152,84,-2.892311,0,1
+4153,84,-2.885756,0,1
+4154,84,-2.879200,0,1
+4155,84,-2.872645,0,1
+4156,84,-2.866089,0,1
+4157,84,-2.859534,0,1
+4158,84,-2.852978,0,1
+4159,84,-2.846423,0,1
+4160,84,-2.839867,0,1
+4161,84,-2.830678,0,1
+4162,84,-2.821489,0,1
+4163,84,-2.812300,0,1
+4164,84,-2.803111,0,1
+4165,84,-2.793921,0,1
+4166,84,-2.784732,0,1
+4167,84,-2.775543,0,1
+4168,84,-2.766354,0,1
+4169,84,-2.757165,0,1
+4170,84,-2.747976,0,1
+4171,84,-2.738786,0,1
+4172,84,-2.729597,0,1
+4173,84,-2.720408,0,1
+4174,84,-2.711219,0,1
+4175,84,-2.702030,0,1
+4176,84,-2.692840,0,1
+4177,84,-2.683651,0,1
+4178,84,-2.674462,0,1
+4179,84,-2.665273,0,1
+4180,84,-2.656084,0,1
+4181,84,-2.642178,0,1
+4182,84,-2.628272,0,1
+4183,84,-2.614366,0,1
+4184,84,-2.600460,0,1
+4185,84,-2.586554,0,1
+4186,84,-2.572648,0,1
+4187,84,-2.558742,0,1
+4188,84,-2.544836,0,1
+4189,84,-2.530930,0,1
+4190,84,-2.517024,0,1
+4191,84,-2.503118,0,1
+4192,84,-2.489212,0,1
+4193,84,-2.475306,0,1
+4194,84,-2.461400,0,1
+4195,84,-2.447494,0,1
+4196,84,-2.433588,0,1
+4197,84,-2.419682,0,1
+4198,84,-2.405776,0,1
+4199,84,-2.391870,0,1
+4200,84,-2.377964,0,1
+4201,84,-2.362743,0,1
+4202,84,-2.347522,0,1
+4203,84,-2.332301,0,1
+4204,84,-2.317080,0,1
+4205,84,-2.301859,0,1
+4206,84,-2.286638,0,1
+4207,84,-2.271417,0,1
+4208,84,-2.256197,0,1
+4209,84,-2.240976,0,1
+4210,84,-2.225755,0,1
+4211,84,-2.210534,0,1
+4212,84,-2.195313,0,1
+4213,84,-2.180092,0,1
+4214,84,-2.164871,0,1
+4215,84,-2.149650,0,1
+4216,84,-2.134430,0,1
+4217,84,-2.119209,0,1
+4218,84,-2.103988,0,1
+4219,84,-2.088767,0,1
+4220,84,-2.073546,0,1
+4221,84,-2.061637,0,1
+4222,84,-2.049728,0,1
+4223,84,-2.037819,0,1
+4224,84,-2.025911,0,1
+4225,84,-2.014002,0,1
+4226,84,-2.002093,0,1
+4227,84,-1.990184,0,1
+4228,84,-1.978275,0,1
+4229,84,-1.966366,0,1
+4230,84,-1.954458,0,1
+4231,84,-1.942549,0,1
+4232,84,-1.930640,0,1
+4233,84,-1.918731,0,1
+4234,84,-1.906822,0,1
+4235,84,-1.894913,0,1
+4236,84,-1.883005,0,1
+4237,84,-1.871096,0,1
+4238,84,-1.859187,0,1
+4239,84,-1.847278,0,1
+4240,84,-1.835369,0,1
+4241,84,-1.829920,0,1
+4242,84,-1.824471,0,1
+4243,84,-1.819022,0,1
+4244,84,-1.813573,0,1
+4245,84,-1.808124,0,1
+4246,84,-1.802675,0,1
+4247,84,-1.797226,0,1
+4248,84,-1.791777,0,1
+4249,84,-1.786328,0,1
+4250,84,-1.780879,0,1
+4251,84,-1.775430,0,1
+4252,84,-1.769981,0,1
+4253,84,-1.764532,0,1
+4254,84,-1.759083,0,1
+4255,84,-1.753634,0,1
+4256,84,-1.748185,0,1
+4257,84,-1.742736,0,1
+4258,84,-1.737287,0,1
+4259,84,-1.731838,0,1
+4260,84,-1.726389,0,1
+4261,84,-1.728165,0,1
+4262,84,-1.729942,0,1
+4263,84,-1.731719,0,1
+4264,84,-1.733495,0,1
+4265,84,-1.735272,0,1
+4266,84,-1.737049,0,1
+4267,84,-1.738826,0,1
+4268,84,-1.740602,0,1
+4269,84,-1.742379,0,1
+4270,84,-1.744156,0,1
+4271,84,-1.745933,0,1
+4272,84,-1.747709,0,1
+4273,84,-1.749486,0,1
+4274,84,-1.751263,0,1
+4275,84,-1.753039,0,1
+4276,84,-1.754816,0,1
+4277,84,-1.756593,0,1
+4278,84,-1.758370,0,1
+4279,84,-1.760146,0,1
+4280,84,-1.761923,0,1
+4281,84,-1.766668,0,1
+4282,84,-1.771412,0,1
+4283,84,-1.776157,0,1
+4284,84,-1.780902,0,1
+4285,84,-1.785646,0,1
+4286,84,-1.790391,0,1
+4287,84,-1.795136,0,1
+4288,84,-1.799880,0,1
+4289,84,-1.804625,0,1
+4290,84,-1.809369,0,1
+4291,84,-1.814114,0,1
+4292,84,-1.818859,0,1
+4293,84,-1.823603,0,1
+4294,84,-1.828348,0,1
+4295,84,-1.833093,0,1
+4296,84,-1.837837,0,1
+4297,84,-1.842582,0,1
+4298,84,-1.847327,0,1
+4299,84,-1.852071,0,1
+4300,84,-1.856816,0,1
+4301,84,-1.861169,0,1
+4302,84,-1.865522,0,1
+4303,84,-1.869874,0,1
+4304,84,-1.874227,0,1
+4305,84,-1.878580,0,1
+4306,84,-1.882933,0,1
+4307,84,-1.887286,0,1
+4308,84,-1.891639,0,1
+4309,84,-1.895992,0,1
+4310,84,-1.900344,0,1
+4311,84,-1.904697,0,1
+4312,84,-1.909050,0,1
+4313,84,-1.913403,0,1
+4314,84,-1.917756,0,1
+4315,84,-1.922109,0,1
+4316,84,-1.926462,0,1
+4317,84,-1.930814,0,1
+4318,84,-1.935167,0,1
+4319,84,-1.939520,0,1
+4320,84,-1.943873,0,1
+4321,84,-1.948344,0,1
+4322,84,-1.952815,0,1
+4323,84,-1.957285,0,1
+4324,84,-1.961756,0,1
+4325,84,-1.966227,0,1
+4326,84,-1.970698,0,1
+4327,84,-1.975169,0,1
+4328,84,-1.979639,0,1
+4329,84,-1.984110,0,1
+4330,84,-1.988581,0,1
+4331,84,-1.993052,0,1
+4332,84,-1.997522,0,1
+4333,84,-2.001993,0,1
+4334,84,-2.006464,0,1
+4335,84,-2.010935,0,1
+4336,84,-2.015406,0,1
+4337,84,-2.019876,0,1
+4338,84,-2.024347,0,1
+4339,84,-2.028818,0,1
+4340,84,-2.033289,0,1
+4341,84,-2.036966,0,1
+4342,84,-2.040644,0,1
+4343,84,-2.044321,0,1
+4344,84,-2.047999,0,1
+4345,84,-2.051676,0,1
+4346,84,-2.055354,0,1
+4347,84,-2.059031,0,1
+4348,84,-2.062709,0,1
+4349,84,-2.066386,0,1
+4350,84,-2.070064,0,1
+4351,84,-2.073741,0,1
+4352,84,-2.077419,0,1
+4353,84,-2.081096,0,1
+4354,84,-2.084774,0,1
+4355,84,-2.088452,0,1
+4356,84,-2.092129,0,1
+4357,84,-2.095807,0,1
+4358,84,-2.099484,0,1
+4359,84,-2.103162,0,1
+4360,84,-2.106839,0,1
+4361,84,-2.108953,0,1
+4362,84,-2.111067,0,1
+4363,84,-2.113181,0,1
+4364,84,-2.115294,0,1
+4365,84,-2.117408,0,1
+4366,84,-2.119522,0,1
+4367,84,-2.121636,0,1
+4368,84,-2.123750,0,1
+4369,84,-2.125864,0,1
+4370,84,-2.127977,0,1
+4371,84,-2.130091,0,1
+4372,84,-2.132205,0,1
+4373,84,-2.134319,0,1
+4374,84,-2.136433,0,1
+4375,84,-2.138547,0,1
+4376,84,-2.140660,0,1
+4377,84,-2.142774,0,1
+4378,84,-2.144888,0,1
+4379,84,-2.147002,0,1
+4380,84,-2.149116,0,1
+4381,84,-2.151081,0,1
+4382,84,-2.153046,0,1
+4383,84,-2.155011,0,1
+4384,84,-2.156976,0,1
+4385,84,-2.158942,0,1
+4386,84,-2.160907,0,1
+4387,84,-2.162872,0,1
+4388,84,-2.164837,0,1
+4389,84,-2.166802,0,1
+4390,84,-2.168767,0,1
+4391,84,-2.170732,0,1
+4392,84,-2.172698,0,1
+4393,84,-2.174663,0,1
+4394,84,-2.176628,0,1
+4395,84,-2.178593,0,1
+4396,84,-2.180558,0,1
+4397,84,-2.182523,0,1
+4398,84,-2.184488,0,1
+4399,84,-2.186454,0,1
+4400,84,-2.188419,0,1
+4401,84,-2.191631,0,1
+4402,84,-2.194844,0,1
+4403,84,-2.198057,0,1
+4404,84,-2.201270,0,1
+4405,84,-2.204483,0,1
+4406,84,-2.207695,0,1
+4407,84,-2.210908,0,1
+4408,84,-2.214121,0,1
+4409,84,-2.217334,0,1
+4410,84,-2.220546,0,1
+4411,84,-2.223759,0,1
+4412,84,-2.226972,0,1
+4413,84,-2.230185,0,1
+4414,84,-2.233397,0,1
+4415,84,-2.236610,0,1
+4416,84,-2.239823,0,1
+4417,84,-2.243036,0,1
+4418,84,-2.246248,0,1
+4419,84,-2.249461,0,1
+4420,84,-2.252674,0,1
+4421,84,-2.256129,0,1
+4422,84,-2.259584,0,1
+4423,84,-2.263038,0,1
+4424,84,-2.266493,0,1
+4425,84,-2.269948,0,1
+4426,84,-2.273403,0,1
+4427,84,-2.276858,0,1
+4428,84,-2.280313,0,1
+4429,84,-2.283768,0,1
+4430,84,-2.287223,0,1
+4431,84,-2.290677,0,1
+4432,84,-2.294132,0,1
+4433,84,-2.297587,0,1
+4434,84,-2.301042,0,1
+4435,84,-2.304497,0,1
+4436,84,-2.307952,0,1
+4437,84,-2.311407,0,1
+4438,84,-2.314861,0,1
+4439,84,-2.318316,0,1
+4440,84,-2.321771,0,1
+4441,84,-2.322464,0,1
+4442,84,-2.323157,0,1
+4443,84,-2.323850,0,1
+4444,84,-2.324543,0,1
+4445,84,-2.325236,0,1
+4446,84,-2.325929,0,1
+4447,84,-2.326622,0,1
+4448,84,-2.327316,0,1
+4449,84,-2.328009,0,1
+4450,84,-2.328702,0,1
+4451,84,-2.329395,0,1
+4452,84,-2.330088,0,1
+4453,84,-2.330781,0,1
+4454,84,-2.331474,0,1
+4455,84,-2.332167,0,1
+4456,84,-2.332860,0,1
+4457,84,-2.333553,0,1
+4458,84,-2.334246,0,1
+4459,84,-2.334939,0,1
+4460,84,-2.335632,0,1
+4461,84,-2.332364,0,1
+4462,84,-2.329097,0,1
+4463,84,-2.325829,0,1
+4464,84,-2.322561,0,1
+4465,84,-2.319294,0,1
+4466,84,-2.316026,0,1
+4467,84,-2.312759,0,1
+4468,84,-2.309491,0,1
+4469,84,-2.306223,0,1
+4470,84,-2.302956,0,1
+4471,84,-2.299688,0,1
+4472,84,-2.296420,0,1
+4473,84,-2.293153,0,1
+4474,84,-2.289885,0,1
+4475,84,-2.286618,0,1
+4476,84,-2.283350,0,1
+4477,84,-2.280082,0,1
+4478,84,-2.276815,0,1
+4479,84,-2.273547,0,1
+4480,84,-2.270280,0,1
+4481,84,-2.263545,0,1
+4482,84,-2.256810,0,1
+4483,84,-2.250076,0,1
+4484,84,-2.243341,0,1
+4485,84,-2.236607,0,1
+4486,84,-2.229872,0,1
+4487,84,-2.223138,0,1
+4488,84,-2.216403,0,1
+4489,84,-2.209668,0,1
+4490,84,-2.202934,0,1
+4491,84,-2.196199,0,1
+4492,84,-2.189465,0,1
+4493,84,-2.182730,0,1
+4494,84,-2.175996,0,1
+4495,84,-2.169261,0,1
+4496,84,-2.162527,0,1
+4497,84,-2.155792,0,1
+4498,84,-2.149057,0,1
+4499,84,-2.142323,0,1
+4500,84,-2.135588,0,1
+4501,84,-2.127415,0,1
+4502,84,-2.119241,0,1
+4503,84,-2.111068,0,1
+4504,84,-2.102894,0,1
+4505,84,-2.094721,0,1
+4506,84,-2.086547,0,1
+4507,84,-2.078374,0,1
+4508,84,-2.070200,0,1
+4509,84,-2.062027,0,1
+4510,84,-2.053853,0,1
+4511,84,-2.045680,0,1
+4512,84,-2.037506,0,1
+4513,84,-2.029333,0,1
+4514,84,-2.021159,0,1
+4515,84,-2.012986,0,1
+4516,84,-2.004812,0,1
+4517,84,-1.996639,0,1
+4518,84,-1.988465,0,1
+4519,84,-1.980292,0,1
+4520,84,-1.972118,0,1
+4521,84,-1.965338,0,1
+4522,84,-1.958559,0,1
+4523,84,-1.951779,0,1
+4524,84,-1.944999,0,1
+4525,84,-1.938219,0,1
+4526,84,-1.931440,0,1
+4527,84,-1.924660,0,1
+4528,84,-1.917880,0,1
+4529,84,-1.911100,0,1
+4530,84,-1.904321,0,1
+4531,84,-1.897541,0,1
+4532,84,-1.890761,0,1
+4533,84,-1.883981,0,1
+4534,84,-1.877202,0,1
+4535,84,-1.870422,0,1
+4536,84,-1.863642,0,1
+4537,84,-1.856862,0,1
+4538,84,-1.850083,0,1
+4539,84,-1.843303,0,1
+4540,84,-1.836523,0,1
+4541,84,-1.830191,0,1
+4542,84,-1.823859,0,1
+4543,84,-1.817527,0,1
+4544,84,-1.811195,0,1
+4545,84,-1.804862,0,1
+4546,84,-1.798530,0,1
+4547,84,-1.792198,0,1
+4548,84,-1.785866,0,1
+4549,84,-1.779534,0,1
+4550,84,-1.773202,0,1
+4551,84,-1.766870,0,1
+4552,84,-1.760538,0,1
+4553,84,-1.754206,0,1
+4554,84,-1.747874,0,1
+4555,84,-1.741541,0,1
+4556,84,-1.735209,0,1
+4557,84,-1.728877,0,1
+4558,84,-1.722545,0,1
+4559,84,-1.716213,0,1
+4560,84,-1.709881,0,1
+4561,84,-1.702360,0,1
+4562,84,-1.694840,0,1
+4563,84,-1.687319,0,1
+4564,84,-1.679798,0,1
+4565,84,-1.672278,0,1
+4566,84,-1.664757,0,1
+4567,84,-1.657236,0,1
+4568,84,-1.649716,0,1
+4569,84,-1.642195,0,1
+4570,84,-1.634675,0,1
+4571,84,-1.627154,0,1
+4572,84,-1.619633,0,1
+4573,84,-1.612113,0,1
+4574,84,-1.604592,0,1
+4575,84,-1.597071,0,1
+4576,84,-1.589551,0,1
+4577,84,-1.582030,0,1
+4578,84,-1.574509,0,1
+4579,84,-1.566989,0,1
+4580,84,-1.559468,0,1
+4581,84,-1.554166,0,1
+4582,84,-1.548864,0,1
+4583,84,-1.543562,0,1
+4584,84,-1.538259,0,1
+4585,84,-1.532957,0,1
+4586,84,-1.527655,0,1
+4587,84,-1.522353,0,1
+4588,84,-1.517051,0,1
+4589,84,-1.511749,0,1
+4590,84,-1.506446,0,1
+4591,84,-1.501144,0,1
+4592,84,-1.495842,0,1
+4593,84,-1.490540,0,1
+4594,84,-1.485238,0,1
+4595,84,-1.479936,0,1
+4596,84,-1.474633,0,1
+4597,84,-1.469331,0,1
+4598,84,-1.464029,0,1
+4599,84,-1.458727,0,1
+4600,84,-1.453425,0,1
+4601,84,-1.456057,0,1
+4602,84,-1.458688,0,1
+4603,84,-1.461320,0,1
+4604,84,-1.463952,0,1
+4605,84,-1.466584,0,1
+4606,84,-1.469216,0,1
+4607,84,-1.471848,0,1
+4608,84,-1.474479,0,1
+4609,84,-1.477111,0,1
+4610,84,-1.479743,0,1
+4611,84,-1.482375,0,1
+4612,84,-1.485007,0,1
+4613,84,-1.487639,0,1
+4614,84,-1.490270,0,1
+4615,84,-1.492902,0,1
+4616,84,-1.495534,0,1
+4617,84,-1.498166,0,1
+4618,84,-1.500798,0,1
+4619,84,-1.503429,0,1
+4620,84,-1.506061,0,1
+4621,84,-1.517960,0,1
+4622,84,-1.529858,0,1
+4623,84,-1.541757,0,1
+4624,84,-1.553655,0,1
+4625,84,-1.565554,0,1
+4626,84,-1.577452,0,1
+4627,84,-1.589351,0,1
+4628,84,-1.601250,0,1
+4629,84,-1.613148,0,1
+4630,84,-1.625047,0,1
+4631,84,-1.636945,0,1
+4632,84,-1.648844,0,1
+4633,84,-1.660742,0,1
+4634,84,-1.672641,0,1
+4635,84,-1.684539,0,1
+4636,84,-1.696438,0,1
+4637,84,-1.708336,0,1
+4638,84,-1.720235,0,1
+4639,84,-1.732133,0,1
+4640,84,-1.744032,0,1
+4641,84,-1.759530,0,1
+4642,84,-1.775029,0,1
+4643,84,-1.790527,0,1
+4644,84,-1.806026,0,1
+4645,84,-1.821524,0,1
+4646,84,-1.837023,0,1
+4647,84,-1.852521,0,1
+4648,84,-1.868020,0,1
+4649,84,-1.883518,0,1
+4650,84,-1.899017,0,1
+4651,84,-1.914515,0,1
+4652,84,-1.930014,0,1
+4653,84,-1.945512,0,1
+4654,84,-1.961011,0,1
+4655,84,-1.976509,0,1
+4656,84,-1.992008,0,1
+4657,84,-2.007506,0,1
+4658,84,-2.023005,0,1
+4659,84,-2.038503,0,1
+4660,84,-2.054002,0,1
+4661,84,-2.066868,0,1
+4662,84,-2.079735,0,1
+4663,84,-2.092602,0,1
+4664,84,-2.105469,0,1
+4665,84,-2.118335,0,1
+4666,84,-2.131202,0,1
+4667,84,-2.144069,0,1
+4668,84,-2.156936,0,1
+4669,84,-2.169803,0,1
+4670,84,-2.182669,0,1
+4671,84,-2.195536,0,1
+4672,84,-2.208403,0,1
+4673,84,-2.221270,0,1
+4674,84,-2.234136,0,1
+4675,84,-2.247003,0,1
+4676,84,-2.259870,0,1
+4677,84,-2.272737,0,1
+4678,84,-2.285603,0,1
+4679,84,-2.298470,0,1
+4680,84,-2.311337,0,1
+4681,84,-2.318184,0,1
+4682,84,-2.325031,0,1
+4683,84,-2.331878,0,1
+4684,84,-2.338725,0,1
+4685,84,-2.345572,0,1
+4686,84,-2.352419,0,1
+4687,84,-2.359266,0,1
+4688,84,-2.366113,0,1
+4689,84,-2.372960,0,1
+4690,84,-2.379807,0,1
+4691,84,-2.386654,0,1
+4692,84,-2.393501,0,1
+4693,84,-2.400348,0,1
+4694,84,-2.407195,0,1
+4695,84,-2.414042,0,1
+4696,84,-2.420890,0,1
+4697,84,-2.427737,0,1
+4698,84,-2.434584,0,1
+4699,84,-2.441431,0,1
+4700,84,-2.448278,0,1
+4701,84,-2.444521,0,1
+4702,84,-2.440764,0,1
+4703,84,-2.437006,0,1
+4704,84,-2.433249,0,1
+4705,84,-2.429492,0,1
+4706,84,-2.425735,0,1
+4707,84,-2.421978,0,1
+4708,84,-2.418221,0,1
+4709,84,-2.414464,0,1
+4710,84,-2.410707,0,1
+4711,84,-2.406950,0,1
+4712,84,-2.403193,0,1
+4713,84,-2.399436,0,1
+4714,84,-2.395679,0,1
+4715,84,-2.391922,0,1
+4716,84,-2.388165,0,1
+4717,84,-2.384408,0,1
+4718,84,-2.380651,0,1
+4719,84,-2.376893,0,1
+4720,84,-2.373136,0,1
+4721,84,-2.357224,0,1
+4722,84,-2.341311,0,1
+4723,84,-2.325398,0,1
+4724,84,-2.309485,0,1
+4725,84,-2.293572,0,1
+4726,84,-2.277659,0,1
+4727,84,-2.261746,0,1
+4728,84,-2.245833,0,1
+4729,84,-2.229921,0,1
+4730,84,-2.214008,0,1
+4731,84,-2.198095,0,1
+4732,84,-2.182182,0,1
+4763,84,-1.522577,0,1
+4764,84,-1.498771,0,1
+4765,84,-1.474966,0,1
+4766,84,-1.451161,0,1
+4767,84,-1.427355,0,1
+4768,84,-1.403550,0,1
+4769,84,-1.379744,0,1
+4770,84,-1.355939,0,1
+4771,84,-1.332134,0,1
+4772,84,-1.308328,0,1
+4773,84,-1.284523,0,1
+4774,84,-1.260717,0,1
+4775,84,-1.236912,0,1
+4776,84,-1.213107,0,1
+4777,84,-1.189301,0,1
+4778,84,-1.165496,0,1
+4779,84,-1.141691,0,1
+4780,84,-1.117885,0,1
+4781,84,-1.099369,0,1
+4782,84,-1.080853,0,1
+4783,84,-1.062337,0,1
+4784,84,-1.043821,0,1
+4785,84,-1.025305,0,1
+4786,84,-1.006789,0,1
+4787,84,-0.988273,0,1
+4788,84,-0.969757,0,1
+4789,84,-0.951241,0,1
+4790,84,-0.932725,0,1
+4791,84,-0.914209,0,1
+4792,84,-0.895693,0,1
+4793,84,-0.877177,0,1
+4794,84,-0.858661,0,1
+4795,84,-0.840145,0,1
+4796,84,-0.821629,0,1
+4797,84,-0.803113,0,1
+4798,84,-0.784596,0,1
+4799,84,-0.766080,0,1
+4800,84,-0.747564,0,1
+4801,84,-0.737605,0,1
+4802,84,-0.727645,0,1
+4803,84,-0.717686,0,1
+4804,84,-0.707726,0,1
+4805,84,-0.697766,0,1
+4806,84,-0.687807,0,1
+4807,84,-0.677847,0,1
+4808,84,-0.667888,0,1
+4809,84,-0.657928,0,1
+4810,84,-0.647969,0,1
+4811,84,-0.638009,0,1
+4812,84,-0.628049,0,1
+4813,84,-0.618090,0,1
+4814,84,-0.608130,0,1
+4815,84,-0.598171,0,1
+4816,84,-0.588211,0,1
+4817,84,-0.578251,0,1
+4818,84,-0.568292,0,1
+4819,84,-0.558332,0,1
+4820,84,-0.548373,0,1
+4821,84,-0.546016,0,1
+4822,84,-0.543659,0,1
+4823,84,-0.541302,0,1
+4824,84,-0.538946,0,1
+4825,84,-0.536589,0,1
+4826,84,-0.534232,0,1
+4827,84,-0.531875,0,1
+4828,84,-0.529518,0,1
+4829,84,-0.527162,0,1
+4830,84,-0.524805,0,1
+4831,84,-0.522448,0,1
+4832,84,-0.520091,0,1
+4833,84,-0.517735,0,1
+4834,84,-0.515378,0,1
+4835,84,-0.513021,0,1
+4836,84,-0.510664,0,1
+4837,84,-0.508307,0,1
+4838,84,-0.505951,0,1
+4839,84,-0.503594,0,1
+4840,84,-0.501237,0,1
+4841,84,-0.505298,0,1
+4842,84,-0.509358,0,1
+4843,84,-0.513419,0,1
+4844,84,-0.517480,0,1
+4845,84,-0.521540,0,1
+4846,84,-0.525601,0,1
+4847,84,-0.529662,0,1
+4848,84,-0.533722,0,1
+4849,84,-0.537783,0,1
+4850,84,-0.541843,0,1
+4851,84,-0.545904,0,1
+4852,84,-0.549965,0,1
+4853,84,-0.554025,0,1
+4854,84,-0.558086,0,1
+4855,84,-0.562147,0,1
+4856,84,-0.566207,0,1
+4857,84,-0.570268,0,1
+4858,84,-0.574329,0,1
+4859,84,-0.578389,0,1
+4860,84,-0.582450,0,1
+4861,84,-0.591435,0,1
+4862,84,-0.600421,0,1
+4863,84,-0.609407,0,1
+4864,84,-0.618392,0,1
+4865,84,-0.627378,0,1
+4866,84,-0.636363,0,1
+4867,84,-0.645349,0,1
+4868,84,-0.654334,0,1
+4869,84,-0.663320,0,1
+4870,84,-0.672306,0,1
+4871,84,-0.681291,0,1
+4872,84,-0.690277,0,1
+4873,84,-0.699262,0,1
+4874,84,-0.708248,0,1
+4875,84,-0.717233,0,1
+4876,84,-0.726219,0,1
+4877,84,-0.735204,0,1
+4878,84,-0.744190,0,1
+4879,84,-0.753176,0,1
+4880,84,-0.762161,0,1
+4881,84,-0.773172,0,1
+4882,84,-0.784182,0,1
+4883,84,-0.795192,0,1
+4884,84,-0.806203,0,1
+4885,84,-0.817213,0,1
+4886,84,-0.828224,0,1
+4887,84,-0.839234,0,1
+4888,84,-0.850244,0,1
+4889,84,-0.861255,0,1
+4890,84,-0.872265,0,1
+4891,84,-0.883276,0,1
+4892,84,-0.894286,0,1
+4893,84,-0.905297,0,1
+4894,84,-0.916307,0,1
+4895,84,-0.927317,0,1
+4896,84,-0.938328,0,1
+4897,84,-0.949338,0,1
+4898,84,-0.960349,0,1
+4899,84,-0.971359,0,1
+4900,84,-0.982370,0,1
+4901,84,-0.991204,0,1
+4902,84,-1.000038,0,1
+4903,84,-1.008872,0,1
+4904,84,-1.017706,0,1
+4905,84,-1.026540,0,1
+4906,84,-1.035374,0,1
+4907,84,-1.044208,0,1
+4908,84,-1.053042,0,1
+4909,84,-1.061876,0,1
+4910,84,-1.070710,0,1
+4911,84,-1.079544,0,1
+4912,84,-1.088378,0,1
+4913,84,-1.097212,0,1
+4914,84,-1.106046,0,1
+4915,84,-1.114880,0,1
+4916,84,-1.123714,0,1
+4917,84,-1.132548,0,1
+4918,84,-1.141382,0,1
+4919,84,-1.150216,0,1
+4920,84,-1.159050,0,1
+4921,84,-1.161501,0,1
+4922,84,-1.163951,0,1
+4923,84,-1.166402,0,1
+4924,84,-1.168853,0,1
+4925,84,-1.171303,0,1
+4926,84,-1.173754,0,1
+4927,84,-1.176205,0,1
+4928,84,-1.178655,0,1
+4929,84,-1.181106,0,1
+4930,84,-1.183557,0,1
+4931,84,-1.186007,0,1
+4932,84,-1.188458,0,1
+4933,84,-1.190909,0,1
+4934,84,-1.193359,0,1
+4935,84,-1.195810,0,1
+4936,84,-1.198261,0,1
+4937,84,-1.200711,0,1
+4938,84,-1.203162,0,1
+4939,84,-1.205613,0,1
+4940,84,-1.208063,0,1
+4941,84,-1.204040,0,1
+4942,84,-1.200017,0,1
+4943,84,-1.195993,0,1
+4944,84,-1.191970,0,1
+4945,84,-1.187947,0,1
+4946,84,-1.183923,0,1
+4947,84,-1.179900,0,1
+4948,84,-1.175877,0,1
+4949,84,-1.171853,0,1
+4950,84,-1.167830,0,1
+4951,84,-1.163807,0,1
+4952,84,-1.159783,0,1
+4953,84,-1.155760,0,1
+4954,84,-1.151737,0,1
+4955,84,-1.147713,0,1
+4956,84,-1.143690,0,1
+4957,84,-1.139667,0,1
+4958,84,-1.135643,0,1
+4959,84,-1.131620,0,1
+4960,84,-1.127597,0,1
+4961,84,-1.120966,0,1
+4962,84,-1.114335,0,1
+4963,84,-1.107704,0,1
+4964,84,-1.101074,0,1
+4965,84,-1.094443,0,1
+4966,84,-1.087812,0,1
+4967,84,-1.081182,0,1
+4968,84,-1.074551,0,1
+4969,84,-1.067920,0,1
+4970,84,-1.061289,0,1
+4971,84,-1.054659,0,1
+4972,84,-1.048028,0,1
+4973,84,-1.041397,0,1
+4974,84,-1.034766,0,1
+4975,84,-1.028136,0,1
+4976,84,-1.021505,0,1
+4977,84,-1.014874,0,1
+4978,84,-1.008243,0,1
+4979,84,-1.001613,0,1
+4980,84,-0.994982,0,1
+4981,84,-0.989923,0,1
+4982,84,-0.984864,0,1
+4983,84,-0.979805,0,1
+4984,84,-0.974746,0,1
+4985,84,-0.969687,0,1
+4986,84,-0.964628,0,1
+4987,84,-0.959569,0,1
+4988,84,-0.954510,0,1
+4989,84,-0.949451,0,1
+4990,84,-0.944392,0,1
+4991,84,-0.939333,0,1
+4992,84,-0.934274,0,1
+4993,84,-0.929215,0,1
+4994,84,-0.924156,0,1
+4995,84,-0.919097,0,1
+4996,84,-0.914038,0,1
+4997,84,-0.908979,0,1
+4998,84,-0.903920,0,1
+4999,84,-0.898861,0,1
+5000,0,-0.893802,2,1
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/MaxCurrent.vimax b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/MaxCurrent.vimax
new file mode 100644
index 0000000000000000000000000000000000000000..5552bda2b03a9e6d5f0b2de49ea79b598013047f
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/MaxCurrent.vimax
@@ -0,0 +1,3 @@
+SOC, I_charge, I_discharge
+0, 280, 280
+100, 280, 280
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/P1_Group5.vveh b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/P1_Group5.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..bf6783dea4e9142a99a53661e104396cd1144f58
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/P1_Group5.vveh
@@ -0,0 +1,109 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2021-06-16T09:38:08.6512146Z",
+ "AppVersion": "3",
+ "FileVersion": 10
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "Tractor",
+ "LegislativeClass": "Unknown",
+ "CurbWeight": 7747,
+ "CurbWeightExtra": 7500.0,
+ "MassMax": 18.0,
+ "Loading": 19300,
+ "rdyn": 492.0,
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 14.9,
+ "Wheels": "315/70 R22.5",
+ "AxleWeightShare": 0.2,
+ "TwinTyres": false,
+ "RRCISO": 0.0052,
+ "FzISO": 33350.0,
+ "Type": "VehicleNonDriven"
+ },
+ {
+ "Inertia": 14.9,
+ "Wheels": "315/70 R22.5",
+ "AxleWeightShare": 0.25,
+ "TwinTyres": true,
+ "RRCISO": 0.0057,
+ "FzISO": 33350.0,
+ "Type": "VehicleDriven"
+ },
+ {
+ "Inertia": 19.2,
+ "Wheels": "385/65 R22.5",
+ "AxleWeightShare": 0.18333,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 41690.0,
+ "Type": "Trailer"
+ },
+ {
+ "Inertia": 19.2,
+ "Wheels": "385/65 R22.5",
+ "AxleWeightShare": 0.18333,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 41690.0,
+ "Type": "Trailer"
+ },
+ {
+ "Inertia": 19.2,
+ "Wheels": "385/65 R22.5",
+ "AxleWeightShare": 0.18334,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 41690.0,
+ "Type": "Trailer"
+ }
+ ]
+ },
+ "EngineStopStart": true,
+ "EcoRoll": "None",
+ "PredictiveCruiseControl": "Option_1_2_3",
+ "ATEcoRollReleaseLockupClutch": false,
+ "CdA": 5.62,
+ "VehicleHeight": 4.0,
+ "IdlingSpeed": 550.0,
+ "Retarder": {
+ "Type": "secondary",
+ "Ratio": 1.0,
+ "File": "Default.vrlm"
+ },
+ "Angledrive": {
+ "Type": "None",
+ "Ratio": 0.0,
+ "LossMap": ""
+ },
+ "PTO": {
+ "Type": "None",
+ "LossMap": "",
+ "Cycle": "",
+ "CycleDriving": ""
+ },
+ "TorqueLimits": {},
+ "InitialSoC": 50.0,
+ "PowertrainConfiguration": "ParallelHybrid",
+ "ElectricMotors": [
+ {
+ "Count": 1,
+ "Ratio": 1.0,
+ "Position": "P1",
+ "MotorFile": "P1_Group5_EM.vem",
+ "MechanicalEfficiency": 1.0
+ }
+ ],
+ "Battery": {
+ "NumPacks": 1,
+ "BatteryFile": "P1_Group5_REESS.vreess"
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/P1_Group5_12.7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/P1_Group5_12.7l.veng
new file mode 100644
index 0000000000000000000000000000000000000000..bb458e71f5dd11157cbe185410bca171d06e8c79
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/P1_Group5_12.7l.veng
@@ -0,0 +1,35 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2021-06-16T09:32:40.9429545Z",
+ "AppVersion": "3",
+ "FileVersion": 5
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "ModelName": "350kW 12.7l Engine",
+ "Displacement": "12740",
+ "IdlingSpeed": 550.0,
+ "Inertia": 5.1498,
+ "Fuels": [
+ {
+ "WHTC-Urban": 1.055,
+ "WHTC-Rural": 1.02,
+ "WHTC-Motorway": 1.0,
+ "WHTC-Engineering": 1.005,
+ "ColdHotBalancingFactor": 1.005,
+ "CFRegPer": 1.0,
+ "FuelMap": "Group5_ICE_Map.vmap",
+ "FuelType": "DieselCI"
+ }
+ ],
+ "RatedPower": 350000,
+ "RatedSpeed": 1750.0,
+ "MaxTorque": 2134,
+ "FullLoadCurve": "Group5_ICE_fld.vfld",
+ "WHRType": [
+ "None"
+ ],
+ "WHRCorrectionFactors": {}
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/P1_Group5_EM.vem b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/P1_Group5_EM.vem
new file mode 100644
index 0000000000000000000000000000000000000000..c3744053d3f6a870e7ce2bb20809461351db6b54
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/P1_Group5_EM.vem
@@ -0,0 +1,22 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2021-06-17T14:26:41.1270692Z",
+ "AppVersion": "3",
+ "FileVersion": 2
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "Model": "Generic Electric Motor",
+ "FullLoadCurve": "EM_fld.vemp",
+ "DragCurve": "EM_drag.vemd",
+ "EfficiencyMap": "EM_Map.vemo",
+ "Inertia": 0.5,
+ "ContinuousTorque": 100,
+ "ContinuousTorqueSpeed": 1273.23954473516,
+ "OverloadTorque": 150,
+ "OverloadTorqueSpeed": 1273.23954473516,
+ "OverloadTime": 30,
+ "ThermalOverloadRecoveryFactor": 0.9
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/P1_Group5_REESS.vreess b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/P1_Group5_REESS.vreess
new file mode 100644
index 0000000000000000000000000000000000000000..ad6a72b1a99406091ad5d0b8ff29546a30bdda36
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/P1_Group5_REESS.vreess
@@ -0,0 +1,19 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2021-06-16T09:37:48.3166199Z",
+ "AppVersion": "3",
+ "FileVersion": 1
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "REESSType": "Battery",
+ "Model": "Generic Battery",
+ "Capacity": 52.08,
+ "SOC_min": 30,
+ "SOC_max": 80,
+ "MaxCurrentMap": "MaxCurrent.vimax",
+ "InternalResistanceCurve": "REESS_Internal_Resistance.vbatr",
+ "SoCCurve": "REESS_SOC_curve.vbatv"
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/P1_Group5_s2c0_rep_Payload.vecto b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/P1_Group5_s2c0_rep_Payload.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..798b19202c158a62d221839b1b60aa998c3ef135
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/P1_Group5_s2c0_rep_Payload.vecto
@@ -0,0 +1,54 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2021-06-16T09:38:48.7797197Z",
+ "AppVersion": "3",
+ "FileVersion": 8
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "P1_Group5.vveh",
+ "EngineFile": "P1_Group5_12.7l.veng",
+ "GearboxFile": "AMT_12.vgbx",
+ "TCU": "AMT_12.vgbx",
+ "ShiftStrategy": "TUGraz.VectoCore.Models.SimulationComponent.Impl.AMTShiftStrategyOptimized",
+ "HybridStrategyParams": "HEV_Parameter.vhctl",
+ "Padd": 4293.0,
+ "Paux_ICEOff_Driving": 0.0,
+ "Paux_ICEOff_Standstill": 0.0,
+ "Padd_electric": 0.0,
+ "VACC": "Truck.vacc",
+ "EngineStopStartAtVehicleStopThreshold": 2.0,
+ "EngineStopStartMaxOffTimespan": 120.0,
+ "EngineStopStartUtilityFactor": 0.8,
+ "EngineStopStartUtilityFactorDriving": 0.8,
+ "EcoRollMinSpeed": 0.0,
+ "EcoRollActivationDelay": 0.0,
+ "EcoRollUnderspeedThreshold": 0.0,
+ "EcoRollMaxAcceleration": 0.0,
+ "PCCEnableSpeed": 80.0,
+ "PCCMinSpeed": 50.0,
+ "PCCUnderspeed": 8.0,
+ "PCCOverSpeed": 5.0,
+ "PCCPreviewDistanceUC1": 1500.0,
+ "PCCPreviewDistanceUC2": 1000.0,
+ "LAC": {
+ "Enabled": true,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": "",
+ "MinSpeed": 50.0
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "Overspeed",
+ "MinSpeed": 50.0,
+ "OverSpeed": 2.5
+ },
+ "Cycles": [
+ "LongHaul_mod5_id_2.vdri"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/REESS_Internal_Resistance.vbatr b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/REESS_Internal_Resistance.vbatr
new file mode 100644
index 0000000000000000000000000000000000000000..953f417ac43d9bc1432971034d22d3ab15d5e1a2
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/REESS_Internal_Resistance.vbatr
@@ -0,0 +1,3 @@
+SoC, Ri
+0, 0.04
+100, 0.04
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/REESS_SOC_curve.vbatv b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/REESS_SOC_curve.vbatv
new file mode 100644
index 0000000000000000000000000000000000000000..65a360759a3ef7ddfb2bafff943f501421eb6ef9
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/REESS_SOC_curve.vbatv
@@ -0,0 +1,12 @@
+SOC, V
+0, 43.1
+10, 44.8
+20, 45.8
+30, 46.3
+40, 46.6
+50, 46.7
+60, 46.8
+70, 47.0
+80, 47.2
+90, 47.5
+100, 48.0
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Truck.vacc b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Truck.vacc
new file mode 100644
index 0000000000000000000000000000000000000000..b03ec7e47e9765ae57e43462c7f4c3ad15a38e7e
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/EngineeringMode/P1_Group5_AMT/Truck.vacc
@@ -0,0 +1,6 @@
+v [km/h],acc [m/s�],dec [m/s�]
+0,1,-1
+25,1,-1
+50,0.642857143,-1
+60,0.5,-0.5
+120,0.5,-0.5
diff --git a/VectoCore/VectoCoreTest/VectoCoreTest.csproj b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
index 2b35cebde4c8ae99e80111dec8fbc24be638f556..e9502c85ba4b5465fb10cd0202fb9e52b8fcdd0f 100644
--- a/VectoCore/VectoCoreTest/VectoCoreTest.csproj
+++ b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
@@ -3352,6 +3352,99 @@
<None Include="TestData\Integration\Buses\SingleBus.vecto">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\AMT_12.vgbx">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Axle_4x2_Tractor.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Default.vrlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\EM_drag.vemd">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\EM_fld.vemp">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\EM_Map.vemo">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Gear_1.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Gear_10.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Gear_11.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Gear_12.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Gear_2.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Gear_3.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Gear_4.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Gear_5.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Gear_6.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Gear_7.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Gear_8.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Gear_9.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Group5_ICE_fld.vfld">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Group5_ICE_Map.vmap">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\HEV_Parameter.vhctl">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\LongHaul_mod5_id_2.vdri">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\MaxCurrent.vimax">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\P1_Group5.vveh">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\P1_Group5_12.7l.veng">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\P1_Group5_EM.vem">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\P1_Group5_REESS.vreess">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\P1_Group5_s2c0_rep_Payload.vecto">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\REESS_Internal_Resistance.vbatr">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\REESS_SOC_curve.vbatv">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Truck.vacc">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
<None Include="TestData\Integration\ShiftStrategyV2\CityBus_AT_FCOpt\175kW.vfld">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
@@ -4434,6 +4527,54 @@
<None Include="TestData\Integration\DeclarationMode\40t Truck\Retarder.vrlm">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
+ <None Include="TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2_ESS\175kW.vfld">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2_ESS\175kW.vmap">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2_ESS\Axle_4x2.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2_ESS\Axle_4x2_orig.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2_ESS\Class2_RigidTruck.vveh">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2_ESS\Class2_RigidTruck_DECL.vecto">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2_ESS\Class2_RigidTruck_NoAirdrag.vveh">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2_ESS\Class2_RigidTruck_NoAirdrag_DECL.vecto">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2_ESS\Engine_175kW_6.8l.veng">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2_ESS\Gear_1.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2_ESS\Gear_2.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2_ESS\Gear_3.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2_ESS\Gear_4.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2_ESS\Gear_5.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2_ESS\Gear_6.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2_ESS\MT_6.vgbx">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
<None Include="TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\175kW.vfld">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>