From 3d194e6c5d3f31023479a363cd347859e84a67dc Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Tue, 9 May 2017 15:25:17 +0200
Subject: [PATCH] remove input (gui, interfaces, json, xml) for engine
start/stop
---
VECTO/GUI/VectoJobForm.vb | 34 +---
VECTO/GUI/VehicleForm.Designer.vb | 190 ++++++++++++++----
VECTO/Input Files/VectoJob.vb | 11 -
VECTO/OutputData/JSONFileWriter.vb | 10 +-
.../InputData/DeclarationInputData.cs | 11 +-
.../InputData/EngineeringInputData.cs | 23 +--
.../InputData/FileIO/JSON/JSONInputData.cs | 5 -
.../XMLDeclarationDriverDataProvider.cs | 14 --
.../XMLEngineeringDriverDataProvider.cs | 22 +-
.../XMLEngineeringVehicleDataProvider.cs | 46 -----
.../VectoCore/InputData/Impl/InputData.cs | 11 -
.../EngineeringDataAdapter.cs | 7 -
.../SimulationComponent/Data/DriverData.cs | 2 -
.../FileIO/SimulationDataReaderTest.cs | 7 -
.../Integration/CoachAdvancedAuxPowertrain.cs | 3 -
.../Integration/CoachPowerTrain.cs | 3 -
.../SimulationRuns/FullPowertrain.cs | 3 -
.../SimulationRuns/MinimalPowertrain.cs | 3 -
.../Integration/Truck40tPowerTrain.cs | 3 -
.../Models/SimulationComponent/DriverTest.cs | 3 -
.../XML/XMLDeclarationInputTest.cs | 1 -
.../XML/XMLEngineeringInputRefTest.cs | 3 +-
.../XML/XMLEngineeringInputSingleTest.cs | 11 -
23 files changed, 168 insertions(+), 258 deletions(-)
diff --git a/VECTO/GUI/VectoJobForm.vb b/VECTO/GUI/VectoJobForm.vb
index c1479b73db..e2809573dc 100644
--- a/VECTO/GUI/VectoJobForm.vb
+++ b/VECTO/GUI/VectoJobForm.vb
@@ -84,7 +84,6 @@ Public Class VectoJobForm
CbEngOnly.Enabled = Not Cfg.DeclMode
GrCycles.Enabled = Not Cfg.DeclMode
GrVACC.Enabled = Not Cfg.DeclMode
- PnStartStop.Enabled = Not Cfg.DeclMode
RdOff.Enabled = Not Cfg.DeclMode
GrLAC.Enabled = Not Cfg.DeclMode
ButAuxAdd.Enabled = Not Cfg.DeclMode
@@ -116,9 +115,6 @@ Public Class VectoJobForm
RdOverspeed.Checked = True
CbLookAhead.Checked = True
- TbSSspeed.Text = DeclarationData.Driver.StartStop.MaxSpeed.AsKmph.ToGUIFormat() 'cDeclaration.SSspeed
- TbSStime.Text = DeclarationData.Driver.StartStop.MinTime.ToGUIFormat() 'cDeclaration.SStime
- TbSSdelay.Text = DeclarationData.Driver.StartStop.Delay.ToGUIFormat() ' cDeclaration.SSdelay
tbLacPreviewFactor.Text = DeclarationData.Driver.LookAhead.LookAheadDistanceFactor.ToGUIFormat()
tbLacDfTargetSpeedFile.Text = ""
tbLacDfVelocityDropFile.Text = ""
@@ -441,10 +437,6 @@ Public Class VectoJobForm
'Start/Stop
Dim driver As IDriverEngineeringInputData = inputData.DriverInputData
- ChBStartStop.Checked = driver.StartStop.Enabled
- TbSSspeed.Text = driver.StartStop.MaxSpeed.AsKmph.ToGUIFormat()
- TbSStime.Text = driver.StartStop.MinTime.ToGUIFormat()
- TbSSdelay.Text = driver.StartStop.Delay.ToGUIFormat()
If (Cfg.DeclMode) Then
TbDesMaxFile.Text = ""
@@ -612,12 +604,6 @@ Public Class VectoJobForm
vectoJob.PathGbx = TbGBX.Text
- 'Start/Stop
- vectoJob.StartStop = ChBStartStop.Checked
- vectoJob.StartStopMaxSpeed = TbSSspeed.Text.ToDouble()
- vectoJob.StartStopTime = TbSStime.Text.ToDouble()
- vectoJob.StartStopDelay = TbSSdelay.Text.ToDouble()
-
'a_DesMax
vectoJob.DesMaxFile = TbDesMaxFile.Text
@@ -693,12 +679,6 @@ Public Class VectoJobForm
TbGBX.Text = ""
TbDesMaxFile.Text = ""
- 'Start/Stop
- TbSSspeed.Text = DeclarationData.Driver.StartStop.MaxSpeed.AsKmph.ToGUIFormat()
- TbSStime.Text = DeclarationData.Driver.StartStop.MinTime.ToGUIFormat()
- TbSSdelay.Text = DeclarationData.Driver.StartStop.Delay.ToGUIFormat()
- ChBStartStop.Checked = False
-
LvAux.Items.Clear()
CbEngOnly.Checked = False
@@ -760,12 +740,12 @@ Public Class VectoJobForm
End Sub
- Private Sub TBSSspeed_TextChanged(sender As Object, e As EventArgs) Handles TbSSspeed.TextChanged
+ Private Sub TBSSspeed_TextChanged(sender As Object, e As EventArgs)
Change()
End Sub
- Private Sub TBSStime_TextChanged(sender As Object, e As EventArgs) _
- Handles TbSStime.TextChanged, TbSSdelay.TextChanged
+ Private Sub TBSStime_TextChanged(sender As Object, e As EventArgs)
+
Change()
End Sub
@@ -1055,13 +1035,6 @@ lbDlog:
GrAux.Enabled = onOff
End Sub
- 'Start/Stop changed
- Private Sub ChBStartStop_CheckedChanged_1(sender As Object, e As EventArgs) _
- Handles ChBStartStop.CheckedChanged
- Change()
- If Not Cfg.DeclMode Then PnStartStop.Enabled = ChBStartStop.Checked
- End Sub
-
'LAC changed
Private Sub CbLookAhead_CheckedChanged(sender As Object, e As EventArgs) _
Handles CbLookAhead.CheckedChanged
@@ -1526,7 +1499,6 @@ lbDlog:
End Sub
Private Sub LvAux_SelectedIndexChanged(sender As Object, e As EventArgs) Handles LvAux.SelectedIndexChanged
-
End Sub
End Class
diff --git a/VECTO/GUI/VehicleForm.Designer.vb b/VECTO/GUI/VehicleForm.Designer.vb
index ead357ed24..88853a367e 100644
--- a/VECTO/GUI/VehicleForm.Designer.vb
+++ b/VECTO/GUI/VehicleForm.Designer.vb
@@ -107,7 +107,6 @@ Partial Class VehicleForm
Me.CmOpenFile = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
- Me.PnAll = New System.Windows.Forms.Panel()
Me.gbPTO = New System.Windows.Forms.GroupBox()
Me.pnPTO = New System.Windows.Forms.Panel()
Me.btPTOCycle = New System.Windows.Forms.Button()
@@ -130,6 +129,16 @@ Partial Class VehicleForm
Me.PicVehicle = New System.Windows.Forms.PictureBox()
Me.Label8 = New System.Windows.Forms.Label()
Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
+ Me.TabControl1 = New System.Windows.Forms.TabControl()
+ Me.TabPage1 = New System.Windows.Forms.TabPage()
+ Me.TabPage2 = New System.Windows.Forms.TabPage()
+ Me.TabPage3 = New System.Windows.Forms.TabPage()
+ Me.lvTorqueLimits = New System.Windows.Forms.ListView()
+ 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.Label17 = New System.Windows.Forms.Label()
+ Me.btDelMaxTorqueEntry = New System.Windows.Forms.Button()
+ Me.btAddMaxTorqueEntry = New System.Windows.Forms.Button()
Me.GroupBox6.SuspendLayout()
Me.ToolStrip1.SuspendLayout()
Me.GroupBox7.SuspendLayout()
@@ -143,13 +152,16 @@ Partial Class VehicleForm
Me.PnCdATrTr.SuspendLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.CmOpenFile.SuspendLayout()
- Me.PnAll.SuspendLayout()
Me.gbPTO.SuspendLayout()
Me.pnPTO.SuspendLayout()
Me.GroupBox3.SuspendLayout()
Me.GroupBox2.SuspendLayout()
Me.pnAngledriveFields.SuspendLayout()
CType(Me.PicVehicle, System.ComponentModel.ISupportInitialize).BeginInit()
+ Me.TabControl1.SuspendLayout()
+ Me.TabPage1.SuspendLayout()
+ Me.TabPage2.SuspendLayout()
+ Me.TabPage3.SuspendLayout()
Me.SuspendLayout()
'
'Label1
@@ -219,7 +231,7 @@ Partial Class VehicleForm
'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(421, 655)
+ Me.ButOK.Location = New System.Drawing.Point(431, 557)
Me.ButOK.Name = "ButOK"
Me.ButOK.Size = New System.Drawing.Size(75, 23)
Me.ButOK.TabIndex = 5
@@ -230,7 +242,7 @@ Partial Class VehicleForm
'
Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.ButCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
- Me.ButCancel.Location = New System.Drawing.Point(502, 655)
+ Me.ButCancel.Location = New System.Drawing.Point(512, 557)
Me.ButCancel.Name = "ButCancel"
Me.ButCancel.Size = New System.Drawing.Size(75, 23)
Me.ButCancel.TabIndex = 6
@@ -302,7 +314,7 @@ Partial Class VehicleForm
Me.GroupBox6.Controls.Add(Me.CbCdMode)
Me.GroupBox6.Controls.Add(Me.BtCdFileBrowse)
Me.GroupBox6.Controls.Add(Me.TbCdFile)
- Me.GroupBox6.Location = New System.Drawing.Point(290, 51)
+ Me.GroupBox6.Location = New System.Drawing.Point(290, 54)
Me.GroupBox6.Name = "GroupBox6"
Me.GroupBox6.Size = New System.Drawing.Size(280, 86)
Me.GroupBox6.TabIndex = 5
@@ -336,7 +348,7 @@ Partial Class VehicleForm
Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator3, Me.ToolStripBtSendTo, Me.ToolStripSeparator1, Me.ToolStripButton1})
Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
Me.ToolStrip1.Name = "ToolStrip1"
- Me.ToolStrip1.Size = New System.Drawing.Size(589, 25)
+ Me.ToolStrip1.Size = New System.Drawing.Size(599, 25)
Me.ToolStrip1.TabIndex = 29
Me.ToolStrip1.Text = "ToolStrip1"
'
@@ -413,9 +425,9 @@ Partial Class VehicleForm
'
Me.GroupBox7.Controls.Add(Me.PnRt)
Me.GroupBox7.Controls.Add(Me.CbRtType)
- Me.GroupBox7.Location = New System.Drawing.Point(6, 293)
+ Me.GroupBox7.Location = New System.Drawing.Point(6, 6)
Me.GroupBox7.Name = "GroupBox7"
- Me.GroupBox7.Size = New System.Drawing.Size(278, 111)
+ Me.GroupBox7.Size = New System.Drawing.Size(564, 111)
Me.GroupBox7.TabIndex = 3
Me.GroupBox7.TabStop = False
Me.GroupBox7.Text = "Retarder Losses"
@@ -528,7 +540,7 @@ Partial Class VehicleForm
Me.GroupBox8.Controls.Add(Me.ButAxlRem)
Me.GroupBox8.Controls.Add(Me.LvRRC)
Me.GroupBox8.Controls.Add(Me.ButAxlAdd)
- Me.GroupBox8.Location = New System.Drawing.Point(6, 138)
+ Me.GroupBox8.Location = New System.Drawing.Point(6, 141)
Me.GroupBox8.Name = "GroupBox8"
Me.GroupBox8.Size = New System.Drawing.Size(564, 151)
Me.GroupBox8.TabIndex = 2
@@ -673,9 +685,9 @@ Partial Class VehicleForm
'StatusStrip1
'
Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LbStatus})
- Me.StatusStrip1.Location = New System.Drawing.Point(0, 681)
+ Me.StatusStrip1.Location = New System.Drawing.Point(0, 583)
Me.StatusStrip1.Name = "StatusStrip1"
- Me.StatusStrip1.Size = New System.Drawing.Size(589, 22)
+ Me.StatusStrip1.Size = New System.Drawing.Size(599, 22)
Me.StatusStrip1.SizingGrip = False
Me.StatusStrip1.TabIndex = 36
Me.StatusStrip1.Text = "StatusStrip1"
@@ -729,7 +741,7 @@ Partial Class VehicleForm
Me.GroupBox1.Controls.Add(Me.TbMass)
Me.GroupBox1.Controls.Add(Me.Label1)
Me.GroupBox1.Controls.Add(Me.Label14)
- Me.GroupBox1.Location = New System.Drawing.Point(6, 3)
+ Me.GroupBox1.Location = New System.Drawing.Point(6, 6)
Me.GroupBox1.Name = "GroupBox1"
Me.GroupBox1.Size = New System.Drawing.Size(278, 134)
Me.GroupBox1.TabIndex = 0
@@ -755,7 +767,7 @@ Partial Class VehicleForm
'GrAirRes
'
Me.GrAirRes.Controls.Add(Me.PnCdATrTr)
- Me.GrAirRes.Location = New System.Drawing.Point(290, 3)
+ Me.GrAirRes.Location = New System.Drawing.Point(290, 6)
Me.GrAirRes.Name = "GrAirRes"
Me.GrAirRes.Size = New System.Drawing.Size(137, 48)
Me.GrAirRes.TabIndex = 1
@@ -788,7 +800,7 @@ Partial Class VehicleForm
Me.PictureBox1.Image = Global.TUGraz.VECTO.My.Resources.Resources.VECTO_VEH
Me.PictureBox1.Location = New System.Drawing.Point(0, 28)
Me.PictureBox1.Name = "PictureBox1"
- Me.PictureBox1.Size = New System.Drawing.Size(589, 40)
+ Me.PictureBox1.Size = New System.Drawing.Size(604, 40)
Me.PictureBox1.TabIndex = 37
Me.PictureBox1.TabStop = False
'
@@ -811,26 +823,11 @@ Partial Class VehicleForm
Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(127, 22)
Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
'
- 'PnAll
- '
- Me.PnAll.Controls.Add(Me.gbPTO)
- Me.PnAll.Controls.Add(Me.GroupBox3)
- Me.PnAll.Controls.Add(Me.GroupBox2)
- Me.PnAll.Controls.Add(Me.GrAirRes)
- Me.PnAll.Controls.Add(Me.GroupBox1)
- Me.PnAll.Controls.Add(Me.GroupBox8)
- Me.PnAll.Controls.Add(Me.GroupBox7)
- Me.PnAll.Controls.Add(Me.GroupBox6)
- Me.PnAll.Location = New System.Drawing.Point(6, 159)
- Me.PnAll.Name = "PnAll"
- Me.PnAll.Size = New System.Drawing.Size(575, 498)
- Me.PnAll.TabIndex = 4
- '
'gbPTO
'
Me.gbPTO.Controls.Add(Me.pnPTO)
Me.gbPTO.Controls.Add(Me.cbPTOType)
- Me.gbPTO.Location = New System.Drawing.Point(6, 408)
+ Me.gbPTO.Location = New System.Drawing.Point(6, 240)
Me.gbPTO.Name = "gbPTO"
Me.gbPTO.Size = New System.Drawing.Size(564, 86)
Me.gbPTO.TabIndex = 4
@@ -921,7 +918,7 @@ Partial Class VehicleForm
'GroupBox3
'
Me.GroupBox3.Controls.Add(Me.PnWheelDiam)
- Me.GroupBox3.Location = New System.Drawing.Point(433, 3)
+ Me.GroupBox3.Location = New System.Drawing.Point(433, 6)
Me.GroupBox3.Name = "GroupBox3"
Me.GroupBox3.Size = New System.Drawing.Size(137, 48)
Me.GroupBox3.TabIndex = 6
@@ -932,9 +929,9 @@ Partial Class VehicleForm
'
Me.GroupBox2.Controls.Add(Me.pnAngledriveFields)
Me.GroupBox2.Controls.Add(Me.cbAngledriveType)
- Me.GroupBox2.Location = New System.Drawing.Point(290, 293)
+ Me.GroupBox2.Location = New System.Drawing.Point(6, 123)
Me.GroupBox2.Name = "GroupBox2"
- Me.GroupBox2.Size = New System.Drawing.Size(280, 111)
+ Me.GroupBox2.Size = New System.Drawing.Size(564, 111)
Me.GroupBox2.TabIndex = 4
Me.GroupBox2.TabStop = False
Me.GroupBox2.Text = "Angledrive"
@@ -1035,19 +1032,125 @@ Partial Class VehicleForm
Me.Label8.TabIndex = 10
Me.Label8.Text = "HDV Class"
'
+ 'TabControl1
+ '
+ Me.TabControl1.Controls.Add(Me.TabPage1)
+ Me.TabControl1.Controls.Add(Me.TabPage2)
+ Me.TabControl1.Controls.Add(Me.TabPage3)
+ Me.TabControl1.Location = New System.Drawing.Point(6, 173)
+ Me.TabControl1.Name = "TabControl1"
+ Me.TabControl1.SelectedIndex = 0
+ Me.TabControl1.Size = New System.Drawing.Size(587, 376)
+ Me.TabControl1.TabIndex = 40
+ '
+ 'TabPage1
+ '
+ Me.TabPage1.Controls.Add(Me.GroupBox1)
+ Me.TabPage1.Controls.Add(Me.GroupBox3)
+ Me.TabPage1.Controls.Add(Me.GroupBox6)
+ Me.TabPage1.Controls.Add(Me.GroupBox8)
+ Me.TabPage1.Controls.Add(Me.GrAirRes)
+ Me.TabPage1.Location = New System.Drawing.Point(4, 22)
+ Me.TabPage1.Name = "TabPage1"
+ Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
+ Me.TabPage1.Size = New System.Drawing.Size(579, 350)
+ Me.TabPage1.TabIndex = 0
+ Me.TabPage1.Text = "General"
+ Me.TabPage1.UseVisualStyleBackColor = True
+ '
+ 'TabPage2
+ '
+ Me.TabPage2.Controls.Add(Me.gbPTO)
+ Me.TabPage2.Controls.Add(Me.GroupBox7)
+ Me.TabPage2.Controls.Add(Me.GroupBox2)
+ Me.TabPage2.Location = New System.Drawing.Point(4, 22)
+ Me.TabPage2.Name = "TabPage2"
+ Me.TabPage2.Padding = New System.Windows.Forms.Padding(3)
+ Me.TabPage2.Size = New System.Drawing.Size(579, 350)
+ Me.TabPage2.TabIndex = 1
+ Me.TabPage2.Text = "Powertrain"
+ Me.TabPage2.UseVisualStyleBackColor = True
+ '
+ 'TabPage3
+ '
+ Me.TabPage3.Controls.Add(Me.lvTorqueLimits)
+ Me.TabPage3.Controls.Add(Me.Label17)
+ Me.TabPage3.Controls.Add(Me.btDelMaxTorqueEntry)
+ Me.TabPage3.Controls.Add(Me.btAddMaxTorqueEntry)
+ Me.TabPage3.Location = New System.Drawing.Point(4, 22)
+ Me.TabPage3.Name = "TabPage3"
+ Me.TabPage3.Size = New System.Drawing.Size(579, 350)
+ Me.TabPage3.TabIndex = 2
+ Me.TabPage3.Text = "Torque Limits"
+ Me.TabPage3.UseVisualStyleBackColor = True
+ '
+ 'lvTorqueLimits
+ '
+ Me.lvTorqueLimits.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.lvTorqueLimits.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader5, Me.ColumnHeader6})
+ Me.lvTorqueLimits.FullRowSelect = True
+ Me.lvTorqueLimits.GridLines = True
+ Me.lvTorqueLimits.HideSelection = False
+ Me.lvTorqueLimits.Location = New System.Drawing.Point(7, 8)
+ Me.lvTorqueLimits.MultiSelect = False
+ Me.lvTorqueLimits.Name = "lvTorqueLimits"
+ Me.lvTorqueLimits.Size = New System.Drawing.Size(282, 102)
+ Me.lvTorqueLimits.TabIndex = 7
+ Me.lvTorqueLimits.TabStop = False
+ Me.lvTorqueLimits.UseCompatibleStateImageBehavior = False
+ Me.lvTorqueLimits.View = System.Windows.Forms.View.Details
+ '
+ 'ColumnHeader5
+ '
+ Me.ColumnHeader5.Text = "Gear #"
+ Me.ColumnHeader5.Width = 67
+ '
+ 'ColumnHeader6
+ '
+ Me.ColumnHeader6.Text = "Max. Torque"
+ Me.ColumnHeader6.Width = 146
+ '
+ 'Label17
+ '
+ Me.Label17.AutoSize = True
+ Me.Label17.Location = New System.Drawing.Point(183, 113)
+ Me.Label17.Name = "Label17"
+ Me.Label17.Size = New System.Drawing.Size(106, 13)
+ Me.Label17.TabIndex = 6
+ Me.Label17.Text = "(Double-Click to Edit)"
+ '
+ 'btDelMaxTorqueEntry
+ '
+ Me.btDelMaxTorqueEntry.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
+ Me.btDelMaxTorqueEntry.Location = New System.Drawing.Point(31, 116)
+ Me.btDelMaxTorqueEntry.Name = "btDelMaxTorqueEntry"
+ Me.btDelMaxTorqueEntry.Size = New System.Drawing.Size(24, 24)
+ Me.btDelMaxTorqueEntry.TabIndex = 5
+ Me.btDelMaxTorqueEntry.UseVisualStyleBackColor = True
+ '
+ 'btAddMaxTorqueEntry
+ '
+ Me.btAddMaxTorqueEntry.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
+ Me.btAddMaxTorqueEntry.Location = New System.Drawing.Point(7, 116)
+ Me.btAddMaxTorqueEntry.Name = "btAddMaxTorqueEntry"
+ Me.btAddMaxTorqueEntry.Size = New System.Drawing.Size(24, 24)
+ Me.btAddMaxTorqueEntry.TabIndex = 4
+ Me.btAddMaxTorqueEntry.UseVisualStyleBackColor = True
+ '
'VehicleForm
'
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(589, 703)
+ Me.ClientSize = New System.Drawing.Size(599, 605)
+ Me.Controls.Add(Me.TabControl1)
Me.Controls.Add(Me.ButCancel)
Me.Controls.Add(Me.ButOK)
Me.Controls.Add(Me.Label8)
Me.Controls.Add(Me.TbHDVclass)
Me.Controls.Add(Me.PicVehicle)
- Me.Controls.Add(Me.PnAll)
Me.Controls.Add(Me.PictureBox1)
Me.Controls.Add(Me.Label9)
Me.Controls.Add(Me.StatusStrip1)
@@ -1084,7 +1187,6 @@ Partial Class VehicleForm
Me.PnCdATrTr.PerformLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
Me.CmOpenFile.ResumeLayout(False)
- Me.PnAll.ResumeLayout(False)
Me.gbPTO.ResumeLayout(False)
Me.pnPTO.ResumeLayout(False)
Me.pnPTO.PerformLayout()
@@ -1093,6 +1195,11 @@ Partial Class VehicleForm
Me.pnAngledriveFields.ResumeLayout(False)
Me.pnAngledriveFields.PerformLayout()
CType(Me.PicVehicle, System.ComponentModel.ISupportInitialize).EndInit()
+ Me.TabControl1.ResumeLayout(False)
+ Me.TabPage1.ResumeLayout(False)
+ Me.TabPage2.ResumeLayout(False)
+ Me.TabPage3.ResumeLayout(False)
+ Me.TabPage3.PerformLayout()
Me.ResumeLayout(False)
Me.PerformLayout()
@@ -1161,7 +1268,6 @@ Partial Class VehicleForm
Friend WithEvents ColumnHeader1 As System.Windows.Forms.ColumnHeader
Friend WithEvents ColumnHeader2 As System.Windows.Forms.ColumnHeader
Friend WithEvents PnLoad As System.Windows.Forms.Panel
- Friend WithEvents PnAll As System.Windows.Forms.Panel
Friend WithEvents Label6 As System.Windows.Forms.Label
Friend WithEvents ColumnHeader3 As System.Windows.Forms.ColumnHeader
Friend WithEvents ColumnHeader4 As System.Windows.Forms.ColumnHeader
@@ -1193,4 +1299,14 @@ Partial Class VehicleForm
Friend WithEvents btPTOCycle As System.Windows.Forms.Button
Friend WithEvents Label16 As System.Windows.Forms.Label
Friend WithEvents tbPTOCycle As System.Windows.Forms.TextBox
+ Friend WithEvents TabControl1 As System.Windows.Forms.TabControl
+ Friend WithEvents TabPage1 As System.Windows.Forms.TabPage
+ Friend WithEvents TabPage2 As System.Windows.Forms.TabPage
+ Friend WithEvents TabPage3 As System.Windows.Forms.TabPage
+ Friend WithEvents Label17 As System.Windows.Forms.Label
+ Friend WithEvents btDelMaxTorqueEntry As System.Windows.Forms.Button
+ Friend WithEvents btAddMaxTorqueEntry As System.Windows.Forms.Button
+ Friend WithEvents lvTorqueLimits As System.Windows.Forms.ListView
+ Friend WithEvents ColumnHeader5 As System.Windows.Forms.ColumnHeader
+ Friend WithEvents ColumnHeader6 As System.Windows.Forms.ColumnHeader
End Class
diff --git a/VECTO/Input Files/VectoJob.vb b/VECTO/Input Files/VectoJob.vb
index d37a864d67..34cd7d75d4 100644
--- a/VECTO/Input Files/VectoJob.vb
+++ b/VECTO/Input Files/VectoJob.vb
@@ -225,17 +225,6 @@ Public Class VectoJob
End Get
End Property
- Public ReadOnly Property IDriverEngineeringInputData_StartStop As IStartStopEngineeringInputData _
- Implements IDriverEngineeringInputData.StartStop
- Get
- Return New StartStopInputData With {
- .Enabled = _startStop,
- .MaxSpeed = StartStopMaxSpeed.KMPHtoMeterPerSecond(),
- .MinTime = StartStopTime.SI(Of Second)(),
- .Delay = StartStopDelay.SI(Of Second)()
- }
- End Get
- End Property
Public ReadOnly Property OverSpeedEcoRoll As IOverSpeedEcoRollDeclarationInputData _
Implements IDriverDeclarationInputData.OverSpeedEcoRoll
diff --git a/VECTO/OutputData/JSONFileWriter.vb b/VECTO/OutputData/JSONFileWriter.vb
index cbd8152566..c2c10de71f 100644
--- a/VECTO/OutputData/JSONFileWriter.vb
+++ b/VECTO/OutputData/JSONFileWriter.vb
@@ -288,11 +288,11 @@ Public Class JSONFileWriter
If Not job.SavedInDeclarationMode Then
body.Add("VACC", GetRelativePath(driver.AccelerationCurve.Source, basePath))
End If
- body.Add("StartStop", New Dictionary(Of String, Object) From {
- {"Enabled", driver.StartStop.Enabled},
- {"MaxSpeed", driver.StartStop.MaxSpeed.AsKmph},
- {"MinTime", driver.StartStop.MinTime.Value()},
- {"Delay", driver.StartStop.Delay.Value()}})
+ 'body.Add("StartStop", New Dictionary(Of String, Object) From {
+ ' {"Enabled", driver.StartStop.Enabled},
+ ' {"MaxSpeed", driver.StartStop.MaxSpeed.AsKmph},
+ ' {"MinTime", driver.StartStop.MinTime.Value()},
+ ' {"Delay", driver.StartStop.Delay.Value()}})
If Not job.SavedInDeclarationMode Then
Dim dfTargetSpeed As String = If(
Not driver.Lookahead.CoastingDecisionFactorTargetSpeedLookup Is Nothing AndAlso
diff --git a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
index 386b80b08b..9ff6c1234f 100644
--- a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
@@ -364,7 +364,7 @@ namespace TUGraz.VectoCommon.InputData
{
bool SavedInDeclarationMode { get; }
- IStartStopDeclarationInputData StartStop { get; }
+ //IStartStopDeclarationInputData StartStop { get; }
IOverSpeedEcoRollDeclarationInputData OverSpeedEcoRoll { get; }
}
@@ -378,15 +378,6 @@ namespace TUGraz.VectoCommon.InputData
DriverMode Mode { get; }
}
- public interface IStartStopDeclarationInputData
- {
- /// <summary>
- /// P010 StartStop - enabled
- /// cf. VECTO Input Parameters.xlsx
- /// </summary>
- bool Enabled { get; }
- }
-
public interface IAuxiliaryDeclarationInputData
{
/// <summary>
diff --git a/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs b/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs
index d8141a8ac3..c8db80a6d0 100644
--- a/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs
@@ -262,7 +262,7 @@ namespace TUGraz.VectoCommon.InputData
public interface IDriverEngineeringInputData : IDriverDeclarationInputData
{
- new IStartStopEngineeringInputData StartStop { get; }
+ //new IStartStopEngineeringInputData StartStop { get; }
new IOverSpeedEcoRollEngineeringInputData OverSpeedEcoRoll { get; }
@@ -296,27 +296,6 @@ namespace TUGraz.VectoCommon.InputData
MeterPerSecond UnderSpeed { get; }
}
- public interface IStartStopEngineeringInputData : IStartStopDeclarationInputData
- {
- /// <summary>
- /// P011 StartStop - Max speed
- /// cf. VECTO Input Parameters.xlsx
- /// </summary>
- MeterPerSecond MaxSpeed { get; }
-
- /// <summary>
- /// P012 StartStop - Min ICE-ON Time
- /// cf. VECTO Input Parameters.xlsx
- /// </summary>
- Second MinTime { get; }
-
- /// <summary>
- /// P013 StartStop - Activation Delay
- /// cf. VECTO Input Parameters.xlsx
- /// </summary>
- Second Delay { get; }
- }
-
public interface ILookaheadCoastingInputData
{
/// <summary>
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
index 4d9ca1e7f0..9b7e2118c9 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
@@ -497,11 +497,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
}
}
- IStartStopDeclarationInputData IDriverDeclarationInputData.StartStop
- {
- get { return StartStop; }
- }
-
public virtual IOverSpeedEcoRollEngineeringInputData OverSpeedEcoRoll
{
get {
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationDriverDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationDriverDataProvider.cs
index 243bd375ec..d9ac30840c 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationDriverDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationDriverDataProvider.cs
@@ -16,20 +16,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration
XBasePath = VehiclePath;
}
- public IStartStopDeclarationInputData StartStop
- {
- get {
- //var node =
- // Navigator.SelectSingleNode(Helper.Query(VehiclePath,
- // XMLNames.Vehicle_AdvancedDriverAssist,
- // XMLNames.Vehicle_AdvancedDriverAssist_EngineStartStop,
- // XMLNames.Vehicle_AdvancedDriverAssist_EngineStartStop_Enabled), Manager);
- return new StartStopInputData() {
- Enabled = false
- };
- }
- }
-
public IOverSpeedEcoRollDeclarationInputData OverSpeedEcoRoll
{
get {
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/XMLEngineeringDriverDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/XMLEngineeringDriverDataProvider.cs
index 3bdaf1863c..202218f349 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/XMLEngineeringDriverDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/XMLEngineeringDriverDataProvider.cs
@@ -23,15 +23,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering
XPathDocument driverDocument, string xmlBasePath, string fsBasePath)
: base(xmlEngineeringJobInputDataProvider, driverDocument, xmlBasePath, fsBasePath) {}
- public IStartStopDeclarationInputData StartStop
- {
- get { return InputData._vehicleInputData.StartStop; }
- }
-
IOverSpeedEcoRollEngineeringInputData IDriverEngineeringInputData.OverSpeedEcoRoll
{
- get
- {
+ get {
var minSpeedPath = Helper.Query(XMLNames.Component_DriverModel,
XMLNames.DriverModel_Overspeed, XMLNames.DriverModel_Overspeed_MinSpeed);
var overSpeedPath = Helper.Query(XMLNames.Component_DriverModel,
@@ -58,8 +52,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering
public TableData AccelerationCurve
{
- get
- {
+ get {
if (ElementExists(Helper.Query(XMLNames.Component_DriverModel, XMLNames.DriverModel_DriverAccelerationCurve))) {
return
ReadTableData(AttributeMappings.DriverAccelerationCurveMapping,
@@ -79,8 +72,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering
public ILookaheadCoastingInputData Lookahead
{
- get
- {
+ get {
var lookAheadXmlPath = Helper.Query(XMLNames.Component_DriverModel, XMLNames.DriverModel_LookAheadCoasting);
var retVal = new LookAheadCoastingInputData {
@@ -154,15 +146,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering
}
}
- IStartStopEngineeringInputData IDriverEngineeringInputData.StartStop
- {
- get { return InputData._vehicleInputData.StartStopEngineering; }
- }
-
public IOverSpeedEcoRollDeclarationInputData OverSpeedEcoRoll
{
- get
- {
+ get {
var node =
Navigator.SelectSingleNode(Helper.Query(XBasePath, XMLNames.Component_DriverModel, XMLNames.DriverModel_Overspeed,
XMLNames.DriverModel_Overspeed_Mode), Manager);
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/XMLEngineeringVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/XMLEngineeringVehicleDataProvider.cs
index 3b8ed664d8..545f51795c 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/XMLEngineeringVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/XMLEngineeringVehicleDataProvider.cs
@@ -266,52 +266,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering
}
}
- public IStartStopDeclarationInputData StartStop
- {
- get {
- var node =
- Navigator.SelectSingleNode(
- Helper.Query(XBasePath, XMLNames.Vehicle_AdvancedDriverAssist,
- XMLNames.Vehicle_AdvancedDriverAssist_EngineStartStop,
- XMLNames.Vehicle_AdvancedDriverAssist_EngineStartStop_Enabled), Manager);
- return new StartStopInputData() {
- Enabled = node != null && XmlConvert.ToBoolean(node.Value)
- };
- }
- }
-
- public IStartStopEngineeringInputData StartStopEngineering
- {
- get {
- var delayPath = Helper.Query(XMLNames.Vehicle_AdvancedDriverAssist,
- XMLNames.Vehicle_AdvancedDriverAssist_EngineStartStop,
- XMLNames.Vehicle_AdvancedDriverAssist_EngineStartStop_ActivationDelay);
- var minTimePath = Helper.Query(XMLNames.Vehicle_AdvancedDriverAssist,
- XMLNames.Vehicle_AdvancedDriverAssist_EngineStartStop,
- XMLNames.Vehicle_AdvancedDriverAssist_EngineStartStop_MinOnTime);
- var maxSpeedPath = Helper.Query(XMLNames.Vehicle_AdvancedDriverAssist,
- XMLNames.Vehicle_AdvancedDriverAssist_EngineStartStop,
- XMLNames.Vehicle_AdvancedDriverAssist_EngineStartStop_MaxSpeed);
- var retVal = new StartStopInputData {
- Enabled = XmlConvert.ToBoolean(GetElementValue(
- Helper.Query(XMLNames.Vehicle_AdvancedDriverAssist,
- XMLNames.Vehicle_AdvancedDriverAssist_EngineStartStop,
- XMLNames.Vehicle_AdvancedDriverAssist_EngineStartStop_Enabled))),
- Delay = ElementExists(delayPath)
- ? GetDoubleElementValue(delayPath).SI<Second>()
- : DeclarationData.Driver.StartStop.Delay,
- MinTime = ElementExists(minTimePath)
- ? GetDoubleElementValue(minTimePath).SI<Second>()
- : DeclarationData.Driver.StartStop.MinTime,
- MaxSpeed = ElementExists(maxSpeedPath)
- ? GetDoubleElementValue(maxSpeedPath).KMPHtoMeterPerSecond()
- : DeclarationData.Driver.StartStop.MaxSpeed
- };
-
- return retVal;
- }
- }
-
#endregion
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/InputData/Impl/InputData.cs b/VectoCore/VectoCore/InputData/Impl/InputData.cs
index e3f08e411f..3c1a581f2d 100644
--- a/VectoCore/VectoCore/InputData/Impl/InputData.cs
+++ b/VectoCore/VectoCore/InputData/Impl/InputData.cs
@@ -44,17 +44,6 @@ namespace TUGraz.VectoCore.InputData.Impl
public TableData CycleData { get; internal set; }
}
- public class StartStopInputData : IStartStopEngineeringInputData
- {
- public bool Enabled { get; internal set; }
-
- public MeterPerSecond MaxSpeed { get; internal set; }
-
- public Second MinTime { get; internal set; }
-
- public Second Delay { get; internal set; }
- }
-
public class LookAheadCoastingInputData : ILookaheadCoastingInputData
{
public bool Enabled { get; internal set; }
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
index ddfc3d114f..149aaf79ed 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
@@ -329,17 +329,10 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
OverSpeed = driver.OverSpeedEcoRoll.OverSpeed,
UnderSpeed = driver.OverSpeedEcoRoll.UnderSpeed,
};
- var startstopData = new VectoRunData.StartStopData {
- Enabled = driver.StartStop.Enabled,
- Delay = driver.StartStop.Delay,
- MinTime = driver.StartStop.MinTime,
- MaxSpeed = driver.StartStop.MaxSpeed,
- };
var retVal = new DriverData {
AccelerationCurve = accelerationData,
LookAheadCoasting = lookAheadData,
OverSpeedEcoRoll = overspeedData,
- StartStop = startstopData,
};
return retVal;
}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/DriverData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/DriverData.cs
index 2825c1cc6a..73a1e6ffd7 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/DriverData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/DriverData.cs
@@ -40,8 +40,6 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
{
public class DriverData
{
- [Required, ValidateObject] public VectoRunData.StartStopData StartStop;
-
[Required, ValidateObject] public OverSpeedEcoRollData OverSpeedEcoRoll;
[Required, ValidateObject] public LACData LookAheadCoasting;
diff --git a/VectoCore/VectoCoreTest/FileIO/SimulationDataReaderTest.cs b/VectoCore/VectoCoreTest/FileIO/SimulationDataReaderTest.cs
index 4e49f6c4d4..854f752b0f 100644
--- a/VectoCore/VectoCoreTest/FileIO/SimulationDataReaderTest.cs
+++ b/VectoCore/VectoCoreTest/FileIO/SimulationDataReaderTest.cs
@@ -92,13 +92,6 @@ namespace TUGraz.VectoCore.Tests.FileIO
Assert.AreEqual(DeclarationData.Driver.OverSpeedEcoRoll.UnderSpeed.Value(),
runData.DriverData.OverSpeedEcoRoll.UnderSpeed.Value(), Tolerance);
- //Assert.AreEqual(false, runData.DriverData.StartStop.Enabled);
- Assert.AreEqual(DeclarationData.Driver.StartStop.Delay.Value(), runData.DriverData.StartStop.Delay.Value(), Tolerance);
- Assert.AreEqual(DeclarationData.Driver.StartStop.MaxSpeed.Value(), runData.DriverData.StartStop.MaxSpeed.Value(),
- Tolerance);
- Assert.AreEqual(DeclarationData.Driver.StartStop.MinTime.Value(), runData.DriverData.StartStop.MinTime.Value(),
- Tolerance);
-
Assert.AreEqual(3.7890, runData.EngineData.Inertia.Value());
var downshiftSpeeds = new[] { 660, 660, 1679.9982 };
diff --git a/VectoCore/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs b/VectoCore/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs
index 889bc77361..2ed4af76d5 100644
--- a/VectoCore/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs
@@ -214,9 +214,6 @@ namespace TUGraz.VectoCore.Tests.Integration
: new DriverData.OverSpeedEcoRollData {
Mode = DriverMode.Off
},
- StartStop = new VectoRunData.StartStopData {
- Enabled = false
- }
};
}
}
diff --git a/VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs b/VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs
index 6ffcec7d78..aa100b2d60 100644
--- a/VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/CoachPowerTrain.cs
@@ -220,9 +220,6 @@ namespace TUGraz.VectoCore.Tests.Integration
: new DriverData.OverSpeedEcoRollData {
Mode = DriverMode.Off
},
- StartStop = new VectoRunData.StartStopData {
- Enabled = false
- }
};
}
}
diff --git a/VectoCore/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs b/VectoCore/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs
index b663a5c91b..2cd72e1fb4 100644
--- a/VectoCore/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs
@@ -424,9 +424,6 @@ namespace TUGraz.VectoCore.Tests.Integration.SimulationRuns
OverSpeedEcoRoll = new DriverData.OverSpeedEcoRollData {
Mode = DriverMode.Off
},
- StartStop = new VectoRunData.StartStopData {
- Enabled = false
- }
};
}
}
diff --git a/VectoCore/VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs b/VectoCore/VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs
index 967d43a8ef..dfd2505c64 100644
--- a/VectoCore/VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/SimulationRuns/MinimalPowertrain.cs
@@ -299,9 +299,6 @@ namespace TUGraz.VectoCore.Tests.Integration.SimulationRuns
OverSpeedEcoRoll = new DriverData.OverSpeedEcoRollData {
Mode = DriverMode.Off
},
- StartStop = new VectoRunData.StartStopData {
- Enabled = false
- }
};
}
}
diff --git a/VectoCore/VectoCoreTest/Integration/Truck40tPowerTrain.cs b/VectoCore/VectoCoreTest/Integration/Truck40tPowerTrain.cs
index f6969dcbb7..eda5f61483 100644
--- a/VectoCore/VectoCoreTest/Integration/Truck40tPowerTrain.cs
+++ b/VectoCore/VectoCoreTest/Integration/Truck40tPowerTrain.cs
@@ -251,9 +251,6 @@ namespace TUGraz.VectoCore.Tests.Integration
: new DriverData.OverSpeedEcoRollData {
Mode = DriverMode.Off
},
- StartStop = new VectoRunData.StartStopData {
- Enabled = false,
- }
};
}
}
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/DriverTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/DriverTest.cs
index 1c15a2a74a..efc16d5959 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/DriverTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/DriverTest.cs
@@ -417,9 +417,6 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
OverSpeedEcoRoll = new DriverData.OverSpeedEcoRollData {
Mode = DriverMode.Off
},
- StartStop = new VectoRunData.StartStopData {
- Enabled = false
- }
};
}
diff --git a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputTest.cs b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputTest.cs
index 3aa33804be..c60d59208b 100644
--- a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputTest.cs
@@ -272,7 +272,6 @@ namespace TUGraz.VectoCore.Tests.XML
var adas = inputDataProvider.DriverInputData;
- Assert.AreEqual(false, adas.StartStop.Enabled);
Assert.AreEqual(DriverMode.Overspeed, adas.OverSpeedEcoRoll.Mode);
}
diff --git a/VectoCore/VectoCoreTest/XML/XMLEngineeringInputRefTest.cs b/VectoCore/VectoCoreTest/XML/XMLEngineeringInputRefTest.cs
index e32dcc9d05..1621c2da2f 100644
--- a/VectoCore/VectoCoreTest/XML/XMLEngineeringInputRefTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLEngineeringInputRefTest.cs
@@ -210,13 +210,12 @@ namespace TUGraz.VectoCore.Tests.XML
[TestMethod]
public void TestXMLInputADASReferencedFile()
{
- var reader = XmlReader.Create(EngineeringSampleFile);
+ //var reader = XmlReader.Create(EngineeringSampleFile);
var inputDataProvider = new XMLEngineeringInputDataProvider(EngineeringSampleFile, true);
var adas = inputDataProvider.DriverInputData;
- Assert.AreEqual(false, adas.StartStop.Enabled);
Assert.AreEqual(DriverMode.Overspeed, adas.OverSpeedEcoRoll.Mode);
}
diff --git a/VectoCore/VectoCoreTest/XML/XMLEngineeringInputSingleTest.cs b/VectoCore/VectoCoreTest/XML/XMLEngineeringInputSingleTest.cs
index 54beeeb44e..2ad733f98f 100644
--- a/VectoCore/VectoCoreTest/XML/XMLEngineeringInputSingleTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLEngineeringInputSingleTest.cs
@@ -334,7 +334,6 @@ namespace TUGraz.VectoCore.Tests.XML
var adas = inputDataProvider.DriverInputData;
- Assert.AreEqual(false, adas.StartStop.Enabled);
Assert.AreEqual(DriverMode.Overspeed, adas.OverSpeedEcoRoll.Mode);
}
@@ -385,12 +384,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual("1", driverAcc.Rows[1][1]);
Assert.AreEqual("-1", driverAcc.Rows[1][2]);
- var startstop = driverDataProvider.StartStop;
- Assert.IsFalse(startstop.Enabled);
- Assert.AreEqual(DeclarationData.Driver.StartStop.MaxSpeed.AsKmph, startstop.MaxSpeed.AsKmph);
-
var declarationDriverDataProvider = (IDriverDeclarationInputData)inputDataProvider.DriverInputData;
- Assert.IsFalse(declarationDriverDataProvider.StartStop.Enabled);
Assert.AreEqual(DriverMode.Overspeed, declarationDriverDataProvider.OverSpeedEcoRoll.Mode);
@@ -542,12 +536,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual("1", driverAcc.Rows[1][1]);
Assert.AreEqual("-1", driverAcc.Rows[1][2]);
- var startstop = driverDataProvider.StartStop;
- Assert.IsFalse(startstop.Enabled);
- Assert.AreEqual(8, startstop.MaxSpeed.AsKmph);
-
var declarationDriverDataProvider = (IDriverDeclarationInputData)inputDataProvider.DriverInputData;
- Assert.IsFalse(declarationDriverDataProvider.StartStop.Enabled);
Assert.AreEqual(DriverMode.Overspeed, declarationDriverDataProvider.OverSpeedEcoRoll.Mode);
--
GitLab