diff --git a/Demo Data/12t Demo/Declaration/Demo_VehicleDeclaration.vveh b/Demo Data/12t Demo/Declaration/Demo_VehicleDeclaration.vveh
index 0456dd030c98a93bbb781bb5508bfda032f45638..37e64b2619cc86da67ade7a58a02c6b422de59e9 100644
--- a/Demo Data/12t Demo/Declaration/Demo_VehicleDeclaration.vveh
+++ b/Demo Data/12t Demo/Declaration/Demo_VehicleDeclaration.vveh
@@ -1,6 +1,6 @@
c VECTO Vehicle Input File
-c VECTO 1.4 RC1
-c 04.09.2013 14:05:37
+c VECTO 1.4 RC3
+c 02.10.2013 17:27:18
c Curb weight vehicle [kg]
7750
c Curb weight extra trailer/body [kg]
@@ -24,9 +24,9 @@ c Retarder Ratio
c Retarder File
<NOFILE>
c Axle configurations
-c Max. axle weight [kg], RRC [N/N]
-6000,0.009
-6000,0.009
+c Axle weight share [-], RRC [N/N],Fz ISO [N]
+0.4,0,0.008343465,20800
+0.6,0,0.00943769,20800
<//>
c VehCat
0
diff --git a/Demo Data/12t Demo/ProofOfConcept/Demo_Vehicle_ChassisDyno.vveh b/Demo Data/12t Demo/ProofOfConcept/Demo_Vehicle_ChassisDyno.vveh
index 87515c8273d1a9ac5ac5934974b602e2ad10e063..3291dd835cfa323330cdd4717813f6ca91d73ecf 100644
--- a/Demo Data/12t Demo/ProofOfConcept/Demo_Vehicle_ChassisDyno.vveh
+++ b/Demo Data/12t Demo/ProofOfConcept/Demo_Vehicle_ChassisDyno.vveh
@@ -1,6 +1,6 @@
c VECTO Vehicle Input File
-c VECTO 1.0 Beta 1
-c 23.10.2012 18:02:14
+c VECTO 1.4 RC3
+c 02.10.2013 17:34:50
c Curb weight vehicle [kg]
8862
c Curb weight extra trailer/body [kg]
@@ -11,7 +11,7 @@ c Cd value [-]
0.7005663
c Cross sectional area [m^2]
8.8
-c Wheels equivalent rotational inertia [kg] (= I_wheel/rdyn^2)
+c Wheels inertia [kgm^2]
216.2271
c Wheel effective diameter [m]
0.848974
@@ -24,8 +24,9 @@ c Retarder Ratio
c Retarder File
<NOFILE>
c Axle configurations
-6000,0.007706799
-6000,0.007706799
+c Axle weight share [-], RRC [N/N],Fz ISO [N]
+0.4,0,0.007144311,20800
+0.6,0,0.008081271,20800
<//>
c VehCat
0
diff --git a/Demo Data/12t Demo/ProofOfConcept/Demo_Vehicle_TestTrack.vveh b/Demo Data/12t Demo/ProofOfConcept/Demo_Vehicle_TestTrack.vveh
index 0745e23e9b8b70ef3c90eac75535279965204ae8..e3c6dab00afeb70769004fb32bba98d639fdb992 100644
--- a/Demo Data/12t Demo/ProofOfConcept/Demo_Vehicle_TestTrack.vveh
+++ b/Demo Data/12t Demo/ProofOfConcept/Demo_Vehicle_TestTrack.vveh
@@ -1,6 +1,6 @@
c VECTO Vehicle Input File
-c VECTO 1.0 Beta 1
-c 23.10.2012 18:14:56
+c VECTO 1.4 RC3
+c 04.10.2013 10:01:14
c Curb weight vehicle [kg]
8862
c Curb weight extra trailer/body [kg]
@@ -11,7 +11,7 @@ c Cd value [-]
0.6014823
c Cross sectional area [m^2]
8.8
-c Wheels equivalent rotational inertia [kg] (= I_wheel/rdyn^2)
+c Wheels inertia [kgm^2]
254.6922
c Wheel effective diameter [m]
0.848974
@@ -24,8 +24,9 @@ c Retarder Ratio
c Retarder File
<NOFILE>
c Axle configurations
-6000,0.0104188
-6000,0.0104188
+c Axle weight share [-], RRC [N/N],Fz ISO [N]
+0.4,0,0.00966,20800
+0.6,0,0.01093,20800
<//>
c VehCat
0
diff --git a/Demo Data/40t Demo/VehClass5_40t.vveh b/Demo Data/40t Demo/VehClass5_40t.vveh
index f10e472cf995675fc3f75c3c3bef0c3f800f789a..edc4db352c46209d477018612f3667717e78f9a4 100644
--- a/Demo Data/40t Demo/VehClass5_40t.vveh
+++ b/Demo Data/40t Demo/VehClass5_40t.vveh
@@ -25,8 +25,11 @@ c Retarder File
<NOFILE>
c Axle configurations
c Max. axle weight [kg], RRC [N/N]
-1,0.0054
-0,0
+0.2,0,0.00555,31300
+0.25,1,0.00628,31300
+0.183333333,0,0.00495,35400
+0.183333333,0,0.00495,35400
+0.183333333,0,0.00495,35400
<//>
c VehCat
1
diff --git a/ShareVecto/VECTO_1.3.1.1_GRAPHiFix.VECTO-3.zip b/ShareVecto/VECTO_1.3.1.1_GRAPHiFix.VECTO-3.zip
index c9f4902b60debeab94261a3c6c3d052b31861825..65068a643dcb6bb7dd537c4fbc59d5c49da24b08 100644
Binary files a/ShareVecto/VECTO_1.3.1.1_GRAPHiFix.VECTO-3.zip and b/ShareVecto/VECTO_1.3.1.1_GRAPHiFix.VECTO-3.zip differ
diff --git a/VECTO/GUI/F_MAINForm.vb b/VECTO/GUI/F_MAINForm.vb
index 29dccb0e042aa8522d4c535992619dd4001d1815..6e6a94968ba7ab871b0cde75d05cf167fb2675e9 100644
--- a/VECTO/GUI/F_MAINForm.vb
+++ b/VECTO/GUI/F_MAINForm.vb
@@ -212,6 +212,11 @@ Public Class F_MAINForm
'Zyklus-Liste definieren (falls nicht BATCH-Modus wird in SetCycleList nur die Liste gelöscht und nicht neu belegt) |@@| Define Cycle-list (if not BATCH mode in SetCycleList deleted only the list and not reassigned)
SetCycleList()
+ If JobFileList.Count = 0 Then
+ GUImsg(tMsgID.Err, "No job file selected!")
+ Exit Sub
+ End If
+
'Check whether Overall-progbar is needed
If PHEMmode = tPHEMmode.ModeBATCH Or JobFileList.Count > 1 Then
ProgOverall = True
@@ -320,6 +325,7 @@ Public Class F_MAINForm
Me.ToolStripProgBarOverall.Visible = True
End If
+ ProgBarCtrl.ProgJobInt = 0
ProgSecStart()
'BG-Worker start
@@ -1808,7 +1814,6 @@ lbFound:
#Region "Sekundäre Progressbar (ToolStripProgBarSec) ...auch Update von ToolStripProgBarPrim möglich"
Private Sub ProgSecStart()
- ProgBarCtrl.ProgJobInt = 0
Me.ToolStripProgBarJob.Value = 0
Me.ToolStripProgBarJob.Style = ProgressBarStyle.Marquee
Me.ToolStripProgBarJob.Visible = True
diff --git a/VECTO/GUI/F_VEH_Axle.Designer.vb b/VECTO/GUI/F_VEH_Axle.Designer.vb
index 3021474b0ce7a9b8f2d63a0520692a307a8d9de6..1326262621bd7176472c44c39662d867a6a4342a 100644
--- a/VECTO/GUI/F_VEH_Axle.Designer.vb
+++ b/VECTO/GUI/F_VEH_Axle.Designer.vb
@@ -55,7 +55,7 @@ Partial Class F_VEH_Axle
Me.TableLayoutPanel1.RowCount = 1
Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
Me.TableLayoutPanel1.Size = New System.Drawing.Size(146, 29)
- Me.TableLayoutPanel1.TabIndex = 10
+ Me.TableLayoutPanel1.TabIndex = 4
'
'OK_Button
'
@@ -124,7 +124,7 @@ Partial Class F_VEH_Axle
Me.TbRRC.Location = New System.Drawing.Point(98, 54)
Me.TbRRC.Name = "TbRRC"
Me.TbRRC.Size = New System.Drawing.Size(84, 20)
- Me.TbRRC.TabIndex = 5
+ Me.TbRRC.TabIndex = 2
'
'Label5
'
@@ -149,7 +149,7 @@ Partial Class F_VEH_Axle
Me.TbFzISO.Location = New System.Drawing.Point(271, 54)
Me.TbFzISO.Name = "TbFzISO"
Me.TbFzISO.Size = New System.Drawing.Size(84, 20)
- Me.TbFzISO.TabIndex = 5
+ Me.TbFzISO.TabIndex = 3
'
'Label7
'
@@ -195,7 +195,7 @@ Partial Class F_VEH_Axle
Me.CbTwinT.Location = New System.Drawing.Point(271, 14)
Me.CbTwinT.Name = "CbTwinT"
Me.CbTwinT.Size = New System.Drawing.Size(78, 17)
- Me.CbTwinT.TabIndex = 11
+ Me.CbTwinT.TabIndex = 1
Me.CbTwinT.Text = "Twin Tyres"
Me.CbTwinT.UseVisualStyleBackColor = True
'
diff --git a/VECTO/GUI/GUI_Subs.vb b/VECTO/GUI/GUI_Subs.vb
index 9ea8a310af77ee3458e0d3f98a53970b23ae84ff..04290415206b8d9424a2d32a586cfd00ce98c438 100644
--- a/VECTO/GUI/GUI_Subs.vb
+++ b/VECTO/GUI/GUI_Subs.vb
@@ -1,5 +1,6 @@
Module GUI_Subs
+ Public test As Integer = 0
#Region "GUI Steuerung durch BG-Worker"
diff --git a/VECTO/Input Files/cVEH.vb b/VECTO/Input Files/cVEH.vb
index 4698cbf49a2a2a79ebab3a0e764f905eb5429b40..29f38b372e9fa6fc917bc3d211deb0d12d2bd205 100644
--- a/VECTO/Input Files/cVEH.vb
+++ b/VECTO/Input Files/cVEH.vb
@@ -441,7 +441,7 @@ lbError:
'Axle configuration - Update 16.10.2012
file.WriteLine("c Axle configurations")
- file.WriteLine("c Axle weight share [-], RRC [N/N],Fz ISO [N]")
+ file.WriteLine("c Axle weight share [-], Twin Tyres [1/0], RRC [N/N], Fz ISO [N]")
For Each sl In RRCs
file.WriteLine(CStr(sl(0)), CStr(sl(1)), CStr(sl(2)), CStr(sl(3)))
Next
diff --git a/VECTO/M_MAIN.vb b/VECTO/M_MAIN.vb
index b85de29a5e3b9339cd82e3d314610e35dbf702c5..00187c32c3b418b6a99ad1147172c04058f4cb0a 100644
--- a/VECTO/M_MAIN.vb
+++ b/VECTO/M_MAIN.vb
@@ -245,6 +245,8 @@ lbSkip0:
For Each CurrentCycleFile In CycleFiles
jsubcycle += 1
+ ProgBarCtrl.ProgJobInt = 0
+
If PHEMmode = tPHEMmode.ModeSTANDARD Then
'ProgBar
diff --git a/VECTO/cERG.vb b/VECTO/cERG.vb
index 75ec8d8137c773a100040afdda6c0a17867320be..7e52a12c98d343a9bcf149e0f43351a39e5d7e70 100644
--- a/VECTO/cERG.vb
+++ b/VECTO/cERG.vb
@@ -597,7 +597,7 @@ Class cERG
'Add file to signing list
Lic.FileSigning.AddFile(ERGpath)
- Lic.FileSigning.AddFile(ERGpath & ".json")
+ If Cfg.JSON Then Lic.FileSigning.AddFile(ERGpath & ".json")
ErgEntries = New Dictionary(Of String, cErgEntry)