Code development platform for open source projects from the European Union institutions

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

fixes gui: 

declaration mode: disable shift parameters dialog
clear drop down in axle dialog (wheels) on consecutive edit,
correct vehicle pic in job dialog,
enable adas parameters in engineering mode (vehicle dialog),
correct type WHR note in engine dialog
parent 4766e7b3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
VECTO/GUI/EngineForm.Designer.vb
+ 69
− 69
View file @ eef4b78a
......@@ -130,8 +130,11 @@ Partial Class EngineForm
Me.Label35 = New System.Windows.Forms.Label()
Me.cbDualFuel = New System.Windows.Forms.CheckBox()
Me.tbWHR = New System.Windows.Forms.TabControl()
Me.TabPage1 = New System.Windows.Forms.TabPage()
Me.cbElWHR = New System.Windows.Forms.CheckBox()
Me.cbMechWHRNotConnectedCrankshaft = New System.Windows.Forms.CheckBox()
Me.cbMechWHRInMap = New System.Windows.Forms.CheckBox()
Me.tbElectricalWHR = New System.Windows.Forms.TabPage()
Me.tbMechanicalWHR = New System.Windows.Forms.TabPage()
Me.Label36 = New System.Windows.Forms.Label()
Me.pnElWHRDeclaration = New System.Windows.Forms.Panel()
Me.lblWHRRegPer = New System.Windows.Forms.Label()
......@@ -148,6 +151,7 @@ Partial Class EngineForm
Me.pnElWhrEngineering = New System.Windows.Forms.Panel()
Me.tbElWHREngineering = New System.Windows.Forms.TextBox()
Me.Label26 = New System.Windows.Forms.Label()
Me.tbMechanicalWHR = New System.Windows.Forms.TabPage()
Me.Label37 = New System.Windows.Forms.Label()
Me.pnMechWhrDeclaration = New System.Windows.Forms.Panel()
Me.Label38 = New System.Windows.Forms.Label()
......@@ -164,10 +168,6 @@ Partial Class EngineForm
Me.pnMechWhrEngineering = New System.Windows.Forms.Panel()
Me.tbMechWHREngineering = New System.Windows.Forms.TextBox()
Me.Label46 = New System.Windows.Forms.Label()
Me.TabPage1 = New System.Windows.Forms.TabPage()
Me.cbMechWHRInMap = New System.Windows.Forms.CheckBox()
Me.cbMechWHRNotConnectedCrankshaft = New System.Windows.Forms.CheckBox()
Me.cbElWHR = New System.Windows.Forms.CheckBox()
Me.ToolStrip1.SuspendLayout
Me.StatusStrip1.SuspendLayout
CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).BeginInit
......@@ -184,13 +184,13 @@ Partial Class EngineForm
Me.pnWhtcFuel2.SuspendLayout
Me.pnEngCFFuel2.SuspendLayout
Me.tbWHR.SuspendLayout
Me.TabPage1.SuspendLayout
Me.tbElectricalWHR.SuspendLayout
Me.tbMechanicalWHR.SuspendLayout
Me.pnElWHRDeclaration.SuspendLayout
Me.pnElWhrEngineering.SuspendLayout
Me.tbMechanicalWHR.SuspendLayout
Me.pnMechWhrDeclaration.SuspendLayout
Me.pnMechWhrEngineering.SuspendLayout
Me.TabPage1.SuspendLayout
Me.SuspendLayout
'
'TbIdleSpeed
......@@ -1027,6 +1027,48 @@ Partial Class EngineForm
Me.tbWHR.Size = New System.Drawing.Size(482, 171)
Me.tbWHR.TabIndex = 59
'
'TabPage1
'
Me.TabPage1.Controls.Add(Me.cbElWHR)
Me.TabPage1.Controls.Add(Me.cbMechWHRNotConnectedCrankshaft)
Me.TabPage1.Controls.Add(Me.cbMechWHRInMap)
Me.TabPage1.Location = New System.Drawing.Point(4, 22)
Me.TabPage1.Name = "TabPage1"
Me.TabPage1.Size = New System.Drawing.Size(474, 145)
Me.TabPage1.TabIndex = 2
Me.TabPage1.Text = "WHR Type"
Me.TabPage1.UseVisualStyleBackColor = true
'
'cbElWHR
'
Me.cbElWHR.AutoSize = true
Me.cbElWHR.Location = New System.Drawing.Point(17, 58)
Me.cbElWHR.Name = "cbElWHR"
Me.cbElWHR.Size = New System.Drawing.Size(136, 17)
Me.cbElWHR.TabIndex = 2
Me.cbElWHR.Text = "Electrical WHR System"
Me.cbElWHR.UseVisualStyleBackColor = true
'
'cbMechWHRNotConnectedCrankshaft
'
Me.cbMechWHRNotConnectedCrankshaft.AutoSize = true
Me.cbMechWHRNotConnectedCrankshaft.Location = New System.Drawing.Point(17, 35)
Me.cbMechWHRNotConnectedCrankshaft.Name = "cbMechWHRNotConnectedCrankshaft"
Me.cbMechWHRNotConnectedCrankshaft.Size = New System.Drawing.Size(303, 17)
Me.cbMechWHRNotConnectedCrankshaft.TabIndex = 1
Me.cbMechWHRNotConnectedCrankshaft.Text = "Mechanical WHR System not connected to the crankshaft"
Me.cbMechWHRNotConnectedCrankshaft.UseVisualStyleBackColor = true
'
'cbMechWHRInMap
'
Me.cbMechWHRInMap.AutoSize = true
Me.cbMechWHRInMap.Location = New System.Drawing.Point(17, 12)
Me.cbMechWHRInMap.Name = "cbMechWHRInMap"
Me.cbMechWHRInMap.Size = New System.Drawing.Size(287, 17)
Me.cbMechWHRInMap.TabIndex = 0
Me.cbMechWHRInMap.Text = "Mechanical WHR System incuded in FC measurements"
Me.cbMechWHRInMap.UseVisualStyleBackColor = true
'
'tbElectricalWHR
'
Me.tbElectricalWHR.Controls.Add(Me.Label36)
......@@ -1040,19 +1082,6 @@ Partial Class EngineForm
Me.tbElectricalWHR.Text = "Correction Factors Electrical WHR"
Me.tbElectricalWHR.UseVisualStyleBackColor = true
'
'tbMechanicalWHR
'
Me.tbMechanicalWHR.Controls.Add(Me.Label37)
Me.tbMechanicalWHR.Controls.Add(Me.pnMechWhrDeclaration)
Me.tbMechanicalWHR.Controls.Add(Me.pnMechWhrEngineering)
Me.tbMechanicalWHR.Location = New System.Drawing.Point(4, 22)
Me.tbMechanicalWHR.Name = "tbMechanicalWHR"
Me.tbMechanicalWHR.Padding = New System.Windows.Forms.Padding(3)
Me.tbMechanicalWHR.Size = New System.Drawing.Size(474, 145)
Me.tbMechanicalWHR.TabIndex = 1
Me.tbMechanicalWHR.Text = "Correction Factors Mechanical WHR"
Me.tbMechanicalWHR.UseVisualStyleBackColor = true
'
'Label36
'
Me.Label36.AutoSize = true
......@@ -1196,15 +1225,28 @@ Partial Class EngineForm
Me.Label26.TabIndex = 6
Me.Label26.Text = "Engineering"
'
'tbMechanicalWHR
'
Me.tbMechanicalWHR.Controls.Add(Me.Label37)
Me.tbMechanicalWHR.Controls.Add(Me.pnMechWhrDeclaration)
Me.tbMechanicalWHR.Controls.Add(Me.pnMechWhrEngineering)
Me.tbMechanicalWHR.Location = New System.Drawing.Point(4, 22)
Me.tbMechanicalWHR.Name = "tbMechanicalWHR"
Me.tbMechanicalWHR.Padding = New System.Windows.Forms.Padding(3)
Me.tbMechanicalWHR.Size = New System.Drawing.Size(474, 145)
Me.tbMechanicalWHR.TabIndex = 1
Me.tbMechanicalWHR.Text = "Correction Factors Mechanical WHR"
Me.tbMechanicalWHR.UseVisualStyleBackColor = true
'
'Label37
'
Me.Label37.AutoSize = true
Me.Label37.Location = New System.Drawing.Point(7, 119)
Me.Label37.Name = "Label37"
Me.Label37.Size = New System.Drawing.Size(426, 13)
Me.Label37.Size = New System.Drawing.Size(428, 13)
Me.Label37.TabIndex = 14
Me.Label37.Text = "Note: Mechanica power generated by WHR has to be provided in FC-Map of primary fu"& _
"el"
Me.Label37.Text = "Note: Mechanical power generated by WHR has to be provided in FC-Map of primary f"& _
"uel"
'
'pnMechWhrDeclaration
'
......@@ -1339,48 +1381,6 @@ Partial Class EngineForm
Me.Label46.TabIndex = 6
Me.Label46.Text = "Engineering"
'
'TabPage1
'
Me.TabPage1.Controls.Add(Me.cbElWHR)
Me.TabPage1.Controls.Add(Me.cbMechWHRNotConnectedCrankshaft)
Me.TabPage1.Controls.Add(Me.cbMechWHRInMap)
Me.TabPage1.Location = New System.Drawing.Point(4, 22)
Me.TabPage1.Name = "TabPage1"
Me.TabPage1.Size = New System.Drawing.Size(474, 145)
Me.TabPage1.TabIndex = 2
Me.TabPage1.Text = "WHR Type"
Me.TabPage1.UseVisualStyleBackColor = true
'
'cbMechWHRInMap
'
Me.cbMechWHRInMap.AutoSize = true
Me.cbMechWHRInMap.Location = New System.Drawing.Point(17, 12)
Me.cbMechWHRInMap.Name = "cbMechWHRInMap"
Me.cbMechWHRInMap.Size = New System.Drawing.Size(287, 17)
Me.cbMechWHRInMap.TabIndex = 0
Me.cbMechWHRInMap.Text = "Mechanical WHR System incuded in FC measurements"
Me.cbMechWHRInMap.UseVisualStyleBackColor = true
'
'cbMechWHRNotConnectedCrankshaft
'
Me.cbMechWHRNotConnectedCrankshaft.AutoSize = true
Me.cbMechWHRNotConnectedCrankshaft.Location = New System.Drawing.Point(17, 35)
Me.cbMechWHRNotConnectedCrankshaft.Name = "cbMechWHRNotConnectedCrankshaft"
Me.cbMechWHRNotConnectedCrankshaft.Size = New System.Drawing.Size(303, 17)
Me.cbMechWHRNotConnectedCrankshaft.TabIndex = 1
Me.cbMechWHRNotConnectedCrankshaft.Text = "Mechanical WHR System not connected to the crankshaft"
Me.cbMechWHRNotConnectedCrankshaft.UseVisualStyleBackColor = true
'
'cbElWHR
'
Me.cbElWHR.AutoSize = true
Me.cbElWHR.Location = New System.Drawing.Point(17, 58)
Me.cbElWHR.Name = "cbElWHR"
Me.cbElWHR.Size = New System.Drawing.Size(136, 17)
Me.cbElWHR.TabIndex = 2
Me.cbElWHR.Text = "Electrical WHR System"
Me.cbElWHR.UseVisualStyleBackColor = true
'
'EngineForm
'
Me.AcceptButton = Me.ButOK
......@@ -1452,20 +1452,20 @@ Partial Class EngineForm
Me.pnEngCFFuel2.ResumeLayout(false)
Me.pnEngCFFuel2.PerformLayout
Me.tbWHR.ResumeLayout(false)
Me.TabPage1.ResumeLayout(false)
Me.TabPage1.PerformLayout
Me.tbElectricalWHR.ResumeLayout(false)
Me.tbElectricalWHR.PerformLayout
Me.tbMechanicalWHR.ResumeLayout(false)
Me.tbMechanicalWHR.PerformLayout
Me.pnElWHRDeclaration.ResumeLayout(false)
Me.pnElWHRDeclaration.PerformLayout
Me.pnElWhrEngineering.ResumeLayout(false)
Me.pnElWhrEngineering.PerformLayout
Me.tbMechanicalWHR.ResumeLayout(false)
Me.tbMechanicalWHR.PerformLayout
Me.pnMechWhrDeclaration.ResumeLayout(false)
Me.pnMechWhrDeclaration.PerformLayout
Me.pnMechWhrEngineering.ResumeLayout(false)
Me.pnMechWhrEngineering.PerformLayout
Me.TabPage1.ResumeLayout(false)
Me.TabPage1.PerformLayout
Me.ResumeLayout(false)
Me.PerformLayout
......
VECTO/GUI/VectoJobForm.vb
+ 3
− 1
View file @ eef4b78a
......@@ -1028,6 +1028,7 @@ Public Class VectoJobForm
pnHybridStrategy.Enabled = False
lblESSUtilityFactorDriving.Enabled = false
tbESSUtilityFactorDriving.Enabled = false
pnHybridStrategy.Enabled = Not Cfg.DeclMode
Select Case JobType
Case VectoSimulationJobType.ConventionalVehicle
gbElectricAux.Enabled = False
......@@ -1040,6 +1041,7 @@ Public Class VectoJobForm
TabPgADAS.Enabled = False
tpAuxiliaries.Enabled = False
pnShiftParams.Enabled = False
pnHybridStrategy.Enabled = false
'Case VectoSimulationJobType.ParallelHybridVehicle
' ' empty line - do not fall-through
' pnHybridStrategy.Enabled = True
......@@ -1348,7 +1350,7 @@ Public Class VectoJobForm
End If
PicVehicle.Image = ConvPicPath(HDVclass, False) _
PicVehicle.Image = ConvPicPath(If( Not s0.Found, -1, HDVclass.GetClassNumber().ToInt()), False) _
'Image.FromFile(cDeclaration.ConvPicPath(HDVclass, False))
TbHVCclass.Text = $"HDV Group {HDVclass}"
......
VECTO/GUI/VehicleForm.Designer.vb
+ 31
− 31
View file @ eef4b78a
......@@ -144,7 +144,8 @@ Partial Class VehicleForm
Me.btDelMaxTorqueEntry = New System.Windows.Forms.Button()
Me.btAddMaxTorqueEntry = New System.Windows.Forms.Button()
Me.tpADAS = New System.Windows.Forms.TabPage()
Me.GroupBox5 = New System.Windows.Forms.GroupBox()
Me.gbADAS = New System.Windows.Forms.GroupBox()
Me.cbAtEcoRollReleaseLockupClutch = New System.Windows.Forms.CheckBox()
Me.cbPcc = New System.Windows.Forms.ComboBox()
Me.cbEcoRoll = New System.Windows.Forms.ComboBox()
Me.Label22 = New System.Windows.Forms.Label()
......@@ -168,7 +169,6 @@ Partial Class VehicleForm
Me.gbPTO = New System.Windows.Forms.GroupBox()
Me.cbLegislativeClass = New System.Windows.Forms.ComboBox()
Me.Label21 = New System.Windows.Forms.Label()
Me.cbAtEcoRollReleaseLockupClutch = New System.Windows.Forms.CheckBox()
Me.GroupBox6.SuspendLayout
Me.ToolStrip1.SuspendLayout
Me.GroupBox7.SuspendLayout
......@@ -194,7 +194,7 @@ Partial Class VehicleForm
Me.GroupBox9.SuspendLayout
Me.TabPage3.SuspendLayout
Me.tpADAS.SuspendLayout
Me.GroupBox5.SuspendLayout
Me.gbADAS.SuspendLayout
Me.tpRoadSweeper.SuspendLayout
Me.gbPTODrive.SuspendLayout
Me.pnPTO.SuspendLayout
......@@ -1199,7 +1199,7 @@ Partial Class VehicleForm
'
'tpADAS
'
Me.tpADAS.Controls.Add(Me.GroupBox5)
Me.tpADAS.Controls.Add(Me.gbADAS)
Me.tpADAS.Location = New System.Drawing.Point(4, 22)
Me.tpADAS.Name = "tpADAS"
Me.tpADAS.Padding = New System.Windows.Forms.Padding(3)
......@@ -1208,20 +1208,30 @@ Partial Class VehicleForm
Me.tpADAS.Text = "ADAS"
Me.tpADAS.UseVisualStyleBackColor = true
'
'GroupBox5
'
Me.GroupBox5.Controls.Add(Me.cbAtEcoRollReleaseLockupClutch)
Me.GroupBox5.Controls.Add(Me.cbPcc)
Me.GroupBox5.Controls.Add(Me.cbEcoRoll)
Me.GroupBox5.Controls.Add(Me.Label22)
Me.GroupBox5.Controls.Add(Me.cbEngineStopStart)
Me.GroupBox5.Controls.Add(Me.lblPCC)
Me.GroupBox5.Location = New System.Drawing.Point(6, 6)
Me.GroupBox5.Name = "GroupBox5"
Me.GroupBox5.Size = New System.Drawing.Size(565, 136)
Me.GroupBox5.TabIndex = 0
Me.GroupBox5.TabStop = false
Me.GroupBox5.Text = "ADAS Options"
'gbADAS
'
Me.gbADAS.Controls.Add(Me.cbAtEcoRollReleaseLockupClutch)
Me.gbADAS.Controls.Add(Me.cbPcc)
Me.gbADAS.Controls.Add(Me.cbEcoRoll)
Me.gbADAS.Controls.Add(Me.Label22)
Me.gbADAS.Controls.Add(Me.cbEngineStopStart)
Me.gbADAS.Controls.Add(Me.lblPCC)
Me.gbADAS.Location = New System.Drawing.Point(6, 6)
Me.gbADAS.Name = "gbADAS"
Me.gbADAS.Size = New System.Drawing.Size(565, 136)
Me.gbADAS.TabIndex = 0
Me.gbADAS.TabStop = false
Me.gbADAS.Text = "ADAS Options"
'
'cbAtEcoRollReleaseLockupClutch
'
Me.cbAtEcoRollReleaseLockupClutch.AutoSize = true
Me.cbAtEcoRollReleaseLockupClutch.Location = New System.Drawing.Point(265, 19)
Me.cbAtEcoRollReleaseLockupClutch.Name = "cbAtEcoRollReleaseLockupClutch"
Me.cbAtEcoRollReleaseLockupClutch.Size = New System.Drawing.Size(243, 17)
Me.cbAtEcoRollReleaseLockupClutch.TabIndex = 10
Me.cbAtEcoRollReleaseLockupClutch.Text = "AT Gearbox: Eco-Roll Release Lockup Clutch"
Me.cbAtEcoRollReleaseLockupClutch.UseVisualStyleBackColor = true
'
'cbPcc
'
......@@ -1444,16 +1454,6 @@ Partial Class VehicleForm
Me.Label21.TabIndex = 42
Me.Label21.Text = "Maximum Laden Mass"
'
'cbAtEcoRollReleaseLockupClutch
'
Me.cbAtEcoRollReleaseLockupClutch.AutoSize = true
Me.cbAtEcoRollReleaseLockupClutch.Location = New System.Drawing.Point(265, 19)
Me.cbAtEcoRollReleaseLockupClutch.Name = "cbAtEcoRollReleaseLockupClutch"
Me.cbAtEcoRollReleaseLockupClutch.Size = New System.Drawing.Size(243, 17)
Me.cbAtEcoRollReleaseLockupClutch.TabIndex = 10
Me.cbAtEcoRollReleaseLockupClutch.Text = "AT Gearbox: Eco-Roll Release Lockup Clutch"
Me.cbAtEcoRollReleaseLockupClutch.UseVisualStyleBackColor = true
'
'VehicleForm
'
Me.AcceptButton = Me.ButOK
......@@ -1521,8 +1521,8 @@ Partial Class VehicleForm
Me.TabPage3.ResumeLayout(false)
Me.TabPage3.PerformLayout
Me.tpADAS.ResumeLayout(false)
Me.GroupBox5.ResumeLayout(false)
Me.GroupBox5.PerformLayout
Me.gbADAS.ResumeLayout(false)
Me.gbADAS.PerformLayout
Me.tpRoadSweeper.ResumeLayout(false)
Me.gbPTODrive.ResumeLayout(false)
Me.gbPTODrive.PerformLayout
......@@ -1638,7 +1638,7 @@ End Sub
Friend WithEvents Label20 As System.Windows.Forms.Label
Friend WithEvents Label21 As Label
Friend WithEvents tpADAS As TabPage
Friend WithEvents GroupBox5 As GroupBox
Friend WithEvents gbADAS As GroupBox
Friend WithEvents cbEngineStopStart As CheckBox
Friend WithEvents lblPCC As Label
Friend WithEvents Label22 As Label
......
VECTO/GUI/VehicleForm.vb
+ 2
− 3
View file @ eef4b78a
......@@ -109,7 +109,7 @@ Public Class VehicleForm
cbTankSystem.DataSource = {New With {Key .Value = CType(Nothing, TankSystem?), .Label = ""}}.Concat([Enum].GetValues(GetType(TankSystem)).Cast(Of TankSystem?).Select(Function(ts) New With {Key .Value = ts , .Label = ts.ToString()})).ToList()
tpADAS.Enabled = Cfg.DeclMode
'tpADAS.Enabled = Cfg.DeclMode
CbCat.ValueMember = "Value"
CbCat.DisplayMember = "Label"
......@@ -799,9 +799,8 @@ Public Class VehicleForm
_axlDlog.TbRRC.Text = lv0.SubItems(AxleTbl.RRC).Text
_axlDlog.TbFzISO.Text = lv0.SubItems(AxleTbl.FzISO).Text
_axlDlog.TbI_wheels.Text = lv0.SubItems(AxleTbl.Inertia).Text
_axlDlog.CbWheels.Text = lv0.SubItems(AxleTbl.WheelsDimension).Text
_axlDlog.CbWheels.SelectedItem = if(string.IsNullOrWhiteSpace(lv0.SubItems(AxleTbl.WheelsDimension).Text), "-",lv0.SubItems(AxleTbl.WheelsDimension).Text)
_axlDlog.cbAxleType.SelectedValue = lv0.SubItems(AxleTbl.AxleType).Text.ParseEnum(Of AxleType)()
If _axlDlog.ShowDialog = DialogResult.OK Then
lv0.SubItems(AxleTbl.RelativeLoad).Text = _axlDlog.TbAxleShare.Text
If _axlDlog.CbTwinT.Checked Then
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about