diff --git a/VECTO Changelog.txt b/VECTO Changelog.txt
index e7623d5965d9b3ff73ffcc036069272a35389d61..4d08a136ae8b47bc3eac63da7a5e6ef250705cef 100644
--- a/VECTO Changelog.txt
+++ b/VECTO Changelog.txt
@@ -1,10 +1,14 @@
VECTO ?.? (future release)
-- Automatic transmission & Torque converter
- Eco-Roll & Over-/Under-Speed
VECTO 1.1 x (current source - next release)
-
+- 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!!
+- Option to open files with GRAPHi or user-defined tool
VECTO 1.1 beta 2 - 01.03.2013
@@ -13,7 +17,7 @@ VECTO 1.1 beta 2 - 01.03.2013
- User Manual updated
o Vehicle Editor: RRC
- Tranmission Loss Maps are not converted to n,Pe-Maps anymore. Should fix non-linear interpolation effects.
-- Automatic Transmission / Torque Converter in development
+- Automatic Transmission / Torque Converter !!in development!!
- Engine Only Mode
VECTO 1.1 beta - 06.02.2013
diff --git a/VECTO/GUI/F_ENG.Designer.vb b/VECTO/GUI/F_ENG.Designer.vb
index 8b2183ce7d940bab6d6058d4916136064477e853..6f0f99ff0e8afac1d7bceb2a595bb01ba44b67bc 100644
--- a/VECTO/GUI/F_ENG.Designer.vb
+++ b/VECTO/GUI/F_ENG.Designer.vb
@@ -22,6 +22,7 @@ Partial Class F_ENG
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<System.Diagnostics.DebuggerStepThrough()> _
Private Sub InitializeComponent()
+ Me.components = New System.ComponentModel.Container()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(F_ENG))
Me.TbNleerl = New System.Windows.Forms.TextBox()
Me.Label11 = New System.Windows.Forms.Label()
@@ -44,6 +45,8 @@ Partial Class F_ENG
Me.ToolStripBtSaveAs = New System.Windows.Forms.ToolStripButton()
Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
Me.ToolStripBtSendTo = New System.Windows.Forms.ToolStripButton()
+ Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
+ Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
Me.LbStatus = New System.Windows.Forms.ToolStripStatusLabel()
Me.Label1 = New System.Windows.Forms.Label()
@@ -61,11 +64,16 @@ Partial Class F_ENG
Me.Label7 = New System.Windows.Forms.Label()
Me.BtWHTC = New System.Windows.Forms.Button()
Me.PictureBox1 = New System.Windows.Forms.PictureBox()
- Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
- Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
+ Me.CmOpenFile = New System.Windows.Forms.ContextMenuStrip(Me.components)
+ Me.OpenWithGRAPHiToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.BtFLDOpen = New System.Windows.Forms.Button()
+ Me.BtMAPopen = New System.Windows.Forms.Button()
Me.ToolStrip1.SuspendLayout()
Me.StatusStrip1.SuspendLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
+ Me.CmOpenFile.SuspendLayout()
Me.SuspendLayout()
'
'TbNleerl
@@ -254,6 +262,20 @@ Partial Class F_ENG
Me.ToolStripBtSendTo.Text = "Send to GEN Editor"
Me.ToolStripBtSendTo.ToolTipText = "Send to GEN Editor"
'
+ 'ToolStripSeparator1
+ '
+ Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
+ Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 25)
+ '
+ 'ToolStripButton1
+ '
+ Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+ Me.ToolStripButton1.Image = Global.VECTO.My.Resources.Resources.Help_icon
+ Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
+ Me.ToolStripButton1.Name = "ToolStripButton1"
+ Me.ToolStripButton1.Size = New System.Drawing.Size(23, 22)
+ Me.ToolStripButton1.Text = "Help"
+ '
'StatusStrip1
'
Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LbStatus})
@@ -324,12 +346,12 @@ Partial Class F_ENG
'
Me.TbFLD.Location = New System.Drawing.Point(12, 221)
Me.TbFLD.Name = "TbFLD"
- Me.TbFLD.Size = New System.Drawing.Size(447, 20)
+ Me.TbFLD.Size = New System.Drawing.Size(418, 20)
Me.TbFLD.TabIndex = 6
'
'BtFLD
'
- Me.BtFLD.Location = New System.Drawing.Point(465, 219)
+ Me.BtFLD.Location = New System.Drawing.Point(436, 219)
Me.BtFLD.Name = "BtFLD"
Me.BtFLD.Size = New System.Drawing.Size(28, 23)
Me.BtFLD.TabIndex = 7
@@ -341,7 +363,7 @@ Partial Class F_ENG
'
Me.TbMAP.Location = New System.Drawing.Point(12, 271)
Me.TbMAP.Name = "TbMAP"
- Me.TbMAP.Size = New System.Drawing.Size(447, 20)
+ Me.TbMAP.Size = New System.Drawing.Size(418, 20)
Me.TbMAP.TabIndex = 8
'
'Label6
@@ -355,7 +377,7 @@ Partial Class F_ENG
'
'BtMAP
'
- Me.BtMAP.Location = New System.Drawing.Point(465, 269)
+ Me.BtMAP.Location = New System.Drawing.Point(436, 269)
Me.BtMAP.Name = "BtMAP"
Me.BtMAP.Size = New System.Drawing.Size(28, 23)
Me.BtMAP.TabIndex = 9
@@ -399,19 +421,49 @@ Partial Class F_ENG
Me.PictureBox1.TabIndex = 39
Me.PictureBox1.TabStop = False
'
- 'ToolStripSeparator1
+ 'CmOpenFile
'
- Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
- Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 25)
+ Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithGRAPHiToolStripMenuItem, Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
+ Me.CmOpenFile.Name = "CmOpenFile"
+ Me.CmOpenFile.Size = New System.Drawing.Size(175, 70)
'
- 'ToolStripButton1
+ 'OpenWithGRAPHiToolStripMenuItem
'
- Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
- Me.ToolStripButton1.Image = Global.VECTO.My.Resources.Resources.Help_icon
- Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
- Me.ToolStripButton1.Name = "ToolStripButton1"
- Me.ToolStripButton1.Size = New System.Drawing.Size(23, 22)
- Me.ToolStripButton1.Text = "Help"
+ Me.OpenWithGRAPHiToolStripMenuItem.Name = "OpenWithGRAPHiToolStripMenuItem"
+ Me.OpenWithGRAPHiToolStripMenuItem.Size = New System.Drawing.Size(174, 22)
+ Me.OpenWithGRAPHiToolStripMenuItem.Text = "Open with GRAPHi"
+ '
+ 'OpenWithToolStripMenuItem
+ '
+ Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem"
+ Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(174, 22)
+ Me.OpenWithToolStripMenuItem.Text = "Open with ..."
+ '
+ 'ShowInFolderToolStripMenuItem
+ '
+ Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem"
+ Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(174, 22)
+ Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
+ '
+ 'BtFLDOpen
+ '
+ Me.BtFLDOpen.Image = Global.VECTO.My.Resources.Resources.application_export_icon_small
+ Me.BtFLDOpen.Location = New System.Drawing.Point(470, 219)
+ Me.BtFLDOpen.Name = "BtFLDOpen"
+ Me.BtFLDOpen.Size = New System.Drawing.Size(23, 23)
+ Me.BtFLDOpen.TabIndex = 40
+ Me.BtFLDOpen.TabStop = False
+ Me.BtFLDOpen.UseVisualStyleBackColor = True
+ '
+ 'BtMAPopen
+ '
+ Me.BtMAPopen.Image = Global.VECTO.My.Resources.Resources.application_export_icon_small
+ Me.BtMAPopen.Location = New System.Drawing.Point(470, 269)
+ Me.BtMAPopen.Name = "BtMAPopen"
+ Me.BtMAPopen.Size = New System.Drawing.Size(23, 23)
+ Me.BtMAPopen.TabIndex = 40
+ Me.BtMAPopen.TabStop = False
+ Me.BtMAPopen.UseVisualStyleBackColor = True
'
'F_ENG
'
@@ -420,11 +472,13 @@ Partial Class F_ENG
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.CancelButton = Me.ButCancel
Me.ClientSize = New System.Drawing.Size(505, 408)
+ Me.Controls.Add(Me.BtMAPopen)
+ Me.Controls.Add(Me.BtFLDOpen)
Me.Controls.Add(Me.PictureBox1)
Me.Controls.Add(Me.BtWHTC)
+ Me.Controls.Add(Me.Label7)
Me.Controls.Add(Me.BtMAP)
Me.Controls.Add(Me.BtFLD)
- Me.Controls.Add(Me.Label7)
Me.Controls.Add(Me.Label6)
Me.Controls.Add(Me.Label4)
Me.Controls.Add(Me.TbNleerl)
@@ -462,6 +516,7 @@ Partial Class F_ENG
Me.StatusStrip1.ResumeLayout(False)
Me.StatusStrip1.PerformLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
+ Me.CmOpenFile.ResumeLayout(False)
Me.ResumeLayout(False)
Me.PerformLayout()
@@ -506,4 +561,10 @@ Partial Class F_ENG
Friend WithEvents PictureBox1 As System.Windows.Forms.PictureBox
Friend WithEvents ToolStripSeparator1 As System.Windows.Forms.ToolStripSeparator
Friend WithEvents ToolStripButton1 As System.Windows.Forms.ToolStripButton
+ Friend WithEvents CmOpenFile As System.Windows.Forms.ContextMenuStrip
+ Friend WithEvents OpenWithGRAPHiToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+ Friend WithEvents OpenWithToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+ Friend WithEvents ShowInFolderToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+ Friend WithEvents BtFLDOpen As System.Windows.Forms.Button
+ Friend WithEvents BtMAPopen As System.Windows.Forms.Button
End Class
diff --git a/VECTO/GUI/F_ENG.resx b/VECTO/GUI/F_ENG.resx
index 0fe8f2f4c177ab96c400c3f96be83418ef0d4180..7c2697aedb40fddb222fd2c8db453878d793ef4e 100644
--- a/VECTO/GUI/F_ENG.resx
+++ b/VECTO/GUI/F_ENG.resx
@@ -112,18 +112,21 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <metadata name="ToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="ToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
- <metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>259, 21</value>
</metadata>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <metadata name="CmOpenFile.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>1101, 12</value>
+ </metadata>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAEAICAAAAEAIACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
diff --git a/VECTO/GUI/F_ENG.vb b/VECTO/GUI/F_ENG.vb
index 8448c0d2c949879187de3253ec3b51432159a531..f6d40c48678bcbb8af3030928544b0d62de87d9d 100644
--- a/VECTO/GUI/F_ENG.vb
+++ b/VECTO/GUI/F_ENG.vb
@@ -263,6 +263,23 @@
If fbWHTC.OpenDialog(fFileRepl(Me.TbWHTC.Text, fPATH(EngFile))) Then Me.TbWHTC.Text = fFileWoDir(fbWHTC.Files(0), fPATH(EngFile))
End Sub
+ Private Sub BtFLDOpen_Click(sender As System.Object, e As System.EventArgs) Handles BtFLDOpen.Click
+ OpenFiles(fFileRepl(Me.TbFLD.Text, fPATH(EngFile)))
+ End Sub
+
+ Private Sub BtMAPopen_Click(sender As System.Object, e As System.EventArgs) Handles BtMAPopen.Click
+ Dim fldfile As String
+
+ fldfile = fFileRepl(Me.TbFLD.Text, fPATH(EngFile))
+
+ If IO.File.Exists(fldfile) Then
+ OpenFiles(fFileRepl(Me.TbMAP.Text, fPATH(EngFile)), fldfile)
+ Else
+ OpenFiles(fFileRepl(Me.TbMAP.Text, fPATH(EngFile)))
+ End If
+
+ End Sub
+
#End Region
@@ -274,5 +291,40 @@
Me.Close()
End Sub
+#Region "Open File Context Menu"
+
+ Private CmFiles As String()
+
+ Private Sub OpenFiles(ParamArray files() As String)
+
+ If files.Length = 0 Then Exit Sub
+
+ CmFiles = files
+
+ OpenWithToolStripMenuItem.Text = "Open with " & Cfg.OpenCmdName
+
+ CmOpenFile.Show(Cursor.Position)
+
+ End Sub
+
+ Private Sub OpenWithGRAPHiToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles OpenWithGRAPHiToolStripMenuItem.Click
+ If Not FileOpenGRAPHi(CmFiles) Then MsgBox("Failed to open file!")
+ End Sub
+
+ Private Sub OpenWithToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles OpenWithToolStripMenuItem.Click
+ If Not FileOpenAlt(CmFiles(0)) Then MsgBox("Failed to open file!")
+ End Sub
+
+ Private Sub ShowInFolderToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles ShowInFolderToolStripMenuItem.Click
+ Try
+ System.Diagnostics.Process.Start("explorer", "/select,""" & CmFiles(0) & "")
+ Catch ex As Exception
+ MsgBox("Failed to open link!", MsgBoxStyle.Critical)
+ End Try
+ End Sub
+
+#End Region
+
+
End Class
diff --git a/VECTO/GUI/F_GBX.Designer.vb b/VECTO/GUI/F_GBX.Designer.vb
index 34d0b42b7e4bab99f97fb45c9b9a3c02deb8f53a..65f58fd539ace606fc83b0e601dedfcb718e8014 100644
--- a/VECTO/GUI/F_GBX.Designer.vb
+++ b/VECTO/GUI/F_GBX.Designer.vb
@@ -22,6 +22,7 @@ Partial Class F_GBX
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<System.Diagnostics.DebuggerStepThrough()> _
Private Sub InitializeComponent()
+ Me.components = New System.ComponentModel.Container()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(F_GBX))
Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
Me.ToolStripBtNew = New System.Windows.Forms.ToolStripButton()
@@ -51,6 +52,7 @@ 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.BtShiftPolyOpen = New System.Windows.Forms.Button()
Me.ChShiftInside = New System.Windows.Forms.CheckBox()
Me.TbShiftTime = New System.Windows.Forms.TextBox()
Me.Label12 = New System.Windows.Forms.Label()
@@ -72,11 +74,32 @@ Partial Class F_GBX
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()
+ Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.GroupBox3 = New System.Windows.Forms.GroupBox()
+ Me.PnTC = New System.Windows.Forms.Panel()
+ Me.Label17 = New System.Windows.Forms.Label()
+ Me.Label15 = New System.Windows.Forms.Label()
+ Me.Label14 = New System.Windows.Forms.Label()
+ Me.BtTCfileBrowse = New System.Windows.Forms.Button()
+ Me.TbTCfile = New System.Windows.Forms.TextBox()
+ Me.BtTCfileOpen = New System.Windows.Forms.Button()
+ Me.TbTCrefrpm = New System.Windows.Forms.TextBox()
+ 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.GroupBox2.SuspendLayout()
+ Me.CmOpenFile.SuspendLayout()
+ Me.GroupBox3.SuspendLayout()
+ Me.PnTC.SuspendLayout()
+ Me.PnTorqRes.SuspendLayout()
Me.SuspendLayout()
'
'ToolStrip1
@@ -161,7 +184,7 @@ Partial Class F_GBX
'StatusStrip1
'
Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LbStatus})
- Me.StatusStrip1.Location = New System.Drawing.Point(0, 629)
+ Me.StatusStrip1.Location = New System.Drawing.Point(0, 713)
Me.StatusStrip1.Name = "StatusStrip1"
Me.StatusStrip1.Size = New System.Drawing.Size(465, 22)
Me.StatusStrip1.SizingGrip = False
@@ -178,7 +201,7 @@ Partial Class F_GBX
'
Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.ButCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
- Me.ButCancel.Location = New System.Drawing.Point(378, 603)
+ 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
@@ -188,7 +211,7 @@ Partial Class F_GBX
'ButOK
'
Me.ButOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.ButOK.Location = New System.Drawing.Point(297, 603)
+ 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
@@ -197,7 +220,7 @@ Partial Class F_GBX
'
'TbTracInt
'
- Me.TbTracInt.Location = New System.Drawing.Point(389, 115)
+ 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
@@ -211,7 +234,7 @@ Partial Class F_GBX
Me.LvGears.Location = New System.Drawing.Point(12, 141)
Me.LvGears.MultiSelect = False
Me.LvGears.Name = "LvGears"
- Me.LvGears.Size = New System.Drawing.Size(441, 170)
+ Me.LvGears.Size = New System.Drawing.Size(441, 150)
Me.LvGears.TabIndex = 3
Me.LvGears.TabStop = False
Me.LvGears.UseCompatibleStateImageBehavior = False
@@ -234,7 +257,7 @@ Partial Class F_GBX
'
'TBI_getr
'
- Me.TBI_getr.Location = New System.Drawing.Point(64, 115)
+ 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
@@ -242,7 +265,7 @@ Partial Class F_GBX
'Label49
'
Me.Label49.AutoSize = True
- Me.Label49.Location = New System.Drawing.Point(435, 118)
+ Me.Label49.Location = New System.Drawing.Point(435, 302)
Me.Label49.Name = "Label49"
Me.Label49.Size = New System.Drawing.Size(18, 13)
Me.Label49.TabIndex = 2
@@ -251,7 +274,7 @@ Partial Class F_GBX
'Label33
'
Me.Label33.AutoSize = True
- Me.Label33.Location = New System.Drawing.Point(127, 118)
+ Me.Label33.Location = New System.Drawing.Point(202, 302)
Me.Label33.Name = "Label33"
Me.Label33.Size = New System.Drawing.Size(36, 13)
Me.Label33.TabIndex = 2
@@ -260,7 +283,7 @@ Partial Class F_GBX
'Label48
'
Me.Label48.AutoSize = True
- Me.Label48.Location = New System.Drawing.Point(281, 118)
+ Me.Label48.Location = New System.Drawing.Point(281, 302)
Me.Label48.Name = "Label48"
Me.Label48.Size = New System.Drawing.Size(102, 13)
Me.Label48.TabIndex = 2
@@ -269,7 +292,7 @@ Partial Class F_GBX
'Label6
'
Me.Label6.AutoSize = True
- Me.Label6.Location = New System.Drawing.Point(22, 118)
+ Me.Label6.Location = New System.Drawing.Point(97, 302)
Me.Label6.Name = "Label6"
Me.Label6.Size = New System.Drawing.Size(36, 13)
Me.Label6.TabIndex = 2
@@ -304,7 +327,7 @@ Partial Class F_GBX
'BtClearGear
'
Me.BtClearGear.Image = Global.VECTO.My.Resources.Resources.minus_circle_icon
- Me.BtClearGear.Location = New System.Drawing.Point(12, 317)
+ 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
@@ -312,33 +335,44 @@ Partial Class F_GBX
'
'GroupBox1
'
+ Me.GroupBox1.Controls.Add(Me.PnTorqRes)
+ Me.GroupBox1.Controls.Add(Me.BtShiftPolyOpen)
Me.GroupBox1.Controls.Add(Me.ChShiftInside)
Me.GroupBox1.Controls.Add(Me.TbShiftTime)
Me.GroupBox1.Controls.Add(Me.Label12)
Me.GroupBox1.Controls.Add(Me.Label13)
Me.GroupBox1.Controls.Add(Me.ChSkipGears)
Me.GroupBox1.Controls.Add(Me.GroupBox2)
- Me.GroupBox1.Controls.Add(Me.TbTqResv)
Me.GroupBox1.Controls.Add(Me.TbShiftPolyFile)
Me.GroupBox1.Controls.Add(Me.BtShiftPolyBrowse)
- Me.GroupBox1.Controls.Add(Me.Label4)
- Me.GroupBox1.Controls.Add(Me.Label2)
Me.GroupBox1.Controls.Add(Me.Label1)
- Me.GroupBox1.Location = New System.Drawing.Point(12, 346)
+ Me.GroupBox1.Location = New System.Drawing.Point(12, 326)
Me.GroupBox1.Name = "GroupBox1"
- Me.GroupBox1.Size = New System.Drawing.Size(441, 251)
+ Me.GroupBox1.Size = New System.Drawing.Size(441, 230)
Me.GroupBox1.TabIndex = 5
Me.GroupBox1.TabStop = False
Me.GroupBox1.Text = "Gear shift parameters"
'
+ 'BtShiftPolyOpen
+ '
+ Me.BtShiftPolyOpen.Image = Global.VECTO.My.Resources.Resources.application_export_icon_small
+ Me.BtShiftPolyOpen.Location = New System.Drawing.Point(412, 39)
+ Me.BtShiftPolyOpen.Name = "BtShiftPolyOpen"
+ Me.BtShiftPolyOpen.Size = New System.Drawing.Size(23, 23)
+ Me.BtShiftPolyOpen.TabIndex = 34
+ Me.BtShiftPolyOpen.TabStop = False
+ Me.BtShiftPolyOpen.UseVisualStyleBackColor = True
+ '
'ChShiftInside
'
Me.ChShiftInside.AutoSize = True
- Me.ChShiftInside.Location = New System.Drawing.Point(6, 74)
+ Me.ChShiftInside.Checked = True
+ Me.ChShiftInside.CheckState = System.Windows.Forms.CheckState.Checked
+ Me.ChShiftInside.Location = New System.Drawing.Point(9, 74)
Me.ChShiftInside.Name = "ChShiftInside"
- Me.ChShiftInside.Size = New System.Drawing.Size(217, 17)
+ Me.ChShiftInside.Size = New System.Drawing.Size(195, 17)
Me.ChShiftInside.TabIndex = 10
- Me.ChShiftInside.Text = "Allow shift-up inside polygons (AMT only)"
+ Me.ChShiftInside.Text = "Allow shift-up inside polygons (AMT)"
Me.ChShiftInside.UseVisualStyleBackColor = True
'
'TbShiftTime
@@ -369,11 +403,11 @@ Partial Class F_GBX
'ChSkipGears
'
Me.ChSkipGears.AutoSize = True
- Me.ChSkipGears.Location = New System.Drawing.Point(6, 100)
+ Me.ChSkipGears.Location = New System.Drawing.Point(9, 100)
Me.ChSkipGears.Name = "ChSkipGears"
- Me.ChSkipGears.Size = New System.Drawing.Size(78, 17)
+ Me.ChSkipGears.Size = New System.Drawing.Size(132, 17)
Me.ChSkipGears.TabIndex = 2
- Me.ChSkipGears.Text = "Skip Gears"
+ Me.ChSkipGears.Text = "Skip Gears (MT, AMT)"
Me.ChSkipGears.UseVisualStyleBackColor = True
'
'GroupBox2
@@ -387,9 +421,9 @@ Partial Class F_GBX
Me.GroupBox2.Controls.Add(Me.Label8)
Me.GroupBox2.Controls.Add(Me.Label5)
Me.GroupBox2.Controls.Add(Me.Label7)
- Me.GroupBox2.Location = New System.Drawing.Point(6, 135)
+ Me.GroupBox2.Location = New System.Drawing.Point(6, 124)
Me.GroupBox2.Name = "GroupBox2"
- Me.GroupBox2.Size = New System.Drawing.Size(429, 110)
+ Me.GroupBox2.Size = New System.Drawing.Size(429, 99)
Me.GroupBox2.TabIndex = 5
Me.GroupBox2.TabStop = False
Me.GroupBox2.Text = "Start Gear"
@@ -471,7 +505,7 @@ Partial Class F_GBX
'
'TbTqResv
'
- Me.TbTqResv.Location = New System.Drawing.Point(340, 72)
+ 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
@@ -480,12 +514,12 @@ Partial Class F_GBX
'
Me.TbShiftPolyFile.Location = New System.Drawing.Point(6, 42)
Me.TbShiftPolyFile.Name = "TbShiftPolyFile"
- Me.TbShiftPolyFile.Size = New System.Drawing.Size(391, 20)
+ Me.TbShiftPolyFile.Size = New System.Drawing.Size(362, 20)
Me.TbShiftPolyFile.TabIndex = 0
'
'BtShiftPolyBrowse
'
- Me.BtShiftPolyBrowse.Location = New System.Drawing.Point(403, 40)
+ Me.BtShiftPolyBrowse.Location = New System.Drawing.Point(374, 39)
Me.BtShiftPolyBrowse.Name = "BtShiftPolyBrowse"
Me.BtShiftPolyBrowse.Size = New System.Drawing.Size(32, 23)
Me.BtShiftPolyBrowse.TabIndex = 1
@@ -496,7 +530,7 @@ Partial Class F_GBX
'Label4
'
Me.Label4.AutoSize = True
- Me.Label4.Location = New System.Drawing.Point(403, 75)
+ 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
@@ -505,7 +539,7 @@ Partial Class F_GBX
'Label2
'
Me.Label2.AutoSize = True
- Me.Label2.Location = New System.Drawing.Point(255, 75)
+ 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
@@ -520,29 +554,183 @@ Partial Class F_GBX
Me.Label1.TabIndex = 0
Me.Label1.Text = "Shift polygons file"
'
+ 'CmOpenFile
+ '
+ Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithGRAPHiToolStripMenuItem, Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
+ Me.CmOpenFile.Name = "CmOpenFile"
+ Me.CmOpenFile.Size = New System.Drawing.Size(175, 70)
+ '
+ 'OpenWithGRAPHiToolStripMenuItem
+ '
+ Me.OpenWithGRAPHiToolStripMenuItem.Name = "OpenWithGRAPHiToolStripMenuItem"
+ Me.OpenWithGRAPHiToolStripMenuItem.Size = New System.Drawing.Size(174, 22)
+ Me.OpenWithGRAPHiToolStripMenuItem.Text = "Open with GRAPHi"
+ '
+ 'OpenWithToolStripMenuItem
+ '
+ Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem"
+ Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(174, 22)
+ Me.OpenWithToolStripMenuItem.Text = "Open with ..."
+ '
+ 'ShowInFolderToolStripMenuItem
+ '
+ Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem"
+ Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(174, 22)
+ Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
+ '
+ 'GroupBox3
+ '
+ Me.GroupBox3.Controls.Add(Me.PnTC)
+ Me.GroupBox3.Controls.Add(Me.ChTCon)
+ 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.TabStop = False
+ Me.GroupBox3.Text = "Torque Converter"
+ '
+ 'PnTC
+ '
+ Me.PnTC.Controls.Add(Me.Label17)
+ Me.PnTC.Controls.Add(Me.Label15)
+ Me.PnTC.Controls.Add(Me.Label14)
+ Me.PnTC.Controls.Add(Me.BtTCfileBrowse)
+ Me.PnTC.Controls.Add(Me.TbTCfile)
+ Me.PnTC.Controls.Add(Me.BtTCfileOpen)
+ Me.PnTC.Controls.Add(Me.TbTCrefrpm)
+ Me.PnTC.Location = New System.Drawing.Point(6, 39)
+ Me.PnTC.Name = "PnTC"
+ Me.PnTC.Size = New System.Drawing.Size(429, 72)
+ Me.PnTC.TabIndex = 36
+ '
+ 'Label17
+ '
+ Me.Label17.AutoSize = True
+ Me.Label17.Location = New System.Drawing.Point(0, 5)
+ Me.Label17.Name = "Label17"
+ Me.Label17.Size = New System.Drawing.Size(176, 13)
+ Me.Label17.TabIndex = 0
+ Me.Label17.Text = "Torque converter characteristics file"
+ '
+ 'Label15
+ '
+ Me.Label15.AutoSize = True
+ Me.Label15.Location = New System.Drawing.Point(98, 50)
+ Me.Label15.Name = "Label15"
+ Me.Label15.Size = New System.Drawing.Size(191, 13)
+ Me.Label15.TabIndex = 0
+ Me.Label15.Text = "Reference rpm for torque characteristic"
+ '
+ 'Label14
+ '
+ Me.Label14.AutoSize = True
+ Me.Label14.Location = New System.Drawing.Point(368, 50)
+ Me.Label14.Name = "Label14"
+ Me.Label14.Size = New System.Drawing.Size(40, 13)
+ Me.Label14.TabIndex = 0
+ Me.Label14.Text = "[1/min]"
+ '
+ 'BtTCfileBrowse
+ '
+ Me.BtTCfileBrowse.Location = New System.Drawing.Point(368, 19)
+ Me.BtTCfileBrowse.Name = "BtTCfileBrowse"
+ Me.BtTCfileBrowse.Size = New System.Drawing.Size(32, 23)
+ Me.BtTCfileBrowse.TabIndex = 1
+ Me.BtTCfileBrowse.TabStop = False
+ Me.BtTCfileBrowse.Text = "..."
+ Me.BtTCfileBrowse.UseVisualStyleBackColor = True
+ '
+ 'TbTCfile
+ '
+ 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
+ '
+ 'BtTCfileOpen
+ '
+ Me.BtTCfileOpen.Image = Global.VECTO.My.Resources.Resources.application_export_icon_small
+ 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.TabStop = False
+ Me.BtTCfileOpen.UseVisualStyleBackColor = True
+ '
+ 'TbTCrefrpm
+ '
+ 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
+ '
+ 'ChTCon
+ '
+ Me.ChTCon.AutoSize = True
+ Me.ChTCon.Checked = True
+ Me.ChTCon.CheckState = System.Windows.Forms.CheckState.Checked
+ Me.ChTCon.Location = New System.Drawing.Point(9, 19)
+ Me.ChTCon.Name = "ChTCon"
+ Me.ChTCon.Size = New System.Drawing.Size(88, 17)
+ Me.ChTCon.TabIndex = 0
+ Me.ChTCon.Text = "Installed (AT)"
+ Me.ChTCon.UseVisualStyleBackColor = True
+ '
+ 'Label16
+ '
+ Me.Label16.AutoSize = True
+ Me.Label16.Location = New System.Drawing.Point(18, 111)
+ Me.Label16.Name = "Label16"
+ Me.Label16.Size = New System.Drawing.Size(95, 13)
+ Me.Label16.TabIndex = 45
+ Me.Label16.Text = "Transmission Type"
+ '
+ 'CbGStype
+ '
+ Me.CbGStype.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+ Me.CbGStype.FormattingEnabled = True
+ Me.CbGStype.Items.AddRange(New Object() {"Manual Transmission (MT)", "Automated Manual Transmission (AMT)", "Automatic Transmission (AT)", "Custom"})
+ 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
+ '
'F_GBX
'
Me.AcceptButton = Me.ButOK
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.CancelButton = Me.ButCancel
- Me.ClientSize = New System.Drawing.Size(465, 651)
+ Me.ClientSize = New System.Drawing.Size(465, 735)
+ Me.Controls.Add(Me.CbGStype)
+ Me.Controls.Add(Me.Label16)
Me.Controls.Add(Me.GroupBox1)
+ Me.Controls.Add(Me.GroupBox3)
Me.Controls.Add(Me.PictureBox1)
Me.Controls.Add(Me.Label3)
Me.Controls.Add(Me.TbName)
Me.Controls.Add(Me.BtClearGear)
- Me.Controls.Add(Me.TbTracInt)
Me.Controls.Add(Me.ButCancel)
Me.Controls.Add(Me.LvGears)
+ Me.Controls.Add(Me.TbTracInt)
Me.Controls.Add(Me.ButOK)
- Me.Controls.Add(Me.TBI_getr)
Me.Controls.Add(Me.StatusStrip1)
- Me.Controls.Add(Me.Label49)
Me.Controls.Add(Me.ToolStrip1)
+ Me.Controls.Add(Me.TBI_getr)
+ Me.Controls.Add(Me.Label49)
Me.Controls.Add(Me.Label33)
- Me.Controls.Add(Me.Label6)
Me.Controls.Add(Me.Label48)
+ Me.Controls.Add(Me.Label6)
Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
Me.MaximizeBox = False
@@ -558,6 +746,13 @@ Partial Class F_GBX
Me.GroupBox1.PerformLayout()
Me.GroupBox2.ResumeLayout(False)
Me.GroupBox2.PerformLayout()
+ Me.CmOpenFile.ResumeLayout(False)
+ Me.GroupBox3.ResumeLayout(False)
+ Me.GroupBox3.PerformLayout()
+ Me.PnTC.ResumeLayout(False)
+ Me.PnTC.PerformLayout()
+ Me.PnTorqRes.ResumeLayout(False)
+ Me.PnTorqRes.PerformLayout()
Me.ResumeLayout(False)
Me.PerformLayout()
@@ -611,4 +806,22 @@ Partial Class F_GBX
Friend WithEvents Label13 As System.Windows.Forms.Label
Friend WithEvents ChSkipGears As System.Windows.Forms.CheckBox
Friend WithEvents ChShiftInside As System.Windows.Forms.CheckBox
+ Friend WithEvents CmOpenFile As System.Windows.Forms.ContextMenuStrip
+ Friend WithEvents OpenWithGRAPHiToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+ Friend WithEvents OpenWithToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+ Friend WithEvents ShowInFolderToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+ Friend WithEvents BtShiftPolyOpen As System.Windows.Forms.Button
+ Friend WithEvents GroupBox3 As System.Windows.Forms.GroupBox
+ Friend WithEvents TbTCfile As System.Windows.Forms.TextBox
+ Friend WithEvents ChTCon As System.Windows.Forms.CheckBox
+ Friend WithEvents BtTCfileBrowse As System.Windows.Forms.Button
+ Friend WithEvents BtTCfileOpen As System.Windows.Forms.Button
+ Friend WithEvents TbTCrefrpm As System.Windows.Forms.TextBox
+ Friend WithEvents Label14 As System.Windows.Forms.Label
+ Friend WithEvents Label15 As System.Windows.Forms.Label
+ Friend WithEvents Label16 As System.Windows.Forms.Label
+ Friend WithEvents CbGStype As System.Windows.Forms.ComboBox
+ Friend WithEvents Label17 As System.Windows.Forms.Label
+ Friend WithEvents PnTC As System.Windows.Forms.Panel
+ Friend WithEvents PnTorqRes As System.Windows.Forms.Panel
End Class
diff --git a/VECTO/GUI/F_GBX.resx b/VECTO/GUI/F_GBX.resx
index 1e9de07a209f22e126466151c78df21025af6f19..7c2697aedb40fddb222fd2c8db453878d793ef4e 100644
--- a/VECTO/GUI/F_GBX.resx
+++ b/VECTO/GUI/F_GBX.resx
@@ -123,6 +123,9 @@
<metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>259, 21</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>
+ </metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
diff --git a/VECTO/GUI/F_GBX.vb b/VECTO/GUI/F_GBX.vb
index d04f4d79dcb1497fe648caa223562c4515e9bf8a..b759884397ce64867549125bdad7d0189c0a5123 100644
--- a/VECTO/GUI/F_GBX.vb
+++ b/VECTO/GUI/F_GBX.vb
@@ -5,6 +5,8 @@
Public GenDir As String = ""
Private GearDia As F_VEH_GearDlog
+ Private Init As Boolean = False
+
Private Changed As Boolean = False
Private Sub F_GBX_FormClosing(sender As Object, e As System.Windows.Forms.FormClosingEventArgs) Handles Me.FormClosing
@@ -17,6 +19,7 @@
Dim lvi As ListViewItem
Dim i As Short
+ Init = False
GearDia = New F_VEH_GearDlog
lvi = New ListViewItem("A")
@@ -31,6 +34,8 @@
Me.LvGears.Items.Add(lvi)
Next
+ Init = True
+
Changed = False
newGBX()
@@ -94,6 +99,8 @@
If ChangeCheckCancel() Then Exit Sub
+ Me.CbGStype.SelectedIndex = 0
+
Me.TbName.Text = ""
Me.TbTracInt.Text = ""
Me.TBI_getr.Text = ""
@@ -113,6 +120,10 @@
Me.TbStartSpeed.Text = ""
Me.TbStartAcc.Text = ""
+ Me.ChTCon.Checked = False
+ Me.TbTCfile.Text = ""
+ Me.TbTCrefrpm.Text = ""
+
GbxFile = ""
Me.Text = "GBX Editor"
@@ -160,6 +171,12 @@
Me.TbStartAcc.Text = GBX0.gs_StartAcc.ToString
Me.ChShiftInside.Checked = GBX0.gs_ShiftInside
+ Me.ChTCon.Checked = GBX0.TCon
+ Me.TbTCfile.Text = GBX0.TCfile(True)
+ Me.TbTCrefrpm.Text = GBX0.TCrefrpm
+
+ Me.CbGStype.SelectedIndex = CType(GBX0.gs_Type, Integer)
+
fbGBX.UpdateHistory(file)
Me.Text = fFILE(file, True)
@@ -210,6 +227,12 @@
GBX0.gs_StartAcc = fTextboxToNumString(Me.TbStartAcc.Text)
GBX0.gs_ShiftInside = Me.ChShiftInside.Checked
+ GBX0.gs_Type = CType(Me.CbGStype.SelectedIndex, tGearbox)
+
+ GBX0.TCon = Me.ChTCon.Checked
+ GBX0.TCfile = Me.TbTCfile.Text
+ GBX0.TCrefrpm = Me.TbTCrefrpm.Text
+
If Not GBX0.SaveFile Then
MsgBox("Cannot safe to " & file, MsgBoxStyle.Critical)
@@ -279,10 +302,12 @@
End Sub
Private Sub ChSkipGears_CheckedChanged(sender As System.Object, e As System.EventArgs) Handles ChSkipGears.CheckedChanged
+ CheckEnableTorqRes()
Change()
End Sub
Private Sub ChShiftInside_CheckedChanged(sender As System.Object, e As System.EventArgs) Handles ChShiftInside.CheckedChanged
+ CheckEnableTorqRes()
Change()
End Sub
@@ -306,6 +331,24 @@
Change()
End Sub
+ Private Sub TbTCfile_TextChanged(sender As System.Object, e As System.EventArgs) Handles TbTCfile.TextChanged
+ Change()
+ End Sub
+
+ Private Sub TbTCrefrpm_TextChanged(sender As System.Object, e As System.EventArgs) Handles TbTCrefrpm.TextChanged
+ Change()
+ End Sub
+
+
+ Private Sub CheckEnableTorqRes()
+ If Me.ChShiftInside.Checked Or Me.ChSkipGears.Checked Then
+ Me.PnTorqRes.Enabled = True
+ Else
+ Me.PnTorqRes.Enabled = False
+ End If
+ End Sub
+
+
#End Region
@@ -319,6 +362,47 @@
End Sub
+ 'Enable/Disable settings for specific transmission types
+ Private Sub CbGStype_SelectedIndexChanged(sender As System.Object, e As System.EventArgs) Handles CbGStype.SelectedIndexChanged
+ Dim GStype As tGearbox
+
+ Change()
+
+ GStype = CType(Me.CbGStype.SelectedIndex, tGearbox)
+
+ Select Case GStype
+ Case tGearbox.Manual
+ Me.ChShiftInside.Enabled = False
+ Me.ChShiftInside.Checked = False
+ Me.ChSkipGears.Enabled = True
+ Me.ChTCon.Enabled = False
+ Me.ChTCon.Checked = False
+
+ Case tGearbox.SemiAutomatic
+ Me.ChShiftInside.Enabled = True
+ Me.ChSkipGears.Enabled = True
+ Me.ChTCon.Enabled = False
+ Me.ChTCon.Checked = False
+
+ Case tGearbox.Automatic
+ Me.ChShiftInside.Enabled = False
+ Me.ChShiftInside.Checked = False
+ Me.ChSkipGears.Enabled = False
+ Me.ChSkipGears.Checked = False
+ Me.ChTCon.Enabled = False
+ Me.ChTCon.Checked = True
+
+ Case tGearbox.Custom
+ Me.ChShiftInside.Enabled = True
+ Me.ChSkipGears.Enabled = True
+ Me.ChTCon.Enabled = True
+
+ End Select
+
+ End Sub
+
+
+
#Region "Gears"
'Gear-DoubleClick
@@ -401,11 +485,101 @@
Private Sub BtShiftPolyBrowse_Click(sender As System.Object, e As System.EventArgs) Handles BtShiftPolyBrowse.Click
Dim fb As cFileBrowser
fb = New cFileBrowser("ShiftPolygon", False, True)
+ fb.Extensions = New String() {"vgbs"}
If fb.OpenDialog(fFileRepl(Me.TbShiftPolyFile.Text, fPATH(GbxFile))) Then
Me.TbShiftPolyFile.Text = fFileWoDir(fb.Files(0), fPATH(GbxFile))
End If
End Sub
-
-
+
+ Private Sub BtShiftPolyOpen_Click(sender As System.Object, e As System.EventArgs) Handles BtShiftPolyOpen.Click
+ OpenFiles(fFileRepl(Me.TbShiftPolyFile.Text, fPATH(GbxFile)))
+ End Sub
+
+
+#Region "Open File Context Menu"
+
+ Private CmFiles As String()
+
+ Private Sub OpenFiles(ParamArray files() As String)
+
+ If files.Length = 0 Then Exit Sub
+
+ CmFiles = files
+
+ OpenWithToolStripMenuItem.Text = "Open with " & Cfg.OpenCmdName
+
+ CmOpenFile.Show(Cursor.Position)
+
+ End Sub
+
+ Private Sub OpenWithGRAPHiToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles OpenWithGRAPHiToolStripMenuItem.Click
+ If Not FileOpenGRAPHi(CmFiles) Then MsgBox("Failed to open file!")
+ End Sub
+
+ Private Sub OpenWithToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles OpenWithToolStripMenuItem.Click
+ If Not FileOpenAlt(CmFiles(0)) Then MsgBox("Failed to open file!")
+ End Sub
+
+ Private Sub ShowInFolderToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles ShowInFolderToolStripMenuItem.Click
+ Try
+ System.Diagnostics.Process.Start("explorer", "/select,""" & CmFiles(0) & "")
+ Catch ex As Exception
+ MsgBox("Failed to open link!", MsgBoxStyle.Critical)
+ End Try
+ End Sub
+
+#End Region
+
+#Region "Torque Converter"
+
+ 'TC on/off
+ Private Sub ChTCon_CheckedChanged(sender As System.Object, e As System.EventArgs) Handles ChTCon.CheckedChanged
+ Change()
+ CheckGearTC()
+ PnTC.Enabled = ChTCon.Checked
+ End Sub
+
+ 'Browse TC file
+ Private Sub BtTCfileBrowse_Click(sender As System.Object, e As System.EventArgs) Handles BtTCfileBrowse.Click
+ Dim fb As cFileBrowser
+ fb = New cFileBrowser("TCfile", False, True)
+ fb.Extensions = New String() {"vtcc"}
+ If fb.OpenDialog(fFileRepl(Me.TbTCfile.Text, fPATH(GbxFile))) Then
+ Me.TbTCfile.Text = fFileWoDir(fb.Files(0), fPATH(GbxFile))
+ End If
+ End Sub
+
+ 'Open TC file
+ Private Sub BtTCfileOpen_Click(sender As System.Object, e As System.EventArgs) Handles BtTCfileOpen.Click
+ OpenFiles(fFileRepl(Me.TbTCfile.Text, fPATH(GbxFile)))
+ End Sub
+
+ Private Sub CheckGearTC()
+ Dim i As Short
+
+ If Not Init Then Exit Sub
+
+ If Me.ChTCon.Checked Then
+
+ Me.LvGears.Items(1).SubItems(0).Text = "TC"
+
+ For i = 2 To 16
+ Me.LvGears.Items(i).SubItems(0).Text = (i - 1).ToString("00")
+ Next
+
+ Else
+ For i = 1 To 16
+ Me.LvGears.Items(i).SubItems(0).Text = i.ToString("00")
+ Next
+
+ End If
+
+ End Sub
+
+
+#End Region
+
+
+
End Class
diff --git a/VECTO/GUI/F_GEN.Designer.vb b/VECTO/GUI/F_GEN.Designer.vb
index f3f9585713e1d10f2179f61b4ec34f7348504196..69ca551288e87c45f1d9fc220d47f215dc26dc90 100644
--- a/VECTO/GUI/F_GEN.Designer.vb
+++ b/VECTO/GUI/F_GEN.Designer.vb
@@ -22,6 +22,7 @@ Partial Class F_GEN
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<System.Diagnostics.DebuggerStepThrough()> _
Private Sub InitializeComponent()
+ Me.components = New System.ComponentModel.Container()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(F_GEN))
Me.ButOpenEXS = New System.Windows.Forms.Button()
Me.ButtonEXS = New System.Windows.Forms.Button()
@@ -75,6 +76,7 @@ Partial Class F_GEN
Me.ButtonWUA = New System.Windows.Forms.Button()
Me.TabPgGen = New System.Windows.Forms.TabPage()
Me.GroupBox5 = New System.Windows.Forms.GroupBox()
+ Me.Label2 = New System.Windows.Forms.Label()
Me.LvCycles = New System.Windows.Forms.ListView()
Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
Me.BtDRIrem = New System.Windows.Forms.Button()
@@ -108,6 +110,7 @@ Partial Class F_GEN
Me.ComboBoxGearShift = New System.Windows.Forms.ComboBox()
Me.TabControl1 = New System.Windows.Forms.TabControl()
Me.TabPgDriver = New System.Windows.Forms.TabPage()
+ Me.BtAccOpen = New System.Windows.Forms.Button()
Me.Label1 = New System.Windows.Forms.Label()
Me.BtDesMaxBr = New System.Windows.Forms.Button()
Me.TbDesMaxFile = New System.Windows.Forms.TextBox()
@@ -170,6 +173,10 @@ Partial Class F_GEN
Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
Me.PictureBox1 = New System.Windows.Forms.PictureBox()
Me.CbEngOnly = New System.Windows.Forms.CheckBox()
+ Me.CmOpenFile = New System.Windows.Forms.ContextMenuStrip(Me.components)
+ Me.OpenWithGRAPHiToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.TabPgHEV.SuspendLayout()
Me.TabPgColdSt.SuspendLayout()
Me.GroupBox3.SuspendLayout()
@@ -187,6 +194,7 @@ Partial Class F_GEN
Me.StatusStrip1.SuspendLayout()
Me.ToolStrip1.SuspendLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
+ Me.CmOpenFile.SuspendLayout()
Me.SuspendLayout()
'
'ButOpenEXS
@@ -235,7 +243,7 @@ Partial Class F_GEN
Me.TabPgHEV.Location = New System.Drawing.Point(4, 22)
Me.TabPgHEV.Name = "TabPgHEV"
Me.TabPgHEV.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPgHEV.Size = New System.Drawing.Size(646, 433)
+ Me.TabPgHEV.Size = New System.Drawing.Size(646, 442)
Me.TabPgHEV.TabIndex = 2
Me.TabPgHEV.Text = "HEV"
Me.TabPgHEV.UseVisualStyleBackColor = True
@@ -471,7 +479,7 @@ Partial Class F_GEN
Me.TabPgColdSt.Location = New System.Drawing.Point(4, 22)
Me.TabPgColdSt.Name = "TabPgColdSt"
Me.TabPgColdSt.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPgColdSt.Size = New System.Drawing.Size(646, 433)
+ Me.TabPgColdSt.Size = New System.Drawing.Size(646, 442)
Me.TabPgColdSt.TabIndex = 1
Me.TabPgColdSt.Text = "Cold Start"
Me.TabPgColdSt.UseVisualStyleBackColor = True
@@ -745,6 +753,7 @@ Partial Class F_GEN
'
'GroupBox5
'
+ Me.GroupBox5.Controls.Add(Me.Label2)
Me.GroupBox5.Controls.Add(Me.LvCycles)
Me.GroupBox5.Controls.Add(Me.BtDRIrem)
Me.GroupBox5.Controls.Add(Me.BtDRIadd)
@@ -755,6 +764,15 @@ Partial Class F_GEN
Me.GroupBox5.TabStop = False
Me.GroupBox5.Text = "Cycles"
'
+ 'Label2
+ '
+ Me.Label2.AutoSize = True
+ Me.Label2.Location = New System.Drawing.Point(506, 153)
+ Me.Label2.Name = "Label2"
+ Me.Label2.Size = New System.Drawing.Size(122, 13)
+ Me.Label2.TabIndex = 33
+ Me.Label2.Text = "Double-Click to open file"
+ '
'LvCycles
'
Me.LvCycles.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1})
@@ -1083,6 +1101,7 @@ Partial Class F_GEN
'
'TabPgDriver
'
+ Me.TabPgDriver.Controls.Add(Me.BtAccOpen)
Me.TabPgDriver.Controls.Add(Me.Label1)
Me.TabPgDriver.Controls.Add(Me.BtDesMaxBr)
Me.TabPgDriver.Controls.Add(Me.TbDesMaxFile)
@@ -1094,6 +1113,16 @@ Partial Class F_GEN
Me.TabPgDriver.Text = "Driver"
Me.TabPgDriver.UseVisualStyleBackColor = True
'
+ 'BtAccOpen
+ '
+ Me.BtAccOpen.Image = Global.VECTO.My.Resources.Resources.application_export_icon_small
+ Me.BtAccOpen.Location = New System.Drawing.Point(617, 28)
+ Me.BtAccOpen.Name = "BtAccOpen"
+ Me.BtAccOpen.Size = New System.Drawing.Size(23, 23)
+ Me.BtAccOpen.TabIndex = 33
+ Me.BtAccOpen.TabStop = False
+ Me.BtAccOpen.UseVisualStyleBackColor = True
+ '
'Label1
'
Me.Label1.AutoSize = True
@@ -1105,7 +1134,7 @@ Partial Class F_GEN
'
'BtDesMaxBr
'
- Me.BtDesMaxBr.Location = New System.Drawing.Point(612, 29)
+ Me.BtDesMaxBr.Location = New System.Drawing.Point(583, 29)
Me.BtDesMaxBr.Name = "BtDesMaxBr"
Me.BtDesMaxBr.Size = New System.Drawing.Size(28, 21)
Me.BtDesMaxBr.TabIndex = 31
@@ -1116,7 +1145,7 @@ Partial Class F_GEN
'
Me.TbDesMaxFile.Location = New System.Drawing.Point(6, 30)
Me.TbDesMaxFile.Name = "TbDesMaxFile"
- Me.TbDesMaxFile.Size = New System.Drawing.Size(600, 20)
+ Me.TbDesMaxFile.Size = New System.Drawing.Size(571, 20)
Me.TbDesMaxFile.TabIndex = 30
'
'TabPgKF
@@ -1125,7 +1154,7 @@ Partial Class F_GEN
Me.TabPgKF.Location = New System.Drawing.Point(4, 22)
Me.TabPgKF.Name = "TabPgKF"
Me.TabPgKF.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPgKF.Size = New System.Drawing.Size(646, 433)
+ Me.TabPgKF.Size = New System.Drawing.Size(646, 442)
Me.TabPgKF.TabIndex = 3
Me.TabPgKF.Text = "MAP Creation"
Me.TabPgKF.UseVisualStyleBackColor = True
@@ -1271,7 +1300,7 @@ Partial Class F_GEN
Me.TabPgStartStop.Location = New System.Drawing.Point(4, 22)
Me.TabPgStartStop.Name = "TabPgStartStop"
Me.TabPgStartStop.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPgStartStop.Size = New System.Drawing.Size(646, 433)
+ Me.TabPgStartStop.Size = New System.Drawing.Size(646, 442)
Me.TabPgStartStop.TabIndex = 4
Me.TabPgStartStop.Text = "Start-Stop"
Me.TabPgStartStop.UseVisualStyleBackColor = True
@@ -1351,7 +1380,7 @@ Partial Class F_GEN
Me.TabPgTEST.Location = New System.Drawing.Point(4, 22)
Me.TabPgTEST.Name = "TabPgTEST"
Me.TabPgTEST.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPgTEST.Size = New System.Drawing.Size(646, 433)
+ Me.TabPgTEST.Size = New System.Drawing.Size(646, 442)
Me.TabPgTEST.TabIndex = 6
Me.TabPgTEST.Text = "TEST"
Me.TabPgTEST.UseVisualStyleBackColor = True
@@ -1710,6 +1739,30 @@ Partial Class F_GEN
Me.CbEngOnly.Text = "Engine Only Mode"
Me.CbEngOnly.UseVisualStyleBackColor = True
'
+ 'CmOpenFile
+ '
+ Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithGRAPHiToolStripMenuItem, Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
+ Me.CmOpenFile.Name = "CmOpenFile"
+ Me.CmOpenFile.Size = New System.Drawing.Size(175, 70)
+ '
+ 'OpenWithGRAPHiToolStripMenuItem
+ '
+ Me.OpenWithGRAPHiToolStripMenuItem.Name = "OpenWithGRAPHiToolStripMenuItem"
+ Me.OpenWithGRAPHiToolStripMenuItem.Size = New System.Drawing.Size(174, 22)
+ Me.OpenWithGRAPHiToolStripMenuItem.Text = "Open with GRAPHi"
+ '
+ 'OpenWithToolStripMenuItem
+ '
+ Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem"
+ Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(174, 22)
+ Me.OpenWithToolStripMenuItem.Text = "Open with ..."
+ '
+ 'ShowInFolderToolStripMenuItem
+ '
+ Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem"
+ Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(174, 22)
+ Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
+ '
'F_GEN
'
Me.AcceptButton = Me.ButOK
@@ -1739,6 +1792,7 @@ Partial Class F_GEN
Me.TabPgGen.ResumeLayout(False)
Me.TabPgGen.PerformLayout()
Me.GroupBox5.ResumeLayout(False)
+ Me.GroupBox5.PerformLayout()
Me.GrAux.ResumeLayout(False)
Me.TabControl1.ResumeLayout(False)
Me.TabPgDriver.ResumeLayout(False)
@@ -1758,6 +1812,7 @@ Partial Class F_GEN
Me.ToolStrip1.ResumeLayout(False)
Me.ToolStrip1.PerformLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
+ Me.CmOpenFile.ResumeLayout(False)
Me.ResumeLayout(False)
Me.PerformLayout()
@@ -1909,4 +1964,10 @@ Partial Class F_GEN
Friend WithEvents Label15 As System.Windows.Forms.Label
Friend WithEvents TBhinauf As System.Windows.Forms.TextBox
Friend WithEvents CbEngOnly As System.Windows.Forms.CheckBox
+ Friend WithEvents BtAccOpen As System.Windows.Forms.Button
+ Friend WithEvents Label2 As System.Windows.Forms.Label
+ Friend WithEvents CmOpenFile As System.Windows.Forms.ContextMenuStrip
+ Friend WithEvents OpenWithGRAPHiToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+ Friend WithEvents OpenWithToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+ Friend WithEvents ShowInFolderToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
End Class
diff --git a/VECTO/GUI/F_GEN.resx b/VECTO/GUI/F_GEN.resx
index 12568ef85264d45d150c020f59ca8562350e7e8b..4a6ac87d61b3932e9c40a991ab858979d957bdf8 100644
--- a/VECTO/GUI/F_GEN.resx
+++ b/VECTO/GUI/F_GEN.resx
@@ -123,6 +123,9 @@
<metadata name="ToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>242, 17</value>
</metadata>
+ <metadata name="CmOpenFile.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>350, 15</value>
+ </metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>49</value>
</metadata>
diff --git a/VECTO/GUI/F_GEN.vb b/VECTO/GUI/F_GEN.vb
index 7ab9c8a10484bf050fcb84c9f7c2b56c379b4108..23b8712e0741184b1ea2a1e4050e27310481db86 100644
--- a/VECTO/GUI/F_GEN.vb
+++ b/VECTO/GUI/F_GEN.vb
@@ -28,8 +28,6 @@ Public Class F_GEN
Private AuxDlog As F_VEH_AuxDlog
-
-
'Initialize form (Load Drives, Combo-lists, ...)
Private Sub F02_GEN_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
Dim x As Int16
@@ -358,6 +356,10 @@ Public Class F_GEN
If fbACC.OpenDialog(fFileRepl(Me.TbDesMaxFile.Text, fPATH(Genfile))) Then Me.TbDesMaxFile.Text = fFileWoDir(fbACC.Files(0), fPATH(Genfile))
End Sub
+ Private Sub BtAccOpen_Click(sender As System.Object, e As System.EventArgs) Handles BtAccOpen.Click
+ OpenFiles(fFileRepl(Me.TbDesMaxFile.Text, fPATH(Genfile)))
+ End Sub
+
#End Region
#Region "Open Buttons"
@@ -442,48 +444,48 @@ Public Class F_GEN
End Sub
Private Sub ButOpenTRS_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ButOpenTRS.Click
- FileOpen(fFileRepl(Me.TextBoxTRS.Text, fPATH(Genfile)))
+ FileOpenAlt(fFileRepl(Me.TextBoxTRS.Text, fPATH(Genfile)))
End Sub
Private Sub ButOpenEXS_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ButOpenEXS.Click
- FileOpen(fFileRepl(Me.TextBoxEXS.Text, fPATH(Genfile)))
+ FileOpenAlt(fFileRepl(Me.TextBoxEXS.Text, fPATH(Genfile)))
End Sub
'Cold Start
Private Sub ButOpenMAA_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ButOpenMAA.Click
- FileOpen(fFileRepl(Me.TextBoxMAA.Text, fPATH(Genfile)))
+ FileOpenAlt(fFileRepl(Me.TextBoxMAA.Text, fPATH(Genfile)))
End Sub
Private Sub ButOpenMAC_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ButOpenMAC.Click
- FileOpen(fFileRepl(Me.TextBoxMAC.Text, fPATH(Genfile)))
+ FileOpenAlt(fFileRepl(Me.TextBoxMAC.Text, fPATH(Genfile)))
End Sub
Private Sub ButOpenWUA_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ButOpenWUA.Click
- FileOpen(fFileRepl(Me.TextBoxWUA.Text, fPATH(Genfile)))
+ FileOpenAlt(fFileRepl(Me.TextBoxWUA.Text, fPATH(Genfile)))
End Sub
Private Sub ButOpenWUC_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ButOpenWUC.Click
- FileOpen(fFileRepl(Me.TextBoxWUC.Text, fPATH(Genfile)))
+ FileOpenAlt(fFileRepl(Me.TextBoxWUC.Text, fPATH(Genfile)))
End Sub
Private Sub ButOpenCDW_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ButOpenCDW.Click
- FileOpen(fFileRepl(Me.TextBoxCDW.Text, fPATH(Genfile)))
+ FileOpenAlt(fFileRepl(Me.TextBoxCDW.Text, fPATH(Genfile)))
End Sub
Private Sub ButOpenATC_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ButOpenATC.Click
- FileOpen(fFileRepl(Me.TextBoxATC.Text, fPATH(Genfile)))
+ FileOpenAlt(fFileRepl(Me.TextBoxATC.Text, fPATH(Genfile)))
End Sub
'HEV
Private Sub ButOpenBAT_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ButOpenBAT.Click
- FileOpen(fFileRepl(Me.TextBoxBAT.Text, fPATH(Genfile)))
+ FileOpenAlt(fFileRepl(Me.TextBoxBAT.Text, fPATH(Genfile)))
End Sub
Private Sub ButOpenEMO_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ButOpenEMO.Click
- FileOpen(fFileRepl(Me.TextBoxEMO.Text, fPATH(Genfile)))
+ FileOpenAlt(fFileRepl(Me.TextBoxEMO.Text, fPATH(Genfile)))
End Sub
Private Sub ButOpenEAN_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ButOpenEAN.Click
- FileOpen(fFileRepl(Me.TextBoxEAN.Text, fPATH(Genfile)))
+ FileOpenAlt(fFileRepl(Me.TextBoxEAN.Text, fPATH(Genfile)))
End Sub
Private Sub ButOpenGET_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ButOpenGET.Click
- FileOpen(fFileRepl(Me.TextBoxGET.Text, fPATH(Genfile)))
+ FileOpenAlt(fFileRepl(Me.TextBoxGET.Text, fPATH(Genfile)))
End Sub
Private Sub ButOpenSTE_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ButOpenSTE.Click
- FileOpen(fFileRepl(Me.TextBoxSTE.Text, fPATH(Genfile)))
+ FileOpenAlt(fFileRepl(Me.TextBoxSTE.Text, fPATH(Genfile)))
End Sub
Private Sub ButOpenEKF_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ButOpenEKF.Click
- FileOpen(fFileRepl(Me.TextBoxEKF.Text, fPATH(Genfile)))
+ FileOpenAlt(fFileRepl(Me.TextBoxEKF.Text, fPATH(Genfile)))
End Sub
#End Region
@@ -572,7 +574,7 @@ Public Class F_GEN
MsgBox("Failed to load " & fFILE(file, True) & "!")
Exit Sub
End Try
-
+
'Update Form
If Gfile.PKWja Then
@@ -1257,7 +1259,7 @@ lbDlog:
End Sub
Private Sub LvCycles_DoubleClick(sender As Object, e As System.EventArgs) Handles LvCycles.DoubleClick
- If Me.LvCycles.SelectedItems.Count > 0 Then FileOpen(fFileRepl(Me.LvCycles.SelectedItems(0).SubItems(0).Text, fPATH(Genfile)))
+ If Me.LvCycles.SelectedItems.Count > 0 Then OpenFiles(fFileRepl(Me.LvCycles.SelectedItems(0).SubItems(0).Text, fPATH(Genfile)))
End Sub
Private Sub LvCycles_KeyDown(sender As Object, e As System.Windows.Forms.KeyEventArgs) Handles LvCycles.KeyDown
@@ -1343,5 +1345,39 @@ lbDlog:
End Sub
+#Region "Open File Context Menu"
+
+ Private CmFiles As String()
+
+ Private Sub OpenFiles(ParamArray files() As String)
+
+ If files.Length = 0 Then Exit Sub
+
+ CmFiles = files
+
+ OpenWithToolStripMenuItem.Text = "Open with " & Cfg.OpenCmdName
+
+ CmOpenFile.Show(Cursor.Position)
+
+ End Sub
+
+ Private Sub OpenWithGRAPHiToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles OpenWithGRAPHiToolStripMenuItem.Click
+ If Not FileOpenGRAPHi(CmFiles) Then MsgBox("Failed to open file!")
+ End Sub
+
+ Private Sub OpenWithToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles OpenWithToolStripMenuItem.Click
+ If Not FileOpenAlt(CmFiles(0)) Then MsgBox("Failed to open file!")
+ End Sub
+
+ Private Sub ShowInFolderToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles ShowInFolderToolStripMenuItem.Click
+ Try
+ System.Diagnostics.Process.Start("explorer", "/select,""" & CmFiles(0) & "")
+ Catch ex As Exception
+ MsgBox("Failed to open link!", MsgBoxStyle.Critical)
+ End Try
+ End Sub
+
+#End Region
+
End Class
diff --git a/VECTO/GUI/F_MAINForm.Designer.vb b/VECTO/GUI/F_MAINForm.Designer.vb
index 8ea5b567521149048a9f4be80659863664f60c8a..0a8d565786f7b23908627fcf536fddd120ed135c 100644
--- a/VECTO/GUI/F_MAINForm.Designer.vb
+++ b/VECTO/GUI/F_MAINForm.Designer.vb
@@ -118,6 +118,10 @@ Partial Class F_MAINForm
Me.AboutPHEMToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
Me.CmDEV = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.TmProgSec = New System.Windows.Forms.Timer(Me.components)
+ Me.CmOpenFile = New System.Windows.Forms.ContextMenuStrip(Me.components)
+ Me.OpenWithGRAPHiToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.StatusBAR.SuspendLayout()
Me.TabControl1.SuspendLayout()
Me.TabPageGEN.SuspendLayout()
@@ -135,6 +139,7 @@ Partial Class F_MAINForm
Me.SplitContainer1.Panel2.SuspendLayout()
Me.SplitContainer1.SuspendLayout()
Me.ToolStrip1.SuspendLayout()
+ Me.CmOpenFile.SuspendLayout()
Me.SuspendLayout()
'
'StatusBAR
@@ -995,6 +1000,30 @@ Partial Class F_MAINForm
'
Me.TmProgSec.Interval = 1000
'
+ 'CmOpenFile
+ '
+ Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithGRAPHiToolStripMenuItem, Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
+ Me.CmOpenFile.Name = "CmOpenFile"
+ Me.CmOpenFile.Size = New System.Drawing.Size(175, 92)
+ '
+ 'OpenWithGRAPHiToolStripMenuItem
+ '
+ Me.OpenWithGRAPHiToolStripMenuItem.Name = "OpenWithGRAPHiToolStripMenuItem"
+ Me.OpenWithGRAPHiToolStripMenuItem.Size = New System.Drawing.Size(174, 22)
+ Me.OpenWithGRAPHiToolStripMenuItem.Text = "Open with GRAPHi"
+ '
+ 'OpenWithToolStripMenuItem
+ '
+ Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem"
+ Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(174, 22)
+ Me.OpenWithToolStripMenuItem.Text = "Open with ..."
+ '
+ 'ShowInFolderToolStripMenuItem
+ '
+ Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem"
+ Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(174, 22)
+ Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
+ '
'F_MAINForm
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -1033,6 +1062,7 @@ Partial Class F_MAINForm
Me.SplitContainer1.ResumeLayout(False)
Me.ToolStrip1.ResumeLayout(False)
Me.ToolStrip1.PerformLayout()
+ Me.CmOpenFile.ResumeLayout(False)
Me.ResumeLayout(False)
Me.PerformLayout()
@@ -1131,5 +1161,9 @@ Partial Class F_MAINForm
Friend WithEvents UserManualToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents QuickStartGuideToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents ToolStripSeparator3 As System.Windows.Forms.ToolStripSeparator
+ Friend WithEvents CmOpenFile As System.Windows.Forms.ContextMenuStrip
+ Friend WithEvents OpenWithGRAPHiToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+ Friend WithEvents OpenWithToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+ Friend WithEvents ShowInFolderToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
End Class
diff --git a/VECTO/GUI/F_MAINForm.resx b/VECTO/GUI/F_MAINForm.resx
index be4f36685fa1b566d863ae0b38a74070acf123a6..6e9b1673e4ad8801c82be01e6eb024eeb8d578bd 100644
--- a/VECTO/GUI/F_MAINForm.resx
+++ b/VECTO/GUI/F_MAINForm.resx
@@ -125,84 +125,81 @@
<value>
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
- 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
+ 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
</value>
</data>
<metadata name="ConMenFilelist.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -223,6 +220,9 @@
<metadata name="TmProgSec.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>752, 12</value>
</metadata>
+ <metadata name="CmOpenFile.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>865, 12</value>
+ </metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>49</value>
</metadata>
diff --git a/VECTO/GUI/F_MAINForm.vb b/VECTO/GUI/F_MAINForm.vb
index 5eb45349110fa434377c8b3226b891c33276fef0..b50a23c4350a583f2adfcd7439c08c6c7f8295ca 100644
--- a/VECTO/GUI/F_MAINForm.vb
+++ b/VECTO/GUI/F_MAINForm.vb
@@ -352,7 +352,7 @@ Public Class F_MAINForm
Select Case BGjob
Case tBGjob.PHEM
- e.Result = PHEM()
+ e.Result = VECTO()
Case tBGjob.ModFilter
ADV = New cADVANCE_V3
ADV.AusgModCut(MODpath, MODVehList)
@@ -573,6 +573,7 @@ Public Class F_MAINForm
CmdLineCtrl(My.Application.CommandLineArgs)
Else
If Cfg.FirstRun Then
+ Cfg.FirstRun = False
If MsgBox("Welcome to VECTO!" & vbCrLf & vbCrLf & "Start Quick Start Guide?", MsgBoxStyle.YesNo, "Welcome") = MsgBoxResult.Yes Then
If IO.File.Exists(MyAppPath & "User Manual\qsg\quickstartApp.html") Then
System.Diagnostics.Process.Start(MyAppPath & "User Manual\qsg\quickstartApp.html")
@@ -583,8 +584,6 @@ Public Class F_MAINForm
End If
End If
- Cfg.FirstRun = False
-
End Sub
'Open file with PHEM
@@ -1197,7 +1196,7 @@ lbFound:
End If
End If
- FileOpen(fFileRepl(Me.LvDRI.SelectedItems(0).SubItems(0).Text, Cfg.WorkDPath))
+ OpenFiles(fFileRepl(Me.LvDRI.SelectedItems(0).SubItems(0).Text, Cfg.WorkDPath))
End Sub
'DRI list: Add File
@@ -2150,11 +2149,7 @@ lbFound:
Private Sub LvMsg_MouseClick(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles LvMsg.MouseClick
If Me.LvMsg.SelectedIndices.Count > 0 Then
If Not Me.LvMsg.SelectedItems(0).Tag Is Nothing Then
- Try
- System.Diagnostics.Process.Start("explorer", "/select,""" & CStr(Me.LvMsg.SelectedItems(0).Tag) & "")
- Catch ex As Exception
- MsgBox("Failed to open link!", MsgBoxStyle.Critical)
- End Try
+ OpenFiles(CStr(Me.LvMsg.SelectedItems(0).Tag))
End If
End If
End Sub
@@ -2170,5 +2165,38 @@ lbFound:
End If
End Sub
+#Region "Open File Context Menu"
+
+ Private CmFiles As String()
+
+ Private Sub OpenFiles(ParamArray files() As String)
+
+ If files.Length = 0 Then Exit Sub
+
+ CmFiles = files
+
+ OpenWithToolStripMenuItem.Text = "Open with " & Cfg.OpenCmdName
+
+ CmOpenFile.Show(Cursor.Position)
+
+ End Sub
+
+ Private Sub OpenWithGRAPHiToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles OpenWithGRAPHiToolStripMenuItem.Click
+ If Not FileOpenGRAPHi(CmFiles) Then MsgBox("Failed to open file!")
+ End Sub
+
+ Private Sub OpenWithToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles OpenWithToolStripMenuItem.Click
+ If Not FileOpenAlt(CmFiles(0)) Then MsgBox("Failed to open file!")
+ End Sub
+ Private Sub ShowInFolderToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles ShowInFolderToolStripMenuItem.Click
+ Try
+ System.Diagnostics.Process.Start("explorer", "/select,""" & CmFiles(0) & "")
+ Catch ex As Exception
+ MsgBox("Failed to open link!", MsgBoxStyle.Critical)
+ End Try
+ End Sub
+
+#End Region
+
End Class
diff --git a/VECTO/GUI/F_Options.Designer.vb b/VECTO/GUI/F_Options.Designer.vb
index 2be6956732b69605ace91800ea52dbd73029d3fa..48ba842124d7497111673de67b92a22d24a019d9 100644
--- a/VECTO/GUI/F_Options.Designer.vb
+++ b/VECTO/GUI/F_Options.Designer.vb
@@ -28,8 +28,11 @@ Partial Class F_Options
Me.ButtonOK = New System.Windows.Forms.Button()
Me.ButtonCancel = New System.Windows.Forms.Button()
Me.GroupBox3 = New System.Windows.Forms.GroupBox()
- Me.TbOpenCmd = New System.Windows.Forms.TextBox()
+ Me.GroupBox5 = New System.Windows.Forms.GroupBox()
+ Me.TbOpenCmdName = New System.Windows.Forms.TextBox()
Me.Label7 = New System.Windows.Forms.Label()
+ Me.TbOpenCmd = New System.Windows.Forms.TextBox()
+ Me.Label12 = New System.Windows.Forms.Label()
Me.TextBoxLogSize = New System.Windows.Forms.TextBox()
Me.Label16 = New System.Windows.Forms.Label()
Me.TabControl1 = New System.Windows.Forms.TabControl()
@@ -61,6 +64,7 @@ Partial Class F_Options
Me.BtHelp = New System.Windows.Forms.Button()
Me.GroupBoxWorDir.SuspendLayout()
Me.GroupBox3.SuspendLayout()
+ Me.GroupBox5.SuspendLayout()
Me.TabControl1.SuspendLayout()
Me.TabPage2.SuspendLayout()
Me.GroupBox4.SuspendLayout()
@@ -100,7 +104,7 @@ Partial Class F_Options
'ButtonOK
'
Me.ButtonOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.ButtonOK.Location = New System.Drawing.Point(347, 272)
+ Me.ButtonOK.Location = New System.Drawing.Point(347, 337)
Me.ButtonOK.Name = "ButtonOK"
Me.ButtonOK.Size = New System.Drawing.Size(75, 26)
Me.ButtonOK.TabIndex = 0
@@ -111,7 +115,7 @@ Partial Class F_Options
'
Me.ButtonCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.ButtonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
- Me.ButtonCancel.Location = New System.Drawing.Point(428, 272)
+ Me.ButtonCancel.Location = New System.Drawing.Point(428, 337)
Me.ButtonCancel.Name = "ButtonCancel"
Me.ButtonCancel.Size = New System.Drawing.Size(75, 26)
Me.ButtonCancel.TabIndex = 1
@@ -120,36 +124,64 @@ Partial Class F_Options
'
'GroupBox3
'
- Me.GroupBox3.Controls.Add(Me.TbOpenCmd)
- Me.GroupBox3.Controls.Add(Me.Label7)
+ Me.GroupBox3.Controls.Add(Me.GroupBox5)
Me.GroupBox3.Controls.Add(Me.TextBoxLogSize)
Me.GroupBox3.Controls.Add(Me.Label16)
Me.GroupBox3.Location = New System.Drawing.Point(5, 63)
Me.GroupBox3.Name = "GroupBox3"
- Me.GroupBox3.Size = New System.Drawing.Size(489, 60)
+ Me.GroupBox3.Size = New System.Drawing.Size(489, 124)
Me.GroupBox3.TabIndex = 11
Me.GroupBox3.TabStop = False
Me.GroupBox3.Text = "Interface"
'
- 'TbOpenCmd
+ 'GroupBox5
'
- Me.TbOpenCmd.Location = New System.Drawing.Point(348, 19)
- Me.TbOpenCmd.Name = "TbOpenCmd"
- Me.TbOpenCmd.Size = New System.Drawing.Size(135, 20)
- Me.TbOpenCmd.TabIndex = 13
+ Me.GroupBox5.Controls.Add(Me.TbOpenCmdName)
+ Me.GroupBox5.Controls.Add(Me.Label7)
+ Me.GroupBox5.Controls.Add(Me.TbOpenCmd)
+ Me.GroupBox5.Controls.Add(Me.Label12)
+ Me.GroupBox5.Location = New System.Drawing.Point(230, 19)
+ Me.GroupBox5.Name = "GroupBox5"
+ Me.GroupBox5.Size = New System.Drawing.Size(253, 96)
+ Me.GroupBox5.TabIndex = 14
+ Me.GroupBox5.TabStop = False
+ Me.GroupBox5.Text = "File Open Command"
+ '
+ 'TbOpenCmdName
+ '
+ Me.TbOpenCmdName.Location = New System.Drawing.Point(66, 19)
+ Me.TbOpenCmdName.Name = "TbOpenCmdName"
+ Me.TbOpenCmdName.Size = New System.Drawing.Size(174, 20)
+ Me.TbOpenCmdName.TabIndex = 13
'
'Label7
'
Me.Label7.AutoSize = True
- Me.Label7.Location = New System.Drawing.Point(240, 22)
+ Me.Label7.Location = New System.Drawing.Point(6, 48)
Me.Label7.Name = "Label7"
- Me.Label7.Size = New System.Drawing.Size(102, 13)
+ Me.Label7.Size = New System.Drawing.Size(54, 13)
Me.Label7.TabIndex = 12
- Me.Label7.Text = "File Open Command"
+ Me.Label7.Text = "Command"
+ '
+ 'TbOpenCmd
+ '
+ Me.TbOpenCmd.Location = New System.Drawing.Point(66, 45)
+ Me.TbOpenCmd.Name = "TbOpenCmd"
+ Me.TbOpenCmd.Size = New System.Drawing.Size(174, 20)
+ Me.TbOpenCmd.TabIndex = 13
+ '
+ 'Label12
+ '
+ Me.Label12.AutoSize = True
+ Me.Label12.Location = New System.Drawing.Point(25, 22)
+ Me.Label12.Name = "Label12"
+ Me.Label12.Size = New System.Drawing.Size(35, 13)
+ Me.Label12.TabIndex = 12
+ Me.Label12.Text = "Name"
'
'TextBoxLogSize
'
- Me.TextBoxLogSize.Location = New System.Drawing.Point(128, 19)
+ Me.TextBoxLogSize.Location = New System.Drawing.Point(134, 38)
Me.TextBoxLogSize.Name = "TextBoxLogSize"
Me.TextBoxLogSize.Size = New System.Drawing.Size(36, 20)
Me.TextBoxLogSize.TabIndex = 11
@@ -157,7 +189,7 @@ Partial Class F_Options
'Label16
'
Me.Label16.AutoSize = True
- Me.Label16.Location = New System.Drawing.Point(12, 22)
+ Me.Label16.Location = New System.Drawing.Point(18, 41)
Me.Label16.Name = "Label16"
Me.Label16.Size = New System.Drawing.Size(110, 13)
Me.Label16.TabIndex = 10
@@ -173,7 +205,7 @@ Partial Class F_Options
Me.TabControl1.Location = New System.Drawing.Point(3, 3)
Me.TabControl1.Name = "TabControl1"
Me.TabControl1.SelectedIndex = 0
- Me.TabControl1.Size = New System.Drawing.Size(508, 263)
+ Me.TabControl1.Size = New System.Drawing.Size(508, 328)
Me.TabControl1.TabIndex = 12
'
'TabPage2
@@ -184,7 +216,7 @@ Partial Class F_Options
Me.TabPage2.Location = New System.Drawing.Point(4, 22)
Me.TabPage2.Name = "TabPage2"
Me.TabPage2.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPage2.Size = New System.Drawing.Size(500, 237)
+ Me.TabPage2.Size = New System.Drawing.Size(500, 302)
Me.TabPage2.TabIndex = 0
Me.TabPage2.Text = "VECTO"
Me.TabPage2.UseVisualStyleBackColor = True
@@ -200,7 +232,7 @@ Partial Class F_Options
Me.GroupBox4.Controls.Add(Me.Label8)
Me.GroupBox4.Controls.Add(Me.TbAirDensity)
Me.GroupBox4.Controls.Add(Me.Label2)
- Me.GroupBox4.Location = New System.Drawing.Point(6, 129)
+ Me.GroupBox4.Location = New System.Drawing.Point(6, 193)
Me.GroupBox4.Name = "GroupBox4"
Me.GroupBox4.Size = New System.Drawing.Size(488, 103)
Me.GroupBox4.TabIndex = 12
@@ -230,7 +262,7 @@ Partial Class F_Options
Me.Label3.AutoSize = True
Me.Label3.Location = New System.Drawing.Point(130, 22)
Me.Label3.Name = "Label3"
- Me.Label3.Size = New System.Drawing.Size(41, 13)
+ Me.Label3.Size = New System.Drawing.Size(48, 13)
Me.Label3.TabIndex = 16
Me.Label3.Text = "[kg/m³]"
'
@@ -293,7 +325,7 @@ Partial Class F_Options
Me.TabPgTest.Location = New System.Drawing.Point(4, 22)
Me.TabPgTest.Name = "TabPgTest"
Me.TabPgTest.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPgTest.Size = New System.Drawing.Size(500, 237)
+ Me.TabPgTest.Size = New System.Drawing.Size(500, 302)
Me.TabPgTest.TabIndex = 2
Me.TabPgTest.Text = "TEST"
Me.TabPgTest.UseVisualStyleBackColor = True
@@ -409,7 +441,7 @@ Partial Class F_Options
'ButReset
'
Me.ButReset.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
- Me.ButReset.Location = New System.Drawing.Point(35, 272)
+ Me.ButReset.Location = New System.Drawing.Point(35, 337)
Me.ButReset.Name = "ButReset"
Me.ButReset.Size = New System.Drawing.Size(108, 26)
Me.ButReset.TabIndex = 13
@@ -420,7 +452,7 @@ Partial Class F_Options
'
Me.BtHelp.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.BtHelp.Image = Global.VECTO.My.Resources.Resources.Help_icon
- Me.BtHelp.Location = New System.Drawing.Point(3, 272)
+ Me.BtHelp.Location = New System.Drawing.Point(3, 337)
Me.BtHelp.Name = "BtHelp"
Me.BtHelp.Size = New System.Drawing.Size(26, 26)
Me.BtHelp.TabIndex = 14
@@ -432,7 +464,7 @@ Partial Class F_Options
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.CancelButton = Me.ButtonCancel
- Me.ClientSize = New System.Drawing.Size(515, 310)
+ Me.ClientSize = New System.Drawing.Size(515, 375)
Me.Controls.Add(Me.BtHelp)
Me.Controls.Add(Me.ButReset)
Me.Controls.Add(Me.TabControl1)
@@ -447,6 +479,8 @@ Partial Class F_Options
Me.GroupBoxWorDir.PerformLayout()
Me.GroupBox3.ResumeLayout(False)
Me.GroupBox3.PerformLayout()
+ Me.GroupBox5.ResumeLayout(False)
+ Me.GroupBox5.PerformLayout()
Me.TabControl1.ResumeLayout(False)
Me.TabPage2.ResumeLayout(False)
Me.GroupBox4.ResumeLayout(False)
@@ -497,4 +531,7 @@ Partial Class F_Options
Friend WithEvents TbCO2toFC As System.Windows.Forms.TextBox
Friend WithEvents Label10 As System.Windows.Forms.Label
Friend WithEvents BtHelp As System.Windows.Forms.Button
+ Friend WithEvents GroupBox5 As System.Windows.Forms.GroupBox
+ Friend WithEvents TbOpenCmdName As System.Windows.Forms.TextBox
+ Friend WithEvents Label12 As System.Windows.Forms.Label
End Class
diff --git a/VECTO/GUI/F_Options.resx b/VECTO/GUI/F_Options.resx
index ff31a6db56e23b5a334f34387830ba5b4bd33eb8..c7e0d4bdf13aadeae1f2c8b103a0232dd12e22d8 100644
--- a/VECTO/GUI/F_Options.resx
+++ b/VECTO/GUI/F_Options.resx
@@ -112,9 +112,9 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
\ No newline at end of file
diff --git a/VECTO/GUI/F_Options.vb b/VECTO/GUI/F_Options.vb
index abd6677a8c8f16a4fa40c3538a6e2fca7b0538d5..636a61ed53cde32bbaa5d1ee4b1cbc7f8716f4b6 100644
--- a/VECTO/GUI/F_Options.vb
+++ b/VECTO/GUI/F_Options.vb
@@ -21,6 +21,7 @@
Me.TbAirDensity.Text = CStr(Cfg.AirDensity)
Me.TbnnormEngStop.Text = CStr(Cfg.nnormEngStop)
Me.TbOpenCmd.Text = Cfg.OpenCmd
+ Me.TbOpenCmdName.Text = Cfg.OpenCmdName
Me.TbFuelDens.Text = Cfg.FuelDens.ToString
Me.TbCO2toFC.Text = Cfg.CO2perFC.ToString
End Sub
@@ -43,6 +44,7 @@
Cfg.AirDensity = CSng(Me.TbAirDensity.Text)
Cfg.nnormEngStop = CSng(Me.TbnnormEngStop.Text)
Cfg.OpenCmd = Me.TbOpenCmd.Text
+ Cfg.OpenCmdName = Me.TbOpenCmdName.Text
Cfg.FuelDens = CSng(Me.TbFuelDens.Text)
Cfg.CO2perFC = CSng(Me.TbCO2toFC.Text)
'----------------------------------------------------
diff --git a/VECTO/GUI/F_TEM_Creator.vb b/VECTO/GUI/F_TEM_Creator.vb
index 46ccb86cee713111e7153a4b70af5d57169b5638..9a4b27489f64442b64e6fc1dce06900e300926fc 100644
--- a/VECTO/GUI/F_TEM_Creator.vb
+++ b/VECTO/GUI/F_TEM_Creator.vb
@@ -36,7 +36,7 @@
F_ADV.WindowState = FormWindowState.Normal
F_ADV.TEMfromCreator(f)
End If
- If Cfg.TEMexl Then FileOpen(f)
+ If Cfg.TEMexl Then FileOpenAlt(f)
End Sub
'Browse
diff --git a/VECTO/GUI/F_VEH.Designer.vb b/VECTO/GUI/F_VEH.Designer.vb
index 960c6c7ed9ec2709ee06e5fe81bd7ff16f885caf..30da82296570bb0f0fbba13ef8557e3a337ad93f 100644
--- a/VECTO/GUI/F_VEH.Designer.vb
+++ b/VECTO/GUI/F_VEH.Designer.vb
@@ -22,6 +22,7 @@ Partial Class F_VEH
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<System.Diagnostics.DebuggerStepThrough()> _
Private Sub InitializeComponent()
+ Me.components = New System.ComponentModel.Container()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(F_VEH))
Me.Label1 = New System.Windows.Forms.Label()
Me.TbMass = New System.Windows.Forms.TextBox()
@@ -47,6 +48,7 @@ Partial Class F_VEH
Me.TbCdFile = New System.Windows.Forms.TextBox()
Me.BtCdFileBrowse = New System.Windows.Forms.Button()
Me.GroupBox6 = New System.Windows.Forms.GroupBox()
+ Me.BtCdFileOpen = New System.Windows.Forms.Button()
Me.LbCdMode = New System.Windows.Forms.Label()
Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
Me.ToolStripBtNew = New System.Windows.Forms.ToolStripButton()
@@ -93,6 +95,10 @@ Partial Class F_VEH
Me.GroupBox1 = New System.Windows.Forms.GroupBox()
Me.GroupBox4 = New System.Windows.Forms.GroupBox()
Me.PictureBox1 = New System.Windows.Forms.PictureBox()
+ Me.CmOpenFile = New System.Windows.Forms.ContextMenuStrip(Me.components)
+ Me.OpenWithGRAPHiToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.GroupBox6.SuspendLayout()
Me.ToolStrip1.SuspendLayout()
Me.GroupBox7.SuspendLayout()
@@ -102,6 +108,7 @@ Partial Class F_VEH
Me.GroupBox1.SuspendLayout()
Me.GroupBox4.SuspendLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
+ Me.CmOpenFile.SuspendLayout()
Me.SuspendLayout()
'
'Label1
@@ -290,13 +297,13 @@ Partial Class F_VEH
Me.TbCdFile.Enabled = False
Me.TbCdFile.Location = New System.Drawing.Point(6, 46)
Me.TbCdFile.Name = "TbCdFile"
- Me.TbCdFile.Size = New System.Drawing.Size(477, 20)
+ Me.TbCdFile.Size = New System.Drawing.Size(448, 20)
Me.TbCdFile.TabIndex = 1
'
'BtCdFileBrowse
'
Me.BtCdFileBrowse.Enabled = False
- Me.BtCdFileBrowse.Location = New System.Drawing.Point(489, 44)
+ Me.BtCdFileBrowse.Location = New System.Drawing.Point(460, 44)
Me.BtCdFileBrowse.Name = "BtCdFileBrowse"
Me.BtCdFileBrowse.Size = New System.Drawing.Size(32, 23)
Me.BtCdFileBrowse.TabIndex = 2
@@ -305,6 +312,7 @@ Partial Class F_VEH
'
'GroupBox6
'
+ Me.GroupBox6.Controls.Add(Me.BtCdFileOpen)
Me.GroupBox6.Controls.Add(Me.LbCdMode)
Me.GroupBox6.Controls.Add(Me.CbCdMode)
Me.GroupBox6.Controls.Add(Me.BtCdFileBrowse)
@@ -316,6 +324,17 @@ Partial Class F_VEH
Me.GroupBox6.TabStop = False
Me.GroupBox6.Text = "Cross Wind Correction"
'
+ 'BtCdFileOpen
+ '
+ Me.BtCdFileOpen.Enabled = False
+ Me.BtCdFileOpen.Image = Global.VECTO.My.Resources.Resources.application_export_icon_small
+ Me.BtCdFileOpen.Location = New System.Drawing.Point(498, 44)
+ Me.BtCdFileOpen.Name = "BtCdFileOpen"
+ Me.BtCdFileOpen.Size = New System.Drawing.Size(23, 23)
+ Me.BtCdFileOpen.TabIndex = 41
+ Me.BtCdFileOpen.TabStop = False
+ Me.BtCdFileOpen.UseVisualStyleBackColor = True
+ '
'LbCdMode
'
Me.LbCdMode.AutoSize = True
@@ -576,7 +595,7 @@ Partial Class F_VEH
'
'ColumnHeader9
'
- Me.ColumnHeader9.Text = "RRC [N/N]"
+ Me.ColumnHeader9.Text = "RRC [-]"
Me.ColumnHeader9.Width = 79
'
'ButAxlAdd
@@ -763,6 +782,30 @@ Partial Class F_VEH
Me.PictureBox1.TabIndex = 37
Me.PictureBox1.TabStop = False
'
+ 'CmOpenFile
+ '
+ Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithGRAPHiToolStripMenuItem, Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
+ Me.CmOpenFile.Name = "CmOpenFile"
+ Me.CmOpenFile.Size = New System.Drawing.Size(175, 70)
+ '
+ 'OpenWithGRAPHiToolStripMenuItem
+ '
+ Me.OpenWithGRAPHiToolStripMenuItem.Name = "OpenWithGRAPHiToolStripMenuItem"
+ Me.OpenWithGRAPHiToolStripMenuItem.Size = New System.Drawing.Size(174, 22)
+ Me.OpenWithGRAPHiToolStripMenuItem.Text = "Open with GRAPHi"
+ '
+ 'OpenWithToolStripMenuItem
+ '
+ Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem"
+ Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(174, 22)
+ Me.OpenWithToolStripMenuItem.Text = "Open with ..."
+ '
+ 'ShowInFolderToolStripMenuItem
+ '
+ Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem"
+ Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(174, 22)
+ Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
+ '
'F_VEH
'
Me.AcceptButton = Me.ButOK
@@ -809,6 +852,7 @@ Partial Class F_VEH
Me.GroupBox4.ResumeLayout(False)
Me.GroupBox4.PerformLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
+ Me.CmOpenFile.ResumeLayout(False)
Me.ResumeLayout(False)
Me.PerformLayout()
@@ -883,4 +927,9 @@ Partial Class F_VEH
Friend WithEvents PictureBox1 As System.Windows.Forms.PictureBox
Friend WithEvents ToolStripSeparator1 As System.Windows.Forms.ToolStripSeparator
Friend WithEvents ToolStripButton1 As System.Windows.Forms.ToolStripButton
+ Friend WithEvents CmOpenFile As System.Windows.Forms.ContextMenuStrip
+ Friend WithEvents OpenWithGRAPHiToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+ Friend WithEvents OpenWithToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+ Friend WithEvents ShowInFolderToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+ Friend WithEvents BtCdFileOpen As System.Windows.Forms.Button
End Class
diff --git a/VECTO/GUI/F_VEH.resx b/VECTO/GUI/F_VEH.resx
index a086c6e10188e1f4461dd0ab780a14eb3d504296..1b58f554c352750abcff337bb3bef2fbc13bb413 100644
--- a/VECTO/GUI/F_VEH.resx
+++ b/VECTO/GUI/F_VEH.resx
@@ -123,6 +123,9 @@
<metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>142, 21</value>
</metadata>
+ <metadata name="CmOpenFile.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>258, 21</value>
+ </metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
diff --git a/VECTO/GUI/F_VEH.vb b/VECTO/GUI/F_VEH.vb
index 193fe76df3baf8bfa18e2e442e5fb57a5307632b..82c5fd247b212bfc6f8a4e92a03cf01d77de6cd0 100644
--- a/VECTO/GUI/F_VEH.vb
+++ b/VECTO/GUI/F_VEH.vb
@@ -340,6 +340,7 @@ Public Class F_VEH
Me.TbCdFile.Enabled = bEnabled
Me.BtCdFileBrowse.Enabled = bEnabled
+ Me.BtCdFileOpen.Enabled = bEnabled
Change()
End Sub
@@ -359,6 +360,10 @@ Public Class F_VEH
End Sub
+ Private Sub BtCdFileOpen_Click(sender As System.Object, e As System.EventArgs) Handles BtCdFileOpen.Click
+ OpenFiles(fFileRepl(Me.TbCdFile.Text, fPATH(VehFile)))
+ End Sub
+
#End Region
@@ -670,6 +675,39 @@ Public Class F_VEH
#End Region
+#Region "Open File Context Menu"
+
+ Private CmFiles As String()
+
+ Private Sub OpenFiles(ParamArray files() As String)
+
+ If files.Length = 0 Then Exit Sub
+ CmFiles = files
+
+ OpenWithToolStripMenuItem.Text = "Open with " & Cfg.OpenCmdName
+
+ CmOpenFile.Show(Cursor.Position)
+
+ End Sub
+
+ Private Sub OpenWithGRAPHiToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles OpenWithGRAPHiToolStripMenuItem.Click
+ If Not FileOpenGRAPHi(CmFiles) Then MsgBox("Failed to open file!")
+ End Sub
+
+ Private Sub OpenWithToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles OpenWithToolStripMenuItem.Click
+ If Not FileOpenAlt(CmFiles(0)) Then MsgBox("Failed to open file!")
+ End Sub
+
+ Private Sub ShowInFolderToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles ShowInFolderToolStripMenuItem.Click
+ Try
+ System.Diagnostics.Process.Start("explorer", "/select,""" & CmFiles(0) & "")
+ Catch ex As Exception
+ MsgBox("Failed to open link!", MsgBoxStyle.Critical)
+ End Try
+ End Sub
+
+#End Region
+
End Class
diff --git a/VECTO/GUI/F_VEH_AuxDlog.Designer.vb b/VECTO/GUI/F_VEH_AuxDlog.Designer.vb
index 6d1307df15c32ae678eaceabcaef4c6ab9334fd1..f680095e0f5519cfa9ab4cc77a4cd15ae0ef96ed 100644
--- a/VECTO/GUI/F_VEH_AuxDlog.Designer.vb
+++ b/VECTO/GUI/F_VEH_AuxDlog.Designer.vb
@@ -134,9 +134,8 @@ Partial Class F_VEH_AuxDlog
Me.LbIDhelp.AutoSize = True
Me.LbIDhelp.Location = New System.Drawing.Point(242, 15)
Me.LbIDhelp.Name = "LbIDhelp"
- Me.LbIDhelp.Size = New System.Drawing.Size(50, 13)
+ Me.LbIDhelp.Size = New System.Drawing.Size(0, 13)
Me.LbIDhelp.TabIndex = 26
- Me.LbIDhelp.Text = "LbIDhelp"
'
'F_VEH_AuxDlog
'
diff --git a/VECTO/GUI/F_VEH_AuxDlog.resx b/VECTO/GUI/F_VEH_AuxDlog.resx
index 5ea0895e324fa7a86681adc56938bad2f2367ba0..29dcb1b3a353ba227f65e11fbe3d6f0766e84292 100644
--- a/VECTO/GUI/F_VEH_AuxDlog.resx
+++ b/VECTO/GUI/F_VEH_AuxDlog.resx
@@ -112,9 +112,9 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
\ No newline at end of file
diff --git a/VECTO/GUI/GUI_Subs.vb b/VECTO/GUI/GUI_Subs.vb
index c9c8ffddc31a701ce0c29763dd16ec4754f27553..6cf5a41e88ba739d89c195439f58f50a857b40f1 100644
--- a/VECTO/GUI/GUI_Subs.vb
+++ b/VECTO/GUI/GUI_Subs.vb
@@ -199,10 +199,10 @@
End If
End Function
- 'Open File in Excel
- Public Function FileOpen(ByVal file As String) As Boolean
+ 'Open File
+ Public Function FileOpenAlt(ByVal file As String) As Boolean
Dim PSI As New ProcessStartInfo
- PSI.FileName = ChrW(34) & Cfg.OpenCmd & ChrW(34)
+ PSI.FileName = Cfg.OpenCmd
PSI.Arguments = ChrW(34) & file & ChrW(34)
Try
Process.Start(PSI)
@@ -212,6 +212,28 @@
End Try
End Function
+ 'Open File with GRAPHi
+ Public Function FileOpenGRAPHi(ParamArray files() As String) As Boolean
+ Dim PSI As New ProcessStartInfo
+ Dim fileStr As String = ""
+ Dim str As String
+
+ For Each str In files
+ If Not IO.File.Exists(str) Then Return False
+ fileStr &= " " & ChrW(34) & str & ChrW(34)
+ Next
+
+ PSI.FileName = ChrW(34) & MyAppPath & "GRAPHi\GRAPHi.exe" & ChrW(34)
+ PSI.Arguments = fileStr & " -load -preconf"
+ Try
+ Process.Start(PSI)
+ Return True
+ Catch ex As Exception
+ Return False
+ End Try
+
+ End Function
+
#Region "Dateipfad Funktionen"
'When no path is specified, then insert either WorkDir or MainDir Special-folders
diff --git a/VECTO/Input Files/cGBX.vb b/VECTO/Input Files/cGBX.vb
index 411e814b3f22ad342da042ee14d3bb5e67d2a8bd..a7f9473e6c4349273ecdb19c7577a3d82fd42e23 100644
--- a/VECTO/Input Files/cGBX.vb
+++ b/VECTO/Input Files/cGBX.vb
@@ -27,17 +27,26 @@ Public Class cGBX
Public gs_StartSpeed As Single
Public gs_StartAcc As Single
Public gs_ShiftInside As Boolean
- 'Public gs_Type As tGearbox 'not used yet
+
+ Public gs_Type As tGearbox
'Torque Converter Input
- Public TCnu As New List(Of Single)
- Public TCmu As New List(Of Single)
- Public TCtorque As New List(Of Single)
- Public TCdim As Integer
+ Public TCon As Boolean
+ Public TCrefrpm As Single
+ Private TC_file As New cSubPath
+
+
+ Private TCnu As New List(Of Single)
+ Private TCmu As New List(Of Single)
+ Private TCtorque As New List(Of Single)
+ Private TCdim As Integer
+
'Torque Converter Iteration Results
Public TCMin As Single
Public TCnUin As Single
+ Public TC_Tbrake As Single
+
Public Sub New()
@@ -53,6 +62,7 @@ Public Class cGBX
Private Sub SetDefault()
Dim i As Integer
+
ModelName = ""
I_Getriebe = 0
TracIntrSi = 0
@@ -74,7 +84,12 @@ Public Class cGBX
gs_StartAcc = 0
gs_ShiftInside = False
- 'gs_Type = tGearbox.Manual
+ gs_Type = tGearbox.Manual
+
+ TCon = False
+ TCrefrpm = 0
+ TC_file.Clear()
+
End Sub
Public Function SaveFile() As Boolean
@@ -121,8 +136,16 @@ Public Class cGBX
file.WriteLine(CStr(gs_StartAcc))
file.WriteLine("c Shift inside polygons")
file.WriteLine(CStr(Math.Abs(CInt(gs_ShiftInside))))
- 'file.WriteLine("c Gearbox Type")
- 'file.WriteLine(CStr(CType(gs_Type, Integer)))
+
+ file.WriteLine("c Gearbox Type")
+ file.WriteLine(CStr(CType(gs_Type, Integer)))
+
+ file.WriteLine("c TC On/Off")
+ file.WriteLine(CStr(Math.Abs(CInt(TCon))))
+ file.WriteLine("c TC characteristics file")
+ file.WriteLine(TC_file.PathOrDummy)
+ file.WriteLine("c TC reference rpm")
+ file.WriteLine(CStr(TCrefrpm))
file.Close()
@@ -179,7 +202,15 @@ Public Class cGBX
gs_StartSpeed = CSng(file.ReadLine(0))
gs_StartAcc = CSng(file.ReadLine(0))
gs_ShiftInside = CBool(CInt(file.ReadLine(0)))
- 'gs_Type = CType(CInt(file.ReadLine(0)), tGearbox)
+ End If
+
+ If Not file.EndOfFile Then
+ gs_Type = CType(CInt(file.ReadLine(0)), tGearbox)
+ TCon = CBool(CInt(file.ReadLine(0)))
+ TC_file.Init(MyPath, file.ReadLine(0))
+ TCrefrpm = CSng(file.ReadLine(0))
+ Else
+ gs_Type = tGearbox.Custom
End If
Catch ex As Exception
@@ -202,8 +233,13 @@ Public Class cGBX
MsgSrc = "GBX/TCinit"
- If Not file.OpenRead(DEV.TCfile) Then
- WorkerMsg(tMsgID.Err, "Torque Converter file not found! (" & DEV.TCfile & ")", MsgSrc)
+ If Not file.OpenRead(TC_file.FullPath) Then
+ WorkerMsg(tMsgID.Err, "Torque Converter file not found! (" & TC_file.FullPath & ")", MsgSrc)
+ Return False
+ End If
+
+ If TCrefrpm <= 0 Then
+ WorkerMsg(tMsgID.Err, "Torque converter reference torque invalid! (" & TCrefrpm & ")", MsgSrc)
Return False
End If
@@ -249,31 +285,23 @@ Public Class cGBX
Dim MoutCalc As Single
- Dim nUmin As Single
- Dim nUmax As Single
+ TC_Tbrake = 0
- Dim Schub As Boolean
-
- 'Torque sign
- If PeOut > 0 Then
- Schub = False
- Else
- Schub = True
- PeOut *= -1
- End If
+ 'Dim nUmin As Single
+ 'Dim nUmax As Single
'Power to torque
Mout = nPeToM(nUout, PeOut)
'rpm-limits
- nUmin = nnormTonU(GBX.fGSnnDown(Mout))
- nUmax = nnormTonU(GBX.fGSnnUp(Mout))
+ 'nUmin = nnormTonU(GBX.fGSnnDown(Mout))
+ 'nUmax = nnormTonU(GBX.fGSnnUp(Mout))
'Start values: Estimate torque converter state
nUin = nUout
- If nUin > nUmax Then nUin = nUmax
- If nUin < nUmin Then nUin = nUmin
+ 'If nUin > nUmax Then nUin = nUmax
+ 'If nUin < nUmin Then nUin = nUmin
nUstep = DEV.TCnUstep
VZ = 1
@@ -284,18 +312,36 @@ Public Class cGBX
MoutCalc = fTCtorque(nu, nUin) * mu
'Iteration
- Do While Math.Abs(MoutCalc - Mout) > DEV.TCiterPrec And nUstep > DEV.TCnUstepMin
+ Do While Math.Abs(1 - MoutCalc / Mout) > DEV.TCiterPrec And nUstep > DEV.TCnUstepMin
nUin += VZ * nUstep
nu = nUout / nUin
mu = fTCmu(nu)
MoutCalc = fTCtorque(nu, nUin) * mu
- If Math.Abs(MoutCalc - Mout) > lastErr Then
+ If Math.Abs(1 - MoutCalc / Mout) > lastErr Then
nUstep /= 2
VZ *= -1
End If
- lastErr = Math.Abs(MoutCalc - Mout)
+ lastErr = Math.Abs(1 - MoutCalc / Mout)
Loop
+ If nUin < VEH.nLeerl Then
+
+ MODdata.ModErrors.TCextrapol = ""
+
+ nUin = VEH.nLeerl
+ nu = nUout / nUin
+ mu = fTCmu(nu)
+ MoutCalc = fTCtorque(nu, nUin) * mu
+
+ If MoutCalc < Mout Then Stop
+
+ TC_Tbrake = Mout - MoutCalc
+
+ End If
+
+
+
+
TCMin = MoutCalc / mu
TCnUin = nUin
@@ -354,7 +400,7 @@ lbInt:
'Interpolation
M0 = (nu - TCnu(i - 1)) * (TCtorque(i) - TCtorque(i - 1)) / (TCnu(i) - TCnu(i - 1)) + TCtorque(i - 1)
- Return M0 * (nUin / DEV.TCnUref) ^ 2
+ Return M0 * (nUin / TCrefrpm) ^ 2
End Function
@@ -364,11 +410,54 @@ lbInt:
Dim file As cFile_V3
Dim line As String()
Dim i As Integer
+ Dim gserror As Boolean
Dim MsgSrc As String
MsgSrc = "GBX/GSinit"
+ 'Check if settings ok
+ If gs_Type <> tGearbox.Custom Then
+
+ gserror = False
+
+ Select Case gs_Type
+ Case tGearbox.Manual
+ If gs_ShiftInside Then
+ WorkerMsg(tMsgID.Err, "Option 'Shift-Up inside polygons' is not available for Manual Transmissions!", MsgSrc)
+ gserror = True
+ End If
+ If TCon Then
+ WorkerMsg(tMsgID.Err, "Torque Converter is not available for Manual Transmissions!", MsgSrc)
+ gserror = True
+ End If
+
+ Case tGearbox.SemiAutomatic
+ If TCon Then
+ WorkerMsg(tMsgID.Err, "Torque Converter is not available for Automated Manual Transmissions!", MsgSrc)
+ gserror = True
+ End If
+
+ Case tGearbox.Automatic
+ If gs_ShiftInside Then
+ WorkerMsg(tMsgID.Err, "Option 'Shift-Up inside polygons' is not available for Automatic Transmissions!", MsgSrc)
+ gserror = True
+ End If
+ If gs_SkipGears Then
+ WorkerMsg(tMsgID.Err, "Option 'Skip gears' is not available for Automatic Transmissions!", MsgSrc)
+ gserror = True
+ End If
+ If Not TCon Then
+ WorkerMsg(tMsgID.Err, "Torque Converter must be activated for Automatic Transmissions!", MsgSrc)
+ gserror = True
+ End If
+
+ End Select
+
+ If gserror Then Return False
+
+ End If
+
'Check if file exists
If Not IO.File.Exists(gs_file.FullPath) Then
WorkerMsg(tMsgID.Err, "Gear Shift Polygon File not found! '" & gs_file.FullPath & "'", MsgSrc)
@@ -409,7 +498,7 @@ lbInt:
WorkerMsg(tMsgID.Err, "More points in Gear Shift Polygon File needed!", MsgSrc)
Return False
End If
-
+
'Normalize rpm
For i = 0 To gs_Dim
gs_nnDown(i) = (gs_nnDown(i) - VEH.nLeerl) / (VEH.nNenn - VEH.nLeerl)
@@ -508,5 +597,18 @@ lbInt:
End Set
End Property
+ Public Property TCfile(Optional ByVal Original As Boolean = False) As String
+ Get
+ If Original Then
+ Return TC_file.OriginalPath
+ Else
+ Return TC_file.FullPath
+ End If
+ End Get
+ Set(value As String)
+ TC_file.Init(MyPath, value)
+ End Set
+ End Property
+
End Class
diff --git a/VECTO/Input Files/cMAP.vb b/VECTO/Input Files/cMAP.vb
index 7ac3acc7e22d5820f19728a2a5db01b1f21bbcfe..88f64af355fd0c3e57fe3ac79949c5b1a91581a1 100644
--- a/VECTO/Input Files/cMAP.vb
+++ b/VECTO/Input Files/cMAP.vb
@@ -951,7 +951,7 @@ lbEr:
Return FuelMap.Intpol(nnorm, Pnorm)
Catch ex As Exception
WorkerMsg(tMsgID.Err, "Cannot extrapolate FC map! n= " & nnormTonU(nnorm).ToString("0") & " [U/min], Me= " & PnormToM(nnorm, Pnorm).ToString("0.0") & " [Nm]", "MAP/FC_Intp")
- Return -100
+ Return -1000
End Try
End Function
diff --git a/VECTO/MODcalc/Em Calc.vb b/VECTO/MODcalc/Em Calc.vb
index cb0d8841ccf52e4ef21c0ee3d3ea8fcebe0d2f24..a2403cfb0ea9e900643c031a49987a2137594a6b 100644
--- a/VECTO/MODcalc/Em Calc.vb
+++ b/VECTO/MODcalc/Em Calc.vb
@@ -16,11 +16,14 @@ Public Class cEm
EmDefComp = Nothing
End Sub
- Public Sub Raw_Calc()
-
+ Public Function Raw_Calc() As Boolean
+ Dim v As Single
Dim i As Integer
Dim KV As KeyValuePair(Of String, cEmComp)
Dim Em0 As cEmComp
+ Dim Result As Boolean
+
+ Result = True
For Each KV In MAP.EmComponents
Em0 = New cEmComp
@@ -49,7 +52,11 @@ Public Class cEm
If KV.Value.MapCompID = tMapComp.FC Then
'Delaunay
- EmComp(KV.Key).RawVals.Add(MAP.fFCdelaunay_Intp(MODdata.nn(i), MODdata.Pe(i)))
+ v = MAP.fFCdelaunay_Intp(MODdata.nn(i), MODdata.Pe(i))
+ If Result Then
+ If v < -999 Then Result = False
+ End If
+ EmComp(KV.Key).RawVals.Add(v)
Else
'Normal interpolation
EmComp(KV.Key).RawVals.Add(MAP.fShep_Intp(KV.Value))
@@ -68,7 +75,9 @@ Public Class cEm
KV = Nothing
- End Sub
+ Return Result
+
+ End Function
Public Sub TC_Calc()
Dim dynkor As Double
diff --git a/VECTO/MODcalc/cPower.vb b/VECTO/MODcalc/cPower.vb
index 99f9ddbc38af3b07c64da1e1183b660799f38bc9..8882832fec06f95b99a9f7db896fec715d59d3d9 100644
--- a/VECTO/MODcalc/cPower.vb
+++ b/VECTO/MODcalc/cPower.vb
@@ -436,6 +436,10 @@ lb10:
Dim StdMode As Boolean
Dim NotAdvMode As Boolean
+
+ Dim LastPmax As Single
+
+
Dim MsgSrc As String
MsgSrc = "Power/Calc"
@@ -540,7 +544,7 @@ lb10:
jz = -1
'***********************************************************************************************
- '*********************************** Time-loop ****************************************
+ '*********************************** Time-loop ****************************************
'***********************************************************************************************
Do
@@ -648,10 +652,15 @@ lbGschw:
End Select
'Faster check if Power is too high
- If PvorD > 2 * VEH.Pnenn Then
- Vh.ReduceSpeed(jz, 0.98)
- GoTo lbGschw
- End If
+ 'If PvorD > 1.2 * VEH.Pnenn Then
+ ' Vh.ReduceSpeed(jz, 0.9)
+ ' GoTo lbGschw
+ 'End If
+
+ 'If jz > 0 AndAlso PvorD > 1.2 * LastPmax Then
+ ' Vh.ReduceSpeed(jz, 0.95)
+ ' GoTo lbGschw
+ 'End If
'************************************ Gear selection ************************************
@@ -666,7 +675,7 @@ lbGschw:
' Gear = fGearLKW(jz)
'End If
- If Not DEV.ATmode AndAlso fnn(Vist, Gear, False) < Kuppln_norm And Pplus Then
+ If Not GBX.TCon AndAlso fnn(Vist, Gear, False) < Kuppln_norm And Pplus Then
Clutch = tEngClutch.Slipping
Else
Clutch = tEngClutch.Closed
@@ -680,7 +689,7 @@ lbGschw:
Else
'Check whether Clutch will slip (important for Gear-shifting model):
- If Not DEV.ATmode AndAlso fnn(Vist, 1, False) < Kuppln_norm And Pplus Then
+ If Not GBX.TCon AndAlso fnn(Vist, 1, False) < Kuppln_norm And Pplus Then
Clutch = tEngClutch.Slipping
Else
Clutch = tEngClutch.Closed
@@ -721,7 +730,7 @@ lbGschw:
Else
- If Not DEV.ATmode AndAlso fnn(Vist, Gear, False) < Kuppln_norm And Pplus And Not VehState0 = tVehState.Dec Then
+ If Not GBX.TCon AndAlso fnn(Vist, Gear, False) < Kuppln_norm And Pplus And Not VehState0 = tVehState.Dec Then
Clutch = tEngClutch.Slipping
Else
Clutch = tEngClutch.Closed
@@ -750,7 +759,7 @@ lbCheck:
''bICEKupOffen = bKupplOffen <= i need nothing more
'Falls vor Gangwahl festgestellt wurde, dass nicht KupplSchleif, dann bei zu niedriger Drehzahl runterschalten: |@@| If before?(vor) Gear-shift is detected that Clutch does not Lock, then Downshift at too low Revolutions:
- If Not DEV.ATmode Then
+ If Not GBX.TCon Then
If Clutch = tEngClutch.Closed Then
If fnn(Vist, Gear, False) < Kuppln_norm And Not VehState0 = tVehState.Dec And Gear > 1 Then Gear -= 1
End If
@@ -769,7 +778,7 @@ lbCheck:
End If
- If Not DEV.ATmode AndAlso fnn(Vist, Gear, False) < Kuppln_norm Then
+ If Not GBX.TCon AndAlso fnn(Vist, Gear, False) < Kuppln_norm Then
Clutch = tEngClutch.Slipping
Else
Clutch = tEngClutch.Closed
@@ -857,7 +866,7 @@ lbCheck:
Else
- If DEV.ATmode And Gear = 1 Then
+ If GBX.TCon And Gear = 1 Then
PlossGB = fPlossGB(PvorD, Vist, Gear)
PlossDiff = fPlossDiff(PvorD, Vist)
@@ -940,7 +949,7 @@ lb_nOK:
PaGetr = 0
Case tEngClutch.Closed
- If DEV.ATmode And Gear = 1 Then
+ If GBX.TCon And Gear = 1 Then
P = nMtoPe(nU, GBX.TCMin) + Paux + PaMot
@@ -1084,12 +1093,12 @@ lb_nOK:
If EngState0 = tEngState.Load Or EngState0 = tEngState.FullLoad Then
If Vist > 0.01 Then
Select Case P / Pmax
- Case Is > 1.6
- Vh.ReduceSpeed(jz, 0.99)
- Case Is > 1.3
- Vh.ReduceSpeed(jz, 0.995)
+ Case Is > 1.6 '1.6
+ Vh.ReduceSpeed(jz, 0.99) '0.99
+ Case Is > 1.3 '1.3
+ Vh.ReduceSpeed(jz, 0.999) '0.995
Case Else
- Vh.ReduceSpeed(jz, 0.999)
+ Vh.ReduceSpeed(jz, 0.9999) '0.999
End Select
FirstSecItar = False
GoTo lbGschw
@@ -1242,6 +1251,7 @@ lb_nOK:
End If
End If
+ LastPmax = Pmax
Loop Until jz >= MODdata.tDim
diff --git a/VECTO/M_MAIN.vb b/VECTO/M_MAIN.vb
index 00fb91a0579b5df9c03374a8c85e5666dfc31334..49446e08de8f966211f7da6986463bf38c1689c9 100644
--- a/VECTO/M_MAIN.vb
+++ b/VECTO/M_MAIN.vb
@@ -20,13 +20,14 @@ Module M_MAIN
Friend Function NrOfRunStr() As String
If PHEMmode = tPHEMmode.ModeSTANDARD Then
- Return CStr(jgen * (CyclesDim + 1) + jzkl + 1) & "-" & CStr(jsubcycle)
+ 'Return CStr(jgen * (CyclesDim + 1) + jzkl + 1) & "-" & CStr(jsubcycle)
+ Return CStr(jgen * (CyclesDim + 1) + jzkl + 1) & "(" & CStr(jsubcycle) & ")"
Else
Return CStr(jgen * (CyclesDim + 1) + jzkl + 1)
End If
End Function
- Public Function PHEM() As tCalcResult
+ Public Function VECTO() As tCalcResult
'Main program for all modes
@@ -45,7 +46,7 @@ Module M_MAIN
MsgStrBuilder = New System.Text.StringBuilder
'If there are any "unplanned" Aborts
- PHEM = tCalcResult.Err
+ VECTO = tCalcResult.Err
'Reset the fault
''ClearErrors()
@@ -332,7 +333,7 @@ lbADV:
If DRI.Vvorg AndAlso DRI.tDim > 1 AndAlso DRI.Values(tDriComp.V)(0) < 0.0001 AndAlso DRI.Values(tDriComp.V)(1) >= 0.0001 Then
DRI.FirstZero()
End If
-
+
'Convert to 1Hz (optional) - does not apply to v(s) cycles because timestep is missing
If DRI.Tvorg Then
If MsgOut Then WorkerMsg(tMsgID.Normal, "Converting cycle to 1Hz", MsgSrc)
@@ -379,9 +380,9 @@ lbADV:
GoTo lbNextJob
End If
- If DEV.ATmode Then
+ If GBX.TCon Then
If Not GBX.TCinit Then
- 'Error-notification within GSinit()
+ 'Error-notification within TCinit()
JobAbortedByErr = True
GoTo lbNextJob
End If
@@ -437,12 +438,12 @@ lbADV:
GoTo lbAusg
End If
- End If
+ End If
- If PHEMworker.CancellationPending Then GoTo lbAbort
+ If PHEMworker.CancellationPending Then GoTo lbAbort
- 'Calculate CycleKin (for erg/sum, etc.)
- MODdata.CylceKin.Calc()
+ 'Calculate CycleKin (for erg/sum, etc.)
+ MODdata.CylceKin.Calc()
End If
'----------------------------------------------------------------------------
@@ -452,10 +453,10 @@ lbADV:
'Emissionen und Nachbehandlung - wird bei EV-Modus nicht ausgeführt |@@| Emissions and After-treatment - it will not run in EV mode
If Not GEN.VehMode = tVehMode.EV Then
- If MsgOut Then WorkerMsg(tMsgID.Normal, "Calculating Transient Correction Factors", MsgSrc)
+ 'If MsgOut Then WorkerMsg(tMsgID.Normal, "Calculating Transient Correction Factors", MsgSrc)
- 'Determine TC parameters per second
- MODdata.TC.Calc()
+ ''Determine TC parameters per second
+ 'MODdata.TC.Calc()
'Map creation
If GEN.CreateMap Then
@@ -474,7 +475,11 @@ lbADV:
If MsgOut Then WorkerMsg(tMsgID.Normal, "Em Calc: Raw", MsgSrc)
'Calculate Raw emissions
- MODdata.Em.Raw_Calc()
+ If Not MODdata.Em.Raw_Calc() Then
+ CyclAbrtedByErr = True
+ WorkerMsg(tMsgID.Normal, "Calculation aborted!", MsgSrc)
+ GoTo lbAusg
+ End If
'TC Parameter umrechnen in Differenz zu Kennfeld-TC-Parameter |@@| Convert TC parameters to differences with Map-TC-parameters
If MAP.TransMap Then MODdata.TC.CalcDiff()
@@ -591,7 +596,7 @@ lbAusg:
'************************* END *** VECTO Cycle-loop *** END *************************
'******************************************************************************************
-
+
Next
'**********************************************************************************************
@@ -652,13 +657,13 @@ lbNextJob:
WorkerMsg(tMsgID.Normal, "Summary Results written to: " & fFILE(ERG.ErgFile, True), MsgSrc, ERG.ErgFile)
WorkerMsg(tMsgID.Normal, "done", MsgSrc)
- PHEM = tCalcResult.Done
+ VECTO = tCalcResult.Done
GoTo lbExit
lbErrBefore: '!!!!!!!!!! Abbruch bevor (!!!) der erste Job angefangen wurde !!!!!!!!!!!
WorkerMsg(tMsgID.Normal, "aborted", MsgSrc)
- PHEM = tCalcResult.Err
+ VECTO = tCalcResult.Err
For i = 0 To FilesDim
WorkerJobStatus(i, "", tJobStatus.Undef)
@@ -670,7 +675,7 @@ lbErrBefore: '!!!!!!!!!! Abbruch bevor (!!!) der erste Job angefangen wurde !!!
lbErrInJobLoop:
WorkerMsg(tMsgID.Normal, "aborted", MsgSrc)
WorkerJobStatus(jgen, "aborted", tJobStatus.Err)
- PHEM = tCalcResult.Err
+ VECTO = tCalcResult.Err
For i = jgen + 1 To FilesDim
WorkerJobStatus(i, "", tJobStatus.Undef)
@@ -683,7 +688,7 @@ lbErrInJobLoop:
lbAbort:
WorkerMsg(tMsgID.Normal, "aborted", MsgSrc)
WorkerJobStatus(jgen, "aborted", tJobStatus.Warn)
- PHEM = tCalcResult.Abort
+ VECTO = tCalcResult.Abort
For i = jgen + 1 To FilesDim
WorkerJobStatus(i, "", tJobStatus.Undef)
diff --git a/VECTO/My Project/Resources.Designer.vb b/VECTO/My Project/Resources.Designer.vb
index 6a7713a1d4576b1b3b1be2fc6e0f062abd1934e8..a585fa252187773ed9312f8cd0521543ad24e0f9 100644
--- a/VECTO/My Project/Resources.Designer.vb
+++ b/VECTO/My Project/Resources.Designer.vb
@@ -1,7 +1,7 @@
'------------------------------------------------------------------------------
' <auto-generated>
' Dieser Code wurde von einem Tool generiert.
-' Laufzeitversion:4.0.30319.269
+' Laufzeitversion:4.0.30319.296
'
' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
' der Code erneut generiert wird.
@@ -88,6 +88,13 @@ Namespace My.Resources
End Get
End Property
+ Friend ReadOnly Property application_export_icon_small() As System.Drawing.Bitmap
+ Get
+ Dim obj As Object = ResourceManager.GetObject("application_export_icon_small", resourceCulture)
+ Return CType(obj,System.Drawing.Bitmap)
+ End Get
+ End Property
+
Friend ReadOnly Property blue_document_icon() As System.Drawing.Bitmap
Get
Dim obj As Object = ResourceManager.GetObject("blue_document_icon", resourceCulture)
diff --git a/VECTO/My Project/Resources.resx b/VECTO/My Project/Resources.resx
index a3975f58aead883232af74a7ebaf868d4e170db9..56397deebb3dab6fa760d5b12c8e08948c225989 100644
--- a/VECTO/My Project/Resources.resx
+++ b/VECTO/My Project/Resources.resx
@@ -112,91 +112,94 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="TUG_91x34" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\TUG_91x34.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="Open_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\Open-icon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="IVT_91x44" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\IVT_91x44.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="minus_circle_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\minus-circle-icon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="Actions_arrow_down_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\Actions-arrow-down-icon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="Information_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\Information-icon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="Actions_arrow_up_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\Actions-arrow-up-icon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="Play_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\Play-icon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Actions_document_save_as_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Actions-document-save-as-icon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="Actions_document_save_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\Actions-document-save-icon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="blue_document_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\blue-document-icon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="export_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\export-icon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="Actions_arrow_down_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\Actions-arrow-down-icon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="Information_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\Information-icon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="IVT_91x44" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\IVT_91x44.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="minus_circle_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\minus-circle-icon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="JRC_About" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\JRC-About.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Misc_Tools_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Misc-Tools-icon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="Open_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\Open-icon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="VECTO_VEH" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\VECTO-VEH.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="Play_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\Play-icon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="IVT_About" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\IVT_About.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="Play_icon_gray" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\Play-icon-gray.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="Help_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\Help-icon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="plus_circle_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\plus-circle-icon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="VECTO_Mainform" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\VECTO-Mainform.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="VECTO_About" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\VECTO-About.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Stop_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Stop-icon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="IVT_About" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\IVT_About.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="Actions_document_save_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\Actions-document-save-icon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="JRC_About" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\JRC-About.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="Play_icon_gray" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\Play-icon-gray.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="TUG_About" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\TUG-About.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="VECTO_About" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\VECTO-About.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="VECTO_VECTO" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\VECTO-VECTO.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="VECTO_ENG" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\VECTO-ENG.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="TUG_91x34" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\TUG_91x34.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="Actions_arrow_up_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\Actions-arrow-up-icon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="VECTO_GBX" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\VECTO-GBX.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="VECTO_Mainform" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\VECTO-Mainform.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="VECTO_VECTO" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\VECTO-VECTO.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="blue_document_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\blue-document-icon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="VECTO_VEH" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\VECTO-VEH.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="plus_circle_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\plus-circle-icon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Icon2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Icon2.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="Help_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\Help-icon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="export_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\export-icon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="application_export_icon_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\application-export-icon-small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
\ No newline at end of file
diff --git a/VECTO/Resources/application-export-icon-small.png b/VECTO/Resources/application-export-icon-small.png
new file mode 100644
index 0000000000000000000000000000000000000000..308a361b10574649a2b733de3d933a243c4f4f4d
Binary files /dev/null and b/VECTO/Resources/application-export-icon-small.png differ
diff --git a/VECTO/VECTO.vbproj b/VECTO/VECTO.vbproj
index 4ff936ee58e4ff0ff350b81772091535dd99a2dc..4442d20e77e940f52b2cea8d0830f1bc25704c07 100644
--- a/VECTO/VECTO.vbproj
+++ b/VECTO/VECTO.vbproj
@@ -379,7 +379,27 @@
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
- <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>
<Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/VECTO/VECTO_Global.vb b/VECTO/VECTO_Global.vb
index 372f311db0f53f2700aa1e5209b29361ce470ba9..7bb63d6bf631799269a35fe399ee592c54afa5e4 100644
--- a/VECTO/VECTO_Global.vb
+++ b/VECTO/VECTO_Global.vb
@@ -2,7 +2,7 @@
Module VECTO_Global
- Public Const VECTOvers As String = "1.1 beta 2"
+ Public Const VECTOvers As String = "1.1 beta 3"
Public MyAppPath As String
Public MyConfPath As String
Public MyDeclPath As String
diff --git a/VECTO/VECTO_Types.vb b/VECTO/VECTO_Types.vb
index f3b3287df95255c0b4ff8e255da8834a75498ee4..84acf3a6c33148b4094bd6ab9466b89959fcd6eb 100644
--- a/VECTO/VECTO_Types.vb
+++ b/VECTO/VECTO_Types.vb
@@ -177,6 +177,7 @@ Public Enum tGearbox
Manual = 0
SemiAutomatic = 1
Automatic = 2
+ Custom = 3
End Enum
diff --git a/VECTO/cConfig.vb b/VECTO/cConfig.vb
index 2543c760d626d3bf79ee330cb4486228d973cd68..ec642e84d5c8f742a829f5195814798c7b105eac 100644
--- a/VECTO/cConfig.vb
+++ b/VECTO/cConfig.vb
@@ -23,6 +23,7 @@
Public FCcorrection As Boolean
Public nnormEngStop As Single
Public OpenCmd As String
+ Public OpenCmdName As String
Public FuelDens As Single
Public CO2perFC As Single
@@ -35,7 +36,7 @@
Public Function ConfigLOAD() As Boolean
Dim c As New cFile_V3
- 'Dim txt As String
+ Dim line As String()
SetDefault()
@@ -44,7 +45,7 @@
Return False
End If
- c.OpenRead(MyConfPath & "settings.txt", "+hugo+")
+ c.OpenRead(MyConfPath & "settings.txt", ";")
'***
'*** First line: Version
@@ -109,7 +110,9 @@
FCcorrection = CBool(c.ReadLine(0))
- OpenCmd = c.ReadLine(0)
+ line = c.ReadLine
+ OpenCmd = line(0)
+ If UBound(line) > 0 Then OpenCmdName = line(1)
FuelDens = CSng(c.ReadLine(0))
@@ -246,7 +249,9 @@ lbDone:
FinalEmOnly = True
FCcorrection = False
nnormEngStop = -0.05
- OpenCmd = "excel"
+ OpenCmd = "notepad++"
+ OpenCmdName = "Notepad++"
+
FuelDens = 0.835
CO2perFC = 3.153
@@ -259,7 +264,7 @@ lbDone:
Public Sub ConfigSAVE()
Dim c As New cFile_V3
- c.OpenWrite(MyConfPath & "settings.txt")
+ c.OpenWrite(MyConfPath & "settings.txt", ";")
'Version
'c.WriteLine("V" & FormatVersion)
@@ -306,7 +311,7 @@ lbDone:
c.WriteLine("c HDV FC Correction 1/0")
c.WriteLine(Math.Abs(CInt(FCcorrection)))
c.WriteLine("c File Open CMD")
- c.WriteLine(OpenCmd)
+ c.WriteLine(OpenCmd, OpenCmdName)
c.WriteLine("c Fuel Density [kg/l]")
c.WriteLine(FuelDens.ToString)
diff --git a/VECTO/cDEV.vb b/VECTO/cDEV.vb
index b1e7a96f78954305df8747925f02fc5f634fc4e1..cdffccf3e4f156c89a7465dc02e6ef41d76c511e 100644
--- a/VECTO/cDEV.vb
+++ b/VECTO/cDEV.vb
@@ -9,12 +9,9 @@ Public Class cDEV
Public GearCorrection As Boolean
- Public ATmode As Boolean
Public TCiterPrec As Single
- Public TCfile As String
Public TCnUstep As Single
Public TCnUstepMin As Single
- Public TCnUref As Single
'**************************************************************************************************************
'**************************************************************************************************************
@@ -122,19 +119,6 @@ Public Class cDEV
Conf0.BoolVal = False
MyOptions.Add("GearCorrection", Conf0)
-
- Conf0 = New cDEVoption(tDEVconfType.tBoolean, "Automatic Transmission. TC file required.", False)
- Conf0.BoolVal = False
- MyOptions.Add("ATmode", Conf0)
-
- Conf0 = New cDEVoption(tDEVconfType.tStringVal, "TC file path")
- Conf0.StringVal = ""
- MyOptions.Add("TCfile", Conf0)
-
- Conf0 = New cDEVoption(tDEVconfType.tSingleVal, "TC reference rpm for input torque [1/min]")
- Conf0.SingleVal = 1000
- MyOptions.Add("TCnUref", Conf0)
-
Conf0 = New cDEVoption(tDEVconfType.tSingleVal, "TC iteration: target precision for torque ratio")
Conf0.SingleVal = 0.001
MyOptions.Add("TCiterPrec", Conf0)
@@ -159,12 +143,9 @@ Public Class cDEV
'Initialize the actual Config-Parameters from MyConfigs list
Public Sub SetOptions()
GearCorrection = MyOptions("GearCorrection").BoolVal
- ATmode = MyOptions("ATmode").BoolVal
TCiterPrec = MyOptions("TCiterPrec").SingleVal
- TCfile = MyOptions("TCfile").StringVal
TCnUstep = MyOptions("TCnUstep").SingleVal
TCnUstepMin = MyOptions("TCnUstepMin").SingleVal
- TCnUref = MyOptions("TCnUref").SingleVal
End Sub
'Demo for Delegate Function
diff --git a/VECTO/cDelaunayMap.vb b/VECTO/cDelaunayMap.vb
index 428665bffb3ffb97633ceacce8a9992213983e34..68ef5b03070199f77913b7ae7f3929f3888c16bd 100644
--- a/VECTO/cDelaunayMap.vb
+++ b/VECTO/cDelaunayMap.vb
@@ -47,6 +47,18 @@ Public Class cDelaunayMap
Next
+
+ '#If DEBUG Then
+ ' Debug.Print("x,y,z,x,y,z")
+ ' For Each tr In lDT
+ ' Debug.Print(tr.P1.X & "," & tr.P1.Y & "," & tr.P1.Z & "," & tr.P2.X & "," & tr.P2.Y & "," & tr.P2.Z)
+ ' Debug.Print(tr.P3.X & "," & tr.P3.Y & "," & tr.P3.Z & "," & tr.P2.X & "," & tr.P2.Y & "," & tr.P2.Z)
+ ' Debug.Print(tr.P1.X & "," & tr.P1.Y & "," & tr.P1.Z & "," & tr.P3.X & "," & tr.P3.Y & "," & tr.P3.Z)
+ ' Next
+ '#End If
+
+
+
'XZ-triangulation
If DualMode Then