diff --git a/AuxillaryTestHarness/Dashboard.Designer.vb b/AuxillaryTestHarness/Dashboard.Designer.vb
index ec1ec8be9e74e6e755ed423ec7f63665ea179cb4..2816b1012508b66ab8e6bae1cc2dba64d5e7a743 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.brcElecConsumers = New System.Windows.Forms.BindingSource(Me.components)
Me.Panel1 = New System.Windows.Forms.Panel()
Me.btnCancel = New System.Windows.Forms.Button()
@@ -295,97 +295,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
'
@@ -439,34 +439,34 @@ Partial Class Dashboard
'
Me.gvElectricalConsumables.AllowUserToOrderColumns = true
Me.gvElectricalConsumables.AutoGenerateColumns = false
- 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
Me.gvElectricalConsumables.DataSource = Me.brcElecConsumers
- 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
'
diff --git a/AuxillaryTestHarness/Dashboard.vb b/AuxillaryTestHarness/Dashboard.vb
index a5a22c66727f0febaf5c47675a48a33fc6b5e7d7..be7b6d8f7962b42f29eaedda40827b538a9a2199 100644
--- a/AuxillaryTestHarness/Dashboard.vb
+++ b/AuxillaryTestHarness/Dashboard.vb
@@ -309,101 +309,138 @@ End Sub
'****** PNEUMATIC VALIDATION
-Public Sub Validating_PneumaticHandler( sender As Object, e As CancelEventArgs ) Handles txtAdBlueNIperMinute.Validating, txtBrakingWithRetarderNIperKG.Validating, txtBrakingNoRetarderNIperKG.Validating, txtAirControlledSuspensionNIperMinute.Validating, txtBreakingPerKneelingNIperKGinMM.Validating, txtSmartRegenFractionTotalAirDemand.Validating, txtPerStopBrakeActuationNIperKG.Validating, txtPerDoorOpeningNI.Validating, txtOverrunUtilisationForCompressionFraction.Validating, txtNonSmartRegenFractionTotalAirDemand.Validating, txtDeadVolumeLitres.Validating, txtDeadVolBlowOutsPerLitresperHour.Validating, txtKneelingHeightMillimeters.Validating, txtCompressorMap.Validating, txtCompressorGearRatio.Validating, txtCompressorGearEfficiency.Validating, txtActuationsMap.Validating, cboDoors.Validating, cboCompressorType.Validating, cboAirSuspensionControl.Validating, cboAdBlueDosing.Validating
+public sub Validating_PneumaticHandler( sender as Object, e As CancelEventArgs ) Handles txtAdBlueNIperMinute.Validating, txtBrakingWithRetarderNIperKG.Validating, txtBrakingNoRetarderNIperKG.Validating, txtAirControlledSuspensionNIperMinute.Validating, txtBreakingPerKneelingNIperKGinMM.Validating, txtSmartRegenFractionTotalAirDemand.Validating, txtPerStopBrakeActuationNIperKG.Validating, txtPerDoorOpeningNI.Validating, txtOverrunUtilisationForCompressionFraction.Validating, txtNonSmartRegenFractionTotalAirDemand.Validating, txtDeadVolumeLitres.Validating, txtDeadVolBlowOutsPerLitresperHour.Validating, txtKneelingHeightMillimeters.Validating, txtCompressorMap.Validating, txtCompressorGearRatio.Validating, txtCompressorGearEfficiency.Validating, txtActuationsMap.Validating, cboDoors.Validating, cboCompressorType.Validating, cboAirSuspensionControl.Validating, cboAdBlueDosing.Validating
-Dim control As Control = CType( sender, Control)
-Select Case control.Name
+ e.Cancel= Validate_Pneumatics()
+
+
+End Sub
+
+
+Public function Validate_Pneumatics( ) As boolean
+
+ Dim result As Boolean = true
+
+ 'PNEUMATIC AUXILLARIES PART
+ '***************************
- case "txtAdBlueNIperMinute"
+
+ 'AdBlue NI per Minute : txtAdBlueNIperMinute
If Not IsZeroOrPostiveNumber(txtAdBlueNIperMinute.Text) then
- e.Cancel=true
- errorProvider.SetError(txtAdBlueNIperMinute ,"Please provide a non negative number.")
+ errorProvider.SetError(txtAdBlueNIperMinute ,"Please provide a non negative number.")
+ result= false
+ Else
+ errorProvider.SetError(txtAdBlueNIperMinute ,String.Empty)
End if
- case "txtOverrunUtilisationForCompressionFraction"
- If Not IsNumberBetweenZeroandOne(txtOverrunUtilisationForCompressionFraction.Text) then
- e.Cancel=true
+ 'Overrun Utilisation For Compression Fraction : txtOverrunUtilisationForCompressionFraction
+ If Not IsNumberBetweenZeroandOne(txtOverrunUtilisationForCompressionFraction.Text) then
errorProvider.SetError(txtOverrunUtilisationForCompressionFraction ,"Please provide a non negative between 0 and 1.")
+ result = false
+ Else
+ errorProvider.SetError(txtOverrunUtilisationForCompressionFraction ,String.Empty)
End if
- case "txtBrakingWithRetarderNIperKG"
- If Not IsZeroOrPostiveNumber(txtBrakingWithRetarderNIperKG.Text) then
- e.Cancel=true
- errorProvider.SetError(txtBrakingWithRetarderNIperKG ,"Please provide a non negative number.")
+ 'Braking With Retarder NI per KG : txtBrakingWithRetarderNIperKG
+ If Not IsZeroOrPostiveNumber(txtBrakingWithRetarderNIperKG.Text) then
+ errorProvider.SetError(txtBrakingWithRetarderNIperKG ,"Please provide a non negative number.")
+ result = false
+ Else
+ errorProvider.SetError(txtBrakingWithRetarderNIperKG ,String.Empty)
End if
- case "txtBrakingNoRetarderNIperKG"
+ 'Braking No Retarder NI per KG : txtBrakingNoRetarderNIperKG
If Not IsZeroOrPostiveNumber(txtBrakingNoRetarderNIperKG.Text) then
- e.Cancel=true
- errorProvider.SetError(txtBrakingNoRetarderNIperKG ,"Please provide a non negative number.")
+ errorProvider.SetError(txtBrakingNoRetarderNIperKG ,"Please provide a non negative number.")
+ result=false
+ Else
+ errorProvider.SetError(txtBrakingNoRetarderNIperKG ,String.Empty)
End if
- case "txtBreakingPerKneelingNIperKGinMM"
+ 'Breaking Per Kneeling NI per KG in MM : txtBreakingPerKneelingNIperKGinMM
If Not IsZeroOrPostiveNumber(txtBreakingPerKneelingNIperKGinMM.Text) then
- e.Cancel=true
errorProvider.SetError(txtBreakingPerKneelingNIperKGinMM ,"Please provide a non negative number.")
+ result=false
+ Else
+ errorProvider.SetError(txtBreakingPerKneelingNIperKGinMM ,String.Empty)
End if
- case "txtPerDoorOpeningNI"
+ 'Per Door Opening NI : txtPerDoorOpeningNI
If Not IsZeroOrPostiveNumber(txtPerDoorOpeningNI.Text) then
- e.Cancel=true
errorProvider.SetError(txtPerDoorOpeningNI ,"Please provide a non negative number.")
+ result=false
+ Else
+ errorProvider.SetError(txtPerDoorOpeningNI ,String.Empty)
End if
- case "txtPerStopBrakeActuationNIperKG"
+ 'Per Stop Brake Actuation NI per KG : txtPerStopBrakeActuationNIperKG
If Not IsZeroOrPostiveNumber(txtPerStopBrakeActuationNIperKG.Text) then
- e.Cancel=true
- errorProvider.SetError(txtPerStopBrakeActuationNIperKG ,"Please provide a non negative number.")
+ errorProvider.SetError(txtPerStopBrakeActuationNIperKG ,"Please provide a non negative number.")
+ result=false
+ Else
+ errorProvider.SetError(txtPerStopBrakeActuationNIperKG ,String.Empty)
End if
- case "txtAirControlledSuspensionNIperMinute"
+ 'Air Controlled Suspension NI per Minute : txtAirControlledSuspensionNIperMinute
If Not IsZeroOrPostiveNumber(txtAirControlledSuspensionNIperMinute.Text) then
- e.Cancel=true
- errorProvider.SetError(txtAirControlledSuspensionNIperMinute ,"Please provide a non negative number.")
+ errorProvider.SetError(txtAirControlledSuspensionNIperMinute ,"Please provide a non negative number.")
+ result=false
+ Else
+ errorProvider.SetError(txtAirControlledSuspensionNIperMinute ,String.Empty)
End if
- case "txtNonSmartRegenFractionTotalAirDemand"
+ 'Non Smart Regen Fraction Total Air Demand : txtNonSmartRegenFractionTotalAirDemand
If Not IsZeroOrPostiveNumber(txtNonSmartRegenFractionTotalAirDemand.Text) then
- e.Cancel=true
- errorProvider.SetError(txtNonSmartRegenFractionTotalAirDemand ,"Please provide a non negative number.")
+ errorProvider.SetError(txtNonSmartRegenFractionTotalAirDemand ,"Please provide a non negative number.")
+ result=false
+ Else
+ errorProvider.SetError(txtNonSmartRegenFractionTotalAirDemand ,String.Empty)
End if
-
- case "txtSmartRegenFractionTotalAirDemand"
- If Not IsNumberBetweenZeroandOne(txtSmartRegenFractionTotalAirDemand.Text) then
- e.Cancel=true
+ 'Smart Regen Fraction Total Air Demand : txtSmartRegenFractionTotalAirDemand
+ If Not IsNumberBetweenZeroandOne(txtSmartRegenFractionTotalAirDemand.Text) then
errorProvider.SetError(txtSmartRegenFractionTotalAirDemand ,"Please provide a non negative between 0 and 1.")
+ result=False
+ Else
+ errorProvider.SetError(txtSmartRegenFractionTotalAirDemand ,String.Empty)
End if
- case "txtDeadVolumeLitres"
- If Not IsZeroOrPostiveNumber(txtDeadVolumeLitres.Text) then
- e.Cancel=true
+ 'Dead Volume Litres : txtDeadVolumeLitres
+ If Not IsZeroOrPostiveNumber(txtDeadVolumeLitres.Text) then
errorProvider.SetError(txtDeadVolumeLitres ,"Please provide a non negative between 0 and 1.")
+ result=False
+ Else
+ errorProvider.SetError(txtDeadVolumeLitres ,String.Empty)
End if
- case "txtDeadVolBlowOutsPerLitresperHour"
- If Not IsZeroOrPostiveNumber(txtDeadVolBlowOutsPerLitresperHour.Text) then
- e.Cancel=true
- errorProvider.SetError(txtDeadVolBlowOutsPerLitresperHour ,"Please provide a non negative between 0 and 1.")
+ 'Dead Vol BlowOuts Per Litresper Hour : txtDeadVolBlowOutsPerLitresperHour
+ If Not IsZeroOrPostiveNumber(txtDeadVolBlowOutsPerLitresperHour.Text) then
+ errorProvider.SetError(txtDeadVolBlowOutsPerLitresperHour ,"Please provide a non negative between 0 and 1.")
+ result=false
+ Else
+ errorProvider.SetError(txtDeadVolBlowOutsPerLitresperHour ,String.Empty)
End if
- 'USER CONFIG
-
- case "cboCompressorType"
- If cboCompressorType.SelectedIndex<1 then
- e.Cancel=true
+ 'USER CONFIG PART
+ '*****************************************************************************************
+ If cboCompressorType.SelectedIndex<1 then
errorProvider.SetError(cboCompressorType ,"Please select a Compressor type from the Dropdown list.")
+ result=false
+ Else
+ errorProvider.SetError(cboCompressorType ,String.Empty)
End if
- case "txtCompressorMap"
+ 'Compressor Map path : txtCompressorMap
'Test for empty after trim
If txtCompressorMap.Text.Trim.Length=0 then
- e.Cancel=true
- errorProvider.SetError(txtCompressorMap ,"Please enter the localtion of a valid compressor map.")
+ errorProvider.SetError(txtCompressorMap ,"Please enter the localtion of a valid compressor map.")
+ result=false
+ else
+ errorProvider.SetError(txtCompressorMap ,String.Empty)
End if
'Test File is valid
Dim comp As CompressorMap
@@ -411,44 +448,41 @@ Select Case control.Name
comp = New CompressorMap( txtCompressorMap.Text)
comp.Initialise()
-
+ errorProvider.SetError(txtCompressorMap ,String.Empty)
Catch ex As Exception
-
- e.Cancel=true
errorProvider.SetError(txtCompressorMap ,"Error : map is invalid or cannot be found, please select a Cvalid compressor map")
-
+ result=false
End Try
- case "txtCompressorGearEfficiency"
+ 'case "txtCompressorGearEfficiency"
- case "txtCompressorGearRatio"
+ 'case "txtCompressorGearRatio"
- case "txtActuationsMap"
+ 'case "txtActuationsMap"
- case "chkSmartAirCompression"
+ 'case "chkSmartAirCompression"
- case "chkSmartRegeneration"
+ 'case "chkSmartRegeneration"
- case "chkRetarderBrake"
+ 'case "chkRetarderBrake"
- case "txtKneelingHeightMillimeters"
+ 'case "txtKneelingHeightMillimeters"
- case "cboAirSuspensionControl"
+ 'case "cboAirSuspensionControl"
- case "cboAdBlueDosing"
+ 'case "cboAdBlueDosing"
- case "cboDoors.DataBindings"
+ 'case "cboDoors.DataBindings"
-
-End Select
+Return result
-End Sub
+End function
-Public Sub Validated_PneumaticHandler( sender As Object, e As EventArgs ) Handles tabMain.Validating, txtAdBlueNIperMinute.Validating, txtAdBlueNIperMinute.Validated, txtSmartRegenFractionTotalAirDemand.Validated, txtPerStopBrakeActuationNIperKG.Validated, txtPerDoorOpeningNI.Validated, txtOverrunUtilisationForCompressionFraction.Validated, txtNonSmartRegenFractionTotalAirDemand.Validated, txtDeadVolumeLitres.Validated, txtDeadVolBlowOutsPerLitresperHour.Validated, txtBreakingPerKneelingNIperKGinMM.Validated, txtBrakingWithRetarderNIperKG.Validated, txtBrakingNoRetarderNIperKG.Validated, txtAirControlledSuspensionNIperMinute.Validated, txtKneelingHeightMillimeters.Validated, txtCompressorMap.Validated, txtCompressorGearRatio.Validated, txtCompressorGearEfficiency.Validated, txtActuationsMap.Validated, cboDoors.Validated, cboCompressorType.Validated, cboAirSuspensionControl.Validated, cboAdBlueDosing.Validated
+Public Sub Validated_PneumaticHandler( sender As Object, e As EventArgs ) Handles txtAdBlueNIperMinute.Validating, txtAdBlueNIperMinute.Validated, txtSmartRegenFractionTotalAirDemand.Validated, txtPerStopBrakeActuationNIperKG.Validated, txtPerDoorOpeningNI.Validated, txtOverrunUtilisationForCompressionFraction.Validated, txtNonSmartRegenFractionTotalAirDemand.Validated, txtDeadVolumeLitres.Validated, txtDeadVolBlowOutsPerLitresperHour.Validated, txtBreakingPerKneelingNIperKGinMM.Validated, txtBrakingWithRetarderNIperKG.Validated, txtBrakingNoRetarderNIperKG.Validated, txtAirControlledSuspensionNIperMinute.Validated, txtKneelingHeightMillimeters.Validated, txtCompressorMap.Validated, txtCompressorGearRatio.Validated, txtCompressorGearEfficiency.Validated, txtActuationsMap.Validated, cboDoors.Validated, cboCompressorType.Validated, cboAirSuspensionControl.Validated, cboAdBlueDosing.Validated
Dim control As Control = CType( sender, Control)
@@ -520,4 +554,7 @@ End Sub
+Private Sub btnStart_Click( sender As Object, e As EventArgs) Handles btnStart.Click
+ Validate_Pneumatics()
+End Sub
End Class
\ No newline at end of file