diff --git a/VECTO/File Browser/FileBrowserModule.vb b/VECTO/File Browser/FileBrowserModule.vb
index a0115609f3767382cd5efeff7b9040e1e02ba4b6..2b77da0df75ac84ec7bc4274ff44c436eae3a0f7 100644
--- a/VECTO/File Browser/FileBrowserModule.vb
+++ b/VECTO/File Browser/FileBrowserModule.vb
@@ -27,7 +27,8 @@ Public Module FileBrowserModule
public ManRXMLFileBrowser As FileBrowser
Public DrivingCycleFileBrowser As FileBrowser
Public PTODrivingCycleStandstillFileBrowser As FileBrowser
- Public PTODrivingCycleDrivingFileBrowser As FileBrowser
+ Public PTODrivingCycleDrivingFileBrowser As FileBrowser
+ Public PTODrivingCycleElectricStandstillFileBrowser As FileBrowser
Public FuelConsumptionMapFileBrowser As FileBrowser
Public FullLoadCurveFileBrowser As FileBrowser
diff --git a/VECTO/GUI/MainForm.vb b/VECTO/GUI/MainForm.vb
index 59e62412ab88a419d0f3d28519421f424f0f5811..d827cc5a895c2ad792fbc47c09d4409c3fde6cbf 100644
--- a/VECTO/GUI/MainForm.vb
+++ b/VECTO/GUI/MainForm.vb
@@ -130,6 +130,7 @@ Public Class MainForm
TransmissionLossMapFileBrowser = New FileBrowser("vtlm")
PtoLossMapFileBrowser = New FileBrowser("vptol")
PTODrivingCycleStandstillFileBrowser = New FileBrowser("vptoc")
+ PTODrivingCycleElectricStandstillFileBrowser = New FileBrowser("vptoel")
PTODrivingCycleDrivingFileBrowser = New FileBrowser("vptor")
TorqueConverterFileBrowser = New FileBrowser("vtcc")
TorqueConverterShiftPolygonFileBrowser = New FileBrowser("vgbs")
diff --git a/VECTO/GUI/VehicleForm.Designer.vb b/VECTO/GUI/VehicleForm.Designer.vb
index 218c39a92815fe8abc9c17b3262995514574844d..cf507acce3165bd9030c73ba99ccfd10fa8386cb 100644
--- a/VECTO/GUI/VehicleForm.Designer.vb
+++ b/VECTO/GUI/VehicleForm.Designer.vb
@@ -78,14 +78,14 @@ Partial Class VehicleForm
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.ColumnHeader10 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader7 = New System.Windows.Forms.ColumnHeader()
+ Me.ColumnHeader8 = New System.Windows.Forms.ColumnHeader()
+ Me.ColumnHeader2 = New System.Windows.Forms.ColumnHeader()
+ Me.ColumnHeader9 = New System.Windows.Forms.ColumnHeader()
+ Me.ColumnHeader1 = New System.Windows.Forms.ColumnHeader()
+ Me.ColumnHeader3 = New System.Windows.Forms.ColumnHeader()
+ Me.ColumnHeader4 = New System.Windows.Forms.ColumnHeader()
+ Me.ColumnHeader10 = New 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()
@@ -125,6 +125,7 @@ Partial Class VehicleForm
Me.tbPTOCycle = New System.Windows.Forms.TextBox()
Me.tbPTOLossMap = New System.Windows.Forms.TextBox()
Me.tbPTODrive = New System.Windows.Forms.TextBox()
+ Me.tbPTOElectricCycle = New System.Windows.Forms.TextBox()
Me.tcVehicleComponents = New System.Windows.Forms.TabControl()
Me.tpGeneral = New System.Windows.Forms.TabPage()
Me.tpPowertrain = New System.Windows.Forms.TabPage()
@@ -142,8 +143,8 @@ Partial Class VehicleForm
Me.Label32 = New System.Windows.Forms.Label()
Me.gbRatiosPerGear = New System.Windows.Forms.GroupBox()
Me.lvRatioPerGear = New System.Windows.Forms.ListView()
- Me.ColumnHeader11 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
- Me.ColumnHeader12 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader11 = New System.Windows.Forms.ColumnHeader()
+ Me.ColumnHeader12 = New System.Windows.Forms.ColumnHeader()
Me.btnAddEMRatio = New System.Windows.Forms.Button()
Me.Label29 = New System.Windows.Forms.Label()
Me.btnRemoveEMRatio = New System.Windows.Forms.Button()
@@ -173,9 +174,9 @@ Partial Class VehicleForm
Me.tpReess = New System.Windows.Forms.TabPage()
Me.gbBattery = New System.Windows.Forms.GroupBox()
Me.lvREESSPacks = New System.Windows.Forms.ListView()
- Me.chReessPackPack = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
- Me.chReessPackCount = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
- Me.chReessPackStringId = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.chReessPackPack = New System.Windows.Forms.ColumnHeader()
+ Me.chReessPackCount = New System.Windows.Forms.ColumnHeader()
+ Me.chReessPackStringId = New System.Windows.Forms.ColumnHeader()
Me.btnAddReessPack = New System.Windows.Forms.Button()
Me.lblEditReessPack = New System.Windows.Forms.Label()
Me.btnRemoveReessPack = New System.Windows.Forms.Button()
@@ -207,8 +208,8 @@ Partial Class VehicleForm
Me.tbEmTorqueLimits = New System.Windows.Forms.TextBox()
Me.bgVehicleTorqueLimits = New System.Windows.Forms.GroupBox()
Me.lvTorqueLimits = New System.Windows.Forms.ListView()
- Me.ColumnHeader5 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
- Me.ColumnHeader6 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader5 = New System.Windows.Forms.ColumnHeader()
+ Me.ColumnHeader6 = New System.Windows.Forms.ColumnHeader()
Me.btAddMaxTorqueEntry = New System.Windows.Forms.Button()
Me.Label17 = New System.Windows.Forms.Label()
Me.btDelMaxTorqueEntry = New System.Windows.Forms.Button()
@@ -222,14 +223,15 @@ Partial Class VehicleForm
Me.cbEngineStopStart = New System.Windows.Forms.CheckBox()
Me.lblPCC = New System.Windows.Forms.Label()
Me.tpRoadSweeper = New System.Windows.Forms.TabPage()
- Me.lblNotePtoPEV_HEVS = New System.Windows.Forms.Label()
- Me.pnPTO = New System.Windows.Forms.Panel()
- Me.pnPtoMode1 = New System.Windows.Forms.Panel()
- Me.Label16 = New System.Windows.Forms.Label()
- Me.btPTOCycle = New System.Windows.Forms.Button()
- Me.pnPtoMode3 = New System.Windows.Forms.Panel()
+ Me.FlowLayoutPanel3 = New System.Windows.Forms.FlowLayoutPanel()
+ Me.Panel2 = New System.Windows.Forms.Panel()
+ Me.gbPTO = New System.Windows.Forms.GroupBox()
+ Me.pnPTO = New System.Windows.Forms.FlowLayoutPanel()
+ Me.GroupBox2 = New System.Windows.Forms.GroupBox()
+ Me.ComboBox1 = New System.Windows.Forms.ComboBox()
+ Me.gbPTOICEGroupBox = New System.Windows.Forms.GroupBox()
+ Me.pnPtoMode3 = New System.Windows.Forms.GroupBox()
Me.btPTOCycleDrive = New System.Windows.Forms.Button()
- Me.Label28 = New System.Windows.Forms.Label()
Me.gbPTODrive = New System.Windows.Forms.GroupBox()
Me.Label27 = New System.Windows.Forms.Label()
Me.tbPtoGear = New System.Windows.Forms.TextBox()
@@ -237,9 +239,14 @@ Partial Class VehicleForm
Me.tbPtoEngineSpeed = New System.Windows.Forms.TextBox()
Me.Label25 = New System.Windows.Forms.Label()
Me.Label24 = New System.Windows.Forms.Label()
+ Me.pnPtoMode1 = New System.Windows.Forms.GroupBox()
+ Me.btPTOCycle = New System.Windows.Forms.Button()
+ Me.gbPTOLossmap = New System.Windows.Forms.GroupBox()
Me.btPTOLossMapBrowse = New System.Windows.Forms.Button()
- Me.Label7 = New System.Windows.Forms.Label()
- Me.gbPTO = New System.Windows.Forms.GroupBox()
+ Me.gbEPTO = New System.Windows.Forms.GroupBox()
+ Me.GroupBox5 = New System.Windows.Forms.GroupBox()
+ Me.btnPTOelCycle = New System.Windows.Forms.Button()
+ Me.lblNotePtoPEV_HEVS = New System.Windows.Forms.Label()
Me.cbLegislativeClass = New System.Windows.Forms.ComboBox()
Me.Label21 = New System.Windows.Forms.Label()
Me.lblTitle = New System.Windows.Forms.Label()
@@ -287,83 +294,99 @@ Partial Class VehicleForm
Me.gbADAS.SuspendLayout()
Me.pnEcoRoll.SuspendLayout()
Me.tpRoadSweeper.SuspendLayout()
+ Me.FlowLayoutPanel3.SuspendLayout()
+ Me.Panel2.SuspendLayout()
+ Me.gbPTO.SuspendLayout()
Me.pnPTO.SuspendLayout()
- Me.pnPtoMode1.SuspendLayout()
+ Me.GroupBox2.SuspendLayout()
+ Me.gbPTOICEGroupBox.SuspendLayout()
Me.pnPtoMode3.SuspendLayout()
Me.gbPTODrive.SuspendLayout()
- Me.gbPTO.SuspendLayout()
+ Me.pnPtoMode1.SuspendLayout()
+ Me.gbPTOLossmap.SuspendLayout()
+ Me.gbEPTO.SuspendLayout()
+ Me.GroupBox5.SuspendLayout()
Me.SuspendLayout()
'
'Label1
'
Me.Label1.AutoSize = True
- Me.Label1.Location = New System.Drawing.Point(6, 22)
+ Me.Label1.Location = New System.Drawing.Point(7, 25)
+ Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label1.Name = "Label1"
- Me.Label1.Size = New System.Drawing.Size(177, 13)
+ Me.Label1.Size = New System.Drawing.Size(195, 15)
Me.Label1.TabIndex = 0
Me.Label1.Text = "Corrected Actual Curb Mass Vehicle"
'
'TbMass
'
- Me.TbMass.Location = New System.Drawing.Point(188, 19)
+ Me.TbMass.Location = New System.Drawing.Point(219, 22)
+ Me.TbMass.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.TbMass.Name = "TbMass"
- Me.TbMass.Size = New System.Drawing.Size(57, 20)
+ Me.TbMass.Size = New System.Drawing.Size(66, 23)
Me.TbMass.TabIndex = 0
'
'Label2
'
Me.Label2.AutoSize = True
- Me.Label2.Location = New System.Drawing.Point(128, 31)
+ Me.Label2.Location = New System.Drawing.Point(149, 36)
+ Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label2.Name = "Label2"
- Me.Label2.Size = New System.Drawing.Size(45, 13)
+ Me.Label2.Size = New System.Drawing.Size(50, 15)
Me.Label2.TabIndex = 2
Me.Label2.Text = "Loading"
'
'TbLoad
'
- Me.TbLoad.Location = New System.Drawing.Point(182, 28)
+ Me.TbLoad.Location = New System.Drawing.Point(212, 32)
+ Me.TbLoad.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.TbLoad.Name = "TbLoad"
- Me.TbLoad.Size = New System.Drawing.Size(57, 20)
+ Me.TbLoad.Size = New System.Drawing.Size(66, 23)
Me.TbLoad.TabIndex = 1
'
'Label3
'
Me.Label3.AutoSize = True
- Me.Label3.Location = New System.Drawing.Point(214, 10)
+ Me.Label3.Location = New System.Drawing.Point(250, 12)
+ Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label3.Name = "Label3"
- Me.Label3.Size = New System.Drawing.Size(38, 13)
+ Me.Label3.Size = New System.Drawing.Size(42, 15)
Me.Label3.TabIndex = 8
Me.Label3.Text = "Cd x A"
'
'TBcdA
'
- Me.TBcdA.Location = New System.Drawing.Point(258, 3)
+ Me.TBcdA.Location = New System.Drawing.Point(301, 3)
+ Me.TBcdA.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.TBcdA.Name = "TBcdA"
- Me.TBcdA.Size = New System.Drawing.Size(57, 20)
+ Me.TBcdA.Size = New System.Drawing.Size(66, 23)
Me.TBcdA.TabIndex = 0
'
'Label13
'
Me.Label13.AutoSize = True
- Me.Label13.Location = New System.Drawing.Point(136, 6)
+ Me.Label13.Location = New System.Drawing.Point(159, 7)
+ Me.Label13.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label13.Name = "Label13"
- Me.Label13.Size = New System.Drawing.Size(40, 13)
+ Me.Label13.Size = New System.Drawing.Size(42, 15)
Me.Label13.TabIndex = 6
Me.Label13.Text = "Radius"
'
'TBrdyn
'
- Me.TBrdyn.Location = New System.Drawing.Point(185, 3)
+ Me.TBrdyn.Location = New System.Drawing.Point(216, 3)
+ Me.TBrdyn.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.TBrdyn.Name = "TBrdyn"
- Me.TBrdyn.Size = New System.Drawing.Size(57, 20)
+ Me.TBrdyn.Size = New System.Drawing.Size(66, 23)
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(498, 577)
+ Me.ButOK.Location = New System.Drawing.Point(581, 666)
+ Me.ButOK.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.ButOK.Name = "ButOK"
- Me.ButOK.Size = New System.Drawing.Size(75, 23)
+ Me.ButOK.Size = New System.Drawing.Size(88, 27)
Me.ButOK.TabIndex = 6
Me.ButOK.Text = "Save"
Me.ButOK.UseVisualStyleBackColor = True
@@ -372,9 +395,10 @@ 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(579, 577)
+ Me.ButCancel.Location = New System.Drawing.Point(676, 666)
+ Me.ButCancel.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.ButCancel.Name = "ButCancel"
- Me.ButCancel.Size = New System.Drawing.Size(75, 23)
+ Me.ButCancel.Size = New System.Drawing.Size(88, 27)
Me.ButCancel.TabIndex = 7
Me.ButCancel.Text = "Cancel"
Me.ButCancel.UseVisualStyleBackColor = True
@@ -382,27 +406,30 @@ Partial Class VehicleForm
'Label14
'
Me.Label14.AutoSize = True
- Me.Label14.Location = New System.Drawing.Point(247, 22)
+ Me.Label14.Location = New System.Drawing.Point(288, 25)
+ Me.Label14.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label14.Name = "Label14"
- Me.Label14.Size = New System.Drawing.Size(25, 13)
+ Me.Label14.Size = New System.Drawing.Size(28, 15)
Me.Label14.TabIndex = 24
Me.Label14.Text = "[kg]"
'
'Label31
'
Me.Label31.AutoSize = True
- Me.Label31.Location = New System.Drawing.Point(241, 31)
+ Me.Label31.Location = New System.Drawing.Point(281, 36)
+ Me.Label31.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label31.Name = "Label31"
- Me.Label31.Size = New System.Drawing.Size(25, 13)
+ Me.Label31.Size = New System.Drawing.Size(28, 15)
Me.Label31.TabIndex = 24
Me.Label31.Text = "[kg]"
'
'Label35
'
Me.Label35.AutoSize = True
- Me.Label35.Location = New System.Drawing.Point(244, 6)
+ Me.Label35.Location = New System.Drawing.Point(285, 7)
+ Me.Label35.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label35.Name = "Label35"
- Me.Label35.Size = New System.Drawing.Size(29, 13)
+ Me.Label35.Size = New System.Drawing.Size(37, 15)
Me.Label35.TabIndex = 24
Me.Label35.Text = "[mm]"
'
@@ -414,9 +441,10 @@ 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(6, 19)
+ Me.CbCdMode.Location = New System.Drawing.Point(7, 22)
+ Me.CbCdMode.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.CbCdMode.Name = "CbCdMode"
- Me.CbCdMode.Size = New System.Drawing.Size(333, 21)
+ Me.CbCdMode.Size = New System.Drawing.Size(388, 23)
Me.CbCdMode.TabIndex = 0
Me.CbCdMode.ValueMember = "Key"
'
@@ -425,9 +453,10 @@ Partial Class VehicleForm
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(9, 65)
+ Me.TbCdFile.Location = New System.Drawing.Point(10, 75)
+ Me.TbCdFile.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.TbCdFile.Name = "TbCdFile"
- Me.TbCdFile.Size = New System.Drawing.Size(276, 20)
+ Me.TbCdFile.Size = New System.Drawing.Size(321, 23)
Me.TbCdFile.TabIndex = 1
'
'BtCdFileBrowse
@@ -435,9 +464,10 @@ Partial Class VehicleForm
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.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.BtCdFileBrowse.Location = New System.Drawing.Point(291, 62)
+ Me.BtCdFileBrowse.Location = New System.Drawing.Point(340, 72)
+ Me.BtCdFileBrowse.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.BtCdFileBrowse.Name = "BtCdFileBrowse"
- Me.BtCdFileBrowse.Size = New System.Drawing.Size(24, 24)
+ Me.BtCdFileBrowse.Size = New System.Drawing.Size(28, 28)
Me.BtCdFileBrowse.TabIndex = 2
Me.BtCdFileBrowse.UseVisualStyleBackColor = True
'
@@ -448,9 +478,11 @@ 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(293, 84)
+ Me.GroupBox6.Location = New System.Drawing.Point(342, 97)
+ Me.GroupBox6.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.GroupBox6.Name = "GroupBox6"
- Me.GroupBox6.Size = New System.Drawing.Size(346, 96)
+ Me.GroupBox6.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.GroupBox6.Size = New System.Drawing.Size(404, 111)
Me.GroupBox6.TabIndex = 3
Me.GroupBox6.TabStop = False
Me.GroupBox6.Text = "Cross Wind Correction"
@@ -460,18 +492,20 @@ Partial Class VehicleForm
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.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.BtCdFileOpen.Location = New System.Drawing.Point(315, 62)
+ Me.BtCdFileOpen.Location = New System.Drawing.Point(368, 72)
+ Me.BtCdFileOpen.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.BtCdFileOpen.Name = "BtCdFileOpen"
- Me.BtCdFileOpen.Size = New System.Drawing.Size(24, 24)
+ Me.BtCdFileOpen.Size = New System.Drawing.Size(28, 28)
Me.BtCdFileOpen.TabIndex = 3
Me.BtCdFileOpen.UseVisualStyleBackColor = True
'
'LbCdMode
'
Me.LbCdMode.AutoSize = True
- Me.LbCdMode.Location = New System.Drawing.Point(6, 47)
+ Me.LbCdMode.Location = New System.Drawing.Point(7, 54)
+ Me.LbCdMode.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.LbCdMode.Name = "LbCdMode"
- Me.LbCdMode.Size = New System.Drawing.Size(59, 13)
+ Me.LbCdMode.Size = New System.Drawing.Size(66, 15)
Me.LbCdMode.TabIndex = 28
Me.LbCdMode.Text = "LbCdMode"
Me.LbCdMode.TextAlign = System.Drawing.ContentAlignment.TopRight
@@ -484,7 +518,7 @@ Partial Class VehicleForm
Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
Me.ToolStrip1.Name = "ToolStrip1"
Me.ToolStrip1.Padding = New System.Windows.Forms.Padding(0, 0, 2, 0)
- Me.ToolStrip1.Size = New System.Drawing.Size(666, 31)
+ Me.ToolStrip1.Size = New System.Drawing.Size(777, 31)
Me.ToolStrip1.TabIndex = 29
Me.ToolStrip1.Text = "ToolStrip1"
'
@@ -561,9 +595,11 @@ Partial Class VehicleForm
'
Me.gbRetarderLosses.Controls.Add(Me.PnRt)
Me.gbRetarderLosses.Controls.Add(Me.CbRtType)
- Me.gbRetarderLosses.Location = New System.Drawing.Point(6, 76)
+ Me.gbRetarderLosses.Location = New System.Drawing.Point(7, 88)
+ Me.gbRetarderLosses.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.gbRetarderLosses.Name = "gbRetarderLosses"
- Me.gbRetarderLosses.Size = New System.Drawing.Size(310, 111)
+ Me.gbRetarderLosses.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.gbRetarderLosses.Size = New System.Drawing.Size(362, 128)
Me.gbRetarderLosses.TabIndex = 1
Me.gbRetarderLosses.TabStop = False
Me.gbRetarderLosses.Text = "Retarder Losses"
@@ -579,18 +615,20 @@ 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(3, 42)
+ Me.PnRt.Location = New System.Drawing.Point(4, 48)
+ Me.PnRt.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.PnRt.Name = "PnRt"
- Me.PnRt.Size = New System.Drawing.Size(299, 63)
+ Me.PnRt.Size = New System.Drawing.Size(349, 73)
Me.PnRt.TabIndex = 1
'
'Label15
'
Me.Label15.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.Label15.Location = New System.Drawing.Point(2, 23)
+ Me.Label15.Location = New System.Drawing.Point(2, 27)
+ Me.Label15.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label15.Name = "Label15"
- Me.Label15.Size = New System.Drawing.Size(232, 16)
+ Me.Label15.Size = New System.Drawing.Size(271, 18)
Me.Label15.TabIndex = 15
Me.Label15.Text = "Retarder Loss Map"
Me.Label15.TextAlign = System.Drawing.ContentAlignment.BottomLeft
@@ -599,9 +637,10 @@ Partial Class VehicleForm
'
Me.BtRtBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.BtRtBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.BtRtBrowse.Location = New System.Drawing.Point(272, 37)
+ Me.BtRtBrowse.Location = New System.Drawing.Point(317, 43)
+ Me.BtRtBrowse.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.BtRtBrowse.Name = "BtRtBrowse"
- Me.BtRtBrowse.Size = New System.Drawing.Size(24, 24)
+ Me.BtRtBrowse.Size = New System.Drawing.Size(28, 28)
Me.BtRtBrowse.TabIndex = 2
Me.BtRtBrowse.UseVisualStyleBackColor = True
'
@@ -609,27 +648,30 @@ Partial Class VehicleForm
'
Me.TbRtPath.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.TbRtPath.Location = New System.Drawing.Point(3, 39)
+ Me.TbRtPath.Location = New System.Drawing.Point(4, 45)
+ Me.TbRtPath.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.TbRtPath.Name = "TbRtPath"
- Me.TbRtPath.Size = New System.Drawing.Size(269, 20)
+ Me.TbRtPath.Size = New System.Drawing.Size(313, 23)
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(263, 5)
+ Me.Label45.Location = New System.Drawing.Point(307, 6)
+ Me.Label45.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label45.Name = "Label45"
- Me.Label45.Size = New System.Drawing.Size(16, 13)
+ Me.Label45.Size = New System.Drawing.Size(20, 15)
Me.Label45.TabIndex = 10
Me.Label45.Text = "[-]"
'
'LbRtRatio
'
Me.LbRtRatio.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.LbRtRatio.Location = New System.Drawing.Point(35, 5)
+ Me.LbRtRatio.Location = New System.Drawing.Point(41, 6)
+ Me.LbRtRatio.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.LbRtRatio.Name = "LbRtRatio"
- Me.LbRtRatio.Size = New System.Drawing.Size(167, 17)
+ Me.LbRtRatio.Size = New System.Drawing.Size(195, 20)
Me.LbRtRatio.TabIndex = 1
Me.LbRtRatio.Text = "Ratio"
Me.LbRtRatio.TextAlign = System.Drawing.ContentAlignment.TopRight
@@ -637,9 +679,10 @@ 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(205, 3)
+ Me.TbRtRatio.Location = New System.Drawing.Point(239, 3)
+ Me.TbRtRatio.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.TbRtRatio.Name = "TbRtRatio"
- Me.TbRtRatio.Size = New System.Drawing.Size(56, 20)
+ Me.TbRtRatio.Size = New System.Drawing.Size(65, 23)
Me.TbRtRatio.TabIndex = 0
'
'CbRtType
@@ -649,35 +692,39 @@ Partial Class VehicleForm
Me.CbRtType.DisplayMember = "Value"
Me.CbRtType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
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.Location = New System.Drawing.Point(7, 22)
+ Me.CbRtType.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.CbRtType.Name = "CbRtType"
- Me.CbRtType.Size = New System.Drawing.Size(297, 21)
+ Me.CbRtType.Size = New System.Drawing.Size(346, 23)
Me.CbRtType.TabIndex = 0
Me.CbRtType.ValueMember = "Key"
'
'Label46
'
Me.Label46.AutoSize = True
- Me.Label46.Location = New System.Drawing.Point(32, 5)
+ Me.Label46.Location = New System.Drawing.Point(37, 6)
+ Me.Label46.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label46.Name = "Label46"
- Me.Label46.Size = New System.Drawing.Size(145, 13)
+ Me.Label46.Size = New System.Drawing.Size(158, 15)
Me.Label46.TabIndex = 31
Me.Label46.Text = "Curb Mass Extra Trailer/Body"
'
'Label50
'
Me.Label50.AutoSize = True
- Me.Label50.Location = New System.Drawing.Point(241, 5)
+ Me.Label50.Location = New System.Drawing.Point(281, 6)
+ Me.Label50.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label50.Name = "Label50"
- Me.Label50.Size = New System.Drawing.Size(25, 13)
+ Me.Label50.Size = New System.Drawing.Size(28, 15)
Me.Label50.TabIndex = 24
Me.Label50.Text = "[kg]"
'
'TbMassExtra
'
- Me.TbMassExtra.Location = New System.Drawing.Point(182, 2)
+ Me.TbMassExtra.Location = New System.Drawing.Point(212, 2)
+ Me.TbMassExtra.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.TbMassExtra.Name = "TbMassExtra"
- Me.TbMassExtra.Size = New System.Drawing.Size(57, 20)
+ Me.TbMassExtra.Size = New System.Drawing.Size(66, 23)
Me.TbMassExtra.TabIndex = 0
'
'GroupBox8
@@ -686,9 +733,11 @@ Partial Class VehicleForm
Me.GroupBox8.Controls.Add(Me.ButAxlRem)
Me.GroupBox8.Controls.Add(Me.LvRRC)
Me.GroupBox8.Controls.Add(Me.ButAxlAdd)
- Me.GroupBox8.Location = New System.Drawing.Point(6, 186)
+ Me.GroupBox8.Location = New System.Drawing.Point(7, 215)
+ Me.GroupBox8.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.GroupBox8.Name = "GroupBox8"
- Me.GroupBox8.Size = New System.Drawing.Size(633, 182)
+ Me.GroupBox8.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.GroupBox8.Size = New System.Drawing.Size(738, 210)
Me.GroupBox8.TabIndex = 4
Me.GroupBox8.TabStop = False
Me.GroupBox8.Text = "Axles / Wheels"
@@ -697,9 +746,10 @@ Partial Class VehicleForm
'
Me.Label6.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.Label6.AutoSize = True
- Me.Label6.Location = New System.Drawing.Point(525, 152)
+ Me.Label6.Location = New System.Drawing.Point(612, 175)
+ Me.Label6.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label6.Name = "Label6"
- Me.Label6.Size = New System.Drawing.Size(106, 13)
+ Me.Label6.Size = New System.Drawing.Size(121, 15)
Me.Label6.TabIndex = 3
Me.Label6.Text = "(Double-Click to Edit)"
'
@@ -707,9 +757,10 @@ Partial Class VehicleForm
'
Me.ButAxlRem.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.ButAxlRem.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
- Me.ButAxlRem.Location = New System.Drawing.Point(29, 151)
+ Me.ButAxlRem.Location = New System.Drawing.Point(34, 174)
+ Me.ButAxlRem.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.ButAxlRem.Name = "ButAxlRem"
- Me.ButAxlRem.Size = New System.Drawing.Size(24, 24)
+ Me.ButAxlRem.Size = New System.Drawing.Size(28, 28)
Me.ButAxlRem.TabIndex = 2
Me.ButAxlRem.UseVisualStyleBackColor = True
'
@@ -721,11 +772,11 @@ Partial Class VehicleForm
Me.LvRRC.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader7, Me.ColumnHeader8, Me.ColumnHeader2, Me.ColumnHeader9, Me.ColumnHeader1, Me.ColumnHeader3, Me.ColumnHeader4, Me.ColumnHeader10})
Me.LvRRC.FullRowSelect = True
Me.LvRRC.GridLines = True
- Me.LvRRC.HideSelection = False
- Me.LvRRC.Location = New System.Drawing.Point(6, 19)
+ Me.LvRRC.Location = New System.Drawing.Point(7, 22)
+ Me.LvRRC.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.LvRRC.MultiSelect = False
Me.LvRRC.Name = "LvRRC"
- Me.LvRRC.Size = New System.Drawing.Size(621, 131)
+ Me.LvRRC.Size = New System.Drawing.Size(724, 151)
Me.LvRRC.TabIndex = 0
Me.LvRRC.TabStop = False
Me.LvRRC.UseCompatibleStateImageBehavior = False
@@ -774,9 +825,10 @@ Partial Class VehicleForm
'
Me.ButAxlAdd.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.ButAxlAdd.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
- Me.ButAxlAdd.Location = New System.Drawing.Point(5, 151)
+ Me.ButAxlAdd.Location = New System.Drawing.Point(6, 174)
+ Me.ButAxlAdd.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.ButAxlAdd.Name = "ButAxlAdd"
- Me.ButAxlAdd.Size = New System.Drawing.Size(24, 24)
+ Me.ButAxlAdd.Size = New System.Drawing.Size(28, 28)
Me.ButAxlAdd.TabIndex = 1
Me.ButAxlAdd.UseVisualStyleBackColor = True
'
@@ -786,9 +838,10 @@ 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(3, 16)
+ Me.PnWheelDiam.Location = New System.Drawing.Point(4, 19)
+ Me.PnWheelDiam.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.PnWheelDiam.Name = "PnWheelDiam"
- Me.PnWheelDiam.Size = New System.Drawing.Size(272, 31)
+ Me.PnWheelDiam.Size = New System.Drawing.Size(316, 36)
Me.PnWheelDiam.TabIndex = 0
'
'CbAxleConfig
@@ -797,9 +850,10 @@ 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(153, 80)
+ Me.CbAxleConfig.Location = New System.Drawing.Point(178, 92)
+ Me.CbAxleConfig.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.CbAxleConfig.Name = "CbAxleConfig"
- Me.CbAxleConfig.Size = New System.Drawing.Size(60, 21)
+ Me.CbAxleConfig.Size = New System.Drawing.Size(69, 23)
Me.CbAxleConfig.TabIndex = 1
Me.CbAxleConfig.ValueMember = "Key"
'
@@ -809,45 +863,50 @@ 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(12, 80)
+ Me.CbCat.Location = New System.Drawing.Point(14, 92)
+ Me.CbCat.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.CbCat.Name = "CbCat"
- Me.CbCat.Size = New System.Drawing.Size(135, 21)
+ Me.CbCat.Size = New System.Drawing.Size(157, 23)
Me.CbCat.TabIndex = 0
Me.CbCat.ValueMember = "Key"
'
'Label5
'
Me.Label5.AutoSize = True
- Me.Label5.Location = New System.Drawing.Point(31, 108)
+ Me.Label5.Location = New System.Drawing.Point(36, 125)
+ Me.Label5.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label5.Name = "Label5"
- Me.Label5.Size = New System.Drawing.Size(116, 13)
+ Me.Label5.Size = New System.Drawing.Size(128, 15)
Me.Label5.TabIndex = 2
Me.Label5.Text = "Technically Permissible"
'
'Label9
'
Me.Label9.AutoSize = True
- Me.Label9.Location = New System.Drawing.Point(197, 114)
+ Me.Label9.Location = New System.Drawing.Point(230, 132)
+ Me.Label9.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label9.Name = "Label9"
- Me.Label9.Size = New System.Drawing.Size(16, 13)
+ Me.Label9.Size = New System.Drawing.Size(19, 15)
Me.Label9.TabIndex = 3
Me.Label9.Text = "[t]"
Me.Label9.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
'
'TbMassMass
'
- Me.TbMassMass.Location = New System.Drawing.Point(153, 111)
+ Me.TbMassMass.Location = New System.Drawing.Point(178, 128)
+ Me.TbMassMass.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.TbMassMass.Name = "TbMassMass"
- Me.TbMassMass.Size = New System.Drawing.Size(42, 20)
+ Me.TbMassMass.Size = New System.Drawing.Size(48, 23)
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, 603)
+ Me.StatusStrip1.Location = New System.Drawing.Point(0, 699)
Me.StatusStrip1.Name = "StatusStrip1"
- Me.StatusStrip1.Size = New System.Drawing.Size(666, 22)
+ Me.StatusStrip1.Padding = New System.Windows.Forms.Padding(1, 0, 16, 0)
+ Me.StatusStrip1.Size = New System.Drawing.Size(777, 22)
Me.StatusStrip1.SizingGrip = False
Me.StatusStrip1.TabIndex = 36
Me.StatusStrip1.Text = "StatusStrip1"
@@ -860,10 +919,11 @@ Partial Class VehicleForm
'
'TbHDVclass
'
- Me.TbHDVclass.Location = New System.Drawing.Point(153, 141)
+ Me.TbHDVclass.Location = New System.Drawing.Point(178, 163)
+ Me.TbHDVclass.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.TbHDVclass.Name = "TbHDVclass"
Me.TbHDVclass.ReadOnly = True
- Me.TbHDVclass.Size = New System.Drawing.Size(42, 20)
+ Me.TbHDVclass.Size = New System.Drawing.Size(48, 23)
Me.TbHDVclass.TabIndex = 3
Me.TbHDVclass.TabStop = False
Me.TbHDVclass.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
@@ -874,9 +934,11 @@ Partial Class VehicleForm
Me.GroupBox1.Controls.Add(Me.TbMass)
Me.GroupBox1.Controls.Add(Me.Label1)
Me.GroupBox1.Controls.Add(Me.Label14)
- Me.GroupBox1.Location = New System.Drawing.Point(6, 6)
+ Me.GroupBox1.Location = New System.Drawing.Point(7, 7)
+ Me.GroupBox1.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.GroupBox1.Name = "GroupBox1"
- Me.GroupBox1.Size = New System.Drawing.Size(278, 118)
+ Me.GroupBox1.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.GroupBox1.Size = New System.Drawing.Size(324, 136)
Me.GroupBox1.TabIndex = 0
Me.GroupBox1.TabStop = False
Me.GroupBox1.Text = "Masses / Loading"
@@ -889,17 +951,20 @@ 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(6, 43)
+ Me.PnLoad.Location = New System.Drawing.Point(7, 50)
+ Me.PnLoad.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.PnLoad.Name = "PnLoad"
- Me.PnLoad.Size = New System.Drawing.Size(269, 58)
+ Me.PnLoad.Size = New System.Drawing.Size(314, 67)
Me.PnLoad.TabIndex = 1
'
'GrAirRes
'
Me.GrAirRes.Controls.Add(Me.PnCdATrTr)
- Me.GrAirRes.Location = New System.Drawing.Point(290, 6)
+ Me.GrAirRes.Location = New System.Drawing.Point(338, 7)
+ Me.GrAirRes.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.GrAirRes.Name = "GrAirRes"
- Me.GrAirRes.Size = New System.Drawing.Size(349, 72)
+ Me.GrAirRes.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.GrAirRes.Size = New System.Drawing.Size(407, 83)
Me.GrAirRes.TabIndex = 2
Me.GrAirRes.TabStop = False
Me.GrAirRes.Text = "Air Resistance"
@@ -913,42 +978,47 @@ 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(3, 16)
+ Me.PnCdATrTr.Location = New System.Drawing.Point(4, 19)
+ Me.PnCdATrTr.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.PnCdATrTr.Name = "PnCdATrTr"
- Me.PnCdATrTr.Size = New System.Drawing.Size(343, 53)
+ Me.PnCdATrTr.Size = New System.Drawing.Size(399, 61)
Me.PnCdATrTr.TabIndex = 0
'
'tbVehicleHeight
'
- Me.tbVehicleHeight.Location = New System.Drawing.Point(258, 29)
+ Me.tbVehicleHeight.Location = New System.Drawing.Point(301, 33)
+ Me.tbVehicleHeight.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbVehicleHeight.Name = "tbVehicleHeight"
- Me.tbVehicleHeight.Size = New System.Drawing.Size(57, 20)
+ Me.tbVehicleHeight.Size = New System.Drawing.Size(66, 23)
Me.tbVehicleHeight.TabIndex = 1
'
'Label11
'
Me.Label11.AutoSize = True
- Me.Label11.Location = New System.Drawing.Point(321, 32)
+ Me.Label11.Location = New System.Drawing.Point(374, 37)
+ Me.Label11.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label11.Name = "Label11"
- Me.Label11.Size = New System.Drawing.Size(21, 13)
+ Me.Label11.Size = New System.Drawing.Size(26, 15)
Me.Label11.TabIndex = 27
Me.Label11.Text = "[m]"
'
'Label20
'
Me.Label20.AutoSize = True
- Me.Label20.Location = New System.Drawing.Point(151, 32)
+ Me.Label20.Location = New System.Drawing.Point(176, 37)
+ Me.Label20.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label20.Name = "Label20"
- Me.Label20.Size = New System.Drawing.Size(102, 13)
+ Me.Label20.Size = New System.Drawing.Size(112, 15)
Me.Label20.TabIndex = 26
Me.Label20.Text = "Max. Vehicle Height"
'
'Label38
'
Me.Label38.AutoSize = True
- Me.Label38.Location = New System.Drawing.Point(321, 6)
+ Me.Label38.Location = New System.Drawing.Point(374, 7)
+ Me.Label38.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label38.Name = "Label38"
- Me.Label38.Size = New System.Drawing.Size(24, 13)
+ Me.Label38.Size = New System.Drawing.Size(30, 15)
Me.Label38.TabIndex = 24
Me.Label38.Text = "[m²]"
'
@@ -956,9 +1026,10 @@ Partial Class VehicleForm
'
Me.PictureBox1.BackColor = System.Drawing.Color.White
Me.PictureBox1.Image = Global.TUGraz.VECTO.My.Resources.Resources.VECTO_Mainform
- Me.PictureBox1.Location = New System.Drawing.Point(0, 28)
+ Me.PictureBox1.Location = New System.Drawing.Point(0, 32)
+ Me.PictureBox1.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.PictureBox1.Name = "PictureBox1"
- Me.PictureBox1.Size = New System.Drawing.Size(666, 40)
+ Me.PictureBox1.Size = New System.Drawing.Size(777, 46)
Me.PictureBox1.TabIndex = 37
Me.PictureBox1.TabStop = False
'
@@ -985,9 +1056,11 @@ Partial Class VehicleForm
'GroupBox3
'
Me.GroupBox3.Controls.Add(Me.PnWheelDiam)
- Me.GroupBox3.Location = New System.Drawing.Point(6, 130)
+ Me.GroupBox3.Location = New System.Drawing.Point(7, 150)
+ Me.GroupBox3.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.GroupBox3.Name = "GroupBox3"
- Me.GroupBox3.Size = New System.Drawing.Size(278, 50)
+ Me.GroupBox3.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.GroupBox3.Size = New System.Drawing.Size(324, 58)
Me.GroupBox3.TabIndex = 1
Me.GroupBox3.TabStop = False
Me.GroupBox3.Text = "Dynamic Tyre Radius"
@@ -996,9 +1069,11 @@ Partial Class VehicleForm
'
Me.gbAngledrive.Controls.Add(Me.pnAngledriveFields)
Me.gbAngledrive.Controls.Add(Me.cbAngledriveType)
- Me.gbAngledrive.Location = New System.Drawing.Point(329, 76)
+ Me.gbAngledrive.Location = New System.Drawing.Point(384, 88)
+ Me.gbAngledrive.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.gbAngledrive.Name = "gbAngledrive"
- Me.gbAngledrive.Size = New System.Drawing.Size(313, 111)
+ Me.gbAngledrive.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.gbAngledrive.Size = New System.Drawing.Size(365, 128)
Me.gbAngledrive.TabIndex = 3
Me.gbAngledrive.TabStop = False
Me.gbAngledrive.Text = "Angledrive"
@@ -1014,27 +1089,30 @@ Partial Class VehicleForm
Me.pnAngledriveFields.Controls.Add(Me.btAngledriveLossMapBrowse)
Me.pnAngledriveFields.Controls.Add(Me.tbAngledriveLossMapPath)
Me.pnAngledriveFields.Controls.Add(Me.Label12)
- Me.pnAngledriveFields.Location = New System.Drawing.Point(3, 42)
+ Me.pnAngledriveFields.Location = New System.Drawing.Point(4, 48)
+ Me.pnAngledriveFields.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.pnAngledriveFields.Name = "pnAngledriveFields"
- Me.pnAngledriveFields.Size = New System.Drawing.Size(303, 63)
+ Me.pnAngledriveFields.Size = New System.Drawing.Size(354, 73)
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(277, 6)
+ Me.Label4.Location = New System.Drawing.Point(323, 7)
+ Me.Label4.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label4.Name = "Label4"
- Me.Label4.Size = New System.Drawing.Size(16, 13)
+ Me.Label4.Size = New System.Drawing.Size(20, 15)
Me.Label4.TabIndex = 16
Me.Label4.Text = "[-]"
'
'Label10
'
Me.Label10.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.Label10.Location = New System.Drawing.Point(170, 6)
+ Me.Label10.Location = New System.Drawing.Point(198, 7)
+ Me.Label10.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label10.Name = "Label10"
- Me.Label10.Size = New System.Drawing.Size(44, 18)
+ Me.Label10.Size = New System.Drawing.Size(51, 21)
Me.Label10.TabIndex = 15
Me.Label10.Text = "Ratio"
Me.Label10.TextAlign = System.Drawing.ContentAlignment.TopRight
@@ -1042,18 +1120,20 @@ 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(219, 4)
+ Me.tbAngledriveRatio.Location = New System.Drawing.Point(255, 5)
+ Me.tbAngledriveRatio.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbAngledriveRatio.Name = "tbAngledriveRatio"
- Me.tbAngledriveRatio.Size = New System.Drawing.Size(56, 20)
+ Me.tbAngledriveRatio.Size = New System.Drawing.Size(65, 23)
Me.tbAngledriveRatio.TabIndex = 0
'
'btAngledriveLossMapBrowse
'
Me.btAngledriveLossMapBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.btAngledriveLossMapBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btAngledriveLossMapBrowse.Location = New System.Drawing.Point(276, 39)
+ Me.btAngledriveLossMapBrowse.Location = New System.Drawing.Point(322, 45)
+ Me.btAngledriveLossMapBrowse.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btAngledriveLossMapBrowse.Name = "btAngledriveLossMapBrowse"
- Me.btAngledriveLossMapBrowse.Size = New System.Drawing.Size(24, 24)
+ Me.btAngledriveLossMapBrowse.Size = New System.Drawing.Size(28, 28)
Me.btAngledriveLossMapBrowse.TabIndex = 2
Me.btAngledriveLossMapBrowse.UseVisualStyleBackColor = True
'
@@ -1061,18 +1141,20 @@ Partial Class VehicleForm
'
Me.tbAngledriveLossMapPath.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.tbAngledriveLossMapPath.Location = New System.Drawing.Point(3, 41)
+ Me.tbAngledriveLossMapPath.Location = New System.Drawing.Point(4, 47)
+ Me.tbAngledriveLossMapPath.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbAngledriveLossMapPath.Name = "tbAngledriveLossMapPath"
- Me.tbAngledriveLossMapPath.Size = New System.Drawing.Size(273, 20)
+ Me.tbAngledriveLossMapPath.Size = New System.Drawing.Size(318, 23)
Me.tbAngledriveLossMapPath.TabIndex = 1
'
'Label12
'
Me.Label12.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.Label12.Location = New System.Drawing.Point(0, 24)
+ Me.Label12.Location = New System.Drawing.Point(0, 28)
+ Me.Label12.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label12.Name = "Label12"
- Me.Label12.Size = New System.Drawing.Size(294, 16)
+ Me.Label12.Size = New System.Drawing.Size(343, 18)
Me.Label12.TabIndex = 17
Me.Label12.Text = "Transmission Loss Map or Efficiency Value [0..1]"
Me.Label12.TextAlign = System.Drawing.ContentAlignment.BottomLeft
@@ -1083,9 +1165,10 @@ Partial Class VehicleForm
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.cbAngledriveType.DisplayMember = "Value"
Me.cbAngledriveType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
- Me.cbAngledriveType.Location = New System.Drawing.Point(6, 19)
+ Me.cbAngledriveType.Location = New System.Drawing.Point(7, 22)
+ Me.cbAngledriveType.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.cbAngledriveType.Name = "cbAngledriveType"
- Me.cbAngledriveType.Size = New System.Drawing.Size(297, 21)
+ Me.cbAngledriveType.Size = New System.Drawing.Size(346, 23)
Me.cbAngledriveType.TabIndex = 0
Me.cbAngledriveType.ValueMember = "Key"
'
@@ -1093,9 +1176,10 @@ Partial Class VehicleForm
'
Me.PicVehicle.BackColor = System.Drawing.Color.LightGray
Me.PicVehicle.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
- Me.PicVehicle.Location = New System.Drawing.Point(281, 70)
+ Me.PicVehicle.Location = New System.Drawing.Point(328, 81)
+ Me.PicVehicle.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.PicVehicle.Name = "PicVehicle"
- Me.PicVehicle.Size = New System.Drawing.Size(300, 88)
+ Me.PicVehicle.Size = New System.Drawing.Size(350, 101)
Me.PicVehicle.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
Me.PicVehicle.TabIndex = 39
Me.PicVehicle.TabStop = False
@@ -1103,49 +1187,66 @@ Partial Class VehicleForm
'Label8
'
Me.Label8.AutoSize = True
- Me.Label8.Location = New System.Drawing.Point(85, 144)
+ Me.Label8.Location = New System.Drawing.Point(99, 166)
+ Me.Label8.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label8.Name = "Label8"
- Me.Label8.Size = New System.Drawing.Size(62, 13)
+ Me.Label8.Size = New System.Drawing.Size(67, 15)
Me.Label8.TabIndex = 10
Me.Label8.Text = "HDV Group"
'
'cbPTOType
'
- Me.cbPTOType.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.cbPTOType.DisplayMember = "Value"
+ Me.cbPTOType.Dock = System.Windows.Forms.DockStyle.Fill
Me.cbPTOType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
- Me.cbPTOType.Location = New System.Drawing.Point(6, 24)
+ Me.cbPTOType.Location = New System.Drawing.Point(4, 20)
+ Me.cbPTOType.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.cbPTOType.Name = "cbPTOType"
- Me.cbPTOType.Size = New System.Drawing.Size(619, 21)
+ Me.cbPTOType.Size = New System.Drawing.Size(551, 23)
Me.cbPTOType.TabIndex = 0
Me.ToolTip1.SetToolTip(Me.cbPTOType, "Transmission type to the PTO consumer")
Me.cbPTOType.ValueMember = "Key"
'
'tbPTOCycle
'
- Me.tbPTOCycle.Location = New System.Drawing.Point(6, 23)
+ Me.tbPTOCycle.Dock = System.Windows.Forms.DockStyle.Left
+ Me.tbPTOCycle.Location = New System.Drawing.Point(4, 19)
+ Me.tbPTOCycle.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbPTOCycle.Name = "tbPTOCycle"
- Me.tbPTOCycle.Size = New System.Drawing.Size(430, 20)
+ Me.tbPTOCycle.Size = New System.Drawing.Size(501, 23)
Me.tbPTOCycle.TabIndex = 2
Me.ToolTip1.SetToolTip(Me.tbPTOCycle, "PTO Consumer Loss Map")
'
'tbPTOLossMap
'
- Me.tbPTOLossMap.Location = New System.Drawing.Point(6, 24)
+ Me.tbPTOLossMap.Dock = System.Windows.Forms.DockStyle.Left
+ Me.tbPTOLossMap.Location = New System.Drawing.Point(3, 19)
+ Me.tbPTOLossMap.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbPTOLossMap.Name = "tbPTOLossMap"
- Me.tbPTOLossMap.Size = New System.Drawing.Size(430, 20)
+ Me.tbPTOLossMap.Size = New System.Drawing.Size(501, 23)
Me.tbPTOLossMap.TabIndex = 0
Me.ToolTip1.SetToolTip(Me.tbPTOLossMap, "PTO Consumer Loss Map")
'
'tbPTODrive
'
- Me.tbPTODrive.Location = New System.Drawing.Point(3, 21)
+ Me.tbPTODrive.Dock = System.Windows.Forms.DockStyle.Left
+ Me.tbPTODrive.Location = New System.Drawing.Point(4, 19)
+ Me.tbPTODrive.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbPTODrive.Name = "tbPTODrive"
- Me.tbPTODrive.Size = New System.Drawing.Size(430, 20)
+ Me.tbPTODrive.Size = New System.Drawing.Size(501, 23)
Me.tbPTODrive.TabIndex = 5
Me.ToolTip1.SetToolTip(Me.tbPTODrive, "PTO Consumer Loss Map")
'
+ 'tbPTOElectricCycle
+ '
+ Me.tbPTOElectricCycle.Dock = System.Windows.Forms.DockStyle.Left
+ Me.tbPTOElectricCycle.Location = New System.Drawing.Point(4, 19)
+ Me.tbPTOElectricCycle.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.tbPTOElectricCycle.Name = "tbPTOElectricCycle"
+ Me.tbPTOElectricCycle.Size = New System.Drawing.Size(501, 23)
+ Me.tbPTOElectricCycle.TabIndex = 7
+ Me.ToolTip1.SetToolTip(Me.tbPTOElectricCycle, "PTO Consumer Loss Map")
+ '
'tcVehicleComponents
'
Me.tcVehicleComponents.Controls.Add(Me.tpGeneral)
@@ -1158,10 +1259,11 @@ 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(5, 173)
+ Me.tcVehicleComponents.Location = New System.Drawing.Point(6, 200)
+ Me.tcVehicleComponents.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tcVehicleComponents.Name = "tcVehicleComponents"
Me.tcVehicleComponents.SelectedIndex = 0
- Me.tcVehicleComponents.Size = New System.Drawing.Size(656, 400)
+ Me.tcVehicleComponents.Size = New System.Drawing.Size(765, 462)
Me.tcVehicleComponents.TabIndex = 5
'
'tpGeneral
@@ -1171,10 +1273,11 @@ 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, 22)
+ Me.tpGeneral.Location = New System.Drawing.Point(4, 24)
+ Me.tpGeneral.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tpGeneral.Name = "tpGeneral"
- Me.tpGeneral.Padding = New System.Windows.Forms.Padding(3)
- Me.tpGeneral.Size = New System.Drawing.Size(648, 374)
+ Me.tpGeneral.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.tpGeneral.Size = New System.Drawing.Size(757, 434)
Me.tpGeneral.TabIndex = 0
Me.tpGeneral.Text = "General"
Me.tpGeneral.UseVisualStyleBackColor = True
@@ -1185,10 +1288,11 @@ Partial Class VehicleForm
Me.tpPowertrain.Controls.Add(Me.gbTankSystem)
Me.tpPowertrain.Controls.Add(Me.gbRetarderLosses)
Me.tpPowertrain.Controls.Add(Me.gbAngledrive)
- Me.tpPowertrain.Location = New System.Drawing.Point(4, 22)
+ Me.tpPowertrain.Location = New System.Drawing.Point(4, 24)
+ Me.tpPowertrain.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tpPowertrain.Name = "tpPowertrain"
- Me.tpPowertrain.Padding = New System.Windows.Forms.Padding(3)
- Me.tpPowertrain.Size = New System.Drawing.Size(648, 374)
+ Me.tpPowertrain.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.tpPowertrain.Size = New System.Drawing.Size(757, 434)
Me.tpPowertrain.TabIndex = 1
Me.tpPowertrain.Text = "Powertrain"
Me.tpPowertrain.UseVisualStyleBackColor = True
@@ -1196,9 +1300,11 @@ Partial Class VehicleForm
'gbVehicleIdlingSpeed
'
Me.gbVehicleIdlingSpeed.Controls.Add(Me.Panel1)
- Me.gbVehicleIdlingSpeed.Location = New System.Drawing.Point(6, 6)
+ Me.gbVehicleIdlingSpeed.Location = New System.Drawing.Point(7, 7)
+ Me.gbVehicleIdlingSpeed.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.gbVehicleIdlingSpeed.Name = "gbVehicleIdlingSpeed"
- Me.gbVehicleIdlingSpeed.Size = New System.Drawing.Size(310, 63)
+ Me.gbVehicleIdlingSpeed.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.gbVehicleIdlingSpeed.Size = New System.Drawing.Size(362, 73)
Me.gbVehicleIdlingSpeed.TabIndex = 0
Me.gbVehicleIdlingSpeed.TabStop = False
Me.gbVehicleIdlingSpeed.Text = "Vehicle Idling Speed"
@@ -1209,33 +1315,37 @@ 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(3, 16)
+ Me.Panel1.Location = New System.Drawing.Point(4, 19)
+ Me.Panel1.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.Panel1.Name = "Panel1"
- Me.Panel1.Size = New System.Drawing.Size(304, 44)
+ Me.Panel1.Size = New System.Drawing.Size(354, 51)
Me.Panel1.TabIndex = 0
'
'tbVehIdlingSpeed
'
- Me.tbVehIdlingSpeed.Location = New System.Drawing.Point(205, 4)
+ Me.tbVehIdlingSpeed.Location = New System.Drawing.Point(239, 5)
+ Me.tbVehIdlingSpeed.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbVehIdlingSpeed.Name = "tbVehIdlingSpeed"
- Me.tbVehIdlingSpeed.Size = New System.Drawing.Size(56, 20)
+ Me.tbVehIdlingSpeed.Size = New System.Drawing.Size(65, 23)
Me.tbVehIdlingSpeed.TabIndex = 0
'
'Label18
'
Me.Label18.AutoSize = True
- Me.Label18.Location = New System.Drawing.Point(264, 7)
+ Me.Label18.Location = New System.Drawing.Point(308, 8)
+ Me.Label18.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label18.Name = "Label18"
- Me.Label18.Size = New System.Drawing.Size(30, 13)
+ Me.Label18.Size = New System.Drawing.Size(37, 15)
Me.Label18.TabIndex = 24
Me.Label18.Text = "[rpm]"
'
'Label19
'
Me.Label19.AutoSize = True
- Me.Label19.Location = New System.Drawing.Point(104, 7)
+ Me.Label19.Location = New System.Drawing.Point(121, 8)
+ Me.Label19.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label19.Name = "Label19"
- Me.Label19.Size = New System.Drawing.Size(94, 13)
+ Me.Label19.Size = New System.Drawing.Size(100, 15)
Me.Label19.TabIndex = 8
Me.Label19.Text = "Engine Idle Speed"
'
@@ -1243,9 +1353,11 @@ Partial Class VehicleForm
'
Me.gbTankSystem.Controls.Add(Me.cbTankSystem)
Me.gbTankSystem.Controls.Add(Me.Label23)
- Me.gbTankSystem.Location = New System.Drawing.Point(329, 6)
+ Me.gbTankSystem.Location = New System.Drawing.Point(384, 7)
+ Me.gbTankSystem.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.gbTankSystem.Name = "gbTankSystem"
- Me.gbTankSystem.Size = New System.Drawing.Size(310, 63)
+ Me.gbTankSystem.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.gbTankSystem.Size = New System.Drawing.Size(362, 73)
Me.gbTankSystem.TabIndex = 2
Me.gbTankSystem.TabStop = False
Me.gbTankSystem.Text = "Tank System"
@@ -1256,17 +1368,19 @@ Partial Class VehicleForm
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.cbTankSystem.DisplayMember = "Value"
Me.cbTankSystem.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
- Me.cbTankSystem.Location = New System.Drawing.Point(6, 19)
+ Me.cbTankSystem.Location = New System.Drawing.Point(7, 22)
+ Me.cbTankSystem.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.cbTankSystem.Name = "cbTankSystem"
- Me.cbTankSystem.Size = New System.Drawing.Size(297, 21)
+ Me.cbTankSystem.Size = New System.Drawing.Size(346, 23)
Me.cbTankSystem.TabIndex = 1
Me.cbTankSystem.ValueMember = "Key"
'
'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(3, 43)
+ Me.Label23.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point)
+ Me.Label23.Location = New System.Drawing.Point(4, 50)
+ Me.Label23.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label23.Name = "Label23"
Me.Label23.Size = New System.Drawing.Size(187, 13)
Me.Label23.TabIndex = 0
@@ -1275,10 +1389,11 @@ Partial Class VehicleForm
'tpElectricMachine
'
Me.tpElectricMachine.Controls.Add(Me.gpElectricMotor)
- Me.tpElectricMachine.Location = New System.Drawing.Point(4, 22)
+ Me.tpElectricMachine.Location = New System.Drawing.Point(4, 24)
+ Me.tpElectricMachine.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tpElectricMachine.Name = "tpElectricMachine"
- Me.tpElectricMachine.Padding = New System.Windows.Forms.Padding(3)
- Me.tpElectricMachine.Size = New System.Drawing.Size(648, 374)
+ Me.tpElectricMachine.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.tpElectricMachine.Size = New System.Drawing.Size(757, 434)
Me.tpElectricMachine.TabIndex = 6
Me.tpElectricMachine.Text = "Electric Machine"
Me.tpElectricMachine.UseVisualStyleBackColor = True
@@ -1298,9 +1413,11 @@ 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(6, 6)
+ Me.gpElectricMotor.Location = New System.Drawing.Point(7, 7)
+ Me.gpElectricMotor.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.gpElectricMotor.Name = "gpElectricMotor"
- Me.gpElectricMotor.Size = New System.Drawing.Size(633, 163)
+ Me.gpElectricMotor.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.gpElectricMotor.Size = New System.Drawing.Size(738, 188)
Me.gpElectricMotor.TabIndex = 1
Me.gpElectricMotor.TabStop = False
Me.gpElectricMotor.Text = "Electric Machine"
@@ -1309,9 +1426,10 @@ Partial Class VehicleForm
'
Me.Label33.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.Label33.AutoSize = True
- Me.Label33.Location = New System.Drawing.Point(203, 108)
+ Me.Label33.Location = New System.Drawing.Point(237, 125)
+ Me.Label33.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label33.Name = "Label33"
- Me.Label33.Size = New System.Drawing.Size(16, 13)
+ Me.Label33.Size = New System.Drawing.Size(20, 15)
Me.Label33.TabIndex = 27
Me.Label33.Text = "[-]"
'
@@ -1319,9 +1437,10 @@ Partial Class VehicleForm
'
Me.Label32.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.Label32.AutoSize = True
- Me.Label32.Location = New System.Drawing.Point(203, 82)
+ Me.Label32.Location = New System.Drawing.Point(237, 95)
+ Me.Label32.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label32.Name = "Label32"
- Me.Label32.Size = New System.Drawing.Size(16, 13)
+ Me.Label32.Size = New System.Drawing.Size(20, 15)
Me.Label32.TabIndex = 26
Me.Label32.Text = "[-]"
'
@@ -1331,9 +1450,11 @@ 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(444, 12)
+ Me.gbRatiosPerGear.Location = New System.Drawing.Point(518, 14)
+ Me.gbRatiosPerGear.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.gbRatiosPerGear.Name = "gbRatiosPerGear"
- Me.gbRatiosPerGear.Size = New System.Drawing.Size(181, 145)
+ Me.gbRatiosPerGear.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.gbRatiosPerGear.Size = New System.Drawing.Size(211, 167)
Me.gbRatiosPerGear.TabIndex = 1
Me.gbRatiosPerGear.TabStop = False
Me.gbRatiosPerGear.Text = "Transmission Ratio per Gear"
@@ -1345,11 +1466,11 @@ Partial Class VehicleForm
Me.lvRatioPerGear.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader11, Me.ColumnHeader12})
Me.lvRatioPerGear.FullRowSelect = True
Me.lvRatioPerGear.GridLines = True
- Me.lvRatioPerGear.HideSelection = False
- Me.lvRatioPerGear.Location = New System.Drawing.Point(6, 16)
+ Me.lvRatioPerGear.Location = New System.Drawing.Point(7, 18)
+ Me.lvRatioPerGear.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.lvRatioPerGear.MultiSelect = False
Me.lvRatioPerGear.Name = "lvRatioPerGear"
- Me.lvRatioPerGear.Size = New System.Drawing.Size(169, 94)
+ Me.lvRatioPerGear.Size = New System.Drawing.Size(196, 108)
Me.lvRatioPerGear.TabIndex = 7
Me.lvRatioPerGear.TabStop = False
Me.lvRatioPerGear.UseCompatibleStateImageBehavior = False
@@ -1368,27 +1489,30 @@ Partial Class VehicleForm
'btnAddEMRatio
'
Me.btnAddEMRatio.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
- Me.btnAddEMRatio.Location = New System.Drawing.Point(6, 116)
+ Me.btnAddEMRatio.Location = New System.Drawing.Point(7, 134)
+ Me.btnAddEMRatio.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btnAddEMRatio.Name = "btnAddEMRatio"
- Me.btnAddEMRatio.Size = New System.Drawing.Size(24, 24)
+ Me.btnAddEMRatio.Size = New System.Drawing.Size(28, 28)
Me.btnAddEMRatio.TabIndex = 4
Me.btnAddEMRatio.UseVisualStyleBackColor = True
'
'Label29
'
Me.Label29.AutoSize = True
- Me.Label29.Location = New System.Drawing.Point(71, 111)
+ Me.Label29.Location = New System.Drawing.Point(83, 128)
+ Me.Label29.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label29.Name = "Label29"
- Me.Label29.Size = New System.Drawing.Size(106, 13)
+ Me.Label29.Size = New System.Drawing.Size(121, 15)
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(33, 116)
+ Me.btnRemoveEMRatio.Location = New System.Drawing.Point(38, 134)
+ Me.btnRemoveEMRatio.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btnRemoveEMRatio.Name = "btnRemoveEMRatio"
- Me.btnRemoveEMRatio.Size = New System.Drawing.Size(24, 24)
+ Me.btnRemoveEMRatio.Size = New System.Drawing.Size(28, 28)
Me.btnRemoveEMRatio.TabIndex = 5
Me.btnRemoveEMRatio.UseVisualStyleBackColor = True
'
@@ -1396,49 +1520,55 @@ 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(346, 129)
+ Me.btnEmADCLossMap.Location = New System.Drawing.Point(404, 149)
+ Me.btnEmADCLossMap.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btnEmADCLossMap.Name = "btnEmADCLossMap"
- Me.btnEmADCLossMap.Size = New System.Drawing.Size(24, 24)
+ Me.btnEmADCLossMap.Size = New System.Drawing.Size(28, 28)
Me.btnEmADCLossMap.TabIndex = 5
Me.btnEmADCLossMap.UseVisualStyleBackColor = True
'
'tbEmADCLossMap
'
- Me.tbEmADCLossMap.Location = New System.Drawing.Point(110, 131)
+ Me.tbEmADCLossMap.Location = New System.Drawing.Point(128, 151)
+ Me.tbEmADCLossMap.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbEmADCLossMap.Name = "tbEmADCLossMap"
- Me.tbEmADCLossMap.Size = New System.Drawing.Size(234, 20)
+ Me.tbEmADCLossMap.Size = New System.Drawing.Size(272, 23)
Me.tbEmADCLossMap.TabIndex = 4
'
'lblEmADCLossmap
'
Me.lblEmADCLossmap.AutoSize = True
- Me.lblEmADCLossmap.Location = New System.Drawing.Point(7, 134)
+ Me.lblEmADCLossmap.Location = New System.Drawing.Point(8, 155)
+ Me.lblEmADCLossmap.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblEmADCLossmap.Name = "lblEmADCLossmap"
- Me.lblEmADCLossmap.Size = New System.Drawing.Size(100, 13)
+ Me.lblEmADCLossmap.Size = New System.Drawing.Size(107, 15)
Me.lblEmADCLossmap.TabIndex = 25
Me.lblEmADCLossmap.Text = "Loss Map EM ADC:"
'
'tbRatioEm
'
- Me.tbRatioEm.Location = New System.Drawing.Point(110, 105)
+ Me.tbRatioEm.Location = New System.Drawing.Point(128, 121)
+ Me.tbRatioEm.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbRatioEm.Name = "tbRatioEm"
- Me.tbRatioEm.Size = New System.Drawing.Size(91, 20)
+ Me.tbRatioEm.Size = New System.Drawing.Size(106, 23)
Me.tbRatioEm.TabIndex = 3
'
'lblRatioEm
'
Me.lblRatioEm.AutoSize = True
- Me.lblRatioEm.Location = New System.Drawing.Point(7, 108)
+ Me.lblRatioEm.Location = New System.Drawing.Point(8, 125)
+ Me.lblRatioEm.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblRatioEm.Name = "lblRatioEm"
- Me.lblRatioEm.Size = New System.Drawing.Size(79, 13)
+ Me.lblRatioEm.Size = New System.Drawing.Size(84, 15)
Me.lblRatioEm.TabIndex = 23
Me.lblRatioEm.Text = "Ratio EM ADC:"
'
'tbEmCount
'
- Me.tbEmCount.Location = New System.Drawing.Point(110, 79)
+ Me.tbEmCount.Location = New System.Drawing.Point(128, 91)
+ Me.tbEmCount.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbEmCount.Name = "tbEmCount"
- Me.tbEmCount.Size = New System.Drawing.Size(91, 20)
+ Me.tbEmCount.Size = New System.Drawing.Size(106, 23)
Me.tbEmCount.TabIndex = 2
'
'cbEmPos
@@ -1446,27 +1576,30 @@ Partial Class VehicleForm
Me.cbEmPos.DisplayMember = "Value"
Me.cbEmPos.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
Me.cbEmPos.FormattingEnabled = True
- Me.cbEmPos.Location = New System.Drawing.Point(110, 52)
+ Me.cbEmPos.Location = New System.Drawing.Point(128, 60)
+ Me.cbEmPos.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.cbEmPos.Name = "cbEmPos"
- Me.cbEmPos.Size = New System.Drawing.Size(153, 21)
+ Me.cbEmPos.Size = New System.Drawing.Size(178, 23)
Me.cbEmPos.TabIndex = 1
Me.cbEmPos.ValueMember = "Key"
'
'lblEmCount
'
Me.lblEmCount.AutoSize = True
- Me.lblEmCount.Location = New System.Drawing.Point(7, 82)
+ Me.lblEmCount.Location = New System.Drawing.Point(8, 95)
+ Me.lblEmCount.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblEmCount.Name = "lblEmCount"
- Me.lblEmCount.Size = New System.Drawing.Size(83, 13)
+ Me.lblEmCount.Size = New System.Drawing.Size(93, 15)
Me.lblEmCount.TabIndex = 20
Me.lblEmCount.Text = "Number of EMs:"
'
'lblEmPosition
'
Me.lblEmPosition.AutoSize = True
- Me.lblEmPosition.Location = New System.Drawing.Point(7, 56)
+ Me.lblEmPosition.Location = New System.Drawing.Point(8, 65)
+ Me.lblEmPosition.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblEmPosition.Name = "lblEmPosition"
- Me.lblEmPosition.Size = New System.Drawing.Size(47, 13)
+ Me.lblEmPosition.Size = New System.Drawing.Size(53, 15)
Me.lblEmPosition.TabIndex = 19
Me.lblEmPosition.Text = "Position:"
'
@@ -1475,16 +1608,18 @@ 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(6, 19)
+ Me.pnElectricMotor.Location = New System.Drawing.Point(7, 22)
+ Me.pnElectricMotor.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.pnElectricMotor.Name = "pnElectricMotor"
- Me.pnElectricMotor.Size = New System.Drawing.Size(432, 27)
+ Me.pnElectricMotor.Size = New System.Drawing.Size(504, 31)
Me.pnElectricMotor.TabIndex = 0
'
'btnOpenElectricMotor
'
- Me.btnOpenElectricMotor.Location = New System.Drawing.Point(4, 3)
+ Me.btnOpenElectricMotor.Location = New System.Drawing.Point(5, 3)
+ Me.btnOpenElectricMotor.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btnOpenElectricMotor.Name = "btnOpenElectricMotor"
- Me.btnOpenElectricMotor.Size = New System.Drawing.Size(94, 21)
+ Me.btnOpenElectricMotor.Size = New System.Drawing.Size(110, 24)
Me.btnOpenElectricMotor.TabIndex = 0
Me.btnOpenElectricMotor.Text = "Electric Machine"
Me.btnOpenElectricMotor.UseVisualStyleBackColor = True
@@ -1493,9 +1628,10 @@ 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(406, 2)
+ Me.btnBrowseElectricMotor.Location = New System.Drawing.Point(474, 2)
+ Me.btnBrowseElectricMotor.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btnBrowseElectricMotor.Name = "btnBrowseElectricMotor"
- Me.btnBrowseElectricMotor.Size = New System.Drawing.Size(24, 24)
+ Me.btnBrowseElectricMotor.Size = New System.Drawing.Size(28, 28)
Me.btnBrowseElectricMotor.TabIndex = 2
Me.btnBrowseElectricMotor.UseVisualStyleBackColor = True
'
@@ -1503,17 +1639,19 @@ 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(104, 4)
+ Me.tbElectricMotor.Location = New System.Drawing.Point(121, 5)
+ Me.tbElectricMotor.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbElectricMotor.Name = "tbElectricMotor"
- Me.tbElectricMotor.Size = New System.Drawing.Size(300, 20)
+ Me.tbElectricMotor.Size = New System.Drawing.Size(349, 23)
Me.tbElectricMotor.TabIndex = 1
'
'tpIEPC
'
Me.tpIEPC.Controls.Add(Me.FlowLayoutPanel1)
- Me.tpIEPC.Location = New System.Drawing.Point(4, 22)
+ Me.tpIEPC.Location = New System.Drawing.Point(4, 24)
+ Me.tpIEPC.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tpIEPC.Name = "tpIEPC"
- Me.tpIEPC.Size = New System.Drawing.Size(648, 374)
+ Me.tpIEPC.Size = New System.Drawing.Size(757, 434)
Me.tpIEPC.TabIndex = 8
Me.tpIEPC.Text = "IEPC"
Me.tpIEPC.UseVisualStyleBackColor = True
@@ -1523,18 +1661,19 @@ Partial Class VehicleForm
Me.FlowLayoutPanel1.Controls.Add(Me.btnIEPC)
Me.FlowLayoutPanel1.Controls.Add(Me.tbIEPCFilePath)
Me.FlowLayoutPanel1.Controls.Add(Me.btIEPCFilePath)
- Me.FlowLayoutPanel1.Location = New System.Drawing.Point(25, 19)
+ Me.FlowLayoutPanel1.Location = New System.Drawing.Point(29, 22)
+ Me.FlowLayoutPanel1.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.FlowLayoutPanel1.Name = "FlowLayoutPanel1"
- Me.FlowLayoutPanel1.Size = New System.Drawing.Size(430, 27)
+ Me.FlowLayoutPanel1.Size = New System.Drawing.Size(502, 31)
Me.FlowLayoutPanel1.TabIndex = 61
'
'btnIEPC
'
Me.btnIEPC.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.btnIEPC.Location = New System.Drawing.Point(1, 2)
+ Me.btnIEPC.Location = New System.Drawing.Point(1, 3)
Me.btnIEPC.Margin = New System.Windows.Forms.Padding(1)
Me.btnIEPC.Name = "btnIEPC"
- Me.btnIEPC.Size = New System.Drawing.Size(94, 21)
+ Me.btnIEPC.Size = New System.Drawing.Size(110, 24)
Me.btnIEPC.TabIndex = 27
Me.btnIEPC.Text = "IEPC"
Me.btnIEPC.UseVisualStyleBackColor = True
@@ -1542,30 +1681,31 @@ Partial Class VehicleForm
'tbIEPCFilePath
'
Me.tbIEPCFilePath.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbIEPCFilePath.Location = New System.Drawing.Point(97, 3)
+ Me.tbIEPCFilePath.Location = New System.Drawing.Point(113, 3)
Me.tbIEPCFilePath.Margin = New System.Windows.Forms.Padding(1)
Me.tbIEPCFilePath.Name = "tbIEPCFilePath"
- Me.tbIEPCFilePath.Size = New System.Drawing.Size(300, 20)
+ Me.tbIEPCFilePath.Size = New System.Drawing.Size(349, 23)
Me.tbIEPCFilePath.TabIndex = 28
'
'btIEPCFilePath
'
Me.btIEPCFilePath.Anchor = System.Windows.Forms.AnchorStyles.None
Me.btIEPCFilePath.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btIEPCFilePath.Location = New System.Drawing.Point(399, 1)
+ Me.btIEPCFilePath.Location = New System.Drawing.Point(464, 1)
Me.btIEPCFilePath.Margin = New System.Windows.Forms.Padding(1)
Me.btIEPCFilePath.Name = "btIEPCFilePath"
- Me.btIEPCFilePath.Size = New System.Drawing.Size(24, 24)
+ Me.btIEPCFilePath.Size = New System.Drawing.Size(28, 28)
Me.btIEPCFilePath.TabIndex = 58
Me.btIEPCFilePath.UseVisualStyleBackColor = True
'
'tbIHPC
'
Me.tbIHPC.Controls.Add(Me.FlowLayoutPanel2)
- Me.tbIHPC.Location = New System.Drawing.Point(4, 22)
+ Me.tbIHPC.Location = New System.Drawing.Point(4, 24)
+ Me.tbIHPC.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbIHPC.Name = "tbIHPC"
- Me.tbIHPC.Padding = New System.Windows.Forms.Padding(3)
- Me.tbIHPC.Size = New System.Drawing.Size(648, 374)
+ Me.tbIHPC.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.tbIHPC.Size = New System.Drawing.Size(757, 434)
Me.tbIHPC.TabIndex = 9
Me.tbIHPC.Text = "IHPC"
Me.tbIHPC.UseVisualStyleBackColor = True
@@ -1575,18 +1715,19 @@ Partial Class VehicleForm
Me.FlowLayoutPanel2.Controls.Add(Me.btIHPC)
Me.FlowLayoutPanel2.Controls.Add(Me.tbIHPCFilePath)
Me.FlowLayoutPanel2.Controls.Add(Me.btIHPCFile)
- Me.FlowLayoutPanel2.Location = New System.Drawing.Point(25, 19)
+ Me.FlowLayoutPanel2.Location = New System.Drawing.Point(29, 22)
+ Me.FlowLayoutPanel2.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.FlowLayoutPanel2.Name = "FlowLayoutPanel2"
- Me.FlowLayoutPanel2.Size = New System.Drawing.Size(449, 27)
+ Me.FlowLayoutPanel2.Size = New System.Drawing.Size(524, 31)
Me.FlowLayoutPanel2.TabIndex = 3
'
'btIHPC
'
Me.btIHPC.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.btIHPC.Location = New System.Drawing.Point(1, 2)
+ Me.btIHPC.Location = New System.Drawing.Point(1, 3)
Me.btIHPC.Margin = New System.Windows.Forms.Padding(1)
Me.btIHPC.Name = "btIHPC"
- Me.btIHPC.Size = New System.Drawing.Size(94, 21)
+ Me.btIHPC.Size = New System.Drawing.Size(110, 24)
Me.btIHPC.TabIndex = 0
Me.btIHPC.Text = "IHPC"
Me.btIHPC.UseVisualStyleBackColor = True
@@ -1594,30 +1735,31 @@ Partial Class VehicleForm
'tbIHPCFilePath
'
Me.tbIHPCFilePath.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbIHPCFilePath.Location = New System.Drawing.Point(97, 3)
+ Me.tbIHPCFilePath.Location = New System.Drawing.Point(113, 3)
Me.tbIHPCFilePath.Margin = New System.Windows.Forms.Padding(1)
Me.tbIHPCFilePath.Name = "tbIHPCFilePath"
- Me.tbIHPCFilePath.Size = New System.Drawing.Size(300, 20)
+ Me.tbIHPCFilePath.Size = New System.Drawing.Size(349, 23)
Me.tbIHPCFilePath.TabIndex = 1
'
'btIHPCFile
'
Me.btIHPCFile.Anchor = System.Windows.Forms.AnchorStyles.None
Me.btIHPCFile.Image = CType(resources.GetObject("btIHPCFile.Image"), System.Drawing.Image)
- Me.btIHPCFile.Location = New System.Drawing.Point(399, 1)
+ Me.btIHPCFile.Location = New System.Drawing.Point(464, 1)
Me.btIHPCFile.Margin = New System.Windows.Forms.Padding(1)
Me.btIHPCFile.Name = "btIHPCFile"
- Me.btIHPCFile.Size = New System.Drawing.Size(24, 24)
+ Me.btIHPCFile.Size = New System.Drawing.Size(28, 28)
Me.btIHPCFile.TabIndex = 2
Me.btIHPCFile.UseVisualStyleBackColor = True
'
'tpReess
'
Me.tpReess.Controls.Add(Me.gbBattery)
- Me.tpReess.Location = New System.Drawing.Point(4, 22)
+ Me.tpReess.Location = New System.Drawing.Point(4, 24)
+ Me.tpReess.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tpReess.Name = "tpReess"
- Me.tpReess.Padding = New System.Windows.Forms.Padding(3)
- Me.tpReess.Size = New System.Drawing.Size(648, 374)
+ Me.tpReess.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.tpReess.Size = New System.Drawing.Size(757, 434)
Me.tpReess.TabIndex = 7
Me.tpReess.Text = "REESS"
Me.tpReess.UseVisualStyleBackColor = True
@@ -1631,9 +1773,11 @@ 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(6, 6)
+ Me.gbBattery.Location = New System.Drawing.Point(7, 7)
+ Me.gbBattery.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.gbBattery.Name = "gbBattery"
- Me.gbBattery.Size = New System.Drawing.Size(633, 187)
+ Me.gbBattery.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.gbBattery.Size = New System.Drawing.Size(738, 216)
Me.gbBattery.TabIndex = 3
Me.gbBattery.TabStop = False
Me.gbBattery.Text = "Electric Energy Storage system"
@@ -1645,11 +1789,11 @@ Partial Class VehicleForm
Me.lvREESSPacks.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.chReessPackPack, Me.chReessPackCount, Me.chReessPackStringId})
Me.lvREESSPacks.FullRowSelect = True
Me.lvREESSPacks.GridLines = True
- Me.lvREESSPacks.HideSelection = False
- Me.lvREESSPacks.Location = New System.Drawing.Point(6, 45)
+ Me.lvREESSPacks.Location = New System.Drawing.Point(7, 52)
+ Me.lvREESSPacks.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.lvREESSPacks.MultiSelect = False
Me.lvREESSPacks.Name = "lvREESSPacks"
- Me.lvREESSPacks.Size = New System.Drawing.Size(553, 102)
+ Me.lvREESSPacks.Size = New System.Drawing.Size(644, 117)
Me.lvREESSPacks.TabIndex = 31
Me.lvREESSPacks.TabStop = False
Me.lvREESSPacks.UseCompatibleStateImageBehavior = False
@@ -1673,53 +1817,59 @@ Partial Class VehicleForm
'btnAddReessPack
'
Me.btnAddReessPack.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
- Me.btnAddReessPack.Location = New System.Drawing.Point(6, 153)
+ Me.btnAddReessPack.Location = New System.Drawing.Point(7, 177)
+ Me.btnAddReessPack.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btnAddReessPack.Name = "btnAddReessPack"
- Me.btnAddReessPack.Size = New System.Drawing.Size(24, 24)
+ Me.btnAddReessPack.Size = New System.Drawing.Size(28, 28)
Me.btnAddReessPack.TabIndex = 1
Me.btnAddReessPack.UseVisualStyleBackColor = True
'
'lblEditReessPack
'
Me.lblEditReessPack.AutoSize = True
- Me.lblEditReessPack.Location = New System.Drawing.Point(452, 148)
+ Me.lblEditReessPack.Location = New System.Drawing.Point(527, 171)
+ Me.lblEditReessPack.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblEditReessPack.Name = "lblEditReessPack"
- Me.lblEditReessPack.Size = New System.Drawing.Size(106, 13)
+ Me.lblEditReessPack.Size = New System.Drawing.Size(121, 15)
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(33, 153)
+ Me.btnRemoveReessPack.Location = New System.Drawing.Point(38, 177)
+ Me.btnRemoveReessPack.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btnRemoveReessPack.Name = "btnRemoveReessPack"
- Me.btnRemoveReessPack.Size = New System.Drawing.Size(24, 24)
+ Me.btnRemoveReessPack.Size = New System.Drawing.Size(28, 28)
Me.btnRemoveReessPack.TabIndex = 2
Me.btnRemoveReessPack.UseVisualStyleBackColor = True
'
'lblInitialSoCUnit
'
Me.lblInitialSoCUnit.AutoSize = True
- Me.lblInitialSoCUnit.Location = New System.Drawing.Point(265, 21)
+ Me.lblInitialSoCUnit.Location = New System.Drawing.Point(309, 24)
+ Me.lblInitialSoCUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblInitialSoCUnit.Name = "lblInitialSoCUnit"
- Me.lblInitialSoCUnit.Size = New System.Drawing.Size(21, 13)
+ Me.lblInitialSoCUnit.Size = New System.Drawing.Size(25, 15)
Me.lblInitialSoCUnit.TabIndex = 27
Me.lblInitialSoCUnit.Text = "[%]"
'
'tbInitialSoC
'
- Me.tbInitialSoC.Location = New System.Drawing.Point(204, 19)
+ Me.tbInitialSoC.Location = New System.Drawing.Point(238, 22)
+ Me.tbInitialSoC.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbInitialSoC.Name = "tbInitialSoC"
- Me.tbInitialSoC.Size = New System.Drawing.Size(59, 20)
+ Me.tbInitialSoC.Size = New System.Drawing.Size(68, 23)
Me.tbInitialSoC.TabIndex = 0
'
'lblInitialSoC
'
Me.lblInitialSoC.AutoSize = True
- Me.lblInitialSoC.Location = New System.Drawing.Point(7, 22)
+ Me.lblInitialSoC.Location = New System.Drawing.Point(8, 25)
+ Me.lblInitialSoC.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblInitialSoC.Name = "lblInitialSoC"
Me.lblInitialSoC.RightToLeft = System.Windows.Forms.RightToLeft.Yes
- Me.lblInitialSoC.Size = New System.Drawing.Size(54, 13)
+ Me.lblInitialSoC.Size = New System.Drawing.Size(60, 15)
Me.lblInitialSoC.TabIndex = 25
Me.lblInitialSoC.Text = "Initial SoC"
'
@@ -1727,10 +1877,10 @@ Partial Class VehicleForm
'
Me.tpGensetComponents.Controls.Add(Me.Label30)
Me.tpGensetComponents.Controls.Add(Me.gbGenSet)
- Me.tpGensetComponents.Location = New System.Drawing.Point(4, 22)
+ Me.tpGensetComponents.Location = New System.Drawing.Point(4, 24)
Me.tpGensetComponents.Margin = New System.Windows.Forms.Padding(2)
Me.tpGensetComponents.Name = "tpGensetComponents"
- Me.tpGensetComponents.Size = New System.Drawing.Size(648, 374)
+ Me.tpGensetComponents.Size = New System.Drawing.Size(757, 434)
Me.tpGensetComponents.TabIndex = 5
Me.tpGensetComponents.Text = "GenSet Components"
Me.tpGensetComponents.UseVisualStyleBackColor = True
@@ -1738,8 +1888,9 @@ Partial Class VehicleForm
'Label30
'
Me.Label30.AutoSize = True
- Me.Label30.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.Label30.Location = New System.Drawing.Point(13, 153)
+ Me.Label30.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point)
+ Me.Label30.Location = New System.Drawing.Point(15, 177)
+ Me.Label30.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label30.Name = "Label30"
Me.Label30.Size = New System.Drawing.Size(429, 13)
Me.Label30.TabIndex = 21
@@ -1758,9 +1909,11 @@ Partial Class VehicleForm
Me.gbGenSet.Controls.Add(Me.tbGenSetCount)
Me.gbGenSet.Controls.Add(Me.lblGenSetCount)
Me.gbGenSet.Controls.Add(Me.pnGenSetEM)
- Me.gbGenSet.Location = New System.Drawing.Point(6, 6)
+ Me.gbGenSet.Location = New System.Drawing.Point(7, 7)
+ Me.gbGenSet.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.gbGenSet.Name = "gbGenSet"
- Me.gbGenSet.Size = New System.Drawing.Size(633, 135)
+ Me.gbGenSet.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.gbGenSet.Size = New System.Drawing.Size(738, 156)
Me.gbGenSet.TabIndex = 1
Me.gbGenSet.TabStop = False
Me.gbGenSet.Text = "Electric Machine"
@@ -1769,9 +1922,10 @@ Partial Class VehicleForm
'
Me.Label36.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.Label36.AutoSize = True
- Me.Label36.Location = New System.Drawing.Point(203, 83)
+ Me.Label36.Location = New System.Drawing.Point(237, 96)
+ Me.Label36.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label36.Name = "Label36"
- Me.Label36.Size = New System.Drawing.Size(16, 13)
+ Me.Label36.Size = New System.Drawing.Size(20, 15)
Me.Label36.TabIndex = 28
Me.Label36.Text = "[-]"
'
@@ -1779,9 +1933,10 @@ Partial Class VehicleForm
'
Me.Label34.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.Label34.AutoSize = True
- Me.Label34.Location = New System.Drawing.Point(203, 57)
+ Me.Label34.Location = New System.Drawing.Point(237, 66)
+ Me.Label34.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label34.Name = "Label34"
- Me.Label34.Size = New System.Drawing.Size(16, 13)
+ Me.Label34.Size = New System.Drawing.Size(20, 15)
Me.Label34.TabIndex = 27
Me.Label34.Text = "[-]"
'
@@ -1789,57 +1944,64 @@ Partial Class VehicleForm
'
Me.btnGenSetLossMap.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.btnGenSetLossMap.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnGenSetLossMap.Location = New System.Drawing.Point(412, 105)
+ Me.btnGenSetLossMap.Location = New System.Drawing.Point(481, 121)
+ Me.btnGenSetLossMap.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btnGenSetLossMap.Name = "btnGenSetLossMap"
- Me.btnGenSetLossMap.Size = New System.Drawing.Size(24, 24)
+ Me.btnGenSetLossMap.Size = New System.Drawing.Size(28, 28)
Me.btnGenSetLossMap.TabIndex = 5
Me.btnGenSetLossMap.UseVisualStyleBackColor = True
'
'tbGenSetADC
'
- Me.tbGenSetADC.Location = New System.Drawing.Point(110, 107)
+ Me.tbGenSetADC.Location = New System.Drawing.Point(128, 123)
+ Me.tbGenSetADC.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbGenSetADC.Name = "tbGenSetADC"
- Me.tbGenSetADC.Size = New System.Drawing.Size(301, 20)
+ Me.tbGenSetADC.Size = New System.Drawing.Size(350, 23)
Me.tbGenSetADC.TabIndex = 4
'
'lblGenSetADC
'
Me.lblGenSetADC.AutoSize = True
- Me.lblGenSetADC.Location = New System.Drawing.Point(7, 110)
+ Me.lblGenSetADC.Location = New System.Drawing.Point(8, 127)
+ Me.lblGenSetADC.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblGenSetADC.Name = "lblGenSetADC"
- Me.lblGenSetADC.Size = New System.Drawing.Size(100, 13)
+ Me.lblGenSetADC.Size = New System.Drawing.Size(107, 15)
Me.lblGenSetADC.TabIndex = 25
Me.lblGenSetADC.Text = "Loss Map EM ADC:"
'
'tbGenSetRatio
'
- Me.tbGenSetRatio.Location = New System.Drawing.Point(110, 81)
+ Me.tbGenSetRatio.Location = New System.Drawing.Point(128, 93)
+ Me.tbGenSetRatio.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbGenSetRatio.Name = "tbGenSetRatio"
- Me.tbGenSetRatio.Size = New System.Drawing.Size(91, 20)
+ Me.tbGenSetRatio.Size = New System.Drawing.Size(106, 23)
Me.tbGenSetRatio.TabIndex = 3
'
'lblGenSetRatio
'
Me.lblGenSetRatio.AutoSize = True
- Me.lblGenSetRatio.Location = New System.Drawing.Point(7, 84)
+ Me.lblGenSetRatio.Location = New System.Drawing.Point(8, 97)
+ Me.lblGenSetRatio.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblGenSetRatio.Name = "lblGenSetRatio"
- Me.lblGenSetRatio.Size = New System.Drawing.Size(79, 13)
+ Me.lblGenSetRatio.Size = New System.Drawing.Size(84, 15)
Me.lblGenSetRatio.TabIndex = 23
Me.lblGenSetRatio.Text = "Ratio EM ADC:"
'
'tbGenSetCount
'
- Me.tbGenSetCount.Location = New System.Drawing.Point(110, 55)
+ Me.tbGenSetCount.Location = New System.Drawing.Point(128, 63)
+ Me.tbGenSetCount.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbGenSetCount.Name = "tbGenSetCount"
- Me.tbGenSetCount.Size = New System.Drawing.Size(91, 20)
+ Me.tbGenSetCount.Size = New System.Drawing.Size(106, 23)
Me.tbGenSetCount.TabIndex = 2
'
'lblGenSetCount
'
Me.lblGenSetCount.AutoSize = True
- Me.lblGenSetCount.Location = New System.Drawing.Point(7, 58)
+ Me.lblGenSetCount.Location = New System.Drawing.Point(8, 67)
+ Me.lblGenSetCount.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblGenSetCount.Name = "lblGenSetCount"
- Me.lblGenSetCount.Size = New System.Drawing.Size(83, 13)
+ Me.lblGenSetCount.Size = New System.Drawing.Size(93, 15)
Me.lblGenSetCount.TabIndex = 20
Me.lblGenSetCount.Text = "Number of EMs:"
'
@@ -1848,16 +2010,18 @@ Partial Class VehicleForm
Me.pnGenSetEM.Controls.Add(Me.btnOpenGenSetEM)
Me.pnGenSetEM.Controls.Add(Me.btnBrowseGenSetEM)
Me.pnGenSetEM.Controls.Add(Me.tbGenSetEM)
- Me.pnGenSetEM.Location = New System.Drawing.Point(6, 19)
+ Me.pnGenSetEM.Location = New System.Drawing.Point(7, 22)
+ Me.pnGenSetEM.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.pnGenSetEM.Name = "pnGenSetEM"
- Me.pnGenSetEM.Size = New System.Drawing.Size(432, 27)
+ Me.pnGenSetEM.Size = New System.Drawing.Size(504, 31)
Me.pnGenSetEM.TabIndex = 0
'
'btnOpenGenSetEM
'
- Me.btnOpenGenSetEM.Location = New System.Drawing.Point(4, 3)
+ Me.btnOpenGenSetEM.Location = New System.Drawing.Point(5, 3)
+ Me.btnOpenGenSetEM.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btnOpenGenSetEM.Name = "btnOpenGenSetEM"
- Me.btnOpenGenSetEM.Size = New System.Drawing.Size(94, 21)
+ Me.btnOpenGenSetEM.Size = New System.Drawing.Size(110, 24)
Me.btnOpenGenSetEM.TabIndex = 0
Me.btnOpenGenSetEM.Text = "Electric Machine"
Me.btnOpenGenSetEM.UseVisualStyleBackColor = True
@@ -1866,9 +2030,10 @@ Partial Class VehicleForm
'
Me.btnBrowseGenSetEM.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.btnBrowseGenSetEM.Image = CType(resources.GetObject("btnBrowseGenSetEM.Image"), System.Drawing.Image)
- Me.btnBrowseGenSetEM.Location = New System.Drawing.Point(406, 2)
+ Me.btnBrowseGenSetEM.Location = New System.Drawing.Point(474, 2)
+ Me.btnBrowseGenSetEM.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btnBrowseGenSetEM.Name = "btnBrowseGenSetEM"
- Me.btnBrowseGenSetEM.Size = New System.Drawing.Size(24, 24)
+ Me.btnBrowseGenSetEM.Size = New System.Drawing.Size(28, 28)
Me.btnBrowseGenSetEM.TabIndex = 2
Me.btnBrowseGenSetEM.UseVisualStyleBackColor = True
'
@@ -1876,9 +2041,10 @@ Partial Class VehicleForm
'
Me.tbGenSetEM.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.tbGenSetEM.Location = New System.Drawing.Point(104, 4)
+ Me.tbGenSetEM.Location = New System.Drawing.Point(121, 5)
+ Me.tbGenSetEM.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbGenSetEM.Name = "tbGenSetEM"
- Me.tbGenSetEM.Size = New System.Drawing.Size(301, 20)
+ Me.tbGenSetEM.Size = New System.Drawing.Size(350, 23)
Me.tbGenSetEM.TabIndex = 1
'
'tpTorqueLimits
@@ -1886,9 +2052,10 @@ 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, 22)
+ Me.tpTorqueLimits.Location = New System.Drawing.Point(4, 24)
+ Me.tpTorqueLimits.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tpTorqueLimits.Name = "tpTorqueLimits"
- Me.tpTorqueLimits.Size = New System.Drawing.Size(648, 374)
+ Me.tpTorqueLimits.Size = New System.Drawing.Size(757, 434)
Me.tpTorqueLimits.TabIndex = 2
Me.tpTorqueLimits.Text = "Torque Limits"
Me.tpTorqueLimits.UseVisualStyleBackColor = True
@@ -1897,9 +2064,11 @@ Partial Class VehicleForm
'
Me.gbPropulsionTorque.Controls.Add(Me.btnPropulsionTorqueLimit)
Me.gbPropulsionTorque.Controls.Add(Me.tbPropulsionTorqueLimit)
- Me.gbPropulsionTorque.Location = New System.Drawing.Point(233, 64)
+ Me.gbPropulsionTorque.Location = New System.Drawing.Point(272, 74)
+ Me.gbPropulsionTorque.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.gbPropulsionTorque.Name = "gbPropulsionTorque"
- Me.gbPropulsionTorque.Size = New System.Drawing.Size(403, 52)
+ Me.gbPropulsionTorque.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.gbPropulsionTorque.Size = New System.Drawing.Size(470, 60)
Me.gbPropulsionTorque.TabIndex = 2
Me.gbPropulsionTorque.TabStop = False
Me.gbPropulsionTorque.Text = "Boosting Torque Limits"
@@ -1908,9 +2077,10 @@ Partial Class VehicleForm
'
Me.btnPropulsionTorqueLimit.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.btnPropulsionTorqueLimit.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnPropulsionTorqueLimit.Location = New System.Drawing.Point(373, 18)
+ Me.btnPropulsionTorqueLimit.Location = New System.Drawing.Point(435, 21)
+ Me.btnPropulsionTorqueLimit.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btnPropulsionTorqueLimit.Name = "btnPropulsionTorqueLimit"
- Me.btnPropulsionTorqueLimit.Size = New System.Drawing.Size(24, 24)
+ Me.btnPropulsionTorqueLimit.Size = New System.Drawing.Size(28, 28)
Me.btnPropulsionTorqueLimit.TabIndex = 1
Me.btnPropulsionTorqueLimit.UseVisualStyleBackColor = True
'
@@ -1918,18 +2088,21 @@ Partial Class VehicleForm
'
Me.tbPropulsionTorqueLimit.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.tbPropulsionTorqueLimit.Location = New System.Drawing.Point(6, 20)
+ Me.tbPropulsionTorqueLimit.Location = New System.Drawing.Point(7, 23)
+ Me.tbPropulsionTorqueLimit.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbPropulsionTorqueLimit.Name = "tbPropulsionTorqueLimit"
- Me.tbPropulsionTorqueLimit.Size = New System.Drawing.Size(365, 20)
+ Me.tbPropulsionTorqueLimit.Size = New System.Drawing.Size(425, 23)
Me.tbPropulsionTorqueLimit.TabIndex = 0
'
'gbEMTorqueLimits
'
Me.gbEMTorqueLimits.Controls.Add(Me.btnEmTorqueLimits)
Me.gbEMTorqueLimits.Controls.Add(Me.tbEmTorqueLimits)
- Me.gbEMTorqueLimits.Location = New System.Drawing.Point(233, 6)
+ Me.gbEMTorqueLimits.Location = New System.Drawing.Point(272, 7)
+ Me.gbEMTorqueLimits.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.gbEMTorqueLimits.Name = "gbEMTorqueLimits"
- Me.gbEMTorqueLimits.Size = New System.Drawing.Size(403, 52)
+ Me.gbEMTorqueLimits.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.gbEMTorqueLimits.Size = New System.Drawing.Size(470, 60)
Me.gbEMTorqueLimits.TabIndex = 1
Me.gbEMTorqueLimits.TabStop = False
Me.gbEMTorqueLimits.Text = "Electric Machine Torque Limits"
@@ -1938,9 +2111,10 @@ Partial Class VehicleForm
'
Me.btnEmTorqueLimits.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.btnEmTorqueLimits.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnEmTorqueLimits.Location = New System.Drawing.Point(373, 17)
+ Me.btnEmTorqueLimits.Location = New System.Drawing.Point(435, 20)
+ Me.btnEmTorqueLimits.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btnEmTorqueLimits.Name = "btnEmTorqueLimits"
- Me.btnEmTorqueLimits.Size = New System.Drawing.Size(24, 24)
+ Me.btnEmTorqueLimits.Size = New System.Drawing.Size(28, 28)
Me.btnEmTorqueLimits.TabIndex = 1
Me.btnEmTorqueLimits.UseVisualStyleBackColor = True
'
@@ -1948,9 +2122,10 @@ Partial Class VehicleForm
'
Me.tbEmTorqueLimits.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.tbEmTorqueLimits.Location = New System.Drawing.Point(6, 19)
+ Me.tbEmTorqueLimits.Location = New System.Drawing.Point(7, 22)
+ Me.tbEmTorqueLimits.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbEmTorqueLimits.Name = "tbEmTorqueLimits"
- Me.tbEmTorqueLimits.Size = New System.Drawing.Size(365, 20)
+ Me.tbEmTorqueLimits.Size = New System.Drawing.Size(425, 23)
Me.tbEmTorqueLimits.TabIndex = 0
'
'bgVehicleTorqueLimits
@@ -1959,9 +2134,11 @@ 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(6, 6)
+ Me.bgVehicleTorqueLimits.Location = New System.Drawing.Point(7, 7)
+ Me.bgVehicleTorqueLimits.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.bgVehicleTorqueLimits.Name = "bgVehicleTorqueLimits"
- Me.bgVehicleTorqueLimits.Size = New System.Drawing.Size(221, 227)
+ Me.bgVehicleTorqueLimits.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.bgVehicleTorqueLimits.Size = New System.Drawing.Size(258, 262)
Me.bgVehicleTorqueLimits.TabIndex = 0
Me.bgVehicleTorqueLimits.TabStop = False
Me.bgVehicleTorqueLimits.Text = "ICE Torque Limits"
@@ -1974,11 +2151,11 @@ Partial Class VehicleForm
Me.lvTorqueLimits.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader5, Me.ColumnHeader6})
Me.lvTorqueLimits.FullRowSelect = True
Me.lvTorqueLimits.GridLines = True
- Me.lvTorqueLimits.HideSelection = False
- Me.lvTorqueLimits.Location = New System.Drawing.Point(6, 19)
+ Me.lvTorqueLimits.Location = New System.Drawing.Point(7, 22)
+ Me.lvTorqueLimits.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.lvTorqueLimits.MultiSelect = False
Me.lvTorqueLimits.Name = "lvTorqueLimits"
- Me.lvTorqueLimits.Size = New System.Drawing.Size(209, 169)
+ Me.lvTorqueLimits.Size = New System.Drawing.Size(243, 194)
Me.lvTorqueLimits.TabIndex = 7
Me.lvTorqueLimits.TabStop = False
Me.lvTorqueLimits.UseCompatibleStateImageBehavior = False
@@ -1999,9 +2176,10 @@ Partial Class VehicleForm
'
Me.btAddMaxTorqueEntry.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.btAddMaxTorqueEntry.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
- Me.btAddMaxTorqueEntry.Location = New System.Drawing.Point(6, 193)
+ Me.btAddMaxTorqueEntry.Location = New System.Drawing.Point(7, 223)
+ Me.btAddMaxTorqueEntry.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btAddMaxTorqueEntry.Name = "btAddMaxTorqueEntry"
- Me.btAddMaxTorqueEntry.Size = New System.Drawing.Size(24, 24)
+ Me.btAddMaxTorqueEntry.Size = New System.Drawing.Size(28, 28)
Me.btAddMaxTorqueEntry.TabIndex = 4
Me.btAddMaxTorqueEntry.UseVisualStyleBackColor = True
'
@@ -2009,9 +2187,10 @@ Partial Class VehicleForm
'
Me.Label17.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.Label17.AutoSize = True
- Me.Label17.Location = New System.Drawing.Point(112, 190)
+ Me.Label17.Location = New System.Drawing.Point(131, 219)
+ Me.Label17.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label17.Name = "Label17"
- Me.Label17.Size = New System.Drawing.Size(106, 13)
+ Me.Label17.Size = New System.Drawing.Size(121, 15)
Me.Label17.TabIndex = 6
Me.Label17.Text = "(Double-Click to Edit)"
Me.Label17.TextAlign = System.Drawing.ContentAlignment.TopRight
@@ -2020,19 +2199,21 @@ Partial Class VehicleForm
'
Me.btDelMaxTorqueEntry.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.btDelMaxTorqueEntry.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
- Me.btDelMaxTorqueEntry.Location = New System.Drawing.Point(30, 193)
+ Me.btDelMaxTorqueEntry.Location = New System.Drawing.Point(35, 223)
+ Me.btDelMaxTorqueEntry.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btDelMaxTorqueEntry.Name = "btDelMaxTorqueEntry"
- Me.btDelMaxTorqueEntry.Size = New System.Drawing.Size(24, 24)
+ Me.btDelMaxTorqueEntry.Size = New System.Drawing.Size(28, 28)
Me.btDelMaxTorqueEntry.TabIndex = 5
Me.btDelMaxTorqueEntry.UseVisualStyleBackColor = True
'
'tpADAS
'
Me.tpADAS.Controls.Add(Me.gbADAS)
- Me.tpADAS.Location = New System.Drawing.Point(4, 22)
+ Me.tpADAS.Location = New System.Drawing.Point(4, 24)
+ Me.tpADAS.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tpADAS.Name = "tpADAS"
- Me.tpADAS.Padding = New System.Windows.Forms.Padding(3)
- Me.tpADAS.Size = New System.Drawing.Size(648, 374)
+ Me.tpADAS.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.tpADAS.Size = New System.Drawing.Size(757, 434)
Me.tpADAS.TabIndex = 3
Me.tpADAS.Text = "ADAS"
Me.tpADAS.UseVisualStyleBackColor = True
@@ -2046,9 +2227,11 @@ Partial Class VehicleForm
Me.gbADAS.Controls.Add(Me.cbPcc)
Me.gbADAS.Controls.Add(Me.cbEngineStopStart)
Me.gbADAS.Controls.Add(Me.lblPCC)
- Me.gbADAS.Location = New System.Drawing.Point(6, 6)
+ Me.gbADAS.Location = New System.Drawing.Point(7, 7)
+ Me.gbADAS.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.gbADAS.Name = "gbADAS"
- Me.gbADAS.Size = New System.Drawing.Size(636, 161)
+ Me.gbADAS.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.gbADAS.Size = New System.Drawing.Size(742, 186)
Me.gbADAS.TabIndex = 0
Me.gbADAS.TabStop = False
Me.gbADAS.Text = "ADAS Options"
@@ -2057,9 +2240,10 @@ Partial Class VehicleForm
'
Me.pnEcoRoll.Controls.Add(Me.cbEcoRoll)
Me.pnEcoRoll.Controls.Add(Me.Label22)
- Me.pnEcoRoll.Location = New System.Drawing.Point(0, 44)
+ Me.pnEcoRoll.Location = New System.Drawing.Point(0, 51)
+ Me.pnEcoRoll.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.pnEcoRoll.Name = "pnEcoRoll"
- Me.pnEcoRoll.Size = New System.Drawing.Size(300, 46)
+ Me.pnEcoRoll.Size = New System.Drawing.Size(350, 53)
Me.pnEcoRoll.TabIndex = 7
'
'cbEcoRoll
@@ -2067,27 +2251,30 @@ Partial Class VehicleForm
Me.cbEcoRoll.DisplayMember = "Value"
Me.cbEcoRoll.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
Me.cbEcoRoll.FormattingEnabled = True
- Me.cbEcoRoll.Location = New System.Drawing.Point(10, 20)
+ Me.cbEcoRoll.Location = New System.Drawing.Point(12, 23)
+ Me.cbEcoRoll.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.cbEcoRoll.Name = "cbEcoRoll"
- Me.cbEcoRoll.Size = New System.Drawing.Size(266, 21)
+ Me.cbEcoRoll.Size = New System.Drawing.Size(310, 23)
Me.cbEcoRoll.TabIndex = 1
Me.cbEcoRoll.ValueMember = "Key"
'
'Label22
'
Me.Label22.AutoSize = True
- Me.Label22.Location = New System.Drawing.Point(7, 5)
+ Me.Label22.Location = New System.Drawing.Point(8, 6)
+ Me.Label22.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label22.Name = "Label22"
- Me.Label22.Size = New System.Drawing.Size(50, 13)
+ Me.Label22.Size = New System.Drawing.Size(54, 15)
Me.Label22.TabIndex = 6
Me.Label22.Text = "Eco-Roll:"
'
'cbAtEcoRollReleaseLockupClutch
'
Me.cbAtEcoRollReleaseLockupClutch.AutoSize = True
- Me.cbAtEcoRollReleaseLockupClutch.Location = New System.Drawing.Point(238, 21)
+ Me.cbAtEcoRollReleaseLockupClutch.Location = New System.Drawing.Point(278, 24)
+ Me.cbAtEcoRollReleaseLockupClutch.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.cbAtEcoRollReleaseLockupClutch.Name = "cbAtEcoRollReleaseLockupClutch"
- Me.cbAtEcoRollReleaseLockupClutch.Size = New System.Drawing.Size(243, 17)
+ Me.cbAtEcoRollReleaseLockupClutch.Size = New System.Drawing.Size(258, 19)
Me.cbAtEcoRollReleaseLockupClutch.TabIndex = 3
Me.cbAtEcoRollReleaseLockupClutch.Text = "AT Gearbox: Eco-Roll Release Lockup Clutch"
Me.cbAtEcoRollReleaseLockupClutch.UseVisualStyleBackColor = True
@@ -2097,18 +2284,20 @@ Partial Class VehicleForm
Me.cbPcc.DisplayMember = "Value"
Me.cbPcc.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
Me.cbPcc.FormattingEnabled = True
- Me.cbPcc.Location = New System.Drawing.Point(10, 124)
+ Me.cbPcc.Location = New System.Drawing.Point(12, 143)
+ Me.cbPcc.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.cbPcc.Name = "cbPcc"
- Me.cbPcc.Size = New System.Drawing.Size(266, 21)
+ Me.cbPcc.Size = New System.Drawing.Size(310, 23)
Me.cbPcc.TabIndex = 2
Me.cbPcc.ValueMember = "Key"
'
'cbEngineStopStart
'
Me.cbEngineStopStart.AutoSize = True
- Me.cbEngineStopStart.Location = New System.Drawing.Point(10, 21)
+ Me.cbEngineStopStart.Location = New System.Drawing.Point(12, 24)
+ Me.cbEngineStopStart.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.cbEngineStopStart.Name = "cbEngineStopStart"
- Me.cbEngineStopStart.Size = New System.Drawing.Size(203, 17)
+ Me.cbEngineStopStart.Size = New System.Drawing.Size(222, 19)
Me.cbEngineStopStart.TabIndex = 0
Me.cbEngineStopStart.Text = "Engine Stop/Start during vehicle stop"
Me.cbEngineStopStart.UseVisualStyleBackColor = True
@@ -2116,106 +2305,133 @@ Partial Class VehicleForm
'lblPCC
'
Me.lblPCC.AutoSize = True
- Me.lblPCC.Location = New System.Drawing.Point(7, 108)
+ Me.lblPCC.Location = New System.Drawing.Point(8, 125)
+ Me.lblPCC.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblPCC.Name = "lblPCC"
- Me.lblPCC.Size = New System.Drawing.Size(125, 13)
+ Me.lblPCC.Size = New System.Drawing.Size(141, 15)
Me.lblPCC.TabIndex = 3
Me.lblPCC.Text = "Predictive Cruise Control:"
'
'tpRoadSweeper
'
- Me.tpRoadSweeper.Controls.Add(Me.lblNotePtoPEV_HEVS)
- Me.tpRoadSweeper.Controls.Add(Me.pnPTO)
- Me.tpRoadSweeper.Controls.Add(Me.gbPTO)
- Me.tpRoadSweeper.Location = New System.Drawing.Point(4, 22)
+ Me.tpRoadSweeper.Controls.Add(Me.FlowLayoutPanel3)
+ Me.tpRoadSweeper.Location = New System.Drawing.Point(4, 24)
+ Me.tpRoadSweeper.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tpRoadSweeper.Name = "tpRoadSweeper"
- Me.tpRoadSweeper.Size = New System.Drawing.Size(648, 374)
+ Me.tpRoadSweeper.Size = New System.Drawing.Size(757, 434)
Me.tpRoadSweeper.TabIndex = 4
Me.tpRoadSweeper.Text = "PTO"
Me.tpRoadSweeper.UseVisualStyleBackColor = True
'
- 'lblNotePtoPEV_HEVS
+ 'FlowLayoutPanel3
+ '
+ Me.FlowLayoutPanel3.BackColor = System.Drawing.Color.Transparent
+ Me.FlowLayoutPanel3.Controls.Add(Me.Panel2)
+ Me.FlowLayoutPanel3.Controls.Add(Me.pnPTO)
+ Me.FlowLayoutPanel3.Controls.Add(Me.lblNotePtoPEV_HEVS)
+ Me.FlowLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill
+ Me.FlowLayoutPanel3.FlowDirection = System.Windows.Forms.FlowDirection.TopDown
+ Me.FlowLayoutPanel3.Location = New System.Drawing.Point(0, 0)
+ Me.FlowLayoutPanel3.Margin = New System.Windows.Forms.Padding(0)
+ Me.FlowLayoutPanel3.Name = "FlowLayoutPanel3"
+ Me.FlowLayoutPanel3.Size = New System.Drawing.Size(757, 434)
+ Me.FlowLayoutPanel3.TabIndex = 5
+ '
+ 'Panel2
+ '
+ Me.Panel2.BackColor = System.Drawing.Color.Transparent
+ Me.Panel2.Controls.Add(Me.gbPTO)
+ Me.Panel2.Location = New System.Drawing.Point(0, 0)
+ Me.Panel2.Margin = New System.Windows.Forms.Padding(0)
+ Me.Panel2.Name = "Panel2"
+ Me.Panel2.Size = New System.Drawing.Size(751, 52)
+ Me.Panel2.TabIndex = 5
'
- Me.lblNotePtoPEV_HEVS.AutoSize = True
- Me.lblNotePtoPEV_HEVS.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.lblNotePtoPEV_HEVS.Location = New System.Drawing.Point(10, 293)
- Me.lblNotePtoPEV_HEVS.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0)
- Me.lblNotePtoPEV_HEVS.Name = "lblNotePtoPEV_HEVS"
- Me.lblNotePtoPEV_HEVS.Size = New System.Drawing.Size(333, 13)
- Me.lblNotePtoPEV_HEVS.TabIndex = 2
- Me.lblNotePtoPEV_HEVS.Text = "Note: PTO losses are only considered for vehicles of type E2 and S2!"
+ 'gbPTO
+ '
+ Me.gbPTO.Controls.Add(Me.cbPTOType)
+ Me.gbPTO.Location = New System.Drawing.Point(1, 3)
+ Me.gbPTO.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.gbPTO.Name = "gbPTO"
+ Me.gbPTO.Padding = New System.Windows.Forms.Padding(4)
+ Me.gbPTO.Size = New System.Drawing.Size(559, 49)
+ Me.gbPTO.TabIndex = 0
+ Me.gbPTO.TabStop = False
+ Me.gbPTO.Text = "PTO Design Variant"
'
'pnPTO
'
- Me.pnPTO.Controls.Add(Me.pnPtoMode1)
- Me.pnPTO.Controls.Add(Me.pnPtoMode3)
- Me.pnPTO.Controls.Add(Me.gbPTODrive)
- 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(6, 73)
+ Me.pnPTO.BackColor = System.Drawing.Color.Transparent
+ Me.pnPTO.Controls.Add(Me.GroupBox2)
+ Me.pnPTO.Controls.Add(Me.gbPTOICEGroupBox)
+ Me.pnPTO.Controls.Add(Me.gbEPTO)
+ Me.pnPTO.Location = New System.Drawing.Point(0, 52)
+ Me.pnPTO.Margin = New System.Windows.Forms.Padding(0)
Me.pnPTO.Name = "pnPTO"
- Me.pnPTO.Size = New System.Drawing.Size(633, 211)
- Me.pnPTO.TabIndex = 1
- '
- 'pnPtoMode1
- '
- Me.pnPtoMode1.Controls.Add(Me.Label16)
- Me.pnPtoMode1.Controls.Add(Me.tbPTOCycle)
- Me.pnPtoMode1.Controls.Add(Me.btPTOCycle)
- Me.pnPtoMode1.Location = New System.Drawing.Point(2, 47)
- Me.pnPtoMode1.Margin = New System.Windows.Forms.Padding(2)
- Me.pnPtoMode1.Name = "pnPtoMode1"
- Me.pnPtoMode1.Size = New System.Drawing.Size(466, 48)
- Me.pnPtoMode1.TabIndex = 2
- '
- 'Label16
- '
- Me.Label16.Location = New System.Drawing.Point(3, 4)
- Me.Label16.Name = "Label16"
- 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
- '
- 'btPTOCycle
- '
- Me.btPTOCycle.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btPTOCycle.Location = New System.Drawing.Point(438, 21)
- Me.btPTOCycle.Name = "btPTOCycle"
- Me.btPTOCycle.Size = New System.Drawing.Size(24, 24)
- Me.btPTOCycle.TabIndex = 3
- Me.btPTOCycle.UseVisualStyleBackColor = True
+ Me.pnPTO.Size = New System.Drawing.Size(751, 365)
+ Me.pnPTO.TabIndex = 5
+ '
+ 'GroupBox2
+ '
+ Me.GroupBox2.Controls.Add(Me.ComboBox1)
+ Me.GroupBox2.Location = New System.Drawing.Point(4, 3)
+ Me.GroupBox2.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.GroupBox2.Name = "GroupBox2"
+ Me.GroupBox2.Padding = New System.Windows.Forms.Padding(4)
+ Me.GroupBox2.Size = New System.Drawing.Size(556, 50)
+ Me.GroupBox2.TabIndex = 4
+ Me.GroupBox2.TabStop = False
+ Me.GroupBox2.Text = "Stand still PTO cycle type"
+ '
+ 'ComboBox1
+ '
+ Me.ComboBox1.Dock = System.Windows.Forms.DockStyle.Fill
+ Me.ComboBox1.FormattingEnabled = True
+ Me.ComboBox1.Location = New System.Drawing.Point(4, 20)
+ Me.ComboBox1.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.ComboBox1.Name = "ComboBox1"
+ Me.ComboBox1.Size = New System.Drawing.Size(548, 23)
+ Me.ComboBox1.TabIndex = 3
+ '
+ 'gbPTOICEGroupBox
+ '
+ Me.gbPTOICEGroupBox.BackColor = System.Drawing.Color.Transparent
+ Me.gbPTOICEGroupBox.Controls.Add(Me.pnPtoMode3)
+ Me.gbPTOICEGroupBox.Controls.Add(Me.gbPTODrive)
+ Me.gbPTOICEGroupBox.Controls.Add(Me.pnPtoMode1)
+ Me.gbPTOICEGroupBox.Controls.Add(Me.gbPTOLossmap)
+ Me.gbPTOICEGroupBox.Location = New System.Drawing.Point(3, 59)
+ Me.gbPTOICEGroupBox.Name = "gbPTOICEGroupBox"
+ Me.gbPTOICEGroupBox.Size = New System.Drawing.Size(557, 225)
+ Me.gbPTOICEGroupBox.TabIndex = 2
+ Me.gbPTOICEGroupBox.TabStop = False
+ Me.gbPTOICEGroupBox.Text = "PTO Consumer driven by ICE"
'
'pnPtoMode3
'
Me.pnPtoMode3.Controls.Add(Me.tbPTODrive)
Me.pnPtoMode3.Controls.Add(Me.btPTOCycleDrive)
- Me.pnPtoMode3.Controls.Add(Me.Label28)
- Me.pnPtoMode3.Location = New System.Drawing.Point(2, 158)
- Me.pnPtoMode3.Margin = New System.Windows.Forms.Padding(2)
+ Me.pnPtoMode3.Dock = System.Windows.Forms.DockStyle.Top
+ Me.pnPtoMode3.Location = New System.Drawing.Point(3, 174)
+ Me.pnPtoMode3.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.pnPtoMode3.Name = "pnPtoMode3"
- Me.pnPtoMode3.Size = New System.Drawing.Size(465, 51)
+ Me.pnPtoMode3.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.pnPtoMode3.Size = New System.Drawing.Size(551, 51)
Me.pnPtoMode3.TabIndex = 2
+ Me.pnPtoMode3.TabStop = False
+ Me.pnPtoMode3.Text = "PTO Cycle during driving (PTO mode 3) (.vptor)"
'
'btPTOCycleDrive
'
+ Me.btPTOCycleDrive.Dock = System.Windows.Forms.DockStyle.Right
Me.btPTOCycleDrive.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btPTOCycleDrive.Location = New System.Drawing.Point(435, 18)
+ Me.btPTOCycleDrive.Location = New System.Drawing.Point(519, 19)
+ Me.btPTOCycleDrive.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btPTOCycleDrive.Name = "btPTOCycleDrive"
- Me.btPTOCycleDrive.Size = New System.Drawing.Size(24, 24)
+ Me.btPTOCycleDrive.Size = New System.Drawing.Size(28, 29)
Me.btPTOCycleDrive.TabIndex = 6
Me.btPTOCycleDrive.UseVisualStyleBackColor = True
'
- 'Label28
- '
- Me.Label28.Location = New System.Drawing.Point(-1, 1)
- Me.Label28.Name = "Label28"
- 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
- '
'gbPTODrive
'
Me.gbPTODrive.Controls.Add(Me.Label27)
@@ -2224,9 +2440,12 @@ 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(0, 99)
+ Me.gbPTODrive.Dock = System.Windows.Forms.DockStyle.Top
+ Me.gbPTODrive.Location = New System.Drawing.Point(3, 111)
+ Me.gbPTODrive.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.gbPTODrive.Name = "gbPTODrive"
- Me.gbPTODrive.Size = New System.Drawing.Size(633, 55)
+ Me.gbPTODrive.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.gbPTODrive.Size = New System.Drawing.Size(551, 63)
Me.gbPTODrive.TabIndex = 4
Me.gbPTODrive.TabStop = False
Me.gbPTODrive.Text = "Working operation settings (PTO mode 2)"
@@ -2234,100 +2453,175 @@ Partial Class VehicleForm
'Label27
'
Me.Label27.AutoSize = True
- Me.Label27.Location = New System.Drawing.Point(446, 24)
+ Me.Label27.Location = New System.Drawing.Point(520, 28)
+ Me.Label27.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label27.Name = "Label27"
- Me.Label27.Size = New System.Drawing.Size(20, 13)
+ Me.Label27.Size = New System.Drawing.Size(22, 15)
Me.Label27.TabIndex = 6
Me.Label27.Text = "[#]"
Me.Label27.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
'
'tbPtoGear
'
- Me.tbPtoGear.Location = New System.Drawing.Point(371, 21)
+ Me.tbPtoGear.Location = New System.Drawing.Point(433, 24)
+ Me.tbPtoGear.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbPtoGear.Name = "tbPtoGear"
- Me.tbPtoGear.Size = New System.Drawing.Size(70, 20)
+ Me.tbPtoGear.Size = New System.Drawing.Size(81, 23)
Me.tbPtoGear.TabIndex = 1
'
'Label26
'
Me.Label26.AutoSize = True
- Me.Label26.Location = New System.Drawing.Point(189, 24)
+ Me.Label26.Location = New System.Drawing.Point(220, 28)
+ Me.Label26.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label26.Name = "Label26"
- Me.Label26.Size = New System.Drawing.Size(30, 13)
+ Me.Label26.Size = New System.Drawing.Size(37, 15)
Me.Label26.TabIndex = 4
Me.Label26.Text = "[rpm]"
Me.Label26.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
'
'tbPtoEngineSpeed
'
- Me.tbPtoEngineSpeed.Location = New System.Drawing.Point(113, 21)
+ Me.tbPtoEngineSpeed.Location = New System.Drawing.Point(132, 24)
+ Me.tbPtoEngineSpeed.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.tbPtoEngineSpeed.Name = "tbPtoEngineSpeed"
- Me.tbPtoEngineSpeed.Size = New System.Drawing.Size(70, 20)
+ Me.tbPtoEngineSpeed.Size = New System.Drawing.Size(81, 23)
Me.tbPtoEngineSpeed.TabIndex = 0
'
'Label25
'
Me.Label25.AutoSize = True
- Me.Label25.Location = New System.Drawing.Point(297, 24)
+ Me.Label25.Location = New System.Drawing.Point(346, 28)
+ Me.Label25.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label25.Name = "Label25"
- Me.Label25.Size = New System.Drawing.Size(68, 13)
+ Me.Label25.Size = New System.Drawing.Size(76, 15)
Me.Label25.TabIndex = 1
Me.Label25.Text = "Gear number"
'
'Label24
'
Me.Label24.AutoSize = True
- Me.Label24.Location = New System.Drawing.Point(7, 24)
+ Me.Label24.Location = New System.Drawing.Point(8, 28)
+ Me.Label24.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label24.Name = "Label24"
- Me.Label24.Size = New System.Drawing.Size(97, 13)
+ Me.Label24.Size = New System.Drawing.Size(105, 15)
Me.Label24.TabIndex = 0
Me.Label24.Text = "Min. Engine Speed"
'
+ 'pnPtoMode1
+ '
+ Me.pnPtoMode1.Controls.Add(Me.tbPTOCycle)
+ Me.pnPtoMode1.Controls.Add(Me.btPTOCycle)
+ Me.pnPtoMode1.Dock = System.Windows.Forms.DockStyle.Top
+ Me.pnPtoMode1.Location = New System.Drawing.Point(3, 65)
+ Me.pnPtoMode1.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.pnPtoMode1.Name = "pnPtoMode1"
+ Me.pnPtoMode1.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.pnPtoMode1.Size = New System.Drawing.Size(551, 46)
+ Me.pnPtoMode1.TabIndex = 2
+ Me.pnPtoMode1.TabStop = False
+ Me.pnPtoMode1.Text = "PTO Cycle during standstill (PTO mode 1) (.vptoc)"
+ '
+ 'btPTOCycle
+ '
+ Me.btPTOCycle.Dock = System.Windows.Forms.DockStyle.Right
+ Me.btPTOCycle.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
+ Me.btPTOCycle.Location = New System.Drawing.Point(519, 19)
+ Me.btPTOCycle.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.btPTOCycle.Name = "btPTOCycle"
+ Me.btPTOCycle.Size = New System.Drawing.Size(28, 24)
+ Me.btPTOCycle.TabIndex = 3
+ Me.btPTOCycle.UseVisualStyleBackColor = True
+ '
+ 'gbPTOLossmap
+ '
+ Me.gbPTOLossmap.Controls.Add(Me.btPTOLossMapBrowse)
+ Me.gbPTOLossmap.Controls.Add(Me.tbPTOLossMap)
+ Me.gbPTOLossmap.Dock = System.Windows.Forms.DockStyle.Top
+ Me.gbPTOLossmap.Location = New System.Drawing.Point(3, 19)
+ Me.gbPTOLossmap.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.gbPTOLossmap.Name = "gbPTOLossmap"
+ Me.gbPTOLossmap.Size = New System.Drawing.Size(551, 46)
+ Me.gbPTOLossmap.TabIndex = 3
+ Me.gbPTOLossmap.TabStop = False
+ Me.gbPTOLossmap.Text = "PTO Consumer Loss Map (.vptoi)"
+ '
'btPTOLossMapBrowse
'
+ Me.btPTOLossMapBrowse.Dock = System.Windows.Forms.DockStyle.Right
Me.btPTOLossMapBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btPTOLossMapBrowse.Location = New System.Drawing.Point(438, 22)
+ Me.btPTOLossMapBrowse.Location = New System.Drawing.Point(520, 19)
+ Me.btPTOLossMapBrowse.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.btPTOLossMapBrowse.Name = "btPTOLossMapBrowse"
- Me.btPTOLossMapBrowse.Size = New System.Drawing.Size(24, 24)
+ Me.btPTOLossMapBrowse.Size = New System.Drawing.Size(28, 24)
Me.btPTOLossMapBrowse.TabIndex = 1
Me.btPTOLossMapBrowse.UseVisualStyleBackColor = True
'
- 'Label7
+ 'gbEPTO
+ '
+ Me.gbEPTO.Controls.Add(Me.GroupBox5)
+ Me.gbEPTO.Location = New System.Drawing.Point(3, 290)
+ Me.gbEPTO.Name = "gbEPTO"
+ Me.gbEPTO.Size = New System.Drawing.Size(557, 72)
+ Me.gbEPTO.TabIndex = 6
+ Me.gbEPTO.TabStop = False
+ Me.gbEPTO.Text = "E-PTO"
+ '
+ 'GroupBox5
+ '
+ Me.GroupBox5.Controls.Add(Me.btnPTOelCycle)
+ Me.GroupBox5.Controls.Add(Me.tbPTOElectricCycle)
+ Me.GroupBox5.Dock = System.Windows.Forms.DockStyle.Top
+ Me.GroupBox5.Location = New System.Drawing.Point(3, 19)
+ Me.GroupBox5.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.GroupBox5.Name = "GroupBox5"
+ Me.GroupBox5.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.GroupBox5.Size = New System.Drawing.Size(551, 47)
+ Me.GroupBox5.TabIndex = 9
+ Me.GroupBox5.TabStop = False
+ Me.GroupBox5.Text = "PTO Cycle electric power during standstill (.vptol)"
+ '
+ 'btnPTOelCycle
+ '
+ Me.btnPTOelCycle.Dock = System.Windows.Forms.DockStyle.Right
+ Me.btnPTOelCycle.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
+ Me.btnPTOelCycle.Location = New System.Drawing.Point(519, 19)
+ Me.btnPTOelCycle.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+ Me.btnPTOelCycle.Name = "btnPTOelCycle"
+ Me.btnPTOelCycle.Size = New System.Drawing.Size(28, 25)
+ Me.btnPTOelCycle.TabIndex = 8
+ Me.btnPTOelCycle.UseVisualStyleBackColor = True
'
- Me.Label7.Location = New System.Drawing.Point(3, 5)
- Me.Label7.Name = "Label7"
- 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
- '
- 'gbPTO
+ 'lblNotePtoPEV_HEVS
'
- Me.gbPTO.Controls.Add(Me.cbPTOType)
- Me.gbPTO.Location = New System.Drawing.Point(6, 6)
- Me.gbPTO.Name = "gbPTO"
- Me.gbPTO.Size = New System.Drawing.Size(633, 61)
- Me.gbPTO.TabIndex = 0
- Me.gbPTO.TabStop = False
- Me.gbPTO.Text = "PTO Design Variant"
+ Me.lblNotePtoPEV_HEVS.AutoSize = True
+ Me.lblNotePtoPEV_HEVS.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point)
+ Me.lblNotePtoPEV_HEVS.Location = New System.Drawing.Point(2, 417)
+ Me.lblNotePtoPEV_HEVS.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0)
+ Me.lblNotePtoPEV_HEVS.Name = "lblNotePtoPEV_HEVS"
+ Me.lblNotePtoPEV_HEVS.Size = New System.Drawing.Size(333, 13)
+ Me.lblNotePtoPEV_HEVS.TabIndex = 2
+ Me.lblNotePtoPEV_HEVS.Text = "Note: PTO losses are only considered for vehicles of type E2 and S2!"
'
'cbLegislativeClass
'
Me.cbLegislativeClass.DisplayMember = "Value"
Me.cbLegislativeClass.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
Me.cbLegislativeClass.FormattingEnabled = True
- Me.cbLegislativeClass.Location = New System.Drawing.Point(220, 140)
+ Me.cbLegislativeClass.Location = New System.Drawing.Point(257, 162)
+ Me.cbLegislativeClass.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
Me.cbLegislativeClass.Name = "cbLegislativeClass"
- Me.cbLegislativeClass.Size = New System.Drawing.Size(52, 21)
+ Me.cbLegislativeClass.Size = New System.Drawing.Size(60, 23)
Me.cbLegislativeClass.TabIndex = 4
Me.cbLegislativeClass.ValueMember = "Key"
'
'Label21
'
Me.Label21.AutoSize = True
- Me.Label21.Location = New System.Drawing.Point(32, 123)
+ Me.Label21.Location = New System.Drawing.Point(37, 142)
+ Me.Label21.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label21.Name = "Label21"
- Me.Label21.Size = New System.Drawing.Size(112, 13)
+ Me.Label21.Size = New System.Drawing.Size(127, 15)
Me.Label21.TabIndex = 42
Me.Label21.Text = "Maximum Laden Mass"
'
@@ -2335,8 +2629,9 @@ 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.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.lblTitle.Location = New System.Drawing.Point(117, 34)
+ Me.lblTitle.Font = New System.Drawing.Font("Microsoft Sans Serif", 18.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point)
+ Me.lblTitle.Location = New System.Drawing.Point(136, 39)
+ Me.lblTitle.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.lblTitle.Name = "lblTitle"
Me.lblTitle.Size = New System.Drawing.Size(166, 29)
Me.lblTitle.TabIndex = 43
@@ -2345,10 +2640,10 @@ Partial Class VehicleForm
'VehicleForm
'
Me.AcceptButton = Me.ButOK
- Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 15.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.CancelButton = Me.ButCancel
- Me.ClientSize = New System.Drawing.Size(666, 625)
+ Me.ClientSize = New System.Drawing.Size(777, 721)
Me.Controls.Add(Me.lblTitle)
Me.Controls.Add(Me.Label21)
Me.Controls.Add(Me.cbLegislativeClass)
@@ -2368,6 +2663,7 @@ 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, 3, 4, 3)
Me.MaximizeBox = False
Me.Name = "VehicleForm"
Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
@@ -2442,129 +2738,133 @@ Partial Class VehicleForm
Me.pnEcoRoll.ResumeLayout(False)
Me.pnEcoRoll.PerformLayout()
Me.tpRoadSweeper.ResumeLayout(False)
- Me.tpRoadSweeper.PerformLayout()
+ Me.FlowLayoutPanel3.ResumeLayout(False)
+ Me.FlowLayoutPanel3.PerformLayout()
+ Me.Panel2.ResumeLayout(False)
+ Me.gbPTO.ResumeLayout(False)
Me.pnPTO.ResumeLayout(False)
- Me.pnPTO.PerformLayout()
- Me.pnPtoMode1.ResumeLayout(False)
- Me.pnPtoMode1.PerformLayout()
+ Me.GroupBox2.ResumeLayout(False)
+ Me.gbPTOICEGroupBox.ResumeLayout(False)
Me.pnPtoMode3.ResumeLayout(False)
Me.pnPtoMode3.PerformLayout()
Me.gbPTODrive.ResumeLayout(False)
Me.gbPTODrive.PerformLayout()
- Me.gbPTO.ResumeLayout(False)
+ Me.pnPtoMode1.ResumeLayout(False)
+ Me.pnPtoMode1.PerformLayout()
+ Me.gbPTOLossmap.ResumeLayout(False)
+ Me.gbPTOLossmap.PerformLayout()
+ Me.gbEPTO.ResumeLayout(False)
+ Me.GroupBox5.ResumeLayout(False)
+ Me.GroupBox5.PerformLayout()
Me.ResumeLayout(False)
- Me.PerformLayout
+ 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 gbRetarderLosses 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 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 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 gbAngledrive As System.Windows.Forms.GroupBox
- Friend WithEvents cbAngledriveType 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 pnAngledriveFields 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 tbAngledriveRatio As System.Windows.Forms.TextBox
- Friend WithEvents btAngledriveLossMapBrowse As System.Windows.Forms.Button
- Friend WithEvents tbAngledriveLossMapPath As System.Windows.Forms.TextBox
- Friend WithEvents ToolTip1 As System.Windows.Forms.ToolTip
- Friend WithEvents GroupBox3 As System.Windows.Forms.GroupBox
-'<<<<<<< HEAD
- 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
- Friend WithEvents tcVehicleComponents As System.Windows.Forms.TabControl
- Friend WithEvents tpGeneral As System.Windows.Forms.TabPage
- Friend WithEvents tpPowertrain As System.Windows.Forms.TabPage
- Friend WithEvents tpTorqueLimits As System.Windows.Forms.TabPage
-'=======
-' Friend WithEvents TabControl1 As System.Windows.Forms.TabControl
-' Friend WithEvents TabPage1 As System.Windows.Forms.TabPage
-' Friend WithEvents TabPage2 As System.Windows.Forms.TabPage
-' Friend WithEvents TabPage3 As System.Windows.Forms.TabPage
- Friend WithEvents Label17 As System.Windows.Forms.Label
- Friend WithEvents btDelMaxTorqueEntry As System.Windows.Forms.Button
- Friend WithEvents btAddMaxTorqueEntry As System.Windows.Forms.Button
- Friend WithEvents lvTorqueLimits As System.Windows.Forms.ListView
- Friend WithEvents ColumnHeader5 As System.Windows.Forms.ColumnHeader
- Friend WithEvents ColumnHeader6 As System.Windows.Forms.ColumnHeader
- Friend WithEvents ColumnHeader10 As System.Windows.Forms.ColumnHeader
+ 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 gbRetarderLosses 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 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 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 gbAngledrive As System.Windows.Forms.GroupBox
+ Friend WithEvents cbAngledriveType 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 pnAngledriveFields 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 tbAngledriveRatio As System.Windows.Forms.TextBox
+ Friend WithEvents btAngledriveLossMapBrowse As System.Windows.Forms.Button
+ Friend WithEvents tbAngledriveLossMapPath As System.Windows.Forms.TextBox
+ Friend WithEvents ToolTip1 As System.Windows.Forms.ToolTip
+ Friend WithEvents GroupBox3 As System.Windows.Forms.GroupBox
+ 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 btPTOCycle As System.Windows.Forms.Button
+ Friend WithEvents tbPTOCycle As System.Windows.Forms.TextBox
+ Friend WithEvents tcVehicleComponents As System.Windows.Forms.TabControl
+ Friend WithEvents tpGeneral As System.Windows.Forms.TabPage
+ Friend WithEvents tpPowertrain As System.Windows.Forms.TabPage
+ Friend WithEvents tpTorqueLimits As System.Windows.Forms.TabPage
+ '=======
+ ' Friend WithEvents TabControl1 As System.Windows.Forms.TabControl
+ ' Friend WithEvents TabPage1 As System.Windows.Forms.TabPage
+ ' Friend WithEvents TabPage2 As System.Windows.Forms.TabPage
+ ' Friend WithEvents TabPage3 As System.Windows.Forms.TabPage
+ Friend WithEvents Label17 As System.Windows.Forms.Label
+ Friend WithEvents btDelMaxTorqueEntry As System.Windows.Forms.Button
+ Friend WithEvents btAddMaxTorqueEntry As System.Windows.Forms.Button
+ Friend WithEvents lvTorqueLimits As System.Windows.Forms.ListView
+ Friend WithEvents ColumnHeader5 As System.Windows.Forms.ColumnHeader
+ Friend WithEvents ColumnHeader6 As System.Windows.Forms.ColumnHeader
+ Friend WithEvents ColumnHeader10 As System.Windows.Forms.ColumnHeader
Friend WithEvents cbLegislativeClass As System.Windows.Forms.ComboBox
Friend WithEvents tbVehicleHeight As System.Windows.Forms.TextBox
Friend WithEvents Label11 As System.Windows.Forms.Label
@@ -2594,7 +2894,7 @@ End Sub
Friend WithEvents gbPropulsionTorque As GroupBox
Friend WithEvents btnPropulsionTorqueLimit As Button
Friend WithEvents tbPropulsionTorqueLimit As TextBox
-'=======
+ '=======
Friend WithEvents tpRoadSweeper As TabPage
Friend WithEvents gbPTODrive As GroupBox
Friend WithEvents tbPtoGear As TextBox
@@ -2613,7 +2913,6 @@ End Sub
'Friend WithEvents tbPTOLossMap As TextBox
Friend WithEvents Label27 As Label
Friend WithEvents btPTOCycleDrive As Button
- Friend WithEvents Label28 As Label
Friend WithEvents tbPTODrive As TextBox
Friend WithEvents tpGensetComponents As TabPage
Friend WithEvents gbGenSet As GroupBox
@@ -2629,9 +2928,9 @@ End Sub
Friend WithEvents btnBrowseGenSetEM As Button
Friend WithEvents tbGenSetEM As TextBox
Friend WithEvents Label30 As Label
- Friend WithEvents Label36 As Label
- Friend WithEvents Label34 As Label
- Friend WithEvents pnEcoRoll As Panel
+ Friend WithEvents Label36 As Label
+ Friend WithEvents Label34 As Label
+ Friend WithEvents pnEcoRoll As Panel
Friend WithEvents tpElectricMachine As TabPage
Friend WithEvents tpReess As TabPage
Friend WithEvents gpElectricMotor As GroupBox
@@ -2678,8 +2977,19 @@ End Sub
Friend WithEvents tbIHPCFilePath As TextBox
Friend WithEvents FlowLayoutPanel1 As FlowLayoutPanel
Friend WithEvents FlowLayoutPanel2 As FlowLayoutPanel
- Friend WithEvents pnPtoMode1 As Panel
- Friend WithEvents pnPtoMode3 As Panel
+ Friend WithEvents pnPtoMode1 As GroupBox
+ Friend WithEvents pnPtoMode3 As GroupBox
Friend WithEvents lblNotePtoPEV_HEVS As Label
+ Friend WithEvents FlowLayoutPanel3 As FlowLayoutPanel
+ Friend WithEvents gbPTOLossmap As GroupBox
+ Friend WithEvents Panel2 As Panel
+ Friend WithEvents pnPTO As FlowLayoutPanel
+ Friend WithEvents GroupBox2 As GroupBox
+ Friend WithEvents ComboBox1 As ComboBox
+ Friend WithEvents gbEPTO As GroupBox
+ Friend WithEvents btnPTOelCycle As Button
+ Friend WithEvents GroupBox5 As GroupBox
+ Friend WithEvents tbPTOElectricCycle As TextBox
+ Friend WithEvents gbPTOICEGroupBox As GroupBox
'>>>>>>> VECTO_CERT/master
End Class
diff --git a/VECTO/GUI/VehicleForm.resx b/VECTO/GUI/VehicleForm.resx
index 33a40094e1fae98cc1903dc11b94458634d1d9a3..4b431164fd87697ca2d98e7988d69f526b9242d5 100644
--- a/VECTO/GUI/VehicleForm.resx
+++ b/VECTO/GUI/VehicleForm.resx
@@ -1,64 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
diff --git a/VECTO/GUI/VehicleForm.vb b/VECTO/GUI/VehicleForm.vb
index c779549038d84c299bfbbe2a9a8c8902a850cb7a..ab0c5fa2bc41ee12bdbc9671a50dfc76de684273 100644
--- a/VECTO/GUI/VehicleForm.vb
+++ b/VECTO/GUI/VehicleForm.vb
@@ -133,6 +133,7 @@ Public Class VehicleForm
cbPTOType.DataSource = DeclarationData.PTOTransmission.GetTechnologies.Select(
Function(technology) New With {.Key = technology, .Value = technology}).ToList()
+
cbLegislativeClass.DataSource = EnumHelper.GetKeyValuePairs(Of LegislativeClass)(Function(t) t.GetLabel())
'cbLegislativeClass.DataSource = EnumHelper.GetValues(Of LegislativeClass).Cast(Of LegislativeClass?).Select( _
' Function(x) New With {.Key = x, .Value = x.GetLabel()}).ToList()
@@ -1504,6 +1505,12 @@ Public Class VehicleForm
End If
End Sub
+ Private Sub btnPTOelCycle_Click(sender As Object, e As EventArgs) Handles btnPTOelCycle.Click
+ If PTODrivingCycleDrivingFileBrowser.OpenDialog(FileRepl(tbPTOElectricCycle.Text, GetPath(_vehFile))) Then
+ tbPTOElectricCycle.Text = GetFilenameWithoutDirectory(PTODrivingCycleDrivingFileBrowser.Files(0), GetPath(_vehFile))
+ End If
+ End Sub
+
Private Sub cbEmPos_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cbEmPos.SelectedIndexChanged
gbRatiosPerGear.Enabled = PowertrainPosition.HybridP2_5.Equals(cbEmPos.SelectedValue)
Dim selectedValue = CbRtType.SelectedValue
@@ -1730,18 +1737,18 @@ Public Class VehicleForm
Dim f = FileRepl(tbIHPCFilePath.Text, GetPath(_vehFile))
IHPCForm.JobDir = GetPath(_vehFile)
- IHPCForm.AutoSendTo = Sub(file, vehicleForm)
- If UCase(FileRepl(vehicleForm.tbIHPCFilePath.Text, JobDir)) <> UCase(file) Then _
- vehicleForm.tbIHPCFilePath.Text = GetFilenameWithoutDirectory(file, JobDir)
- VectoJobForm.UpdatePic()
- End Sub
+ IHPCForm.AutoSendTo = Sub(file, vehicleForm)
+ If UCase(FileRepl(vehicleForm.tbIHPCFilePath.Text, JobDir)) <> UCase(file) Then _
+ vehicleForm.tbIHPCFilePath.Text = GetFilenameWithoutDirectory(file, JobDir)
+ VectoJobForm.UpdatePic()
+ End Sub
- If Not Trim(f) = "" Then
- If Not File.Exists(f) Then
- MsgBox("File not found!")
- Exit Sub
- End If
- End If
+ If Not Trim(f) = "" Then
+ If Not File.Exists(f) Then
+ MsgBox("File not found!")
+ Exit Sub
+ End If
+ End If
If Not IHPCForm.Visible Then
IHPCForm.ClearIHPC()
@@ -1759,4 +1766,6 @@ Public Class VehicleForm
End Try
End If
End Sub
+
+
End Class
\ No newline at end of file
diff --git a/VECTO/VECTO.vbproj b/VECTO/VECTO.vbproj
index be55af27d43b130263c978a615c569a771b6187d..bc178b10deca42e95cbd9bec019c4d33ab300b2c 100644
--- a/VECTO/VECTO.vbproj
+++ b/VECTO/VECTO.vbproj
@@ -8,7 +8,7 @@
<OptionStrict>On</OptionStrict>
<UseWindowsForms>true</UseWindowsForms>
<MyType>WindowsForms</MyType>
- <TargetFrameworks>net45;net48;net6.0-windows</TargetFrameworks>
+ <TargetFrameworks>net6.0-windows</TargetFrameworks>
<TargetFrameworks Condition="'$(Configuration)' == 'Release'">net45;net48;net6.0-windows</TargetFrameworks>
<TargetFrameworks Condition="'$(Configuration)' == 'Deploy'">net45;net48;net6.0-windows</TargetFrameworks>
<TargetFrameworks Condition="'$(Configuration)' == 'MockupDeploy'">net45;net48;net6.0-windows</TargetFrameworks>