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 616baefd authored by Martin Dippold's avatar Martin Dippold
Browse files

* New version number

* Bugfix for tq_sum_float_delta_LS selection dependent of vehicle class
* Bugfix for v_veh_avg_max_HS dependent of vehicle class
* Add note to GUI for v_veh_avg_max_HS
parent ccc97e2c
No related branches found
No related tags found
1 merge request!1* Tag added
File added
File deleted
File deleted
File added
...@@ -1117,6 +1117,7 @@ Public Module main_calculation_call ...@@ -1117,6 +1117,7 @@ Public Module main_calculation_call
'Check the criteria parameter dependent of the vehicle class and calculation mode 'Check the criteria parameter dependent of the vehicle class and calculation mode
If SetCritVeh(Job.mode, vehicle.classCode) Then If SetCritVeh(Job.mode, vehicle.classCode) Then
logme(7, False, format("Criteria parameter tq_sum_float_delta_LS set to new value ({0})", Crt.tq_sum_float_delta_LS)) logme(7, False, format("Criteria parameter tq_sum_float_delta_LS set to new value ({0})", Crt.tq_sum_float_delta_LS))
logme(7, False, format("Criteria parameter v_veh_avg_max_HS set to new value ({0})", Crt.v_veh_avg_max_HS))
End If End If
Return Flag Return Flag
...@@ -1138,10 +1139,47 @@ Public Module main_calculation_call ...@@ -1138,10 +1139,47 @@ Public Module main_calculation_call
Private Function SetCritVeh(ByVal mode As Integer, ByVal vehicleclass As tVehClass) As Boolean Private Function SetCritVeh(ByVal mode As Integer, ByVal vehicleclass As tVehClass) As Boolean
If mode = 1 Then If mode = 1 Then
Select Case (vehicleclass) Select Case (vehicleclass)
Case 1, 2, 21, 22, 23 Case tVehClass.Class1, tVehClass.Class2, tVehClass.Class53, tVehClass.Class54
Crt.tq_sum_float_delta_LS = 0.5 Crt.tq_sum_float_delta_LS = 0.5
Case 3, 4, 5, 9, 10, 24 Case tVehClass.Class3, tVehClass.Class4, tVehClass.Class5, tVehClass.Class9, tVehClass.Class10
Crt.tq_sum_float_delta_LS = 0.3 Crt.tq_sum_float_delta_LS = 0.3
Case tVehClass.Class31b2,
tVehClass.Class32a,
tVehClass.Class32b,
tVehClass.Class32c,
tVehClass.Class32d,
tVehClass.Class32e,
tVehClass.Class32f,
tVehClass.Class33b2,
tVehClass.Class34a,
tVehClass.Class34b,
tVehClass.Class34c,
tVehClass.Class34d,
tVehClass.Class34e,
tVehClass.Class34f,
tVehClass.Class35b2,
tVehClass.Class36a,
tVehClass.Class36b,
tVehClass.Class36c,
tVehClass.Class36d,
tVehClass.Class36e,
tVehClass.Class36f,
tVehClass.Class37b2,
tVehClass.Class38a,
tVehClass.Class38b,
tVehClass.Class38c,
tVehClass.Class38d,
tVehClass.Class38e,
tVehClass.Class38f,
tVehClass.Class39b2,
tVehClass.Class40a,
tVehClass.Class40b,
tVehClass.Class40c,
tVehClass.Class40d,
tVehClass.Class40e,
tVehClass.Class40f
Crt.tq_sum_float_delta_LS = 0.3
Crt.v_veh_avg_max_HS = 103
End Select End Select
Return True Return True
End If End If
......
...@@ -138,6 +138,7 @@ Partial Class F_Main ...@@ -138,6 +138,7 @@ Partial Class F_Main
Me.Label65 = New System.Windows.Forms.Label() Me.Label65 = New System.Windows.Forms.Label()
Me.Label54 = New System.Windows.Forms.Label() Me.Label54 = New System.Windows.Forms.Label()
Me.GroupBox9 = New System.Windows.Forms.GroupBox() Me.GroupBox9 = New System.Windows.Forms.GroupBox()
Me.LInfoDM = New System.Windows.Forms.Label()
Me.GroupBox15 = New System.Windows.Forms.GroupBox() Me.GroupBox15 = New System.Windows.Forms.GroupBox()
Me.LLengCrit = New System.Windows.Forms.Label() Me.LLengCrit = New System.Windows.Forms.Label()
Me.TB_leng_crit = New System.Windows.Forms.TextBox() Me.TB_leng_crit = New System.Windows.Forms.TextBox()
...@@ -176,6 +177,7 @@ Partial Class F_Main ...@@ -176,6 +177,7 @@ Partial Class F_Main
Me.LB_v_veh_avg_min_HS = New System.Windows.Forms.Label() Me.LB_v_veh_avg_min_HS = New System.Windows.Forms.Label()
Me.Label61 = New System.Windows.Forms.Label() Me.Label61 = New System.Windows.Forms.Label()
Me.GroupBox11 = New System.Windows.Forms.GroupBox() Me.GroupBox11 = New System.Windows.Forms.GroupBox()
Me.LStar = New System.Windows.Forms.Label()
Me.Label13 = New System.Windows.Forms.Label() Me.Label13 = New System.Windows.Forms.Label()
Me.Label3 = New System.Windows.Forms.Label() Me.Label3 = New System.Windows.Forms.Label()
Me.TB_delta_n_ec_LS = New System.Windows.Forms.TextBox() Me.TB_delta_n_ec_LS = New System.Windows.Forms.TextBox()
...@@ -249,8 +251,7 @@ Partial Class F_Main ...@@ -249,8 +251,7 @@ Partial Class F_Main
Me.LAccCorrAve = New System.Windows.Forms.Label() Me.LAccCorrAve = New System.Windows.Forms.Label()
Me.TB_acc_corr_avg = New System.Windows.Forms.TextBox() Me.TB_acc_corr_avg = New System.Windows.Forms.TextBox()
Me.LB_SelMode = New System.Windows.Forms.Label() Me.LB_SelMode = New System.Windows.Forms.Label()
Me.LInfoDM = New System.Windows.Forms.Label() Me.Label25 = New System.Windows.Forms.Label()
Me.LStar = New System.Windows.Forms.Label()
Me.MenuStrip1.SuspendLayout() Me.MenuStrip1.SuspendLayout()
Me.GroupBoxJob.SuspendLayout() Me.GroupBoxJob.SuspendLayout()
Me.GB_hz_out.SuspendLayout() Me.GB_hz_out.SuspendLayout()
...@@ -296,7 +297,7 @@ Partial Class F_Main ...@@ -296,7 +297,7 @@ Partial Class F_Main
' '
Me.MenuItemExit.Image = Global.AirDrag.My.Resources.Resources.Beenden Me.MenuItemExit.Image = Global.AirDrag.My.Resources.Resources.Beenden
Me.MenuItemExit.Name = "MenuItemExit" Me.MenuItemExit.Name = "MenuItemExit"
Me.MenuItemExit.Size = New System.Drawing.Size(53, 20) Me.MenuItemExit.Size = New System.Drawing.Size(54, 20)
Me.MenuItemExit.Text = "Exit" Me.MenuItemExit.Text = "Exit"
' '
'MenuItemNewJob 'MenuItemNewJob
...@@ -338,7 +339,7 @@ Partial Class F_Main ...@@ -338,7 +339,7 @@ Partial Class F_Main
' '
Me.ToolsToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MenuItemClearLog, Me.ToolStripMenuItemLog, Me.ToolStripMenuItem2, Me.ToolStripMenuItemOption}) Me.ToolsToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MenuItemClearLog, Me.ToolStripMenuItemLog, Me.ToolStripMenuItem2, Me.ToolStripMenuItemOption})
Me.ToolsToolStripMenuItem.Name = "ToolsToolStripMenuItem" Me.ToolsToolStripMenuItem.Name = "ToolsToolStripMenuItem"
Me.ToolsToolStripMenuItem.Size = New System.Drawing.Size(47, 20) Me.ToolsToolStripMenuItem.Size = New System.Drawing.Size(46, 20)
Me.ToolsToolStripMenuItem.Text = "Tools" Me.ToolsToolStripMenuItem.Text = "Tools"
' '
'MenuItemClearLog 'MenuItemClearLog
...@@ -378,37 +379,37 @@ Partial Class F_Main ...@@ -378,37 +379,37 @@ Partial Class F_Main
'ToolStripMenuItemManu 'ToolStripMenuItemManu
' '
Me.ToolStripMenuItemManu.Name = "ToolStripMenuItemManu" Me.ToolStripMenuItemManu.Name = "ToolStripMenuItemManu"
Me.ToolStripMenuItemManu.Size = New System.Drawing.Size(188, 22) Me.ToolStripMenuItemManu.Size = New System.Drawing.Size(187, 22)
Me.ToolStripMenuItemManu.Text = "User Manual" Me.ToolStripMenuItemManu.Text = "User Manual"
' '
'ReleaseNotesToolStripMenuItem 'ReleaseNotesToolStripMenuItem
' '
Me.ReleaseNotesToolStripMenuItem.Name = "ReleaseNotesToolStripMenuItem" Me.ReleaseNotesToolStripMenuItem.Name = "ReleaseNotesToolStripMenuItem"
Me.ReleaseNotesToolStripMenuItem.Size = New System.Drawing.Size(188, 22) Me.ReleaseNotesToolStripMenuItem.Size = New System.Drawing.Size(187, 22)
Me.ReleaseNotesToolStripMenuItem.Text = "Release Notes" Me.ReleaseNotesToolStripMenuItem.Text = "Release Notes"
' '
'ToolStripSeparator1 'ToolStripSeparator1
' '
Me.ToolStripSeparator1.Name = "ToolStripSeparator1" Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
Me.ToolStripSeparator1.Size = New System.Drawing.Size(185, 6) Me.ToolStripSeparator1.Size = New System.Drawing.Size(184, 6)
' '
'ReportBugToolStripMenuItem 'ReportBugToolStripMenuItem
' '
Me.ReportBugToolStripMenuItem.Image = Global.AirDrag.My.Resources.Resources.bug_edit_icon Me.ReportBugToolStripMenuItem.Image = Global.AirDrag.My.Resources.Resources.bug_edit_icon
Me.ReportBugToolStripMenuItem.Name = "ReportBugToolStripMenuItem" Me.ReportBugToolStripMenuItem.Name = "ReportBugToolStripMenuItem"
Me.ReportBugToolStripMenuItem.Size = New System.Drawing.Size(188, 22) Me.ReportBugToolStripMenuItem.Size = New System.Drawing.Size(187, 22)
Me.ReportBugToolStripMenuItem.Text = "Report Bug via CITnet" Me.ReportBugToolStripMenuItem.Text = "Report Bug via CITnet"
' '
'ToolStripMenuItem1 'ToolStripMenuItem1
' '
Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1" Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1"
Me.ToolStripMenuItem1.Size = New System.Drawing.Size(185, 6) Me.ToolStripMenuItem1.Size = New System.Drawing.Size(184, 6)
' '
'ToolStripMenuItemAbout 'ToolStripMenuItemAbout
' '
Me.ToolStripMenuItemAbout.Image = Global.AirDrag.My.Resources.Resources.Info Me.ToolStripMenuItemAbout.Image = Global.AirDrag.My.Resources.Resources.Info
Me.ToolStripMenuItemAbout.Name = "ToolStripMenuItemAbout" Me.ToolStripMenuItemAbout.Name = "ToolStripMenuItemAbout"
Me.ToolStripMenuItemAbout.Size = New System.Drawing.Size(188, 22) Me.ToolStripMenuItemAbout.Size = New System.Drawing.Size(187, 22)
Me.ToolStripMenuItemAbout.Text = "About Air Drag" Me.ToolStripMenuItemAbout.Text = "About Air Drag"
' '
'BackgroundWorkerVECTO 'BackgroundWorkerVECTO
...@@ -1487,6 +1488,17 @@ Partial Class F_Main ...@@ -1487,6 +1488,17 @@ Partial Class F_Main
Me.GroupBox9.TabStop = False Me.GroupBox9.TabStop = False
Me.GroupBox9.Text = "Dataset validity criteria" Me.GroupBox9.Text = "Dataset validity criteria"
' '
'LInfoDM
'
Me.LInfoDM.AutoSize = True
Me.LInfoDM.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.LInfoDM.ForeColor = System.Drawing.Color.Blue
Me.LInfoDM.Location = New System.Drawing.Point(223, 279)
Me.LInfoDM.Name = "LInfoDM"
Me.LInfoDM.Size = New System.Drawing.Size(328, 13)
Me.LInfoDM.TabIndex = 84
Me.LInfoDM.Text = "* Depend on vehicle class and might differ in calculation"
'
'GroupBox15 'GroupBox15
' '
Me.GroupBox15.Controls.Add(Me.LLengCrit) Me.GroupBox15.Controls.Add(Me.LLengCrit)
...@@ -1520,6 +1532,7 @@ Partial Class F_Main ...@@ -1520,6 +1532,7 @@ Partial Class F_Main
' '
'GroupBox12 'GroupBox12
' '
Me.GroupBox12.Controls.Add(Me.Label25)
Me.GroupBox12.Controls.Add(Me.Label21) Me.GroupBox12.Controls.Add(Me.Label21)
Me.GroupBox12.Controls.Add(Me.Label11) Me.GroupBox12.Controls.Add(Me.Label11)
Me.GroupBox12.Controls.Add(Me.Label20) Me.GroupBox12.Controls.Add(Me.Label20)
...@@ -1877,6 +1890,16 @@ Partial Class F_Main ...@@ -1877,6 +1890,16 @@ Partial Class F_Main
Me.GroupBox11.TabStop = False Me.GroupBox11.TabStop = False
Me.GroupBox11.Text = "Low speed test" Me.GroupBox11.Text = "Low speed test"
' '
'LStar
'
Me.LStar.AutoSize = True
Me.LStar.ForeColor = System.Drawing.Color.Blue
Me.LStar.Location = New System.Drawing.Point(111, 98)
Me.LStar.Name = "LStar"
Me.LStar.Size = New System.Drawing.Size(11, 13)
Me.LStar.TabIndex = 85
Me.LStar.Text = "*"
'
'Label13 'Label13
' '
Me.Label13.AutoSize = True Me.Label13.AutoSize = True
...@@ -2561,26 +2584,15 @@ Partial Class F_Main ...@@ -2561,26 +2584,15 @@ Partial Class F_Main
Me.LB_SelMode.TabIndex = 36 Me.LB_SelMode.TabIndex = 36
Me.LB_SelMode.Text = "Engineering mode" Me.LB_SelMode.Text = "Engineering mode"
' '
'LInfoDM 'Label25
'
Me.LInfoDM.AutoSize = True
Me.LInfoDM.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.LInfoDM.ForeColor = System.Drawing.Color.Blue
Me.LInfoDM.Location = New System.Drawing.Point(223, 279)
Me.LInfoDM.Name = "LInfoDM"
Me.LInfoDM.Size = New System.Drawing.Size(328, 13)
Me.LInfoDM.TabIndex = 84
Me.LInfoDM.Text = "* Depend on vehicle class and might differ in calculation"
'
'LStar
' '
Me.LStar.AutoSize = True Me.Label25.AutoSize = True
Me.LStar.ForeColor = System.Drawing.Color.Blue Me.Label25.ForeColor = System.Drawing.Color.Blue
Me.LStar.Location = New System.Drawing.Point(111, 98) Me.Label25.Location = New System.Drawing.Point(108, 98)
Me.LStar.Name = "LStar" Me.Label25.Name = "Label25"
Me.LStar.Size = New System.Drawing.Size(11, 13) Me.Label25.Size = New System.Drawing.Size(11, 13)
Me.LStar.TabIndex = 85 Me.Label25.TabIndex = 104
Me.LStar.Text = "*" Me.Label25.Text = "*"
' '
'F_Main 'F_Main
' '
...@@ -2879,4 +2891,5 @@ Partial Class F_Main ...@@ -2879,4 +2891,5 @@ Partial Class F_Main
Friend WithEvents ButtonGenVECTO As Button Friend WithEvents ButtonGenVECTO As Button
Friend WithEvents LInfoDM As Label Friend WithEvents LInfoDM As Label
Friend WithEvents LStar As Label Friend WithEvents LStar As Label
Friend WithEvents Label25 As Label
End Class End Class
...@@ -241,7 +241,7 @@ Public Class cCriteria ...@@ -241,7 +241,7 @@ Public Class cCriteria
"units": "km/h", "units": "km/h",
}, },
"v_veh_avg_max_HS": {"type": "number", "required": true, "v_veh_avg_max_HS": {"type": "number", "required": true,
"description": "Maximum average vehicle speed (high speed).", "description": "Maximum average vehicle speed (high speed). Dependent of vehicle class in Declaration mode (set automatically)",
"units": "km/h", "units": "km/h",
}, },
"v_veh_1s_delta_HS": {"type": "number", "required": true, "v_veh_1s_delta_HS": {"type": "number", "required": true,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment