From 8382e3e7ca593c1b92630cc43e499e3405077d50 Mon Sep 17 00:00:00 2001
From: Raphael Luz <luz@ivt.tugraz.at>
Date: Mon, 7 Oct 2013 15:55:54 +0200
Subject: [PATCH] - Demo Data updated - Added twin tyres option for
load-dependent RRC - bug fixes
---
.../Declaration/Demo_VehicleDeclaration.vveh | 10 +++++-----
.../Demo_Vehicle_ChassisDyno.vveh | 11 ++++++-----
.../Demo_Vehicle_TestTrack.vveh | 11 ++++++-----
Demo Data/40t Demo/VehClass5_40t.vveh | 7 +++++--
.../VECTO_1.3.1.1_GRAPHiFix.VECTO-3.zip | Bin 11878527 -> 11878114 bytes
VECTO/GUI/F_MAINForm.vb | 7 ++++++-
VECTO/GUI/F_VEH_Axle.Designer.vb | 8 ++++----
VECTO/GUI/GUI_Subs.vb | 1 +
VECTO/Input Files/cVEH.vb | 2 +-
VECTO/M_MAIN.vb | 2 ++
VECTO/cERG.vb | 2 +-
11 files changed, 37 insertions(+), 24 deletions(-)
diff --git a/Demo Data/12t Demo/Declaration/Demo_VehicleDeclaration.vveh b/Demo Data/12t Demo/Declaration/Demo_VehicleDeclaration.vveh
index 0456dd030c..37e64b2619 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 87515c8273..3291dd835c 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 0745e23e9b..e3c6dab00a 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 f10e472cf9..edc4db352c 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
GIT binary patch
delta 3823
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
delta 3926
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
diff --git a/VECTO/GUI/F_MAINForm.vb b/VECTO/GUI/F_MAINForm.vb
index 29dccb0e04..6e6a94968b 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 3021474b0c..1326262621 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 9ea8a310af..0429041520 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 4698cbf49a..29f38b372e 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 b85de29a5e..00187c32c3 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 75ec8d8137..7e52a12c98 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)
--
GitLab