From 34c8cc85129938bfede0eb2b50af43bd8f077144 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Thu, 16 Dec 2021 15:12:13 +0100
Subject: [PATCH] correcting typo in engine form, reset selected tyre dimension
on re-opening, disable shift parameters in declaration mode
---
VECTO/GUI/VectoJobForm.vb | 2 +
VECTO/GUI/VehicleForm.Designer.vb | 801 ++++++++++++------------------
VECTO/GUI/VehicleForm.vb | 2 +-
3 files changed, 320 insertions(+), 485 deletions(-)
diff --git a/VECTO/GUI/VectoJobForm.vb b/VECTO/GUI/VectoJobForm.vb
index 2feaeb0e1a..1002f2e569 100644
--- a/VECTO/GUI/VectoJobForm.vb
+++ b/VECTO/GUI/VectoJobForm.vb
@@ -1011,6 +1011,7 @@ Public Class VectoJobForm
pnHybridStrategy.Enabled = False
lblESSUtilityFactorDriving.Enabled = false
tbESSUtilityFactorDriving.Enabled = false
+ pnHybridStrategy.Enabled = Not Cfg.DeclMode
Select Case JobType
Case VectoSimulationJobType.ConventionalVehicle
gbElectricAux.Enabled = False
@@ -1023,6 +1024,7 @@ Public Class VectoJobForm
TabPgADAS.Enabled = False
tpAuxiliaries.Enabled = False
pnShiftParams.Enabled = False
+ pnHybridStrategy.Enabled = False
Case VectoSimulationJobType.ParallelHybridVehicle
' empty line - do not fall-through
pnHybridStrategy.Enabled = True
diff --git a/VECTO/GUI/VehicleForm.Designer.vb b/VECTO/GUI/VehicleForm.Designer.vb
index 2d45ca4204..ae21a2d56d 100644
--- a/VECTO/GUI/VehicleForm.Designer.vb
+++ b/VECTO/GUI/VehicleForm.Designer.vb
@@ -184,7 +184,7 @@ Partial Class VehicleForm
Me.Label17 = New System.Windows.Forms.Label()
Me.btDelMaxTorqueEntry = New System.Windows.Forms.Button()
Me.tpADAS = New System.Windows.Forms.TabPage()
- Me.GroupBox5 = New System.Windows.Forms.GroupBox()
+ Me.gbADAS = New System.Windows.Forms.GroupBox()
Me.cbAtEcoRollReleaseLockupClutch = New System.Windows.Forms.CheckBox()
Me.cbPcc = New System.Windows.Forms.ComboBox()
Me.cbEcoRoll = New System.Windows.Forms.ComboBox()
@@ -243,7 +243,7 @@ Partial Class VehicleForm
Me.gbEMTorqueLimits.SuspendLayout
Me.bgVehicleTorqueLimits.SuspendLayout
Me.tpADAS.SuspendLayout
- Me.GroupBox5.SuspendLayout
+ Me.gbADAS.SuspendLayout
Me.tpRoadSweeper.SuspendLayout
Me.pnPTO.SuspendLayout
Me.gbPTODrive.SuspendLayout
@@ -253,82 +253,73 @@ Partial Class VehicleForm
'Label1
'
Me.Label1.AutoSize = true
- Me.Label1.Location = New System.Drawing.Point(9, 34)
- Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label1.Location = New System.Drawing.Point(6, 22)
Me.Label1.Name = "Label1"
- Me.Label1.Size = New System.Drawing.Size(264, 20)
+ Me.Label1.Size = New System.Drawing.Size(177, 13)
Me.Label1.TabIndex = 0
Me.Label1.Text = "Corrected Actual Curb Mass Vehicle"
'
'TbMass
'
- Me.TbMass.Location = New System.Drawing.Point(282, 29)
- Me.TbMass.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TbMass.Location = New System.Drawing.Point(188, 19)
Me.TbMass.Name = "TbMass"
- Me.TbMass.Size = New System.Drawing.Size(84, 26)
+ 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(192, 48)
- Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label2.Location = New System.Drawing.Point(128, 31)
Me.Label2.Name = "Label2"
- Me.Label2.Size = New System.Drawing.Size(66, 20)
+ 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(273, 43)
- Me.TbLoad.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TbLoad.Location = New System.Drawing.Point(182, 28)
Me.TbLoad.Name = "TbLoad"
- Me.TbLoad.Size = New System.Drawing.Size(84, 26)
+ 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(112, 9)
- Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label3.Location = New System.Drawing.Point(75, 6)
Me.Label3.Name = "Label3"
- Me.Label3.Size = New System.Drawing.Size(55, 20)
+ Me.Label3.Size = New System.Drawing.Size(38, 13)
Me.Label3.TabIndex = 8
Me.Label3.Text = "Cd x A"
'
'TBcdA
'
- Me.TBcdA.Location = New System.Drawing.Point(178, 5)
- Me.TBcdA.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TBcdA.Location = New System.Drawing.Point(119, 3)
Me.TBcdA.Name = "TBcdA"
- Me.TBcdA.Size = New System.Drawing.Size(84, 26)
+ 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(204, 9)
- Me.Label13.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label13.Location = New System.Drawing.Point(136, 6)
Me.Label13.Name = "Label13"
- Me.Label13.Size = New System.Drawing.Size(59, 20)
+ 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(278, 5)
- Me.TBrdyn.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TBrdyn.Location = New System.Drawing.Point(185, 3)
Me.TBrdyn.Name = "TBrdyn"
- Me.TBrdyn.Size = New System.Drawing.Size(84, 26)
+ 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(747, 888)
- Me.ButOK.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.ButOK.Location = New System.Drawing.Point(498, 577)
Me.ButOK.Name = "ButOK"
- Me.ButOK.Size = New System.Drawing.Size(112, 35)
+ Me.ButOK.Size = New System.Drawing.Size(75, 23)
Me.ButOK.TabIndex = 6
Me.ButOK.Text = "Save"
Me.ButOK.UseVisualStyleBackColor = true
@@ -337,10 +328,9 @@ Partial Class VehicleForm
'
Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.ButCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
- Me.ButCancel.Location = New System.Drawing.Point(868, 888)
- Me.ButCancel.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.ButCancel.Location = New System.Drawing.Point(579, 577)
Me.ButCancel.Name = "ButCancel"
- Me.ButCancel.Size = New System.Drawing.Size(112, 35)
+ Me.ButCancel.Size = New System.Drawing.Size(75, 23)
Me.ButCancel.TabIndex = 7
Me.ButCancel.Text = "Cancel"
Me.ButCancel.UseVisualStyleBackColor = true
@@ -348,30 +338,27 @@ Partial Class VehicleForm
'Label14
'
Me.Label14.AutoSize = true
- Me.Label14.Location = New System.Drawing.Point(370, 34)
- Me.Label14.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label14.Location = New System.Drawing.Point(247, 22)
Me.Label14.Name = "Label14"
- Me.Label14.Size = New System.Drawing.Size(34, 20)
+ 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(362, 48)
- Me.Label31.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label31.Location = New System.Drawing.Point(241, 31)
Me.Label31.Name = "Label31"
- Me.Label31.Size = New System.Drawing.Size(34, 20)
+ 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(366, 9)
- Me.Label35.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label35.Location = New System.Drawing.Point(244, 6)
Me.Label35.Name = "Label35"
- Me.Label35.Size = New System.Drawing.Size(43, 20)
+ Me.Label35.Size = New System.Drawing.Size(29, 13)
Me.Label35.TabIndex = 24
Me.Label35.Text = "[mm]"
'
@@ -380,20 +367,18 @@ Partial Class VehicleForm
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(9, 29)
- Me.CbCdMode.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.CbCdMode.Location = New System.Drawing.Point(6, 19)
Me.CbCdMode.Name = "CbCdMode"
- Me.CbCdMode.Size = New System.Drawing.Size(398, 28)
+ Me.CbCdMode.Size = New System.Drawing.Size(267, 21)
Me.CbCdMode.TabIndex = 0
'
'TbCdFile
'
Me.TbCdFile.Anchor = System.Windows.Forms.AnchorStyles.None
Me.TbCdFile.Enabled = false
- Me.TbCdFile.Location = New System.Drawing.Point(14, 100)
- Me.TbCdFile.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TbCdFile.Location = New System.Drawing.Point(9, 65)
Me.TbCdFile.Name = "TbCdFile"
- Me.TbCdFile.Size = New System.Drawing.Size(313, 26)
+ Me.TbCdFile.Size = New System.Drawing.Size(210, 20)
Me.TbCdFile.TabIndex = 1
'
'BtCdFileBrowse
@@ -401,10 +386,9 @@ Partial Class VehicleForm
Me.BtCdFileBrowse.Anchor = System.Windows.Forms.AnchorStyles.None
Me.BtCdFileBrowse.Enabled = false
Me.BtCdFileBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.BtCdFileBrowse.Location = New System.Drawing.Point(338, 95)
- Me.BtCdFileBrowse.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.BtCdFileBrowse.Location = New System.Drawing.Point(225, 62)
Me.BtCdFileBrowse.Name = "BtCdFileBrowse"
- Me.BtCdFileBrowse.Size = New System.Drawing.Size(36, 37)
+ Me.BtCdFileBrowse.Size = New System.Drawing.Size(24, 24)
Me.BtCdFileBrowse.TabIndex = 2
Me.BtCdFileBrowse.UseVisualStyleBackColor = true
'
@@ -415,11 +399,9 @@ Partial Class VehicleForm
Me.GroupBox6.Controls.Add(Me.CbCdMode)
Me.GroupBox6.Controls.Add(Me.BtCdFileBrowse)
Me.GroupBox6.Controls.Add(Me.TbCdFile)
- Me.GroupBox6.Location = New System.Drawing.Point(435, 129)
- Me.GroupBox6.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox6.Location = New System.Drawing.Point(290, 84)
Me.GroupBox6.Name = "GroupBox6"
- Me.GroupBox6.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.GroupBox6.Size = New System.Drawing.Size(422, 148)
+ Me.GroupBox6.Size = New System.Drawing.Size(281, 96)
Me.GroupBox6.TabIndex = 3
Me.GroupBox6.TabStop = false
Me.GroupBox6.Text = "Cross Wind Correction"
@@ -429,20 +411,18 @@ Partial Class VehicleForm
Me.BtCdFileOpen.Anchor = System.Windows.Forms.AnchorStyles.None
Me.BtCdFileOpen.Enabled = false
Me.BtCdFileOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.BtCdFileOpen.Location = New System.Drawing.Point(374, 95)
- Me.BtCdFileOpen.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.BtCdFileOpen.Location = New System.Drawing.Point(249, 62)
Me.BtCdFileOpen.Name = "BtCdFileOpen"
- Me.BtCdFileOpen.Size = New System.Drawing.Size(36, 37)
+ Me.BtCdFileOpen.Size = New System.Drawing.Size(24, 24)
Me.BtCdFileOpen.TabIndex = 3
Me.BtCdFileOpen.UseVisualStyleBackColor = true
'
'LbCdMode
'
Me.LbCdMode.AutoSize = true
- Me.LbCdMode.Location = New System.Drawing.Point(9, 72)
- Me.LbCdMode.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.LbCdMode.Location = New System.Drawing.Point(6, 47)
Me.LbCdMode.Name = "LbCdMode"
- Me.LbCdMode.Size = New System.Drawing.Size(87, 20)
+ Me.LbCdMode.Size = New System.Drawing.Size(59, 13)
Me.LbCdMode.TabIndex = 28
Me.LbCdMode.Text = "LbCdMode"
Me.LbCdMode.TextAlign = System.Drawing.ContentAlignment.TopRight
@@ -454,8 +434,7 @@ Partial Class VehicleForm
Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator3, Me.ToolStripBtSendTo, Me.ToolStripSeparator1, Me.ToolStripButton1})
Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
Me.ToolStrip1.Name = "ToolStrip1"
- Me.ToolStrip1.Padding = New System.Windows.Forms.Padding(0, 0, 3, 0)
- Me.ToolStrip1.Size = New System.Drawing.Size(999, 33)
+ Me.ToolStrip1.Size = New System.Drawing.Size(666, 33)
Me.ToolStrip1.TabIndex = 29
Me.ToolStrip1.Text = "ToolStrip1"
'
@@ -532,11 +511,9 @@ Partial Class VehicleForm
'
Me.GroupBox7.Controls.Add(Me.PnRt)
Me.GroupBox7.Controls.Add(Me.CbRtType)
- Me.GroupBox7.Location = New System.Drawing.Point(9, 117)
- Me.GroupBox7.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox7.Location = New System.Drawing.Point(6, 76)
Me.GroupBox7.Name = "GroupBox7"
- Me.GroupBox7.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.GroupBox7.Size = New System.Drawing.Size(418, 171)
+ Me.GroupBox7.Size = New System.Drawing.Size(279, 111)
Me.GroupBox7.TabIndex = 1
Me.GroupBox7.TabStop = false
Me.GroupBox7.Text = "Retarder Losses"
@@ -549,18 +526,16 @@ Partial Class VehicleForm
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(4, 65)
- Me.PnRt.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.PnRt.Location = New System.Drawing.Point(3, 42)
Me.PnRt.Name = "PnRt"
- Me.PnRt.Size = New System.Drawing.Size(402, 97)
+ Me.PnRt.Size = New System.Drawing.Size(268, 63)
Me.PnRt.TabIndex = 1
'
'Label15
'
- Me.Label15.Location = New System.Drawing.Point(9, 35)
- Me.Label15.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label15.Location = New System.Drawing.Point(6, 23)
Me.Label15.Name = "Label15"
- Me.Label15.Size = New System.Drawing.Size(302, 25)
+ 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
@@ -569,39 +544,35 @@ Partial Class VehicleForm
'
Me.BtRtBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
Me.BtRtBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.BtRtBrowse.Location = New System.Drawing.Point(354, 60)
- Me.BtRtBrowse.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.BtRtBrowse.Location = New System.Drawing.Point(236, 39)
Me.BtRtBrowse.Name = "BtRtBrowse"
- Me.BtRtBrowse.Size = New System.Drawing.Size(36, 37)
+ Me.BtRtBrowse.Size = New System.Drawing.Size(24, 24)
Me.BtRtBrowse.TabIndex = 2
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(9, 63)
- Me.TbRtPath.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TbRtPath.Location = New System.Drawing.Point(6, 41)
Me.TbRtPath.Name = "TbRtPath"
- Me.TbRtPath.Size = New System.Drawing.Size(334, 26)
+ Me.TbRtPath.Size = New System.Drawing.Size(224, 20)
Me.TbRtPath.TabIndex = 1
'
'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(348, 8)
- Me.Label45.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label45.Location = New System.Drawing.Point(232, 5)
Me.Label45.Name = "Label45"
- Me.Label45.Size = New System.Drawing.Size(22, 20)
+ Me.Label45.Size = New System.Drawing.Size(16, 13)
Me.Label45.TabIndex = 10
Me.Label45.Text = "[-]"
'
'LbRtRatio
'
- Me.LbRtRatio.Location = New System.Drawing.Point(6, 8)
- Me.LbRtRatio.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.LbRtRatio.Location = New System.Drawing.Point(4, 5)
Me.LbRtRatio.Name = "LbRtRatio"
- Me.LbRtRatio.Size = New System.Drawing.Size(250, 26)
+ Me.LbRtRatio.Size = New System.Drawing.Size(167, 17)
Me.LbRtRatio.TabIndex = 1
Me.LbRtRatio.Text = "Ratio"
Me.LbRtRatio.TextAlign = System.Drawing.ContentAlignment.TopRight
@@ -609,10 +580,9 @@ Partial Class VehicleForm
'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(261, 5)
- Me.TbRtRatio.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TbRtRatio.Location = New System.Drawing.Point(174, 3)
Me.TbRtRatio.Name = "TbRtRatio"
- Me.TbRtRatio.Size = New System.Drawing.Size(82, 26)
+ Me.TbRtRatio.Size = New System.Drawing.Size(56, 20)
Me.TbRtRatio.TabIndex = 0
'
'CbRtType
@@ -620,38 +590,34 @@ Partial Class VehicleForm
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(9, 29)
- Me.CbRtType.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.CbRtType.Location = New System.Drawing.Point(6, 19)
Me.CbRtType.Name = "CbRtType"
- Me.CbRtType.Size = New System.Drawing.Size(397, 28)
+ 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(48, 8)
- Me.Label46.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label46.Location = New System.Drawing.Point(32, 5)
Me.Label46.Name = "Label46"
- Me.Label46.Size = New System.Drawing.Size(213, 20)
+ Me.Label46.Size = New System.Drawing.Size(145, 13)
Me.Label46.TabIndex = 31
Me.Label46.Text = "Curb Mass Extra Trailer/Body"
'
'Label50
'
Me.Label50.AutoSize = true
- Me.Label50.Location = New System.Drawing.Point(362, 8)
- Me.Label50.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label50.Location = New System.Drawing.Point(241, 5)
Me.Label50.Name = "Label50"
- Me.Label50.Size = New System.Drawing.Size(34, 20)
+ 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(273, 3)
- Me.TbMassExtra.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TbMassExtra.Location = New System.Drawing.Point(182, 2)
Me.TbMassExtra.Name = "TbMassExtra"
- Me.TbMassExtra.Size = New System.Drawing.Size(84, 26)
+ Me.TbMassExtra.Size = New System.Drawing.Size(57, 20)
Me.TbMassExtra.TabIndex = 0
'
'GroupBox8
@@ -660,11 +626,9 @@ Partial Class VehicleForm
Me.GroupBox8.Controls.Add(Me.ButAxlRem)
Me.GroupBox8.Controls.Add(Me.LvRRC)
Me.GroupBox8.Controls.Add(Me.ButAxlAdd)
- Me.GroupBox8.Location = New System.Drawing.Point(9, 286)
- Me.GroupBox8.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox8.Location = New System.Drawing.Point(6, 186)
Me.GroupBox8.Name = "GroupBox8"
- Me.GroupBox8.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.GroupBox8.Size = New System.Drawing.Size(846, 232)
+ Me.GroupBox8.Size = New System.Drawing.Size(564, 151)
Me.GroupBox8.TabIndex = 4
Me.GroupBox8.TabStop = false
Me.GroupBox8.Text = "Axles / Wheels"
@@ -672,20 +636,18 @@ Partial Class VehicleForm
'Label6
'
Me.Label6.AutoSize = true
- Me.Label6.Location = New System.Drawing.Point(675, 186)
- Me.Label6.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label6.Location = New System.Drawing.Point(450, 121)
Me.Label6.Name = "Label6"
- Me.Label6.Size = New System.Drawing.Size(158, 20)
+ 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.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
- Me.ButAxlRem.Location = New System.Drawing.Point(44, 188)
- Me.ButAxlRem.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.ButAxlRem.Location = New System.Drawing.Point(29, 122)
Me.ButAxlRem.Name = "ButAxlRem"
- Me.ButAxlRem.Size = New System.Drawing.Size(36, 37)
+ Me.ButAxlRem.Size = New System.Drawing.Size(24, 24)
Me.ButAxlRem.TabIndex = 2
Me.ButAxlRem.UseVisualStyleBackColor = true
'
@@ -697,11 +659,10 @@ Partial Class VehicleForm
Me.LvRRC.FullRowSelect = true
Me.LvRRC.GridLines = true
Me.LvRRC.HideSelection = false
- Me.LvRRC.Location = New System.Drawing.Point(9, 29)
- Me.LvRRC.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.LvRRC.Location = New System.Drawing.Point(6, 19)
Me.LvRRC.MultiSelect = false
Me.LvRRC.Name = "LvRRC"
- Me.LvRRC.Size = New System.Drawing.Size(826, 155)
+ Me.LvRRC.Size = New System.Drawing.Size(552, 102)
Me.LvRRC.TabIndex = 0
Me.LvRRC.TabStop = false
Me.LvRRC.UseCompatibleStateImageBehavior = false
@@ -749,10 +710,9 @@ Partial Class VehicleForm
'ButAxlAdd
'
Me.ButAxlAdd.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
- Me.ButAxlAdd.Location = New System.Drawing.Point(8, 188)
- Me.ButAxlAdd.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.ButAxlAdd.Location = New System.Drawing.Point(5, 122)
Me.ButAxlAdd.Name = "ButAxlAdd"
- Me.ButAxlAdd.Size = New System.Drawing.Size(36, 37)
+ Me.ButAxlAdd.Size = New System.Drawing.Size(24, 24)
Me.ButAxlAdd.TabIndex = 1
Me.ButAxlAdd.UseVisualStyleBackColor = true
'
@@ -762,10 +722,9 @@ Partial Class VehicleForm
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(4, 24)
- Me.PnWheelDiam.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.PnWheelDiam.Location = New System.Drawing.Point(3, 16)
Me.PnWheelDiam.Name = "PnWheelDiam"
- Me.PnWheelDiam.Size = New System.Drawing.Size(409, 48)
+ Me.PnWheelDiam.Size = New System.Drawing.Size(272, 31)
Me.PnWheelDiam.TabIndex = 0
'
'CbAxleConfig
@@ -773,10 +732,9 @@ Partial Class VehicleForm
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(230, 123)
- Me.CbAxleConfig.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.CbAxleConfig.Location = New System.Drawing.Point(153, 80)
Me.CbAxleConfig.Name = "CbAxleConfig"
- Me.CbAxleConfig.Size = New System.Drawing.Size(88, 28)
+ Me.CbAxleConfig.Size = New System.Drawing.Size(60, 21)
Me.CbAxleConfig.TabIndex = 1
'
'CbCat
@@ -784,49 +742,44 @@ Partial Class VehicleForm
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(18, 123)
- Me.CbCat.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.CbCat.Location = New System.Drawing.Point(12, 80)
Me.CbCat.Name = "CbCat"
- Me.CbCat.Size = New System.Drawing.Size(200, 28)
+ 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(46, 166)
- Me.Label5.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label5.Location = New System.Drawing.Point(31, 108)
Me.Label5.Name = "Label5"
- Me.Label5.Size = New System.Drawing.Size(170, 20)
+ Me.Label5.Size = New System.Drawing.Size(116, 13)
Me.Label5.TabIndex = 2
Me.Label5.Text = "Technically Permissible"
'
'Label9
'
Me.Label9.AutoSize = true
- Me.Label9.Location = New System.Drawing.Point(296, 175)
- Me.Label9.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label9.Location = New System.Drawing.Point(197, 114)
Me.Label9.Name = "Label9"
- Me.Label9.Size = New System.Drawing.Size(22, 20)
+ 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(230, 171)
- Me.TbMassMass.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TbMassMass.Location = New System.Drawing.Point(153, 111)
Me.TbMassMass.Name = "TbMassMass"
- Me.TbMassMass.Size = New System.Drawing.Size(61, 26)
+ Me.TbMassMass.Size = New System.Drawing.Size(42, 20)
Me.TbMassMass.TabIndex = 2
'
'StatusStrip1
'
Me.StatusStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LbStatus})
- Me.StatusStrip1.Location = New System.Drawing.Point(0, 930)
+ Me.StatusStrip1.Location = New System.Drawing.Point(0, 593)
Me.StatusStrip1.Name = "StatusStrip1"
- Me.StatusStrip1.Padding = New System.Windows.Forms.Padding(2, 0, 21, 0)
- Me.StatusStrip1.Size = New System.Drawing.Size(999, 32)
+ Me.StatusStrip1.Size = New System.Drawing.Size(666, 32)
Me.StatusStrip1.SizingGrip = false
Me.StatusStrip1.TabIndex = 36
Me.StatusStrip1.Text = "StatusStrip1"
@@ -839,11 +792,10 @@ Partial Class VehicleForm
'
'TbHDVclass
'
- Me.TbHDVclass.Location = New System.Drawing.Point(230, 217)
- Me.TbHDVclass.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TbHDVclass.Location = New System.Drawing.Point(153, 141)
Me.TbHDVclass.Name = "TbHDVclass"
Me.TbHDVclass.ReadOnly = true
- Me.TbHDVclass.Size = New System.Drawing.Size(61, 26)
+ 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
@@ -854,11 +806,9 @@ Partial Class VehicleForm
Me.GroupBox1.Controls.Add(Me.TbMass)
Me.GroupBox1.Controls.Add(Me.Label1)
Me.GroupBox1.Controls.Add(Me.Label14)
- Me.GroupBox1.Location = New System.Drawing.Point(9, 9)
- Me.GroupBox1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox1.Location = New System.Drawing.Point(6, 6)
Me.GroupBox1.Name = "GroupBox1"
- Me.GroupBox1.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.GroupBox1.Size = New System.Drawing.Size(417, 182)
+ Me.GroupBox1.Size = New System.Drawing.Size(278, 118)
Me.GroupBox1.TabIndex = 0
Me.GroupBox1.TabStop = false
Me.GroupBox1.Text = "Masses / Loading"
@@ -871,20 +821,17 @@ Partial Class VehicleForm
Me.PnLoad.Controls.Add(Me.TbMassExtra)
Me.PnLoad.Controls.Add(Me.Label50)
Me.PnLoad.Controls.Add(Me.Label46)
- Me.PnLoad.Location = New System.Drawing.Point(9, 66)
- Me.PnLoad.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.PnLoad.Location = New System.Drawing.Point(6, 43)
Me.PnLoad.Name = "PnLoad"
- Me.PnLoad.Size = New System.Drawing.Size(404, 89)
+ Me.PnLoad.Size = New System.Drawing.Size(269, 58)
Me.PnLoad.TabIndex = 1
'
'GrAirRes
'
Me.GrAirRes.Controls.Add(Me.PnCdATrTr)
- Me.GrAirRes.Location = New System.Drawing.Point(435, 9)
- Me.GrAirRes.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GrAirRes.Location = New System.Drawing.Point(290, 6)
Me.GrAirRes.Name = "GrAirRes"
- Me.GrAirRes.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.GrAirRes.Size = New System.Drawing.Size(420, 111)
+ Me.GrAirRes.Size = New System.Drawing.Size(280, 72)
Me.GrAirRes.TabIndex = 2
Me.GrAirRes.TabStop = false
Me.GrAirRes.Text = "Air Resistance"
@@ -898,47 +845,42 @@ Partial Class VehicleForm
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(4, 24)
- Me.PnCdATrTr.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.PnCdATrTr.Location = New System.Drawing.Point(3, 16)
Me.PnCdATrTr.Name = "PnCdATrTr"
- Me.PnCdATrTr.Size = New System.Drawing.Size(412, 82)
+ Me.PnCdATrTr.Size = New System.Drawing.Size(274, 53)
Me.PnCdATrTr.TabIndex = 0
'
'tbVehicleHeight
'
- Me.tbVehicleHeight.Location = New System.Drawing.Point(178, 45)
- Me.tbVehicleHeight.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbVehicleHeight.Location = New System.Drawing.Point(119, 29)
Me.tbVehicleHeight.Name = "tbVehicleHeight"
- Me.tbVehicleHeight.Size = New System.Drawing.Size(84, 26)
+ Me.tbVehicleHeight.Size = New System.Drawing.Size(57, 20)
Me.tbVehicleHeight.TabIndex = 1
'
'Label11
'
Me.Label11.AutoSize = true
- Me.Label11.Location = New System.Drawing.Point(273, 49)
- Me.Label11.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label11.Location = New System.Drawing.Point(182, 32)
Me.Label11.Name = "Label11"
- Me.Label11.Size = New System.Drawing.Size(30, 20)
+ Me.Label11.Size = New System.Drawing.Size(21, 13)
Me.Label11.TabIndex = 27
Me.Label11.Text = "[m]"
'
'Label20
'
Me.Label20.AutoSize = true
- Me.Label20.Location = New System.Drawing.Point(112, 49)
- Me.Label20.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label20.Location = New System.Drawing.Point(75, 32)
Me.Label20.Name = "Label20"
- Me.Label20.Size = New System.Drawing.Size(56, 20)
+ Me.Label20.Size = New System.Drawing.Size(38, 13)
Me.Label20.TabIndex = 26
Me.Label20.Text = "Height"
'
'Label38
'
Me.Label38.AutoSize = true
- Me.Label38.Location = New System.Drawing.Point(273, 9)
- Me.Label38.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label38.Location = New System.Drawing.Point(182, 6)
Me.Label38.Name = "Label38"
- Me.Label38.Size = New System.Drawing.Size(35, 20)
+ Me.Label38.Size = New System.Drawing.Size(24, 13)
Me.Label38.TabIndex = 24
Me.Label38.Text = "[m²]"
'
@@ -946,10 +888,9 @@ Partial Class VehicleForm
'
Me.PictureBox1.BackColor = System.Drawing.Color.White
Me.PictureBox1.Image = Global.TUGraz.VECTO.My.Resources.Resources.VECTO_VEH
- Me.PictureBox1.Location = New System.Drawing.Point(0, 43)
- Me.PictureBox1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.PictureBox1.Location = New System.Drawing.Point(0, 28)
Me.PictureBox1.Name = "PictureBox1"
- Me.PictureBox1.Size = New System.Drawing.Size(906, 62)
+ Me.PictureBox1.Size = New System.Drawing.Size(604, 40)
Me.PictureBox1.TabIndex = 37
Me.PictureBox1.TabStop = false
'
@@ -976,11 +917,9 @@ Partial Class VehicleForm
'GroupBox3
'
Me.GroupBox3.Controls.Add(Me.PnWheelDiam)
- Me.GroupBox3.Location = New System.Drawing.Point(9, 200)
- Me.GroupBox3.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox3.Location = New System.Drawing.Point(6, 130)
Me.GroupBox3.Name = "GroupBox3"
- Me.GroupBox3.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.GroupBox3.Size = New System.Drawing.Size(417, 77)
+ Me.GroupBox3.Size = New System.Drawing.Size(278, 50)
Me.GroupBox3.TabIndex = 1
Me.GroupBox3.TabStop = false
Me.GroupBox3.Text = "Dynamic Tyre Radius"
@@ -989,11 +928,9 @@ Partial Class VehicleForm
'
Me.GroupBox2.Controls.Add(Me.pnAngledriveFields)
Me.GroupBox2.Controls.Add(Me.cbAngledriveType)
- Me.GroupBox2.Location = New System.Drawing.Point(436, 117)
- Me.GroupBox2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox2.Location = New System.Drawing.Point(291, 76)
Me.GroupBox2.Name = "GroupBox2"
- Me.GroupBox2.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.GroupBox2.Size = New System.Drawing.Size(423, 171)
+ Me.GroupBox2.Size = New System.Drawing.Size(282, 111)
Me.GroupBox2.TabIndex = 3
Me.GroupBox2.TabStop = false
Me.GroupBox2.Text = "Angledrive"
@@ -1006,39 +943,35 @@ Partial Class VehicleForm
Me.pnAngledriveFields.Controls.Add(Me.tbAngledriveRatio)
Me.pnAngledriveFields.Controls.Add(Me.btAngledriveLossMapBrowse)
Me.pnAngledriveFields.Controls.Add(Me.tbAngledriveLossMapPath)
- Me.pnAngledriveFields.Location = New System.Drawing.Point(4, 65)
- Me.pnAngledriveFields.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.pnAngledriveFields.Location = New System.Drawing.Point(3, 42)
Me.pnAngledriveFields.Name = "pnAngledriveFields"
- Me.pnAngledriveFields.Size = New System.Drawing.Size(408, 97)
+ Me.pnAngledriveFields.Size = New System.Drawing.Size(272, 63)
Me.pnAngledriveFields.TabIndex = 1
'
'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(369, 9)
- Me.Label4.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label4.Location = New System.Drawing.Point(246, 6)
Me.Label4.Name = "Label4"
- Me.Label4.Size = New System.Drawing.Size(22, 20)
+ Me.Label4.Size = New System.Drawing.Size(16, 13)
Me.Label4.TabIndex = 16
Me.Label4.Text = "[-]"
'
'Label12
'
- Me.Label12.Location = New System.Drawing.Point(9, 35)
- Me.Label12.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label12.Location = New System.Drawing.Point(6, 23)
Me.Label12.Name = "Label12"
- Me.Label12.Size = New System.Drawing.Size(394, 25)
+ 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(208, 9)
- Me.Label10.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label10.Location = New System.Drawing.Point(139, 6)
Me.Label10.Name = "Label10"
- Me.Label10.Size = New System.Drawing.Size(66, 28)
+ Me.Label10.Size = New System.Drawing.Size(44, 18)
Me.Label10.TabIndex = 15
Me.Label10.Text = "Ratio"
Me.Label10.TextAlign = System.Drawing.ContentAlignment.TopRight
@@ -1046,50 +979,45 @@ Partial Class VehicleForm
'tbAngledriveRatio
'
Me.tbAngledriveRatio.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.tbAngledriveRatio.Location = New System.Drawing.Point(282, 6)
- Me.tbAngledriveRatio.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbAngledriveRatio.Location = New System.Drawing.Point(188, 4)
Me.tbAngledriveRatio.Name = "tbAngledriveRatio"
- Me.tbAngledriveRatio.Size = New System.Drawing.Size(82, 26)
+ Me.tbAngledriveRatio.Size = New System.Drawing.Size(56, 20)
Me.tbAngledriveRatio.TabIndex = 0
'
'btAngledriveLossMapBrowse
'
Me.btAngledriveLossMapBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
Me.btAngledriveLossMapBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btAngledriveLossMapBrowse.Location = New System.Drawing.Point(368, 60)
- Me.btAngledriveLossMapBrowse.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btAngledriveLossMapBrowse.Location = New System.Drawing.Point(245, 39)
Me.btAngledriveLossMapBrowse.Name = "btAngledriveLossMapBrowse"
- Me.btAngledriveLossMapBrowse.Size = New System.Drawing.Size(36, 37)
+ Me.btAngledriveLossMapBrowse.Size = New System.Drawing.Size(24, 24)
Me.btAngledriveLossMapBrowse.TabIndex = 2
Me.btAngledriveLossMapBrowse.UseVisualStyleBackColor = true
'
'tbAngledriveLossMapPath
'
Me.tbAngledriveLossMapPath.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
- Me.tbAngledriveLossMapPath.Location = New System.Drawing.Point(9, 63)
- Me.tbAngledriveLossMapPath.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbAngledriveLossMapPath.Location = New System.Drawing.Point(6, 41)
Me.tbAngledriveLossMapPath.Name = "tbAngledriveLossMapPath"
- Me.tbAngledriveLossMapPath.Size = New System.Drawing.Size(356, 26)
+ Me.tbAngledriveLossMapPath.Size = New System.Drawing.Size(239, 20)
Me.tbAngledriveLossMapPath.TabIndex = 1
'
'cbAngledriveType
'
Me.cbAngledriveType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
Me.cbAngledriveType.FormattingEnabled = true
- Me.cbAngledriveType.Location = New System.Drawing.Point(9, 29)
- Me.cbAngledriveType.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.cbAngledriveType.Location = New System.Drawing.Point(6, 19)
Me.cbAngledriveType.Name = "cbAngledriveType"
- Me.cbAngledriveType.Size = New System.Drawing.Size(397, 28)
+ Me.cbAngledriveType.Size = New System.Drawing.Size(266, 21)
Me.cbAngledriveType.TabIndex = 0
'
'PicVehicle
'
Me.PicVehicle.BackColor = System.Drawing.Color.LightGray
Me.PicVehicle.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
- Me.PicVehicle.Location = New System.Drawing.Point(422, 108)
- Me.PicVehicle.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.PicVehicle.Location = New System.Drawing.Point(281, 70)
Me.PicVehicle.Name = "PicVehicle"
- Me.PicVehicle.Size = New System.Drawing.Size(449, 134)
+ 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
@@ -1097,47 +1025,42 @@ Partial Class VehicleForm
'Label8
'
Me.Label8.AutoSize = true
- Me.Label8.Location = New System.Drawing.Point(128, 222)
- Me.Label8.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label8.Location = New System.Drawing.Point(85, 144)
Me.Label8.Name = "Label8"
- Me.Label8.Size = New System.Drawing.Size(93, 20)
+ Me.Label8.Size = New System.Drawing.Size(62, 13)
Me.Label8.TabIndex = 10
Me.Label8.Text = "HDV Group"
'
'cbPTOType
'
Me.cbPTOType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
- Me.cbPTOType.Location = New System.Drawing.Point(9, 26)
- Me.cbPTOType.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.cbPTOType.Location = New System.Drawing.Point(6, 17)
Me.cbPTOType.Name = "cbPTOType"
- Me.cbPTOType.Size = New System.Drawing.Size(823, 28)
+ Me.cbPTOType.Size = New System.Drawing.Size(550, 21)
Me.cbPTOType.TabIndex = 0
Me.ToolTip1.SetToolTip(Me.cbPTOType, "Transmission type to the PTO consumer")
'
'tbPTOCycle
'
- Me.tbPTOCycle.Location = New System.Drawing.Point(9, 109)
- Me.tbPTOCycle.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbPTOCycle.Location = New System.Drawing.Point(6, 71)
Me.tbPTOCycle.Name = "tbPTOCycle"
- Me.tbPTOCycle.Size = New System.Drawing.Size(356, 26)
+ Me.tbPTOCycle.Size = New System.Drawing.Size(239, 20)
Me.tbPTOCycle.TabIndex = 2
Me.ToolTip1.SetToolTip(Me.tbPTOCycle, "PTO Consumer Loss Map")
'
'tbPTOLossMap
'
- Me.tbPTOLossMap.Location = New System.Drawing.Point(9, 37)
- Me.tbPTOLossMap.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbPTOLossMap.Location = New System.Drawing.Point(6, 24)
Me.tbPTOLossMap.Name = "tbPTOLossMap"
- Me.tbPTOLossMap.Size = New System.Drawing.Size(356, 26)
+ Me.tbPTOLossMap.Size = New System.Drawing.Size(239, 20)
Me.tbPTOLossMap.TabIndex = 0
Me.ToolTip1.SetToolTip(Me.tbPTOLossMap, "PTO Consumer Loss Map")
'
'tbPTODrive
'
- Me.tbPTODrive.Location = New System.Drawing.Point(9, 282)
- Me.tbPTODrive.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbPTODrive.Location = New System.Drawing.Point(6, 183)
Me.tbPTODrive.Name = "tbPTODrive"
- Me.tbPTODrive.Size = New System.Drawing.Size(356, 26)
+ Me.tbPTODrive.Size = New System.Drawing.Size(239, 20)
Me.tbPTODrive.TabIndex = 5
Me.ToolTip1.SetToolTip(Me.tbPTODrive, "PTO Consumer Loss Map")
'
@@ -1149,11 +1072,10 @@ Partial Class VehicleForm
Me.tcVehicleComponents.Controls.Add(Me.tpTorqueLimits)
Me.tcVehicleComponents.Controls.Add(Me.tpADAS)
Me.tcVehicleComponents.Controls.Add(Me.tpRoadSweeper)
- Me.tcVehicleComponents.Location = New System.Drawing.Point(9, 266)
- Me.tcVehicleComponents.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tcVehicleComponents.Location = New System.Drawing.Point(6, 173)
Me.tcVehicleComponents.Name = "tcVehicleComponents"
Me.tcVehicleComponents.SelectedIndex = 0
- Me.tcVehicleComponents.Size = New System.Drawing.Size(984, 615)
+ Me.tcVehicleComponents.Size = New System.Drawing.Size(656, 400)
Me.tcVehicleComponents.TabIndex = 5
'
'tpGeneral
@@ -1163,11 +1085,10 @@ Partial Class VehicleForm
Me.tpGeneral.Controls.Add(Me.GroupBox6)
Me.tpGeneral.Controls.Add(Me.GroupBox8)
Me.tpGeneral.Controls.Add(Me.GrAirRes)
- Me.tpGeneral.Location = New System.Drawing.Point(4, 29)
- Me.tpGeneral.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tpGeneral.Location = New System.Drawing.Point(4, 22)
Me.tpGeneral.Name = "tpGeneral"
- Me.tpGeneral.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.tpGeneral.Size = New System.Drawing.Size(976, 582)
+ Me.tpGeneral.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3)
+ Me.tpGeneral.Size = New System.Drawing.Size(648, 374)
Me.tpGeneral.TabIndex = 0
Me.tpGeneral.Text = "General"
Me.tpGeneral.UseVisualStyleBackColor = true
@@ -1178,11 +1099,10 @@ Partial Class VehicleForm
Me.tpPowertrain.Controls.Add(Me.GroupBox9)
Me.tpPowertrain.Controls.Add(Me.GroupBox7)
Me.tpPowertrain.Controls.Add(Me.GroupBox2)
- Me.tpPowertrain.Location = New System.Drawing.Point(4, 29)
- Me.tpPowertrain.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tpPowertrain.Location = New System.Drawing.Point(4, 22)
Me.tpPowertrain.Name = "tpPowertrain"
- Me.tpPowertrain.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.tpPowertrain.Size = New System.Drawing.Size(976, 582)
+ Me.tpPowertrain.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3)
+ Me.tpPowertrain.Size = New System.Drawing.Size(648, 374)
Me.tpPowertrain.TabIndex = 1
Me.tpPowertrain.Text = "Powertrain"
Me.tpPowertrain.UseVisualStyleBackColor = true
@@ -1190,11 +1110,9 @@ Partial Class VehicleForm
'GroupBox4
'
Me.GroupBox4.Controls.Add(Me.Panel1)
- Me.GroupBox4.Location = New System.Drawing.Point(9, 11)
- Me.GroupBox4.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox4.Location = New System.Drawing.Point(6, 7)
Me.GroupBox4.Name = "GroupBox4"
- Me.GroupBox4.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.GroupBox4.Size = New System.Drawing.Size(418, 97)
+ Me.GroupBox4.Size = New System.Drawing.Size(279, 63)
Me.GroupBox4.TabIndex = 0
Me.GroupBox4.TabStop = false
Me.GroupBox4.Text = "Vehicle Idling Speed"
@@ -1205,37 +1123,33 @@ Partial Class VehicleForm
Me.Panel1.Controls.Add(Me.Label18)
Me.Panel1.Controls.Add(Me.Label19)
Me.Panel1.Dock = System.Windows.Forms.DockStyle.Fill
- Me.Panel1.Location = New System.Drawing.Point(4, 24)
- Me.Panel1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.Panel1.Location = New System.Drawing.Point(3, 16)
Me.Panel1.Name = "Panel1"
- Me.Panel1.Size = New System.Drawing.Size(410, 68)
+ Me.Panel1.Size = New System.Drawing.Size(273, 44)
Me.Panel1.TabIndex = 0
'
'tbVehIdlingSpeed
'
- Me.tbVehIdlingSpeed.Location = New System.Drawing.Point(260, 5)
- Me.tbVehIdlingSpeed.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbVehIdlingSpeed.Location = New System.Drawing.Point(173, 3)
Me.tbVehIdlingSpeed.Name = "tbVehIdlingSpeed"
- Me.tbVehIdlingSpeed.Size = New System.Drawing.Size(84, 26)
+ Me.tbVehIdlingSpeed.Size = New System.Drawing.Size(57, 20)
Me.tbVehIdlingSpeed.TabIndex = 0
'
'Label18
'
Me.Label18.AutoSize = true
- Me.Label18.Location = New System.Drawing.Point(350, 9)
- Me.Label18.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label18.Location = New System.Drawing.Point(233, 6)
Me.Label18.Name = "Label18"
- Me.Label18.Size = New System.Drawing.Size(44, 20)
+ Me.Label18.Size = New System.Drawing.Size(30, 13)
Me.Label18.TabIndex = 24
Me.Label18.Text = "[rpm]"
'
'Label19
'
Me.Label19.AutoSize = true
- Me.Label19.Location = New System.Drawing.Point(110, 9)
- Me.Label19.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label19.Location = New System.Drawing.Point(73, 6)
Me.Label19.Name = "Label19"
- Me.Label19.Size = New System.Drawing.Size(140, 20)
+ Me.Label19.Size = New System.Drawing.Size(94, 13)
Me.Label19.TabIndex = 8
Me.Label19.Text = "Engine Idle Speed"
'
@@ -1243,11 +1157,9 @@ Partial Class VehicleForm
'
Me.GroupBox9.Controls.Add(Me.cbTankSystem)
Me.GroupBox9.Controls.Add(Me.Label23)
- Me.GroupBox9.Location = New System.Drawing.Point(459, 11)
- Me.GroupBox9.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox9.Location = New System.Drawing.Point(306, 7)
Me.GroupBox9.Name = "GroupBox9"
- Me.GroupBox9.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.GroupBox9.Size = New System.Drawing.Size(396, 97)
+ Me.GroupBox9.Size = New System.Drawing.Size(264, 63)
Me.GroupBox9.TabIndex = 2
Me.GroupBox9.TabStop = false
Me.GroupBox9.Text = "Tank System"
@@ -1255,18 +1167,16 @@ Partial Class VehicleForm
'cbTankSystem
'
Me.cbTankSystem.FormattingEnabled = true
- Me.cbTankSystem.Location = New System.Drawing.Point(14, 51)
- Me.cbTankSystem.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.cbTankSystem.Location = New System.Drawing.Point(9, 33)
Me.cbTankSystem.Name = "cbTankSystem"
- Me.cbTankSystem.Size = New System.Drawing.Size(368, 28)
+ Me.cbTankSystem.Size = New System.Drawing.Size(247, 21)
Me.cbTankSystem.TabIndex = 1
'
'Label23
'
Me.Label23.AutoSize = true
Me.Label23.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- Me.Label23.Location = New System.Drawing.Point(9, 25)
- Me.Label23.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label23.Location = New System.Drawing.Point(6, 16)
Me.Label23.Name = "Label23"
Me.Label23.Size = New System.Drawing.Size(277, 20)
Me.Label23.TabIndex = 0
@@ -1276,11 +1186,10 @@ Partial Class VehicleForm
'
Me.tpElectricComponents.Controls.Add(Me.gbBattery)
Me.tpElectricComponents.Controls.Add(Me.gpElectricMotor)
- Me.tpElectricComponents.Location = New System.Drawing.Point(4, 29)
- Me.tpElectricComponents.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tpElectricComponents.Location = New System.Drawing.Point(4, 22)
Me.tpElectricComponents.Name = "tpElectricComponents"
- Me.tpElectricComponents.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.tpElectricComponents.Size = New System.Drawing.Size(976, 582)
+ Me.tpElectricComponents.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3)
+ Me.tpElectricComponents.Size = New System.Drawing.Size(648, 374)
Me.tpElectricComponents.TabIndex = 4
Me.tpElectricComponents.Text = "Electric Components"
Me.tpElectricComponents.UseVisualStyleBackColor = true
@@ -1294,11 +1203,9 @@ Partial Class VehicleForm
Me.gbBattery.Controls.Add(Me.lblInitialSoCUnit)
Me.gbBattery.Controls.Add(Me.tbInitialSoC)
Me.gbBattery.Controls.Add(Me.lblInitialSoC)
- Me.gbBattery.Location = New System.Drawing.Point(9, 269)
- Me.gbBattery.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbBattery.Location = New System.Drawing.Point(6, 175)
Me.gbBattery.Name = "gbBattery"
- Me.gbBattery.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.gbBattery.Size = New System.Drawing.Size(950, 288)
+ Me.gbBattery.Size = New System.Drawing.Size(633, 187)
Me.gbBattery.TabIndex = 2
Me.gbBattery.TabStop = false
Me.gbBattery.Text = "Electric Energy Storage system"
@@ -1311,11 +1218,10 @@ Partial Class VehicleForm
Me.lvREESSPacks.FullRowSelect = true
Me.lvREESSPacks.GridLines = true
Me.lvREESSPacks.HideSelection = false
- Me.lvREESSPacks.Location = New System.Drawing.Point(9, 69)
- Me.lvREESSPacks.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.lvREESSPacks.Location = New System.Drawing.Point(6, 45)
Me.lvREESSPacks.MultiSelect = false
Me.lvREESSPacks.Name = "lvREESSPacks"
- Me.lvREESSPacks.Size = New System.Drawing.Size(828, 155)
+ Me.lvREESSPacks.Size = New System.Drawing.Size(553, 102)
Me.lvREESSPacks.TabIndex = 31
Me.lvREESSPacks.TabStop = false
Me.lvREESSPacks.UseCompatibleStateImageBehavior = false
@@ -1339,59 +1245,53 @@ Partial Class VehicleForm
'btnAddReessPack
'
Me.btnAddReessPack.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
- Me.btnAddReessPack.Location = New System.Drawing.Point(9, 235)
- Me.btnAddReessPack.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnAddReessPack.Location = New System.Drawing.Point(6, 153)
Me.btnAddReessPack.Name = "btnAddReessPack"
- Me.btnAddReessPack.Size = New System.Drawing.Size(36, 37)
+ Me.btnAddReessPack.Size = New System.Drawing.Size(24, 24)
Me.btnAddReessPack.TabIndex = 1
Me.btnAddReessPack.UseVisualStyleBackColor = true
'
'lblEditReessPack
'
Me.lblEditReessPack.AutoSize = true
- Me.lblEditReessPack.Location = New System.Drawing.Point(676, 245)
- Me.lblEditReessPack.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblEditReessPack.Location = New System.Drawing.Point(451, 159)
Me.lblEditReessPack.Name = "lblEditReessPack"
- Me.lblEditReessPack.Size = New System.Drawing.Size(158, 20)
+ Me.lblEditReessPack.Size = New System.Drawing.Size(106, 13)
Me.lblEditReessPack.TabIndex = 30
Me.lblEditReessPack.Text = "(Double-Click to Edit)"
'
'btnRemoveReessPack
'
Me.btnRemoveReessPack.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
- Me.btnRemoveReessPack.Location = New System.Drawing.Point(50, 235)
- Me.btnRemoveReessPack.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnRemoveReessPack.Location = New System.Drawing.Point(33, 153)
Me.btnRemoveReessPack.Name = "btnRemoveReessPack"
- Me.btnRemoveReessPack.Size = New System.Drawing.Size(36, 37)
+ Me.btnRemoveReessPack.Size = New System.Drawing.Size(24, 24)
Me.btnRemoveReessPack.TabIndex = 2
Me.btnRemoveReessPack.UseVisualStyleBackColor = true
'
'lblInitialSoCUnit
'
Me.lblInitialSoCUnit.AutoSize = true
- Me.lblInitialSoCUnit.Location = New System.Drawing.Point(404, 34)
- Me.lblInitialSoCUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblInitialSoCUnit.Location = New System.Drawing.Point(269, 22)
Me.lblInitialSoCUnit.Name = "lblInitialSoCUnit"
- Me.lblInitialSoCUnit.Size = New System.Drawing.Size(31, 20)
+ Me.lblInitialSoCUnit.Size = New System.Drawing.Size(21, 13)
Me.lblInitialSoCUnit.TabIndex = 27
Me.lblInitialSoCUnit.Text = "[%]"
'
'tbInitialSoC
'
- Me.tbInitialSoC.Location = New System.Drawing.Point(306, 29)
- Me.tbInitialSoC.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbInitialSoC.Location = New System.Drawing.Point(204, 19)
Me.tbInitialSoC.Name = "tbInitialSoC"
- Me.tbInitialSoC.Size = New System.Drawing.Size(86, 26)
+ Me.tbInitialSoC.Size = New System.Drawing.Size(59, 20)
Me.tbInitialSoC.TabIndex = 0
'
'lblInitialSoC
'
Me.lblInitialSoC.AutoSize = true
- Me.lblInitialSoC.Location = New System.Drawing.Point(10, 34)
- Me.lblInitialSoC.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblInitialSoC.Location = New System.Drawing.Point(7, 22)
Me.lblInitialSoC.Name = "lblInitialSoC"
Me.lblInitialSoC.RightToLeft = System.Windows.Forms.RightToLeft.Yes
- Me.lblInitialSoC.Size = New System.Drawing.Size(81, 20)
+ Me.lblInitialSoC.Size = New System.Drawing.Size(54, 13)
Me.lblInitialSoC.TabIndex = 25
Me.lblInitialSoC.Text = "Initial SoC"
'
@@ -1408,11 +1308,9 @@ Partial Class VehicleForm
Me.gpElectricMotor.Controls.Add(Me.lblEmCount)
Me.gpElectricMotor.Controls.Add(Me.lblEmPosition)
Me.gpElectricMotor.Controls.Add(Me.pnElectricMotor)
- Me.gpElectricMotor.Location = New System.Drawing.Point(9, 9)
- Me.gpElectricMotor.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gpElectricMotor.Location = New System.Drawing.Point(6, 6)
Me.gpElectricMotor.Name = "gpElectricMotor"
- Me.gpElectricMotor.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.gpElectricMotor.Size = New System.Drawing.Size(950, 251)
+ Me.gpElectricMotor.Size = New System.Drawing.Size(633, 163)
Me.gpElectricMotor.TabIndex = 0
Me.gpElectricMotor.TabStop = false
Me.gpElectricMotor.Text = "Electric Motor"
@@ -1423,11 +1321,9 @@ Partial Class VehicleForm
Me.gbRatiosPerGear.Controls.Add(Me.btnAddEMRatio)
Me.gbRatiosPerGear.Controls.Add(Me.Label29)
Me.gbRatiosPerGear.Controls.Add(Me.btnRemoveEMRatio)
- Me.gbRatiosPerGear.Location = New System.Drawing.Point(666, 18)
- Me.gbRatiosPerGear.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbRatiosPerGear.Location = New System.Drawing.Point(444, 12)
Me.gbRatiosPerGear.Name = "gbRatiosPerGear"
- Me.gbRatiosPerGear.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.gbRatiosPerGear.Size = New System.Drawing.Size(272, 223)
+ Me.gbRatiosPerGear.Size = New System.Drawing.Size(181, 145)
Me.gbRatiosPerGear.TabIndex = 1
Me.gbRatiosPerGear.TabStop = false
Me.gbRatiosPerGear.Text = "Transmission Ratio per Gear"
@@ -1440,11 +1336,10 @@ Partial Class VehicleForm
Me.lvRatioPerGear.FullRowSelect = true
Me.lvRatioPerGear.GridLines = true
Me.lvRatioPerGear.HideSelection = false
- Me.lvRatioPerGear.Location = New System.Drawing.Point(9, 25)
- Me.lvRatioPerGear.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.lvRatioPerGear.Location = New System.Drawing.Point(6, 16)
Me.lvRatioPerGear.MultiSelect = false
Me.lvRatioPerGear.Name = "lvRatioPerGear"
- Me.lvRatioPerGear.Size = New System.Drawing.Size(252, 142)
+ Me.lvRatioPerGear.Size = New System.Drawing.Size(169, 94)
Me.lvRatioPerGear.TabIndex = 7
Me.lvRatioPerGear.TabStop = false
Me.lvRatioPerGear.UseCompatibleStateImageBehavior = false
@@ -1463,30 +1358,27 @@ Partial Class VehicleForm
'btnAddEMRatio
'
Me.btnAddEMRatio.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
- Me.btnAddEMRatio.Location = New System.Drawing.Point(9, 178)
- Me.btnAddEMRatio.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnAddEMRatio.Location = New System.Drawing.Point(6, 116)
Me.btnAddEMRatio.Name = "btnAddEMRatio"
- Me.btnAddEMRatio.Size = New System.Drawing.Size(36, 37)
+ Me.btnAddEMRatio.Size = New System.Drawing.Size(24, 24)
Me.btnAddEMRatio.TabIndex = 4
Me.btnAddEMRatio.UseVisualStyleBackColor = true
'
'Label29
'
Me.Label29.AutoSize = true
- Me.Label29.Location = New System.Drawing.Point(106, 186)
- Me.Label29.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label29.Location = New System.Drawing.Point(71, 121)
Me.Label29.Name = "Label29"
- Me.Label29.Size = New System.Drawing.Size(158, 20)
+ Me.Label29.Size = New System.Drawing.Size(106, 13)
Me.Label29.TabIndex = 6
Me.Label29.Text = "(Double-Click to Edit)"
'
'btnRemoveEMRatio
'
Me.btnRemoveEMRatio.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
- Me.btnRemoveEMRatio.Location = New System.Drawing.Point(50, 178)
- Me.btnRemoveEMRatio.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnRemoveEMRatio.Location = New System.Drawing.Point(33, 116)
Me.btnRemoveEMRatio.Name = "btnRemoveEMRatio"
- Me.btnRemoveEMRatio.Size = New System.Drawing.Size(36, 37)
+ Me.btnRemoveEMRatio.Size = New System.Drawing.Size(24, 24)
Me.btnRemoveEMRatio.TabIndex = 5
Me.btnRemoveEMRatio.UseVisualStyleBackColor = true
'
@@ -1494,83 +1386,74 @@ Partial Class VehicleForm
'
Me.btnEmADCLossMap.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
Me.btnEmADCLossMap.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnEmADCLossMap.Location = New System.Drawing.Point(621, 195)
- Me.btnEmADCLossMap.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnEmADCLossMap.Location = New System.Drawing.Point(414, 127)
Me.btnEmADCLossMap.Name = "btnEmADCLossMap"
- Me.btnEmADCLossMap.Size = New System.Drawing.Size(36, 37)
+ Me.btnEmADCLossMap.Size = New System.Drawing.Size(24, 24)
Me.btnEmADCLossMap.TabIndex = 5
Me.btnEmADCLossMap.UseVisualStyleBackColor = true
'
'tbEmADCLossMap
'
- Me.tbEmADCLossMap.Location = New System.Drawing.Point(306, 202)
- Me.tbEmADCLossMap.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbEmADCLossMap.Location = New System.Drawing.Point(204, 131)
Me.tbEmADCLossMap.Name = "tbEmADCLossMap"
- Me.tbEmADCLossMap.Size = New System.Drawing.Size(301, 26)
+ Me.tbEmADCLossMap.Size = New System.Drawing.Size(202, 20)
Me.tbEmADCLossMap.TabIndex = 4
'
'lblEmADCLossmap
'
Me.lblEmADCLossmap.AutoSize = true
- Me.lblEmADCLossmap.Location = New System.Drawing.Point(10, 206)
- Me.lblEmADCLossmap.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblEmADCLossmap.Location = New System.Drawing.Point(7, 134)
Me.lblEmADCLossmap.Name = "lblEmADCLossmap"
- Me.lblEmADCLossmap.Size = New System.Drawing.Size(148, 20)
+ Me.lblEmADCLossmap.Size = New System.Drawing.Size(100, 13)
Me.lblEmADCLossmap.TabIndex = 25
Me.lblEmADCLossmap.Text = "Loss Map EM ADC:"
'
'tbRatioEm
'
- Me.tbRatioEm.Location = New System.Drawing.Point(306, 162)
- Me.tbRatioEm.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbRatioEm.Location = New System.Drawing.Point(204, 105)
Me.tbRatioEm.Name = "tbRatioEm"
- Me.tbRatioEm.Size = New System.Drawing.Size(86, 26)
+ Me.tbRatioEm.Size = New System.Drawing.Size(59, 20)
Me.tbRatioEm.TabIndex = 3
'
'lblRatioEm
'
Me.lblRatioEm.AutoSize = true
- Me.lblRatioEm.Location = New System.Drawing.Point(10, 166)
- Me.lblRatioEm.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblRatioEm.Location = New System.Drawing.Point(7, 108)
Me.lblRatioEm.Name = "lblRatioEm"
- Me.lblRatioEm.Size = New System.Drawing.Size(117, 20)
+ Me.lblRatioEm.Size = New System.Drawing.Size(79, 13)
Me.lblRatioEm.TabIndex = 23
Me.lblRatioEm.Text = "Ratio EM ADC:"
'
'tbEmCount
'
- Me.tbEmCount.Location = New System.Drawing.Point(306, 122)
- Me.tbEmCount.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbEmCount.Location = New System.Drawing.Point(204, 79)
Me.tbEmCount.Name = "tbEmCount"
- Me.tbEmCount.Size = New System.Drawing.Size(86, 26)
+ Me.tbEmCount.Size = New System.Drawing.Size(59, 20)
Me.tbEmCount.TabIndex = 2
'
'cbEmPos
'
Me.cbEmPos.FormattingEnabled = true
- Me.cbEmPos.Location = New System.Drawing.Point(213, 80)
- Me.cbEmPos.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.cbEmPos.Location = New System.Drawing.Point(142, 52)
Me.cbEmPos.Name = "cbEmPos"
- Me.cbEmPos.Size = New System.Drawing.Size(180, 28)
+ Me.cbEmPos.Size = New System.Drawing.Size(121, 21)
Me.cbEmPos.TabIndex = 1
'
'lblEmCount
'
Me.lblEmCount.AutoSize = true
- Me.lblEmCount.Location = New System.Drawing.Point(10, 126)
- Me.lblEmCount.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblEmCount.Location = New System.Drawing.Point(7, 82)
Me.lblEmCount.Name = "lblEmCount"
- Me.lblEmCount.Size = New System.Drawing.Size(123, 20)
+ Me.lblEmCount.Size = New System.Drawing.Size(83, 13)
Me.lblEmCount.TabIndex = 20
Me.lblEmCount.Text = "Number of EMs:"
'
'lblEmPosition
'
Me.lblEmPosition.AutoSize = true
- Me.lblEmPosition.Location = New System.Drawing.Point(10, 86)
- Me.lblEmPosition.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblEmPosition.Location = New System.Drawing.Point(7, 56)
Me.lblEmPosition.Name = "lblEmPosition"
- Me.lblEmPosition.Size = New System.Drawing.Size(69, 20)
+ Me.lblEmPosition.Size = New System.Drawing.Size(47, 13)
Me.lblEmPosition.TabIndex = 19
Me.lblEmPosition.Text = "Position:"
'
@@ -1579,18 +1462,16 @@ Partial Class VehicleForm
Me.pnElectricMotor.Controls.Add(Me.btnOpenElectricMotor)
Me.pnElectricMotor.Controls.Add(Me.btnBrowseElectricMotor)
Me.pnElectricMotor.Controls.Add(Me.tbElectricMotor)
- Me.pnElectricMotor.Location = New System.Drawing.Point(9, 29)
- Me.pnElectricMotor.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.pnElectricMotor.Location = New System.Drawing.Point(6, 19)
Me.pnElectricMotor.Name = "pnElectricMotor"
- Me.pnElectricMotor.Size = New System.Drawing.Size(648, 42)
+ Me.pnElectricMotor.Size = New System.Drawing.Size(432, 27)
Me.pnElectricMotor.TabIndex = 0
'
'btnOpenElectricMotor
'
- Me.btnOpenElectricMotor.Location = New System.Drawing.Point(6, 5)
- Me.btnOpenElectricMotor.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnOpenElectricMotor.Location = New System.Drawing.Point(4, 3)
Me.btnOpenElectricMotor.Name = "btnOpenElectricMotor"
- Me.btnOpenElectricMotor.Size = New System.Drawing.Size(141, 32)
+ Me.btnOpenElectricMotor.Size = New System.Drawing.Size(94, 21)
Me.btnOpenElectricMotor.TabIndex = 0
Me.btnOpenElectricMotor.Text = "Electric Motor"
Me.btnOpenElectricMotor.UseVisualStyleBackColor = true
@@ -1599,10 +1480,9 @@ Partial Class VehicleForm
'
Me.btnBrowseElectricMotor.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.btnBrowseElectricMotor.Image = CType(resources.GetObject("btnBrowseElectricMotor.Image"),System.Drawing.Image)
- Me.btnBrowseElectricMotor.Location = New System.Drawing.Point(609, 3)
- Me.btnBrowseElectricMotor.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnBrowseElectricMotor.Location = New System.Drawing.Point(406, 2)
Me.btnBrowseElectricMotor.Name = "btnBrowseElectricMotor"
- Me.btnBrowseElectricMotor.Size = New System.Drawing.Size(36, 37)
+ Me.btnBrowseElectricMotor.Size = New System.Drawing.Size(24, 24)
Me.btnBrowseElectricMotor.TabIndex = 2
Me.btnBrowseElectricMotor.UseVisualStyleBackColor = true
'
@@ -1610,10 +1490,9 @@ Partial Class VehicleForm
'
Me.tbElectricMotor.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.tbElectricMotor.Location = New System.Drawing.Point(156, 6)
- Me.tbElectricMotor.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbElectricMotor.Location = New System.Drawing.Point(104, 4)
Me.tbElectricMotor.Name = "tbElectricMotor"
- Me.tbElectricMotor.Size = New System.Drawing.Size(442, 26)
+ Me.tbElectricMotor.Size = New System.Drawing.Size(296, 20)
Me.tbElectricMotor.TabIndex = 1
'
'tpTorqueLimits
@@ -1621,10 +1500,9 @@ Partial Class VehicleForm
Me.tpTorqueLimits.Controls.Add(Me.gbPropulsionTorque)
Me.tpTorqueLimits.Controls.Add(Me.gbEMTorqueLimits)
Me.tpTorqueLimits.Controls.Add(Me.bgVehicleTorqueLimits)
- Me.tpTorqueLimits.Location = New System.Drawing.Point(4, 29)
- Me.tpTorqueLimits.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tpTorqueLimits.Location = New System.Drawing.Point(4, 22)
Me.tpTorqueLimits.Name = "tpTorqueLimits"
- Me.tpTorqueLimits.Size = New System.Drawing.Size(976, 582)
+ Me.tpTorqueLimits.Size = New System.Drawing.Size(648, 374)
Me.tpTorqueLimits.TabIndex = 2
Me.tpTorqueLimits.Text = "Torque Limits"
Me.tpTorqueLimits.UseVisualStyleBackColor = true
@@ -1633,11 +1511,9 @@ Partial Class VehicleForm
'
Me.gbPropulsionTorque.Controls.Add(Me.btnPropulsionTorqueLimit)
Me.gbPropulsionTorque.Controls.Add(Me.tbPropulsionTorqueLimit)
- Me.gbPropulsionTorque.Location = New System.Drawing.Point(4, 363)
- Me.gbPropulsionTorque.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbPropulsionTorque.Location = New System.Drawing.Point(3, 236)
Me.gbPropulsionTorque.Name = "gbPropulsionTorque"
- Me.gbPropulsionTorque.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.gbPropulsionTorque.Size = New System.Drawing.Size(610, 80)
+ Me.gbPropulsionTorque.Size = New System.Drawing.Size(407, 52)
Me.gbPropulsionTorque.TabIndex = 2
Me.gbPropulsionTorque.TabStop = false
Me.gbPropulsionTorque.Text = "Propulsion Torque Limit"
@@ -1645,30 +1521,26 @@ Partial Class VehicleForm
'btnPropulsionTorqueLimit
'
Me.btnPropulsionTorqueLimit.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnPropulsionTorqueLimit.Location = New System.Drawing.Point(496, 26)
- Me.btnPropulsionTorqueLimit.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnPropulsionTorqueLimit.Location = New System.Drawing.Point(331, 17)
Me.btnPropulsionTorqueLimit.Name = "btnPropulsionTorqueLimit"
- Me.btnPropulsionTorqueLimit.Size = New System.Drawing.Size(36, 37)
+ Me.btnPropulsionTorqueLimit.Size = New System.Drawing.Size(24, 24)
Me.btnPropulsionTorqueLimit.TabIndex = 1
Me.btnPropulsionTorqueLimit.UseVisualStyleBackColor = true
'
'tbPropulsionTorqueLimit
'
- Me.tbPropulsionTorqueLimit.Location = New System.Drawing.Point(9, 31)
- Me.tbPropulsionTorqueLimit.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbPropulsionTorqueLimit.Location = New System.Drawing.Point(6, 20)
Me.tbPropulsionTorqueLimit.Name = "tbPropulsionTorqueLimit"
- Me.tbPropulsionTorqueLimit.Size = New System.Drawing.Size(476, 26)
+ Me.tbPropulsionTorqueLimit.Size = New System.Drawing.Size(319, 20)
Me.tbPropulsionTorqueLimit.TabIndex = 0
'
'gbEMTorqueLimits
'
Me.gbEMTorqueLimits.Controls.Add(Me.btnEmTorqueLimits)
Me.gbEMTorqueLimits.Controls.Add(Me.tbEmTorqueLimits)
- Me.gbEMTorqueLimits.Location = New System.Drawing.Point(4, 274)
- Me.gbEMTorqueLimits.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbEMTorqueLimits.Location = New System.Drawing.Point(3, 178)
Me.gbEMTorqueLimits.Name = "gbEMTorqueLimits"
- Me.gbEMTorqueLimits.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.gbEMTorqueLimits.Size = New System.Drawing.Size(610, 80)
+ Me.gbEMTorqueLimits.Size = New System.Drawing.Size(407, 52)
Me.gbEMTorqueLimits.TabIndex = 1
Me.gbEMTorqueLimits.TabStop = false
Me.gbEMTorqueLimits.Text = "Electric Machine Torque Limits"
@@ -1676,19 +1548,17 @@ Partial Class VehicleForm
'btnEmTorqueLimits
'
Me.btnEmTorqueLimits.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnEmTorqueLimits.Location = New System.Drawing.Point(496, 26)
- Me.btnEmTorqueLimits.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnEmTorqueLimits.Location = New System.Drawing.Point(331, 17)
Me.btnEmTorqueLimits.Name = "btnEmTorqueLimits"
- Me.btnEmTorqueLimits.Size = New System.Drawing.Size(36, 37)
+ Me.btnEmTorqueLimits.Size = New System.Drawing.Size(24, 24)
Me.btnEmTorqueLimits.TabIndex = 1
Me.btnEmTorqueLimits.UseVisualStyleBackColor = true
'
'tbEmTorqueLimits
'
- Me.tbEmTorqueLimits.Location = New System.Drawing.Point(9, 31)
- Me.tbEmTorqueLimits.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbEmTorqueLimits.Location = New System.Drawing.Point(6, 20)
Me.tbEmTorqueLimits.Name = "tbEmTorqueLimits"
- Me.tbEmTorqueLimits.Size = New System.Drawing.Size(476, 26)
+ Me.tbEmTorqueLimits.Size = New System.Drawing.Size(319, 20)
Me.tbEmTorqueLimits.TabIndex = 0
'
'bgVehicleTorqueLimits
@@ -1697,11 +1567,9 @@ Partial Class VehicleForm
Me.bgVehicleTorqueLimits.Controls.Add(Me.btAddMaxTorqueEntry)
Me.bgVehicleTorqueLimits.Controls.Add(Me.Label17)
Me.bgVehicleTorqueLimits.Controls.Add(Me.btDelMaxTorqueEntry)
- Me.bgVehicleTorqueLimits.Location = New System.Drawing.Point(4, 14)
- Me.bgVehicleTorqueLimits.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.bgVehicleTorqueLimits.Location = New System.Drawing.Point(3, 9)
Me.bgVehicleTorqueLimits.Name = "bgVehicleTorqueLimits"
- Me.bgVehicleTorqueLimits.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.bgVehicleTorqueLimits.Size = New System.Drawing.Size(610, 251)
+ Me.bgVehicleTorqueLimits.Size = New System.Drawing.Size(407, 163)
Me.bgVehicleTorqueLimits.TabIndex = 0
Me.bgVehicleTorqueLimits.TabStop = false
Me.bgVehicleTorqueLimits.Text = "ICE Torque Limits"
@@ -1714,11 +1582,10 @@ Partial Class VehicleForm
Me.lvTorqueLimits.FullRowSelect = true
Me.lvTorqueLimits.GridLines = true
Me.lvTorqueLimits.HideSelection = false
- Me.lvTorqueLimits.Location = New System.Drawing.Point(9, 29)
- Me.lvTorqueLimits.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.lvTorqueLimits.Location = New System.Drawing.Point(6, 19)
Me.lvTorqueLimits.MultiSelect = false
Me.lvTorqueLimits.Name = "lvTorqueLimits"
- Me.lvTorqueLimits.Size = New System.Drawing.Size(421, 155)
+ Me.lvTorqueLimits.Size = New System.Drawing.Size(282, 102)
Me.lvTorqueLimits.TabIndex = 7
Me.lvTorqueLimits.TabStop = false
Me.lvTorqueLimits.UseCompatibleStateImageBehavior = false
@@ -1737,69 +1604,62 @@ Partial Class VehicleForm
'btAddMaxTorqueEntry
'
Me.btAddMaxTorqueEntry.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
- Me.btAddMaxTorqueEntry.Location = New System.Drawing.Point(9, 195)
- Me.btAddMaxTorqueEntry.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btAddMaxTorqueEntry.Location = New System.Drawing.Point(6, 127)
Me.btAddMaxTorqueEntry.Name = "btAddMaxTorqueEntry"
- Me.btAddMaxTorqueEntry.Size = New System.Drawing.Size(36, 37)
+ Me.btAddMaxTorqueEntry.Size = New System.Drawing.Size(24, 24)
Me.btAddMaxTorqueEntry.TabIndex = 4
Me.btAddMaxTorqueEntry.UseVisualStyleBackColor = true
'
'Label17
'
Me.Label17.AutoSize = true
- Me.Label17.Location = New System.Drawing.Point(273, 191)
- Me.Label17.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label17.Location = New System.Drawing.Point(182, 124)
Me.Label17.Name = "Label17"
- Me.Label17.Size = New System.Drawing.Size(158, 20)
+ Me.Label17.Size = New System.Drawing.Size(106, 13)
Me.Label17.TabIndex = 6
Me.Label17.Text = "(Double-Click to Edit)"
'
'btDelMaxTorqueEntry
'
Me.btDelMaxTorqueEntry.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
- Me.btDelMaxTorqueEntry.Location = New System.Drawing.Point(45, 195)
- Me.btDelMaxTorqueEntry.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btDelMaxTorqueEntry.Location = New System.Drawing.Point(30, 127)
Me.btDelMaxTorqueEntry.Name = "btDelMaxTorqueEntry"
- Me.btDelMaxTorqueEntry.Size = New System.Drawing.Size(36, 37)
+ Me.btDelMaxTorqueEntry.Size = New System.Drawing.Size(24, 24)
Me.btDelMaxTorqueEntry.TabIndex = 5
Me.btDelMaxTorqueEntry.UseVisualStyleBackColor = true
'
'tpADAS
'
- Me.tpADAS.Controls.Add(Me.GroupBox5)
- Me.tpADAS.Location = New System.Drawing.Point(4, 29)
- Me.tpADAS.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tpADAS.Controls.Add(Me.gbADAS)
+ Me.tpADAS.Location = New System.Drawing.Point(4, 22)
Me.tpADAS.Name = "tpADAS"
- Me.tpADAS.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.tpADAS.Size = New System.Drawing.Size(976, 582)
+ Me.tpADAS.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3)
+ Me.tpADAS.Size = New System.Drawing.Size(648, 374)
Me.tpADAS.TabIndex = 3
Me.tpADAS.Text = "ADAS"
Me.tpADAS.UseVisualStyleBackColor = true
'
- 'GroupBox5
- '
- Me.GroupBox5.Controls.Add(Me.cbAtEcoRollReleaseLockupClutch)
- Me.GroupBox5.Controls.Add(Me.cbPcc)
- Me.GroupBox5.Controls.Add(Me.cbEcoRoll)
- Me.GroupBox5.Controls.Add(Me.Label22)
- Me.GroupBox5.Controls.Add(Me.cbEngineStopStart)
- Me.GroupBox5.Controls.Add(Me.lblPCC)
- Me.GroupBox5.Location = New System.Drawing.Point(9, 9)
- Me.GroupBox5.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.GroupBox5.Name = "GroupBox5"
- Me.GroupBox5.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.GroupBox5.Size = New System.Drawing.Size(848, 209)
- Me.GroupBox5.TabIndex = 0
- Me.GroupBox5.TabStop = false
- Me.GroupBox5.Text = "ADAS Options"
+ 'gbADAS
+ '
+ Me.gbADAS.Controls.Add(Me.cbAtEcoRollReleaseLockupClutch)
+ Me.gbADAS.Controls.Add(Me.cbPcc)
+ Me.gbADAS.Controls.Add(Me.cbEcoRoll)
+ Me.gbADAS.Controls.Add(Me.Label22)
+ Me.gbADAS.Controls.Add(Me.cbEngineStopStart)
+ Me.gbADAS.Controls.Add(Me.lblPCC)
+ Me.gbADAS.Location = New System.Drawing.Point(6, 6)
+ Me.gbADAS.Name = "gbADAS"
+ Me.gbADAS.Size = New System.Drawing.Size(565, 136)
+ Me.gbADAS.TabIndex = 0
+ Me.gbADAS.TabStop = false
+ Me.gbADAS.Text = "ADAS Options"
'
'cbAtEcoRollReleaseLockupClutch
'
Me.cbAtEcoRollReleaseLockupClutch.AutoSize = true
- Me.cbAtEcoRollReleaseLockupClutch.Location = New System.Drawing.Point(398, 29)
- Me.cbAtEcoRollReleaseLockupClutch.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.cbAtEcoRollReleaseLockupClutch.Location = New System.Drawing.Point(265, 19)
Me.cbAtEcoRollReleaseLockupClutch.Name = "cbAtEcoRollReleaseLockupClutch"
- Me.cbAtEcoRollReleaseLockupClutch.Size = New System.Drawing.Size(356, 24)
+ Me.cbAtEcoRollReleaseLockupClutch.Size = New System.Drawing.Size(250, 21)
Me.cbAtEcoRollReleaseLockupClutch.TabIndex = 3
Me.cbAtEcoRollReleaseLockupClutch.Text = "AT Gearbox: Eco-Roll Release Lockup Clutch"
Me.cbAtEcoRollReleaseLockupClutch.UseVisualStyleBackColor = true
@@ -1807,38 +1667,34 @@ Partial Class VehicleForm
'cbPcc
'
Me.cbPcc.FormattingEnabled = true
- Me.cbPcc.Location = New System.Drawing.Point(27, 160)
- Me.cbPcc.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.cbPcc.Location = New System.Drawing.Point(18, 104)
Me.cbPcc.Name = "cbPcc"
- Me.cbPcc.Size = New System.Drawing.Size(266, 28)
+ Me.cbPcc.Size = New System.Drawing.Size(179, 21)
Me.cbPcc.TabIndex = 2
'
'cbEcoRoll
'
Me.cbEcoRoll.FormattingEnabled = true
- Me.cbEcoRoll.Location = New System.Drawing.Point(27, 89)
- Me.cbEcoRoll.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.cbEcoRoll.Location = New System.Drawing.Point(18, 58)
Me.cbEcoRoll.Name = "cbEcoRoll"
- Me.cbEcoRoll.Size = New System.Drawing.Size(266, 28)
+ Me.cbEcoRoll.Size = New System.Drawing.Size(179, 21)
Me.cbEcoRoll.TabIndex = 1
'
'Label22
'
Me.Label22.AutoSize = true
- Me.Label22.Location = New System.Drawing.Point(9, 65)
- Me.Label22.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label22.Location = New System.Drawing.Point(6, 42)
Me.Label22.Name = "Label22"
- Me.Label22.Size = New System.Drawing.Size(69, 20)
+ Me.Label22.Size = New System.Drawing.Size(47, 13)
Me.Label22.TabIndex = 6
Me.Label22.Text = "Eco-Roll"
'
'cbEngineStopStart
'
Me.cbEngineStopStart.AutoSize = true
- Me.cbEngineStopStart.Location = New System.Drawing.Point(9, 29)
- Me.cbEngineStopStart.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.cbEngineStopStart.Location = New System.Drawing.Point(6, 19)
Me.cbEngineStopStart.Name = "cbEngineStopStart"
- Me.cbEngineStopStart.Size = New System.Drawing.Size(297, 24)
+ Me.cbEngineStopStart.Size = New System.Drawing.Size(210, 21)
Me.cbEngineStopStart.TabIndex = 0
Me.cbEngineStopStart.Text = "Engine Stop/Start during vehicle stop"
Me.cbEngineStopStart.UseVisualStyleBackColor = true
@@ -1846,10 +1702,9 @@ Partial Class VehicleForm
'lblPCC
'
Me.lblPCC.AutoSize = true
- Me.lblPCC.Location = New System.Drawing.Point(9, 135)
- Me.lblPCC.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblPCC.Location = New System.Drawing.Point(6, 88)
Me.lblPCC.Name = "lblPCC"
- Me.lblPCC.Size = New System.Drawing.Size(181, 20)
+ Me.lblPCC.Size = New System.Drawing.Size(122, 13)
Me.lblPCC.TabIndex = 3
Me.lblPCC.Text = "Predictive Cruise Control"
'
@@ -1857,10 +1712,9 @@ Partial Class VehicleForm
'
Me.tpRoadSweeper.Controls.Add(Me.pnPTO)
Me.tpRoadSweeper.Controls.Add(Me.gbPTO)
- Me.tpRoadSweeper.Location = New System.Drawing.Point(4, 29)
- Me.tpRoadSweeper.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tpRoadSweeper.Location = New System.Drawing.Point(4, 22)
Me.tpRoadSweeper.Name = "tpRoadSweeper"
- Me.tpRoadSweeper.Size = New System.Drawing.Size(976, 582)
+ Me.tpRoadSweeper.Size = New System.Drawing.Size(648, 374)
Me.tpRoadSweeper.TabIndex = 4
Me.tpRoadSweeper.Text = "PTO"
Me.tpRoadSweeper.UseVisualStyleBackColor = true
@@ -1877,10 +1731,9 @@ Partial Class VehicleForm
Me.pnPTO.Controls.Add(Me.btPTOLossMapBrowse)
Me.pnPTO.Controls.Add(Me.Label7)
Me.pnPTO.Controls.Add(Me.tbPTOLossMap)
- Me.pnPTO.Location = New System.Drawing.Point(8, 112)
- Me.pnPTO.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.pnPTO.Location = New System.Drawing.Point(5, 73)
Me.pnPTO.Name = "pnPTO"
- Me.pnPTO.Size = New System.Drawing.Size(849, 325)
+ Me.pnPTO.Size = New System.Drawing.Size(566, 211)
Me.pnPTO.TabIndex = 1
'
'gbPTODrive
@@ -1891,11 +1744,9 @@ Partial Class VehicleForm
Me.gbPTODrive.Controls.Add(Me.tbPtoEngineSpeed)
Me.gbPTODrive.Controls.Add(Me.Label25)
Me.gbPTODrive.Controls.Add(Me.Label24)
- Me.gbPTODrive.Location = New System.Drawing.Point(4, 152)
- Me.gbPTODrive.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbPTODrive.Location = New System.Drawing.Point(3, 99)
Me.gbPTODrive.Name = "gbPTODrive"
- Me.gbPTODrive.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.gbPTODrive.Size = New System.Drawing.Size(834, 85)
+ Me.gbPTODrive.Size = New System.Drawing.Size(556, 55)
Me.gbPTODrive.TabIndex = 4
Me.gbPTODrive.TabStop = false
Me.gbPTODrive.Text = "Working operation settings (PTO mode 2)"
@@ -1903,77 +1754,69 @@ Partial Class VehicleForm
'Label27
'
Me.Label27.AutoSize = true
- Me.Label27.Location = New System.Drawing.Point(669, 37)
- Me.Label27.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label27.Location = New System.Drawing.Point(446, 24)
Me.Label27.Name = "Label27"
- Me.Label27.Size = New System.Drawing.Size(26, 20)
+ Me.Label27.Size = New System.Drawing.Size(20, 13)
Me.Label27.TabIndex = 6
Me.Label27.Text = "[#]"
Me.Label27.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
'
'tbPtoGear
'
- Me.tbPtoGear.Location = New System.Drawing.Point(556, 32)
- Me.tbPtoGear.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbPtoGear.Location = New System.Drawing.Point(371, 21)
Me.tbPtoGear.Name = "tbPtoGear"
- Me.tbPtoGear.Size = New System.Drawing.Size(103, 26)
+ Me.tbPtoGear.Size = New System.Drawing.Size(70, 20)
Me.tbPtoGear.TabIndex = 1
'
'Label26
'
Me.Label26.AutoSize = true
- Me.Label26.Location = New System.Drawing.Point(294, 37)
- Me.Label26.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label26.Location = New System.Drawing.Point(196, 24)
Me.Label26.Name = "Label26"
- Me.Label26.Size = New System.Drawing.Size(44, 20)
+ Me.Label26.Size = New System.Drawing.Size(30, 13)
Me.Label26.TabIndex = 4
Me.Label26.Text = "[rpm]"
Me.Label26.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
'
'tbPtoEngineSpeed
'
- Me.tbPtoEngineSpeed.Location = New System.Drawing.Point(180, 32)
- Me.tbPtoEngineSpeed.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbPtoEngineSpeed.Location = New System.Drawing.Point(120, 21)
Me.tbPtoEngineSpeed.Name = "tbPtoEngineSpeed"
- Me.tbPtoEngineSpeed.Size = New System.Drawing.Size(103, 26)
+ Me.tbPtoEngineSpeed.Size = New System.Drawing.Size(70, 20)
Me.tbPtoEngineSpeed.TabIndex = 0
'
'Label25
'
Me.Label25.AutoSize = true
- Me.Label25.Location = New System.Drawing.Point(446, 37)
- Me.Label25.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label25.Location = New System.Drawing.Point(297, 24)
Me.Label25.Name = "Label25"
- Me.Label25.Size = New System.Drawing.Size(103, 20)
+ Me.Label25.Size = New System.Drawing.Size(68, 13)
Me.Label25.TabIndex = 1
Me.Label25.Text = "Gear number"
'
'Label24
'
Me.Label24.AutoSize = true
- Me.Label24.Location = New System.Drawing.Point(10, 37)
- Me.Label24.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label24.Location = New System.Drawing.Point(7, 24)
Me.Label24.Name = "Label24"
- Me.Label24.Size = New System.Drawing.Size(143, 20)
+ Me.Label24.Size = New System.Drawing.Size(97, 13)
Me.Label24.TabIndex = 0
Me.Label24.Text = "Min. Engine Speed"
'
'btPTOCycleDrive
'
Me.btPTOCycleDrive.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btPTOCycleDrive.Location = New System.Drawing.Point(368, 278)
- Me.btPTOCycleDrive.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btPTOCycleDrive.Location = New System.Drawing.Point(245, 181)
Me.btPTOCycleDrive.Name = "btPTOCycleDrive"
- Me.btPTOCycleDrive.Size = New System.Drawing.Size(36, 37)
+ Me.btPTOCycleDrive.Size = New System.Drawing.Size(24, 24)
Me.btPTOCycleDrive.TabIndex = 6
Me.btPTOCycleDrive.UseVisualStyleBackColor = true
'
'Label28
'
- Me.Label28.Location = New System.Drawing.Point(4, 252)
- Me.Label28.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label28.Location = New System.Drawing.Point(3, 164)
Me.Label28.Name = "Label28"
- Me.Label28.Size = New System.Drawing.Size(399, 25)
+ Me.Label28.Size = New System.Drawing.Size(266, 16)
Me.Label28.TabIndex = 21
Me.Label28.Text = "PTO Cycle during driving (PTO mode 3) (.vptor)"
Me.Label28.TextAlign = System.Drawing.ContentAlignment.BottomLeft
@@ -1981,19 +1824,17 @@ Partial Class VehicleForm
'btPTOCycle
'
Me.btPTOCycle.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btPTOCycle.Location = New System.Drawing.Point(368, 106)
- Me.btPTOCycle.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btPTOCycle.Location = New System.Drawing.Point(245, 69)
Me.btPTOCycle.Name = "btPTOCycle"
- Me.btPTOCycle.Size = New System.Drawing.Size(36, 37)
+ Me.btPTOCycle.Size = New System.Drawing.Size(24, 24)
Me.btPTOCycle.TabIndex = 3
Me.btPTOCycle.UseVisualStyleBackColor = true
'
'Label16
'
- Me.Label16.Location = New System.Drawing.Point(4, 80)
- Me.Label16.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label16.Location = New System.Drawing.Point(3, 52)
Me.Label16.Name = "Label16"
- Me.Label16.Size = New System.Drawing.Size(399, 25)
+ Me.Label16.Size = New System.Drawing.Size(266, 16)
Me.Label16.TabIndex = 18
Me.Label16.Text = "PTO Cycle during standstill (PTO mode 1) (.vptoc)"
Me.Label16.TextAlign = System.Drawing.ContentAlignment.BottomLeft
@@ -2001,19 +1842,17 @@ Partial Class VehicleForm
'btPTOLossMapBrowse
'
Me.btPTOLossMapBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btPTOLossMapBrowse.Location = New System.Drawing.Point(368, 34)
- Me.btPTOLossMapBrowse.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btPTOLossMapBrowse.Location = New System.Drawing.Point(245, 22)
Me.btPTOLossMapBrowse.Name = "btPTOLossMapBrowse"
- Me.btPTOLossMapBrowse.Size = New System.Drawing.Size(36, 37)
+ Me.btPTOLossMapBrowse.Size = New System.Drawing.Size(24, 24)
Me.btPTOLossMapBrowse.TabIndex = 1
Me.btPTOLossMapBrowse.UseVisualStyleBackColor = true
'
'Label7
'
- Me.Label7.Location = New System.Drawing.Point(4, 8)
- Me.Label7.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label7.Location = New System.Drawing.Point(3, 5)
Me.Label7.Name = "Label7"
- Me.Label7.Size = New System.Drawing.Size(302, 25)
+ Me.Label7.Size = New System.Drawing.Size(201, 16)
Me.Label7.TabIndex = 15
Me.Label7.Text = "PTO Consumer Loss Map (.vptoi)"
Me.Label7.TextAlign = System.Drawing.ContentAlignment.BottomLeft
@@ -2021,11 +1860,9 @@ Partial Class VehicleForm
'gbPTO
'
Me.gbPTO.Controls.Add(Me.cbPTOType)
- Me.gbPTO.Location = New System.Drawing.Point(8, 15)
- Me.gbPTO.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbPTO.Location = New System.Drawing.Point(5, 10)
Me.gbPTO.Name = "gbPTO"
- Me.gbPTO.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.gbPTO.Size = New System.Drawing.Size(846, 88)
+ Me.gbPTO.Size = New System.Drawing.Size(564, 57)
Me.gbPTO.TabIndex = 0
Me.gbPTO.TabStop = false
Me.gbPTO.Text = "PTO Design Variant"
@@ -2034,19 +1871,17 @@ Partial Class VehicleForm
'
Me.cbLegislativeClass.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
Me.cbLegislativeClass.FormattingEnabled = true
- Me.cbLegislativeClass.Location = New System.Drawing.Point(330, 215)
- Me.cbLegislativeClass.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.cbLegislativeClass.Location = New System.Drawing.Point(220, 140)
Me.cbLegislativeClass.Name = "cbLegislativeClass"
- Me.cbLegislativeClass.Size = New System.Drawing.Size(76, 28)
+ Me.cbLegislativeClass.Size = New System.Drawing.Size(52, 21)
Me.cbLegislativeClass.TabIndex = 4
'
'Label21
'
Me.Label21.AutoSize = true
- Me.Label21.Location = New System.Drawing.Point(48, 189)
- Me.Label21.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label21.Location = New System.Drawing.Point(32, 123)
Me.Label21.Name = "Label21"
- Me.Label21.Size = New System.Drawing.Size(167, 20)
+ Me.Label21.Size = New System.Drawing.Size(112, 13)
Me.Label21.TabIndex = 42
Me.Label21.Text = "Maximum Laden Mass"
'
@@ -2055,8 +1890,7 @@ Partial Class VehicleForm
Me.lblTitle.AutoSize = true
Me.lblTitle.BackColor = System.Drawing.Color.White
Me.lblTitle.Font = New System.Drawing.Font("Microsoft Sans Serif", 18!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- Me.lblTitle.Location = New System.Drawing.Point(182, 52)
- Me.lblTitle.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblTitle.Location = New System.Drawing.Point(121, 34)
Me.lblTitle.Name = "lblTitle"
Me.lblTitle.Size = New System.Drawing.Size(242, 40)
Me.lblTitle.TabIndex = 43
@@ -2065,10 +1899,10 @@ Partial Class VehicleForm
'VehicleForm
'
Me.AcceptButton = Me.ButOK
- Me.AutoScaleDimensions = New System.Drawing.SizeF(9!, 20!)
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.CancelButton = Me.ButCancel
- Me.ClientSize = New System.Drawing.Size(999, 962)
+ Me.ClientSize = New System.Drawing.Size(666, 625)
Me.Controls.Add(Me.lblTitle)
Me.Controls.Add(Me.Label21)
Me.Controls.Add(Me.cbLegislativeClass)
@@ -2088,7 +1922,6 @@ Partial Class VehicleForm
Me.Controls.Add(Me.ToolStrip1)
Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
Me.Icon = CType(resources.GetObject("$this.Icon"),System.Drawing.Icon)
- Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.MaximizeBox = false
Me.Name = "VehicleForm"
Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
@@ -2145,8 +1978,8 @@ Partial Class VehicleForm
Me.bgVehicleTorqueLimits.ResumeLayout(false)
Me.bgVehicleTorqueLimits.PerformLayout
Me.tpADAS.ResumeLayout(false)
- Me.GroupBox5.ResumeLayout(false)
- Me.GroupBox5.PerformLayout
+ Me.gbADAS.ResumeLayout(false)
+ Me.gbADAS.PerformLayout
Me.tpRoadSweeper.ResumeLayout(false)
Me.pnPTO.ResumeLayout(false)
Me.pnPTO.PerformLayout
@@ -2272,7 +2105,7 @@ End Sub
Friend WithEvents Label20 As System.Windows.Forms.Label
Friend WithEvents Label21 As Label
Friend WithEvents tpADAS As TabPage
- Friend WithEvents GroupBox5 As GroupBox
+ Friend WithEvents gbADAS As GroupBox
Friend WithEvents cbEngineStopStart As CheckBox
Friend WithEvents lblPCC As Label
Friend WithEvents Label22 As Label
diff --git a/VECTO/GUI/VehicleForm.vb b/VECTO/GUI/VehicleForm.vb
index 304115e9de..659ba9de93 100644
--- a/VECTO/GUI/VehicleForm.vb
+++ b/VECTO/GUI/VehicleForm.vb
@@ -943,7 +943,7 @@ Public Class VehicleForm
_axlDlog.TbRRC.Text = lv0.SubItems(AxleTbl.RRC).Text
_axlDlog.TbFzISO.Text = lv0.SubItems(AxleTbl.FzISO).Text
_axlDlog.TbI_wheels.Text = lv0.SubItems(AxleTbl.Inertia).Text
- _axlDlog.CbWheels.Text = lv0.SubItems(AxleTbl.WheelsDimension).Text
+ _axlDlog.CbWheels.SelectedItem = if(string.IsNullOrWhiteSpace(lv0.SubItems(AxleTbl.WheelsDimension).Text), "-", lv0.SubItems(AxleTbl.WheelsDimension).Text)
_axlDlog.cbAxleType.SelectedValue = lv0.SubItems(AxleTbl.AxleType).Text.ParseEnum(Of AxleType)()
If _axlDlog.ShowDialog = DialogResult.OK Then
--
GitLab