From 0a813906e9360bf0736d19d6678aeead32e13398 Mon Sep 17 00:00:00 2001
From: "harald.martini@student.tugraz.at" <harald.martini@student.tugraz.at>
Date: Wed, 18 Aug 2021 10:45:24 +0200
Subject: [PATCH] Updated HVAC Labels, fixed a group editing error
---
.../Properties/BusStrings.Designer.cs | 36 +++++++++++++++++++
VECTO3GUI2020/Properties/BusStrings.resx | 12 +++++++
.../MultistageAuxiliariesViewModel.cs | 1 +
.../ManufacturingStageAuxiliariesView.xaml | 4 +--
4 files changed, 51 insertions(+), 2 deletions(-)
diff --git a/VECTO3GUI2020/Properties/BusStrings.Designer.cs b/VECTO3GUI2020/Properties/BusStrings.Designer.cs
index 00c1f74fd2..96dc7c6bb7 100644
--- a/VECTO3GUI2020/Properties/BusStrings.Designer.cs
+++ b/VECTO3GUI2020/Properties/BusStrings.Designer.cs
@@ -141,6 +141,42 @@ namespace VECTO3GUI2020.Properties {
}
}
+ /// <summary>
+ /// Looks up a localized string similar to Cooling.
+ /// </summary>
+ public static string HeatPumpTypeCoolingDriverCompartment {
+ get {
+ return ResourceManager.GetString("HeatPumpTypeCoolingDriverCompartment", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Cooling.
+ /// </summary>
+ public static string HeatPumpTypeCoolingPassengerCompartment {
+ get {
+ return ResourceManager.GetString("HeatPumpTypeCoolingPassengerCompartment", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Heating.
+ /// </summary>
+ public static string HeatPumpTypeHeatingDriverCompartment {
+ get {
+ return ResourceManager.GetString("HeatPumpTypeHeatingDriverCompartment", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Heating.
+ /// </summary>
+ public static string HeatPumpTypeHeatingPassengerCompartment {
+ get {
+ return ResourceManager.GetString("HeatPumpTypeHeatingPassengerCompartment", resourceCulture);
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to Height.
/// </summary>
diff --git a/VECTO3GUI2020/Properties/BusStrings.resx b/VECTO3GUI2020/Properties/BusStrings.resx
index 20eca9eee3..29061e43ab 100644
--- a/VECTO3GUI2020/Properties/BusStrings.resx
+++ b/VECTO3GUI2020/Properties/BusStrings.resx
@@ -144,6 +144,18 @@
<data name="GrossVehicleMassRating" xml:space="preserve">
<value>Tech. Perm. Max. Laden Mass</value>
</data>
+ <data name="HeatPumpTypeCoolingDriverCompartment" xml:space="preserve">
+ <value>Cooling</value>
+ </data>
+ <data name="HeatPumpTypeCoolingPassengerCompartment" xml:space="preserve">
+ <value>Cooling</value>
+ </data>
+ <data name="HeatPumpTypeHeatingDriverCompartment" xml:space="preserve">
+ <value>Heating</value>
+ </data>
+ <data name="HeatPumpTypeHeatingPassengerCompartment" xml:space="preserve">
+ <value>Heating</value>
+ </data>
<data name="HeightInMm" xml:space="preserve">
<value>Height</value>
</data>
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs
index 48c681ecc4..99eb26c631 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs
@@ -367,6 +367,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
set
{
if (SetProperty(ref _heatPumpGroupEditingEnabled, value)) {
+ _parameterViewModels[nameof(SystemConfiguration)].EditingEnabled = value;
_parameterViewModels[nameof(HeatPumpTypeCoolingDriverCompartment)].EditingEnabled = value;
_parameterViewModels[nameof(HeatPumpTypeCoolingPassengerCompartment)].EditingEnabled = value;
_parameterViewModels[nameof(HeatPumpTypeHeatingDriverCompartment)].EditingEnabled = value;
diff --git a/VECTO3GUI2020/Views/Multistage/ManufacturingStageAuxiliariesView.xaml b/VECTO3GUI2020/Views/Multistage/ManufacturingStageAuxiliariesView.xaml
index 880cef340e..c790f1a5c5 100644
--- a/VECTO3GUI2020/Views/Multistage/ManufacturingStageAuxiliariesView.xaml
+++ b/VECTO3GUI2020/Views/Multistage/ManufacturingStageAuxiliariesView.xaml
@@ -38,14 +38,14 @@
<ContentControl Content="{Binding ParameterViewModels[SystemConfiguration]}"/>
<Border Margin="5" BorderThickness="2" BorderBrush="{DynamicResource ButtonHighlightColor}">
<StackPanel>
- <Label Style="{DynamicResource LabelStyle1}">Driver Compartment</Label>
+ <Label Style="{DynamicResource LabelStyle1}">Driver Compartment Heat Pumps</Label>
<ContentControl Content="{Binding ParameterViewModels[HeatPumpTypeCoolingDriverCompartment]}"/>
<ContentControl Content="{Binding ParameterViewModels[HeatPumpTypeHeatingDriverCompartment]}"/>
</StackPanel>
</Border>
<Border Margin="5" BorderThickness="2" BorderBrush="{DynamicResource ButtonHighlightColor}">
<StackPanel>
- <Label Style="{DynamicResource LabelStyle1}">Passenger Compartment</Label>
+ <Label Style="{DynamicResource LabelStyle1}">Passenger Compartment Heat Pumps</Label>
<ContentControl Content="{Binding ParameterViewModels[HeatPumpTypeCoolingPassengerCompartment]}"/>
<ContentControl Content="{Binding ParameterViewModels[HeatPumpTypeHeatingPassengerCompartment]}"/>
</StackPanel>
--
GitLab