From f4a703a387e64ac3c64efc7374dbd4723671cd15 Mon Sep 17 00:00:00 2001
From: "harald.martini@student.tugraz.at" <harald.martini@student.tugraz.at>
Date: Wed, 12 May 2021 09:59:26 +0200
Subject: [PATCH] Removed setting default value for HeatPumpMode, changed label
of n_a to not applicable
---
.../MultistageAuxiliariesViewModel.cs | 21 ++++++++++++++-----
.../VectoCommon/BusAuxiliaries/ISSMInputs.cs | 2 +-
2 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs
index 24d013f410..4744da5fe3 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs
@@ -146,7 +146,18 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
public bool HeatPumpGroupEditingEnabled
{
get => _heatPumpGroupEditingEnabled;
- set => SetProperty(ref _heatPumpGroupEditingEnabled, value);
+ set
+ {
+
+ SetProperty(ref _heatPumpGroupEditingEnabled, value);
+ //if (value == false)
+ //{
+ // HeatPumpTypePassengerCompartment = null;
+ // HeatPumpModePassengerCompartment = null;
+ // HeatPumpModeDriverCompartment = null;
+ // HeatPumpTypeDriverCompartment = null;
+ //}
+ }
}
public BusHVACSystemConfiguration? SystemConfiguration
@@ -163,12 +174,12 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
if (value == HeatPumpType.none) {
HeatPumpModeDriverCompartmentAllowedValues =
EnumHelper.GetValuesAsObservableCollectionIncluding<Enum, HeatPumpMode>(items:HeatPumpMode.N_A);
- HeatPumpModeDriverCompartment = HeatPumpMode.N_A;
+ //HeatPumpModeDriverCompartment = HeatPumpMode.N_A;
} else {
HeatPumpModeDriverCompartmentAllowedValues =
EnumHelper.GetValuesAsObservableCollectionExcluding<Enum, HeatPumpMode>(
items: HeatPumpMode.N_A);
- HeatPumpModeDriverCompartment = HeatPumpMode.cooling;
+ //HeatPumpModeDriverCompartment = HeatPumpMode.cooling;
}
@@ -213,14 +224,14 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
{
HeatPumpModePassengerCompartmentAllowedValues =
EnumHelper.GetValuesAsObservableCollectionIncluding<Enum, HeatPumpMode>(items: HeatPumpMode.N_A);
- HeatPumpModePassengerCompartment = HeatPumpMode.N_A;
+ //HeatPumpModePassengerCompartment = HeatPumpMode.N_A;
}
else
{
HeatPumpModePassengerCompartmentAllowedValues =
EnumHelper.GetValuesAsObservableCollectionExcluding<Enum, HeatPumpMode>(
items: HeatPumpMode.N_A);
- HeatPumpModePassengerCompartment = HeatPumpMode.cooling;
+ //HeatPumpModePassengerCompartment = HeatPumpMode.cooling;
}
}
}
diff --git a/VectoCommon/VectoCommon/BusAuxiliaries/ISSMInputs.cs b/VectoCommon/VectoCommon/BusAuxiliaries/ISSMInputs.cs
index 635fa22f1f..49ad17abef 100644
--- a/VectoCommon/VectoCommon/BusAuxiliaries/ISSMInputs.cs
+++ b/VectoCommon/VectoCommon/BusAuxiliaries/ISSMInputs.cs
@@ -255,7 +255,7 @@ namespace TUGraz.VectoCommon.BusAuxiliaries
heating_and_cooling,
[GuiLabel("Cooling")]
cooling,
- [GuiLabel("N_A")]
+ [GuiLabel("not_applicable")]
N_A,
}
--
GitLab