From f1d30139e1ec6ed7817b27ca0ba3e0b1db3f0ddf Mon Sep 17 00:00:00 2001
From: Michael Krisper <michael.krisper@tugraz.at>
Date: Wed, 30 Mar 2022 16:14:39 +0200
Subject: [PATCH] MainForm: Added Serial Hybrid Vehicle in Menu
---
VECTO/GUI/MainForm.Designer.vb | 245 ++++++++++++++-------------------
VECTO/GUI/MainForm.resx | 3 +
VECTO/GUI/MainForm.vb | 14 +-
3 files changed, 113 insertions(+), 149 deletions(-)
diff --git a/VECTO/GUI/MainForm.Designer.vb b/VECTO/GUI/MainForm.Designer.vb
index 7c923f9df9..972c320b15 100644
--- a/VECTO/GUI/MainForm.Designer.vb
+++ b/VECTO/GUI/MainForm.Designer.vb
@@ -120,6 +120,7 @@ Partial Class MainForm
Me.OpenInGraphWindowToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
+ Me.JobEditorSerialHybridVehicleToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.StatusBAR.SuspendLayout
Me.TabControl1.SuspendLayout
Me.TabPageGEN.SuspendLayout
@@ -144,17 +145,16 @@ Partial Class MainForm
'
Me.StatusBAR.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.StatusBAR.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripLbStatus, Me.ToolStripProgBarJob, Me.ToolStripProgBarOverall})
- Me.StatusBAR.Location = New System.Drawing.Point(0, 1009)
+ Me.StatusBAR.Location = New System.Drawing.Point(0, 648)
Me.StatusBAR.Name = "StatusBAR"
- Me.StatusBAR.Padding = New System.Windows.Forms.Padding(2, 0, 21, 0)
- Me.StatusBAR.Size = New System.Drawing.Size(1568, 22)
+ Me.StatusBAR.Size = New System.Drawing.Size(1045, 22)
Me.StatusBAR.TabIndex = 7
Me.StatusBAR.Text = "StatusBAR"
'
'ToolStripLbStatus
'
Me.ToolStripLbStatus.Name = "ToolStripLbStatus"
- Me.ToolStripLbStatus.Size = New System.Drawing.Size(1545, 17)
+ Me.ToolStripLbStatus.Size = New System.Drawing.Size(1030, 17)
Me.ToolStripLbStatus.Spring = true
Me.ToolStripLbStatus.Text = "Status Text"
Me.ToolStripLbStatus.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
@@ -164,7 +164,7 @@ Partial Class MainForm
Me.ToolStripProgBarJob.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
Me.ToolStripProgBarJob.AutoSize = false
Me.ToolStripProgBarJob.Name = "ToolStripProgBarJob"
- Me.ToolStripProgBarJob.Size = New System.Drawing.Size(150, 25)
+ Me.ToolStripProgBarJob.Size = New System.Drawing.Size(100, 16)
Me.ToolStripProgBarJob.Style = System.Windows.Forms.ProgressBarStyle.Continuous
Me.ToolStripProgBarJob.ToolTipText = "overall progress"
Me.ToolStripProgBarJob.Visible = false
@@ -174,7 +174,7 @@ Partial Class MainForm
Me.ToolStripProgBarOverall.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
Me.ToolStripProgBarOverall.AutoSize = false
Me.ToolStripProgBarOverall.Name = "ToolStripProgBarOverall"
- Me.ToolStripProgBarOverall.Size = New System.Drawing.Size(150, 25)
+ Me.ToolStripProgBarOverall.Size = New System.Drawing.Size(100, 16)
Me.ToolStripProgBarOverall.Style = System.Windows.Forms.ProgressBarStyle.Continuous
Me.ToolStripProgBarOverall.ToolTipText = "job progress"
Me.ToolStripProgBarOverall.Visible = false
@@ -184,12 +184,12 @@ Partial Class MainForm
Me.TabControl1.Controls.Add(Me.TabPageGEN)
Me.TabControl1.Controls.Add(Me.TabPgOptions)
Me.TabControl1.Dock = System.Windows.Forms.DockStyle.Fill
- Me.TabControl1.Location = New System.Drawing.Point(4, 5)
+ Me.TabControl1.Location = New System.Drawing.Point(3, 3)
Me.TabControl1.Margin = New System.Windows.Forms.Padding(0)
Me.TabControl1.Name = "TabControl1"
Me.TabControl1.Padding = New System.Drawing.Point(0, 0)
Me.TabControl1.SelectedIndex = 0
- Me.TabControl1.Size = New System.Drawing.Size(1564, 504)
+ Me.TabControl1.Size = New System.Drawing.Size(1042, 327)
Me.TabControl1.TabIndex = 10
'
'TabPageGEN
@@ -206,10 +206,10 @@ Partial Class MainForm
Me.TabPageGEN.Controls.Add(Me.LvGEN)
Me.TabPageGEN.Controls.Add(Me.ButtonGENremove)
Me.TabPageGEN.Controls.Add(Me.ButtonGENadd)
- Me.TabPageGEN.Location = New System.Drawing.Point(4, 29)
+ Me.TabPageGEN.Location = New System.Drawing.Point(4, 22)
Me.TabPageGEN.Margin = New System.Windows.Forms.Padding(0)
Me.TabPageGEN.Name = "TabPageGEN"
- Me.TabPageGEN.Size = New System.Drawing.Size(1556, 471)
+ Me.TabPageGEN.Size = New System.Drawing.Size(1034, 301)
Me.TabPageGEN.TabIndex = 0
Me.TabPageGEN.Text = "Job Files"
Me.TabPageGEN.UseVisualStyleBackColor = true
@@ -217,10 +217,9 @@ Partial Class MainForm
'btnImportXML
'
Me.btnImportXML.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
- Me.btnImportXML.Location = New System.Drawing.Point(690, 399)
- Me.btnImportXML.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnImportXML.Location = New System.Drawing.Point(460, 263)
Me.btnImportXML.Name = "btnImportXML"
- Me.btnImportXML.Size = New System.Drawing.Size(172, 46)
+ Me.btnImportXML.Size = New System.Drawing.Size(115, 30)
Me.btnImportXML.TabIndex = 23
Me.btnImportXML.Text = "Import from XML"
Me.btnImportXML.UseVisualStyleBackColor = true
@@ -230,10 +229,9 @@ Partial Class MainForm
'
Me.btnExportXML.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
Me.btnExportXML.Enabled = false
- Me.btnExportXML.Location = New System.Drawing.Point(516, 399)
- Me.btnExportXML.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btnExportXML.Location = New System.Drawing.Point(344, 263)
Me.btnExportXML.Name = "btnExportXML"
- Me.btnExportXML.Size = New System.Drawing.Size(172, 46)
+ Me.btnExportXML.Size = New System.Drawing.Size(115, 30)
Me.btnExportXML.TabIndex = 22
Me.btnExportXML.Text = "Export as XML"
Me.btnExportXML.UseVisualStyleBackColor = true
@@ -242,10 +240,9 @@ Partial Class MainForm
'
Me.Label6.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.Label6.AutoSize = true
- Me.Label6.Location = New System.Drawing.Point(1222, 401)
- Me.Label6.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label6.Location = New System.Drawing.Point(814, 264)
Me.Label6.Name = "Label6"
- Me.Label6.Size = New System.Drawing.Size(324, 20)
+ Me.Label6.Size = New System.Drawing.Size(217, 13)
Me.Label6.TabIndex = 21
Me.Label6.Text = "(Double-Click to Edit, Right-Click for Options)"
'
@@ -254,10 +251,9 @@ Partial Class MainForm
Me.btStartV3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
Me.btStartV3.Image = Global.TUGraz.VECTO.My.Resources.Resources.Play_icon
Me.btStartV3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
- Me.btStartV3.Location = New System.Drawing.Point(4, 86)
- Me.btStartV3.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.btStartV3.Location = New System.Drawing.Point(3, 56)
Me.btStartV3.Name = "btStartV3"
- Me.btStartV3.Size = New System.Drawing.Size(162, 77)
+ Me.btStartV3.Size = New System.Drawing.Size(108, 50)
Me.btStartV3.TabIndex = 20
Me.btStartV3.Text = "START"
Me.btStartV3.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText
@@ -268,8 +264,7 @@ Partial Class MainForm
'
Me.LbDecl.AutoSize = true
Me.LbDecl.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- Me.LbDecl.Location = New System.Drawing.Point(8, 168)
- Me.LbDecl.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.LbDecl.Location = New System.Drawing.Point(5, 109)
Me.LbDecl.Name = "LbDecl"
Me.LbDecl.Size = New System.Drawing.Size(107, 13)
Me.LbDecl.TabIndex = 19
@@ -279,10 +274,9 @@ Partial Class MainForm
'PictureBox1
'
Me.PictureBox1.Image = CType(resources.GetObject("PictureBox1.Image"),System.Drawing.Image)
- Me.PictureBox1.Location = New System.Drawing.Point(4, 5)
- Me.PictureBox1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.PictureBox1.Location = New System.Drawing.Point(3, 3)
Me.PictureBox1.Name = "PictureBox1"
- Me.PictureBox1.Size = New System.Drawing.Size(162, 72)
+ Me.PictureBox1.Size = New System.Drawing.Size(108, 47)
Me.PictureBox1.TabIndex = 18
Me.PictureBox1.TabStop = false
'
@@ -290,10 +284,9 @@ Partial Class MainForm
'
Me.BtGENdown.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
Me.BtGENdown.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_arrow_down_icon
- Me.BtGENdown.Location = New System.Drawing.Point(460, 399)
- Me.BtGENdown.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.BtGENdown.Location = New System.Drawing.Point(307, 263)
Me.BtGENdown.Name = "BtGENdown"
- Me.BtGENdown.Size = New System.Drawing.Size(45, 46)
+ Me.BtGENdown.Size = New System.Drawing.Size(30, 30)
Me.BtGENdown.TabIndex = 6
Me.ToolTip1.SetToolTip(Me.BtGENdown, "Move job down one row")
Me.BtGENdown.UseVisualStyleBackColor = true
@@ -302,10 +295,9 @@ Partial Class MainForm
'
Me.BtGENup.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
Me.BtGENup.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_arrow_up_icon
- Me.BtGENup.Location = New System.Drawing.Point(414, 399)
- Me.BtGENup.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.BtGENup.Location = New System.Drawing.Point(276, 263)
Me.BtGENup.Name = "BtGENup"
- Me.BtGENup.Size = New System.Drawing.Size(45, 46)
+ Me.BtGENup.Size = New System.Drawing.Size(30, 30)
Me.BtGENup.TabIndex = 4
Me.ToolTip1.SetToolTip(Me.BtGENup, "Move job up one row")
Me.BtGENup.UseVisualStyleBackColor = true
@@ -314,10 +306,9 @@ Partial Class MainForm
'
Me.ChBoxAllGEN.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
Me.ChBoxAllGEN.AutoSize = true
- Me.ChBoxAllGEN.Location = New System.Drawing.Point(292, 412)
- Me.ChBoxAllGEN.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.ChBoxAllGEN.Location = New System.Drawing.Point(195, 270)
Me.ChBoxAllGEN.Name = "ChBoxAllGEN"
- Me.ChBoxAllGEN.Size = New System.Drawing.Size(94, 24)
+ Me.ChBoxAllGEN.Size = New System.Drawing.Size(70, 17)
Me.ChBoxAllGEN.TabIndex = 16
Me.ChBoxAllGEN.Text = "Select All"
Me.ToolTip1.SetToolTip(Me.ChBoxAllGEN, "Select All / None")
@@ -336,10 +327,9 @@ Partial Class MainForm
Me.LvGEN.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable
Me.LvGEN.HideSelection = false
Me.LvGEN.LabelEdit = true
- Me.LvGEN.Location = New System.Drawing.Point(171, 5)
- Me.LvGEN.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.LvGEN.Location = New System.Drawing.Point(114, 3)
Me.LvGEN.Name = "LvGEN"
- Me.LvGEN.Size = New System.Drawing.Size(1375, 391)
+ Me.LvGEN.Size = New System.Drawing.Size(917, 259)
Me.LvGEN.TabIndex = 14
Me.LvGEN.UseCompatibleStateImageBehavior = false
Me.LvGEN.View = System.Windows.Forms.View.Details
@@ -359,10 +349,9 @@ Partial Class MainForm
Me.ButtonGENremove.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
Me.ButtonGENremove.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
Me.ButtonGENremove.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
- Me.ButtonGENremove.Location = New System.Drawing.Point(220, 399)
- Me.ButtonGENremove.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.ButtonGENremove.Location = New System.Drawing.Point(147, 263)
Me.ButtonGENremove.Name = "ButtonGENremove"
- Me.ButtonGENremove.Size = New System.Drawing.Size(50, 46)
+ Me.ButtonGENremove.Size = New System.Drawing.Size(33, 30)
Me.ButtonGENremove.TabIndex = 2
Me.ToolTip1.SetToolTip(Me.ButtonGENremove, "Remove selected entries")
Me.ButtonGENremove.UseVisualStyleBackColor = true
@@ -372,10 +361,9 @@ Partial Class MainForm
Me.ButtonGENadd.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
Me.ButtonGENadd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
Me.ButtonGENadd.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
- Me.ButtonGENadd.Location = New System.Drawing.Point(170, 399)
- Me.ButtonGENadd.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.ButtonGENadd.Location = New System.Drawing.Point(113, 263)
Me.ButtonGENadd.Name = "ButtonGENadd"
- Me.ButtonGENadd.Size = New System.Drawing.Size(50, 46)
+ Me.ButtonGENadd.Size = New System.Drawing.Size(33, 30)
Me.ButtonGENadd.TabIndex = 1
Me.ToolTip1.SetToolTip(Me.ButtonGENadd, "Add Job File")
Me.ButtonGENadd.UseVisualStyleBackColor = true
@@ -383,11 +371,10 @@ Partial Class MainForm
'TabPgOptions
'
Me.TabPgOptions.Controls.Add(Me.PanelOptAllg)
- Me.TabPgOptions.Location = New System.Drawing.Point(4, 29)
- Me.TabPgOptions.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.TabPgOptions.Location = New System.Drawing.Point(4, 22)
Me.TabPgOptions.Name = "TabPgOptions"
- Me.TabPgOptions.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.TabPgOptions.Size = New System.Drawing.Size(1555, 472)
+ Me.TabPgOptions.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3)
+ Me.TabPgOptions.Size = New System.Drawing.Size(1035, 302)
Me.TabPgOptions.TabIndex = 2
Me.TabPgOptions.Text = "Options"
Me.TabPgOptions.UseVisualStyleBackColor = true
@@ -399,10 +386,9 @@ Partial Class MainForm
Me.PanelOptAllg.Controls.Add(Me.GroupBox3)
Me.PanelOptAllg.Controls.Add(Me.GroupBox2)
Me.PanelOptAllg.Controls.Add(Me.GroupBox1)
- Me.PanelOptAllg.Location = New System.Drawing.Point(9, 9)
- Me.PanelOptAllg.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.PanelOptAllg.Location = New System.Drawing.Point(6, 6)
Me.PanelOptAllg.Name = "PanelOptAllg"
- Me.PanelOptAllg.Size = New System.Drawing.Size(1533, 446)
+ Me.PanelOptAllg.Size = New System.Drawing.Size(1022, 290)
Me.PanelOptAllg.TabIndex = 0
'
'GroupBox5
@@ -412,11 +398,9 @@ Partial Class MainForm
Me.GroupBox5.Controls.Add(Me.tbMinSpeedLAC)
Me.GroupBox5.Controls.Add(Me.Label3)
Me.GroupBox5.Controls.Add(Me.Label2)
- Me.GroupBox5.Location = New System.Drawing.Point(274, 88)
- Me.GroupBox5.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox5.Location = New System.Drawing.Point(183, 57)
Me.GroupBox5.Name = "GroupBox5"
- Me.GroupBox5.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.GroupBox5.Size = New System.Drawing.Size(390, 154)
+ Me.GroupBox5.Size = New System.Drawing.Size(260, 100)
Me.GroupBox5.TabIndex = 20
Me.GroupBox5.TabStop = false
Me.GroupBox5.Text = "Look-Ahead Coasting Override"
@@ -424,10 +408,9 @@ Partial Class MainForm
'Label5
'
Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- Me.Label5.Location = New System.Drawing.Point(10, 74)
- Me.Label5.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label5.Location = New System.Drawing.Point(7, 48)
Me.Label5.Name = "Label5"
- Me.Label5.Size = New System.Drawing.Size(370, 55)
+ Me.Label5.Size = New System.Drawing.Size(247, 36)
Me.Label5.TabIndex = 4
Me.Label5.Text = "Overrides Look-Ahead Coasting in declaration mode. Leave empty to use default beh"& _
"aviour."
@@ -435,37 +418,33 @@ Partial Class MainForm
'Label4
'
Me.Label4.AutoSize = true
- Me.Label4.Location = New System.Drawing.Point(15, 68)
- Me.Label4.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label4.Location = New System.Drawing.Point(10, 44)
Me.Label4.Name = "Label4"
- Me.Label4.Size = New System.Drawing.Size(0, 20)
+ Me.Label4.Size = New System.Drawing.Size(0, 13)
Me.Label4.TabIndex = 3
'
'tbMinSpeedLAC
'
- Me.tbMinSpeedLAC.Location = New System.Drawing.Point(144, 26)
- Me.tbMinSpeedLAC.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbMinSpeedLAC.Location = New System.Drawing.Point(96, 17)
Me.tbMinSpeedLAC.Name = "tbMinSpeedLAC"
- Me.tbMinSpeedLAC.Size = New System.Drawing.Size(82, 26)
+ Me.tbMinSpeedLAC.Size = New System.Drawing.Size(56, 20)
Me.tbMinSpeedLAC.TabIndex = 2
'
'Label3
'
Me.Label3.AutoSize = true
- Me.Label3.Location = New System.Drawing.Point(237, 31)
- Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label3.Location = New System.Drawing.Point(158, 20)
Me.Label3.Name = "Label3"
- Me.Label3.Size = New System.Drawing.Size(51, 20)
+ Me.Label3.Size = New System.Drawing.Size(38, 13)
Me.Label3.TabIndex = 1
Me.Label3.Text = "[km/h]"
'
'Label2
'
Me.Label2.AutoSize = true
- Me.Label2.Location = New System.Drawing.Point(10, 29)
- Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+ Me.Label2.Location = New System.Drawing.Point(7, 19)
Me.Label2.Name = "Label2"
- Me.Label2.Size = New System.Drawing.Size(89, 20)
+ Me.Label2.Size = New System.Drawing.Size(61, 13)
Me.Label2.TabIndex = 1
Me.Label2.Text = "Min Speed:"
'
@@ -473,11 +452,9 @@ Partial Class MainForm
'
Me.GroupBox4.Controls.Add(Me.BtTCfileBrowse)
Me.GroupBox4.Controls.Add(Me.tbOutputFolder)
- Me.GroupBox4.Location = New System.Drawing.Point(274, 6)
- Me.GroupBox4.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox4.Location = New System.Drawing.Point(183, 4)
Me.GroupBox4.Name = "GroupBox4"
- Me.GroupBox4.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.GroupBox4.Size = New System.Drawing.Size(390, 71)
+ Me.GroupBox4.Size = New System.Drawing.Size(260, 46)
Me.GroupBox4.TabIndex = 19
Me.GroupBox4.TabStop = false
Me.GroupBox4.Text = "Output Directory"
@@ -485,20 +462,18 @@ Partial Class MainForm
'BtTCfileBrowse
'
Me.BtTCfileBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.BtTCfileBrowse.Location = New System.Drawing.Point(340, 22)
- Me.BtTCfileBrowse.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.BtTCfileBrowse.Location = New System.Drawing.Point(227, 14)
Me.BtTCfileBrowse.Name = "BtTCfileBrowse"
- Me.BtTCfileBrowse.Size = New System.Drawing.Size(36, 37)
+ Me.BtTCfileBrowse.Size = New System.Drawing.Size(24, 24)
Me.BtTCfileBrowse.TabIndex = 27
Me.BtTCfileBrowse.TabStop = false
Me.BtTCfileBrowse.UseVisualStyleBackColor = true
'
'tbOutputFolder
'
- Me.tbOutputFolder.Location = New System.Drawing.Point(9, 26)
- Me.tbOutputFolder.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.tbOutputFolder.Location = New System.Drawing.Point(6, 17)
Me.tbOutputFolder.Name = "tbOutputFolder"
- Me.tbOutputFolder.Size = New System.Drawing.Size(320, 26)
+ Me.tbOutputFolder.Size = New System.Drawing.Size(215, 20)
Me.tbOutputFolder.TabIndex = 0
'
'GroupBox3
@@ -506,11 +481,9 @@ Partial Class MainForm
Me.GroupBox3.Controls.Add(Me.cbSaveVectoRunData)
Me.GroupBox3.Controls.Add(Me.cbActVmod)
Me.GroupBox3.Controls.Add(Me.cbValidateRunData)
- Me.GroupBox3.Location = New System.Drawing.Point(4, 272)
- Me.GroupBox3.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox3.Location = New System.Drawing.Point(3, 177)
Me.GroupBox3.Name = "GroupBox3"
- Me.GroupBox3.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.GroupBox3.Size = New System.Drawing.Size(260, 169)
+ Me.GroupBox3.Size = New System.Drawing.Size(173, 110)
Me.GroupBox3.TabIndex = 18
Me.GroupBox3.TabStop = false
Me.GroupBox3.Text = "Misc"
@@ -518,20 +491,18 @@ Partial Class MainForm
'cbSaveVectoRunData
'
Me.cbSaveVectoRunData.AutoSize = true
- Me.cbSaveVectoRunData.Location = New System.Drawing.Point(10, 132)
- Me.cbSaveVectoRunData.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.cbSaveVectoRunData.Location = New System.Drawing.Point(7, 86)
Me.cbSaveVectoRunData.Name = "cbSaveVectoRunData"
- Me.cbSaveVectoRunData.Size = New System.Drawing.Size(238, 24)
+ Me.cbSaveVectoRunData.Size = New System.Drawing.Size(166, 17)
Me.cbSaveVectoRunData.TabIndex = 19
Me.cbSaveVectoRunData.Text = "Export ModelData (EXPERT!)"
Me.cbSaveVectoRunData.UseVisualStyleBackColor = true
'
'cbActVmod
'
- Me.cbActVmod.Location = New System.Drawing.Point(9, 52)
- Me.cbActVmod.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.cbActVmod.Location = New System.Drawing.Point(6, 34)
Me.cbActVmod.Name = "cbActVmod"
- Me.cbActVmod.Size = New System.Drawing.Size(250, 80)
+ Me.cbActVmod.Size = New System.Drawing.Size(167, 52)
Me.cbActVmod.TabIndex = 18
Me.cbActVmod.Text = "Output values in vmod at beginning and end of simulation interval (EXPERT!)"
Me.cbActVmod.UseVisualStyleBackColor = true
@@ -541,10 +512,9 @@ Partial Class MainForm
Me.cbValidateRunData.AutoSize = true
Me.cbValidateRunData.Checked = true
Me.cbValidateRunData.CheckState = System.Windows.Forms.CheckState.Checked
- Me.cbValidateRunData.Location = New System.Drawing.Point(9, 29)
- Me.cbValidateRunData.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.cbValidateRunData.Location = New System.Drawing.Point(6, 19)
Me.cbValidateRunData.Name = "cbValidateRunData"
- Me.cbValidateRunData.Size = New System.Drawing.Size(125, 24)
+ Me.cbValidateRunData.Size = New System.Drawing.Size(90, 17)
Me.cbValidateRunData.TabIndex = 17
Me.cbValidateRunData.Text = "Validate Data"
Me.cbValidateRunData.UseVisualStyleBackColor = true
@@ -553,11 +523,9 @@ Partial Class MainForm
'
Me.GroupBox2.Controls.Add(Me.ChBoxModOut)
Me.GroupBox2.Controls.Add(Me.ChBoxMod1Hz)
- Me.GroupBox2.Location = New System.Drawing.Point(4, 126)
- Me.GroupBox2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox2.Location = New System.Drawing.Point(3, 82)
Me.GroupBox2.Name = "GroupBox2"
- Me.GroupBox2.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.GroupBox2.Size = New System.Drawing.Size(260, 137)
+ Me.GroupBox2.Size = New System.Drawing.Size(173, 89)
Me.GroupBox2.TabIndex = 16
Me.GroupBox2.TabStop = false
Me.GroupBox2.Text = "Output"
@@ -567,10 +535,9 @@ Partial Class MainForm
Me.ChBoxModOut.AutoSize = true
Me.ChBoxModOut.Checked = true
Me.ChBoxModOut.CheckState = System.Windows.Forms.CheckState.Checked
- Me.ChBoxModOut.Location = New System.Drawing.Point(9, 29)
- Me.ChBoxModOut.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.ChBoxModOut.Location = New System.Drawing.Point(6, 19)
Me.ChBoxModOut.Name = "ChBoxModOut"
- Me.ChBoxModOut.Size = New System.Drawing.Size(163, 24)
+ Me.ChBoxModOut.Size = New System.Drawing.Size(115, 17)
Me.ChBoxModOut.TabIndex = 0
Me.ChBoxModOut.Text = "Write modal results"
Me.ChBoxModOut.UseVisualStyleBackColor = true
@@ -578,10 +545,9 @@ Partial Class MainForm
'ChBoxMod1Hz
'
Me.ChBoxMod1Hz.AutoSize = true
- Me.ChBoxMod1Hz.Location = New System.Drawing.Point(9, 65)
- Me.ChBoxMod1Hz.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.ChBoxMod1Hz.Location = New System.Drawing.Point(6, 42)
Me.ChBoxMod1Hz.Name = "ChBoxMod1Hz"
- Me.ChBoxMod1Hz.Size = New System.Drawing.Size(171, 24)
+ Me.ChBoxMod1Hz.Size = New System.Drawing.Size(121, 17)
Me.ChBoxMod1Hz.TabIndex = 16
Me.ChBoxMod1Hz.Text = "Modal results in 1Hz"
Me.ChBoxMod1Hz.UseVisualStyleBackColor = true
@@ -590,11 +556,9 @@ Partial Class MainForm
'
Me.GroupBox1.Controls.Add(Me.RbDev)
Me.GroupBox1.Controls.Add(Me.RbDecl)
- Me.GroupBox1.Location = New System.Drawing.Point(4, 5)
- Me.GroupBox1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.GroupBox1.Location = New System.Drawing.Point(3, 3)
Me.GroupBox1.Name = "GroupBox1"
- Me.GroupBox1.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.GroupBox1.Size = New System.Drawing.Size(260, 111)
+ Me.GroupBox1.Size = New System.Drawing.Size(173, 72)
Me.GroupBox1.TabIndex = 15
Me.GroupBox1.TabStop = false
Me.GroupBox1.Text = "Mode"
@@ -603,10 +567,9 @@ Partial Class MainForm
'
Me.RbDev.AutoSize = true
Me.RbDev.Checked = true
- Me.RbDev.Location = New System.Drawing.Point(9, 65)
- Me.RbDev.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.RbDev.Location = New System.Drawing.Point(6, 42)
Me.RbDev.Name = "RbDev"
- Me.RbDev.Size = New System.Drawing.Size(156, 24)
+ Me.RbDev.Size = New System.Drawing.Size(111, 17)
Me.RbDev.TabIndex = 1
Me.RbDev.TabStop = true
Me.RbDev.Text = "Engineering Mode"
@@ -615,10 +578,9 @@ Partial Class MainForm
'RbDecl
'
Me.RbDecl.AutoSize = true
- Me.RbDecl.Location = New System.Drawing.Point(9, 29)
- Me.RbDecl.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+ Me.RbDecl.Location = New System.Drawing.Point(6, 19)
Me.RbDecl.Name = "RbDecl"
- Me.RbDecl.Size = New System.Drawing.Size(152, 24)
+ Me.RbDecl.Size = New System.Drawing.Size(109, 17)
Me.RbDecl.TabIndex = 0
Me.RbDecl.TabStop = true
Me.RbDecl.Text = "Declaration Mode"
@@ -677,7 +639,7 @@ Partial Class MainForm
Me.LvMsg.Location = New System.Drawing.Point(0, 0)
Me.LvMsg.Margin = New System.Windows.Forms.Padding(0)
Me.LvMsg.Name = "LvMsg"
- Me.LvMsg.Size = New System.Drawing.Size(1568, 433)
+ Me.LvMsg.Size = New System.Drawing.Size(1045, 282)
Me.LvMsg.TabIndex = 0
Me.LvMsg.UseCompatibleStateImageBehavior = false
Me.LvMsg.View = System.Windows.Forms.View.Details
@@ -702,7 +664,7 @@ Partial Class MainForm
Me.SplitContainer1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.SplitContainer1.Location = New System.Drawing.Point(0, 42)
+ Me.SplitContainer1.Location = New System.Drawing.Point(0, 27)
Me.SplitContainer1.Margin = New System.Windows.Forms.Padding(0)
Me.SplitContainer1.Name = "SplitContainer1"
Me.SplitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal
@@ -710,14 +672,13 @@ Partial Class MainForm
'SplitContainer1.Panel1
'
Me.SplitContainer1.Panel1.Controls.Add(Me.TabControl1)
- Me.SplitContainer1.Panel1.Padding = New System.Windows.Forms.Padding(4, 5, 0, 3)
+ Me.SplitContainer1.Panel1.Padding = New System.Windows.Forms.Padding(3, 3, 0, 2)
'
'SplitContainer1.Panel2
'
Me.SplitContainer1.Panel2.Controls.Add(Me.LvMsg)
- Me.SplitContainer1.Size = New System.Drawing.Size(1568, 951)
- Me.SplitContainer1.SplitterDistance = 512
- Me.SplitContainer1.SplitterWidth = 6
+ Me.SplitContainer1.Size = New System.Drawing.Size(1045, 618)
+ Me.SplitContainer1.SplitterDistance = 332
Me.SplitContainer1.TabIndex = 12
'
'ToolStrip1
@@ -728,8 +689,7 @@ Partial Class MainForm
Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripSeparator2, Me.ToolStripDrDnBtTools, Me.ToolStripDrDnBtInfo})
Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
Me.ToolStrip1.Name = "ToolStrip1"
- Me.ToolStrip1.Padding = New System.Windows.Forms.Padding(0, 0, 2, 0)
- Me.ToolStrip1.Size = New System.Drawing.Size(1568, 31)
+ Me.ToolStrip1.Size = New System.Drawing.Size(1045, 31)
Me.ToolStrip1.TabIndex = 11
Me.ToolStrip1.Text = "ToolStrip1"
'
@@ -760,7 +720,7 @@ Partial Class MainForm
'
'ToolStripDrDnBtTools
'
- Me.ToolStripDrDnBtTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GENEditorToolStripMenuItem1, Me.JobEditorParallelHybridVehicleToolStripMenuItem, Me.JobEditorBatteryElectricVehicleToolStripMenuItem, Me.JobEditorEngineOnlyModeToolStripMenuItem, Me.EPTPJobEditorToolStripMenuItem, Me.VEHEditorToolStripMenuItem, Me.EngineEditorToolStripMenuItem, Me.GearboxEditorToolStripMenuItem, Me.GraphToolStripMenuItem, Me.ToolStripSeparator6, Me.OpenLogToolStripMenuItem, Me.SettingsToolStripMenuItem})
+ Me.ToolStripDrDnBtTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GENEditorToolStripMenuItem1, Me.JobEditorSerialHybridVehicleToolStripMenuItem, Me.JobEditorParallelHybridVehicleToolStripMenuItem, Me.JobEditorBatteryElectricVehicleToolStripMenuItem, Me.JobEditorEngineOnlyModeToolStripMenuItem, Me.EPTPJobEditorToolStripMenuItem, Me.VEHEditorToolStripMenuItem, Me.EngineEditorToolStripMenuItem, Me.GearboxEditorToolStripMenuItem, Me.GraphToolStripMenuItem, Me.ToolStripSeparator6, Me.OpenLogToolStripMenuItem, Me.SettingsToolStripMenuItem})
Me.ToolStripDrDnBtTools.Image = Global.TUGraz.VECTO.My.Resources.Resources.Misc_Tools_icon
Me.ToolStripDrDnBtTools.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripDrDnBtTools.Name = "ToolStripDrDnBtTools"
@@ -771,80 +731,80 @@ Partial Class MainForm
'
Me.GENEditorToolStripMenuItem1.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
Me.GENEditorToolStripMenuItem1.Name = "GENEditorToolStripMenuItem1"
- Me.GENEditorToolStripMenuItem1.Size = New System.Drawing.Size(254, 22)
+ Me.GENEditorToolStripMenuItem1.Size = New System.Drawing.Size(262, 30)
Me.GENEditorToolStripMenuItem1.Text = "Job Editor - Conventional Vehicle"
'
'JobEditorParallelHybridVehicleToolStripMenuItem
'
Me.JobEditorParallelHybridVehicleToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
Me.JobEditorParallelHybridVehicleToolStripMenuItem.Name = "JobEditorParallelHybridVehicleToolStripMenuItem"
- Me.JobEditorParallelHybridVehicleToolStripMenuItem.Size = New System.Drawing.Size(254, 22)
+ Me.JobEditorParallelHybridVehicleToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
Me.JobEditorParallelHybridVehicleToolStripMenuItem.Text = "Job Editor - Parallel Hybrid Vehicle"
'
'JobEditorBatteryElectricVehicleToolStripMenuItem
'
Me.JobEditorBatteryElectricVehicleToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
Me.JobEditorBatteryElectricVehicleToolStripMenuItem.Name = "JobEditorBatteryElectricVehicleToolStripMenuItem"
- Me.JobEditorBatteryElectricVehicleToolStripMenuItem.Size = New System.Drawing.Size(254, 22)
+ Me.JobEditorBatteryElectricVehicleToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
Me.JobEditorBatteryElectricVehicleToolStripMenuItem.Text = "JobEditor - Battery Electric Vehicle"
'
'JobEditorEngineOnlyModeToolStripMenuItem
'
Me.JobEditorEngineOnlyModeToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
Me.JobEditorEngineOnlyModeToolStripMenuItem.Name = "JobEditorEngineOnlyModeToolStripMenuItem"
- Me.JobEditorEngineOnlyModeToolStripMenuItem.Size = New System.Drawing.Size(254, 22)
+ Me.JobEditorEngineOnlyModeToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
Me.JobEditorEngineOnlyModeToolStripMenuItem.Text = "Job Editor - Engine Only Mode"
'
'EPTPJobEditorToolStripMenuItem
'
Me.EPTPJobEditorToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
Me.EPTPJobEditorToolStripMenuItem.Name = "EPTPJobEditorToolStripMenuItem"
- Me.EPTPJobEditorToolStripMenuItem.Size = New System.Drawing.Size(254, 22)
+ Me.EPTPJobEditorToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
Me.EPTPJobEditorToolStripMenuItem.Text = "VTP Job Editor"
'
'VEHEditorToolStripMenuItem
'
Me.VEHEditorToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VEH
Me.VEHEditorToolStripMenuItem.Name = "VEHEditorToolStripMenuItem"
- Me.VEHEditorToolStripMenuItem.Size = New System.Drawing.Size(254, 22)
+ Me.VEHEditorToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
Me.VEHEditorToolStripMenuItem.Text = "Vehicle Editor"
'
'EngineEditorToolStripMenuItem
'
Me.EngineEditorToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_ENG
Me.EngineEditorToolStripMenuItem.Name = "EngineEditorToolStripMenuItem"
- Me.EngineEditorToolStripMenuItem.Size = New System.Drawing.Size(254, 22)
+ Me.EngineEditorToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
Me.EngineEditorToolStripMenuItem.Text = "Engine Editor"
'
'GearboxEditorToolStripMenuItem
'
Me.GearboxEditorToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_GBX
Me.GearboxEditorToolStripMenuItem.Name = "GearboxEditorToolStripMenuItem"
- Me.GearboxEditorToolStripMenuItem.Size = New System.Drawing.Size(254, 22)
+ Me.GearboxEditorToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
Me.GearboxEditorToolStripMenuItem.Text = "Gearbox Editor"
'
'GraphToolStripMenuItem
'
Me.GraphToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_Graph
Me.GraphToolStripMenuItem.Name = "GraphToolStripMenuItem"
- Me.GraphToolStripMenuItem.Size = New System.Drawing.Size(254, 22)
+ Me.GraphToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
Me.GraphToolStripMenuItem.Text = "Graph"
'
'ToolStripSeparator6
'
Me.ToolStripSeparator6.Name = "ToolStripSeparator6"
- Me.ToolStripSeparator6.Size = New System.Drawing.Size(251, 6)
+ Me.ToolStripSeparator6.Size = New System.Drawing.Size(259, 6)
'
'OpenLogToolStripMenuItem
'
Me.OpenLogToolStripMenuItem.Name = "OpenLogToolStripMenuItem"
- Me.OpenLogToolStripMenuItem.Size = New System.Drawing.Size(254, 22)
+ Me.OpenLogToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
Me.OpenLogToolStripMenuItem.Text = "Open Log"
'
'SettingsToolStripMenuItem
'
Me.SettingsToolStripMenuItem.Name = "SettingsToolStripMenuItem"
- Me.SettingsToolStripMenuItem.Size = New System.Drawing.Size(254, 22)
+ Me.SettingsToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
Me.SettingsToolStripMenuItem.Text = "Settings"
'
'ToolStripDrDnBtInfo
@@ -922,18 +882,24 @@ Partial Class MainForm
Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(173, 22)
Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
'
+ 'JobEditorSerialHybridVehicleToolStripMenuItem
+ '
+ Me.JobEditorSerialHybridVehicleToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
+ Me.JobEditorSerialHybridVehicleToolStripMenuItem.Name = "JobEditorSerialHybridVehicleToolStripMenuItem"
+ Me.JobEditorSerialHybridVehicleToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
+ Me.JobEditorSerialHybridVehicleToolStripMenuItem.Text = "Job Editor - Serial Hybrid Vehicle"
+ '
'MainForm
'
Me.AcceptButton = Me.btStartV3
- Me.AutoScaleDimensions = New System.Drawing.SizeF(9!, 20!)
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
- Me.ClientSize = New System.Drawing.Size(1568, 1031)
+ Me.ClientSize = New System.Drawing.Size(1045, 670)
Me.Controls.Add(Me.ToolStrip1)
Me.Controls.Add(Me.SplitContainer1)
Me.Controls.Add(Me.StatusBAR)
Me.Icon = CType(resources.GetObject("$this.Icon"),System.Drawing.Icon)
- Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
- Me.MinimumSize = New System.Drawing.Size(1170, 725)
+ Me.MinimumSize = New System.Drawing.Size(785, 485)
Me.Name = "MainForm"
Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
Me.Text = "VECTO"
@@ -1060,4 +1026,5 @@ End Sub
Friend WithEvents JobEditorParallelHybridVehicleToolStripMenuItem As ToolStripMenuItem
Friend WithEvents JobEditorBatteryElectricVehicleToolStripMenuItem As ToolStripMenuItem
Friend WithEvents JobEditorEngineOnlyModeToolStripMenuItem As ToolStripMenuItem
+ Friend WithEvents JobEditorSerialHybridVehicleToolStripMenuItem As ToolStripMenuItem
End Class
diff --git a/VECTO/GUI/MainForm.resx b/VECTO/GUI/MainForm.resx
index b00fb45de6..df927555f4 100644
--- a/VECTO/GUI/MainForm.resx
+++ b/VECTO/GUI/MainForm.resx
@@ -223,6 +223,9 @@
<metadata name="CmOpenFile.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>732, 12</value>
</metadata>
+ <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>850, 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/MainForm.vb b/VECTO/GUI/MainForm.vb
index 8c36cfd648..3e0175a7c7 100644
--- a/VECTO/GUI/MainForm.vb
+++ b/VECTO/GUI/MainForm.vb
@@ -2175,14 +2175,8 @@ lbFound:
Private Sub JobEditorEngineOnlyModeToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles JobEditorEngineOnlyModeToolStripMenuItem.Click
OpenVECTOeditor("<New>", VectoSimulationJobType.EngineOnlySimulation)
End Sub
-End Class
-
-'Public Enum VectoJobType
-' NotSet
-' ConventionalVehicle
-' ParallelHybrid
-' BatteryElectric
-' EngineOnly
-'End Enum
-
+ Private Sub JobEditorSerialHybridVehicleToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles JobEditorSerialHybridVehicleToolStripMenuItem.Click
+ OpenVECTOeditor("<New>", VectoSimulationJobType.SerialHybridVehicle)
+ End Sub
+End Class
--
GitLab