diff --git a/AuxillaryTestHarness/Dashboard.Designer.vb b/AuxillaryTestHarness/Dashboard.Designer.vb
index b6f3e254352aa46716c266762ef0026cc909bfa0..4b28ef72e5ca3a2fb25f461313c39e1c1e10822a 100644
--- a/AuxillaryTestHarness/Dashboard.Designer.vb
+++ b/AuxillaryTestHarness/Dashboard.Designer.vb
@@ -23,18 +23,18 @@ Partial Class Dashboard
<System.Diagnostics.DebuggerStepThrough()> _
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
- Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Me.pnlMain = New System.Windows.Forms.Panel()
Me.btnLoad = New System.Windows.Forms.Button()
Me.btnCancel = New System.Windows.Forms.Button()
@@ -128,7 +128,7 @@ Partial Class Dashboard
Me.tabPlayground = New System.Windows.Forms.TabPage()
Me.pnlM13 = New System.Windows.Forms.Panel()
Me.lblM13_FinalFCOverTheCycle = New System.Windows.Forms.Label()
- Me.txtM13_out_TotalCycleFuelCalculation = New System.Windows.Forms.TextBox()
+ Me.txtM13_out_TotalCycleFuelCalculationGramsGRAMS = New System.Windows.Forms.TextBox()
Me.lblM13_Title = New System.Windows.Forms.Label()
Me.pnlM12 = New System.Windows.Forms.Panel()
Me.lblM12_FuelConsumptionWithSmartElectricsAndAveragePneumaticPowerDemand = New System.Windows.Forms.Label()
@@ -284,6 +284,8 @@ Partial Class Dashboard
Me.DeleteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ErrorProvider = New System.Windows.Forms.ErrorProvider(Me.components)
Me.Timer1 = New System.Windows.Forms.Timer(Me.components)
+ Me.lblM13TotalFuelConsumptionTotalCycleLitres = New System.Windows.Forms.Label()
+ Me.txtM13_out_TotalCycleFuelCalculationGramsLITRES = New System.Windows.Forms.TextBox()
Me.pnlMain.SuspendLayout
Me.tabMain.SuspendLayout
Me.tabGeneralConfig.SuspendLayout
@@ -487,97 +489,97 @@ Partial Class Dashboard
'
'gvResultsCardOverrun
'
- DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardOverrun.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle13
+ DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvResultsCardOverrun.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1
Me.gvResultsCardOverrun.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- DataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Window
- DataGridViewCellStyle14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.ControlText
- DataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.gvResultsCardOverrun.DefaultCellStyle = DataGridViewCellStyle14
+ DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window
+ DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText
+ DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+ Me.gvResultsCardOverrun.DefaultCellStyle = DataGridViewCellStyle2
Me.gvResultsCardOverrun.Location = New System.Drawing.Point(590, 451)
Me.gvResultsCardOverrun.Name = "gvResultsCardOverrun"
- DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardOverrun.RowHeadersDefaultCellStyle = DataGridViewCellStyle15
+ DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvResultsCardOverrun.RowHeadersDefaultCellStyle = DataGridViewCellStyle3
Me.gvResultsCardOverrun.Size = New System.Drawing.Size(246, 125)
Me.gvResultsCardOverrun.TabIndex = 18
'
'gvResultsCardTraction
'
- DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardTraction.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle16
+ DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvResultsCardTraction.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4
Me.gvResultsCardTraction.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- DataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Window
- DataGridViewCellStyle17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.ControlText
- DataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.gvResultsCardTraction.DefaultCellStyle = DataGridViewCellStyle17
+ DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window
+ DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText
+ DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+ Me.gvResultsCardTraction.DefaultCellStyle = DataGridViewCellStyle5
Me.gvResultsCardTraction.Location = New System.Drawing.Point(311, 451)
Me.gvResultsCardTraction.Name = "gvResultsCardTraction"
- DataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardTraction.RowHeadersDefaultCellStyle = DataGridViewCellStyle18
+ DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvResultsCardTraction.RowHeadersDefaultCellStyle = DataGridViewCellStyle6
Me.gvResultsCardTraction.Size = New System.Drawing.Size(258, 125)
Me.gvResultsCardTraction.TabIndex = 17
'
'gvResultsCardIdle
'
- DataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardIdle.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle19
+ DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvResultsCardIdle.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle7
Me.gvResultsCardIdle.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- DataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Window
- DataGridViewCellStyle20.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle20.ForeColor = System.Drawing.SystemColors.ControlText
- DataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.gvResultsCardIdle.DefaultCellStyle = DataGridViewCellStyle20
+ DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window
+ DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText
+ DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+ Me.gvResultsCardIdle.DefaultCellStyle = DataGridViewCellStyle8
Me.gvResultsCardIdle.Location = New System.Drawing.Point(35, 451)
Me.gvResultsCardIdle.Name = "gvResultsCardIdle"
- DataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardIdle.RowHeadersDefaultCellStyle = DataGridViewCellStyle21
+ DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvResultsCardIdle.RowHeadersDefaultCellStyle = DataGridViewCellStyle9
Me.gvResultsCardIdle.Size = New System.Drawing.Size(256, 125)
Me.gvResultsCardIdle.TabIndex = 16
'
@@ -629,33 +631,33 @@ Partial Class Dashboard
'
'gvElectricalConsumables
'
- DataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvElectricalConsumables.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle22
+ DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvElectricalConsumables.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle10
Me.gvElectricalConsumables.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- DataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle23.BackColor = System.Drawing.SystemColors.Window
- DataGridViewCellStyle23.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle23.ForeColor = System.Drawing.SystemColors.ControlText
- DataGridViewCellStyle23.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle23.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.gvElectricalConsumables.DefaultCellStyle = DataGridViewCellStyle23
+ DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Window
+ DataGridViewCellStyle11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.ControlText
+ DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+ Me.gvElectricalConsumables.DefaultCellStyle = DataGridViewCellStyle11
Me.gvElectricalConsumables.Location = New System.Drawing.Point(33, 170)
Me.gvElectricalConsumables.Name = "gvElectricalConsumables"
- DataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle24.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvElectricalConsumables.RowHeadersDefaultCellStyle = DataGridViewCellStyle24
+ DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvElectricalConsumables.RowHeadersDefaultCellStyle = DataGridViewCellStyle12
Me.gvElectricalConsumables.Size = New System.Drawing.Size(803, 250)
Me.gvElectricalConsumables.TabIndex = 10
'
@@ -1349,11 +1351,13 @@ Partial Class Dashboard
'pnlM13
'
Me.pnlM13.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+ Me.pnlM13.Controls.Add(Me.txtM13_out_TotalCycleFuelCalculationGramsLITRES)
+ Me.pnlM13.Controls.Add(Me.lblM13TotalFuelConsumptionTotalCycleLitres)
Me.pnlM13.Controls.Add(Me.lblM13_FinalFCOverTheCycle)
- Me.pnlM13.Controls.Add(Me.txtM13_out_TotalCycleFuelCalculation)
- Me.pnlM13.Location = New System.Drawing.Point(1157, 434)
+ Me.pnlM13.Controls.Add(Me.txtM13_out_TotalCycleFuelCalculationGramsGRAMS)
+ Me.pnlM13.Location = New System.Drawing.Point(1157, 435)
Me.pnlM13.Name = "pnlM13"
- Me.pnlM13.Size = New System.Drawing.Size(308, 75)
+ Me.pnlM13.Size = New System.Drawing.Size(308, 120)
Me.pnlM13.TabIndex = 59
'
'lblM13_FinalFCOverTheCycle
@@ -1362,24 +1366,24 @@ Partial Class Dashboard
Me.lblM13_FinalFCOverTheCycle.Location = New System.Drawing.Point(6, 12)
Me.lblM13_FinalFCOverTheCycle.MaximumSize = New System.Drawing.Size(260, 0)
Me.lblM13_FinalFCOverTheCycle.Name = "lblM13_FinalFCOverTheCycle"
- Me.lblM13_FinalFCOverTheCycle.Size = New System.Drawing.Size(138, 13)
+ Me.lblM13_FinalFCOverTheCycle.Size = New System.Drawing.Size(192, 13)
Me.lblM13_FinalFCOverTheCycle.TabIndex = 2
- Me.lblM13_FinalFCOverTheCycle.Text = "Total Cycle Fuel Calculation"
+ Me.lblM13_FinalFCOverTheCycle.Text = "Total Cycle Fuel Calculation ( GRAMS )"
'
- 'txtM13_out_TotalCycleFuelCalculation
+ 'txtM13_out_TotalCycleFuelCalculationGramsGRAMS
'
- Me.txtM13_out_TotalCycleFuelCalculation.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0,Byte),Integer), CType(CType(192,Byte),Integer), CType(CType(0,Byte),Integer))
- Me.txtM13_out_TotalCycleFuelCalculation.Location = New System.Drawing.Point(8, 44)
- Me.txtM13_out_TotalCycleFuelCalculation.Name = "txtM13_out_TotalCycleFuelCalculation"
- Me.txtM13_out_TotalCycleFuelCalculation.Size = New System.Drawing.Size(100, 20)
- Me.txtM13_out_TotalCycleFuelCalculation.TabIndex = 0
+ Me.txtM13_out_TotalCycleFuelCalculationGramsGRAMS.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0,Byte),Integer), CType(CType(192,Byte),Integer), CType(CType(0,Byte),Integer))
+ Me.txtM13_out_TotalCycleFuelCalculationGramsGRAMS.Location = New System.Drawing.Point(12, 33)
+ Me.txtM13_out_TotalCycleFuelCalculationGramsGRAMS.Name = "txtM13_out_TotalCycleFuelCalculationGramsGRAMS"
+ Me.txtM13_out_TotalCycleFuelCalculationGramsGRAMS.Size = New System.Drawing.Size(100, 20)
+ Me.txtM13_out_TotalCycleFuelCalculationGramsGRAMS.TabIndex = 0
'
'lblM13_Title
'
Me.lblM13_Title.AutoSize = true
Me.lblM13_Title.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
Me.lblM13_Title.ForeColor = System.Drawing.SystemColors.Highlight
- Me.lblM13_Title.Location = New System.Drawing.Point(1157, 418)
+ Me.lblM13_Title.Location = New System.Drawing.Point(1157, 419)
Me.lblM13_Title.MaximumSize = New System.Drawing.Size(270, 0)
Me.lblM13_Title.Name = "lblM13_Title"
Me.lblM13_Title.Size = New System.Drawing.Size(240, 13)
@@ -2826,6 +2830,24 @@ Partial Class Dashboard
'
Me.Timer1.Interval = 1000
'
+ 'lblM13TotalFuelConsumptionTotalCycleLitres
+ '
+ Me.lblM13TotalFuelConsumptionTotalCycleLitres.AutoSize = true
+ Me.lblM13TotalFuelConsumptionTotalCycleLitres.Location = New System.Drawing.Point(6, 64)
+ Me.lblM13TotalFuelConsumptionTotalCycleLitres.MaximumSize = New System.Drawing.Size(260, 0)
+ Me.lblM13TotalFuelConsumptionTotalCycleLitres.Name = "lblM13TotalFuelConsumptionTotalCycleLitres"
+ Me.lblM13TotalFuelConsumptionTotalCycleLitres.Size = New System.Drawing.Size(191, 13)
+ Me.lblM13TotalFuelConsumptionTotalCycleLitres.TabIndex = 3
+ Me.lblM13TotalFuelConsumptionTotalCycleLitres.Text = "Total Cycle Fuel Calculation ( LITRES )"
+ '
+ 'txtM13_out_TotalCycleFuelCalculationGramsLITRES
+ '
+ Me.txtM13_out_TotalCycleFuelCalculationGramsLITRES.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0,Byte),Integer), CType(CType(192,Byte),Integer), CType(CType(0,Byte),Integer))
+ Me.txtM13_out_TotalCycleFuelCalculationGramsLITRES.Location = New System.Drawing.Point(12, 80)
+ Me.txtM13_out_TotalCycleFuelCalculationGramsLITRES.Name = "txtM13_out_TotalCycleFuelCalculationGramsLITRES"
+ Me.txtM13_out_TotalCycleFuelCalculationGramsLITRES.Size = New System.Drawing.Size(100, 20)
+ Me.txtM13_out_TotalCycleFuelCalculationGramsLITRES.TabIndex = 4
+ '
'Dashboard
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
@@ -3136,8 +3158,10 @@ End Sub
Friend WithEvents lblM13_Title As System.Windows.Forms.Label
Friend WithEvents pnlM13 As System.Windows.Forms.Panel
Friend WithEvents lblM13_FinalFCOverTheCycle As System.Windows.Forms.Label
- Friend WithEvents txtM13_out_TotalCycleFuelCalculation As System.Windows.Forms.TextBox
+ Friend WithEvents txtM13_out_TotalCycleFuelCalculationGramsGRAMS As System.Windows.Forms.TextBox
Friend WithEvents btnLoad As System.Windows.Forms.Button
Friend WithEvents btnSave As System.Windows.Forms.Button
+ Friend WithEvents txtM13_out_TotalCycleFuelCalculationGramsLITRES As System.Windows.Forms.TextBox
+ Friend WithEvents lblM13TotalFuelConsumptionTotalCycleLitres As System.Windows.Forms.Label
End Class
diff --git a/AuxillaryTestHarness/Dashboard.vb b/AuxillaryTestHarness/Dashboard.vb
index b516d838d314b674723ab8facb135f28a471bc00..d5ddc1cd3d1b33cce80ae1d3470c70a57158ab7f 100644
--- a/AuxillaryTestHarness/Dashboard.vb
+++ b/AuxillaryTestHarness/Dashboard.vb
@@ -927,6 +927,144 @@ Private Sub btnFinish_Click( sender As Object, e As EventArgs) Handles btnFinis
End Sub
+
+Private Sub btnSave_Click( sender As Object, e As EventArgs) Handles btnSave.Click
+
+ auxEnvironment.ClearDown()
+
+ auxEnvironment.Save("TESTHARNESCONFIG.Json")
+
+
+
+End Sub
+Private Sub btnLoad_Click( sender As Object, e As EventArgs) Handles btnLoad.Click
+
+ 'JSON METHOD
+ 'Release existing databindings
+ UnbindAllControls( Me)
+
+
+ auxEnvironment.Load("TESTHARNESCONFIG.Json")
+
+ ''Only required for Harness environment
+ auxEnvironment.Initialise()
+
+ CreateBindings()
+
+End Sub
+
+
+
+Private Sub btnFuelMap_Click( sender As Object, e As EventArgs) Handles btnFuelMap.Click
+
+ Dim fbAux As New cFileBrowser(True,false)
+
+
+
+ ' Dim vectoFile As String = "C:\Users\tb28\Source\Workspaces\VECTO\AuxillaryTestHarness\bin\Debug\vectopath.vecto"
+ Dim fname As String = fFILE( vectoFile,true)
+
+ fbAux.Extensions = New String() {"vmap"}
+ ' If fbAux.OpenDialog(fFileRepl(fname, fPATH(VECTOfile))) Then
+ If fbAux.OpenDialog( fPATH(VECTOfile)) Then
+
+ txtFuelMap.Text = fFileWoDir(fbAux.Files(0), fPATH(VECTOfile))
+
+ End If
+
+ 'fbFileLists.Extensions = New String() {"txt"}
+ 'fbVECTO.Extensions = New String() {"vecto"}
+ 'fbVEH.Extensions = New String() {"vveh"} - Vehicle FIle
+ 'fbMAP.Extensions = New String() {"vmap"} - Fuel Map
+ 'fbDRI.Extensions = New String() {"vdri"} - Diving Cycle
+ 'fbFLD.Extensions = New String() {"vfld"} - Full Load & Drag Toque
+ 'fbENG.Extensions = New String() {"veng"} - Vehicle Engine
+ 'fbGBX.Extensions = New String() {"vgbx"} - Vehicle Gearbox
+ 'fbACC.Extensions = New String() {"vacc"} - Acceleration Limiting Input File
+ 'fbAUX.Extensions = New String() {"vaux"} - Vehicle Auxiliaries
+ 'fbGBS.Extensions = New String() {"vgbs"} - Shift Polygons
+ 'fbRLM.Extensions = New String() {"vrlm"} - Retarder Loss Input
+ 'fbTLM.Extensions = New String() {"vtlm"} - Tranmission Loss Map
+ 'fbTCC.Extensions = New String() {"vtcc"} - Torque Converter Characteristics
+ 'fbCDx.Extensions = New String() {"vcdv", "vcdb"} - Cross Wind Correction Speed types
+
+ 'fbVMOD.Extensions = New String() {"vmod"} - Modal Results.
+
+
+
+
+End Sub
+Private Sub btnAlternatorMapPath_Click( sender As Object, e As EventArgs) Handles btnAlternatorMapPath.Click
+
+
+
+ Dim fbAux As New cFileBrowser(True,false)
+
+
+
+ ' Dim vectoFile As String = "C:\Users\tb28\Source\Workspaces\VECTO\AuxillaryTestHarness\bin\Debug\vectopath.vecto"
+ Dim fname As String = fFILE( vectoFile,true)
+
+ fbAux.Extensions = New String() {"AALT"}
+ If fbAux.OpenDialog(fPATH(VECTOfile)) Then
+
+ txtAlternatorMapPath.Text = fFileWoDir(fbAux.Files(0), fPATH(VECTOfile))
+
+ End If
+
+ Validate_Electrics
+
+ 'Causes Binding to fire
+ txtAlternatorMapPath.Focus
+
+End Sub
+Private Sub btnCompressorMap_Click( sender As Object, e As EventArgs) Handles btnCompressorMap.Click
+
+
+ Dim fbAux As New cFileBrowser(True,false)
+
+
+
+ ' Dim vectoFile As String = "C:\Users\tb28\Source\Workspaces\VECTO\AuxillaryTestHarness\bin\Debug\vectopath.vecto"
+ Dim fname As String = fFILE( vectoFile,true)
+
+ fbAux.Extensions = New String() {"ACMP"}
+ If fbAux.OpenDialog(fPATH(VECTOfile)) Then
+
+ txtCompressorMap.Text = fFileWoDir(fbAux.Files(0), fPATH(VECTOfile))
+
+ End If
+
+ Validate_Pneumatics
+
+ 'Causes binding to fire
+ txtCompressorMap.Focus
+
+
+End Sub
+Private Sub btnActuationsMap_Click( sender As Object, e As EventArgs) Handles btnActuationsMap.Click
+
+ Dim fbAux As New cFileBrowser(True,false)
+
+ ' Dim vectoFile As String = "C:\Users\tb28\Source\Workspaces\VECTO\AuxillaryTestHarness\bin\Debug\vectopath.vecto"
+ Dim fname As String = fFILE( vectoFile,true)
+
+ fbAux.Extensions = New String() {"APAC"}
+ If fbAux.OpenDialog(fPATH(VECTOfile)) Then
+
+ txtActuationsMap.Text = fFileWoDir(fbAux.Files(0), fPATH(VECTOfile))
+
+ End If
+
+ Validate_Pneumatics
+
+ 'Causes Binding to fire.
+ txtActuationsMap.Focus
+
+End Sub
+
+
+
#End Region
Private sub RefreshDisplays()
@@ -1015,7 +1153,8 @@ Private sub RefreshDisplays()
'M13
- txtM13_out_TotalCycleFuelCalculation.Text = auxEnvironment.M13.TotalCycleFuelConsumption
+ txtM13_out_TotalCycleFuelCalculationGramsGRAMS.Text = auxEnvironment.M13.TotalCycleFuelConsumptionGrams
+ txtM13_out_TotalCycleFuelCalculationGramsLitres.Text = auxEnvironment.M13.TotalCycleFuelConsumptionLitres
End Sub
@@ -1083,33 +1222,6 @@ Protected Overrides Function ProcessCmdKey(ByRef msg As Message, keyData As Keys
End Function
-Private Sub btnSave_Click( sender As Object, e As EventArgs) Handles btnSave.Click
-
- auxEnvironment.ClearDown()
-
- auxEnvironment.Save("TESTHARNESCONFIG.Json")
-
-
-
-End Sub
-
-Private Sub btnLoad_Click( sender As Object, e As EventArgs) Handles btnLoad.Click
-
- 'JSON METHOD
- 'Release existing databindings
- UnbindAllControls( Me)
-
-
- auxEnvironment.Load("TESTHARNESCONFIG.Json")
-
- ''Only required for Harness environment
- auxEnvironment.Initialise()
-
- CreateBindings()
-
-End Sub
-
-
public sub UnbindAllControls(ByRef container As Control)
'Clear all of the controls within the container object
@@ -1129,113 +1241,4 @@ public sub UnbindAllControls(ByRef container As Control)
End Sub
-Private Sub btnFuelMap_Click( sender As Object, e As EventArgs) Handles btnFuelMap.Click
-
- Dim fbAux As New cFileBrowser(True,false)
-
-
-
- ' Dim vectoFile As String = "C:\Users\tb28\Source\Workspaces\VECTO\AuxillaryTestHarness\bin\Debug\vectopath.vecto"
- Dim fname As String = fFILE( vectoFile,true)
-
- fbAux.Extensions = New String() {"vmap"}
- ' If fbAux.OpenDialog(fFileRepl(fname, fPATH(VECTOfile))) Then
- If fbAux.OpenDialog( fPATH(VECTOfile)) Then
-
- txtFuelMap.Text = fFileWoDir(fbAux.Files(0), fPATH(VECTOfile))
-
- End If
-
- 'fbFileLists.Extensions = New String() {"txt"}
- 'fbVECTO.Extensions = New String() {"vecto"}
- 'fbVEH.Extensions = New String() {"vveh"} - Vehicle FIle
- 'fbMAP.Extensions = New String() {"vmap"} - Fuel Map
- 'fbDRI.Extensions = New String() {"vdri"} - Diving Cycle
- 'fbFLD.Extensions = New String() {"vfld"} - Full Load & Drag Toque
- 'fbENG.Extensions = New String() {"veng"} - Vehicle Engine
- 'fbGBX.Extensions = New String() {"vgbx"} - Vehicle Gearbox
- 'fbACC.Extensions = New String() {"vacc"} - Acceleration Limiting Input File
- 'fbAUX.Extensions = New String() {"vaux"} - Vehicle Auxiliaries
- 'fbGBS.Extensions = New String() {"vgbs"} - Shift Polygons
- 'fbRLM.Extensions = New String() {"vrlm"} - Retarder Loss Input
- 'fbTLM.Extensions = New String() {"vtlm"} - Tranmission Loss Map
- 'fbTCC.Extensions = New String() {"vtcc"} - Torque Converter Characteristics
- 'fbCDx.Extensions = New String() {"vcdv", "vcdb"} - Cross Wind Correction Speed types
-
- 'fbVMOD.Extensions = New String() {"vmod"} - Modal Results.
-
-
-
-
-End Sub
-
-Private Sub btnAlternatorMapPath_Click( sender As Object, e As EventArgs) Handles btnAlternatorMapPath.Click
-
-
-
- Dim fbAux As New cFileBrowser(True,false)
-
-
-
- ' Dim vectoFile As String = "C:\Users\tb28\Source\Workspaces\VECTO\AuxillaryTestHarness\bin\Debug\vectopath.vecto"
- Dim fname As String = fFILE( vectoFile,true)
-
- fbAux.Extensions = New String() {"AALT"}
- If fbAux.OpenDialog(fPATH(VECTOfile)) Then
-
- txtAlternatorMapPath.Text = fFileWoDir(fbAux.Files(0), fPATH(VECTOfile))
-
- End If
-
- Validate_Electrics
-
-
-End Sub
-
-
-
-Private Sub btnCompressorMap_Click( sender As Object, e As EventArgs) Handles btnCompressorMap.Click
-
-
- Dim fbAux As New cFileBrowser(True,false)
-
-
-
- ' Dim vectoFile As String = "C:\Users\tb28\Source\Workspaces\VECTO\AuxillaryTestHarness\bin\Debug\vectopath.vecto"
- Dim fname As String = fFILE( vectoFile,true)
-
- fbAux.Extensions = New String() {"ACMP"}
- If fbAux.OpenDialog(fPATH(VECTOfile)) Then
-
- txtCompressorMap.Text = fFileWoDir(fbAux.Files(0), fPATH(VECTOfile))
-
- End If
-
- Validate_Pneumatics
-
-
-
-End Sub
-
-
-
-Private Sub btnActuationsMap_Click( sender As Object, e As EventArgs) Handles btnActuationsMap.Click
-
- Dim fbAux As New cFileBrowser(True,false)
-
- ' Dim vectoFile As String = "C:\Users\tb28\Source\Workspaces\VECTO\AuxillaryTestHarness\bin\Debug\vectopath.vecto"
- Dim fname As String = fFILE( vectoFile,true)
-
- fbAux.Extensions = New String() {"APAC"}
- If fbAux.OpenDialog(fPATH(VECTOfile)) Then
-
- txtActuationsMap.Text = fFileWoDir(fbAux.Files(0), fPATH(VECTOfile))
-
- End If
-
- Validate_Pneumatics
-
-End Sub
-
-
End Class
\ No newline at end of file
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/IM13.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/IM13.vb
index eebf94d4ca8b54bc8d22aa98ed5bf59b1a0dd09c..561d43815cca6803b22d4d4794b4e4eb91d5d148 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/IM13.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/IM13.vb
@@ -8,7 +8,9 @@ Namespace DownstreamModules
Public Interface IM13
-ReadOnly Property TotalCycleFuelConsumption As Single
+ReadOnly Property TotalCycleFuelConsumptionGrams As Single
+ReadOnly Property TotalCycleFuelConsumptionLitres As Single
+
End Interface
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/M13.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/M13.vb
index 706ad53b424fa5ebe2e9c60892a6796b91f8b8c9..812d571a2415e4f985a70bc7c9cddf1354a20dd4 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/M13.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/M13.vb
@@ -7,6 +7,8 @@ Namespace DownstreamModules
Public Class M13
Implements IM13
+
+ Private Const FUEL_DENSITY_L3 As Single = 835
Private m1 As IM1_AverageHVACLoadDemand
Private m10 As IM10
@@ -35,9 +37,20 @@ Private readonly Property Sum4 As Single
End Property
Private readonly Property Sum5 As Single
Get
- Return SW3 + m1.HVACFuelingLitresPerHour
+ Return m1.HVACFuelingLitresPerHour * FUEL_DENSITY_L3
+ End Get
+End Property
+Private ReadOnly Property Sum6 As Single
+ Get
+ Return SW3 + Sum5
+ End Get
+End Property
+Private ReadOnly Property Sum7 As Single
+ Get
+ Return Sum6/ FUEL_DENSITY_L3
End Get
End Property
+
Private readonly Property SW1 As Single
Get
@@ -55,12 +68,6 @@ Private readonly Property SW3 As Single
End Get
End Property
-
-Public ReadOnly Property TotalCycleFuelConsumption As Single Implements IM13.TotalCycleFuelConsumption
- Get
- Return Sum5
- End Get
-End Property
Public Sub new ( m1 As IM1_AverageHVACLoadDemand, m10 As IM10, m12 As IM12 , signals As ISignals)
me.m1 = m1
@@ -71,6 +78,17 @@ Public Sub new ( m1 As IM1_AverageHVACLoadDemand, m10 As IM10, m12 As IM12 , sig
End Sub
+ Public ReadOnly Property TotalCycleFuelConsumptionGrams As Single Implements IM13.TotalCycleFuelConsumptionGrams
+ Get
+ Return Sum6
+ End Get
+ End Property
+
+ Public ReadOnly Property TotalCycleFuelConsumptionLitres As Single Implements IM13.TotalCycleFuelConsumptionLitres
+ Get
+ Return Sum7
+ End Get
+ End Property
End Class
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M13Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M13Tests.vb
index f645c8302ee2b60a069fd19f40596df02c79615c..37d0d59b4e094c29705c409d595b627536499c30 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M13Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M13Tests.vb
@@ -10,18 +10,22 @@ Namespace UnitTests
<TestFixture()> _
Public Class M13Tests
+Private Const FUEL_DENSITY_percm3 As Single = 0.835
+
+
<Test()> _
-<TestCase(50, 60, 70, FALSE, FALSE, 80, 140 )> _
-<TestCase(50, 60, 70, FALSE, TRUE, 80, 130 )> _
-<TestCase(50, 60, 70, TRUE, FALSE, 80, 150 )> _
-<TestCase(50, 60, 70, TRUE, TRUE, 80, 140 )> _
+<TestCase(50, 60, 70, FALSE, FALSE, 0.5f, 477.5f , 0.571856287f )> _
+<TestCase(50, 60, 70, FALSE, TRUE, 0.5f, 467.5f , 0.55988024f )> _
+<TestCase(50, 60, 70, TRUE, FALSE, 0.5f, 487.5f , 0.583832335f )> _
+<TestCase(50, 60, 70, TRUE, TRUE, 0.5f, 477.5f , 0.571856287f )> _
Public Sub InputOutputValues( IP1 As single,
IP2 As single,
IP3 As single,
IP4 As Boolean,
IP5 As Boolean,
IP6 As single,
- OUT1 As single)
+ OUT1 As single,
+ OUT2 As single)
'Arrange
Dim m1 As New Mock(Of IM1_AverageHVACLoadDemand)
@@ -41,8 +45,8 @@ m1.Setup ( Function(x) x.HVACFuelingLitresPerHour)
Dim target = New M13( m1.Object, m10.Object, M12.Object, Signals.Object)
'Assert
-Assert.AreEqual( target.TotalCycleFuelConsumption, OUT1 )
-
+Assert.AreEqual( target.TotalCycleFuelConsumptionGrams, OUT1 )
+Assert.AreEqual( target.TotalCycleFuelConsumptionLitres, OUT2 )
End Sub
End Class