diff --git a/VECTO3GUI2020/TestViewModel.cs b/VECTO3GUI2020/TestViewModel.cs
index 2e5b1a9badb3db6139fb932f357bcdce0f5f86f1..a21deb9371ad2743aae96ad7c4486c76d87d2bf1 100644
--- a/VECTO3GUI2020/TestViewModel.cs
+++ b/VECTO3GUI2020/TestViewModel.cs
@@ -38,7 +38,7 @@ namespace VECTO3GUI2020
private Meter _meter;
- private HeatPumpMode? _heatpumpMode;
+ //private HeatPumpMode? _heatpumpMode;
private string _testString;
public Meter Meter
@@ -47,30 +47,30 @@ namespace VECTO3GUI2020
set => SetProperty(ref _meter, value);
}
- public HeatPumpMode? HeatPumpMode
- {
- get => _heatpumpMode;
- set => SetProperty(ref _heatpumpMode, value);
- }
+ //public HeatPumpMode? HeatPumpMode
+ //{
+ // get => _heatpumpMode;
+ // set => SetProperty(ref _heatpumpMode, value);
+ //}
- private IList<HeatPumpMode> allowedValues = new List<HeatPumpMode>(){
- TUGraz.VectoCommon.BusAuxiliaries.HeatPumpMode.cooling,
- TUGraz.VectoCommon.BusAuxiliaries.HeatPumpMode.heating_and_cooling
- };
+ //private IList<HeatPumpMode> allowedValues = new List<HeatPumpMode>(){
+ // TUGraz.VectoCommon.BusAuxiliaries.HeatPumpMode.cooling,
+ // TUGraz.VectoCommon.BusAuxiliaries.HeatPumpMode.heating_and_cooling
+ //};
- private HeatPumpMode? _heatpumpMode2;
+ //private HeatPumpMode? _heatpumpMode2;
private bool _enabled;
public bool enabled { get => _enabled; set => SetProperty(ref _enabled, value); }
- public HeatPumpMode? HeatPumpMode2
- {
- get => _heatpumpMode2;
- set => SetProperty(ref _heatpumpMode2, value);
- }
-
- public ObservableCollection<Enum> HeatPumpModeListItems
- {
- get => new ObservableCollection<Enum>(allowedValues.Cast<Enum>());
- }
+ //public HeatPumpMode? HeatPumpMode2
+ //{
+ // get => _heatpumpMode2;
+ // set => SetProperty(ref _heatpumpMode2, value);
+ //}
+
+ //public ObservableCollection<Enum> HeatPumpModeListItems
+ //{
+ // get => new ObservableCollection<Enum>(allowedValues.Cast<Enum>());
+ //}
public String TestString
{
diff --git a/VECTO3GUI2020/Util/XML/Implementation/ComponentWriter/XMLBusAuxiliariesWriter.cs b/VECTO3GUI2020/Util/XML/Implementation/ComponentWriter/XMLBusAuxiliariesWriter.cs
index ad44783039c8b070b744ed533de5947710fd64bb..438417db122c31aa096d331a4756d5f169534f51 100644
--- a/VECTO3GUI2020/Util/XML/Implementation/ComponentWriter/XMLBusAuxiliariesWriter.cs
+++ b/VECTO3GUI2020/Util/XML/Implementation/ComponentWriter/XMLBusAuxiliariesWriter.cs
@@ -83,24 +83,24 @@ namespace VECTO3GUI2020.Util.XML.Implementation.ComponentWriter
}
if (_inputData.HVACAux != null) {
- var hvacElement = new XElement(_defaultNamespace + "HVAC");
- hvacElement.Add(new XElement(_defaultNamespace + XMLNames.Bus_SystemConfiguration, _inputData.HVACAux.SystemConfiguration.GetXmlFormat()));
- var heatPumpTypeLabel = _inputData.HVACAux.HeatPumpTypeDriverCompartment.GetLabel();
- if (heatPumpTypeLabel == "~null~") {
- heatPumpTypeLabel = null;
- }
- hvacElement.Add(new XElement(_defaultNamespace + XMLNames.Bus_HeatPumpTypeDriver, heatPumpTypeLabel));
- hvacElement.Add(new XElement(_defaultNamespace + XMLNames.Bus_HeatPumpModeDriver, _inputData.HVACAux.HeatPumpModeDriverCompartment.GetLabel()));
- //TODO
- if (_inputData.HVACAux.HeatPumpPassengerCompartments != null) {
- foreach (var (heatPumpType, heatPumpMode) in _inputData.HVACAux.HeatPumpPassengerCompartments) {
- hvacElement.Add(new XElement(_defaultNamespace + XMLNames.Bus_HeatPumpTypePassenger, heatPumpType.GetLabel()));
- hvacElement.Add(new XElement(_defaultNamespace + XMLNames.Bus_HeatPumpModePassenger, heatPumpMode.GetLabel()));
- }
- }
-
-
- hvacElement.Add(new XElement(_defaultNamespace + XMLNames.Bus_AuxiliaryHeaterPower, _inputData.HVACAux.AuxHeaterPower?.ToXMLFormat(0)));
+ var hvacElement = new XElement(_defaultNamespace + "HVAC");
+ //hvacElement.Add(new XElement(_defaultNamespace + XMLNames.Bus_SystemConfiguration, _inputData.HVACAux.SystemConfiguration.GetXmlFormat()));
+ //var heatPumpTypeLabel = _inputData.HVACAux.HeatPumpTypeDriverCompartment.GetLabel();
+ //if (heatPumpTypeLabel == "~null~") {
+ // heatPumpTypeLabel = null;
+ //}
+ //hvacElement.Add(new XElement(_defaultNamespace + XMLNames.Bus_HeatPumpTypeDriver, heatPumpTypeLabel));
+ //hvacElement.Add(new XElement(_defaultNamespace + XMLNames.Bus_HeatPumpModeDriver, _inputData.HVACAux.HeatPumpModeDriverCompartment.GetLabel()));
+ ////TODO
+ //if (_inputData.HVACAux.HeatPumpPassengerCompartments != null) {
+ // foreach (var (heatPumpType, heatPumpMode) in _inputData.HVACAux.HeatPumpPassengerCompartments) {
+ // hvacElement.Add(new XElement(_defaultNamespace + XMLNames.Bus_HeatPumpTypePassenger, heatPumpType.GetLabel()));
+ // hvacElement.Add(new XElement(_defaultNamespace + XMLNames.Bus_HeatPumpModePassenger, heatPumpMode.GetLabel()));
+ // }
+ //}
+
+
+ hvacElement.Add(new XElement(_defaultNamespace + XMLNames.Bus_AuxiliaryHeaterPower, _inputData.HVACAux.AuxHeaterPower?.ToXMLFormat(0)));
hvacElement.Add(new XElement(_defaultNamespace + XMLNames.Bus_DoubleGlazing, _inputData.HVACAux.DoubleGlazing));
hvacElement.Add(new XElement(_defaultNamespace + XMLNames.Bus_AdjustableAuxiliaryHeater, _inputData.HVACAux.AdjustableAuxiliaryHeater));
hvacElement.Add(new XElement(_defaultNamespace + XMLNames.Bus_SeparateAirDistributionDucts, _inputData.HVACAux.SeparateAirDistributionDucts));
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs
index a1a749c1215e0d97958825f8dfd3728b1653647c..a507e1eb0df473d773b6e8c241b49ea7e8fb683d 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs
@@ -53,16 +53,16 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
public MultistageAuxiliariesViewModel(IBusAuxiliariesDeclarationData consolidatedAuxiliariesInputData)
{
ConsolidatedInputData = consolidatedAuxiliariesInputData;
- if (ConsolidatedInputData?.HVACAux?.HeatPumpPassengerCompartments != null) {
+ if (ConsolidatedInputData?.HVACAux?.HeatPumpTypeCoolingPassengerCompartment != null) {
_consolidatedHeatPumpConfigurationsPassenger = new ObservableCollection<HeatPumpConfiguration>();
- foreach (var (heatPumpType, heatPumpMode) in ConsolidatedInputData?.HVACAux?.HeatPumpPassengerCompartments) {
- ConsolidatedHeatPumpConfigurationsPassenger.Add(new HeatPumpConfiguration()
- {
- HeatPumpMode = heatPumpMode,
- HeatPumpType = heatPumpType,
- IsReadOnly = true,
- });
- }
+ //foreach (var (heatPumpType, heatPumpMode) in ConsolidatedInputData?.HVACAux?.HeatPumpPassengerCompartments) {
+ // ConsolidatedHeatPumpConfigurationsPassenger.Add(new HeatPumpConfiguration()
+ // {
+ // HeatPumpMode = heatPumpMode,
+ // HeatPumpType = heatPumpType,
+ // IsReadOnly = true,
+ // });
+ //}
}
CreateParameterViewModels();
@@ -80,7 +80,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
nameof(HeadlightsLED),
nameof(SystemConfiguration),
- nameof(HeatPumpModeDriverCompartment),
+ nameof(HeatPumpTypeDriverCompartment),
nameof(HeatPumpTypeDriverCompartment),
nameof(AuxHeaterPower),
@@ -129,12 +129,12 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
ConsolidatedInputData?.ElectricConsumers.HeadlightsLED;
_parameterViewModels[nameof(SystemConfiguration)].PreviousContent =
ConsolidatedInputData?.HVACAux.SystemConfiguration;
- _parameterViewModels[nameof(HeatPumpModeDriverCompartment)].PreviousContent =
- ConsolidatedInputData?.HVACAux.HeatPumpModeDriverCompartment;
+ _parameterViewModels[nameof(HeatPumpTypeDriverCompartment)].PreviousContent =
+ ConsolidatedInputData?.HVACAux.HeatPumpTypeHeatingDriverCompartment;
//_parameterViewModels[nameof(HeatPumpTypePassengerCompartment)].PreviousContent =
// ConsolidatedInputData?.HVACAux.HeatPumpTypePassengerCompartment;
_parameterViewModels[nameof(HeatPumpTypeDriverCompartment)].PreviousContent =
- ConsolidatedInputData?.HVACAux.HeatPumpTypeDriverCompartment;
+ ConsolidatedInputData?.HVACAux.HeatPumpTypeCoolingDriverCompartment;
//_parameterViewModels[nameof(HeatPumpModePassengerCompartment)].PreviousContent =
// ConsolidatedInputData?.HVACAux.HeatPumpModePassengerCompartment;
_parameterViewModels[nameof(AuxHeaterPower)].PreviousContent =
@@ -157,14 +157,14 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
};
_parameterViewModels[nameof(SystemConfiguration)].EditingChangedCallback =
HeatPumpGroupEditingEnabledCallback;
- _parameterViewModels[nameof(HeatPumpModeDriverCompartment)].EditingChangedCallback =
+ _parameterViewModels[nameof(HeatPumpTypeDriverCompartment)].EditingChangedCallback =
HeatPumpGroupEditingEnabledCallback;
_parameterViewModels[nameof(HeatPumpTypeDriverCompartment)].EditingChangedCallback =
HeatPumpGroupEditingEnabledCallback;
//Setup AllowedValues
- HeatPumpModeDriverCompartmentAllowedValues =
- EnumHelper.GetValuesAsObservableCollectionExcluding<Enum, HeatPumpMode>(HeatPumpMode.N_A);
+ //HeatPumpModeDriverCompartmentAllowedValues =
+ // EnumHelper.GetValuesAsObservableCollectionExcluding<Enum, HeatPumpMode>(HeatPumpMode.N_A);
SystemConfigurationAllowedValues =
EnumHelper.GetValuesAsObservableCollectionExcluding<Enum, BusHVACSystemConfiguration>(
@@ -191,21 +191,21 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
HeatPumpGroupEditingEnabled = componentsAuxiliaryInputData.HVACAux != null;
SystemConfiguration = componentsAuxiliaryInputData.HVACAux?.SystemConfiguration;
- HeatPumpTypeDriverCompartment = componentsAuxiliaryInputData.HVACAux?.HeatPumpTypeDriverCompartment;
- HeatPumpModeDriverCompartment = componentsAuxiliaryInputData.HVACAux?.HeatPumpModeDriverCompartment;
+ HeatPumpTypeDriverCompartment = componentsAuxiliaryInputData.HVACAux?.HeatPumpTypeCoolingDriverCompartment;
+ //HeatPumpModeDriverCompartment = componentsAuxiliaryInputData.HVACAux?.HeatPumpModeDriverCompartment;
HeatPumpConfigurationsPassenger = null;
HeatPumpConfigurationsPassenger = new ObservableCollection<HeatPumpConfiguration>();
- if (componentsAuxiliaryInputData?.HVACAux?.HeatPumpPassengerCompartments != null)
- {
- foreach (var (heatPumpType, heatPumpMode) in componentsAuxiliaryInputData.HVACAux.HeatPumpPassengerCompartments)
- {
- HeatPumpConfigurationsPassenger.Add(new HeatPumpConfiguration()
- {
- HeatPumpType = heatPumpType,
- HeatPumpMode = heatPumpMode,
- });
- }
- }
+ //if (componentsAuxiliaryInputData?.HVACAux?.HeatPumpTypeCoolingPassengerCompartment != null)
+ //{
+ // foreach (var (heatPumpType, heatPumpMode) in componentsAuxiliaryInputData.HVACAux.HeatPumpPassengerCompartments)
+ // {
+ // HeatPumpConfigurationsPassenger.Add(new HeatPumpConfiguration()
+ // {
+ // HeatPumpType = heatPumpType,
+ // HeatPumpMode = heatPumpMode,
+ // });
+ // }
+ //}
@@ -299,7 +299,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
private bool _heatPumpGroupEditingEnabled;
private BusHVACSystemConfiguration? _systemConfiguration;
private HeatPumpType? _heatPumpTypeDriverCompartment;
- private HeatPumpMode? _heatPumpModeDriverCompartment;
+ //private HeatPumpMode? _heatPumpModeDriverCompartment;
@@ -320,6 +320,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
private bool? _otherHeatingTechnology;
+ public HeatPumpType? HeatPumpTypeHeatingPassengerCompartment { get; }
public Watt AuxHeaterPower
{
@@ -406,22 +407,22 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
}
}
- public IList<Tuple<HeatPumpType, HeatPumpMode>> HeatPumpPassengerCompartments{
- get
- {
- IList<Tuple<HeatPumpType,HeatPumpMode>> list = null;
- if (HeatPumpConfigurationsPassenger != null) {
- list = new List<Tuple<HeatPumpType, HeatPumpMode>>();
- foreach (var heatPumpConfiguration in HeatPumpConfigurationsPassenger)
- {
- list.Add(new Tuple<HeatPumpType, HeatPumpMode>((HeatPumpType)heatPumpConfiguration.HeatPumpType, (HeatPumpMode)heatPumpConfiguration.HeatPumpMode));
- }
- }
+ //public IList<Tuple<HeatPumpType, HeatPumpMode>> HeatPumpPassengerCompartments{
+ // get
+ // {
+ // IList<Tuple<HeatPumpType,HeatPumpMode>> list = null;
+ // if (HeatPumpConfigurationsPassenger != null) {
+ // list = new List<Tuple<HeatPumpType, HeatPumpMode>>();
+ // foreach (var heatPumpConfiguration in HeatPumpConfigurationsPassenger)
+ // {
+ // list.Add(new Tuple<HeatPumpType, HeatPumpMode>((HeatPumpType)heatPumpConfiguration.HeatPumpType, (HeatPumpMode)heatPumpConfiguration.HeatPumpMode));
+ // }
+ // }
- return list;
- }
- }
+ // return list;
+ // }
+ //}
public ObservableCollection<HeatPumpConfiguration> ConsolidatedHeatPumpConfigurationsPassenger
{
@@ -442,7 +443,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
public MultistageParameterViewModel HeatPumpModeVM { get; }
private HeatPumpType? _heatPumpType;
- private HeatPumpMode? _heatPumpMode;
+ //private HeatPumpMode? _heatPumpMode;
public HeatPumpType? HeatPumpType
{
@@ -453,15 +454,15 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
if (value == TUGraz.VectoCommon.BusAuxiliaries.HeatPumpType.none)
{
- HeatPumpModeVM.AllowedItems =
- EnumHelper.GetValuesAsObservableCollectionIncluding<Enum, HeatPumpMode>(
- items: TUGraz.VectoCommon.BusAuxiliaries.HeatPumpMode.N_A);
+ //HeatPumpModeVM.AllowedItems =
+ // EnumHelper.GetValuesAsObservableCollectionIncluding<Enum, HeatPumpMode>(
+ // items: TUGraz.VectoCommon.BusAuxiliaries.HeatPumpMode.N_A);
}
else
{
- HeatPumpModeVM.AllowedItems =
- EnumHelper.GetValuesAsObservableCollectionExcluding<Enum, HeatPumpMode>(
- items: TUGraz.VectoCommon.BusAuxiliaries.HeatPumpMode.N_A);
+ //HeatPumpModeVM.AllowedItems =
+ // EnumHelper.GetValuesAsObservableCollectionExcluding<Enum, HeatPumpMode>(
+ // items: TUGraz.VectoCommon.BusAuxiliaries.HeatPumpMode.N_A);
}
HeatPumpTypeVM.CurrentContent = value;
@@ -470,30 +471,30 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
}
- public HeatPumpMode? HeatPumpMode
- {
- get => _heatPumpMode;
- set
- {
- if (SetProperty(ref _heatPumpMode, value)) {
- HeatPumpModeVM.CurrentContent = value;
- }
- }
- }
+ //public HeatPumpMode? HeatPumpMode
+ //{
+ // get => _heatPumpMode;
+ // set
+ // {
+ // if (SetProperty(ref _heatPumpMode, value)) {
+ // HeatPumpModeVM.CurrentContent = value;
+ // }
+ // }
+ //}
public HeatPumpConfiguration()
{
- HeatPumpModeVM = new MultistageParameterViewModel(nameof(HeatPumpMode), null, this, ViewMode.COMBOBOX,
- mandatory: true, resourceManagers: new ResourceManager[] {
- BusStrings.ResourceManager,
- Strings.ResourceManager,
- }) {
- AllowedItems = EnumHelper.GetValuesAsObservableCollectionExcluding<Enum, HeatPumpMode>(items: TUGraz.VectoCommon.BusAuxiliaries.HeatPumpMode.N_A)
- };
- HeatPumpTypeVM = new MultistageParameterViewModel(nameof(HeatPumpType), null, this, ViewMode.COMBOBOX,
- mandatory: true, resourceManagers: new ResourceManager[] {
- BusStrings.ResourceManager,
- Strings.ResourceManager,
- });
+ //HeatPumpModeVM = new MultistageParameterViewModel(nameof(HeatPumpMode), null, this, ViewMode.COMBOBOX,
+ // mandatory: true, resourceManagers: new ResourceManager[] {
+ // BusStrings.ResourceManager,
+ // Strings.ResourceManager,
+ // }) {
+ // AllowedItems = EnumHelper.GetValuesAsObservableCollectionExcluding<Enum, HeatPumpMode>(items: TUGraz.VectoCommon.BusAuxiliaries.HeatPumpMode.N_A)
+ //};
+ //HeatPumpTypeVM = new MultistageParameterViewModel(nameof(HeatPumpType), null, this, ViewMode.COMBOBOX,
+ // mandatory: true, resourceManagers: new ResourceManager[] {
+ // BusStrings.ResourceManager,
+ // Strings.ResourceManager,
+ // });
}
public bool IsReadOnly
@@ -533,11 +534,11 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
result = $"{columnName} must not be empty";
}
break;
- case nameof(HeatPumpMode):
- if (HeatPumpMode == null) {
- result = $"{columnName} must not be empty";
- }
- break;
+ //case nameof(HeatPumpMode):
+ // if (HeatPumpMode == null) {
+ // result = $"{columnName} must not be empty";
+ // }
+ // break;
default:
result = null;
break;
@@ -577,7 +578,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
set
{
if (SetProperty(ref _heatPumpGroupEditingEnabled, value)) {
- _parameterViewModels[nameof(HeatPumpModeDriverCompartment)].EditingEnabled = value;
+ //_parameterViewModels[nameof(HeatPumpModeDriverCompartment)].EditingEnabled = value;
_parameterViewModels[nameof(HeatPumpTypeDriverCompartment)].EditingEnabled = value;
_parameterViewModels[nameof(SystemConfiguration)].EditingEnabled = value;
if (value == false) {
@@ -610,6 +611,10 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
set => SetProperty(ref _systemConfiguration, value);
}
+ public HeatPumpType? HeatPumpTypeCoolingDriverCompartment { get; }
+ public HeatPumpType? HeatPumpTypeHeatingDriverCompartment { get; }
+ public HeatPumpType? HeatPumpTypeCoolingPassengerCompartment { get; }
+
public HeatPumpType? HeatPumpTypeDriverCompartment
{
get => _heatPumpTypeDriverCompartment;
@@ -618,15 +623,15 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
if (SetProperty(ref _heatPumpTypeDriverCompartment, value)) {
if (value == HeatPumpType.none)
{
- HeatPumpModeDriverCompartmentAllowedValues =
- EnumHelper.GetValuesAsObservableCollectionIncluding<Enum, HeatPumpMode>(items: HeatPumpMode.N_A);
+ //HeatPumpModeDriverCompartmentAllowedValues =
+ // EnumHelper.GetValuesAsObservableCollectionIncluding<Enum, HeatPumpMode>(items: HeatPumpMode.N_A);
}
else
{
- HeatPumpModeDriverCompartmentAllowedValues =
- EnumHelper.GetValuesAsObservableCollectionExcluding<Enum, HeatPumpMode>(
- items: HeatPumpMode.N_A);
+ //HeatPumpModeDriverCompartmentAllowedValues =
+ // EnumHelper.GetValuesAsObservableCollectionExcluding<Enum, HeatPumpMode>(
+ // items: HeatPumpMode.N_A);
}
@@ -634,11 +639,11 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
}
}
- public HeatPumpMode? HeatPumpModeDriverCompartment
- {
- get => _heatPumpModeDriverCompartment;
- set => SetProperty(ref _heatPumpModeDriverCompartment, value);
- }
+ //public HeatPumpMode? HeatPumpModeDriverCompartment
+ //{
+ // get => _heatPumpModeDriverCompartment;
+ // set => SetProperty(ref _heatPumpModeDriverCompartment, value);
+ //}
private ObservableCollection<Enum> _heatPumpModeDriverCompartmentAllowedValues;
@@ -651,7 +656,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
private set
{
if (SetProperty(ref _heatPumpModeDriverCompartmentAllowedValues, value)) {
- _parameterViewModels[nameof(HeatPumpModeDriverCompartment)].AllowedItems = value;
+ //_parameterViewModels[nameof(HeatPumpModeDriverCompartment)].AllowedItems = value;
};
}
}
@@ -813,7 +818,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
switch (propertyName)
{
case nameof(HeatPumpTypeDriverCompartment):
- case nameof(HeatPumpModeDriverCompartment):
+ //case nameof(HeatPumpModeDriverCompartment):
case nameof(SystemConfiguration):
if (HeatPumpGroupEditingEnabled == true &&
this.GetType().GetProperty(propertyName).GetValue(this) == null) {
diff --git a/Vecto3GUI2020Test/ViewModelTests/LoadAndSaveVehicleData.cs b/Vecto3GUI2020Test/ViewModelTests/LoadAndSaveVehicleData.cs
index 43d10665153d00b3f3c05249ee0c2c3e5e2bf48b..18ec31846ffd3dfaba42603b35bda2aa08ab3071 100644
--- a/Vecto3GUI2020Test/ViewModelTests/LoadAndSaveVehicleData.cs
+++ b/Vecto3GUI2020Test/ViewModelTests/LoadAndSaveVehicleData.cs
@@ -61,7 +61,7 @@ namespace Vecto3GUI2020Test
auxVm.SystemConfiguration = BusHVACSystemConfiguration.Configuration2;
auxVm.HeatPumpTypeDriverCompartment = HeatPumpType.non_R_744_2_stage;
- auxVm.HeatPumpModeDriverCompartment = (HeatPumpMode)auxVm.HeatPumpModeDriverCompartmentAllowedValues[0];
+ //auxVm.HeatPumpModeDriverCompartment = (HeatPumpMode)auxVm.HeatPumpModeDriverCompartmentAllowedValues[0];
var multistageJob = newMultiStageJob.MultiStageJobViewModel as MultiStageJobViewModel_v0_1;
multistageJob.ManufacturingStageViewModel.SaveInputDataExecute(GetFullPath(stageInputFileName));
@@ -411,17 +411,17 @@ namespace Vecto3GUI2020Test
private void TestHVACComponent(IHVACBusAuxiliariesDeclarationData hvacAux)
{
Assert.AreEqual(BusHVACSystemConfiguration.Configuration0, hvacAux.SystemConfiguration);
- Assert.AreEqual(HeatPumpType.none, hvacAux.HeatPumpTypeDriverCompartment);
- Assert.AreEqual(HeatPumpMode.heating, hvacAux.HeatPumpModeDriverCompartment);
+ //Assert.AreEqual(HeatPumpType.none, hvacAux.HeatPumpTypeDriverCompartment);
+ //Assert.AreEqual(HeatPumpMode.heating, hvacAux.HeatPumpModeDriverCompartment);
- Assert.AreEqual(HeatPumpType.non_R_744_2_stage, hvacAux.HeatPumpPassengerCompartments[0].Item1);
- Assert.AreEqual(HeatPumpMode.cooling, hvacAux.HeatPumpPassengerCompartments[0].Item2);
+ //Assert.AreEqual(HeatPumpType.non_R_744_2_stage, hvacAux.HeatPumpPassengerCompartments[0].Item1);
+ //Assert.AreEqual(HeatPumpMode.cooling, hvacAux.HeatPumpPassengerCompartments[0].Item2);
- Assert.AreEqual(HeatPumpType.non_R_744_3_stage, hvacAux.HeatPumpPassengerCompartments[1].Item1);
- Assert.AreEqual(HeatPumpMode.heating, hvacAux.HeatPumpPassengerCompartments[1].Item2);
+ //Assert.AreEqual(HeatPumpType.non_R_744_3_stage, hvacAux.HeatPumpPassengerCompartments[1].Item1);
+ //Assert.AreEqual(HeatPumpMode.heating, hvacAux.HeatPumpPassengerCompartments[1].Item2);
- Assert.AreEqual(HeatPumpType.non_R_744_2_stage, hvacAux.HeatPumpPassengerCompartments[2].Item1);
- Assert.AreEqual(HeatPumpMode.cooling, hvacAux.HeatPumpPassengerCompartments[2].Item2);
+ //Assert.AreEqual(HeatPumpType.non_R_744_2_stage, hvacAux.HeatPumpPassengerCompartments[2].Item1);
+ //Assert.AreEqual(HeatPumpMode.cooling, hvacAux.HeatPumpPassengerCompartments[2].Item2);
Assert.AreEqual(50, hvacAux.AuxHeaterPower.Value());
Assert.AreEqual(false, hvacAux.DoubleGlazing);
diff --git a/Vecto3GUI2020Test/ViewModelTests/MultistageAuxiliariesViewModelTests.cs b/Vecto3GUI2020Test/ViewModelTests/MultistageAuxiliariesViewModelTests.cs
index 801e095995c191e606368b3edbac1dd74d623a13..86b58f173dfeeef7c2fc66088fcb06eb8eb4a84e 100644
--- a/Vecto3GUI2020Test/ViewModelTests/MultistageAuxiliariesViewModelTests.cs
+++ b/Vecto3GUI2020Test/ViewModelTests/MultistageAuxiliariesViewModelTests.cs
@@ -36,14 +36,14 @@ namespace Vecto3GUI2020Test.ViewModelTests
{
var auxVm = new MultistageAuxiliariesViewModel(null);
auxVm.HeatPumpTypeDriverCompartment = HeatPumpType.none;
- Assert.IsTrue(auxVm.HeatPumpModeDriverCompartmentAllowedValues.Contains(HeatPumpMode.N_A));
- Assert.IsFalse(auxVm.HeatPumpModeDriverCompartmentAllowedValues.Contains(HeatPumpMode.cooling));
- Assert.IsFalse(auxVm.HeatPumpModeDriverCompartmentAllowedValues.Contains(HeatPumpMode.heating));
- Assert.IsFalse(auxVm.HeatPumpModeDriverCompartmentAllowedValues.Contains(HeatPumpMode.heating_and_cooling));
+ //Assert.IsTrue(auxVm.HeatPumpModeDriverCompartmentAllowedValues.Contains(HeatPumpMode.N_A));
+ //Assert.IsFalse(auxVm.HeatPumpModeDriverCompartmentAllowedValues.Contains(HeatPumpMode.cooling));
+ //Assert.IsFalse(auxVm.HeatPumpModeDriverCompartmentAllowedValues.Contains(HeatPumpMode.heating));
+ //Assert.IsFalse(auxVm.HeatPumpModeDriverCompartmentAllowedValues.Contains(HeatPumpMode.heating_and_cooling));
- auxVm.HeatPumpTypeDriverCompartment = HeatPumpType.R_744;
- Assert.IsFalse(auxVm.HeatPumpModeDriverCompartmentAllowedValues.Contains(HeatPumpMode.N_A));
+ //auxVm.HeatPumpTypeDriverCompartment = HeatPumpType.R_744;
+ //Assert.IsFalse(auxVm.HeatPumpModeDriverCompartmentAllowedValues.Contains(HeatPumpMode.N_A));
}
@@ -74,12 +74,12 @@ namespace Vecto3GUI2020Test.ViewModelTests
{
var auxVm = new MultistageAuxiliariesViewModel(null);
auxVm.HeatPumpTypeDriverCompartment = HeatPumpType.none;
- auxVm.HeatPumpModeDriverCompartment = HeatPumpMode.N_A;
- auxVm.HeatPumpGroupEditingEnabled = false;
- auxVm.HeatPumpGroupEditingEnabled = true;
- Assert.AreEqual(HeatPumpMode.N_A, auxVm.HeatPumpModeDriverCompartment);
- Assert.AreEqual(HeatPumpMode.N_A,
- auxVm.ParameterViewModels[nameof(auxVm.HeatPumpModeDriverCompartment)].CurrentContent);
+ //auxVm.HeatPumpModeDriverCompartment = HeatPumpMode.N_A;
+ //auxVm.HeatPumpGroupEditingEnabled = false;
+ //auxVm.HeatPumpGroupEditingEnabled = true;
+ //Assert.AreEqual(HeatPumpMode.N_A, auxVm.HeatPumpModeDriverCompartment);
+ //Assert.AreEqual(HeatPumpMode.N_A,
+ // auxVm.ParameterViewModels[nameof(auxVm.HeatPumpModeDriverCompartment)].CurrentContent);
}
[Test]