diff --git a/VECTO/GUI/EngineForm.Designer.vb b/VECTO/GUI/EngineForm.Designer.vb
index 54bc55fe075c676a4fd07fc08c3af2bfdb88dfe9..20c75919ef72192d1ddc8be960555fa500eedab1 100644
--- a/VECTO/GUI/EngineForm.Designer.vb
+++ b/VECTO/GUI/EngineForm.Designer.vb
@@ -35,755 +35,735 @@ Partial Class EngineForm
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<DebuggerStepThrough()> _
Private Sub InitializeComponent()
- Me.components = New System.ComponentModel.Container()
- Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(EngineForm))
- Me.TbNleerl = New System.Windows.Forms.TextBox()
- Me.Label11 = New System.Windows.Forms.Label()
- Me.TbInertia = New System.Windows.Forms.TextBox()
- Me.Label41 = New System.Windows.Forms.Label()
- Me.Label40 = New System.Windows.Forms.Label()
- Me.Label5 = New System.Windows.Forms.Label()
- Me.ButCancel = New System.Windows.Forms.Button()
- Me.ButOK = New System.Windows.Forms.Button()
- Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
- Me.ToolStripBtNew = New System.Windows.Forms.ToolStripButton()
- Me.ToolStripBtOpen = New System.Windows.Forms.ToolStripButton()
- Me.ToolStripBtSave = New System.Windows.Forms.ToolStripButton()
- 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()
- Me.Label2 = New System.Windows.Forms.Label()
- Me.TbDispl = New System.Windows.Forms.TextBox()
- Me.TbName = New System.Windows.Forms.TextBox()
- Me.Label3 = New System.Windows.Forms.Label()
- Me.TbMAP = New System.Windows.Forms.TextBox()
- Me.Label6 = New System.Windows.Forms.Label()
- Me.BtMAP = New System.Windows.Forms.Button()
- Me.PictureBox1 = New System.Windows.Forms.PictureBox()
- Me.CmOpenFile = New System.Windows.Forms.ContextMenuStrip(Me.components)
- Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
- Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
- Me.BtMAPopen = New System.Windows.Forms.Button()
- Me.PnInertia = New System.Windows.Forms.Panel()
- Me.GrWHTC = New System.Windows.Forms.GroupBox()
- Me.PnWhtcDeclaration = New System.Windows.Forms.Panel()
- Me.Label20 = New System.Windows.Forms.Label()
- Me.tbRegPerCorrFactor = New System.Windows.Forms.TextBox()
- Me.Label19 = New System.Windows.Forms.Label()
- Me.tbNCVCorrFactor = New System.Windows.Forms.TextBox()
- Me.lblColdHotFactor = New System.Windows.Forms.Label()
- Me.TbColdHotFactor = New System.Windows.Forms.TextBox()
- Me.BtWHTCimport = New System.Windows.Forms.Button()
- Me.Label4 = New System.Windows.Forms.Label()
- Me.Label7 = New System.Windows.Forms.Label()
- Me.Label13 = New System.Windows.Forms.Label()
- Me.Label8 = New System.Windows.Forms.Label()
- Me.TbWHTCmw = New System.Windows.Forms.TextBox()
- Me.TbWHTCurban = New System.Windows.Forms.TextBox()
- Me.TbWHTCrural = New System.Windows.Forms.TextBox()
- Me.PnWhtcEngineering = New System.Windows.Forms.Panel()
- Me.TbWHTCEngineering = New System.Windows.Forms.TextBox()
- Me.lblWhtcEngineering = New System.Windows.Forms.Label()
- Me.PicBox = New System.Windows.Forms.PictureBox()
- Me.TbFLD = New System.Windows.Forms.TextBox()
- Me.Label14 = New System.Windows.Forms.Label()
- Me.BtFLD = New System.Windows.Forms.Button()
- Me.BtFLDopen = New System.Windows.Forms.Button()
- Me.tbRatedSpeed = New System.Windows.Forms.TextBox()
- Me.Label9 = New System.Windows.Forms.Label()
- Me.Label10 = New System.Windows.Forms.Label()
- Me.tbRatedPower = New System.Windows.Forms.TextBox()
- Me.Label12 = New System.Windows.Forms.Label()
- Me.Label15 = New System.Windows.Forms.Label()
- Me.tbMaxTorque = New System.Windows.Forms.TextBox()
- Me.Label16 = New System.Windows.Forms.Label()
- Me.Label17 = New System.Windows.Forms.Label()
- Me.Label18 = New System.Windows.Forms.Label()
- Me.cbFuelType = New System.Windows.Forms.ComboBox()
- Me.lblEngineCharacteristics = New System.Windows.Forms.Label()
- Me.ToolStrip1.SuspendLayout()
- Me.StatusStrip1.SuspendLayout()
- CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
- Me.CmOpenFile.SuspendLayout()
- Me.PnInertia.SuspendLayout()
- Me.GrWHTC.SuspendLayout()
- Me.PnWhtcDeclaration.SuspendLayout()
- Me.PnWhtcEngineering.SuspendLayout()
- CType(Me.PicBox, System.ComponentModel.ISupportInitialize).BeginInit()
- Me.SuspendLayout()
- '
- 'TbNleerl
- '
- Me.TbNleerl.Location = New System.Drawing.Point(123, 108)
- Me.TbNleerl.Name = "TbNleerl"
- Me.TbNleerl.Size = New System.Drawing.Size(57, 20)
- Me.TbNleerl.TabIndex = 1
- '
- 'Label11
- '
- Me.Label11.AutoSize = True
- Me.Label11.Location = New System.Drawing.Point(15, 111)
- Me.Label11.Name = "Label11"
- Me.Label11.Size = New System.Drawing.Size(102, 13)
- Me.Label11.TabIndex = 15
- Me.Label11.Text = "Idling Engine Speed"
- '
- 'TbInertia
- '
- Me.TbInertia.Location = New System.Drawing.Point(122, 4)
- Me.TbInertia.Name = "TbInertia"
- Me.TbInertia.Size = New System.Drawing.Size(57, 20)
- Me.TbInertia.TabIndex = 3
- '
- 'Label41
- '
- Me.Label41.AutoSize = True
- Me.Label41.Location = New System.Drawing.Point(185, 7)
- Me.Label41.Name = "Label41"
- Me.Label41.Size = New System.Drawing.Size(36, 13)
- Me.Label41.TabIndex = 24
- Me.Label41.Text = "[kgm²]"
- '
- 'Label40
- '
- Me.Label40.AutoSize = True
- Me.Label40.Location = New System.Drawing.Point(186, 111)
- Me.Label40.Name = "Label40"
- Me.Label40.Size = New System.Drawing.Size(30, 13)
- Me.Label40.TabIndex = 24
- Me.Label40.Text = "[rpm]"
- '
- 'Label5
- '
- Me.Label5.AutoSize = True
- Me.Label5.Location = New System.Drawing.Point(14, 7)
- Me.Label5.Name = "Label5"
- Me.Label5.Size = New System.Drawing.Size(102, 13)
- Me.Label5.TabIndex = 0
- Me.Label5.Text = "Inertia incl. Flywheel"
- '
- 'ButCancel
- '
- 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(898, 460)
- Me.ButCancel.Name = "ButCancel"
- Me.ButCancel.Size = New System.Drawing.Size(75, 23)
- Me.ButCancel.TabIndex = 13
- Me.ButCancel.Text = "Cancel"
- Me.ButCancel.UseVisualStyleBackColor = True
- '
- '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(817, 460)
- Me.ButOK.Name = "ButOK"
- Me.ButOK.Size = New System.Drawing.Size(75, 23)
- Me.ButOK.TabIndex = 12
- Me.ButOK.Text = "Save"
- Me.ButOK.UseVisualStyleBackColor = True
- '
- 'ToolStrip1
- '
- Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
- Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator3, Me.ToolStripBtSendTo, Me.ToolStripSeparator1, Me.ToolStripButton1})
- Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
- Me.ToolStrip1.Name = "ToolStrip1"
- Me.ToolStrip1.Size = New System.Drawing.Size(985, 25)
- Me.ToolStrip1.TabIndex = 30
- Me.ToolStrip1.Text = "ToolStrip1"
- '
- 'ToolStripBtNew
- '
- Me.ToolStripBtNew.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
- Me.ToolStripBtNew.Image = Global.TUGraz.VECTO.My.Resources.Resources.blue_document_icon
- Me.ToolStripBtNew.ImageTransparentColor = System.Drawing.Color.Magenta
- Me.ToolStripBtNew.Name = "ToolStripBtNew"
- Me.ToolStripBtNew.Size = New System.Drawing.Size(23, 22)
- Me.ToolStripBtNew.Text = "ToolStripButton1"
- Me.ToolStripBtNew.ToolTipText = "New"
- '
- 'ToolStripBtOpen
- '
- Me.ToolStripBtOpen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
- Me.ToolStripBtOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.ToolStripBtOpen.ImageTransparentColor = System.Drawing.Color.Magenta
- Me.ToolStripBtOpen.Name = "ToolStripBtOpen"
- Me.ToolStripBtOpen.Size = New System.Drawing.Size(23, 22)
- Me.ToolStripBtOpen.Text = "ToolStripButton1"
- Me.ToolStripBtOpen.ToolTipText = "Open..."
- '
- 'ToolStripBtSave
- '
- Me.ToolStripBtSave.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
- Me.ToolStripBtSave.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_document_save_icon
- Me.ToolStripBtSave.ImageTransparentColor = System.Drawing.Color.Magenta
- Me.ToolStripBtSave.Name = "ToolStripBtSave"
- Me.ToolStripBtSave.Size = New System.Drawing.Size(23, 22)
- Me.ToolStripBtSave.Text = "ToolStripButton1"
- Me.ToolStripBtSave.ToolTipText = "Save"
- '
- 'ToolStripBtSaveAs
- '
- Me.ToolStripBtSaveAs.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
- Me.ToolStripBtSaveAs.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_document_save_as_icon
- Me.ToolStripBtSaveAs.ImageTransparentColor = System.Drawing.Color.Magenta
- Me.ToolStripBtSaveAs.Name = "ToolStripBtSaveAs"
- Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(23, 22)
- Me.ToolStripBtSaveAs.Text = "ToolStripButton1"
- Me.ToolStripBtSaveAs.ToolTipText = "Save As..."
- '
- 'ToolStripSeparator3
- '
- Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
- Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 25)
- '
- 'ToolStripBtSendTo
- '
- Me.ToolStripBtSendTo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
- Me.ToolStripBtSendTo.Image = Global.TUGraz.VECTO.My.Resources.Resources.export_icon
- Me.ToolStripBtSendTo.ImageTransparentColor = System.Drawing.Color.Magenta
- Me.ToolStripBtSendTo.Name = "ToolStripBtSendTo"
- Me.ToolStripBtSendTo.Size = New System.Drawing.Size(23, 22)
- Me.ToolStripBtSendTo.Text = "Send to Job Editor"
- Me.ToolStripBtSendTo.ToolTipText = "Send to Job 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.TUGraz.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})
- Me.StatusStrip1.Location = New System.Drawing.Point(0, 486)
- Me.StatusStrip1.Name = "StatusStrip1"
- Me.StatusStrip1.Size = New System.Drawing.Size(985, 22)
- Me.StatusStrip1.SizingGrip = False
- Me.StatusStrip1.TabIndex = 37
- Me.StatusStrip1.Text = "StatusStrip1"
- '
- 'LbStatus
- '
- Me.LbStatus.Name = "LbStatus"
- Me.LbStatus.Size = New System.Drawing.Size(39, 17)
- Me.LbStatus.Text = "Status"
- '
- 'Label1
- '
- Me.Label1.AutoSize = True
- Me.Label1.Location = New System.Drawing.Point(186, 137)
- Me.Label1.Name = "Label1"
- Me.Label1.Size = New System.Drawing.Size(33, 13)
- Me.Label1.TabIndex = 24
- Me.Label1.Text = "[ccm]"
- '
- 'Label2
- '
- Me.Label2.AutoSize = True
- Me.Label2.Location = New System.Drawing.Point(46, 137)
- Me.Label2.Name = "Label2"
- Me.Label2.Size = New System.Drawing.Size(71, 13)
- Me.Label2.TabIndex = 13
- Me.Label2.Text = "Displacement"
- '
- 'TbDispl
- '
- Me.TbDispl.Location = New System.Drawing.Point(123, 134)
- Me.TbDispl.Name = "TbDispl"
- Me.TbDispl.Size = New System.Drawing.Size(57, 20)
- Me.TbDispl.TabIndex = 2
- '
- 'TbName
- '
- Me.TbName.Location = New System.Drawing.Point(123, 82)
- Me.TbName.Name = "TbName"
- Me.TbName.Size = New System.Drawing.Size(370, 20)
- Me.TbName.TabIndex = 0
- '
- 'Label3
- '
- Me.Label3.AutoSize = True
- Me.Label3.Location = New System.Drawing.Point(30, 85)
- Me.Label3.Name = "Label3"
- Me.Label3.Size = New System.Drawing.Size(87, 13)
- Me.Label3.TabIndex = 11
- Me.Label3.Text = "Make and Model"
- '
- 'TbMAP
- '
- Me.TbMAP.Location = New System.Drawing.Point(12, 271)
- Me.TbMAP.Name = "TbMAP"
- Me.TbMAP.Size = New System.Drawing.Size(434, 20)
- Me.TbMAP.TabIndex = 5
- '
- 'Label6
- '
- Me.Label6.AutoSize = True
- Me.Label6.Location = New System.Drawing.Point(12, 255)
- Me.Label6.Name = "Label6"
- Me.Label6.Size = New System.Drawing.Size(115, 13)
- Me.Label6.TabIndex = 38
- Me.Label6.Text = "Fuel Consumption Map"
- '
- 'BtMAP
- '
- Me.BtMAP.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.BtMAP.Location = New System.Drawing.Point(446, 269)
- Me.BtMAP.Name = "BtMAP"
- Me.BtMAP.Size = New System.Drawing.Size(24, 24)
- Me.BtMAP.TabIndex = 6
- Me.BtMAP.TabStop = False
- Me.BtMAP.UseVisualStyleBackColor = True
- '
- 'PictureBox1
- '
- Me.PictureBox1.BackColor = System.Drawing.Color.White
- Me.PictureBox1.Image = Global.TUGraz.VECTO.My.Resources.Resources.VECTO_ENG
- Me.PictureBox1.Location = New System.Drawing.Point(0, 28)
- Me.PictureBox1.Name = "PictureBox1"
- Me.PictureBox1.Size = New System.Drawing.Size(502, 40)
- Me.PictureBox1.TabIndex = 39
- Me.PictureBox1.TabStop = False
- '
- 'CmOpenFile
- '
- Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
- Me.CmOpenFile.Name = "CmOpenFile"
- Me.CmOpenFile.Size = New System.Drawing.Size(153, 48)
- '
- 'OpenWithToolStripMenuItem
- '
- Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem"
- Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
- Me.OpenWithToolStripMenuItem.Text = "Open with ..."
- '
- 'ShowInFolderToolStripMenuItem
- '
- Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem"
- Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
- Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
- '
- 'BtMAPopen
- '
- Me.BtMAPopen.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.BtMAPopen.Location = New System.Drawing.Point(469, 269)
- Me.BtMAPopen.Name = "BtMAPopen"
- Me.BtMAPopen.Size = New System.Drawing.Size(24, 24)
- Me.BtMAPopen.TabIndex = 7
- Me.BtMAPopen.TabStop = False
- Me.BtMAPopen.UseVisualStyleBackColor = True
- '
- 'PnInertia
- '
- Me.PnInertia.Controls.Add(Me.Label5)
- Me.PnInertia.Controls.Add(Me.Label41)
- Me.PnInertia.Controls.Add(Me.TbInertia)
- Me.PnInertia.Location = New System.Drawing.Point(258, 184)
- Me.PnInertia.Name = "PnInertia"
- Me.PnInertia.Size = New System.Drawing.Size(229, 30)
- Me.PnInertia.TabIndex = 3
- '
- 'GrWHTC
- '
- Me.GrWHTC.Controls.Add(Me.PnWhtcDeclaration)
- Me.GrWHTC.Controls.Add(Me.PnWhtcEngineering)
- Me.GrWHTC.Location = New System.Drawing.Point(12, 300)
- Me.GrWHTC.Name = "GrWHTC"
- Me.GrWHTC.Size = New System.Drawing.Size(481, 153)
- Me.GrWHTC.TabIndex = 9
- Me.GrWHTC.TabStop = False
- Me.GrWHTC.Text = "WHTC Correction"
- '
- 'PnWhtcDeclaration
- '
- Me.PnWhtcDeclaration.Controls.Add(Me.Label20)
- Me.PnWhtcDeclaration.Controls.Add(Me.tbRegPerCorrFactor)
- Me.PnWhtcDeclaration.Controls.Add(Me.Label19)
- Me.PnWhtcDeclaration.Controls.Add(Me.tbNCVCorrFactor)
- Me.PnWhtcDeclaration.Controls.Add(Me.lblColdHotFactor)
- Me.PnWhtcDeclaration.Controls.Add(Me.TbColdHotFactor)
- Me.PnWhtcDeclaration.Controls.Add(Me.BtWHTCimport)
- Me.PnWhtcDeclaration.Controls.Add(Me.Label4)
- Me.PnWhtcDeclaration.Controls.Add(Me.Label7)
- Me.PnWhtcDeclaration.Controls.Add(Me.Label13)
- Me.PnWhtcDeclaration.Controls.Add(Me.Label8)
- Me.PnWhtcDeclaration.Controls.Add(Me.TbWHTCmw)
- Me.PnWhtcDeclaration.Controls.Add(Me.TbWHTCurban)
- Me.PnWhtcDeclaration.Controls.Add(Me.TbWHTCrural)
- Me.PnWhtcDeclaration.Location = New System.Drawing.Point(3, 19)
- Me.PnWhtcDeclaration.Name = "PnWhtcDeclaration"
- Me.PnWhtcDeclaration.Size = New System.Drawing.Size(472, 95)
- Me.PnWhtcDeclaration.TabIndex = 8
- '
- 'Label20
- '
- Me.Label20.AutoSize = True
- Me.Label20.Location = New System.Drawing.Point(99, 76)
- Me.Label20.Name = "Label20"
- Me.Label20.Size = New System.Drawing.Size(89, 13)
- Me.Label20.TabIndex = 9
- Me.Label20.Text = "Reg. Per. Corr. F."
- '
- 'tbRegPerCorrFactor
- '
- Me.tbRegPerCorrFactor.Location = New System.Drawing.Point(194, 73)
- Me.tbRegPerCorrFactor.Name = "tbRegPerCorrFactor"
- Me.tbRegPerCorrFactor.Size = New System.Drawing.Size(57, 20)
- Me.tbRegPerCorrFactor.TabIndex = 10
- '
- 'Label19
- '
- Me.Label19.AutoSize = True
- Me.Label19.Location = New System.Drawing.Point(274, 53)
- Me.Label19.Name = "Label19"
- Me.Label19.Size = New System.Drawing.Size(66, 13)
- Me.Label19.TabIndex = 7
- Me.Label19.Text = "NCV Corr. F."
- '
- 'tbNCVCorrFactor
- '
- Me.tbNCVCorrFactor.Location = New System.Drawing.Point(343, 50)
- Me.tbNCVCorrFactor.Name = "tbNCVCorrFactor"
- Me.tbNCVCorrFactor.Size = New System.Drawing.Size(57, 20)
- Me.tbNCVCorrFactor.TabIndex = 8
- '
- 'lblColdHotFactor
- '
- Me.lblColdHotFactor.AutoSize = True
- Me.lblColdHotFactor.Location = New System.Drawing.Point(3, 53)
- Me.lblColdHotFactor.Name = "lblColdHotFactor"
- Me.lblColdHotFactor.Size = New System.Drawing.Size(177, 13)
- Me.lblColdHotFactor.TabIndex = 5
- Me.lblColdHotFactor.Text = "Cold/Hot Emission Balancing Factor"
- '
- 'TbColdHotFactor
- '
- Me.TbColdHotFactor.Location = New System.Drawing.Point(194, 50)
- Me.TbColdHotFactor.Name = "TbColdHotFactor"
- Me.TbColdHotFactor.Size = New System.Drawing.Size(57, 20)
- Me.TbColdHotFactor.TabIndex = 6
- '
- 'BtWHTCimport
- '
- Me.BtWHTCimport.Location = New System.Drawing.Point(299, 3)
- Me.BtWHTCimport.Name = "BtWHTCimport"
- Me.BtWHTCimport.Size = New System.Drawing.Size(170, 15)
- Me.BtWHTCimport.TabIndex = 4
- Me.BtWHTCimport.Text = "Import from VECTO-Engine"
- Me.BtWHTCimport.UseVisualStyleBackColor = True
- Me.BtWHTCimport.Visible = False
- '
- 'Label4
- '
- Me.Label4.AutoSize = True
- Me.Label4.Location = New System.Drawing.Point(1, 27)
- Me.Label4.Name = "Label4"
- Me.Label4.Size = New System.Drawing.Size(36, 13)
- Me.Label4.TabIndex = 0
- Me.Label4.Text = "Urban"
- '
- 'Label7
- '
- Me.Label7.AutoSize = True
- Me.Label7.Location = New System.Drawing.Point(156, 27)
- Me.Label7.Name = "Label7"
- Me.Label7.Size = New System.Drawing.Size(32, 13)
- Me.Label7.TabIndex = 0
- Me.Label7.Text = "Rural"
- '
- 'Label13
- '
- Me.Label13.AutoSize = True
- Me.Label13.Location = New System.Drawing.Point(1, 5)
- Me.Label13.Name = "Label13"
- Me.Label13.Size = New System.Drawing.Size(242, 13)
- Me.Label13.TabIndex = 3
- Me.Label13.Text = "Correction Factors calculated with VECTO-Engine"
- '
- 'Label8
- '
- Me.Label8.AutoSize = True
- Me.Label8.Location = New System.Drawing.Point(284, 27)
- Me.Label8.Name = "Label8"
- Me.Label8.Size = New System.Drawing.Size(53, 13)
- Me.Label8.TabIndex = 0
- Me.Label8.Text = "Motorway"
- '
- 'TbWHTCmw
- '
- Me.TbWHTCmw.Location = New System.Drawing.Point(343, 24)
- Me.TbWHTCmw.Name = "TbWHTCmw"
- Me.TbWHTCmw.Size = New System.Drawing.Size(57, 20)
- Me.TbWHTCmw.TabIndex = 2
- '
- 'TbWHTCurban
- '
- Me.TbWHTCurban.Location = New System.Drawing.Point(43, 24)
- Me.TbWHTCurban.Name = "TbWHTCurban"
- Me.TbWHTCurban.Size = New System.Drawing.Size(57, 20)
- Me.TbWHTCurban.TabIndex = 0
- '
- 'TbWHTCrural
- '
- Me.TbWHTCrural.Location = New System.Drawing.Point(194, 24)
- Me.TbWHTCrural.Name = "TbWHTCrural"
- Me.TbWHTCrural.Size = New System.Drawing.Size(57, 20)
- Me.TbWHTCrural.TabIndex = 1
- '
- 'PnWhtcEngineering
- '
- Me.PnWhtcEngineering.Controls.Add(Me.TbWHTCEngineering)
- Me.PnWhtcEngineering.Controls.Add(Me.lblWhtcEngineering)
- Me.PnWhtcEngineering.Location = New System.Drawing.Point(3, 117)
- Me.PnWhtcEngineering.Name = "PnWhtcEngineering"
- Me.PnWhtcEngineering.Size = New System.Drawing.Size(472, 30)
- Me.PnWhtcEngineering.TabIndex = 7
- '
- 'TbWHTCEngineering
- '
- Me.TbWHTCEngineering.Location = New System.Drawing.Point(194, 3)
- Me.TbWHTCEngineering.Name = "TbWHTCEngineering"
- Me.TbWHTCEngineering.Size = New System.Drawing.Size(57, 20)
- Me.TbWHTCEngineering.TabIndex = 5
- '
- 'lblWhtcEngineering
- '
- Me.lblWhtcEngineering.AutoSize = True
- Me.lblWhtcEngineering.Location = New System.Drawing.Point(125, 6)
- Me.lblWhtcEngineering.Name = "lblWhtcEngineering"
- Me.lblWhtcEngineering.Size = New System.Drawing.Size(63, 13)
- Me.lblWhtcEngineering.TabIndex = 6
- Me.lblWhtcEngineering.Text = "Engineering"
- '
- 'PicBox
- '
- Me.PicBox.BackColor = System.Drawing.Color.LightGray
- Me.PicBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
- Me.PicBox.Location = New System.Drawing.Point(499, 28)
- Me.PicBox.Name = "PicBox"
- Me.PicBox.Size = New System.Drawing.Size(474, 392)
- Me.PicBox.TabIndex = 40
- Me.PicBox.TabStop = False
- '
- 'TbFLD
- '
- Me.TbFLD.Location = New System.Drawing.Point(12, 228)
- Me.TbFLD.Name = "TbFLD"
- Me.TbFLD.Size = New System.Drawing.Size(434, 20)
- Me.TbFLD.TabIndex = 5
- '
- 'Label14
- '
- Me.Label14.AutoSize = True
- Me.Label14.Location = New System.Drawing.Point(12, 212)
- Me.Label14.Name = "Label14"
- Me.Label14.Size = New System.Drawing.Size(128, 13)
- Me.Label14.TabIndex = 38
- Me.Label14.Text = "Full Load and Drag Curve"
- '
- 'BtFLD
- '
- Me.BtFLD.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
- Me.BtFLD.Location = New System.Drawing.Point(446, 226)
- Me.BtFLD.Name = "BtFLD"
- Me.BtFLD.Size = New System.Drawing.Size(24, 24)
- Me.BtFLD.TabIndex = 6
- Me.BtFLD.TabStop = False
- Me.BtFLD.UseVisualStyleBackColor = True
- '
- 'BtFLDopen
- '
- Me.BtFLDopen.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
- Me.BtFLDopen.Location = New System.Drawing.Point(469, 226)
- Me.BtFLDopen.Name = "BtFLDopen"
- Me.BtFLDopen.Size = New System.Drawing.Size(24, 24)
- Me.BtFLDopen.TabIndex = 7
- Me.BtFLDopen.TabStop = False
- Me.BtFLDopen.UseVisualStyleBackColor = True
- '
- 'tbRatedSpeed
- '
- Me.tbRatedSpeed.Location = New System.Drawing.Point(381, 108)
- Me.tbRatedSpeed.Name = "tbRatedSpeed"
- Me.tbRatedSpeed.Size = New System.Drawing.Size(57, 20)
- Me.tbRatedSpeed.TabIndex = 41
- '
- 'Label9
- '
- Me.Label9.AutoSize = True
- Me.Label9.Location = New System.Drawing.Point(304, 111)
- Me.Label9.Name = "Label9"
- Me.Label9.Size = New System.Drawing.Size(70, 13)
- Me.Label9.TabIndex = 42
- Me.Label9.Text = "Rated Speed"
- '
- 'Label10
- '
- Me.Label10.AutoSize = True
- Me.Label10.Location = New System.Drawing.Point(444, 111)
- Me.Label10.Name = "Label10"
- Me.Label10.Size = New System.Drawing.Size(30, 13)
- Me.Label10.TabIndex = 43
- Me.Label10.Text = "[rpm]"
- '
- 'tbRatedPower
- '
- Me.tbRatedPower.Location = New System.Drawing.Point(381, 134)
- Me.tbRatedPower.Name = "tbRatedPower"
- Me.tbRatedPower.Size = New System.Drawing.Size(57, 20)
- Me.tbRatedPower.TabIndex = 44
- '
- 'Label12
- '
- Me.Label12.AutoSize = True
- Me.Label12.Location = New System.Drawing.Point(304, 137)
- Me.Label12.Name = "Label12"
- Me.Label12.Size = New System.Drawing.Size(69, 13)
- Me.Label12.TabIndex = 45
- Me.Label12.Text = "Rated Power"
- '
- 'Label15
- '
- Me.Label15.AutoSize = True
- Me.Label15.Location = New System.Drawing.Point(444, 137)
- Me.Label15.Name = "Label15"
- Me.Label15.Size = New System.Drawing.Size(30, 13)
- Me.Label15.TabIndex = 46
- Me.Label15.Text = "[kW]"
- '
- 'tbMaxTorque
- '
- Me.tbMaxTorque.Location = New System.Drawing.Point(381, 158)
- Me.tbMaxTorque.Name = "tbMaxTorque"
- Me.tbMaxTorque.Size = New System.Drawing.Size(57, 20)
- Me.tbMaxTorque.TabIndex = 47
- '
- 'Label16
- '
- Me.Label16.AutoSize = True
- Me.Label16.Location = New System.Drawing.Point(309, 161)
- Me.Label16.Name = "Label16"
- Me.Label16.Size = New System.Drawing.Size(64, 13)
- Me.Label16.TabIndex = 48
- Me.Label16.Text = "Max Torque"
- '
- 'Label17
- '
- Me.Label17.AutoSize = True
- Me.Label17.Location = New System.Drawing.Point(444, 161)
- Me.Label17.Name = "Label17"
- Me.Label17.Size = New System.Drawing.Size(29, 13)
- Me.Label17.TabIndex = 49
- Me.Label17.Text = "[Nm]"
- '
- 'Label18
- '
- Me.Label18.AutoSize = True
- Me.Label18.Location = New System.Drawing.Point(63, 164)
- Me.Label18.Name = "Label18"
- Me.Label18.Size = New System.Drawing.Size(54, 13)
- Me.Label18.TabIndex = 50
- Me.Label18.Text = "Fuel Type"
- '
- 'cbFuelType
- '
- Me.cbFuelType.FormattingEnabled = True
- Me.cbFuelType.Location = New System.Drawing.Point(123, 161)
- Me.cbFuelType.Name = "cbFuelType"
- Me.cbFuelType.Size = New System.Drawing.Size(143, 21)
- Me.cbFuelType.TabIndex = 51
- '
- 'lblEngineCharacteristics
- '
- Me.lblEngineCharacteristics.AutoSize = True
- Me.lblEngineCharacteristics.Location = New System.Drawing.Point(500, 433)
- Me.lblEngineCharacteristics.Name = "lblEngineCharacteristics"
- Me.lblEngineCharacteristics.Size = New System.Drawing.Size(0, 13)
- Me.lblEngineCharacteristics.TabIndex = 52
- '
- 'EngineForm
- '
- 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(985, 508)
- Me.Controls.Add(Me.lblEngineCharacteristics)
- Me.Controls.Add(Me.cbFuelType)
- Me.Controls.Add(Me.Label18)
- Me.Controls.Add(Me.tbMaxTorque)
- Me.Controls.Add(Me.Label16)
- Me.Controls.Add(Me.Label17)
- Me.Controls.Add(Me.tbRatedPower)
- Me.Controls.Add(Me.Label12)
- Me.Controls.Add(Me.Label15)
- Me.Controls.Add(Me.tbRatedSpeed)
- Me.Controls.Add(Me.Label9)
- Me.Controls.Add(Me.Label10)
- Me.Controls.Add(Me.PicBox)
- Me.Controls.Add(Me.GrWHTC)
- Me.Controls.Add(Me.PnInertia)
- Me.Controls.Add(Me.BtFLDopen)
- Me.Controls.Add(Me.BtMAPopen)
- Me.Controls.Add(Me.PictureBox1)
- Me.Controls.Add(Me.BtFLD)
- Me.Controls.Add(Me.BtMAP)
- Me.Controls.Add(Me.Label14)
- Me.Controls.Add(Me.Label6)
- Me.Controls.Add(Me.TbNleerl)
- Me.Controls.Add(Me.StatusStrip1)
- Me.Controls.Add(Me.Label11)
- Me.Controls.Add(Me.ToolStrip1)
- Me.Controls.Add(Me.TbDispl)
- Me.Controls.Add(Me.Label2)
- Me.Controls.Add(Me.ButCancel)
- Me.Controls.Add(Me.TbFLD)
- Me.Controls.Add(Me.ButOK)
- Me.Controls.Add(Me.TbMAP)
- Me.Controls.Add(Me.Label3)
- Me.Controls.Add(Me.Label40)
- Me.Controls.Add(Me.Label1)
- Me.Controls.Add(Me.TbName)
- Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
- Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
- Me.MaximizeBox = False
- Me.Name = "EngineForm"
- Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide
- Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
- Me.Text = "F_ENG"
- Me.ToolStrip1.ResumeLayout(False)
- Me.ToolStrip1.PerformLayout()
- Me.StatusStrip1.ResumeLayout(False)
- Me.StatusStrip1.PerformLayout()
- CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
- Me.CmOpenFile.ResumeLayout(False)
- Me.PnInertia.ResumeLayout(False)
- Me.PnInertia.PerformLayout()
- Me.GrWHTC.ResumeLayout(False)
- Me.PnWhtcDeclaration.ResumeLayout(False)
- Me.PnWhtcDeclaration.PerformLayout()
- Me.PnWhtcEngineering.ResumeLayout(False)
- Me.PnWhtcEngineering.PerformLayout()
- CType(Me.PicBox, System.ComponentModel.ISupportInitialize).EndInit()
- Me.ResumeLayout(False)
- Me.PerformLayout()
+ Me.components = New System.ComponentModel.Container()
+ Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(EngineForm))
+ Me.TbNleerl = New System.Windows.Forms.TextBox()
+ Me.Label11 = New System.Windows.Forms.Label()
+ Me.TbInertia = New System.Windows.Forms.TextBox()
+ Me.Label41 = New System.Windows.Forms.Label()
+ Me.Label40 = New System.Windows.Forms.Label()
+ Me.Label5 = New System.Windows.Forms.Label()
+ Me.ButCancel = New System.Windows.Forms.Button()
+ Me.ButOK = New System.Windows.Forms.Button()
+ Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
+ Me.ToolStripBtNew = New System.Windows.Forms.ToolStripButton()
+ Me.ToolStripBtOpen = New System.Windows.Forms.ToolStripButton()
+ Me.ToolStripBtSave = New System.Windows.Forms.ToolStripButton()
+ 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()
+ Me.Label2 = New System.Windows.Forms.Label()
+ Me.TbDispl = New System.Windows.Forms.TextBox()
+ Me.TbName = New System.Windows.Forms.TextBox()
+ Me.Label3 = New System.Windows.Forms.Label()
+ Me.TbMAP = New System.Windows.Forms.TextBox()
+ Me.Label6 = New System.Windows.Forms.Label()
+ Me.BtMAP = New System.Windows.Forms.Button()
+ Me.PictureBox1 = New System.Windows.Forms.PictureBox()
+ Me.CmOpenFile = New System.Windows.Forms.ContextMenuStrip(Me.components)
+ Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.BtMAPopen = New System.Windows.Forms.Button()
+ Me.PnInertia = New System.Windows.Forms.Panel()
+ Me.GrWHTC = New System.Windows.Forms.GroupBox()
+ Me.PnWhtcDeclaration = New System.Windows.Forms.Panel()
+ Me.Label20 = New System.Windows.Forms.Label()
+ Me.tbRegPerCorrFactor = New System.Windows.Forms.TextBox()
+ Me.lblColdHotFactor = New System.Windows.Forms.Label()
+ Me.TbColdHotFactor = New System.Windows.Forms.TextBox()
+ Me.BtWHTCimport = New System.Windows.Forms.Button()
+ Me.Label4 = New System.Windows.Forms.Label()
+ Me.Label7 = New System.Windows.Forms.Label()
+ Me.Label13 = New System.Windows.Forms.Label()
+ Me.Label8 = New System.Windows.Forms.Label()
+ Me.TbWHTCmw = New System.Windows.Forms.TextBox()
+ Me.TbWHTCurban = New System.Windows.Forms.TextBox()
+ Me.TbWHTCrural = New System.Windows.Forms.TextBox()
+ Me.PnWhtcEngineering = New System.Windows.Forms.Panel()
+ Me.TbWHTCEngineering = New System.Windows.Forms.TextBox()
+ Me.lblWhtcEngineering = New System.Windows.Forms.Label()
+ Me.PicBox = New System.Windows.Forms.PictureBox()
+ Me.TbFLD = New System.Windows.Forms.TextBox()
+ Me.Label14 = New System.Windows.Forms.Label()
+ Me.BtFLD = New System.Windows.Forms.Button()
+ Me.BtFLDopen = New System.Windows.Forms.Button()
+ Me.tbRatedSpeed = New System.Windows.Forms.TextBox()
+ Me.Label9 = New System.Windows.Forms.Label()
+ Me.Label10 = New System.Windows.Forms.Label()
+ Me.tbRatedPower = New System.Windows.Forms.TextBox()
+ Me.Label12 = New System.Windows.Forms.Label()
+ Me.Label15 = New System.Windows.Forms.Label()
+ Me.tbMaxTorque = New System.Windows.Forms.TextBox()
+ Me.Label16 = New System.Windows.Forms.Label()
+ Me.Label17 = New System.Windows.Forms.Label()
+ Me.Label18 = New System.Windows.Forms.Label()
+ Me.cbFuelType = New System.Windows.Forms.ComboBox()
+ Me.lblEngineCharacteristics = New System.Windows.Forms.Label()
+ Me.ToolStrip1.SuspendLayout
+ Me.StatusStrip1.SuspendLayout
+ CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).BeginInit
+ Me.CmOpenFile.SuspendLayout
+ Me.PnInertia.SuspendLayout
+ Me.GrWHTC.SuspendLayout
+ Me.PnWhtcDeclaration.SuspendLayout
+ Me.PnWhtcEngineering.SuspendLayout
+ CType(Me.PicBox,System.ComponentModel.ISupportInitialize).BeginInit
+ Me.SuspendLayout
+ '
+ 'TbNleerl
+ '
+ Me.TbNleerl.Location = New System.Drawing.Point(123, 108)
+ Me.TbNleerl.Name = "TbNleerl"
+ Me.TbNleerl.Size = New System.Drawing.Size(57, 20)
+ Me.TbNleerl.TabIndex = 1
+ '
+ 'Label11
+ '
+ Me.Label11.AutoSize = true
+ Me.Label11.Location = New System.Drawing.Point(15, 111)
+ Me.Label11.Name = "Label11"
+ Me.Label11.Size = New System.Drawing.Size(102, 13)
+ Me.Label11.TabIndex = 15
+ Me.Label11.Text = "Idling Engine Speed"
+ '
+ 'TbInertia
+ '
+ Me.TbInertia.Location = New System.Drawing.Point(122, 4)
+ Me.TbInertia.Name = "TbInertia"
+ Me.TbInertia.Size = New System.Drawing.Size(57, 20)
+ Me.TbInertia.TabIndex = 3
+ '
+ 'Label41
+ '
+ Me.Label41.AutoSize = true
+ Me.Label41.Location = New System.Drawing.Point(185, 7)
+ Me.Label41.Name = "Label41"
+ Me.Label41.Size = New System.Drawing.Size(36, 13)
+ Me.Label41.TabIndex = 24
+ Me.Label41.Text = "[kgm²]"
+ '
+ 'Label40
+ '
+ Me.Label40.AutoSize = true
+ Me.Label40.Location = New System.Drawing.Point(186, 111)
+ Me.Label40.Name = "Label40"
+ Me.Label40.Size = New System.Drawing.Size(30, 13)
+ Me.Label40.TabIndex = 24
+ Me.Label40.Text = "[rpm]"
+ '
+ 'Label5
+ '
+ Me.Label5.AutoSize = true
+ Me.Label5.Location = New System.Drawing.Point(14, 7)
+ Me.Label5.Name = "Label5"
+ Me.Label5.Size = New System.Drawing.Size(102, 13)
+ Me.Label5.TabIndex = 0
+ Me.Label5.Text = "Inertia incl. Flywheel"
+ '
+ 'ButCancel
+ '
+ 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(898, 460)
+ Me.ButCancel.Name = "ButCancel"
+ Me.ButCancel.Size = New System.Drawing.Size(75, 23)
+ Me.ButCancel.TabIndex = 13
+ Me.ButCancel.Text = "Cancel"
+ Me.ButCancel.UseVisualStyleBackColor = true
+ '
+ '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(817, 460)
+ Me.ButOK.Name = "ButOK"
+ Me.ButOK.Size = New System.Drawing.Size(75, 23)
+ Me.ButOK.TabIndex = 12
+ Me.ButOK.Text = "Save"
+ Me.ButOK.UseVisualStyleBackColor = true
+ '
+ 'ToolStrip1
+ '
+ Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
+ Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator3, Me.ToolStripBtSendTo, Me.ToolStripSeparator1, Me.ToolStripButton1})
+ Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
+ Me.ToolStrip1.Name = "ToolStrip1"
+ Me.ToolStrip1.Size = New System.Drawing.Size(985, 25)
+ Me.ToolStrip1.TabIndex = 30
+ Me.ToolStrip1.Text = "ToolStrip1"
+ '
+ 'ToolStripBtNew
+ '
+ Me.ToolStripBtNew.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+ Me.ToolStripBtNew.Image = Global.TUGraz.VECTO.My.Resources.Resources.blue_document_icon
+ Me.ToolStripBtNew.ImageTransparentColor = System.Drawing.Color.Magenta
+ Me.ToolStripBtNew.Name = "ToolStripBtNew"
+ Me.ToolStripBtNew.Size = New System.Drawing.Size(23, 22)
+ Me.ToolStripBtNew.Text = "ToolStripButton1"
+ Me.ToolStripBtNew.ToolTipText = "New"
+ '
+ 'ToolStripBtOpen
+ '
+ Me.ToolStripBtOpen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+ Me.ToolStripBtOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
+ Me.ToolStripBtOpen.ImageTransparentColor = System.Drawing.Color.Magenta
+ Me.ToolStripBtOpen.Name = "ToolStripBtOpen"
+ Me.ToolStripBtOpen.Size = New System.Drawing.Size(23, 22)
+ Me.ToolStripBtOpen.Text = "ToolStripButton1"
+ Me.ToolStripBtOpen.ToolTipText = "Open..."
+ '
+ 'ToolStripBtSave
+ '
+ Me.ToolStripBtSave.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+ Me.ToolStripBtSave.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_document_save_icon
+ Me.ToolStripBtSave.ImageTransparentColor = System.Drawing.Color.Magenta
+ Me.ToolStripBtSave.Name = "ToolStripBtSave"
+ Me.ToolStripBtSave.Size = New System.Drawing.Size(23, 22)
+ Me.ToolStripBtSave.Text = "ToolStripButton1"
+ Me.ToolStripBtSave.ToolTipText = "Save"
+ '
+ 'ToolStripBtSaveAs
+ '
+ Me.ToolStripBtSaveAs.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+ Me.ToolStripBtSaveAs.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_document_save_as_icon
+ Me.ToolStripBtSaveAs.ImageTransparentColor = System.Drawing.Color.Magenta
+ Me.ToolStripBtSaveAs.Name = "ToolStripBtSaveAs"
+ Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(23, 22)
+ Me.ToolStripBtSaveAs.Text = "ToolStripButton1"
+ Me.ToolStripBtSaveAs.ToolTipText = "Save As..."
+ '
+ 'ToolStripSeparator3
+ '
+ Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
+ Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 25)
+ '
+ 'ToolStripBtSendTo
+ '
+ Me.ToolStripBtSendTo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+ Me.ToolStripBtSendTo.Image = Global.TUGraz.VECTO.My.Resources.Resources.export_icon
+ Me.ToolStripBtSendTo.ImageTransparentColor = System.Drawing.Color.Magenta
+ Me.ToolStripBtSendTo.Name = "ToolStripBtSendTo"
+ Me.ToolStripBtSendTo.Size = New System.Drawing.Size(23, 22)
+ Me.ToolStripBtSendTo.Text = "Send to Job Editor"
+ Me.ToolStripBtSendTo.ToolTipText = "Send to Job 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.TUGraz.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})
+ Me.StatusStrip1.Location = New System.Drawing.Point(0, 486)
+ Me.StatusStrip1.Name = "StatusStrip1"
+ Me.StatusStrip1.Size = New System.Drawing.Size(985, 22)
+ Me.StatusStrip1.SizingGrip = false
+ Me.StatusStrip1.TabIndex = 37
+ Me.StatusStrip1.Text = "StatusStrip1"
+ '
+ 'LbStatus
+ '
+ Me.LbStatus.Name = "LbStatus"
+ Me.LbStatus.Size = New System.Drawing.Size(39, 17)
+ Me.LbStatus.Text = "Status"
+ '
+ 'Label1
+ '
+ Me.Label1.AutoSize = true
+ Me.Label1.Location = New System.Drawing.Point(186, 137)
+ Me.Label1.Name = "Label1"
+ Me.Label1.Size = New System.Drawing.Size(33, 13)
+ Me.Label1.TabIndex = 24
+ Me.Label1.Text = "[ccm]"
+ '
+ 'Label2
+ '
+ Me.Label2.AutoSize = true
+ Me.Label2.Location = New System.Drawing.Point(46, 137)
+ Me.Label2.Name = "Label2"
+ Me.Label2.Size = New System.Drawing.Size(71, 13)
+ Me.Label2.TabIndex = 13
+ Me.Label2.Text = "Displacement"
+ '
+ 'TbDispl
+ '
+ Me.TbDispl.Location = New System.Drawing.Point(123, 134)
+ Me.TbDispl.Name = "TbDispl"
+ Me.TbDispl.Size = New System.Drawing.Size(57, 20)
+ Me.TbDispl.TabIndex = 2
+ '
+ 'TbName
+ '
+ Me.TbName.Location = New System.Drawing.Point(123, 82)
+ Me.TbName.Name = "TbName"
+ Me.TbName.Size = New System.Drawing.Size(370, 20)
+ Me.TbName.TabIndex = 0
+ '
+ 'Label3
+ '
+ Me.Label3.AutoSize = true
+ Me.Label3.Location = New System.Drawing.Point(30, 85)
+ Me.Label3.Name = "Label3"
+ Me.Label3.Size = New System.Drawing.Size(87, 13)
+ Me.Label3.TabIndex = 11
+ Me.Label3.Text = "Make and Model"
+ '
+ 'TbMAP
+ '
+ Me.TbMAP.Location = New System.Drawing.Point(12, 271)
+ Me.TbMAP.Name = "TbMAP"
+ Me.TbMAP.Size = New System.Drawing.Size(434, 20)
+ Me.TbMAP.TabIndex = 5
+ '
+ 'Label6
+ '
+ Me.Label6.AutoSize = true
+ Me.Label6.Location = New System.Drawing.Point(12, 255)
+ Me.Label6.Name = "Label6"
+ Me.Label6.Size = New System.Drawing.Size(115, 13)
+ Me.Label6.TabIndex = 38
+ Me.Label6.Text = "Fuel Consumption Map"
+ '
+ 'BtMAP
+ '
+ Me.BtMAP.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
+ Me.BtMAP.Location = New System.Drawing.Point(446, 269)
+ Me.BtMAP.Name = "BtMAP"
+ Me.BtMAP.Size = New System.Drawing.Size(24, 24)
+ Me.BtMAP.TabIndex = 6
+ Me.BtMAP.TabStop = false
+ Me.BtMAP.UseVisualStyleBackColor = true
+ '
+ 'PictureBox1
+ '
+ Me.PictureBox1.BackColor = System.Drawing.Color.White
+ Me.PictureBox1.Image = Global.TUGraz.VECTO.My.Resources.Resources.VECTO_ENG
+ Me.PictureBox1.Location = New System.Drawing.Point(0, 28)
+ Me.PictureBox1.Name = "PictureBox1"
+ Me.PictureBox1.Size = New System.Drawing.Size(502, 40)
+ Me.PictureBox1.TabIndex = 39
+ Me.PictureBox1.TabStop = false
+ '
+ 'CmOpenFile
+ '
+ Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
+ Me.CmOpenFile.Name = "CmOpenFile"
+ Me.CmOpenFile.Size = New System.Drawing.Size(153, 48)
+ '
+ 'OpenWithToolStripMenuItem
+ '
+ Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem"
+ Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
+ Me.OpenWithToolStripMenuItem.Text = "Open with ..."
+ '
+ 'ShowInFolderToolStripMenuItem
+ '
+ Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem"
+ Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
+ Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
+ '
+ 'BtMAPopen
+ '
+ Me.BtMAPopen.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
+ Me.BtMAPopen.Location = New System.Drawing.Point(469, 269)
+ Me.BtMAPopen.Name = "BtMAPopen"
+ Me.BtMAPopen.Size = New System.Drawing.Size(24, 24)
+ Me.BtMAPopen.TabIndex = 7
+ Me.BtMAPopen.TabStop = false
+ Me.BtMAPopen.UseVisualStyleBackColor = true
+ '
+ 'PnInertia
+ '
+ Me.PnInertia.Controls.Add(Me.Label5)
+ Me.PnInertia.Controls.Add(Me.Label41)
+ Me.PnInertia.Controls.Add(Me.TbInertia)
+ Me.PnInertia.Location = New System.Drawing.Point(258, 184)
+ Me.PnInertia.Name = "PnInertia"
+ Me.PnInertia.Size = New System.Drawing.Size(229, 30)
+ Me.PnInertia.TabIndex = 3
+ '
+ 'GrWHTC
+ '
+ Me.GrWHTC.Controls.Add(Me.PnWhtcDeclaration)
+ Me.GrWHTC.Controls.Add(Me.PnWhtcEngineering)
+ Me.GrWHTC.Location = New System.Drawing.Point(12, 300)
+ Me.GrWHTC.Name = "GrWHTC"
+ Me.GrWHTC.Size = New System.Drawing.Size(481, 153)
+ Me.GrWHTC.TabIndex = 9
+ Me.GrWHTC.TabStop = false
+ Me.GrWHTC.Text = "WHTC Correction"
+ '
+ 'PnWhtcDeclaration
+ '
+ Me.PnWhtcDeclaration.Controls.Add(Me.Label20)
+ Me.PnWhtcDeclaration.Controls.Add(Me.tbRegPerCorrFactor)
+ Me.PnWhtcDeclaration.Controls.Add(Me.lblColdHotFactor)
+ Me.PnWhtcDeclaration.Controls.Add(Me.TbColdHotFactor)
+ Me.PnWhtcDeclaration.Controls.Add(Me.BtWHTCimport)
+ Me.PnWhtcDeclaration.Controls.Add(Me.Label4)
+ Me.PnWhtcDeclaration.Controls.Add(Me.Label7)
+ Me.PnWhtcDeclaration.Controls.Add(Me.Label13)
+ Me.PnWhtcDeclaration.Controls.Add(Me.Label8)
+ Me.PnWhtcDeclaration.Controls.Add(Me.TbWHTCmw)
+ Me.PnWhtcDeclaration.Controls.Add(Me.TbWHTCurban)
+ Me.PnWhtcDeclaration.Controls.Add(Me.TbWHTCrural)
+ Me.PnWhtcDeclaration.Location = New System.Drawing.Point(3, 19)
+ Me.PnWhtcDeclaration.Name = "PnWhtcDeclaration"
+ Me.PnWhtcDeclaration.Size = New System.Drawing.Size(472, 95)
+ Me.PnWhtcDeclaration.TabIndex = 8
+ '
+ 'Label20
+ '
+ Me.Label20.AutoSize = true
+ Me.Label20.Location = New System.Drawing.Point(99, 76)
+ Me.Label20.Name = "Label20"
+ Me.Label20.Size = New System.Drawing.Size(89, 13)
+ Me.Label20.TabIndex = 9
+ Me.Label20.Text = "Reg. Per. Corr. F."
+ '
+ 'tbRegPerCorrFactor
+ '
+ Me.tbRegPerCorrFactor.Location = New System.Drawing.Point(194, 73)
+ Me.tbRegPerCorrFactor.Name = "tbRegPerCorrFactor"
+ Me.tbRegPerCorrFactor.Size = New System.Drawing.Size(57, 20)
+ Me.tbRegPerCorrFactor.TabIndex = 10
+ '
+ 'lblColdHotFactor
+ '
+ Me.lblColdHotFactor.AutoSize = true
+ Me.lblColdHotFactor.Location = New System.Drawing.Point(3, 53)
+ Me.lblColdHotFactor.Name = "lblColdHotFactor"
+ Me.lblColdHotFactor.Size = New System.Drawing.Size(177, 13)
+ Me.lblColdHotFactor.TabIndex = 5
+ Me.lblColdHotFactor.Text = "Cold/Hot Emission Balancing Factor"
+ '
+ 'TbColdHotFactor
+ '
+ Me.TbColdHotFactor.Location = New System.Drawing.Point(194, 50)
+ Me.TbColdHotFactor.Name = "TbColdHotFactor"
+ Me.TbColdHotFactor.Size = New System.Drawing.Size(57, 20)
+ Me.TbColdHotFactor.TabIndex = 6
+ '
+ 'BtWHTCimport
+ '
+ Me.BtWHTCimport.Location = New System.Drawing.Point(299, 3)
+ Me.BtWHTCimport.Name = "BtWHTCimport"
+ Me.BtWHTCimport.Size = New System.Drawing.Size(170, 15)
+ Me.BtWHTCimport.TabIndex = 4
+ Me.BtWHTCimport.Text = "Import from VECTO-Engine"
+ Me.BtWHTCimport.UseVisualStyleBackColor = true
+ Me.BtWHTCimport.Visible = false
+ '
+ 'Label4
+ '
+ Me.Label4.AutoSize = true
+ Me.Label4.Location = New System.Drawing.Point(1, 27)
+ Me.Label4.Name = "Label4"
+ Me.Label4.Size = New System.Drawing.Size(36, 13)
+ Me.Label4.TabIndex = 0
+ Me.Label4.Text = "Urban"
+ '
+ 'Label7
+ '
+ Me.Label7.AutoSize = true
+ Me.Label7.Location = New System.Drawing.Point(156, 27)
+ Me.Label7.Name = "Label7"
+ Me.Label7.Size = New System.Drawing.Size(32, 13)
+ Me.Label7.TabIndex = 0
+ Me.Label7.Text = "Rural"
+ '
+ 'Label13
+ '
+ Me.Label13.AutoSize = true
+ Me.Label13.Location = New System.Drawing.Point(1, 5)
+ Me.Label13.Name = "Label13"
+ Me.Label13.Size = New System.Drawing.Size(242, 13)
+ Me.Label13.TabIndex = 3
+ Me.Label13.Text = "Correction Factors calculated with VECTO-Engine"
+ '
+ 'Label8
+ '
+ Me.Label8.AutoSize = true
+ Me.Label8.Location = New System.Drawing.Point(284, 27)
+ Me.Label8.Name = "Label8"
+ Me.Label8.Size = New System.Drawing.Size(53, 13)
+ Me.Label8.TabIndex = 0
+ Me.Label8.Text = "Motorway"
+ '
+ 'TbWHTCmw
+ '
+ Me.TbWHTCmw.Location = New System.Drawing.Point(343, 24)
+ Me.TbWHTCmw.Name = "TbWHTCmw"
+ Me.TbWHTCmw.Size = New System.Drawing.Size(57, 20)
+ Me.TbWHTCmw.TabIndex = 2
+ '
+ 'TbWHTCurban
+ '
+ Me.TbWHTCurban.Location = New System.Drawing.Point(43, 24)
+ Me.TbWHTCurban.Name = "TbWHTCurban"
+ Me.TbWHTCurban.Size = New System.Drawing.Size(57, 20)
+ Me.TbWHTCurban.TabIndex = 0
+ '
+ 'TbWHTCrural
+ '
+ Me.TbWHTCrural.Location = New System.Drawing.Point(194, 24)
+ Me.TbWHTCrural.Name = "TbWHTCrural"
+ Me.TbWHTCrural.Size = New System.Drawing.Size(57, 20)
+ Me.TbWHTCrural.TabIndex = 1
+ '
+ 'PnWhtcEngineering
+ '
+ Me.PnWhtcEngineering.Controls.Add(Me.TbWHTCEngineering)
+ Me.PnWhtcEngineering.Controls.Add(Me.lblWhtcEngineering)
+ Me.PnWhtcEngineering.Location = New System.Drawing.Point(3, 117)
+ Me.PnWhtcEngineering.Name = "PnWhtcEngineering"
+ Me.PnWhtcEngineering.Size = New System.Drawing.Size(472, 30)
+ Me.PnWhtcEngineering.TabIndex = 7
+ '
+ 'TbWHTCEngineering
+ '
+ Me.TbWHTCEngineering.Location = New System.Drawing.Point(194, 3)
+ Me.TbWHTCEngineering.Name = "TbWHTCEngineering"
+ Me.TbWHTCEngineering.Size = New System.Drawing.Size(57, 20)
+ Me.TbWHTCEngineering.TabIndex = 5
+ '
+ 'lblWhtcEngineering
+ '
+ Me.lblWhtcEngineering.AutoSize = true
+ Me.lblWhtcEngineering.Location = New System.Drawing.Point(125, 6)
+ Me.lblWhtcEngineering.Name = "lblWhtcEngineering"
+ Me.lblWhtcEngineering.Size = New System.Drawing.Size(63, 13)
+ Me.lblWhtcEngineering.TabIndex = 6
+ Me.lblWhtcEngineering.Text = "Engineering"
+ '
+ 'PicBox
+ '
+ Me.PicBox.BackColor = System.Drawing.Color.LightGray
+ Me.PicBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+ Me.PicBox.Location = New System.Drawing.Point(499, 28)
+ Me.PicBox.Name = "PicBox"
+ Me.PicBox.Size = New System.Drawing.Size(474, 392)
+ Me.PicBox.TabIndex = 40
+ Me.PicBox.TabStop = false
+ '
+ 'TbFLD
+ '
+ Me.TbFLD.Location = New System.Drawing.Point(12, 228)
+ Me.TbFLD.Name = "TbFLD"
+ Me.TbFLD.Size = New System.Drawing.Size(434, 20)
+ Me.TbFLD.TabIndex = 5
+ '
+ 'Label14
+ '
+ Me.Label14.AutoSize = true
+ Me.Label14.Location = New System.Drawing.Point(12, 212)
+ Me.Label14.Name = "Label14"
+ Me.Label14.Size = New System.Drawing.Size(128, 13)
+ Me.Label14.TabIndex = 38
+ Me.Label14.Text = "Full Load and Drag Curve"
+ '
+ 'BtFLD
+ '
+ Me.BtFLD.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
+ Me.BtFLD.Location = New System.Drawing.Point(446, 226)
+ Me.BtFLD.Name = "BtFLD"
+ Me.BtFLD.Size = New System.Drawing.Size(24, 24)
+ Me.BtFLD.TabIndex = 6
+ Me.BtFLD.TabStop = false
+ Me.BtFLD.UseVisualStyleBackColor = true
+ '
+ 'BtFLDopen
+ '
+ Me.BtFLDopen.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
+ Me.BtFLDopen.Location = New System.Drawing.Point(469, 226)
+ Me.BtFLDopen.Name = "BtFLDopen"
+ Me.BtFLDopen.Size = New System.Drawing.Size(24, 24)
+ Me.BtFLDopen.TabIndex = 7
+ Me.BtFLDopen.TabStop = false
+ Me.BtFLDopen.UseVisualStyleBackColor = true
+ '
+ 'tbRatedSpeed
+ '
+ Me.tbRatedSpeed.Location = New System.Drawing.Point(381, 108)
+ Me.tbRatedSpeed.Name = "tbRatedSpeed"
+ Me.tbRatedSpeed.Size = New System.Drawing.Size(57, 20)
+ Me.tbRatedSpeed.TabIndex = 41
+ '
+ 'Label9
+ '
+ Me.Label9.AutoSize = true
+ Me.Label9.Location = New System.Drawing.Point(304, 111)
+ Me.Label9.Name = "Label9"
+ Me.Label9.Size = New System.Drawing.Size(70, 13)
+ Me.Label9.TabIndex = 42
+ Me.Label9.Text = "Rated Speed"
+ '
+ 'Label10
+ '
+ Me.Label10.AutoSize = true
+ Me.Label10.Location = New System.Drawing.Point(444, 111)
+ Me.Label10.Name = "Label10"
+ Me.Label10.Size = New System.Drawing.Size(30, 13)
+ Me.Label10.TabIndex = 43
+ Me.Label10.Text = "[rpm]"
+ '
+ 'tbRatedPower
+ '
+ Me.tbRatedPower.Location = New System.Drawing.Point(381, 134)
+ Me.tbRatedPower.Name = "tbRatedPower"
+ Me.tbRatedPower.Size = New System.Drawing.Size(57, 20)
+ Me.tbRatedPower.TabIndex = 44
+ '
+ 'Label12
+ '
+ Me.Label12.AutoSize = true
+ Me.Label12.Location = New System.Drawing.Point(304, 137)
+ Me.Label12.Name = "Label12"
+ Me.Label12.Size = New System.Drawing.Size(69, 13)
+ Me.Label12.TabIndex = 45
+ Me.Label12.Text = "Rated Power"
+ '
+ 'Label15
+ '
+ Me.Label15.AutoSize = true
+ Me.Label15.Location = New System.Drawing.Point(444, 137)
+ Me.Label15.Name = "Label15"
+ Me.Label15.Size = New System.Drawing.Size(30, 13)
+ Me.Label15.TabIndex = 46
+ Me.Label15.Text = "[kW]"
+ '
+ 'tbMaxTorque
+ '
+ Me.tbMaxTorque.Location = New System.Drawing.Point(381, 158)
+ Me.tbMaxTorque.Name = "tbMaxTorque"
+ Me.tbMaxTorque.Size = New System.Drawing.Size(57, 20)
+ Me.tbMaxTorque.TabIndex = 47
+ '
+ 'Label16
+ '
+ Me.Label16.AutoSize = true
+ Me.Label16.Location = New System.Drawing.Point(309, 161)
+ Me.Label16.Name = "Label16"
+ Me.Label16.Size = New System.Drawing.Size(64, 13)
+ Me.Label16.TabIndex = 48
+ Me.Label16.Text = "Max Torque"
+ '
+ 'Label17
+ '
+ Me.Label17.AutoSize = true
+ Me.Label17.Location = New System.Drawing.Point(444, 161)
+ Me.Label17.Name = "Label17"
+ Me.Label17.Size = New System.Drawing.Size(29, 13)
+ Me.Label17.TabIndex = 49
+ Me.Label17.Text = "[Nm]"
+ '
+ 'Label18
+ '
+ Me.Label18.AutoSize = true
+ Me.Label18.Location = New System.Drawing.Point(63, 164)
+ Me.Label18.Name = "Label18"
+ Me.Label18.Size = New System.Drawing.Size(54, 13)
+ Me.Label18.TabIndex = 50
+ Me.Label18.Text = "Fuel Type"
+ '
+ 'cbFuelType
+ '
+ Me.cbFuelType.FormattingEnabled = true
+ Me.cbFuelType.Location = New System.Drawing.Point(123, 161)
+ Me.cbFuelType.Name = "cbFuelType"
+ Me.cbFuelType.Size = New System.Drawing.Size(143, 21)
+ Me.cbFuelType.TabIndex = 51
+ '
+ 'lblEngineCharacteristics
+ '
+ Me.lblEngineCharacteristics.AutoSize = true
+ Me.lblEngineCharacteristics.Location = New System.Drawing.Point(500, 433)
+ Me.lblEngineCharacteristics.Name = "lblEngineCharacteristics"
+ Me.lblEngineCharacteristics.Size = New System.Drawing.Size(0, 13)
+ Me.lblEngineCharacteristics.TabIndex = 52
+ '
+ 'EngineForm
+ '
+ Me.AcceptButton = Me.ButOK
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
+ Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+ Me.CancelButton = Me.ButCancel
+ Me.ClientSize = New System.Drawing.Size(985, 508)
+ Me.Controls.Add(Me.lblEngineCharacteristics)
+ Me.Controls.Add(Me.cbFuelType)
+ Me.Controls.Add(Me.Label18)
+ Me.Controls.Add(Me.tbMaxTorque)
+ Me.Controls.Add(Me.Label16)
+ Me.Controls.Add(Me.Label17)
+ Me.Controls.Add(Me.tbRatedPower)
+ Me.Controls.Add(Me.Label12)
+ Me.Controls.Add(Me.Label15)
+ Me.Controls.Add(Me.tbRatedSpeed)
+ Me.Controls.Add(Me.Label9)
+ Me.Controls.Add(Me.Label10)
+ Me.Controls.Add(Me.PicBox)
+ Me.Controls.Add(Me.GrWHTC)
+ Me.Controls.Add(Me.PnInertia)
+ Me.Controls.Add(Me.BtFLDopen)
+ Me.Controls.Add(Me.BtMAPopen)
+ Me.Controls.Add(Me.PictureBox1)
+ Me.Controls.Add(Me.BtFLD)
+ Me.Controls.Add(Me.BtMAP)
+ Me.Controls.Add(Me.Label14)
+ Me.Controls.Add(Me.Label6)
+ Me.Controls.Add(Me.TbNleerl)
+ Me.Controls.Add(Me.StatusStrip1)
+ Me.Controls.Add(Me.Label11)
+ Me.Controls.Add(Me.ToolStrip1)
+ Me.Controls.Add(Me.TbDispl)
+ Me.Controls.Add(Me.Label2)
+ Me.Controls.Add(Me.ButCancel)
+ Me.Controls.Add(Me.TbFLD)
+ Me.Controls.Add(Me.ButOK)
+ Me.Controls.Add(Me.TbMAP)
+ Me.Controls.Add(Me.Label3)
+ Me.Controls.Add(Me.Label40)
+ Me.Controls.Add(Me.Label1)
+ Me.Controls.Add(Me.TbName)
+ Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
+ Me.Icon = CType(resources.GetObject("$this.Icon"),System.Drawing.Icon)
+ Me.MaximizeBox = false
+ Me.Name = "EngineForm"
+ Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide
+ Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+ Me.Text = "F_ENG"
+ Me.ToolStrip1.ResumeLayout(false)
+ Me.ToolStrip1.PerformLayout
+ Me.StatusStrip1.ResumeLayout(false)
+ Me.StatusStrip1.PerformLayout
+ CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).EndInit
+ Me.CmOpenFile.ResumeLayout(false)
+ Me.PnInertia.ResumeLayout(false)
+ Me.PnInertia.PerformLayout
+ Me.GrWHTC.ResumeLayout(false)
+ Me.PnWhtcDeclaration.ResumeLayout(false)
+ Me.PnWhtcDeclaration.PerformLayout
+ Me.PnWhtcEngineering.ResumeLayout(false)
+ Me.PnWhtcEngineering.PerformLayout
+ CType(Me.PicBox,System.ComponentModel.ISupportInitialize).EndInit
+ Me.ResumeLayout(false)
+ Me.PerformLayout
- End Sub
+End Sub
Friend WithEvents TbNleerl As TextBox
Friend WithEvents Label11 As Label
Friend WithEvents TbInertia As TextBox
@@ -839,8 +819,6 @@ Partial Class EngineForm
Friend WithEvents TbColdHotFactor As System.Windows.Forms.TextBox
Friend WithEvents Label20 As System.Windows.Forms.Label
Friend WithEvents tbRegPerCorrFactor As System.Windows.Forms.TextBox
- Friend WithEvents Label19 As System.Windows.Forms.Label
- Friend WithEvents tbNCVCorrFactor As System.Windows.Forms.TextBox
Friend WithEvents tbRatedSpeed As System.Windows.Forms.TextBox
Friend WithEvents Label9 As System.Windows.Forms.Label
Friend WithEvents Label10 As System.Windows.Forms.Label
diff --git a/VECTO/GUI/EngineForm.vb b/VECTO/GUI/EngineForm.vb
index 15f98cfe1b90db447af4a11a4163ff81c3ab39bf..24327aab1270e38214589f8fc7e7b3b1e6ec1460 100644
--- a/VECTO/GUI/EngineForm.vb
+++ b/VECTO/GUI/EngineForm.vb
@@ -193,7 +193,6 @@ Public Class EngineForm
TbWHTCmw.Text = engine.WHTCMotorway.ToGUIFormat()
TbWHTCEngineering.Text = engine.WHTCEngineering.ToGUIFormat()
TbColdHotFactor.Text = engine.ColdHotBalancingFactor.ToGUIFormat()
- tbNCVCorrFactor.Text = engine.CorrectionFactorNCV.ToGUIFormat()
tbRegPerCorrFactor.Text = engine.CorrectionFactorRegPer.ToGUIFormat()
tbMaxTorque.Text = engine.MaxTorqueDeclared.ToGUIFormat()
tbRatedPower.Text = (engine.RatedPowerDeclared.Value()/1000).ToGUIFormat()
@@ -245,7 +244,6 @@ Public Class EngineForm
engine.WHTCRuralInput = TbWHTCrural.Text.ToDouble(0)
engine.WHTCMotorwayInput = TbWHTCmw.Text.ToDouble(0)
engine.WHTCEngineeringInput = TbWHTCEngineering.Text.ToDouble(0)
- engine.correctionFactorNCVInput = tbNCVCorrFactor.Text.ToDouble(0)
engine.correctionFactorRegPerInput = tbRegPerCorrFactor.Text.ToDouble(0)
engine.ColdHotBalancingFactorInput = TbColdHotFactor.Text.ToDouble(0)
diff --git a/VECTO/Input Files/Engine.vb b/VECTO/Input Files/Engine.vb
index 0fe8dece66939dcfd284f5ab224f354c3a96456d..8844e6825d2e925780f3eb268d3d0459d1229c14 100644
--- a/VECTO/Input Files/Engine.vb
+++ b/VECTO/Input Files/Engine.vb
@@ -108,7 +108,6 @@ Public Class Engine
Public ColdHotBalancingFactorInput As Double
Public correctionFactorRegPerInput As Double
- Public correctionFactorNCVInput As Double
Public FuelTypeInput As FuelType
Public ratedPowerInput As Watt
Public ratedSpeedInput As PerSecond
@@ -370,12 +369,6 @@ Public Class Engine
End Get
End Property
- Public ReadOnly Property CorrectionFactorNCV As Double Implements IEngineDeclarationInputData.CorrectionFactorNCV
- Get
- Return correctionFactorNCVInput
- End Get
- End Property
-
Public ReadOnly Property FuelType As FuelType Implements IEngineDeclarationInputData.FuelType
Get
Return FuelTypeInput
diff --git a/VECTO/OutputData/JSONFileWriter.vb b/VECTO/OutputData/JSONFileWriter.vb
index 7d95b1e2e47f8a522ec65e7492b04fa2e155238c..af4be0deb7ee360b9b2f6c96683b60e15b00a1a7 100644
--- a/VECTO/OutputData/JSONFileWriter.vb
+++ b/VECTO/OutputData/JSONFileWriter.vb
@@ -52,7 +52,6 @@ Public Class JSONFileWriter
body.Add("WHTC-Engineering", eng.WHTCEngineering)
body.Add("ColdHotBalancingFactor", eng.ColdHotBalancingFactor)
body.Add("CFRegPer", eng.CorrectionFactorRegPer)
- body.Add("CFNCV", eng.CorrectionFactorNCV)
body.Add("RatedPower", eng.RatedPowerDeclared.Value())
body.Add("RatedSpeed", eng.RatedSpeedDeclared.AsRPM)
body.Add("MaxTorque", eng.MaxTorqueDeclared.Value())
diff --git a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
index f1e54242a13f92abc131d48fd883b06430aebb49..9bbbb02469d54d708effc76a292701ee5de55ed8 100644
--- a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
@@ -356,8 +356,6 @@ namespace TUGraz.VectoCommon.InputData
double CorrectionFactorRegPer { get; }
- double CorrectionFactorNCV { get; }
-
FuelType FuelType { get; }
/// <summary>
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs
index fe1832aa758e763eca1ed3b999501e0af02fabda..d3971d189c5c60b96f44aefca74f5d4899c0fff9 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs
@@ -94,11 +94,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
}
- public override double CorrectionFactorNCV
- {
- get { return Body.GetEx<double>("CFNCV"); }
- }
-
public override FuelType FuelType
{
get { return Body.GetEx<string>("FuelType").ParseEnum<FuelType>(); }
@@ -220,11 +215,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
get { return 1; }
}
- public virtual double CorrectionFactorNCV
- {
- get { return 1; }
- }
-
public string Manufacturer
{
get { return "N/A"; }
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationEngineDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationEngineDataProvider.cs
index 7c48145fe1f7a0a884d49a3dea401950155618e9..84738d48b3ed874126c998279abc8b0e9f2ba19a 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationEngineDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationEngineDataProvider.cs
@@ -119,10 +119,5 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration
{
get { return GetDoubleElementValue(XMLNames.Engine_CorrectionFactor_RegPer); }
}
-
- public double CorrectionFactorNCV
- {
- get { return GetDoubleElementValue(XMLNames.Engine_CorrecionFactor_NCV); }
- }
}
-}
\ No newline at end of file
+}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/XMLEngineeringEngineDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/XMLEngineeringEngineDataProvider.cs
index fce8b3645497783a0a8504840d6823a24d78125d..661d3aa371a837f4c4dbeba02f6b280ca8f6f1d5 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/XMLEngineeringEngineDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/XMLEngineeringEngineDataProvider.cs
@@ -89,12 +89,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering
}
}
- public double CorrectionFactorNCV
- {
- get { return 1; //GetDoubleElementValue(XMLNames.Engine_CorrecionFactor_NCV);
- }
- }
-
public FuelType FuelType
{
get { return FuelType.DieselCI; //GetElementValue(XMLNames.Engine_FuelType).ParseEnum<FuelType>();
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs
index 09427161a5d535aeb2b24f01c7db0fc44df412fa..732d7fb4f0f9669a5bb9d7b5c6369eca07d34aa2 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs
@@ -71,9 +71,6 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
[Required, Range(double.MinValue, double.MaxValue)]
public double CorrectionFactorRegPer { get; internal set; }
- [Required, Range(double.MinValue, double.MaxValue)]
- public double CorrectionFactorNCV { get; internal set; }
-
public double FuelConsumptionCorrectionFactor { get; internal set; }
public PerSecond RatedSpeedDeclared { get; internal set; }
@@ -89,7 +86,6 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
WHTCUrban = 1;
WHTCMotorway = 1;
WHTCRural = 1;
- CorrectionFactorNCV = 1;
CorrectionFactorRegPer = 1;
FuelConsumptionCorrectionFactor = 1;
}
@@ -108,7 +104,6 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
ConsumptionMap = ConsumptionMap,
FullLoadCurves = FullLoadCurves,
CorrectionFactorRegPer = CorrectionFactorRegPer,
- CorrectionFactorNCV = CorrectionFactorNCV,
ColdHotCorrectionFactor = ColdHotCorrectionFactor,
FuelConsumptionCorrectionFactor = FuelConsumptionCorrectionFactor,
RatedPowerDeclared = RatedPowerDeclared,
diff --git a/VectoCore/VectoCoreTest/Utils/MockEngineDataProvider.cs b/VectoCore/VectoCoreTest/Utils/MockEngineDataProvider.cs
index 3c19b596cc5ffe76eec3bebb783733ad813737b8..f857cd088e1604a06af5a162e084678a160a5c44 100644
--- a/VectoCore/VectoCoreTest/Utils/MockEngineDataProvider.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockEngineDataProvider.cs
@@ -29,41 +29,40 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
-using System.Data;
-using TUGraz.VectoCommon.InputData;
-using TUGraz.VectoCommon.Models;
-using TUGraz.VectoCommon.Utils;
-
-namespace TUGraz.VectoCore.Tests.Utils
-{
- public class MockEngineDataProvider : IEngineEngineeringInputData
- {
- public DataSourceType SourceType { get; set; }
- public string Source { get; set; }
- public bool SavedInDeclarationMode { get; set; }
- public string Manufacturer { get; set; }
- public string Model { get; set; }
- public string Creator { get; set; }
- public string Date { get; set; }
- public string TechnicalReportId { get; set; }
- public CertificationMethod CertificationMethod { get{return CertificationMethod.NotCertified;} }
- public string CertificationNumber { get; set; }
- public string DigestValue { get; set; }
- public CubicMeter Displacement { get; set; }
- public PerSecond IdleSpeed { get; set; }
- public double WHTCMotorway { get; set; }
- public double WHTCRural { get; set; }
- public double WHTCUrban { get; set; }
- public double ColdHotBalancingFactor { get; set; }
- public double CorrectionFactorRegPer { get; set; }
- public double CorrectionFactorNCV { get; set; }
- public FuelType FuelType { get; set; }
- public TableData FuelConsumptionMap { get; set; }
- public TableData FullLoadCurve { get; set; }
- public Watt RatedPowerDeclared { get; set; }
- public PerSecond RatedSpeedDeclared { get; set; }
- public NewtonMeter MaxTorqueDeclared { get; set; }
- public KilogramSquareMeter Inertia { get; set; }
- public double WHTCEngineering { get; set; }
- }
+using System.Data;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
+
+namespace TUGraz.VectoCore.Tests.Utils
+{
+ public class MockEngineDataProvider : IEngineEngineeringInputData
+ {
+ public DataSourceType SourceType { get; set; }
+ public string Source { get; set; }
+ public bool SavedInDeclarationMode { get; set; }
+ public string Manufacturer { get; set; }
+ public string Model { get; set; }
+ public string Creator { get; set; }
+ public string Date { get; set; }
+ public string TechnicalReportId { get; set; }
+ public CertificationMethod CertificationMethod { get{return CertificationMethod.NotCertified;} }
+ public string CertificationNumber { get; set; }
+ public string DigestValue { get; set; }
+ public CubicMeter Displacement { get; set; }
+ public PerSecond IdleSpeed { get; set; }
+ public double WHTCMotorway { get; set; }
+ public double WHTCRural { get; set; }
+ public double WHTCUrban { get; set; }
+ public double ColdHotBalancingFactor { get; set; }
+ public double CorrectionFactorRegPer { get; set; }
+ public FuelType FuelType { get; set; }
+ public TableData FuelConsumptionMap { get; set; }
+ public TableData FullLoadCurve { get; set; }
+ public Watt RatedPowerDeclared { get; set; }
+ public PerSecond RatedSpeedDeclared { get; set; }
+ public NewtonMeter MaxTorqueDeclared { get; set; }
+ public KilogramSquareMeter Inertia { get; set; }
+ public double WHTCEngineering { get; set; }
+ }
}
\ No newline at end of file