diff --git a/VECTO/GUI/VehicleAxleDialog.vb b/VECTO/GUI/VehicleAxleDialog.vb index c9afe4f1109f0c7cc91bef3521077e13a0575c81..67f43f84530b0cf3d8f451497d5328beb9d06106 100644 --- a/VECTO/GUI/VehicleAxleDialog.vb +++ b/VECTO/GUI/VehicleAxleDialog.vb @@ -29,7 +29,7 @@ Public Class VehicleAxleDialog InitializeComponent() CbWheels.Items.Add("-") - CbWheels.Items.AddRange(DeclarationData.Wheels.GetWheelsDimensions()) + CbWheels.Items.AddRange(DeclarationData.Wheels.GetWheelsDimensions().OrderBy(function(s) s).ToArray()) cbAxleType.Items.Clear() cbAxleType.ValueMember = "Value" diff --git a/VectoCore/VectoCore/Resources/Declaration/Wheels.csv b/VectoCore/VectoCore/Resources/Declaration/Wheels.csv index 0458291493b3f0513dbbfe3a4e4ad7c593897e92..2528208e77c6ed0908989b8764f7b5e4183a7c36 100644 --- a/VectoCore/VectoCore/Resources/Declaration/Wheels.csv +++ b/VectoCore/VectoCore/Resources/Declaration/Wheels.csv @@ -86,3 +86,19 @@ Wheel , cross-sectional width [mm] , tire aspect ratio [%] , rim diameter 8 R17.5 , 208 , 0.80 , 17.5 , 784 , 4.00 , 3.05 LT265/75 R16 , 267 , 0.75 , 16 , 804 , 5.82 , 3.05 385/55 R19.5 , 386 , 0.55 , 19.5 , 919 , 11.14 , 3.03 +# +24 R21 , 610 , 0.80 , 21 , 1372 , 70.15 , 3.05 +205/70 R15C , 209 , 0.70 , 15 , 669 , 1.66 , 3.03 +215/70 R15C , 221 , 0.70 , 15 , 683 , 1.60 , 3.03 +225/70 R15C , 228 , 0.70 , 15 , 697 , 1.82 , 3.03 +185/75 R16C , 184 , 0.75 , 16 , 684 , 1.67 , 3.03 +195/65 R16C , 201 , 0.65 , 16 , 660 , 1.59 , 3.03 +195/75 R16C , 196 , 0.75 , 16 , 698 , 1.80 , 3.03 +205/65 R16C , 209 , 0.65 , 16 , 672 , 1.68 , 3.03 +205/75 R16C , 203 , 0.75 , 16 , 714 , 2.09 , 3.03 +215/65 R16C , 221 , 0.65 , 16 , 686 , 1.83 , 3.03 +215/75 R16C , 216 , 0.75 , 16 , 728 , 2.24 , 3.03 +225/65 R16C , 228 , 0.65 , 16 , 698 , 1.93 , 3.03 +235/65 R16C , 240 , 0.65 , 16 , 712 , 2.12 , 3.03 +215/60 R17C , 221 , 0.60 , 17 , 690 , 1.50 , 3.03 +235/60 R17C , 240 , 0.60 , 17 , 714 , 2.29 , 3.03 diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.1.0.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.1.0.xsd index 9fd6562e50e0e301c792fa092ceefbb385462e6f..bd1cb43f8dd34b6cccc0ce90b8839217cbb55c54 100644 --- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.1.0.xsd +++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.1.0.xsd @@ -2518,7 +2518,22 @@ ToDo: -0.00 <xs:enumeration value="8.5 R17.5"/> <xs:enumeration value="8 R17.5"/> <xs:enumeration value="LT265/75 R16"/> - <xs:enumeration value="385/55 R19.5"/> + <xs:enumeration value="385/55 R19.5"/> + <xs:enumeration value="24 R21"/> + <xs:enumeration value="205/70 R15C"/> + <xs:enumeration value="215/70 R15C"/> + <xs:enumeration value="225/70 R15C"/> + <xs:enumeration value="185/75 R16C"/> + <xs:enumeration value="195/65 R16C"/> + <xs:enumeration value="195/75 R16C"/> + <xs:enumeration value="205/65 R16C"/> + <xs:enumeration value="205/75 R16C"/> + <xs:enumeration value="215/65 R16C"/> + <xs:enumeration value="215/75 R16C"/> + <xs:enumeration value="225/65 R16C"/> + <xs:enumeration value="235/65 R16C"/> + <xs:enumeration value="215/60 R17C"/> + <xs:enumeration value="235/60 R17C"/> </xs:restriction> </xs:simpleType> <xs:simpleType name="TyreFzISOType"> diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.2.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.2.xsd index f18187989708126c1c81872daffd7e5942b43f50..bdb761d258b0312707f6085623e0a33e48a2ecab 100644 --- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.2.xsd +++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.2.xsd @@ -150,23 +150,22 @@ <xs:enumeration value="8.5 R17.5"/> <xs:enumeration value="8 R17.5"/> <xs:enumeration value="LT265/75 R16"/> - <xs:enumeration value="385/55 R19.5"/> - <xs:enumeration value="455/45 R22.5"/> - <xs:enumeration value="195/75 R16 C"/> - <xs:enumeration value="205/65 R16 C"/> - <xs:enumeration value="205/70 R15 C"/> - <xs:enumeration value="215/70 R15 C"/> - <xs:enumeration value="225/70 R15 C"/> - <xs:enumeration value="185/75 R16 C"/> - <xs:enumeration value="195/65 R16 C"/> - <xs:enumeration value="205/75 R16 C"/> - <xs:enumeration value="215/65 R16 C"/> - <xs:enumeration value="215/75 R16 C"/> - <xs:enumeration value="225/65 R16 C"/> - <xs:enumeration value="225/75 R16 C"/> - <xs:enumeration value="235/65 R16 C"/> - <xs:enumeration value="215/60 R17 C"/> - <xs:enumeration value="235/60 R17 C"/> + <xs:enumeration value="385/55 R19.5"/> + <xs:enumeration value="24 R21"/> + <xs:enumeration value="205/70 R15C"/> + <xs:enumeration value="215/70 R15C"/> + <xs:enumeration value="225/70 R15C"/> + <xs:enumeration value="185/75 R16C"/> + <xs:enumeration value="195/65 R16C"/> + <xs:enumeration value="195/75 R16C"/> + <xs:enumeration value="205/65 R16C"/> + <xs:enumeration value="205/75 R16C"/> + <xs:enumeration value="215/65 R16C"/> + <xs:enumeration value="215/75 R16C"/> + <xs:enumeration value="225/65 R16C"/> + <xs:enumeration value="235/65 R16C"/> + <xs:enumeration value="215/60 R17C"/> + <xs:enumeration value="235/60 R17C"/> </xs:restriction> </xs:simpleType> </xs:schema>