CA WIP - Fixes for SSM Categories and Repeating Dialogs when using original...

CA WIP - Fixes for SSM Categories and Repeating Dialogs when using original Alpha file type for (.AHSM) IE Non Combined Alternator.

git-tfs-id: [http://tfs00.element.root.com:8080/tfs/TFSCollection]$/VECTO;C1845

HVACTOOL/HVACTOOL.vbproj

@@ -143,6 +143,7 @@
     <Content Include="bin\Debug\ssm.Ahsm">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <None Include="bin\Debug\SSMOLD.ahsm" />
     <None Include="HVACTOOL_TemporaryKey.pfx" />
     <None Include="My Project\Application.myapp">
       <Generator>MyApplicationCodeGenerator</Generator>
@@ -165,6 +166,7 @@
     <Content Include="ssm.Ahsm">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <None Include="SSMOLD.ashm" />
     <None Include="testCombinedAlternatorMap.aalt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

HVACTOOL/Module1.vb

@@ -13,15 +13,13 @@ Sub main()
 
    Dim altSignals As New CombinedAlternatorSignals()
 
-   'Dim frm As New frmHVACTool("BusDatabase.abdb", "ssm.ahsm")
-   Dim frm As New frmCombinedAlternators("testCombinedAlternatorMap.aalt",altSignals)
-
-
-
+    Dim frm As New frmHVACTool("BusDatabase.abdb", "ssmDelete.ahsm")
+   'Dim frm As New frmCombinedAlternators("testCombinedAlternatorMap.aalt",altSignals)
 
     frm.ShowDialog()
 
 
+    
 
 End Sub
 

HVACTOOL/SSMOLD.ashm

+[Electrical Power (w)],[Mechanical Power (w)], [Fuelling (L/H)]
+100,50,0
+[MODELSOURCE]
+Modelname : HVAC MODEL SYSTEM
+Model Version : 1.0
+UserName : Joe Bloggs
+DateTime : 15th Feb 2014
+Comments :This is some descriptive Comments on the production of this model.
+
+[KeyValuePairs]
+AmbientTemperature Deg C : 22

VECTOAux/VectoAuxiliaries/UI/frmHVACTool.Designer.vb

@@ -2271,7 +2271,6 @@ Partial Class frmHVACTool
         '
         'Timer1
         '
-        Me.Timer1.Enabled = true
         Me.Timer1.Interval = 1000
         '
         'lblElectricalBaseW

VECTOAux/VectoAuxiliaries/UI/frmHVACTool.vb

@@ -55,7 +55,7 @@ End Function
      If Not ssmTOOL is Nothing AndAlso Not ssmTOOL.TechList is Nothing AndAlso ssmTOOL.TechList.TechLines.Count>0
 
         'Fuse Lists          
-        Dim fusedList As new List(Of String )
+        Dim fusedList As  List(Of String ) = DefaultCategories.ToList()
         
         For Each s As String In ssmTOOL.TechList.TechLines.Select( Function(sel) sel.Category)
 
@@ -93,12 +93,19 @@ End Function
     ssmTOOL = New SSMTOOL(ahsmFilePath,useDefaults)
     originalssmTOOL = New SSMTOOL( ahsmFilePath, useDefaults)
 
-    ssmTOOL.Load(ahsmFilePath)
-    originalssmTOOL.Load( ahsmFilePath)
+    If  ssmTOOL.Load(ahsmFilePath) ANdAlso  originalssmTOOL.Load( ahsmFilePath) then
+      Timer1.Enabled=true
+    Else
+    
+      MessageBox.Show("The file format for the Steady State Model (.AHSM) was corrupted or is an alpha version. Please refer to the documentation or help to discover more.")
+      Timer1.Enabled=false
+
+    end if
+
+     setupBuses()
+     setupControls()
+     setupBindings()  
 
-    setupBuses()
-    setupControls()
-    setupBindings()
 
 End Sub
 

VECTOAux/VectoAuxiliariesTests/TestFiles/testHVACSteadyStateModelBadValues.ahsm

 [Electrical Power (w)],[Mechanical Power (w)], [Fuelling (L/H)]
-100,d,0
+100,50,0
 [MODELSOURCE]
 Modelname : HVAC MODEL SYSTEM
 Model Version : 1.0