diff --git a/VECTO/GUI/VectoJobForm.vb b/VECTO/GUI/VectoJobForm.vb index 138a18b29388bf2ef339d198a35a3e535ba7b46e..f04c2e0ab98aa3ff34adb4fd871d1c1fbe5ebdf6 100644 --- a/VECTO/GUI/VectoJobForm.vb +++ b/VECTO/GUI/VectoJobForm.vb @@ -449,13 +449,15 @@ Public Class VectoJobForm End If - Dim sb As ICycleData - For Each sb In vectoJob.Cycles - Dim lv0 As ListViewItem = New ListViewItem - lv0.Text = GetRelativePath(sb.CycleData.Source, Path.GetDirectoryName(Path.GetFullPath(file))) 'sb.Name - LvCycles.Items.Add(lv0) - Next - + Try + Dim sb As ICycleData + For Each sb In vectoJob.Cycles + Dim lv0 As ListViewItem = New ListViewItem + lv0.Text = GetRelativePath(sb.CycleData.Source, Path.GetDirectoryName(Path.GetFullPath(file))) 'sb.Name + LvCycles.Items.Add(lv0) + Next + Catch ex As Exception + End Try CbEngOnly.Checked = vectoJob.EngineOnlyMode If driver.OverSpeedEcoRoll.Mode = DriverMode.EcoRoll Then diff --git a/VECTO/GUI/VehicleForm.vb b/VECTO/GUI/VehicleForm.vb index 91237d27a17cb79c12b3ededfc467304ee442908..8b1d45d3f6f27b46845dc2754527efe0c12dba23 100644 --- a/VECTO/GUI/VehicleForm.vb +++ b/VECTO/GUI/VehicleForm.vb @@ -339,6 +339,7 @@ Public Class VehicleForm End Select End If + _vehFile = file Dim basePath As String = Path.GetDirectoryName(file) CbCat.SelectedValue = vehicle.VehicleCategory CbAxleConfig.SelectedValue = vehicle.AxleConfiguration @@ -357,12 +358,6 @@ Public Class VehicleForm TbRtRatio.Text = retarder.Ratio.ToGUIFormat() TbRtPath.Text = If(retarder.LossMap Is Nothing, "", GetRelativePath(retarder.LossMap.Source, basePath)) - - cbAngledriveType.SelectedValue = angledrive.Type - tbAngledriveRatio.Text = angledrive.Ratio.ToGUIFormat() - tbAngledriveLossMapPath.Text = - If(angledrive.LossMap Is Nothing, "", GetRelativePath(angledrive.LossMap.Source, basePath)) - LvRRC.Items.Clear() Dim i As Integer = 0 Dim a0 As IAxleEngineeringInputData @@ -391,12 +386,17 @@ Public Class VehicleForm tbPTOLossMap.Text = If(pto.PTOLossMap Is Nothing, "", GetRelativePath(pto.PTOLossMap.Source, basePath)) tbPTOCycle.Text = If(pto.PTOCycle Is Nothing, "", GetRelativePath(pto.PTOCycle.Source, basePath)) + cbAngledriveType.SelectedValue = angledrive.Type + tbAngledriveRatio.Text = angledrive.Ratio.ToGUIFormat() + tbAngledriveLossMapPath.Text = + If(angledrive.LossMap Is Nothing, "", GetRelativePath(angledrive.LossMap.Source, basePath)) + DeclInit() VehicleFileBrowser.UpdateHistory(file) Text = GetFilenameWithoutPath(file, True) LbStatus.Text = "" - _vehFile = file + Activate() _changed = False diff --git a/VectoCommon/VectoCommon/Models/GearboxType.cs b/VectoCommon/VectoCommon/Models/GearboxType.cs index 89b5949a6e564d8f9374218b6c00a114ba4d1122..ab5fec0399973b393be4a108a4e12b81316d85bd 100644 --- a/VectoCommon/VectoCommon/Models/GearboxType.cs +++ b/VectoCommon/VectoCommon/Models/GearboxType.cs @@ -118,7 +118,7 @@ namespace TUGraz.VectoCommon.Models return 1.SI<Second>(); case GearboxType.ATSerial: case GearboxType.ATPowerSplit: - return 0.8.SI<Second>(); + return 0.0.SI<Second>(); } return 0.SI<Second>(); } diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs index 6cdc927f7b8be49ed042c0e5f4f6863cf7c6c495..6c76f1b80a5a91d500ccb4f5edc2d03827c5d5c7 100644 --- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs +++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs @@ -498,7 +498,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl protected class CombustionEngineIdleController : LoggingObject, IIdleController { - protected readonly double PeDropSlope = -0.75; + protected readonly double PeDropSlope = -5; protected readonly double PeDropOffset = 1.0; protected CombustionEngine Engine;