Merge branch...
Merge branch 'feature/VECTO-1143-extending-segmentation-table-for-medium-lorries' into feature/VECTO-1190-declaration-mode-for-heavy-buses # Conflicts: # VECTO/GUI/GearboxForm.vb # VECTO/GUI/VectoJobForm.vb # VECTO/OutputData/JSONFileWriter.vb # VectoCommon/VectoCommon/Models/VehicleCategory.cs # VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterTruck.cs # VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs # VectoCore/VectoCore/Models/Declaration/TruckSegments.cs # VectoCore/VectoCore/Models/Declaration/VehicleClass.cs # VectoCore/VectoCore/Models/Declaration/WeightingGroups.cs # VectoCore/VectoCore/Resources/Declaration/CO2Standards/MissionProfileWeights.csv # VectoCore/VectoCore/Resources/Declaration/CO2Standards/WeightingGroups.csv # VectoCore/VectoCore/Resources/Declaration/SegmentTable.csv # VectoCore/VectoCore/VectoCore.csproj # VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs
Showing
- Documentation/User Manual/help.html 5 additions, 10 deletionsDocumentation/User Manual/help.html
- VECTO/GUI/EngineForm.vb 3 additions, 3 deletionsVECTO/GUI/EngineForm.vb
- VECTO/GUI/GearboxForm.vb 1 addition, 1 deletionVECTO/GUI/GearboxForm.vb
- VECTO/GUI/VectoJobForm.vb 6 additions, 8 deletionsVECTO/GUI/VectoJobForm.vb
- VECTO/GUI/VectoVTPJobForm.vb 5 additions, 7 deletionsVECTO/GUI/VectoVTPJobForm.vb
- VECTO/GUI/VehicleForm.vb 10 additions, 10 deletionsVECTO/GUI/VehicleForm.vb
- VECTO/MainModule.vb 39 additions, 19 deletionsVECTO/MainModule.vb
- VECTO/OutputData/JSONFileWriter.vb 1 addition, 1 deletionVECTO/OutputData/JSONFileWriter.vb
- VECTO/VECTO.vbproj 1 addition, 0 deletionsVECTO/VECTO.vbproj
- VectoCommon/VectoCommon/Models/AxleConfiguration.cs 2 additions, 1 deletionVectoCommon/VectoCommon/Models/AxleConfiguration.cs
- VectoCommon/VectoCommon/Models/VehicleCategory.cs 9 additions, 3 deletionsVectoCommon/VectoCommon/Models/VehicleCategory.cs
- VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterTruck.cs 2 additions, 2 deletions...a/Reader/DataObjectAdapter/DeclarationDataAdapterTruck.cs
- VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs 5 additions, 0 deletions...utData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
- VectoCore/VectoCore/Models/Connector/Ports/Impl/Response.cs 2 additions, 0 deletionsVectoCore/VectoCore/Models/Connector/Ports/Impl/Response.cs
- VectoCore/VectoCore/Models/Declaration/DeclarationData.cs 2 additions, 1 deletionVectoCore/VectoCore/Models/Declaration/DeclarationData.cs
- VectoCore/VectoCore/Models/Declaration/Fan.cs 79 additions, 35 deletionsVectoCore/VectoCore/Models/Declaration/Fan.cs
- VectoCore/VectoCore/Models/Declaration/Payloads.cs 3 additions, 3 deletionsVectoCore/VectoCore/Models/Declaration/Payloads.cs
- VectoCore/VectoCore/Models/Declaration/TruckSegments.cs 10 additions, 8 deletionsVectoCore/VectoCore/Models/Declaration/TruckSegments.cs
- VectoCore/VectoCore/Models/Declaration/VehicleClass.cs 26 additions, 3 deletionsVectoCore/VectoCore/Models/Declaration/VehicleClass.cs
- VectoCore/VectoCore/Models/Declaration/WeightingGroups.cs 9 additions, 3 deletionsVectoCore/VectoCore/Models/Declaration/WeightingGroups.cs
Loading
Please register or sign in to comment