Merge branch 'feature/VECTO_GUI' of git+ssh://129.27.107.191:2211/vecto-dev into feature/VECTO_GUI
# Conflicts: # VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
Showing
- VECTO3GUI/App.xaml 2 additions, 2 deletionsVECTO3GUI/App.xaml
- VECTO3GUI/Helper/XmlComponentReaderHelper.cs 10 additions, 0 deletionsVECTO3GUI/Helper/XmlComponentReaderHelper.cs
- VECTO3GUI/Helper/XmlHelper.cs 8 additions, 0 deletionsVECTO3GUI/Helper/XmlHelper.cs
- VECTO3GUI/Model/AlternatorTechnologyModel.cs 50 additions, 0 deletionsVECTO3GUI/Model/AlternatorTechnologyModel.cs
- VECTO3GUI/Model/InterfacesImpl.cs 0 additions, 17 deletionsVECTO3GUI/Model/InterfacesImpl.cs
- VECTO3GUI/Model/TempDataObject/AirdragComponentData.cs 3 additions, 0 deletionsVECTO3GUI/Model/TempDataObject/AirdragComponentData.cs
- VECTO3GUI/Model/TempDataObject/AuxiliariesBusComponentData.cs 30 additions, 5 deletions...O3GUI/Model/TempDataObject/AuxiliariesBusComponentData.cs
- VECTO3GUI/Util/XML/XMLCompletedBus.cs 13 additions, 4 deletionsVECTO3GUI/Util/XML/XMLCompletedBus.cs
- VECTO3GUI/VECTO3GUI.csproj 2 additions, 1 deletionVECTO3GUI/VECTO3GUI.csproj
- VECTO3GUI/ViewModel/Impl/AbstractBusJobViewModel.cs 21 additions, 19 deletionsVECTO3GUI/ViewModel/Impl/AbstractBusJobViewModel.cs
- VECTO3GUI/ViewModel/Impl/AbstractJobViewModel.cs 1 addition, 5 deletionsVECTO3GUI/ViewModel/Impl/AbstractJobViewModel.cs
- VECTO3GUI/ViewModel/Impl/AirdragViewModel.cs 52 additions, 23 deletionsVECTO3GUI/ViewModel/Impl/AirdragViewModel.cs
- VECTO3GUI/ViewModel/Impl/AuxiliariesViewModel.cs 74 additions, 26 deletionsVECTO3GUI/ViewModel/Impl/AuxiliariesViewModel.cs
- VECTO3GUI/ViewModel/Impl/CompleteVehicleBusJobViewModel.cs 2 additions, 0 deletionsVECTO3GUI/ViewModel/Impl/CompleteVehicleBusJobViewModel.cs
- VECTO3GUI/ViewModel/Impl/CompleteVehicleBusViewModel.cs 5 additions, 4 deletionsVECTO3GUI/ViewModel/Impl/CompleteVehicleBusViewModel.cs
- VECTO3GUI/ViewModel/Interfaces/IAirdrag.cs 1 addition, 0 deletionsVECTO3GUI/ViewModel/Interfaces/IAirdrag.cs
- VECTO3GUI/ViewModel/Interfaces/IAirdragViewModel.cs 0 additions, 1 deletionVECTO3GUI/ViewModel/Interfaces/IAirdragViewModel.cs
- VECTO3GUI/ViewModel/Interfaces/IAuxiliariesBus.cs 3 additions, 1 deletionVECTO3GUI/ViewModel/Interfaces/IAuxiliariesBus.cs
- VECTO3GUI/ViewModel/Interfaces/IAuxiliariesViewModel.cs 2 additions, 1 deletionVECTO3GUI/ViewModel/Interfaces/IAuxiliariesViewModel.cs
- VECTO3GUI/ViewModel/Interfaces/ICompleteVehicleBusViewModel.cs 1 addition, 1 deletion...3GUI/ViewModel/Interfaces/ICompleteVehicleBusViewModel.cs
Loading
Please register or sign in to comment