From d0aa4a9e8a1e2d7ded0f9f123abc46ba17dd8716 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Wed, 19 Dec 2018 13:17:25 +0100
Subject: [PATCH] removing ncv of test fuel (adding note in gui)
---
VECTO/GUI/VectoVTPJobForm.Designer.vb | 250 ++++++++++--------
VECTO/GUI/VectoVTPJobForm.vb | 128 +++++----
VECTO/Input Files/VectoEPTPJob.vb | 3 -
VECTO/OutputData/JSONFileWriter.vb | 1 -
.../InputData/VTPDeclarationInputData.cs | 2 -
.../InputData/FileIO/JSON/JSONInputData.cs | 5 -
6 files changed, 215 insertions(+), 174 deletions(-)
diff --git a/VECTO/GUI/VectoVTPJobForm.Designer.vb b/VECTO/GUI/VectoVTPJobForm.Designer.vb
index e48b774716..12549309a3 100644
--- a/VECTO/GUI/VectoVTPJobForm.Designer.vb
+++ b/VECTO/GUI/VectoVTPJobForm.Designer.vb
@@ -69,26 +69,28 @@ Partial Class VectoVTPJobForm
Me.lblEngineCharacteristics = New System.Windows.Forms.Label()
Me.PictureBox2 = New System.Windows.Forms.PictureBox()
Me.GroupBox1 = New System.Windows.Forms.GroupBox()
- Me.Label7 = New System.Windows.Forms.Label()
Me.tbFanDiameter = New System.Windows.Forms.TextBox()
- Me.Label6 = New System.Windows.Forms.Label()
+ Me.Label7 = New System.Windows.Forms.Label()
+ Me.pnFanParameters = New System.Windows.Forms.Panel()
+ Me.Label11 = New System.Windows.Forms.Label()
+ Me.Label10 = New System.Windows.Forms.Label()
+ Me.Label9 = New System.Windows.Forms.Label()
+ Me.Label1 = New System.Windows.Forms.Label()
+ Me.tbC1 = New System.Windows.Forms.TextBox()
+ Me.Label3 = New System.Windows.Forms.Label()
Me.tbC3 = New System.Windows.Forms.TextBox()
- Me.Label4 = New System.Windows.Forms.Label()
Me.tbC2 = New System.Windows.Forms.TextBox()
- Me.Label3 = New System.Windows.Forms.Label()
- Me.tbC1 = New System.Windows.Forms.TextBox()
- Me.Label1 = New System.Windows.Forms.Label()
+ Me.Label4 = New System.Windows.Forms.Label()
+ Me.Label6 = New System.Windows.Forms.Label()
Me.Label5 = New System.Windows.Forms.Label()
Me.pnManufacturerRecord = New System.Windows.Forms.Panel()
Me.lblMileageUnit = New System.Windows.Forms.Label()
Me.tbMileage = New System.Windows.Forms.TextBox()
Me.lblMileage = New System.Windows.Forms.Label()
- Me.lblNCVUnit = New System.Windows.Forms.Label()
- Me.tbNCV = New System.Windows.Forms.TextBox()
- Me.lblNCV = New System.Windows.Forms.Label()
Me.Label8 = New System.Windows.Forms.Label()
Me.tbManufacturerRecord = New System.Windows.Forms.TextBox()
Me.ButtonManR = New System.Windows.Forms.Button()
+ Me.Label12 = New System.Windows.Forms.Label()
Me.GrCycles.SuspendLayout
Me.GrAux.SuspendLayout
Me.StatusStrip1.SuspendLayout
@@ -99,6 +101,7 @@ Partial Class VectoVTPJobForm
CType(Me.PicBox,System.ComponentModel.ISupportInitialize).BeginInit
CType(Me.PictureBox2,System.ComponentModel.ISupportInitialize).BeginInit
Me.GroupBox1.SuspendLayout
+ Me.pnFanParameters.SuspendLayout
Me.pnManufacturerRecord.SuspendLayout
Me.SuspendLayout
'
@@ -106,13 +109,14 @@ Partial Class VectoVTPJobForm
'
Me.GrCycles.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.GrCycles.Controls.Add(Me.Label12)
Me.GrCycles.Controls.Add(Me.Label2)
Me.GrCycles.Controls.Add(Me.LvCycles)
Me.GrCycles.Controls.Add(Me.BtDRIrem)
Me.GrCycles.Controls.Add(Me.BtDRIadd)
Me.GrCycles.Location = New System.Drawing.Point(11, 324)
Me.GrCycles.Name = "GrCycles"
- Me.GrCycles.Size = New System.Drawing.Size(515, 138)
+ Me.GrCycles.Size = New System.Drawing.Size(515, 166)
Me.GrCycles.TabIndex = 10
Me.GrCycles.TabStop = false
Me.GrCycles.Text = "Cycles"
@@ -122,7 +126,7 @@ Partial Class VectoVTPJobForm
Me.Label2.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.Label2.AutoSize = true
- Me.Label2.Location = New System.Drawing.Point(391, 109)
+ Me.Label2.Location = New System.Drawing.Point(391, 137)
Me.Label2.Name = "Label2"
Me.Label2.Size = New System.Drawing.Size(118, 13)
Me.Label2.TabIndex = 3
@@ -139,10 +143,10 @@ Partial Class VectoVTPJobForm
Me.LvCycles.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None
Me.LvCycles.HideSelection = false
Me.LvCycles.LabelEdit = true
- Me.LvCycles.Location = New System.Drawing.Point(6, 19)
+ Me.LvCycles.Location = New System.Drawing.Point(6, 40)
Me.LvCycles.MultiSelect = false
Me.LvCycles.Name = "LvCycles"
- Me.LvCycles.Size = New System.Drawing.Size(503, 89)
+ Me.LvCycles.Size = New System.Drawing.Size(503, 96)
Me.LvCycles.TabIndex = 0
Me.LvCycles.TabStop = false
Me.LvCycles.UseCompatibleStateImageBehavior = false
@@ -158,7 +162,7 @@ Partial Class VectoVTPJobForm
Me.BtDRIrem.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.BtDRIrem.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
- Me.BtDRIrem.Location = New System.Drawing.Point(29, 109)
+ Me.BtDRIrem.Location = New System.Drawing.Point(29, 137)
Me.BtDRIrem.Name = "BtDRIrem"
Me.BtDRIrem.Size = New System.Drawing.Size(24, 24)
Me.BtDRIrem.TabIndex = 2
@@ -169,7 +173,7 @@ Partial Class VectoVTPJobForm
Me.BtDRIadd.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.BtDRIadd.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
- Me.BtDRIadd.Location = New System.Drawing.Point(5, 109)
+ Me.BtDRIadd.Location = New System.Drawing.Point(5, 137)
Me.BtDRIadd.Name = "BtDRIadd"
Me.BtDRIadd.Size = New System.Drawing.Size(24, 24)
Me.BtDRIadd.TabIndex = 1
@@ -243,7 +247,7 @@ Partial Class VectoVTPJobForm
'StatusStrip1
'
Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripStatusLabelGEN})
- Me.StatusStrip1.Location = New System.Drawing.Point(0, 609)
+ Me.StatusStrip1.Location = New System.Drawing.Point(0, 635)
Me.StatusStrip1.Name = "StatusStrip1"
Me.StatusStrip1.Size = New System.Drawing.Size(944, 22)
Me.StatusStrip1.SizingGrip = false
@@ -259,7 +263,7 @@ Partial Class VectoVTPJobForm
'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(778, 582)
+ Me.ButOK.Location = New System.Drawing.Point(778, 608)
Me.ButOK.Name = "ButOK"
Me.ButOK.Size = New System.Drawing.Size(75, 23)
Me.ButOK.TabIndex = 0
@@ -270,7 +274,7 @@ Partial Class VectoVTPJobForm
'
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(859, 582)
+ Me.ButCancel.Location = New System.Drawing.Point(859, 608)
Me.ButCancel.Name = "ButCancel"
Me.ButCancel.Size = New System.Drawing.Size(75, 23)
Me.ButCancel.TabIndex = 1
@@ -477,95 +481,133 @@ Partial Class VectoVTPJobForm
'
'GroupBox1
'
- Me.GroupBox1.Controls.Add(Me.Label7)
Me.GroupBox1.Controls.Add(Me.tbFanDiameter)
- Me.GroupBox1.Controls.Add(Me.Label6)
- Me.GroupBox1.Controls.Add(Me.tbC3)
- Me.GroupBox1.Controls.Add(Me.Label4)
- Me.GroupBox1.Controls.Add(Me.tbC2)
- Me.GroupBox1.Controls.Add(Me.Label3)
- Me.GroupBox1.Controls.Add(Me.tbC1)
- Me.GroupBox1.Controls.Add(Me.Label1)
+ Me.GroupBox1.Controls.Add(Me.Label7)
+ Me.GroupBox1.Controls.Add(Me.pnFanParameters)
Me.GroupBox1.Controls.Add(Me.PictureBox2)
- Me.GroupBox1.Location = New System.Drawing.Point(10, 468)
+ Me.GroupBox1.Controls.Add(Me.Label6)
+ Me.GroupBox1.Location = New System.Drawing.Point(10, 496)
Me.GroupBox1.Name = "GroupBox1"
- Me.GroupBox1.Size = New System.Drawing.Size(515, 135)
+ Me.GroupBox1.Size = New System.Drawing.Size(517, 135)
Me.GroupBox1.TabIndex = 39
Me.GroupBox1.TabStop = false
Me.GroupBox1.Text = "Fan Power"
'
+ 'tbFanDiameter
+ '
+ Me.tbFanDiameter.Location = New System.Drawing.Point(371, 13)
+ Me.tbFanDiameter.Name = "tbFanDiameter"
+ Me.tbFanDiameter.Size = New System.Drawing.Size(86, 20)
+ Me.tbFanDiameter.TabIndex = 46
+ '
'Label7
'
Me.Label7.AutoSize = true
- Me.Label7.Location = New System.Drawing.Point(477, 32)
+ Me.Label7.Location = New System.Drawing.Point(463, 16)
Me.Label7.Name = "Label7"
Me.Label7.Size = New System.Drawing.Size(29, 13)
Me.Label7.TabIndex = 47
Me.Label7.Text = "[mm]"
'
- 'tbFanDiameter
+ 'pnFanParameters
+ '
+ Me.pnFanParameters.Controls.Add(Me.Label11)
+ Me.pnFanParameters.Controls.Add(Me.Label10)
+ Me.pnFanParameters.Controls.Add(Me.Label9)
+ Me.pnFanParameters.Controls.Add(Me.Label1)
+ Me.pnFanParameters.Controls.Add(Me.tbC1)
+ Me.pnFanParameters.Controls.Add(Me.Label3)
+ Me.pnFanParameters.Controls.Add(Me.tbC3)
+ Me.pnFanParameters.Controls.Add(Me.tbC2)
+ Me.pnFanParameters.Controls.Add(Me.Label4)
+ Me.pnFanParameters.Location = New System.Drawing.Point(290, 39)
+ Me.pnFanParameters.Name = "pnFanParameters"
+ Me.pnFanParameters.Size = New System.Drawing.Size(218, 88)
+ Me.pnFanParameters.TabIndex = 48
+ '
+ 'Label11
+ '
+ Me.Label11.AutoSize = true
+ Me.Label11.Location = New System.Drawing.Point(173, 63)
+ Me.Label11.Name = "Label11"
+ Me.Label11.Size = New System.Drawing.Size(29, 13)
+ Me.Label11.TabIndex = 50
+ Me.Label11.Text = "[mm]"
+ '
+ 'Label10
+ '
+ Me.Label10.AutoSize = true
+ Me.Label10.Location = New System.Drawing.Point(173, 37)
+ Me.Label10.Name = "Label10"
+ Me.Label10.Size = New System.Drawing.Size(30, 13)
+ Me.Label10.TabIndex = 49
+ Me.Label10.Text = "[rpm]"
+ '
+ 'Label9
+ '
+ Me.Label9.AutoSize = true
+ Me.Label9.Location = New System.Drawing.Point(173, 11)
+ Me.Label9.Name = "Label9"
+ Me.Label9.Size = New System.Drawing.Size(30, 13)
+ Me.Label9.TabIndex = 48
+ Me.Label9.Text = "[kW]"
'
- Me.tbFanDiameter.Location = New System.Drawing.Point(371, 29)
- Me.tbFanDiameter.Name = "tbFanDiameter"
- Me.tbFanDiameter.Size = New System.Drawing.Size(100, 20)
- Me.tbFanDiameter.TabIndex = 46
+ 'Label1
'
- 'Label6
+ Me.Label1.AutoSize = true
+ Me.Label1.Location = New System.Drawing.Point(52, 11)
+ Me.Label1.Name = "Label1"
+ Me.Label1.Size = New System.Drawing.Size(23, 13)
+ Me.Label1.TabIndex = 39
+ Me.Label1.Text = "C1:"
'
- Me.Label6.AutoSize = true
- Me.Label6.Location = New System.Drawing.Point(294, 32)
- Me.Label6.Name = "Label6"
- Me.Label6.Size = New System.Drawing.Size(71, 13)
- Me.Label6.TabIndex = 45
- Me.Label6.Text = "Fan diameter:"
+ 'tbC1
+ '
+ Me.tbC1.Location = New System.Drawing.Point(81, 8)
+ Me.tbC1.Name = "tbC1"
+ Me.tbC1.Size = New System.Drawing.Size(86, 20)
+ Me.tbC1.TabIndex = 40
+ '
+ 'Label3
+ '
+ Me.Label3.AutoSize = true
+ Me.Label3.Location = New System.Drawing.Point(52, 37)
+ Me.Label3.Name = "Label3"
+ Me.Label3.Size = New System.Drawing.Size(23, 13)
+ Me.Label3.TabIndex = 41
+ Me.Label3.Text = "C2:"
'
'tbC3
'
- Me.tbC3.Location = New System.Drawing.Point(371, 107)
+ Me.tbC3.Location = New System.Drawing.Point(81, 60)
Me.tbC3.Name = "tbC3"
- Me.tbC3.Size = New System.Drawing.Size(100, 20)
+ Me.tbC3.Size = New System.Drawing.Size(86, 20)
Me.tbC3.TabIndex = 44
'
+ 'tbC2
+ '
+ Me.tbC2.Location = New System.Drawing.Point(81, 34)
+ Me.tbC2.Name = "tbC2"
+ Me.tbC2.Size = New System.Drawing.Size(86, 20)
+ Me.tbC2.TabIndex = 42
+ '
'Label4
'
Me.Label4.AutoSize = true
- Me.Label4.Location = New System.Drawing.Point(342, 110)
+ Me.Label4.Location = New System.Drawing.Point(52, 63)
Me.Label4.Name = "Label4"
Me.Label4.Size = New System.Drawing.Size(23, 13)
Me.Label4.TabIndex = 43
Me.Label4.Text = "C3:"
'
- 'tbC2
- '
- Me.tbC2.Location = New System.Drawing.Point(371, 81)
- Me.tbC2.Name = "tbC2"
- Me.tbC2.Size = New System.Drawing.Size(100, 20)
- Me.tbC2.TabIndex = 42
- '
- 'Label3
- '
- Me.Label3.AutoSize = true
- Me.Label3.Location = New System.Drawing.Point(342, 84)
- Me.Label3.Name = "Label3"
- Me.Label3.Size = New System.Drawing.Size(23, 13)
- Me.Label3.TabIndex = 41
- Me.Label3.Text = "C2:"
- '
- 'tbC1
- '
- Me.tbC1.Location = New System.Drawing.Point(371, 55)
- Me.tbC1.Name = "tbC1"
- Me.tbC1.Size = New System.Drawing.Size(100, 20)
- Me.tbC1.TabIndex = 40
- '
- 'Label1
+ 'Label6
'
- Me.Label1.AutoSize = true
- Me.Label1.Location = New System.Drawing.Point(342, 58)
- Me.Label1.Name = "Label1"
- Me.Label1.Size = New System.Drawing.Size(23, 13)
- Me.Label1.TabIndex = 39
- Me.Label1.Text = "C1:"
+ Me.Label6.AutoSize = true
+ Me.Label6.Location = New System.Drawing.Point(294, 16)
+ Me.Label6.Name = "Label6"
+ Me.Label6.Size = New System.Drawing.Size(71, 13)
+ Me.Label6.TabIndex = 45
+ Me.Label6.Text = "Fan diameter:"
'
'Label5
'
@@ -581,9 +623,6 @@ Partial Class VectoVTPJobForm
Me.pnManufacturerRecord.Controls.Add(Me.lblMileageUnit)
Me.pnManufacturerRecord.Controls.Add(Me.tbMileage)
Me.pnManufacturerRecord.Controls.Add(Me.lblMileage)
- Me.pnManufacturerRecord.Controls.Add(Me.lblNCVUnit)
- Me.pnManufacturerRecord.Controls.Add(Me.tbNCV)
- Me.pnManufacturerRecord.Controls.Add(Me.lblNCV)
Me.pnManufacturerRecord.Controls.Add(Me.Label8)
Me.pnManufacturerRecord.Controls.Add(Me.tbManufacturerRecord)
Me.pnManufacturerRecord.Controls.Add(Me.ButtonManR)
@@ -595,7 +634,7 @@ Partial Class VectoVTPJobForm
'lblMileageUnit
'
Me.lblMileageUnit.AutoSize = true
- Me.lblMileageUnit.Location = New System.Drawing.Point(476, 43)
+ Me.lblMileageUnit.Location = New System.Drawing.Point(199, 43)
Me.lblMileageUnit.Name = "lblMileageUnit"
Me.lblMileageUnit.Size = New System.Drawing.Size(27, 13)
Me.lblMileageUnit.TabIndex = 49
@@ -605,7 +644,7 @@ Partial Class VectoVTPJobForm
'
Me.tbMileage.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.tbMileage.Location = New System.Drawing.Point(394, 40)
+ Me.tbMileage.Location = New System.Drawing.Point(117, 40)
Me.tbMileage.Name = "tbMileage"
Me.tbMileage.Size = New System.Drawing.Size(76, 20)
Me.tbMileage.TabIndex = 48
@@ -613,39 +652,12 @@ Partial Class VectoVTPJobForm
'lblMileage
'
Me.lblMileage.AutoSize = true
- Me.lblMileage.Location = New System.Drawing.Point(281, 43)
+ Me.lblMileage.Location = New System.Drawing.Point(4, 43)
Me.lblMileage.Name = "lblMileage"
Me.lblMileage.Size = New System.Drawing.Size(47, 13)
Me.lblMileage.TabIndex = 47
Me.lblMileage.Text = "Mileage:"
'
- 'lblNCVUnit
- '
- Me.lblNCVUnit.AutoSize = true
- Me.lblNCVUnit.Location = New System.Drawing.Point(199, 43)
- Me.lblNCVUnit.Name = "lblNCVUnit"
- Me.lblNCVUnit.Size = New System.Drawing.Size(44, 13)
- Me.lblNCVUnit.TabIndex = 46
- Me.lblNCVUnit.Text = "[MJ/kg]"
- '
- 'tbNCV
- '
- Me.tbNCV.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.tbNCV.Location = New System.Drawing.Point(117, 40)
- Me.tbNCV.Name = "tbNCV"
- Me.tbNCV.Size = New System.Drawing.Size(76, 20)
- Me.tbNCV.TabIndex = 45
- '
- 'lblNCV
- '
- Me.lblNCV.AutoSize = true
- Me.lblNCV.Location = New System.Drawing.Point(4, 43)
- Me.lblNCV.Name = "lblNCV"
- Me.lblNCV.Size = New System.Drawing.Size(79, 13)
- Me.lblNCV.TabIndex = 44
- Me.lblNCV.Text = "NCV Test Fuel:"
- '
'Label8
'
Me.Label8.AutoSize = true
@@ -675,13 +687,25 @@ Partial Class VectoVTPJobForm
Me.ButtonManR.TabStop = false
Me.ButtonManR.UseVisualStyleBackColor = true
'
+ 'Label12
+ '
+ Me.Label12.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.Label12.AutoSize = true
+ Me.Label12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ Me.Label12.Location = New System.Drawing.Point(6, 20)
+ Me.Label12.Name = "Label12"
+ Me.Label12.Size = New System.Drawing.Size(426, 13)
+ Me.Label12.TabIndex = 4
+ Me.Label12.Text = "The fuel cocnsumption in the cycle has to be corrected for standard NCV!"
+ '
'VectoVTPJobForm
'
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(944, 631)
+ Me.ClientSize = New System.Drawing.Size(944, 657)
Me.Controls.Add(Me.pnManufacturerRecord)
Me.Controls.Add(Me.Label5)
Me.Controls.Add(Me.GroupBox1)
@@ -723,6 +747,8 @@ Partial Class VectoVTPJobForm
CType(Me.PictureBox2,System.ComponentModel.ISupportInitialize).EndInit
Me.GroupBox1.ResumeLayout(false)
Me.GroupBox1.PerformLayout
+ Me.pnFanParameters.ResumeLayout(false)
+ Me.pnFanParameters.PerformLayout
Me.pnManufacturerRecord.ResumeLayout(false)
Me.pnManufacturerRecord.PerformLayout
Me.ResumeLayout(false)
@@ -788,7 +814,9 @@ End Sub
Friend WithEvents lblMileageUnit As Label
Friend WithEvents tbMileage As TextBox
Friend WithEvents lblMileage As Label
- Friend WithEvents lblNCVUnit As Label
- Friend WithEvents tbNCV As TextBox
- Friend WithEvents lblNCV As Label
+ Friend WithEvents pnFanParameters As Panel
+ Friend WithEvents Label11 As Label
+ Friend WithEvents Label10 As Label
+ Friend WithEvents Label9 As Label
+ Friend WithEvents Label12 As Label
End Class
diff --git a/VECTO/GUI/VectoVTPJobForm.vb b/VECTO/GUI/VectoVTPJobForm.vb
index e667c47311..53e0cada6b 100644
--- a/VECTO/GUI/VectoVTPJobForm.vb
+++ b/VECTO/GUI/VectoVTPJobForm.vb
@@ -46,18 +46,18 @@ Public Class VectoVTPJobForm
End Enum
-
'Initialise form
Private Sub F02_GEN_Load(sender As Object, e As EventArgs) Handles Me.Load
_auxDialog = New VehicleAuxiliariesDialog
- LvAux.Columns(AuxViewColumns.AuxInputOrTech).Width = -2
+ LvAux.Columns(AuxViewColumns.AuxInputOrTech).Width = - 2
LvAux.Columns(AuxViewColumns.AuxInputOrTech).Text = "Technology"
pnManufacturerRecord.Visible = cfg.DeclMode
+ pnFanParameters.Enabled = Not cfg.DeclMode
GrCycles.Enabled = True
@@ -72,8 +72,6 @@ Public Class VectoVTPJobForm
End Sub
-
-
#Region "Browse Buttons"
Private Sub ButtonVEH_Click(sender As Object, e As EventArgs) Handles ButtonVEH.Click
@@ -130,7 +128,7 @@ Public Class VectoVTPJobForm
If File.Exists(MyAppPath & "User Manual\help.html") Then
Dim defaultBrowserPath As String = BrowserUtils.GetDefaultBrowserPath()
Process.Start(defaultBrowserPath,
- String.Format("""file://{0}{1}""", MyAppPath, "User Manual\help.html#job-editor"))
+ String.Format("""file://{0}{1}""", MyAppPath, "User Manual\help.html#job-editor"))
Else
MsgBox("User Manual not found!", MsgBoxStyle.Critical)
End If
@@ -182,7 +180,7 @@ Public Class VectoVTPJobForm
Close()
MainForm.RbDecl.Checked = Not MainForm.RbDecl.Checked
MainForm.OpenVectoFile(file)
- Case -1
+ Case - 1
Exit Sub
End Select
End If
@@ -194,26 +192,32 @@ Public Class VectoVTPJobForm
'Files -----------------------------
TbVEH.Text = GetRelativePath(inputData.JobInputData.Vehicle.Source, _basePath)
- tbManufacturerRecord.Text = If (cfg.DeclMode, GetRelativePath(inputData.JobInputData.ManufacturerReportInputData.Source, _basePath), "")
+ tbManufacturerRecord.Text =
+ If (cfg.DeclMode, GetRelativePath(inputData.JobInputData.ManufacturerReportInputData.Source, _basePath), "")
Dim auxInput As IAuxiliariesDeclarationInputData = inputData.JobInputData.Vehicle.AuxiliaryInputData()
PopulateAuxiliaryList(auxInput)
tbMileage.Text = if(Cfg.DeclMode, inputData.JobInputData.Mileage.ConvertToKiloMeter().Value.ToGUIFormat(), "")
- tbNCV.Text = if (Cfg.DeclMode, inputData.JobInputData.NetCalorificValueTestFuel.ConvertToMegaJoulePerKilogram().Value.ToGUIFormat(), "")
-
- Dim coefficients As Double() = vectoJob.FanPowerCoefficents.ToArray()
- If (coefficients.Length >= 1) Then
- tbC1.Text = coefficients(0).ToGUIFormat()
- End If
- If (coefficients.Length >= 2) Then
- tbC2.Text = coefficients(1).ToGUIFormat()
- End If
- If (coefficients.Length >= 3) Then
- tbC3.Text = coefficients(2).ToGUIFormat()
+
+ If cfg.DeclMode Then
+ tbC1.Text = DeclarationData.VTPMode.FanParameters(0).ToGUIFormat()
+ tbC2.Text = DeclarationData.VTPMode.FanParameters(1).ToGUIFormat()
+ tbC3.Text = DeclarationData.VTPMode.FanParameters(2).ToGUIFormat()
+ Else
+ Dim coefficients As Double() = vectoJob.FanPowerCoefficents.ToArray()
+ If (coefficients.Length >= 1) Then
+ tbC1.Text = coefficients(0).ToGUIFormat()
+ End If
+ If (coefficients.Length >= 2) Then
+ tbC2.Text = coefficients(1).ToGUIFormat()
+ End If
+ If (coefficients.Length >= 3) Then
+ tbC3.Text = coefficients(2).ToGUIFormat()
+ End If
End If
- tbFanDiameter.Text = (vectoJob.FanDiameter.Value() * 1000).ToGUIFormat()
+ tbFanDiameter.Text = (vectoJob.FanDiameter.Value()*1000).ToGUIFormat()
Try
Dim sb As ICycleData
For Each sb In vectoJob.Cycles
@@ -248,7 +252,8 @@ Public Class VectoVTPJobForm
'If entry.AuxiliaryType = AuxiliaryDemandType.Constant Then Continue For
Try
LvAux.Items.Add(CreateAuxListEntry(AuxiliaryTypeHelper.GetAuxKey(entry.Type),
- AuxiliaryTypeHelper.ToString(entry.Type), String.Join("; ", entry.Technology)))
+ AuxiliaryTypeHelper.ToString(entry.Type),
+ String.Join("; ", entry.Technology)))
Catch ex As Exception
End Try
Next
@@ -274,7 +279,7 @@ Public Class VectoVTPJobForm
'Files ------------------------------------------------- -----------------
vectoJob.PathVeh = TbVEH.Text
- vectoJob.ManufacturerRecord = If(cfg.DeclMode, tbManufacturerRecord.Text, "")
+ vectoJob.ManufacturerRecord = If(cfg.DeclMode, tbManufacturerRecord.Text, "")
For Each lv0 As ListViewItem In LvCycles.Items
@@ -283,16 +288,14 @@ Public Class VectoVTPJobForm
vectoJob.CycleFiles.Add(sb)
Next
- vectoJob.Mileage = tbMileage.Text.ToDouble(0).SI(Unit.SI.Kilo.Meter).Cast(of Meter)
-
- vectoJob.NetCalorificValueTestFuel = tbNCV.Text.ToDouble(0).SI(Unit.SI.Mega.Joule.Per.Kilo.Gramm).Cast(of JoulePerKilogramm)
+ vectoJob.Mileage = tbMileage.Text.ToDouble(0).SI(Unit.SI.Kilo.Meter).Cast (of Meter)
- vectoJob.FanCoefficients = New Double() {
- tbC1.Text.ToDouble(0),
- tbC2.Text.ToDouble(0),
- tbC3.Text.ToDouble(0)
- }
- vectoJob.FanDiameter = (tbFanDiameter.Text.ToDouble(0) / 1000).SI(of Meter)
+ vectoJob.FanCoefficients = New Double() { _
+ tbC1.Text.ToDouble(0),
+ tbC2.Text.ToDouble(0),
+ tbC3.Text.ToDouble(0)
+ }
+ vectoJob.FanDiameter = (tbFanDiameter.Text.ToDouble(0)/1000).SI (of Meter)
'SAVE
If Not vectoJob.SaveFile Then
@@ -326,6 +329,8 @@ Public Class VectoVTPJobForm
LvAux.Items.Clear()
+ DeclInit()
+
EngineForm.AutoSendTo = False
VectoFile = ""
@@ -335,6 +340,14 @@ Public Class VectoVTPJobForm
UpdatePic()
End Sub
+ Private Sub DeclInit()
+ If not Cfg.DeclMode then exit Sub
+
+ tbC1.Text = DeclarationData.VTPMode.FanParameters(0).ToGUIFormat()
+ tbc2.Text = DeclarationData.VTPMode.FanParameters(1).ToGUIFormat()
+ tbC3.Text = DeclarationData.VTPMode.FanParameters(2).ToGUIFormat()
+ End Sub
+
#Region "Track changes"
@@ -349,16 +362,18 @@ Public Class VectoVTPJobForm
Private Sub UpdateAuxList()
Dim vehicleFile As String =
- If(Not String.IsNullOrWhiteSpace(VectoFile), Path.Combine(Path.GetDirectoryName(VectoFile), TbVEH.Text), TbVEH.Text)
+ If _
+ (Not String.IsNullOrWhiteSpace(VectoFile), Path.Combine(Path.GetDirectoryName(VectoFile), TbVEH.Text),
+ TbVEH.Text)
If File.Exists(vehicleFile) Then
Try
- Dim inputData As XMLDeclarationInputDataProvider = New XMLDeclarationInputDataProvider(XmlReader.Create(vehicleFile), True)
+ Dim inputData As XMLDeclarationInputDataProvider =
+ New XMLDeclarationInputDataProvider(XmlReader.Create(vehicleFile), True)
Dim auxInput As IAuxiliariesDeclarationInputData = inputData.JobInputData.Vehicle.AuxiliaryInputData()
PopulateAuxiliaryList(auxInput)
Catch
End Try
End If
-
End Sub
@@ -530,10 +545,13 @@ Public Class VectoVTPJobForm
Dim gearbox As IGearboxDeclarationInputData = Nothing
Dim vehicleFile As String =
- If(Not String.IsNullOrWhiteSpace(VectoFile), Path.Combine(Path.GetDirectoryName(VectoFile), TbVEH.Text), TbVEH.Text)
+ If _
+ (Not String.IsNullOrWhiteSpace(VectoFile), Path.Combine(Path.GetDirectoryName(VectoFile), TbVEH.Text),
+ TbVEH.Text)
If File.Exists(vehicleFile) Then
Try
- Dim inputData As XMLDeclarationInputDataProvider = New XMLDeclarationInputDataProvider(XmlReader.Create(vehicleFile), True)
+ Dim inputData As XMLDeclarationInputDataProvider =
+ New XMLDeclarationInputDataProvider(XmlReader.Create(vehicleFile), True)
gearbox = inputData.JobInputData.Vehicle.GearboxInputData
Catch
End Try
@@ -542,7 +560,6 @@ Public Class VectoVTPJobForm
If gearbox Is Nothing Then Return
TbGbxTxt.Text = String.Format("{0}-Speed {1} {2}", gearbox.Gears.Count, gearbox.Type.ShortName(), gearbox.Model)
-
End Sub
Private Sub UpdateEnginePic(ByRef chart As Chart)
@@ -552,10 +569,13 @@ Public Class VectoVTPJobForm
Dim engine As IEngineDeclarationInputData = Nothing
lblEngineCharacteristics.Text = ""
Dim vehicleFile As String =
- If(Not String.IsNullOrWhiteSpace(VectoFile), Path.Combine(Path.GetDirectoryName(VectoFile), TbVEH.Text), TbVEH.Text)
+ If _
+ (Not String.IsNullOrWhiteSpace(VectoFile), Path.Combine(Path.GetDirectoryName(VectoFile), TbVEH.Text),
+ TbVEH.Text)
If File.Exists(vehicleFile) Then
Try
- Dim inputData As XMLDeclarationInputDataProvider = New XMLDeclarationInputDataProvider(XmlReader.Create(vehicleFile), True)
+ Dim inputData As XMLDeclarationInputDataProvider =
+ New XMLDeclarationInputDataProvider(XmlReader.Create(vehicleFile), True)
engine = inputData.JobInputData.Vehicle.EngineInputData
Catch
Return
@@ -597,11 +617,11 @@ Public Class VectoVTPJobForm
s.Name = "Motoring"
chart.Series.Add(s)
- pmax = fullLoadCurve.MaxPower.Value() / 1000 'FLD0.Pfull(FLD0.EngineRatedSpeed)
+ pmax = fullLoadCurve.MaxPower.Value()/1000 'FLD0.Pfull(FLD0.EngineRatedSpeed)
- TbEngTxt.Text = String.Format("{0} l {1} kw {2}", (engine.Displacement.Value() * 1000).ToString("0.0"),
- pmax.ToString("#"), engine.Model)
+ TbEngTxt.Text = String.Format("{0} l {1} kw {2}", (engine.Displacement.Value()*1000).ToString("0.0"),
+ pmax.ToString("#"), engine.Model)
Dim fuelConsumptionMap As FuelConsumptionMap = FuelConsumptionMapReader.Create(engine.FuelConsumptionMap)
@@ -616,8 +636,9 @@ Public Class VectoVTPJobForm
Dim engineCharacteristics As String =
String.Format("Max. Torque: {0:F0} Nm; Max. Power: {1:F1} kW; n_rated: {2:F0} rpm; n_95h: {3:F0} rpm",
- fullLoadCurve.MaxTorque.Value(), fullLoadCurve.MaxPower.Value() / 1000, fullLoadCurve.RatedSpeed.AsRPM,
- fullLoadCurve.N95hSpeed.AsRPM)
+ fullLoadCurve.MaxTorque.Value(), fullLoadCurve.MaxPower.Value()/1000,
+ fullLoadCurve.RatedSpeed.AsRPM,
+ fullLoadCurve.N95hSpeed.AsRPM)
lblEngineCharacteristics.Text = engineCharacteristics
End Sub
@@ -627,10 +648,13 @@ Public Class VectoVTPJobForm
Dim vehicle As IVehicleDeclarationInputData = Nothing
Dim vehicleFile As String =
- If(Not String.IsNullOrWhiteSpace(VectoFile), Path.Combine(Path.GetDirectoryName(VectoFile), TbVEH.Text), TbVEH.Text)
+ If _
+ (Not String.IsNullOrWhiteSpace(VectoFile), Path.Combine(Path.GetDirectoryName(VectoFile), TbVEH.Text),
+ TbVEH.Text)
If File.Exists(vehicleFile) Then
Try
- Dim inputData As XMLDeclarationInputDataProvider = New XMLDeclarationInputDataProvider(XmlReader.Create(vehicleFile), True)
+ Dim inputData As XMLDeclarationInputDataProvider =
+ New XMLDeclarationInputDataProvider(XmlReader.Create(vehicleFile), True)
vehicle = inputData.JobInputData.Vehicle
Catch
End Try
@@ -638,12 +662,14 @@ Public Class VectoVTPJobForm
If vehicle Is Nothing Then Return
- Dim maxMass As Kilogram = vehicle.GrossVehicleMassRating 'CSng(fTextboxToNumString(TbMassMass.Text))
+ Dim maxMass As Kilogram = vehicle.GrossVehicleMassRating _
+ 'CSng(fTextboxToNumString(TbMassMass.Text))
Dim s0 As Segment = Nothing
Try
- s0 = DeclarationData.Segments.Lookup(vehicle.VehicleCategory, vehicle.AxleConfiguration, maxMass, 0.SI(Of Kilogram),
- True)
+ s0 = DeclarationData.Segments.Lookup(vehicle.VehicleCategory, vehicle.AxleConfiguration, maxMass,
+ 0.SI (Of Kilogram),
+ True)
Catch
End Try
If Not s0.Found Then
@@ -652,12 +678,12 @@ Public Class VectoVTPJobForm
HDVclass = s0.VehicleClass.GetClassNumber()
End If
- PicVehicle.Image = ConvPicPath(If(Not s0.Found, -1, HDVclass.ToInt()), False) _
+ PicVehicle.Image = ConvPicPath(If(Not s0.Found, - 1, HDVclass.ToInt()), False) _
'Image.FromFile(cDeclaration.ConvPicPath(HDVclass, False))
TbHVCclass.Text = String.Format("HDV Group {0}", HDVclass)
TbVehCat.Text = vehicle.VehicleCategory.GetCategoryName() 'ConvVehCat(VEH0.VehCat, True)
- TbMass.Text = (vehicle.GrossVehicleMassRating.Value() / 1000) & " t"
+ TbMass.Text = (vehicle.GrossVehicleMassRating.Value()/1000) & " t"
TbAxleConf.Text = vehicle.AxleConfiguration.GetName() 'ConvAxleConf(VEH0.AxleConf)
End Sub
@@ -710,8 +736,6 @@ Public Class VectoVTPJobForm
tbManufacturerRecord.Text = GetFilenameWithoutDirectory(ManRXMLFileBrowser.Files(0), GetPath(VectoFile))
End If
End Sub
-
-
End Class
diff --git a/VECTO/Input Files/VectoEPTPJob.vb b/VECTO/Input Files/VectoEPTPJob.vb
index ccac7979ea..10643f47af 100644
--- a/VECTO/Input Files/VectoEPTPJob.vb
+++ b/VECTO/Input Files/VectoEPTPJob.vb
@@ -130,9 +130,6 @@ Public Class VectoVTPJob
Public ReadOnly Property VectoManufacturerReportHash As IVectoHash Implements IVTPDeclarationJobInputData.VectoManufacturerReportHash
Public Property Mileage As Meter Implements IVTPDeclarationJobInputData.Mileage
- Public Property NetCalorificValueTestFuel As JoulePerKilogramm Implements IVTPDeclarationJobInputData.NetCalorificValueTestFuel
-
-
Public ReadOnly Property Cycles As IList(Of ICycleData) Implements IVTPEngineeringJobInputData.Cycles
Get
Dim retVal As ICycleData() = New ICycleData(CycleFiles.Count - 1) {}
diff --git a/VECTO/OutputData/JSONFileWriter.vb b/VECTO/OutputData/JSONFileWriter.vb
index e1060c9e3f..3d2a982267 100644
--- a/VECTO/OutputData/JSONFileWriter.vb
+++ b/VECTO/OutputData/JSONFileWriter.vb
@@ -373,7 +373,6 @@ Public Class JSONFileWriter
if declarationmode Then
body.add("ManufacturerRecord", GetRelativePath(job.ManufacturerReportInputData.Source, Path.GetDirectoryName(filename)))
body.Add("Mileage", job.Mileage.ConvertToKiloMeter().Value)
- body.add("NCVTestFuel", job.NetCalorificValueTestFuel.ConvertToMegaJoulePerKilogram().Value())
End If
body.Add("FanPowerCoefficients", job.FanPowerCoefficents)
body.Add("FanDiameter", job.FanDiameter.Value())
diff --git a/VectoCommon/VectoCommon/InputData/VTPDeclarationInputData.cs b/VectoCommon/VectoCommon/InputData/VTPDeclarationInputData.cs
index 3b7d829092..bffaa7a638 100644
--- a/VectoCommon/VectoCommon/InputData/VTPDeclarationInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/VTPDeclarationInputData.cs
@@ -56,8 +56,6 @@ namespace TUGraz.VectoCommon.InputData
Meter Mileage { get; }
- JoulePerKilogramm NetCalorificValueTestFuel { get; }
-
IList<ICycleData> Cycles { get; }
IEnumerable<double> FanPowerCoefficents { get; }
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
index b31860e425..1da4693e27 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
@@ -701,11 +701,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
get { return Body.GetEx<double>("Mileage").SI(Unit.SI.Kilo.Meter).Cast<Meter>(); }
}
- public JoulePerKilogramm NetCalorificValueTestFuel
- {
- get { return Body.GetEx<double>("NCVTestFuel").SI(Unit.SI.Mega.Joule.Per.Kilo.Gramm).Cast<JoulePerKilogramm>(); }
- }
-
string IManufacturerReport.Source { get { return Body["ManufacturerRecord"].Value<string>(); } }
public IList<ICycleData> Cycles
--
GitLab