diff --git a/VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb b/VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb index 9a64e50a07f6b0499f6070d064c43dc03263137a..46a06976dad9d7e9a086429ea9f3815a0ce03b4d 100644 --- a/VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb +++ b/VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb @@ -322,14 +322,16 @@ Public Class AuxiliaryConfig 'This is where we Assume values of loaded( Deserialized ) object. AssumeValuesOfOther(tmpAux) - Dim tmp As cMAP = New cMAP - tmp.FilePath = Path.Combine(Path.GetDirectoryName(auxFile), tmpAux.VectoInputs.FuelMapFile) - If Not tmp.ReadFile() Then - MessageBox.Show("Unable to read fuel map, aborting.") - Return False + If Not tmpAux.VectoInputs.FuelMapFile Is Nothing Then + Dim tmp As cMAP = New cMAP + tmp.FilePath = Path.Combine(Path.GetDirectoryName(auxFile), tmpAux.VectoInputs.FuelMapFile) + If Not tmp.ReadFile() Then + MessageBox.Show("Unable to read fuel map, aborting.") + Return False + End If + tmp.Triangulate() + VectoInputs.FuelMap = tmp End If - tmp.Triangulate() - VectoInputs.FuelMap = tmp Catch ex As Exception returnValue = False diff --git a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj index 7f39914c33a3afdf07dfc221f3b3d9bb7221a238..2576fa0f01828aa9e19fecc8b46432aec4197a8e 100644 --- a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj +++ b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj @@ -297,6 +297,21 @@ <None Include="TestFiles\AdvAuxTest.aaux"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None> + <None Include="TestFiles\auxiliaryConfigKEEP.json"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestFiles\CombinedAlternatorEfficiencyMap.csv"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestFiles\CombinedAlternatorPowerMap.csv"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestFiles\cstrPneumaticActuationsMapPath_INCORRECTCOLUMNS.csv"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestFiles\HVACMap.vaux"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> <None Include="TestFiles\Integration\24t Coach.vmap"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None> @@ -363,6 +378,9 @@ <Content Include="TestFiles\Integration\testFuelGoodMap.vmap"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> + <None Include="TestFiles\testCompressorMap - Copy.acmp"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> </ItemGroup> <ItemGroup /> <ItemGroup>