Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit cd9fadef authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

Merge pull request #364 in VECTO/vecto-sim from...

Merge pull request #364 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-435-gearbox-form-show-information-whether to develop

* commit 'f4b90bfe':
  hide start acceleration
  add label to indicate when the torque converter is used
parents 06335e9c f4b90bfe
No related branches found
No related tags found
No related merge requests found
...@@ -136,6 +136,7 @@ Partial Class GearboxForm ...@@ -136,6 +136,7 @@ Partial Class GearboxForm
Me.Label34 = New System.Windows.Forms.Label() Me.Label34 = New System.Windows.Forms.Label()
Me.Label35 = New System.Windows.Forms.Label() Me.Label35 = New System.Windows.Forms.Label()
Me.gbTCAccMin = New System.Windows.Forms.GroupBox() Me.gbTCAccMin = New System.Windows.Forms.GroupBox()
Me.lblGbxInfo = New System.Windows.Forms.Label()
Me.ToolStrip1.SuspendLayout() Me.ToolStrip1.SuspendLayout()
Me.StatusStrip1.SuspendLayout() Me.StatusStrip1.SuspendLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
...@@ -361,7 +362,7 @@ Partial Class GearboxForm ...@@ -361,7 +362,7 @@ Partial Class GearboxForm
'Label3 'Label3
' '
Me.Label3.AutoSize = True 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.Name = "Label3"
Me.Label3.Size = New System.Drawing.Size(87, 13) Me.Label3.Size = New System.Drawing.Size(87, 13)
Me.Label3.TabIndex = 42 Me.Label3.TabIndex = 42
...@@ -369,7 +370,7 @@ Partial Class GearboxForm ...@@ -369,7 +370,7 @@ Partial Class GearboxForm
' '
'TbName '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.Name = "TbName"
Me.TbName.Size = New System.Drawing.Size(334, 20) Me.TbName.Size = New System.Drawing.Size(334, 20)
Me.TbName.TabIndex = 0 Me.TbName.TabIndex = 0
...@@ -599,6 +600,7 @@ Partial Class GearboxForm ...@@ -599,6 +600,7 @@ Partial Class GearboxForm
Me.TbStartAcc.Name = "TbStartAcc" Me.TbStartAcc.Name = "TbStartAcc"
Me.TbStartAcc.Size = New System.Drawing.Size(57, 20) Me.TbStartAcc.Size = New System.Drawing.Size(57, 20)
Me.TbStartAcc.TabIndex = 2 Me.TbStartAcc.TabIndex = 2
Me.TbStartAcc.Visible = False
' '
'Label11 'Label11
' '
...@@ -608,6 +610,7 @@ Partial Class GearboxForm ...@@ -608,6 +610,7 @@ Partial Class GearboxForm
Me.Label11.Size = New System.Drawing.Size(173, 13) Me.Label11.Size = New System.Drawing.Size(173, 13)
Me.Label11.TabIndex = 0 Me.Label11.TabIndex = 0
Me.Label11.Text = "Reference acceleration at clutch-in" Me.Label11.Text = "Reference acceleration at clutch-in"
Me.Label11.Visible = False
' '
'TbStartSpeed 'TbStartSpeed
' '
...@@ -633,6 +636,7 @@ Partial Class GearboxForm ...@@ -633,6 +636,7 @@ Partial Class GearboxForm
Me.Label10.Size = New System.Drawing.Size(34, 13) Me.Label10.Size = New System.Drawing.Size(34, 13)
Me.Label10.TabIndex = 0 Me.Label10.TabIndex = 0
Me.Label10.Text = "[m/s²]" Me.Label10.Text = "[m/s²]"
Me.Label10.Visible = False
' '
'TbTqResvStart 'TbTqResvStart
' '
...@@ -886,7 +890,7 @@ Partial Class GearboxForm ...@@ -886,7 +890,7 @@ Partial Class GearboxForm
'Label16 'Label16
' '
Me.Label16.AutoSize = True 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.Name = "Label16"
Me.Label16.Size = New System.Drawing.Size(95, 13) Me.Label16.Size = New System.Drawing.Size(95, 13)
Me.Label16.TabIndex = 45 Me.Label16.TabIndex = 45
...@@ -896,7 +900,7 @@ Partial Class GearboxForm ...@@ -896,7 +900,7 @@ Partial Class GearboxForm
' '
Me.CbGStype.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.CbGStype.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
Me.CbGStype.FormattingEnabled = True 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.Name = "CbGStype"
Me.CbGStype.Size = New System.Drawing.Size(227, 21) Me.CbGStype.Size = New System.Drawing.Size(227, 21)
Me.CbGStype.TabIndex = 1 Me.CbGStype.TabIndex = 1
...@@ -1060,6 +1064,14 @@ Partial Class GearboxForm ...@@ -1060,6 +1064,14 @@ Partial Class GearboxForm
Me.gbTCAccMin.TabStop = False Me.gbTCAccMin.TabStop = False
Me.gbTCAccMin.Text = "Torque Converter: Min. acceleration after upshift" 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 'GearboxForm
' '
Me.AcceptButton = Me.ButOK Me.AcceptButton = Me.ButOK
...@@ -1067,6 +1079,7 @@ Partial Class GearboxForm ...@@ -1067,6 +1079,7 @@ Partial Class GearboxForm
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.CancelButton = Me.ButCancel Me.CancelButton = Me.ButCancel
Me.ClientSize = New System.Drawing.Size(877, 696) Me.ClientSize = New System.Drawing.Size(877, 696)
Me.Controls.Add(Me.lblGbxInfo)
Me.Controls.Add(Me.gbTCAccMin) Me.Controls.Add(Me.gbTCAccMin)
Me.Controls.Add(Me.gbPowershiftLosses) Me.Controls.Add(Me.gbPowershiftLosses)
Me.Controls.Add(Me.PicBox) Me.Controls.Add(Me.PicBox)
...@@ -1218,4 +1231,5 @@ Partial Class GearboxForm ...@@ -1218,4 +1231,5 @@ Partial Class GearboxForm
Friend WithEvents Label34 As System.Windows.Forms.Label Friend WithEvents Label34 As System.Windows.Forms.Label
Friend WithEvents Label35 As System.Windows.Forms.Label Friend WithEvents Label35 As System.Windows.Forms.Label
Friend WithEvents gbTCAccMin As System.Windows.Forms.GroupBox Friend WithEvents gbTCAccMin As System.Windows.Forms.GroupBox
Friend WithEvents lblGbxInfo As System.Windows.Forms.Label
End Class End Class
...@@ -326,6 +326,7 @@ Public Class GearboxForm ...@@ -326,6 +326,7 @@ Public Class GearboxForm
GearboxFileBrowser.UpdateHistory(file) GearboxFileBrowser.UpdateHistory(file)
Text = GetFilenameWithoutPath(file, True) Text = GetFilenameWithoutPath(file, True)
LbStatus.Text = "" LbStatus.Text = ""
UpdateGearboxInfoText()
_gbxFile = file _gbxFile = file
Activate() Activate()
...@@ -503,6 +504,25 @@ Public Class GearboxForm ...@@ -503,6 +504,25 @@ Public Class GearboxForm
TbTracInt.Enabled = Not gStype.AutomaticTransmission() TbTracInt.Enabled = Not gStype.AutomaticTransmission()
tbDownshiftAfterUpshift.Enabled = Not gStype.AutomaticTransmission() tbDownshiftAfterUpshift.Enabled = Not gStype.AutomaticTransmission()
tbUpshiftAfterDownshift.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 End Sub
...@@ -580,6 +600,7 @@ Public Class GearboxForm ...@@ -580,6 +600,7 @@ Public Class GearboxForm
LvGears.SelectedItems(0).SubItems(GearboxTbl.LossMapEfficiency).Text = _gearDialog.TbMapPath.Text 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.ShiftPolygons).Text = _gearDialog.TbShiftPolyFile.Text
LvGears.SelectedItems(0).SubItems(GearboxTbl.MaxTorque).Text = _gearDialog.TbMaxTorque.Text LvGears.SelectedItems(0).SubItems(GearboxTbl.MaxTorque).Text = _gearDialog.TbMaxTorque.Text
UpdateGearboxInfoText()
Try Try
UpdatePic() UpdatePic()
Catch Catch
...@@ -615,7 +636,7 @@ Public Class GearboxForm ...@@ -615,7 +636,7 @@ Public Class GearboxForm
LvGears.Items.Add(lvi) LvGears.Items.Add(lvi)
lvi.EnsureVisible() lvi.EnsureVisible()
UpdateGearboxInfoText()
LvGears.Focus() LvGears.Focus()
'Change() => NO! Change() is already handled by EditGear 'Change() => NO! Change() is already handled by EditGear
...@@ -648,7 +669,7 @@ Public Class GearboxForm ...@@ -648,7 +669,7 @@ Public Class GearboxForm
LvGears.Items(i0).Selected = True LvGears.Items(i0).Selected = True
LvGears.Items(i0).EnsureVisible() LvGears.Items(i0).EnsureVisible()
End If End If
UpdateGearboxInfoText()
LvGears.Focus() LvGears.Focus()
Try Try
UpdatePic() UpdatePic()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment