Merge branch 'develop' into feature/VECTO-323-pto-idle-losses
# Conflicts: # VECTO/GUI/F_MAINForm.Designer.vb # VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs # VectoCore/VectoCore/Models/SimulationComponent/Impl/EngineAuxiliary.cs # VectoCore/VectoCore/Models/SimulationComponent/Impl/PowertrainDrivingCycle.cs
No related branches found
No related tags found
Showing
- Documentation/User Manual/5-input-and-output-files/VDRI.md 20 additions, 0 deletionsDocumentation/User Manual/5-input-and-output-files/VDRI.md
- Documentation/User Manual/help.html 50 additions, 20 deletionsDocumentation/User Manual/help.html
- VECTO/File Browser/FB_Dialog.vb 1 addition, 1 deletionVECTO/File Browser/FB_Dialog.vb
- VECTO/GUI/F_GBX.Designer.vb 11 additions, 11 deletionsVECTO/GUI/F_GBX.Designer.vb
- VECTO/GUI/F_GBX.vb 95 additions, 114 deletionsVECTO/GUI/F_GBX.vb
- VECTO/GUI/F_MAINForm.Designer.vb 1 addition, 1 deletionVECTO/GUI/F_MAINForm.Designer.vb
- VECTO/GUI/GearboxGearDialog.Designer.vb 0 additions, 13 deletionsVECTO/GUI/GearboxGearDialog.Designer.vb
- VECTO/GUI/GearboxGearDialog.resx 3 additions, 3 deletionsVECTO/GUI/GearboxGearDialog.resx
- VectoCore/VectoCore/Configuration/Constants.cs 2 additions, 0 deletionsVectoCore/VectoCore/Configuration/Constants.cs
- VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs 2 additions, 8 deletionsVectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
- VectoCore/VectoCore/InputData/Reader/ComponentData/AuxiliaryDataReader.cs 4 additions, 11 deletions...ore/InputData/Reader/ComponentData/AuxiliaryDataReader.cs
- VectoCore/VectoCore/InputData/Reader/ComponentData/TransmissionLossMapReader.cs 3 additions, 3 deletions...putData/Reader/ComponentData/TransmissionLossMapReader.cs
- VectoCore/VectoCore/InputData/Reader/DrivingCycleDataReader.cs 64 additions, 50 deletions...Core/VectoCore/InputData/Reader/DrivingCycleDataReader.cs
- VectoCore/VectoCore/Models/Declaration/AuxiliaryTypeHelper.cs 1 addition, 4 deletions...oCore/VectoCore/Models/Declaration/AuxiliaryTypeHelper.cs
- VectoCore/VectoCore/Models/Declaration/DeclarationData.cs 4 additions, 0 deletionsVectoCore/VectoCore/Models/Declaration/DeclarationData.cs
- VectoCore/VectoCore/Models/Declaration/PT1.cs 3 additions, 3 deletionsVectoCore/VectoCore/Models/Declaration/PT1.cs
- VectoCore/VectoCore/Models/Simulation/Data/ModalResult.cs 4 additions, 5 deletionsVectoCore/VectoCore/Models/Simulation/Data/ModalResult.cs
- VectoCore/VectoCore/Models/SimulationComponent/Data/AuxSupplyPowerReader.cs 11 additions, 9 deletions...e/Models/SimulationComponent/Data/AuxSupplyPowerReader.cs
- VectoCore/VectoCore/Models/SimulationComponent/Data/AuxiliaryData.cs 4 additions, 9 deletions...ectoCore/Models/SimulationComponent/Data/AuxiliaryData.cs
- VectoCore/VectoCore/Models/SimulationComponent/Data/Engine/PT1Curve.cs 3 additions, 3 deletions...toCore/Models/SimulationComponent/Data/Engine/PT1Curve.cs
Loading
Please register or sign in to comment