diff --git a/VECTO/GUI/GearboxForm.Designer.vb b/VECTO/GUI/GearboxForm.Designer.vb index 6254e627916cc94301228b80b52369b36aeda95b..15acbbdce12d0e9da00a43a99f8e6507d300fb2e 100644 --- a/VECTO/GUI/GearboxForm.Designer.vb +++ b/VECTO/GUI/GearboxForm.Designer.vb @@ -136,6 +136,7 @@ Partial Class GearboxForm Me.Label34 = New System.Windows.Forms.Label() Me.Label35 = New System.Windows.Forms.Label() Me.gbTCAccMin = New System.Windows.Forms.GroupBox() + Me.lblGbxInfo = New System.Windows.Forms.Label() Me.ToolStrip1.SuspendLayout() Me.StatusStrip1.SuspendLayout() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -361,7 +362,7 @@ Partial Class GearboxForm 'Label3 ' Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(26, 85) + Me.Label3.Location = New System.Drawing.Point(26, 79) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(87, 13) Me.Label3.TabIndex = 42 @@ -369,7 +370,7 @@ Partial Class GearboxForm ' 'TbName ' - Me.TbName.Location = New System.Drawing.Point(119, 82) + Me.TbName.Location = New System.Drawing.Point(119, 76) Me.TbName.Name = "TbName" Me.TbName.Size = New System.Drawing.Size(334, 20) Me.TbName.TabIndex = 0 @@ -599,6 +600,7 @@ Partial Class GearboxForm Me.TbStartAcc.Name = "TbStartAcc" Me.TbStartAcc.Size = New System.Drawing.Size(57, 20) Me.TbStartAcc.TabIndex = 2 + Me.TbStartAcc.Visible = False ' 'Label11 ' @@ -608,6 +610,7 @@ Partial Class GearboxForm Me.Label11.Size = New System.Drawing.Size(173, 13) Me.Label11.TabIndex = 0 Me.Label11.Text = "Reference acceleration at clutch-in" + Me.Label11.Visible = False ' 'TbStartSpeed ' @@ -633,6 +636,7 @@ Partial Class GearboxForm Me.Label10.Size = New System.Drawing.Size(34, 13) Me.Label10.TabIndex = 0 Me.Label10.Text = "[m/s²]" + Me.Label10.Visible = False ' 'TbTqResvStart ' @@ -886,7 +890,7 @@ Partial Class GearboxForm 'Label16 ' Me.Label16.AutoSize = True - Me.Label16.Location = New System.Drawing.Point(18, 111) + Me.Label16.Location = New System.Drawing.Point(18, 105) Me.Label16.Name = "Label16" Me.Label16.Size = New System.Drawing.Size(95, 13) Me.Label16.TabIndex = 45 @@ -896,7 +900,7 @@ Partial Class GearboxForm ' Me.CbGStype.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.CbGStype.FormattingEnabled = True - Me.CbGStype.Location = New System.Drawing.Point(119, 108) + Me.CbGStype.Location = New System.Drawing.Point(119, 102) Me.CbGStype.Name = "CbGStype" Me.CbGStype.Size = New System.Drawing.Size(227, 21) Me.CbGStype.TabIndex = 1 @@ -1060,6 +1064,14 @@ Partial Class GearboxForm Me.gbTCAccMin.TabStop = False Me.gbTCAccMin.Text = "Torque Converter: Min. acceleration after upshift" ' + 'lblGbxInfo + ' + Me.lblGbxInfo.AutoSize = True + Me.lblGbxInfo.Location = New System.Drawing.Point(121, 126) + Me.lblGbxInfo.Name = "lblGbxInfo" + Me.lblGbxInfo.Size = New System.Drawing.Size(0, 13) + Me.lblGbxInfo.TabIndex = 51 + ' 'GearboxForm ' Me.AcceptButton = Me.ButOK @@ -1067,6 +1079,7 @@ Partial Class GearboxForm Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.CancelButton = Me.ButCancel Me.ClientSize = New System.Drawing.Size(877, 696) + Me.Controls.Add(Me.lblGbxInfo) Me.Controls.Add(Me.gbTCAccMin) Me.Controls.Add(Me.gbPowershiftLosses) Me.Controls.Add(Me.PicBox) @@ -1218,4 +1231,5 @@ Partial Class GearboxForm Friend WithEvents Label34 As System.Windows.Forms.Label Friend WithEvents Label35 As System.Windows.Forms.Label Friend WithEvents gbTCAccMin As System.Windows.Forms.GroupBox + Friend WithEvents lblGbxInfo As System.Windows.Forms.Label End Class diff --git a/VECTO/GUI/GearboxForm.vb b/VECTO/GUI/GearboxForm.vb index a65b47741f646a5978e7988cfa9ce0b5bdf17010..6f54e5730ade56753d0a02bdcb0843f811371a9d 100644 --- a/VECTO/GUI/GearboxForm.vb +++ b/VECTO/GUI/GearboxForm.vb @@ -101,7 +101,7 @@ Public Class GearboxForm TbMinTimeBetweenShifts.Text = DeclarationData.Gearbox.MinTimeBetweenGearshifts.ToGUIFormat() 'cDeclaration.MinTimeBetweenGearshift(GStype) - TbTqResv.Text = (DeclarationData.Gearbox.TorqueReserve * 100).ToGUIFormat() ' cDeclaration.TqResv + TbTqResv.Text = (DeclarationData.Gearbox.TorqueReserve * 100).ToGUIFormat() ' cDeclaration.TqResv TbTqResvStart.Text = (DeclarationData.Gearbox.TorqueReserveStart * 100).ToGUIFormat() 'cDeclaration.TqResvStart TbStartSpeed.Text = DeclarationData.Gearbox.StartSpeed.ToGUIFormat() 'cDeclaration.StartSpeed TbStartAcc.Text = DeclarationData.Gearbox.StartAcceleration.ToGUIFormat() ' cDeclaration.StartAcc @@ -326,6 +326,7 @@ Public Class GearboxForm GearboxFileBrowser.UpdateHistory(file) Text = GetFilenameWithoutPath(file, True) LbStatus.Text = "" + UpdateGearboxInfoText() _gbxFile = file Activate() @@ -503,6 +504,25 @@ Public Class GearboxForm TbTracInt.Enabled = Not gStype.AutomaticTransmission() tbDownshiftAfterUpshift.Enabled = Not gStype.AutomaticTransmission() tbUpshiftAfterDownshift.Enabled = Not gStype.AutomaticTransmission() + UpdateGearboxInfoText() + End Sub + + Private Sub UpdateGearboxInfoText() + Dim gStype As GearboxType = CType(CbGStype.SelectedValue, GearboxType) + + Dim text As String = "" + If (gStype = GearboxType.ATSerial) Then + If LvGears.Items.Count > 2 Then + Dim ratio1 As Double = LvGears.Items.Item(1).SubItems(GearboxTbl.Ratio).Text.ToDouble(0) + Dim ratio2 As Double = LvGears.Items.Item(2).SubItems(GearboxTbl.Ratio).Text.ToDouble(0) + If ratio1 / ratio2 >= DeclarationData.Gearbox.TorqueConverterSecondGearThreshold Then + text = "Torque converter is used in 1st and 2nd gear" + Else + text = "Torque converter is used in 1st gear only" + End If + End If + End If + lblGbxInfo.Text = text End Sub @@ -580,6 +600,7 @@ Public Class GearboxForm LvGears.SelectedItems(0).SubItems(GearboxTbl.LossMapEfficiency).Text = _gearDialog.TbMapPath.Text LvGears.SelectedItems(0).SubItems(GearboxTbl.ShiftPolygons).Text = _gearDialog.TbShiftPolyFile.Text LvGears.SelectedItems(0).SubItems(GearboxTbl.MaxTorque).Text = _gearDialog.TbMaxTorque.Text + UpdateGearboxInfoText() Try UpdatePic() Catch @@ -615,7 +636,7 @@ Public Class GearboxForm LvGears.Items.Add(lvi) lvi.EnsureVisible() - + UpdateGearboxInfoText() LvGears.Focus() 'Change() => NO! Change() is already handled by EditGear @@ -648,7 +669,7 @@ Public Class GearboxForm LvGears.Items(i0).Selected = True LvGears.Items(i0).EnsureVisible() End If - + UpdateGearboxInfoText() LvGears.Focus() Try UpdatePic()