From eb8aa2660ca0f1e6f99a598a3a7d0864d3ee3d80 Mon Sep 17 00:00:00 2001 From: "VKMTHD\\haraldmartini" <harald.martini@student.tugraz.at> Date: Thu, 23 Mar 2023 12:04:59 +0100 Subject: [PATCH] moved IMultistageVehicleViewModel --- .../InterimStageBusVehicleViewModel_v2_8.cs | 11 ---------- .../Interfaces/IMultistageVehicleViewModel.cs | 20 +++++++++++++++++++ 2 files changed, 20 insertions(+), 11 deletions(-) create mode 100644 VECTO3GUI2020/ViewModel/MultiStage/Interfaces/IMultistageVehicleViewModel.cs diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs index 652da7f5a8..4518cb5d8e 100644 --- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs +++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs @@ -15,7 +15,6 @@ using TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v24; using VECTO3GUI2020.Helper; using VECTO3GUI2020.Properties; using VECTO3GUI2020.ViewModel.Implementation.Common; -using VECTO3GUI2020.ViewModel.Interfaces.JobEdit.Vehicle; using VECTO3GUI2020.ViewModel.Interfaces.JobEdit.Vehicle.Components; using VECTO3GUI2020.ViewModel.MultiStage.Interfaces; using EnumHelper = VECTO3GUI2020.Helper.EnumHelper; @@ -58,16 +57,6 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation } } - public interface IMultistageVehicleViewModel : IVehicleViewModel, INotifyPropertyChanged - { - bool HasErrors { get; } - Dictionary<string, string> Errors { get; } - IMultistageAirdragViewModel MultistageAirdragViewModel { get; set; } - IMultistageAuxiliariesViewModel MultistageAuxiliariesViewModel { get; set; } - bool PrimaryVehicleHybridElectric { get; set; } - void SetVehicleInputData(IVehicleDeclarationInputData vehicleInputData); - } - public class InterimStageBusVehicleViewModel_v2_8 : ViewModelBase, IMultistageVehicleViewModel, IVehicleComponentsDeclaration, IAdvancedDriverAssistantSystemDeclarationInputData, IDataErrorInfo diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Interfaces/IMultistageVehicleViewModel.cs b/VECTO3GUI2020/ViewModel/MultiStage/Interfaces/IMultistageVehicleViewModel.cs new file mode 100644 index 0000000000..ffd79d079b --- /dev/null +++ b/VECTO3GUI2020/ViewModel/MultiStage/Interfaces/IMultistageVehicleViewModel.cs @@ -0,0 +1,20 @@ +using System.Collections.Generic; +using System.ComponentModel; +using TUGraz.VectoCommon.InputData; +using VECTO3GUI2020.ViewModel.Interfaces.JobEdit.Vehicle; +using VECTO3GUI2020.ViewModel.MultiStage.Implementation; + +namespace VECTO3GUI2020.ViewModel.MultiStage.Interfaces +{ + public interface IMultistageVehicleViewModel : IVehicleViewModel, INotifyPropertyChanged + { + bool HasErrors { get; } + Dictionary<string, string> Errors { get; } + IMultistageAirdragViewModel MultistageAirdragViewModel { get; set; } + IMultistageAuxiliariesViewModel MultistageAuxiliariesViewModel { get; set; } + bool PrimaryVehicleHybridElectric { get; set; } + bool ShowConsolidatedData { get; set; } + void SetVehicleInputData(IVehicleDeclarationInputData vehicleInputData); + } +} + -- GitLab