diff --git a/Declaration/Wheels.csv b/Declaration/Wheels.csv
index f49a335209e44ff9951ed5e98a2785bd226be895..5dda0ca85a381b0db0d882056a47ece906c010b2 100644
--- a/Declaration/Wheels.csv
+++ b/Declaration/Wheels.csv
@@ -1,41 +1,58 @@
-Wheel,Inertia,d,Size-Class (0/1)
-9 R22.5,8.9,970,b
-9.00 R20,10.5,1018,b
-9.5 R17.5,4.9,842,b
-10 R17.5,5,858,b
-10 R22.5,11,1020,b
-10.00 R20,13.1,1025,b
-11 R22.5,14.4,1050,b
-11.00 R20,14.6,1082,b
-12 R22.5,16.8,1084,b
-12.00 R20,19.5,1122,b
-12.00 R24,27.7,1226,b
-12.5 R20,12.7,1120,b
-13 R22.5,20,1124,b
-14.00 R20,30.8,1238,b
-14.5 R20,14.8,1092,b
-16.00 R20,47.5,1343,b
-215/75 R17.5,3.9,767,b
-225/70 R17.5,4,759.5,b
-225/75 R17.5,4,782,b
-235/75 R17.5,4.5,797,b
-245/70 R17.5,5.2,787.5,b
-245/70 R19.5,6,838.3,b
-255/70 R22.5,9.5,928.5,b
-265/70 R19.5,6.5,866.3,b
-275/70 R22.5,11.9,956.5,b
-275/80 R22.5,12.8,1011.5,b
-285/70 R19.5,7.9,894.3,b
+Wheel,Inertia,d,Size-Class (0/1)
+9.5 R17.5,4.9,842,a
+9.00 R20,10.5,1018,a
+9 R22.5,8.9,970,a
+10 R17.5,5,858,a
+10 R22.5,11,1020,a
+10.00 R20,13.1,1025,a
+11 R22.5,14.4,1050,a
+11.00 R20,14.6,1082,a
+11.00 R22,16,1089.66,a
+12 R22.5,16.85,1084,a
+12.00 R20,19.5,1122,a
+12.00 R24,27.7,1226,a
+12.5 R20,12.7,1120,a
+13 R22.5,20,1124,a
+14.00 R20,30.8,1238,a
+14.5 R20,14.8,1092,a
+16.00 R20,47.5,1343,a
+205/75 R17.5,3.5,752,a
+215/75 R17.5,3.9,767,a
+225/70 R17.5,4,759.5,a
+225/75 R17.5,4,782,a
+235/75 R17.5,4.5,797,a
+245/70 R17.5,5.2,787.5,a
+245/70 R19.5,6,838.3,a
+255/70 R22.5,9.5,928.5,a
+265/70 R17.5,5.6,817,a
+265/70 R19.5,6.5,866.3,a
+275/70 R22.5,11.9,956.5,a
+275/80 R22.5,12.8,1011.5,a
+285/60 R22.5,10.6,913.5,a
+285/70 R19.5,7.9,894.3,a
295/55 R22.5,10.2,896,a
295/60 R22.5,10.8,925.5,a
-295/80 R22.5,15.5,1043.5,b
-305/70 R19.5,9.2,922.3,b
-305/70 R22.5,13.9,998.5,b
+295/80 R22.5,15.5,1043.5,a
+305/60 R22.5,11.4,922.3,a
+305/70 R19.5,9.2,998.5,a
+305/70 R22.5,13.9,998.5,a
+305/75 R24.5,21.2,1079.8,a
315/45 R22.5,9.9,855,a
315/60 R22.5,12.8,949.5,a
-315/70 R22.5,14.9,1012.5,b
-315/80 R22.5,17.6,1075.5,b
-365/80 R20,17.2,1092,b
-365/85 R20,22.5,1128.5,b
+315/70 R22.5,14.9,1012.5,a
+315/80 R22.5,17.6,1075.5,a
+325/95 R24,27.6,1227.1,a
+335/80 R20,13.5,1044,a
+355/50 R22.5,12.2,926.5,a
+365/70 R22.5,18.6,1082.5,a
+365/80 R20,17.2,1092,a
+365/85 R20,22.5,1128.5,a
+375/45 R22.5,11.2,909,a
+375/50 R22.5,13,946.5,a
+375/90 R22.5,33.8,1246.5,a
385/55 R22.5,15.9,995,a
385/65 R22.5,19.2,1072,a
+395/85 R20,27.9,1179.5,a
+425/65 R22.5,22.5,1124,a
+495/45 R22.5,20.7,1017,a
+525/65 R20.5,35,1203.2,a
diff --git a/VECTO/GUI/F_VEH_Axle.vb b/VECTO/GUI/F_VEH_Axle.vb
index 19bb2b25cddf8fa9aaa0429cf49bdf46554293e9..6efbbd19002e0a3763ec266012f96701291eecba 100644
--- a/VECTO/GUI/F_VEH_Axle.vb
+++ b/VECTO/GUI/F_VEH_Axle.vb
@@ -8,87 +8,74 @@
' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
'
' See the LICENSE.txt for the specific language governing permissions and limitations.
-Imports System.Windows.Forms
+Option Infer On
+Option Strict On
+Option Explicit On
''' <summary>
''' Axle Config Editor (Vehicle Editor sub-dialog)
''' </summary>
-''' <remarks></remarks>
Public Class F_VEH_Axle
-
- Public Sub New()
- Dim w As String
-
- ' Dieser Aufruf ist für den Designer erforderlich.
- InitializeComponent()
-
- ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
- Me.CbWheels.Items.Add("-")
- For Each w In Declaration.WheelsList
- Me.CbWheels.Items.Add(w)
- Next
-
-
-
- End Sub
-
- Public Sub Clear()
- Me.CbTwinT.Checked = False
- Me.TbAxleShare.Text = ""
- Me.TbI_wheels.Text = ""
- Me.TbRRC.Text = ""
- Me.TbFzISO.Text = ""
- Me.CbWheels.SelectedIndex = 0
- End Sub
-
- 'Initialise
- Private Sub F_VEH_Axle_Load(sender As Object, e As System.EventArgs) Handles Me.Load
- Me.PnAxle.Enabled = Not Cfg.DeclMode
- End Sub
-
- 'Save and close
- Private Sub OK_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles OK_Button.Click
-
- If Not Cfg.DeclMode Then
- If Not IsNumeric(Me.TbAxleShare.Text) OrElse Trim(Me.TbAxleShare.Text) = "" Then
- MsgBox("Weight input is not valid!")
- Exit Sub
- End If
- End If
-
- If Not IsNumeric(Me.TbRRC.Text) OrElse Trim(Me.TbRRC.Text) = "" Then
- MsgBox("RRC input is not valid!")
- Exit Sub
- End If
-
- If Not IsNumeric(Me.TbFzISO.Text) OrElse Trim(Me.TbFzISO.Text) = "" Then
- MsgBox("Fz ISO input is not valid!")
- Exit Sub
- End If
-
- Me.DialogResult = System.Windows.Forms.DialogResult.OK
- Me.Close()
- End Sub
-
- Private Sub CbWheels_SelectedIndexChanged(sender As System.Object, e As System.EventArgs) Handles CbWheels.SelectedIndexChanged
- Dim inertia As Single
- If Cfg.DeclMode Then
- inertia = Declaration.WheelsInertia(Me.CbWheels.Text)
- If inertia < 0 Then
- Me.TbI_wheels.Text = "-"
- Else
- Me.TbI_wheels.Text = inertia
- End If
- End If
- End Sub
-
- 'Cancel
- Private Sub Cancel_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles Cancel_Button.Click
- Me.DialogResult = System.Windows.Forms.DialogResult.Cancel
- Me.Close()
- End Sub
-
-
-
-
+ Public Sub New()
+ InitializeComponent()
+
+ CbWheels.Items.Add("-")
+ CbWheels.Items.AddRange(Declaration.WheelsList)
+ End Sub
+
+ Public Sub Clear()
+ CbTwinT.Checked = False
+ TbAxleShare.Text = ""
+ TbI_wheels.Text = ""
+ TbRRC.Text = ""
+ TbFzISO.Text = ""
+ CbWheels.SelectedIndex = 0
+ End Sub
+
+ 'Initialise
+ Private Sub F_VEH_Axle_Load(sender As Object, e As EventArgs) Handles Me.Load
+ PnAxle.Enabled = Not Cfg.DeclMode
+ End Sub
+
+ 'Save and close
+ Private Sub OK_Button_Click(sender As Object, e As EventArgs) Handles OK_Button.Click
+
+ If Not Cfg.DeclMode Then
+ If Not IsNumeric(TbAxleShare.Text) OrElse Trim(TbAxleShare.Text) = "" Then
+ MsgBox("Weight input is not valid!")
+ Exit Sub
+ End If
+ End If
+
+ If Not IsNumeric(TbRRC.Text) OrElse Trim(TbRRC.Text) = "" Then
+ MsgBox("RRC input is not valid!")
+ Exit Sub
+ End If
+
+ If Not IsNumeric(TbFzISO.Text) OrElse Trim(TbFzISO.Text) = "" Then
+ MsgBox("Fz ISO input is not valid!")
+ Exit Sub
+ End If
+
+ DialogResult = DialogResult.OK
+ Close()
+ End Sub
+
+ Private Sub CbWheels_SelectedIndexChanged(sender As Object, e As EventArgs) Handles CbWheels.SelectedIndexChanged
+ Dim inertia As Single
+ If Cfg.DeclMode Then
+ inertia = Declaration.WheelsInertia(CbWheels.Text)
+ If inertia < 0 Then
+ TbI_wheels.Text = "-"
+ Else
+ TbI_wheels.Text = inertia.ToString()
+ End If
+ End If
+ End Sub
+
+ 'Cancel
+ Private Sub Cancel_Button_Click(sender As Object, e As EventArgs) Handles Cancel_Button.Click
+ DialogResult = DialogResult.Cancel
+ Close()
+ End Sub
End Class
diff --git a/VECTO/cDeclaration.vb b/VECTO/cDeclaration.vb
index 046ef91cc8038ad218debe78f3ce64f80c47e935..8fcdd6f5eac1125f7885c2af4908161c4f72583e 100644
--- a/VECTO/cDeclaration.vb
+++ b/VECTO/cDeclaration.vb
@@ -12,6 +12,7 @@
Imports System.Collections.Generic
Imports iTextSharp.text.pdf
Imports System.IO
+Imports System.Linq
Imports iTextSharp.text
Public Class cDeclaration
@@ -757,9 +758,9 @@ Public Class cDeclaration
Return (F * w.Diam) / (2 * Math.PI)
End Function
- Public ReadOnly Property WheelsList As Dictionary(Of String, cWheel).KeyCollection
+ Public ReadOnly Property WheelsList As String()
Get
- Return Wheels.Keys
+ Return Wheels.Keys.ToArray()
End Get
End Property