From 10d9eb614294e1ed40bdbb40f544c5826b43f971 Mon Sep 17 00:00:00 2001
From: Raphael Kalchgruber <kalchgruber@ivt.tugraz.at>
Date: Mon, 29 Aug 2022 12:38:22 +0200
Subject: [PATCH] corrected design issues, labels; gui checks for input values.
---
VECTO/ApplicationEvents.vb | 4 +-
VECTO/GUI/BatteryForm.vb | 46 +-
VECTO/GUI/ElectricMotorForm.Designer.vb | 102 +-
VECTO/GUI/EngineForm.Designer.vb | 52 +-
VECTO/GUI/GearboxForm.Designer.vb | 4 +-
VECTO/GUI/IEPCForm.Designer.vb | 817 ++++----
VECTO/GUI/IEPCForm.vb | 4 +-
VECTO/GUI/IHPCForm.Designer.vb | 200 +-
VECTO/GUI/MainForm.Designer.vb | 400 ++--
VECTO/GUI/MainForm.resx | 5 +-
VECTO/GUI/MainForm.vb | 3 +
VECTO/GUI/REESSPackDialog.vb | 17 +-
VECTO/GUI/VectoJobForm.vb | 196 +-
VECTO/GUI/VehicleForm.Designer.vb | 1692 ++++++++---------
VECTO/GUI/VehicleForm.resx | 2 +-
VECTO/GUI/VehicleForm.vb | 159 +-
VECTO/MainModule.vb | 54 +-
.../VectoCore/Models/Declaration/Axle.cs | 2 +-
.../Models/Declaration/TruckSegments.cs | 6 +
.../Resources/Declaration/SegmentTable.csv | 6 +-
20 files changed, 1903 insertions(+), 1868 deletions(-)
diff --git a/VECTO/ApplicationEvents.vb b/VECTO/ApplicationEvents.vb
index 8a39fabeeb..4dd1755f4b 100644
--- a/VECTO/ApplicationEvents.vb
+++ b/VECTO/ApplicationEvents.vb
@@ -84,8 +84,8 @@ Namespace My
'Log
LogFile = New FileLogger
If Not LogFile.StartLog() Then
- MsgBox("Error! Can't access log file. Application folder needs read/write permissions!")
- e.Cancel = True
+ MsgBox("Error! Can't access log file. Application folder needs read/write permissions! Check if VECTO is already running.")
+ e.Cancel = True
End If
If Not Directory.Exists(MyConfPath) Then
diff --git a/VECTO/GUI/BatteryForm.vb b/VECTO/GUI/BatteryForm.vb
index c7ecaefbf7..e548b9001f 100644
--- a/VECTO/GUI/BatteryForm.vb
+++ b/VECTO/GUI/BatteryForm.vb
@@ -300,12 +300,12 @@ Public Class BatteryForm
superCap.MinV = _tbSuperCapMinV.Text.ToDouble(0)
superCap.MaxV = tbSuperCapMaxV.Text.ToDouble(0)
- superCap.MaxChgCurrent = tbSuperCapMaxCurrentCharge.Text.ToDouble()
- superCap.MaxDischgCurrent = tbSuperCapMaxCurrentDischarge.Text.ToDouble()
+ superCap.MaxChgCurrent = tbSuperCapMaxCurrentCharge.Text.ToDouble(0)
+ superCap.MaxDischgCurrent = tbSuperCapMaxCurrentDischarge.Text.ToDouble(0)
Return superCap
End Function
- Private Function FillBattery(file As string) As Battery
+ Private Function FillBattery(file As String) As Battery
Dim battery As Battery = New Battery
battery.FilePath = file
@@ -323,7 +323,47 @@ Public Class BatteryForm
battery.PathMaxCurrentCurve = tbMaxCurrentMap.Text
Return battery
End Function
+ Private Sub tbCapacity_Leave(sender As Object, e As System.EventArgs) Handles tbCapacity.Leave
+ If Not IsNumeric(tbCapacity.Text) Then
+ MsgBox("Invalid capacity value")
+ tbCapacity.Focus()
+ Return
+ End If
+ If Not 0 < Convert.ToInt32(tbCapacity.Text) Then
+ MsgBox("Input has to be positive")
+ tbCapacity.Focus()
+ Return
+ End If
+ End Sub
+
+ Private Sub tbSoCMin_Leave(sender As Object, e As System.EventArgs) Handles tbSoCMin.Leave
+
+ If Not IsNumeric(tbSoCMin.Text) Then
+ MsgBox("Invalid SoC Min value")
+ tbSoCMin.Focus()
+ Return
+ End If
+ If Not 0 < Convert.ToInt32(tbSoCMin.Text) Then
+ MsgBox("Input has to be positive")
+ tbSoCMin.Focus()
+ Return
+ End If
+ End Sub
+
+ Private Sub tbSoCMax_Leave(sender As Object, e As System.EventArgs) Handles tbSoCMax.Leave
+
+ If Not IsNumeric(tbSoCMax.Text) Then
+ MsgBox("Invalid SoC Max value")
+ tbSoCMax.Focus()
+ Return
+ End If
+ If Not 0 < Convert.ToInt32(tbSoCMax.Text) Then
+ MsgBox("Input has to be positive")
+ tbSoCMax.Focus()
+ Return
+ End If
+ End Sub
#Region "Track changes"
diff --git a/VECTO/GUI/ElectricMotorForm.Designer.vb b/VECTO/GUI/ElectricMotorForm.Designer.vb
index d7453bab60..ab1c0be226 100644
--- a/VECTO/GUI/ElectricMotorForm.Designer.vb
+++ b/VECTO/GUI/ElectricMotorForm.Designer.vb
@@ -395,27 +395,27 @@ Partial Class ElectricMotorForm
'btnMaxTorqueCurveOpenHi
'
Me.btnMaxTorqueCurveOpenHi.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btnMaxTorqueCurveOpenHi.Location = New System.Drawing.Point(441, 49)
+ Me.btnMaxTorqueCurveOpenHi.Location = New System.Drawing.Point(441, 48)
Me.btnMaxTorqueCurveOpenHi.Name = "btnMaxTorqueCurveOpenHi"
Me.btnMaxTorqueCurveOpenHi.Size = New System.Drawing.Size(24, 24)
Me.btnMaxTorqueCurveOpenHi.TabIndex = 46
- Me.btnMaxTorqueCurveOpenHi.TabStop = false
- Me.btnMaxTorqueCurveOpenHi.UseVisualStyleBackColor = true
+ Me.btnMaxTorqueCurveOpenHi.TabStop = False
+ Me.btnMaxTorqueCurveOpenHi.UseVisualStyleBackColor = True
'
'btnBrowseMaxTorqueHi
'
Me.btnBrowseMaxTorqueHi.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btnBrowseMaxTorqueHi.Location = New System.Drawing.Point(419, 49)
+ Me.btnBrowseMaxTorqueHi.Location = New System.Drawing.Point(419, 48)
Me.btnBrowseMaxTorqueHi.Name = "btnBrowseMaxTorqueHi"
Me.btnBrowseMaxTorqueHi.Size = New System.Drawing.Size(24, 24)
Me.btnBrowseMaxTorqueHi.TabIndex = 45
- Me.btnBrowseMaxTorqueHi.TabStop = false
- Me.btnBrowseMaxTorqueHi.UseVisualStyleBackColor = true
+ Me.btnBrowseMaxTorqueHi.TabStop = False
+ Me.btnBrowseMaxTorqueHi.UseVisualStyleBackColor = True
'
'lblMaxTorqueHi
'
- Me.lblMaxTorqueHi.AutoSize = true
- Me.lblMaxTorqueHi.Location = New System.Drawing.Point(5, 35)
+ Me.lblMaxTorqueHi.AutoSize = True
+ Me.lblMaxTorqueHi.Location = New System.Drawing.Point(5, 34)
Me.lblMaxTorqueHi.Name = "lblMaxTorqueHi"
Me.lblMaxTorqueHi.Size = New System.Drawing.Size(222, 13)
Me.lblMaxTorqueHi.TabIndex = 47
@@ -423,16 +423,16 @@ Partial Class ElectricMotorForm
'
'tbMaxTorqueHi
'
- Me.tbMaxTorqueHi.Location = New System.Drawing.Point(5, 51)
+ Me.tbMaxTorqueHi.Location = New System.Drawing.Point(5, 50)
Me.tbMaxTorqueHi.Name = "tbMaxTorqueHi"
Me.tbMaxTorqueHi.Size = New System.Drawing.Size(406, 20)
Me.tbMaxTorqueHi.TabIndex = 44
'
'lblTitle
'
- Me.lblTitle.AutoSize = true
+ Me.lblTitle.AutoSize = True
Me.lblTitle.BackColor = System.Drawing.Color.White
- Me.lblTitle.Font = New System.Drawing.Font("Microsoft Sans Serif", 18!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ Me.lblTitle.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(119, 34)
Me.lblTitle.Name = "lblTitle"
Me.lblTitle.Size = New System.Drawing.Size(190, 29)
@@ -447,7 +447,7 @@ Partial Class ElectricMotorForm
Me.PicBox.Name = "PicBox"
Me.PicBox.Size = New System.Drawing.Size(382, 266)
Me.PicBox.TabIndex = 49
- Me.PicBox.TabStop = false
+ Me.PicBox.TabStop = False
'
'Panel1
'
@@ -461,7 +461,7 @@ Partial Class ElectricMotorForm
'
'lblContTq
'
- Me.lblContTq.AutoSize = true
+ Me.lblContTq.AutoSize = True
Me.lblContTq.Location = New System.Drawing.Point(3, 7)
Me.lblContTq.Name = "lblContTq"
Me.lblContTq.Size = New System.Drawing.Size(100, 13)
@@ -470,7 +470,7 @@ Partial Class ElectricMotorForm
'
'lblContTqUnit
'
- Me.lblContTqUnit.AutoSize = true
+ Me.lblContTqUnit.AutoSize = True
Me.lblContTqUnit.Location = New System.Drawing.Point(182, 8)
Me.lblContTqUnit.Name = "lblContTqUnit"
Me.lblContTqUnit.Size = New System.Drawing.Size(29, 13)
@@ -496,7 +496,7 @@ Partial Class ElectricMotorForm
'
'lblOvlTime
'
- Me.lblOvlTime.AutoSize = true
+ Me.lblOvlTime.AutoSize = True
Me.lblOvlTime.Location = New System.Drawing.Point(3, 7)
Me.lblOvlTime.Name = "lblOvlTime"
Me.lblOvlTime.Size = New System.Drawing.Size(96, 13)
@@ -505,7 +505,7 @@ Partial Class ElectricMotorForm
'
'lblOvltimeUnit
'
- Me.lblOvltimeUnit.AutoSize = true
+ Me.lblOvltimeUnit.AutoSize = True
Me.lblOvltimeUnit.Location = New System.Drawing.Point(180, 7)
Me.lblOvltimeUnit.Name = "lblOvltimeUnit"
Me.lblOvltimeUnit.Size = New System.Drawing.Size(18, 13)
@@ -531,7 +531,7 @@ Partial Class ElectricMotorForm
'
'lblOvlRecovery
'
- Me.lblOvlRecovery.AutoSize = true
+ Me.lblOvlRecovery.AutoSize = True
Me.lblOvlRecovery.Location = New System.Drawing.Point(-2, 8)
Me.lblOvlRecovery.Name = "lblOvlRecovery"
Me.lblOvlRecovery.Size = New System.Drawing.Size(176, 13)
@@ -540,7 +540,7 @@ Partial Class ElectricMotorForm
'
'lblOvlRecoveryFactorUnit
'
- Me.lblOvlRecoveryFactorUnit.AutoSize = true
+ Me.lblOvlRecoveryFactorUnit.AutoSize = True
Me.lblOvlRecoveryFactorUnit.Location = New System.Drawing.Point(230, 7)
Me.lblOvlRecoveryFactorUnit.Name = "lblOvlRecoveryFactorUnit"
Me.lblOvlRecoveryFactorUnit.Size = New System.Drawing.Size(16, 13)
@@ -566,7 +566,7 @@ Partial Class ElectricMotorForm
'
'lblRatedSpeed
'
- Me.lblRatedSpeed.AutoSize = true
+ Me.lblRatedSpeed.AutoSize = True
Me.lblRatedSpeed.Location = New System.Drawing.Point(3, 7)
Me.lblRatedSpeed.Name = "lblRatedSpeed"
Me.lblRatedSpeed.Size = New System.Drawing.Size(158, 13)
@@ -575,7 +575,7 @@ Partial Class ElectricMotorForm
'
'lblRatedSpeedUnit
'
- Me.lblRatedSpeedUnit.AutoSize = true
+ Me.lblRatedSpeedUnit.AutoSize = True
Me.lblRatedSpeedUnit.Location = New System.Drawing.Point(229, 7)
Me.lblRatedSpeedUnit.Name = "lblRatedSpeedUnit"
Me.lblRatedSpeedUnit.Size = New System.Drawing.Size(30, 13)
@@ -601,7 +601,7 @@ Partial Class ElectricMotorForm
'
'lblOverloadTq
'
- Me.lblOverloadTq.AutoSize = true
+ Me.lblOverloadTq.AutoSize = True
Me.lblOverloadTq.Location = New System.Drawing.Point(3, 7)
Me.lblOverloadTq.Name = "lblOverloadTq"
Me.lblOverloadTq.Size = New System.Drawing.Size(90, 13)
@@ -610,7 +610,7 @@ Partial Class ElectricMotorForm
'
'lblOverloadTqUnit
'
- Me.lblOverloadTqUnit.AutoSize = true
+ Me.lblOverloadTqUnit.AutoSize = True
Me.lblOverloadTqUnit.Location = New System.Drawing.Point(182, 8)
Me.lblOverloadTqUnit.Name = "lblOverloadTqUnit"
Me.lblOverloadTqUnit.Size = New System.Drawing.Size(29, 13)
@@ -636,7 +636,7 @@ Partial Class ElectricMotorForm
'
'lblOverloadSpeed
'
- Me.lblOverloadSpeed.AutoSize = true
+ Me.lblOverloadSpeed.AutoSize = True
Me.lblOverloadSpeed.Location = New System.Drawing.Point(3, 7)
Me.lblOverloadSpeed.Name = "lblOverloadSpeed"
Me.lblOverloadSpeed.Size = New System.Drawing.Size(148, 13)
@@ -645,7 +645,7 @@ Partial Class ElectricMotorForm
'
'lblOverloadSpeedUnit
'
- Me.lblOverloadSpeedUnit.AutoSize = true
+ Me.lblOverloadSpeedUnit.AutoSize = True
Me.lblOverloadSpeedUnit.Location = New System.Drawing.Point(229, 7)
Me.lblOverloadSpeedUnit.Name = "lblOverloadSpeedUnit"
Me.lblOverloadSpeedUnit.Size = New System.Drawing.Size(30, 13)
@@ -661,8 +661,8 @@ Partial Class ElectricMotorForm
'
'lblVoltageHi
'
- Me.lblVoltageHi.AutoSize = true
- Me.lblVoltageHi.Location = New System.Drawing.Point(11, 10)
+ Me.lblVoltageHi.AutoSize = True
+ Me.lblVoltageHi.Location = New System.Drawing.Point(11, 9)
Me.lblVoltageHi.Name = "lblVoltageHi"
Me.lblVoltageHi.Size = New System.Drawing.Size(43, 13)
Me.lblVoltageHi.TabIndex = 48
@@ -670,7 +670,7 @@ Partial Class ElectricMotorForm
'
'lblVoltageHiUnit
'
- Me.lblVoltageHiUnit.AutoSize = true
+ Me.lblVoltageHiUnit.AutoSize = True
Me.lblVoltageHiUnit.Location = New System.Drawing.Point(188, 10)
Me.lblVoltageHiUnit.Name = "lblVoltageHiUnit"
Me.lblVoltageHiUnit.Size = New System.Drawing.Size(20, 13)
@@ -679,14 +679,14 @@ Partial Class ElectricMotorForm
'
'tbVoltageHi
'
- Me.tbVoltageHi.Location = New System.Drawing.Point(135, 8)
+ Me.tbVoltageHi.Location = New System.Drawing.Point(135, 7)
Me.tbVoltageHi.Name = "tbVoltageHi"
Me.tbVoltageHi.Size = New System.Drawing.Size(49, 20)
Me.tbVoltageHi.TabIndex = 49
'
'lblVoltageLow
'
- Me.lblVoltageLow.AutoSize = true
+ Me.lblVoltageLow.AutoSize = True
Me.lblVoltageLow.Location = New System.Drawing.Point(11, 9)
Me.lblVoltageLow.Name = "lblVoltageLow"
Me.lblVoltageLow.Size = New System.Drawing.Size(43, 13)
@@ -695,7 +695,7 @@ Partial Class ElectricMotorForm
'
'lblVoltageLowUnit
'
- Me.lblVoltageLowUnit.AutoSize = true
+ Me.lblVoltageLowUnit.AutoSize = True
Me.lblVoltageLowUnit.Location = New System.Drawing.Point(188, 9)
Me.lblVoltageLowUnit.Name = "lblVoltageLowUnit"
Me.lblVoltageLowUnit.Size = New System.Drawing.Size(20, 13)
@@ -711,7 +711,7 @@ Partial Class ElectricMotorForm
'
'lblMaxTorqueLow
'
- Me.lblMaxTorqueLow.AutoSize = true
+ Me.lblMaxTorqueLow.AutoSize = True
Me.lblMaxTorqueLow.Location = New System.Drawing.Point(5, 34)
Me.lblMaxTorqueLow.Name = "lblMaxTorqueLow"
Me.lblMaxTorqueLow.Size = New System.Drawing.Size(222, 13)
@@ -727,7 +727,7 @@ Partial Class ElectricMotorForm
'
'lblDragTorque
'
- Me.lblDragTorque.AutoSize = true
+ Me.lblDragTorque.AutoSize = True
Me.lblDragTorque.Location = New System.Drawing.Point(17, 145)
Me.lblDragTorque.Name = "lblDragTorque"
Me.lblDragTorque.Size = New System.Drawing.Size(98, 13)
@@ -741,8 +741,8 @@ Partial Class ElectricMotorForm
Me.btnBrowseDragCurve.Name = "btnBrowseDragCurve"
Me.btnBrowseDragCurve.Size = New System.Drawing.Size(24, 24)
Me.btnBrowseDragCurve.TabIndex = 6
- Me.btnBrowseDragCurve.TabStop = false
- Me.btnBrowseDragCurve.UseVisualStyleBackColor = true
+ Me.btnBrowseDragCurve.TabStop = False
+ Me.btnBrowseDragCurve.UseVisualStyleBackColor = True
'
'btnDragCurveOpen
'
@@ -751,8 +751,8 @@ Partial Class ElectricMotorForm
Me.btnDragCurveOpen.Name = "btnDragCurveOpen"
Me.btnDragCurveOpen.Size = New System.Drawing.Size(24, 24)
Me.btnDragCurveOpen.TabIndex = 7
- Me.btnDragCurveOpen.TabStop = false
- Me.btnDragCurveOpen.UseVisualStyleBackColor = true
+ Me.btnDragCurveOpen.TabStop = False
+ Me.btnDragCurveOpen.UseVisualStyleBackColor = True
'
'tbMapLow
'
@@ -763,7 +763,7 @@ Partial Class ElectricMotorForm
'
'lblPowerMapLow
'
- Me.lblPowerMapLow.AutoSize = true
+ Me.lblPowerMapLow.AutoSize = True
Me.lblPowerMapLow.Location = New System.Drawing.Point(5, 74)
Me.lblPowerMapLow.Name = "lblPowerMapLow"
Me.lblPowerMapLow.Size = New System.Drawing.Size(163, 13)
@@ -777,8 +777,8 @@ Partial Class ElectricMotorForm
Me.btnBrowseEmMapLow.Name = "btnBrowseEmMapLow"
Me.btnBrowseEmMapLow.Size = New System.Drawing.Size(24, 24)
Me.btnBrowseEmMapLow.TabIndex = 41
- Me.btnBrowseEmMapLow.TabStop = false
- Me.btnBrowseEmMapLow.UseVisualStyleBackColor = true
+ Me.btnBrowseEmMapLow.TabStop = False
+ Me.btnBrowseEmMapLow.UseVisualStyleBackColor = True
'
'btnEmMapOpenLow
'
@@ -787,8 +787,8 @@ Partial Class ElectricMotorForm
Me.btnEmMapOpenLow.Name = "btnEmMapOpenLow"
Me.btnEmMapOpenLow.Size = New System.Drawing.Size(24, 24)
Me.btnEmMapOpenLow.TabIndex = 42
- Me.btnEmMapOpenLow.TabStop = false
- Me.btnEmMapOpenLow.UseVisualStyleBackColor = true
+ Me.btnEmMapOpenLow.TabStop = False
+ Me.btnEmMapOpenLow.UseVisualStyleBackColor = True
'
'tbMaxTorqueLow
'
@@ -804,8 +804,8 @@ Partial Class ElectricMotorForm
Me.btnMaxTorqueCurveOpenLow.Name = "btnMaxTorqueCurveOpenLow"
Me.btnMaxTorqueCurveOpenLow.Size = New System.Drawing.Size(24, 24)
Me.btnMaxTorqueCurveOpenLow.TabIndex = 46
- Me.btnMaxTorqueCurveOpenLow.TabStop = false
- Me.btnMaxTorqueCurveOpenLow.UseVisualStyleBackColor = true
+ Me.btnMaxTorqueCurveOpenLow.TabStop = False
+ Me.btnMaxTorqueCurveOpenLow.UseVisualStyleBackColor = True
'
'btnBrowseMaxTorqueLow
'
@@ -814,15 +814,15 @@ Partial Class ElectricMotorForm
Me.btnBrowseMaxTorqueLow.Name = "btnBrowseMaxTorqueLow"
Me.btnBrowseMaxTorqueLow.Size = New System.Drawing.Size(24, 24)
Me.btnBrowseMaxTorqueLow.TabIndex = 45
- Me.btnBrowseMaxTorqueLow.TabStop = false
- Me.btnBrowseMaxTorqueLow.UseVisualStyleBackColor = true
+ Me.btnBrowseMaxTorqueLow.TabStop = False
+ Me.btnBrowseMaxTorqueLow.UseVisualStyleBackColor = True
'
'tcVoltageLevels
'
Me.tcVoltageLevels.Controls.Add(Me.tpVoltageLow)
Me.tcVoltageLevels.Controls.Add(Me.tpVoltageHigh)
Me.tcVoltageLevels.Location = New System.Drawing.Point(12, 189)
- Me.tcVoltageLevels.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
+ Me.tcVoltageLevels.Margin = New System.Windows.Forms.Padding(2)
Me.tcVoltageLevels.Name = "tcVoltageLevels"
Me.tcVoltageLevels.SelectedIndex = 0
Me.tcVoltageLevels.Size = New System.Drawing.Size(501, 246)
@@ -847,13 +847,13 @@ Partial Class ElectricMotorForm
Me.tpVoltageLow.Controls.Add(Me.lblPowerMapLow)
Me.tpVoltageLow.Controls.Add(Me.tbMapLow)
Me.tpVoltageLow.Location = New System.Drawing.Point(4, 22)
- Me.tpVoltageLow.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
+ Me.tpVoltageLow.Margin = New System.Windows.Forms.Padding(2)
Me.tpVoltageLow.Name = "tpVoltageLow"
- Me.tpVoltageLow.Padding = New System.Windows.Forms.Padding(2, 2, 2, 2)
+ Me.tpVoltageLow.Padding = New System.Windows.Forms.Padding(2)
Me.tpVoltageLow.Size = New System.Drawing.Size(493, 220)
Me.tpVoltageLow.TabIndex = 0
Me.tpVoltageLow.Text = "Voltage Level Low"
- Me.tpVoltageLow.UseVisualStyleBackColor = true
+ Me.tpVoltageLow.UseVisualStyleBackColor = True
'
'tpVoltageHigh
'
@@ -874,9 +874,9 @@ Partial Class ElectricMotorForm
Me.tpVoltageHigh.Controls.Add(Me.lblPowerMapHi)
Me.tpVoltageHigh.Controls.Add(Me.tbMapHi)
Me.tpVoltageHigh.Location = New System.Drawing.Point(4, 22)
- Me.tpVoltageHigh.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
+ Me.tpVoltageHigh.Margin = New System.Windows.Forms.Padding(2)
Me.tpVoltageHigh.Name = "tpVoltageHigh"
- Me.tpVoltageHigh.Padding = New System.Windows.Forms.Padding(2, 2, 2, 2)
+ Me.tpVoltageHigh.Padding = New System.Windows.Forms.Padding(2)
Me.tpVoltageHigh.Size = New System.Drawing.Size(493, 220)
Me.tpVoltageHigh.TabIndex = 1
Me.tpVoltageHigh.Text = "Voltage Level High"
diff --git a/VECTO/GUI/EngineForm.Designer.vb b/VECTO/GUI/EngineForm.Designer.vb
index 742146d7d4..c8c17137d9 100644
--- a/VECTO/GUI/EngineForm.Designer.vb
+++ b/VECTO/GUI/EngineForm.Designer.vb
@@ -767,10 +767,10 @@ Partial Class EngineForm
'
Me.tbDualFuel.Controls.Add(Me.tpPrimaryfuel)
Me.tbDualFuel.Controls.Add(Me.tpSecondaryFuel)
- Me.tbDualFuel.Location = New System.Drawing.Point(12, 268)
+ Me.tbDualFuel.Location = New System.Drawing.Point(12, 287)
Me.tbDualFuel.Name = "tbDualFuel"
Me.tbDualFuel.SelectedIndex = 0
- Me.tbDualFuel.Size = New System.Drawing.Size(481, 279)
+ Me.tbDualFuel.Size = New System.Drawing.Size(481, 260)
Me.tbDualFuel.TabIndex = 11
'
'tpPrimaryfuel
@@ -785,10 +785,10 @@ Partial Class EngineForm
Me.tpPrimaryfuel.Location = New System.Drawing.Point(4, 22)
Me.tpPrimaryfuel.Name = "tpPrimaryfuel"
Me.tpPrimaryfuel.Padding = New System.Windows.Forms.Padding(3)
- Me.tpPrimaryfuel.Size = New System.Drawing.Size(473, 253)
+ Me.tpPrimaryfuel.Size = New System.Drawing.Size(473, 234)
Me.tpPrimaryfuel.TabIndex = 0
Me.tpPrimaryfuel.Text = "Primary Fuel"
- Me.tpPrimaryfuel.UseVisualStyleBackColor = true
+ Me.tpPrimaryfuel.UseVisualStyleBackColor = True
'
'tpSecondaryFuel
'
@@ -802,20 +802,20 @@ Partial Class EngineForm
Me.tpSecondaryFuel.Location = New System.Drawing.Point(4, 22)
Me.tpSecondaryFuel.Name = "tpSecondaryFuel"
Me.tpSecondaryFuel.Padding = New System.Windows.Forms.Padding(3)
- Me.tpSecondaryFuel.Size = New System.Drawing.Size(473, 253)
+ Me.tpSecondaryFuel.Size = New System.Drawing.Size(473, 234)
Me.tpSecondaryFuel.TabIndex = 1
Me.tpSecondaryFuel.Text = "Secondary Fuel"
- Me.tpSecondaryFuel.UseVisualStyleBackColor = true
+ Me.tpSecondaryFuel.UseVisualStyleBackColor = True
'
'GroupBox1
'
Me.GroupBox1.Controls.Add(Me.pnWhtcFuel2)
Me.GroupBox1.Controls.Add(Me.pnEngCFFuel2)
- Me.GroupBox1.Location = New System.Drawing.Point(3, 85)
+ Me.GroupBox1.Location = New System.Drawing.Point(3, 94)
Me.GroupBox1.Name = "GroupBox1"
Me.GroupBox1.Size = New System.Drawing.Size(462, 135)
Me.GroupBox1.TabIndex = 4
- Me.GroupBox1.TabStop = false
+ Me.GroupBox1.TabStop = False
Me.GroupBox1.Text = "Fuel Consumption Correction Factors"
'
'pnWhtcFuel2
@@ -838,7 +838,7 @@ Partial Class EngineForm
'
'Label27
'
- Me.Label27.AutoSize = true
+ Me.Label27.AutoSize = True
Me.Label27.Location = New System.Drawing.Point(296, 49)
Me.Label27.Name = "Label27"
Me.Label27.Size = New System.Drawing.Size(89, 13)
@@ -854,7 +854,7 @@ Partial Class EngineForm
'
'Label28
'
- Me.Label28.AutoSize = true
+ Me.Label28.AutoSize = True
Me.Label28.Location = New System.Drawing.Point(42, 49)
Me.Label28.Name = "Label28"
Me.Label28.Size = New System.Drawing.Size(177, 13)
@@ -870,7 +870,7 @@ Partial Class EngineForm
'
'Label29
'
- Me.Label29.AutoSize = true
+ Me.Label29.AutoSize = True
Me.Label29.Location = New System.Drawing.Point(3, 23)
Me.Label29.Name = "Label29"
Me.Label29.Size = New System.Drawing.Size(72, 13)
@@ -879,7 +879,7 @@ Partial Class EngineForm
'
'Label30
'
- Me.Label30.AutoSize = true
+ Me.Label30.AutoSize = True
Me.Label30.Location = New System.Drawing.Point(151, 23)
Me.Label30.Name = "Label30"
Me.Label30.Size = New System.Drawing.Size(68, 13)
@@ -888,7 +888,7 @@ Partial Class EngineForm
'
'Label31
'
- Me.Label31.AutoSize = true
+ Me.Label31.AutoSize = True
Me.Label31.Location = New System.Drawing.Point(1, 1)
Me.Label31.Name = "Label31"
Me.Label31.Size = New System.Drawing.Size(242, 13)
@@ -897,7 +897,7 @@ Partial Class EngineForm
'
'Label32
'
- Me.Label32.AutoSize = true
+ Me.Label32.AutoSize = True
Me.Label32.Location = New System.Drawing.Point(296, 23)
Me.Label32.Name = "Label32"
Me.Label32.Size = New System.Drawing.Size(89, 13)
@@ -944,7 +944,7 @@ Partial Class EngineForm
'
'Label33
'
- Me.Label33.AutoSize = true
+ Me.Label33.AutoSize = True
Me.Label33.Location = New System.Drawing.Point(156, 6)
Me.Label33.Name = "Label33"
Me.Label33.Size = New System.Drawing.Size(63, 13)
@@ -953,15 +953,15 @@ Partial Class EngineForm
'
'tbMapFuel2
'
- Me.tbMapFuel2.Location = New System.Drawing.Point(6, 54)
+ Me.tbMapFuel2.Location = New System.Drawing.Point(6, 57)
Me.tbMapFuel2.Name = "tbMapFuel2"
Me.tbMapFuel2.Size = New System.Drawing.Size(406, 20)
Me.tbMapFuel2.TabIndex = 1
'
'Label34
'
- Me.Label34.AutoSize = true
- Me.Label34.Location = New System.Drawing.Point(6, 38)
+ Me.Label34.AutoSize = True
+ Me.Label34.Location = New System.Drawing.Point(6, 41)
Me.Label34.Name = "Label34"
Me.Label34.Size = New System.Drawing.Size(115, 13)
Me.Label34.TabIndex = 56
@@ -970,33 +970,33 @@ Partial Class EngineForm
'btMapFuel2
'
Me.btMapFuel2.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btMapFuel2.Location = New System.Drawing.Point(418, 52)
+ Me.btMapFuel2.Location = New System.Drawing.Point(418, 55)
Me.btMapFuel2.Name = "btMapFuel2"
Me.btMapFuel2.Size = New System.Drawing.Size(24, 24)
Me.btMapFuel2.TabIndex = 2
- Me.btMapFuel2.UseVisualStyleBackColor = true
+ Me.btMapFuel2.UseVisualStyleBackColor = True
'
'btMapOpenFuel2
'
Me.btMapOpenFuel2.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btMapOpenFuel2.Location = New System.Drawing.Point(441, 52)
+ Me.btMapOpenFuel2.Location = New System.Drawing.Point(441, 55)
Me.btMapOpenFuel2.Name = "btMapOpenFuel2"
Me.btMapOpenFuel2.Size = New System.Drawing.Size(24, 24)
Me.btMapOpenFuel2.TabIndex = 3
- Me.btMapOpenFuel2.UseVisualStyleBackColor = true
+ Me.btMapOpenFuel2.UseVisualStyleBackColor = True
'
'cbFuelType2
'
- Me.cbFuelType2.FormattingEnabled = true
- Me.cbFuelType2.Location = New System.Drawing.Point(71, 6)
+ Me.cbFuelType2.FormattingEnabled = True
+ Me.cbFuelType2.Location = New System.Drawing.Point(71, 10)
Me.cbFuelType2.Name = "cbFuelType2"
Me.cbFuelType2.Size = New System.Drawing.Size(143, 21)
Me.cbFuelType2.TabIndex = 0
'
'Label35
'
- Me.Label35.AutoSize = true
- Me.Label35.Location = New System.Drawing.Point(11, 9)
+ Me.Label35.AutoSize = True
+ Me.Label35.Location = New System.Drawing.Point(11, 13)
Me.Label35.Name = "Label35"
Me.Label35.Size = New System.Drawing.Size(54, 13)
Me.Label35.TabIndex = 57
diff --git a/VECTO/GUI/GearboxForm.Designer.vb b/VECTO/GUI/GearboxForm.Designer.vb
index d6f346b88a..6c4dfc56b8 100644
--- a/VECTO/GUI/GearboxForm.Designer.vb
+++ b/VECTO/GUI/GearboxForm.Designer.vb
@@ -782,9 +782,9 @@ Partial Class GearboxForm
Me.Label14.AutoSize = true
Me.Label14.Location = New System.Drawing.Point(357, 3)
Me.Label14.Name = "Label14"
- Me.Label14.Size = New System.Drawing.Size(40, 13)
+ Me.Label14.Size = New System.Drawing.Size(30, 13)
Me.Label14.TabIndex = 41
- Me.Label14.Text = "[1/min]"
+ Me.Label14.Text = "[rpm]"
'
'BtTCShiftFileBrowse
'
diff --git a/VECTO/GUI/IEPCForm.Designer.vb b/VECTO/GUI/IEPCForm.Designer.vb
index 9c5b42f476..83a875cab4 100644
--- a/VECTO/GUI/IEPCForm.Designer.vb
+++ b/VECTO/GUI/IEPCForm.Designer.vb
@@ -178,92 +178,87 @@ Partial Class IEPCForm
'
Me.btFLCurveFile1.Anchor = System.Windows.Forms.AnchorStyles.None
Me.btFLCurveFile1.Image = CType(resources.GetObject("btFLCurveFile1.Image"),System.Drawing.Image)
- Me.btFLCurveFile1.Location = New System.Drawing.Point(630, 1)
+ Me.btFLCurveFile1.Location = New System.Drawing.Point(425, 1)
Me.btFLCurveFile1.Margin = New System.Windows.Forms.Padding(0)
Me.btFLCurveFile1.Name = "btFLCurveFile1"
- Me.btFLCurveFile1.Size = New System.Drawing.Size(36, 37)
+ Me.btFLCurveFile1.Size = New System.Drawing.Size(24, 24)
Me.btFLCurveFile1.TabIndex = 15
- Me.btFLCurveFile1.UseVisualStyleBackColor = true
+ Me.btFLCurveFile1.UseVisualStyleBackColor = True
'
'tbThermalOverload
'
Me.tbThermalOverload.Anchor = System.Windows.Forms.AnchorStyles.Left
- Me.tbThermalOverload.Location = New System.Drawing.Point(317, 5)
- Me.tbThermalOverload.Margin = New System.Windows.Forms.Padding(45, 5, 4, 5)
+ Me.tbThermalOverload.Location = New System.Drawing.Point(216, 3)
+ Me.tbThermalOverload.Margin = New System.Windows.Forms.Padding(30, 3, 3, 3)
Me.tbThermalOverload.Name = "tbThermalOverload"
- Me.tbThermalOverload.Size = New System.Drawing.Size(82, 26)
+ Me.tbThermalOverload.Size = New System.Drawing.Size(56, 20)
Me.tbThermalOverload.TabIndex = 3
'
'Label52
'
Me.Label52.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label52.AutoSize = true
- Me.Label52.Location = New System.Drawing.Point(4, 8)
- Me.Label52.Margin = New System.Windows.Forms.Padding(4, 0, 15, 0)
+ Me.Label52.AutoSize = True
+ Me.Label52.Location = New System.Drawing.Point(3, 6)
+ Me.Label52.Margin = New System.Windows.Forms.Padding(3, 0, 10, 0)
Me.Label52.Name = "Label52"
- Me.Label52.Size = New System.Drawing.Size(253, 20)
+ Me.Label52.Size = New System.Drawing.Size(173, 13)
Me.Label52.TabIndex = 50
Me.Label52.Text = "Thermal Overload Recovery Factor"
'
'Label48
'
Me.Label48.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label48.AutoSize = true
- Me.Label48.Location = New System.Drawing.Point(4, 8)
- Me.Label48.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label48.AutoSize = True
+ Me.Label48.Location = New System.Drawing.Point(3, 6)
Me.Label48.Name = "Label48"
- Me.Label48.Size = New System.Drawing.Size(304, 20)
+ Me.Label48.Size = New System.Drawing.Size(207, 13)
Me.Label48.TabIndex = 48
Me.Label48.Text = "Nr of Design Type Wheel Motor Measured"
'
'tbNumberOfDesignTypeWheelMotor
'
Me.tbNumberOfDesignTypeWheelMotor.Anchor = System.Windows.Forms.AnchorStyles.Left
- Me.tbNumberOfDesignTypeWheelMotor.Enabled = false
- Me.tbNumberOfDesignTypeWheelMotor.Location = New System.Drawing.Point(316, 5)
- Me.tbNumberOfDesignTypeWheelMotor.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbNumberOfDesignTypeWheelMotor.Enabled = False
+ Me.tbNumberOfDesignTypeWheelMotor.Location = New System.Drawing.Point(216, 3)
Me.tbNumberOfDesignTypeWheelMotor.Name = "tbNumberOfDesignTypeWheelMotor"
- Me.tbNumberOfDesignTypeWheelMotor.Size = New System.Drawing.Size(43, 26)
+ Me.tbNumberOfDesignTypeWheelMotor.Size = New System.Drawing.Size(30, 20)
Me.tbNumberOfDesignTypeWheelMotor.TabIndex = 5
'
'Label51
'
Me.Label51.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label51.AutoSize = true
- Me.Label51.Location = New System.Drawing.Point(4, 8)
- Me.Label51.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label51.AutoSize = True
+ Me.Label51.Location = New System.Drawing.Point(3, 6)
Me.Label51.Name = "Label51"
- Me.Label51.Size = New System.Drawing.Size(54, 20)
+ Me.Label51.Size = New System.Drawing.Size(36, 13)
Me.Label51.TabIndex = 45
Me.Label51.Text = "Inertia"
'
'tbInertia
'
Me.tbInertia.Anchor = System.Windows.Forms.AnchorStyles.Left
- Me.tbInertia.Location = New System.Drawing.Point(66, 5)
- Me.tbInertia.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbInertia.Location = New System.Drawing.Point(45, 3)
Me.tbInertia.Name = "tbInertia"
- Me.tbInertia.Size = New System.Drawing.Size(84, 26)
+ Me.tbInertia.Size = New System.Drawing.Size(57, 20)
Me.tbInertia.TabIndex = 2
'
'Label49
'
Me.Label49.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label49.AutoSize = true
- Me.Label49.Location = New System.Drawing.Point(4, 8)
- Me.Label49.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label49.AutoSize = True
+ Me.Label49.Location = New System.Drawing.Point(3, 6)
Me.Label49.Name = "Label49"
- Me.Label49.Size = New System.Drawing.Size(52, 20)
+ Me.Label49.Size = New System.Drawing.Size(87, 13)
Me.Label49.TabIndex = 43
- Me.Label49.Text = "Model"
+ Me.Label49.Text = "Make and Model"
'
'tbModel
'
Me.tbModel.Anchor = System.Windows.Forms.AnchorStyles.Left
- Me.tbModel.Location = New System.Drawing.Point(64, 5)
- Me.tbModel.Margin = New System.Windows.Forms.Padding(4, 5, 0, 5)
+ Me.tbModel.Location = New System.Drawing.Point(96, 3)
+ Me.tbModel.Margin = New System.Windows.Forms.Padding(3, 3, 0, 3)
Me.tbModel.Name = "tbModel"
- Me.tbModel.Size = New System.Drawing.Size(289, 26)
+ Me.tbModel.Size = New System.Drawing.Size(414, 20)
Me.tbModel.TabIndex = 1
'
'tcVoltageLevels
@@ -271,11 +266,10 @@ Partial Class IEPCForm
Me.tcVoltageLevels.Anchor = System.Windows.Forms.AnchorStyles.Top
Me.tcVoltageLevels.Controls.Add(Me.tpFirstVoltageLevel)
Me.tcVoltageLevels.Controls.Add(Me.tpVoltageLevel)
- Me.tcVoltageLevels.Location = New System.Drawing.Point(24, 318)
- Me.tcVoltageLevels.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tcVoltageLevels.Location = New System.Drawing.Point(16, 207)
Me.tcVoltageLevels.Name = "tcVoltageLevels"
Me.tcVoltageLevels.SelectedIndex = 0
- Me.tcVoltageLevels.Size = New System.Drawing.Size(776, 495)
+ Me.tcVoltageLevels.Size = New System.Drawing.Size(517, 322)
Me.tcVoltageLevels.TabIndex = 107
'
'tpFirstVoltageLevel
@@ -283,14 +277,13 @@ Partial Class IEPCForm
Me.tpFirstVoltageLevel.Controls.Add(Me.FlowLayoutPanel9)
Me.tpFirstVoltageLevel.Controls.Add(Me.TableLayoutPanel1)
Me.tpFirstVoltageLevel.Controls.Add(Me.GroupBox2)
- Me.tpFirstVoltageLevel.Location = New System.Drawing.Point(4, 29)
- Me.tpFirstVoltageLevel.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tpFirstVoltageLevel.Location = New System.Drawing.Point(4, 22)
Me.tpFirstVoltageLevel.Name = "tpFirstVoltageLevel"
- Me.tpFirstVoltageLevel.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.tpFirstVoltageLevel.Size = New System.Drawing.Size(768, 462)
+ Me.tpFirstVoltageLevel.Padding = New System.Windows.Forms.Padding(3)
+ Me.tpFirstVoltageLevel.Size = New System.Drawing.Size(509, 296)
Me.tpFirstVoltageLevel.TabIndex = 0
Me.tpFirstVoltageLevel.Text = "Voltage Level Low"
- Me.tpFirstVoltageLevel.UseVisualStyleBackColor = true
+ Me.tpFirstVoltageLevel.UseVisualStyleBackColor = True
'
'FlowLayoutPanel9
'
@@ -299,53 +292,52 @@ Partial Class IEPCForm
Me.FlowLayoutPanel9.Controls.Add(Me.tbFLCurve1)
Me.FlowLayoutPanel9.Controls.Add(Me.btFLCurveFile1)
Me.FlowLayoutPanel9.Controls.Add(Me.btShowFLCurve1)
- Me.FlowLayoutPanel9.Location = New System.Drawing.Point(9, 145)
- Me.FlowLayoutPanel9.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.FlowLayoutPanel9.Location = New System.Drawing.Point(6, 94)
Me.FlowLayoutPanel9.Name = "FlowLayoutPanel9"
- Me.FlowLayoutPanel9.Size = New System.Drawing.Size(744, 40)
+ Me.FlowLayoutPanel9.Size = New System.Drawing.Size(496, 26)
Me.FlowLayoutPanel9.TabIndex = 108
'
'Label44
'
Me.Label44.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label44.AutoSize = true
- Me.Label44.Location = New System.Drawing.Point(21, 9)
- Me.Label44.Margin = New System.Windows.Forms.Padding(21, 0, 0, 0)
+ Me.Label44.AutoSize = True
+ Me.Label44.Location = New System.Drawing.Point(14, 6)
+ Me.Label44.Margin = New System.Windows.Forms.Padding(14, 0, 0, 0)
Me.Label44.Name = "Label44"
- Me.Label44.Size = New System.Drawing.Size(182, 20)
+ Me.Label44.Size = New System.Drawing.Size(125, 13)
Me.Label44.TabIndex = 59
Me.Label44.Text = "Full Load Curve (.viepcp)"
'
'tbFLCurve1
'
Me.tbFLCurve1.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbFLCurve1.Location = New System.Drawing.Point(207, 6)
- Me.tbFLCurve1.Margin = New System.Windows.Forms.Padding(4, 5, 9, 5)
+ Me.tbFLCurve1.Location = New System.Drawing.Point(142, 3)
+ Me.tbFLCurve1.Margin = New System.Windows.Forms.Padding(3, 3, 6, 3)
Me.tbFLCurve1.Name = "tbFLCurve1"
- Me.tbFLCurve1.Size = New System.Drawing.Size(414, 26)
+ Me.tbFLCurve1.Size = New System.Drawing.Size(277, 20)
Me.tbFLCurve1.TabIndex = 14
'
'btShowFLCurve1
'
Me.btShowFLCurve1.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btShowFLCurve1.Location = New System.Drawing.Point(666, 2)
- Me.btShowFLCurve1.Margin = New System.Windows.Forms.Padding(0, 2, 0, 0)
+ Me.btShowFLCurve1.Location = New System.Drawing.Point(449, 1)
+ Me.btShowFLCurve1.Margin = New System.Windows.Forms.Padding(0, 1, 0, 0)
Me.btShowFLCurve1.Name = "btShowFLCurve1"
- Me.btShowFLCurve1.Size = New System.Drawing.Size(36, 37)
+ Me.btShowFLCurve1.Size = New System.Drawing.Size(24, 24)
Me.btShowFLCurve1.TabIndex = 85
- Me.btShowFLCurve1.TabStop = false
- Me.btShowFLCurve1.UseVisualStyleBackColor = true
+ Me.btShowFLCurve1.TabStop = False
+ Me.btShowFLCurve1.UseVisualStyleBackColor = True
'
'TableLayoutPanel1
'
Me.TableLayoutPanel1.ColumnCount = 7
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 210!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 93!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 45!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 192!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 93!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 45!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 88!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 140.0!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 62.0!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 30.0!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 128.0!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 62.0!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 30.0!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 59.0!))
Me.TableLayoutPanel1.Controls.Add(Me.Label11, 2, 1)
Me.TableLayoutPanel1.Controls.Add(Me.Label4, 2, 0)
Me.TableLayoutPanel1.Controls.Add(Me.Label13, 5, 0)
@@ -364,199 +356,190 @@ Partial Class IEPCForm
Me.TableLayoutPanel1.Controls.Add(Me.Label41, 3, 1)
Me.TableLayoutPanel1.Controls.Add(Me.tbOverloadTorque1, 4, 1)
Me.TableLayoutPanel1.Controls.Add(Me.Label12, 5, 1)
- Me.TableLayoutPanel1.Location = New System.Drawing.Point(9, 11)
- Me.TableLayoutPanel1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TableLayoutPanel1.Location = New System.Drawing.Point(6, 7)
Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
Me.TableLayoutPanel1.RowCount = 3
- Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 42!))
- Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 42!))
- Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 42!))
- Me.TableLayoutPanel1.Size = New System.Drawing.Size(744, 126)
+ Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27.0!))
+ Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27.0!))
+ Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27.0!))
+ Me.TableLayoutPanel1.Size = New System.Drawing.Size(496, 82)
Me.TableLayoutPanel1.TabIndex = 107
'
'Label11
'
Me.Label11.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label11.AutoSize = true
- Me.Label11.Location = New System.Drawing.Point(305, 53)
+ Me.Label11.AutoSize = True
+ Me.Label11.Location = New System.Drawing.Point(202, 34)
Me.Label11.Margin = New System.Windows.Forms.Padding(0)
Me.Label11.Name = "Label11"
- Me.Label11.Size = New System.Drawing.Size(41, 20)
+ Me.Label11.Size = New System.Drawing.Size(29, 13)
Me.Label11.TabIndex = 63
Me.Label11.Text = "[Nm]"
'
'Label4
'
Me.Label4.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label4.AutoSize = true
- Me.Label4.Location = New System.Drawing.Point(311, 11)
+ Me.Label4.AutoSize = True
+ Me.Label4.Location = New System.Drawing.Point(207, 7)
Me.Label4.Margin = New System.Windows.Forms.Padding(0)
Me.Label4.Name = "Label4"
- Me.Label4.Size = New System.Drawing.Size(28, 20)
+ Me.Label4.Size = New System.Drawing.Size(20, 13)
Me.Label4.TabIndex = 62
Me.Label4.Text = "[V]"
'
'Label13
'
Me.Label13.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label13.AutoSize = true
- Me.Label13.Location = New System.Drawing.Point(634, 11)
+ Me.Label13.AutoSize = True
+ Me.Label13.Location = New System.Drawing.Point(428, 7)
Me.Label13.Margin = New System.Windows.Forms.Padding(0)
Me.Label13.Name = "Label13"
- Me.Label13.Size = New System.Drawing.Size(42, 20)
+ Me.Label13.Size = New System.Drawing.Size(18, 13)
Me.Label13.TabIndex = 65
- Me.Label13.Text = "[sec]"
+ Me.Label13.Text = "[s]"
'
'Label43
'
Me.Label43.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label43.AutoSize = true
- Me.Label43.Location = New System.Drawing.Point(426, 11)
- Me.Label43.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label43.AutoSize = True
+ Me.Label43.Location = New System.Drawing.Point(281, 7)
Me.Label43.Name = "Label43"
- Me.Label43.Size = New System.Drawing.Size(110, 20)
+ Me.Label43.Size = New System.Drawing.Size(76, 13)
Me.Label43.TabIndex = 11
Me.Label43.Text = "Overload Time"
'
'Label37
'
Me.Label37.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label37.AutoSize = true
- Me.Label37.Location = New System.Drawing.Point(142, 11)
- Me.Label37.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label37.AutoSize = True
+ Me.Label37.Location = New System.Drawing.Point(94, 7)
Me.Label37.Name = "Label37"
- Me.Label37.Size = New System.Drawing.Size(64, 20)
+ Me.Label37.Size = New System.Drawing.Size(43, 13)
Me.Label37.TabIndex = 1
Me.Label37.Text = "Voltage"
'
'tbOverloadTime1
'
Me.tbOverloadTime1.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbOverloadTime1.Location = New System.Drawing.Point(545, 8)
+ Me.tbOverloadTime1.Location = New System.Drawing.Point(363, 3)
Me.tbOverloadTime1.Margin = New System.Windows.Forms.Padding(0)
Me.tbOverloadTime1.Name = "tbOverloadTime1"
- Me.tbOverloadTime1.Size = New System.Drawing.Size(82, 26)
+ Me.tbOverloadTime1.Size = New System.Drawing.Size(56, 20)
Me.tbOverloadTime1.TabIndex = 11
'
'tbVoltage1
'
Me.tbVoltage1.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbVoltage1.Location = New System.Drawing.Point(215, 8)
+ Me.tbVoltage1.Location = New System.Drawing.Point(143, 3)
Me.tbVoltage1.Margin = New System.Windows.Forms.Padding(0)
Me.tbVoltage1.Name = "tbVoltage1"
- Me.tbVoltage1.Size = New System.Drawing.Size(82, 26)
+ Me.tbVoltage1.Size = New System.Drawing.Size(56, 20)
Me.tbVoltage1.TabIndex = 8
'
'Label39
'
Me.Label39.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label39.AutoSize = true
- Me.Label39.Location = New System.Drawing.Point(62, 53)
- Me.Label39.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label39.AutoSize = True
+ Me.Label39.Location = New System.Drawing.Point(40, 34)
Me.Label39.Name = "Label39"
- Me.Label39.Size = New System.Drawing.Size(144, 20)
+ Me.Label39.Size = New System.Drawing.Size(97, 13)
Me.Label39.TabIndex = 3
Me.Label39.Text = "Continuous Torque"
'
'Label1
'
Me.Label1.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label1.AutoSize = true
- Me.Label1.Location = New System.Drawing.Point(11, 95)
- Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label1.AutoSize = True
+ Me.Label1.Location = New System.Drawing.Point(6, 61)
Me.Label1.Name = "Label1"
- Me.Label1.Size = New System.Drawing.Size(195, 20)
+ Me.Label1.Size = New System.Drawing.Size(131, 13)
Me.Label1.TabIndex = 6
Me.Label1.Text = "Continuous Torque Speed"
'
'tbContinousTorque1
'
Me.tbContinousTorque1.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbContinousTorque1.Location = New System.Drawing.Point(215, 50)
+ Me.tbContinousTorque1.Location = New System.Drawing.Point(143, 30)
Me.tbContinousTorque1.Margin = New System.Windows.Forms.Padding(0)
Me.tbContinousTorque1.Name = "tbContinousTorque1"
- Me.tbContinousTorque1.Size = New System.Drawing.Size(82, 26)
+ Me.tbContinousTorque1.Size = New System.Drawing.Size(56, 20)
Me.tbContinousTorque1.TabIndex = 9
'
'tbContinousTorqueSpeed1
'
Me.tbContinousTorqueSpeed1.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbContinousTorqueSpeed1.Location = New System.Drawing.Point(215, 92)
+ Me.tbContinousTorqueSpeed1.Location = New System.Drawing.Point(143, 58)
Me.tbContinousTorqueSpeed1.Margin = New System.Windows.Forms.Padding(0)
Me.tbContinousTorqueSpeed1.Name = "tbContinousTorqueSpeed1"
- Me.tbContinousTorqueSpeed1.Size = New System.Drawing.Size(82, 26)
+ Me.tbContinousTorqueSpeed1.Size = New System.Drawing.Size(56, 20)
Me.tbContinousTorqueSpeed1.TabIndex = 10
'
'Label15
'
Me.Label15.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label15.AutoSize = true
- Me.Label15.Location = New System.Drawing.Point(303, 95)
+ Me.Label15.AutoSize = True
+ Me.Label15.Location = New System.Drawing.Point(202, 61)
Me.Label15.Margin = New System.Windows.Forms.Padding(0)
Me.Label15.Name = "Label15"
- Me.Label15.Size = New System.Drawing.Size(44, 20)
+ Me.Label15.Size = New System.Drawing.Size(30, 13)
Me.Label15.TabIndex = 67
Me.Label15.Text = "[rpm]"
'
'Label42
'
Me.Label42.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label42.AutoSize = true
- Me.Label42.Location = New System.Drawing.Point(359, 95)
- Me.Label42.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label42.AutoSize = True
+ Me.Label42.Location = New System.Drawing.Point(236, 61)
Me.Label42.Name = "Label42"
- Me.Label42.Size = New System.Drawing.Size(177, 20)
+ Me.Label42.Size = New System.Drawing.Size(121, 13)
Me.Label42.TabIndex = 9
Me.Label42.Text = "Overload Torque Speed"
'
'Label14
'
Me.Label14.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label14.AutoSize = true
- Me.Label14.Location = New System.Drawing.Point(633, 95)
+ Me.Label14.AutoSize = True
+ Me.Label14.Location = New System.Drawing.Point(422, 61)
Me.Label14.Margin = New System.Windows.Forms.Padding(0)
Me.Label14.Name = "Label14"
- Me.Label14.Size = New System.Drawing.Size(44, 20)
+ Me.Label14.Size = New System.Drawing.Size(30, 13)
Me.Label14.TabIndex = 66
Me.Label14.Text = "[rpm]"
'
'tboverloadTorqueSpeed1
'
Me.tboverloadTorqueSpeed1.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tboverloadTorqueSpeed1.Location = New System.Drawing.Point(545, 92)
- Me.tboverloadTorqueSpeed1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tboverloadTorqueSpeed1.Location = New System.Drawing.Point(363, 58)
Me.tboverloadTorqueSpeed1.Name = "tboverloadTorqueSpeed1"
- Me.tboverloadTorqueSpeed1.Size = New System.Drawing.Size(82, 26)
+ Me.tboverloadTorqueSpeed1.Size = New System.Drawing.Size(56, 20)
Me.tboverloadTorqueSpeed1.TabIndex = 13
'
'Label41
'
Me.Label41.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label41.AutoSize = true
- Me.Label41.Location = New System.Drawing.Point(410, 53)
- Me.Label41.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label41.AutoSize = True
+ Me.Label41.Location = New System.Drawing.Point(270, 34)
Me.Label41.Name = "Label41"
- Me.Label41.Size = New System.Drawing.Size(126, 20)
+ Me.Label41.Size = New System.Drawing.Size(87, 13)
Me.Label41.TabIndex = 7
Me.Label41.Text = "Overload Torque"
'
'tbOverloadTorque1
'
Me.tbOverloadTorque1.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbOverloadTorque1.Location = New System.Drawing.Point(545, 50)
- Me.tbOverloadTorque1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbOverloadTorque1.Location = New System.Drawing.Point(363, 30)
Me.tbOverloadTorque1.Name = "tbOverloadTorque1"
- Me.tbOverloadTorque1.Size = New System.Drawing.Size(82, 26)
+ Me.tbOverloadTorque1.Size = New System.Drawing.Size(56, 20)
Me.tbOverloadTorque1.TabIndex = 12
'
'Label12
'
Me.Label12.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label12.AutoSize = true
- Me.Label12.Location = New System.Drawing.Point(635, 53)
+ Me.Label12.AutoSize = True
+ Me.Label12.Location = New System.Drawing.Point(422, 34)
Me.Label12.Margin = New System.Windows.Forms.Padding(0)
Me.Label12.Name = "Label12"
- Me.Label12.Size = New System.Drawing.Size(41, 20)
+ Me.Label12.Size = New System.Drawing.Size(29, 13)
Me.Label12.TabIndex = 64
Me.Label12.Text = "[Nm]"
'
@@ -564,62 +547,57 @@ Partial Class IEPCForm
'
Me.GroupBox2.Anchor = System.Windows.Forms.AnchorStyles.Top
Me.GroupBox2.Controls.Add(Me.TableLayoutPanel6)
- Me.GroupBox2.Location = New System.Drawing.Point(9, 194)
- Me.GroupBox2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox2.Location = New System.Drawing.Point(6, 126)
Me.GroupBox2.Name = "GroupBox2"
- Me.GroupBox2.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.GroupBox2.Size = New System.Drawing.Size(472, 249)
+ Me.GroupBox2.Size = New System.Drawing.Size(315, 162)
Me.GroupBox2.TabIndex = 60
- Me.GroupBox2.TabStop = false
+ Me.GroupBox2.TabStop = False
Me.GroupBox2.Text = "Power Map Per Gear"
'
'TableLayoutPanel6
'
Me.TableLayoutPanel6.Anchor = System.Windows.Forms.AnchorStyles.None
Me.TableLayoutPanel6.ColumnCount = 2
- Me.TableLayoutPanel6.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 194!))
- Me.TableLayoutPanel6.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 254!))
+ Me.TableLayoutPanel6.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 129.0!))
+ Me.TableLayoutPanel6.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 169.0!))
Me.TableLayoutPanel6.Controls.Add(Me.Label47, 1, 1)
Me.TableLayoutPanel6.Controls.Add(Me.lvPowerMap1, 0, 0)
- Me.TableLayoutPanel6.Location = New System.Drawing.Point(9, 20)
- Me.TableLayoutPanel6.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TableLayoutPanel6.Location = New System.Drawing.Point(6, 13)
Me.TableLayoutPanel6.Name = "TableLayoutPanel6"
Me.TableLayoutPanel6.RowCount = 2
Me.TableLayoutPanel6.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 88.81119!))
Me.TableLayoutPanel6.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.18881!))
- Me.TableLayoutPanel6.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 31!))
- Me.TableLayoutPanel6.Size = New System.Drawing.Size(447, 220)
+ Me.TableLayoutPanel6.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20.0!))
+ Me.TableLayoutPanel6.Size = New System.Drawing.Size(298, 143)
Me.TableLayoutPanel6.TabIndex = 53
'
'Label47
'
- Me.Label47.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.Label47.AutoSize = true
- Me.Label47.Location = New System.Drawing.Point(286, 195)
- Me.Label47.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label47.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.Label47.AutoSize = True
+ Me.Label47.Location = New System.Drawing.Point(189, 127)
Me.Label47.Name = "Label47"
- Me.Label47.Size = New System.Drawing.Size(158, 20)
+ Me.Label47.Size = New System.Drawing.Size(106, 13)
Me.Label47.TabIndex = 6
Me.Label47.Text = "(Double-Click to Edit)"
'
'lvPowerMap1
'
- Me.lvPowerMap1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
- Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.lvPowerMap1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.lvPowerMap1.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader13, Me.ColumnHeader14})
Me.TableLayoutPanel6.SetColumnSpan(Me.lvPowerMap1, 2)
- Me.lvPowerMap1.FullRowSelect = true
- Me.lvPowerMap1.GridLines = true
- Me.lvPowerMap1.HideSelection = false
- Me.lvPowerMap1.Location = New System.Drawing.Point(4, 5)
- Me.lvPowerMap1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.lvPowerMap1.MultiSelect = false
+ Me.lvPowerMap1.FullRowSelect = True
+ Me.lvPowerMap1.GridLines = True
+ Me.lvPowerMap1.HideSelection = False
+ Me.lvPowerMap1.Location = New System.Drawing.Point(3, 3)
+ Me.lvPowerMap1.MultiSelect = False
Me.lvPowerMap1.Name = "lvPowerMap1"
- Me.lvPowerMap1.Size = New System.Drawing.Size(440, 185)
+ Me.lvPowerMap1.Size = New System.Drawing.Size(292, 121)
Me.lvPowerMap1.TabIndex = 108
- Me.lvPowerMap1.TabStop = false
- Me.lvPowerMap1.UseCompatibleStateImageBehavior = false
+ Me.lvPowerMap1.TabStop = False
+ Me.lvPowerMap1.UseCompatibleStateImageBehavior = False
Me.lvPowerMap1.View = System.Windows.Forms.View.Details
'
'ColumnHeader13
@@ -637,75 +615,69 @@ Partial Class IEPCForm
Me.tpVoltageLevel.Controls.Add(Me.GroupBox4)
Me.tpVoltageLevel.Controls.Add(Me.FlowLayoutPanel10)
Me.tpVoltageLevel.Controls.Add(Me.TableLayoutPanel4)
- Me.tpVoltageLevel.Location = New System.Drawing.Point(4, 29)
- Me.tpVoltageLevel.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tpVoltageLevel.Location = New System.Drawing.Point(4, 22)
Me.tpVoltageLevel.Name = "tpVoltageLevel"
- Me.tpVoltageLevel.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.tpVoltageLevel.Size = New System.Drawing.Size(768, 462)
+ Me.tpVoltageLevel.Padding = New System.Windows.Forms.Padding(3)
+ Me.tpVoltageLevel.Size = New System.Drawing.Size(509, 296)
Me.tpVoltageLevel.TabIndex = 1
Me.tpVoltageLevel.Text = "Voltage Level High"
- Me.tpVoltageLevel.UseVisualStyleBackColor = true
+ Me.tpVoltageLevel.UseVisualStyleBackColor = True
'
'GroupBox4
'
Me.GroupBox4.Anchor = System.Windows.Forms.AnchorStyles.Top
Me.GroupBox4.Controls.Add(Me.TableLayoutPanel2)
- Me.GroupBox4.Location = New System.Drawing.Point(9, 194)
- Me.GroupBox4.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox4.Location = New System.Drawing.Point(6, 126)
Me.GroupBox4.Name = "GroupBox4"
- Me.GroupBox4.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.GroupBox4.Size = New System.Drawing.Size(472, 249)
+ Me.GroupBox4.Size = New System.Drawing.Size(315, 162)
Me.GroupBox4.TabIndex = 75
- Me.GroupBox4.TabStop = false
+ Me.GroupBox4.TabStop = False
Me.GroupBox4.Text = "Power Map Per Gear"
'
'TableLayoutPanel2
'
Me.TableLayoutPanel2.Anchor = System.Windows.Forms.AnchorStyles.None
Me.TableLayoutPanel2.ColumnCount = 2
- Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 194!))
- Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 254!))
+ Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 129.0!))
+ Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 169.0!))
Me.TableLayoutPanel2.Controls.Add(Me.Label5, 1, 1)
Me.TableLayoutPanel2.Controls.Add(Me.lvPowerMap2, 0, 0)
- Me.TableLayoutPanel2.Location = New System.Drawing.Point(9, 20)
- Me.TableLayoutPanel2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TableLayoutPanel2.Location = New System.Drawing.Point(6, 13)
Me.TableLayoutPanel2.Name = "TableLayoutPanel2"
Me.TableLayoutPanel2.RowCount = 2
Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 88.81119!))
Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.18881!))
- Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 31!))
- Me.TableLayoutPanel2.Size = New System.Drawing.Size(447, 220)
+ Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20.0!))
+ Me.TableLayoutPanel2.Size = New System.Drawing.Size(298, 143)
Me.TableLayoutPanel2.TabIndex = 53
'
'Label5
'
- Me.Label5.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.Label5.AutoSize = true
- Me.Label5.Location = New System.Drawing.Point(286, 195)
- Me.Label5.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label5.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.Label5.AutoSize = True
+ Me.Label5.Location = New System.Drawing.Point(189, 127)
Me.Label5.Name = "Label5"
- Me.Label5.Size = New System.Drawing.Size(158, 20)
+ Me.Label5.Size = New System.Drawing.Size(106, 13)
Me.Label5.TabIndex = 6
Me.Label5.Text = "(Double-Click to Edit)"
'
'lvPowerMap2
'
- Me.lvPowerMap2.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
- Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.lvPowerMap2.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.lvPowerMap2.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader6, Me.ColumnHeader7})
Me.TableLayoutPanel2.SetColumnSpan(Me.lvPowerMap2, 2)
- Me.lvPowerMap2.FullRowSelect = true
- Me.lvPowerMap2.GridLines = true
- Me.lvPowerMap2.HideSelection = false
- Me.lvPowerMap2.Location = New System.Drawing.Point(4, 5)
- Me.lvPowerMap2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.lvPowerMap2.MultiSelect = false
+ Me.lvPowerMap2.FullRowSelect = True
+ Me.lvPowerMap2.GridLines = True
+ Me.lvPowerMap2.HideSelection = False
+ Me.lvPowerMap2.Location = New System.Drawing.Point(3, 3)
+ Me.lvPowerMap2.MultiSelect = False
Me.lvPowerMap2.Name = "lvPowerMap2"
- Me.lvPowerMap2.Size = New System.Drawing.Size(440, 185)
+ Me.lvPowerMap2.Size = New System.Drawing.Size(292, 121)
Me.lvPowerMap2.TabIndex = 109
- Me.lvPowerMap2.TabStop = false
- Me.lvPowerMap2.UseCompatibleStateImageBehavior = false
+ Me.lvPowerMap2.TabStop = False
+ Me.lvPowerMap2.UseCompatibleStateImageBehavior = False
Me.lvPowerMap2.View = System.Windows.Forms.View.Details
'
'ColumnHeader6
@@ -724,65 +696,64 @@ Partial Class IEPCForm
Me.FlowLayoutPanel10.Controls.Add(Me.tbFLCurve2)
Me.FlowLayoutPanel10.Controls.Add(Me.btFLCurveFile2)
Me.FlowLayoutPanel10.Controls.Add(Me.btShowFLCurve2)
- Me.FlowLayoutPanel10.Location = New System.Drawing.Point(9, 145)
- Me.FlowLayoutPanel10.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.FlowLayoutPanel10.Location = New System.Drawing.Point(6, 94)
Me.FlowLayoutPanel10.Name = "FlowLayoutPanel10"
- Me.FlowLayoutPanel10.Size = New System.Drawing.Size(744, 40)
+ Me.FlowLayoutPanel10.Size = New System.Drawing.Size(496, 26)
Me.FlowLayoutPanel10.TabIndex = 110
'
'Label28
'
Me.Label28.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label28.AutoSize = true
- Me.Label28.Location = New System.Drawing.Point(21, 9)
- Me.Label28.Margin = New System.Windows.Forms.Padding(21, 0, 0, 0)
+ Me.Label28.AutoSize = True
+ Me.Label28.Location = New System.Drawing.Point(14, 6)
+ Me.Label28.Margin = New System.Windows.Forms.Padding(14, 0, 0, 0)
Me.Label28.Name = "Label28"
- Me.Label28.Size = New System.Drawing.Size(182, 20)
+ Me.Label28.Size = New System.Drawing.Size(125, 13)
Me.Label28.TabIndex = 59
Me.Label28.Text = "Full Load Curve (.viepcp)"
'
'tbFLCurve2
'
Me.tbFLCurve2.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbFLCurve2.Location = New System.Drawing.Point(207, 6)
- Me.tbFLCurve2.Margin = New System.Windows.Forms.Padding(4, 5, 9, 5)
+ Me.tbFLCurve2.Location = New System.Drawing.Point(142, 3)
+ Me.tbFLCurve2.Margin = New System.Windows.Forms.Padding(3, 3, 6, 3)
Me.tbFLCurve2.Name = "tbFLCurve2"
- Me.tbFLCurve2.Size = New System.Drawing.Size(414, 26)
+ Me.tbFLCurve2.Size = New System.Drawing.Size(277, 20)
Me.tbFLCurve2.TabIndex = 23
'
'btFLCurveFile2
'
Me.btFLCurveFile2.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.btFLCurveFile2.Image = CType(resources.GetObject("btFLCurveFile2.Image"),System.Drawing.Image)
- Me.btFLCurveFile2.Location = New System.Drawing.Point(630, 1)
+ Me.btFLCurveFile2.Image = CType(resources.GetObject("btFLCurveFile2.Image"), System.Drawing.Image)
+ Me.btFLCurveFile2.Location = New System.Drawing.Point(425, 1)
Me.btFLCurveFile2.Margin = New System.Windows.Forms.Padding(0)
Me.btFLCurveFile2.Name = "btFLCurveFile2"
- Me.btFLCurveFile2.Size = New System.Drawing.Size(36, 37)
+ Me.btFLCurveFile2.Size = New System.Drawing.Size(24, 24)
Me.btFLCurveFile2.TabIndex = 24
- Me.btFLCurveFile2.UseVisualStyleBackColor = true
+ Me.btFLCurveFile2.UseVisualStyleBackColor = True
'
'btShowFLCurve2
'
Me.btShowFLCurve2.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.btShowFLCurve2.Location = New System.Drawing.Point(666, 2)
- Me.btShowFLCurve2.Margin = New System.Windows.Forms.Padding(0, 2, 0, 0)
+ Me.btShowFLCurve2.Location = New System.Drawing.Point(449, 1)
+ Me.btShowFLCurve2.Margin = New System.Windows.Forms.Padding(0, 1, 0, 0)
Me.btShowFLCurve2.Name = "btShowFLCurve2"
- Me.btShowFLCurve2.Size = New System.Drawing.Size(36, 37)
+ Me.btShowFLCurve2.Size = New System.Drawing.Size(24, 24)
Me.btShowFLCurve2.TabIndex = 85
- Me.btShowFLCurve2.TabStop = false
- Me.btShowFLCurve2.UseVisualStyleBackColor = true
+ Me.btShowFLCurve2.TabStop = False
+ Me.btShowFLCurve2.UseVisualStyleBackColor = True
'
'TableLayoutPanel4
'
Me.TableLayoutPanel4.Anchor = System.Windows.Forms.AnchorStyles.None
Me.TableLayoutPanel4.ColumnCount = 7
- Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 210!))
- Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 93!))
- Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 45!))
- Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 192!))
- Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 93!))
- Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 45!))
- Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 88!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 140.0!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 62.0!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 30.0!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 128.0!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 62.0!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 30.0!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 59.0!))
Me.TableLayoutPanel4.Controls.Add(Me.Label17, 2, 1)
Me.TableLayoutPanel4.Controls.Add(Me.Label18, 2, 0)
Me.TableLayoutPanel4.Controls.Add(Me.Label26, 5, 0)
@@ -801,336 +772,315 @@ Partial Class IEPCForm
Me.TableLayoutPanel4.Controls.Add(Me.Label22, 3, 1)
Me.TableLayoutPanel4.Controls.Add(Me.tbOverloadTorque2, 4, 1)
Me.TableLayoutPanel4.Controls.Add(Me.Label16, 5, 1)
- Me.TableLayoutPanel4.Location = New System.Drawing.Point(9, 11)
- Me.TableLayoutPanel4.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TableLayoutPanel4.Location = New System.Drawing.Point(6, 7)
Me.TableLayoutPanel4.Name = "TableLayoutPanel4"
Me.TableLayoutPanel4.RowCount = 3
- Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 42!))
- Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 42!))
- Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 42!))
- Me.TableLayoutPanel4.Size = New System.Drawing.Size(744, 126)
+ Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27.0!))
+ Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27.0!))
+ Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27.0!))
+ Me.TableLayoutPanel4.Size = New System.Drawing.Size(496, 82)
Me.TableLayoutPanel4.TabIndex = 109
'
'Label17
'
Me.Label17.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label17.AutoSize = true
- Me.Label17.Location = New System.Drawing.Point(305, 53)
+ Me.Label17.AutoSize = True
+ Me.Label17.Location = New System.Drawing.Point(202, 34)
Me.Label17.Margin = New System.Windows.Forms.Padding(0)
Me.Label17.Name = "Label17"
- Me.Label17.Size = New System.Drawing.Size(41, 20)
+ Me.Label17.Size = New System.Drawing.Size(29, 13)
Me.Label17.TabIndex = 63
Me.Label17.Text = "[Nm]"
'
'Label18
'
Me.Label18.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label18.AutoSize = true
- Me.Label18.Location = New System.Drawing.Point(311, 11)
+ Me.Label18.AutoSize = True
+ Me.Label18.Location = New System.Drawing.Point(207, 7)
Me.Label18.Margin = New System.Windows.Forms.Padding(0)
Me.Label18.Name = "Label18"
- Me.Label18.Size = New System.Drawing.Size(28, 20)
+ Me.Label18.Size = New System.Drawing.Size(20, 13)
Me.Label18.TabIndex = 62
Me.Label18.Text = "[V]"
'
'Label26
'
Me.Label26.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label26.AutoSize = true
- Me.Label26.Location = New System.Drawing.Point(634, 11)
+ Me.Label26.AutoSize = True
+ Me.Label26.Location = New System.Drawing.Point(428, 7)
Me.Label26.Margin = New System.Windows.Forms.Padding(0)
Me.Label26.Name = "Label26"
- Me.Label26.Size = New System.Drawing.Size(42, 20)
+ Me.Label26.Size = New System.Drawing.Size(18, 13)
Me.Label26.TabIndex = 65
- Me.Label26.Text = "[sec]"
+ Me.Label26.Text = "[s]"
'
'Label19
'
Me.Label19.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label19.AutoSize = true
- Me.Label19.Location = New System.Drawing.Point(142, 11)
- Me.Label19.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label19.AutoSize = True
+ Me.Label19.Location = New System.Drawing.Point(94, 7)
Me.Label19.Name = "Label19"
- Me.Label19.Size = New System.Drawing.Size(64, 20)
+ Me.Label19.Size = New System.Drawing.Size(43, 13)
Me.Label19.TabIndex = 1
Me.Label19.Text = "Voltage"
'
'tbOverloadTime2
'
Me.tbOverloadTime2.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbOverloadTime2.Location = New System.Drawing.Point(545, 8)
- Me.tbOverloadTime2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbOverloadTime2.Location = New System.Drawing.Point(363, 3)
Me.tbOverloadTime2.Name = "tbOverloadTime2"
- Me.tbOverloadTime2.Size = New System.Drawing.Size(82, 26)
+ Me.tbOverloadTime2.Size = New System.Drawing.Size(56, 20)
Me.tbOverloadTime2.TabIndex = 20
'
'Label24
'
Me.Label24.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label24.AutoSize = true
- Me.Label24.Location = New System.Drawing.Point(426, 11)
- Me.Label24.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label24.AutoSize = True
+ Me.Label24.Location = New System.Drawing.Point(281, 7)
Me.Label24.Name = "Label24"
- Me.Label24.Size = New System.Drawing.Size(110, 20)
+ Me.Label24.Size = New System.Drawing.Size(76, 13)
Me.Label24.TabIndex = 11
Me.Label24.Text = "Overload Time"
'
'tbVoltage2
'
Me.tbVoltage2.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbVoltage2.Location = New System.Drawing.Point(215, 8)
- Me.tbVoltage2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbVoltage2.Location = New System.Drawing.Point(143, 3)
Me.tbVoltage2.Name = "tbVoltage2"
- Me.tbVoltage2.Size = New System.Drawing.Size(82, 26)
+ Me.tbVoltage2.Size = New System.Drawing.Size(56, 20)
Me.tbVoltage2.TabIndex = 17
'
'Label20
'
Me.Label20.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label20.AutoSize = true
- Me.Label20.Location = New System.Drawing.Point(62, 53)
- Me.Label20.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label20.AutoSize = True
+ Me.Label20.Location = New System.Drawing.Point(40, 34)
Me.Label20.Name = "Label20"
- Me.Label20.Size = New System.Drawing.Size(144, 20)
+ Me.Label20.Size = New System.Drawing.Size(97, 13)
Me.Label20.TabIndex = 3
Me.Label20.Text = "Continuous Torque"
'
'Label21
'
Me.Label21.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label21.AutoSize = true
- Me.Label21.Location = New System.Drawing.Point(11, 95)
- Me.Label21.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label21.AutoSize = True
+ Me.Label21.Location = New System.Drawing.Point(6, 61)
Me.Label21.Name = "Label21"
- Me.Label21.Size = New System.Drawing.Size(195, 20)
+ Me.Label21.Size = New System.Drawing.Size(131, 13)
Me.Label21.TabIndex = 6
Me.Label21.Text = "Continuous Torque Speed"
'
'tbContinousTorque2
'
Me.tbContinousTorque2.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbContinousTorque2.Location = New System.Drawing.Point(215, 50)
- Me.tbContinousTorque2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbContinousTorque2.Location = New System.Drawing.Point(143, 30)
Me.tbContinousTorque2.Name = "tbContinousTorque2"
- Me.tbContinousTorque2.Size = New System.Drawing.Size(82, 26)
+ Me.tbContinousTorque2.Size = New System.Drawing.Size(56, 20)
Me.tbContinousTorque2.TabIndex = 18
'
'tbContinousTorqueSpeed2
'
Me.tbContinousTorqueSpeed2.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbContinousTorqueSpeed2.Location = New System.Drawing.Point(215, 92)
- Me.tbContinousTorqueSpeed2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbContinousTorqueSpeed2.Location = New System.Drawing.Point(143, 58)
Me.tbContinousTorqueSpeed2.Name = "tbContinousTorqueSpeed2"
- Me.tbContinousTorqueSpeed2.Size = New System.Drawing.Size(82, 26)
+ Me.tbContinousTorqueSpeed2.Size = New System.Drawing.Size(56, 20)
Me.tbContinousTorqueSpeed2.TabIndex = 19
'
'Label27
'
Me.Label27.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label27.AutoSize = true
- Me.Label27.Location = New System.Drawing.Point(303, 95)
+ Me.Label27.AutoSize = True
+ Me.Label27.Location = New System.Drawing.Point(202, 61)
Me.Label27.Margin = New System.Windows.Forms.Padding(0)
Me.Label27.Name = "Label27"
- Me.Label27.Size = New System.Drawing.Size(44, 20)
+ Me.Label27.Size = New System.Drawing.Size(30, 13)
Me.Label27.TabIndex = 67
Me.Label27.Text = "[rpm]"
'
'Label23
'
Me.Label23.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label23.AutoSize = true
- Me.Label23.Location = New System.Drawing.Point(359, 95)
- Me.Label23.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label23.AutoSize = True
+ Me.Label23.Location = New System.Drawing.Point(236, 61)
Me.Label23.Name = "Label23"
- Me.Label23.Size = New System.Drawing.Size(177, 20)
+ Me.Label23.Size = New System.Drawing.Size(121, 13)
Me.Label23.TabIndex = 9
Me.Label23.Text = "Overload Torque Speed"
'
'tbOverloadTorqueSpeed2
'
Me.tbOverloadTorqueSpeed2.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbOverloadTorqueSpeed2.Location = New System.Drawing.Point(545, 92)
- Me.tbOverloadTorqueSpeed2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbOverloadTorqueSpeed2.Location = New System.Drawing.Point(363, 58)
Me.tbOverloadTorqueSpeed2.Name = "tbOverloadTorqueSpeed2"
- Me.tbOverloadTorqueSpeed2.Size = New System.Drawing.Size(82, 26)
+ Me.tbOverloadTorqueSpeed2.Size = New System.Drawing.Size(56, 20)
Me.tbOverloadTorqueSpeed2.TabIndex = 22
'
'Label25
'
Me.Label25.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label25.AutoSize = true
- Me.Label25.Location = New System.Drawing.Point(633, 95)
+ Me.Label25.AutoSize = True
+ Me.Label25.Location = New System.Drawing.Point(422, 61)
Me.Label25.Margin = New System.Windows.Forms.Padding(0)
Me.Label25.Name = "Label25"
- Me.Label25.Size = New System.Drawing.Size(44, 20)
+ Me.Label25.Size = New System.Drawing.Size(30, 13)
Me.Label25.TabIndex = 66
Me.Label25.Text = "[rpm]"
'
'Label22
'
Me.Label22.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label22.AutoSize = true
- Me.Label22.Location = New System.Drawing.Point(410, 53)
- Me.Label22.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label22.AutoSize = True
+ Me.Label22.Location = New System.Drawing.Point(270, 34)
Me.Label22.Name = "Label22"
- Me.Label22.Size = New System.Drawing.Size(126, 20)
+ Me.Label22.Size = New System.Drawing.Size(87, 13)
Me.Label22.TabIndex = 7
Me.Label22.Text = "Overload Torque"
'
'tbOverloadTorque2
'
Me.tbOverloadTorque2.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbOverloadTorque2.Location = New System.Drawing.Point(545, 50)
- Me.tbOverloadTorque2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbOverloadTorque2.Location = New System.Drawing.Point(363, 30)
Me.tbOverloadTorque2.Name = "tbOverloadTorque2"
- Me.tbOverloadTorque2.Size = New System.Drawing.Size(82, 26)
+ Me.tbOverloadTorque2.Size = New System.Drawing.Size(56, 20)
Me.tbOverloadTorque2.TabIndex = 21
'
'Label16
'
Me.Label16.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label16.AutoSize = true
- Me.Label16.Location = New System.Drawing.Point(635, 53)
+ Me.Label16.AutoSize = True
+ Me.Label16.Location = New System.Drawing.Point(422, 34)
Me.Label16.Margin = New System.Windows.Forms.Padding(0)
Me.Label16.Name = "Label16"
- Me.Label16.Size = New System.Drawing.Size(41, 20)
+ Me.Label16.Size = New System.Drawing.Size(29, 13)
Me.Label16.TabIndex = 64
Me.Label16.Text = "[Nm]"
'
'Label3
'
- Me.Label3.AutoSize = true
+ Me.Label3.AutoSize = True
Me.Label3.Dock = System.Windows.Forms.DockStyle.Top
- Me.Label3.Location = New System.Drawing.Point(4, 9)
- Me.Label3.Margin = New System.Windows.Forms.Padding(4, 9, 9, 9)
+ Me.Label3.Location = New System.Drawing.Point(3, 6)
+ Me.Label3.Margin = New System.Windows.Forms.Padding(3, 6, 6, 6)
Me.Label3.Name = "Label3"
- Me.Label3.Size = New System.Drawing.Size(191, 20)
+ Me.Label3.Size = New System.Drawing.Size(131, 13)
Me.Label3.TabIndex = 54
Me.Label3.Text = "Design Type Wheel Motor"
'
'cbDesignTypeWheelMotor
'
Me.cbDesignTypeWheelMotor.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.cbDesignTypeWheelMotor.AutoSize = true
- Me.cbDesignTypeWheelMotor.Location = New System.Drawing.Point(274, 9)
- Me.cbDesignTypeWheelMotor.Margin = New System.Windows.Forms.Padding(70, 9, 4, 9)
+ Me.cbDesignTypeWheelMotor.AutoSize = True
+ Me.cbDesignTypeWheelMotor.Location = New System.Drawing.Point(190, 6)
+ Me.cbDesignTypeWheelMotor.Margin = New System.Windows.Forms.Padding(50, 6, 3, 6)
Me.cbDesignTypeWheelMotor.Name = "cbDesignTypeWheelMotor"
- Me.cbDesignTypeWheelMotor.Size = New System.Drawing.Size(22, 21)
+ Me.cbDesignTypeWheelMotor.Size = New System.Drawing.Size(15, 14)
Me.cbDesignTypeWheelMotor.TabIndex = 4
- Me.cbDesignTypeWheelMotor.UseVisualStyleBackColor = true
+ Me.cbDesignTypeWheelMotor.UseVisualStyleBackColor = True
'
'Label2
'
Me.Label2.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label2.AutoSize = true
- Me.Label2.Location = New System.Drawing.Point(4, 9)
- Me.Label2.Margin = New System.Windows.Forms.Padding(4, 9, 9, 9)
+ Me.Label2.AutoSize = True
+ Me.Label2.Location = New System.Drawing.Point(3, 6)
+ Me.Label2.Margin = New System.Windows.Forms.Padding(3, 6, 6, 6)
Me.Label2.Name = "Label2"
- Me.Label2.Size = New System.Drawing.Size(151, 20)
+ Me.Label2.Size = New System.Drawing.Size(101, 13)
Me.Label2.TabIndex = 53
Me.Label2.Text = "Differential Included"
'
'cbDifferentialIncluded
'
Me.cbDifferentialIncluded.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.cbDifferentialIncluded.AutoSize = true
- Me.cbDifferentialIncluded.Location = New System.Drawing.Point(284, 9)
- Me.cbDifferentialIncluded.Margin = New System.Windows.Forms.Padding(120, 9, 4, 9)
+ Me.cbDifferentialIncluded.AutoSize = True
+ Me.cbDifferentialIncluded.Location = New System.Drawing.Point(190, 6)
+ Me.cbDifferentialIncluded.Margin = New System.Windows.Forms.Padding(80, 6, 3, 6)
Me.cbDifferentialIncluded.Name = "cbDifferentialIncluded"
- Me.cbDifferentialIncluded.Size = New System.Drawing.Size(22, 21)
+ Me.cbDifferentialIncluded.Size = New System.Drawing.Size(15, 14)
Me.cbDifferentialIncluded.TabIndex = 6
- Me.cbDifferentialIncluded.UseVisualStyleBackColor = true
+ Me.cbDifferentialIncluded.UseVisualStyleBackColor = True
'
'GroupBox1
'
Me.GroupBox1.Anchor = System.Windows.Forms.AnchorStyles.Top
Me.GroupBox1.Controls.Add(Me.TableLayoutPanel5)
- Me.GroupBox1.Location = New System.Drawing.Point(808, 289)
- Me.GroupBox1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox1.Location = New System.Drawing.Point(539, 188)
Me.GroupBox1.Name = "GroupBox1"
- Me.GroupBox1.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.GroupBox1.Size = New System.Drawing.Size(471, 277)
+ Me.GroupBox1.Size = New System.Drawing.Size(314, 180)
Me.GroupBox1.TabIndex = 61
- Me.GroupBox1.TabStop = false
+ Me.GroupBox1.TabStop = False
Me.GroupBox1.Text = "Gears"
'
'TableLayoutPanel5
'
Me.TableLayoutPanel5.Anchor = System.Windows.Forms.AnchorStyles.None
Me.TableLayoutPanel5.ColumnCount = 2
- Me.TableLayoutPanel5.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 194!))
- Me.TableLayoutPanel5.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 256!))
+ Me.TableLayoutPanel5.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 129.0!))
+ Me.TableLayoutPanel5.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 171.0!))
Me.TableLayoutPanel5.Controls.Add(Me.FlowLayoutPanel2, 0, 1)
Me.TableLayoutPanel5.Controls.Add(Me.Label6, 1, 1)
Me.TableLayoutPanel5.Controls.Add(Me.lvGear, 0, 0)
- Me.TableLayoutPanel5.Location = New System.Drawing.Point(10, 25)
- Me.TableLayoutPanel5.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TableLayoutPanel5.Location = New System.Drawing.Point(7, 16)
Me.TableLayoutPanel5.Name = "TableLayoutPanel5"
Me.TableLayoutPanel5.RowCount = 2
Me.TableLayoutPanel5.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 78.61636!))
Me.TableLayoutPanel5.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 21.38365!))
- Me.TableLayoutPanel5.Size = New System.Drawing.Size(450, 245)
+ Me.TableLayoutPanel5.Size = New System.Drawing.Size(300, 159)
Me.TableLayoutPanel5.TabIndex = 111
'
'FlowLayoutPanel2
'
Me.FlowLayoutPanel2.Controls.Add(Me.btAddGear)
Me.FlowLayoutPanel2.Controls.Add(Me.btRemoveGear)
- Me.FlowLayoutPanel2.Location = New System.Drawing.Point(4, 197)
- Me.FlowLayoutPanel2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.FlowLayoutPanel2.Location = New System.Drawing.Point(3, 128)
Me.FlowLayoutPanel2.Name = "FlowLayoutPanel2"
- Me.FlowLayoutPanel2.Size = New System.Drawing.Size(92, 43)
+ Me.FlowLayoutPanel2.Size = New System.Drawing.Size(61, 28)
Me.FlowLayoutPanel2.TabIndex = 112
'
'btAddGear
'
Me.btAddGear.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
- Me.btAddGear.Location = New System.Drawing.Point(4, 5)
- Me.btAddGear.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btAddGear.Location = New System.Drawing.Point(3, 3)
Me.btAddGear.Name = "btAddGear"
- Me.btAddGear.Size = New System.Drawing.Size(36, 37)
+ Me.btAddGear.Size = New System.Drawing.Size(24, 24)
Me.btAddGear.TabIndex = 25
- Me.btAddGear.UseVisualStyleBackColor = true
+ Me.btAddGear.UseVisualStyleBackColor = True
'
'btRemoveGear
'
Me.btRemoveGear.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
- Me.btRemoveGear.Location = New System.Drawing.Point(48, 5)
- Me.btRemoveGear.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btRemoveGear.Location = New System.Drawing.Point(33, 3)
Me.btRemoveGear.Name = "btRemoveGear"
- Me.btRemoveGear.Size = New System.Drawing.Size(36, 37)
+ Me.btRemoveGear.Size = New System.Drawing.Size(24, 24)
Me.btRemoveGear.TabIndex = 26
- Me.btRemoveGear.UseVisualStyleBackColor = true
+ Me.btRemoveGear.UseVisualStyleBackColor = True
'
'Label6
'
- Me.Label6.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.Label6.AutoSize = true
- Me.Label6.Location = New System.Drawing.Point(288, 192)
- Me.Label6.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label6.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.Label6.AutoSize = True
+ Me.Label6.Location = New System.Drawing.Point(191, 125)
Me.Label6.Name = "Label6"
- Me.Label6.Size = New System.Drawing.Size(158, 20)
+ Me.Label6.Size = New System.Drawing.Size(106, 13)
Me.Label6.TabIndex = 6
Me.Label6.Text = "(Double-Click to Edit)"
'
'lvGear
'
- Me.lvGear.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
- Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.lvGear.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.lvGear.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader2, Me.ColumnHeader3})
Me.TableLayoutPanel5.SetColumnSpan(Me.lvGear, 2)
- Me.lvGear.FullRowSelect = true
- Me.lvGear.GridLines = true
- Me.lvGear.HideSelection = false
- Me.lvGear.Location = New System.Drawing.Point(4, 5)
- Me.lvGear.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.lvGear.MultiSelect = false
+ Me.lvGear.FullRowSelect = True
+ Me.lvGear.GridLines = True
+ Me.lvGear.HideSelection = False
+ Me.lvGear.Location = New System.Drawing.Point(3, 3)
+ Me.lvGear.MultiSelect = False
Me.lvGear.Name = "lvGear"
- Me.lvGear.Size = New System.Drawing.Size(442, 182)
+ Me.lvGear.Size = New System.Drawing.Size(294, 119)
Me.lvGear.TabIndex = 78
- Me.lvGear.TabStop = false
- Me.lvGear.UseCompatibleStateImageBehavior = false
+ Me.lvGear.TabStop = False
+ Me.lvGear.UseCompatibleStateImageBehavior = False
Me.lvGear.View = System.Windows.Forms.View.Details
'
'ColumnHeader1
@@ -1152,51 +1102,47 @@ Partial Class IEPCForm
'
Me.GroupBox3.Anchor = System.Windows.Forms.AnchorStyles.Top
Me.GroupBox3.Controls.Add(Me.TableLayoutPanel3)
- Me.GroupBox3.Location = New System.Drawing.Point(808, 572)
- Me.GroupBox3.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox3.Location = New System.Drawing.Point(539, 372)
Me.GroupBox3.Name = "GroupBox3"
- Me.GroupBox3.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.GroupBox3.Size = New System.Drawing.Size(471, 277)
+ Me.GroupBox3.Size = New System.Drawing.Size(314, 180)
Me.GroupBox3.TabIndex = 62
- Me.GroupBox3.TabStop = false
+ Me.GroupBox3.TabStop = False
Me.GroupBox3.Text = "Drag Curves"
'
'TableLayoutPanel3
'
Me.TableLayoutPanel3.Anchor = System.Windows.Forms.AnchorStyles.None
Me.TableLayoutPanel3.ColumnCount = 2
- Me.TableLayoutPanel3.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 194!))
- Me.TableLayoutPanel3.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 256!))
+ Me.TableLayoutPanel3.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 129.0!))
+ Me.TableLayoutPanel3.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 171.0!))
Me.TableLayoutPanel3.Controls.Add(Me.lvDragCurve, 0, 0)
Me.TableLayoutPanel3.Controls.Add(Me.FlowLayoutPanel11, 0, 1)
Me.TableLayoutPanel3.Controls.Add(Me.Label7, 1, 1)
- Me.TableLayoutPanel3.Location = New System.Drawing.Point(10, 22)
- Me.TableLayoutPanel3.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TableLayoutPanel3.Location = New System.Drawing.Point(7, 14)
Me.TableLayoutPanel3.Name = "TableLayoutPanel3"
Me.TableLayoutPanel3.RowCount = 2
Me.TableLayoutPanel3.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 78.61636!))
Me.TableLayoutPanel3.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 21.38365!))
- Me.TableLayoutPanel3.Size = New System.Drawing.Size(450, 245)
+ Me.TableLayoutPanel3.Size = New System.Drawing.Size(300, 159)
Me.TableLayoutPanel3.TabIndex = 113
'
'lvDragCurve
'
- Me.lvDragCurve.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
- Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.lvDragCurve.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.lvDragCurve.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader4, Me.ColumnHeader5})
Me.TableLayoutPanel3.SetColumnSpan(Me.lvDragCurve, 2)
- Me.lvDragCurve.FullRowSelect = true
- Me.lvDragCurve.GridLines = true
- Me.lvDragCurve.HideSelection = false
- Me.lvDragCurve.Location = New System.Drawing.Point(4, 5)
- Me.lvDragCurve.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.lvDragCurve.MultiSelect = false
+ Me.lvDragCurve.FullRowSelect = True
+ Me.lvDragCurve.GridLines = True
+ Me.lvDragCurve.HideSelection = False
+ Me.lvDragCurve.Location = New System.Drawing.Point(3, 3)
+ Me.lvDragCurve.MultiSelect = False
Me.lvDragCurve.Name = "lvDragCurve"
- Me.lvDragCurve.Size = New System.Drawing.Size(442, 182)
+ Me.lvDragCurve.Size = New System.Drawing.Size(294, 119)
Me.lvDragCurve.TabIndex = 78
- Me.lvDragCurve.TabStop = false
- Me.lvDragCurve.UseCompatibleStateImageBehavior = false
+ Me.lvDragCurve.TabStop = False
+ Me.lvDragCurve.UseCompatibleStateImageBehavior = False
Me.lvDragCurve.View = System.Windows.Forms.View.Details
'
'ColumnHeader4
@@ -1213,40 +1159,36 @@ Partial Class IEPCForm
'
Me.FlowLayoutPanel11.Controls.Add(Me.btAddDragCurve)
Me.FlowLayoutPanel11.Controls.Add(Me.btRemoveDragCurve)
- Me.FlowLayoutPanel11.Location = New System.Drawing.Point(4, 197)
- Me.FlowLayoutPanel11.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.FlowLayoutPanel11.Location = New System.Drawing.Point(3, 128)
Me.FlowLayoutPanel11.Name = "FlowLayoutPanel11"
- Me.FlowLayoutPanel11.Size = New System.Drawing.Size(92, 43)
+ Me.FlowLayoutPanel11.Size = New System.Drawing.Size(61, 28)
Me.FlowLayoutPanel11.TabIndex = 114
'
'btAddDragCurve
'
Me.btAddDragCurve.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
- Me.btAddDragCurve.Location = New System.Drawing.Point(4, 5)
- Me.btAddDragCurve.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btAddDragCurve.Location = New System.Drawing.Point(3, 3)
Me.btAddDragCurve.Name = "btAddDragCurve"
- Me.btAddDragCurve.Size = New System.Drawing.Size(36, 37)
+ Me.btAddDragCurve.Size = New System.Drawing.Size(24, 24)
Me.btAddDragCurve.TabIndex = 27
- Me.btAddDragCurve.UseVisualStyleBackColor = true
+ Me.btAddDragCurve.UseVisualStyleBackColor = True
'
'btRemoveDragCurve
'
Me.btRemoveDragCurve.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
- Me.btRemoveDragCurve.Location = New System.Drawing.Point(48, 5)
- Me.btRemoveDragCurve.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btRemoveDragCurve.Location = New System.Drawing.Point(33, 3)
Me.btRemoveDragCurve.Name = "btRemoveDragCurve"
- Me.btRemoveDragCurve.Size = New System.Drawing.Size(36, 37)
+ Me.btRemoveDragCurve.Size = New System.Drawing.Size(24, 24)
Me.btRemoveDragCurve.TabIndex = 28
- Me.btRemoveDragCurve.UseVisualStyleBackColor = true
+ Me.btRemoveDragCurve.UseVisualStyleBackColor = True
'
'Label7
'
- Me.Label7.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.Label7.AutoSize = true
- Me.Label7.Location = New System.Drawing.Point(288, 192)
- Me.Label7.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label7.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.Label7.AutoSize = True
+ Me.Label7.Location = New System.Drawing.Point(191, 125)
Me.Label7.Name = "Label7"
- Me.Label7.Size = New System.Drawing.Size(158, 20)
+ Me.Label7.Size = New System.Drawing.Size(106, 13)
Me.Label7.TabIndex = 6
Me.Label7.Text = "(Double-Click to Edit)"
'
@@ -1257,7 +1199,7 @@ Partial Class IEPCForm
Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator3, Me.ToolStripBtSendTo, Me.ToolStripSeparator1, Me.ToolStripButton1})
Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
Me.ToolStrip1.Name = "ToolStrip1"
- Me.ToolStrip1.Size = New System.Drawing.Size(1296, 38)
+ Me.ToolStrip1.Size = New System.Drawing.Size(864, 31)
Me.ToolStrip1.TabIndex = 63
Me.ToolStrip1.Text = "ToolStrip1"
'
@@ -1267,7 +1209,7 @@ Partial Class IEPCForm
Me.ToolStripBtNew.Image = Global.TUGraz.VECTO.My.Resources.Resources.blue_document_icon
Me.ToolStripBtNew.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripBtNew.Name = "ToolStripBtNew"
- Me.ToolStripBtNew.Size = New System.Drawing.Size(34, 28)
+ Me.ToolStripBtNew.Size = New System.Drawing.Size(28, 28)
Me.ToolStripBtNew.Text = "ToolStripButton1"
Me.ToolStripBtNew.ToolTipText = "New"
'
@@ -1277,7 +1219,7 @@ Partial Class IEPCForm
Me.ToolStripBtOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
Me.ToolStripBtOpen.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripBtOpen.Name = "ToolStripBtOpen"
- Me.ToolStripBtOpen.Size = New System.Drawing.Size(34, 28)
+ Me.ToolStripBtOpen.Size = New System.Drawing.Size(28, 28)
Me.ToolStripBtOpen.Text = "ToolStripButton1"
Me.ToolStripBtOpen.ToolTipText = "Open..."
'
@@ -1287,7 +1229,7 @@ Partial Class IEPCForm
Me.ToolStripBtSave.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_document_save_icon
Me.ToolStripBtSave.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripBtSave.Name = "ToolStripBtSave"
- Me.ToolStripBtSave.Size = New System.Drawing.Size(34, 28)
+ Me.ToolStripBtSave.Size = New System.Drawing.Size(28, 28)
Me.ToolStripBtSave.Text = "ToolStripButton1"
Me.ToolStripBtSave.ToolTipText = "Save"
'
@@ -1297,14 +1239,14 @@ Partial Class IEPCForm
Me.ToolStripBtSaveAs.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_document_save_as_icon
Me.ToolStripBtSaveAs.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripBtSaveAs.Name = "ToolStripBtSaveAs"
- Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(34, 28)
+ Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(28, 28)
Me.ToolStripBtSaveAs.Text = "ToolStripButton1"
Me.ToolStripBtSaveAs.ToolTipText = "Save As..."
'
'ToolStripSeparator3
'
Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
- Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 33)
+ Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 31)
'
'ToolStripBtSendTo
'
@@ -1312,14 +1254,14 @@ Partial Class IEPCForm
Me.ToolStripBtSendTo.Image = Global.TUGraz.VECTO.My.Resources.Resources.export_icon
Me.ToolStripBtSendTo.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripBtSendTo.Name = "ToolStripBtSendTo"
- Me.ToolStripBtSendTo.Size = New System.Drawing.Size(34, 28)
+ Me.ToolStripBtSendTo.Size = New System.Drawing.Size(28, 28)
Me.ToolStripBtSendTo.Text = "Send to Vehicle Editor"
Me.ToolStripBtSendTo.ToolTipText = "Send to Vehicle Editor"
'
'ToolStripSeparator1
'
Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
- Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 33)
+ Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 31)
'
'ToolStripButton1
'
@@ -1327,7 +1269,7 @@ Partial Class IEPCForm
Me.ToolStripButton1.Image = Global.TUGraz.VECTO.My.Resources.Resources.Help_icon
Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripButton1.Name = "ToolStripButton1"
- Me.ToolStripButton1.Size = New System.Drawing.Size(34, 28)
+ Me.ToolStripButton1.Size = New System.Drawing.Size(28, 28)
Me.ToolStripButton1.Text = "Help"
'
'PictureBox1
@@ -1335,57 +1277,52 @@ Partial Class IEPCForm
Me.PictureBox1.BackColor = System.Drawing.Color.White
Me.PictureBox1.Dock = System.Windows.Forms.DockStyle.Top
Me.PictureBox1.Image = Global.TUGraz.VECTO.My.Resources.Resources.VECTO_Mainform
- Me.PictureBox1.Location = New System.Drawing.Point(0, 38)
- Me.PictureBox1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.PictureBox1.Location = New System.Drawing.Point(0, 31)
Me.PictureBox1.Name = "PictureBox1"
- Me.PictureBox1.Size = New System.Drawing.Size(1296, 62)
+ Me.PictureBox1.Size = New System.Drawing.Size(864, 40)
Me.PictureBox1.TabIndex = 64
- Me.PictureBox1.TabStop = false
+ Me.PictureBox1.TabStop = False
'
'lblTitle
'
Me.lblTitle.Anchor = System.Windows.Forms.AnchorStyles.Top
- Me.lblTitle.AutoSize = true
+ Me.lblTitle.AutoSize = True
Me.lblTitle.BackColor = System.Drawing.Color.White
- Me.lblTitle.Font = New System.Drawing.Font("Microsoft Sans Serif", 18!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- Me.lblTitle.Location = New System.Drawing.Point(171, 55)
- Me.lblTitle.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ 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(114, 36)
Me.lblTitle.Name = "lblTitle"
- Me.lblTitle.Size = New System.Drawing.Size(100, 40)
+ Me.lblTitle.Size = New System.Drawing.Size(68, 29)
Me.lblTitle.TabIndex = 65
Me.lblTitle.Text = "IEPC"
'
'ButCancel
'
- Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ 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(1167, 863)
- Me.ButCancel.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.ButCancel.Location = New System.Drawing.Point(778, 561)
Me.ButCancel.Name = "ButCancel"
- Me.ButCancel.Size = New System.Drawing.Size(112, 35)
+ Me.ButCancel.Size = New System.Drawing.Size(75, 23)
Me.ButCancel.TabIndex = 67
Me.ButCancel.Text = "Cancel"
- Me.ButCancel.UseVisualStyleBackColor = true
+ Me.ButCancel.UseVisualStyleBackColor = True
'
'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(1046, 863)
- Me.ButOK.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ 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(697, 561)
Me.ButOK.Name = "ButOK"
- Me.ButOK.Size = New System.Drawing.Size(112, 35)
+ Me.ButOK.Size = New System.Drawing.Size(75, 23)
Me.ButOK.TabIndex = 66
Me.ButOK.Text = "Save"
- Me.ButOK.UseVisualStyleBackColor = true
+ Me.ButOK.UseVisualStyleBackColor = True
'
'FlowLayoutPanel1
'
Me.FlowLayoutPanel1.Controls.Add(Me.Label49)
Me.FlowLayoutPanel1.Controls.Add(Me.tbModel)
- Me.FlowLayoutPanel1.Location = New System.Drawing.Point(18, 118)
- Me.FlowLayoutPanel1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.FlowLayoutPanel1.Location = New System.Drawing.Point(12, 77)
Me.FlowLayoutPanel1.Name = "FlowLayoutPanel1"
- Me.FlowLayoutPanel1.Size = New System.Drawing.Size(363, 40)
+ Me.FlowLayoutPanel1.Size = New System.Drawing.Size(513, 26)
Me.FlowLayoutPanel1.TabIndex = 101
'
'FlowLayoutPanel4
@@ -1393,10 +1330,9 @@ Partial Class IEPCForm
Me.FlowLayoutPanel4.Anchor = System.Windows.Forms.AnchorStyles.Top
Me.FlowLayoutPanel4.Controls.Add(Me.Label3)
Me.FlowLayoutPanel4.Controls.Add(Me.cbDesignTypeWheelMotor)
- Me.FlowLayoutPanel4.Location = New System.Drawing.Point(18, 202)
- Me.FlowLayoutPanel4.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.FlowLayoutPanel4.Location = New System.Drawing.Point(12, 131)
Me.FlowLayoutPanel4.Name = "FlowLayoutPanel4"
- Me.FlowLayoutPanel4.Size = New System.Drawing.Size(315, 40)
+ Me.FlowLayoutPanel4.Size = New System.Drawing.Size(210, 26)
Me.FlowLayoutPanel4.TabIndex = 104
'
'FlowLayoutPanel5
@@ -1404,20 +1340,18 @@ Partial Class IEPCForm
Me.FlowLayoutPanel5.Controls.Add(Me.Label48)
Me.FlowLayoutPanel5.Controls.Add(Me.tbNumberOfDesignTypeWheelMotor)
Me.FlowLayoutPanel5.Controls.Add(Me.Label9)
- Me.FlowLayoutPanel5.Location = New System.Drawing.Point(340, 202)
- Me.FlowLayoutPanel5.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.FlowLayoutPanel5.Location = New System.Drawing.Point(227, 131)
Me.FlowLayoutPanel5.Name = "FlowLayoutPanel5"
- Me.FlowLayoutPanel5.Size = New System.Drawing.Size(447, 40)
+ Me.FlowLayoutPanel5.Size = New System.Drawing.Size(298, 26)
Me.FlowLayoutPanel5.TabIndex = 105
'
'Label9
'
Me.Label9.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label9.AutoSize = true
- Me.Label9.Location = New System.Drawing.Point(367, 8)
- Me.Label9.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label9.AutoSize = True
+ Me.Label9.Location = New System.Drawing.Point(252, 6)
Me.Label9.Name = "Label9"
- Me.Label9.Size = New System.Drawing.Size(22, 20)
+ Me.Label9.Size = New System.Drawing.Size(16, 13)
Me.Label9.TabIndex = 66
Me.Label9.Text = "[-]"
'
@@ -1426,20 +1360,18 @@ Partial Class IEPCForm
Me.FlowLayoutPanel6.Controls.Add(Me.Label51)
Me.FlowLayoutPanel6.Controls.Add(Me.tbInertia)
Me.FlowLayoutPanel6.Controls.Add(Me.lblinertiaUnit)
- Me.FlowLayoutPanel6.Location = New System.Drawing.Point(18, 160)
- Me.FlowLayoutPanel6.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.FlowLayoutPanel6.Location = New System.Drawing.Point(12, 104)
Me.FlowLayoutPanel6.Name = "FlowLayoutPanel6"
- Me.FlowLayoutPanel6.Size = New System.Drawing.Size(315, 40)
+ Me.FlowLayoutPanel6.Size = New System.Drawing.Size(210, 26)
Me.FlowLayoutPanel6.TabIndex = 102
'
'lblinertiaUnit
'
Me.lblinertiaUnit.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.lblinertiaUnit.AutoSize = true
- Me.lblinertiaUnit.Location = New System.Drawing.Point(158, 8)
- Me.lblinertiaUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblinertiaUnit.AutoSize = True
+ Me.lblinertiaUnit.Location = New System.Drawing.Point(108, 6)
Me.lblinertiaUnit.Name = "lblinertiaUnit"
- Me.lblinertiaUnit.Size = New System.Drawing.Size(52, 20)
+ Me.lblinertiaUnit.Size = New System.Drawing.Size(36, 13)
Me.lblinertiaUnit.TabIndex = 64
Me.lblinertiaUnit.Text = "[kgm²]"
'
@@ -1447,10 +1379,9 @@ Partial Class IEPCForm
'
Me.FlowLayoutPanel7.Controls.Add(Me.Label2)
Me.FlowLayoutPanel7.Controls.Add(Me.cbDifferentialIncluded)
- Me.FlowLayoutPanel7.Location = New System.Drawing.Point(18, 243)
- Me.FlowLayoutPanel7.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.FlowLayoutPanel7.Location = New System.Drawing.Point(12, 158)
Me.FlowLayoutPanel7.Name = "FlowLayoutPanel7"
- Me.FlowLayoutPanel7.Size = New System.Drawing.Size(315, 40)
+ Me.FlowLayoutPanel7.Size = New System.Drawing.Size(210, 26)
Me.FlowLayoutPanel7.TabIndex = 106
'
'FlowLayoutPanel8
@@ -1458,20 +1389,18 @@ Partial Class IEPCForm
Me.FlowLayoutPanel8.Controls.Add(Me.Label52)
Me.FlowLayoutPanel8.Controls.Add(Me.tbThermalOverload)
Me.FlowLayoutPanel8.Controls.Add(Me.Label10)
- Me.FlowLayoutPanel8.Location = New System.Drawing.Point(340, 160)
- Me.FlowLayoutPanel8.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.FlowLayoutPanel8.Location = New System.Drawing.Point(227, 104)
Me.FlowLayoutPanel8.Name = "FlowLayoutPanel8"
- Me.FlowLayoutPanel8.Size = New System.Drawing.Size(447, 40)
+ Me.FlowLayoutPanel8.Size = New System.Drawing.Size(298, 26)
Me.FlowLayoutPanel8.TabIndex = 103
'
'Label10
'
Me.Label10.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label10.AutoSize = true
- Me.Label10.Location = New System.Drawing.Point(407, 8)
- Me.Label10.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label10.AutoSize = True
+ Me.Label10.Location = New System.Drawing.Point(278, 6)
Me.Label10.Name = "Label10"
- Me.Label10.Size = New System.Drawing.Size(22, 20)
+ Me.Label10.Size = New System.Drawing.Size(16, 13)
Me.Label10.TabIndex = 67
Me.Label10.Text = "[-]"
'
@@ -1479,18 +1408,17 @@ Partial Class IEPCForm
'
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, 905)
+ Me.StatusStrip1.Location = New System.Drawing.Point(0, 587)
Me.StatusStrip1.Name = "StatusStrip1"
- Me.StatusStrip1.Padding = New System.Windows.Forms.Padding(2, 0, 21, 0)
- Me.StatusStrip1.Size = New System.Drawing.Size(1296, 32)
- Me.StatusStrip1.SizingGrip = false
+ Me.StatusStrip1.Size = New System.Drawing.Size(864, 22)
+ Me.StatusStrip1.SizingGrip = False
Me.StatusStrip1.TabIndex = 74
Me.StatusStrip1.Text = "StatusStrip1"
'
'LbStatus
'
Me.LbStatus.Name = "LbStatus"
- Me.LbStatus.Size = New System.Drawing.Size(60, 25)
+ Me.LbStatus.Size = New System.Drawing.Size(39, 17)
Me.LbStatus.Text = "Status"
'
'CmOpenFile
@@ -1498,25 +1426,25 @@ Partial Class IEPCForm
Me.CmOpenFile.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
Me.CmOpenFile.Name = "CmOpenFile"
- Me.CmOpenFile.Size = New System.Drawing.Size(203, 68)
+ Me.CmOpenFile.Size = New System.Drawing.Size(153, 48)
'
'OpenWithToolStripMenuItem
'
Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem"
- Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(202, 32)
+ Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
Me.OpenWithToolStripMenuItem.Text = "Open with ..."
'
'ShowInFolderToolStripMenuItem
'
Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem"
- Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(202, 32)
+ Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
'
'IEPCForm
'
- Me.AutoScaleDimensions = New System.Drawing.SizeF(9!, 20!)
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
- Me.ClientSize = New System.Drawing.Size(1296, 937)
+ Me.ClientSize = New System.Drawing.Size(864, 609)
Me.Controls.Add(Me.StatusStrip1)
Me.Controls.Add(Me.FlowLayoutPanel7)
Me.Controls.Add(Me.FlowLayoutPanel5)
@@ -1533,9 +1461,8 @@ Partial Class IEPCForm
Me.Controls.Add(Me.GroupBox1)
Me.Controls.Add(Me.tcVoltageLevels)
Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
- Me.Icon = CType(resources.GetObject("$this.Icon"),System.Drawing.Icon)
- Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.MaximizeBox = false
+ Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+ Me.MaximizeBox = False
Me.Name = "IEPCForm"
Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide
Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
diff --git a/VECTO/GUI/IEPCForm.vb b/VECTO/GUI/IEPCForm.vb
index 813e992f29..b1355d59d8 100644
--- a/VECTO/GUI/IEPCForm.vb
+++ b/VECTO/GUI/IEPCForm.vb
@@ -289,8 +289,8 @@ Public Class IEPCForm
tbInertia.Text = ""
cbDifferentialIncluded.Checked = False
cbDesignTypeWheelMotor.Checked = False
- tbNumberOfDesignTypeWheelMotor.Text = ""
- tbThermalOverload.Text = ""
+ tbNumberOfDesignTypeWheelMotor.Text = "0"
+ tbThermalOverload.Text = ""
tbVoltage1.Text = ""
tbContinousTorque1.Text = ""
diff --git a/VECTO/GUI/IHPCForm.Designer.vb b/VECTO/GUI/IHPCForm.Designer.vb
index dae432d617..50779dd92c 100644
--- a/VECTO/GUI/IHPCForm.Designer.vb
+++ b/VECTO/GUI/IHPCForm.Designer.vb
@@ -156,26 +156,26 @@ Partial Class IHPCForm
Me.FlowLayoutPanel1.Controls.Add(Me.tbModel)
Me.FlowLayoutPanel1.Location = New System.Drawing.Point(12, 77)
Me.FlowLayoutPanel1.Name = "FlowLayoutPanel1"
- Me.FlowLayoutPanel1.Size = New System.Drawing.Size(242, 26)
+ Me.FlowLayoutPanel1.Size = New System.Drawing.Size(513, 26)
Me.FlowLayoutPanel1.TabIndex = 100
'
'Label49
'
Me.Label49.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label49.AutoSize = true
+ Me.Label49.AutoSize = True
Me.Label49.Location = New System.Drawing.Point(3, 6)
Me.Label49.Name = "Label49"
- Me.Label49.Size = New System.Drawing.Size(36, 13)
+ Me.Label49.Size = New System.Drawing.Size(87, 13)
Me.Label49.TabIndex = 43
- Me.Label49.Text = "Model"
+ Me.Label49.Text = "Make and Model"
'
'tbModel
'
Me.tbModel.Anchor = System.Windows.Forms.AnchorStyles.Left
- Me.tbModel.Location = New System.Drawing.Point(45, 3)
+ Me.tbModel.Location = New System.Drawing.Point(96, 3)
Me.tbModel.Margin = New System.Windows.Forms.Padding(3, 3, 0, 3)
Me.tbModel.Name = "tbModel"
- Me.tbModel.Size = New System.Drawing.Size(194, 20)
+ Me.tbModel.Size = New System.Drawing.Size(417, 20)
Me.tbModel.TabIndex = 0
'
'FlowLayoutPanel6
@@ -191,7 +191,7 @@ Partial Class IHPCForm
'Label51
'
Me.Label51.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label51.AutoSize = true
+ Me.Label51.AutoSize = True
Me.Label51.Location = New System.Drawing.Point(3, 6)
Me.Label51.Name = "Label51"
Me.Label51.Size = New System.Drawing.Size(36, 13)
@@ -209,7 +209,7 @@ Partial Class IHPCForm
'lblinertiaUnit
'
Me.lblinertiaUnit.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.lblinertiaUnit.AutoSize = true
+ Me.lblinertiaUnit.AutoSize = True
Me.lblinertiaUnit.Location = New System.Drawing.Point(108, 6)
Me.lblinertiaUnit.Name = "lblinertiaUnit"
Me.lblinertiaUnit.Size = New System.Drawing.Size(36, 13)
@@ -229,7 +229,7 @@ Partial Class IHPCForm
'Label52
'
Me.Label52.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label52.AutoSize = true
+ Me.Label52.AutoSize = True
Me.Label52.Location = New System.Drawing.Point(3, 6)
Me.Label52.Margin = New System.Windows.Forms.Padding(3, 0, 0, 0)
Me.Label52.Name = "Label52"
@@ -249,7 +249,7 @@ Partial Class IHPCForm
'Label10
'
Me.Label10.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label10.AutoSize = true
+ Me.Label10.AutoSize = True
Me.Label10.Location = New System.Drawing.Point(242, 6)
Me.Label10.Margin = New System.Windows.Forms.Padding(2, 0, 3, 0)
Me.Label10.Name = "Label10"
@@ -272,7 +272,7 @@ Partial Class IHPCForm
'Label1
'
Me.Label1.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label1.AutoSize = true
+ Me.Label1.AutoSize = True
Me.Label1.Location = New System.Drawing.Point(3, 6)
Me.Label1.Margin = New System.Windows.Forms.Padding(3, 0, 6, 0)
Me.Label1.Name = "Label1"
@@ -292,13 +292,13 @@ Partial Class IHPCForm
'btDragCurve
'
Me.btDragCurve.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.btDragCurve.Image = CType(resources.GetObject("btDragCurve.Image"),System.Drawing.Image)
+ Me.btDragCurve.Image = CType(resources.GetObject("btDragCurve.Image"), System.Drawing.Image)
Me.btDragCurve.Location = New System.Drawing.Point(394, 1)
Me.btDragCurve.Margin = New System.Windows.Forms.Padding(0)
Me.btDragCurve.Name = "btDragCurve"
Me.btDragCurve.Size = New System.Drawing.Size(24, 24)
Me.btDragCurve.TabIndex = 4
- Me.btDragCurve.UseVisualStyleBackColor = true
+ Me.btDragCurve.UseVisualStyleBackColor = True
'
'btDragCurveOpen
'
@@ -308,8 +308,8 @@ Partial Class IHPCForm
Me.btDragCurveOpen.Name = "btDragCurveOpen"
Me.btDragCurveOpen.Size = New System.Drawing.Size(24, 24)
Me.btDragCurveOpen.TabIndex = 84
- Me.btDragCurveOpen.TabStop = false
- Me.btDragCurveOpen.UseVisualStyleBackColor = true
+ Me.btDragCurveOpen.TabStop = False
+ Me.btDragCurveOpen.UseVisualStyleBackColor = True
'
'tcVoltageLevels
'
@@ -333,7 +333,7 @@ Partial Class IHPCForm
Me.tpFirstVoltageLevel.Size = New System.Drawing.Size(509, 313)
Me.tpFirstVoltageLevel.TabIndex = 0
Me.tpFirstVoltageLevel.Text = "Voltage Level Low"
- Me.tpFirstVoltageLevel.UseVisualStyleBackColor = true
+ Me.tpFirstVoltageLevel.UseVisualStyleBackColor = True
'
'lvPowerMap
'
@@ -343,15 +343,15 @@ Partial Class IHPCForm
Me.lvPowerMap.Name = "lvPowerMap"
Me.lvPowerMap.Size = New System.Drawing.Size(500, 180)
Me.lvPowerMap.TabIndex = 107
- Me.lvPowerMap.TabStop = false
+ Me.lvPowerMap.TabStop = False
Me.lvPowerMap.Text = "Power Map Per Gear"
'
'TableLayoutPanel3
'
Me.TableLayoutPanel3.Anchor = System.Windows.Forms.AnchorStyles.None
Me.TableLayoutPanel3.ColumnCount = 2
- Me.TableLayoutPanel3.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 129!))
- Me.TableLayoutPanel3.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 359!))
+ Me.TableLayoutPanel3.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 129.0!))
+ Me.TableLayoutPanel3.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 359.0!))
Me.TableLayoutPanel3.Controls.Add(Me.lvPowerMap1, 0, 0)
Me.TableLayoutPanel3.Controls.Add(Me.FlowLayoutPanel11, 0, 1)
Me.TableLayoutPanel3.Controls.Add(Me.Label7, 1, 1)
@@ -365,21 +365,21 @@ Partial Class IHPCForm
'
'lvPowerMap1
'
- Me.lvPowerMap1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
- Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.lvPowerMap1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.lvPowerMap1.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader4, Me.ColumnHeader5})
Me.TableLayoutPanel3.SetColumnSpan(Me.lvPowerMap1, 2)
- Me.lvPowerMap1.FullRowSelect = true
- Me.lvPowerMap1.GridLines = true
- Me.lvPowerMap1.HideSelection = false
+ Me.lvPowerMap1.FullRowSelect = True
+ Me.lvPowerMap1.GridLines = True
+ Me.lvPowerMap1.HideSelection = False
Me.lvPowerMap1.Location = New System.Drawing.Point(3, 3)
- Me.lvPowerMap1.MultiSelect = false
+ Me.lvPowerMap1.MultiSelect = False
Me.lvPowerMap1.Name = "lvPowerMap1"
Me.lvPowerMap1.Size = New System.Drawing.Size(482, 119)
Me.lvPowerMap1.TabIndex = 77
- Me.lvPowerMap1.TabStop = false
- Me.lvPowerMap1.UseCompatibleStateImageBehavior = false
+ Me.lvPowerMap1.TabStop = False
+ Me.lvPowerMap1.UseCompatibleStateImageBehavior = False
Me.lvPowerMap1.View = System.Windows.Forms.View.Details
'
'ColumnHeader4
@@ -408,7 +408,7 @@ Partial Class IHPCForm
Me.btAddPowerMap1.Name = "btAddPowerMap1"
Me.btAddPowerMap1.Size = New System.Drawing.Size(24, 24)
Me.btAddPowerMap1.TabIndex = 38
- Me.btAddPowerMap1.UseVisualStyleBackColor = true
+ Me.btAddPowerMap1.UseVisualStyleBackColor = True
'
'btRemovePowerMap1
'
@@ -417,12 +417,12 @@ Partial Class IHPCForm
Me.btRemovePowerMap1.Name = "btRemovePowerMap1"
Me.btRemovePowerMap1.Size = New System.Drawing.Size(24, 24)
Me.btRemovePowerMap1.TabIndex = 39
- Me.btRemovePowerMap1.UseVisualStyleBackColor = true
+ Me.btRemovePowerMap1.UseVisualStyleBackColor = True
'
'Label7
'
- Me.Label7.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.Label7.AutoSize = true
+ Me.Label7.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.Label7.AutoSize = True
Me.Label7.Location = New System.Drawing.Point(379, 125)
Me.Label7.Name = "Label7"
Me.Label7.Size = New System.Drawing.Size(106, 13)
@@ -444,7 +444,7 @@ Partial Class IHPCForm
'Label2
'
Me.Label2.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label2.AutoSize = true
+ Me.Label2.AutoSize = True
Me.Label2.Location = New System.Drawing.Point(6, 6)
Me.Label2.Margin = New System.Windows.Forms.Padding(6, 0, 9, 0)
Me.Label2.Name = "Label2"
@@ -464,13 +464,13 @@ Partial Class IHPCForm
'btFLCurveFile1
'
Me.btFLCurveFile1.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.btFLCurveFile1.Image = CType(resources.GetObject("btFLCurveFile1.Image"),System.Drawing.Image)
+ Me.btFLCurveFile1.Image = CType(resources.GetObject("btFLCurveFile1.Image"), System.Drawing.Image)
Me.btFLCurveFile1.Location = New System.Drawing.Point(426, 1)
Me.btFLCurveFile1.Margin = New System.Windows.Forms.Padding(0)
Me.btFLCurveFile1.Name = "btFLCurveFile1"
Me.btFLCurveFile1.Size = New System.Drawing.Size(24, 24)
Me.btFLCurveFile1.TabIndex = 37
- Me.btFLCurveFile1.UseVisualStyleBackColor = true
+ Me.btFLCurveFile1.UseVisualStyleBackColor = True
'
'btFLCurve1
'
@@ -480,19 +480,19 @@ Partial Class IHPCForm
Me.btFLCurve1.Name = "btFLCurve1"
Me.btFLCurve1.Size = New System.Drawing.Size(24, 24)
Me.btFLCurve1.TabIndex = 85
- Me.btFLCurve1.TabStop = false
- Me.btFLCurve1.UseVisualStyleBackColor = true
+ Me.btFLCurve1.TabStop = False
+ Me.btFLCurve1.UseVisualStyleBackColor = True
'
'TableLayoutPanel1
'
Me.TableLayoutPanel1.ColumnCount = 7
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 140!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 62!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 30!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 128!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 62!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 30!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 59!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 140.0!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 62.0!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 30.0!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 128.0!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 62.0!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 30.0!))
+ Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 59.0!))
Me.TableLayoutPanel1.Controls.Add(Me.Label11, 2, 1)
Me.TableLayoutPanel1.Controls.Add(Me.Label4, 2, 0)
Me.TableLayoutPanel1.Controls.Add(Me.Label13, 5, 0)
@@ -514,16 +514,16 @@ Partial Class IHPCForm
Me.TableLayoutPanel1.Location = New System.Drawing.Point(6, 7)
Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
Me.TableLayoutPanel1.RowCount = 3
- Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27!))
- Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27!))
- Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27!))
+ Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27.0!))
+ Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27.0!))
+ Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27.0!))
Me.TableLayoutPanel1.Size = New System.Drawing.Size(496, 82)
Me.TableLayoutPanel1.TabIndex = 105
'
'Label11
'
Me.Label11.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label11.AutoSize = true
+ Me.Label11.AutoSize = True
Me.Label11.Location = New System.Drawing.Point(202, 34)
Me.Label11.Margin = New System.Windows.Forms.Padding(0)
Me.Label11.Name = "Label11"
@@ -534,7 +534,7 @@ Partial Class IHPCForm
'Label4
'
Me.Label4.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label4.AutoSize = true
+ Me.Label4.AutoSize = True
Me.Label4.Location = New System.Drawing.Point(207, 7)
Me.Label4.Margin = New System.Windows.Forms.Padding(0)
Me.Label4.Name = "Label4"
@@ -545,18 +545,18 @@ Partial Class IHPCForm
'Label13
'
Me.Label13.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label13.AutoSize = true
- Me.Label13.Location = New System.Drawing.Point(422, 7)
+ Me.Label13.AutoSize = True
+ Me.Label13.Location = New System.Drawing.Point(428, 7)
Me.Label13.Margin = New System.Windows.Forms.Padding(0)
Me.Label13.Name = "Label13"
- Me.Label13.Size = New System.Drawing.Size(30, 13)
+ Me.Label13.Size = New System.Drawing.Size(18, 13)
Me.Label13.TabIndex = 65
- Me.Label13.Text = "[sec]"
+ Me.Label13.Text = "[s]"
'
'Label43
'
Me.Label43.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label43.AutoSize = true
+ Me.Label43.AutoSize = True
Me.Label43.Location = New System.Drawing.Point(281, 7)
Me.Label43.Name = "Label43"
Me.Label43.Size = New System.Drawing.Size(76, 13)
@@ -566,7 +566,7 @@ Partial Class IHPCForm
'Label37
'
Me.Label37.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label37.AutoSize = true
+ Me.Label37.AutoSize = True
Me.Label37.Location = New System.Drawing.Point(94, 7)
Me.Label37.Name = "Label37"
Me.Label37.Size = New System.Drawing.Size(43, 13)
@@ -594,7 +594,7 @@ Partial Class IHPCForm
'Label39
'
Me.Label39.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label39.AutoSize = true
+ Me.Label39.AutoSize = True
Me.Label39.Location = New System.Drawing.Point(40, 34)
Me.Label39.Name = "Label39"
Me.Label39.Size = New System.Drawing.Size(97, 13)
@@ -604,7 +604,7 @@ Partial Class IHPCForm
'Label3
'
Me.Label3.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label3.AutoSize = true
+ Me.Label3.AutoSize = True
Me.Label3.Location = New System.Drawing.Point(6, 61)
Me.Label3.Name = "Label3"
Me.Label3.Size = New System.Drawing.Size(131, 13)
@@ -632,7 +632,7 @@ Partial Class IHPCForm
'Label15
'
Me.Label15.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label15.AutoSize = true
+ Me.Label15.AutoSize = True
Me.Label15.Location = New System.Drawing.Point(202, 61)
Me.Label15.Margin = New System.Windows.Forms.Padding(0)
Me.Label15.Name = "Label15"
@@ -643,7 +643,7 @@ Partial Class IHPCForm
'Label42
'
Me.Label42.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label42.AutoSize = true
+ Me.Label42.AutoSize = True
Me.Label42.Location = New System.Drawing.Point(236, 61)
Me.Label42.Name = "Label42"
Me.Label42.Size = New System.Drawing.Size(121, 13)
@@ -653,7 +653,7 @@ Partial Class IHPCForm
'Label14
'
Me.Label14.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label14.AutoSize = true
+ Me.Label14.AutoSize = True
Me.Label14.Location = New System.Drawing.Point(422, 61)
Me.Label14.Margin = New System.Windows.Forms.Padding(0)
Me.Label14.Name = "Label14"
@@ -672,7 +672,7 @@ Partial Class IHPCForm
'Label41
'
Me.Label41.Anchor = System.Windows.Forms.AnchorStyles.Right
- Me.Label41.AutoSize = true
+ Me.Label41.AutoSize = True
Me.Label41.Location = New System.Drawing.Point(270, 34)
Me.Label41.Name = "Label41"
Me.Label41.Size = New System.Drawing.Size(87, 13)
@@ -690,7 +690,7 @@ Partial Class IHPCForm
'Label12
'
Me.Label12.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label12.AutoSize = true
+ Me.Label12.AutoSize = True
Me.Label12.Location = New System.Drawing.Point(422, 34)
Me.Label12.Margin = New System.Windows.Forms.Padding(0)
Me.Label12.Name = "Label12"
@@ -709,7 +709,7 @@ Partial Class IHPCForm
Me.tpVoltageLevel.Size = New System.Drawing.Size(509, 313)
Me.tpVoltageLevel.TabIndex = 1
Me.tpVoltageLevel.Text = "Voltage Level High"
- Me.tpVoltageLevel.UseVisualStyleBackColor = true
+ Me.tpVoltageLevel.UseVisualStyleBackColor = True
'
'GroupBox1
'
@@ -719,15 +719,15 @@ Partial Class IHPCForm
Me.GroupBox1.Name = "GroupBox1"
Me.GroupBox1.Size = New System.Drawing.Size(496, 180)
Me.GroupBox1.TabIndex = 122
- Me.GroupBox1.TabStop = false
+ Me.GroupBox1.TabStop = False
Me.GroupBox1.Text = "Power Map Per Gear"
'
'TableLayoutPanel2
'
Me.TableLayoutPanel2.Anchor = System.Windows.Forms.AnchorStyles.None
Me.TableLayoutPanel2.ColumnCount = 2
- Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 129!))
- Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 359!))
+ Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 129.0!))
+ Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 359.0!))
Me.TableLayoutPanel2.Controls.Add(Me.lvPowerMap2, 0, 0)
Me.TableLayoutPanel2.Controls.Add(Me.FlowLayoutPanel4, 0, 1)
Me.TableLayoutPanel2.Controls.Add(Me.Label5, 1, 1)
@@ -741,21 +741,21 @@ Partial Class IHPCForm
'
'lvPowerMap2
'
- Me.lvPowerMap2.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
- Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.lvPowerMap2.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.lvPowerMap2.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader2})
Me.TableLayoutPanel2.SetColumnSpan(Me.lvPowerMap2, 2)
- Me.lvPowerMap2.FullRowSelect = true
- Me.lvPowerMap2.GridLines = true
- Me.lvPowerMap2.HideSelection = false
+ Me.lvPowerMap2.FullRowSelect = True
+ Me.lvPowerMap2.GridLines = True
+ Me.lvPowerMap2.HideSelection = False
Me.lvPowerMap2.Location = New System.Drawing.Point(3, 3)
- Me.lvPowerMap2.MultiSelect = false
+ Me.lvPowerMap2.MultiSelect = False
Me.lvPowerMap2.Name = "lvPowerMap2"
Me.lvPowerMap2.Size = New System.Drawing.Size(482, 119)
Me.lvPowerMap2.TabIndex = 77
- Me.lvPowerMap2.TabStop = false
- Me.lvPowerMap2.UseCompatibleStateImageBehavior = false
+ Me.lvPowerMap2.TabStop = False
+ Me.lvPowerMap2.UseCompatibleStateImageBehavior = False
Me.lvPowerMap2.View = System.Windows.Forms.View.Details
'
'ColumnHeader1
@@ -784,7 +784,7 @@ Partial Class IHPCForm
Me.btAddPowerMap2.Name = "btAddPowerMap2"
Me.btAddPowerMap2.Size = New System.Drawing.Size(24, 24)
Me.btAddPowerMap2.TabIndex = 48
- Me.btAddPowerMap2.UseVisualStyleBackColor = true
+ Me.btAddPowerMap2.UseVisualStyleBackColor = True
'
'btRemovePowerMap2
'
@@ -793,12 +793,12 @@ Partial Class IHPCForm
Me.btRemovePowerMap2.Name = "btRemovePowerMap2"
Me.btRemovePowerMap2.Size = New System.Drawing.Size(24, 24)
Me.btRemovePowerMap2.TabIndex = 49
- Me.btRemovePowerMap2.UseVisualStyleBackColor = true
+ Me.btRemovePowerMap2.UseVisualStyleBackColor = True
'
'Label5
'
- Me.Label5.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.Label5.AutoSize = true
+ Me.Label5.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.Label5.AutoSize = True
Me.Label5.Location = New System.Drawing.Point(379, 125)
Me.Label5.Name = "Label5"
Me.Label5.Size = New System.Drawing.Size(106, 13)
@@ -819,7 +819,7 @@ Partial Class IHPCForm
'Label28
'
Me.Label28.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label28.AutoSize = true
+ Me.Label28.AutoSize = True
Me.Label28.Location = New System.Drawing.Point(6, 6)
Me.Label28.Margin = New System.Windows.Forms.Padding(6, 0, 9, 0)
Me.Label28.Name = "Label28"
@@ -839,13 +839,13 @@ Partial Class IHPCForm
'btFLCurveFile2
'
Me.btFLCurveFile2.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.btFLCurveFile2.Image = CType(resources.GetObject("btFLCurveFile2.Image"),System.Drawing.Image)
+ Me.btFLCurveFile2.Image = CType(resources.GetObject("btFLCurveFile2.Image"), System.Drawing.Image)
Me.btFLCurveFile2.Location = New System.Drawing.Point(426, 1)
Me.btFLCurveFile2.Margin = New System.Windows.Forms.Padding(0)
Me.btFLCurveFile2.Name = "btFLCurveFile2"
Me.btFLCurveFile2.Size = New System.Drawing.Size(24, 24)
Me.btFLCurveFile2.TabIndex = 47
- Me.btFLCurveFile2.UseVisualStyleBackColor = true
+ Me.btFLCurveFile2.UseVisualStyleBackColor = True
'
'btFLCurve2
'
@@ -855,20 +855,20 @@ Partial Class IHPCForm
Me.btFLCurve2.Name = "btFLCurve2"
Me.btFLCurve2.Size = New System.Drawing.Size(24, 24)
Me.btFLCurve2.TabIndex = 86
- Me.btFLCurve2.TabStop = false
- Me.btFLCurve2.UseVisualStyleBackColor = true
+ Me.btFLCurve2.TabStop = False
+ Me.btFLCurve2.UseVisualStyleBackColor = True
'
'TableLayoutPanel4
'
Me.TableLayoutPanel4.Anchor = System.Windows.Forms.AnchorStyles.None
Me.TableLayoutPanel4.ColumnCount = 7
- Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 140!))
- Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 62!))
- Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 30!))
- Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 128!))
- Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 62!))
- Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 30!))
- Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 59!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 140.0!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 62.0!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 30.0!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 128.0!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 62.0!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 30.0!))
+ Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 59.0!))
Me.TableLayoutPanel4.Controls.Add(Me.Label17, 2, 1)
Me.TableLayoutPanel4.Controls.Add(Me.Label18, 2, 0)
Me.TableLayoutPanel4.Controls.Add(Me.Label26, 5, 0)
@@ -890,16 +890,16 @@ Partial Class IHPCForm
Me.TableLayoutPanel4.Location = New System.Drawing.Point(6, 7)
Me.TableLayoutPanel4.Name = "TableLayoutPanel4"
Me.TableLayoutPanel4.RowCount = 3
- Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27!))
- Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27!))
- Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27!))
+ Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27.0!))
+ Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27.0!))
+ Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27.0!))
Me.TableLayoutPanel4.Size = New System.Drawing.Size(496, 82)
Me.TableLayoutPanel4.TabIndex = 120
'
'Label17
'
Me.Label17.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label17.AutoSize = true
+ Me.Label17.AutoSize = True
Me.Label17.Location = New System.Drawing.Point(202, 34)
Me.Label17.Margin = New System.Windows.Forms.Padding(0)
Me.Label17.Name = "Label17"
@@ -910,7 +910,7 @@ Partial Class IHPCForm
'Label18
'
Me.Label18.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label18.AutoSize = true
+ Me.Label18.AutoSize = True
Me.Label18.Location = New System.Drawing.Point(207, 7)
Me.Label18.Margin = New System.Windows.Forms.Padding(0)
Me.Label18.Name = "Label18"
@@ -921,13 +921,13 @@ Partial Class IHPCForm
'Label26
'
Me.Label26.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Label26.AutoSize = true
- Me.Label26.Location = New System.Drawing.Point(422, 7)
+ Me.Label26.AutoSize = True
+ Me.Label26.Location = New System.Drawing.Point(428, 7)
Me.Label26.Margin = New System.Windows.Forms.Padding(0)
Me.Label26.Name = "Label26"
- Me.Label26.Size = New System.Drawing.Size(30, 13)
+ Me.Label26.Size = New System.Drawing.Size(18, 13)
Me.Label26.TabIndex = 65
- Me.Label26.Text = "[sec]"
+ Me.Label26.Text = "[s]"
'
'Label19
'
diff --git a/VECTO/GUI/MainForm.Designer.vb b/VECTO/GUI/MainForm.Designer.vb
index 042e6cfa33..8e7eaf18c7 100644
--- a/VECTO/GUI/MainForm.Designer.vb
+++ b/VECTO/GUI/MainForm.Designer.vb
@@ -148,52 +148,51 @@ Partial Class MainForm
'
Me.StatusBAR.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.StatusBAR.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripLbStatus, Me.ToolStripProgBarJob, Me.ToolStripProgBarOverall})
- Me.StatusBAR.Location = New System.Drawing.Point(0, 1009)
+ Me.StatusBAR.Location = New System.Drawing.Point(0, 648)
Me.StatusBAR.Name = "StatusBAR"
- Me.StatusBAR.Padding = New System.Windows.Forms.Padding(2, 0, 21, 0)
- Me.StatusBAR.Size = New System.Drawing.Size(1568, 22)
+ Me.StatusBAR.Size = New System.Drawing.Size(1045, 22)
Me.StatusBAR.TabIndex = 7
Me.StatusBAR.Text = "StatusBAR"
'
'ToolStripLbStatus
'
Me.ToolStripLbStatus.Name = "ToolStripLbStatus"
- Me.ToolStripLbStatus.Size = New System.Drawing.Size(1545, 17)
- Me.ToolStripLbStatus.Spring = true
+ Me.ToolStripLbStatus.Size = New System.Drawing.Size(1030, 17)
+ Me.ToolStripLbStatus.Spring = True
Me.ToolStripLbStatus.Text = "Status Text"
Me.ToolStripLbStatus.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
'
'ToolStripProgBarJob
'
Me.ToolStripProgBarJob.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
- Me.ToolStripProgBarJob.AutoSize = false
+ Me.ToolStripProgBarJob.AutoSize = False
Me.ToolStripProgBarJob.Name = "ToolStripProgBarJob"
- Me.ToolStripProgBarJob.Size = New System.Drawing.Size(150, 25)
+ Me.ToolStripProgBarJob.Size = New System.Drawing.Size(100, 16)
Me.ToolStripProgBarJob.Style = System.Windows.Forms.ProgressBarStyle.Continuous
Me.ToolStripProgBarJob.ToolTipText = "overall progress"
- Me.ToolStripProgBarJob.Visible = false
+ Me.ToolStripProgBarJob.Visible = False
'
'ToolStripProgBarOverall
'
Me.ToolStripProgBarOverall.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
- Me.ToolStripProgBarOverall.AutoSize = false
+ Me.ToolStripProgBarOverall.AutoSize = False
Me.ToolStripProgBarOverall.Name = "ToolStripProgBarOverall"
- Me.ToolStripProgBarOverall.Size = New System.Drawing.Size(150, 25)
+ Me.ToolStripProgBarOverall.Size = New System.Drawing.Size(100, 16)
Me.ToolStripProgBarOverall.Style = System.Windows.Forms.ProgressBarStyle.Continuous
Me.ToolStripProgBarOverall.ToolTipText = "job progress"
- Me.ToolStripProgBarOverall.Visible = false
+ Me.ToolStripProgBarOverall.Visible = False
'
'TabControl1
'
Me.TabControl1.Controls.Add(Me.TabPageGEN)
Me.TabControl1.Controls.Add(Me.TabPgOptions)
Me.TabControl1.Dock = System.Windows.Forms.DockStyle.Fill
- Me.TabControl1.Location = New System.Drawing.Point(4, 5)
+ Me.TabControl1.Location = New System.Drawing.Point(3, 3)
Me.TabControl1.Margin = New System.Windows.Forms.Padding(0)
Me.TabControl1.Name = "TabControl1"
Me.TabControl1.Padding = New System.Drawing.Point(0, 0)
Me.TabControl1.SelectedIndex = 0
- Me.TabControl1.Size = New System.Drawing.Size(1564, 502)
+ Me.TabControl1.Size = New System.Drawing.Size(1042, 326)
Me.TabControl1.TabIndex = 10
'
'TabPageGEN
@@ -210,44 +209,41 @@ Partial Class MainForm
Me.TabPageGEN.Controls.Add(Me.LvGEN)
Me.TabPageGEN.Controls.Add(Me.ButtonGENremove)
Me.TabPageGEN.Controls.Add(Me.ButtonGENadd)
- Me.TabPageGEN.Location = New System.Drawing.Point(4, 29)
+ Me.TabPageGEN.Location = New System.Drawing.Point(4, 22)
Me.TabPageGEN.Margin = New System.Windows.Forms.Padding(0)
Me.TabPageGEN.Name = "TabPageGEN"
- Me.TabPageGEN.Size = New System.Drawing.Size(1556, 469)
+ Me.TabPageGEN.Size = New System.Drawing.Size(1034, 300)
Me.TabPageGEN.TabIndex = 0
Me.TabPageGEN.Text = "Job Files"
- Me.TabPageGEN.UseVisualStyleBackColor = true
+ Me.TabPageGEN.UseVisualStyleBackColor = True
'
'btnImportXML
'
- Me.btnImportXML.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
- Me.btnImportXML.Location = New System.Drawing.Point(690, 393)
- Me.btnImportXML.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnImportXML.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+ Me.btnImportXML.Location = New System.Drawing.Point(460, 260)
Me.btnImportXML.Name = "btnImportXML"
- Me.btnImportXML.Size = New System.Drawing.Size(172, 46)
+ Me.btnImportXML.Size = New System.Drawing.Size(115, 30)
Me.btnImportXML.TabIndex = 23
Me.btnImportXML.Text = "Import from XML"
- Me.btnImportXML.UseVisualStyleBackColor = true
- Me.btnImportXML.Visible = false
+ Me.btnImportXML.UseVisualStyleBackColor = True
+ Me.btnImportXML.Visible = False
'
'btnExportXML
'
- Me.btnExportXML.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
- Me.btnExportXML.Enabled = false
- Me.btnExportXML.Location = New System.Drawing.Point(516, 393)
- Me.btnExportXML.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnExportXML.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+ Me.btnExportXML.Enabled = False
+ Me.btnExportXML.Location = New System.Drawing.Point(344, 260)
Me.btnExportXML.Name = "btnExportXML"
- Me.btnExportXML.Size = New System.Drawing.Size(172, 46)
+ Me.btnExportXML.Size = New System.Drawing.Size(115, 30)
Me.btnExportXML.TabIndex = 22
Me.btnExportXML.Text = "Export as XML"
- Me.btnExportXML.UseVisualStyleBackColor = true
+ Me.btnExportXML.UseVisualStyleBackColor = True
'
'Label6
'
- 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(1222, 394)
- Me.Label6.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ 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(814, 261)
Me.Label6.Name = "Label6"
Me.Label6.Size = New System.Drawing.Size(217, 13)
Me.Label6.TabIndex = 21
@@ -255,97 +251,90 @@ Partial Class MainForm
'
'btStartV3
'
- Me.btStartV3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ Me.btStartV3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.btStartV3.Image = Global.TUGraz.VECTO.My.Resources.Resources.Play_icon
Me.btStartV3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
- Me.btStartV3.Location = New System.Drawing.Point(4, 86)
- Me.btStartV3.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btStartV3.Location = New System.Drawing.Point(3, 56)
Me.btStartV3.Name = "btStartV3"
- Me.btStartV3.Size = New System.Drawing.Size(162, 77)
+ Me.btStartV3.Size = New System.Drawing.Size(108, 50)
Me.btStartV3.TabIndex = 20
Me.btStartV3.Text = "START"
Me.btStartV3.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText
Me.ToolTip1.SetToolTip(Me.btStartV3, "Start Simulation")
- Me.btStartV3.UseVisualStyleBackColor = true
+ Me.btStartV3.UseVisualStyleBackColor = True
'
'LbDecl
'
- Me.LbDecl.AutoSize = true
- Me.LbDecl.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- Me.LbDecl.Location = New System.Drawing.Point(8, 168)
- Me.LbDecl.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.LbDecl.AutoSize = True
+ Me.LbDecl.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.LbDecl.Location = New System.Drawing.Point(5, 109)
Me.LbDecl.Name = "LbDecl"
Me.LbDecl.Size = New System.Drawing.Size(107, 13)
Me.LbDecl.TabIndex = 19
Me.LbDecl.Text = "Declaration Mode"
- Me.LbDecl.Visible = false
+ Me.LbDecl.Visible = False
'
'PictureBox1
'
- Me.PictureBox1.Image = CType(resources.GetObject("PictureBox1.Image"),System.Drawing.Image)
- Me.PictureBox1.Location = New System.Drawing.Point(4, 5)
- Me.PictureBox1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.PictureBox1.Image = CType(resources.GetObject("PictureBox1.Image"), System.Drawing.Image)
+ Me.PictureBox1.Location = New System.Drawing.Point(3, 3)
Me.PictureBox1.Name = "PictureBox1"
- Me.PictureBox1.Size = New System.Drawing.Size(162, 72)
+ Me.PictureBox1.Size = New System.Drawing.Size(108, 47)
Me.PictureBox1.TabIndex = 18
- Me.PictureBox1.TabStop = false
+ Me.PictureBox1.TabStop = False
'
'BtGENdown
'
- Me.BtGENdown.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
+ Me.BtGENdown.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.BtGENdown.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_arrow_down_icon
- Me.BtGENdown.Location = New System.Drawing.Point(460, 393)
- Me.BtGENdown.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.BtGENdown.Location = New System.Drawing.Point(307, 260)
Me.BtGENdown.Name = "BtGENdown"
- Me.BtGENdown.Size = New System.Drawing.Size(45, 46)
+ Me.BtGENdown.Size = New System.Drawing.Size(30, 30)
Me.BtGENdown.TabIndex = 6
Me.ToolTip1.SetToolTip(Me.BtGENdown, "Move job down one row")
- Me.BtGENdown.UseVisualStyleBackColor = true
+ Me.BtGENdown.UseVisualStyleBackColor = True
'
'BtGENup
'
- Me.BtGENup.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
+ Me.BtGENup.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.BtGENup.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_arrow_up_icon
- Me.BtGENup.Location = New System.Drawing.Point(414, 393)
- Me.BtGENup.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.BtGENup.Location = New System.Drawing.Point(276, 260)
Me.BtGENup.Name = "BtGENup"
- Me.BtGENup.Size = New System.Drawing.Size(45, 46)
+ Me.BtGENup.Size = New System.Drawing.Size(30, 30)
Me.BtGENup.TabIndex = 4
Me.ToolTip1.SetToolTip(Me.BtGENup, "Move job up one row")
- Me.BtGENup.UseVisualStyleBackColor = true
+ Me.BtGENup.UseVisualStyleBackColor = True
'
'ChBoxAllGEN
'
- Me.ChBoxAllGEN.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
- Me.ChBoxAllGEN.AutoSize = true
- Me.ChBoxAllGEN.Location = New System.Drawing.Point(292, 413)
- Me.ChBoxAllGEN.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.ChBoxAllGEN.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+ Me.ChBoxAllGEN.AutoSize = True
+ Me.ChBoxAllGEN.Location = New System.Drawing.Point(195, 267)
Me.ChBoxAllGEN.Name = "ChBoxAllGEN"
Me.ChBoxAllGEN.Size = New System.Drawing.Size(70, 17)
Me.ChBoxAllGEN.TabIndex = 16
Me.ChBoxAllGEN.Text = "Select All"
Me.ToolTip1.SetToolTip(Me.ChBoxAllGEN, "Select All / None")
- Me.ChBoxAllGEN.UseVisualStyleBackColor = true
+ Me.ChBoxAllGEN.UseVisualStyleBackColor = True
'
'LvGEN
'
- Me.LvGEN.AllowDrop = true
- Me.LvGEN.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
- Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.LvGEN.CheckBoxes = true
+ Me.LvGEN.AllowDrop = True
+ Me.LvGEN.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.LvGEN.CheckBoxes = True
Me.LvGEN.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColGENpath, Me.ColGENstatus})
- Me.LvGEN.FullRowSelect = true
- Me.LvGEN.GridLines = true
+ Me.LvGEN.FullRowSelect = True
+ Me.LvGEN.GridLines = True
Me.LvGEN.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable
- Me.LvGEN.HideSelection = false
- Me.LvGEN.LabelEdit = true
- Me.LvGEN.Location = New System.Drawing.Point(171, 5)
- Me.LvGEN.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.LvGEN.HideSelection = False
+ Me.LvGEN.LabelEdit = True
+ Me.LvGEN.Location = New System.Drawing.Point(114, 3)
Me.LvGEN.Name = "LvGEN"
- Me.LvGEN.Size = New System.Drawing.Size(1375, 385)
+ Me.LvGEN.Size = New System.Drawing.Size(917, 256)
Me.LvGEN.TabIndex = 14
- Me.LvGEN.UseCompatibleStateImageBehavior = false
+ Me.LvGEN.UseCompatibleStateImageBehavior = False
Me.LvGEN.View = System.Windows.Forms.View.Details
'
'ColGENpath
@@ -360,41 +349,38 @@ Partial Class MainForm
'
'ButtonGENremove
'
- Me.ButtonGENremove.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
- Me.ButtonGENremove.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ Me.ButtonGENremove.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+ Me.ButtonGENremove.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.ButtonGENremove.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
- Me.ButtonGENremove.Location = New System.Drawing.Point(220, 393)
- Me.ButtonGENremove.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.ButtonGENremove.Location = New System.Drawing.Point(147, 260)
Me.ButtonGENremove.Name = "ButtonGENremove"
- Me.ButtonGENremove.Size = New System.Drawing.Size(50, 46)
+ Me.ButtonGENremove.Size = New System.Drawing.Size(33, 30)
Me.ButtonGENremove.TabIndex = 2
Me.ToolTip1.SetToolTip(Me.ButtonGENremove, "Remove selected entries")
- Me.ButtonGENremove.UseVisualStyleBackColor = true
+ Me.ButtonGENremove.UseVisualStyleBackColor = True
'
'ButtonGENadd
'
- Me.ButtonGENadd.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
- Me.ButtonGENadd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ Me.ButtonGENadd.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+ Me.ButtonGENadd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.ButtonGENadd.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
- Me.ButtonGENadd.Location = New System.Drawing.Point(170, 393)
- Me.ButtonGENadd.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.ButtonGENadd.Location = New System.Drawing.Point(113, 260)
Me.ButtonGENadd.Name = "ButtonGENadd"
- Me.ButtonGENadd.Size = New System.Drawing.Size(50, 46)
+ Me.ButtonGENadd.Size = New System.Drawing.Size(33, 30)
Me.ButtonGENadd.TabIndex = 1
Me.ToolTip1.SetToolTip(Me.ButtonGENadd, "Add Job File")
- Me.ButtonGENadd.UseVisualStyleBackColor = true
+ Me.ButtonGENadd.UseVisualStyleBackColor = True
'
'TabPgOptions
'
Me.TabPgOptions.Controls.Add(Me.PanelOptAllg)
- Me.TabPgOptions.Location = New System.Drawing.Point(4, 29)
- Me.TabPgOptions.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TabPgOptions.Location = New System.Drawing.Point(4, 22)
Me.TabPgOptions.Name = "TabPgOptions"
- Me.TabPgOptions.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.TabPgOptions.Size = New System.Drawing.Size(1556, 469)
+ Me.TabPgOptions.Padding = New System.Windows.Forms.Padding(3)
+ Me.TabPgOptions.Size = New System.Drawing.Size(1034, 300)
Me.TabPgOptions.TabIndex = 2
Me.TabPgOptions.Text = "Options"
- Me.TabPgOptions.UseVisualStyleBackColor = true
+ Me.TabPgOptions.UseVisualStyleBackColor = True
'
'PanelOptAllg
'
@@ -403,10 +389,9 @@ Partial Class MainForm
Me.PanelOptAllg.Controls.Add(Me.GroupBox3)
Me.PanelOptAllg.Controls.Add(Me.GroupBox2)
Me.PanelOptAllg.Controls.Add(Me.GroupBox1)
- Me.PanelOptAllg.Location = New System.Drawing.Point(9, 9)
- Me.PanelOptAllg.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.PanelOptAllg.Location = New System.Drawing.Point(6, 6)
Me.PanelOptAllg.Name = "PanelOptAllg"
- Me.PanelOptAllg.Size = New System.Drawing.Size(1533, 446)
+ Me.PanelOptAllg.Size = New System.Drawing.Size(1022, 290)
Me.PanelOptAllg.TabIndex = 0
'
'GroupBox5
@@ -416,49 +401,43 @@ Partial Class MainForm
Me.GroupBox5.Controls.Add(Me.tbMinSpeedLAC)
Me.GroupBox5.Controls.Add(Me.Label3)
Me.GroupBox5.Controls.Add(Me.Label2)
- Me.GroupBox5.Location = New System.Drawing.Point(274, 88)
- Me.GroupBox5.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox5.Location = New System.Drawing.Point(183, 57)
Me.GroupBox5.Name = "GroupBox5"
- Me.GroupBox5.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.GroupBox5.Size = New System.Drawing.Size(390, 154)
+ Me.GroupBox5.Size = New System.Drawing.Size(260, 100)
Me.GroupBox5.TabIndex = 20
- Me.GroupBox5.TabStop = false
+ Me.GroupBox5.TabStop = False
Me.GroupBox5.Text = "Look-Ahead Coasting Override"
- Me.GroupBox5.Visible = false
+ Me.GroupBox5.Visible = False
'
'Label5
'
- Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- Me.Label5.Location = New System.Drawing.Point(10, 74)
- Me.Label5.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.Label5.Location = New System.Drawing.Point(7, 48)
Me.Label5.Name = "Label5"
- Me.Label5.Size = New System.Drawing.Size(370, 55)
+ Me.Label5.Size = New System.Drawing.Size(247, 36)
Me.Label5.TabIndex = 4
- Me.Label5.Text = "Overrides Look-Ahead Coasting in declaration mode. Leave empty to use default beh"& _
+ Me.Label5.Text = "Overrides Look-Ahead Coasting in declaration mode. Leave empty to use default beh" &
"aviour."
'
'Label4
'
- Me.Label4.AutoSize = true
- Me.Label4.Location = New System.Drawing.Point(15, 68)
- Me.Label4.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label4.AutoSize = True
+ Me.Label4.Location = New System.Drawing.Point(10, 44)
Me.Label4.Name = "Label4"
Me.Label4.Size = New System.Drawing.Size(0, 13)
Me.Label4.TabIndex = 3
'
'tbMinSpeedLAC
'
- Me.tbMinSpeedLAC.Location = New System.Drawing.Point(144, 26)
- Me.tbMinSpeedLAC.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbMinSpeedLAC.Location = New System.Drawing.Point(96, 17)
Me.tbMinSpeedLAC.Name = "tbMinSpeedLAC"
- Me.tbMinSpeedLAC.Size = New System.Drawing.Size(82, 20)
+ Me.tbMinSpeedLAC.Size = New System.Drawing.Size(56, 20)
Me.tbMinSpeedLAC.TabIndex = 2
'
'Label3
'
- Me.Label3.AutoSize = true
- Me.Label3.Location = New System.Drawing.Point(237, 31)
- Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label3.AutoSize = True
+ Me.Label3.Location = New System.Drawing.Point(158, 20)
Me.Label3.Name = "Label3"
Me.Label3.Size = New System.Drawing.Size(38, 13)
Me.Label3.TabIndex = 1
@@ -466,9 +445,8 @@ Partial Class MainForm
'
'Label2
'
- Me.Label2.AutoSize = true
- Me.Label2.Location = New System.Drawing.Point(10, 29)
- Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label2.AutoSize = True
+ Me.Label2.Location = New System.Drawing.Point(7, 19)
Me.Label2.Name = "Label2"
Me.Label2.Size = New System.Drawing.Size(61, 13)
Me.Label2.TabIndex = 1
@@ -478,32 +456,28 @@ Partial Class MainForm
'
Me.GroupBox4.Controls.Add(Me.BtTCfileBrowse)
Me.GroupBox4.Controls.Add(Me.tbOutputFolder)
- Me.GroupBox4.Location = New System.Drawing.Point(274, 6)
- Me.GroupBox4.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox4.Location = New System.Drawing.Point(183, 4)
Me.GroupBox4.Name = "GroupBox4"
- Me.GroupBox4.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.GroupBox4.Size = New System.Drawing.Size(390, 71)
+ Me.GroupBox4.Size = New System.Drawing.Size(260, 46)
Me.GroupBox4.TabIndex = 19
- Me.GroupBox4.TabStop = false
+ Me.GroupBox4.TabStop = False
Me.GroupBox4.Text = "Output Directory"
'
'BtTCfileBrowse
'
Me.BtTCfileBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.BtTCfileBrowse.Location = New System.Drawing.Point(340, 22)
- Me.BtTCfileBrowse.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.BtTCfileBrowse.Location = New System.Drawing.Point(227, 14)
Me.BtTCfileBrowse.Name = "BtTCfileBrowse"
- Me.BtTCfileBrowse.Size = New System.Drawing.Size(36, 37)
+ Me.BtTCfileBrowse.Size = New System.Drawing.Size(24, 24)
Me.BtTCfileBrowse.TabIndex = 27
- Me.BtTCfileBrowse.TabStop = false
- Me.BtTCfileBrowse.UseVisualStyleBackColor = true
+ Me.BtTCfileBrowse.TabStop = False
+ Me.BtTCfileBrowse.UseVisualStyleBackColor = True
'
'tbOutputFolder
'
- Me.tbOutputFolder.Location = New System.Drawing.Point(9, 26)
- Me.tbOutputFolder.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbOutputFolder.Location = New System.Drawing.Point(6, 17)
Me.tbOutputFolder.Name = "tbOutputFolder"
- Me.tbOutputFolder.Size = New System.Drawing.Size(320, 20)
+ Me.tbOutputFolder.Size = New System.Drawing.Size(215, 20)
Me.tbOutputFolder.TabIndex = 0
'
'GroupBox3
@@ -511,130 +485,117 @@ Partial Class MainForm
Me.GroupBox3.Controls.Add(Me.cbSaveVectoRunData)
Me.GroupBox3.Controls.Add(Me.cbActVmod)
Me.GroupBox3.Controls.Add(Me.cbValidateRunData)
- Me.GroupBox3.Location = New System.Drawing.Point(4, 272)
- Me.GroupBox3.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox3.Location = New System.Drawing.Point(3, 177)
Me.GroupBox3.Name = "GroupBox3"
- Me.GroupBox3.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.GroupBox3.Size = New System.Drawing.Size(260, 169)
+ Me.GroupBox3.Size = New System.Drawing.Size(173, 110)
Me.GroupBox3.TabIndex = 18
- Me.GroupBox3.TabStop = false
+ Me.GroupBox3.TabStop = False
Me.GroupBox3.Text = "Misc"
'
'cbSaveVectoRunData
'
- Me.cbSaveVectoRunData.AutoSize = true
- Me.cbSaveVectoRunData.Location = New System.Drawing.Point(10, 132)
- Me.cbSaveVectoRunData.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.cbSaveVectoRunData.AutoSize = True
+ Me.cbSaveVectoRunData.Location = New System.Drawing.Point(7, 86)
Me.cbSaveVectoRunData.Name = "cbSaveVectoRunData"
Me.cbSaveVectoRunData.Size = New System.Drawing.Size(166, 17)
Me.cbSaveVectoRunData.TabIndex = 19
Me.cbSaveVectoRunData.Text = "Export ModelData (EXPERT!)"
- Me.cbSaveVectoRunData.UseVisualStyleBackColor = true
+ Me.cbSaveVectoRunData.UseVisualStyleBackColor = True
'
'cbActVmod
'
- Me.cbActVmod.Location = New System.Drawing.Point(9, 52)
- Me.cbActVmod.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.cbActVmod.Location = New System.Drawing.Point(6, 34)
Me.cbActVmod.Name = "cbActVmod"
- Me.cbActVmod.Size = New System.Drawing.Size(250, 80)
+ Me.cbActVmod.Size = New System.Drawing.Size(167, 52)
Me.cbActVmod.TabIndex = 18
Me.cbActVmod.Text = "Output values in vmod at beginning and end of simulation interval (EXPERT!)"
- Me.cbActVmod.UseVisualStyleBackColor = true
+ Me.cbActVmod.UseVisualStyleBackColor = True
'
'cbValidateRunData
'
- Me.cbValidateRunData.AutoSize = true
- Me.cbValidateRunData.Checked = true
+ Me.cbValidateRunData.AutoSize = True
+ Me.cbValidateRunData.Checked = True
Me.cbValidateRunData.CheckState = System.Windows.Forms.CheckState.Checked
- Me.cbValidateRunData.Location = New System.Drawing.Point(9, 29)
- Me.cbValidateRunData.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.cbValidateRunData.Location = New System.Drawing.Point(6, 19)
Me.cbValidateRunData.Name = "cbValidateRunData"
Me.cbValidateRunData.Size = New System.Drawing.Size(90, 17)
Me.cbValidateRunData.TabIndex = 17
Me.cbValidateRunData.Text = "Validate Data"
- Me.cbValidateRunData.UseVisualStyleBackColor = true
+ Me.cbValidateRunData.UseVisualStyleBackColor = True
'
'GroupBox2
'
Me.GroupBox2.Controls.Add(Me.ChBoxModOut)
Me.GroupBox2.Controls.Add(Me.ChBoxMod1Hz)
- Me.GroupBox2.Location = New System.Drawing.Point(4, 126)
- Me.GroupBox2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox2.Location = New System.Drawing.Point(3, 82)
Me.GroupBox2.Name = "GroupBox2"
- Me.GroupBox2.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.GroupBox2.Size = New System.Drawing.Size(260, 137)
+ Me.GroupBox2.Size = New System.Drawing.Size(173, 89)
Me.GroupBox2.TabIndex = 16
- Me.GroupBox2.TabStop = false
+ Me.GroupBox2.TabStop = False
Me.GroupBox2.Text = "Output"
'
'ChBoxModOut
'
- Me.ChBoxModOut.AutoSize = true
- Me.ChBoxModOut.Checked = true
+ Me.ChBoxModOut.AutoSize = True
+ Me.ChBoxModOut.Checked = True
Me.ChBoxModOut.CheckState = System.Windows.Forms.CheckState.Checked
- Me.ChBoxModOut.Location = New System.Drawing.Point(9, 29)
- Me.ChBoxModOut.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.ChBoxModOut.Location = New System.Drawing.Point(6, 19)
Me.ChBoxModOut.Name = "ChBoxModOut"
Me.ChBoxModOut.Size = New System.Drawing.Size(115, 17)
Me.ChBoxModOut.TabIndex = 0
Me.ChBoxModOut.Text = "Write modal results"
- Me.ChBoxModOut.UseVisualStyleBackColor = true
+ Me.ChBoxModOut.UseVisualStyleBackColor = True
'
'ChBoxMod1Hz
'
- Me.ChBoxMod1Hz.AutoSize = true
- Me.ChBoxMod1Hz.Location = New System.Drawing.Point(9, 65)
- Me.ChBoxMod1Hz.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.ChBoxMod1Hz.AutoSize = True
+ Me.ChBoxMod1Hz.Location = New System.Drawing.Point(6, 42)
Me.ChBoxMod1Hz.Name = "ChBoxMod1Hz"
Me.ChBoxMod1Hz.Size = New System.Drawing.Size(121, 17)
Me.ChBoxMod1Hz.TabIndex = 16
Me.ChBoxMod1Hz.Text = "Modal results in 1Hz"
- Me.ChBoxMod1Hz.UseVisualStyleBackColor = true
+ Me.ChBoxMod1Hz.UseVisualStyleBackColor = True
'
'GroupBox1
'
Me.GroupBox1.Controls.Add(Me.RbDev)
Me.GroupBox1.Controls.Add(Me.RbDecl)
- Me.GroupBox1.Location = New System.Drawing.Point(4, 5)
- Me.GroupBox1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox1.Location = New System.Drawing.Point(3, 3)
Me.GroupBox1.Name = "GroupBox1"
- Me.GroupBox1.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.GroupBox1.Size = New System.Drawing.Size(260, 111)
+ Me.GroupBox1.Size = New System.Drawing.Size(173, 72)
Me.GroupBox1.TabIndex = 15
- Me.GroupBox1.TabStop = false
+ Me.GroupBox1.TabStop = False
Me.GroupBox1.Text = "Mode"
'
'RbDev
'
- Me.RbDev.AutoSize = true
- Me.RbDev.Checked = true
- Me.RbDev.Location = New System.Drawing.Point(9, 65)
- Me.RbDev.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.RbDev.AutoSize = True
+ Me.RbDev.Checked = True
+ Me.RbDev.Location = New System.Drawing.Point(6, 42)
Me.RbDev.Name = "RbDev"
Me.RbDev.Size = New System.Drawing.Size(111, 17)
Me.RbDev.TabIndex = 1
- Me.RbDev.TabStop = true
+ Me.RbDev.TabStop = True
Me.RbDev.Text = "Engineering Mode"
- Me.RbDev.UseVisualStyleBackColor = true
+ Me.RbDev.UseVisualStyleBackColor = True
'
'RbDecl
'
- Me.RbDecl.AutoSize = true
- Me.RbDecl.Location = New System.Drawing.Point(9, 29)
- Me.RbDecl.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.RbDecl.AutoSize = True
+ Me.RbDecl.Location = New System.Drawing.Point(6, 19)
Me.RbDecl.Name = "RbDecl"
Me.RbDecl.Size = New System.Drawing.Size(109, 17)
Me.RbDecl.TabIndex = 0
- Me.RbDecl.TabStop = true
+ Me.RbDecl.TabStop = True
Me.RbDecl.Text = "Declaration Mode"
- Me.RbDecl.UseVisualStyleBackColor = true
+ Me.RbDecl.UseVisualStyleBackColor = True
'
'ConMenFilelist
'
Me.ConMenFilelist.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.ConMenFilelist.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ShowInFolderMenuItem, Me.SaveListToolStripMenuItem, Me.LoadListToolStripMenuItem, Me.LoadDefaultListToolStripMenuItem, Me.ClearListToolStripMenuItem})
Me.ConMenFilelist.Name = "ConMenFilelist"
- Me.ConMenFilelist.ShowImageMargin = false
+ Me.ConMenFilelist.ShowImageMargin = False
Me.ConMenFilelist.Size = New System.Drawing.Size(151, 114)
'
'ShowInFolderMenuItem
@@ -669,22 +630,22 @@ Partial Class MainForm
'
'LvMsg
'
- Me.LvMsg.AllowColumnReorder = true
+ Me.LvMsg.AllowColumnReorder = True
Me.LvMsg.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
Me.LvMsg.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader2, Me.ColumnHeader3})
Me.LvMsg.Dock = System.Windows.Forms.DockStyle.Fill
- Me.LvMsg.Font = New System.Drawing.Font("Courier New", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- Me.LvMsg.FullRowSelect = true
- Me.LvMsg.GridLines = true
+ Me.LvMsg.Font = New System.Drawing.Font("Courier New", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.LvMsg.FullRowSelect = True
+ Me.LvMsg.GridLines = True
Me.LvMsg.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable
- Me.LvMsg.HideSelection = false
- Me.LvMsg.LabelWrap = false
+ Me.LvMsg.HideSelection = False
+ Me.LvMsg.LabelWrap = False
Me.LvMsg.Location = New System.Drawing.Point(0, 0)
Me.LvMsg.Margin = New System.Windows.Forms.Padding(0)
Me.LvMsg.Name = "LvMsg"
- Me.LvMsg.Size = New System.Drawing.Size(1568, 435)
+ Me.LvMsg.Size = New System.Drawing.Size(1045, 283)
Me.LvMsg.TabIndex = 0
- Me.LvMsg.UseCompatibleStateImageBehavior = false
+ Me.LvMsg.UseCompatibleStateImageBehavior = False
Me.LvMsg.View = System.Windows.Forms.View.Details
'
'ColumnHeader1
@@ -704,10 +665,10 @@ Partial Class MainForm
'
'SplitContainer1
'
- Me.SplitContainer1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
- Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.SplitContainer1.Location = New System.Drawing.Point(0, 42)
+ Me.SplitContainer1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.SplitContainer1.Location = New System.Drawing.Point(0, 27)
Me.SplitContainer1.Margin = New System.Windows.Forms.Padding(0)
Me.SplitContainer1.Name = "SplitContainer1"
Me.SplitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal
@@ -715,14 +676,13 @@ Partial Class MainForm
'SplitContainer1.Panel1
'
Me.SplitContainer1.Panel1.Controls.Add(Me.TabControl1)
- Me.SplitContainer1.Panel1.Padding = New System.Windows.Forms.Padding(4, 5, 0, 3)
+ Me.SplitContainer1.Panel1.Padding = New System.Windows.Forms.Padding(3, 3, 0, 2)
'
'SplitContainer1.Panel2
'
Me.SplitContainer1.Panel2.Controls.Add(Me.LvMsg)
- Me.SplitContainer1.Size = New System.Drawing.Size(1568, 951)
- Me.SplitContainer1.SplitterDistance = 510
- Me.SplitContainer1.SplitterWidth = 6
+ Me.SplitContainer1.Size = New System.Drawing.Size(1045, 618)
+ Me.SplitContainer1.SplitterDistance = 331
Me.SplitContainer1.TabIndex = 12
'
'ToolStrip1
@@ -733,8 +693,7 @@ Partial Class MainForm
Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripSeparator2, Me.ToolStripDrDnBtTools, Me.ToolStripDrDnBtInfo})
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(1568, 31)
+ Me.ToolStrip1.Size = New System.Drawing.Size(1045, 31)
Me.ToolStrip1.TabIndex = 11
Me.ToolStrip1.Text = "ToolStrip1"
'
@@ -776,108 +735,108 @@ Partial Class MainForm
'
Me.GENEditorToolStripMenuItem1.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
Me.GENEditorToolStripMenuItem1.Name = "GENEditorToolStripMenuItem1"
- Me.GENEditorToolStripMenuItem1.Size = New System.Drawing.Size(263, 30)
+ Me.GENEditorToolStripMenuItem1.Size = New System.Drawing.Size(255, 22)
Me.GENEditorToolStripMenuItem1.Text = "Job Editor - Conventional Vehicle"
'
'JobEditorSerialHybridVehicleToolStripMenuItem
'
Me.JobEditorSerialHybridVehicleToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
Me.JobEditorSerialHybridVehicleToolStripMenuItem.Name = "JobEditorSerialHybridVehicleToolStripMenuItem"
- Me.JobEditorSerialHybridVehicleToolStripMenuItem.Size = New System.Drawing.Size(263, 30)
+ Me.JobEditorSerialHybridVehicleToolStripMenuItem.Size = New System.Drawing.Size(255, 22)
Me.JobEditorSerialHybridVehicleToolStripMenuItem.Text = "Job Editor - Serial Hybrid Vehicle"
'
'JobEditorParallelHybridVehicleToolStripMenuItem
'
Me.JobEditorParallelHybridVehicleToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
Me.JobEditorParallelHybridVehicleToolStripMenuItem.Name = "JobEditorParallelHybridVehicleToolStripMenuItem"
- Me.JobEditorParallelHybridVehicleToolStripMenuItem.Size = New System.Drawing.Size(263, 30)
+ Me.JobEditorParallelHybridVehicleToolStripMenuItem.Size = New System.Drawing.Size(255, 22)
Me.JobEditorParallelHybridVehicleToolStripMenuItem.Text = "Job Editor - Parallel Hybrid Vehicle"
'
'JobEditorBatteryElectricVehicleToolStripMenuItem
'
Me.JobEditorBatteryElectricVehicleToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
Me.JobEditorBatteryElectricVehicleToolStripMenuItem.Name = "JobEditorBatteryElectricVehicleToolStripMenuItem"
- Me.JobEditorBatteryElectricVehicleToolStripMenuItem.Size = New System.Drawing.Size(263, 30)
+ Me.JobEditorBatteryElectricVehicleToolStripMenuItem.Size = New System.Drawing.Size(255, 22)
Me.JobEditorBatteryElectricVehicleToolStripMenuItem.Text = "Job Editor - Battery Electric Vehicle"
'
'JobEditorIEPC_E_VehicleToolStripMenuItem
'
Me.JobEditorIEPC_E_VehicleToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
Me.JobEditorIEPC_E_VehicleToolStripMenuItem.Name = "JobEditorIEPC_E_VehicleToolStripMenuItem"
- Me.JobEditorIEPC_E_VehicleToolStripMenuItem.Size = New System.Drawing.Size(263, 30)
+ Me.JobEditorIEPC_E_VehicleToolStripMenuItem.Size = New System.Drawing.Size(255, 22)
Me.JobEditorIEPC_E_VehicleToolStripMenuItem.Text = "Job Editor - IEPC-E Vehicle"
'
'JobEditorIEPC_S_VehicleToolStripMenuItem
'
Me.JobEditorIEPC_S_VehicleToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
Me.JobEditorIEPC_S_VehicleToolStripMenuItem.Name = "JobEditorIEPC_S_VehicleToolStripMenuItem"
- Me.JobEditorIEPC_S_VehicleToolStripMenuItem.Size = New System.Drawing.Size(263, 30)
+ Me.JobEditorIEPC_S_VehicleToolStripMenuItem.Size = New System.Drawing.Size(255, 22)
Me.JobEditorIEPC_S_VehicleToolStripMenuItem.Text = "Job Editor - IEPC-S Vehicle"
'
'JobEditorIHPCVehicleToolStripMenuItem
'
Me.JobEditorIHPCVehicleToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
Me.JobEditorIHPCVehicleToolStripMenuItem.Name = "JobEditorIHPCVehicleToolStripMenuItem"
- Me.JobEditorIHPCVehicleToolStripMenuItem.Size = New System.Drawing.Size(263, 30)
+ Me.JobEditorIHPCVehicleToolStripMenuItem.Size = New System.Drawing.Size(255, 22)
Me.JobEditorIHPCVehicleToolStripMenuItem.Text = "Job Editor - IHPC Vehicle"
'
'JobEditorEngineOnlyModeToolStripMenuItem
'
Me.JobEditorEngineOnlyModeToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
Me.JobEditorEngineOnlyModeToolStripMenuItem.Name = "JobEditorEngineOnlyModeToolStripMenuItem"
- Me.JobEditorEngineOnlyModeToolStripMenuItem.Size = New System.Drawing.Size(263, 30)
+ Me.JobEditorEngineOnlyModeToolStripMenuItem.Size = New System.Drawing.Size(255, 22)
Me.JobEditorEngineOnlyModeToolStripMenuItem.Text = "Job Editor - Engine Only Mode"
'
'EPTPJobEditorToolStripMenuItem
'
Me.EPTPJobEditorToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
Me.EPTPJobEditorToolStripMenuItem.Name = "EPTPJobEditorToolStripMenuItem"
- Me.EPTPJobEditorToolStripMenuItem.Size = New System.Drawing.Size(263, 30)
+ Me.EPTPJobEditorToolStripMenuItem.Size = New System.Drawing.Size(255, 22)
Me.EPTPJobEditorToolStripMenuItem.Text = "VTP Job Editor"
'
'VEHEditorToolStripMenuItem
'
Me.VEHEditorToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VEH
Me.VEHEditorToolStripMenuItem.Name = "VEHEditorToolStripMenuItem"
- Me.VEHEditorToolStripMenuItem.Size = New System.Drawing.Size(263, 30)
+ Me.VEHEditorToolStripMenuItem.Size = New System.Drawing.Size(255, 22)
Me.VEHEditorToolStripMenuItem.Text = "Vehicle Editor"
'
'EngineEditorToolStripMenuItem
'
Me.EngineEditorToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_ENG
Me.EngineEditorToolStripMenuItem.Name = "EngineEditorToolStripMenuItem"
- Me.EngineEditorToolStripMenuItem.Size = New System.Drawing.Size(263, 30)
+ Me.EngineEditorToolStripMenuItem.Size = New System.Drawing.Size(255, 22)
Me.EngineEditorToolStripMenuItem.Text = "Engine Editor"
'
'GearboxEditorToolStripMenuItem
'
Me.GearboxEditorToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_GBX
Me.GearboxEditorToolStripMenuItem.Name = "GearboxEditorToolStripMenuItem"
- Me.GearboxEditorToolStripMenuItem.Size = New System.Drawing.Size(263, 30)
+ Me.GearboxEditorToolStripMenuItem.Size = New System.Drawing.Size(255, 22)
Me.GearboxEditorToolStripMenuItem.Text = "Gearbox Editor"
'
'GraphToolStripMenuItem
'
Me.GraphToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_Graph
Me.GraphToolStripMenuItem.Name = "GraphToolStripMenuItem"
- Me.GraphToolStripMenuItem.Size = New System.Drawing.Size(263, 30)
+ Me.GraphToolStripMenuItem.Size = New System.Drawing.Size(255, 22)
Me.GraphToolStripMenuItem.Text = "Graph"
'
'ToolStripSeparator6
'
Me.ToolStripSeparator6.Name = "ToolStripSeparator6"
- Me.ToolStripSeparator6.Size = New System.Drawing.Size(260, 6)
+ Me.ToolStripSeparator6.Size = New System.Drawing.Size(252, 6)
'
'OpenLogToolStripMenuItem
'
Me.OpenLogToolStripMenuItem.Name = "OpenLogToolStripMenuItem"
- Me.OpenLogToolStripMenuItem.Size = New System.Drawing.Size(263, 30)
+ Me.OpenLogToolStripMenuItem.Size = New System.Drawing.Size(255, 22)
Me.OpenLogToolStripMenuItem.Text = "Open Log"
'
'SettingsToolStripMenuItem
'
Me.SettingsToolStripMenuItem.Name = "SettingsToolStripMenuItem"
- Me.SettingsToolStripMenuItem.Size = New System.Drawing.Size(263, 30)
+ Me.SettingsToolStripMenuItem.Size = New System.Drawing.Size(255, 22)
Me.SettingsToolStripMenuItem.Text = "Settings"
'
'ToolStripDrDnBtInfo
@@ -922,7 +881,7 @@ Partial Class MainForm
'
Me.CmDEV.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.CmDEV.Name = "CmDEV"
- Me.CmDEV.ShowImageMargin = false
+ Me.CmDEV.ShowImageMargin = False
Me.CmDEV.Size = New System.Drawing.Size(36, 4)
'
'TmProgSec
@@ -934,7 +893,7 @@ Partial Class MainForm
Me.CmOpenFile.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.OpenInGraphWindowToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
Me.CmOpenFile.Name = "CmOpenFile"
- Me.CmOpenFile.ShowImageMargin = false
+ Me.CmOpenFile.ShowImageMargin = False
Me.CmOpenFile.Size = New System.Drawing.Size(174, 70)
'
'OpenWithToolStripMenuItem
@@ -958,15 +917,14 @@ Partial Class MainForm
'MainForm
'
Me.AcceptButton = Me.btStartV3
- Me.AutoScaleDimensions = New System.Drawing.SizeF(9!, 20!)
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
- Me.ClientSize = New System.Drawing.Size(1568, 1031)
+ Me.ClientSize = New System.Drawing.Size(1045, 670)
Me.Controls.Add(Me.ToolStrip1)
Me.Controls.Add(Me.SplitContainer1)
Me.Controls.Add(Me.StatusBAR)
- Me.Icon = CType(resources.GetObject("$this.Icon"),System.Drawing.Icon)
- Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.MinimumSize = New System.Drawing.Size(1170, 725)
+ Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+ Me.MinimumSize = New System.Drawing.Size(785, 485)
Me.Name = "MainForm"
Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
Me.Text = "VECTO"
diff --git a/VECTO/GUI/MainForm.resx b/VECTO/GUI/MainForm.resx
index df927555f4..8d7d8721a8 100644
--- a/VECTO/GUI/MainForm.resx
+++ b/VECTO/GUI/MainForm.resx
@@ -223,11 +223,8 @@
<metadata name="CmOpenFile.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>732, 12</value>
</metadata>
- <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>850, 12</value>
- </metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>49</value>
+ <value>25</value>
</metadata>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
diff --git a/VECTO/GUI/MainForm.vb b/VECTO/GUI/MainForm.vb
index dcd784a7af..b02a9bac8f 100644
--- a/VECTO/GUI/MainForm.vb
+++ b/VECTO/GUI/MainForm.vb
@@ -1693,6 +1693,9 @@ lbFound:
JobEditorParallelHybridVehicleToolStripMenuItem.Enabled = Not Cfg.DeclMode
JobEditorEngineOnlyModeToolStripMenuItem.Enabled = Not Cfg.DeclMode
JobEditorSerialHybridVehicleToolStripMenuItem.Enabled = Not Cfg.DeclMode
+ JobEditorIEPC_E_VehicleToolStripMenuItem.Enabled = Not Cfg.DeclMode
+ JobEditorIEPC_S_VehicleToolStripMenuItem.Enabled = Not Cfg.DeclMode
+ JobEditorIHPCVehicleToolStripMenuItem.Enabled = Not Cfg.DeclMode
End Sub
diff --git a/VECTO/GUI/REESSPackDialog.vb b/VECTO/GUI/REESSPackDialog.vb
index 235410f231..e7c66ae724 100644
--- a/VECTO/GUI/REESSPackDialog.vb
+++ b/VECTO/GUI/REESSPackDialog.vb
@@ -46,13 +46,18 @@ Public Class REESSPackDialog
tbStreamId.Focus()
Return
End If
- If Not IsNumeric(tbBatteryPackCnt.Text) Then
- MsgBox("Invalid REESS Count")
- tbBatteryPackCnt.Focus()
- Return
- End If
+ If Not IsNumeric(tbBatteryPackCnt.Text) Then
+ MsgBox("Invalid REESS Count")
+ tbBatteryPackCnt.Focus()
+ Return
+ End If
+ If Not 0 < Convert.ToInt32(tbBatteryPackCnt.Text) Then
+ MsgBox("REESS Count has to be positive")
+ tbBatteryPackCnt.Focus()
+ Return
+ End If
- DialogResult = DialogResult.OK
+ DialogResult = DialogResult.OK
Close()
End Sub
diff --git a/VECTO/GUI/VectoJobForm.vb b/VECTO/GUI/VectoJobForm.vb
index daf588d1b8..34301c4327 100644
--- a/VECTO/GUI/VectoJobForm.vb
+++ b/VECTO/GUI/VectoJobForm.vb
@@ -1390,10 +1390,10 @@ Public Class VectoJobForm
End If
PicVehicle.Image = ConvPicPath(HDVclass, False) _
- 'Image.FromFile(cDeclaration.ConvPicPath(HDVclass, False))
+ 'Image.FromFile(cDeclaration.ConvPicPath(HDVclass, False))
- TbHVCclass.Text = $"HDV Group {HDVclass}"
- TbVehCat.Text = vehicle.VehicleCategory.GetCategoryName() 'ConvVehCat(VEH0.VehCat, True)
+ TbHVCclass.Text = $"{HDVclass}"
+ TbVehCat.Text = vehicle.VehicleCategory.GetCategoryName() 'ConvVehCat(VEH0.VehCat, True)
TbMass.Text = (vehicle.GrossVehicleMassRating.Value() / 1000) & " t"
TbAxleConf.Text = vehicle.AxleConfiguration.GetName() 'ConvAxleConf(VEH0.AxleConf)
End Sub
@@ -1433,14 +1433,187 @@ Public Class VectoJobForm
#End Region
- Private Sub btnDfTargetSpeed_Click(sender As Object, e As EventArgs) Handles btnDfTargetSpeed.Click
- If DriverDecisionFactorTargetSpeedFileBrowser.OpenDialog(FileRepl(tbLacDfTargetSpeedFile.Text, GetPath(VectoFile))) _
- Then _
- tbLacDfTargetSpeedFile.Text = GetFilenameWithoutDirectory(DriverDecisionFactorTargetSpeedFileBrowser.Files(0),
- GetPath(VectoFile))
- End Sub
+#Region "TextBox Validation OnLeave"
+
+ Private Function TextboxValidation(text As String) As Boolean
+ If text = "" Then
+ Return True
+ End If
+ If Not IsNumeric(text) Then
+ Return False
+ End If
+
+ If Not 0 < Convert.ToDouble(text) Then
+ Return False
+ End If
+
+ Return True
+ End Function
+
+
+ Private Sub tbEngineStopStartActivationDelay_Leave(sender As Object, e As System.EventArgs) Handles tbEngineStopStartActivationDelay.Leave
+ If Not TextboxValidation(tbEngineStopStartActivationDelay.Text) Then
+ MsgBox("Invalid input value for 'Engine-off'!", vbExclamation, "Warning")
+ tbEngineStopStartActivationDelay.Focus()
+ Return
+ End If
+ End Sub
+
+ Private Sub tbMaxEngineOffTimespan_Leave(sender As Object, e As System.EventArgs) Handles tbMaxEngineOffTimespan.Leave
+ If Not TextboxValidation(tbMaxEngineOffTimespan.Text) Then
+ MsgBox("Invalid input value for 'Max. engine-off time:'!", vbExclamation, "Warning")
+ tbMaxEngineOffTimespan.Focus()
+ Return
+ End If
+ End Sub
+
+ Private Sub tbEcoRollMinSpeed_Leave(sender As Object, e As System.EventArgs) Handles tbEcoRollMinSpeed.Leave
+ If Not TextboxValidation(tbEcoRollMinSpeed.Text) Then
+ MsgBox("Invalid input value for 'Eco Roll - Minimum Speed'!", vbExclamation, "Warning")
+ tbEcoRollMinSpeed.Focus()
+ Return
+ End If
+ End Sub
+
+ Private Sub tbEcoRollActivationDelay_Leave(sender As Object, e As System.EventArgs) Handles tbEcoRollActivationDelay.Leave
+ If Not TextboxValidation(tbEcoRollActivationDelay.Text) Then
+ MsgBox("Invalid input value for 'Eco Roll - Activation Delay'!", vbExclamation, "Warning")
+ tbEcoRollActivationDelay.Focus()
+ Return
+ End If
+ End Sub
+
+ Private Sub tbEcoRollMaxAcc_Leave(sender As Object, e As System.EventArgs) Handles tbEcoRollMaxAcc.Leave
+ If Not TextboxValidation(tbEcoRollMaxAcc.Text) Then
+ MsgBox("Invalid input value for 'Eco Roll - Upper Accelaration Limit'!", vbExclamation, "Warning")
+ tbEcoRollActivationDelay.Focus()
+ Return
+ End If
+ End Sub
+
+ Private Sub tbEcoRollUnderspeed_Leave(sender As Object, e As System.EventArgs) Handles tbEcoRollUnderspeed.Leave
+ If Not TextboxValidation(tbEcoRollUnderspeed.Text) Then
+ MsgBox("Invalid input value for 'Eco Roll - Underspeed threshold'!", vbExclamation, "Warning")
+ tbEcoRollUnderspeed.Focus()
+ Return
+ End If
+ End Sub
+
+ Private Sub tbPCCUnderspeed_Leave(sender As Object, e As System.EventArgs) Handles tbPCCUnderspeed.Leave
+ If Not TextboxValidation(tbPCCUnderspeed.Text) Then
+ MsgBox("Invalid input value for 'Predictive Cruise Control - Allowed Underspeed'!", vbExclamation, "Warning")
+ tbPCCUnderspeed.Focus()
+ Return
+ End If
+ End Sub
+
+ Private Sub tbPCCOverspeed_Leave(sender As Object, e As System.EventArgs) Handles tbPCCOverspeed.Leave
+ If Not TextboxValidation(tbPCCOverspeed.Text) Then
+ MsgBox("Invalid input value for 'Predictive Cruise Control - Allowed Overspeed'!", vbExclamation, "Warning")
+ tbPCCOverspeed.Focus()
+ Return
+ End If
+ End Sub
+
+ Private Sub tbPCCEnableSpeed_Leave(sender As Object, e As System.EventArgs) Handles tbPCCEnableSpeed.Leave
+ If Not TextboxValidation(tbPCCEnableSpeed.Text) Then
+ MsgBox("Invalid input value for 'Predictive Cruise Control - PCC enabling velocity'!", vbExclamation, "Warning")
+ tbPCCEnableSpeed.Focus()
+ Return
+ End If
+ End Sub
+
+ Private Sub tbPCCMinSpeed_Leave(sender As Object, e As System.EventArgs) Handles tbPCCMinSpeed.Leave
+ If Not TextboxValidation(tbPCCMinSpeed.Text) Then
+ MsgBox("Invalid input value for 'Predictive Cruise Control - Minimum Speed'!", vbExclamation, "Warning")
+ tbPCCMinSpeed.Focus()
+ Return
+ End If
+ End Sub
+
+ Private Sub tbPCCPreviewUseCase1_Leave(sender As Object, e As System.EventArgs) Handles tbPCCPreviewUseCase1.Leave
+ If Not TextboxValidation(tbPCCPreviewUseCase1.Text) Then
+ MsgBox("Invalid input value for 'Predictive Cruise Control - Preview Distance use case 1'!", vbExclamation, "Warning")
+ tbPCCPreviewUseCase1.Focus()
+ Return
+ End If
+ End Sub
+
+ Private Sub tbtbPCCPreviewUseCase2_Leave(sender As Object, e As System.EventArgs) Handles tbPCCPreviewUseCase2.Leave
+ If Not TextboxValidation(tbPCCPreviewUseCase2.Text) Then
+ MsgBox("Invalid input value for 'Predictive Cruise Control - Preview Distance use case 2'!", vbExclamation, "Warning")
+ tbPCCPreviewUseCase2.Focus()
+ Return
+ End If
+ End Sub
+
+ Private Sub TbAuxPAuxICEOn_Leave(sender As Object, e As System.EventArgs) Handles TbAuxPAuxICEOn.Leave
+ If Not TextboxValidation(TbAuxPAuxICEOn.Text) Then
+ MsgBox("Invalid input value for 'Auxiliaries - Aux Load (ICE On)'!", vbExclamation, "Warning")
+ TbAuxPAuxICEOn.Focus()
+ Return
+ End If
+ End Sub
+
+ Private Sub tbPAuxDrivingICEOff_Leave(sender As Object, e As System.EventArgs) Handles tbPAuxDrivingICEOff.Leave
+ If Not TextboxValidation(tbPAuxDrivingICEOff.Text) Then
+ MsgBox("Invalid input value for 'Auxiliaries - Aux Load (Driving, ICE Off)'!", vbExclamation, "Warning")
+ tbPAuxDrivingICEOff.Focus()
+ Return
+ End If
+ End Sub
+
+ Private Sub tbPAuxStandstillICEOff_Leave(sender As Object, e As System.EventArgs) Handles tbPAuxStandstillICEOff.Leave
+ If Not TextboxValidation(tbPAuxStandstillICEOff.Text) Then
+ MsgBox("Invalid input value for 'Auxiliaries - Aux Load (Standstill, ICE Off)'!", vbExclamation, "Warning")
+ tbPAuxStandstillICEOff.Focus()
+ Return
+ End If
+ End Sub
+
+ Private Sub TbOverspeed_Leave(sender As Object, e As System.EventArgs) Handles TbOverspeed.Leave
+ If Not TextboxValidation(TbOverspeed.Text) Then
+ MsgBox("Invalid input value for 'Driver Model - 'Maximum Overspeed'!", vbExclamation, "Warning")
+ TbOverspeed.Focus()
+ Return
+ End If
+ End Sub
+
+ Private Sub TbVmin_Leave(sender As Object, e As System.EventArgs) Handles TbVmin.Leave
+ If Not TextboxValidation(TbVmin.Text) Then
+ MsgBox("Invalid input value for 'Driver Model - 'Minimum Speed'!", vbExclamation, "Warning")
+ TbVmin.Focus()
+ Return
+ End If
+ End Sub
+
+ Private Sub tbLacMinSpeed_Leave(sender As Object, e As System.EventArgs) Handles tbLacMinSpeed.Leave
+ If Not TextboxValidation(tbLacMinSpeed.Text) Then
+ MsgBox("Invalid input value for 'Look-Ahead Coasting - 'Min. Velocity'!", vbExclamation, "Warning")
+ tbLacMinSpeed.Focus()
+ Return
+ End If
+ End Sub
+
+ Private Sub tbLacPreviewFactor_Leave(sender As Object, e As System.EventArgs) Handles tbLacPreviewFactor.Leave
+ If Not TextboxValidation(tbLacPreviewFactor.Text) Then
+ MsgBox("Invalid input value for 'Look-Ahead Coasting - 'Preview distance factor'!", vbExclamation, "Warning")
+ tbLacPreviewFactor.Focus()
+ Return
+ End If
+ End Sub
+
- Private Sub btnDfVelocityDrop_Click_1(sender As Object, e As EventArgs) Handles btnDfVelocityDrop.Click
+#End Region
+
+ Private Sub btnDfTargetSpeed_Click(sender As Object, e As EventArgs) Handles btnDfTargetSpeed.Click
+ If DriverDecisionFactorTargetSpeedFileBrowser.OpenDialog(FileRepl(tbLacDfTargetSpeedFile.Text, GetPath(VectoFile))) _
+ Then _
+ tbLacDfTargetSpeedFile.Text = GetFilenameWithoutDirectory(DriverDecisionFactorTargetSpeedFileBrowser.Files(0),
+ GetPath(VectoFile))
+ End Sub
+
+ Private Sub btnDfVelocityDrop_Click_1(sender As Object, e As EventArgs) Handles btnDfVelocityDrop.Click
If DriverDecisionFactorVelocityDropFileBrowser.OpenDialog(FileRepl(tbLacDfVelocityDropFile.Text, GetPath(VectoFile))) _
Then _
tbLacDfVelocityDropFile.Text = GetFilenameWithoutDirectory(DriverDecisionFactorVelocityDropFileBrowser.Files(0),
@@ -1568,6 +1741,9 @@ Public Class VectoJobForm
End If
End Sub
+ Private Sub Label5_Click(sender As Object, e As EventArgs) Handles Label5.Click
+
+ End Sub
End Class
diff --git a/VECTO/GUI/VehicleForm.Designer.vb b/VECTO/GUI/VehicleForm.Designer.vb
index 57014cc253..218c39a928 100644
--- a/VECTO/GUI/VehicleForm.Designer.vb
+++ b/VECTO/GUI/VehicleForm.Designer.vb
@@ -222,7 +222,14 @@ 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.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()
@@ -230,75 +237,67 @@ 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.btPTOCycleDrive = New System.Windows.Forms.Button()
- Me.Label28 = New System.Windows.Forms.Label()
- Me.btPTOCycle = New System.Windows.Forms.Button()
- Me.Label16 = New System.Windows.Forms.Label()
Me.btPTOLossMapBrowse = New System.Windows.Forms.Button()
Me.Label7 = New System.Windows.Forms.Label()
Me.gbPTO = New System.Windows.Forms.GroupBox()
Me.cbLegislativeClass = New System.Windows.Forms.ComboBox()
Me.Label21 = New System.Windows.Forms.Label()
Me.lblTitle = New System.Windows.Forms.Label()
- Me.pnPtoMode3 = New System.Windows.Forms.Panel()
- Me.pnPtoMode1 = New System.Windows.Forms.Panel()
- Me.lblNotePtoPEV_HEVS = New System.Windows.Forms.Label()
- Me.GroupBox6.SuspendLayout
- Me.ToolStrip1.SuspendLayout
- Me.gbRetarderLosses.SuspendLayout
- Me.PnRt.SuspendLayout
- Me.GroupBox8.SuspendLayout
- Me.PnWheelDiam.SuspendLayout
- Me.StatusStrip1.SuspendLayout
- Me.GroupBox1.SuspendLayout
- Me.PnLoad.SuspendLayout
- Me.GrAirRes.SuspendLayout
- Me.PnCdATrTr.SuspendLayout
- CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).BeginInit
- Me.CmOpenFile.SuspendLayout
- Me.GroupBox3.SuspendLayout
- Me.gbAngledrive.SuspendLayout
- Me.pnAngledriveFields.SuspendLayout
- CType(Me.PicVehicle,System.ComponentModel.ISupportInitialize).BeginInit
- Me.tcVehicleComponents.SuspendLayout
- Me.tpGeneral.SuspendLayout
- Me.tpPowertrain.SuspendLayout
- Me.gbVehicleIdlingSpeed.SuspendLayout
- Me.Panel1.SuspendLayout
- Me.gbTankSystem.SuspendLayout
- Me.tpElectricMachine.SuspendLayout
- Me.gpElectricMotor.SuspendLayout
- Me.gbRatiosPerGear.SuspendLayout
- Me.pnElectricMotor.SuspendLayout
- Me.tpIEPC.SuspendLayout
- Me.FlowLayoutPanel1.SuspendLayout
- Me.tbIHPC.SuspendLayout
- Me.FlowLayoutPanel2.SuspendLayout
- Me.tpReess.SuspendLayout
- Me.gbBattery.SuspendLayout
- Me.tpGensetComponents.SuspendLayout
- Me.gbGenSet.SuspendLayout
- Me.pnGenSetEM.SuspendLayout
- Me.tpTorqueLimits.SuspendLayout
- Me.gbPropulsionTorque.SuspendLayout
- Me.gbEMTorqueLimits.SuspendLayout
- Me.bgVehicleTorqueLimits.SuspendLayout
- Me.tpADAS.SuspendLayout
- Me.gbADAS.SuspendLayout
- Me.pnEcoRoll.SuspendLayout
- Me.tpRoadSweeper.SuspendLayout
- Me.pnPTO.SuspendLayout
- Me.gbPTODrive.SuspendLayout
- Me.gbPTO.SuspendLayout
- Me.pnPtoMode3.SuspendLayout
- Me.pnPtoMode1.SuspendLayout
- Me.SuspendLayout
+ Me.GroupBox6.SuspendLayout()
+ Me.ToolStrip1.SuspendLayout()
+ Me.gbRetarderLosses.SuspendLayout()
+ Me.PnRt.SuspendLayout()
+ Me.GroupBox8.SuspendLayout()
+ Me.PnWheelDiam.SuspendLayout()
+ Me.StatusStrip1.SuspendLayout()
+ Me.GroupBox1.SuspendLayout()
+ Me.PnLoad.SuspendLayout()
+ Me.GrAirRes.SuspendLayout()
+ Me.PnCdATrTr.SuspendLayout()
+ CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
+ Me.CmOpenFile.SuspendLayout()
+ Me.GroupBox3.SuspendLayout()
+ Me.gbAngledrive.SuspendLayout()
+ Me.pnAngledriveFields.SuspendLayout()
+ CType(Me.PicVehicle, System.ComponentModel.ISupportInitialize).BeginInit()
+ Me.tcVehicleComponents.SuspendLayout()
+ Me.tpGeneral.SuspendLayout()
+ Me.tpPowertrain.SuspendLayout()
+ Me.gbVehicleIdlingSpeed.SuspendLayout()
+ Me.Panel1.SuspendLayout()
+ Me.gbTankSystem.SuspendLayout()
+ Me.tpElectricMachine.SuspendLayout()
+ Me.gpElectricMotor.SuspendLayout()
+ Me.gbRatiosPerGear.SuspendLayout()
+ Me.pnElectricMotor.SuspendLayout()
+ Me.tpIEPC.SuspendLayout()
+ Me.FlowLayoutPanel1.SuspendLayout()
+ Me.tbIHPC.SuspendLayout()
+ Me.FlowLayoutPanel2.SuspendLayout()
+ Me.tpReess.SuspendLayout()
+ Me.gbBattery.SuspendLayout()
+ Me.tpGensetComponents.SuspendLayout()
+ Me.gbGenSet.SuspendLayout()
+ Me.pnGenSetEM.SuspendLayout()
+ Me.tpTorqueLimits.SuspendLayout()
+ Me.gbPropulsionTorque.SuspendLayout()
+ Me.gbEMTorqueLimits.SuspendLayout()
+ Me.bgVehicleTorqueLimits.SuspendLayout()
+ Me.tpADAS.SuspendLayout()
+ Me.gbADAS.SuspendLayout()
+ Me.pnEcoRoll.SuspendLayout()
+ Me.tpRoadSweeper.SuspendLayout()
+ Me.pnPTO.SuspendLayout()
+ Me.pnPtoMode1.SuspendLayout()
+ Me.pnPtoMode3.SuspendLayout()
+ Me.gbPTODrive.SuspendLayout()
+ Me.gbPTO.SuspendLayout()
+ Me.SuspendLayout()
'
'Label1
'
- Me.Label1.AutoSize = true
- Me.Label1.Location = New System.Drawing.Point(9, 34)
- Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label1.AutoSize = True
+ Me.Label1.Location = New System.Drawing.Point(6, 22)
Me.Label1.Name = "Label1"
Me.Label1.Size = New System.Drawing.Size(177, 13)
Me.Label1.TabIndex = 0
@@ -306,17 +305,15 @@ Partial Class VehicleForm
'
'TbMass
'
- Me.TbMass.Location = New System.Drawing.Point(282, 29)
- Me.TbMass.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TbMass.Location = New System.Drawing.Point(188, 19)
Me.TbMass.Name = "TbMass"
- Me.TbMass.Size = New System.Drawing.Size(84, 20)
+ Me.TbMass.Size = New System.Drawing.Size(57, 20)
Me.TbMass.TabIndex = 0
'
'Label2
'
- Me.Label2.AutoSize = true
- Me.Label2.Location = New System.Drawing.Point(192, 48)
- Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label2.AutoSize = True
+ Me.Label2.Location = New System.Drawing.Point(128, 31)
Me.Label2.Name = "Label2"
Me.Label2.Size = New System.Drawing.Size(45, 13)
Me.Label2.TabIndex = 2
@@ -324,17 +321,15 @@ Partial Class VehicleForm
'
'TbLoad
'
- Me.TbLoad.Location = New System.Drawing.Point(273, 43)
- Me.TbLoad.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TbLoad.Location = New System.Drawing.Point(182, 28)
Me.TbLoad.Name = "TbLoad"
- Me.TbLoad.Size = New System.Drawing.Size(84, 20)
+ Me.TbLoad.Size = New System.Drawing.Size(57, 20)
Me.TbLoad.TabIndex = 1
'
'Label3
'
- Me.Label3.AutoSize = true
- Me.Label3.Location = New System.Drawing.Point(15, 9)
- Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label3.AutoSize = True
+ Me.Label3.Location = New System.Drawing.Point(214, 10)
Me.Label3.Name = "Label3"
Me.Label3.Size = New System.Drawing.Size(38, 13)
Me.Label3.TabIndex = 8
@@ -342,17 +337,15 @@ Partial Class VehicleForm
'
'TBcdA
'
- Me.TBcdA.Location = New System.Drawing.Point(81, 5)
- Me.TBcdA.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TBcdA.Location = New System.Drawing.Point(258, 3)
Me.TBcdA.Name = "TBcdA"
- Me.TBcdA.Size = New System.Drawing.Size(84, 20)
+ Me.TBcdA.Size = New System.Drawing.Size(57, 20)
Me.TBcdA.TabIndex = 0
'
'Label13
'
- Me.Label13.AutoSize = true
- Me.Label13.Location = New System.Drawing.Point(204, 9)
- Me.Label13.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label13.AutoSize = True
+ Me.Label13.Location = New System.Drawing.Point(136, 6)
Me.Label13.Name = "Label13"
Me.Label13.Size = New System.Drawing.Size(40, 13)
Me.Label13.TabIndex = 6
@@ -360,40 +353,36 @@ Partial Class VehicleForm
'
'TBrdyn
'
- Me.TBrdyn.Location = New System.Drawing.Point(278, 5)
- Me.TBrdyn.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TBrdyn.Location = New System.Drawing.Point(185, 3)
Me.TBrdyn.Name = "TBrdyn"
- Me.TBrdyn.Size = New System.Drawing.Size(84, 20)
+ Me.TBrdyn.Size = New System.Drawing.Size(57, 20)
Me.TBrdyn.TabIndex = 0
'
'ButOK
'
- Me.ButOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.ButOK.Location = New System.Drawing.Point(747, 888)
- Me.ButOK.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.ButOK.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.Name = "ButOK"
- Me.ButOK.Size = New System.Drawing.Size(112, 35)
+ Me.ButOK.Size = New System.Drawing.Size(75, 23)
Me.ButOK.TabIndex = 6
Me.ButOK.Text = "Save"
- Me.ButOK.UseVisualStyleBackColor = true
+ Me.ButOK.UseVisualStyleBackColor = True
'
'ButCancel
'
- Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.ButCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
- Me.ButCancel.Location = New System.Drawing.Point(868, 888)
- Me.ButCancel.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.ButCancel.Location = New System.Drawing.Point(579, 577)
Me.ButCancel.Name = "ButCancel"
- Me.ButCancel.Size = New System.Drawing.Size(112, 35)
+ Me.ButCancel.Size = New System.Drawing.Size(75, 23)
Me.ButCancel.TabIndex = 7
Me.ButCancel.Text = "Cancel"
- Me.ButCancel.UseVisualStyleBackColor = true
+ Me.ButCancel.UseVisualStyleBackColor = True
'
'Label14
'
- Me.Label14.AutoSize = true
- Me.Label14.Location = New System.Drawing.Point(370, 34)
- Me.Label14.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label14.AutoSize = True
+ Me.Label14.Location = New System.Drawing.Point(247, 22)
Me.Label14.Name = "Label14"
Me.Label14.Size = New System.Drawing.Size(25, 13)
Me.Label14.TabIndex = 24
@@ -401,9 +390,8 @@ Partial Class VehicleForm
'
'Label31
'
- Me.Label31.AutoSize = true
- Me.Label31.Location = New System.Drawing.Point(362, 48)
- Me.Label31.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label31.AutoSize = True
+ Me.Label31.Location = New System.Drawing.Point(241, 31)
Me.Label31.Name = "Label31"
Me.Label31.Size = New System.Drawing.Size(25, 13)
Me.Label31.TabIndex = 24
@@ -411,9 +399,8 @@ Partial Class VehicleForm
'
'Label35
'
- Me.Label35.AutoSize = true
- Me.Label35.Location = New System.Drawing.Point(366, 9)
- Me.Label35.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label35.AutoSize = True
+ Me.Label35.Location = New System.Drawing.Point(244, 6)
Me.Label35.Name = "Label35"
Me.Label35.Size = New System.Drawing.Size(29, 13)
Me.Label35.TabIndex = 24
@@ -421,41 +408,38 @@ Partial Class VehicleForm
'
'CbCdMode
'
- Me.CbCdMode.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.CbCdMode.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.CbCdMode.DisplayMember = "Value"
Me.CbCdMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
- Me.CbCdMode.FormattingEnabled = true
+ Me.CbCdMode.FormattingEnabled = True
Me.CbCdMode.Items.AddRange(New Object() {"No Correction", "Speed dependent (User-defined)", "Speed dependent (Declaration Mode)", "Vair & Beta Input"})
- Me.CbCdMode.Location = New System.Drawing.Point(9, 29)
- Me.CbCdMode.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.CbCdMode.Location = New System.Drawing.Point(6, 19)
Me.CbCdMode.Name = "CbCdMode"
- Me.CbCdMode.Size = New System.Drawing.Size(498, 28)
+ Me.CbCdMode.Size = New System.Drawing.Size(333, 21)
Me.CbCdMode.TabIndex = 0
Me.CbCdMode.ValueMember = "Key"
'
'TbCdFile
'
- Me.TbCdFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.TbCdFile.Enabled = false
- Me.TbCdFile.Location = New System.Drawing.Point(14, 100)
- Me.TbCdFile.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ 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.Name = "TbCdFile"
- Me.TbCdFile.Size = New System.Drawing.Size(412, 20)
+ Me.TbCdFile.Size = New System.Drawing.Size(276, 20)
Me.TbCdFile.TabIndex = 1
'
'BtCdFileBrowse
'
- Me.BtCdFileBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.BtCdFileBrowse.Enabled = false
+ Me.BtCdFileBrowse.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(436, 95)
- Me.BtCdFileBrowse.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.BtCdFileBrowse.Location = New System.Drawing.Point(291, 62)
Me.BtCdFileBrowse.Name = "BtCdFileBrowse"
- Me.BtCdFileBrowse.Size = New System.Drawing.Size(36, 37)
+ Me.BtCdFileBrowse.Size = New System.Drawing.Size(24, 24)
Me.BtCdFileBrowse.TabIndex = 2
- Me.BtCdFileBrowse.UseVisualStyleBackColor = true
+ Me.BtCdFileBrowse.UseVisualStyleBackColor = True
'
'GroupBox6
'
@@ -464,32 +448,28 @@ 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(440, 129)
- Me.GroupBox6.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox6.Location = New System.Drawing.Point(293, 84)
Me.GroupBox6.Name = "GroupBox6"
- Me.GroupBox6.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.GroupBox6.Size = New System.Drawing.Size(519, 148)
+ Me.GroupBox6.Size = New System.Drawing.Size(346, 96)
Me.GroupBox6.TabIndex = 3
- Me.GroupBox6.TabStop = false
+ Me.GroupBox6.TabStop = False
Me.GroupBox6.Text = "Cross Wind Correction"
'
'BtCdFileOpen
'
- Me.BtCdFileOpen.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.BtCdFileOpen.Enabled = false
+ Me.BtCdFileOpen.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(472, 95)
- Me.BtCdFileOpen.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.BtCdFileOpen.Location = New System.Drawing.Point(315, 62)
Me.BtCdFileOpen.Name = "BtCdFileOpen"
- Me.BtCdFileOpen.Size = New System.Drawing.Size(36, 37)
+ Me.BtCdFileOpen.Size = New System.Drawing.Size(24, 24)
Me.BtCdFileOpen.TabIndex = 3
- Me.BtCdFileOpen.UseVisualStyleBackColor = true
+ Me.BtCdFileOpen.UseVisualStyleBackColor = True
'
'LbCdMode
'
- Me.LbCdMode.AutoSize = true
- Me.LbCdMode.Location = New System.Drawing.Point(9, 72)
- Me.LbCdMode.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.LbCdMode.AutoSize = True
+ Me.LbCdMode.Location = New System.Drawing.Point(6, 47)
Me.LbCdMode.Name = "LbCdMode"
Me.LbCdMode.Size = New System.Drawing.Size(59, 13)
Me.LbCdMode.TabIndex = 28
@@ -503,8 +483,8 @@ Partial Class VehicleForm
Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator3, Me.ToolStripBtSendTo, Me.ToolStripSeparator1, Me.ToolStripButton1})
Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
Me.ToolStrip1.Name = "ToolStrip1"
- Me.ToolStrip1.Padding = New System.Windows.Forms.Padding(0, 0, 3, 0)
- Me.ToolStrip1.Size = New System.Drawing.Size(999, 31)
+ Me.ToolStrip1.Padding = New System.Windows.Forms.Padding(0, 0, 2, 0)
+ Me.ToolStrip1.Size = New System.Drawing.Size(666, 31)
Me.ToolStrip1.TabIndex = 29
Me.ToolStrip1.Text = "ToolStrip1"
'
@@ -581,71 +561,64 @@ Partial Class VehicleForm
'
Me.gbRetarderLosses.Controls.Add(Me.PnRt)
Me.gbRetarderLosses.Controls.Add(Me.CbRtType)
- Me.gbRetarderLosses.Location = New System.Drawing.Point(9, 117)
- Me.gbRetarderLosses.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbRetarderLosses.Location = New System.Drawing.Point(6, 76)
Me.gbRetarderLosses.Name = "gbRetarderLosses"
- Me.gbRetarderLosses.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.gbRetarderLosses.Size = New System.Drawing.Size(465, 171)
+ Me.gbRetarderLosses.Size = New System.Drawing.Size(310, 111)
Me.gbRetarderLosses.TabIndex = 1
- Me.gbRetarderLosses.TabStop = false
+ Me.gbRetarderLosses.TabStop = False
Me.gbRetarderLosses.Text = "Retarder Losses"
'
'PnRt
'
- Me.PnRt.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
- Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.PnRt.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.PnRt.Controls.Add(Me.Label15)
Me.PnRt.Controls.Add(Me.BtRtBrowse)
Me.PnRt.Controls.Add(Me.TbRtPath)
Me.PnRt.Controls.Add(Me.Label45)
Me.PnRt.Controls.Add(Me.LbRtRatio)
Me.PnRt.Controls.Add(Me.TbRtRatio)
- Me.PnRt.Location = New System.Drawing.Point(4, 65)
- Me.PnRt.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.PnRt.Location = New System.Drawing.Point(3, 42)
Me.PnRt.Name = "PnRt"
- Me.PnRt.Size = New System.Drawing.Size(448, 97)
+ Me.PnRt.Size = New System.Drawing.Size(299, 63)
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(3, 35)
- Me.Label15.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ 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.Name = "Label15"
- Me.Label15.Size = New System.Drawing.Size(348, 25)
+ Me.Label15.Size = New System.Drawing.Size(232, 16)
Me.Label15.TabIndex = 15
Me.Label15.Text = "Retarder Loss Map"
Me.Label15.TextAlign = System.Drawing.ContentAlignment.BottomLeft
'
'BtRtBrowse
'
- Me.BtRtBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ 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(408, 57)
- Me.BtRtBrowse.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.BtRtBrowse.Location = New System.Drawing.Point(272, 37)
Me.BtRtBrowse.Name = "BtRtBrowse"
- Me.BtRtBrowse.Size = New System.Drawing.Size(36, 37)
+ Me.BtRtBrowse.Size = New System.Drawing.Size(24, 24)
Me.BtRtBrowse.TabIndex = 2
- Me.BtRtBrowse.UseVisualStyleBackColor = true
+ Me.BtRtBrowse.UseVisualStyleBackColor = True
'
'TbRtPath
'
- 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(4, 60)
- Me.TbRtPath.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ 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.Name = "TbRtPath"
- Me.TbRtPath.Size = New System.Drawing.Size(402, 20)
+ Me.TbRtPath.Size = New System.Drawing.Size(269, 20)
Me.TbRtPath.TabIndex = 1
'
'Label45
'
- Me.Label45.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.Label45.AutoSize = true
- Me.Label45.Location = New System.Drawing.Point(394, 8)
- Me.Label45.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ 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.Name = "Label45"
Me.Label45.Size = New System.Drawing.Size(16, 13)
Me.Label45.TabIndex = 10
@@ -653,43 +626,39 @@ Partial Class VehicleForm
'
'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(52, 8)
- Me.LbRtRatio.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ 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.Name = "LbRtRatio"
- Me.LbRtRatio.Size = New System.Drawing.Size(250, 26)
+ Me.LbRtRatio.Size = New System.Drawing.Size(167, 17)
Me.LbRtRatio.TabIndex = 1
Me.LbRtRatio.Text = "Ratio"
Me.LbRtRatio.TextAlign = System.Drawing.ContentAlignment.TopRight
'
'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(308, 5)
- Me.TbRtRatio.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ 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.Name = "TbRtRatio"
- Me.TbRtRatio.Size = New System.Drawing.Size(82, 20)
+ Me.TbRtRatio.Size = New System.Drawing.Size(56, 20)
Me.TbRtRatio.TabIndex = 0
'
'CbRtType
'
- Me.CbRtType.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.CbRtType.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
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(9, 29)
- Me.CbRtType.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.CbRtType.Location = New System.Drawing.Point(6, 19)
Me.CbRtType.Name = "CbRtType"
- Me.CbRtType.Size = New System.Drawing.Size(444, 28)
+ Me.CbRtType.Size = New System.Drawing.Size(297, 21)
Me.CbRtType.TabIndex = 0
Me.CbRtType.ValueMember = "Key"
'
'Label46
'
- Me.Label46.AutoSize = true
- Me.Label46.Location = New System.Drawing.Point(48, 8)
- Me.Label46.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label46.AutoSize = True
+ Me.Label46.Location = New System.Drawing.Point(32, 5)
Me.Label46.Name = "Label46"
Me.Label46.Size = New System.Drawing.Size(145, 13)
Me.Label46.TabIndex = 31
@@ -697,9 +666,8 @@ Partial Class VehicleForm
'
'Label50
'
- Me.Label50.AutoSize = true
- Me.Label50.Location = New System.Drawing.Point(362, 8)
- Me.Label50.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label50.AutoSize = True
+ Me.Label50.Location = New System.Drawing.Point(241, 5)
Me.Label50.Name = "Label50"
Me.Label50.Size = New System.Drawing.Size(25, 13)
Me.Label50.TabIndex = 24
@@ -707,10 +675,9 @@ Partial Class VehicleForm
'
'TbMassExtra
'
- Me.TbMassExtra.Location = New System.Drawing.Point(273, 3)
- Me.TbMassExtra.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TbMassExtra.Location = New System.Drawing.Point(182, 2)
Me.TbMassExtra.Name = "TbMassExtra"
- Me.TbMassExtra.Size = New System.Drawing.Size(84, 20)
+ Me.TbMassExtra.Size = New System.Drawing.Size(57, 20)
Me.TbMassExtra.TabIndex = 0
'
'GroupBox8
@@ -719,21 +686,18 @@ Partial Class VehicleForm
Me.GroupBox8.Controls.Add(Me.ButAxlRem)
Me.GroupBox8.Controls.Add(Me.LvRRC)
Me.GroupBox8.Controls.Add(Me.ButAxlAdd)
- Me.GroupBox8.Location = New System.Drawing.Point(9, 286)
- Me.GroupBox8.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox8.Location = New System.Drawing.Point(6, 186)
Me.GroupBox8.Name = "GroupBox8"
- Me.GroupBox8.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.GroupBox8.Size = New System.Drawing.Size(950, 280)
+ Me.GroupBox8.Size = New System.Drawing.Size(633, 182)
Me.GroupBox8.TabIndex = 4
- Me.GroupBox8.TabStop = false
+ Me.GroupBox8.TabStop = False
Me.GroupBox8.Text = "Axles / Wheels"
'
'Label6
'
- 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(788, 234)
- Me.Label6.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ 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.Name = "Label6"
Me.Label6.Size = New System.Drawing.Size(106, 13)
Me.Label6.TabIndex = 3
@@ -741,32 +705,30 @@ Partial Class VehicleForm
'
'ButAxlRem
'
- Me.ButAxlRem.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
+ 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(44, 232)
- Me.ButAxlRem.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.ButAxlRem.Location = New System.Drawing.Point(29, 151)
Me.ButAxlRem.Name = "ButAxlRem"
- Me.ButAxlRem.Size = New System.Drawing.Size(36, 37)
+ Me.ButAxlRem.Size = New System.Drawing.Size(24, 24)
Me.ButAxlRem.TabIndex = 2
- Me.ButAxlRem.UseVisualStyleBackColor = true
+ Me.ButAxlRem.UseVisualStyleBackColor = True
'
'LvRRC
'
- Me.LvRRC.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
- Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.LvRRC.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.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(9, 29)
- Me.LvRRC.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.LvRRC.MultiSelect = false
+ Me.LvRRC.FullRowSelect = True
+ Me.LvRRC.GridLines = True
+ Me.LvRRC.HideSelection = False
+ Me.LvRRC.Location = New System.Drawing.Point(6, 19)
+ Me.LvRRC.MultiSelect = False
Me.LvRRC.Name = "LvRRC"
- Me.LvRRC.Size = New System.Drawing.Size(930, 199)
+ Me.LvRRC.Size = New System.Drawing.Size(621, 131)
Me.LvRRC.TabIndex = 0
- Me.LvRRC.TabStop = false
- Me.LvRRC.UseCompatibleStateImageBehavior = false
+ Me.LvRRC.TabStop = False
+ Me.LvRRC.UseCompatibleStateImageBehavior = False
Me.LvRRC.View = System.Windows.Forms.View.Details
'
'ColumnHeader7
@@ -810,14 +772,13 @@ Partial Class VehicleForm
'
'ButAxlAdd
'
- Me.ButAxlAdd.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
+ 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(8, 232)
- Me.ButAxlAdd.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.ButAxlAdd.Location = New System.Drawing.Point(5, 151)
Me.ButAxlAdd.Name = "ButAxlAdd"
- Me.ButAxlAdd.Size = New System.Drawing.Size(36, 37)
+ Me.ButAxlAdd.Size = New System.Drawing.Size(24, 24)
Me.ButAxlAdd.TabIndex = 1
- Me.ButAxlAdd.UseVisualStyleBackColor = true
+ Me.ButAxlAdd.UseVisualStyleBackColor = True
'
'PnWheelDiam
'
@@ -825,22 +786,20 @@ Partial Class VehicleForm
Me.PnWheelDiam.Controls.Add(Me.TBrdyn)
Me.PnWheelDiam.Controls.Add(Me.Label35)
Me.PnWheelDiam.Dock = System.Windows.Forms.DockStyle.Fill
- Me.PnWheelDiam.Location = New System.Drawing.Point(4, 18)
- Me.PnWheelDiam.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.PnWheelDiam.Location = New System.Drawing.Point(3, 16)
Me.PnWheelDiam.Name = "PnWheelDiam"
- Me.PnWheelDiam.Size = New System.Drawing.Size(409, 54)
+ Me.PnWheelDiam.Size = New System.Drawing.Size(272, 31)
Me.PnWheelDiam.TabIndex = 0
'
'CbAxleConfig
'
Me.CbAxleConfig.DisplayMember = "Value"
Me.CbAxleConfig.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
- Me.CbAxleConfig.FormattingEnabled = true
+ Me.CbAxleConfig.FormattingEnabled = True
Me.CbAxleConfig.Items.AddRange(New Object() {"-", "4x2", "4x4", "6x2", "6x4", "6x6", "8x2", "8x4", "8x6", "8x8"})
- Me.CbAxleConfig.Location = New System.Drawing.Point(230, 123)
- Me.CbAxleConfig.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.CbAxleConfig.Location = New System.Drawing.Point(153, 80)
Me.CbAxleConfig.Name = "CbAxleConfig"
- Me.CbAxleConfig.Size = New System.Drawing.Size(88, 28)
+ Me.CbAxleConfig.Size = New System.Drawing.Size(60, 21)
Me.CbAxleConfig.TabIndex = 1
Me.CbAxleConfig.ValueMember = "Key"
'
@@ -848,20 +807,18 @@ Partial Class VehicleForm
'
Me.CbCat.DisplayMember = "Value"
Me.CbCat.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
- Me.CbCat.FormattingEnabled = true
+ Me.CbCat.FormattingEnabled = True
Me.CbCat.Items.AddRange(New Object() {"-", "Rigid Truck", "Tractor", "City Bus", "Interurban Bus", "Coach"})
- Me.CbCat.Location = New System.Drawing.Point(18, 123)
- Me.CbCat.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.CbCat.Location = New System.Drawing.Point(12, 80)
Me.CbCat.Name = "CbCat"
- Me.CbCat.Size = New System.Drawing.Size(200, 28)
+ Me.CbCat.Size = New System.Drawing.Size(135, 21)
Me.CbCat.TabIndex = 0
Me.CbCat.ValueMember = "Key"
'
'Label5
'
- Me.Label5.AutoSize = true
- Me.Label5.Location = New System.Drawing.Point(46, 166)
- Me.Label5.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label5.AutoSize = True
+ Me.Label5.Location = New System.Drawing.Point(31, 108)
Me.Label5.Name = "Label5"
Me.Label5.Size = New System.Drawing.Size(116, 13)
Me.Label5.TabIndex = 2
@@ -869,9 +826,8 @@ Partial Class VehicleForm
'
'Label9
'
- Me.Label9.AutoSize = true
- Me.Label9.Location = New System.Drawing.Point(296, 175)
- Me.Label9.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label9.AutoSize = True
+ Me.Label9.Location = New System.Drawing.Point(197, 114)
Me.Label9.Name = "Label9"
Me.Label9.Size = New System.Drawing.Size(16, 13)
Me.Label9.TabIndex = 3
@@ -880,21 +836,19 @@ Partial Class VehicleForm
'
'TbMassMass
'
- Me.TbMassMass.Location = New System.Drawing.Point(230, 171)
- Me.TbMassMass.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TbMassMass.Location = New System.Drawing.Point(153, 111)
Me.TbMassMass.Name = "TbMassMass"
- Me.TbMassMass.Size = New System.Drawing.Size(61, 20)
+ Me.TbMassMass.Size = New System.Drawing.Size(42, 20)
Me.TbMassMass.TabIndex = 2
'
'StatusStrip1
'
Me.StatusStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LbStatus})
- Me.StatusStrip1.Location = New System.Drawing.Point(0, 940)
+ Me.StatusStrip1.Location = New System.Drawing.Point(0, 603)
Me.StatusStrip1.Name = "StatusStrip1"
- Me.StatusStrip1.Padding = New System.Windows.Forms.Padding(2, 0, 21, 0)
- Me.StatusStrip1.Size = New System.Drawing.Size(999, 22)
- Me.StatusStrip1.SizingGrip = false
+ Me.StatusStrip1.Size = New System.Drawing.Size(666, 22)
+ Me.StatusStrip1.SizingGrip = False
Me.StatusStrip1.TabIndex = 36
Me.StatusStrip1.Text = "StatusStrip1"
'
@@ -906,13 +860,12 @@ Partial Class VehicleForm
'
'TbHDVclass
'
- Me.TbHDVclass.Location = New System.Drawing.Point(230, 217)
- Me.TbHDVclass.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TbHDVclass.Location = New System.Drawing.Point(153, 141)
Me.TbHDVclass.Name = "TbHDVclass"
- Me.TbHDVclass.ReadOnly = true
- Me.TbHDVclass.Size = New System.Drawing.Size(61, 20)
+ Me.TbHDVclass.ReadOnly = True
+ Me.TbHDVclass.Size = New System.Drawing.Size(42, 20)
Me.TbHDVclass.TabIndex = 3
- Me.TbHDVclass.TabStop = false
+ Me.TbHDVclass.TabStop = False
Me.TbHDVclass.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
'
'GroupBox1
@@ -921,13 +874,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(9, 9)
- Me.GroupBox1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox1.Location = New System.Drawing.Point(6, 6)
Me.GroupBox1.Name = "GroupBox1"
- Me.GroupBox1.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.GroupBox1.Size = New System.Drawing.Size(417, 182)
+ Me.GroupBox1.Size = New System.Drawing.Size(278, 118)
Me.GroupBox1.TabIndex = 0
- Me.GroupBox1.TabStop = false
+ Me.GroupBox1.TabStop = False
Me.GroupBox1.Text = "Masses / Loading"
'
'PnLoad
@@ -938,22 +889,19 @@ Partial Class VehicleForm
Me.PnLoad.Controls.Add(Me.TbMassExtra)
Me.PnLoad.Controls.Add(Me.Label50)
Me.PnLoad.Controls.Add(Me.Label46)
- Me.PnLoad.Location = New System.Drawing.Point(9, 66)
- Me.PnLoad.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.PnLoad.Location = New System.Drawing.Point(6, 43)
Me.PnLoad.Name = "PnLoad"
- Me.PnLoad.Size = New System.Drawing.Size(404, 89)
+ Me.PnLoad.Size = New System.Drawing.Size(269, 58)
Me.PnLoad.TabIndex = 1
'
'GrAirRes
'
Me.GrAirRes.Controls.Add(Me.PnCdATrTr)
- Me.GrAirRes.Location = New System.Drawing.Point(435, 9)
- Me.GrAirRes.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GrAirRes.Location = New System.Drawing.Point(290, 6)
Me.GrAirRes.Name = "GrAirRes"
- Me.GrAirRes.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.GrAirRes.Size = New System.Drawing.Size(524, 111)
+ Me.GrAirRes.Size = New System.Drawing.Size(349, 72)
Me.GrAirRes.TabIndex = 2
- Me.GrAirRes.TabStop = false
+ Me.GrAirRes.TabStop = False
Me.GrAirRes.Text = "Air Resistance"
'
'PnCdATrTr
@@ -965,25 +913,22 @@ Partial Class VehicleForm
Me.PnCdATrTr.Controls.Add(Me.Label38)
Me.PnCdATrTr.Controls.Add(Me.Label3)
Me.PnCdATrTr.Dock = System.Windows.Forms.DockStyle.Fill
- Me.PnCdATrTr.Location = New System.Drawing.Point(4, 18)
- Me.PnCdATrTr.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.PnCdATrTr.Location = New System.Drawing.Point(3, 16)
Me.PnCdATrTr.Name = "PnCdATrTr"
- Me.PnCdATrTr.Size = New System.Drawing.Size(516, 88)
+ Me.PnCdATrTr.Size = New System.Drawing.Size(343, 53)
Me.PnCdATrTr.TabIndex = 0
'
'tbVehicleHeight
'
- Me.tbVehicleHeight.Location = New System.Drawing.Point(81, 45)
- Me.tbVehicleHeight.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbVehicleHeight.Location = New System.Drawing.Point(258, 29)
Me.tbVehicleHeight.Name = "tbVehicleHeight"
- Me.tbVehicleHeight.Size = New System.Drawing.Size(84, 20)
+ Me.tbVehicleHeight.Size = New System.Drawing.Size(57, 20)
Me.tbVehicleHeight.TabIndex = 1
'
'Label11
'
- Me.Label11.AutoSize = true
- Me.Label11.Location = New System.Drawing.Point(176, 49)
- Me.Label11.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label11.AutoSize = True
+ Me.Label11.Location = New System.Drawing.Point(321, 32)
Me.Label11.Name = "Label11"
Me.Label11.Size = New System.Drawing.Size(21, 13)
Me.Label11.TabIndex = 27
@@ -991,19 +936,17 @@ Partial Class VehicleForm
'
'Label20
'
- Me.Label20.AutoSize = true
- Me.Label20.Location = New System.Drawing.Point(15, 49)
- Me.Label20.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label20.AutoSize = True
+ Me.Label20.Location = New System.Drawing.Point(151, 32)
Me.Label20.Name = "Label20"
- Me.Label20.Size = New System.Drawing.Size(38, 13)
+ Me.Label20.Size = New System.Drawing.Size(102, 13)
Me.Label20.TabIndex = 26
- Me.Label20.Text = "Height"
+ Me.Label20.Text = "Max. Vehicle Height"
'
'Label38
'
- Me.Label38.AutoSize = true
- Me.Label38.Location = New System.Drawing.Point(176, 9)
- Me.Label38.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label38.AutoSize = True
+ Me.Label38.Location = New System.Drawing.Point(321, 6)
Me.Label38.Name = "Label38"
Me.Label38.Size = New System.Drawing.Size(24, 13)
Me.Label38.TabIndex = 24
@@ -1013,19 +956,18 @@ 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, 43)
- Me.PictureBox1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.PictureBox1.Location = New System.Drawing.Point(0, 28)
Me.PictureBox1.Name = "PictureBox1"
- Me.PictureBox1.Size = New System.Drawing.Size(999, 62)
+ Me.PictureBox1.Size = New System.Drawing.Size(666, 40)
Me.PictureBox1.TabIndex = 37
- Me.PictureBox1.TabStop = false
+ Me.PictureBox1.TabStop = False
'
'CmOpenFile
'
Me.CmOpenFile.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
Me.CmOpenFile.Name = "CmOpenFile"
- Me.CmOpenFile.ShowImageMargin = false
+ Me.CmOpenFile.ShowImageMargin = False
Me.CmOpenFile.Size = New System.Drawing.Size(128, 48)
'
'OpenWithToolStripMenuItem
@@ -1043,51 +985,45 @@ Partial Class VehicleForm
'GroupBox3
'
Me.GroupBox3.Controls.Add(Me.PnWheelDiam)
- Me.GroupBox3.Location = New System.Drawing.Point(9, 200)
- Me.GroupBox3.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox3.Location = New System.Drawing.Point(6, 130)
Me.GroupBox3.Name = "GroupBox3"
- Me.GroupBox3.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.GroupBox3.Size = New System.Drawing.Size(417, 77)
+ Me.GroupBox3.Size = New System.Drawing.Size(278, 50)
Me.GroupBox3.TabIndex = 1
- Me.GroupBox3.TabStop = false
+ Me.GroupBox3.TabStop = False
Me.GroupBox3.Text = "Dynamic Tyre Radius"
'
'gbAngledrive
'
Me.gbAngledrive.Controls.Add(Me.pnAngledriveFields)
Me.gbAngledrive.Controls.Add(Me.cbAngledriveType)
- Me.gbAngledrive.Location = New System.Drawing.Point(494, 117)
- Me.gbAngledrive.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbAngledrive.Location = New System.Drawing.Point(329, 76)
Me.gbAngledrive.Name = "gbAngledrive"
- Me.gbAngledrive.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.gbAngledrive.Size = New System.Drawing.Size(470, 171)
+ Me.gbAngledrive.Size = New System.Drawing.Size(313, 111)
Me.gbAngledrive.TabIndex = 3
- Me.gbAngledrive.TabStop = false
+ Me.gbAngledrive.TabStop = False
Me.gbAngledrive.Text = "Angledrive"
'
'pnAngledriveFields
'
- Me.pnAngledriveFields.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
- Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.pnAngledriveFields.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.pnAngledriveFields.Controls.Add(Me.Label4)
Me.pnAngledriveFields.Controls.Add(Me.Label10)
Me.pnAngledriveFields.Controls.Add(Me.tbAngledriveRatio)
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(4, 65)
- Me.pnAngledriveFields.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.pnAngledriveFields.Location = New System.Drawing.Point(3, 42)
Me.pnAngledriveFields.Name = "pnAngledriveFields"
- Me.pnAngledriveFields.Size = New System.Drawing.Size(454, 97)
+ Me.pnAngledriveFields.Size = New System.Drawing.Size(303, 63)
Me.pnAngledriveFields.TabIndex = 1
'
'Label4
'
- Me.Label4.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.Label4.AutoSize = true
- Me.Label4.Location = New System.Drawing.Point(416, 9)
- Me.Label4.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ 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.Name = "Label4"
Me.Label4.Size = New System.Drawing.Size(16, 13)
Me.Label4.TabIndex = 16
@@ -1095,67 +1031,61 @@ Partial Class VehicleForm
'
'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(255, 9)
- Me.Label10.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ 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.Name = "Label10"
- Me.Label10.Size = New System.Drawing.Size(66, 28)
+ Me.Label10.Size = New System.Drawing.Size(44, 18)
Me.Label10.TabIndex = 15
Me.Label10.Text = "Ratio"
Me.Label10.TextAlign = System.Drawing.ContentAlignment.TopRight
'
'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(328, 6)
- Me.tbAngledriveRatio.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ 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.Name = "tbAngledriveRatio"
- Me.tbAngledriveRatio.Size = New System.Drawing.Size(82, 20)
+ Me.tbAngledriveRatio.Size = New System.Drawing.Size(56, 20)
Me.tbAngledriveRatio.TabIndex = 0
'
'btAngledriveLossMapBrowse
'
- Me.btAngledriveLossMapBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ 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(414, 60)
- Me.btAngledriveLossMapBrowse.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btAngledriveLossMapBrowse.Location = New System.Drawing.Point(276, 39)
Me.btAngledriveLossMapBrowse.Name = "btAngledriveLossMapBrowse"
- Me.btAngledriveLossMapBrowse.Size = New System.Drawing.Size(36, 37)
+ Me.btAngledriveLossMapBrowse.Size = New System.Drawing.Size(24, 24)
Me.btAngledriveLossMapBrowse.TabIndex = 2
- Me.btAngledriveLossMapBrowse.UseVisualStyleBackColor = true
+ Me.btAngledriveLossMapBrowse.UseVisualStyleBackColor = True
'
'tbAngledriveLossMapPath
'
- 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(4, 63)
- Me.tbAngledriveLossMapPath.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ 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.Name = "tbAngledriveLossMapPath"
- Me.tbAngledriveLossMapPath.Size = New System.Drawing.Size(408, 20)
+ Me.tbAngledriveLossMapPath.Size = New System.Drawing.Size(273, 20)
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, 37)
- Me.Label12.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ 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.Name = "Label12"
- Me.Label12.Size = New System.Drawing.Size(441, 25)
+ Me.Label12.Size = New System.Drawing.Size(294, 16)
Me.Label12.TabIndex = 17
Me.Label12.Text = "Transmission Loss Map or Efficiency Value [0..1]"
Me.Label12.TextAlign = System.Drawing.ContentAlignment.BottomLeft
'
'cbAngledriveType
'
- Me.cbAngledriveType.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.cbAngledriveType.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+ 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(9, 29)
- Me.cbAngledriveType.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.cbAngledriveType.Location = New System.Drawing.Point(6, 19)
Me.cbAngledriveType.Name = "cbAngledriveType"
- Me.cbAngledriveType.Size = New System.Drawing.Size(444, 28)
+ Me.cbAngledriveType.Size = New System.Drawing.Size(297, 21)
Me.cbAngledriveType.TabIndex = 0
Me.cbAngledriveType.ValueMember = "Key"
'
@@ -1163,19 +1093,17 @@ 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(422, 108)
- Me.PicVehicle.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.PicVehicle.Location = New System.Drawing.Point(281, 70)
Me.PicVehicle.Name = "PicVehicle"
- Me.PicVehicle.Size = New System.Drawing.Size(449, 134)
+ Me.PicVehicle.Size = New System.Drawing.Size(300, 88)
Me.PicVehicle.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
Me.PicVehicle.TabIndex = 39
- Me.PicVehicle.TabStop = false
+ Me.PicVehicle.TabStop = False
'
'Label8
'
- Me.Label8.AutoSize = true
- Me.Label8.Location = New System.Drawing.Point(128, 222)
- Me.Label8.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label8.AutoSize = True
+ Me.Label8.Location = New System.Drawing.Point(85, 144)
Me.Label8.Name = "Label8"
Me.Label8.Size = New System.Drawing.Size(62, 13)
Me.Label8.TabIndex = 10
@@ -1183,42 +1111,38 @@ Partial Class VehicleForm
'
'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.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.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
- Me.cbPTOType.Location = New System.Drawing.Point(9, 37)
- Me.cbPTOType.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.cbPTOType.Location = New System.Drawing.Point(6, 24)
Me.cbPTOType.Name = "cbPTOType"
- Me.cbPTOType.Size = New System.Drawing.Size(926, 28)
+ Me.cbPTOType.Size = New System.Drawing.Size(619, 21)
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(9, 35)
- Me.tbPTOCycle.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbPTOCycle.Location = New System.Drawing.Point(6, 23)
Me.tbPTOCycle.Name = "tbPTOCycle"
- Me.tbPTOCycle.Size = New System.Drawing.Size(643, 20)
+ Me.tbPTOCycle.Size = New System.Drawing.Size(430, 20)
Me.tbPTOCycle.TabIndex = 2
Me.ToolTip1.SetToolTip(Me.tbPTOCycle, "PTO Consumer Loss Map")
'
'tbPTOLossMap
'
- Me.tbPTOLossMap.Location = New System.Drawing.Point(9, 37)
- Me.tbPTOLossMap.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbPTOLossMap.Location = New System.Drawing.Point(6, 24)
Me.tbPTOLossMap.Name = "tbPTOLossMap"
- Me.tbPTOLossMap.Size = New System.Drawing.Size(643, 20)
+ Me.tbPTOLossMap.Size = New System.Drawing.Size(430, 20)
Me.tbPTOLossMap.TabIndex = 0
Me.ToolTip1.SetToolTip(Me.tbPTOLossMap, "PTO Consumer Loss Map")
'
'tbPTODrive
'
- Me.tbPTODrive.Location = New System.Drawing.Point(4, 32)
- Me.tbPTODrive.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbPTODrive.Location = New System.Drawing.Point(3, 21)
Me.tbPTODrive.Name = "tbPTODrive"
- Me.tbPTODrive.Size = New System.Drawing.Size(643, 20)
+ Me.tbPTODrive.Size = New System.Drawing.Size(430, 20)
Me.tbPTODrive.TabIndex = 5
Me.ToolTip1.SetToolTip(Me.tbPTODrive, "PTO Consumer Loss Map")
'
@@ -1234,11 +1158,10 @@ Partial Class VehicleForm
Me.tcVehicleComponents.Controls.Add(Me.tpTorqueLimits)
Me.tcVehicleComponents.Controls.Add(Me.tpADAS)
Me.tcVehicleComponents.Controls.Add(Me.tpRoadSweeper)
- Me.tcVehicleComponents.Location = New System.Drawing.Point(8, 266)
- Me.tcVehicleComponents.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tcVehicleComponents.Location = New System.Drawing.Point(5, 173)
Me.tcVehicleComponents.Name = "tcVehicleComponents"
Me.tcVehicleComponents.SelectedIndex = 0
- Me.tcVehicleComponents.Size = New System.Drawing.Size(984, 615)
+ Me.tcVehicleComponents.Size = New System.Drawing.Size(656, 400)
Me.tcVehicleComponents.TabIndex = 5
'
'tpGeneral
@@ -1248,14 +1171,13 @@ Partial Class VehicleForm
Me.tpGeneral.Controls.Add(Me.GroupBox6)
Me.tpGeneral.Controls.Add(Me.GroupBox8)
Me.tpGeneral.Controls.Add(Me.GrAirRes)
- Me.tpGeneral.Location = New System.Drawing.Point(4, 29)
- Me.tpGeneral.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tpGeneral.Location = New System.Drawing.Point(4, 22)
Me.tpGeneral.Name = "tpGeneral"
- Me.tpGeneral.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.tpGeneral.Size = New System.Drawing.Size(976, 582)
+ Me.tpGeneral.Padding = New System.Windows.Forms.Padding(3)
+ Me.tpGeneral.Size = New System.Drawing.Size(648, 374)
Me.tpGeneral.TabIndex = 0
Me.tpGeneral.Text = "General"
- Me.tpGeneral.UseVisualStyleBackColor = true
+ Me.tpGeneral.UseVisualStyleBackColor = True
'
'tpPowertrain
'
@@ -1263,25 +1185,22 @@ 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, 29)
- Me.tpPowertrain.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tpPowertrain.Location = New System.Drawing.Point(4, 22)
Me.tpPowertrain.Name = "tpPowertrain"
- Me.tpPowertrain.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.tpPowertrain.Size = New System.Drawing.Size(976, 582)
+ Me.tpPowertrain.Padding = New System.Windows.Forms.Padding(3)
+ Me.tpPowertrain.Size = New System.Drawing.Size(648, 374)
Me.tpPowertrain.TabIndex = 1
Me.tpPowertrain.Text = "Powertrain"
- Me.tpPowertrain.UseVisualStyleBackColor = true
+ Me.tpPowertrain.UseVisualStyleBackColor = True
'
'gbVehicleIdlingSpeed
'
Me.gbVehicleIdlingSpeed.Controls.Add(Me.Panel1)
- Me.gbVehicleIdlingSpeed.Location = New System.Drawing.Point(9, 9)
- Me.gbVehicleIdlingSpeed.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbVehicleIdlingSpeed.Location = New System.Drawing.Point(6, 6)
Me.gbVehicleIdlingSpeed.Name = "gbVehicleIdlingSpeed"
- Me.gbVehicleIdlingSpeed.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.gbVehicleIdlingSpeed.Size = New System.Drawing.Size(465, 97)
+ Me.gbVehicleIdlingSpeed.Size = New System.Drawing.Size(310, 63)
Me.gbVehicleIdlingSpeed.TabIndex = 0
- Me.gbVehicleIdlingSpeed.TabStop = false
+ Me.gbVehicleIdlingSpeed.TabStop = False
Me.gbVehicleIdlingSpeed.Text = "Vehicle Idling Speed"
'
'Panel1
@@ -1290,25 +1209,22 @@ Partial Class VehicleForm
Me.Panel1.Controls.Add(Me.Label18)
Me.Panel1.Controls.Add(Me.Label19)
Me.Panel1.Dock = System.Windows.Forms.DockStyle.Fill
- Me.Panel1.Location = New System.Drawing.Point(4, 18)
- Me.Panel1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.Panel1.Location = New System.Drawing.Point(3, 16)
Me.Panel1.Name = "Panel1"
- Me.Panel1.Size = New System.Drawing.Size(457, 74)
+ Me.Panel1.Size = New System.Drawing.Size(304, 44)
Me.Panel1.TabIndex = 0
'
'tbVehIdlingSpeed
'
- Me.tbVehIdlingSpeed.Location = New System.Drawing.Point(308, 6)
- Me.tbVehIdlingSpeed.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbVehIdlingSpeed.Location = New System.Drawing.Point(205, 4)
Me.tbVehIdlingSpeed.Name = "tbVehIdlingSpeed"
- Me.tbVehIdlingSpeed.Size = New System.Drawing.Size(82, 20)
+ Me.tbVehIdlingSpeed.Size = New System.Drawing.Size(56, 20)
Me.tbVehIdlingSpeed.TabIndex = 0
'
'Label18
'
- Me.Label18.AutoSize = true
- Me.Label18.Location = New System.Drawing.Point(396, 11)
- Me.Label18.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label18.AutoSize = True
+ Me.Label18.Location = New System.Drawing.Point(264, 7)
Me.Label18.Name = "Label18"
Me.Label18.Size = New System.Drawing.Size(30, 13)
Me.Label18.TabIndex = 24
@@ -1316,9 +1232,8 @@ Partial Class VehicleForm
'
'Label19
'
- Me.Label19.AutoSize = true
- Me.Label19.Location = New System.Drawing.Point(156, 11)
- Me.Label19.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label19.AutoSize = True
+ Me.Label19.Location = New System.Drawing.Point(104, 7)
Me.Label19.Name = "Label19"
Me.Label19.Size = New System.Drawing.Size(94, 13)
Me.Label19.TabIndex = 8
@@ -1328,34 +1243,30 @@ Partial Class VehicleForm
'
Me.gbTankSystem.Controls.Add(Me.cbTankSystem)
Me.gbTankSystem.Controls.Add(Me.Label23)
- Me.gbTankSystem.Location = New System.Drawing.Point(494, 9)
- Me.gbTankSystem.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbTankSystem.Location = New System.Drawing.Point(329, 6)
Me.gbTankSystem.Name = "gbTankSystem"
- Me.gbTankSystem.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.gbTankSystem.Size = New System.Drawing.Size(465, 97)
+ Me.gbTankSystem.Size = New System.Drawing.Size(310, 63)
Me.gbTankSystem.TabIndex = 2
- Me.gbTankSystem.TabStop = false
+ Me.gbTankSystem.TabStop = False
Me.gbTankSystem.Text = "Tank System"
'
'cbTankSystem
'
- Me.cbTankSystem.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.cbTankSystem.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+ 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(9, 29)
- Me.cbTankSystem.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.cbTankSystem.Location = New System.Drawing.Point(6, 19)
Me.cbTankSystem.Name = "cbTankSystem"
- Me.cbTankSystem.Size = New System.Drawing.Size(444, 28)
+ Me.cbTankSystem.Size = New System.Drawing.Size(297, 21)
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(4, 66)
- Me.Label23.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ 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.Name = "Label23"
Me.Label23.Size = New System.Drawing.Size(187, 13)
Me.Label23.TabIndex = 0
@@ -1364,14 +1275,13 @@ Partial Class VehicleForm
'tpElectricMachine
'
Me.tpElectricMachine.Controls.Add(Me.gpElectricMotor)
- Me.tpElectricMachine.Location = New System.Drawing.Point(4, 29)
- Me.tpElectricMachine.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tpElectricMachine.Location = New System.Drawing.Point(4, 22)
Me.tpElectricMachine.Name = "tpElectricMachine"
- Me.tpElectricMachine.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.tpElectricMachine.Size = New System.Drawing.Size(976, 582)
+ Me.tpElectricMachine.Padding = New System.Windows.Forms.Padding(3)
+ Me.tpElectricMachine.Size = New System.Drawing.Size(648, 374)
Me.tpElectricMachine.TabIndex = 6
Me.tpElectricMachine.Text = "Electric Machine"
- Me.tpElectricMachine.UseVisualStyleBackColor = true
+ Me.tpElectricMachine.UseVisualStyleBackColor = True
'
'gpElectricMotor
'
@@ -1388,21 +1298,18 @@ Partial Class VehicleForm
Me.gpElectricMotor.Controls.Add(Me.lblEmCount)
Me.gpElectricMotor.Controls.Add(Me.lblEmPosition)
Me.gpElectricMotor.Controls.Add(Me.pnElectricMotor)
- Me.gpElectricMotor.Location = New System.Drawing.Point(9, 9)
- Me.gpElectricMotor.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gpElectricMotor.Location = New System.Drawing.Point(6, 6)
Me.gpElectricMotor.Name = "gpElectricMotor"
- Me.gpElectricMotor.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.gpElectricMotor.Size = New System.Drawing.Size(950, 251)
+ Me.gpElectricMotor.Size = New System.Drawing.Size(633, 163)
Me.gpElectricMotor.TabIndex = 1
- Me.gpElectricMotor.TabStop = false
+ Me.gpElectricMotor.TabStop = False
Me.gpElectricMotor.Text = "Electric Machine"
'
'Label33
'
- 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(304, 166)
- Me.Label33.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ 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.Name = "Label33"
Me.Label33.Size = New System.Drawing.Size(16, 13)
Me.Label33.TabIndex = 27
@@ -1410,10 +1317,9 @@ Partial Class VehicleForm
'
'Label32
'
- 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(304, 126)
- Me.Label32.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ 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.Name = "Label32"
Me.Label32.Size = New System.Drawing.Size(16, 13)
Me.Label32.TabIndex = 26
@@ -1425,31 +1331,28 @@ Partial Class VehicleForm
Me.gbRatiosPerGear.Controls.Add(Me.btnAddEMRatio)
Me.gbRatiosPerGear.Controls.Add(Me.Label29)
Me.gbRatiosPerGear.Controls.Add(Me.btnRemoveEMRatio)
- Me.gbRatiosPerGear.Location = New System.Drawing.Point(666, 18)
- Me.gbRatiosPerGear.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbRatiosPerGear.Location = New System.Drawing.Point(444, 12)
Me.gbRatiosPerGear.Name = "gbRatiosPerGear"
- Me.gbRatiosPerGear.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.gbRatiosPerGear.Size = New System.Drawing.Size(272, 223)
+ Me.gbRatiosPerGear.Size = New System.Drawing.Size(181, 145)
Me.gbRatiosPerGear.TabIndex = 1
- Me.gbRatiosPerGear.TabStop = false
+ Me.gbRatiosPerGear.TabStop = False
Me.gbRatiosPerGear.Text = "Transmission Ratio per Gear"
'
'lvRatioPerGear
'
- Me.lvRatioPerGear.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.lvRatioPerGear.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
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(9, 25)
- Me.lvRatioPerGear.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.lvRatioPerGear.MultiSelect = false
+ Me.lvRatioPerGear.FullRowSelect = True
+ Me.lvRatioPerGear.GridLines = True
+ Me.lvRatioPerGear.HideSelection = False
+ Me.lvRatioPerGear.Location = New System.Drawing.Point(6, 16)
+ Me.lvRatioPerGear.MultiSelect = False
Me.lvRatioPerGear.Name = "lvRatioPerGear"
- Me.lvRatioPerGear.Size = New System.Drawing.Size(252, 142)
+ Me.lvRatioPerGear.Size = New System.Drawing.Size(169, 94)
Me.lvRatioPerGear.TabIndex = 7
- Me.lvRatioPerGear.TabStop = false
- Me.lvRatioPerGear.UseCompatibleStateImageBehavior = false
+ Me.lvRatioPerGear.TabStop = False
+ Me.lvRatioPerGear.UseCompatibleStateImageBehavior = False
Me.lvRatioPerGear.View = System.Windows.Forms.View.Details
'
'ColumnHeader11
@@ -1465,18 +1368,16 @@ Partial Class VehicleForm
'btnAddEMRatio
'
Me.btnAddEMRatio.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
- Me.btnAddEMRatio.Location = New System.Drawing.Point(9, 178)
- Me.btnAddEMRatio.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnAddEMRatio.Location = New System.Drawing.Point(6, 116)
Me.btnAddEMRatio.Name = "btnAddEMRatio"
- Me.btnAddEMRatio.Size = New System.Drawing.Size(36, 37)
+ Me.btnAddEMRatio.Size = New System.Drawing.Size(24, 24)
Me.btnAddEMRatio.TabIndex = 4
- Me.btnAddEMRatio.UseVisualStyleBackColor = true
+ Me.btnAddEMRatio.UseVisualStyleBackColor = True
'
'Label29
'
- Me.Label29.AutoSize = true
- Me.Label29.Location = New System.Drawing.Point(106, 171)
- Me.Label29.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label29.AutoSize = True
+ Me.Label29.Location = New System.Drawing.Point(71, 111)
Me.Label29.Name = "Label29"
Me.Label29.Size = New System.Drawing.Size(106, 13)
Me.Label29.TabIndex = 6
@@ -1485,37 +1386,33 @@ Partial Class VehicleForm
'btnRemoveEMRatio
'
Me.btnRemoveEMRatio.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
- Me.btnRemoveEMRatio.Location = New System.Drawing.Point(50, 178)
- Me.btnRemoveEMRatio.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnRemoveEMRatio.Location = New System.Drawing.Point(33, 116)
Me.btnRemoveEMRatio.Name = "btnRemoveEMRatio"
- Me.btnRemoveEMRatio.Size = New System.Drawing.Size(36, 37)
+ Me.btnRemoveEMRatio.Size = New System.Drawing.Size(24, 24)
Me.btnRemoveEMRatio.TabIndex = 5
- Me.btnRemoveEMRatio.UseVisualStyleBackColor = true
+ Me.btnRemoveEMRatio.UseVisualStyleBackColor = True
'
'btnEmADCLossMap
'
- Me.btnEmADCLossMap.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
+ 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(519, 198)
- Me.btnEmADCLossMap.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnEmADCLossMap.Location = New System.Drawing.Point(346, 129)
Me.btnEmADCLossMap.Name = "btnEmADCLossMap"
- Me.btnEmADCLossMap.Size = New System.Drawing.Size(36, 37)
+ Me.btnEmADCLossMap.Size = New System.Drawing.Size(24, 24)
Me.btnEmADCLossMap.TabIndex = 5
- Me.btnEmADCLossMap.UseVisualStyleBackColor = true
+ Me.btnEmADCLossMap.UseVisualStyleBackColor = True
'
'tbEmADCLossMap
'
- Me.tbEmADCLossMap.Location = New System.Drawing.Point(165, 202)
- Me.tbEmADCLossMap.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbEmADCLossMap.Location = New System.Drawing.Point(110, 131)
Me.tbEmADCLossMap.Name = "tbEmADCLossMap"
- Me.tbEmADCLossMap.Size = New System.Drawing.Size(349, 20)
+ Me.tbEmADCLossMap.Size = New System.Drawing.Size(234, 20)
Me.tbEmADCLossMap.TabIndex = 4
'
'lblEmADCLossmap
'
- Me.lblEmADCLossmap.AutoSize = true
- Me.lblEmADCLossmap.Location = New System.Drawing.Point(10, 206)
- Me.lblEmADCLossmap.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblEmADCLossmap.AutoSize = True
+ Me.lblEmADCLossmap.Location = New System.Drawing.Point(7, 134)
Me.lblEmADCLossmap.Name = "lblEmADCLossmap"
Me.lblEmADCLossmap.Size = New System.Drawing.Size(100, 13)
Me.lblEmADCLossmap.TabIndex = 25
@@ -1523,17 +1420,15 @@ Partial Class VehicleForm
'
'tbRatioEm
'
- Me.tbRatioEm.Location = New System.Drawing.Point(165, 162)
- Me.tbRatioEm.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbRatioEm.Location = New System.Drawing.Point(110, 105)
Me.tbRatioEm.Name = "tbRatioEm"
- Me.tbRatioEm.Size = New System.Drawing.Size(134, 20)
+ Me.tbRatioEm.Size = New System.Drawing.Size(91, 20)
Me.tbRatioEm.TabIndex = 3
'
'lblRatioEm
'
- Me.lblRatioEm.AutoSize = true
- Me.lblRatioEm.Location = New System.Drawing.Point(10, 166)
- Me.lblRatioEm.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblRatioEm.AutoSize = True
+ Me.lblRatioEm.Location = New System.Drawing.Point(7, 108)
Me.lblRatioEm.Name = "lblRatioEm"
Me.lblRatioEm.Size = New System.Drawing.Size(79, 13)
Me.lblRatioEm.TabIndex = 23
@@ -1541,29 +1436,26 @@ Partial Class VehicleForm
'
'tbEmCount
'
- Me.tbEmCount.Location = New System.Drawing.Point(165, 122)
- Me.tbEmCount.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbEmCount.Location = New System.Drawing.Point(110, 79)
Me.tbEmCount.Name = "tbEmCount"
- Me.tbEmCount.Size = New System.Drawing.Size(134, 20)
+ Me.tbEmCount.Size = New System.Drawing.Size(91, 20)
Me.tbEmCount.TabIndex = 2
'
'cbEmPos
'
Me.cbEmPos.DisplayMember = "Value"
Me.cbEmPos.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
- Me.cbEmPos.FormattingEnabled = true
- Me.cbEmPos.Location = New System.Drawing.Point(165, 80)
- Me.cbEmPos.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.cbEmPos.FormattingEnabled = True
+ Me.cbEmPos.Location = New System.Drawing.Point(110, 52)
Me.cbEmPos.Name = "cbEmPos"
- Me.cbEmPos.Size = New System.Drawing.Size(228, 28)
+ Me.cbEmPos.Size = New System.Drawing.Size(153, 21)
Me.cbEmPos.TabIndex = 1
Me.cbEmPos.ValueMember = "Key"
'
'lblEmCount
'
- Me.lblEmCount.AutoSize = true
- Me.lblEmCount.Location = New System.Drawing.Point(10, 126)
- Me.lblEmCount.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblEmCount.AutoSize = True
+ Me.lblEmCount.Location = New System.Drawing.Point(7, 82)
Me.lblEmCount.Name = "lblEmCount"
Me.lblEmCount.Size = New System.Drawing.Size(83, 13)
Me.lblEmCount.TabIndex = 20
@@ -1571,9 +1463,8 @@ Partial Class VehicleForm
'
'lblEmPosition
'
- Me.lblEmPosition.AutoSize = true
- Me.lblEmPosition.Location = New System.Drawing.Point(10, 86)
- Me.lblEmPosition.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblEmPosition.AutoSize = True
+ Me.lblEmPosition.Location = New System.Drawing.Point(7, 56)
Me.lblEmPosition.Name = "lblEmPosition"
Me.lblEmPosition.Size = New System.Drawing.Size(47, 13)
Me.lblEmPosition.TabIndex = 19
@@ -1584,161 +1475,152 @@ Partial Class VehicleForm
Me.pnElectricMotor.Controls.Add(Me.btnOpenElectricMotor)
Me.pnElectricMotor.Controls.Add(Me.btnBrowseElectricMotor)
Me.pnElectricMotor.Controls.Add(Me.tbElectricMotor)
- Me.pnElectricMotor.Location = New System.Drawing.Point(9, 29)
- Me.pnElectricMotor.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.pnElectricMotor.Location = New System.Drawing.Point(6, 19)
Me.pnElectricMotor.Name = "pnElectricMotor"
- Me.pnElectricMotor.Size = New System.Drawing.Size(648, 42)
+ Me.pnElectricMotor.Size = New System.Drawing.Size(432, 27)
Me.pnElectricMotor.TabIndex = 0
'
'btnOpenElectricMotor
'
- Me.btnOpenElectricMotor.Location = New System.Drawing.Point(6, 5)
- Me.btnOpenElectricMotor.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnOpenElectricMotor.Location = New System.Drawing.Point(4, 3)
Me.btnOpenElectricMotor.Name = "btnOpenElectricMotor"
- Me.btnOpenElectricMotor.Size = New System.Drawing.Size(141, 32)
+ Me.btnOpenElectricMotor.Size = New System.Drawing.Size(94, 21)
Me.btnOpenElectricMotor.TabIndex = 0
Me.btnOpenElectricMotor.Text = "Electric Machine"
- Me.btnOpenElectricMotor.UseVisualStyleBackColor = true
+ Me.btnOpenElectricMotor.UseVisualStyleBackColor = True
'
'btnBrowseElectricMotor
'
- Me.btnBrowseElectricMotor.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.btnBrowseElectricMotor.Image = CType(resources.GetObject("btnBrowseElectricMotor.Image"),System.Drawing.Image)
- Me.btnBrowseElectricMotor.Location = New System.Drawing.Point(609, 3)
- Me.btnBrowseElectricMotor.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnBrowseElectricMotor.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.Name = "btnBrowseElectricMotor"
- Me.btnBrowseElectricMotor.Size = New System.Drawing.Size(36, 37)
+ Me.btnBrowseElectricMotor.Size = New System.Drawing.Size(24, 24)
Me.btnBrowseElectricMotor.TabIndex = 2
- Me.btnBrowseElectricMotor.UseVisualStyleBackColor = true
+ Me.btnBrowseElectricMotor.UseVisualStyleBackColor = True
'
'tbElectricMotor
'
- Me.tbElectricMotor.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.tbElectricMotor.Location = New System.Drawing.Point(156, 6)
- Me.tbElectricMotor.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbElectricMotor.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.Name = "tbElectricMotor"
- Me.tbElectricMotor.Size = New System.Drawing.Size(448, 20)
+ Me.tbElectricMotor.Size = New System.Drawing.Size(300, 20)
Me.tbElectricMotor.TabIndex = 1
'
'tpIEPC
'
Me.tpIEPC.Controls.Add(Me.FlowLayoutPanel1)
- Me.tpIEPC.Location = New System.Drawing.Point(4, 29)
- Me.tpIEPC.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tpIEPC.Location = New System.Drawing.Point(4, 22)
Me.tpIEPC.Name = "tpIEPC"
- Me.tpIEPC.Size = New System.Drawing.Size(976, 582)
+ Me.tpIEPC.Size = New System.Drawing.Size(648, 374)
Me.tpIEPC.TabIndex = 8
Me.tpIEPC.Text = "IEPC"
- Me.tpIEPC.UseVisualStyleBackColor = true
+ Me.tpIEPC.UseVisualStyleBackColor = True
'
'FlowLayoutPanel1
'
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(38, 29)
- Me.FlowLayoutPanel1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.FlowLayoutPanel1.Location = New System.Drawing.Point(25, 19)
Me.FlowLayoutPanel1.Name = "FlowLayoutPanel1"
- Me.FlowLayoutPanel1.Size = New System.Drawing.Size(645, 42)
+ Me.FlowLayoutPanel1.Size = New System.Drawing.Size(430, 27)
Me.FlowLayoutPanel1.TabIndex = 61
'
'btnIEPC
'
Me.btnIEPC.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.btnIEPC.Location = New System.Drawing.Point(2, 4)
- Me.btnIEPC.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
+ Me.btnIEPC.Location = New System.Drawing.Point(1, 2)
+ Me.btnIEPC.Margin = New System.Windows.Forms.Padding(1)
Me.btnIEPC.Name = "btnIEPC"
- Me.btnIEPC.Size = New System.Drawing.Size(141, 32)
+ Me.btnIEPC.Size = New System.Drawing.Size(94, 21)
Me.btnIEPC.TabIndex = 27
Me.btnIEPC.Text = "IEPC"
- Me.btnIEPC.UseVisualStyleBackColor = true
+ Me.btnIEPC.UseVisualStyleBackColor = True
'
'tbIEPCFilePath
'
Me.tbIEPCFilePath.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbIEPCFilePath.Location = New System.Drawing.Point(147, 10)
- Me.tbIEPCFilePath.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
+ Me.tbIEPCFilePath.Location = New System.Drawing.Point(97, 3)
+ Me.tbIEPCFilePath.Margin = New System.Windows.Forms.Padding(1)
Me.tbIEPCFilePath.Name = "tbIEPCFilePath"
- Me.tbIEPCFilePath.Size = New System.Drawing.Size(448, 20)
+ Me.tbIEPCFilePath.Size = New System.Drawing.Size(300, 20)
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(599, 2)
- Me.btIEPCFilePath.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
+ Me.btIEPCFilePath.Location = New System.Drawing.Point(399, 1)
+ Me.btIEPCFilePath.Margin = New System.Windows.Forms.Padding(1)
Me.btIEPCFilePath.Name = "btIEPCFilePath"
- Me.btIEPCFilePath.Size = New System.Drawing.Size(36, 37)
+ Me.btIEPCFilePath.Size = New System.Drawing.Size(24, 24)
Me.btIEPCFilePath.TabIndex = 58
- Me.btIEPCFilePath.UseVisualStyleBackColor = true
+ Me.btIEPCFilePath.UseVisualStyleBackColor = True
'
'tbIHPC
'
Me.tbIHPC.Controls.Add(Me.FlowLayoutPanel2)
- Me.tbIHPC.Location = New System.Drawing.Point(4, 29)
- Me.tbIHPC.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbIHPC.Location = New System.Drawing.Point(4, 22)
Me.tbIHPC.Name = "tbIHPC"
- Me.tbIHPC.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.tbIHPC.Size = New System.Drawing.Size(976, 582)
+ Me.tbIHPC.Padding = New System.Windows.Forms.Padding(3)
+ Me.tbIHPC.Size = New System.Drawing.Size(648, 374)
Me.tbIHPC.TabIndex = 9
Me.tbIHPC.Text = "IHPC"
- Me.tbIHPC.UseVisualStyleBackColor = true
+ Me.tbIHPC.UseVisualStyleBackColor = True
'
'FlowLayoutPanel2
'
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(38, 29)
- Me.FlowLayoutPanel2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.FlowLayoutPanel2.Location = New System.Drawing.Point(25, 19)
Me.FlowLayoutPanel2.Name = "FlowLayoutPanel2"
- Me.FlowLayoutPanel2.Size = New System.Drawing.Size(640, 42)
+ Me.FlowLayoutPanel2.Size = New System.Drawing.Size(449, 27)
Me.FlowLayoutPanel2.TabIndex = 3
'
'btIHPC
'
Me.btIHPC.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.btIHPC.Location = New System.Drawing.Point(2, 4)
- Me.btIHPC.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
+ Me.btIHPC.Location = New System.Drawing.Point(1, 2)
+ Me.btIHPC.Margin = New System.Windows.Forms.Padding(1)
Me.btIHPC.Name = "btIHPC"
- Me.btIHPC.Size = New System.Drawing.Size(141, 32)
+ Me.btIHPC.Size = New System.Drawing.Size(94, 21)
Me.btIHPC.TabIndex = 0
Me.btIHPC.Text = "IHPC"
- Me.btIHPC.UseVisualStyleBackColor = true
+ Me.btIHPC.UseVisualStyleBackColor = True
'
'tbIHPCFilePath
'
Me.tbIHPCFilePath.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.tbIHPCFilePath.Location = New System.Drawing.Point(147, 10)
- Me.tbIHPCFilePath.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
+ Me.tbIHPCFilePath.Location = New System.Drawing.Point(97, 3)
+ Me.tbIHPCFilePath.Margin = New System.Windows.Forms.Padding(1)
Me.tbIHPCFilePath.Name = "tbIHPCFilePath"
- Me.tbIHPCFilePath.Size = New System.Drawing.Size(448, 20)
+ Me.tbIHPCFilePath.Size = New System.Drawing.Size(300, 20)
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(599, 2)
- Me.btIHPCFile.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
+ Me.btIHPCFile.Image = CType(resources.GetObject("btIHPCFile.Image"), System.Drawing.Image)
+ Me.btIHPCFile.Location = New System.Drawing.Point(399, 1)
+ Me.btIHPCFile.Margin = New System.Windows.Forms.Padding(1)
Me.btIHPCFile.Name = "btIHPCFile"
- Me.btIHPCFile.Size = New System.Drawing.Size(36, 37)
+ Me.btIHPCFile.Size = New System.Drawing.Size(24, 24)
Me.btIHPCFile.TabIndex = 2
- Me.btIHPCFile.UseVisualStyleBackColor = true
+ Me.btIHPCFile.UseVisualStyleBackColor = True
'
'tpReess
'
Me.tpReess.Controls.Add(Me.gbBattery)
- Me.tpReess.Location = New System.Drawing.Point(4, 29)
- Me.tpReess.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tpReess.Location = New System.Drawing.Point(4, 22)
Me.tpReess.Name = "tpReess"
- Me.tpReess.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.tpReess.Size = New System.Drawing.Size(976, 582)
+ Me.tpReess.Padding = New System.Windows.Forms.Padding(3)
+ Me.tpReess.Size = New System.Drawing.Size(648, 374)
Me.tpReess.TabIndex = 7
Me.tpReess.Text = "REESS"
- Me.tpReess.UseVisualStyleBackColor = true
+ Me.tpReess.UseVisualStyleBackColor = True
'
'gbBattery
'
@@ -1749,31 +1631,28 @@ Partial Class VehicleForm
Me.gbBattery.Controls.Add(Me.lblInitialSoCUnit)
Me.gbBattery.Controls.Add(Me.tbInitialSoC)
Me.gbBattery.Controls.Add(Me.lblInitialSoC)
- Me.gbBattery.Location = New System.Drawing.Point(9, 9)
- Me.gbBattery.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbBattery.Location = New System.Drawing.Point(6, 6)
Me.gbBattery.Name = "gbBattery"
- Me.gbBattery.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.gbBattery.Size = New System.Drawing.Size(950, 288)
+ Me.gbBattery.Size = New System.Drawing.Size(633, 187)
Me.gbBattery.TabIndex = 3
- Me.gbBattery.TabStop = false
+ Me.gbBattery.TabStop = False
Me.gbBattery.Text = "Electric Energy Storage system"
'
'lvREESSPacks
'
- Me.lvREESSPacks.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.lvREESSPacks.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
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(9, 69)
- Me.lvREESSPacks.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.lvREESSPacks.MultiSelect = false
+ Me.lvREESSPacks.FullRowSelect = True
+ Me.lvREESSPacks.GridLines = True
+ Me.lvREESSPacks.HideSelection = False
+ Me.lvREESSPacks.Location = New System.Drawing.Point(6, 45)
+ Me.lvREESSPacks.MultiSelect = False
Me.lvREESSPacks.Name = "lvREESSPacks"
- Me.lvREESSPacks.Size = New System.Drawing.Size(828, 155)
+ Me.lvREESSPacks.Size = New System.Drawing.Size(553, 102)
Me.lvREESSPacks.TabIndex = 31
- Me.lvREESSPacks.TabStop = false
- Me.lvREESSPacks.UseCompatibleStateImageBehavior = false
+ Me.lvREESSPacks.TabStop = False
+ Me.lvREESSPacks.UseCompatibleStateImageBehavior = False
Me.lvREESSPacks.View = System.Windows.Forms.View.Details
'
'chReessPackPack
@@ -1794,18 +1673,16 @@ Partial Class VehicleForm
'btnAddReessPack
'
Me.btnAddReessPack.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
- Me.btnAddReessPack.Location = New System.Drawing.Point(9, 235)
- Me.btnAddReessPack.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnAddReessPack.Location = New System.Drawing.Point(6, 153)
Me.btnAddReessPack.Name = "btnAddReessPack"
- Me.btnAddReessPack.Size = New System.Drawing.Size(36, 37)
+ Me.btnAddReessPack.Size = New System.Drawing.Size(24, 24)
Me.btnAddReessPack.TabIndex = 1
- Me.btnAddReessPack.UseVisualStyleBackColor = true
+ Me.btnAddReessPack.UseVisualStyleBackColor = True
'
'lblEditReessPack
'
- Me.lblEditReessPack.AutoSize = true
- Me.lblEditReessPack.Location = New System.Drawing.Point(678, 228)
- Me.lblEditReessPack.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblEditReessPack.AutoSize = True
+ Me.lblEditReessPack.Location = New System.Drawing.Point(452, 148)
Me.lblEditReessPack.Name = "lblEditReessPack"
Me.lblEditReessPack.Size = New System.Drawing.Size(106, 13)
Me.lblEditReessPack.TabIndex = 30
@@ -1814,18 +1691,16 @@ Partial Class VehicleForm
'btnRemoveReessPack
'
Me.btnRemoveReessPack.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
- Me.btnRemoveReessPack.Location = New System.Drawing.Point(50, 235)
- Me.btnRemoveReessPack.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnRemoveReessPack.Location = New System.Drawing.Point(33, 153)
Me.btnRemoveReessPack.Name = "btnRemoveReessPack"
- Me.btnRemoveReessPack.Size = New System.Drawing.Size(36, 37)
+ Me.btnRemoveReessPack.Size = New System.Drawing.Size(24, 24)
Me.btnRemoveReessPack.TabIndex = 2
- Me.btnRemoveReessPack.UseVisualStyleBackColor = true
+ Me.btnRemoveReessPack.UseVisualStyleBackColor = True
'
'lblInitialSoCUnit
'
- Me.lblInitialSoCUnit.AutoSize = true
- Me.lblInitialSoCUnit.Location = New System.Drawing.Point(398, 32)
- Me.lblInitialSoCUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblInitialSoCUnit.AutoSize = True
+ Me.lblInitialSoCUnit.Location = New System.Drawing.Point(265, 21)
Me.lblInitialSoCUnit.Name = "lblInitialSoCUnit"
Me.lblInitialSoCUnit.Size = New System.Drawing.Size(21, 13)
Me.lblInitialSoCUnit.TabIndex = 27
@@ -1833,17 +1708,15 @@ Partial Class VehicleForm
'
'tbInitialSoC
'
- Me.tbInitialSoC.Location = New System.Drawing.Point(306, 29)
- Me.tbInitialSoC.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbInitialSoC.Location = New System.Drawing.Point(204, 19)
Me.tbInitialSoC.Name = "tbInitialSoC"
- Me.tbInitialSoC.Size = New System.Drawing.Size(86, 20)
+ Me.tbInitialSoC.Size = New System.Drawing.Size(59, 20)
Me.tbInitialSoC.TabIndex = 0
'
'lblInitialSoC
'
- Me.lblInitialSoC.AutoSize = true
- Me.lblInitialSoC.Location = New System.Drawing.Point(10, 34)
- Me.lblInitialSoC.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblInitialSoC.AutoSize = True
+ Me.lblInitialSoC.Location = New System.Drawing.Point(7, 22)
Me.lblInitialSoC.Name = "lblInitialSoC"
Me.lblInitialSoC.RightToLeft = System.Windows.Forms.RightToLeft.Yes
Me.lblInitialSoC.Size = New System.Drawing.Size(54, 13)
@@ -1854,23 +1727,23 @@ Partial Class VehicleForm
'
Me.tpGensetComponents.Controls.Add(Me.Label30)
Me.tpGensetComponents.Controls.Add(Me.gbGenSet)
- Me.tpGensetComponents.Location = New System.Drawing.Point(4, 29)
+ Me.tpGensetComponents.Location = New System.Drawing.Point(4, 22)
+ Me.tpGensetComponents.Margin = New System.Windows.Forms.Padding(2)
Me.tpGensetComponents.Name = "tpGensetComponents"
- Me.tpGensetComponents.Size = New System.Drawing.Size(976, 582)
+ Me.tpGensetComponents.Size = New System.Drawing.Size(648, 374)
Me.tpGensetComponents.TabIndex = 5
Me.tpGensetComponents.Text = "GenSet Components"
- Me.tpGensetComponents.UseVisualStyleBackColor = true
+ Me.tpGensetComponents.UseVisualStyleBackColor = True
'
'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(20, 235)
- Me.Label30.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ 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.Name = "Label30"
Me.Label30.Size = New System.Drawing.Size(429, 13)
Me.Label30.TabIndex = 21
- Me.Label30.Text = "Note: The internal combustion engine of the GenSet is configured in the Job-Edito"& _
+ Me.Label30.Text = "Note: The internal combustion engine of the GenSet is configured in the Job-Edito" &
"r dialog."
'
'gbGenSet
@@ -1885,21 +1758,18 @@ 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(9, 9)
- Me.gbGenSet.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbGenSet.Location = New System.Drawing.Point(6, 6)
Me.gbGenSet.Name = "gbGenSet"
- Me.gbGenSet.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.gbGenSet.Size = New System.Drawing.Size(950, 208)
+ Me.gbGenSet.Size = New System.Drawing.Size(633, 135)
Me.gbGenSet.TabIndex = 1
- Me.gbGenSet.TabStop = false
+ Me.gbGenSet.TabStop = False
Me.gbGenSet.Text = "Electric Machine"
'
'Label36
'
- 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(304, 128)
- Me.Label36.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ 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.Name = "Label36"
Me.Label36.Size = New System.Drawing.Size(16, 13)
Me.Label36.TabIndex = 28
@@ -1907,10 +1777,9 @@ Partial Class VehicleForm
'
'Label34
'
- 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(304, 88)
- Me.Label34.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ 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.Name = "Label34"
Me.Label34.Size = New System.Drawing.Size(16, 13)
Me.Label34.TabIndex = 27
@@ -1918,28 +1787,25 @@ Partial Class VehicleForm
'
'btnGenSetLossMap
'
- Me.btnGenSetLossMap.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
+ 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(618, 162)
- Me.btnGenSetLossMap.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnGenSetLossMap.Location = New System.Drawing.Point(412, 105)
Me.btnGenSetLossMap.Name = "btnGenSetLossMap"
- Me.btnGenSetLossMap.Size = New System.Drawing.Size(36, 37)
+ Me.btnGenSetLossMap.Size = New System.Drawing.Size(24, 24)
Me.btnGenSetLossMap.TabIndex = 5
- Me.btnGenSetLossMap.UseVisualStyleBackColor = true
+ Me.btnGenSetLossMap.UseVisualStyleBackColor = True
'
'tbGenSetADC
'
- Me.tbGenSetADC.Location = New System.Drawing.Point(165, 165)
- Me.tbGenSetADC.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbGenSetADC.Location = New System.Drawing.Point(110, 107)
Me.tbGenSetADC.Name = "tbGenSetADC"
- Me.tbGenSetADC.Size = New System.Drawing.Size(450, 20)
+ Me.tbGenSetADC.Size = New System.Drawing.Size(301, 20)
Me.tbGenSetADC.TabIndex = 4
'
'lblGenSetADC
'
- Me.lblGenSetADC.AutoSize = true
- Me.lblGenSetADC.Location = New System.Drawing.Point(10, 169)
- Me.lblGenSetADC.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblGenSetADC.AutoSize = True
+ Me.lblGenSetADC.Location = New System.Drawing.Point(7, 110)
Me.lblGenSetADC.Name = "lblGenSetADC"
Me.lblGenSetADC.Size = New System.Drawing.Size(100, 13)
Me.lblGenSetADC.TabIndex = 25
@@ -1947,17 +1813,15 @@ Partial Class VehicleForm
'
'tbGenSetRatio
'
- Me.tbGenSetRatio.Location = New System.Drawing.Point(165, 125)
- Me.tbGenSetRatio.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbGenSetRatio.Location = New System.Drawing.Point(110, 81)
Me.tbGenSetRatio.Name = "tbGenSetRatio"
- Me.tbGenSetRatio.Size = New System.Drawing.Size(134, 20)
+ Me.tbGenSetRatio.Size = New System.Drawing.Size(91, 20)
Me.tbGenSetRatio.TabIndex = 3
'
'lblGenSetRatio
'
- Me.lblGenSetRatio.AutoSize = true
- Me.lblGenSetRatio.Location = New System.Drawing.Point(10, 129)
- Me.lblGenSetRatio.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblGenSetRatio.AutoSize = True
+ Me.lblGenSetRatio.Location = New System.Drawing.Point(7, 84)
Me.lblGenSetRatio.Name = "lblGenSetRatio"
Me.lblGenSetRatio.Size = New System.Drawing.Size(79, 13)
Me.lblGenSetRatio.TabIndex = 23
@@ -1965,17 +1829,15 @@ Partial Class VehicleForm
'
'tbGenSetCount
'
- Me.tbGenSetCount.Location = New System.Drawing.Point(165, 85)
- Me.tbGenSetCount.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbGenSetCount.Location = New System.Drawing.Point(110, 55)
Me.tbGenSetCount.Name = "tbGenSetCount"
- Me.tbGenSetCount.Size = New System.Drawing.Size(134, 20)
+ Me.tbGenSetCount.Size = New System.Drawing.Size(91, 20)
Me.tbGenSetCount.TabIndex = 2
'
'lblGenSetCount
'
- Me.lblGenSetCount.AutoSize = true
- Me.lblGenSetCount.Location = New System.Drawing.Point(10, 89)
- Me.lblGenSetCount.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblGenSetCount.AutoSize = True
+ Me.lblGenSetCount.Location = New System.Drawing.Point(7, 58)
Me.lblGenSetCount.Name = "lblGenSetCount"
Me.lblGenSetCount.Size = New System.Drawing.Size(83, 13)
Me.lblGenSetCount.TabIndex = 20
@@ -1986,41 +1848,37 @@ 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(9, 29)
- Me.pnGenSetEM.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.pnGenSetEM.Location = New System.Drawing.Point(6, 19)
Me.pnGenSetEM.Name = "pnGenSetEM"
- Me.pnGenSetEM.Size = New System.Drawing.Size(648, 42)
+ Me.pnGenSetEM.Size = New System.Drawing.Size(432, 27)
Me.pnGenSetEM.TabIndex = 0
'
'btnOpenGenSetEM
'
- Me.btnOpenGenSetEM.Location = New System.Drawing.Point(6, 5)
- Me.btnOpenGenSetEM.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnOpenGenSetEM.Location = New System.Drawing.Point(4, 3)
Me.btnOpenGenSetEM.Name = "btnOpenGenSetEM"
- Me.btnOpenGenSetEM.Size = New System.Drawing.Size(141, 32)
+ Me.btnOpenGenSetEM.Size = New System.Drawing.Size(94, 21)
Me.btnOpenGenSetEM.TabIndex = 0
Me.btnOpenGenSetEM.Text = "Electric Machine"
- Me.btnOpenGenSetEM.UseVisualStyleBackColor = true
+ Me.btnOpenGenSetEM.UseVisualStyleBackColor = True
'
'btnBrowseGenSetEM
'
- 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(609, 3)
- Me.btnBrowseGenSetEM.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ 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.Name = "btnBrowseGenSetEM"
- Me.btnBrowseGenSetEM.Size = New System.Drawing.Size(36, 37)
+ Me.btnBrowseGenSetEM.Size = New System.Drawing.Size(24, 24)
Me.btnBrowseGenSetEM.TabIndex = 2
- Me.btnBrowseGenSetEM.UseVisualStyleBackColor = true
+ Me.btnBrowseGenSetEM.UseVisualStyleBackColor = True
'
'tbGenSetEM
'
- 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(156, 6)
- Me.tbGenSetEM.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ 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.Name = "tbGenSetEM"
- Me.tbGenSetEM.Size = New System.Drawing.Size(450, 20)
+ Me.tbGenSetEM.Size = New System.Drawing.Size(301, 20)
Me.tbGenSetEM.TabIndex = 1
'
'tpTorqueLimits
@@ -2028,80 +1886,71 @@ Partial Class VehicleForm
Me.tpTorqueLimits.Controls.Add(Me.gbPropulsionTorque)
Me.tpTorqueLimits.Controls.Add(Me.gbEMTorqueLimits)
Me.tpTorqueLimits.Controls.Add(Me.bgVehicleTorqueLimits)
- Me.tpTorqueLimits.Location = New System.Drawing.Point(4, 29)
- Me.tpTorqueLimits.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tpTorqueLimits.Location = New System.Drawing.Point(4, 22)
Me.tpTorqueLimits.Name = "tpTorqueLimits"
- Me.tpTorqueLimits.Size = New System.Drawing.Size(976, 582)
+ Me.tpTorqueLimits.Size = New System.Drawing.Size(648, 374)
Me.tpTorqueLimits.TabIndex = 2
Me.tpTorqueLimits.Text = "Torque Limits"
- Me.tpTorqueLimits.UseVisualStyleBackColor = true
+ Me.tpTorqueLimits.UseVisualStyleBackColor = True
'
'gbPropulsionTorque
'
Me.gbPropulsionTorque.Controls.Add(Me.btnPropulsionTorqueLimit)
Me.gbPropulsionTorque.Controls.Add(Me.tbPropulsionTorqueLimit)
- Me.gbPropulsionTorque.Location = New System.Drawing.Point(350, 98)
- Me.gbPropulsionTorque.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbPropulsionTorque.Location = New System.Drawing.Point(233, 64)
Me.gbPropulsionTorque.Name = "gbPropulsionTorque"
- Me.gbPropulsionTorque.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.gbPropulsionTorque.Size = New System.Drawing.Size(604, 80)
+ Me.gbPropulsionTorque.Size = New System.Drawing.Size(403, 52)
Me.gbPropulsionTorque.TabIndex = 2
- Me.gbPropulsionTorque.TabStop = false
+ Me.gbPropulsionTorque.TabStop = False
Me.gbPropulsionTorque.Text = "Boosting Torque Limits"
'
'btnPropulsionTorqueLimit
'
- Me.btnPropulsionTorqueLimit.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ 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(560, 28)
- Me.btnPropulsionTorqueLimit.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnPropulsionTorqueLimit.Location = New System.Drawing.Point(373, 18)
Me.btnPropulsionTorqueLimit.Name = "btnPropulsionTorqueLimit"
- Me.btnPropulsionTorqueLimit.Size = New System.Drawing.Size(36, 37)
+ Me.btnPropulsionTorqueLimit.Size = New System.Drawing.Size(24, 24)
Me.btnPropulsionTorqueLimit.TabIndex = 1
- Me.btnPropulsionTorqueLimit.UseVisualStyleBackColor = true
+ Me.btnPropulsionTorqueLimit.UseVisualStyleBackColor = True
'
'tbPropulsionTorqueLimit
'
- 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(9, 31)
- Me.tbPropulsionTorqueLimit.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ 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.Name = "tbPropulsionTorqueLimit"
- Me.tbPropulsionTorqueLimit.Size = New System.Drawing.Size(546, 20)
+ Me.tbPropulsionTorqueLimit.Size = New System.Drawing.Size(365, 20)
Me.tbPropulsionTorqueLimit.TabIndex = 0
'
'gbEMTorqueLimits
'
Me.gbEMTorqueLimits.Controls.Add(Me.btnEmTorqueLimits)
Me.gbEMTorqueLimits.Controls.Add(Me.tbEmTorqueLimits)
- Me.gbEMTorqueLimits.Location = New System.Drawing.Point(350, 9)
- Me.gbEMTorqueLimits.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbEMTorqueLimits.Location = New System.Drawing.Point(233, 6)
Me.gbEMTorqueLimits.Name = "gbEMTorqueLimits"
- Me.gbEMTorqueLimits.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.gbEMTorqueLimits.Size = New System.Drawing.Size(604, 80)
+ Me.gbEMTorqueLimits.Size = New System.Drawing.Size(403, 52)
Me.gbEMTorqueLimits.TabIndex = 1
- Me.gbEMTorqueLimits.TabStop = false
+ Me.gbEMTorqueLimits.TabStop = False
Me.gbEMTorqueLimits.Text = "Electric Machine Torque Limits"
'
'btnEmTorqueLimits
'
- Me.btnEmTorqueLimits.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ 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(560, 26)
- Me.btnEmTorqueLimits.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnEmTorqueLimits.Location = New System.Drawing.Point(373, 17)
Me.btnEmTorqueLimits.Name = "btnEmTorqueLimits"
- Me.btnEmTorqueLimits.Size = New System.Drawing.Size(36, 37)
+ Me.btnEmTorqueLimits.Size = New System.Drawing.Size(24, 24)
Me.btnEmTorqueLimits.TabIndex = 1
- Me.btnEmTorqueLimits.UseVisualStyleBackColor = true
+ Me.btnEmTorqueLimits.UseVisualStyleBackColor = True
'
'tbEmTorqueLimits
'
- 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(9, 29)
- Me.tbEmTorqueLimits.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ 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.Name = "tbEmTorqueLimits"
- Me.tbEmTorqueLimits.Size = New System.Drawing.Size(546, 20)
+ Me.tbEmTorqueLimits.Size = New System.Drawing.Size(365, 20)
Me.tbEmTorqueLimits.TabIndex = 0
'
'bgVehicleTorqueLimits
@@ -2110,32 +1959,29 @@ 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(9, 9)
- Me.bgVehicleTorqueLimits.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.bgVehicleTorqueLimits.Location = New System.Drawing.Point(6, 6)
Me.bgVehicleTorqueLimits.Name = "bgVehicleTorqueLimits"
- Me.bgVehicleTorqueLimits.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.bgVehicleTorqueLimits.Size = New System.Drawing.Size(332, 349)
+ Me.bgVehicleTorqueLimits.Size = New System.Drawing.Size(221, 227)
Me.bgVehicleTorqueLimits.TabIndex = 0
- Me.bgVehicleTorqueLimits.TabStop = false
+ Me.bgVehicleTorqueLimits.TabStop = False
Me.bgVehicleTorqueLimits.Text = "ICE Torque Limits"
'
'lvTorqueLimits
'
- Me.lvTorqueLimits.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
- Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.lvTorqueLimits.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.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(9, 29)
- Me.lvTorqueLimits.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.lvTorqueLimits.MultiSelect = false
+ Me.lvTorqueLimits.FullRowSelect = True
+ Me.lvTorqueLimits.GridLines = True
+ Me.lvTorqueLimits.HideSelection = False
+ Me.lvTorqueLimits.Location = New System.Drawing.Point(6, 19)
+ Me.lvTorqueLimits.MultiSelect = False
Me.lvTorqueLimits.Name = "lvTorqueLimits"
- Me.lvTorqueLimits.Size = New System.Drawing.Size(312, 258)
+ Me.lvTorqueLimits.Size = New System.Drawing.Size(209, 169)
Me.lvTorqueLimits.TabIndex = 7
- Me.lvTorqueLimits.TabStop = false
- Me.lvTorqueLimits.UseCompatibleStateImageBehavior = false
+ Me.lvTorqueLimits.TabStop = False
+ Me.lvTorqueLimits.UseCompatibleStateImageBehavior = False
Me.lvTorqueLimits.View = System.Windows.Forms.View.Details
'
'ColumnHeader5
@@ -2151,21 +1997,19 @@ Partial Class VehicleForm
'
'btAddMaxTorqueEntry
'
- Me.btAddMaxTorqueEntry.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
+ 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(9, 297)
- Me.btAddMaxTorqueEntry.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btAddMaxTorqueEntry.Location = New System.Drawing.Point(6, 193)
Me.btAddMaxTorqueEntry.Name = "btAddMaxTorqueEntry"
- Me.btAddMaxTorqueEntry.Size = New System.Drawing.Size(36, 37)
+ Me.btAddMaxTorqueEntry.Size = New System.Drawing.Size(24, 24)
Me.btAddMaxTorqueEntry.TabIndex = 4
- Me.btAddMaxTorqueEntry.UseVisualStyleBackColor = true
+ Me.btAddMaxTorqueEntry.UseVisualStyleBackColor = True
'
'Label17
'
- 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(168, 292)
- Me.Label17.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ 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.Name = "Label17"
Me.Label17.Size = New System.Drawing.Size(106, 13)
Me.Label17.TabIndex = 6
@@ -2174,72 +2018,65 @@ Partial Class VehicleForm
'
'btDelMaxTorqueEntry
'
- Me.btDelMaxTorqueEntry.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
+ 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(45, 297)
- Me.btDelMaxTorqueEntry.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btDelMaxTorqueEntry.Location = New System.Drawing.Point(30, 193)
Me.btDelMaxTorqueEntry.Name = "btDelMaxTorqueEntry"
- Me.btDelMaxTorqueEntry.Size = New System.Drawing.Size(36, 37)
+ Me.btDelMaxTorqueEntry.Size = New System.Drawing.Size(24, 24)
Me.btDelMaxTorqueEntry.TabIndex = 5
- Me.btDelMaxTorqueEntry.UseVisualStyleBackColor = true
+ Me.btDelMaxTorqueEntry.UseVisualStyleBackColor = True
'
'tpADAS
'
Me.tpADAS.Controls.Add(Me.gbADAS)
- Me.tpADAS.Location = New System.Drawing.Point(4, 29)
- Me.tpADAS.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tpADAS.Location = New System.Drawing.Point(4, 22)
Me.tpADAS.Name = "tpADAS"
- Me.tpADAS.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.tpADAS.Size = New System.Drawing.Size(976, 582)
+ Me.tpADAS.Padding = New System.Windows.Forms.Padding(3)
+ Me.tpADAS.Size = New System.Drawing.Size(648, 374)
Me.tpADAS.TabIndex = 3
Me.tpADAS.Text = "ADAS"
- Me.tpADAS.UseVisualStyleBackColor = true
+ Me.tpADAS.UseVisualStyleBackColor = True
'
'gbADAS
'
- Me.gbADAS.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.gbADAS.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.gbADAS.Controls.Add(Me.pnEcoRoll)
Me.gbADAS.Controls.Add(Me.cbAtEcoRollReleaseLockupClutch)
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(9, 9)
- Me.gbADAS.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbADAS.Location = New System.Drawing.Point(6, 6)
Me.gbADAS.Name = "gbADAS"
- Me.gbADAS.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.gbADAS.Size = New System.Drawing.Size(954, 248)
+ Me.gbADAS.Size = New System.Drawing.Size(636, 161)
Me.gbADAS.TabIndex = 0
- Me.gbADAS.TabStop = false
+ Me.gbADAS.TabStop = False
Me.gbADAS.Text = "ADAS Options"
'
'pnEcoRoll
'
Me.pnEcoRoll.Controls.Add(Me.cbEcoRoll)
Me.pnEcoRoll.Controls.Add(Me.Label22)
- Me.pnEcoRoll.Location = New System.Drawing.Point(0, 68)
- Me.pnEcoRoll.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.pnEcoRoll.Location = New System.Drawing.Point(0, 44)
Me.pnEcoRoll.Name = "pnEcoRoll"
- Me.pnEcoRoll.Size = New System.Drawing.Size(450, 71)
+ Me.pnEcoRoll.Size = New System.Drawing.Size(300, 46)
Me.pnEcoRoll.TabIndex = 7
'
'cbEcoRoll
'
Me.cbEcoRoll.DisplayMember = "Value"
Me.cbEcoRoll.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
- Me.cbEcoRoll.FormattingEnabled = true
- Me.cbEcoRoll.Location = New System.Drawing.Point(15, 31)
- Me.cbEcoRoll.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.cbEcoRoll.FormattingEnabled = True
+ Me.cbEcoRoll.Location = New System.Drawing.Point(10, 20)
Me.cbEcoRoll.Name = "cbEcoRoll"
- Me.cbEcoRoll.Size = New System.Drawing.Size(397, 28)
+ Me.cbEcoRoll.Size = New System.Drawing.Size(266, 21)
Me.cbEcoRoll.TabIndex = 1
Me.cbEcoRoll.ValueMember = "Key"
'
'Label22
'
- Me.Label22.AutoSize = true
- Me.Label22.Location = New System.Drawing.Point(10, 8)
- Me.Label22.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label22.AutoSize = True
+ Me.Label22.Location = New System.Drawing.Point(7, 5)
Me.Label22.Name = "Label22"
Me.Label22.Size = New System.Drawing.Size(50, 13)
Me.Label22.TabIndex = 6
@@ -2247,43 +2084,39 @@ Partial Class VehicleForm
'
'cbAtEcoRollReleaseLockupClutch
'
- Me.cbAtEcoRollReleaseLockupClutch.AutoSize = true
- Me.cbAtEcoRollReleaseLockupClutch.Location = New System.Drawing.Point(357, 32)
- Me.cbAtEcoRollReleaseLockupClutch.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.cbAtEcoRollReleaseLockupClutch.AutoSize = True
+ Me.cbAtEcoRollReleaseLockupClutch.Location = New System.Drawing.Point(238, 21)
Me.cbAtEcoRollReleaseLockupClutch.Name = "cbAtEcoRollReleaseLockupClutch"
Me.cbAtEcoRollReleaseLockupClutch.Size = New System.Drawing.Size(243, 17)
Me.cbAtEcoRollReleaseLockupClutch.TabIndex = 3
Me.cbAtEcoRollReleaseLockupClutch.Text = "AT Gearbox: Eco-Roll Release Lockup Clutch"
- Me.cbAtEcoRollReleaseLockupClutch.UseVisualStyleBackColor = true
+ Me.cbAtEcoRollReleaseLockupClutch.UseVisualStyleBackColor = True
'
'cbPcc
'
Me.cbPcc.DisplayMember = "Value"
Me.cbPcc.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
- Me.cbPcc.FormattingEnabled = true
- Me.cbPcc.Location = New System.Drawing.Point(15, 191)
- Me.cbPcc.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.cbPcc.FormattingEnabled = True
+ Me.cbPcc.Location = New System.Drawing.Point(10, 124)
Me.cbPcc.Name = "cbPcc"
- Me.cbPcc.Size = New System.Drawing.Size(397, 28)
+ Me.cbPcc.Size = New System.Drawing.Size(266, 21)
Me.cbPcc.TabIndex = 2
Me.cbPcc.ValueMember = "Key"
'
'cbEngineStopStart
'
- Me.cbEngineStopStart.AutoSize = true
- Me.cbEngineStopStart.Location = New System.Drawing.Point(15, 32)
- Me.cbEngineStopStart.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.cbEngineStopStart.AutoSize = True
+ Me.cbEngineStopStart.Location = New System.Drawing.Point(10, 21)
Me.cbEngineStopStart.Name = "cbEngineStopStart"
Me.cbEngineStopStart.Size = New System.Drawing.Size(203, 17)
Me.cbEngineStopStart.TabIndex = 0
Me.cbEngineStopStart.Text = "Engine Stop/Start during vehicle stop"
- Me.cbEngineStopStart.UseVisualStyleBackColor = true
+ Me.cbEngineStopStart.UseVisualStyleBackColor = True
'
'lblPCC
'
- Me.lblPCC.AutoSize = true
- Me.lblPCC.Location = New System.Drawing.Point(10, 166)
- Me.lblPCC.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.lblPCC.AutoSize = True
+ Me.lblPCC.Location = New System.Drawing.Point(7, 108)
Me.lblPCC.Name = "lblPCC"
Me.lblPCC.Size = New System.Drawing.Size(125, 13)
Me.lblPCC.TabIndex = 3
@@ -2294,13 +2127,23 @@ Partial Class VehicleForm
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, 29)
- Me.tpRoadSweeper.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tpRoadSweeper.Location = New System.Drawing.Point(4, 22)
Me.tpRoadSweeper.Name = "tpRoadSweeper"
- Me.tpRoadSweeper.Size = New System.Drawing.Size(976, 582)
+ Me.tpRoadSweeper.Size = New System.Drawing.Size(648, 374)
Me.tpRoadSweeper.TabIndex = 4
Me.tpRoadSweeper.Text = "PTO"
- Me.tpRoadSweeper.UseVisualStyleBackColor = true
+ Me.tpRoadSweeper.UseVisualStyleBackColor = True
+ '
+ 'lblNotePtoPEV_HEVS
+ '
+ 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!"
'
'pnPTO
'
@@ -2310,12 +2153,69 @@ Partial Class VehicleForm
Me.pnPTO.Controls.Add(Me.btPTOLossMapBrowse)
Me.pnPTO.Controls.Add(Me.Label7)
Me.pnPTO.Controls.Add(Me.tbPTOLossMap)
- Me.pnPTO.Location = New System.Drawing.Point(9, 112)
- Me.pnPTO.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.pnPTO.Location = New System.Drawing.Point(6, 73)
Me.pnPTO.Name = "pnPTO"
- Me.pnPTO.Size = New System.Drawing.Size(950, 325)
+ 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
+ '
+ '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.Name = "pnPtoMode3"
+ Me.pnPtoMode3.Size = New System.Drawing.Size(465, 51)
+ Me.pnPtoMode3.TabIndex = 2
+ '
+ 'btPTOCycleDrive
+ '
+ Me.btPTOCycleDrive.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
+ Me.btPTOCycleDrive.Location = New System.Drawing.Point(435, 18)
+ Me.btPTOCycleDrive.Name = "btPTOCycleDrive"
+ Me.btPTOCycleDrive.Size = New System.Drawing.Size(24, 24)
+ Me.btPTOCycleDrive.TabIndex = 6
+ Me.btPTOCycleDrive.UseVisualStyleBackColor = True
+ '
+ 'Label28
+ '
+ Me.Label28.Location = New System.Drawing.Point(-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)
@@ -2324,20 +2224,17 @@ 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, 153)
- Me.gbPTODrive.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbPTODrive.Location = New System.Drawing.Point(0, 99)
Me.gbPTODrive.Name = "gbPTODrive"
- Me.gbPTODrive.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.gbPTODrive.Size = New System.Drawing.Size(950, 85)
+ Me.gbPTODrive.Size = New System.Drawing.Size(633, 55)
Me.gbPTODrive.TabIndex = 4
- Me.gbPTODrive.TabStop = false
+ Me.gbPTODrive.TabStop = False
Me.gbPTODrive.Text = "Working operation settings (PTO mode 2)"
'
'Label27
'
- Me.Label27.AutoSize = true
- Me.Label27.Location = New System.Drawing.Point(669, 37)
- Me.Label27.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label27.AutoSize = True
+ Me.Label27.Location = New System.Drawing.Point(446, 24)
Me.Label27.Name = "Label27"
Me.Label27.Size = New System.Drawing.Size(20, 13)
Me.Label27.TabIndex = 6
@@ -2346,17 +2243,15 @@ Partial Class VehicleForm
'
'tbPtoGear
'
- Me.tbPtoGear.Location = New System.Drawing.Point(556, 32)
- Me.tbPtoGear.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbPtoGear.Location = New System.Drawing.Point(371, 21)
Me.tbPtoGear.Name = "tbPtoGear"
- Me.tbPtoGear.Size = New System.Drawing.Size(103, 20)
+ Me.tbPtoGear.Size = New System.Drawing.Size(70, 20)
Me.tbPtoGear.TabIndex = 1
'
'Label26
'
- Me.Label26.AutoSize = true
- Me.Label26.Location = New System.Drawing.Point(284, 37)
- Me.Label26.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label26.AutoSize = True
+ Me.Label26.Location = New System.Drawing.Point(189, 24)
Me.Label26.Name = "Label26"
Me.Label26.Size = New System.Drawing.Size(30, 13)
Me.Label26.TabIndex = 4
@@ -2365,17 +2260,15 @@ Partial Class VehicleForm
'
'tbPtoEngineSpeed
'
- Me.tbPtoEngineSpeed.Location = New System.Drawing.Point(170, 32)
- Me.tbPtoEngineSpeed.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbPtoEngineSpeed.Location = New System.Drawing.Point(113, 21)
Me.tbPtoEngineSpeed.Name = "tbPtoEngineSpeed"
- Me.tbPtoEngineSpeed.Size = New System.Drawing.Size(103, 20)
+ Me.tbPtoEngineSpeed.Size = New System.Drawing.Size(70, 20)
Me.tbPtoEngineSpeed.TabIndex = 0
'
'Label25
'
- Me.Label25.AutoSize = true
- Me.Label25.Location = New System.Drawing.Point(446, 37)
- Me.Label25.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label25.AutoSize = True
+ Me.Label25.Location = New System.Drawing.Point(297, 24)
Me.Label25.Name = "Label25"
Me.Label25.Size = New System.Drawing.Size(68, 13)
Me.Label25.TabIndex = 1
@@ -2383,70 +2276,27 @@ Partial Class VehicleForm
'
'Label24
'
- Me.Label24.AutoSize = true
- Me.Label24.Location = New System.Drawing.Point(10, 37)
- Me.Label24.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label24.AutoSize = True
+ Me.Label24.Location = New System.Drawing.Point(7, 24)
Me.Label24.Name = "Label24"
Me.Label24.Size = New System.Drawing.Size(97, 13)
Me.Label24.TabIndex = 0
Me.Label24.Text = "Min. Engine Speed"
'
- 'btPTOCycleDrive
- '
- Me.btPTOCycleDrive.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btPTOCycleDrive.Location = New System.Drawing.Point(652, 28)
- Me.btPTOCycleDrive.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.btPTOCycleDrive.Name = "btPTOCycleDrive"
- Me.btPTOCycleDrive.Size = New System.Drawing.Size(36, 37)
- Me.btPTOCycleDrive.TabIndex = 6
- Me.btPTOCycleDrive.UseVisualStyleBackColor = true
- '
- 'Label28
- '
- Me.Label28.Location = New System.Drawing.Point(-1, 2)
- Me.Label28.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
- Me.Label28.Name = "Label28"
- Me.Label28.Size = New System.Drawing.Size(399, 25)
- Me.Label28.TabIndex = 21
- Me.Label28.Text = "PTO Cycle during driving (PTO mode 3) (.vptor)"
- Me.Label28.TextAlign = System.Drawing.ContentAlignment.BottomLeft
- '
- 'btPTOCycle
- '
- Me.btPTOCycle.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btPTOCycle.Location = New System.Drawing.Point(657, 32)
- Me.btPTOCycle.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.btPTOCycle.Name = "btPTOCycle"
- Me.btPTOCycle.Size = New System.Drawing.Size(36, 37)
- Me.btPTOCycle.TabIndex = 3
- Me.btPTOCycle.UseVisualStyleBackColor = true
- '
- 'Label16
- '
- Me.Label16.Location = New System.Drawing.Point(4, 6)
- Me.Label16.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
- Me.Label16.Name = "Label16"
- Me.Label16.Size = New System.Drawing.Size(399, 25)
- Me.Label16.TabIndex = 18
- Me.Label16.Text = "PTO Cycle during standstill (PTO mode 1) (.vptoc)"
- Me.Label16.TextAlign = System.Drawing.ContentAlignment.BottomLeft
- '
'btPTOLossMapBrowse
'
Me.btPTOLossMapBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.btPTOLossMapBrowse.Location = New System.Drawing.Point(657, 34)
- Me.btPTOLossMapBrowse.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btPTOLossMapBrowse.Location = New System.Drawing.Point(438, 22)
Me.btPTOLossMapBrowse.Name = "btPTOLossMapBrowse"
- Me.btPTOLossMapBrowse.Size = New System.Drawing.Size(36, 37)
+ Me.btPTOLossMapBrowse.Size = New System.Drawing.Size(24, 24)
Me.btPTOLossMapBrowse.TabIndex = 1
- Me.btPTOLossMapBrowse.UseVisualStyleBackColor = true
+ Me.btPTOLossMapBrowse.UseVisualStyleBackColor = True
'
'Label7
'
- Me.Label7.Location = New System.Drawing.Point(4, 8)
- Me.Label7.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label7.Location = New System.Drawing.Point(3, 5)
Me.Label7.Name = "Label7"
- Me.Label7.Size = New System.Drawing.Size(302, 25)
+ Me.Label7.Size = New System.Drawing.Size(201, 16)
Me.Label7.TabIndex = 15
Me.Label7.Text = "PTO Consumer Loss Map (.vptoi)"
Me.Label7.TextAlign = System.Drawing.ContentAlignment.BottomLeft
@@ -2454,32 +2304,28 @@ Partial Class VehicleForm
'gbPTO
'
Me.gbPTO.Controls.Add(Me.cbPTOType)
- Me.gbPTO.Location = New System.Drawing.Point(9, 9)
- Me.gbPTO.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.gbPTO.Location = New System.Drawing.Point(6, 6)
Me.gbPTO.Name = "gbPTO"
- Me.gbPTO.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.gbPTO.Size = New System.Drawing.Size(950, 94)
+ Me.gbPTO.Size = New System.Drawing.Size(633, 61)
Me.gbPTO.TabIndex = 0
- Me.gbPTO.TabStop = false
+ Me.gbPTO.TabStop = False
Me.gbPTO.Text = "PTO Design Variant"
'
'cbLegislativeClass
'
Me.cbLegislativeClass.DisplayMember = "Value"
Me.cbLegislativeClass.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
- Me.cbLegislativeClass.FormattingEnabled = true
- Me.cbLegislativeClass.Location = New System.Drawing.Point(330, 215)
- Me.cbLegislativeClass.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.cbLegislativeClass.FormattingEnabled = True
+ Me.cbLegislativeClass.Location = New System.Drawing.Point(220, 140)
Me.cbLegislativeClass.Name = "cbLegislativeClass"
- Me.cbLegislativeClass.Size = New System.Drawing.Size(76, 28)
+ Me.cbLegislativeClass.Size = New System.Drawing.Size(52, 21)
Me.cbLegislativeClass.TabIndex = 4
Me.cbLegislativeClass.ValueMember = "Key"
'
'Label21
'
- Me.Label21.AutoSize = true
- Me.Label21.Location = New System.Drawing.Point(48, 189)
- Me.Label21.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label21.AutoSize = True
+ Me.Label21.Location = New System.Drawing.Point(32, 123)
Me.Label21.Name = "Label21"
Me.Label21.Size = New System.Drawing.Size(112, 13)
Me.Label21.TabIndex = 42
@@ -2487,53 +2333,22 @@ Partial Class VehicleForm
'
'lblTitle
'
- Me.lblTitle.AutoSize = true
+ Me.lblTitle.AutoSize = True
Me.lblTitle.BackColor = System.Drawing.Color.White
- Me.lblTitle.Font = New System.Drawing.Font("Microsoft Sans Serif", 18!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- Me.lblTitle.Location = New System.Drawing.Point(176, 52)
- Me.lblTitle.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ 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.Name = "lblTitle"
Me.lblTitle.Size = New System.Drawing.Size(166, 29)
Me.lblTitle.TabIndex = 43
Me.lblTitle.Text = "Vehicle TITLE"
'
- '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(3, 243)
- Me.pnPtoMode3.Name = "pnPtoMode3"
- Me.pnPtoMode3.Size = New System.Drawing.Size(698, 79)
- Me.pnPtoMode3.TabIndex = 2
- '
- '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(3, 73)
- Me.pnPtoMode1.Name = "pnPtoMode1"
- Me.pnPtoMode1.Size = New System.Drawing.Size(699, 74)
- Me.pnPtoMode1.TabIndex = 2
- '
- 'lblNotePtoPEV_HEVS
- '
- 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(15, 451)
- 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!"
- '
'VehicleForm
'
Me.AcceptButton = Me.ButOK
- Me.AutoScaleDimensions = New System.Drawing.SizeF(9!, 20!)
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.CancelButton = Me.ButCancel
- Me.ClientSize = New System.Drawing.Size(999, 962)
+ Me.ClientSize = New System.Drawing.Size(666, 625)
Me.Controls.Add(Me.lblTitle)
Me.Controls.Add(Me.Label21)
Me.Controls.Add(Me.cbLegislativeClass)
@@ -2552,93 +2367,92 @@ Partial Class VehicleForm
Me.Controls.Add(Me.Label5)
Me.Controls.Add(Me.ToolStrip1)
Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
- Me.Icon = CType(resources.GetObject("$this.Icon"),System.Drawing.Icon)
- Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.MaximizeBox = false
+ Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+ Me.MaximizeBox = False
Me.Name = "VehicleForm"
Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
Me.Text = "F05_VEH"
- Me.GroupBox6.ResumeLayout(false)
- Me.GroupBox6.PerformLayout
- Me.ToolStrip1.ResumeLayout(false)
- Me.ToolStrip1.PerformLayout
- Me.gbRetarderLosses.ResumeLayout(false)
- Me.PnRt.ResumeLayout(false)
- Me.PnRt.PerformLayout
- Me.GroupBox8.ResumeLayout(false)
- Me.GroupBox8.PerformLayout
- Me.PnWheelDiam.ResumeLayout(false)
- Me.PnWheelDiam.PerformLayout
- Me.StatusStrip1.ResumeLayout(false)
- Me.StatusStrip1.PerformLayout
- Me.GroupBox1.ResumeLayout(false)
- Me.GroupBox1.PerformLayout
- Me.PnLoad.ResumeLayout(false)
- Me.PnLoad.PerformLayout
- Me.GrAirRes.ResumeLayout(false)
- Me.PnCdATrTr.ResumeLayout(false)
- Me.PnCdATrTr.PerformLayout
- CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).EndInit
- Me.CmOpenFile.ResumeLayout(false)
- Me.GroupBox3.ResumeLayout(false)
- Me.gbAngledrive.ResumeLayout(false)
- Me.pnAngledriveFields.ResumeLayout(false)
- Me.pnAngledriveFields.PerformLayout
- CType(Me.PicVehicle,System.ComponentModel.ISupportInitialize).EndInit
- Me.tcVehicleComponents.ResumeLayout(false)
- Me.tpGeneral.ResumeLayout(false)
- Me.tpPowertrain.ResumeLayout(false)
- Me.gbVehicleIdlingSpeed.ResumeLayout(false)
- Me.Panel1.ResumeLayout(false)
- Me.Panel1.PerformLayout
- Me.gbTankSystem.ResumeLayout(false)
- Me.gbTankSystem.PerformLayout
- Me.tpElectricMachine.ResumeLayout(false)
- Me.gpElectricMotor.ResumeLayout(false)
- Me.gpElectricMotor.PerformLayout
- Me.gbRatiosPerGear.ResumeLayout(false)
- Me.gbRatiosPerGear.PerformLayout
- Me.pnElectricMotor.ResumeLayout(false)
- Me.pnElectricMotor.PerformLayout
- Me.tpIEPC.ResumeLayout(false)
- Me.FlowLayoutPanel1.ResumeLayout(false)
- Me.FlowLayoutPanel1.PerformLayout
- Me.tbIHPC.ResumeLayout(false)
- Me.FlowLayoutPanel2.ResumeLayout(false)
- Me.FlowLayoutPanel2.PerformLayout
- Me.tpReess.ResumeLayout(false)
- Me.gbBattery.ResumeLayout(false)
- Me.gbBattery.PerformLayout
- Me.tpGensetComponents.ResumeLayout(false)
- Me.tpGensetComponents.PerformLayout
- Me.gbGenSet.ResumeLayout(false)
- Me.gbGenSet.PerformLayout
- Me.pnGenSetEM.ResumeLayout(false)
- Me.pnGenSetEM.PerformLayout
- Me.tpTorqueLimits.ResumeLayout(false)
- Me.gbPropulsionTorque.ResumeLayout(false)
- Me.gbPropulsionTorque.PerformLayout
- Me.gbEMTorqueLimits.ResumeLayout(false)
- Me.gbEMTorqueLimits.PerformLayout
- Me.bgVehicleTorqueLimits.ResumeLayout(false)
- Me.bgVehicleTorqueLimits.PerformLayout
- Me.tpADAS.ResumeLayout(false)
- Me.gbADAS.ResumeLayout(false)
- Me.gbADAS.PerformLayout
- Me.pnEcoRoll.ResumeLayout(false)
- Me.pnEcoRoll.PerformLayout
- Me.tpRoadSweeper.ResumeLayout(false)
- Me.tpRoadSweeper.PerformLayout
- Me.pnPTO.ResumeLayout(false)
- Me.pnPTO.PerformLayout
- Me.gbPTODrive.ResumeLayout(false)
- Me.gbPTODrive.PerformLayout
- Me.gbPTO.ResumeLayout(false)
- Me.pnPtoMode3.ResumeLayout(false)
- Me.pnPtoMode3.PerformLayout
- Me.pnPtoMode1.ResumeLayout(false)
- Me.pnPtoMode1.PerformLayout
- Me.ResumeLayout(false)
+ Me.GroupBox6.ResumeLayout(False)
+ Me.GroupBox6.PerformLayout()
+ Me.ToolStrip1.ResumeLayout(False)
+ Me.ToolStrip1.PerformLayout()
+ Me.gbRetarderLosses.ResumeLayout(False)
+ Me.PnRt.ResumeLayout(False)
+ Me.PnRt.PerformLayout()
+ Me.GroupBox8.ResumeLayout(False)
+ Me.GroupBox8.PerformLayout()
+ Me.PnWheelDiam.ResumeLayout(False)
+ Me.PnWheelDiam.PerformLayout()
+ Me.StatusStrip1.ResumeLayout(False)
+ Me.StatusStrip1.PerformLayout()
+ Me.GroupBox1.ResumeLayout(False)
+ Me.GroupBox1.PerformLayout()
+ Me.PnLoad.ResumeLayout(False)
+ Me.PnLoad.PerformLayout()
+ Me.GrAirRes.ResumeLayout(False)
+ Me.PnCdATrTr.ResumeLayout(False)
+ Me.PnCdATrTr.PerformLayout()
+ CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
+ Me.CmOpenFile.ResumeLayout(False)
+ Me.GroupBox3.ResumeLayout(False)
+ Me.gbAngledrive.ResumeLayout(False)
+ Me.pnAngledriveFields.ResumeLayout(False)
+ Me.pnAngledriveFields.PerformLayout()
+ CType(Me.PicVehicle, System.ComponentModel.ISupportInitialize).EndInit()
+ Me.tcVehicleComponents.ResumeLayout(False)
+ Me.tpGeneral.ResumeLayout(False)
+ Me.tpPowertrain.ResumeLayout(False)
+ Me.gbVehicleIdlingSpeed.ResumeLayout(False)
+ Me.Panel1.ResumeLayout(False)
+ Me.Panel1.PerformLayout()
+ Me.gbTankSystem.ResumeLayout(False)
+ Me.gbTankSystem.PerformLayout()
+ Me.tpElectricMachine.ResumeLayout(False)
+ Me.gpElectricMotor.ResumeLayout(False)
+ Me.gpElectricMotor.PerformLayout()
+ Me.gbRatiosPerGear.ResumeLayout(False)
+ Me.gbRatiosPerGear.PerformLayout()
+ Me.pnElectricMotor.ResumeLayout(False)
+ Me.pnElectricMotor.PerformLayout()
+ Me.tpIEPC.ResumeLayout(False)
+ Me.FlowLayoutPanel1.ResumeLayout(False)
+ Me.FlowLayoutPanel1.PerformLayout()
+ Me.tbIHPC.ResumeLayout(False)
+ Me.FlowLayoutPanel2.ResumeLayout(False)
+ Me.FlowLayoutPanel2.PerformLayout()
+ Me.tpReess.ResumeLayout(False)
+ Me.gbBattery.ResumeLayout(False)
+ Me.gbBattery.PerformLayout()
+ Me.tpGensetComponents.ResumeLayout(False)
+ Me.tpGensetComponents.PerformLayout()
+ Me.gbGenSet.ResumeLayout(False)
+ Me.gbGenSet.PerformLayout()
+ Me.pnGenSetEM.ResumeLayout(False)
+ Me.pnGenSetEM.PerformLayout()
+ Me.tpTorqueLimits.ResumeLayout(False)
+ Me.gbPropulsionTorque.ResumeLayout(False)
+ Me.gbPropulsionTorque.PerformLayout()
+ Me.gbEMTorqueLimits.ResumeLayout(False)
+ Me.gbEMTorqueLimits.PerformLayout()
+ Me.bgVehicleTorqueLimits.ResumeLayout(False)
+ Me.bgVehicleTorqueLimits.PerformLayout()
+ Me.tpADAS.ResumeLayout(False)
+ Me.gbADAS.ResumeLayout(False)
+ Me.gbADAS.PerformLayout()
+ Me.pnEcoRoll.ResumeLayout(False)
+ Me.pnEcoRoll.PerformLayout()
+ Me.tpRoadSweeper.ResumeLayout(False)
+ Me.tpRoadSweeper.PerformLayout()
+ Me.pnPTO.ResumeLayout(False)
+ Me.pnPTO.PerformLayout()
+ Me.pnPtoMode1.ResumeLayout(False)
+ Me.pnPtoMode1.PerformLayout()
+ Me.pnPtoMode3.ResumeLayout(False)
+ Me.pnPtoMode3.PerformLayout()
+ Me.gbPTODrive.ResumeLayout(False)
+ Me.gbPTODrive.PerformLayout()
+ Me.gbPTO.ResumeLayout(False)
+ Me.ResumeLayout(False)
Me.PerformLayout
End Sub
diff --git a/VECTO/GUI/VehicleForm.resx b/VECTO/GUI/VehicleForm.resx
index 72954ee247..33a40094e1 100644
--- a/VECTO/GUI/VehicleForm.resx
+++ b/VECTO/GUI/VehicleForm.resx
@@ -185,7 +185,7 @@
</value>
</data>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>46</value>
+ <value>56</value>
</metadata>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
diff --git a/VECTO/GUI/VehicleForm.vb b/VECTO/GUI/VehicleForm.vb
index fc51649d2a..96d137140c 100644
--- a/VECTO/GUI/VehicleForm.vb
+++ b/VECTO/GUI/VehicleForm.vb
@@ -87,25 +87,31 @@ Public Class VehicleForm
CbRtType.DataSource = EnumHelper.GetKeyValuePairs(Of RetarderType)(Function(t) t.GetLabel()).ToDataView()
- If (Cfg.DeclMode) Then
- CbAxleConfig.DataSource = DeclarationData.TruckSegments.GetAxleConfigurations() _
- .Cast(Of AxleConfiguration) _
- .Select(Function(category) New With {.Key = category, .Value = category.GetName()}).ToList()
- Else
- CbAxleConfig.DataSource = EnumHelper.GetKeyValuePairs(Of AxleConfiguration)(Function(t) t.GetName())
- End If
+ If (Not Cfg.DeclMode) Then
+ CbAxleConfig.DataSource = EnumHelper.GetKeyValuePairs(Of AxleConfiguration)(Function(t) t.GetName())
+ End If
- cbEcoRoll.DataSource = EnumHelper.GetKeyValuePairs(Of EcoRollType)(Function(t) t.GetName())
+ cbEcoRoll.DataSource = EnumHelper.GetKeyValuePairs(Of EcoRollType)(Function(t) t.GetName())
cbPcc.DataSource = EnumHelper.GetKeyValuePairs(Of PredictiveCruiseControlType)(Function(t) t.GetName())
cbTankSystem.DataSource = EnumHelper.GetKeyValuePairs(Of TankSystem)()
- 'tpADAS.Enabled = Cfg.DeclMode
+ 'tpADAS.Enabled = Cfg.DeclMode
- CbCat.DataSource = EnumHelper.GetKeyValuePairs(Of VehicleCategory)(Function(t) t.GetLabel())
- cbAngledriveType.DataSource = EnumHelper.GetKeyValuePairs(Of AngledriveType)(Function(t) t.GetLabel())
+ 'TODO RK20220809 add busses as soon as available
+ If (Cfg.DeclMode) Then
+ CbCat.DataSource = EnumHelper.GetKeyValuePairs(Of VehicleCategory)(
+ Function(t) t.GetLabel(),
+ Function(x) x.IsOneOf(VehicleCategory.Van, VehicleCategory.RigidTruck, VehicleCategory.Tractor))
+ Else
+ CbCat.DataSource = EnumHelper.GetKeyValuePairs(Of VehicleCategory)(Function(t) t.GetLabel())
+ End If
+
+
+
+ cbAngledriveType.DataSource = EnumHelper.GetKeyValuePairs(Of AngledriveType)(Function(t) t.GetLabel())
_axlDlog = New VehicleAxleDialog
_torqueLimitDlog = New VehicleTorqueLimitDialog()
@@ -131,19 +137,19 @@ Public Class VehicleForm
'Set HDVclasss
Private Sub SetHdVclass()
If String.IsNullOrEmpty(TbMassMass.Text) OrElse Not IsNumeric(TbMassMass.Text) Then
- TbHDVclass.Text = "-"
- Exit Sub
+ TbHDVclass.Text = "-"
+ Exit Sub
End If
Dim vehC As VehicleCategory = CType(CbCat.SelectedValue, VehicleCategory)
Dim axlC As AxleConfiguration = CType(CbAxleConfig.SelectedValue, AxleConfiguration)
- Dim maxMass As Kilogram = (TbMassMass.Text.ToDouble() * 1000).SI(Of Kilogram)()
+ Dim maxMass As Kilogram = (TbMassMass.Text.ToDouble(0) * 1000).SI(Of Kilogram)()
- _hdVclass = VehicleClass.Unknown
+ _hdVclass = VehicleClass.Unknown
Dim s0 As Segment = Nothing
Try
- s0 = DeclarationData.TruckSegments.Lookup(vehC, axlC, maxMass, 0.SI(Of Kilogram), False)
+ s0 = DeclarationData.TruckSegments.Lookup(vehC, axlC, maxMass, 0.SI(Of Kilogram), False)
- Catch
+ Catch
' no segment found - ignore
End Try
If s0.Found Then
@@ -158,17 +164,17 @@ Public Class VehicleForm
'Set generic values for Declaration mode
Private Sub DeclInit()
- If Not Cfg.DeclMode Then Exit Sub
+ If Not Cfg.DeclMode Then Exit Sub
- If String.IsNullOrEmpty(TbMassMass.Text) Then
+ If String.IsNullOrEmpty(TbMassMass.Text) Then
TbHDVclass.Text = "-"
Exit Sub
End If
Dim vehC As VehicleCategory = CType(CbCat.SelectedValue, VehicleCategory)
Dim axlC As AxleConfiguration = CType(CbAxleConfig.SelectedValue, AxleConfiguration)
- Dim maxMass As Kilogram = (TbMassMass.Text.ToDouble() * 1000).SI(Of Kilogram)()
+ Dim maxMass As Kilogram = (TbMassMass.Text.ToDouble(0) * 1000).SI(Of Kilogram)()
- Dim s0 As Segment = Nothing
+ Dim s0 As Segment = Nothing
Try
s0 = DeclarationData.TruckSegments.Lookup(vehC, axlC, maxMass, 0.SI(Of Kilogram), False)
Catch
@@ -186,8 +192,8 @@ Public Class VehicleForm
AxleType.VehicleNonDriven))
Next
- ElseIf axleCount < LvRRC.Items.Count Then
- For i = axleCount To LvRRC.Items.Count - 1
+ ElseIf axleCount <LvRRC.Items.Count Then
+ For i = axleCount To LvRRC.Items.Count - 1
LvRRC.Items.RemoveAt(LvRRC.Items.Count - 1)
Next
End If
@@ -513,7 +519,8 @@ Public Class VehicleForm
_changed = False
End Sub
- Private Function CreateRatioPerGearListViewItem(gear As Integer, ratio As Double) As ListViewItem
+
+ Private Function CreateRatioPerGearListViewItem(gear As Integer, ratio As Double) As ListViewItem
Dim retval As New ListViewItem
retval.SubItems(0).Text = gear.ToGUIFormat()
retval.SubItems.Add(ratio.ToGUIFormat())
@@ -808,7 +815,9 @@ Public Class VehicleForm
veh.MassExtra = TbMassExtra.Text.ToDouble(0)
veh.AxleConfiguration = CType(CbAxleConfig.SelectedValue, AxleConfiguration)
- For Each entry As ListViewItem In LvRRC.Items
+ Dim relCheck As Double = 0
+ Dim hasDrivenAxle As Boolean = False
+ For Each entry As ListViewItem In LvRRC.Items
Dim a0 As AxleInputData = New AxleInputData()
a0.AxleWeightShare = entry.SubItems(AxleTbl.RelativeLoad).Text.ToDouble(0)
a0.TwinTyres = (entry.SubItems(AxleTbl.TwinTyres).Text = "yes")
@@ -819,10 +828,26 @@ Public Class VehicleForm
tyre.Dimension = entry.SubItems(AxleTbl.WheelsDimension).Text
tyre.Inertia = entry.SubItems(AxleTbl.Inertia).Text.ToDouble(0).SI(Of KilogramSquareMeter)()
a0.Tyre = tyre
- veh.Axles.Add(a0)
- Next
-
- veh.RetarderType = CType(CbRtType.SelectedValue, RetarderType)
+ veh.Axles.Add(a0)
+ relCheck += a0.AxleWeightShare
+ If a0.AxleType.Equals(AxleType.VehicleDriven) Then
+ hasDrivenAxle = True
+ End If
+ Next
+
+
+ If Not hasDrivenAxle Then
+ MsgBox("No driven axle selected")
+ tcVehicleComponents.SelectedTab = tpGeneral
+ Return False
+ End If
+ If (relCheck < 1) Or (relCheck > 1) Then
+ MsgBox("Relative Weight distribution on axle does not sum to 1")
+ tcVehicleComponents.SelectedTab = tpGeneral
+ Return False
+ End If
+
+ veh.RetarderType = CType(CbRtType.SelectedValue, RetarderType)
veh.RetarderRatio = TbRtRatio.Text.ToDouble(0)
veh.RetarderLossMapFile.Init(GetPath(file), TbRtPath.Text)
@@ -944,9 +969,9 @@ Public Class VehicleForm
veh.GearDuringPTODrive = If(String.IsNullOrWhiteSpace(tbPtoGear.Text), Nothing, CType(tbPtoGear.Text.ToInt(), UInteger?))
- veh.EngineSpeedDuringPTODrive = If(String.IsNullOrWhiteSpace(tbPtoEngineSpeed.Text), Nothing, tbPtoEngineSpeed.Text.ToDouble().RPMtoRad())
- '---------------------------------------------------------------------------------
- If Not veh.SaveFile Then
+ veh.EngineSpeedDuringPTODrive = If(String.IsNullOrWhiteSpace(tbPtoEngineSpeed.Text), Nothing, tbPtoEngineSpeed.Text.ToDouble(0).RPMtoRad())
+ '---------------------------------------------------------------------------------
+ If Not veh.SaveFile Then
MsgBox("Cannot save to " & file, MsgBoxStyle.Critical)
Return False
End If
@@ -1093,23 +1118,31 @@ Public Class VehicleForm
Change()
End Sub
- Private Sub CbCat_SelectedIndexChanged(sender As Object, e As EventArgs) Handles CbCat.SelectedIndexChanged
- Change()
- SetHdVclass()
- DeclInit()
- End Sub
+ Private Sub TBcdA_Leave(sender As Object, e As EventArgs) Handles TBcdA.Leave
+ If Not IsNumeric(TBcdA.Text) Then
+ MsgBox("Invalid value for Air Resistance - Cd x A")
+ TBcdA.Focus()
+ End If
+ End Sub
- Private Sub TbMassTrailer_TextChanged(sender As Object, e As EventArgs) Handles TbMassExtra.TextChanged
- Change()
- End Sub
+ Private Sub CbCat_SelectedIndexChanged(sender As Object, e As EventArgs) Handles CbCat.SelectedIndexChanged
+ Change()
+ SetAxleConfigOptions()
+ SetHdVclass()
+ DeclInit()
+ End Sub
- Private Sub TbMassMax_TextChanged(sender As Object, e As EventArgs) Handles TbMassMass.TextChanged
+ Private Sub TbMassTrailer_TextChanged(sender As Object, e As EventArgs) Handles TbMassExtra.TextChanged
Change()
- SetHdVclass()
- DeclInit()
End Sub
- Private Sub CbAxleConfig_SelectedIndexChanged(sender As Object, e As EventArgs) _
+ Private Sub TbMassMax_TextChanged(sender As Object, e As EventArgs) Handles TbMassMass.Leave
+ Change()
+ SetHdVclass()
+ DeclInit()
+ End Sub
+
+ Private Sub CbAxleConfig_SelectedIndexChanged(sender As Object, e As EventArgs) _
Handles CbAxleConfig.SelectedIndexChanged
Change()
SetHdVclass()
@@ -1119,6 +1152,13 @@ Public Class VehicleForm
#End Region
#Region "Axle Configuration"
+ Private Sub SetAxleConfigOptions()
+ If Cfg.DeclMode Then
+ CbAxleConfig.DataSource = DeclarationData.TruckSegments.GetAxleConfigurations(CType(CbCat.SelectedValue, VehicleCategory)) _
+ .Cast(Of AxleConfiguration) _
+ .Select(Function(category) New With {.Key = category, .Value = category.GetName()}).ToList()
+ End If
+ End Sub
Private Sub ButAxlAdd_Click(sender As Object, e As EventArgs) Handles ButAxlAdd.Click
_axlDlog.Clear()
@@ -1265,8 +1305,26 @@ Public Class VehicleForm
End Sub
#End Region
-
- Private Sub cbPTOType_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cbPTOType.SelectedIndexChanged
+ Private Sub tbInitialSoCMax_Leave(sender As Object, e As System.EventArgs) Handles tbInitialSoC.Leave
+
+ If Not IsNumeric(tbInitialSoC.Text) Then
+ MsgBox("Invalid SoC Max value")
+ tbInitialSoC.Focus()
+ Return
+ End If
+ If Not 0 < Convert.ToInt32(tbInitialSoC.Text) Then
+ MsgBox("Input has to be positive")
+ tbInitialSoC.Focus()
+ Return
+ End If
+ If Not 100 < Convert.ToInt32(tbInitialSoC.Text) Then
+ MsgBox("Input has to below 100")
+ tbInitialSoC.Focus()
+ Return
+ End If
+ End Sub
+
+ Private Sub cbPTOType_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cbPTOType.SelectedIndexChanged
If (Cfg.DeclMode) Then
Exit Sub
@@ -1447,10 +1505,13 @@ Public Class VehicleForm
ElseIf PowertrainPosition.BatteryElectricE3.Equals(cbEmPos.SelectedValue) Then
gbRetarderLosses.Enabled = True
CType(CbRtType.DataSource, DataView).RowFilter = $"Key in ({CInt(RetarderType.None)}, {CInt(RetarderType.AxlegearInputRetarder)})"
- Else
+ ElseIf False Then 'not IEPC vehicle
gbRetarderLosses.Enabled = True
- CType(CbRtType.DataSource, DataView).RowFilter = $"Key <> {CInt(RetarderType.AxlegearInputRetarder)}"
- End If
+ CType(CbRtType.DataSource, DataView).RowFilter = "Key <> {CInt(RetarderType.AxlegearInputRetarder)}"
+ Else
+ gbRetarderLosses.Enabled = True
+ CType(CbRtType.DataSource, DataView).RowFilter = ""
+ End If
If (selectedValue IsNot Nothing) Then
If Not selectedValue.Equals(CbRtType.SelectedValue) Then
diff --git a/VECTO/MainModule.vb b/VECTO/MainModule.vb
index fa5c9d7af4..d95fd515ff 100644
--- a/VECTO/MainModule.vb
+++ b/VECTO/MainModule.vb
@@ -54,11 +54,8 @@ Module MainModule
Select Case hdVclass
Case VehicleClass.Class51,
- VehicleClass.Class52,
VehicleClass.Class53,
- VehicleClass.Class54,
VehicleClass.Class55,
- VehicleClass.Class56,
VehicleClass.Class1s
Return My.Resources.Undef
@@ -83,6 +80,57 @@ Module MainModule
VehicleClass.Class12,
VehicleClass.Class14
Return My.Resources._6x2tt
+
+ Case VehicleClass.Class16
+ Return My.Resources.rigid8x4
+
+ Case VehicleClass.Class52,
+ VehicleClass.Class54,
+ VehicleClass.Class56
+ Return My.Resources.van
+
+ Case VehicleClass.Class31a,
+ VehicleClass.Class31b1,
+ VehicleClass.Class31b2,
+ VehicleClass.Class31c,
+ VehicleClass.Class31d,
+ VehicleClass.Class31e,
+ VehicleClass.Class32a,
+ VehicleClass.Class32b,
+ VehicleClass.Class32c,
+ VehicleClass.Class32d,
+ VehicleClass.Class32e,
+ VehicleClass.Class32f
+ Return My.Resources.bus4x2
+
+ Case VehicleClass.Class33a,
+ VehicleClass.Class33b1,
+ VehicleClass.Class33b2,
+ VehicleClass.Class33c,
+ VehicleClass.Class33d,
+ VehicleClass.Class33e,
+ VehicleClass.Class34a,
+ VehicleClass.Class34b,
+ VehicleClass.Class34c,
+ VehicleClass.Class34d,
+ VehicleClass.Class34e,
+ VehicleClass.Class34f
+ Return My.Resources.bus6x2
+
+ Case VehicleClass.Class37a,
+ VehicleClass.Class37b1,
+ VehicleClass.Class37b2,
+ VehicleClass.Class37c,
+ VehicleClass.Class37d,
+ VehicleClass.Class37e,
+ VehicleClass.Class38a,
+ VehicleClass.Class38b,
+ VehicleClass.Class38c,
+ VehicleClass.Class38d,
+ VehicleClass.Class38e,
+ VehicleClass.Class38f
+ Return My.Resources.bus8x2
+
Case Else
Return My.Resources.Undef
End Select
diff --git a/VectoCore/VectoCore/Models/Declaration/Axle.cs b/VectoCore/VectoCore/Models/Declaration/Axle.cs
index e6c99bff9a..f666166647 100644
--- a/VectoCore/VectoCore/Models/Declaration/Axle.cs
+++ b/VectoCore/VectoCore/Models/Declaration/Axle.cs
@@ -69,7 +69,7 @@ namespace TUGraz.VectoCore.Models.Declaration
try {
DeclarationData.Wheels.Lookup(axle.WheelsDimension);
} catch (Exception) {
- return new ValidationResult($"Unknown Tyre dimenstion '{axle.WheelsDimension}'");
+ return new ValidationResult($"Unknown Tyre dimension '{axle.WheelsDimension}'");
}
return ValidationResult.Success;
}
diff --git a/VectoCore/VectoCore/Models/Declaration/TruckSegments.cs b/VectoCore/VectoCore/Models/Declaration/TruckSegments.cs
index 9c831442ef..c36a2bd389 100644
--- a/VectoCore/VectoCore/Models/Declaration/TruckSegments.cs
+++ b/VectoCore/VectoCore/Models/Declaration/TruckSegments.cs
@@ -75,6 +75,12 @@ namespace TUGraz.VectoCore.Models.Declaration
.Select(row => AxleConfigurationHelper.Parse(row.Field<string>("axleconf."))).Distinct();
}
+ public IEnumerable<AxleConfiguration> GetAxleConfigurations(VehicleCategory vehCat)
+ {
+ return _segmentTable.AsEnumerable().Where(row => row.Field<string>("valid") == "1" && row.Field<string>("vehiclecategory") == vehCat.ToString())
+ .Select(row => AxleConfigurationHelper.Parse(row.Field<string>("axleconf."))).Distinct();
+ }
+
public Segment Lookup(
VehicleCategory vehicleCategory, AxleConfiguration axleConfiguration,
Kilogram grossVehicleMassRating, Kilogram curbWeight, bool vocational, bool considerInvalid)
diff --git a/VectoCore/VectoCore/Resources/Declaration/SegmentTable.csv b/VectoCore/VectoCore/Resources/Declaration/SegmentTable.csv
index bec4a1233f..f1038a9e71 100644
--- a/VectoCore/VectoCore/Resources/Declaration/SegmentTable.csv
+++ b/VectoCore/VectoCore/Resources/Declaration/SegmentTable.csv
@@ -36,6 +36,6 @@ HDV group , Vocational , Valid , Vehicle Category , Axle Conf. , TPMLM_Min , TPM
53 , 0 , 1 , RigidTruck , 4x2 , 5 , 7.4 , 3.5 , 85 , B-II , , , , , , Truck.vacc , , , MediumLorriesRigid , , 45/55 , , , , , , , - , - , pc10(R)/pc50(R) , - , pc10(R)/pc50(R) , - , - , - , - , - , - , - , 5.8 ,
53 , 0 , 1 , Tractor , 4x2 , 5 , 7.4 , 3.5 , 85 , B-II , , , , , , Truck.vacc , , , MediumLorriesRigid , , 45/55 , , , , , , , - , - , pc10(R)/pc50(R) , - , pc10(R)/pc50(R) , - , - , - , - , - , - , - , 5.8 ,
54 , 0 , 1 , Van , 4x2 , 5 , 7.4 , 2.9 , 85 , , , , , , , Truck.vacc , , , MediumLorriesVan , , 45/55 , , , , , , , - , - , pc10(V)/pc50(V) , - , pc10(V)/pc50(V) , - , - , - , - , - , - , - , 2.5 ,
-55 , 0 , 1 , RigidTruck , 4x4 , 5 , 7.4 , 3.5 , 85 , B-II , , , , , , Truck.vacc , , , MediumLorriesRigid , , 45/55 , , , , , , , - , - , pc10(R)/pc50(R) , - , pc10(R)/pc50(R) , - , - , - , - , - , - , - , 5.8 ,
-55 , 0 , 1 , Tractor , 4x4 , 5 , 7.4 , 3.5 , 85 , B-II , , , , , , Truck.vacc , , , MediumLorriesRigid , , 45/55 , , , , , , , - , - , pc10(R)/pc50(R) , - , pc10(R)/pc50(R) , - , - , - , - , - , - , - , 5.8 ,
-56 , 0 , 1 , Van , 4x4 , 5 , 7.4 , 2.9 , 85 , , , , , , , Truck.vacc , , , MediumLorriesVan , , 45/55 , , , , , , , - , - , pc10(V)/pc50(V) , - , pc10(V)/pc50(V) , - , - , - , - , - , - , - , 2.5 ,
+55 , 0 , 0 , RigidTruck , 4x4 , 5 , 7.4 , 3.5 , 85 , B-II , , , , , , Truck.vacc , , , MediumLorriesRigid , , 45/55 , , , , , , , - , - , pc10(R)/pc50(R) , - , pc10(R)/pc50(R) , - , - , - , - , - , - , - , 5.8 ,
+55 , 0 , 0 , Tractor , 4x4 , 5 , 7.4 , 3.5 , 85 , B-II , , , , , , Truck.vacc , , , MediumLorriesRigid , , 45/55 , , , , , , , - , - , pc10(R)/pc50(R) , - , pc10(R)/pc50(R) , - , - , - , - , - , - , - , 5.8 ,
+56 , 0 , 0 , Van , 4x4 , 5 , 7.4 , 2.9 , 85 , , , , , , , Truck.vacc , , , MediumLorriesVan , , 45/55 , , , , , , , - , - , pc10(V)/pc50(V) , - , pc10(V)/pc50(V) , - , - , - , - , - , - , - , 2.5 ,
--
GitLab