From 580d41a25de29cf5fd1770eea552547aa636ee5b Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <quaritsch@ivt.tugraz.at>
Date: Mon, 13 May 2024 15:41:56 +0200
Subject: [PATCH] use default values for eco roll and engine stop/start in case
of HEV and PEV vehicles in the view model to avoid validation errors
---
.../InterimStageBusVehicleViewModel.cs | 35 ++++++++++++++++---
1 file changed, 31 insertions(+), 4 deletions(-)
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel.cs
index 8543738b01..09b1e631f3 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel.cs
@@ -947,7 +947,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
}
}
- public bool? EngineStopStartNullable
+ public virtual bool? EngineStopStartNullable
{
get => _engineStopStartNullable;
set
@@ -966,7 +966,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
}
}
- public EcoRollType? EcoRollTypeNullable
+ public virtual EcoRollType? EcoRollTypeNullable
{
get => _ecoRollTypeNullable;
set
@@ -1336,7 +1336,12 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
public override bool EcoRollEnabled => false;
- public override bool ATEcoRollReleaseLockupClutchEnabled => false;
+ public override EcoRollType? EcoRollTypeNullable {
+ get { return EcoRollType.None; }
+ set { }
+ }
+
+ public override bool ATEcoRollReleaseLockupClutchEnabled => false;
public override string XMLType => XMLTypes.Vehicle_Hev_CompletedBusDeclarationType;
@@ -1363,8 +1368,20 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
public override bool EcoRollEnabled => false;
+ public override EcoRollType? EcoRollTypeNullable
+ {
+ get { return EcoRollType.None; }
+ set { }
+ }
+
public override bool EngineStopStartEnabled => false;
+ public override bool? EngineStopStartNullable
+ {
+ get { return false; }
+ set { }
+ }
+
public override bool ATEcoRollReleaseLockupClutchEnabled => false;
@@ -1391,8 +1408,18 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
public override bool EcoRollEnabled => false;
- public override bool EngineStopStartEnabled => false;
+ public override EcoRollType? EcoRollTypeNullable {
+ get { return EcoRollType.None; }
+ set { }
+ }
+ public override bool EngineStopStartEnabled => false;
+
+ public override bool? EngineStopStartNullable {
+ get { return false; }
+ set { }
+ }
+
public override bool ATEcoRollReleaseLockupClutchEnabled => false;
--
GitLab