From 38a255f1a83bcf1636795b33ef160258b2c18af7 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Tue, 6 Sep 2016 14:36:02 +0200
Subject: [PATCH] removing old files, deleting commented (deprecated) code

---
 VECTO/File Browser/FB_Global.vb |   46 --
 VECTO/GUI/F_VEH.Designer.vb     | 1195 -------------------------------
 VECTO/Input Files/cVEH.vb       |  840 ----------------------
 VECTO/VECTO_Types.vb            |   23 -
 4 files changed, 2104 deletions(-)
 delete mode 100644 VECTO/File Browser/FB_Global.vb
 delete mode 100644 VECTO/GUI/F_VEH.Designer.vb
 delete mode 100644 VECTO/Input Files/cVEH.vb

diff --git a/VECTO/File Browser/FB_Global.vb b/VECTO/File Browser/FB_Global.vb
deleted file mode 100644
index 9129d13ded..0000000000
--- a/VECTO/File Browser/FB_Global.vb	
+++ /dev/null
@@ -1,46 +0,0 @@
-' 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.
-
-''' <summary>
-''' Global File Brower properties and cFilebrowser instances.
-''' </summary>
-''' <remarks></remarks>
-Public Module FB_Global
-	Public FB_FolderHistory(19) As String
-	Public FB_Drives() As String
-	Public FB_Init As Boolean
-	Public FB_FilHisDir As String
-	'-----------------------------
-	Public fbFolder As cFileBrowser
-	Public fbVECTO As cFileBrowser
-	Public fbFileLists As cFileBrowser
-	Public fbVEH As cFileBrowser
-	Public fbDRI As cFileBrowser
-	Public fbMAP As cFileBrowser
-	Public fbFLD As cFileBrowser
-
-	Public fbENG As cFileBrowser
-	Public fbGBX As cFileBrowser
-	Public fbACC As cFileBrowser
-	Public fbDfTargetSpeed As cFileBrowser
-	Public fbDfVelocityDrop As cFileBrowser
-	Public fbAUX As cFileBrowser
-
-	Public fbGBS As cFileBrowser
-	Public fbTLM As cFileBrowser
-	Public fbPTOLM As cFileBrowser
-	Public fbRLM As cFileBrowser
-	Public fbTCC As cFileBrowser
-	Public fbCDx As cFileBrowser
-
-	Public fbVMOD As cFileBrowser
-End Module
-
diff --git a/VECTO/GUI/F_VEH.Designer.vb b/VECTO/GUI/F_VEH.Designer.vb
deleted file mode 100644
index 0121d504f8..0000000000
--- a/VECTO/GUI/F_VEH.Designer.vb
+++ /dev/null
@@ -1,1195 +0,0 @@
-' 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.
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
-Partial Class F_VEH
-    Inherits System.Windows.Forms.Form
-
-    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
-    <System.Diagnostics.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 System.ComponentModel.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.
-    <System.Diagnostics.DebuggerStepThrough()> _
-    Private Sub InitializeComponent()
-		Me.components = New System.ComponentModel.Container()
-		Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(F_VEH))
-		Me.Label1 = New System.Windows.Forms.Label()
-		Me.TbMass = New System.Windows.Forms.TextBox()
-		Me.Label2 = New System.Windows.Forms.Label()
-		Me.TbLoad = New System.Windows.Forms.TextBox()
-		Me.Label3 = New System.Windows.Forms.Label()
-		Me.TBcdA = New System.Windows.Forms.TextBox()
-		Me.Label13 = New System.Windows.Forms.Label()
-		Me.TBrdyn = New System.Windows.Forms.TextBox()
-		Me.ButOK = New System.Windows.Forms.Button()
-		Me.ButCancel = New System.Windows.Forms.Button()
-		Me.Label14 = New System.Windows.Forms.Label()
-		Me.Label31 = New System.Windows.Forms.Label()
-		Me.Label35 = New System.Windows.Forms.Label()
-		Me.CbCdMode = New System.Windows.Forms.ComboBox()
-		Me.TbCdFile = New System.Windows.Forms.TextBox()
-		Me.BtCdFileBrowse = New System.Windows.Forms.Button()
-		Me.GroupBox6 = New System.Windows.Forms.GroupBox()
-		Me.BtCdFileOpen = New System.Windows.Forms.Button()
-		Me.LbCdMode = New System.Windows.Forms.Label()
-		Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
-		Me.ToolStripBtNew = New System.Windows.Forms.ToolStripButton()
-		Me.ToolStripBtOpen = New System.Windows.Forms.ToolStripButton()
-		Me.ToolStripBtSave = New System.Windows.Forms.ToolStripButton()
-		Me.ToolStripBtSaveAs = New System.Windows.Forms.ToolStripButton()
-		Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
-		Me.ToolStripBtSendTo = New System.Windows.Forms.ToolStripButton()
-		Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
-		Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
-		Me.GroupBox7 = New System.Windows.Forms.GroupBox()
-		Me.PnRt = New System.Windows.Forms.Panel()
-		Me.Label15 = New System.Windows.Forms.Label()
-		Me.BtRtBrowse = New System.Windows.Forms.Button()
-		Me.TbRtPath = New System.Windows.Forms.TextBox()
-		Me.Label45 = New System.Windows.Forms.Label()
-		Me.LbRtRatio = New System.Windows.Forms.Label()
-		Me.TbRtRatio = New System.Windows.Forms.TextBox()
-		Me.CbRtType = New System.Windows.Forms.ComboBox()
-		Me.Label46 = New System.Windows.Forms.Label()
-		Me.Label50 = New System.Windows.Forms.Label()
-		Me.TbMassExtra = New System.Windows.Forms.TextBox()
-		Me.GroupBox8 = New System.Windows.Forms.GroupBox()
-		Me.Label6 = New System.Windows.Forms.Label()
-		Me.ButAxlRem = New System.Windows.Forms.Button()
-		Me.LvRRC = New System.Windows.Forms.ListView()
-		Me.ColumnHeader7 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-		Me.ColumnHeader8 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-		Me.ColumnHeader2 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-		Me.ColumnHeader9 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-		Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-		Me.ColumnHeader3 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-		Me.ColumnHeader4 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-		Me.ButAxlAdd = New System.Windows.Forms.Button()
-		Me.PnWheelDiam = New System.Windows.Forms.Panel()
-		Me.CbAxleConfig = New System.Windows.Forms.ComboBox()
-		Me.CbCat = New System.Windows.Forms.ComboBox()
-		Me.Label5 = New System.Windows.Forms.Label()
-		Me.Label9 = New System.Windows.Forms.Label()
-		Me.TbMassMass = New System.Windows.Forms.TextBox()
-		Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
-		Me.LbStatus = New System.Windows.Forms.ToolStripStatusLabel()
-		Me.TbHDVclass = New System.Windows.Forms.TextBox()
-		Me.Label11 = New System.Windows.Forms.Label()
-		Me.TbLoadingMax = New System.Windows.Forms.TextBox()
-		Me.Label22 = New System.Windows.Forms.Label()
-		Me.GroupBox1 = New System.Windows.Forms.GroupBox()
-		Me.PnLoad = New System.Windows.Forms.Panel()
-		Me.GrAirRes = New System.Windows.Forms.GroupBox()
-		Me.PnCdATrTr = New System.Windows.Forms.Panel()
-		Me.Label38 = New System.Windows.Forms.Label()
-		Me.PictureBox1 = New System.Windows.Forms.PictureBox()
-		Me.CmOpenFile = New System.Windows.Forms.ContextMenuStrip(Me.components)
-		Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-		Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-		Me.PnAll = New System.Windows.Forms.Panel()
-		Me.gbPTO = New System.Windows.Forms.GroupBox()
-		Me.pnPTO = New System.Windows.Forms.Panel()
-		Me.btPTOCycle = New System.Windows.Forms.Button()
-		Me.Label16 = New System.Windows.Forms.Label()
-		Me.tbPTOCycle = New System.Windows.Forms.TextBox()
-		Me.btPTOLossMapBrowse = New System.Windows.Forms.Button()
-		Me.Label7 = New System.Windows.Forms.Label()
-		Me.tbPTOLossMap = New System.Windows.Forms.TextBox()
-		Me.cbPTOType = New System.Windows.Forms.ComboBox()
-		Me.GroupBox3 = New System.Windows.Forms.GroupBox()
-		Me.GroupBox2 = New System.Windows.Forms.GroupBox()
-		Me.pnAngularGearFields = New System.Windows.Forms.Panel()
-		Me.Label4 = New System.Windows.Forms.Label()
-		Me.Label12 = New System.Windows.Forms.Label()
-		Me.Label10 = New System.Windows.Forms.Label()
-		Me.tbAngularGearRatio = New System.Windows.Forms.TextBox()
-		Me.btAngularGearLossMapBrowse = New System.Windows.Forms.Button()
-		Me.tbAngularGearLossMapPath = New System.Windows.Forms.TextBox()
-		Me.cbAngularGearType = New System.Windows.Forms.ComboBox()
-		Me.PicVehicle = New System.Windows.Forms.PictureBox()
-		Me.Label8 = New System.Windows.Forms.Label()
-		Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
-		Me.GroupBox6.SuspendLayout()
-		Me.ToolStrip1.SuspendLayout()
-		Me.GroupBox7.SuspendLayout()
-		Me.PnRt.SuspendLayout()
-		Me.GroupBox8.SuspendLayout()
-		Me.PnWheelDiam.SuspendLayout()
-		Me.StatusStrip1.SuspendLayout()
-		Me.GroupBox1.SuspendLayout()
-		Me.PnLoad.SuspendLayout()
-		Me.GrAirRes.SuspendLayout()
-		Me.PnCdATrTr.SuspendLayout()
-		CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
-		Me.CmOpenFile.SuspendLayout()
-		Me.PnAll.SuspendLayout()
-		Me.gbPTO.SuspendLayout()
-		Me.pnPTO.SuspendLayout()
-		Me.GroupBox3.SuspendLayout()
-		Me.GroupBox2.SuspendLayout()
-		Me.pnAngularGearFields.SuspendLayout()
-		CType(Me.PicVehicle, System.ComponentModel.ISupportInitialize).BeginInit()
-		Me.SuspendLayout()
-		'
-		'Label1
-		'
-		Me.Label1.AutoSize = True
-		Me.Label1.Location = New System.Drawing.Point(62, 22)
-		Me.Label1.Name = "Label1"
-		Me.Label1.Size = New System.Drawing.Size(104, 13)
-		Me.Label1.TabIndex = 0
-		Me.Label1.Text = "Curb Weight Vehicle"
-		'
-		'TbMass
-		'
-		Me.TbMass.Location = New System.Drawing.Point(172, 19)
-		Me.TbMass.Name = "TbMass"
-		Me.TbMass.Size = New System.Drawing.Size(57, 20)
-		Me.TbMass.TabIndex = 0
-		'
-		'Label2
-		'
-		Me.Label2.AutoSize = True
-		Me.Label2.Location = New System.Drawing.Point(115, 31)
-		Me.Label2.Name = "Label2"
-		Me.Label2.Size = New System.Drawing.Size(45, 13)
-		Me.Label2.TabIndex = 2
-		Me.Label2.Text = "Loading"
-		'
-		'TbLoad
-		'
-		Me.TbLoad.Location = New System.Drawing.Point(166, 28)
-		Me.TbLoad.Name = "TbLoad"
-		Me.TbLoad.Size = New System.Drawing.Size(57, 20)
-		Me.TbLoad.TabIndex = 1
-		'
-		'Label3
-		'
-		Me.Label3.AutoSize = True
-		Me.Label3.Location = New System.Drawing.Point(3, 6)
-		Me.Label3.Name = "Label3"
-		Me.Label3.Size = New System.Drawing.Size(37, 13)
-		Me.Label3.TabIndex = 8
-		Me.Label3.Text = "cd x A"
-		'
-		'TBcdA
-		'
-		Me.TBcdA.Location = New System.Drawing.Point(46, 3)
-		Me.TBcdA.Name = "TBcdA"
-		Me.TBcdA.Size = New System.Drawing.Size(57, 20)
-		Me.TBcdA.TabIndex = 0
-		'
-		'Label13
-		'
-		Me.Label13.AutoSize = True
-		Me.Label13.Location = New System.Drawing.Point(3, 7)
-		Me.Label13.Name = "Label13"
-		Me.Label13.Size = New System.Drawing.Size(40, 13)
-		Me.Label13.TabIndex = 6
-		Me.Label13.Text = "Radius"
-		'
-		'TBrdyn
-		'
-		Me.TBrdyn.Location = New System.Drawing.Point(46, 4)
-		Me.TBrdyn.Name = "TBrdyn"
-		Me.TBrdyn.Size = New System.Drawing.Size(57, 20)
-		Me.TBrdyn.TabIndex = 0
-		'
-		'ButOK
-		'
-		Me.ButOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.ButOK.Location = New System.Drawing.Point(421, 675)
-		Me.ButOK.Name = "ButOK"
-		Me.ButOK.Size = New System.Drawing.Size(75, 23)
-		Me.ButOK.TabIndex = 5
-		Me.ButOK.Text = "Save"
-		Me.ButOK.UseVisualStyleBackColor = True
-		'
-		'ButCancel
-		'
-		Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.ButCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
-		Me.ButCancel.Location = New System.Drawing.Point(502, 675)
-		Me.ButCancel.Name = "ButCancel"
-		Me.ButCancel.Size = New System.Drawing.Size(75, 23)
-		Me.ButCancel.TabIndex = 6
-		Me.ButCancel.Text = "Cancel"
-		Me.ButCancel.UseVisualStyleBackColor = True
-		'
-		'Label14
-		'
-		Me.Label14.AutoSize = True
-		Me.Label14.Location = New System.Drawing.Point(231, 22)
-		Me.Label14.Name = "Label14"
-		Me.Label14.Size = New System.Drawing.Size(25, 13)
-		Me.Label14.TabIndex = 24
-		Me.Label14.Text = "[kg]"
-		'
-		'Label31
-		'
-		Me.Label31.AutoSize = True
-		Me.Label31.Location = New System.Drawing.Point(225, 31)
-		Me.Label31.Name = "Label31"
-		Me.Label31.Size = New System.Drawing.Size(25, 13)
-		Me.Label31.TabIndex = 24
-		Me.Label31.Text = "[kg]"
-		'
-		'Label35
-		'
-		Me.Label35.AutoSize = True
-		Me.Label35.Location = New System.Drawing.Point(105, 7)
-		Me.Label35.Name = "Label35"
-		Me.Label35.Size = New System.Drawing.Size(29, 13)
-		Me.Label35.TabIndex = 24
-		Me.Label35.Text = "[mm]"
-		'
-		'CbCdMode
-		'
-		Me.CbCdMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-		Me.CbCdMode.FormattingEnabled = True
-		Me.CbCdMode.Items.AddRange(New Object() {"No Correction", "Speed dependent (User-defined)", "Speed dependent (Declaration Mode)", "Vair & Beta Input"})
-		Me.CbCdMode.Location = New System.Drawing.Point(6, 19)
-		Me.CbCdMode.Name = "CbCdMode"
-		Me.CbCdMode.Size = New System.Drawing.Size(268, 21)
-		Me.CbCdMode.TabIndex = 0
-		'
-		'TbCdFile
-		'
-		Me.TbCdFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
-			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.TbCdFile.Enabled = False
-		Me.TbCdFile.Location = New System.Drawing.Point(6, 58)
-		Me.TbCdFile.Name = "TbCdFile"
-		Me.TbCdFile.Size = New System.Drawing.Size(222, 20)
-		Me.TbCdFile.TabIndex = 1
-		'
-		'BtCdFileBrowse
-		'
-		Me.BtCdFileBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.BtCdFileBrowse.Enabled = False
-		Me.BtCdFileBrowse.Image = Global.VECTO.My.Resources.Resources.Open_icon
-		Me.BtCdFileBrowse.Location = New System.Drawing.Point(228, 55)
-		Me.BtCdFileBrowse.Name = "BtCdFileBrowse"
-		Me.BtCdFileBrowse.Size = New System.Drawing.Size(24, 24)
-		Me.BtCdFileBrowse.TabIndex = 2
-		Me.BtCdFileBrowse.UseVisualStyleBackColor = True
-		'
-		'GroupBox6
-		'
-		Me.GroupBox6.Controls.Add(Me.BtCdFileOpen)
-		Me.GroupBox6.Controls.Add(Me.LbCdMode)
-		Me.GroupBox6.Controls.Add(Me.CbCdMode)
-		Me.GroupBox6.Controls.Add(Me.BtCdFileBrowse)
-		Me.GroupBox6.Controls.Add(Me.TbCdFile)
-		Me.GroupBox6.Location = New System.Drawing.Point(290, 51)
-		Me.GroupBox6.Name = "GroupBox6"
-		Me.GroupBox6.Size = New System.Drawing.Size(280, 86)
-		Me.GroupBox6.TabIndex = 5
-		Me.GroupBox6.TabStop = False
-		Me.GroupBox6.Text = "Cross Wind Correction"
-		'
-		'BtCdFileOpen
-		'
-		Me.BtCdFileOpen.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.BtCdFileOpen.Enabled = False
-		Me.BtCdFileOpen.Image = Global.VECTO.My.Resources.Resources.application_export_icon_small
-		Me.BtCdFileOpen.Location = New System.Drawing.Point(251, 55)
-		Me.BtCdFileOpen.Name = "BtCdFileOpen"
-		Me.BtCdFileOpen.Size = New System.Drawing.Size(24, 24)
-		Me.BtCdFileOpen.TabIndex = 3
-		Me.BtCdFileOpen.TabStop = False
-		Me.BtCdFileOpen.UseVisualStyleBackColor = True
-		'
-		'LbCdMode
-		'
-		Me.LbCdMode.AutoSize = True
-		Me.LbCdMode.Location = New System.Drawing.Point(6, 42)
-		Me.LbCdMode.Name = "LbCdMode"
-		Me.LbCdMode.Size = New System.Drawing.Size(59, 13)
-		Me.LbCdMode.TabIndex = 28
-		Me.LbCdMode.Text = "LbCdMode"
-		'
-		'ToolStrip1
-		'
-		Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
-		Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator3, Me.ToolStripBtSendTo, Me.ToolStripSeparator1, Me.ToolStripButton1})
-		Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
-		Me.ToolStrip1.Name = "ToolStrip1"
-		Me.ToolStrip1.Size = New System.Drawing.Size(589, 25)
-		Me.ToolStrip1.TabIndex = 29
-		Me.ToolStrip1.Text = "ToolStrip1"
-		'
-		'ToolStripBtNew
-		'
-		Me.ToolStripBtNew.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-		Me.ToolStripBtNew.Image = Global.VECTO.My.Resources.Resources.blue_document_icon
-		Me.ToolStripBtNew.ImageTransparentColor = System.Drawing.Color.Magenta
-		Me.ToolStripBtNew.Name = "ToolStripBtNew"
-		Me.ToolStripBtNew.Size = New System.Drawing.Size(23, 22)
-		Me.ToolStripBtNew.Text = "ToolStripButton1"
-		Me.ToolStripBtNew.ToolTipText = "New"
-		'
-		'ToolStripBtOpen
-		'
-		Me.ToolStripBtOpen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-		Me.ToolStripBtOpen.Image = Global.VECTO.My.Resources.Resources.Open_icon
-		Me.ToolStripBtOpen.ImageTransparentColor = System.Drawing.Color.Magenta
-		Me.ToolStripBtOpen.Name = "ToolStripBtOpen"
-		Me.ToolStripBtOpen.Size = New System.Drawing.Size(23, 22)
-		Me.ToolStripBtOpen.Text = "ToolStripButton1"
-		Me.ToolStripBtOpen.ToolTipText = "Open..."
-		'
-		'ToolStripBtSave
-		'
-		Me.ToolStripBtSave.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-		Me.ToolStripBtSave.Image = Global.VECTO.My.Resources.Resources.Actions_document_save_icon
-		Me.ToolStripBtSave.ImageTransparentColor = System.Drawing.Color.Magenta
-		Me.ToolStripBtSave.Name = "ToolStripBtSave"
-		Me.ToolStripBtSave.Size = New System.Drawing.Size(23, 22)
-		Me.ToolStripBtSave.Text = "ToolStripButton1"
-		Me.ToolStripBtSave.ToolTipText = "Save"
-		'
-		'ToolStripBtSaveAs
-		'
-		Me.ToolStripBtSaveAs.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-		Me.ToolStripBtSaveAs.Image = Global.VECTO.My.Resources.Resources.Actions_document_save_as_icon
-		Me.ToolStripBtSaveAs.ImageTransparentColor = System.Drawing.Color.Magenta
-		Me.ToolStripBtSaveAs.Name = "ToolStripBtSaveAs"
-		Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(23, 22)
-		Me.ToolStripBtSaveAs.Text = "ToolStripButton1"
-		Me.ToolStripBtSaveAs.ToolTipText = "Save As..."
-		'
-		'ToolStripSeparator3
-		'
-		Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
-		Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 25)
-		'
-		'ToolStripBtSendTo
-		'
-		Me.ToolStripBtSendTo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-		Me.ToolStripBtSendTo.Image = Global.VECTO.My.Resources.Resources.export_icon
-		Me.ToolStripBtSendTo.ImageTransparentColor = System.Drawing.Color.Magenta
-		Me.ToolStripBtSendTo.Name = "ToolStripBtSendTo"
-		Me.ToolStripBtSendTo.Size = New System.Drawing.Size(23, 22)
-		Me.ToolStripBtSendTo.Text = "Send to Job Editor"
-		Me.ToolStripBtSendTo.ToolTipText = "Send to Job Editor"
-		'
-		'ToolStripSeparator1
-		'
-		Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
-		Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 25)
-		'
-		'ToolStripButton1
-		'
-		Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-		Me.ToolStripButton1.Image = Global.VECTO.My.Resources.Resources.Help_icon
-		Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
-		Me.ToolStripButton1.Name = "ToolStripButton1"
-		Me.ToolStripButton1.Size = New System.Drawing.Size(23, 22)
-		Me.ToolStripButton1.Text = "Help"
-		'
-		'GroupBox7
-		'
-		Me.GroupBox7.Controls.Add(Me.PnRt)
-		Me.GroupBox7.Controls.Add(Me.CbRtType)
-		Me.GroupBox7.Location = New System.Drawing.Point(6, 295)
-		Me.GroupBox7.Name = "GroupBox7"
-		Me.GroupBox7.Size = New System.Drawing.Size(278, 111)
-		Me.GroupBox7.TabIndex = 3
-		Me.GroupBox7.TabStop = False
-		Me.GroupBox7.Text = "Retarder Losses"
-		'
-		'PnRt
-		'
-		Me.PnRt.Controls.Add(Me.Label15)
-		Me.PnRt.Controls.Add(Me.BtRtBrowse)
-		Me.PnRt.Controls.Add(Me.TbRtPath)
-		Me.PnRt.Controls.Add(Me.Label45)
-		Me.PnRt.Controls.Add(Me.LbRtRatio)
-		Me.PnRt.Controls.Add(Me.TbRtRatio)
-		Me.PnRt.Location = New System.Drawing.Point(3, 42)
-		Me.PnRt.Name = "PnRt"
-		Me.PnRt.Size = New System.Drawing.Size(272, 63)
-		Me.PnRt.TabIndex = 1
-		'
-		'Label15
-		'
-		Me.Label15.Location = New System.Drawing.Point(6, 23)
-		Me.Label15.Name = "Label15"
-		Me.Label15.Size = New System.Drawing.Size(201, 16)
-		Me.Label15.TabIndex = 15
-		Me.Label15.Text = "Retarder Loss Map"
-		Me.Label15.TextAlign = System.Drawing.ContentAlignment.BottomLeft
-		'
-		'BtRtBrowse
-		'
-		Me.BtRtBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-		Me.BtRtBrowse.Image = Global.VECTO.My.Resources.Resources.Open_icon
-		Me.BtRtBrowse.Location = New System.Drawing.Point(245, 39)
-		Me.BtRtBrowse.Name = "BtRtBrowse"
-		Me.BtRtBrowse.Size = New System.Drawing.Size(24, 24)
-		Me.BtRtBrowse.TabIndex = 14
-		Me.BtRtBrowse.UseVisualStyleBackColor = True
-		'
-		'TbRtPath
-		'
-		Me.TbRtPath.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-		Me.TbRtPath.Location = New System.Drawing.Point(6, 41)
-		Me.TbRtPath.Name = "TbRtPath"
-		Me.TbRtPath.Size = New System.Drawing.Size(239, 20)
-		Me.TbRtPath.TabIndex = 13
-		'
-		'Label45
-		'
-		Me.Label45.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.Label45.AutoSize = True
-		Me.Label45.Location = New System.Drawing.Point(251, 4)
-		Me.Label45.Name = "Label45"
-		Me.Label45.Size = New System.Drawing.Size(16, 13)
-		Me.Label45.TabIndex = 10
-		Me.Label45.Text = "[-]"
-		'
-		'LbRtRatio
-		'
-		Me.LbRtRatio.Location = New System.Drawing.Point(19, 4)
-		Me.LbRtRatio.Name = "LbRtRatio"
-		Me.LbRtRatio.Size = New System.Drawing.Size(167, 17)
-		Me.LbRtRatio.TabIndex = 5
-		Me.LbRtRatio.Text = "Ratio"
-		Me.LbRtRatio.TextAlign = System.Drawing.ContentAlignment.TopRight
-		'
-		'TbRtRatio
-		'
-		Me.TbRtRatio.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.TbRtRatio.Location = New System.Drawing.Point(193, 2)
-		Me.TbRtRatio.Name = "TbRtRatio"
-		Me.TbRtRatio.Size = New System.Drawing.Size(56, 20)
-		Me.TbRtRatio.TabIndex = 0
-		'
-		'CbRtType
-		'
-		Me.CbRtType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-		Me.CbRtType.FormattingEnabled = True
-		Me.CbRtType.Items.AddRange(New Object() {"Included in Transmission Loss Maps", "Primary Retarder", "Secondary Retarder"})
-		Me.CbRtType.Location = New System.Drawing.Point(6, 19)
-		Me.CbRtType.Name = "CbRtType"
-		Me.CbRtType.Size = New System.Drawing.Size(266, 21)
-		Me.CbRtType.TabIndex = 0
-		'
-		'Label46
-		'
-		Me.Label46.AutoSize = True
-		Me.Label46.Location = New System.Drawing.Point(6, 5)
-		Me.Label46.Name = "Label46"
-		Me.Label46.Size = New System.Drawing.Size(154, 13)
-		Me.Label46.TabIndex = 31
-		Me.Label46.Text = "Curb Weight Extra Trailer/Body"
-		'
-		'Label50
-		'
-		Me.Label50.AutoSize = True
-		Me.Label50.Location = New System.Drawing.Point(225, 5)
-		Me.Label50.Name = "Label50"
-		Me.Label50.Size = New System.Drawing.Size(25, 13)
-		Me.Label50.TabIndex = 24
-		Me.Label50.Text = "[kg]"
-		'
-		'TbMassExtra
-		'
-		Me.TbMassExtra.Location = New System.Drawing.Point(166, 2)
-		Me.TbMassExtra.Name = "TbMassExtra"
-		Me.TbMassExtra.Size = New System.Drawing.Size(57, 20)
-		Me.TbMassExtra.TabIndex = 0
-		'
-		'GroupBox8
-		'
-		Me.GroupBox8.Controls.Add(Me.Label6)
-		Me.GroupBox8.Controls.Add(Me.ButAxlRem)
-		Me.GroupBox8.Controls.Add(Me.LvRRC)
-		Me.GroupBox8.Controls.Add(Me.ButAxlAdd)
-		Me.GroupBox8.Location = New System.Drawing.Point(6, 138)
-		Me.GroupBox8.Name = "GroupBox8"
-		Me.GroupBox8.Size = New System.Drawing.Size(564, 151)
-		Me.GroupBox8.TabIndex = 2
-		Me.GroupBox8.TabStop = False
-		Me.GroupBox8.Text = "Axles / Wheels"
-		'
-		'Label6
-		'
-		Me.Label6.AutoSize = True
-		Me.Label6.Location = New System.Drawing.Point(450, 121)
-		Me.Label6.Name = "Label6"
-		Me.Label6.Size = New System.Drawing.Size(106, 13)
-		Me.Label6.TabIndex = 3
-		Me.Label6.Text = "(Double-Click to Edit)"
-		'
-		'ButAxlRem
-		'
-		Me.ButAxlRem.Image = Global.VECTO.My.Resources.Resources.minus_circle_icon
-		Me.ButAxlRem.Location = New System.Drawing.Point(29, 122)
-		Me.ButAxlRem.Name = "ButAxlRem"
-		Me.ButAxlRem.Size = New System.Drawing.Size(24, 24)
-		Me.ButAxlRem.TabIndex = 2
-		Me.ButAxlRem.UseVisualStyleBackColor = True
-		'
-		'LvRRC
-		'
-		Me.LvRRC.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
-			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.LvRRC.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader7, Me.ColumnHeader8, Me.ColumnHeader2, Me.ColumnHeader9, Me.ColumnHeader1, Me.ColumnHeader3, Me.ColumnHeader4})
-		Me.LvRRC.FullRowSelect = True
-		Me.LvRRC.GridLines = True
-		Me.LvRRC.HideSelection = False
-		Me.LvRRC.Location = New System.Drawing.Point(6, 19)
-		Me.LvRRC.MultiSelect = False
-		Me.LvRRC.Name = "LvRRC"
-		Me.LvRRC.Size = New System.Drawing.Size(552, 102)
-		Me.LvRRC.TabIndex = 0
-		Me.LvRRC.TabStop = False
-		Me.LvRRC.UseCompatibleStateImageBehavior = False
-		Me.LvRRC.View = System.Windows.Forms.View.Details
-		'
-		'ColumnHeader7
-		'
-		Me.ColumnHeader7.Text = "#"
-		Me.ColumnHeader7.Width = 22
-		'
-		'ColumnHeader8
-		'
-		Me.ColumnHeader8.Text = "Rel. load"
-		Me.ColumnHeader8.Width = 62
-		'
-		'ColumnHeader2
-		'
-		Me.ColumnHeader2.Text = "Twin T."
-		Me.ColumnHeader2.Width = 51
-		'
-		'ColumnHeader9
-		'
-		Me.ColumnHeader9.Text = "RRC"
-		Me.ColumnHeader9.Width = 59
-		'
-		'ColumnHeader1
-		'
-		Me.ColumnHeader1.Text = "Fz ISO"
-		Me.ColumnHeader1.Width = 55
-		'
-		'ColumnHeader3
-		'
-		Me.ColumnHeader3.Text = "Wheels"
-		Me.ColumnHeader3.Width = 181
-		'
-		'ColumnHeader4
-		'
-		Me.ColumnHeader4.Text = "Inertia"
-		'
-		'ButAxlAdd
-		'
-		Me.ButAxlAdd.Image = Global.VECTO.My.Resources.Resources.plus_circle_icon
-		Me.ButAxlAdd.Location = New System.Drawing.Point(5, 122)
-		Me.ButAxlAdd.Name = "ButAxlAdd"
-		Me.ButAxlAdd.Size = New System.Drawing.Size(24, 24)
-		Me.ButAxlAdd.TabIndex = 1
-		Me.ButAxlAdd.UseVisualStyleBackColor = True
-		'
-		'PnWheelDiam
-		'
-		Me.PnWheelDiam.Controls.Add(Me.Label13)
-		Me.PnWheelDiam.Controls.Add(Me.TBrdyn)
-		Me.PnWheelDiam.Controls.Add(Me.Label35)
-		Me.PnWheelDiam.Dock = System.Windows.Forms.DockStyle.Fill
-		Me.PnWheelDiam.Location = New System.Drawing.Point(3, 16)
-		Me.PnWheelDiam.Name = "PnWheelDiam"
-		Me.PnWheelDiam.Size = New System.Drawing.Size(131, 29)
-		Me.PnWheelDiam.TabIndex = 5
-		'
-		'CbAxleConfig
-		'
-		Me.CbAxleConfig.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-		Me.CbAxleConfig.FormattingEnabled = True
-		Me.CbAxleConfig.Items.AddRange(New Object() {"-", "4x2", "4x4", "6x2", "6x4", "6x6", "8x2", "8x4", "8x6", "8x8"})
-		Me.CbAxleConfig.Location = New System.Drawing.Point(153, 80)
-		Me.CbAxleConfig.Name = "CbAxleConfig"
-		Me.CbAxleConfig.Size = New System.Drawing.Size(60, 21)
-		Me.CbAxleConfig.TabIndex = 1
-		'
-		'CbCat
-		'
-		Me.CbCat.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-		Me.CbCat.FormattingEnabled = True
-		Me.CbCat.Items.AddRange(New Object() {"-", "Rigid Truck", "Tractor", "City Bus", "Interurban Bus", "Coach"})
-		Me.CbCat.Location = New System.Drawing.Point(12, 80)
-		Me.CbCat.Name = "CbCat"
-		Me.CbCat.Size = New System.Drawing.Size(135, 21)
-		Me.CbCat.TabIndex = 0
-		'
-		'Label5
-		'
-		Me.Label5.AutoSize = True
-		Me.Label5.Location = New System.Drawing.Point(13, 110)
-		Me.Label5.Name = "Label5"
-		Me.Label5.Size = New System.Drawing.Size(134, 13)
-		Me.Label5.TabIndex = 2
-		Me.Label5.Text = "Gross Vehicle Mass Rating"
-		'
-		'Label9
-		'
-		Me.Label9.AutoSize = True
-		Me.Label9.Location = New System.Drawing.Point(197, 110)
-		Me.Label9.Name = "Label9"
-		Me.Label9.Size = New System.Drawing.Size(16, 13)
-		Me.Label9.TabIndex = 3
-		Me.Label9.Text = "[t]"
-		Me.Label9.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
-		'
-		'TbMassMass
-		'
-		Me.TbMassMass.Location = New System.Drawing.Point(153, 107)
-		Me.TbMassMass.Name = "TbMassMass"
-		Me.TbMassMass.Size = New System.Drawing.Size(42, 20)
-		Me.TbMassMass.TabIndex = 2
-		'
-		'StatusStrip1
-		'
-		Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LbStatus})
-		Me.StatusStrip1.Location = New System.Drawing.Point(0, 701)
-		Me.StatusStrip1.Name = "StatusStrip1"
-		Me.StatusStrip1.Size = New System.Drawing.Size(589, 22)
-		Me.StatusStrip1.SizingGrip = False
-		Me.StatusStrip1.TabIndex = 36
-		Me.StatusStrip1.Text = "StatusStrip1"
-		'
-		'LbStatus
-		'
-		Me.LbStatus.Name = "LbStatus"
-		Me.LbStatus.Size = New System.Drawing.Size(39, 17)
-		Me.LbStatus.Text = "Status"
-		'
-		'TbHDVclass
-		'
-		Me.TbHDVclass.Location = New System.Drawing.Point(153, 133)
-		Me.TbHDVclass.Name = "TbHDVclass"
-		Me.TbHDVclass.ReadOnly = True
-		Me.TbHDVclass.Size = New System.Drawing.Size(42, 20)
-		Me.TbHDVclass.TabIndex = 3
-		Me.TbHDVclass.TabStop = False
-		Me.TbHDVclass.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
-		'
-		'Label11
-		'
-		Me.Label11.AutoSize = True
-		Me.Label11.Location = New System.Drawing.Point(89, 57)
-		Me.Label11.Name = "Label11"
-		Me.Label11.Size = New System.Drawing.Size(71, 13)
-		Me.Label11.TabIndex = 31
-		Me.Label11.Text = "Max. Loading"
-		'
-		'TbLoadingMax
-		'
-		Me.TbLoadingMax.Location = New System.Drawing.Point(166, 54)
-		Me.TbLoadingMax.Name = "TbLoadingMax"
-		Me.TbLoadingMax.ReadOnly = True
-		Me.TbLoadingMax.Size = New System.Drawing.Size(57, 20)
-		Me.TbLoadingMax.TabIndex = 2
-		Me.TbLoadingMax.TabStop = False
-		'
-		'Label22
-		'
-		Me.Label22.AutoSize = True
-		Me.Label22.Location = New System.Drawing.Point(225, 57)
-		Me.Label22.Name = "Label22"
-		Me.Label22.Size = New System.Drawing.Size(25, 13)
-		Me.Label22.TabIndex = 24
-		Me.Label22.Text = "[kg]"
-		'
-		'GroupBox1
-		'
-		Me.GroupBox1.Controls.Add(Me.PnLoad)
-		Me.GroupBox1.Controls.Add(Me.TbMass)
-		Me.GroupBox1.Controls.Add(Me.Label1)
-		Me.GroupBox1.Controls.Add(Me.Label14)
-		Me.GroupBox1.Location = New System.Drawing.Point(6, 3)
-		Me.GroupBox1.Name = "GroupBox1"
-		Me.GroupBox1.Size = New System.Drawing.Size(278, 134)
-		Me.GroupBox1.TabIndex = 0
-		Me.GroupBox1.TabStop = False
-		Me.GroupBox1.Text = "Weight / Loading"
-		'
-		'PnLoad
-		'
-		Me.PnLoad.Controls.Add(Me.Label2)
-		Me.PnLoad.Controls.Add(Me.Label31)
-		Me.PnLoad.Controls.Add(Me.TbLoad)
-		Me.PnLoad.Controls.Add(Me.TbMassExtra)
-		Me.PnLoad.Controls.Add(Me.TbLoadingMax)
-		Me.PnLoad.Controls.Add(Me.Label50)
-		Me.PnLoad.Controls.Add(Me.Label46)
-		Me.PnLoad.Controls.Add(Me.Label22)
-		Me.PnLoad.Controls.Add(Me.Label11)
-		Me.PnLoad.Location = New System.Drawing.Point(6, 43)
-		Me.PnLoad.Name = "PnLoad"
-		Me.PnLoad.Size = New System.Drawing.Size(256, 75)
-		Me.PnLoad.TabIndex = 1
-		'
-		'GrAirRes
-		'
-		Me.GrAirRes.Controls.Add(Me.PnCdATrTr)
-		Me.GrAirRes.Location = New System.Drawing.Point(290, 3)
-		Me.GrAirRes.Name = "GrAirRes"
-		Me.GrAirRes.Size = New System.Drawing.Size(137, 48)
-		Me.GrAirRes.TabIndex = 1
-		Me.GrAirRes.TabStop = False
-		Me.GrAirRes.Text = "Air Resistance"
-		'
-		'PnCdATrTr
-		'
-		Me.PnCdATrTr.Controls.Add(Me.TBcdA)
-		Me.PnCdATrTr.Controls.Add(Me.Label38)
-		Me.PnCdATrTr.Controls.Add(Me.Label3)
-		Me.PnCdATrTr.Dock = System.Windows.Forms.DockStyle.Fill
-		Me.PnCdATrTr.Location = New System.Drawing.Point(3, 16)
-		Me.PnCdATrTr.Name = "PnCdATrTr"
-		Me.PnCdATrTr.Size = New System.Drawing.Size(131, 29)
-		Me.PnCdATrTr.TabIndex = 0
-		'
-		'Label38
-		'
-		Me.Label38.AutoSize = True
-		Me.Label38.Location = New System.Drawing.Point(105, 6)
-		Me.Label38.Name = "Label38"
-		Me.Label38.Size = New System.Drawing.Size(24, 13)
-		Me.Label38.TabIndex = 24
-		Me.Label38.Text = "[m²]"
-		'
-		'PictureBox1
-		'
-		Me.PictureBox1.BackColor = System.Drawing.Color.White
-		Me.PictureBox1.Image = Global.VECTO.My.Resources.Resources.VECTO_VEH
-		Me.PictureBox1.Location = New System.Drawing.Point(12, 28)
-		Me.PictureBox1.Name = "PictureBox1"
-		Me.PictureBox1.Size = New System.Drawing.Size(569, 40)
-		Me.PictureBox1.TabIndex = 37
-		Me.PictureBox1.TabStop = False
-		'
-		'CmOpenFile
-		'
-		Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
-		Me.CmOpenFile.Name = "CmOpenFile"
-		Me.CmOpenFile.Size = New System.Drawing.Size(153, 48)
-		'
-		'OpenWithToolStripMenuItem
-		'
-		Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem"
-		Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
-		Me.OpenWithToolStripMenuItem.Text = "Open with ..."
-		'
-		'ShowInFolderToolStripMenuItem
-		'
-		Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem"
-		Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
-		Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
-		'
-		'PnAll
-		'
-		Me.PnAll.Controls.Add(Me.gbPTO)
-		Me.PnAll.Controls.Add(Me.GroupBox3)
-		Me.PnAll.Controls.Add(Me.GroupBox2)
-		Me.PnAll.Controls.Add(Me.GrAirRes)
-		Me.PnAll.Controls.Add(Me.GroupBox1)
-		Me.PnAll.Controls.Add(Me.GroupBox8)
-		Me.PnAll.Controls.Add(Me.GroupBox7)
-		Me.PnAll.Controls.Add(Me.GroupBox6)
-		Me.PnAll.Location = New System.Drawing.Point(6, 172)
-		Me.PnAll.Name = "PnAll"
-		Me.PnAll.Size = New System.Drawing.Size(575, 503)
-		Me.PnAll.TabIndex = 4
-		'
-		'gbPTO
-		'
-		Me.gbPTO.Controls.Add(Me.pnPTO)
-		Me.gbPTO.Controls.Add(Me.cbPTOType)
-		Me.gbPTO.Location = New System.Drawing.Point(6, 412)
-		Me.gbPTO.Name = "gbPTO"
-		Me.gbPTO.Size = New System.Drawing.Size(564, 86)
-		Me.gbPTO.TabIndex = 4
-		Me.gbPTO.TabStop = False
-		Me.gbPTO.Text = "PTO Consumer"
-		'
-		'pnPTO
-		'
-		Me.pnPTO.Controls.Add(Me.btPTOCycle)
-		Me.pnPTO.Controls.Add(Me.Label16)
-		Me.pnPTO.Controls.Add(Me.tbPTOCycle)
-		Me.pnPTO.Controls.Add(Me.btPTOLossMapBrowse)
-		Me.pnPTO.Controls.Add(Me.Label7)
-		Me.pnPTO.Controls.Add(Me.tbPTOLossMap)
-		Me.pnPTO.Dock = System.Windows.Forms.DockStyle.Bottom
-		Me.pnPTO.Location = New System.Drawing.Point(3, 42)
-		Me.pnPTO.Name = "pnPTO"
-		Me.pnPTO.Size = New System.Drawing.Size(558, 41)
-		Me.pnPTO.TabIndex = 4
-		'
-		'btPTOCycle
-		'
-		Me.btPTOCycle.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-		Me.btPTOCycle.Image = Global.VECTO.My.Resources.Resources.Open_icon
-		Me.btPTOCycle.Location = New System.Drawing.Point(529, 16)
-		Me.btPTOCycle.Name = "btPTOCycle"
-		Me.btPTOCycle.Size = New System.Drawing.Size(24, 24)
-		Me.btPTOCycle.TabIndex = 17
-		Me.btPTOCycle.UseVisualStyleBackColor = True
-		'
-		'Label16
-		'
-		Me.Label16.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-		Me.Label16.Location = New System.Drawing.Point(287, -1)
-		Me.Label16.Name = "Label16"
-		Me.Label16.Size = New System.Drawing.Size(201, 16)
-		Me.Label16.TabIndex = 18
-		Me.Label16.Text = "PTO Cycle (.vdri)"
-		Me.Label16.TextAlign = System.Drawing.ContentAlignment.BottomLeft
-		'
-		'tbPTOCycle
-		'
-		Me.tbPTOCycle.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-		Me.tbPTOCycle.Location = New System.Drawing.Point(290, 18)
-		Me.tbPTOCycle.Name = "tbPTOCycle"
-		Me.tbPTOCycle.Size = New System.Drawing.Size(239, 20)
-		Me.tbPTOCycle.TabIndex = 16
-		Me.ToolTip1.SetToolTip(Me.tbPTOCycle, "PTO Consumer Loss Map")
-		'
-		'btPTOLossMapBrowse
-		'
-		Me.btPTOLossMapBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-		Me.btPTOLossMapBrowse.Image = Global.VECTO.My.Resources.Resources.Open_icon
-		Me.btPTOLossMapBrowse.Location = New System.Drawing.Point(245, 16)
-		Me.btPTOLossMapBrowse.Name = "btPTOLossMapBrowse"
-		Me.btPTOLossMapBrowse.Size = New System.Drawing.Size(24, 24)
-		Me.btPTOLossMapBrowse.TabIndex = 14
-		Me.btPTOLossMapBrowse.UseVisualStyleBackColor = True
-		'
-		'Label7
-		'
-		Me.Label7.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-		Me.Label7.Location = New System.Drawing.Point(3, -1)
-		Me.Label7.Name = "Label7"
-		Me.Label7.Size = New System.Drawing.Size(201, 16)
-		Me.Label7.TabIndex = 15
-		Me.Label7.Text = "PTO Consumer Loss Map (.vptol)"
-		Me.Label7.TextAlign = System.Drawing.ContentAlignment.BottomLeft
-		'
-		'tbPTOLossMap
-		'
-		Me.tbPTOLossMap.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-		Me.tbPTOLossMap.Location = New System.Drawing.Point(6, 18)
-		Me.tbPTOLossMap.Name = "tbPTOLossMap"
-		Me.tbPTOLossMap.Size = New System.Drawing.Size(239, 20)
-		Me.tbPTOLossMap.TabIndex = 13
-		Me.ToolTip1.SetToolTip(Me.tbPTOLossMap, "PTO Consumer Loss Map")
-		'
-		'cbPTOType
-		'
-		Me.cbPTOType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-		Me.cbPTOType.Location = New System.Drawing.Point(6, 17)
-		Me.cbPTOType.Name = "cbPTOType"
-		Me.cbPTOType.Size = New System.Drawing.Size(550, 21)
-		Me.cbPTOType.TabIndex = 0
-		Me.ToolTip1.SetToolTip(Me.cbPTOType, "Transmission type to the PTO consumer")
-		'
-		'GroupBox3
-		'
-		Me.GroupBox3.Controls.Add(Me.PnWheelDiam)
-		Me.GroupBox3.Location = New System.Drawing.Point(433, 3)
-		Me.GroupBox3.Name = "GroupBox3"
-		Me.GroupBox3.Size = New System.Drawing.Size(137, 48)
-		Me.GroupBox3.TabIndex = 6
-		Me.GroupBox3.TabStop = False
-		Me.GroupBox3.Text = "Dynamic Tire Radius"
-		'
-		'GroupBox2
-		'
-		Me.GroupBox2.Controls.Add(Me.pnAngularGearFields)
-		Me.GroupBox2.Controls.Add(Me.cbAngularGearType)
-		Me.GroupBox2.Location = New System.Drawing.Point(290, 295)
-		Me.GroupBox2.Name = "GroupBox2"
-		Me.GroupBox2.Size = New System.Drawing.Size(280, 111)
-		Me.GroupBox2.TabIndex = 4
-		Me.GroupBox2.TabStop = False
-		Me.GroupBox2.Text = "Angular Gear"
-		'
-		'pnAngularGearFields
-		'
-		Me.pnAngularGearFields.Controls.Add(Me.Label4)
-		Me.pnAngularGearFields.Controls.Add(Me.Label12)
-		Me.pnAngularGearFields.Controls.Add(Me.Label10)
-		Me.pnAngularGearFields.Controls.Add(Me.tbAngularGearRatio)
-		Me.pnAngularGearFields.Controls.Add(Me.btAngularGearLossMapBrowse)
-		Me.pnAngularGearFields.Controls.Add(Me.tbAngularGearLossMapPath)
-		Me.pnAngularGearFields.Location = New System.Drawing.Point(3, 42)
-		Me.pnAngularGearFields.Name = "pnAngularGearFields"
-		Me.pnAngularGearFields.Size = New System.Drawing.Size(272, 63)
-		Me.pnAngularGearFields.TabIndex = 6
-		'
-		'Label4
-		'
-		Me.Label4.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.Label4.AutoSize = True
-		Me.Label4.Location = New System.Drawing.Point(251, 4)
-		Me.Label4.Name = "Label4"
-		Me.Label4.Size = New System.Drawing.Size(16, 13)
-		Me.Label4.TabIndex = 16
-		Me.Label4.Text = "[-]"
-		'
-		'Label12
-		'
-		Me.Label12.Location = New System.Drawing.Point(6, 23)
-		Me.Label12.Name = "Label12"
-		Me.Label12.Size = New System.Drawing.Size(263, 16)
-		Me.Label12.TabIndex = 17
-		Me.Label12.Text = "Transmission Loss Map or Efficiency Value [0..1]"
-		Me.Label12.TextAlign = System.Drawing.ContentAlignment.BottomLeft
-		'
-		'Label10
-		'
-		Me.Label10.Location = New System.Drawing.Point(144, 4)
-		Me.Label10.Name = "Label10"
-		Me.Label10.Size = New System.Drawing.Size(44, 18)
-		Me.Label10.TabIndex = 15
-		Me.Label10.Text = "Ratio"
-		Me.Label10.TextAlign = System.Drawing.ContentAlignment.TopRight
-		'
-		'tbAngularGearRatio
-		'
-		Me.tbAngularGearRatio.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.tbAngularGearRatio.Location = New System.Drawing.Point(193, 2)
-		Me.tbAngularGearRatio.Name = "tbAngularGearRatio"
-		Me.tbAngularGearRatio.Size = New System.Drawing.Size(56, 20)
-		Me.tbAngularGearRatio.TabIndex = 12
-		'
-		'btAngularGearLossMapBrowse
-		'
-		Me.btAngularGearLossMapBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-		Me.btAngularGearLossMapBrowse.Image = Global.VECTO.My.Resources.Resources.Open_icon
-		Me.btAngularGearLossMapBrowse.Location = New System.Drawing.Point(245, 39)
-		Me.btAngularGearLossMapBrowse.Name = "btAngularGearLossMapBrowse"
-		Me.btAngularGearLossMapBrowse.Size = New System.Drawing.Size(24, 24)
-		Me.btAngularGearLossMapBrowse.TabIndex = 14
-		Me.btAngularGearLossMapBrowse.UseVisualStyleBackColor = True
-		'
-		'tbAngularGearLossMapPath
-		'
-		Me.tbAngularGearLossMapPath.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-		Me.tbAngularGearLossMapPath.Location = New System.Drawing.Point(6, 41)
-		Me.tbAngularGearLossMapPath.Name = "tbAngularGearLossMapPath"
-		Me.tbAngularGearLossMapPath.Size = New System.Drawing.Size(239, 20)
-		Me.tbAngularGearLossMapPath.TabIndex = 13
-		'
-		'cbAngularGearType
-		'
-		Me.cbAngularGearType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-		Me.cbAngularGearType.FormattingEnabled = True
-		Me.cbAngularGearType.Items.AddRange(New Object() {"No Angular Gear", "Separate Angular Gear", "Included in Transmission Loss Maps"})
-		Me.cbAngularGearType.Location = New System.Drawing.Point(6, 19)
-		Me.cbAngularGearType.Name = "cbAngularGearType"
-		Me.cbAngularGearType.Size = New System.Drawing.Size(266, 21)
-		Me.cbAngularGearType.TabIndex = 0
-		'
-		'PicVehicle
-		'
-		Me.PicVehicle.BackColor = System.Drawing.Color.LightGray
-		Me.PicVehicle.Location = New System.Drawing.Point(281, 74)
-		Me.PicVehicle.Name = "PicVehicle"
-		Me.PicVehicle.Size = New System.Drawing.Size(300, 88)
-		Me.PicVehicle.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
-		Me.PicVehicle.TabIndex = 39
-		Me.PicVehicle.TabStop = False
-		'
-		'Label8
-		'
-		Me.Label8.AutoSize = True
-		Me.Label8.Location = New System.Drawing.Point(89, 136)
-		Me.Label8.Name = "Label8"
-		Me.Label8.Size = New System.Drawing.Size(58, 13)
-		Me.Label8.TabIndex = 10
-		Me.Label8.Text = "HDV Class"
-		'
-		'F_VEH
-		'
-		Me.AcceptButton = Me.ButOK
-		Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
-		Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-		Me.CancelButton = Me.ButCancel
-		Me.ClientSize = New System.Drawing.Size(589, 723)
-		Me.Controls.Add(Me.Label8)
-		Me.Controls.Add(Me.TbHDVclass)
-		Me.Controls.Add(Me.PicVehicle)
-		Me.Controls.Add(Me.PnAll)
-		Me.Controls.Add(Me.PictureBox1)
-		Me.Controls.Add(Me.Label9)
-		Me.Controls.Add(Me.StatusStrip1)
-		Me.Controls.Add(Me.CbAxleConfig)
-		Me.Controls.Add(Me.TbMassMass)
-		Me.Controls.Add(Me.CbCat)
-		Me.Controls.Add(Me.Label5)
-		Me.Controls.Add(Me.ToolStrip1)
-		Me.Controls.Add(Me.ButCancel)
-		Me.Controls.Add(Me.ButOK)
-		Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
-		Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
-		Me.MaximizeBox = False
-		Me.Name = "F_VEH"
-		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
-		Me.Text = "F05_VEH"
-		Me.GroupBox6.ResumeLayout(False)
-		Me.GroupBox6.PerformLayout()
-		Me.ToolStrip1.ResumeLayout(False)
-		Me.ToolStrip1.PerformLayout()
-		Me.GroupBox7.ResumeLayout(False)
-		Me.PnRt.ResumeLayout(False)
-		Me.PnRt.PerformLayout()
-		Me.GroupBox8.ResumeLayout(False)
-		Me.GroupBox8.PerformLayout()
-		Me.PnWheelDiam.ResumeLayout(False)
-		Me.PnWheelDiam.PerformLayout()
-		Me.StatusStrip1.ResumeLayout(False)
-		Me.StatusStrip1.PerformLayout()
-		Me.GroupBox1.ResumeLayout(False)
-		Me.GroupBox1.PerformLayout()
-		Me.PnLoad.ResumeLayout(False)
-		Me.PnLoad.PerformLayout()
-		Me.GrAirRes.ResumeLayout(False)
-		Me.PnCdATrTr.ResumeLayout(False)
-		Me.PnCdATrTr.PerformLayout()
-		CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
-		Me.CmOpenFile.ResumeLayout(False)
-		Me.PnAll.ResumeLayout(False)
-		Me.gbPTO.ResumeLayout(False)
-		Me.pnPTO.ResumeLayout(False)
-		Me.pnPTO.PerformLayout()
-		Me.GroupBox3.ResumeLayout(False)
-		Me.GroupBox2.ResumeLayout(False)
-		Me.pnAngularGearFields.ResumeLayout(False)
-		Me.pnAngularGearFields.PerformLayout()
-		CType(Me.PicVehicle, System.ComponentModel.ISupportInitialize).EndInit()
-		Me.ResumeLayout(False)
-		Me.PerformLayout()
-
-	End Sub
-	Friend WithEvents Label1 As System.Windows.Forms.Label
-	Friend WithEvents TbMass As System.Windows.Forms.TextBox
-	Friend WithEvents Label2 As System.Windows.Forms.Label
-	Friend WithEvents TbLoad As System.Windows.Forms.TextBox
-	Friend WithEvents Label3 As System.Windows.Forms.Label
-	Friend WithEvents TBcdA As System.Windows.Forms.TextBox
-	Friend WithEvents Label13 As System.Windows.Forms.Label
-	Friend WithEvents TBrdyn As System.Windows.Forms.TextBox
-	Friend WithEvents ButOK As System.Windows.Forms.Button
-	Friend WithEvents ButCancel As System.Windows.Forms.Button
-	Friend WithEvents Label14 As System.Windows.Forms.Label
-	Friend WithEvents Label31 As System.Windows.Forms.Label
-	Friend WithEvents Label35 As System.Windows.Forms.Label
-	Friend WithEvents CbCdMode As System.Windows.Forms.ComboBox
-	Friend WithEvents TbCdFile As System.Windows.Forms.TextBox
-	Friend WithEvents BtCdFileBrowse As System.Windows.Forms.Button
-	Friend WithEvents GroupBox6 As System.Windows.Forms.GroupBox
-	Friend WithEvents LbCdMode As System.Windows.Forms.Label
-	Friend WithEvents ToolStrip1 As System.Windows.Forms.ToolStrip
-	Friend WithEvents ToolStripBtNew As System.Windows.Forms.ToolStripButton
-	Friend WithEvents ToolStripBtOpen As System.Windows.Forms.ToolStripButton
-	Friend WithEvents ToolStripBtSave As System.Windows.Forms.ToolStripButton
-	Friend WithEvents ToolStripBtSaveAs As System.Windows.Forms.ToolStripButton
-	Friend WithEvents ToolStripSeparator3 As System.Windows.Forms.ToolStripSeparator
-	Friend WithEvents ToolStripBtSendTo As System.Windows.Forms.ToolStripButton
-	Friend WithEvents GroupBox7 As System.Windows.Forms.GroupBox
-	Friend WithEvents LbRtRatio As System.Windows.Forms.Label
-	Friend WithEvents TbRtRatio As System.Windows.Forms.TextBox
-	Friend WithEvents CbRtType As System.Windows.Forms.ComboBox
-	Friend WithEvents Label45 As System.Windows.Forms.Label
-	Friend WithEvents PnRt As System.Windows.Forms.Panel
-	Friend WithEvents Label46 As System.Windows.Forms.Label
-	Friend WithEvents Label50 As System.Windows.Forms.Label
-	Friend WithEvents TbMassExtra As System.Windows.Forms.TextBox
-	Friend WithEvents GroupBox8 As System.Windows.Forms.GroupBox
-	Friend WithEvents ButAxlRem As System.Windows.Forms.Button
-	Friend WithEvents LvRRC As System.Windows.Forms.ListView
-	Friend WithEvents ColumnHeader7 As System.Windows.Forms.ColumnHeader
-	Friend WithEvents ColumnHeader8 As System.Windows.Forms.ColumnHeader
-	Friend WithEvents ButAxlAdd As System.Windows.Forms.Button
-	Friend WithEvents CbCat As System.Windows.Forms.ComboBox
-	Friend WithEvents Label5 As System.Windows.Forms.Label
-	Friend WithEvents Label9 As System.Windows.Forms.Label
-	Friend WithEvents TbMassMass As System.Windows.Forms.TextBox
-	Friend WithEvents ColumnHeader9 As System.Windows.Forms.ColumnHeader
-	Friend WithEvents StatusStrip1 As System.Windows.Forms.StatusStrip
-	Friend WithEvents LbStatus As System.Windows.Forms.ToolStripStatusLabel
-	Friend WithEvents CbAxleConfig As System.Windows.Forms.ComboBox
-	Friend WithEvents TbHDVclass As System.Windows.Forms.TextBox
-	Friend WithEvents Label11 As System.Windows.Forms.Label
-	Friend WithEvents TbLoadingMax As System.Windows.Forms.TextBox
-	Friend WithEvents Label22 As System.Windows.Forms.Label
-	Friend WithEvents GroupBox1 As System.Windows.Forms.GroupBox
-	Friend WithEvents GrAirRes As System.Windows.Forms.GroupBox
-	Friend WithEvents PictureBox1 As System.Windows.Forms.PictureBox
-	Friend WithEvents ToolStripSeparator1 As System.Windows.Forms.ToolStripSeparator
-	Friend WithEvents ToolStripButton1 As System.Windows.Forms.ToolStripButton
-	Friend WithEvents CmOpenFile As System.Windows.Forms.ContextMenuStrip
-	Friend WithEvents OpenWithToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
-	Friend WithEvents ShowInFolderToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
-	Friend WithEvents BtCdFileOpen As System.Windows.Forms.Button
-	Friend WithEvents ColumnHeader1 As System.Windows.Forms.ColumnHeader
-	Friend WithEvents ColumnHeader2 As System.Windows.Forms.ColumnHeader
-	Friend WithEvents PnLoad As System.Windows.Forms.Panel
-	Friend WithEvents PnAll As System.Windows.Forms.Panel
-	Friend WithEvents Label6 As System.Windows.Forms.Label
-	Friend WithEvents ColumnHeader3 As System.Windows.Forms.ColumnHeader
-	Friend WithEvents ColumnHeader4 As System.Windows.Forms.ColumnHeader
-	Friend WithEvents PnWheelDiam As System.Windows.Forms.Panel
-	Friend WithEvents PicVehicle As System.Windows.Forms.PictureBox
-	Friend WithEvents Label8 As System.Windows.Forms.Label
-	Friend WithEvents PnCdATrTr As System.Windows.Forms.Panel
-	Friend WithEvents Label38 As System.Windows.Forms.Label
-	Friend WithEvents GroupBox2 As System.Windows.Forms.GroupBox
-	Friend WithEvents cbAngularGearType As System.Windows.Forms.ComboBox
-	Friend WithEvents Label15 As System.Windows.Forms.Label
-	Friend WithEvents BtRtBrowse As System.Windows.Forms.Button
-	Friend WithEvents TbRtPath As System.Windows.Forms.TextBox
-	Friend WithEvents pnAngularGearFields As System.Windows.Forms.Panel
-	Friend WithEvents Label4 As System.Windows.Forms.Label
-	Friend WithEvents Label12 As System.Windows.Forms.Label
-	Friend WithEvents Label10 As System.Windows.Forms.Label
-	Friend WithEvents tbAngularGearRatio As System.Windows.Forms.TextBox
-	Friend WithEvents btAngularGearLossMapBrowse As System.Windows.Forms.Button
-	Friend WithEvents tbAngularGearLossMapPath As System.Windows.Forms.TextBox
-	Friend WithEvents ToolTip1 As System.Windows.Forms.ToolTip
-	Friend WithEvents GroupBox3 As System.Windows.Forms.GroupBox
-	Friend WithEvents Label7 As System.Windows.Forms.Label
-	Friend WithEvents tbPTOLossMap As System.Windows.Forms.TextBox
-	Friend WithEvents gbPTO As System.Windows.Forms.GroupBox
-	Friend WithEvents btPTOLossMapBrowse As System.Windows.Forms.Button
-	Friend WithEvents cbPTOType As System.Windows.Forms.ComboBox
-	Friend WithEvents pnPTO As System.Windows.Forms.Panel
-	Friend WithEvents btPTOCycle As System.Windows.Forms.Button
-	Friend WithEvents Label16 As System.Windows.Forms.Label
-	Friend WithEvents tbPTOCycle As System.Windows.Forms.TextBox
-End Class
diff --git a/VECTO/Input Files/cVEH.vb b/VECTO/Input Files/cVEH.vb
deleted file mode 100644
index 07e2c91404..0000000000
--- a/VECTO/Input Files/cVEH.vb	
+++ /dev/null
@@ -1,840 +0,0 @@
-' 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
-
-Imports System.Collections.Generic
-Imports System.IO
-Imports System.Linq
-Imports TUGraz.VectoCommon.Models
-Imports TUGraz.VectoCommon.Utils
-
-
-Public Class cVEH
-	'V2 MassMax is now saved in [t] instead of [kg]
-	Private Const FormatVersion As Short = 7
-	Private FileVersion As Short
-
-	Private sFilePath As String
-	Private MyPath As String
-
-	Public Mass As Single
-	Public Loading As Single
-	Private siFr0 As Single
-
-	Public CdA0 As Single
-	Public CdA02 As Single
-	Private CdA0Act As Single
-
-	Public CdMode As tCdMode
-	Public CdFile As cSubPath
-	Private CdX As List(Of Single)
-	Private CdY As List(Of Single)
-	Private CdDim As Integer
-
-	Public RtType As tRtType '0=None, 1=Primary, 2=Secondary
-	Public RtRatio As Single = 0
-	Public RtFile As cSubPath
-	Private RtDim As Integer
-	Private RtnU As List(Of Single)
-	Private RtM As List(Of Single)
-
-	Public rdyn As Single
-	Public Axles As List(Of cAxle)
-	Private m_red0 As Single
-
-	Public VehCat As tVehCat
-	Public MassExtra As Single
-	Public MassMax As Single
-	Public AxleConf As tAxleConf
-
-	Private _myFileList As List(Of String)
-
-	Public SavedInDeclMode As Boolean
-	Public AngularGearType As AngularGearType '0=None, 1=Separate, 2=Included
-	Public AngularGearRatio As Single
-	Public AngularGearLossMapFile As cSubPath
-
-	Public PTOType As tPTOType
-	Public PTOLossMap As cSubPath
-	Public PTOCycle As cSubPath
-
-	Public Class cAxle
-		Public RRC As Single
-		Public Share As Single
-		Public TwinTire As Boolean
-		Public FzISO As Single
-		Public Wheels As String
-		Public Inertia As Single
-	End Class
-
-
-	Public Function CreateFileList() As Boolean
-		_myFileList = New List(Of String)
-
-		'.vcdv  / .vcdb
-		If CdMode = tCdMode.CdOfVeng Or CdMode = tCdMode.CdOfBeta Then
-			_myFileList.Add(CdFile.FullPath)
-		End If
-
-		'Retarder
-		If RtType <> tRtType.None Then
-			_myFileList.Add(RtFile.FullPath)
-		End If
-
-		'Angular Gear
-		If AngularGearType <> AngularGearType.None Then
-			_myFileList.Add(AngularGearLossMapFile.FullPath)
-		End If
-
-		Return True
-	End Function
-
-	Public Sub New()
-		MyPath = ""
-		sFilePath = ""
-		CdFile = New cSubPath
-		CdX = New List(Of Single)
-		CdY = New List(Of Single)
-		RtFile = New cSubPath
-		AngularGearLossMapFile = New cSubPath()
-		RtnU = New List(Of Single)
-		RtM = New List(Of Single)
-		Axles = New List(Of cAxle)
-		PTOLossMap = New cSubPath()
-		PTOCycle = New cSubPath()
-		SetDefault()
-	End Sub
-
-	Private Sub SetDefault()
-		Mass = 0
-		MassExtra = 0
-		Loading = 0
-		CdA0 = 0
-		CdA0Act = CdA0
-		CdA02 = 0
-		CdFile.Clear()
-		CdMode = tCdMode.ConstCd0
-		CdX.Clear()
-		CdY.Clear()
-		CdDim = - 1
-
-		siFr0 = 0
-		rdyn = 0
-
-		RtType = tRtType.None
-		RtRatio = 1
-		RtnU.Clear()
-		RtM.Clear()
-		RtFile.Clear()
-
-		AngularGearType = AngularGearType.None
-		AngularGearLossMapFile.Clear()
-		AngularGearRatio = 1
-
-		PTOType = tPTOType.None
-		PTOLossMap.Clear()
-		PTOCycle.Clear()
-
-		Axles.Clear()
-		VehCat = tVehCat.Undef
-		MassMax = 0
-		AxleConf = tAxleConf.Undef
-
-		SavedInDeclMode = False
-	End Sub
-
-	Public Function Validate() As Boolean
-		Const msgSrc = "VEH/Validate"
-		If rdyn < 100 Then
-			WorkerMsg(tMsgID.Err, "Parameter 'Dynamic Tire Radius' is invalid (" & rdyn & "mm).", msgSrc, sFilePath)
-			Return False
-		End If
-		Return True
-	End Function
-
-	Public Function ReadFile(Optional showMsg As Boolean = True) As Boolean
-		Const msgSrc = "VEH/ReadFile"
-		SetDefault()
-
-		Dim json As New JSON
-		If Not json.ReadFile(sFilePath) Then Return False
-
-		Try
-			Dim header = json.Content("Header")
-			Dim body = json.Content("Body")
-
-			FileVersion = header("FileVersion")
-			If FileVersion > 4 Then
-				SavedInDeclMode = body("SavedInDeclMode")
-			Else
-				SavedInDeclMode = Cfg.DeclMode
-			End If
-
-			Mass = body("CurbWeight")
-			MassExtra = body("CurbWeightExtra")
-			Loading = body("Loading")
-			VehCat = ConvVehCat(body("VehCat").ToString)
-			AxleConf = ConvAxleConf(body("AxleConfig")("Type").ToString)
-
-			If FileVersion < 2 Then
-				'convert kg to ton
-				MassMax /= 1000
-			Else
-				MassMax = body("MassMax")
-			End If
-
-			If FileVersion < 7 Then
-				'calc CdA from Cd and area value
-				CdA0 = CSng(body("Cd"))*CSng(body("CrossSecArea"))
-			Else
-				CdA0 = body("CdA")
-			End If
-
-			CdA02 = CdA0
-
-			If FileVersion < 4 Then
-				If Not body("CdRigid") Is Nothing AndAlso Not body("CrossSecAreaRigid") Is Nothing Then
-					CdA02 = CSng(body("CdRigid"))*CSng(body("CrossSecAreaRigid"))
-				End If
-			ElseIf FileVersion < 7 Then
-				If Not body("Cd2") Is Nothing AndAlso Not body("CrossSecArea2") Is Nothing Then
-					CdA02 = CSng(body("Cd2"))*CSng(body("CrossSecArea2"))
-				End If
-			Else
-				If Not body("CdA2") Is Nothing Then
-					CdA02 = body("CdA2")
-				End If
-			End If
-
-			CdA0Act = CdA0
-
-			CdMode = CdModeConv(body("CdCorrMode").ToString)
-			If Not body("CdCorrFile") Is Nothing Then
-				CdFile.Init(MyPath, body("CdCorrFile"))
-			End If
-
-			If body("Retarder") Is Nothing Then
-				RtType = tRtType.None
-			Else
-				RtType = RtTypeConv(body("Retarder")("Type").ToString)
-				If Not body("Retarder")("Ratio") Is Nothing Then
-					RtRatio = body("Retarder")("Ratio")
-				End If
-				If Not body("Retarder")("File") Is Nothing Then
-					RtFile.Init(MyPath, body("Retarder")("File"))
-				End If
-			End If
-
-			If body("AngularGear") Is Nothing Then
-				AngularGearType = AngularGearType.None
-			Else
-				AngularGearType = body("AngularGear")("Type").ToString.ParseEnum (Of AngularGearType)()
-				If Not body("AngularGear")("Ratio") Is Nothing Then
-					AngularGearRatio = body("AngularGear")("Ratio")
-				End If
-				If Not body("AngularGear")("LossMap") Is Nothing Then
-					AngularGearLossMapFile.Init(MyPath, body("AngularGear")("LossMap"))
-				End If
-			End If
-
-			Dim inertiaTemp As Single
-			If FileVersion < 3 Then
-				inertiaTemp = body("WheelsInertia")
-				rdyn = 1000*body("WheelsDiaEff")/2
-			Else
-				rdyn = body("rdyn")
-			End If
-
-			Dim axleCount = body("AxleConfig")("Axles").Count()
-			For Each axleEntry In body("AxleConfig")("Axles")
-				Dim axle = New cAxle With {
-						.Share = CSng(axleEntry("AxleWeightShare")),
-						.TwinTire = CBool(axleEntry("TwinTyres")),
-						.RRC = CSng(axleEntry("RRCISO")),
-						.FzISO = CSng(axleEntry("FzISO"))}
-
-				If FileVersion < 3 Then
-					axle.Wheels = "-"
-					axle.Inertia = inertiaTemp/(IIf(axle.TwinTire, 4, 2)*axleCount)
-				Else
-					axle.Wheels = CStr(axleEntry("Wheels")).Replace("R ", "R")
-					axle.Inertia = CSng(axleEntry("Inertia"))
-				End If
-				Axles.Add(axle)
-			Next
-
-			PTOType = tPTOType.None
-			If Not body("PTO") Is Nothing Then
-				Dim ptoStr = body("PTO")("Type")
-
-				If String.IsNullOrWhiteSpace(ptoStr) Then
-					PTOType = tPTOType.None
-					WorkerMsg(tMsgID.Normal, "PTO automatically updated to '" + PTOType + "'", msgSrc)
-				Else
-					PTOType = GetPTOType(ptoStr)
-				End If
-
-			End If
-
-			If Not PTOType = tPTOType.None Then
-				PTOLossMap.Init(MyPath, body("PTO")("LossMap"))
-				PTOCycle.Init(MyPath, body("PTO")("Cycle"))
-			End If
-
-
-		Catch ex As Exception
-			If showMsg Then WorkerMsg(tMsgID.Err, "Failed to read Vehicle file! " & ex.Message, msgSrc)
-			Return False
-		End Try
-
-		Return True
-	End Function
-
-	Public Function SaveFile() As Boolean
-		SavedInDeclMode = Cfg.DeclMode
-
-		Dim json As New JSON
-		'Header
-		json.Content.Add("Header", New Dictionary(Of String, Object) From {
-							{"CreatedBy", Lic.LicString & " (" & Lic.GUID & ")"},
-							{"Date", Now.ToUniversalTime().ToString("o")},
-							{"AppVersion", VECTOvers},
-							{"FileVersion", FormatVersion}})
-
-		'Body
-		Dim dic As Dictionary(Of String, Object)
-		dic = New Dictionary(Of String, Object) From {
-			{"SavedInDeclMode", Cfg.DeclMode},
-			{"VehCat", ConvVehCat(VehCat, False)},
-			{"CurbWeight", Mass},
-			{"CurbWeightExtra", MassExtra},
-			{"Loading", Loading},
-			{"MassMax", MassMax},
-			{"CdA", CdA0},
-			{"CdA2", CdA02},
-			{"rdyn", rdyn},
-			{"CdCorrMode", CdModeConv(CdMode)},
-			{"CdCorrFile", CdFile.PathOrDummy},
-			{"Retarder", New Dictionary(Of String, Object) From {
-				{"Type", RtTypeConv(RtType)},
-				{"Ratio", RtRatio},
-				{"File", RtFile.PathOrDummy}}},
-			{"AngularGear", New Dictionary(Of String, Object) From {
-				{"Type", AngularGearType.ToString()},
-				{"Ratio", AngularGearRatio},
-				{"LossMap", AngularGearLossMapFile.PathOrDummy}}},
-			{"PTO", New Dictionary(Of String, Object) From {
-				{"Type", GetPTOString(PTOType)},
-				{"LossMap", PTOLossMap.PathOrDummy},
-				{"Cycle", PTOCycle.PathOrDummy}}},
-			{"AxleConfig", New Dictionary(Of String, Object) From {
-				{"Type", ConvAxleConf(AxleConf)},
-				{"Axles", (From axle In Axles Select New Dictionary(Of String, Object) From {
-					{"Inertia", axle.Inertia},
-					{"Wheels", axle.Wheels},
-					{"AxleWeightShare", axle.Share},
-					{"TwinTyres", axle.TwinTire},
-					{"RRCISO", axle.RRC},
-					{"FzISO", axle.FzISO}})}}}
-			}
-
-		json.Content.Add("Body", dic)
-		Return json.WriteFile(sFilePath)
-	End Function
-
-
-	Public Function DeclInitCycle() As Boolean
-		Const msgSrc = "VEH/DeclInit"
-		Dim missionId = Declaration.CurrentMission.MissionID
-
-		MassExtra = Declaration.SegRef.GetBodyTrWeight(missionId)
-
-		Dim al = Declaration.SegRef.AxleShares(missionId)
-		If al.Count > Axles.Count Then
-			WorkerMsg(tMsgID.Err, "Invalid number of axles! Defined: " & Axles.Count & ", required: " & al.Count, msgSrc)
-			Return False
-		End If
-
-		Dim i = - 1
-		For Each a In al
-			i += 1
-			Axles(i).Share = a/100
-		Next
-
-		'Remove non-Truck axles
-		Do While Axles.Count > al.Count
-			Axles.RemoveAt(Axles.Count - 1)
-		Loop
-
-		'(Semi-) Trailer
-		If Not Declaration.SegRef.TrailerOnlyInLongHaul OrElse missionId = tMission.LongHaul Then
-			al = Declaration.SegRef.AxleSharesTr(missionId)
-			For Each a In al
-				Dim a0 = New cAxle
-				a0.Inertia = 0	 'Defined later
-				a0.Wheels = cDeclaration.TyreTr
-				a0.Share = a/100
-				a0.TwinTire = False
-				a0.RRC = cDeclaration.RRCTr
-				a0.FzISO = cDeclaration.FzISOTr
-				Axles.Add(a0)
-			Next
-		End If
-
-		'Wheels Inertias
-		For Each a0 In Axles
-			a0.Inertia = Declaration.WheelsInertia(a0.Wheels)
-			If a0.Inertia < 0 Then
-				WorkerMsg(tMsgID.Err, "Selected wheels (" & a0.Wheels & ") are not supported!", msgSrc)
-				Return False
-			End If
-		Next
-
-		CdMode = tCdMode.CdOfVdecl
-		If Not Declaration.SegRef.VCDVparam.ContainsKey(missionId) Then
-			WorkerMsg(tMsgID.Err, "No Cross Wind Correction parameters defined for current vehicle & mission profile!", msgSrc)
-			Return False
-		End If
-
-		If Declaration.SegRef.TrailerOnlyInLongHaul Then
-			If missionId = tMission.LongHaul Then
-				CdA0Act = CdA0
-			Else
-				CdA0Act = CdA02
-			End If
-		Else
-			CdA0Act = CdA0
-		End If
-
-		Return True
-	End Function
-
-	Public Function DeclInitLoad(loadingId As tLoading) As Boolean
-		Const msgSrc = "VEH/DeclInit"
-
-		Dim missionId As tMission = Declaration.CurrentMission.MissionID
-		Dim lmax = MassMax*1000 - Mass - MassExtra
-
-		Select Case loadingId
-			Case tLoading.FullLoaded
-				Loading = lmax
-
-			Case tLoading.RefLoaded
-				Loading = Declaration.SegRef.GetLoading(missionId, MassMax)
-				If Loading < 0 Then
-					WorkerMsg(tMsgID.Err, "Invalid loading in segement table!", msgSrc)
-					Return False
-				End If
-
-				If Loading > lmax Then
-					WorkerMsg(tMsgID.Warn, "Reference loading > Max. loading! Using max. loading.", msgSrc)
-					Loading = lmax
-				End If
-
-			Case tLoading.EmptyLoaded
-				Loading = 0
-
-			Case Else ' tLoading.EmptyLoaded
-				WorkerMsg(tMsgID.Err, "tLoading.UserDefLoaded not allowed!", msgSrc)
-				Return False
-
-		End Select
-
-		Return True
-	End Function
-
-
-	Public Function VehmodeInit() As Boolean
-		Const msgSrc = "VEH/Init"
-
-		'Cd-Init
-		If Not CdInit() Then Return False
-
-		'Transmission Loss Maps
-		If Not GBX.TrLossMapInit Then
-			WorkerMsg(tMsgID.Err, "Failed to initialize Transmission Loss Maps!", msgSrc)
-			Return False
-		End If
-
-		'Retarder
-		If Not RtInit() Then Return False
-
-		'Fr0
-		If Axles.Count < 2 Then
-			WorkerMsg(tMsgID.Err, "At least 2 axle configurations are required!", msgSrc, "<GUI>" & sFilePath)
-			Return False
-		End If
-
-		'Check if sum=100%
-		If Math.Abs(Axles.Sum(Function(axle) axle.Share) - 1) > 0.0001 Then
-			WorkerMsg(tMsgID.Err, "Sum of relative axle shares is not 100%!", msgSrc, "<GUI>" & sFilePath)
-			Return False
-		End If
-
-		If rdyn <= 0 Then
-			WorkerMsg(tMsgID.Err, "rdyn is invalid!", msgSrc, "<GUI>" & sFilePath)
-			Return False
-		End If
-
-		Dim rrc = 0.0
-		m_red0 = 0
-		For Each a0 In Axles
-
-			If a0.RRC < - 0.000001 Then
-				WorkerMsg(tMsgID.Err, "Invalid RRC value! (" & a0.RRC & ")", msgSrc, "<GUI>" & sFilePath)
-				Return False
-			End If
-
-			If a0.FzISO < 0.00001 Then
-				WorkerMsg(tMsgID.Err, "Invalid FzISO value! (" & a0.FzISO & ")", msgSrc, "<GUI>" & sFilePath)
-				Return False
-			End If
-
-			Dim nrwheels As Single
-			If a0.TwinTire Then
-				nrwheels = 4
-			Else
-				nrwheels = 2
-			End If
-
-			rrc += a0.Share*(a0.RRC*((Loading + Mass + MassExtra)*a0.Share*9.81/(a0.FzISO*nrwheels))^(0.9 - 1)) 'Beta=0.9
-
-			m_red0 += nrwheels*a0.Inertia/((rdyn/1000)^2)
-
-		Next
-
-		siFr0 = rrc
-
-		Return True
-	End Function
-
-
-#Region "Cd Funktionen"
-
-	Private Function CdInit() As Boolean
-		Dim file As cFile_V3
-		Dim line As String()
-
-		Const msgSrc = "VEH/CdInit"
-
-		'Warn If Vair specified in DRI but CdType != CdOfBeta
-		If DRI.VairVorg Xor CdMode = tCdMode.CdOfBeta Then
-
-			If DRI.VairVorg Then
-				WorkerMsg(tMsgID.Warn, "Vair input in driving cycle will be irgnored! (Side wind correction disabled in .veh file)",
-						msgSrc)
-			Else
-				WorkerMsg(tMsgID.Err, "No Vair input in driving cycle defined! Vres and Beta is required!", msgSrc)
-				Return False
-			End If
-
-		End If
-
-		'If Cd-value is constant then do nothing
-		If CdMode = tCdMode.ConstCd0 Then Return True
-
-		'Declaration Mode
-		If CdMode = tCdMode.CdOfVdecl Then Return CdofVdeclInit()
-
-
-		'Read Inputfile
-		file = New cFile_V3
-
-		If Not file.OpenRead(CdFile.FullPath) Then
-			WorkerMsg(tMsgID.Err, "Failed to read Cd input file! (" & CdFile.FullPath & ")", msgSrc)
-			Return False
-		End If
-
-		'Skip Header
-		file.ReadLine()
-
-		CdX.Clear()
-		CdY.Clear()
-		CdDim = - 1
-		Do While Not file.EndOfFile
-
-			CdDim += 1
-			line = file.ReadLine
-
-			Try
-				CdX.Add(CSng(line(0)))
-				CdY.Add(CSng(line(1)))
-			Catch ex As Exception
-				WorkerMsg(tMsgID.Err, "Error during file read! Line number: " & CdDim + 1 & " (" & CdFile.FullPath & ")", msgSrc,
-						CdFile.FullPath)
-				file.Close()
-				Return False
-			End Try
-
-		Loop
-
-		file.Close()
-
-		If CdDim < 1 Then
-			WorkerMsg(tMsgID.Err, "Cd input file invalid! Two or more lines required! (" & CdFile.FullPath & ")", msgSrc,
-					CdFile.FullPath)
-			Return False
-		End If
-
-		Return True
-	End Function
-
-	Private Function CdofVdeclInit() As Boolean
-		Dim lBeta As New List(Of Single)
-		Dim lDeltaCdA As New List(Of Single)
-		Dim beta As Single
-		Dim a As List(Of Single)
-		Dim share As Single
-
-		Const vwind = cDeclaration.Vwind*3.6
-
-		Try
-			If Cfg.DeclMode Then
-				a = Declaration.SegRef.VCDVparam(Declaration.CurrentMission.MissionID)
-			Else
-				a = Declaration.VCDVparamPerCat(VEH.VehCat)
-			End If
-		Catch ex As Exception
-			Return False
-		End Try
-
-		For i = 0 To 12
-			beta = CSng(i)
-			lBeta.Add(beta)
-			lDeltaCdA.Add(a(0)*beta + a(1)*beta^2 + a(2)*beta^3)
-		Next
-
-		Dim iDim As Integer = lBeta.Count - 1
-
-		CdX.Clear()
-		CdY.Clear()
-		CdDim = - 1
-
-		CdX.Add(0)
-		CdY.Add(0)
-		For i = 60 To 100 Step 5
-			Dim vveh = CSng(i)
-
-			Dim cdAsum As Single = 0
-			For j = 0 To 180 Step 10
-				Dim alpha = CSng(j)
-				Dim vwindX As Single = vwind*Math.Cos(alpha*Math.PI/180)
-				Dim vwindY As Single = vwind*Math.Sin(alpha*Math.PI/180)
-				Dim vairX As Single = vveh + vwindX
-				Dim vairY As Single = vwindY
-				Dim vair As Single = Math.Sqrt(vairX^2 + vairY^2)
-				beta = Math.Atan(vairY/vairX)*180/Math.PI
-
-				Dim k As Integer
-				If lBeta(0) >= beta Then
-					k = 1
-				Else
-					k = 0
-					Do While lBeta(k) < beta And k < iDim
-						k += 1
-					Loop
-				End If
-				Dim deltaCdA = (beta - lBeta(k - 1))*(lDeltaCdA(k) - lDeltaCdA(k - 1))/(lBeta(k) - lBeta(k - 1)) +
-								lDeltaCdA(k - 1)
-
-				Dim cdA = CdA0Act + deltaCdA
-
-				If j = 0 OrElse j = 180 Then
-					share = 5/180
-				Else
-					share = 10/180
-				End If
-
-				cdAsum += share*cdA*(vair^2/vveh^2)
-
-			Next
-			CdX.Add(vveh)
-			CdY.Add(cdAsum)
-		Next
-		CdY(0) = CdY(1)
-		CdDim = CdX.Count - 1
-
-		Return True
-	End Function
-
-	Public Function CdA_Y(x As Single) As Single
-		Return CdIntpol(x)
-	End Function
-
-
-	Public Function CdA() As Single
-		Return CdA0Act
-	End Function
-
-	Private Function CdIntpol(x As Single) As Single
-		Dim i As Int32
-
-		'Extrapolation for x < x(1)
-		If CdX(0) >= x Then
-			If CdX(0) > x Then
-				If CdMode = tCdMode.CdOfBeta Then
-					MODdata.ModErrors.CdExtrapol = "β= " & x
-				Else
-					MODdata.ModErrors.CdExtrapol = "v= " & x
-				End If
-			End If
-			i = 1
-			GoTo lbInt
-		End If
-
-		i = 0
-		Do While CdX(i) < x And i < CdDim
-			i += 1
-		Loop
-
-		'Extrapolation for x > x(imax)
-		If CdX(i) < x Then
-			If CdMode = tCdMode.CdOfBeta Then
-				MODdata.ModErrors.CdExtrapol = "β= " & x
-			Else
-				MODdata.ModErrors.CdExtrapol = "v= " & x
-			End If
-		End If
-
-		lbInt:
-		'Interpolation
-		Return (x - CdX(i - 1))*(CdY(i) - CdY(i - 1))/(CdX(i) - CdX(i - 1)) + CdY(i - 1)
-	End Function
-
-#End Region
-
-#Region "Retarder"
-
-	Private Function RtInit() As Boolean
-		Dim file As cFile_V3
-		Dim line As String()
-
-		Const msgSrc = "VEH/RtInit"
-
-		If RtType = tRtType.None Then Return True
-
-		'Read Inputfile
-		file = New cFile_V3
-		If Not file.OpenRead(RtFile.FullPath) Then
-			WorkerMsg(tMsgID.Err, "Failed to read Retarder input file! (" & RtFile.FullPath & ")", msgSrc)
-			Return False
-		End If
-
-		'Skip Header
-		file.ReadLine()
-
-		RtDim = - 1
-		Do While Not file.EndOfFile
-
-			RtDim += 1
-			line = file.ReadLine
-
-			Try
-				RtnU.Add(CSng(line(0)))
-				RtM.Add(CSng(line(1)))
-			Catch ex As Exception
-				WorkerMsg(tMsgID.Err, "Error during file read! Line number: " & RtDim + 1 & " (" & RtFile.FullPath & ")", msgSrc,
-						RtFile.FullPath)
-				file.Close()
-				Return False
-			End Try
-
-		Loop
-
-		file.Close()
-
-		If RtDim < 1 Then
-			WorkerMsg(tMsgID.Err, "Retarder input file invalid! Two or more lines required! (" & RtFile.FullPath & ")", msgSrc,
-					RtFile.FullPath)
-			Return False
-		End If
-
-		Return True
-	End Function
-
-
-	Public Function RtPeLoss(v As Single, gear As Integer) As Single
-		Dim nU As Single
-
-		Select Case RtType
-			Case tRtType.Primary
-				nU = (60*v)/(2*VEH.rdyn*Math.PI/1000)*GBX.Igetr(0)*GBX.Igetr(gear)*RtRatio
-			Case tRtType.Secondary
-				nU = (60*v)/(2*VEH.rdyn*Math.PI/1000)*GBX.Igetr(0)*RtRatio
-			Case Else 'tRtType.None
-				Return 0
-		End Select
-		Return RtIntpol(nU)*nU*2*Math.PI/60/1000
-	End Function
-
-	Private Function RtIntpol(nU As Single) As Single
-		Dim i As Int32
-		'Extrapolation for x < x(1)
-		If RtnU(0) >= nU Then
-			If RtnU(0) > nU Then MODdata.ModErrors.RtExtrapol = "n= " & nU & " [1/min]"
-			i = 1
-			GoTo lbInt
-		End If
-
-		i = 0
-		Do While RtnU(i) < nU And i < RtDim
-			i += 1
-		Loop
-
-		'Extrapolation for x> x(imax)
-		If RtnU(i) < nU Then MODdata.ModErrors.RtExtrapol = "n= " & nU & " [1/min]"
-
-		lbInt:
-		'Interpolation
-		Return (nU - RtnU(i - 1))*(RtM(i) - RtM(i - 1))/(RtnU(i) - RtnU(i - 1)) + RtM(i - 1)
-	End Function
-
-#End Region
-
-#Region "Properties"
-
-	Public ReadOnly Property FileList As List(Of String)
-		Get
-			Return _myFileList
-		End Get
-	End Property
-
-	Public ReadOnly Property MRed As Single
-		Get
-			Return m_red0
-		End Get
-	End Property
-
-	Public Property Fr0 As Single
-		Get
-			Return siFr0
-		End Get
-		Set(value As Single)
-			siFr0 = value
-		End Set
-	End Property
-
-	Public Property FilePath() As String
-		Get
-			Return sFilePath
-		End Get
-		Set(value As String)
-			sFilePath = value
-			If sFilePath = "" Then
-				MyPath = ""
-			Else
-				MyPath = Path.GetDirectoryName(sFilePath) & "\"
-			End If
-		End Set
-	End Property
-
-#End Region
-End Class
\ No newline at end of file
diff --git a/VECTO/VECTO_Types.vb b/VECTO/VECTO_Types.vb
index 39e1e12731..f3bddb403e 100644
--- a/VECTO/VECTO_Types.vb
+++ b/VECTO/VECTO_Types.vb
@@ -41,26 +41,3 @@ Public Enum MessageType
 End Enum
 
 
-
-
-Module PTOType
-	'Public ReadOnly PtoTypeStrings As New Dictionary(Of tPTOType, String) From {
-	'	{tPTOType.None, "None"},
-	'	{tPTOType.OnlyDriveShaftShiftClawSynchronizerSchieberad,
-	'	"only the drive shaft of the PTO - shift claw, synchronizer, Schieberad"},
-	'	{tPTOType.OnlyDriveShaftMultiDiscClutch, "only the drive shaft of the PTO - multi-disc clutch"},
-	'	{tPTOType.OnlyDriveShaftMultiDiscClutchOilPump, "only the drive shaft of the PTO - multi-disc clutch, oil pump"},
-	'	{tPTOType.DriveShaftUpTo2GearWheelsShiftClawSynchronizerSchieberad,
-	'	"drive shaft and/or up to 2 gear wheels - shift claw, synchronizer, Schieberad"},
-	'	{tPTOType.DriveShaftUpTo2GearWheelsMultiDiscClutch, "drive shaft and/or up to 2 gear wheels - multi-disc clutch"},
-	'	{tPTOType.DriveShaftUpTo2GearWheelsMultiDiscClutchOilPump,
-	'	"drive shaft and/or up to 2 gear wheels - multi-disc clutch, oil pump"},
-	'	{tPTOType.DriveShaftMoreThan2GearWheelsShiftClawSynchronizerSchieberad,
-	'	"drive shaft and/or more than 2 gear wheels - shift claw, synchronizer, Schieberad"},
-	'	{tPTOType.DriveShaftMoreThan2GearWheelsMultiDiscClutch,
-	'	"drive shaft and/or more than 2 gear wheels - multi-disc clutch"},
-	'	{tPTOType.DriveShaftMoreThan2GearWheelsMultiDiscClutchOilPump,
-	'	"drive shaft and/or more than 2 gear wheels - multi-disc clutch, oil pump"}
-	'	}
-
-End Module
-- 
GitLab