diff --git a/HVACTOOL/BusDatabase.csv b/HVACTOOL/BusDatabase.abdb
similarity index 100%
rename from HVACTOOL/BusDatabase.csv
rename to HVACTOOL/BusDatabase.abdb
diff --git a/HVACTOOL/HVACTOOL.vbproj b/HVACTOOL/HVACTOOL.vbproj
index 7c7dcb8dcae8c3a4a96a9a37d5a9039a3a4e2a0a..27b927763923def5ece293ae4c427adff845c354 100644
--- a/HVACTOOL/HVACTOOL.vbproj
+++ b/HVACTOOL/HVACTOOL.vbproj
@@ -137,7 +137,7 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
- <Content Include="BusDatabase.csv">
+ <Content Include="BusDatabase.abdb">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<None Include="HVACTOOL_TemporaryKey.pfx" />
diff --git a/HVACTOOL/Module1.vb b/HVACTOOL/Module1.vb
index 8b9c127195208645ba758adca828aa068fb79596..0093fe5309fc022e1ba7cda0b2fa5177b487b4bf 100644
--- a/HVACTOOL/Module1.vb
+++ b/HVACTOOL/Module1.vb
@@ -4,7 +4,7 @@ module Main
Sub main()
- Dim frm As New frmHVACTool("BusDatabase.csv", "ssm.ahsm")
+ Dim frm As New frmHVACTool("BusDatabase.abdb", "ssm.ahsm")
frm.ShowDialog()
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/HVACUserInputsConfig.vb b/VECTOAux/VectoAuxiliaries/Hvac/HVACUserInputsConfig.vb
index cb3d9738f267730a4063f12581d3ee78017eeb37..961111b1ad411f16c36bdb955b8edc6f15763efa 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/HVACUserInputsConfig.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/HVACUserInputsConfig.vb
@@ -18,6 +18,7 @@ Namespace Hvac
Public Class HVACUserInputsConfig
Implements IHVACUserInputsConfig
+
'Constructor
Public Sub new (ssm As IHVACSteadyStateModel, ssmFilePath As string)
@@ -28,8 +29,11 @@ Implements IHVACUserInputsConfig
'Implementation
Public Property SteadyStateModel As IHVACSteadyStateModel Implements IHVACUserInputsConfig.SteadyStateModel
+
Public Property SSMFilePath As String Implements IHVACUserInputsConfig.SSMFilePath
+ Public Property BusDatabasePath As String Implements IHVACUserInputsConfig.BusDatabasePath
+
End Class
End Namespace
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/IHVACUserInputsConfig.vb b/VECTOAux/VectoAuxiliaries/Hvac/IHVACUserInputsConfig.vb
index b7e33a229323be485b051637599edaa266f13dd4..f2d65292061b37a26d55aed65ad81c7a2ea3e4d8 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/IHVACUserInputsConfig.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/IHVACUserInputsConfig.vb
@@ -31,6 +31,7 @@ Namespace Hvac
''' <returns></returns>
''' <remarks></remarks>
Property SSMFilePath As string
+ Property BusDatabasePath As String
End Interface
diff --git a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.Designer.vb b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.Designer.vb
index c9df49e3f07b013856bbe97f53678cb6cfb0f3b8..b4e1d3d0c3bb8d677517ff66a020f74b340b362a 100644
--- a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.Designer.vb
+++ b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.Designer.vb
@@ -24,18 +24,18 @@ Partial Class frmAuxiliaryConfig
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmAuxiliaryConfig))
- 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()
+ 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()
Me.pnlMain = New System.Windows.Forms.Panel()
Me.btnCancel = New System.Windows.Forms.Button()
Me.btnSave = New System.Windows.Forms.Button()
@@ -120,17 +120,15 @@ Partial Class frmAuxiliaryConfig
Me.txtPerStopBrakeActuationNIperKG = New System.Windows.Forms.TextBox()
Me.txtSmartRegenFractionTotalAirDemand = New System.Windows.Forms.TextBox()
Me.tabHVACConfig = New System.Windows.Forms.TabPage()
+ Me.btnOpenABDB = New System.Windows.Forms.Button()
+ Me.btnBusDatabaseSource = New System.Windows.Forms.Button()
+ Me.txtBusDatabaseFilePath = New System.Windows.Forms.TextBox()
+ Me.lblBusDatabaseFilePath = New System.Windows.Forms.Label()
Me.btnOpenAHSM = New System.Windows.Forms.Button()
Me.btnSSMBSource = New System.Windows.Forms.Button()
Me.lblSSMFilePath = New System.Windows.Forms.Label()
Me.txtSSMFilePath = New System.Windows.Forms.TextBox()
Me.lblHVACTitle = New System.Windows.Forms.Label()
- Me.txtHVACFuellingLitresPerHour = New System.Windows.Forms.TextBox()
- Me.lblHVACFuellingLitresPerHour = New System.Windows.Forms.Label()
- Me.txtHVACMechanicalLoadPowerWatts = New System.Windows.Forms.TextBox()
- Me.lblHVACMechanicalLoadPowerWatts = New System.Windows.Forms.Label()
- Me.txtHVACElectricalLoadPowerWatts = New System.Windows.Forms.TextBox()
- Me.lblHVACElectricalLoadPowerWatts = New System.Windows.Forms.Label()
Me.resultCardContextMenu = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.DeleteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ErrorProvider = New System.Windows.Forms.ErrorProvider(Me.components)
@@ -322,97 +320,97 @@ Partial Class frmAuxiliaryConfig
'
'gvResultsCardOverrun
'
- 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
+ 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
Me.gvResultsCardOverrun.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- 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
+ 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
Me.gvResultsCardOverrun.Location = New System.Drawing.Point(590, 451)
Me.gvResultsCardOverrun.Name = "gvResultsCardOverrun"
- 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
+ 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
Me.gvResultsCardOverrun.Size = New System.Drawing.Size(246, 125)
Me.gvResultsCardOverrun.TabIndex = 18
'
'gvResultsCardTraction
'
- 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
+ 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
Me.gvResultsCardTraction.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- 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
+ 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
Me.gvResultsCardTraction.Location = New System.Drawing.Point(311, 451)
Me.gvResultsCardTraction.Name = "gvResultsCardTraction"
- 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
+ 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
Me.gvResultsCardTraction.Size = New System.Drawing.Size(258, 125)
Me.gvResultsCardTraction.TabIndex = 17
'
'gvResultsCardIdle
'
- 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
+ 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
Me.gvResultsCardIdle.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- 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
+ 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
Me.gvResultsCardIdle.Location = New System.Drawing.Point(35, 451)
Me.gvResultsCardIdle.Name = "gvResultsCardIdle"
- 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
+ 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
Me.gvResultsCardIdle.Size = New System.Drawing.Size(256, 125)
Me.gvResultsCardIdle.TabIndex = 16
'
@@ -464,33 +462,33 @@ Partial Class frmAuxiliaryConfig
'
'gvElectricalConsumables
'
- 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
+ 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
Me.gvElectricalConsumables.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- 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
+ 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
Me.gvElectricalConsumables.Location = New System.Drawing.Point(33, 170)
Me.gvElectricalConsumables.Name = "gvElectricalConsumables"
- 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
+ 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
Me.gvElectricalConsumables.Size = New System.Drawing.Size(803, 250)
Me.gvElectricalConsumables.TabIndex = 10
'
@@ -1068,17 +1066,15 @@ Partial Class frmAuxiliaryConfig
'
'tabHVACConfig
'
+ Me.tabHVACConfig.Controls.Add(Me.btnOpenABDB)
+ Me.tabHVACConfig.Controls.Add(Me.btnBusDatabaseSource)
+ Me.tabHVACConfig.Controls.Add(Me.txtBusDatabaseFilePath)
+ Me.tabHVACConfig.Controls.Add(Me.lblBusDatabaseFilePath)
Me.tabHVACConfig.Controls.Add(Me.btnOpenAHSM)
Me.tabHVACConfig.Controls.Add(Me.btnSSMBSource)
Me.tabHVACConfig.Controls.Add(Me.lblSSMFilePath)
Me.tabHVACConfig.Controls.Add(Me.txtSSMFilePath)
Me.tabHVACConfig.Controls.Add(Me.lblHVACTitle)
- Me.tabHVACConfig.Controls.Add(Me.txtHVACFuellingLitresPerHour)
- Me.tabHVACConfig.Controls.Add(Me.lblHVACFuellingLitresPerHour)
- Me.tabHVACConfig.Controls.Add(Me.txtHVACMechanicalLoadPowerWatts)
- Me.tabHVACConfig.Controls.Add(Me.lblHVACMechanicalLoadPowerWatts)
- Me.tabHVACConfig.Controls.Add(Me.txtHVACElectricalLoadPowerWatts)
- Me.tabHVACConfig.Controls.Add(Me.lblHVACElectricalLoadPowerWatts)
Me.tabHVACConfig.Location = New System.Drawing.Point(4, 22)
Me.tabHVACConfig.Name = "tabHVACConfig"
Me.tabHVACConfig.Size = New System.Drawing.Size(901, 587)
@@ -1086,6 +1082,40 @@ Partial Class frmAuxiliaryConfig
Me.tabHVACConfig.Text = "HVAC"
Me.tabHVACConfig.UseVisualStyleBackColor = true
'
+ 'btnOpenABDB
+ '
+ Me.btnOpenABDB.Image = CType(resources.GetObject("btnOpenABDB.Image"),System.Drawing.Image)
+ Me.btnOpenABDB.Location = New System.Drawing.Point(777, 138)
+ Me.btnOpenABDB.Name = "btnOpenABDB"
+ Me.btnOpenABDB.Size = New System.Drawing.Size(28, 20)
+ Me.btnOpenABDB.TabIndex = 59
+ Me.btnOpenABDB.UseVisualStyleBackColor = true
+ '
+ 'btnBusDatabaseSource
+ '
+ Me.btnBusDatabaseSource.Location = New System.Drawing.Point(712, 136)
+ Me.btnBusDatabaseSource.Name = "btnBusDatabaseSource"
+ Me.btnBusDatabaseSource.Size = New System.Drawing.Size(45, 23)
+ Me.btnBusDatabaseSource.TabIndex = 58
+ Me.btnBusDatabaseSource.Text = ". . ."
+ Me.btnBusDatabaseSource.UseVisualStyleBackColor = true
+ '
+ 'txtBusDatabaseFilePath
+ '
+ Me.txtBusDatabaseFilePath.Location = New System.Drawing.Point(210, 138)
+ Me.txtBusDatabaseFilePath.Name = "txtBusDatabaseFilePath"
+ Me.txtBusDatabaseFilePath.Size = New System.Drawing.Size(485, 20)
+ Me.txtBusDatabaseFilePath.TabIndex = 57
+ '
+ 'lblBusDatabaseFilePath
+ '
+ Me.lblBusDatabaseFilePath.AutoSize = true
+ Me.lblBusDatabaseFilePath.Location = New System.Drawing.Point(31, 138)
+ Me.lblBusDatabaseFilePath.Name = "lblBusDatabaseFilePath"
+ Me.lblBusDatabaseFilePath.Size = New System.Drawing.Size(169, 13)
+ Me.lblBusDatabaseFilePath.TabIndex = 56
+ Me.lblBusDatabaseFilePath.Text = "Steady State Model File ( .ABDB )"
+ '
'btnOpenAHSM
'
Me.btnOpenAHSM.Image = CType(resources.GetObject("btnOpenAHSM.Image"),System.Drawing.Image)
@@ -1131,54 +1161,6 @@ Partial Class frmAuxiliaryConfig
Me.lblHVACTitle.TabIndex = 25
Me.lblHVACTitle.Text = "Steady State Output Values"
'
- 'txtHVACFuellingLitresPerHour
- '
- Me.txtHVACFuellingLitresPerHour.Location = New System.Drawing.Point(208, 237)
- Me.txtHVACFuellingLitresPerHour.Name = "txtHVACFuellingLitresPerHour"
- Me.txtHVACFuellingLitresPerHour.Size = New System.Drawing.Size(100, 20)
- Me.txtHVACFuellingLitresPerHour.TabIndex = 5
- '
- 'lblHVACFuellingLitresPerHour
- '
- Me.lblHVACFuellingLitresPerHour.AutoSize = true
- Me.lblHVACFuellingLitresPerHour.Location = New System.Drawing.Point(31, 241)
- Me.lblHVACFuellingLitresPerHour.Name = "lblHVACFuellingLitresPerHour"
- Me.lblHVACFuellingLitresPerHour.Size = New System.Drawing.Size(116, 13)
- Me.lblHVACFuellingLitresPerHour.TabIndex = 4
- Me.lblHVACFuellingLitresPerHour.Text = "Fuelling Litres Per Hour"
- '
- 'txtHVACMechanicalLoadPowerWatts
- '
- Me.txtHVACMechanicalLoadPowerWatts.Location = New System.Drawing.Point(208, 185)
- Me.txtHVACMechanicalLoadPowerWatts.Name = "txtHVACMechanicalLoadPowerWatts"
- Me.txtHVACMechanicalLoadPowerWatts.Size = New System.Drawing.Size(100, 20)
- Me.txtHVACMechanicalLoadPowerWatts.TabIndex = 3
- '
- 'lblHVACMechanicalLoadPowerWatts
- '
- Me.lblHVACMechanicalLoadPowerWatts.AutoSize = true
- Me.lblHVACMechanicalLoadPowerWatts.Location = New System.Drawing.Point(31, 189)
- Me.lblHVACMechanicalLoadPowerWatts.Name = "lblHVACMechanicalLoadPowerWatts"
- Me.lblHVACMechanicalLoadPowerWatts.Size = New System.Drawing.Size(153, 13)
- Me.lblHVACMechanicalLoadPowerWatts.TabIndex = 2
- Me.lblHVACMechanicalLoadPowerWatts.Text = "Mechanical Load Power Watts"
- '
- 'txtHVACElectricalLoadPowerWatts
- '
- Me.txtHVACElectricalLoadPowerWatts.Location = New System.Drawing.Point(208, 133)
- Me.txtHVACElectricalLoadPowerWatts.Name = "txtHVACElectricalLoadPowerWatts"
- Me.txtHVACElectricalLoadPowerWatts.Size = New System.Drawing.Size(100, 20)
- Me.txtHVACElectricalLoadPowerWatts.TabIndex = 1
- '
- 'lblHVACElectricalLoadPowerWatts
- '
- Me.lblHVACElectricalLoadPowerWatts.AutoSize = true
- Me.lblHVACElectricalLoadPowerWatts.Location = New System.Drawing.Point(31, 137)
- Me.lblHVACElectricalLoadPowerWatts.Name = "lblHVACElectricalLoadPowerWatts"
- Me.lblHVACElectricalLoadPowerWatts.Size = New System.Drawing.Size(141, 13)
- Me.lblHVACElectricalLoadPowerWatts.TabIndex = 0
- Me.lblHVACElectricalLoadPowerWatts.Text = "Electrical Load Power Watts"
- '
'resultCardContextMenu
'
Me.resultCardContextMenu.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DeleteToolStripMenuItem})
@@ -1328,12 +1310,6 @@ End Sub
Friend WithEvents tabHVACConfig As System.Windows.Forms.TabPage
Friend WithEvents btnAlternatorMapPath As System.Windows.Forms.Button
Friend WithEvents gvResultsCardIdle As System.Windows.Forms.DataGridView
- Friend WithEvents txtHVACFuellingLitresPerHour As System.Windows.Forms.TextBox
- Friend WithEvents lblHVACFuellingLitresPerHour As System.Windows.Forms.Label
- Friend WithEvents txtHVACMechanicalLoadPowerWatts As System.Windows.Forms.TextBox
- Friend WithEvents lblHVACMechanicalLoadPowerWatts As System.Windows.Forms.Label
- Friend WithEvents txtHVACElectricalLoadPowerWatts As System.Windows.Forms.TextBox
- Friend WithEvents lblHVACElectricalLoadPowerWatts As System.Windows.Forms.Label
Friend WithEvents lblHVACTitle As System.Windows.Forms.Label
Friend WithEvents Timer1 As System.Windows.Forms.Timer
Friend WithEvents btnSave As System.Windows.Forms.Button
@@ -1354,5 +1330,9 @@ End Sub
Friend WithEvents btnOpenAPAC As System.Windows.Forms.Button
Friend WithEvents btnOpenAHSM As System.Windows.Forms.Button
Friend WithEvents Label1 As System.Windows.Forms.Label
+ Friend WithEvents btnOpenABDB As System.Windows.Forms.Button
+ Friend WithEvents btnBusDatabaseSource As System.Windows.Forms.Button
+ Friend WithEvents txtBusDatabaseFilePath As System.Windows.Forms.TextBox
+ Friend WithEvents lblBusDatabaseFilePath As System.Windows.Forms.Label
End Class
diff --git a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.resx b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.resx
index 3d9bf05720b369fe8d763cd75327c25400f9926c..d088b8f77214b6996bf0a335e58ef95a20cf1203 100644
--- a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.resx
+++ b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.resx
@@ -118,10 +118,10 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <data name="btnAALTOpen.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <data name="btnOpenABDB.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAACw0AAAsNAe0HwCwAAAAGYktHRAD/AP8A/6C9p5MAAAAHdElNRQfdAw8KGzD/z7E3
+ YQUAAAAJcEhZcwAACwwAAAsMAT9AIsgAAAAGYktHRAD/AP8A/6C9p5MAAAAHdElNRQfdAw8KGzD/z7E3
AAACLElEQVQ4T2OgCggMDGQysg5n1zcPZjewDGU3tApjB/GNbWAYxA9ld3V1ZoFqQQX+4UVO+XVrFxU0
bN2QW7dpfVb1hvUZFevWp5evXZ9esR7I3rQ+v3b9yryS7mx3d1deqDYE8IpobUqsf/Dfp+DFf8+8Z//d
c578d8169N8l4+F/p/QHQPzwf2DBzf9xuYtOMfBaykO1IUBadmXFpTs//x+9+O3f0Qtf/4PwkfNfwPjw
@@ -134,7 +134,7 @@
Gpa8vLzcUG1oQK6eiSAehICBAQCMzHS0MqOocgAAAABJRU5ErkJggg==
</value>
</data>
- <data name="btnOpenAPAC.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <data name="btnOpenAHSM.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAACwwAAAsMAT9AIsgAAAAGYktHRAD/AP8A/6C9p5MAAAAHdElNRQfdAw8KGzD/z7E3
@@ -150,7 +150,7 @@
Gpa8vLzcUG1oQK6eiSAehICBAQCMzHS0MqOocgAAAABJRU5ErkJggg==
</value>
</data>
- <data name="btnOpenACMP.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <data name="btnAALTOpen.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAACwwAAAsMAT9AIsgAAAAGYktHRAD/AP8A/6C9p5MAAAAHdElNRQfdAw8KGzD/z7E3
@@ -166,7 +166,23 @@
Gpa8vLzcUG1oQK6eiSAehICBAQCMzHS0MqOocgAAAABJRU5ErkJggg==
</value>
</data>
- <data name="btnOpenAHSM.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <data name="btnOpenAPAC.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAACwwAAAsMAT9AIsgAAAAGYktHRAD/AP8A/6C9p5MAAAAHdElNRQfdAw8KGzD/z7E3
+ AAACLElEQVQ4T2OgCggMDGQysg5n1zcPZjewDGU3tApjB/GNbWAYxA9ld3V1ZoFqQQX+4UVO+XVrFxU0
+ bN2QW7dpfVb1hvUZFevWp5evXZ9esR7I3rQ+v3b9yryS7mx3d1deqDYE8IpobUqsf/Dfp+DFf8+8Z//d
+ c578d8169N8l4+F/p/QHQPzwf2DBzf9xuYtOMfBaykO1IUBadmXFpTs//x+9+O3f0Qtf/4PwkfNfwPjw
+ uc//dx3/8n/e5u//KyY8uM0sX6vHYPOfEaoVAnJzc4v//fv//9ev3xj458/f/6/c/fM/tubR/6LmXVcU
+ 9GKUoNoQICMjo/Tv37//v337hoI/ffr0/9WrN/8PnXn1P6ri5v+9J97c9g8IDTc1NUUNh6SkpIqfP3/+
+ //jxIxx/+PDh/6Mnr//vP/Hs/4qtD/8v2Pjs36MX//4fP/fiqbNHZCZUKwRER0dXf/ny5f/r16//v3nz
+ Boxfvnz1/+CJ+/+TGh7+d864/z+05Pb/DYf+/U+svX5PySQvFaoVAkJCQmrfv//w/8mTp/+fPn0Gx3fu
+ Pft/8NTL/zuPvvpfVL/6f9usu/cZJDKKOfTX8EG1QoAbMB5PXf74f8fhF/93HgFqQMI7DgMxkG7sXvc/
+ JqXmGqeIqTJUGwKoGET1BRXdfmOV9OidVSIWDBQPLLrzsrB69l4GRnbMWGDiNTJgkC4OY5BrjsWJQfKc
+ Gpa8vLzcUG1oQK6eiSAehICBAQCMzHS0MqOocgAAAABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="btnOpenACMP.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAACwwAAAsMAT9AIsgAAAAGYktHRAD/AP8A/6C9p5MAAAAHdElNRQfdAw8KGzD/z7E3
diff --git a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb
index e139497722ebd4d1bde2803ce9d2610dee68ea65..0a255977764f58bc917b486f908d432ac776e289 100644
--- a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb
+++ b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb
@@ -15,6 +15,7 @@ Imports VectoAuxiliaries.Pneumatics
Imports System.ComponentModel
Imports System.Windows.Forms
Imports System.Drawing
+Imports VectoAuxiliaries.Hvac
Public Class frmAuxiliaryConfig
@@ -446,7 +447,7 @@ Dim result As Boolean = True
End Function
'****** HVAC VALIDATION
-Public Sub Validating_HVACHandler(sender As Object, e As CancelEventArgs) Handles txtHVACMechanicalLoadPowerWatts.Validating, txtHVACFuellingLitresPerHour.Validating, txtHVACElectricalLoadPowerWatts.Validating, txtSSMFilePath.Validating
+Public Sub Validating_HVACHandler(sender As Object, e As CancelEventArgs) Handles txtSSMFilePath.Validating, txtBusDatabaseFilePath.Validating
e.Cancel = Not Validate_HVAC()
@@ -457,41 +458,64 @@ Dim result As Boolean = True
Dim message As String =""
- 'HVAC Electrical Load Power Watts : txtHVACElectricalLoadPowerWatts
- If Not IsZeroOrPostiveNumber(txtHVACElectricalLoadPowerWatts.Text) Then
- ErrorProvider.SetError(txtHVACElectricalLoadPowerWatts, "Please provide a non negative number.")
- result = False
- Else
- ErrorProvider.SetError(txtHVACElectricalLoadPowerWatts, String.Empty)
- End If
+ ''HVAC Electrical Load Power Watts : txtHVACElectricalLoadPowerWatts
+ 'If Not IsZeroOrPostiveNumber(txtHVACElectricalLoadPowerWatts.Text) Then
+ ' ErrorProvider.SetError(txtHVACElectricalLoadPowerWatts, "Please provide a non negative number.")
+ ' result = False
+ 'Else
+ ' ErrorProvider.SetError(txtHVACElectricalLoadPowerWatts, String.Empty)
+ 'End If
'HVAC Mechanical Load Power Watts : txtHVACMechanicalLoadPowerWatts
- If Not IsZeroOrPostiveNumber(txtHVACMechanicalLoadPowerWatts.Text) Then
- ErrorProvider.SetError(txtHVACMechanicalLoadPowerWatts, "Please provide a non negative number.")
- result = False
- Else
- ErrorProvider.SetError(txtHVACMechanicalLoadPowerWatts, String.Empty)
- End If
+ 'If Not IsZeroOrPostiveNumber(txtHVACMechanicalLoadPowerWatts.Text) Then
+ ' ErrorProvider.SetError(txtHVACMechanicalLoadPowerWatts, "Please provide a non negative number.")
+ ' result = False
+ 'Else
+ ' ErrorProvider.SetError(txtHVACMechanicalLoadPowerWatts, String.Empty)
+ 'End If
'HVAC Fuelling Litres Per Hour : txtHVACFuellingLitresPerHour
- If Not IsZeroOrPostiveNumber(txtHVACFuellingLitresPerHour.Text) Then
- ErrorProvider.SetError(txtHVACFuellingLitresPerHour, "Please provide a non negative number.")
- result = False
- Else
- ErrorProvider.SetError(txtHVACFuellingLitresPerHour, String.Empty)
- End If
+ 'If Not IsZeroOrPostiveNumber(txtHVACFuellingLitresPerHour.Text) Then
+ ' ErrorProvider.SetError(txtHVACFuellingLitresPerHour, "Please provide a non negative number.")
+ ' result = False
+ 'Else
+ ' ErrorProvider.SetError(txtHVACFuellingLitresPerHour, String.Empty)
+ 'End If
- 'Check file is valid
- If GetSSMMAP(FilePathUtils.ResolveFilePath(vectoPath,txtSSMFilePath.Text), message ) is nothing then
- ErrorProvider.SetError(txtSSMFilePath, "Please choose a vaid Steady State Model File (*.AHSM")
- result = False
- else
- ErrorProvider.SetError(txtSSMFilePath, String.Empty)
- End If
+
+ 'Validate abdb - Bus Database
+ Dim abdbFile As String = FilePathUtils.ResolveFilePath(vectoPath,txtBusDatabaseFilePath.Text)
+ Dim bdb As New BusDatabase()
+ If bdb.Initialise(abdbFile ) then
+ ErrorProvider.SetError(txtBusDatabaseFilePath, String.Empty)
+ Else
+ result=false
+ ErrorProvider.SetError(Me.txtBusDatabaseFilePath, "Please choose a vaid Steady State Model File (*.ABDB")
+ End If
+ 'Try ahsm - HVac Steady State Model
+ Try
+
+ Dim ahsmFile As String = FilePathUtils.ResolveFilePath(vectoPath,txtSSMFilePath.Text)
+ Dim ssmTool As SSMTOOL = New SSMTOOL( ahsmFile,False)
+
+ If ssmTool.Load( ahsmFile ) then
+ ErrorProvider.SetError(txtSSMFilePath, String.Empty)
+ Else
+ result=false
+ ErrorProvider.SetError(txtSSMFilePath, "Please choose a vaid Steady State Model File (*.AHSM")
+ End If
+
+ Catch ex As Exception
+ 'Just in case
+ ErrorProvider.SetError(txtSSMFilePath, "Please choose a vaid Steady State Model File (*.AHSM")
+ result = false
+
+ End Try
+
UpdateTabStatus("tabHVACConfig", result)
@@ -880,14 +904,43 @@ Private Sub btnCancel_Click( sender As Object, e As EventArgs) Handles btnCance
End Sub
-Private Sub btnSSMBSource_Click( sender As Object, e As EventArgs) Handles btnSSMBSource.Click
+Private Sub btnBusDatabaseSource_Click( sender As Object, e As EventArgs) Handles btnBusDatabaseSource.Click
Dim fbAux As New cFileBrowser(True, False)
Dim ssmMap As Hvac.HVACSteadyStateModel
Dim message As String = String.Empty
+ fbAux.Extensions = New String() {"abdb"}
+
+ If fbAux.OpenDialog(fPATH(vectoFile)) Then
+
+ txtBusDatabaseFilePath.Focus()
+ txtBusDatabaseFilePath.Text = fFileWoDir(fbAux.Files(0), fPATH(vectoFile))
+
+ Dim busDB As New BusDatabase( )
+
+ If Not busDB.Initialise( FilePathUtils.ResolveFilePath(vectoPath,txtBusDatabaseFilePath.Text) )
+
+ messagebox.Show("Unable to load")
+
+
+ End If
+
+
+ End If
+
+
+End Sub
+Private Sub btnSSMBSource_Click( sender As Object, e As EventArgs) Handles btnSSMBSource.Click
+
+
+ Dim fbAux As New cFileBrowser(True, False)
+ Dim ssmMap As ISSMTool
+ Dim message As String = String.Empty
+
+
fbAux.Extensions = New String() {"ahsm"}
If fbAux.OpenDialog(fPATH(vectoFile)) Then
@@ -897,31 +950,20 @@ Private Sub btnSSMBSource_Click( sender As Object, e As EventArgs) Handles btnS
- ssmMap = GetSSMMAP(FilePathUtils.ResolveFilePath(vectoPath,txtSSMFilePath.Text), message )
+ ssmMap = New SSMTOOL(txtSSMFilePath.Text,false)
If ssmMap is nothing then
- txtHVACElectricalLoadPowerWatts.Text = string.empty
- txtHVACMechanicalLoadPowerWatts.Text = string.empty
- txtHVACFuellingLitresPerHour.Text = string.empty
messagebox.Show("Unable to load")
- else
-
- 'Populate boxes
- txtHVACElectricalLoadPowerWatts.Text = ssmMap.HVACElectricalLoadPowerWatts.ToString()
- txtHVACMechanicalLoadPowerWatts.Text = ssmMap.HVACMechanicalLoadPowerWatts.ToString()
- txtHVACFuellingLitresPerHour.Text = ssmMap.HVACFuellingLitresPerHour.ToString()
-
-
End If
End If
- 'Causes binding to fire
- btnSSMBSource.Focus()
- txtSSMFilePath.Focus()
+ ''Causes binding to fire
+ 'btnSSMBSource.Focus()
+ 'txtSSMFilePath.Focus()
@@ -952,6 +994,13 @@ Private Sub btnOpenAHSM_Click( sender As Object, e As EventArgs) Handles btnOpe
End Sub
+Private Sub btnOpenABDB_Click( sender As Object, e As EventArgs) Handles btnOpenABDB.Click
+
+
+ OpenFiles(fFileRepl(Me.txtBusDatabaseFilePath.Text, fPATH(VECTOfile)))
+
+End Sub
+
#end region
@@ -1265,9 +1314,9 @@ Private Sub CreateBindings()
cboDoors.DataBindings.Add("Text", auxConfig.PneumaticUserInputsConfig, "Doors")
'HVAC Bindings
- txtHVACElectricalLoadPowerWatts.DataBindings.Add("Text", auxConfig.HvacUserInputsConfig.SteadyStateModel, "HVACElectricalLoadPowerWatts",False,DataSourceUpdateMode.OnPropertyChanged)
- txtHVACFuellingLitresPerHour.DataBindings.Add("Text", auxConfig.HvacUserInputsConfig.SteadyStateModel, "HVACFuellingLitresPerHour",False,DataSourceUpdateMode.OnPropertyChanged)
- txtHVACMechanicalLoadPowerWatts.DataBindings.Add("Text", auxConfig.HvacUserInputsConfig.SteadyStateModel, "HVACMechanicalLoadPowerWatts",False,DataSourceUpdateMode.OnPropertyChanged)
+ 'txtHVACElectricalLoadPowerWatts.DataBindings.Add("Text", auxConfig.HvacUserInputsConfig.SteadyStateModel, "HVACElectricalLoadPowerWatts",False,DataSourceUpdateMode.OnPropertyChanged)
+ 'txtHVACFuellingLitresPerHour.DataBindings.Add("Text", auxConfig.HvacUserInputsConfig.SteadyStateModel, "HVACFuellingLitresPerHour",False,DataSourceUpdateMode.OnPropertyChanged)
+ 'txtHVACMechanicalLoadPowerWatts.DataBindings.Add("Text", auxConfig.HvacUserInputsConfig.SteadyStateModel, "HVACMechanicalLoadPowerWatts",False,DataSourceUpdateMode.OnPropertyChanged)
txtSSMFilePath.DataBindings.Add( "Text", auxConfig.HvacUserInputsConfig,"SSMFilePath")
@@ -1311,4 +1360,5 @@ Public Function FileOpenAlt(ByVal file As String) As Boolean
End Function
+
End Class
\ No newline at end of file