Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit f404bb88 authored by Raphael LUZ's avatar Raphael LUZ
Browse files

Internal/JRC Release: VECTO 1.1 beta 3

See VECTO Changelog.txt for details
parent a9ea8ee3
No related branches found
No related tags found
No related merge requests found
Showing
with 224 additions and 165 deletions
......@@ -22,8 +22,8 @@ VECTO 1.1<br><br style="font-family: Verdana;"></span>
<li style="font-family: Calibri;"><big><a href="quickstart.html">Quick Start Guide</a></big></li><li style="font-family: Calibri;"><big>User
Interface</big></li>
<ul>
<li style="font-family: Calibri;"><big><a href="GUI/mainform.html">Main Form</a></big></li>
<li style="font-family: Calibri;"><big><a href="GUI/VECTO-Editor.html">VECTO Editor</a></big></li>
<li style="font-family: Calibri;"><big><a href="GUI/mainform.html">Main Form</a></big></li><ul><li style="font-family: Calibri;"><big><a href="GUI/settings.html">Settings</a><br></big></li></ul>
<li style="font-family: Calibri;"><big><a href="GUI/VECTO-Editor.html">VECTO Editor</a></big></li><ul><li style="font-family: Calibri;"><big><a href="GUI/VECTO-Editor_Aux.html">Aux Dialog</a><br></big></li></ul>
<li style="font-family: Calibri;"><big><a href="GUI/VEH-Editor.html">Vehicle Editor</a></big></li>
<li style="font-family: Calibri;"><big><a href="GUI/ENG-Editor.html">Engine Editor</a></big></li>
<li style="font-family: Calibri;"><big><a href="GUI/GBX-Editor.html">Gearbox Editor</a></big></li>
......
......@@ -3,13 +3,17 @@ VECTO ?.? (future release)
VECTO 1.1 x (current source - next release)
VECTO 1.1 beta 3
- FC Extrapolation will abort the calculation
- Transmission Type selection in Gearbox (.vgbx) file.
- Enables/Disables transmission type-specific options
- In Proof-Of-Concept mode "Custom" type is available with all options enabled.
- Automatic Transmission mode with Torque converter !!in development!!
- Automatic Transmission mode with Torque converter: Input parameters in Gearbox file !!still being tested!!
- Option to open files with GRAPHi or user-defined tool
- User Manual updated
- Bugfix: Files with relative paths were not located correctly
VECTO 1.1 beta 2 - 01.03.2013
- Corrected comment line for wheels inertia and axle config in .vveh file
......
......@@ -387,6 +387,7 @@ Partial Class F_ENG
'
'TbWHTC
'
Me.TbWHTC.Enabled = False
Me.TbWHTC.Location = New System.Drawing.Point(12, 321)
Me.TbWHTC.Name = "TbWHTC"
Me.TbWHTC.Size = New System.Drawing.Size(447, 20)
......@@ -395,6 +396,7 @@ Partial Class F_ENG
'Label7
'
Me.Label7.AutoSize = True
Me.Label7.Enabled = False
Me.Label7.Location = New System.Drawing.Point(12, 305)
Me.Label7.Name = "Label7"
Me.Label7.Size = New System.Drawing.Size(109, 13)
......@@ -403,6 +405,7 @@ Partial Class F_ENG
'
'BtWHTC
'
Me.BtWHTC.Enabled = False
Me.BtWHTC.Location = New System.Drawing.Point(465, 319)
Me.BtWHTC.Name = "BtWHTC"
Me.BtWHTC.Size = New System.Drawing.Size(28, 23)
......
......@@ -121,7 +121,7 @@
<value>17, 17</value>
</metadata>
<metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>259, 21</value>
<value>114, 20</value>
</metadata>
<metadata name="CmOpenFile.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1101, 12</value>
......
......@@ -316,11 +316,15 @@
End Sub
Private Sub ShowInFolderToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles ShowInFolderToolStripMenuItem.Click
If IO.File.Exists(CmFiles(0)) Then
Try
System.Diagnostics.Process.Start("explorer", "/select,""" & CmFiles(0) & "")
Catch ex As Exception
MsgBox("Failed to open link!", MsgBoxStyle.Critical)
MsgBox("Failed to open file!")
End Try
Else
MsgBox("File not found!")
End If
End Sub
#End Region
......
......@@ -52,6 +52,10 @@ Partial Class F_GBX
Me.PictureBox1 = New System.Windows.Forms.PictureBox()
Me.BtClearGear = New System.Windows.Forms.Button()
Me.GroupBox1 = New System.Windows.Forms.GroupBox()
Me.PnTorqRes = New System.Windows.Forms.Panel()
Me.Label2 = New System.Windows.Forms.Label()
Me.Label4 = New System.Windows.Forms.Label()
Me.TbTqResv = New System.Windows.Forms.TextBox()
Me.BtShiftPolyOpen = New System.Windows.Forms.Button()
Me.ChShiftInside = New System.Windows.Forms.CheckBox()
Me.TbShiftTime = New System.Windows.Forms.TextBox()
......@@ -68,11 +72,8 @@ Partial Class F_GBX
Me.Label8 = New System.Windows.Forms.Label()
Me.Label5 = New System.Windows.Forms.Label()
Me.Label7 = New System.Windows.Forms.Label()
Me.TbTqResv = New System.Windows.Forms.TextBox()
Me.TbShiftPolyFile = New System.Windows.Forms.TextBox()
Me.BtShiftPolyBrowse = New System.Windows.Forms.Button()
Me.Label4 = New System.Windows.Forms.Label()
Me.Label2 = New System.Windows.Forms.Label()
Me.Label1 = New System.Windows.Forms.Label()
Me.CmOpenFile = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.OpenWithGRAPHiToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
......@@ -90,16 +91,15 @@ Partial Class F_GBX
Me.ChTCon = New System.Windows.Forms.CheckBox()
Me.Label16 = New System.Windows.Forms.Label()
Me.CbGStype = New System.Windows.Forms.ComboBox()
Me.PnTorqRes = New System.Windows.Forms.Panel()
Me.ToolStrip1.SuspendLayout()
Me.StatusStrip1.SuspendLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.GroupBox1.SuspendLayout()
Me.PnTorqRes.SuspendLayout()
Me.GroupBox2.SuspendLayout()
Me.CmOpenFile.SuspendLayout()
Me.GroupBox3.SuspendLayout()
Me.PnTC.SuspendLayout()
Me.PnTorqRes.SuspendLayout()
Me.SuspendLayout()
'
'ToolStrip1
......@@ -204,7 +204,7 @@ Partial Class F_GBX
Me.ButCancel.Location = New System.Drawing.Point(378, 687)
Me.ButCancel.Name = "ButCancel"
Me.ButCancel.Size = New System.Drawing.Size(75, 23)
Me.ButCancel.TabIndex = 7
Me.ButCancel.TabIndex = 9
Me.ButCancel.Text = "Cancel"
Me.ButCancel.UseVisualStyleBackColor = True
'
......@@ -214,7 +214,7 @@ Partial Class F_GBX
Me.ButOK.Location = New System.Drawing.Point(297, 687)
Me.ButOK.Name = "ButOK"
Me.ButOK.Size = New System.Drawing.Size(75, 23)
Me.ButOK.TabIndex = 6
Me.ButOK.TabIndex = 8
Me.ButOK.Text = "OK"
Me.ButOK.UseVisualStyleBackColor = True
'
......@@ -223,7 +223,7 @@ Partial Class F_GBX
Me.TbTracInt.Location = New System.Drawing.Point(389, 299)
Me.TbTracInt.Name = "TbTracInt"
Me.TbTracInt.Size = New System.Drawing.Size(40, 20)
Me.TbTracInt.TabIndex = 2
Me.TbTracInt.TabIndex = 5
'
'LvGears
'
......@@ -235,7 +235,7 @@ Partial Class F_GBX
Me.LvGears.MultiSelect = False
Me.LvGears.Name = "LvGears"
Me.LvGears.Size = New System.Drawing.Size(441, 150)
Me.LvGears.TabIndex = 3
Me.LvGears.TabIndex = 2
Me.LvGears.TabStop = False
Me.LvGears.UseCompatibleStateImageBehavior = False
Me.LvGears.View = System.Windows.Forms.View.Details
......@@ -260,7 +260,7 @@ Partial Class F_GBX
Me.TBI_getr.Location = New System.Drawing.Point(139, 299)
Me.TBI_getr.Name = "TBI_getr"
Me.TBI_getr.Size = New System.Drawing.Size(57, 20)
Me.TBI_getr.TabIndex = 1
Me.TBI_getr.TabIndex = 4
'
'Label49
'
......@@ -330,7 +330,7 @@ Partial Class F_GBX
Me.BtClearGear.Location = New System.Drawing.Point(12, 297)
Me.BtClearGear.Name = "BtClearGear"
Me.BtClearGear.Size = New System.Drawing.Size(29, 23)
Me.BtClearGear.TabIndex = 4
Me.BtClearGear.TabIndex = 3
Me.BtClearGear.UseVisualStyleBackColor = True
'
'GroupBox1
......@@ -349,17 +349,52 @@ Partial Class F_GBX
Me.GroupBox1.Location = New System.Drawing.Point(12, 326)
Me.GroupBox1.Name = "GroupBox1"
Me.GroupBox1.Size = New System.Drawing.Size(441, 230)
Me.GroupBox1.TabIndex = 5
Me.GroupBox1.TabIndex = 6
Me.GroupBox1.TabStop = False
Me.GroupBox1.Text = "Gear shift parameters"
'
'PnTorqRes
'
Me.PnTorqRes.Controls.Add(Me.Label2)
Me.PnTorqRes.Controls.Add(Me.Label4)
Me.PnTorqRes.Controls.Add(Me.TbTqResv)
Me.PnTorqRes.Location = New System.Drawing.Point(235, 66)
Me.PnTorqRes.Name = "PnTorqRes"
Me.PnTorqRes.Size = New System.Drawing.Size(200, 32)
Me.PnTorqRes.TabIndex = 5
'
'Label2
'
Me.Label2.AutoSize = True
Me.Label2.Location = New System.Drawing.Point(20, 9)
Me.Label2.Name = "Label2"
Me.Label2.Size = New System.Drawing.Size(79, 13)
Me.Label2.TabIndex = 0
Me.Label2.Text = "Torque reserve"
'
'Label4
'
Me.Label4.AutoSize = True
Me.Label4.Location = New System.Drawing.Point(168, 9)
Me.Label4.Name = "Label4"
Me.Label4.Size = New System.Drawing.Size(21, 13)
Me.Label4.TabIndex = 0
Me.Label4.Text = "[%]"
'
'TbTqResv
'
Me.TbTqResv.Location = New System.Drawing.Point(105, 6)
Me.TbTqResv.Name = "TbTqResv"
Me.TbTqResv.Size = New System.Drawing.Size(57, 20)
Me.TbTqResv.TabIndex = 3
'
'BtShiftPolyOpen
'
Me.BtShiftPolyOpen.Image = Global.VECTO.My.Resources.Resources.application_export_icon_small
Me.BtShiftPolyOpen.Location = New System.Drawing.Point(412, 39)
Me.BtShiftPolyOpen.Location = New System.Drawing.Point(412, 40)
Me.BtShiftPolyOpen.Name = "BtShiftPolyOpen"
Me.BtShiftPolyOpen.Size = New System.Drawing.Size(23, 23)
Me.BtShiftPolyOpen.TabIndex = 34
Me.BtShiftPolyOpen.TabIndex = 2
Me.BtShiftPolyOpen.TabStop = False
Me.BtShiftPolyOpen.UseVisualStyleBackColor = True
'
......@@ -371,7 +406,7 @@ Partial Class F_GBX
Me.ChShiftInside.Location = New System.Drawing.Point(9, 74)
Me.ChShiftInside.Name = "ChShiftInside"
Me.ChShiftInside.Size = New System.Drawing.Size(195, 17)
Me.ChShiftInside.TabIndex = 10
Me.ChShiftInside.TabIndex = 3
Me.ChShiftInside.Text = "Allow shift-up inside polygons (AMT)"
Me.ChShiftInside.UseVisualStyleBackColor = True
'
......@@ -380,7 +415,7 @@ Partial Class F_GBX
Me.TbShiftTime.Location = New System.Drawing.Point(340, 98)
Me.TbShiftTime.Name = "TbShiftTime"
Me.TbShiftTime.Size = New System.Drawing.Size(57, 20)
Me.TbShiftTime.TabIndex = 4
Me.TbShiftTime.TabIndex = 6
'
'Label12
'
......@@ -406,7 +441,7 @@ Partial Class F_GBX
Me.ChSkipGears.Location = New System.Drawing.Point(9, 100)
Me.ChSkipGears.Name = "ChSkipGears"
Me.ChSkipGears.Size = New System.Drawing.Size(132, 17)
Me.ChSkipGears.TabIndex = 2
Me.ChSkipGears.TabIndex = 4
Me.ChSkipGears.Text = "Skip Gears (MT, AMT)"
Me.ChSkipGears.UseVisualStyleBackColor = True
'
......@@ -424,7 +459,7 @@ Partial Class F_GBX
Me.GroupBox2.Location = New System.Drawing.Point(6, 124)
Me.GroupBox2.Name = "GroupBox2"
Me.GroupBox2.Size = New System.Drawing.Size(429, 99)
Me.GroupBox2.TabIndex = 5
Me.GroupBox2.TabIndex = 7
Me.GroupBox2.TabStop = False
Me.GroupBox2.Text = "Start Gear"
'
......@@ -503,13 +538,6 @@ Partial Class F_GBX
Me.Label7.TabIndex = 0
Me.Label7.Text = "[%]"
'
'TbTqResv
'
Me.TbTqResv.Location = New System.Drawing.Point(105, 6)
Me.TbTqResv.Name = "TbTqResv"
Me.TbTqResv.Size = New System.Drawing.Size(57, 20)
Me.TbTqResv.TabIndex = 3
'
'TbShiftPolyFile
'
Me.TbShiftPolyFile.Location = New System.Drawing.Point(6, 42)
......@@ -519,7 +547,7 @@ Partial Class F_GBX
'
'BtShiftPolyBrowse
'
Me.BtShiftPolyBrowse.Location = New System.Drawing.Point(374, 39)
Me.BtShiftPolyBrowse.Location = New System.Drawing.Point(374, 40)
Me.BtShiftPolyBrowse.Name = "BtShiftPolyBrowse"
Me.BtShiftPolyBrowse.Size = New System.Drawing.Size(32, 23)
Me.BtShiftPolyBrowse.TabIndex = 1
......@@ -527,24 +555,6 @@ Partial Class F_GBX
Me.BtShiftPolyBrowse.Text = "..."
Me.BtShiftPolyBrowse.UseVisualStyleBackColor = True
'
'Label4
'
Me.Label4.AutoSize = True
Me.Label4.Location = New System.Drawing.Point(168, 9)
Me.Label4.Name = "Label4"
Me.Label4.Size = New System.Drawing.Size(21, 13)
Me.Label4.TabIndex = 0
Me.Label4.Text = "[%]"
'
'Label2
'
Me.Label2.AutoSize = True
Me.Label2.Location = New System.Drawing.Point(20, 9)
Me.Label2.Name = "Label2"
Me.Label2.Size = New System.Drawing.Size(79, 13)
Me.Label2.TabIndex = 0
Me.Label2.Text = "Torque reserve"
'
'Label1
'
Me.Label1.AutoSize = True
......@@ -585,7 +595,7 @@ Partial Class F_GBX
Me.GroupBox3.Location = New System.Drawing.Point(12, 562)
Me.GroupBox3.Name = "GroupBox3"
Me.GroupBox3.Size = New System.Drawing.Size(441, 119)
Me.GroupBox3.TabIndex = 44
Me.GroupBox3.TabIndex = 7
Me.GroupBox3.TabStop = False
Me.GroupBox3.Text = "Torque Converter"
'
......@@ -645,7 +655,7 @@ Partial Class F_GBX
Me.TbTCfile.Location = New System.Drawing.Point(0, 21)
Me.TbTCfile.Name = "TbTCfile"
Me.TbTCfile.Size = New System.Drawing.Size(362, 20)
Me.TbTCfile.TabIndex = 1
Me.TbTCfile.TabIndex = 0
'
'BtTCfileOpen
'
......@@ -653,7 +663,7 @@ Partial Class F_GBX
Me.BtTCfileOpen.Location = New System.Drawing.Point(406, 19)
Me.BtTCfileOpen.Name = "BtTCfileOpen"
Me.BtTCfileOpen.Size = New System.Drawing.Size(23, 23)
Me.BtTCfileOpen.TabIndex = 34
Me.BtTCfileOpen.TabIndex = 2
Me.BtTCfileOpen.TabStop = False
Me.BtTCfileOpen.UseVisualStyleBackColor = True
'
......@@ -662,7 +672,7 @@ Partial Class F_GBX
Me.TbTCrefrpm.Location = New System.Drawing.Point(295, 47)
Me.TbTCrefrpm.Name = "TbTCrefrpm"
Me.TbTCrefrpm.Size = New System.Drawing.Size(67, 20)
Me.TbTCrefrpm.TabIndex = 35
Me.TbTCrefrpm.TabIndex = 3
'
'ChTCon
'
......@@ -693,17 +703,7 @@ Partial Class F_GBX
Me.CbGStype.Location = New System.Drawing.Point(119, 108)
Me.CbGStype.Name = "CbGStype"
Me.CbGStype.Size = New System.Drawing.Size(227, 21)
Me.CbGStype.TabIndex = 46
'
'PnTorqRes
'
Me.PnTorqRes.Controls.Add(Me.Label2)
Me.PnTorqRes.Controls.Add(Me.Label4)
Me.PnTorqRes.Controls.Add(Me.TbTqResv)
Me.PnTorqRes.Location = New System.Drawing.Point(235, 66)
Me.PnTorqRes.Name = "PnTorqRes"
Me.PnTorqRes.Size = New System.Drawing.Size(200, 32)
Me.PnTorqRes.TabIndex = 35
Me.CbGStype.TabIndex = 1
'
'F_GBX
'
......@@ -744,6 +744,8 @@ Partial Class F_GBX
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
Me.GroupBox1.ResumeLayout(False)
Me.GroupBox1.PerformLayout()
Me.PnTorqRes.ResumeLayout(False)
Me.PnTorqRes.PerformLayout()
Me.GroupBox2.ResumeLayout(False)
Me.GroupBox2.PerformLayout()
Me.CmOpenFile.ResumeLayout(False)
......@@ -751,8 +753,6 @@ Partial Class F_GBX
Me.GroupBox3.PerformLayout()
Me.PnTC.ResumeLayout(False)
Me.PnTC.PerformLayout()
Me.PnTorqRes.ResumeLayout(False)
Me.PnTorqRes.PerformLayout()
Me.ResumeLayout(False)
Me.PerformLayout()
......
......@@ -374,13 +374,16 @@
Case tGearbox.Manual
Me.ChShiftInside.Enabled = False
Me.ChShiftInside.Checked = False
Me.ChSkipGears.Enabled = True
Me.ChSkipGears.Enabled = False
Me.ChSkipGears.Checked = True
Me.ChTCon.Enabled = False
Me.ChTCon.Checked = False
Case tGearbox.SemiAutomatic
Me.ChShiftInside.Enabled = True
Me.ChSkipGears.Enabled = True
Me.ChShiftInside.Enabled = False
Me.ChShiftInside.Checked = True
Me.ChSkipGears.Enabled = False
Me.ChSkipGears.Checked = True
Me.ChTCon.Enabled = False
Me.ChTCon.Checked = False
......@@ -522,11 +525,15 @@
End Sub
Private Sub ShowInFolderToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles ShowInFolderToolStripMenuItem.Click
If IO.File.Exists(CmFiles(0)) Then
Try
System.Diagnostics.Process.Start("explorer", "/select,""" & CmFiles(0) & "")
Catch ex As Exception
MsgBox("Failed to open link!", MsgBoxStyle.Critical)
MsgBox("Failed to open file!")
End Try
Else
MsgBox("File not found!")
End If
End Sub
#End Region
......
......@@ -1370,11 +1370,15 @@ lbDlog:
End Sub
Private Sub ShowInFolderToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles ShowInFolderToolStripMenuItem.Click
If IO.File.Exists(CmFiles(0)) Then
Try
System.Diagnostics.Process.Start("explorer", "/select,""" & CmFiles(0) & "")
Catch ex As Exception
MsgBox("Failed to open link!", MsgBoxStyle.Critical)
MsgBox("Failed to open file!")
End Try
Else
MsgBox("File not found!")
End If
End Sub
#End Region
......
......@@ -2190,11 +2190,15 @@ lbFound:
End Sub
Private Sub ShowInFolderToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles ShowInFolderToolStripMenuItem.Click
If IO.File.Exists(CmFiles(0)) Then
Try
System.Diagnostics.Process.Start("explorer", "/select,""" & CmFiles(0) & "")
Catch ex As Exception
MsgBox("Failed to open link!", MsgBoxStyle.Critical)
MsgBox("Failed to open file!")
End Try
Else
MsgBox("File not found!")
End If
End Sub
#End Region
......
......@@ -251,9 +251,9 @@ Partial Class F_VEH
Me.Label32.AutoSize = True
Me.Label32.Location = New System.Drawing.Point(206, 184)
Me.Label32.Name = "Label32"
Me.Label32.Size = New System.Drawing.Size(43, 13)
Me.Label32.Size = New System.Drawing.Size(36, 13)
Me.Label32.TabIndex = 24
Me.Label32.Text = "[kgm²]"
Me.Label32.Text = "[kgm²]"
'
'Label35
'
......@@ -278,9 +278,9 @@ Partial Class F_VEH
Me.Label38.AutoSize = True
Me.Label38.Location = New System.Drawing.Point(235, 48)
Me.Label38.Name = "Label38"
Me.Label38.Size = New System.Drawing.Size(31, 13)
Me.Label38.Size = New System.Drawing.Size(24, 13)
Me.Label38.TabIndex = 24
Me.Label38.Text = "[m²]"
Me.Label38.Text = "[m²]"
'
'CbCdMode
'
......
......@@ -700,11 +700,15 @@ Public Class F_VEH
End Sub
Private Sub ShowInFolderToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles ShowInFolderToolStripMenuItem.Click
If IO.File.Exists(CmFiles(0)) Then
Try
System.Diagnostics.Process.Start("explorer", "/select,""" & CmFiles(0) & "")
Catch ex As Exception
MsgBox("Failed to open link!", MsgBoxStyle.Critical)
MsgBox("Failed to open file!")
End Try
Else
MsgBox("File not found!")
End If
End Sub
#End Region
......
......@@ -202,6 +202,9 @@
'Open File
Public Function FileOpenAlt(ByVal file As String) As Boolean
Dim PSI As New ProcessStartInfo
If Not IO.File.Exists(file) Then Return False
PSI.FileName = Cfg.OpenCmd
PSI.Arguments = ChrW(34) & file & ChrW(34)
Try
......
......@@ -112,12 +112,13 @@ Public Class cDRI
Dim ExsKV As KeyValuePair(Of Integer, List(Of Single))
Dim AuxSpalten As Dictionary(Of String, Integer) = Nothing
Dim Mvorg As Boolean = False
Dim Tvorg As Boolean = False
Dim MsgSrc As String
MsgSrc = "Main/ReadInp/DRI"
bCreateMapParDef = False
......@@ -331,11 +332,11 @@ Public Class cDRI
PaddVorg = DRIcheck(tDriComp.Padd)
GradVorg = DRIcheck(tDriComp.Grad)
VairVorg = DRIcheck(tDriComp.VairVres) And DRIcheck(tDriComp.VairBeta)
Tvorg = DRIcheck(tDriComp.Torque)
Mvorg = DRIcheck(tDriComp.Torque)
If Tvorg And Pvorg Then
If Mvorg And Pvorg Then
WorkerMsg(tMsgID.Warn, "Engine torque and power defined in cycle! Torque will be ignored!", MsgSrc)
Tvorg = False
Mvorg = False
End If
'***
......@@ -479,7 +480,7 @@ Public Class cDRI
Next
End If
If Tvorg And Nvorg Then
If Mvorg And Nvorg Then
Values.Add(tDriComp.Pe, New List(Of Double))
Pvorg = True
For s = 0 To tDim
......
......@@ -45,7 +45,9 @@ Public Class cGBX
'Torque Converter Iteration Results
Public TCMin As Single
Public TCnUin As Single
Public TC_Tbrake As Single
Public TC_PeBrake As Single
Public TCMout As Single
Public TCnout As Single
......@@ -285,7 +287,11 @@ Public Class cGBX
Dim MoutCalc As Single
TC_Tbrake = 0
Dim MsgSrc As String
MsgSrc = "GBX/TCiteration"
TC_PeBrake = 0
'Dim nUmin As Single
'Dim nUmax As Single
......@@ -333,18 +339,21 @@ Public Class cGBX
mu = fTCmu(nu)
MoutCalc = fTCtorque(nu, nUin) * mu
If MoutCalc < Mout Then Stop
TC_Tbrake = Mout - MoutCalc
If MoutCalc < Mout Then
WorkerMsg(tMsgID.Err, "MoutCalc < Mout while nUin = nIdle!", MsgSrc)
Return False
End If
TC_PeBrake = nMtoPe(nUout, Mout - MoutCalc)
End If
TCMin = MoutCalc / mu
TCnUin = nUin
TCMout = MoutCalc
TCnout = nUout
Return True
End Function
......@@ -404,7 +413,21 @@ lbInt:
End Function
Public Function fGearStr(ByVal Gear As Int16) As String
If Gear = 0 Then Return "0"
If TCon Then
If Gear = 1 Then
Return "0.5"
Else
Return CStr(Gear - 1)
End If
Else
Return CStr(Gear)
End If
End Function
Public Function GSinit() As Boolean
Dim file As cFile_V3
......
......@@ -38,7 +38,7 @@ Public Class cVEH
Private CdDim As Integer
Private siGetrI(16) As Single
Private sGetrMaps(16) As cSubPath
Public GetrMap(16) As cSubPath
Private MyGBmaps As List(Of cDelaunayMap)
Public GetrEffDef(16) As Boolean
Public GetrEff(16) As Single
......@@ -77,7 +77,7 @@ Public Class cVEH
MyPath = ""
sFilePath = ""
For i = 0 To 16
sGetrMaps(i) = New cSubPath
GetrMap(i) = New cSubPath
Next
CdFile = New cSubPath
CdX = New List(Of Single)
......@@ -123,7 +123,7 @@ Public Class cVEH
sipmodell = 0
For i = 0 To 16
siGetrI(i) = 0
sGetrMaps(i).Clear()
GetrMap(i).Clear()
GetrEffDef(i) = False
GetrEff(i) = 0
Next
......@@ -521,7 +521,7 @@ lbError:
Else
path = sGetrMaps(i).FullPath
path = GetrMap(i).FullPath
If Not file.OpenRead(path) Then
WorkerMsg(tMsgID.Err, "Cannot read file '" & path & "'!", MsgSrc)
......@@ -1138,19 +1138,6 @@ lbInt:
End Set
End Property
Public Property AchsMap(Optional ByVal Original As Boolean = False) As String
Get
If Original Then
Return sGetrMaps(0).OriginalPath
Else
Return sGetrMaps(0).FullPath
End If
End Get
Set(ByVal value As String)
sGetrMaps(0).Init(MyPath, value)
End Set
End Property
Public Property ganganz As Short
Get
Return iganganz
......@@ -1169,19 +1156,6 @@ lbInt:
End Set
End Property
Public Property GetrMap(ByVal x As Short, Optional ByVal Original As Boolean = False) As String
Get
If Original Then
Return sGetrMaps(x).OriginalPath
Else
Return sGetrMaps(x).FullPath
End If
End Get
Set(ByVal value As String)
sGetrMaps(x).Init(MyPath, value)
End Set
End Property
Public Property Mass As Single
Get
Return siMass
......
......@@ -37,6 +37,10 @@ Public Class cMOD
Public Gear As List(Of Single)
Public VehState As List(Of tVehState)
Public TCnu As List(Of Single)
Public TCmu As List(Of Single)
Public TCMout As List(Of Single)
Public TCnOut As List(Of Single)
Private bInit As Boolean
......@@ -74,6 +78,11 @@ Public Class cMOD
Gear = New List(Of Single)
VehState = New List(Of tVehState)
TCnu = New List(Of Single)
TCmu = New List(Of Single)
TCMout = New List(Of Single)
TCnOut = New List(Of Single)
Em.Init()
TC.Init()
Vh.Init()
......@@ -115,6 +124,11 @@ Public Class cMOD
Gear = Nothing
VehState = Nothing
TCnu = Nothing
TCmu = Nothing
TCMout = Nothing
TCnOut = Nothing
CylceKin = Nothing
ModErrors = Nothing
bInit = False
......@@ -418,6 +432,11 @@ Public Class cMOD
s.Append(",Gear,Ploss GB,Ploss Diff,Ploss Retarder,Pa GB,Pa Veh,Proll,Pair,Pgrad,Pwheel,Pbrake")
sU.Append(",[-],[kW],[kW],[kW],[kW],[kW],[kW],[kW],[kW],[kW],[kW]")
If GBX.TCon Then
s.Append(",TCν,TCμ,TC_M_Out,TC_n_Out")
sU.Append(",[-],[-],[Nm],[1/min]")
End If
'Auxiliaries
For Each StrKey In AuxList
......@@ -606,7 +625,7 @@ Public Class cMOD
If Not GEN.VehMode = tVehMode.EngineOnly Then
'Gear
s.Append(Sepp & .Gear(t))
s.Append(Sepp & GBX.fGearStr(.Gear(t)))
'Transmission-losses
s.Append(Sepp & .PlossGB(t))
......@@ -638,6 +657,9 @@ Public Class cMOD
'Brake
s.Append(Sepp & .Pbrake(t))
'Torque Converter output
If GBX.TCon Then s.Append(Sepp & .TCnu(t) & Sepp & .TCmu(t) & Sepp & .TCMout(t) & Sepp & .TCnOut(t))
'Auxiliaries
For Each StrKey In AuxList
s.Append(Sepp & .Paux(StrKey)(t))
......
......@@ -1060,6 +1060,7 @@ lb_nOK:
Else
If EngState0 = tEngState.Load Then
Pbrake = 0
If GBX.TCon And Gear = 1 Then Pbrake = GBX.TC_PeBrake
If Math.Abs(P / Pmax - 1) < 0.02 Then EngState0 = tEngState.FullLoad
Else ' tEngState.Drag (tEngState.Idle, tEngState.Stopped kann's hier nicht geben weil Clutch <> Closed)
If P < Pmin Then
......@@ -1195,6 +1196,29 @@ lb_nOK:
MODdata.VehState.Add(VehState0)
MODdata.Gear.Add(Gear)
'Torque Converter output
If GBX.TCon Then
If Gear = 1 Then
If nU = 0 Then
MODdata.TCnu.Add(0)
Else
MODdata.TCnu.Add(GBX.TCnout / nU)
End If
If GBX.TCMin = 0 Then
MODdata.TCmu.Add(0)
Else
MODdata.TCmu.Add(GBX.TCMout / GBX.TCMin)
End If
MODdata.TCMout.Add(GBX.TCMout)
MODdata.TCnOut.Add(GBX.TCnout)
Else
MODdata.TCnu.Add(1)
MODdata.TCmu.Add(1)
MODdata.TCMout.Add(nPeToM(nU, P - Paux - PaMot))
MODdata.TCnOut.Add(nU)
End If
End If
If Cfg.WegKorJa Then Vh.DistCorrection(jz, VehState0)
'Interruption of traction(Zugkraftunterbrechung)
......
......@@ -97,7 +97,7 @@ Module M_Lese
For Each AuxKV In GEN.AuxPaths
AuxEntry = New cVEH.cAuxEntry
AuxEntry.Type = AuxKV.Value.Type
AuxEntry.Path.Init(fPATH(GEN.PathVEH), AuxKV.Value.Path.OriginalPath)
AuxEntry.Path.Init(fPATH(GEN.FilePath), AuxKV.Value.Path.OriginalPath)
VEH.AuxPaths.Add(UCase(Trim(AuxKV.Key)), AuxEntry)
Next
End If
......@@ -122,7 +122,7 @@ Module M_Lese
VEH.GetrEffDef(i) = True
VEH.GetrEff(i) = CSng(GBX.GetrMap(i, True))
Else
VEH.GetrMap(i) = GBX.GetrMap(i, True)
VEH.GetrMap(i).Init(fPATH(GEN.PathGBX), GBX.GetrMap(i, True))
End If
If VEH.Igetr(i) > 0.0001 Then VEH.ganganz = i
Next
......
......@@ -17,6 +17,8 @@
</FileUpgradeFlags>
<OldToolsVersion>2.0</OldToolsVersion>
<UpgradeBackupLocation />
<IsWebBootstrapper>false</IsWebBootstrapper>
<TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
......@@ -29,10 +31,8 @@
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
......@@ -379,24 +379,6 @@
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<None Include="Resources\GRAPHi small.ico" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\GRAPHi small.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\GRAPHi small.gif" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\GRAPHi small1.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\GRAPHi_small.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\Open-icon-small.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\application-export-icon-small.png" />
</ItemGroup>
......
......@@ -424,7 +424,7 @@ Public Class csKey
Public VairBeta As String = "<VAIR_BETA>"
Public s As String = "<S>"
Public StopTime As String = "<STOP>"
Public Torque As String = "<M>"
Public Torque As String = "<ME>"
End Class
Public Class csKeyEXS
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment