diff --git a/VECTO/GUI/VectoJobForm.Designer.vb b/VECTO/GUI/VectoJobForm.Designer.vb
index 2cf5335deed16983df889b2386888155cf3d907e..0970652f0169f7261d15f7000d2c3e0918764b11 100644
--- a/VECTO/GUI/VectoJobForm.Designer.vb
+++ b/VECTO/GUI/VectoJobForm.Designer.vb
@@ -25,116 +25,121 @@ Partial Class VectoJobForm
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<DebuggerStepThrough()> _
Private Sub InitializeComponent()
- Me.components = New Container()
- Dim resources As ComponentResourceManager = New ComponentResourceManager(GetType(VectoJobForm))
- Me.TabPgGen = New TabPage()
- Me.GrCycles = New GroupBox()
- Me.Label2 = New Label()
- Me.LvCycles = New ListView()
- Me.ColumnHeader1 = CType(New ColumnHeader(), ColumnHeader)
- Me.BtDRIrem = New Button()
- Me.BtDRIadd = New Button()
- Me.GrAux = New GroupBox()
- Me.btnAAUXOpen = New Button()
- Me.Label1 = New Label()
- Me.btnBrowseAAUXFile = New Button()
- Me.txtAdvancedAuxiliaryFile = New TextBox()
- Me.picAuxInfo = New PictureBox()
- Me.cboAdvancedAuxiliaries = New ComboBox()
- Me.lbAdvancedAuxiliaries = New Label()
- Me.Label32 = New Label()
- Me.LvAux = New ListView()
- Me.ColumnHeader4 = CType(New ColumnHeader(), ColumnHeader)
- Me.ColumnHeader5 = CType(New ColumnHeader(), ColumnHeader)
- Me.ColumnHeader6 = CType(New ColumnHeader(), ColumnHeader)
- Me.ButAuxRem = New Button()
- Me.ButAuxAdd = New Button()
- Me.TbGBX = New TextBox()
- Me.TbENG = New TextBox()
- Me.TbVEH = New TextBox()
- Me.ButOpenGBX = New Button()
- Me.ButOpenENG = New Button()
- Me.ButOpenVEH = New Button()
- Me.ButtonVEH = New Button()
- Me.ButtonGBX = New Button()
- Me.ButtonMAP = New Button()
- Me.TabControl1 = New TabControl()
- Me.TabPgDriver = New TabPage()
- Me.GrVACC = New GroupBox()
- Me.TbDesMaxFile = New TextBox()
- Me.BtDesMaxBr = New Button()
- Me.BtAccOpen = New Button()
- Me.GrLAC = New GroupBox()
- Me.Label12 = New Label()
- Me.tbDfCoastingScale = New TextBox()
- Me.CbLookAhead = New CheckBox()
- Me.Label11 = New Label()
- Me.Label3 = New Label()
- Me.tbDfCoastingOffset = New TextBox()
- Me.tbLacDfTargetSpeedFile = New TextBox()
- Me.Label10 = New Label()
- Me.Label4 = New Label()
- Me.Label5 = New Label()
- Me.btnDfTargetSpeed = New Button()
- Me.tbLacPreviewFactor = New TextBox()
- Me.tbLacDfVelocityDropFile = New TextBox()
- Me.GroupBox1 = New GroupBox()
- Me.PnEcoRoll = New Panel()
- Me.Label21 = New Label()
- Me.Label20 = New Label()
- Me.Label14 = New Label()
- Me.TbVmin = New TextBox()
- Me.TbUnderSpeed = New TextBox()
- Me.TbOverspeed = New TextBox()
- Me.Label23 = New Label()
- Me.Label22 = New Label()
- Me.Label13 = New Label()
- Me.RdEcoRoll = New RadioButton()
- Me.RdOverspeed = New RadioButton()
- Me.RdOff = New RadioButton()
- Me.GrStartStop = New GroupBox()
- Me.PnStartStop = New Panel()
- Me.Label31 = New Label()
- Me.Label27 = New Label()
- Me.TbSSspeed = New TextBox()
- Me.LabelSSspeed = New Label()
- Me.Label26 = New Label()
- Me.Label30 = New Label()
- Me.LabelSStime = New Label()
- Me.TbSSdelay = New TextBox()
- Me.TbSStime = New TextBox()
- Me.ChBStartStop = New CheckBox()
- Me.StatusStrip1 = New StatusStrip()
- Me.ToolStripStatusLabelGEN = New ToolStripStatusLabel()
- Me.ButOK = New Button()
- Me.ButCancel = New Button()
- Me.ToolStrip1 = New ToolStrip()
- Me.ToolStripBtNew = New ToolStripButton()
- Me.ToolStripBtOpen = New ToolStripButton()
- Me.ToolStripBtSave = New ToolStripButton()
- Me.ToolStripBtSaveAs = New ToolStripButton()
- Me.ToolStripSeparator1 = New ToolStripSeparator()
- Me.ToolStripBtSendTo = New ToolStripButton()
- Me.ToolStripSeparator2 = New ToolStripSeparator()
- Me.ToolStripButton1 = New ToolStripButton()
- Me.PictureBox1 = New PictureBox()
- Me.CbEngOnly = New CheckBox()
- Me.CmOpenFile = New ContextMenuStrip(Me.components)
- Me.OpenWithToolStripMenuItem = New ToolStripMenuItem()
- Me.ShowInFolderToolStripMenuItem = New ToolStripMenuItem()
- Me.PicVehicle = New PictureBox()
- Me.PicBox = New PictureBox()
- Me.TbEngTxt = New TextBox()
- Me.TbVehCat = New TextBox()
- Me.TbAxleConf = New TextBox()
- Me.TbHVCclass = New TextBox()
- Me.TbGbxTxt = New TextBox()
- Me.TbMass = New TextBox()
- Me.ToolTip1 = New ToolTip(Me.components)
+ Me.components = New System.ComponentModel.Container()
+ Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(VectoJobForm))
+ Me.TabPgGen = New System.Windows.Forms.TabPage()
+ Me.GrCycles = New System.Windows.Forms.GroupBox()
+ Me.Label2 = New System.Windows.Forms.Label()
+ Me.LvCycles = New System.Windows.Forms.ListView()
+ Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+ Me.BtDRIrem = New System.Windows.Forms.Button()
+ Me.BtDRIadd = New System.Windows.Forms.Button()
+ Me.GrAux = New System.Windows.Forms.GroupBox()
+ Me.btnAAUXOpen = New System.Windows.Forms.Button()
+ Me.Label1 = New System.Windows.Forms.Label()
+ Me.btnBrowseAAUXFile = New System.Windows.Forms.Button()
+ Me.txtAdvancedAuxiliaryFile = New System.Windows.Forms.TextBox()
+ Me.picAuxInfo = New System.Windows.Forms.PictureBox()
+ Me.cboAdvancedAuxiliaries = New System.Windows.Forms.ComboBox()
+ Me.lbAdvancedAuxiliaries = New System.Windows.Forms.Label()
+ Me.Label32 = New System.Windows.Forms.Label()
+ Me.LvAux = New System.Windows.Forms.ListView()
+ Me.ColumnHeader4 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader5 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader6 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+ Me.ButAuxRem = New System.Windows.Forms.Button()
+ Me.ButAuxAdd = New System.Windows.Forms.Button()
+ Me.TbGBX = New System.Windows.Forms.TextBox()
+ Me.TbENG = New System.Windows.Forms.TextBox()
+ Me.TbVEH = New System.Windows.Forms.TextBox()
+ Me.ButOpenGBX = New System.Windows.Forms.Button()
+ Me.ButOpenENG = New System.Windows.Forms.Button()
+ Me.ButOpenVEH = New System.Windows.Forms.Button()
+ Me.ButtonVEH = New System.Windows.Forms.Button()
+ Me.ButtonGBX = New System.Windows.Forms.Button()
+ Me.ButtonMAP = New System.Windows.Forms.Button()
+ Me.TabControl1 = New System.Windows.Forms.TabControl()
+ Me.TabPgDriver = New System.Windows.Forms.TabPage()
+ Me.GrVACC = New System.Windows.Forms.GroupBox()
+ Me.TbDesMaxFile = New System.Windows.Forms.TextBox()
+ Me.BtDesMaxBr = New System.Windows.Forms.Button()
+ Me.BtAccOpen = New System.Windows.Forms.Button()
+ Me.GrLAC = New System.Windows.Forms.GroupBox()
+ Me.CbLookAhead = New System.Windows.Forms.CheckBox()
+ Me.GroupBox1 = New System.Windows.Forms.GroupBox()
+ Me.PnEcoRoll = New System.Windows.Forms.Panel()
+ Me.Label21 = New System.Windows.Forms.Label()
+ Me.Label20 = New System.Windows.Forms.Label()
+ Me.Label14 = New System.Windows.Forms.Label()
+ Me.TbVmin = New System.Windows.Forms.TextBox()
+ Me.TbUnderSpeed = New System.Windows.Forms.TextBox()
+ Me.TbOverspeed = New System.Windows.Forms.TextBox()
+ Me.Label23 = New System.Windows.Forms.Label()
+ Me.Label22 = New System.Windows.Forms.Label()
+ Me.Label13 = New System.Windows.Forms.Label()
+ Me.RdEcoRoll = New System.Windows.Forms.RadioButton()
+ Me.RdOverspeed = New System.Windows.Forms.RadioButton()
+ Me.RdOff = New System.Windows.Forms.RadioButton()
+ Me.GrStartStop = New System.Windows.Forms.GroupBox()
+ Me.PnStartStop = New System.Windows.Forms.Panel()
+ Me.Label31 = New System.Windows.Forms.Label()
+ Me.Label27 = New System.Windows.Forms.Label()
+ Me.TbSSspeed = New System.Windows.Forms.TextBox()
+ Me.LabelSSspeed = New System.Windows.Forms.Label()
+ Me.Label26 = New System.Windows.Forms.Label()
+ Me.Label30 = New System.Windows.Forms.Label()
+ Me.LabelSStime = New System.Windows.Forms.Label()
+ Me.TbSSdelay = New System.Windows.Forms.TextBox()
+ Me.TbSStime = New System.Windows.Forms.TextBox()
+ Me.ChBStartStop = New System.Windows.Forms.CheckBox()
+ Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
+ Me.ToolStripStatusLabelGEN = New System.Windows.Forms.ToolStripStatusLabel()
+ Me.ButOK = New System.Windows.Forms.Button()
+ Me.ButCancel = New System.Windows.Forms.Button()
+ 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.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
+ Me.ToolStripBtSendTo = New System.Windows.Forms.ToolStripButton()
+ Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator()
+ Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
+ Me.PictureBox1 = New System.Windows.Forms.PictureBox()
+ Me.CbEngOnly = New System.Windows.Forms.CheckBox()
+ Me.CmOpenFile = New System.Windows.Forms.ContextMenuStrip(Me.components)
+ Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.PicVehicle = New System.Windows.Forms.PictureBox()
+ Me.PicBox = New System.Windows.Forms.PictureBox()
+ Me.TbEngTxt = New System.Windows.Forms.TextBox()
+ Me.TbVehCat = New System.Windows.Forms.TextBox()
+ Me.TbAxleConf = New System.Windows.Forms.TextBox()
+ Me.TbHVCclass = New System.Windows.Forms.TextBox()
+ Me.TbGbxTxt = New System.Windows.Forms.TextBox()
+ Me.TbMass = New System.Windows.Forms.TextBox()
+ Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
+ Me.pnLookAheadCoasting = New System.Windows.Forms.Panel()
+ Me.btnDfVelocityDrop = New System.Windows.Forms.Button()
+ Me.Label12 = New System.Windows.Forms.Label()
+ Me.tbDfCoastingScale = New System.Windows.Forms.TextBox()
+ Me.Label11 = New System.Windows.Forms.Label()
+ Me.Label3 = New System.Windows.Forms.Label()
+ Me.tbDfCoastingOffset = New System.Windows.Forms.TextBox()
+ Me.tbLacDfTargetSpeedFile = New System.Windows.Forms.TextBox()
+ Me.Label10 = New System.Windows.Forms.Label()
+ Me.Label4 = New System.Windows.Forms.Label()
+ Me.Label5 = New System.Windows.Forms.Label()
+ Me.btnDfTargetSpeed = New System.Windows.Forms.Button()
+ Me.tbLacPreviewFactor = New System.Windows.Forms.TextBox()
+ Me.tbLacDfVelocityDropFile = New System.Windows.Forms.TextBox()
+ Me.Label6 = New System.Windows.Forms.Label()
+ Me.tbLacMinSpeed = New System.Windows.Forms.TextBox()
+ Me.Label7 = New System.Windows.Forms.Label()
Me.TabPgGen.SuspendLayout()
Me.GrCycles.SuspendLayout()
Me.GrAux.SuspendLayout()
- CType(Me.picAuxInfo, ISupportInitialize).BeginInit()
+ CType(Me.picAuxInfo, System.ComponentModel.ISupportInitialize).BeginInit()
Me.TabControl1.SuspendLayout()
Me.TabPgDriver.SuspendLayout()
Me.GrVACC.SuspendLayout()
@@ -145,10 +150,11 @@ Partial Class VectoJobForm
Me.PnStartStop.SuspendLayout()
Me.StatusStrip1.SuspendLayout()
Me.ToolStrip1.SuspendLayout()
- CType(Me.PictureBox1, ISupportInitialize).BeginInit()
+ CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.CmOpenFile.SuspendLayout()
- CType(Me.PicVehicle, ISupportInitialize).BeginInit()
- CType(Me.PicBox, ISupportInitialize).BeginInit()
+ CType(Me.PicVehicle, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.PicBox, System.ComponentModel.ISupportInitialize).BeginInit()
+ Me.pnLookAheadCoasting.SuspendLayout()
Me.SuspendLayout()
'
'TabPgGen
@@ -164,58 +170,58 @@ Partial Class VectoJobForm
Me.TabPgGen.Controls.Add(Me.ButtonVEH)
Me.TabPgGen.Controls.Add(Me.ButtonGBX)
Me.TabPgGen.Controls.Add(Me.ButtonMAP)
- Me.TabPgGen.Location = New Point(4, 22)
+ Me.TabPgGen.Location = New System.Drawing.Point(4, 22)
Me.TabPgGen.Name = "TabPgGen"
- Me.TabPgGen.Padding = New Padding(3)
- Me.TabPgGen.Size = New Size(527, 534)
+ Me.TabPgGen.Padding = New System.Windows.Forms.Padding(3)
+ Me.TabPgGen.Size = New System.Drawing.Size(527, 534)
Me.TabPgGen.TabIndex = 0
Me.TabPgGen.Text = "General"
Me.TabPgGen.UseVisualStyleBackColor = True
'
'GrCycles
'
- Me.GrCycles.Anchor = CType((((AnchorStyles.Top Or AnchorStyles.Bottom) _
- Or AnchorStyles.Left) _
- Or AnchorStyles.Right), AnchorStyles)
+ Me.GrCycles.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.GrCycles.Controls.Add(Me.Label2)
Me.GrCycles.Controls.Add(Me.LvCycles)
Me.GrCycles.Controls.Add(Me.BtDRIrem)
Me.GrCycles.Controls.Add(Me.BtDRIadd)
- Me.GrCycles.Location = New Point(9, 314)
+ Me.GrCycles.Location = New System.Drawing.Point(9, 314)
Me.GrCycles.Name = "GrCycles"
- Me.GrCycles.Size = New Size(515, 184)
+ Me.GrCycles.Size = New System.Drawing.Size(515, 184)
Me.GrCycles.TabIndex = 10
Me.GrCycles.TabStop = False
Me.GrCycles.Text = "Cycles"
'
'Label2
'
- Me.Label2.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles)
+ 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 Point(379, 148)
+ Me.Label2.Location = New System.Drawing.Point(379, 148)
Me.Label2.Name = "Label2"
- Me.Label2.Size = New Size(133, 13)
+ Me.Label2.Size = New System.Drawing.Size(133, 13)
Me.Label2.TabIndex = 3
Me.Label2.Text = "(Double-Click to Open File)"
'
'LvCycles
'
- Me.LvCycles.Anchor = CType(((AnchorStyles.Top Or AnchorStyles.Left) _
- Or AnchorStyles.Right), AnchorStyles)
- Me.LvCycles.Columns.AddRange(New ColumnHeader() {Me.ColumnHeader1})
+ Me.LvCycles.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.LvCycles.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1})
Me.LvCycles.FullRowSelect = True
Me.LvCycles.GridLines = True
- Me.LvCycles.HeaderStyle = ColumnHeaderStyle.None
+ Me.LvCycles.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None
Me.LvCycles.HideSelection = False
Me.LvCycles.LabelEdit = True
- Me.LvCycles.Location = New Point(6, 25)
+ Me.LvCycles.Location = New System.Drawing.Point(6, 25)
Me.LvCycles.MultiSelect = False
Me.LvCycles.Name = "LvCycles"
- Me.LvCycles.Size = New Size(503, 123)
+ Me.LvCycles.Size = New System.Drawing.Size(503, 123)
Me.LvCycles.TabIndex = 0
Me.LvCycles.TabStop = False
Me.LvCycles.UseCompatibleStateImageBehavior = False
- Me.LvCycles.View = View.Details
+ Me.LvCycles.View = System.Windows.Forms.View.Details
'
'ColumnHeader1
'
@@ -224,29 +230,29 @@ Partial Class VectoJobForm
'
'BtDRIrem
'
- Me.BtDRIrem.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles)
- Me.BtDRIrem.Image = My.Resources.Resources.minus_circle_icon
- Me.BtDRIrem.Location = New Point(29, 149)
+ Me.BtDRIrem.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+ Me.BtDRIrem.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
+ Me.BtDRIrem.Location = New System.Drawing.Point(29, 149)
Me.BtDRIrem.Name = "BtDRIrem"
- Me.BtDRIrem.Size = New Size(24, 24)
+ Me.BtDRIrem.Size = New System.Drawing.Size(24, 24)
Me.BtDRIrem.TabIndex = 2
Me.BtDRIrem.UseVisualStyleBackColor = True
'
'BtDRIadd
'
- Me.BtDRIadd.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles)
- Me.BtDRIadd.Image = My.Resources.Resources.plus_circle_icon
- Me.BtDRIadd.Location = New Point(5, 149)
+ Me.BtDRIadd.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+ Me.BtDRIadd.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
+ Me.BtDRIadd.Location = New System.Drawing.Point(5, 149)
Me.BtDRIadd.Name = "BtDRIadd"
- Me.BtDRIadd.Size = New Size(24, 24)
+ Me.BtDRIadd.Size = New System.Drawing.Size(24, 24)
Me.BtDRIadd.TabIndex = 1
Me.BtDRIadd.UseVisualStyleBackColor = True
'
'GrAux
'
- Me.GrAux.Anchor = CType((((AnchorStyles.Top Or AnchorStyles.Bottom) _
- Or AnchorStyles.Left) _
- Or AnchorStyles.Right), AnchorStyles)
+ Me.GrAux.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.GrAux.Controls.Add(Me.btnAAUXOpen)
Me.GrAux.Controls.Add(Me.Label1)
Me.GrAux.Controls.Add(Me.btnBrowseAAUXFile)
@@ -258,102 +264,102 @@ Partial Class VectoJobForm
Me.GrAux.Controls.Add(Me.LvAux)
Me.GrAux.Controls.Add(Me.ButAuxRem)
Me.GrAux.Controls.Add(Me.ButAuxAdd)
- Me.GrAux.Location = New Point(6, 87)
+ Me.GrAux.Location = New System.Drawing.Point(6, 87)
Me.GrAux.Name = "GrAux"
- Me.GrAux.Size = New Size(515, 221)
+ Me.GrAux.Size = New System.Drawing.Size(515, 221)
Me.GrAux.TabIndex = 9
Me.GrAux.TabStop = False
Me.GrAux.Text = "Auxiliaries"
'
'btnAAUXOpen
'
- Me.btnAAUXOpen.Image = My.Resources.Resources.application_export_icon_small
- Me.btnAAUXOpen.Location = New Point(465, 45)
+ Me.btnAAUXOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
+ Me.btnAAUXOpen.Location = New System.Drawing.Point(465, 45)
Me.btnAAUXOpen.Name = "btnAAUXOpen"
- Me.btnAAUXOpen.Size = New Size(24, 24)
+ Me.btnAAUXOpen.Size = New System.Drawing.Size(24, 24)
Me.btnAAUXOpen.TabIndex = 41
Me.btnAAUXOpen.UseVisualStyleBackColor = True
'
'Label1
'
Me.Label1.AutoSize = True
- Me.Label1.Location = New Point(7, 52)
+ Me.Label1.Location = New System.Drawing.Point(7, 52)
Me.Label1.Name = "Label1"
- Me.Label1.Size = New Size(96, 13)
+ Me.Label1.Size = New System.Drawing.Size(96, 13)
Me.Label1.TabIndex = 40
Me.Label1.Text = "Advanced Aux File"
'
'btnBrowseAAUXFile
'
- Me.btnBrowseAAUXFile.Image = My.Resources.Resources.Open_icon
- Me.btnBrowseAAUXFile.Location = New Point(441, 45)
+ Me.btnBrowseAAUXFile.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
+ Me.btnBrowseAAUXFile.Location = New System.Drawing.Point(441, 45)
Me.btnBrowseAAUXFile.Name = "btnBrowseAAUXFile"
- Me.btnBrowseAAUXFile.Size = New Size(24, 24)
+ Me.btnBrowseAAUXFile.Size = New System.Drawing.Size(24, 24)
Me.btnBrowseAAUXFile.TabIndex = 39
Me.ToolTip1.SetToolTip(Me.btnBrowseAAUXFile, "Configure/Browser Advanced Auxiliary Files")
Me.btnBrowseAAUXFile.UseVisualStyleBackColor = True
'
'txtAdvancedAuxiliaryFile
'
- Me.txtAdvancedAuxiliaryFile.Location = New Point(119, 47)
+ Me.txtAdvancedAuxiliaryFile.Location = New System.Drawing.Point(119, 47)
Me.txtAdvancedAuxiliaryFile.Name = "txtAdvancedAuxiliaryFile"
- Me.txtAdvancedAuxiliaryFile.Size = New Size(321, 20)
+ Me.txtAdvancedAuxiliaryFile.Size = New System.Drawing.Size(321, 20)
Me.txtAdvancedAuxiliaryFile.TabIndex = 38
'
'picAuxInfo
'
- Me.picAuxInfo.Image = My.Resources.Resources.Information_icon
- Me.picAuxInfo.InitialImage = My.Resources.Resources.Information_icon
- Me.picAuxInfo.Location = New Point(451, 19)
+ Me.picAuxInfo.Image = Global.TUGraz.VECTO.My.Resources.Resources.Information_icon
+ Me.picAuxInfo.InitialImage = Global.TUGraz.VECTO.My.Resources.Resources.Information_icon
+ Me.picAuxInfo.Location = New System.Drawing.Point(451, 19)
Me.picAuxInfo.Name = "picAuxInfo"
- Me.picAuxInfo.Size = New Size(16, 16)
- Me.picAuxInfo.SizeMode = PictureBoxSizeMode.AutoSize
+ Me.picAuxInfo.Size = New System.Drawing.Size(16, 16)
+ Me.picAuxInfo.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize
Me.picAuxInfo.TabIndex = 37
Me.picAuxInfo.TabStop = False
'
'cboAdvancedAuxiliaries
'
Me.cboAdvancedAuxiliaries.FormattingEnabled = True
- Me.cboAdvancedAuxiliaries.Location = New Point(119, 18)
+ Me.cboAdvancedAuxiliaries.Location = New System.Drawing.Point(119, 18)
Me.cboAdvancedAuxiliaries.Name = "cboAdvancedAuxiliaries"
- Me.cboAdvancedAuxiliaries.Size = New Size(321, 21)
+ Me.cboAdvancedAuxiliaries.Size = New System.Drawing.Size(321, 21)
Me.cboAdvancedAuxiliaries.TabIndex = 36
'
'lbAdvancedAuxiliaries
'
Me.lbAdvancedAuxiliaries.AutoSize = True
- Me.lbAdvancedAuxiliaries.Location = New Point(7, 21)
+ Me.lbAdvancedAuxiliaries.Location = New System.Drawing.Point(7, 21)
Me.lbAdvancedAuxiliaries.Name = "lbAdvancedAuxiliaries"
- Me.lbAdvancedAuxiliaries.Size = New Size(72, 13)
+ Me.lbAdvancedAuxiliaries.Size = New System.Drawing.Size(72, 13)
Me.lbAdvancedAuxiliaries.TabIndex = 35
Me.lbAdvancedAuxiliaries.Text = "Auxiliary Type"
'
'Label32
'
- Me.Label32.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles)
+ Me.Label32.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.Label32.AutoSize = True
- Me.Label32.Location = New Point(406, 189)
+ Me.Label32.Location = New System.Drawing.Point(406, 189)
Me.Label32.Name = "Label32"
- Me.Label32.Size = New Size(106, 13)
+ Me.Label32.Size = New System.Drawing.Size(106, 13)
Me.Label32.TabIndex = 3
Me.Label32.Text = "(Double-Click to Edit)"
'
'LvAux
'
- Me.LvAux.Anchor = CType(((AnchorStyles.Top Or AnchorStyles.Left) _
- Or AnchorStyles.Right), AnchorStyles)
- Me.LvAux.Columns.AddRange(New ColumnHeader() {Me.ColumnHeader4, Me.ColumnHeader5, Me.ColumnHeader6})
+ Me.LvAux.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.LvAux.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader4, Me.ColumnHeader5, Me.ColumnHeader6})
Me.LvAux.FullRowSelect = True
Me.LvAux.GridLines = True
Me.LvAux.HideSelection = False
- Me.LvAux.Location = New Point(6, 72)
+ Me.LvAux.Location = New System.Drawing.Point(6, 72)
Me.LvAux.MultiSelect = False
Me.LvAux.Name = "LvAux"
- Me.LvAux.Size = New Size(503, 117)
+ Me.LvAux.Size = New System.Drawing.Size(503, 117)
Me.LvAux.TabIndex = 0
Me.LvAux.TabStop = False
Me.LvAux.UseCompatibleStateImageBehavior = False
- Me.LvAux.View = View.Details
+ Me.LvAux.View = System.Windows.Forms.View.Details
'
'ColumnHeader4
'
@@ -372,54 +378,54 @@ Partial Class VectoJobForm
'
'ButAuxRem
'
- Me.ButAuxRem.Image = My.Resources.Resources.minus_circle_icon
- Me.ButAuxRem.Location = New Point(29, 190)
+ Me.ButAuxRem.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
+ Me.ButAuxRem.Location = New System.Drawing.Point(29, 190)
Me.ButAuxRem.Name = "ButAuxRem"
- Me.ButAuxRem.Size = New Size(24, 24)
+ Me.ButAuxRem.Size = New System.Drawing.Size(24, 24)
Me.ButAuxRem.TabIndex = 2
Me.ButAuxRem.UseVisualStyleBackColor = True
'
'ButAuxAdd
'
- Me.ButAuxAdd.Image = My.Resources.Resources.plus_circle_icon
- Me.ButAuxAdd.Location = New Point(5, 190)
+ Me.ButAuxAdd.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
+ Me.ButAuxAdd.Location = New System.Drawing.Point(5, 190)
Me.ButAuxAdd.Name = "ButAuxAdd"
- Me.ButAuxAdd.Size = New Size(24, 24)
+ Me.ButAuxAdd.Size = New System.Drawing.Size(24, 24)
Me.ButAuxAdd.TabIndex = 1
Me.ButAuxAdd.UseVisualStyleBackColor = True
'
'TbGBX
'
- Me.TbGBX.Anchor = CType(((AnchorStyles.Top Or AnchorStyles.Left) _
- Or AnchorStyles.Right), AnchorStyles)
- Me.TbGBX.Location = New Point(84, 60)
+ Me.TbGBX.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.TbGBX.Location = New System.Drawing.Point(84, 60)
Me.TbGBX.Name = "TbGBX"
- Me.TbGBX.Size = New Size(411, 20)
+ Me.TbGBX.Size = New System.Drawing.Size(411, 20)
Me.TbGBX.TabIndex = 7
'
'TbENG
'
- Me.TbENG.Anchor = CType(((AnchorStyles.Top Or AnchorStyles.Left) _
- Or AnchorStyles.Right), AnchorStyles)
- Me.TbENG.Location = New Point(84, 33)
+ Me.TbENG.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.TbENG.Location = New System.Drawing.Point(84, 33)
Me.TbENG.Name = "TbENG"
- Me.TbENG.Size = New Size(411, 20)
+ Me.TbENG.Size = New System.Drawing.Size(411, 20)
Me.TbENG.TabIndex = 4
'
'TbVEH
'
- Me.TbVEH.Anchor = CType(((AnchorStyles.Top Or AnchorStyles.Left) _
- Or AnchorStyles.Right), AnchorStyles)
- Me.TbVEH.Location = New Point(84, 7)
+ Me.TbVEH.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.TbVEH.Location = New System.Drawing.Point(84, 7)
Me.TbVEH.Name = "TbVEH"
- Me.TbVEH.Size = New Size(411, 20)
+ Me.TbVEH.Size = New System.Drawing.Size(411, 20)
Me.TbVEH.TabIndex = 1
'
'ButOpenGBX
'
- Me.ButOpenGBX.Location = New Point(6, 60)
+ Me.ButOpenGBX.Location = New System.Drawing.Point(6, 60)
Me.ButOpenGBX.Name = "ButOpenGBX"
- Me.ButOpenGBX.Size = New Size(72, 21)
+ Me.ButOpenGBX.Size = New System.Drawing.Size(72, 21)
Me.ButOpenGBX.TabIndex = 6
Me.ButOpenGBX.TabStop = False
Me.ButOpenGBX.Text = "Gearbox"
@@ -427,9 +433,9 @@ Partial Class VectoJobForm
'
'ButOpenENG
'
- Me.ButOpenENG.Location = New Point(6, 33)
+ Me.ButOpenENG.Location = New System.Drawing.Point(6, 33)
Me.ButOpenENG.Name = "ButOpenENG"
- Me.ButOpenENG.Size = New Size(72, 21)
+ Me.ButOpenENG.Size = New System.Drawing.Size(72, 21)
Me.ButOpenENG.TabIndex = 3
Me.ButOpenENG.TabStop = False
Me.ButOpenENG.Text = "Engine"
@@ -437,9 +443,9 @@ Partial Class VectoJobForm
'
'ButOpenVEH
'
- Me.ButOpenVEH.Location = New Point(6, 6)
+ Me.ButOpenVEH.Location = New System.Drawing.Point(6, 6)
Me.ButOpenVEH.Name = "ButOpenVEH"
- Me.ButOpenVEH.Size = New Size(72, 21)
+ Me.ButOpenVEH.Size = New System.Drawing.Size(72, 21)
Me.ButOpenVEH.TabIndex = 0
Me.ButOpenVEH.TabStop = False
Me.ButOpenVEH.Text = "Vehicle"
@@ -447,48 +453,48 @@ Partial Class VectoJobForm
'
'ButtonVEH
'
- Me.ButtonVEH.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles)
- Me.ButtonVEH.Image = CType(resources.GetObject("ButtonVEH.Image"), Image)
- Me.ButtonVEH.Location = New Point(496, 5)
+ Me.ButtonVEH.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.ButtonVEH.Image = CType(resources.GetObject("ButtonVEH.Image"), System.Drawing.Image)
+ Me.ButtonVEH.Location = New System.Drawing.Point(496, 5)
Me.ButtonVEH.Name = "ButtonVEH"
- Me.ButtonVEH.Size = New Size(24, 24)
+ Me.ButtonVEH.Size = New System.Drawing.Size(24, 24)
Me.ButtonVEH.TabIndex = 2
Me.ButtonVEH.TabStop = False
Me.ButtonVEH.UseVisualStyleBackColor = True
'
'ButtonGBX
'
- Me.ButtonGBX.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles)
- Me.ButtonGBX.Image = CType(resources.GetObject("ButtonGBX.Image"), Image)
- Me.ButtonGBX.Location = New Point(496, 58)
+ Me.ButtonGBX.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.ButtonGBX.Image = CType(resources.GetObject("ButtonGBX.Image"), System.Drawing.Image)
+ Me.ButtonGBX.Location = New System.Drawing.Point(496, 58)
Me.ButtonGBX.Name = "ButtonGBX"
- Me.ButtonGBX.Size = New Size(24, 24)
+ Me.ButtonGBX.Size = New System.Drawing.Size(24, 24)
Me.ButtonGBX.TabIndex = 8
Me.ButtonGBX.TabStop = False
Me.ButtonGBX.UseVisualStyleBackColor = True
'
'ButtonMAP
'
- Me.ButtonMAP.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles)
- Me.ButtonMAP.Image = CType(resources.GetObject("ButtonMAP.Image"), Image)
- Me.ButtonMAP.Location = New Point(496, 31)
+ Me.ButtonMAP.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.ButtonMAP.Image = CType(resources.GetObject("ButtonMAP.Image"), System.Drawing.Image)
+ Me.ButtonMAP.Location = New System.Drawing.Point(496, 31)
Me.ButtonMAP.Name = "ButtonMAP"
- Me.ButtonMAP.Size = New Size(24, 24)
+ Me.ButtonMAP.Size = New System.Drawing.Size(24, 24)
Me.ButtonMAP.TabIndex = 5
Me.ButtonMAP.TabStop = False
Me.ButtonMAP.UseVisualStyleBackColor = True
'
'TabControl1
'
- Me.TabControl1.Anchor = CType(((AnchorStyles.Top Or AnchorStyles.Left) _
- Or AnchorStyles.Right), AnchorStyles)
+ Me.TabControl1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.TabControl1.Controls.Add(Me.TabPgGen)
Me.TabControl1.Controls.Add(Me.TabPgDriver)
- Me.TabControl1.Location = New Point(1, 107)
+ Me.TabControl1.Location = New System.Drawing.Point(1, 107)
Me.TabControl1.Name = "TabControl1"
Me.TabControl1.SelectedIndex = 0
- Me.TabControl1.Size = New Size(535, 560)
- Me.TabControl1.SizeMode = TabSizeMode.Fixed
+ Me.TabControl1.Size = New System.Drawing.Size(535, 560)
+ Me.TabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed
Me.TabControl1.TabIndex = 0
'
'TabPgDriver
@@ -497,10 +503,10 @@ Partial Class VectoJobForm
Me.TabPgDriver.Controls.Add(Me.GrLAC)
Me.TabPgDriver.Controls.Add(Me.GroupBox1)
Me.TabPgDriver.Controls.Add(Me.GrStartStop)
- Me.TabPgDriver.Location = New Point(4, 22)
+ Me.TabPgDriver.Location = New System.Drawing.Point(4, 22)
Me.TabPgDriver.Name = "TabPgDriver"
- Me.TabPgDriver.Padding = New Padding(3)
- Me.TabPgDriver.Size = New Size(527, 534)
+ Me.TabPgDriver.Padding = New System.Windows.Forms.Padding(3)
+ Me.TabPgDriver.Size = New System.Drawing.Size(527, 534)
Me.TabPgDriver.TabIndex = 7
Me.TabPgDriver.Text = "Driver Assist"
Me.TabPgDriver.UseVisualStyleBackColor = True
@@ -510,193 +516,75 @@ Partial Class VectoJobForm
Me.GrVACC.Controls.Add(Me.TbDesMaxFile)
Me.GrVACC.Controls.Add(Me.BtDesMaxBr)
Me.GrVACC.Controls.Add(Me.BtAccOpen)
- Me.GrVACC.Location = New Point(6, 459)
+ Me.GrVACC.Location = New System.Drawing.Point(6, 459)
Me.GrVACC.Name = "GrVACC"
- Me.GrVACC.Size = New Size(515, 65)
+ Me.GrVACC.Size = New System.Drawing.Size(515, 65)
Me.GrVACC.TabIndex = 3
Me.GrVACC.TabStop = False
Me.GrVACC.Text = "Max. acceleration and brake curves"
'
'TbDesMaxFile
'
- Me.TbDesMaxFile.Anchor = CType(((AnchorStyles.Top Or AnchorStyles.Left) _
- Or AnchorStyles.Right), AnchorStyles)
- Me.TbDesMaxFile.Location = New Point(6, 29)
+ Me.TbDesMaxFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.TbDesMaxFile.Location = New System.Drawing.Point(6, 29)
Me.TbDesMaxFile.Name = "TbDesMaxFile"
- Me.TbDesMaxFile.Size = New Size(440, 20)
+ Me.TbDesMaxFile.Size = New System.Drawing.Size(433, 20)
Me.TbDesMaxFile.TabIndex = 0
'
'BtDesMaxBr
'
- Me.BtDesMaxBr.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles)
- Me.BtDesMaxBr.Image = My.Resources.Resources.Open_icon
- Me.BtDesMaxBr.Location = New Point(446, 27)
+ Me.BtDesMaxBr.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.BtDesMaxBr.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
+ Me.BtDesMaxBr.Location = New System.Drawing.Point(446, 27)
Me.BtDesMaxBr.Name = "BtDesMaxBr"
- Me.BtDesMaxBr.Size = New Size(24, 24)
+ Me.BtDesMaxBr.Size = New System.Drawing.Size(24, 24)
Me.BtDesMaxBr.TabIndex = 1
Me.BtDesMaxBr.UseVisualStyleBackColor = True
'
'BtAccOpen
'
- Me.BtAccOpen.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles)
- Me.BtAccOpen.Image = My.Resources.Resources.application_export_icon_small
- Me.BtAccOpen.Location = New Point(469, 27)
+ Me.BtAccOpen.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.BtAccOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
+ Me.BtAccOpen.Location = New System.Drawing.Point(469, 27)
Me.BtAccOpen.Name = "BtAccOpen"
- Me.BtAccOpen.Size = New Size(24, 24)
+ Me.BtAccOpen.Size = New System.Drawing.Size(24, 24)
Me.BtAccOpen.TabIndex = 2
Me.BtAccOpen.TabStop = False
Me.BtAccOpen.UseVisualStyleBackColor = True
'
'GrLAC
'
- Me.GrLAC.Controls.Add(Me.Label12)
- Me.GrLAC.Controls.Add(Me.tbDfCoastingScale)
+ Me.GrLAC.Controls.Add(Me.pnLookAheadCoasting)
Me.GrLAC.Controls.Add(Me.CbLookAhead)
- Me.GrLAC.Controls.Add(Me.Label11)
- Me.GrLAC.Controls.Add(Me.Label3)
- Me.GrLAC.Controls.Add(Me.tbDfCoastingOffset)
- Me.GrLAC.Controls.Add(Me.tbLacDfTargetSpeedFile)
- Me.GrLAC.Controls.Add(Me.Label10)
- Me.GrLAC.Controls.Add(Me.Label4)
- Me.GrLAC.Controls.Add(Me.Label5)
- Me.GrLAC.Controls.Add(Me.btnDfTargetSpeed)
- Me.GrLAC.Controls.Add(Me.tbLacPreviewFactor)
- Me.GrLAC.Controls.Add(Me.tbLacDfVelocityDropFile)
- Me.GrLAC.Location = New Point(7, 290)
+ Me.GrLAC.Location = New System.Drawing.Point(7, 280)
Me.GrLAC.Name = "GrLAC"
- Me.GrLAC.Size = New Size(514, 163)
+ Me.GrLAC.Size = New System.Drawing.Size(514, 173)
Me.GrLAC.TabIndex = 2
Me.GrLAC.TabStop = False
Me.GrLAC.Text = "Look-Ahead Coasting"
'
- 'Label12
- '
- Me.Label12.AutoSize = True
- Me.Label12.Location = New Point(279, 133)
- Me.Label12.Name = "Label12"
- Me.Label12.Size = New Size(130, 13)
- Me.Label12.TabIndex = 17
- Me.Label12.Text = "* DF_vTarget * DF_vDrop"
- '
- 'tbDfCoastingScale
- '
- Me.tbDfCoastingScale.Location = New Point(236, 130)
- Me.tbDfCoastingScale.Name = "tbDfCoastingScale"
- Me.tbDfCoastingScale.Size = New Size(37, 20)
- Me.tbDfCoastingScale.TabIndex = 16
- '
'CbLookAhead
'
Me.CbLookAhead.AutoSize = True
Me.CbLookAhead.Checked = True
- Me.CbLookAhead.CheckState = CheckState.Checked
- Me.CbLookAhead.Location = New Point(16, 21)
+ Me.CbLookAhead.CheckState = System.Windows.Forms.CheckState.Checked
+ Me.CbLookAhead.Location = New System.Drawing.Point(16, 21)
Me.CbLookAhead.Name = "CbLookAhead"
- Me.CbLookAhead.Size = New Size(65, 17)
+ Me.CbLookAhead.Size = New System.Drawing.Size(65, 17)
Me.CbLookAhead.TabIndex = 0
Me.CbLookAhead.Text = "Enabled"
Me.CbLookAhead.UseVisualStyleBackColor = True
'
- 'Label11
- '
- Me.Label11.AutoSize = True
- Me.Label11.Location = New Point(219, 132)
- Me.Label11.Name = "Label11"
- Me.Label11.Size = New Size(13, 13)
- Me.Label11.TabIndex = 15
- Me.Label11.Text = "- "
- '
- 'Label3
- '
- Me.Label3.AutoSize = True
- Me.Label3.Location = New Point(50, 54)
- Me.Label3.Name = "Label3"
- Me.Label3.Size = New Size(118, 13)
- Me.Label3.TabIndex = 4
- Me.Label3.Text = "Preview distance factor"
- Me.Label3.TextAlign = ContentAlignment.MiddleRight
- '
- 'tbDfCoastingOffset
- '
- Me.tbDfCoastingOffset.Location = New Point(175, 130)
- Me.tbDfCoastingOffset.Name = "tbDfCoastingOffset"
- Me.tbDfCoastingOffset.Size = New Size(37, 20)
- Me.tbDfCoastingOffset.TabIndex = 14
- '
- 'tbLacDfTargetSpeedFile
- '
- Me.tbLacDfTargetSpeedFile.Anchor = CType(((AnchorStyles.Top Or AnchorStyles.Left) _
- Or AnchorStyles.Right), AnchorStyles)
- Me.tbLacDfTargetSpeedFile.Location = New Point(174, 77)
- Me.tbLacDfTargetSpeedFile.Name = "tbLacDfTargetSpeedFile"
- Me.tbLacDfTargetSpeedFile.Size = New Size(264, 20)
- Me.tbLacDfTargetSpeedFile.TabIndex = 6
- '
- 'Label10
- '
- Me.Label10.AutoSize = True
- Me.Label10.Location = New Point(89, 133)
- Me.Label10.Name = "Label10"
- Me.Label10.Size = New Size(79, 13)
- Me.Label10.TabIndex = 12
- Me.Label10.Text = "DF_coasting = "
- '
- 'Label4
- '
- Me.Label4.AutoSize = True
- Me.Label4.Location = New Point(13, 80)
- Me.Label4.Name = "Label4"
- Me.Label4.Size = New Size(155, 13)
- Me.Label4.TabIndex = 8
- Me.Label4.Text = "Decision Factor - Target Speed"
- Me.Label4.TextAlign = ContentAlignment.MiddleRight
- '
- 'Label5
- '
- Me.Label5.AutoSize = True
- Me.Label5.Location = New Point(15, 107)
- Me.Label5.Name = "Label5"
- Me.Label5.Size = New Size(153, 13)
- Me.Label5.TabIndex = 11
- Me.Label5.Text = "Decision Factor - Velocity Drop"
- Me.Label5.TextAlign = ContentAlignment.MiddleRight
- '
- 'btnDfTargetSpeed
- '
- Me.btnDfTargetSpeed.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles)
- Me.btnDfTargetSpeed.Image = CType(resources.GetObject("btnDfTargetSpeed.Image"), Image)
- Me.btnDfTargetSpeed.Location = New Point(438, 76)
- Me.btnDfTargetSpeed.Name = "btnDfTargetSpeed"
- Me.btnDfTargetSpeed.Size = New Size(24, 24)
- Me.btnDfTargetSpeed.TabIndex = 7
- Me.btnDfTargetSpeed.TabStop = False
- Me.btnDfTargetSpeed.UseVisualStyleBackColor = True
- '
- 'tbLacPreviewFactor
- '
- Me.tbLacPreviewFactor.Location = New Point(174, 51)
- Me.tbLacPreviewFactor.Name = "tbLacPreviewFactor"
- Me.tbLacPreviewFactor.Size = New Size(64, 20)
- Me.tbLacPreviewFactor.TabIndex = 5
- '
- 'tbLacDfVelocityDropFile
- '
- Me.tbLacDfVelocityDropFile.Anchor = CType(((AnchorStyles.Top Or AnchorStyles.Left) _
- Or AnchorStyles.Right), AnchorStyles)
- Me.tbLacDfVelocityDropFile.Location = New Point(174, 104)
- Me.tbLacDfVelocityDropFile.Name = "tbLacDfVelocityDropFile"
- Me.tbLacDfVelocityDropFile.Size = New Size(264, 20)
- Me.tbLacDfVelocityDropFile.TabIndex = 9
- '
'GroupBox1
'
Me.GroupBox1.Controls.Add(Me.PnEcoRoll)
Me.GroupBox1.Controls.Add(Me.RdEcoRoll)
Me.GroupBox1.Controls.Add(Me.RdOverspeed)
Me.GroupBox1.Controls.Add(Me.RdOff)
- Me.GroupBox1.Location = New Point(6, 149)
+ Me.GroupBox1.Location = New System.Drawing.Point(6, 149)
Me.GroupBox1.Name = "GroupBox1"
- Me.GroupBox1.Size = New Size(515, 135)
+ Me.GroupBox1.Size = New System.Drawing.Size(515, 125)
Me.GroupBox1.TabIndex = 1
Me.GroupBox1.TabStop = False
Me.GroupBox1.Text = "Overspeed / Eco-Roll"
@@ -712,83 +600,83 @@ Partial Class VectoJobForm
Me.PnEcoRoll.Controls.Add(Me.Label23)
Me.PnEcoRoll.Controls.Add(Me.Label22)
Me.PnEcoRoll.Controls.Add(Me.Label13)
- Me.PnEcoRoll.Location = New Point(137, 16)
+ Me.PnEcoRoll.Location = New System.Drawing.Point(137, 16)
Me.PnEcoRoll.Name = "PnEcoRoll"
- Me.PnEcoRoll.Size = New Size(232, 102)
+ Me.PnEcoRoll.Size = New System.Drawing.Size(232, 102)
Me.PnEcoRoll.TabIndex = 3
'
'Label21
'
Me.Label21.AutoSize = True
- Me.Label21.Location = New Point(178, 61)
+ Me.Label21.Location = New System.Drawing.Point(178, 61)
Me.Label21.Name = "Label21"
- Me.Label21.Size = New Size(38, 13)
+ Me.Label21.Size = New System.Drawing.Size(38, 13)
Me.Label21.TabIndex = 3
Me.Label21.Text = "[km/h]"
'
'Label20
'
Me.Label20.AutoSize = True
- Me.Label20.Location = New Point(178, 35)
+ Me.Label20.Location = New System.Drawing.Point(178, 35)
Me.Label20.Name = "Label20"
- Me.Label20.Size = New Size(38, 13)
+ Me.Label20.Size = New System.Drawing.Size(38, 13)
Me.Label20.TabIndex = 3
Me.Label20.Text = "[km/h]"
'
'Label14
'
Me.Label14.AutoSize = True
- Me.Label14.Location = New Point(178, 9)
+ Me.Label14.Location = New System.Drawing.Point(178, 9)
Me.Label14.Name = "Label14"
- Me.Label14.Size = New Size(38, 13)
+ Me.Label14.Size = New System.Drawing.Size(38, 13)
Me.Label14.TabIndex = 3
Me.Label14.Text = "[km/h]"
'
'TbVmin
'
- Me.TbVmin.Location = New Point(108, 58)
+ Me.TbVmin.Location = New System.Drawing.Point(108, 58)
Me.TbVmin.Name = "TbVmin"
- Me.TbVmin.Size = New Size(64, 20)
+ Me.TbVmin.Size = New System.Drawing.Size(64, 20)
Me.TbVmin.TabIndex = 2
'
'TbUnderSpeed
'
- Me.TbUnderSpeed.Location = New Point(108, 32)
+ Me.TbUnderSpeed.Location = New System.Drawing.Point(108, 32)
Me.TbUnderSpeed.Name = "TbUnderSpeed"
- Me.TbUnderSpeed.Size = New Size(64, 20)
+ Me.TbUnderSpeed.Size = New System.Drawing.Size(64, 20)
Me.TbUnderSpeed.TabIndex = 1
'
'TbOverspeed
'
- Me.TbOverspeed.Location = New Point(108, 6)
+ Me.TbOverspeed.Location = New System.Drawing.Point(108, 6)
Me.TbOverspeed.Name = "TbOverspeed"
- Me.TbOverspeed.Size = New Size(64, 20)
+ Me.TbOverspeed.Size = New System.Drawing.Size(64, 20)
Me.TbOverspeed.TabIndex = 0
'
'Label23
'
Me.Label23.AutoSize = True
- Me.Label23.Location = New Point(22, 61)
+ Me.Label23.Location = New System.Drawing.Point(22, 61)
Me.Label23.Name = "Label23"
- Me.Label23.Size = New Size(80, 13)
+ Me.Label23.Size = New System.Drawing.Size(80, 13)
Me.Label23.TabIndex = 1
Me.Label23.Text = "Minimum speed"
'
'Label22
'
Me.Label22.AutoSize = True
- Me.Label22.Location = New Point(11, 35)
+ Me.Label22.Location = New System.Drawing.Point(11, 35)
Me.Label22.Name = "Label22"
- Me.Label22.Size = New Size(91, 13)
+ Me.Label22.Size = New System.Drawing.Size(91, 13)
Me.Label22.TabIndex = 1
Me.Label22.Text = "Max. Underspeed"
'
'Label13
'
Me.Label13.AutoSize = True
- Me.Label13.Location = New Point(17, 9)
+ Me.Label13.Location = New System.Drawing.Point(17, 9)
Me.Label13.Name = "Label13"
- Me.Label13.Size = New Size(85, 13)
+ Me.Label13.Size = New System.Drawing.Size(85, 13)
Me.Label13.TabIndex = 1
Me.Label13.Text = "Max. Overspeed"
'
@@ -796,9 +684,9 @@ Partial Class VectoJobForm
'
Me.RdEcoRoll.AutoSize = True
Me.RdEcoRoll.Checked = True
- Me.RdEcoRoll.Location = New Point(13, 68)
+ Me.RdEcoRoll.Location = New System.Drawing.Point(13, 68)
Me.RdEcoRoll.Name = "RdEcoRoll"
- Me.RdEcoRoll.Size = New Size(65, 17)
+ Me.RdEcoRoll.Size = New System.Drawing.Size(65, 17)
Me.RdEcoRoll.TabIndex = 2
Me.RdEcoRoll.TabStop = True
Me.RdEcoRoll.Text = "Eco-Roll"
@@ -807,9 +695,9 @@ Partial Class VectoJobForm
'RdOverspeed
'
Me.RdOverspeed.AutoSize = True
- Me.RdOverspeed.Location = New Point(13, 45)
+ Me.RdOverspeed.Location = New System.Drawing.Point(13, 45)
Me.RdOverspeed.Name = "RdOverspeed"
- Me.RdOverspeed.Size = New Size(77, 17)
+ Me.RdOverspeed.Size = New System.Drawing.Size(77, 17)
Me.RdOverspeed.TabIndex = 1
Me.RdOverspeed.Text = "Overspeed"
Me.RdOverspeed.UseVisualStyleBackColor = True
@@ -817,9 +705,9 @@ Partial Class VectoJobForm
'RdOff
'
Me.RdOff.AutoSize = True
- Me.RdOff.Location = New Point(13, 22)
+ Me.RdOff.Location = New System.Drawing.Point(13, 22)
Me.RdOff.Name = "RdOff"
- Me.RdOff.Size = New Size(39, 17)
+ Me.RdOff.Size = New System.Drawing.Size(39, 17)
Me.RdOff.TabIndex = 0
Me.RdOff.Text = "Off"
Me.RdOff.UseVisualStyleBackColor = True
@@ -828,9 +716,9 @@ Partial Class VectoJobForm
'
Me.GrStartStop.Controls.Add(Me.PnStartStop)
Me.GrStartStop.Controls.Add(Me.ChBStartStop)
- Me.GrStartStop.Location = New Point(6, 6)
+ Me.GrStartStop.Location = New System.Drawing.Point(6, 6)
Me.GrStartStop.Name = "GrStartStop"
- Me.GrStartStop.Size = New Size(515, 137)
+ Me.GrStartStop.Size = New System.Drawing.Size(515, 137)
Me.GrStartStop.TabIndex = 0
Me.GrStartStop.TabStop = False
Me.GrStartStop.Text = "Engine Start Stop"
@@ -846,104 +734,104 @@ Partial Class VectoJobForm
Me.PnStartStop.Controls.Add(Me.LabelSStime)
Me.PnStartStop.Controls.Add(Me.TbSSdelay)
Me.PnStartStop.Controls.Add(Me.TbSStime)
- Me.PnStartStop.Location = New Point(87, 21)
+ Me.PnStartStop.Location = New System.Drawing.Point(87, 21)
Me.PnStartStop.Name = "PnStartStop"
- Me.PnStartStop.Size = New Size(422, 95)
+ Me.PnStartStop.Size = New System.Drawing.Size(422, 95)
Me.PnStartStop.TabIndex = 1
'
'Label31
'
Me.Label31.AutoSize = True
- Me.Label31.Location = New Point(228, 58)
+ Me.Label31.Location = New System.Drawing.Point(228, 58)
Me.Label31.Name = "Label31"
- Me.Label31.Size = New Size(18, 13)
+ Me.Label31.Size = New System.Drawing.Size(18, 13)
Me.Label31.TabIndex = 38
Me.Label31.Text = "[s]"
'
'Label27
'
Me.Label27.AutoSize = True
- Me.Label27.Location = New Point(228, 32)
+ Me.Label27.Location = New System.Drawing.Point(228, 32)
Me.Label27.Name = "Label27"
- Me.Label27.Size = New Size(18, 13)
+ Me.Label27.Size = New System.Drawing.Size(18, 13)
Me.Label27.TabIndex = 38
Me.Label27.Text = "[s]"
'
'TbSSspeed
'
- Me.TbSSspeed.Location = New Point(158, 3)
+ Me.TbSSspeed.Location = New System.Drawing.Point(158, 3)
Me.TbSSspeed.Name = "TbSSspeed"
- Me.TbSSspeed.Size = New Size(64, 20)
+ Me.TbSSspeed.Size = New System.Drawing.Size(64, 20)
Me.TbSSspeed.TabIndex = 0
'
'LabelSSspeed
'
Me.LabelSSspeed.AutoSize = True
- Me.LabelSSspeed.Location = New Point(91, 6)
+ Me.LabelSSspeed.Location = New System.Drawing.Point(91, 6)
Me.LabelSSspeed.Name = "LabelSSspeed"
- Me.LabelSSspeed.Size = New Size(61, 13)
+ Me.LabelSSspeed.Size = New System.Drawing.Size(61, 13)
Me.LabelSSspeed.TabIndex = 37
Me.LabelSSspeed.Text = "Max Speed"
'
'Label26
'
Me.Label26.AutoSize = True
- Me.Label26.Location = New Point(228, 6)
+ Me.Label26.Location = New System.Drawing.Point(228, 6)
Me.Label26.Name = "Label26"
- Me.Label26.Size = New Size(38, 13)
+ Me.Label26.Size = New System.Drawing.Size(38, 13)
Me.Label26.TabIndex = 38
Me.Label26.Text = "[km/h]"
'
'Label30
'
Me.Label30.AutoSize = True
- Me.Label30.Location = New Point(68, 58)
+ Me.Label30.Location = New System.Drawing.Point(68, 58)
Me.Label30.Name = "Label30"
- Me.Label30.Size = New Size(84, 13)
+ Me.Label30.Size = New System.Drawing.Size(84, 13)
Me.Label30.TabIndex = 35
Me.Label30.Text = "Activation Delay"
'
'LabelSStime
'
Me.LabelSStime.AutoSize = True
- Me.LabelSStime.Location = New Point(65, 32)
+ Me.LabelSStime.Location = New System.Drawing.Point(65, 32)
Me.LabelSStime.Name = "LabelSStime"
- Me.LabelSStime.Size = New Size(87, 13)
+ Me.LabelSStime.Size = New System.Drawing.Size(87, 13)
Me.LabelSStime.TabIndex = 35
Me.LabelSStime.Text = "Min ICE-On Time"
'
'TbSSdelay
'
- Me.TbSSdelay.Location = New Point(158, 55)
+ Me.TbSSdelay.Location = New System.Drawing.Point(158, 55)
Me.TbSSdelay.Name = "TbSSdelay"
- Me.TbSSdelay.Size = New Size(64, 20)
+ Me.TbSSdelay.Size = New System.Drawing.Size(64, 20)
Me.TbSSdelay.TabIndex = 2
'
'TbSStime
'
- Me.TbSStime.Location = New Point(158, 29)
+ Me.TbSStime.Location = New System.Drawing.Point(158, 29)
Me.TbSStime.Name = "TbSStime"
- Me.TbSStime.Size = New Size(64, 20)
+ Me.TbSStime.Size = New System.Drawing.Size(64, 20)
Me.TbSStime.TabIndex = 1
'
'ChBStartStop
'
Me.ChBStartStop.AutoSize = True
Me.ChBStartStop.Checked = True
- Me.ChBStartStop.CheckState = CheckState.Checked
- Me.ChBStartStop.Location = New Point(16, 21)
+ Me.ChBStartStop.CheckState = System.Windows.Forms.CheckState.Checked
+ Me.ChBStartStop.Location = New System.Drawing.Point(16, 21)
Me.ChBStartStop.Name = "ChBStartStop"
- Me.ChBStartStop.Size = New Size(65, 17)
+ Me.ChBStartStop.Size = New System.Drawing.Size(65, 17)
Me.ChBStartStop.TabIndex = 0
Me.ChBStartStop.Text = "Enabled"
Me.ChBStartStop.UseVisualStyleBackColor = True
'
'StatusStrip1
'
- Me.StatusStrip1.Items.AddRange(New ToolStripItem() {Me.ToolStripStatusLabelGEN})
- Me.StatusStrip1.Location = New Point(0, 672)
+ Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripStatusLabelGEN})
+ Me.StatusStrip1.Location = New System.Drawing.Point(0, 672)
Me.StatusStrip1.Name = "StatusStrip1"
- Me.StatusStrip1.Size = New Size(944, 22)
+ Me.StatusStrip1.Size = New System.Drawing.Size(944, 22)
Me.StatusStrip1.SizingGrip = False
Me.StatusStrip1.TabIndex = 6
Me.StatusStrip1.Text = "StatusStrip1"
@@ -951,221 +839,386 @@ Partial Class VectoJobForm
'ToolStripStatusLabelGEN
'
Me.ToolStripStatusLabelGEN.Name = "ToolStripStatusLabelGEN"
- Me.ToolStripStatusLabelGEN.Size = New Size(121, 17)
+ Me.ToolStripStatusLabelGEN.Size = New System.Drawing.Size(121, 17)
Me.ToolStripStatusLabelGEN.Text = "ToolStripStatusLabel1"
'
'ButOK
'
- Me.ButOK.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles)
- Me.ButOK.Location = New Point(779, 646)
+ 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(779, 646)
Me.ButOK.Name = "ButOK"
- Me.ButOK.Size = New Size(75, 23)
+ Me.ButOK.Size = New System.Drawing.Size(75, 23)
Me.ButOK.TabIndex = 0
Me.ButOK.Text = "Save"
Me.ButOK.UseVisualStyleBackColor = True
'
'ButCancel
'
- Me.ButCancel.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles)
- Me.ButCancel.DialogResult = DialogResult.Cancel
- Me.ButCancel.Location = New Point(860, 646)
+ 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(860, 646)
Me.ButCancel.Name = "ButCancel"
- Me.ButCancel.Size = New Size(75, 23)
+ Me.ButCancel.Size = New System.Drawing.Size(75, 23)
Me.ButCancel.TabIndex = 1
Me.ButCancel.Text = "Cancel"
Me.ButCancel.UseVisualStyleBackColor = True
'
'ToolStrip1
'
- Me.ToolStrip1.GripStyle = ToolStripGripStyle.Hidden
- Me.ToolStrip1.Items.AddRange(New ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator1, Me.ToolStripBtSendTo, Me.ToolStripSeparator2, Me.ToolStripButton1})
- Me.ToolStrip1.Location = New Point(0, 0)
+ 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.ToolStripSeparator1, Me.ToolStripBtSendTo, Me.ToolStripSeparator2, Me.ToolStripButton1})
+ Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
Me.ToolStrip1.Name = "ToolStrip1"
- Me.ToolStrip1.Size = New Size(944, 25)
+ Me.ToolStrip1.Size = New System.Drawing.Size(944, 25)
Me.ToolStrip1.TabIndex = 20
Me.ToolStrip1.Text = "ToolStrip1"
'
'ToolStripBtNew
'
- Me.ToolStripBtNew.DisplayStyle = ToolStripItemDisplayStyle.Image
- Me.ToolStripBtNew.Image = My.Resources.Resources.blue_document_icon
- Me.ToolStripBtNew.ImageTransparentColor = Color.Magenta
+ 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 Size(23, 22)
+ Me.ToolStripBtNew.Size = New System.Drawing.Size(23, 22)
Me.ToolStripBtNew.Text = "New"
Me.ToolStripBtNew.ToolTipText = "New"
'
'ToolStripBtOpen
'
- Me.ToolStripBtOpen.DisplayStyle = ToolStripItemDisplayStyle.Image
- Me.ToolStripBtOpen.Image = My.Resources.Resources.Open_icon
- Me.ToolStripBtOpen.ImageTransparentColor = Color.Magenta
+ 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 Size(23, 22)
+ Me.ToolStripBtOpen.Size = New System.Drawing.Size(23, 22)
Me.ToolStripBtOpen.Text = "Open"
Me.ToolStripBtOpen.ToolTipText = "Open..."
'
'ToolStripBtSave
'
- Me.ToolStripBtSave.DisplayStyle = ToolStripItemDisplayStyle.Image
- Me.ToolStripBtSave.Image = My.Resources.Resources.Actions_document_save_icon
- Me.ToolStripBtSave.ImageTransparentColor = Color.Magenta
+ 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 Size(23, 22)
+ Me.ToolStripBtSave.Size = New System.Drawing.Size(23, 22)
Me.ToolStripBtSave.Text = "Save"
Me.ToolStripBtSave.ToolTipText = "Save"
'
'ToolStripBtSaveAs
'
- Me.ToolStripBtSaveAs.DisplayStyle = ToolStripItemDisplayStyle.Image
- Me.ToolStripBtSaveAs.Image = My.Resources.Resources.Actions_document_save_as_icon
- Me.ToolStripBtSaveAs.ImageTransparentColor = Color.Magenta
+ 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 Size(23, 22)
+ Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(23, 22)
Me.ToolStripBtSaveAs.Text = "Save As"
Me.ToolStripBtSaveAs.ToolTipText = "Save As..."
'
'ToolStripSeparator1
'
Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
- Me.ToolStripSeparator1.Size = New Size(6, 25)
+ Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 25)
'
'ToolStripBtSendTo
'
- Me.ToolStripBtSendTo.DisplayStyle = ToolStripItemDisplayStyle.Image
- Me.ToolStripBtSendTo.Image = My.Resources.Resources.export_icon
- Me.ToolStripBtSendTo.ImageTransparentColor = Color.Magenta
+ 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 Size(23, 22)
+ Me.ToolStripBtSendTo.Size = New System.Drawing.Size(23, 22)
Me.ToolStripBtSendTo.Text = "Send to Job List"
Me.ToolStripBtSendTo.ToolTipText = "Send to Job List"
'
'ToolStripSeparator2
'
Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
- Me.ToolStripSeparator2.Size = New Size(6, 25)
+ Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 25)
'
'ToolStripButton1
'
- Me.ToolStripButton1.DisplayStyle = ToolStripItemDisplayStyle.Image
- Me.ToolStripButton1.Image = My.Resources.Resources.Help_icon
- Me.ToolStripButton1.ImageTransparentColor = Color.Magenta
+ 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 Size(23, 22)
+ Me.ToolStripButton1.Size = New System.Drawing.Size(23, 22)
Me.ToolStripButton1.Text = "Help"
'
'PictureBox1
'
- Me.PictureBox1.BackColor = Color.White
- Me.PictureBox1.Image = My.Resources.Resources.VECTO_VECTO
- Me.PictureBox1.Location = New Point(12, 28)
+ Me.PictureBox1.BackColor = System.Drawing.Color.White
+ Me.PictureBox1.Image = Global.TUGraz.VECTO.My.Resources.Resources.VECTO_VECTO
+ Me.PictureBox1.Location = New System.Drawing.Point(12, 28)
Me.PictureBox1.Name = "PictureBox1"
- Me.PictureBox1.Size = New Size(920, 40)
+ Me.PictureBox1.Size = New System.Drawing.Size(920, 40)
Me.PictureBox1.TabIndex = 21
Me.PictureBox1.TabStop = False
'
'CbEngOnly
'
Me.CbEngOnly.AutoSize = True
- Me.CbEngOnly.Location = New Point(17, 84)
+ Me.CbEngOnly.Location = New System.Drawing.Point(17, 84)
Me.CbEngOnly.Name = "CbEngOnly"
- Me.CbEngOnly.Size = New Size(113, 17)
+ Me.CbEngOnly.Size = New System.Drawing.Size(113, 17)
Me.CbEngOnly.TabIndex = 0
Me.CbEngOnly.Text = "Engine Only Mode"
Me.CbEngOnly.UseVisualStyleBackColor = True
'
'CmOpenFile
'
- Me.CmOpenFile.Items.AddRange(New ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
+ Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
Me.CmOpenFile.Name = "CmOpenFile"
- Me.CmOpenFile.Size = New Size(153, 48)
+ Me.CmOpenFile.Size = New System.Drawing.Size(153, 48)
'
'OpenWithToolStripMenuItem
'
Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem"
- Me.OpenWithToolStripMenuItem.Size = New Size(152, 22)
+ Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
Me.OpenWithToolStripMenuItem.Text = "Open with ..."
'
'ShowInFolderToolStripMenuItem
'
Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem"
- Me.ShowInFolderToolStripMenuItem.Size = New Size(152, 22)
+ Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
'
'PicVehicle
'
- Me.PicVehicle.BackColor = Color.LightGray
- Me.PicVehicle.Location = New Point(542, 122)
+ Me.PicVehicle.BackColor = System.Drawing.Color.LightGray
+ Me.PicVehicle.Location = New System.Drawing.Point(542, 122)
Me.PicVehicle.Name = "PicVehicle"
- Me.PicVehicle.Size = New Size(300, 88)
- Me.PicVehicle.SizeMode = PictureBoxSizeMode.StretchImage
+ Me.PicVehicle.Size = New System.Drawing.Size(300, 88)
+ Me.PicVehicle.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
Me.PicVehicle.TabIndex = 36
Me.PicVehicle.TabStop = False
'
'PicBox
'
- Me.PicBox.BackColor = Color.LightGray
- Me.PicBox.Location = New Point(542, 268)
+ Me.PicBox.BackColor = System.Drawing.Color.LightGray
+ Me.PicBox.Location = New System.Drawing.Point(542, 268)
Me.PicBox.Name = "PicBox"
- Me.PicBox.Size = New Size(390, 327)
+ Me.PicBox.Size = New System.Drawing.Size(390, 327)
Me.PicBox.TabIndex = 36
Me.PicBox.TabStop = False
'
'TbEngTxt
'
- Me.TbEngTxt.Location = New Point(542, 216)
+ Me.TbEngTxt.Location = New System.Drawing.Point(542, 216)
Me.TbEngTxt.Name = "TbEngTxt"
Me.TbEngTxt.ReadOnly = True
- Me.TbEngTxt.Size = New Size(390, 20)
+ Me.TbEngTxt.Size = New System.Drawing.Size(390, 20)
Me.TbEngTxt.TabIndex = 6
'
'TbVehCat
'
- Me.TbVehCat.Location = New Point(848, 126)
+ Me.TbVehCat.Location = New System.Drawing.Point(848, 126)
Me.TbVehCat.Name = "TbVehCat"
Me.TbVehCat.ReadOnly = True
- Me.TbVehCat.Size = New Size(87, 20)
+ Me.TbVehCat.Size = New System.Drawing.Size(87, 20)
Me.TbVehCat.TabIndex = 2
'
'TbAxleConf
'
- Me.TbAxleConf.Location = New Point(904, 155)
+ Me.TbAxleConf.Location = New System.Drawing.Point(904, 155)
Me.TbAxleConf.Name = "TbAxleConf"
Me.TbAxleConf.ReadOnly = True
- Me.TbAxleConf.Size = New Size(31, 20)
+ Me.TbAxleConf.Size = New System.Drawing.Size(31, 20)
Me.TbAxleConf.TabIndex = 4
'
'TbHVCclass
'
- Me.TbHVCclass.Location = New Point(848, 184)
+ Me.TbHVCclass.Location = New System.Drawing.Point(848, 184)
Me.TbHVCclass.Name = "TbHVCclass"
Me.TbHVCclass.ReadOnly = True
- Me.TbHVCclass.Size = New Size(87, 20)
+ Me.TbHVCclass.Size = New System.Drawing.Size(87, 20)
Me.TbHVCclass.TabIndex = 5
'
'TbGbxTxt
'
- Me.TbGbxTxt.Location = New Point(542, 242)
+ Me.TbGbxTxt.Location = New System.Drawing.Point(542, 242)
Me.TbGbxTxt.Name = "TbGbxTxt"
Me.TbGbxTxt.ReadOnly = True
- Me.TbGbxTxt.Size = New Size(390, 20)
+ Me.TbGbxTxt.Size = New System.Drawing.Size(390, 20)
Me.TbGbxTxt.TabIndex = 7
'
'TbMass
'
- Me.TbMass.Location = New Point(848, 155)
+ Me.TbMass.Location = New System.Drawing.Point(848, 155)
Me.TbMass.Name = "TbMass"
Me.TbMass.ReadOnly = True
- Me.TbMass.Size = New Size(50, 20)
+ Me.TbMass.Size = New System.Drawing.Size(50, 20)
Me.TbMass.TabIndex = 3
'
- 'F_VECTO
+ 'pnLookAheadCoasting
+ '
+ Me.pnLookAheadCoasting.Controls.Add(Me.Label7)
+ Me.pnLookAheadCoasting.Controls.Add(Me.Label6)
+ Me.pnLookAheadCoasting.Controls.Add(Me.tbLacMinSpeed)
+ Me.pnLookAheadCoasting.Controls.Add(Me.btnDfVelocityDrop)
+ Me.pnLookAheadCoasting.Controls.Add(Me.Label12)
+ Me.pnLookAheadCoasting.Controls.Add(Me.tbDfCoastingScale)
+ Me.pnLookAheadCoasting.Controls.Add(Me.Label11)
+ Me.pnLookAheadCoasting.Controls.Add(Me.Label3)
+ Me.pnLookAheadCoasting.Controls.Add(Me.tbDfCoastingOffset)
+ Me.pnLookAheadCoasting.Controls.Add(Me.tbLacDfTargetSpeedFile)
+ Me.pnLookAheadCoasting.Controls.Add(Me.Label10)
+ Me.pnLookAheadCoasting.Controls.Add(Me.Label4)
+ Me.pnLookAheadCoasting.Controls.Add(Me.Label5)
+ Me.pnLookAheadCoasting.Controls.Add(Me.btnDfTargetSpeed)
+ Me.pnLookAheadCoasting.Controls.Add(Me.tbLacPreviewFactor)
+ Me.pnLookAheadCoasting.Controls.Add(Me.tbLacDfVelocityDropFile)
+ Me.pnLookAheadCoasting.Location = New System.Drawing.Point(16, 37)
+ Me.pnLookAheadCoasting.Name = "pnLookAheadCoasting"
+ Me.pnLookAheadCoasting.Size = New System.Drawing.Size(467, 129)
+ Me.pnLookAheadCoasting.TabIndex = 20
+ '
+ 'btnDfVelocityDrop
+ '
+ Me.btnDfVelocityDrop.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.btnDfVelocityDrop.Image = CType(resources.GetObject("btnDfVelocityDrop.Image"), System.Drawing.Image)
+ Me.btnDfVelocityDrop.Location = New System.Drawing.Point(435, 78)
+ Me.btnDfVelocityDrop.Name = "btnDfVelocityDrop"
+ Me.btnDfVelocityDrop.Size = New System.Drawing.Size(24, 24)
+ Me.btnDfVelocityDrop.TabIndex = 32
+ Me.btnDfVelocityDrop.TabStop = False
+ Me.btnDfVelocityDrop.UseVisualStyleBackColor = True
+ '
+ 'Label12
+ '
+ Me.Label12.AutoSize = True
+ Me.Label12.Location = New System.Drawing.Point(269, 110)
+ Me.Label12.Name = "Label12"
+ Me.Label12.Size = New System.Drawing.Size(130, 13)
+ Me.Label12.TabIndex = 31
+ Me.Label12.Text = "* DF_vTarget * DF_vDrop"
+ '
+ 'tbDfCoastingScale
+ '
+ Me.tbDfCoastingScale.Location = New System.Drawing.Point(226, 107)
+ Me.tbDfCoastingScale.Name = "tbDfCoastingScale"
+ Me.tbDfCoastingScale.Size = New System.Drawing.Size(37, 20)
+ Me.tbDfCoastingScale.TabIndex = 30
+ '
+ 'Label11
+ '
+ Me.Label11.AutoSize = True
+ Me.Label11.Location = New System.Drawing.Point(209, 109)
+ Me.Label11.Name = "Label11"
+ Me.Label11.Size = New System.Drawing.Size(13, 13)
+ Me.Label11.TabIndex = 29
+ Me.Label11.Text = "- "
+ '
+ 'Label3
+ '
+ Me.Label3.AutoSize = True
+ Me.Label3.Location = New System.Drawing.Point(40, 31)
+ Me.Label3.Name = "Label3"
+ Me.Label3.Size = New System.Drawing.Size(118, 13)
+ Me.Label3.TabIndex = 20
+ Me.Label3.Text = "Preview distance factor"
+ Me.Label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+ '
+ 'tbDfCoastingOffset
+ '
+ Me.tbDfCoastingOffset.Location = New System.Drawing.Point(165, 107)
+ Me.tbDfCoastingOffset.Name = "tbDfCoastingOffset"
+ Me.tbDfCoastingOffset.Size = New System.Drawing.Size(37, 20)
+ Me.tbDfCoastingOffset.TabIndex = 28
+ '
+ 'tbLacDfTargetSpeedFile
+ '
+ Me.tbLacDfTargetSpeedFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.tbLacDfTargetSpeedFile.Location = New System.Drawing.Point(164, 54)
+ Me.tbLacDfTargetSpeedFile.Name = "tbLacDfTargetSpeedFile"
+ Me.tbLacDfTargetSpeedFile.Size = New System.Drawing.Size(264, 20)
+ Me.tbLacDfTargetSpeedFile.TabIndex = 22
+ '
+ 'Label10
+ '
+ Me.Label10.AutoSize = True
+ Me.Label10.Location = New System.Drawing.Point(79, 110)
+ Me.Label10.Name = "Label10"
+ Me.Label10.Size = New System.Drawing.Size(79, 13)
+ Me.Label10.TabIndex = 27
+ Me.Label10.Text = "DF_coasting = "
+ '
+ 'Label4
+ '
+ Me.Label4.AutoSize = True
+ Me.Label4.Location = New System.Drawing.Point(3, 57)
+ Me.Label4.Name = "Label4"
+ Me.Label4.Size = New System.Drawing.Size(155, 13)
+ Me.Label4.TabIndex = 24
+ Me.Label4.Text = "Decision Factor - Target Speed"
+ Me.Label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+ '
+ 'Label5
+ '
+ Me.Label5.AutoSize = True
+ Me.Label5.Location = New System.Drawing.Point(5, 84)
+ Me.Label5.Name = "Label5"
+ Me.Label5.Size = New System.Drawing.Size(153, 13)
+ Me.Label5.TabIndex = 26
+ Me.Label5.Text = "Decision Factor - Velocity Drop"
+ Me.Label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+ '
+ 'btnDfTargetSpeed
+ '
+ Me.btnDfTargetSpeed.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.btnDfTargetSpeed.Image = CType(resources.GetObject("btnDfTargetSpeed.Image"), System.Drawing.Image)
+ Me.btnDfTargetSpeed.Location = New System.Drawing.Point(434, 54)
+ Me.btnDfTargetSpeed.Name = "btnDfTargetSpeed"
+ Me.btnDfTargetSpeed.Size = New System.Drawing.Size(24, 24)
+ Me.btnDfTargetSpeed.TabIndex = 23
+ Me.btnDfTargetSpeed.TabStop = False
+ Me.btnDfTargetSpeed.UseVisualStyleBackColor = True
+ '
+ 'tbLacPreviewFactor
+ '
+ Me.tbLacPreviewFactor.Location = New System.Drawing.Point(164, 28)
+ Me.tbLacPreviewFactor.Name = "tbLacPreviewFactor"
+ Me.tbLacPreviewFactor.Size = New System.Drawing.Size(64, 20)
+ Me.tbLacPreviewFactor.TabIndex = 21
+ '
+ 'tbLacDfVelocityDropFile
+ '
+ Me.tbLacDfVelocityDropFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.tbLacDfVelocityDropFile.Location = New System.Drawing.Point(164, 81)
+ Me.tbLacDfVelocityDropFile.Name = "tbLacDfVelocityDropFile"
+ Me.tbLacDfVelocityDropFile.Size = New System.Drawing.Size(264, 20)
+ Me.tbLacDfVelocityDropFile.TabIndex = 25
+ '
+ 'Label6
+ '
+ Me.Label6.AutoSize = True
+ Me.Label6.Location = New System.Drawing.Point(91, 6)
+ Me.Label6.Name = "Label6"
+ Me.Label6.Size = New System.Drawing.Size(67, 13)
+ Me.Label6.TabIndex = 33
+ Me.Label6.Text = "Min. Velocity"
+ Me.Label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+ '
+ 'tbLacMinSpeed
+ '
+ Me.tbLacMinSpeed.Location = New System.Drawing.Point(164, 3)
+ Me.tbLacMinSpeed.Name = "tbLacMinSpeed"
+ Me.tbLacMinSpeed.Size = New System.Drawing.Size(64, 20)
+ Me.tbLacMinSpeed.TabIndex = 34
+ '
+ 'Label7
+ '
+ Me.Label7.AutoSize = True
+ Me.Label7.Location = New System.Drawing.Point(234, 6)
+ Me.Label7.Name = "Label7"
+ Me.Label7.Size = New System.Drawing.Size(38, 13)
+ Me.Label7.TabIndex = 4
+ Me.Label7.Text = "[km/h]"
+ '
+ 'VectoJobForm
'
Me.AcceptButton = Me.ButOK
- Me.AutoScaleDimensions = New SizeF(6.0!, 13.0!)
- Me.AutoScaleMode = AutoScaleMode.Font
Me.CancelButton = Me.ButCancel
- Me.ClientSize = New Size(944, 694)
+ Me.ClientSize = New System.Drawing.Size(944, 694)
Me.Controls.Add(Me.TbHVCclass)
Me.Controls.Add(Me.TbMass)
Me.Controls.Add(Me.TbAxleConf)
@@ -1181,11 +1234,10 @@ Partial Class VectoJobForm
Me.Controls.Add(Me.TabControl1)
Me.Controls.Add(Me.ButOK)
Me.Controls.Add(Me.StatusStrip1)
- Me.FormBorderStyle = FormBorderStyle.FixedSingle
- Me.Icon = CType(resources.GetObject("$this.Icon"), Icon)
+ Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
Me.MaximizeBox = False
Me.Name = "VectoJobForm"
- Me.StartPosition = FormStartPosition.CenterParent
+ Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
Me.Text = "Job Editor"
Me.TabPgGen.ResumeLayout(False)
Me.TabPgGen.PerformLayout()
@@ -1193,7 +1245,7 @@ Partial Class VectoJobForm
Me.GrCycles.PerformLayout()
Me.GrAux.ResumeLayout(False)
Me.GrAux.PerformLayout()
- CType(Me.picAuxInfo, ISupportInitialize).EndInit()
+ CType(Me.picAuxInfo, System.ComponentModel.ISupportInitialize).EndInit()
Me.TabControl1.ResumeLayout(False)
Me.TabPgDriver.ResumeLayout(False)
Me.GrVACC.ResumeLayout(False)
@@ -1212,10 +1264,12 @@ Partial Class VectoJobForm
Me.StatusStrip1.PerformLayout()
Me.ToolStrip1.ResumeLayout(False)
Me.ToolStrip1.PerformLayout()
- CType(Me.PictureBox1, ISupportInitialize).EndInit()
+ CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
Me.CmOpenFile.ResumeLayout(False)
- CType(Me.PicVehicle, ISupportInitialize).EndInit()
- CType(Me.PicBox, ISupportInitialize).EndInit()
+ CType(Me.PicVehicle, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.PicBox, System.ComponentModel.ISupportInitialize).EndInit()
+ Me.pnLookAheadCoasting.ResumeLayout(False)
+ Me.pnLookAheadCoasting.PerformLayout()
Me.ResumeLayout(False)
Me.PerformLayout()
@@ -1312,16 +1366,21 @@ Partial Class VectoJobForm
Friend WithEvents txtAdvancedAuxiliaryFile As TextBox
Friend WithEvents lbAdvancedAuxiliaries As Label
Friend WithEvents btnAAUXOpen As Button
- Friend WithEvents Label12 As Label
- Friend WithEvents tbDfCoastingScale As TextBox
- Friend WithEvents Label11 As Label
- Friend WithEvents Label3 As Label
- Friend WithEvents tbDfCoastingOffset As TextBox
- Friend WithEvents tbLacDfTargetSpeedFile As TextBox
- Friend WithEvents Label10 As Label
- Friend WithEvents Label4 As Label
- Friend WithEvents Label5 As Label
- Friend WithEvents btnDfTargetSpeed As Button
- Friend WithEvents tbLacPreviewFactor As TextBox
- Friend WithEvents tbLacDfVelocityDropFile As TextBox
+ Friend WithEvents pnLookAheadCoasting As System.Windows.Forms.Panel
+ Friend WithEvents btnDfVelocityDrop As System.Windows.Forms.Button
+ Friend WithEvents Label12 As System.Windows.Forms.Label
+ Friend WithEvents tbDfCoastingScale As System.Windows.Forms.TextBox
+ Friend WithEvents Label11 As System.Windows.Forms.Label
+ Friend WithEvents Label3 As System.Windows.Forms.Label
+ Friend WithEvents tbDfCoastingOffset As System.Windows.Forms.TextBox
+ Friend WithEvents tbLacDfTargetSpeedFile As System.Windows.Forms.TextBox
+ Friend WithEvents Label10 As System.Windows.Forms.Label
+ Friend WithEvents Label4 As System.Windows.Forms.Label
+ Friend WithEvents Label5 As System.Windows.Forms.Label
+ Friend WithEvents btnDfTargetSpeed As System.Windows.Forms.Button
+ Friend WithEvents tbLacPreviewFactor As System.Windows.Forms.TextBox
+ Friend WithEvents tbLacDfVelocityDropFile As System.Windows.Forms.TextBox
+ Friend WithEvents Label6 As System.Windows.Forms.Label
+ Friend WithEvents tbLacMinSpeed As System.Windows.Forms.TextBox
+ Friend WithEvents Label7 As System.Windows.Forms.Label
End Class
diff --git a/VECTO/GUI/VectoJobForm.resx b/VECTO/GUI/VectoJobForm.resx
index 087e6067950a3b7e0a6a1305861d5674430ef6b6..e89a5da4d25ff01ecfa847660f4f5ede2ef06659 100644
--- a/VECTO/GUI/VectoJobForm.resx
+++ b/VECTO/GUI/VectoJobForm.resx
@@ -124,7 +124,7 @@
<data name="ButtonVEH.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADr8AAA6/ATgFUyQAAALVSURBVDhPhZJrSJNhGIYXOs1Nc8o8gJWZ+UNEEupPxDAw
+ YQUAAAAJcEhZcwAADr4AAA6+AepCscAAAALVSURBVDhPhZJrSJNhGIYXOs1Nc8o8gJWZ+UNEEupPxDAw
0kIrs5JsTOcKRANNEs0827KM0BA1MlSo0G3o1DxkEsso1JqH8rBUSlPzPOfSeajkbu+7NSl/9MD147u/
776eF96P0VbB7+6Q8tFZJcCH2gj01wsx0BD5F5+aRFA1iTR99ZERjH+HlKHLxexgEoZao0Geh96mY2FC
AkBpYlX7HL3PhBpjbXNIYWP5DjaWDKwv3MKMKomKMHIXGDWikaGu5gw8n3LhUWKXZ6wbBL+0tyk/Fwk5
@@ -142,7 +142,7 @@
<data name="ButtonGBX.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADr8AAA6/ATgFUyQAAALVSURBVDhPhZJrSJNhGIYXOs1Nc8o8gJWZ+UNEEupPxDAw
+ YQUAAAAJcEhZcwAADr4AAA6+AepCscAAAALVSURBVDhPhZJrSJNhGIYXOs1Nc8o8gJWZ+UNEEupPxDAw
0kIrs5JsTOcKRANNEs0827KM0BA1MlSo0G3o1DxkEsso1JqH8rBUSlPzPOfSeajkbu+7NSl/9MD147u/
776eF96P0VbB7+6Q8tFZJcCH2gj01wsx0BD5F5+aRFA1iTR99ZERjH+HlKHLxexgEoZao0Geh96mY2FC
AkBpYlX7HL3PhBpjbXNIYWP5DjaWDKwv3MKMKomKMHIXGDWikaGu5gw8n3LhUWKXZ6wbBL+0tyk/Fwk5
@@ -160,7 +160,25 @@
<data name="ButtonMAP.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADr8AAA6/ATgFUyQAAALVSURBVDhPhZJrSJNhGIYXOs1Nc8o8gJWZ+UNEEupPxDAw
+ YQUAAAAJcEhZcwAADr4AAA6+AepCscAAAALVSURBVDhPhZJrSJNhGIYXOs1Nc8o8gJWZ+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==
+</value>
+ </data>
+ <data name="btnDfVelocityDrop.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAALVSURBVDhPhZJrSJNhGIYXOs1Nc8o8gJWZ+UNEEupPxDAw
0kIrs5JsTOcKRANNEs0827KM0BA1MlSo0G3o1DxkEsso1JqH8rBUSlPzPOfSeajkbu+7NSl/9MD147u/
776eF96P0VbB7+6Q8tFZJcCH2gj01wsx0BD5F5+aRFA1iTR99ZERjH+HlKHLxexgEoZao0Geh96mY2FC
AkBpYlX7HL3PhBpjbXNIYWP5DjaWDKwv3MKMKomKMHIXGDWikaGu5gw8n3LhUWKXZ6wbBL+0tyk/Fwk5
@@ -178,7 +196,7 @@
<data name="btnDfTargetSpeed.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADr4AAA6+AepCscAAAALVSURBVDhPhZJrSJNhGIYXOs1Nc8o8gJWZ+UNEEupPxDAw
+ YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAALVSURBVDhPhZJrSJNhGIYXOs1Nc8o8gJWZ+UNEEupPxDAw
0kIrs5JsTOcKRANNEs0827KM0BA1MlSo0G3o1DxkEsso1JqH8rBUSlPzPOfSeajkbu+7NSl/9MD147u/
776eF96P0VbB7+6Q8tFZJcCH2gj01wsx0BD5F5+aRFA1iTR99ZERjH+HlKHLxexgEoZao0Geh96mY2FC
AkBpYlX7HL3PhBpjbXNIYWP5DjaWDKwv3MKMKomKMHIXGDWikaGu5gw8n3LhUWKXZ6wbBL+0tyk/Fwk5
diff --git a/VECTO/GUI/VectoJobForm.vb b/VECTO/GUI/VectoJobForm.vb
index abb35959cae91feebaabf97223fdd4b500a7f6d6..938393ee52792ef6be3c855320507ca936ac2538 100644
--- a/VECTO/GUI/VectoJobForm.vb
+++ b/VECTO/GUI/VectoJobForm.vb
@@ -178,31 +178,31 @@ Public Class VectoJobForm
#Region "Browse Buttons"
Private Sub ButtonVEH_Click(sender As Object, e As EventArgs) Handles ButtonVEH.Click
- If VehicleFileBrowser.OpenDialog(FileRepl(TbVEH.Text, GetPath(VECTOfile))) Then
- TbVEH.Text = GetFilenameWithoutDirectory(VehicleFileBrowser.Files(0), GetPath(VECTOfile))
+ If VehicleFileBrowser.OpenDialog(FileRepl(TbVEH.Text, GetPath(VectoFile))) Then
+ TbVEH.Text = GetFilenameWithoutDirectory(VehicleFileBrowser.Files(0), GetPath(VectoFile))
End If
End Sub
Private Sub ButtonMAP_Click(sender As Object, e As EventArgs) Handles ButtonMAP.Click
- If EngineFileBrowser.OpenDialog(FileRepl(TbENG.Text, GetPath(VECTOfile))) Then
- TbENG.Text = GetFilenameWithoutDirectory(EngineFileBrowser.Files(0), GetPath(VECTOfile))
+ If EngineFileBrowser.OpenDialog(FileRepl(TbENG.Text, GetPath(VectoFile))) Then
+ TbENG.Text = GetFilenameWithoutDirectory(EngineFileBrowser.Files(0), GetPath(VectoFile))
End If
End Sub
Private Sub ButtonGBX_Click(sender As Object, e As EventArgs) Handles ButtonGBX.Click
- If GearboxFileBrowser.OpenDialog(FileRepl(TbGBX.Text, GetPath(VECTOfile))) Then
- TbGBX.Text = GetFilenameWithoutDirectory(GearboxFileBrowser.Files(0), GetPath(VECTOfile))
+ If GearboxFileBrowser.OpenDialog(FileRepl(TbGBX.Text, GetPath(VectoFile))) Then
+ TbGBX.Text = GetFilenameWithoutDirectory(GearboxFileBrowser.Files(0), GetPath(VectoFile))
End If
End Sub
Private Sub BtDesMaxBr_Click_1(sender As Object, e As EventArgs) Handles BtDesMaxBr.Click
- If DriverAccelerationFileBrowser.OpenDialog(FileRepl(TbDesMaxFile.Text, GetPath(VECTOfile))) Then
- TbDesMaxFile.Text = GetFilenameWithoutDirectory(DriverAccelerationFileBrowser.Files(0), GetPath(VECTOfile))
+ If DriverAccelerationFileBrowser.OpenDialog(FileRepl(TbDesMaxFile.Text, GetPath(VectoFile))) Then
+ TbDesMaxFile.Text = GetFilenameWithoutDirectory(DriverAccelerationFileBrowser.Files(0), GetPath(VectoFile))
End If
End Sub
Private Sub BtAccOpen_Click(sender As Object, e As EventArgs) Handles BtAccOpen.Click
- OpenFiles(FileRepl(TbDesMaxFile.Text, GetPath(VECTOfile)))
+ OpenFiles(FileRepl(TbDesMaxFile.Text, GetPath(VectoFile)))
End Sub
#End Region
@@ -212,10 +212,10 @@ Public Class VectoJobForm
'Open Vehicle Editor
Private Sub ButOpenVEH_Click(sender As Object, e As EventArgs) Handles ButOpenVEH.Click
Dim f As String
- f = FileRepl(TbVEH.Text, GetPath(VECTOfile))
+ f = FileRepl(TbVEH.Text, GetPath(VectoFile))
'Thus Veh-file is returned
- VehicleForm.JobDir = GetPath(VECTOfile)
+ VehicleForm.JobDir = GetPath(VectoFile)
VehicleForm.AutoSendTo = True
If Not Trim(f) = "" Then
@@ -244,10 +244,10 @@ Public Class VectoJobForm
'Open Engine Editor
Private Sub ButOpenENG_Click(sender As Object, e As EventArgs) Handles ButOpenENG.Click
Dim f As String
- f = FileRepl(TbENG.Text, GetPath(VECTOfile))
+ f = FileRepl(TbENG.Text, GetPath(VectoFile))
'Thus Veh-file is returned
- EngineForm.JobDir = GetPath(VECTOfile)
+ EngineForm.JobDir = GetPath(VectoFile)
EngineForm.AutoSendTo = True
If Not Trim(f) = "" Then
@@ -270,10 +270,10 @@ Public Class VectoJobForm
'Open Gearbox Editor
Private Sub ButOpenGBX_Click(sender As Object, e As EventArgs) Handles ButOpenGBX.Click
Dim f As String
- f = FileRepl(TbGBX.Text, GetPath(VECTOfile))
+ f = FileRepl(TbGBX.Text, GetPath(VectoFile))
'Thus Veh-file is returned
- GearboxForm.JobDir = GetPath(VECTOfile)
+ GearboxForm.JobDir = GetPath(VectoFile)
GearboxForm.AutoSendTo = True
If Not Trim(f) = "" Then
@@ -304,7 +304,7 @@ Public Class VectoJobForm
'Open
Private Sub ToolStripBtOpen_Click(sender As Object, e As EventArgs) Handles ToolStripBtOpen.Click
- If JobfileFileBrowser.OpenDialog(VECTOfile, False, "vecto") Then VECTOload2Form(JobfileFileBrowser.Files(0))
+ If JobfileFileBrowser.OpenDialog(VectoFile, False, "vecto") Then VECTOload2Form(JobfileFileBrowser.Files(0))
End Sub
'Save
@@ -314,16 +314,16 @@ Public Class VectoJobForm
'Save As
Private Sub ToolStripBtSaveAs_Click(sender As Object, e As EventArgs) Handles ToolStripBtSaveAs.Click
- If JobfileFileBrowser.SaveDialog(VECTOfile) Then Call VECTOsave(JobfileFileBrowser.Files(0))
+ If JobfileFileBrowser.SaveDialog(VectoFile) Then Call VECTOsave(JobfileFileBrowser.Files(0))
End Sub
'Send to Job file list in main form
Private Sub ToolStripBtSendTo_Click(sender As Object, e As EventArgs) Handles ToolStripBtSendTo.Click
If ChangeCheckCancel() Then Exit Sub
- If VECTOfile = "" Then
+ If VectoFile = "" Then
MsgBox("File not found!" & ChrW(10) & ChrW(10) & "Save file and try again.")
Else
- MainForm.AddToJobListView(VECTOfile)
+ MainForm.AddToJobListView(VectoFile)
End If
End Sub
@@ -346,14 +346,14 @@ Public Class VectoJobForm
'Save ("Save" or "Save As" when new file)
Private Function Save() As Boolean
- If VECTOfile = "" Then
+ If VectoFile = "" Then
If JobfileFileBrowser.SaveDialog("") Then
- VECTOfile = JobfileFileBrowser.Files(0)
+ VectoFile = JobfileFileBrowser.Files(0)
Else
Return False
End If
End If
- Return VECTOsave(VECTOfile)
+ Return VECTOsave(VectoFile)
End Function
'Open file
@@ -379,7 +379,7 @@ Public Class VectoJobForm
End Select
End If
- VECTOfile = file
+ VectoFile = file
_basePath = Path.GetDirectoryName(file)
'Update Form
@@ -464,6 +464,7 @@ Public Class VectoJobForm
TbVmin.Text = driver.OverSpeedEcoRoll.MinSpeed.AsKmph().ToGUIFormat()
CbLookAhead.Checked = driver.Lookahead.Enabled
'TbAlookahead.Text = CStr(VEC0.ALookahead)
+ tbLacMinSpeed.Text = driver.Lookahead.MinSpeed.AsKmph().ToGUIFormat()
'TbVminLA.Text = CStr(VEC0.VMinLa)
tbLacPreviewFactor.Text = driver.Lookahead.LookaheadDistanceFactor.ToGUIFormat()
tbDfCoastingOffset.Text = driver.Lookahead.CoastingDecisionFactorOffset.ToGUIFormat()
@@ -507,7 +508,7 @@ Public Class VectoJobForm
If cboAdvancedAuxiliaries.SelectedIndex > 0 Then
'resolve absolute path for auxiliary file.
- Dim absoluteAAUxFile As String = ResolveAAUXFilePath(GetPath(VECTOfile), txtAdvancedAuxiliaryFile.Text)
+ Dim absoluteAAUxFile As String = ResolveAAUXFilePath(GetPath(VectoFile), txtAdvancedAuxiliaryFile.Text)
Dim aaAssemblyName As String = DirectCast(cboAdvancedAuxiliaries.SelectedItem, AdvancedAuxiliary).AssemblyName
Dim aaAssemblyVersion As String = DirectCast(cboAdvancedAuxiliaries.SelectedItem, AdvancedAuxiliary).AuxiliaryVersion
@@ -572,16 +573,16 @@ Public Class VectoJobForm
vec0.EcoRollOn = RdEcoRoll.Checked
vec0.OverSpeedOn = RdOverspeed.Checked
- vec0.OverSpeed = TbOverspeed.Text.ToDouble()
- vec0.UnderSpeed = TbUnderSpeed.Text.ToDouble()
- vec0.VMin = TbVmin.Text.ToDouble()
+ vec0.OverSpeed = TbOverspeed.Text.ToDouble(0)
+ vec0.UnderSpeed = TbUnderSpeed.Text.ToDouble(0)
+ vec0.VMin = TbVmin.Text.ToDouble(0)
vec0.LookAheadOn = CbLookAhead.Checked
'vec0.ALookahead = CSng(fTextboxToNumString(TbAlookahead.Text))
'vec0.VMinLa = CSng(fTextboxToNumString(TbVminLA.Text))
-
- vec0.LacPreviewFactor = tbLacPreviewFactor.Text.ToDouble()
- vec0.LacDfOffset = tbDfCoastingOffset.Text.ToDouble()
- vec0.LacDfScale = tbDfCoastingScale.Text.ToDouble()
+ vec0.LookAheadMinSpeed = tbLacMinSpeed.Text.ToDouble(0)
+ vec0.LacPreviewFactor = tbLacPreviewFactor.Text.ToDouble(0)
+ vec0.LacDfOffset = tbDfCoastingOffset.Text.ToDouble(0)
+ vec0.LacDfScale = tbDfCoastingScale.Text.ToDouble(0)
vec0.LacDfTargetSpeedFile = tbLacDfTargetSpeedFile.Text
vec0.LacDfVelocityDropFile = tbLacDfVelocityDropFile.Text
'------------------------------------------------------------
@@ -592,14 +593,14 @@ Public Class VectoJobForm
Return False
End If
- VECTOfile = file
+ VectoFile = file
- file = GetFilenameWithoutPath(VECTOfile, True)
+ file = GetFilenameWithoutPath(VectoFile, True)
Text = file
ToolStripStatusLabelGEN.Text = ""
- MainForm.AddToJobListView(VECTOfile)
+ MainForm.AddToJobListView(VectoFile)
_changed = False
@@ -646,7 +647,7 @@ Public Class VectoJobForm
EngineForm.AutoSendTo = False
- VECTOfile = ""
+ VectoFile = ""
Text = "Job Editor"
ToolStripStatusLabelGEN.Text = ""
_changed = False
@@ -747,7 +748,7 @@ Public Class VectoJobForm
Private Sub ButAuxAdd_Click(sender As Object, e As EventArgs) Handles ButAuxAdd.Click
Dim id As String
- _auxDialog.VehPath = GetPath(VECTOfile)
+ _auxDialog.VehPath = GetPath(VectoFile)
_auxDialog.TbPath.Text = ""
_auxDialog.CbType.SelectedIndex = -1
_auxDialog.CbType.Text = ""
@@ -801,7 +802,7 @@ lbDlog:
Dim selItem As ListViewItem = LvAux.SelectedItems(0)
- _auxDialog.VehPath = GetPath(VECTOfile)
+ _auxDialog.VehPath = GetPath(VectoFile)
_auxDialog.CbType.SelectedIndex = -1
_auxDialog.CbType.Text = selItem.SubItems(1).Text
_auxDialog.TbID.Text = selItem.SubItems(0).Text 'After Type-set!
@@ -872,7 +873,7 @@ lbDlog:
Private Sub LvCycles_DoubleClick(sender As Object, e As EventArgs) Handles LvCycles.DoubleClick
If LvCycles.SelectedItems.Count > 0 Then _
- OpenFiles(FileRepl(LvCycles.SelectedItems(0).SubItems(0).Text, GetPath(VECTOfile)))
+ OpenFiles(FileRepl(LvCycles.SelectedItems(0).SubItems(0).Text, GetPath(VectoFile)))
End Sub
Private Sub LvCycles_KeyDown(sender As Object, e As KeyEventArgs) Handles LvCycles.KeyDown
@@ -885,7 +886,7 @@ lbDlog:
End Sub
Private Sub BtDRIadd_Click(sender As Object, e As EventArgs) Handles BtDRIadd.Click
- Dim genDir As String = GetPath(VECTOfile)
+ Dim genDir As String = GetPath(VectoFile)
If DrivingCycleFileBrowser.OpenDialog("", True) Then
Dim s As String
@@ -965,6 +966,7 @@ lbDlog:
Private Sub CbLookAhead_CheckedChanged(sender As Object, e As EventArgs) _
Handles CbLookAhead.CheckedChanged
Change()
+ pnLookAheadCoasting.Enabled = CbLookAhead.Checked
End Sub
'EcoRoll / Overspeed changed
@@ -1015,7 +1017,7 @@ lbDlog:
PicVehicle.Image = Nothing
PicBox.Image = Nothing
- Dim inputData As IEngineeringInputDataProvider = TryCast(JSONInputDataFactory.ReadComponentData(VECTOfile),
+ Dim inputData As IEngineeringInputDataProvider = TryCast(JSONInputDataFactory.ReadComponentData(VectoFile),
IEngineeringInputDataProvider)
Dim vehicle As IVehicleEngineeringInputData = inputData.VehicleInputData
@@ -1297,7 +1299,7 @@ lbDlog:
'AA-TB
Private Sub btnBrowseAAUXFile_Click(sender As Object, e As EventArgs) Handles btnBrowseAAUXFile.Click
- If String.IsNullOrEmpty(VECTOfile) Then
+ If String.IsNullOrEmpty(VectoFile) Then
MessageBox.Show(
"Please complete and save a valid new .vecto file before adding/configuring advanced bus auxiliaries.")
Return
@@ -1313,7 +1315,7 @@ lbDlog:
If cboAdvancedAuxiliaries.SelectedIndex = 0 Then Return
'Get Absolute Path for AAUX FILE.
- absoluteAuxPath = ResolveAAUXFilePath(GetPath(VECTOfile), txtAdvancedAuxiliaryFile.Text)
+ absoluteAuxPath = ResolveAAUXFilePath(GetPath(VectoFile), txtAdvancedAuxiliaryFile.Text)
'Set Extensions
fbAux.Extensions = New String() {"AAUX"}
@@ -1328,7 +1330,7 @@ lbDlog:
If fileExists AndAlso validAAUXFile Then
ConfigureAdvancedAuxiliaries(assembly.AssemblyName, assembly.AuxiliaryVersion,
- txtAdvancedAuxiliaryFile.Text, VECTOfile)
+ txtAdvancedAuxiliaryFile.Text, VectoFile)
Else
Dim needToFindOrCreateFile As Boolean = True
@@ -1338,15 +1340,15 @@ lbDlog:
'Find / Create file and configure.
If fbAux.CustomDialog(absoluteAuxPath, False, False, FileBrowserFileExtensionMode.ForceExt, False, String.Empty) _
Then
- txtAdvancedAuxiliaryFile.Text = GetFilenameWithoutDirectory(fbAux.Files(0), GetPath(VECTOfile))
+ txtAdvancedAuxiliaryFile.Text = GetFilenameWithoutDirectory(fbAux.Files(0), GetPath(VectoFile))
assembly = DirectCast(cboAdvancedAuxiliaries.SelectedItem, AdvancedAuxiliary)
If _
- File.Exists(ResolveAAUXFilePath(GetPath(VECTOfile), txtAdvancedAuxiliaryFile.Text)) OrElse
+ File.Exists(ResolveAAUXFilePath(GetPath(VectoFile), txtAdvancedAuxiliaryFile.Text)) OrElse
MsgBox("Do you want to create a new .AAUX file?", MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
needToFindOrCreateFile = False
ConfigureAdvancedAuxiliaries(assembly.AssemblyName, assembly.AuxiliaryVersion,
- txtAdvancedAuxiliaryFile.Text, VECTOfile)
+ txtAdvancedAuxiliaryFile.Text, VectoFile)
End If
Else
needToFindOrCreateFile = False
@@ -1383,18 +1385,26 @@ lbDlog:
'AA-TB
Private Sub btnAAUXOpen_Click(sender As Object, e As EventArgs) Handles btnAAUXOpen.Click
- OpenFiles(FileRepl(txtAdvancedAuxiliaryFile.Text, GetPath(VECTOfile)))
+ OpenFiles(FileRepl(txtAdvancedAuxiliaryFile.Text, GetPath(VectoFile)))
End Sub
- Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnDfTargetSpeed.Click
- If DriverDecisionFactorTargetSpeedFileBrowser.OpenDialog(FileRepl(tbLacDfTargetSpeedFile.Text, GetPath(VECTOfile))) _
+
+ Private Sub btnDfTargetSpeed_Click(sender As Object, e As EventArgs) Handles btnDfTargetSpeed.Click
+ If DriverDecisionFactorTargetSpeedFileBrowser.OpenDialog(FileRepl(tbLacDfTargetSpeedFile.Text, GetPath(VectoFile))) _
Then _
tbLacDfTargetSpeedFile.Text = GetFilenameWithoutDirectory(DriverDecisionFactorTargetSpeedFileBrowser.Files(0),
- GetPath(VECTOfile))
+ GetPath(VectoFile))
End Sub
-End Class
-
+ Private Sub btnDfVelocityDrop_Click_1(sender As Object, e As EventArgs) Handles btnDfVelocityDrop.Click
+ If DriverDecisionFactorVelocityDropFileBrowser.OpenDialog(FileRepl(tbLacDfVelocityDropFile.Text, GetPath(VectoFile))) _
+ Then _
+ tbLacDfVelocityDropFile.Text = GetFilenameWithoutDirectory(DriverDecisionFactorVelocityDropFileBrowser.Files(0),
+ GetPath(VectoFile))
+ End Sub
+ Private Sub Label6_Click(sender As Object, e As EventArgs) Handles Label6.Click
+ End Sub
+End Class
diff --git a/VECTO/Input Files/VectoJob.vb b/VECTO/Input Files/VectoJob.vb
index ab3b282eaa3a6a9fb9177ca4f08730c82ed559d0..d8af67211e31efc6add9d387e7130ee6842ab191 100644
--- a/VECTO/Input Files/VectoJob.vb
+++ b/VECTO/Input Files/VectoJob.vb
@@ -71,6 +71,7 @@ Public Class VectoJob
Private _vehicleInputData As JSONComponentInputData
Private _engineInputData As JSONComponentInputData
Private _gearboxInputData As JSONComponentInputData
+ Public LookAheadMinSpeed As Double
Public Property StartStopMaxSpeed As Double
@@ -568,9 +569,10 @@ Public Class VectoJob
Dim lacVdropLookup As TableData =
If(File.Exists(LacDfVelocityDropFile), VectoCSVFile.Read(LacDfVelocityDropFile), Nothing)
Return New LookAheadCoastingInputData With {
+ .Enabled = LookAheadOn,
+ .MinSpeed = LookAheadMinSpeed.KMPHtoMeterPerSecond(),
.CoastingDecisionFactorScaling = LacDfScale,
.CoastingDecisionFactorOffset = LacDfOffset,
- .Enabled = LookAheadOn,
.LookaheadDistanceFactor = LacPreviewFactor,
.CoastingDecisionFactorTargetSpeedLookup = lacTargetLookup,
.CoastingDecisionFactorVelocityDropLookup = lacVdropLookup
diff --git a/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs b/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs
index ee80409fb4946bf9d8de49d74ef2da5328d59f44..2d8e96935cf7275e262473f642dcb10cd614716f 100644
--- a/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/EngineeringInputData.cs
@@ -322,7 +322,8 @@ namespace TUGraz.VectoCommon.InputData
/// P021
/// cf. VECTO Input Parameters.xlsx
/// </summary>
- //MeterPerSecond MinSpeed { get; }
+ MeterPerSecond MinSpeed { get; }
+
double CoastingDecisionFactorOffset { get; }
double CoastingDecisionFactorScaling { get; }
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
index 63e91182b968b6354ce0eb08fffa5b65bbf9cbf6..1e9f15c10656295dd7cf3016158587feb6e43091 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
@@ -412,7 +412,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
return new LookAheadCoastingInputData() {
Enabled = lac.GetEx<bool>(JsonKeys.DriverData_Lookahead_Enabled),
//Deceleration = lac.GetEx<double>(JsonKeys.DriverData_Lookahead_Deceleration).SI<MeterPerSquareSecond>(),
- //MinSpeed = lac.GetEx<double>(JsonKeys.DriverData_Lookahead_MinSpeed).KMPHtoMeterPerSecond(),
+ MinSpeed = lac.GetEx<double>(JsonKeys.DriverData_Lookahead_MinSpeed).KMPHtoMeterPerSecond(),
LookaheadDistanceFactor = distanceScalingFactor,
CoastingDecisionFactorOffset = lacDfOffset,
CoastingDecisionFactorScaling = lacDfScaling,
@@ -450,7 +450,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
{
var acceleration = Body[JsonKeys.DriverData_AccelerationCurve];
if (acceleration == null || EmptyOrInvalidFileName(acceleration.Value<string>())) {
- throw new VectoException("AccelerationCurve (VACC) required");
+ return null;
+// throw new VectoException("AccelerationCurve (VACC) required");
}
try {
return ReadTableData(acceleration.Value<string>(), "DriverAccelerationCurve", false);
diff --git a/VectoCore/VectoCore/InputData/Impl/InputData.cs b/VectoCore/VectoCore/InputData/Impl/InputData.cs
index 442266ea11cbdb7daeb4abc364833446b20f15b1..a88e4115a9cbdb1cae783bcd71f6ea6d3ed5a9b5 100644
--- a/VectoCore/VectoCore/InputData/Impl/InputData.cs
+++ b/VectoCore/VectoCore/InputData/Impl/InputData.cs
@@ -61,7 +61,7 @@ namespace TUGraz.VectoCore.InputData.Impl
//public MeterPerSquareSecond Deceleration { get; internal set; }
- //public MeterPerSecond MinSpeed { get; internal set; }
+ public MeterPerSecond MinSpeed { get; internal set; }
public double CoastingDecisionFactorOffset { get; internal set; }
public double CoastingDecisionFactorScaling { get; internal set; }
@@ -98,7 +98,6 @@ namespace TUGraz.VectoCore.InputData.Impl
public class AxleInputData : IAxleEngineeringInputData
{
-
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design",
"CA1065:DoNotRaiseExceptionsInUnexpectedLocations")]
public bool SavedInDeclarationMode
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
index dd1d50c27d51170b469c7ff4356fc47a6d094adf..f68efa901d9555f983cd030bad6042d3578ff00b 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
@@ -273,7 +273,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
var lookAheadData = new DriverData.LACData {
Enabled = driver.Lookahead.Enabled,
//Deceleration = driver.Lookahead.Deceleration,
- //MinSpeed = driver.Lookahead.MinSpeed,
+ MinSpeed = driver.Lookahead.MinSpeed,
LookAheadDecisionFactor =
new LACDecisionFactor(driver.Lookahead.CoastingDecisionFactorOffset, driver.Lookahead.CoastingDecisionFactorScaling,
driver.Lookahead.CoastingDecisionFactorTargetSpeedLookup,
diff --git a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
index 94fe58d944ad73404e5ac6c6614ef94f3d042757..e7b4064c33310cb30598e77336179bc62dd94ed3 100644
--- a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
+++ b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
@@ -195,6 +195,7 @@ namespace TUGraz.VectoCore.Models.Declaration
public const double DecisionFactorCoastingOffset = 2.5;
public const double DecisionFactorCoastingScaling = 1.5;
public const double LookAheadDistanceFactor = 10;
+ public static readonly MeterPerSecond MinimumSpeed = 50.KMPHtoMeterPerSecond();
}
public static class OverSpeedEcoRoll
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/DriverData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/DriverData.cs
index 3ffe87fb9d5bc9daeb3b3f6d598c2ed2c6ec6b57..2825c1cc6a6f89456ee771683e5ccde1d6001ab0 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/DriverData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/DriverData.cs
@@ -29,8 +29,10 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
+using System.ComponentModel.DataAnnotations;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.Simulation.Data;
@@ -38,10 +40,13 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
{
public class DriverData
{
- public VectoRunData.StartStopData StartStop;
- public OverSpeedEcoRollData OverSpeedEcoRoll;
- public LACData LookAheadCoasting;
- public AccelerationCurveData AccelerationCurve;
+ [Required, ValidateObject] public VectoRunData.StartStopData StartStop;
+
+ [Required, ValidateObject] public OverSpeedEcoRollData OverSpeedEcoRoll;
+
+ [Required, ValidateObject] public LACData LookAheadCoasting;
+
+ [Required, ValidateObject] public AccelerationCurveData AccelerationCurve;
public static DriverMode ParseDriverMode(string mode)
{
@@ -51,19 +56,25 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
public class OverSpeedEcoRollData
{
public DriverMode Mode;
- public MeterPerSecond MinSpeed;
- public MeterPerSecond OverSpeed;
- public MeterPerSecond UnderSpeed;
+
+ [Required, SIRange(0, 120 / Constants.MeterPerSecondToKMH)] public MeterPerSecond MinSpeed;
+
+ [Required, SIRange(0, 50 / Constants.MeterPerSecondToKMH)] public MeterPerSecond OverSpeed;
+
+ [Required, SIRange(0, 50 / Constants.MeterPerSecondToKMH)] public MeterPerSecond UnderSpeed;
}
public class LACData
{
public bool Enabled;
+
//public MeterPerSquareSecond Deceleration;
- //public MeterPerSecond MinSpeed;
- public double LookAheadDistanceFactor;
- public LACDecisionFactor LookAheadDecisionFactor;
+ [Required, SIRange(0, 120 / Constants.MeterPerSecondToKMH)] public MeterPerSecond MinSpeed;
+
+ [Required, Range(0, 20)] public double LookAheadDistanceFactor;
+
+ [Required, ValidateObject] public LACDecisionFactor LookAheadDecisionFactor;
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
index 8359471720f383b0d84e1b233e0212be18dc8ba0..503426de7d635ca4d112e04995a75fe9e3dd5930 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
@@ -189,13 +189,14 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
var coastingDistance = ComputeCoastingDistance(currentSpeed, entry);
var brakingDistance = Driver.ComputeDecelerationDistance(nextTargetSpeed) + BrakingSafetyMargin;
- if (coastingDistance < 0) {
+ if (!Driver.DriverData.LookAheadCoasting.Enabled || coastingDistance < 0) {
Log.Debug(
"adding 'Braking' starting at distance {0}. brakingDistance: {1}, triggerDistance: {2}, nextTargetSpeed: {3}",
entry.Distance - brakingDistance, brakingDistance, entry.Distance, nextTargetSpeed);
+ coastingDistance = brakingDistance;
} else {
//var coastingDistance = ComputeCoastingDistance(currentSpeed, nextTargetSpeed);
- if (currentSpeed > 50.KMPHtoMeterPerSecond()) {
+ if (currentSpeed > Driver.DriverData.LookAheadCoasting.MinSpeed) {
action = DrivingBehavior.Coasting;
Log.Debug(