diff --git a/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vecto b/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vecto
index 6b93f38a31754341338a98bcd5efc6b8b4be1d1e..92c360e6589c62c96aeca7e9b085484ddb2237d4 100644
--- a/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vecto
+++ b/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vecto
@@ -1,8 +1,8 @@
{
"Header": {
- "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)",
- "Date": "29.07.2014 16:58:58",
- "AppVersion": "2.0.4-beta",
+ "CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
+ "Date": "24.06.2015 12:03:58",
+ "AppVersion": "2.2 beta",
"FileVersion": 2
},
"Body": {
diff --git a/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.veng b/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.veng
index c1e59fbeae495fae19c73bd5db3e34906bc62927..2fe4c0c77d3e56b760af11960618d24a5deac8d4 100644
--- a/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.veng
+++ b/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.veng
@@ -1,9 +1,9 @@
{
"Header": {
- "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)",
- "Date": "29.07.2014 16:58:53",
- "AppVersion": "2.0.4-beta",
- "FileVersion": 2
+ "CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
+ "Date": "24.06.2015 09:20:06",
+ "AppVersion": "2.2 beta",
+ "FileVersion": 3
},
"Body": {
"SavedInDeclMode": true,
@@ -11,15 +11,10 @@
"Displacement": 7700.0,
"IdlingSpeed": 600.0,
"Inertia": 3.789,
- "FullLoadCurves": [
- {
- "Path": "12t Delivery Truck.vfld",
- "Gears": "0 - 99"
- }
- ],
+ "FullLoadCurve": "12t Delivery Truck.vfld",
"FuelMap": "12t Delivery Truck.vmap",
- "WHTC-Urban": 215.0,
- "WHTC-Rural": 202.0,
- "WHTC-Motorway": 204.0
+ "WHTC-Urban": 1.03,
+ "WHTC-Rural": 1.02,
+ "WHTC-Motorway": 1.01
}
}
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vgbx b/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vgbx
index 71a6413e1fa53facffa7b50a50b8ff74023d655e..922993ec9fa7193115dfba9b6965be547e87cf62 100644
--- a/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vgbx
+++ b/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vgbx
@@ -1,9 +1,9 @@
{
"Header": {
- "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)",
- "Date": "29.07.2014 16:58:58",
- "AppVersion": "2.0.4-beta",
- "FileVersion": 4
+ "CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
+ "Date": "24.06.2015 09:33:31",
+ "AppVersion": "2.2 beta",
+ "FileVersion": 5
},
"Body": {
"SavedInDeclMode": true,
@@ -19,37 +19,43 @@
"Ratio": 6.75,
"LossMap": "Indirect Gear.vtlm",
"TCactive": false,
- "ShiftPolygon": "-"
+ "ShiftPolygon": "-",
+ "FullLoadCurve": "<NOFILE>"
},
{
"Ratio": 3.6,
"LossMap": "Indirect Gear.vtlm",
"TCactive": false,
- "ShiftPolygon": "-"
+ "ShiftPolygon": "-",
+ "FullLoadCurve": "<NOFILE>"
},
{
"Ratio": 2.13,
"LossMap": "Indirect Gear.vtlm",
"TCactive": false,
- "ShiftPolygon": "-"
+ "ShiftPolygon": "-",
+ "FullLoadCurve": "<NOFILE>"
},
{
"Ratio": 1.39,
"LossMap": "Indirect Gear.vtlm",
"TCactive": false,
- "ShiftPolygon": "-"
+ "ShiftPolygon": "-",
+ "FullLoadCurve": "<NOFILE>"
},
{
"Ratio": 1.0,
"LossMap": "Direct Gear.vtlm",
"TCactive": false,
- "ShiftPolygon": "-"
+ "ShiftPolygon": "-",
+ "FullLoadCurve": "<NOFILE>"
},
{
"Ratio": 0.78,
"LossMap": "Indirect Gear.vtlm",
"TCactive": false,
- "ShiftPolygon": "-"
+ "ShiftPolygon": "-",
+ "FullLoadCurve": "<NOFILE>"
}
],
"TqReserve": 20.0,
diff --git a/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vveh b/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vveh
index 7e48eda364dafced678cd2d6f6ec778d42cd7f43..c3ceee94fcfd0a6277435fe964cc7aaf5915a8f9 100644
--- a/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vveh
+++ b/Generic Vehicles/Declaration Mode/12t Delivery Truck/12t Delivery Truck.vveh
@@ -1,9 +1,9 @@
{
"Header": {
- "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)",
- "Date": "29.07.2014 16:58:52",
- "AppVersion": "2.0.4-beta",
- "FileVersion": 5
+ "CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
+ "Date": "24.06.2015 09:07:37",
+ "AppVersion": "2.2 beta",
+ "FileVersion": 6
},
"Body": {
"SavedInDeclMode": true,
@@ -16,8 +16,8 @@
"CrossSecArea": 8.8,
"rdyn": 406.9297,
"Rim": "15° DC Rims",
- "CdCorrMode": "CdOfV",
- "CdCorrFile": "12t Delivery Truck.vcdv",
+ "CdCorrMode": "CdOfVdecl",
+ "CdCorrFile": "<NOFILE>",
"Retarder": {
"Type": "None",
"Ratio": 1.0,
@@ -28,7 +28,7 @@
"Axles": [
{
"Inertia": 6.0,
- "Wheels": "245/70 R 19.5",
+ "Wheels": "245/70 R19.5",
"AxleWeightShare": 0.0,
"TwinTyres": false,
"RRCISO": 0.008343465,
@@ -36,7 +36,7 @@
},
{
"Inertia": 6.0,
- "Wheels": "245/70 R 19.5",
+ "Wheels": "245/70 R19.5",
"AxleWeightShare": 0.0,
"TwinTyres": true,
"RRCISO": 0.00943769,
diff --git a/Generic Vehicles/Declaration Mode/12t Delivery Truck/Direct Gear.vtlm b/Generic Vehicles/Declaration Mode/12t Delivery Truck/Direct Gear.vtlm
index 9f3166c05f41576fb33fa529ea69aa1811a786ba..0e5b9b3eb574682a62d048c9e995fbe62e6e7694 100644
--- a/Generic Vehicles/Declaration Mode/12t Delivery Truck/Direct Gear.vtlm
+++ b/Generic Vehicles/Declaration Mode/12t Delivery Truck/Direct Gear.vtlm
@@ -6,7 +6,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
0,450,4.23,
0,650,5.23,
0,850,6.23,
-0,1050,7.23,
+0,1200,7.23,
200,-350,4.126,
200,-150,3.126,
200,50,2.626,
@@ -14,7 +14,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
200,450,4.626,
200,650,5.626,
200,850,6.626,
-200,1050,7.626,
+200,1200,7.626,
400,-350,4.522,
400,-150,3.522,
400,50,3.022,
@@ -22,7 +22,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
400,450,5.022,
400,650,6.022,
400,850,7.022,
-400,1050,8.022,
+400,1200,8.022,
600,-350,4.918,
600,-150,3.918,
600,50,3.418,
@@ -30,7 +30,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
600,450,5.418,
600,650,6.418,
600,850,7.418,
-600,1050,8.418,
+600,1200,8.418,
800,-350,5.314,
800,-150,4.314,
800,50,3.814,
@@ -38,7 +38,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
800,450,5.814,
800,650,6.814,
800,850,7.814,
-800,1050,8.814,
+800,1200,8.814,
1000,-350,5.71,
1000,-150,4.71,
1000,50,4.21,
@@ -46,7 +46,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
1000,450,6.21,
1000,650,7.21,
1000,850,8.21,
-1000,1050,9.21,
+1000,1200,9.21,
1200,-350,6.106,
1200,-150,5.106,
1200,50,4.606,
@@ -54,7 +54,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
1200,450,6.606,
1200,650,7.606,
1200,850,8.606,
-1200,1050,9.606,
+1200,1200,9.606,
1400,-350,6.502,
1400,-150,5.502,
1400,50,5.002,
@@ -62,7 +62,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
1400,450,7.002,
1400,650,8.002,
1400,850,9.002,
-1400,1050,10.002,
+1400,1200,10.002,
1600,-350,6.898,
1600,-150,5.898,
1600,50,5.398,
@@ -70,7 +70,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
1600,450,7.398,
1600,650,8.398,
1600,850,9.398,
-1600,1050,10.398,
+1600,1200,10.398,
1800,-350,7.294,
1800,-150,6.294,
1800,50,5.794,
@@ -78,7 +78,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
1800,450,7.794,
1800,650,8.794,
1800,850,9.794,
-1800,1050,10.794,
+1800,1200,10.794,
2000,-350,7.69,
2000,-150,6.69,
2000,50,6.19,
@@ -86,7 +86,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
2000,450,8.19,
2000,650,9.19,
2000,850,10.19,
-2000,1050,11.19,
+2000,1200,11.19,
2200,-350,8.086,
2200,-150,7.086,
2200,50,6.586,
@@ -94,7 +94,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
2200,450,8.586,
2200,650,9.586,
2200,850,10.586,
-2200,1050,11.586,
+2200,1200,11.586,
2400,-350,8.482,
2400,-150,7.482,
2400,50,6.982,
@@ -102,7 +102,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
2400,450,8.982,
2400,650,9.982,
2400,850,10.982,
-2400,1050,11.982,
+2400,1200,11.982,
0,-1000,6.98,
200,-1000,7.376,
400,-1000,7.772,
diff --git a/Generic Vehicles/Declaration Mode/12t Delivery Truck/Indirect Gear.vtlm b/Generic Vehicles/Declaration Mode/12t Delivery Truck/Indirect Gear.vtlm
index 4171bb62973f8d3453853eebd65bc16050d07d07..d687a85bf5d2c1d243a66f41a44d334381724a51 100644
--- a/Generic Vehicles/Declaration Mode/12t Delivery Truck/Indirect Gear.vtlm
+++ b/Generic Vehicles/Declaration Mode/12t Delivery Truck/Indirect Gear.vtlm
@@ -7,7 +7,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
0,650,14.98,
0,850,18.98,
0,1050,22.98,
-0,1250,27
+0,1600,27
200,-350,9.376,
200,-150,5.376,
200,50,3.376,
@@ -16,7 +16,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
200,650,15.376,
200,850,19.376,
200,1050,23.376,
-200,1250,28
+200,1600,28
400,-350,9.772,
400,-150,5.772,
400,50,3.772,
@@ -25,7 +25,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
400,650,15.772,
400,850,19.772,
400,1050,23.772,
-400,1250,28
+400,1600,28
600,-350,10.168,
600,-150,6.168,
600,50,4.168,
@@ -34,7 +34,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
600,650,16.168,
600,850,20.168,
600,1050,24.168,
-600,1250,28.8
+600,1600,28.8
800,-350,10.564,
800,-150,6.564,
800,50,4.564,
@@ -43,7 +43,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
800,650,16.564,
800,850,20.564,
800,1050,24.564,
-800,1250,29
+800,1600,29
1000,-350,10.96,
1000,-150,6.96,
1000,50,4.96,
@@ -52,7 +52,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
1000,650,16.96,
1000,850,20.96,
1000,1050,24.96,
-1000,1250,30
+1000,1600,30
1200,-350,11.356,
1200,-150,7.356,
1200,50,5.356,
@@ -61,7 +61,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
1200,650,17.356,
1200,850,21.356,
1200,1050,25.356,
-1200,1250,30
+1200,1600,30
1400,-350,11.752,
1400,-150,7.752,
1400,50,5.752,
@@ -70,7 +70,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
1400,650,17.752,
1400,850,21.752,
1400,1050,25.752,
-1400,1250,31
+1400,1600,31
1600,-350,12.148,
1600,-150,8.148,
1600,50,6.148,
@@ -79,7 +79,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
1600,650,18.148,
1600,850,22.148,
1600,1050,26.148,
-1600,1250,31
+1600,1600,31
1800,-350,12.544,
1800,-150,8.544,
1800,50,6.544,
@@ -88,7 +88,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
1800,650,18.544,
1800,850,22.544,
1800,1050,26.544,
-1800,1250,32
+1800,1600,32
2000,-350,12.94,
2000,-150,8.94,
2000,50,6.94,
@@ -97,7 +97,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
2000,650,18.94,
2000,850,22.94,
2000,1050,26.94,
-2000,1250,32
+2000,1600,32
2200,-350,13.336,
2200,-150,9.336,
2200,50,7.336,
@@ -106,7 +106,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
2200,650,19.336,
2200,850,23.336,
2200,1050,27.336,
-2200,1250,33
+2200,1600,33
2400,-350,13.732,
2400,-150,9.732,
2400,50,7.732,
@@ -115,7 +115,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-]
2400,650,19.732,
2400,850,23.732,
2400,1050,27.732,
-2400,1250,33
+2400,1600,33
0,-1000,21.98,
200,-1000,22.376,
400,-1000,22.772,
diff --git a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.veng b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.veng
index 29f208aeeeaa81bf66fb9467ecd4077f6364bb0d..38c83945d7d7f8596f057ea6efc75c8d5f149b1b 100644
--- a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.veng
+++ b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.veng
@@ -1,9 +1,9 @@
{
"Header": {
- "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)",
- "Date": "29.07.2014 16:59:04",
- "AppVersion": "2.0.4-beta",
- "FileVersion": 2
+ "CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
+ "Date": "24.06.2015 09:43:47",
+ "AppVersion": "2.2 beta",
+ "FileVersion": 3
},
"Body": {
"SavedInDeclMode": true,
@@ -11,15 +11,10 @@
"Displacement": 12730.0,
"IdlingSpeed": 560.0,
"Inertia": 5.1471,
- "FullLoadCurves": [
- {
- "Path": "40t_Long_Haul_Truck.vfld",
- "Gears": "0 - 99"
- }
- ],
+ "FullLoadCurve": "40t_Long_Haul_Truck.vfld",
"FuelMap": "40t_Long_Haul_Truck.vmap",
- "WHTC-Urban": 199.84,
- "WHTC-Rural": 192.89,
- "WHTC-Motorway": 193.155
+ "WHTC-Urban": 1.05,
+ "WHTC-Rural": 1.02,
+ "WHTC-Motorway": 1.03
}
}
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vgbx b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vgbx
index 3ac2c59374c2271c30f7cfb308fdc97711a08c26..06e29aa330a095f98b2e2cf8d43fbc5725d109a2 100644
--- a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vgbx
+++ b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vgbx
@@ -1,9 +1,9 @@
{
"Header": {
- "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)",
- "Date": "29.07.2014 16:59:06",
- "AppVersion": "2.0.4-beta",
- "FileVersion": 4
+ "CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
+ "Date": "24.06.2015 09:43:54",
+ "AppVersion": "2.2 beta",
+ "FileVersion": 5
},
"Body": {
"SavedInDeclMode": true,
@@ -19,73 +19,85 @@
"Ratio": 14.93,
"LossMap": "Indirect Gear.vtlm",
"TCactive": false,
- "ShiftPolygon": "-"
+ "ShiftPolygon": "-",
+ "FullLoadCurve": "<NOFILE>"
},
{
"Ratio": 11.64,
"LossMap": "Indirect Gear.vtlm",
"TCactive": false,
- "ShiftPolygon": "-"
+ "ShiftPolygon": "-",
+ "FullLoadCurve": "<NOFILE>"
},
{
"Ratio": 9.02,
"LossMap": "Indirect Gear.vtlm",
"TCactive": false,
- "ShiftPolygon": "-"
+ "ShiftPolygon": "-",
+ "FullLoadCurve": "<NOFILE>"
},
{
"Ratio": 7.04,
"LossMap": "Indirect Gear.vtlm",
"TCactive": false,
- "ShiftPolygon": "-"
+ "ShiftPolygon": "-",
+ "FullLoadCurve": "<NOFILE>"
},
{
"Ratio": 5.64,
"LossMap": "Indirect Gear.vtlm",
"TCactive": false,
- "ShiftPolygon": "-"
+ "ShiftPolygon": "-",
+ "FullLoadCurve": "<NOFILE>"
},
{
"Ratio": 4.4,
"LossMap": "Indirect Gear.vtlm",
"TCactive": false,
- "ShiftPolygon": "-"
+ "ShiftPolygon": "-",
+ "FullLoadCurve": "<NOFILE>"
},
{
"Ratio": 3.39,
"LossMap": "Indirect Gear.vtlm",
"TCactive": false,
- "ShiftPolygon": "-"
+ "ShiftPolygon": "-",
+ "FullLoadCurve": "<NOFILE>"
},
{
"Ratio": 2.65,
"LossMap": "Indirect Gear.vtlm",
"TCactive": false,
- "ShiftPolygon": "-"
+ "ShiftPolygon": "-",
+ "FullLoadCurve": "<NOFILE>"
},
{
"Ratio": 2.05,
"LossMap": "Indirect Gear.vtlm",
"TCactive": false,
- "ShiftPolygon": "-"
+ "ShiftPolygon": "-",
+ "FullLoadCurve": "<NOFILE>"
},
{
"Ratio": 1.6,
"LossMap": "Indirect Gear.vtlm",
"TCactive": false,
- "ShiftPolygon": "-"
+ "ShiftPolygon": "-",
+ "FullLoadCurve": "<NOFILE>"
},
{
"Ratio": 1.28,
"LossMap": "Indirect Gear.vtlm",
"TCactive": false,
- "ShiftPolygon": "-"
+ "ShiftPolygon": "-",
+ "FullLoadCurve": "<NOFILE>"
},
{
"Ratio": 1.0,
"LossMap": "Direct Gear.vtlm",
"TCactive": false,
- "ShiftPolygon": "-"
+ "ShiftPolygon": "-",
+ "FullLoadCurve": "<NOFILE>"
}
],
"TqReserve": 20.0,
diff --git a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vveh b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vveh
index 41d41402bb0d2ef0d8163f3dafdb1d78ed4b6704..0740f997a3baa41538cd82adc3ab166428f166ef 100644
--- a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vveh
+++ b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vveh
@@ -1,9 +1,9 @@
{
"Header": {
- "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)",
- "Date": "29.07.2014 16:59:03",
- "AppVersion": "2.0.4-beta",
- "FileVersion": 5
+ "CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
+ "Date": "24.06.2015 09:45:16",
+ "AppVersion": "2.2 beta",
+ "FileVersion": 6
},
"Body": {
"SavedInDeclMode": true,
@@ -16,8 +16,8 @@
"CrossSecArea": 9.5,
"rdyn": 488.2675,
"Rim": "5° DC Rims",
- "CdCorrMode": "CdOfV",
- "CdCorrFile": "40t_Long_Haul_Truck.vcdv",
+ "CdCorrMode": "CdOfVdecl",
+ "CdCorrFile": "<NOFILE>",
"Retarder": {
"Type": "Secondary",
"Ratio": 1.0,
@@ -28,7 +28,7 @@
"Axles": [
{
"Inertia": 14.9,
- "Wheels": "315/70 R 22.5",
+ "Wheels": "315/70 R22.5",
"AxleWeightShare": 0.0,
"TwinTyres": false,
"RRCISO": 0.00555,
@@ -36,7 +36,7 @@
},
{
"Inertia": 14.9,
- "Wheels": "315/70 R 22.5",
+ "Wheels": "315/70 R22.5",
"AxleWeightShare": 0.0,
"TwinTyres": true,
"RRCISO": 0.00628,
diff --git a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Direct Gear.vtlm b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Direct Gear.vtlm
index 938654e43e6b82ca1be9b9948176db24f95857af..87fbdc57f77b24fedf9ad3f44a366b94517cf8d0 100644
--- a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Direct Gear.vtlm
+++ b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Direct Gear.vtlm
@@ -13,7 +13,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
0,1850,14.31
0,2050,15.31
0,2250,16.31
-0,2450,17.31
+0,2600,17.31
100,-350,7.316
100,-150,6.316
100,50,5.816
@@ -28,7 +28,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
100,1850,14.816
100,2050,15.816
100,2250,16.816
-100,2450,17.816
+100,2600,17.816
300,-350,8.328
300,-150,7.328
300,50,6.828
@@ -43,7 +43,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
300,1850,15.828
300,2050,16.828
300,2250,17.828
-300,2450,18.828
+300,2600,18.828
500,-350,9.34
500,-150,8.34
500,50,7.84
@@ -58,7 +58,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
500,1850,16.84
500,2050,17.84
500,2250,18.84
-500,2450,19.84
+500,2600,19.84
700,-350,10.352
700,-150,9.352
700,50,8.852
@@ -73,7 +73,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
700,1850,17.852
700,2050,18.852
700,2250,19.852
-700,2450,20.852
+700,2600,20.852
900,-350,11.364
900,-150,10.364
900,50,9.864
@@ -88,7 +88,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
900,1850,18.864
900,2050,19.864
900,2250,20.864
-900,2450,21.864
+900,2600,21.864
1100,-350,12.376
1100,-150,11.376
1100,50,10.876
@@ -103,7 +103,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
1100,1850,19.876
1100,2050,20.876
1100,2250,21.876
-1100,2450,22.876
+1100,2600,22.876
1300,-350,13.388
1300,-150,12.388
1300,50,11.888
@@ -118,7 +118,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
1300,1850,20.888
1300,2050,21.888
1300,2250,22.888
-1300,2450,23.888
+1300,2600,23.888
1500,-350,14.4
1500,-150,13.4
1500,50,12.9
@@ -133,7 +133,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
1500,1850,21.9
1500,2050,22.9
1500,2250,23.9
-1500,2450,24.9
+1500,2600,24.9
1700,-350,15.412
1700,-150,14.412
1700,50,13.912
@@ -148,7 +148,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
1700,1850,22.912
1700,2050,23.912
1700,2250,24.912
-1700,2450,25.912
+1700,2600,25.912
1900,-350,16.424
1900,-150,15.424
1900,50,14.924
@@ -163,7 +163,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
1900,1850,23.924
1900,2050,24.924
1900,2250,25.924
-1900,2450,26.924
+1900,2600,26.924
2100,-350,17.436
2100,-150,16.436
2100,50,15.936
@@ -178,7 +178,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
2100,1850,24.936
2100,2050,25.936
2100,2250,26.936
-2100,2450,27.936
+2100,2600,27.936
0,-1000,10.06
100,-1000,10.566
300,-1000,11.578
diff --git a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Indirect Gear.vtlm b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Indirect Gear.vtlm
index e92c034837149aeb694dbdc917bd70e0eaf5fb78..0198efcc3633373b82fdd76362e1b2080f0dbd1e 100644
--- a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Indirect Gear.vtlm
+++ b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/Indirect Gear.vtlm
@@ -13,7 +13,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
0,1850,42.06
0,2050,46.06
0,2250,50.06
-0,2450,54.06
+0,3000,54.06
100,-350,12.566
100,-150,8.566
100,50,6.566
@@ -28,7 +28,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
100,1850,42.566
100,2050,46.566
100,2250,50.566
-100,2450,54.566
+100,3000,54.566
300,-350,13.578
300,-150,9.578
300,50,7.578
@@ -43,7 +43,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
300,1850,43.578
300,2050,47.578
300,2250,51.578
-300,2450,55.578
+300,3000,55.578
500,-350,14.59
500,-150,10.59
500,50,8.59
@@ -58,7 +58,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
500,1850,44.59
500,2050,48.59
500,2250,52.59
-500,2450,56.59
+500,3000,56.59
700,-350,15.602
700,-150,11.602
700,50,9.602
@@ -73,7 +73,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
700,1850,45.602
700,2050,49.602
700,2250,53.602
-700,2450,57.602
+700,3000,57.602
900,-350,16.614
900,-150,12.614
900,50,10.614
@@ -88,7 +88,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
900,1850,46.614
900,2050,50.614
900,2250,54.614
-900,2450,58.614
+900,3000,58.614
1100,-350,17.626
1100,-150,13.626
1100,50,11.626
@@ -103,7 +103,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
1100,1850,47.626
1100,2050,51.626
1100,2250,55.626
-1100,2450,59.626
+1100,3000,59.626
1300,-350,18.638
1300,-150,14.638
1300,50,12.638
@@ -118,7 +118,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
1300,1850,48.638
1300,2050,52.638
1300,2250,56.638
-1300,2450,60.638
+1300,3000,60.638
1500,-350,19.65
1500,-150,15.65
1500,50,13.65
@@ -133,7 +133,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
1500,1850,49.65
1500,2050,53.65
1500,2250,57.65
-1500,2450,61.65
+1500,3000,61.65
1700,-350,20.662
1700,-150,16.662
1700,50,14.662
@@ -148,7 +148,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
1700,1850,50.662
1700,2050,54.662
1700,2250,58.662
-1700,2450,62.662
+1700,3000,62.662
1900,-350,21.674
1900,-150,17.674
1900,50,15.674
@@ -163,7 +163,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
1900,1850,51.674
1900,2050,55.674
1900,2250,59.674
-1900,2450,63.674
+1900,3000,63.674
2100,-350,22.686
2100,-150,18.686
2100,50,16.686
@@ -178,7 +178,7 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
2100,1850,52.686
2100,2050,56.686
2100,2250,60.686
-2100,2450,64.686
+2100,3000,64.686
0,-1000,25.06
100,-1000,25.566
300,-1000,26.578
diff --git a/VECTO/GUI/F_ENG.Designer.vb b/VECTO/GUI/F_ENG.Designer.vb
index c0cf99ac6c01fdc789edf09b40e60f37b5943d65..a3d5ec7295f232bcd61fa682de69dc8b53009e12 100644
--- a/VECTO/GUI/F_ENG.Designer.vb
+++ b/VECTO/GUI/F_ENG.Designer.vb
@@ -385,7 +385,7 @@ Partial Class F_ENG
Me.GrWHTC.Size = New System.Drawing.Size(481, 91)
Me.GrWHTC.TabIndex = 9
Me.GrWHTC.TabStop = False
- Me.GrWHTC.Text = "WHTC Test Results"
+ Me.GrWHTC.Text = "WHTC Correction"
'
'Label13
'
diff --git a/VECTO/GUI/F_GBX.Designer.vb b/VECTO/GUI/F_GBX.Designer.vb
index 408903e26942266566fd8be6da43903bedf7927a..4bbe17ace7681adbc07b14b24a3a6df0d07976f0 100644
--- a/VECTO/GUI/F_GBX.Designer.vb
+++ b/VECTO/GUI/F_GBX.Designer.vb
@@ -54,6 +54,7 @@ Partial Class F_GBX
Me.ColumnHeader2 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
Me.ColumnHeader3 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
Me.ColumnHeader5 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader6 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
Me.TBI_getr = New System.Windows.Forms.TextBox()
Me.Label49 = New System.Windows.Forms.Label()
Me.Label33 = New System.Windows.Forms.Label()
@@ -106,7 +107,6 @@ Partial Class F_GBX
Me.Label32 = New System.Windows.Forms.Label()
Me.PnInertiaTI = New System.Windows.Forms.Panel()
Me.PicBox = New System.Windows.Forms.PictureBox()
- Me.ColumnHeader6 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
Me.ToolStrip1.SuspendLayout()
Me.StatusStrip1.SuspendLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -281,9 +281,14 @@ Partial Class F_GBX
'
'ColumnHeader5
'
- Me.ColumnHeader5.Text = "Shift polygons"
+ Me.ColumnHeader5.Text = "Shift Polygons"
Me.ColumnHeader5.Width = 97
'
+ 'ColumnHeader6
+ '
+ Me.ColumnHeader6.Text = "Full Load Curve"
+ Me.ColumnHeader6.Width = 89
+ '
'TBI_getr
'
Me.TBI_getr.Location = New System.Drawing.Point(53, 3)
@@ -778,11 +783,6 @@ Partial Class F_GBX
Me.PicBox.TabIndex = 48
Me.PicBox.TabStop = False
'
- 'ColumnHeader6
- '
- Me.ColumnHeader6.Text = "Full load curve"
- Me.ColumnHeader6.Width = 89
- '
'F_GBX
'
Me.AcceptButton = Me.ButOK
diff --git a/VECTO/GUI/F_GBX.vb b/VECTO/GUI/F_GBX.vb
index 8ac594eeb4f9183c0602b2b87534c986e1094d56..47e8d747b0a6e4813ff776e8acb8f18c3f2dba06 100644
--- a/VECTO/GUI/F_GBX.vb
+++ b/VECTO/GUI/F_GBX.vb
@@ -16,8 +16,8 @@ Imports System.Collections.Generic
''' <remarks></remarks>
Public Class F_GBX
- Private GbxFile As String = ""
- Public AutoSendTo As Boolean = False
+ Private GbxFile As String = ""
+ Public AutoSendTo As Boolean = False
Public JobDir As String = ""
Private GearDia As F_GBX_GearDlog
@@ -690,6 +690,7 @@ Public Class F_GBX
Dim fldpath As String
Dim FLD0 As cFLD = Nothing
Dim ShiftOK As Boolean = False
+ Dim Shiftpoly As cGBX.cShiftPolygon
Me.PicBox.Image = Nothing
@@ -698,19 +699,23 @@ Public Class F_GBX
'Check Files
If Me.LvGears.Items.Count > 1 Then
- If Me.LvGears.SelectedItems.Count > 0 Then
- path = fFileRepl(Me.LvGears.SelectedItems(0).SubItems(4).Text, fPATH(GbxFile))
+ If Me.LvGears.SelectedItems.Count > 0 AndAlso Me.LvGears.SelectedIndices(0) > 0 Then
+ path = fFileRepl(Me.LvGears.SelectedItems(0).SubItems(4).Text, fPATH(GbxFile))
fldpath = fFileRepl(Me.LvGears.SelectedItems(0).SubItems(5).Text, fPATH(GbxFile))
Gear = Me.LvGears.SelectedIndices(0)
Else
path = fFileRepl(Me.LvGears.Items(1).SubItems(4).Text, fPATH(GbxFile))
fldpath = fFileRepl(Me.LvGears.Items(1).SubItems(5).Text, fPATH(GbxFile))
Gear = 1
- End If
+ End If
f = New cFile_V3
ShiftOK = f.OpenRead(path)
+ If fldpath.Trim = "" Then
+ If F_VECTO.Visible AndAlso F_VECTO.FLDfile <> "" Then fldpath = F_VECTO.FLDfile
+ End If
+
fldOK = fldpath.Trim <> ""
If fldOK Then
@@ -759,7 +764,7 @@ Public Class F_GBX
End If
-
+
'Create plot
If Not ShiftOK And Not fldOK Then Exit Sub
@@ -800,6 +805,33 @@ Public Class F_GBX
s.Name = "Full load"
MyChart.Series.Add(s)
+ If F_VECTO.Visible AndAlso F_VECTO.n_idle > 0 Then
+ If FLD0.Init(F_VECTO.n_idle) Then
+
+ Shiftpoly = New cGBX.cShiftPolygon("", 0)
+ Shiftpoly.SetGenericShiftPoly(FLD0, F_VECTO.n_idle)
+
+ s = New System.Windows.Forms.DataVisualization.Charting.Series
+ s.Points.DataBindXY(Shiftpoly.gs_nUup, Shiftpoly.gs_TqUp)
+ s.ChartType = DataVisualization.Charting.SeriesChartType.FastLine
+ s.BorderWidth = 2
+ s.Color = Color.DarkRed
+ s.BorderDashStyle = DataVisualization.Charting.ChartDashStyle.Dash
+ s.Name = "Upshift curve (generic)"
+ MyChart.Series.Add(s)
+
+ s = New System.Windows.Forms.DataVisualization.Charting.Series
+ s.Points.DataBindXY(Shiftpoly.gs_nUdown, Shiftpoly.gs_TqDown)
+ s.ChartType = DataVisualization.Charting.SeriesChartType.FastLine
+ s.BorderWidth = 2
+ s.Color = Color.DarkRed
+ s.BorderDashStyle = DataVisualization.Charting.ChartDashStyle.Dash
+ s.Name = "Downshift curve (generic)"
+ MyChart.Series.Add(s)
+
+ End If
+ End If
+
End If
diff --git a/VECTO/GUI/F_GBX_GearDlog.Designer.vb b/VECTO/GUI/F_GBX_GearDlog.Designer.vb
index 4c39518b6d3e270b6e96fe81c38a398d2aa74c50..d8509838d84843bf18ce80dcdb72b58427f8d857 100644
--- a/VECTO/GUI/F_GBX_GearDlog.Designer.vb
+++ b/VECTO/GUI/F_GBX_GearDlog.Designer.vb
@@ -42,6 +42,7 @@ Partial Class F_GBX_GearDlog
Me.BtBrowseFld = New System.Windows.Forms.Button()
Me.TbFld = New System.Windows.Forms.TextBox()
Me.PnFld = New System.Windows.Forms.Panel()
+ Me.Label6 = New System.Windows.Forms.Label()
Me.TableLayoutPanel1.SuspendLayout()
Me.PnShiftPoly.SuspendLayout()
Me.PnFld.SuspendLayout()
@@ -55,7 +56,7 @@ Partial Class F_GBX_GearDlog
Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
Me.TableLayoutPanel1.Controls.Add(Me.OK_Button, 0, 0)
Me.TableLayoutPanel1.Controls.Add(Me.Cancel_Button, 1, 0)
- Me.TableLayoutPanel1.Location = New System.Drawing.Point(380, 202)
+ Me.TableLayoutPanel1.Location = New System.Drawing.Point(380, 217)
Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
Me.TableLayoutPanel1.RowCount = 1
Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
@@ -145,7 +146,7 @@ Partial Class F_GBX_GearDlog
'BtNext
'
Me.BtNext.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
- Me.BtNext.Location = New System.Drawing.Point(307, 205)
+ Me.BtNext.Location = New System.Drawing.Point(307, 220)
Me.BtNext.Name = "BtNext"
Me.BtNext.Size = New System.Drawing.Size(67, 23)
Me.BtNext.TabIndex = 9
@@ -226,21 +227,31 @@ Partial Class F_GBX_GearDlog
'
'PnFld
'
+ Me.PnFld.Controls.Add(Me.Label6)
Me.PnFld.Controls.Add(Me.TbFld)
Me.PnFld.Controls.Add(Me.BtBrowseFld)
Me.PnFld.Controls.Add(Me.Label5)
Me.PnFld.Location = New System.Drawing.Point(10, 144)
Me.PnFld.Name = "PnFld"
- Me.PnFld.Size = New System.Drawing.Size(523, 50)
+ Me.PnFld.Size = New System.Drawing.Size(523, 65)
Me.PnFld.TabIndex = 15
'
+ 'Label6
+ '
+ Me.Label6.AutoSize = True
+ Me.Label6.Location = New System.Drawing.Point(3, 42)
+ Me.Label6.Name = "Label6"
+ Me.Label6.Size = New System.Drawing.Size(344, 13)
+ Me.Label6.TabIndex = 14
+ Me.Label6.Text = "If no file is defined the Full Load Curve from the Engine File will be used."
+ '
'F_GBX_GearDlog
'
Me.AcceptButton = Me.OK_Button
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.CancelButton = Me.Cancel_Button
- Me.ClientSize = New System.Drawing.Size(538, 243)
+ Me.ClientSize = New System.Drawing.Size(538, 258)
Me.Controls.Add(Me.PnFld)
Me.Controls.Add(Me.PnShiftPoly)
Me.Controls.Add(Me.ChIsTCgear)
@@ -289,5 +300,6 @@ Partial Class F_GBX_GearDlog
Friend WithEvents BtBrowseFld As System.Windows.Forms.Button
Friend WithEvents TbFld As System.Windows.Forms.TextBox
Friend WithEvents PnFld As System.Windows.Forms.Panel
+ Friend WithEvents Label6 As System.Windows.Forms.Label
End Class
diff --git a/VECTO/GUI/F_MAINForm.vb b/VECTO/GUI/F_MAINForm.vb
index 62dc0cdae0fb34b3f3e64622f06b13a675ef12c0..8dfffffed83a522da363269a9c7526a9baf31534 100644
--- a/VECTO/GUI/F_MAINForm.vb
+++ b/VECTO/GUI/F_MAINForm.vb
@@ -444,7 +444,7 @@ Public Class F_MAINForm
CycleTabPage = Me.TabPageDRI
DEVpage = Me.TabPageDEV
- Me.TabControl1.Controls.Remove(DEVpage)
+ 'Me.TabControl1.Controls.Remove(DEVpage)
LastModeName = ""
@@ -524,6 +524,16 @@ Public Class F_MAINForm
End If
End If
+ If DEV.Enabled Then
+ If Not Cfg.DeclMode Then
+ If Not Me.TabControl1.TabPages.Contains(DEVpage) Then Me.TabControl1.TabPages.Insert(Me.TabControl1.TabPages.Count, DEVpage)
+ LoadDEVconfigs()
+ Else
+ If Me.TabControl1.TabPages.Contains(DEVpage) Then Me.TabControl1.Controls.Remove(DEVpage)
+ DEV.SetDefault()
+ End If
+ End If
+
Status(LastModeName & " Mode")
Me.LoadOptions()
@@ -538,9 +548,9 @@ Public Class F_MAINForm
Dim fwelcome As F_Welcome
'DEV Form
- If DEV.Enabled Then
- Me.TabControl1.TabPages.Insert(Me.TabControl1.TabPages.Count, DEVpage)
- End If
+ 'If DEV.Enabled And Not Cfg.DeclMode Then
+ ' Me.TabControl1.TabPages.Insert(Me.TabControl1.TabPages.Count, DEVpage)
+ 'End If
'VECTO Init
Declaration.Init()
diff --git a/VECTO/GUI/F_VECTO.vb b/VECTO/GUI/F_VECTO.vb
index 9cf4389ce77f1ff98055ca3f67da40cd5651df93..a1d4e44cc5726e37f3fdf622bc9c4408a8f44026 100644
--- a/VECTO/GUI/F_VECTO.vb
+++ b/VECTO/GUI/F_VECTO.vb
@@ -26,11 +26,17 @@ Public Class F_VECTO
Private AuxDlog As F_VEH_AuxDlog
- Private EStechs As New List(Of String)
+ Private EStechs As New List(Of String)
+
+ Public n_idle As Single
+ Public FLDfile As String
'Initialise form
Private Sub F02_GEN_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
- Dim x As Int16
+ Dim x As Int16
+
+ n_idle = -1
+ FLDfile = ""
AuxDlog = New F_VEH_AuxDlog
@@ -538,6 +544,9 @@ Public Class F_VECTO
If ChangeCheckCancel() Then Exit Sub
+ n_idle = -1
+ FLDfile = ""
+
'Files
Me.TbVEH.Text = ""
Me.TbENG.Text = ""
@@ -1035,6 +1044,9 @@ lbDlog:
If ENG0.ReadFile(False) Then
+ n_idle = ENG0.Nidle
+ FLDfile = ENG0.PathFLD
+
EngOK = True
FLD0.FilePath = ENG0.PathFLD
diff --git a/VECTO/Input Files/cENG.vb b/VECTO/Input Files/cENG.vb
index 28e20bca515129344e0a38e30346050ca9a3f75f..960eb26a6ed0d5335ccf3a50138b40bcf1cccd93 100644
--- a/VECTO/Input Files/cENG.vb
+++ b/VECTO/Input Files/cENG.vb
@@ -142,7 +142,8 @@ Public Class cENG
Public Sub New()
MyPath = ""
sFilePath = ""
- fMAP = New cSubPath
+ fMAP = New cSubPath
+ fFLD = New cSubPath
SetDefault()
End Sub
@@ -159,6 +160,7 @@ Public Class cENG
Pmax = 0
fMAP.Clear()
+ fFLD.Clear()
WHTCurban = 0
WHTCrural = 0
@@ -246,7 +248,6 @@ Public Class cENG
Nidle = JSON.Content("Body")("IdlingSpeed")
I_mot = JSON.Content("Body")("Inertia")
- fFLD = New cSubPath
If FileVersion < 3 Then
fFLD.Init(MyPath, JSON.Content("Body")("FullLoadCurves")(0)("Path"))
Else
diff --git a/VECTO/cDEV.vb b/VECTO/cDEV.vb
index e2d9d00f7a5e165d0bd678f781f6a26663ad66b8..74b329765b9948b0ac06ac9d83c913caaa521666 100644
--- a/VECTO/cDEV.vb
+++ b/VECTO/cDEV.vb
@@ -165,6 +165,15 @@ Public Class cDEV
TCaccmin = MyOptions("TCaccMin").SingleVal
End Sub
+ Public Sub SetDefault()
+ Dim opt0 As cDEVoption
+
+ For Each opt0 In MyOptions.Values
+ opt0.SetDefault()
+ Next
+
+ End Sub
+
'Demo for Delegate Function
Public Function TestFunction() As String
Return "OK...?"
@@ -378,6 +387,24 @@ Public Class cDEVoption
sValTextDef = sValText
End Sub
+ Public Sub SetDefault()
+ Dim si As String = sValTextDef
+
+ If MyConfType = tDEVconfType.tSelection Then
+ Try
+ If sValTextDef(0) = "(" AndAlso sValTextDef.Contains(")") Then
+ si = sValTextDef.Substring(1, sValTextDef.IndexOf(")") - 1)
+ End If
+ Catch ex As Exception
+ Exit Sub
+ End Try
+ End If
+
+ StringToVal(si)
+
+
+ End Sub
+
Public Sub DoAction()
sValText = ActionDelegate.Invoke()
End Sub
@@ -392,7 +419,7 @@ Public Class cDEVoption
Try
Select Case MyConfType
Case tDEVconfType.tAction
- '??? Darf nicht sein |@@| May not be
+
Return False
Case tDEVconfType.tBoolean
diff --git a/VECTO/cDeclaration.vb b/VECTO/cDeclaration.vb
index 25f311ee97322eadce776c8e850fbb5d1aa0a51a..c1597cce3f02f4b1c48c48d14e6c62c11aa281f1 100644
--- a/VECTO/cDeclaration.vb
+++ b/VECTO/cDeclaration.vb
@@ -985,7 +985,7 @@ Public Class cDeclaration
Result = False
End If
- ESsum -= AuxESpower(EStech)(CurrentMission.MissionID)
+ ESsum += AuxESpower(EStech)(CurrentMission.MissionID)
Next