From a2c0258f930ca615721a029c2d6d7c0453331e84 Mon Sep 17 00:00:00 2001
From: Michael Krisper <michael.krisper@tugraz.at>
Date: Mon, 25 Apr 2022 17:58:48 +0200
Subject: [PATCH] VehicleForm: Removed HybridPositionNotSet from Dropdown for
Hybrids and BatteryElectric Vehicles
---
VECTO/GUI/VehicleForm.vb | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/VECTO/GUI/VehicleForm.vb b/VECTO/GUI/VehicleForm.vb
index e2e193e693..6fc6e3a0b3 100644
--- a/VECTO/GUI/VehicleForm.vb
+++ b/VECTO/GUI/VehicleForm.vb
@@ -527,8 +527,8 @@ Public Class VehicleForm
lblTitle.Text = "Conventional Vehicle"
gbRetarderLosses.Enabled = True
tpElectricComponents.Enabled = False
- cbEmPos.DataSource = EnumHelper.GetKeyValuePairs(Of PowertrainPosition)(Function(t) t.GetName,
- Function(t) t = PowertrainPosition.HybridPositionNotSet)
+ cbEmPos.DataSource = EnumHelper.GetKeyValuePairs(Of PowertrainPosition) _
+ (Function(t) t.GetLabel(), Function(t) t = PowertrainPosition.HybridPositionNotSet)
cbEngineStopStart.Enabled = True
cbEcoRoll.DataSource = EnumHelper.GetKeyValuePairs(Of EcoRollType)(Function(t) t.GetName())
cbEcoRoll.Enabled = True
@@ -537,16 +537,16 @@ Public Class VehicleForm
Case VectoSimulationJobType.ParallelHybridVehicle
gbRetarderLosses.Enabled = True
lblTitle.Text = "Parallel Hybrid Vehicle"
- cbEmPos.DataSource = EnumHelper.GetKeyValuePairs(Of PowertrainPosition)(Function(t) t.GetLabel,
- Function(x) x.IsParallelHybrid() Or x = PowertrainPosition.HybridPositionNotSet)
+ cbEmPos.DataSource = EnumHelper.GetKeyValuePairs(Of PowertrainPosition) _
+ (Function(t) t.GetLabel(), Function(x) x.IsParallelHybrid())
gbEMTorqueLimits.Enabled = True
cbEcoRoll.Enabled = True
tpGensetComponents.Visible = False
Case VectoSimulationJobType.SerialHybridVehicle
gbRetarderLosses.Enabled = False
lblTitle.Text = "Serial Hybrid Vehicle"
- cbEmPos.DataSource = EnumHelper.GetKeyValuePairs(Of PowertrainPosition)(Function(t) t.GetLabel,
- Function(x) x.IsSerialHybrid() Or x = PowertrainPosition.HybridPositionNotSet)
+ cbEmPos.DataSource = EnumHelper.GetKeyValuePairs(Of PowertrainPosition) _
+ (Function(t) t.GetLabel(), Function(x) x.IsSerialHybrid())
tpTorqueLimits.Enabled = False
cbEngineStopStart.Checked = False
cbEngineStopStart.Enabled = False
@@ -561,8 +561,8 @@ Public Class VehicleForm
gbTankSystem.Enabled = False
gbAngledrive.Enabled = False
tpTorqueLimits.Enabled = False
- cbEmPos.DataSource = EnumHelper.GetKeyValuePairs(Of PowertrainPosition)(Function(t) t.GetLabel,
- Function(x) x.IsBatteryElectric() Or x = PowertrainPosition.HybridPositionNotSet)
+ cbEmPos.DataSource = EnumHelper.GetKeyValuePairs(Of PowertrainPosition) _
+ (Function(t) t.GetLabel(), Function(x) x.IsBatteryElectric())
cbEngineStopStart.Checked = False
cbEngineStopStart.Enabled = False
cbEcoRoll.DataSource = {New With {.Key = EcoRollType.None, .Value = EcoRollType.None.GetName()}}
--
GitLab