Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit 0c48c375 authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

make new gui compile after changes in hvac input data

parent c9e4e79b
No related branches found
No related tags found
No related merge requests found
...@@ -38,7 +38,7 @@ namespace VECTO3GUI2020 ...@@ -38,7 +38,7 @@ namespace VECTO3GUI2020
private Meter _meter; private Meter _meter;
private HeatPumpMode? _heatpumpMode; //private HeatPumpMode? _heatpumpMode;
private string _testString; private string _testString;
public Meter Meter public Meter Meter
...@@ -47,30 +47,30 @@ namespace VECTO3GUI2020 ...@@ -47,30 +47,30 @@ namespace VECTO3GUI2020
set => SetProperty(ref _meter, value); set => SetProperty(ref _meter, value);
} }
public HeatPumpMode? HeatPumpMode //public HeatPumpMode? HeatPumpMode
{ //{
get => _heatpumpMode; // get => _heatpumpMode;
set => SetProperty(ref _heatpumpMode, value); // set => SetProperty(ref _heatpumpMode, value);
} //}
private IList<HeatPumpMode> allowedValues = new List<HeatPumpMode>(){ //private IList<HeatPumpMode> allowedValues = new List<HeatPumpMode>(){
TUGraz.VectoCommon.BusAuxiliaries.HeatPumpMode.cooling, // TUGraz.VectoCommon.BusAuxiliaries.HeatPumpMode.cooling,
TUGraz.VectoCommon.BusAuxiliaries.HeatPumpMode.heating_and_cooling // TUGraz.VectoCommon.BusAuxiliaries.HeatPumpMode.heating_and_cooling
}; //};
private HeatPumpMode? _heatpumpMode2; //private HeatPumpMode? _heatpumpMode2;
private bool _enabled; private bool _enabled;
public bool enabled { get => _enabled; set => SetProperty(ref _enabled, value); } public bool enabled { get => _enabled; set => SetProperty(ref _enabled, value); }
public HeatPumpMode? HeatPumpMode2 //public HeatPumpMode? HeatPumpMode2
{ //{
get => _heatpumpMode2; // get => _heatpumpMode2;
set => SetProperty(ref _heatpumpMode2, value); // set => SetProperty(ref _heatpumpMode2, value);
} //}
public ObservableCollection<Enum> HeatPumpModeListItems //public ObservableCollection<Enum> HeatPumpModeListItems
{ //{
get => new ObservableCollection<Enum>(allowedValues.Cast<Enum>()); // get => new ObservableCollection<Enum>(allowedValues.Cast<Enum>());
} //}
public String TestString public String TestString
{ {
......
...@@ -84,20 +84,20 @@ namespace VECTO3GUI2020.Util.XML.Implementation.ComponentWriter ...@@ -84,20 +84,20 @@ namespace VECTO3GUI2020.Util.XML.Implementation.ComponentWriter
if (_inputData.HVACAux != null) { if (_inputData.HVACAux != null) {
var hvacElement = new XElement(_defaultNamespace + "HVAC"); var hvacElement = new XElement(_defaultNamespace + "HVAC");
hvacElement.Add(new XElement(_defaultNamespace + XMLNames.Bus_SystemConfiguration, _inputData.HVACAux.SystemConfiguration.GetXmlFormat())); //hvacElement.Add(new XElement(_defaultNamespace + XMLNames.Bus_SystemConfiguration, _inputData.HVACAux.SystemConfiguration.GetXmlFormat()));
var heatPumpTypeLabel = _inputData.HVACAux.HeatPumpTypeDriverCompartment.GetLabel(); //var heatPumpTypeLabel = _inputData.HVACAux.HeatPumpTypeDriverCompartment.GetLabel();
if (heatPumpTypeLabel == "~null~") { //if (heatPumpTypeLabel == "~null~") {
heatPumpTypeLabel = null; // heatPumpTypeLabel = null;
} //}
hvacElement.Add(new XElement(_defaultNamespace + XMLNames.Bus_HeatPumpTypeDriver, heatPumpTypeLabel)); //hvacElement.Add(new XElement(_defaultNamespace + XMLNames.Bus_HeatPumpTypeDriver, heatPumpTypeLabel));
hvacElement.Add(new XElement(_defaultNamespace + XMLNames.Bus_HeatPumpModeDriver, _inputData.HVACAux.HeatPumpModeDriverCompartment.GetLabel())); //hvacElement.Add(new XElement(_defaultNamespace + XMLNames.Bus_HeatPumpModeDriver, _inputData.HVACAux.HeatPumpModeDriverCompartment.GetLabel()));
//TODO ////TODO
if (_inputData.HVACAux.HeatPumpPassengerCompartments != null) { //if (_inputData.HVACAux.HeatPumpPassengerCompartments != null) {
foreach (var (heatPumpType, heatPumpMode) in _inputData.HVACAux.HeatPumpPassengerCompartments) { // 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_HeatPumpTypePassenger, heatPumpType.GetLabel()));
hvacElement.Add(new XElement(_defaultNamespace + XMLNames.Bus_HeatPumpModePassenger, heatPumpMode.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_AuxiliaryHeaterPower, _inputData.HVACAux.AuxHeaterPower?.ToXMLFormat(0)));
......
...@@ -53,16 +53,16 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation ...@@ -53,16 +53,16 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
public MultistageAuxiliariesViewModel(IBusAuxiliariesDeclarationData consolidatedAuxiliariesInputData) public MultistageAuxiliariesViewModel(IBusAuxiliariesDeclarationData consolidatedAuxiliariesInputData)
{ {
ConsolidatedInputData = consolidatedAuxiliariesInputData; ConsolidatedInputData = consolidatedAuxiliariesInputData;
if (ConsolidatedInputData?.HVACAux?.HeatPumpPassengerCompartments != null) { if (ConsolidatedInputData?.HVACAux?.HeatPumpTypeCoolingPassengerCompartment != null) {
_consolidatedHeatPumpConfigurationsPassenger = new ObservableCollection<HeatPumpConfiguration>(); _consolidatedHeatPumpConfigurationsPassenger = new ObservableCollection<HeatPumpConfiguration>();
foreach (var (heatPumpType, heatPumpMode) in ConsolidatedInputData?.HVACAux?.HeatPumpPassengerCompartments) { //foreach (var (heatPumpType, heatPumpMode) in ConsolidatedInputData?.HVACAux?.HeatPumpPassengerCompartments) {
ConsolidatedHeatPumpConfigurationsPassenger.Add(new HeatPumpConfiguration() // ConsolidatedHeatPumpConfigurationsPassenger.Add(new HeatPumpConfiguration()
{ // {
HeatPumpMode = heatPumpMode, // HeatPumpMode = heatPumpMode,
HeatPumpType = heatPumpType, // HeatPumpType = heatPumpType,
IsReadOnly = true, // IsReadOnly = true,
}); // });
} //}
} }
CreateParameterViewModels(); CreateParameterViewModels();
...@@ -80,7 +80,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation ...@@ -80,7 +80,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
nameof(HeadlightsLED), nameof(HeadlightsLED),
nameof(SystemConfiguration), nameof(SystemConfiguration),
nameof(HeatPumpModeDriverCompartment), nameof(HeatPumpTypeDriverCompartment),
nameof(HeatPumpTypeDriverCompartment), nameof(HeatPumpTypeDriverCompartment),
nameof(AuxHeaterPower), nameof(AuxHeaterPower),
...@@ -129,12 +129,12 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation ...@@ -129,12 +129,12 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
ConsolidatedInputData?.ElectricConsumers.HeadlightsLED; ConsolidatedInputData?.ElectricConsumers.HeadlightsLED;
_parameterViewModels[nameof(SystemConfiguration)].PreviousContent = _parameterViewModels[nameof(SystemConfiguration)].PreviousContent =
ConsolidatedInputData?.HVACAux.SystemConfiguration; ConsolidatedInputData?.HVACAux.SystemConfiguration;
_parameterViewModels[nameof(HeatPumpModeDriverCompartment)].PreviousContent = _parameterViewModels[nameof(HeatPumpTypeDriverCompartment)].PreviousContent =
ConsolidatedInputData?.HVACAux.HeatPumpModeDriverCompartment; ConsolidatedInputData?.HVACAux.HeatPumpTypeHeatingDriverCompartment;
//_parameterViewModels[nameof(HeatPumpTypePassengerCompartment)].PreviousContent = //_parameterViewModels[nameof(HeatPumpTypePassengerCompartment)].PreviousContent =
// ConsolidatedInputData?.HVACAux.HeatPumpTypePassengerCompartment; // ConsolidatedInputData?.HVACAux.HeatPumpTypePassengerCompartment;
_parameterViewModels[nameof(HeatPumpTypeDriverCompartment)].PreviousContent = _parameterViewModels[nameof(HeatPumpTypeDriverCompartment)].PreviousContent =
ConsolidatedInputData?.HVACAux.HeatPumpTypeDriverCompartment; ConsolidatedInputData?.HVACAux.HeatPumpTypeCoolingDriverCompartment;
//_parameterViewModels[nameof(HeatPumpModePassengerCompartment)].PreviousContent = //_parameterViewModels[nameof(HeatPumpModePassengerCompartment)].PreviousContent =
// ConsolidatedInputData?.HVACAux.HeatPumpModePassengerCompartment; // ConsolidatedInputData?.HVACAux.HeatPumpModePassengerCompartment;
_parameterViewModels[nameof(AuxHeaterPower)].PreviousContent = _parameterViewModels[nameof(AuxHeaterPower)].PreviousContent =
...@@ -157,14 +157,14 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation ...@@ -157,14 +157,14 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
}; };
_parameterViewModels[nameof(SystemConfiguration)].EditingChangedCallback = _parameterViewModels[nameof(SystemConfiguration)].EditingChangedCallback =
HeatPumpGroupEditingEnabledCallback; HeatPumpGroupEditingEnabledCallback;
_parameterViewModels[nameof(HeatPumpModeDriverCompartment)].EditingChangedCallback = _parameterViewModels[nameof(HeatPumpTypeDriverCompartment)].EditingChangedCallback =
HeatPumpGroupEditingEnabledCallback; HeatPumpGroupEditingEnabledCallback;
_parameterViewModels[nameof(HeatPumpTypeDriverCompartment)].EditingChangedCallback = _parameterViewModels[nameof(HeatPumpTypeDriverCompartment)].EditingChangedCallback =
HeatPumpGroupEditingEnabledCallback; HeatPumpGroupEditingEnabledCallback;
//Setup AllowedValues //Setup AllowedValues
HeatPumpModeDriverCompartmentAllowedValues = //HeatPumpModeDriverCompartmentAllowedValues =
EnumHelper.GetValuesAsObservableCollectionExcluding<Enum, HeatPumpMode>(HeatPumpMode.N_A); // EnumHelper.GetValuesAsObservableCollectionExcluding<Enum, HeatPumpMode>(HeatPumpMode.N_A);
SystemConfigurationAllowedValues = SystemConfigurationAllowedValues =
EnumHelper.GetValuesAsObservableCollectionExcluding<Enum, BusHVACSystemConfiguration>( EnumHelper.GetValuesAsObservableCollectionExcluding<Enum, BusHVACSystemConfiguration>(
...@@ -191,21 +191,21 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation ...@@ -191,21 +191,21 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
HeatPumpGroupEditingEnabled = componentsAuxiliaryInputData.HVACAux != null; HeatPumpGroupEditingEnabled = componentsAuxiliaryInputData.HVACAux != null;
SystemConfiguration = componentsAuxiliaryInputData.HVACAux?.SystemConfiguration; SystemConfiguration = componentsAuxiliaryInputData.HVACAux?.SystemConfiguration;
HeatPumpTypeDriverCompartment = componentsAuxiliaryInputData.HVACAux?.HeatPumpTypeDriverCompartment; HeatPumpTypeDriverCompartment = componentsAuxiliaryInputData.HVACAux?.HeatPumpTypeCoolingDriverCompartment;
HeatPumpModeDriverCompartment = componentsAuxiliaryInputData.HVACAux?.HeatPumpModeDriverCompartment; //HeatPumpModeDriverCompartment = componentsAuxiliaryInputData.HVACAux?.HeatPumpModeDriverCompartment;
HeatPumpConfigurationsPassenger = null; HeatPumpConfigurationsPassenger = null;
HeatPumpConfigurationsPassenger = new ObservableCollection<HeatPumpConfiguration>(); HeatPumpConfigurationsPassenger = new ObservableCollection<HeatPumpConfiguration>();
if (componentsAuxiliaryInputData?.HVACAux?.HeatPumpPassengerCompartments != null) //if (componentsAuxiliaryInputData?.HVACAux?.HeatPumpTypeCoolingPassengerCompartment != null)
{ //{
foreach (var (heatPumpType, heatPumpMode) in componentsAuxiliaryInputData.HVACAux.HeatPumpPassengerCompartments) // foreach (var (heatPumpType, heatPumpMode) in componentsAuxiliaryInputData.HVACAux.HeatPumpPassengerCompartments)
{ // {
HeatPumpConfigurationsPassenger.Add(new HeatPumpConfiguration() // HeatPumpConfigurationsPassenger.Add(new HeatPumpConfiguration()
{ // {
HeatPumpType = heatPumpType, // HeatPumpType = heatPumpType,
HeatPumpMode = heatPumpMode, // HeatPumpMode = heatPumpMode,
}); // });
} // }
} //}
...@@ -299,7 +299,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation ...@@ -299,7 +299,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
private bool _heatPumpGroupEditingEnabled; private bool _heatPumpGroupEditingEnabled;
private BusHVACSystemConfiguration? _systemConfiguration; private BusHVACSystemConfiguration? _systemConfiguration;
private HeatPumpType? _heatPumpTypeDriverCompartment; private HeatPumpType? _heatPumpTypeDriverCompartment;
private HeatPumpMode? _heatPumpModeDriverCompartment; //private HeatPumpMode? _heatPumpModeDriverCompartment;
...@@ -320,6 +320,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation ...@@ -320,6 +320,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
private bool? _otherHeatingTechnology; private bool? _otherHeatingTechnology;
public HeatPumpType? HeatPumpTypeHeatingPassengerCompartment { get; }
public Watt AuxHeaterPower public Watt AuxHeaterPower
{ {
...@@ -406,22 +407,22 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation ...@@ -406,22 +407,22 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
} }
} }
public IList<Tuple<HeatPumpType, HeatPumpMode>> HeatPumpPassengerCompartments{ //public IList<Tuple<HeatPumpType, HeatPumpMode>> HeatPumpPassengerCompartments{
get // get
{ // {
IList<Tuple<HeatPumpType,HeatPumpMode>> list = null; // IList<Tuple<HeatPumpType,HeatPumpMode>> list = null;
if (HeatPumpConfigurationsPassenger != null) { // if (HeatPumpConfigurationsPassenger != null) {
list = new List<Tuple<HeatPumpType, HeatPumpMode>>(); // list = new List<Tuple<HeatPumpType, HeatPumpMode>>();
foreach (var heatPumpConfiguration in HeatPumpConfigurationsPassenger) // foreach (var heatPumpConfiguration in HeatPumpConfigurationsPassenger)
{ // {
list.Add(new Tuple<HeatPumpType, HeatPumpMode>((HeatPumpType)heatPumpConfiguration.HeatPumpType, (HeatPumpMode)heatPumpConfiguration.HeatPumpMode)); // list.Add(new Tuple<HeatPumpType, HeatPumpMode>((HeatPumpType)heatPumpConfiguration.HeatPumpType, (HeatPumpMode)heatPumpConfiguration.HeatPumpMode));
} // }
} // }
return list; // return list;
} // }
} //}
public ObservableCollection<HeatPumpConfiguration> ConsolidatedHeatPumpConfigurationsPassenger public ObservableCollection<HeatPumpConfiguration> ConsolidatedHeatPumpConfigurationsPassenger
{ {
...@@ -442,7 +443,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation ...@@ -442,7 +443,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
public MultistageParameterViewModel HeatPumpModeVM { get; } public MultistageParameterViewModel HeatPumpModeVM { get; }
private HeatPumpType? _heatPumpType; private HeatPumpType? _heatPumpType;
private HeatPumpMode? _heatPumpMode; //private HeatPumpMode? _heatPumpMode;
public HeatPumpType? HeatPumpType public HeatPumpType? HeatPumpType
{ {
...@@ -453,15 +454,15 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation ...@@ -453,15 +454,15 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
if (value == TUGraz.VectoCommon.BusAuxiliaries.HeatPumpType.none) if (value == TUGraz.VectoCommon.BusAuxiliaries.HeatPumpType.none)
{ {
HeatPumpModeVM.AllowedItems = //HeatPumpModeVM.AllowedItems =
EnumHelper.GetValuesAsObservableCollectionIncluding<Enum, HeatPumpMode>( // EnumHelper.GetValuesAsObservableCollectionIncluding<Enum, HeatPumpMode>(
items: TUGraz.VectoCommon.BusAuxiliaries.HeatPumpMode.N_A); // items: TUGraz.VectoCommon.BusAuxiliaries.HeatPumpMode.N_A);
} }
else else
{ {
HeatPumpModeVM.AllowedItems = //HeatPumpModeVM.AllowedItems =
EnumHelper.GetValuesAsObservableCollectionExcluding<Enum, HeatPumpMode>( // EnumHelper.GetValuesAsObservableCollectionExcluding<Enum, HeatPumpMode>(
items: TUGraz.VectoCommon.BusAuxiliaries.HeatPumpMode.N_A); // items: TUGraz.VectoCommon.BusAuxiliaries.HeatPumpMode.N_A);
} }
HeatPumpTypeVM.CurrentContent = value; HeatPumpTypeVM.CurrentContent = value;
...@@ -470,30 +471,30 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation ...@@ -470,30 +471,30 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
} }
public HeatPumpMode? HeatPumpMode //public HeatPumpMode? HeatPumpMode
{ //{
get => _heatPumpMode; // get => _heatPumpMode;
set // set
{ // {
if (SetProperty(ref _heatPumpMode, value)) { // if (SetProperty(ref _heatPumpMode, value)) {
HeatPumpModeVM.CurrentContent = value; // HeatPumpModeVM.CurrentContent = value;
} // }
} // }
} //}
public HeatPumpConfiguration() public HeatPumpConfiguration()
{ {
HeatPumpModeVM = new MultistageParameterViewModel(nameof(HeatPumpMode), null, this, ViewMode.COMBOBOX, //HeatPumpModeVM = new MultistageParameterViewModel(nameof(HeatPumpMode), null, this, ViewMode.COMBOBOX,
mandatory: true, resourceManagers: new ResourceManager[] { // mandatory: true, resourceManagers: new ResourceManager[] {
BusStrings.ResourceManager, // BusStrings.ResourceManager,
Strings.ResourceManager, // Strings.ResourceManager,
}) { // }) {
AllowedItems = EnumHelper.GetValuesAsObservableCollectionExcluding<Enum, HeatPumpMode>(items: TUGraz.VectoCommon.BusAuxiliaries.HeatPumpMode.N_A) // AllowedItems = EnumHelper.GetValuesAsObservableCollectionExcluding<Enum, HeatPumpMode>(items: TUGraz.VectoCommon.BusAuxiliaries.HeatPumpMode.N_A)
}; //};
HeatPumpTypeVM = new MultistageParameterViewModel(nameof(HeatPumpType), null, this, ViewMode.COMBOBOX, //HeatPumpTypeVM = new MultistageParameterViewModel(nameof(HeatPumpType), null, this, ViewMode.COMBOBOX,
mandatory: true, resourceManagers: new ResourceManager[] { // mandatory: true, resourceManagers: new ResourceManager[] {
BusStrings.ResourceManager, // BusStrings.ResourceManager,
Strings.ResourceManager, // Strings.ResourceManager,
}); // });
} }
public bool IsReadOnly public bool IsReadOnly
...@@ -533,11 +534,11 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation ...@@ -533,11 +534,11 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
result = $"{columnName} must not be empty"; result = $"{columnName} must not be empty";
} }
break; break;
case nameof(HeatPumpMode): //case nameof(HeatPumpMode):
if (HeatPumpMode == null) { // if (HeatPumpMode == null) {
result = $"{columnName} must not be empty"; // result = $"{columnName} must not be empty";
} // }
break; // break;
default: default:
result = null; result = null;
break; break;
...@@ -577,7 +578,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation ...@@ -577,7 +578,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
set set
{ {
if (SetProperty(ref _heatPumpGroupEditingEnabled, value)) { if (SetProperty(ref _heatPumpGroupEditingEnabled, value)) {
_parameterViewModels[nameof(HeatPumpModeDriverCompartment)].EditingEnabled = value; //_parameterViewModels[nameof(HeatPumpModeDriverCompartment)].EditingEnabled = value;
_parameterViewModels[nameof(HeatPumpTypeDriverCompartment)].EditingEnabled = value; _parameterViewModels[nameof(HeatPumpTypeDriverCompartment)].EditingEnabled = value;
_parameterViewModels[nameof(SystemConfiguration)].EditingEnabled = value; _parameterViewModels[nameof(SystemConfiguration)].EditingEnabled = value;
if (value == false) { if (value == false) {
...@@ -610,6 +611,10 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation ...@@ -610,6 +611,10 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
set => SetProperty(ref _systemConfiguration, value); set => SetProperty(ref _systemConfiguration, value);
} }
public HeatPumpType? HeatPumpTypeCoolingDriverCompartment { get; }
public HeatPumpType? HeatPumpTypeHeatingDriverCompartment { get; }
public HeatPumpType? HeatPumpTypeCoolingPassengerCompartment { get; }
public HeatPumpType? HeatPumpTypeDriverCompartment public HeatPumpType? HeatPumpTypeDriverCompartment
{ {
get => _heatPumpTypeDriverCompartment; get => _heatPumpTypeDriverCompartment;
...@@ -618,15 +623,15 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation ...@@ -618,15 +623,15 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
if (SetProperty(ref _heatPumpTypeDriverCompartment, value)) { if (SetProperty(ref _heatPumpTypeDriverCompartment, value)) {
if (value == HeatPumpType.none) if (value == HeatPumpType.none)
{ {
HeatPumpModeDriverCompartmentAllowedValues = //HeatPumpModeDriverCompartmentAllowedValues =
EnumHelper.GetValuesAsObservableCollectionIncluding<Enum, HeatPumpMode>(items: HeatPumpMode.N_A); // EnumHelper.GetValuesAsObservableCollectionIncluding<Enum, HeatPumpMode>(items: HeatPumpMode.N_A);
} }
else else
{ {
HeatPumpModeDriverCompartmentAllowedValues = //HeatPumpModeDriverCompartmentAllowedValues =
EnumHelper.GetValuesAsObservableCollectionExcluding<Enum, HeatPumpMode>( // EnumHelper.GetValuesAsObservableCollectionExcluding<Enum, HeatPumpMode>(
items: HeatPumpMode.N_A); // items: HeatPumpMode.N_A);
} }
...@@ -634,11 +639,11 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation ...@@ -634,11 +639,11 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
} }
} }
public HeatPumpMode? HeatPumpModeDriverCompartment //public HeatPumpMode? HeatPumpModeDriverCompartment
{ //{
get => _heatPumpModeDriverCompartment; // get => _heatPumpModeDriverCompartment;
set => SetProperty(ref _heatPumpModeDriverCompartment, value); // set => SetProperty(ref _heatPumpModeDriverCompartment, value);
} //}
private ObservableCollection<Enum> _heatPumpModeDriverCompartmentAllowedValues; private ObservableCollection<Enum> _heatPumpModeDriverCompartmentAllowedValues;
...@@ -651,7 +656,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation ...@@ -651,7 +656,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
private set private set
{ {
if (SetProperty(ref _heatPumpModeDriverCompartmentAllowedValues, value)) { if (SetProperty(ref _heatPumpModeDriverCompartmentAllowedValues, value)) {
_parameterViewModels[nameof(HeatPumpModeDriverCompartment)].AllowedItems = value; //_parameterViewModels[nameof(HeatPumpModeDriverCompartment)].AllowedItems = value;
}; };
} }
} }
...@@ -813,7 +818,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation ...@@ -813,7 +818,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
switch (propertyName) switch (propertyName)
{ {
case nameof(HeatPumpTypeDriverCompartment): case nameof(HeatPumpTypeDriverCompartment):
case nameof(HeatPumpModeDriverCompartment): //case nameof(HeatPumpModeDriverCompartment):
case nameof(SystemConfiguration): case nameof(SystemConfiguration):
if (HeatPumpGroupEditingEnabled == true && if (HeatPumpGroupEditingEnabled == true &&
this.GetType().GetProperty(propertyName).GetValue(this) == null) { this.GetType().GetProperty(propertyName).GetValue(this) == null) {
......
...@@ -61,7 +61,7 @@ namespace Vecto3GUI2020Test ...@@ -61,7 +61,7 @@ namespace Vecto3GUI2020Test
auxVm.SystemConfiguration = BusHVACSystemConfiguration.Configuration2; auxVm.SystemConfiguration = BusHVACSystemConfiguration.Configuration2;
auxVm.HeatPumpTypeDriverCompartment = HeatPumpType.non_R_744_2_stage; 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; var multistageJob = newMultiStageJob.MultiStageJobViewModel as MultiStageJobViewModel_v0_1;
multistageJob.ManufacturingStageViewModel.SaveInputDataExecute(GetFullPath(stageInputFileName)); multistageJob.ManufacturingStageViewModel.SaveInputDataExecute(GetFullPath(stageInputFileName));
...@@ -411,17 +411,17 @@ namespace Vecto3GUI2020Test ...@@ -411,17 +411,17 @@ namespace Vecto3GUI2020Test
private void TestHVACComponent(IHVACBusAuxiliariesDeclarationData hvacAux) private void TestHVACComponent(IHVACBusAuxiliariesDeclarationData hvacAux)
{ {
Assert.AreEqual(BusHVACSystemConfiguration.Configuration0, hvacAux.SystemConfiguration); Assert.AreEqual(BusHVACSystemConfiguration.Configuration0, hvacAux.SystemConfiguration);
Assert.AreEqual(HeatPumpType.none, hvacAux.HeatPumpTypeDriverCompartment); //Assert.AreEqual(HeatPumpType.none, hvacAux.HeatPumpTypeDriverCompartment);
Assert.AreEqual(HeatPumpMode.heating, hvacAux.HeatPumpModeDriverCompartment); //Assert.AreEqual(HeatPumpMode.heating, hvacAux.HeatPumpModeDriverCompartment);
Assert.AreEqual(HeatPumpType.non_R_744_2_stage, hvacAux.HeatPumpPassengerCompartments[0].Item1); //Assert.AreEqual(HeatPumpType.non_R_744_2_stage, hvacAux.HeatPumpPassengerCompartments[0].Item1);
Assert.AreEqual(HeatPumpMode.cooling, hvacAux.HeatPumpPassengerCompartments[0].Item2); //Assert.AreEqual(HeatPumpMode.cooling, hvacAux.HeatPumpPassengerCompartments[0].Item2);
Assert.AreEqual(HeatPumpType.non_R_744_3_stage, hvacAux.HeatPumpPassengerCompartments[1].Item1); //Assert.AreEqual(HeatPumpType.non_R_744_3_stage, hvacAux.HeatPumpPassengerCompartments[1].Item1);
Assert.AreEqual(HeatPumpMode.heating, hvacAux.HeatPumpPassengerCompartments[1].Item2); //Assert.AreEqual(HeatPumpMode.heating, hvacAux.HeatPumpPassengerCompartments[1].Item2);
Assert.AreEqual(HeatPumpType.non_R_744_2_stage, hvacAux.HeatPumpPassengerCompartments[2].Item1); //Assert.AreEqual(HeatPumpType.non_R_744_2_stage, hvacAux.HeatPumpPassengerCompartments[2].Item1);
Assert.AreEqual(HeatPumpMode.cooling, hvacAux.HeatPumpPassengerCompartments[2].Item2); //Assert.AreEqual(HeatPumpMode.cooling, hvacAux.HeatPumpPassengerCompartments[2].Item2);
Assert.AreEqual(50, hvacAux.AuxHeaterPower.Value()); Assert.AreEqual(50, hvacAux.AuxHeaterPower.Value());
Assert.AreEqual(false, hvacAux.DoubleGlazing); Assert.AreEqual(false, hvacAux.DoubleGlazing);
......
...@@ -36,14 +36,14 @@ namespace Vecto3GUI2020Test.ViewModelTests ...@@ -36,14 +36,14 @@ namespace Vecto3GUI2020Test.ViewModelTests
{ {
var auxVm = new MultistageAuxiliariesViewModel(null); var auxVm = new MultistageAuxiliariesViewModel(null);
auxVm.HeatPumpTypeDriverCompartment = HeatPumpType.none; auxVm.HeatPumpTypeDriverCompartment = HeatPumpType.none;
Assert.IsTrue(auxVm.HeatPumpModeDriverCompartmentAllowedValues.Contains(HeatPumpMode.N_A)); //Assert.IsTrue(auxVm.HeatPumpModeDriverCompartmentAllowedValues.Contains(HeatPumpMode.N_A));
Assert.IsFalse(auxVm.HeatPumpModeDriverCompartmentAllowedValues.Contains(HeatPumpMode.cooling)); //Assert.IsFalse(auxVm.HeatPumpModeDriverCompartmentAllowedValues.Contains(HeatPumpMode.cooling));
Assert.IsFalse(auxVm.HeatPumpModeDriverCompartmentAllowedValues.Contains(HeatPumpMode.heating)); //Assert.IsFalse(auxVm.HeatPumpModeDriverCompartmentAllowedValues.Contains(HeatPumpMode.heating));
Assert.IsFalse(auxVm.HeatPumpModeDriverCompartmentAllowedValues.Contains(HeatPumpMode.heating_and_cooling)); //Assert.IsFalse(auxVm.HeatPumpModeDriverCompartmentAllowedValues.Contains(HeatPumpMode.heating_and_cooling));
auxVm.HeatPumpTypeDriverCompartment = HeatPumpType.R_744; //auxVm.HeatPumpTypeDriverCompartment = HeatPumpType.R_744;
Assert.IsFalse(auxVm.HeatPumpModeDriverCompartmentAllowedValues.Contains(HeatPumpMode.N_A)); //Assert.IsFalse(auxVm.HeatPumpModeDriverCompartmentAllowedValues.Contains(HeatPumpMode.N_A));
} }
...@@ -74,12 +74,12 @@ namespace Vecto3GUI2020Test.ViewModelTests ...@@ -74,12 +74,12 @@ namespace Vecto3GUI2020Test.ViewModelTests
{ {
var auxVm = new MultistageAuxiliariesViewModel(null); var auxVm = new MultistageAuxiliariesViewModel(null);
auxVm.HeatPumpTypeDriverCompartment = HeatPumpType.none; auxVm.HeatPumpTypeDriverCompartment = HeatPumpType.none;
auxVm.HeatPumpModeDriverCompartment = HeatPumpMode.N_A; //auxVm.HeatPumpModeDriverCompartment = HeatPumpMode.N_A;
auxVm.HeatPumpGroupEditingEnabled = false; //auxVm.HeatPumpGroupEditingEnabled = false;
auxVm.HeatPumpGroupEditingEnabled = true; //auxVm.HeatPumpGroupEditingEnabled = true;
Assert.AreEqual(HeatPumpMode.N_A, auxVm.HeatPumpModeDriverCompartment); //Assert.AreEqual(HeatPumpMode.N_A, auxVm.HeatPumpModeDriverCompartment);
Assert.AreEqual(HeatPumpMode.N_A, //Assert.AreEqual(HeatPumpMode.N_A,
auxVm.ParameterViewModels[nameof(auxVm.HeatPumpModeDriverCompartment)].CurrentContent); // auxVm.ParameterViewModels[nameof(auxVm.HeatPumpModeDriverCompartment)].CurrentContent);
} }
[Test] [Test]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment