Merge branch 'feature/VECTO-1190-d-m-heavy-busesK' into feature/VECTO_GUI
# Conflicts: # VECTO3GUI/ViewModel/Impl/AuxiliariesViewModel.cs # VECTO3GUI/ViewModel/Impl/CompleteVehicleBusViewModel.cs # VectoCommon/VectoCommon/BusAuxiliaries/BusHVACSystemConfiguration.cs # VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
No related branches found
No related tags found
Showing
- Documentation/User Manual/5-input-and-output-files/VMOD.md 1 addition, 1 deletionDocumentation/User Manual/5-input-and-output-files/VMOD.md
- Documentation/User Manual/5-input-and-output-files/VSUM.md 3 additions, 1 deletionDocumentation/User Manual/5-input-and-output-files/VSUM.md
- Generic Vehicles/Declaration Mode/Single Bus_41/vecto_vehicle-completed_heavyBus_41.xml 0 additions, 3 deletions...ode/Single Bus_41/vecto_vehicle-completed_heavyBus_41.xml
- Tools/GraphDrawer/bin/Debug/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.xml 3288 additions, 0 deletions...hod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.xml
- VECTO/BusAuxiliaries/UI/frmAuxiliaryConfig.vb 1 addition, 1 deletionVECTO/BusAuxiliaries/UI/frmAuxiliaryConfig.vb
- VECTO/GUI/MainForm.Designer.vb 15 additions, 2 deletionsVECTO/GUI/MainForm.Designer.vb
- VECTO/GUI/MainForm.vb 1 addition, 0 deletionsVECTO/GUI/MainForm.vb
- VECTO/GUI/VectoJobForm.Designer.vb 23 additions, 39 deletionsVECTO/GUI/VectoJobForm.Designer.vb
- VECTO/GUI/VectoJobForm.resx 0 additions, 3 deletionsVECTO/GUI/VectoJobForm.resx
- VECTO/GUI/VectoJobForm.vb 1287 additions, 1286 deletionsVECTO/GUI/VectoJobForm.vb
- VECTO/Input Files/Engine.vb 2 additions, 1 deletionVECTO/Input Files/Engine.vb
- VECTO/Input Files/Gearbox.vb 2 additions, 1 deletionVECTO/Input Files/Gearbox.vb
- VECTO/Input Files/MockVehicleInputData.vb 2 additions, 1 deletionVECTO/Input Files/MockVehicleInputData.vb
- VECTO/Input Files/Vehicle.vb 2 additions, 1 deletionVECTO/Input Files/Vehicle.vb
- VECTO/MainModule.vb 1 addition, 0 deletionsVECTO/MainModule.vb
- VECTO3GUI/Helper/Converter/VehicleClassConverter.cs 1 addition, 0 deletionsVECTO3GUI/Helper/Converter/VehicleClassConverter.cs
- VECTO3GUI/Resources/GlobalStyles.xaml 0 additions, 1 deletionVECTO3GUI/Resources/GlobalStyles.xaml
- VECTO3GUI/Resources/StringResources.xaml 0 additions, 1 deletionVECTO3GUI/Resources/StringResources.xaml
- VECTO3GUI/ViewModel/Adapter/Declaration/TyreDeclarationAdapter.cs 1 addition, 0 deletions...I/ViewModel/Adapter/Declaration/TyreDeclarationAdapter.cs
- VECTO3GUI/ViewModel/Adapter/Declaration/VehicleDeclarationAdapter.cs 2 additions, 1 deletion...iewModel/Adapter/Declaration/VehicleDeclarationAdapter.cs
Loading
Please register or sign in to comment