diff --git a/VECTO/GUI/VectoJobForm.Designer.vb b/VECTO/GUI/VectoJobForm.Designer.vb
index 104d02d89547023da7a71880c83232fd9cd61919..c957d80effffc8340bfaccda458e86b29378eb27 100644
--- a/VECTO/GUI/VectoJobForm.Designer.vb
+++ b/VECTO/GUI/VectoJobForm.Designer.vb
@@ -101,18 +101,6 @@ Partial Class VectoJobForm
Me.Label13 = New System.Windows.Forms.Label()
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()
@@ -152,8 +140,6 @@ Partial Class VectoJobForm
Me.GroupBox1.SuspendLayout()
Me.GroupBox2.SuspendLayout()
Me.PnEcoRoll.SuspendLayout()
- Me.GrStartStop.SuspendLayout()
- Me.PnStartStop.SuspendLayout()
Me.StatusStrip1.SuspendLayout()
Me.ToolStrip1.SuspendLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -543,13 +529,12 @@ Partial Class VectoJobForm
Me.TabPgDriver.Controls.Add(Me.GrVACC)
Me.TabPgDriver.Controls.Add(Me.GrLAC)
Me.TabPgDriver.Controls.Add(Me.GroupBox1)
- Me.TabPgDriver.Controls.Add(Me.GrStartStop)
Me.TabPgDriver.Location = New System.Drawing.Point(4, 22)
Me.TabPgDriver.Name = "TabPgDriver"
Me.TabPgDriver.Padding = New System.Windows.Forms.Padding(3)
Me.TabPgDriver.Size = New System.Drawing.Size(527, 487)
Me.TabPgDriver.TabIndex = 7
- Me.TabPgDriver.Text = "Driver Assist"
+ Me.TabPgDriver.Text = "Driver Model"
Me.TabPgDriver.UseVisualStyleBackColor = True
'
'GrVACC
@@ -558,7 +543,7 @@ 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 System.Drawing.Point(7, 383)
+ Me.GrVACC.Location = New System.Drawing.Point(9, 271)
Me.GrVACC.Name = "GrVACC"
Me.GrVACC.Size = New System.Drawing.Size(515, 69)
Me.GrVACC.TabIndex = 3
@@ -608,7 +593,7 @@ Partial Class VectoJobForm
'
Me.GrLAC.Controls.Add(Me.pnLookAheadCoasting)
Me.GrLAC.Controls.Add(Me.CbLookAhead)
- Me.GrLAC.Location = New System.Drawing.Point(7, 204)
+ Me.GrLAC.Location = New System.Drawing.Point(9, 92)
Me.GrLAC.Name = "GrLAC"
Me.GrLAC.Size = New System.Drawing.Size(514, 173)
Me.GrLAC.TabIndex = 2
@@ -800,7 +785,7 @@ Partial Class VectoJobForm
Me.GroupBox1.Controls.Add(Me.PnEcoRoll)
Me.GroupBox1.Controls.Add(Me.RdOverspeed)
Me.GroupBox1.Controls.Add(Me.RdOff)
- Me.GroupBox1.Location = New System.Drawing.Point(6, 121)
+ Me.GroupBox1.Location = New System.Drawing.Point(9, 9)
Me.GroupBox1.Name = "GroupBox1"
Me.GroupBox1.Size = New System.Drawing.Size(515, 77)
Me.GroupBox1.TabIndex = 1
@@ -934,120 +919,6 @@ Partial Class VectoJobForm
Me.RdOff.Text = "Off"
Me.RdOff.UseVisualStyleBackColor = True
'
- 'GrStartStop
- '
- Me.GrStartStop.Controls.Add(Me.PnStartStop)
- Me.GrStartStop.Controls.Add(Me.ChBStartStop)
- Me.GrStartStop.Location = New System.Drawing.Point(6, 6)
- Me.GrStartStop.Name = "GrStartStop"
- Me.GrStartStop.Size = New System.Drawing.Size(515, 109)
- Me.GrStartStop.TabIndex = 0
- Me.GrStartStop.TabStop = False
- Me.GrStartStop.Text = "Engine Start Stop"
- '
- 'PnStartStop
- '
- Me.PnStartStop.Controls.Add(Me.Label31)
- Me.PnStartStop.Controls.Add(Me.Label27)
- Me.PnStartStop.Controls.Add(Me.TbSSspeed)
- Me.PnStartStop.Controls.Add(Me.LabelSSspeed)
- Me.PnStartStop.Controls.Add(Me.Label26)
- Me.PnStartStop.Controls.Add(Me.Label30)
- Me.PnStartStop.Controls.Add(Me.LabelSStime)
- Me.PnStartStop.Controls.Add(Me.TbSSdelay)
- Me.PnStartStop.Controls.Add(Me.TbSStime)
- Me.PnStartStop.Location = New System.Drawing.Point(91, 19)
- Me.PnStartStop.Name = "PnStartStop"
- Me.PnStartStop.Size = New System.Drawing.Size(232, 80)
- Me.PnStartStop.TabIndex = 1
- '
- 'Label31
- '
- Me.Label31.AutoSize = True
- Me.Label31.Location = New System.Drawing.Point(170, 58)
- Me.Label31.Name = "Label31"
- 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 System.Drawing.Point(170, 32)
- Me.Label27.Name = "Label27"
- Me.Label27.Size = New System.Drawing.Size(18, 13)
- Me.Label27.TabIndex = 38
- Me.Label27.Text = "[s]"
- '
- 'TbSSspeed
- '
- Me.TbSSspeed.Location = New System.Drawing.Point(104, 3)
- Me.TbSSspeed.Name = "TbSSspeed"
- Me.TbSSspeed.Size = New System.Drawing.Size(64, 20)
- Me.TbSSspeed.TabIndex = 0
- '
- 'LabelSSspeed
- '
- Me.LabelSSspeed.AutoSize = True
- Me.LabelSSspeed.Location = New System.Drawing.Point(37, 6)
- Me.LabelSSspeed.Name = "LabelSSspeed"
- 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 System.Drawing.Point(170, 6)
- Me.Label26.Name = "Label26"
- 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 System.Drawing.Point(14, 58)
- Me.Label30.Name = "Label30"
- 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 System.Drawing.Point(11, 32)
- Me.LabelSStime.Name = "LabelSStime"
- 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 System.Drawing.Point(104, 55)
- Me.TbSSdelay.Name = "TbSSdelay"
- Me.TbSSdelay.Size = New System.Drawing.Size(64, 20)
- Me.TbSSdelay.TabIndex = 2
- '
- 'TbSStime
- '
- Me.TbSStime.Location = New System.Drawing.Point(104, 29)
- Me.TbSStime.Name = "TbSStime"
- 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 = System.Windows.Forms.CheckState.Checked
- Me.ChBStartStop.Location = New System.Drawing.Point(16, 21)
- Me.ChBStartStop.Name = "ChBStartStop"
- 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 System.Windows.Forms.ToolStripItem() {Me.ToolStripStatusLabelGEN})
@@ -1323,10 +1194,6 @@ Partial Class VectoJobForm
Me.GroupBox2.PerformLayout()
Me.PnEcoRoll.ResumeLayout(False)
Me.PnEcoRoll.PerformLayout()
- Me.GrStartStop.ResumeLayout(False)
- Me.GrStartStop.PerformLayout()
- Me.PnStartStop.ResumeLayout(False)
- Me.PnStartStop.PerformLayout()
Me.StatusStrip1.ResumeLayout(False)
Me.StatusStrip1.PerformLayout()
Me.ToolStrip1.ResumeLayout(False)
@@ -1385,12 +1252,6 @@ Partial Class VectoJobForm
Friend WithEvents CmOpenFile As ContextMenuStrip
Friend WithEvents OpenWithToolStripMenuItem As ToolStripMenuItem
Friend WithEvents ShowInFolderToolStripMenuItem As ToolStripMenuItem
- Friend WithEvents ChBStartStop As CheckBox
- Friend WithEvents GrStartStop As GroupBox
- Friend WithEvents TbSSspeed As TextBox
- Friend WithEvents TbSStime As TextBox
- Friend WithEvents LabelSStime As Label
- Friend WithEvents LabelSSspeed As Label
Friend WithEvents GrLAC As GroupBox
Friend WithEvents CbLookAhead As CheckBox
Friend WithEvents GroupBox1 As GroupBox
@@ -1405,12 +1266,6 @@ Partial Class VectoJobForm
Friend WithEvents Label13 As Label
Friend WithEvents RdOverspeed As RadioButton
Friend WithEvents RdOff As RadioButton
- Friend WithEvents PnStartStop As Panel
- Friend WithEvents Label27 As Label
- Friend WithEvents Label26 As Label
- Friend WithEvents Label31 As Label
- Friend WithEvents Label30 As Label
- Friend WithEvents TbSSdelay As TextBox
Friend WithEvents Label32 As Label
Friend WithEvents PnEcoRoll As Panel
Friend WithEvents PicVehicle As PictureBox
diff --git a/VECTO/GUI/VectoJobForm.resx b/VECTO/GUI/VectoJobForm.resx
index e9a578870cae82e82a55883df6245850c7b01ac1..86bda0298ff9d20a16e9cd1ffc9613b4baff4457 100644
--- a/VECTO/GUI/VectoJobForm.resx
+++ b/VECTO/GUI/VectoJobForm.resx
@@ -220,9 +220,6 @@
<metadata name="CmOpenFile.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>350, 15</value>
</metadata>
- <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>468, 15</value>
- </metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>49</value>
</metadata>
diff --git a/VECTO/GUI/VehicleForm.vb b/VECTO/GUI/VehicleForm.vb
index 65d471575dc6894db71647b8c97649ebaca7bcfd..5de38f5bc36b47d1f2bbf4f39cc11b9d8d1691e8 100644
--- a/VECTO/GUI/VehicleForm.vb
+++ b/VECTO/GUI/VehicleForm.vb
@@ -41,6 +41,7 @@ Public Class VehicleForm
Public AutoSendTo As Boolean = False
Public JobDir As String = ""
+ Private _torqueLimitDlog As VehicleTorqueLimitDialog
'Close - Check for unsaved changes
Private Sub VehicleFormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
@@ -88,6 +89,7 @@ Public Class VehicleForm
cbAngledriveType.DataSource = [Enum].GetValues(GetType(AngledriveType)) _
.Cast (Of AngledriveType).Select(Function(type) New With {Key .Value = type, .Label = type.GetLabel()}).ToList()
_axlDlog = New VehicleAxleDialog
+ _torqueLimitDlog = New VehicleTorqueLimitDialog()
cbPTOType.ValueMember = "Value"
cbPTOType.DisplayMember = "Label"
@@ -163,10 +165,10 @@ Public Class VehicleForm
Next
End If
- PnAll.Enabled = True
+ 'PnAll.Enabled = True
Else
- PnAll.Enabled = False
+ 'PnAll.Enabled = False
_hdVclass = "-"
End If
@@ -828,5 +830,40 @@ Public Class VehicleForm
tbPTOCycle.Text = GetFilenameWithoutDirectory(PTODrivingCycleFileBrowser.Files(0), GetPath(_vehFile))
End If
End Sub
+
+ Private Sub btAddMaxTorqueEntry_Click(sender As Object, e As EventArgs) Handles btAddMaxTorqueEntry.Click
+ _torqueLimitDlog.Clear()
+ If _torqueLimitDlog.ShowDialog() = DialogResult.OK Then
+ lvTorqueLimits.Items.Add(CreateMaxTorqueListViewItem(_torqueLimitDlog.tbGear.Text.ToInt(0),
+ _torqueLimitDlog.tbMaxTorque.Text.ToDouble(0)))
+ Change()
+
+ End If
+ End Sub
+
+ Private Function CreateMaxTorqueListViewItem(gear As Integer, maxTorque As Double) As ListViewItem
+ Dim retVal As New ListViewItem
+ retVal.SubItems(0).Text = gear.ToGUIFormat()
+ retVal.SubItems.Add(maxTorque.ToGUIFormat())
+ Return retVal
+ End Function
+
+ Private Sub btDelMaxTorqueEntry_Click(sender As Object, e As EventArgs) Handles btDelMaxTorqueEntry.Click
+ RemoveMaxTorqueItem()
+ End Sub
+
+ Private Sub RemoveMaxTorqueItem()
+ If lvTorqueLimits.SelectedItems.Count = 0 Then
+ If lvTorqueLimits.Items.Count = 0 Then
+ Exit Sub
+ Else
+ lvTorqueLimits.Items(lvTorqueLimits.Items.Count - 1).Selected = True
+ End If
+ End If
+
+ lvTorqueLimits.SelectedItems(0).Remove()
+
+ Change()
+ End Sub
End Class
diff --git a/VECTO/GUI/VehicleTorqueLimitsDialog.Designer.vb b/VECTO/GUI/VehicleTorqueLimitsDialog.Designer.vb
new file mode 100644
index 0000000000000000000000000000000000000000..f1591b402096e8ca3f5be6b948b0edb44a90124b
--- /dev/null
+++ b/VECTO/GUI/VehicleTorqueLimitsDialog.Designer.vb
@@ -0,0 +1,160 @@
+' Copyright 2014 European Union.
+' Licensed under the EUPL (the 'Licence');
+'
+' * You may not use this work except in compliance with the Licence.
+' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
+' * Unless required by applicable law or agreed to in writing,
+' software distributed under the Licence is distributed on an "AS IS" basis,
+' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+'
+' See the LICENSE.txt for the specific language governing permissions and limitations.
+Imports System.ComponentModel
+Imports Microsoft.VisualBasic.CompilerServices
+
+<DesignerGenerated()> _
+Partial Class VehicleTorqueLimitDialog
+ Inherits Form
+
+ 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+ <DebuggerNonUserCode()> _
+ Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+ Try
+ If disposing AndAlso components IsNot Nothing Then
+ components.Dispose()
+ End If
+ Finally
+ MyBase.Dispose(disposing)
+ End Try
+ End Sub
+
+ 'Wird vom Windows Form-Designer benötigt.
+ Private components As IContainer
+
+ 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+ 'Das Bearbeiten ist mit dem Windows Form-Designer möglich.
+ 'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+ <DebuggerStepThrough()> _
+ Private Sub InitializeComponent()
+ Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
+ Me.OK_Button = New System.Windows.Forms.Button()
+ Me.Cancel_Button = New System.Windows.Forms.Button()
+ Me.Label3 = New System.Windows.Forms.Label()
+ Me.tbGear = New System.Windows.Forms.TextBox()
+ Me.Label5 = New System.Windows.Forms.Label()
+ Me.Label6 = New System.Windows.Forms.Label()
+ Me.tbMaxTorque = New System.Windows.Forms.TextBox()
+ Me.TableLayoutPanel1.SuspendLayout
+ Me.SuspendLayout
+ '
+ 'TableLayoutPanel1
+ '
+ Me.TableLayoutPanel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.TableLayoutPanel1.ColumnCount = 2
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50!))
+ Me.TableLayoutPanel1.Controls.Add(Me.OK_Button, 0, 0)
+ Me.TableLayoutPanel1.Controls.Add(Me.Cancel_Button, 1, 0)
+ Me.TableLayoutPanel1.Location = New System.Drawing.Point(303, 44)
+ Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
+ Me.TableLayoutPanel1.RowCount = 1
+ Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50!))
+ Me.TableLayoutPanel1.Size = New System.Drawing.Size(146, 29)
+ Me.TableLayoutPanel1.TabIndex = 4
+ '
+ 'OK_Button
+ '
+ Me.OK_Button.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.OK_Button.Location = New System.Drawing.Point(3, 3)
+ Me.OK_Button.Name = "OK_Button"
+ Me.OK_Button.Size = New System.Drawing.Size(67, 23)
+ Me.OK_Button.TabIndex = 0
+ Me.OK_Button.Text = "OK"
+ '
+ 'Cancel_Button
+ '
+ Me.Cancel_Button.Anchor = System.Windows.Forms.AnchorStyles.None
+ Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel
+ Me.Cancel_Button.Location = New System.Drawing.Point(76, 3)
+ Me.Cancel_Button.Name = "Cancel_Button"
+ Me.Cancel_Button.Size = New System.Drawing.Size(67, 23)
+ Me.Cancel_Button.TabIndex = 1
+ Me.Cancel_Button.Text = "Cancel"
+ '
+ 'Label3
+ '
+ Me.Label3.AutoSize = true
+ Me.Label3.Location = New System.Drawing.Point(13, 15)
+ Me.Label3.Name = "Label3"
+ Me.Label3.Size = New System.Drawing.Size(30, 13)
+ Me.Label3.TabIndex = 1
+ Me.Label3.Text = "Gear"
+ '
+ 'tbGear
+ '
+ Me.tbGear.Location = New System.Drawing.Point(70, 12)
+ Me.tbGear.Name = "tbGear"
+ Me.tbGear.Size = New System.Drawing.Size(41, 20)
+ Me.tbGear.TabIndex = 2
+ Me.tbGear.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
+ '
+ 'Label5
+ '
+ Me.Label5.AutoSize = True
+ Me.Label5.Location = New System.Drawing.Point(171, 15)
+ Me.Label5.Name = "Label5"
+ Me.Label5.Size = New System.Drawing.Size(66, 13)
+ Me.Label5.TabIndex = 1
+ Me.Label5.Text = "max. Torque"
+ '
+ 'Label6
+ '
+ Me.Label6.AutoSize = True
+ Me.Label6.Location = New System.Drawing.Point(331, 15)
+ Me.Label6.Name = "Label6"
+ Me.Label6.Size = New System.Drawing.Size(29, 13)
+ Me.Label6.TabIndex = 1
+ Me.Label6.Text = "[Nm]"
+ '
+ 'tbMaxTorque
+ '
+ Me.tbMaxTorque.Location = New System.Drawing.Point(241, 13)
+ Me.tbMaxTorque.Name = "tbMaxTorque"
+ Me.tbMaxTorque.Size = New System.Drawing.Size(84, 20)
+ Me.tbMaxTorque.TabIndex = 3
+ Me.tbMaxTorque.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
+ '
+ 'VehicleTorqueLimitDialog
+ '
+ Me.AcceptButton = Me.OK_Button
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
+ Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+ Me.CancelButton = Me.Cancel_Button
+ Me.ClientSize = New System.Drawing.Size(461, 85)
+ Me.Controls.Add(Me.tbMaxTorque)
+ Me.Controls.Add(Me.Label6)
+ Me.Controls.Add(Me.tbGear)
+ Me.Controls.Add(Me.Label5)
+ Me.Controls.Add(Me.Label3)
+ Me.Controls.Add(Me.TableLayoutPanel1)
+ Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow
+ Me.MaximizeBox = false
+ Me.MinimizeBox = false
+ Me.Name = "VehicleTorqueLimitDialog"
+ Me.ShowInTaskbar = false
+ Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+ Me.Text = "Torque Limits"
+ Me.TableLayoutPanel1.ResumeLayout(false)
+ Me.ResumeLayout(false)
+ Me.PerformLayout
+
+End Sub
+ Friend WithEvents TableLayoutPanel1 As TableLayoutPanel
+ Friend WithEvents OK_Button As Button
+ Friend WithEvents Cancel_Button As Button
+ Friend WithEvents Label3 As Label
+ Friend WithEvents tbGear As TextBox
+ Friend WithEvents Label5 As Label
+ Friend WithEvents Label6 As Label
+ Friend WithEvents tbMaxTorque As TextBox
+
+End Class
diff --git a/VECTO/GUI/VehicleTorqueLimitsDialog.resx b/VECTO/GUI/VehicleTorqueLimitsDialog.resx
new file mode 100644
index 0000000000000000000000000000000000000000..1af7de150c99c12dd67a509fe57c10d63e4eeb04
--- /dev/null
+++ b/VECTO/GUI/VehicleTorqueLimitsDialog.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
diff --git a/VECTO/GUI/VehicleTorqueLimitsDialog.vb b/VECTO/GUI/VehicleTorqueLimitsDialog.vb
new file mode 100644
index 0000000000000000000000000000000000000000..44558819d2a77ba0138c636f8484028b399b1eb5
--- /dev/null
+++ b/VECTO/GUI/VehicleTorqueLimitsDialog.vb
@@ -0,0 +1,48 @@
+' Copyright 2014 European Union.
+' Licensed under the EUPL (the 'Licence');
+'
+' * You may not use this work except in compliance with the Licence.
+' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
+' * Unless required by applicable law or agreed to in writing,
+' software distributed under the Licence is distributed on an "AS IS" basis,
+' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+'
+' See the LICENSE.txt for the specific language governing permissions and limitations.
+Option Infer On
+Option Strict On
+Option Explicit On
+
+
+
+
+''' <summary>
+''' Axle Config Editor (Vehicle Editor sub-dialog)
+''' </summary>
+Public Class VehicleTorqueLimitDialog
+ Public Sub New()
+ InitializeComponent()
+ End Sub
+
+ Public Sub Clear()
+
+ tbGear.Text = ""
+ tbMaxTorque.Text = ""
+ End Sub
+
+ 'Initialise
+ Private Sub F_VEH_Axle_Load(sender As Object, e As EventArgs) Handles Me.Load
+ End Sub
+
+ 'Save and close
+ Private Sub OK_Button_Click(sender As Object, e As EventArgs) Handles OK_Button.Click
+
+ DialogResult = DialogResult.OK
+ Close()
+ End Sub
+
+ 'Cancel
+ Private Sub Cancel_Button_Click(sender As Object, e As EventArgs) Handles Cancel_Button.Click
+ DialogResult = DialogResult.Cancel
+ Close()
+ End Sub
+End Class
diff --git a/VECTO/VECTO.vbproj b/VECTO/VECTO.vbproj
index 0f05b243b003f4d55122e3ff697295eb0770633e..a86332afdb8c9d108e87283cfd9c43e49e036529 100644
--- a/VECTO/VECTO.vbproj
+++ b/VECTO/VECTO.vbproj
@@ -180,6 +180,12 @@
</ItemGroup>
<ItemGroup>
<Compile Include="ApplicationEvents.vb" />
+ <Compile Include="GUI\VehicleTorqueLimitsDialog.Designer.vb">
+ <DependentUpon>VehicleTorqueLimitsDialog.vb</DependentUpon>
+ </Compile>
+ <Compile Include="GUI\VehicleTorqueLimitsDialog.vb">
+ <SubType>Form</SubType>
+ </Compile>
<Compile Include="GUI\XMLExportJobDialog.Designer.vb">
<DependentUpon>XMLExportJobDialog.vb</DependentUpon>
</Compile>
@@ -346,6 +352,9 @@
<EmbeddedResource Include="GUI\JiraDialog.resx">
<DependentUpon>JiraDialog.vb</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="GUI\VehicleTorqueLimitsDialog.resx">
+ <DependentUpon>VehicleTorqueLimitsDialog.vb</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="GUI\WelcomeDialog.resx">
<DependentUpon>WelcomeDialog.vb</DependentUpon>
</EmbeddedResource>