Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit 727c6cea authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

renaming variable, storing path for aaux file relative to job-file, use correct path for aaux file

parent cd278eda
Branches
Tags
No related merge requests found
...@@ -256,7 +256,7 @@ Public Class JSONFileWriter ...@@ -256,7 +256,7 @@ Public Class JSONFileWriter
'ADVANCED AUXILIARIES 'ADVANCED AUXILIARIES
body.Add("AuxiliaryAssembly", aux.AuxiliaryAssembly.GetName()) body.Add("AuxiliaryAssembly", aux.AuxiliaryAssembly.GetName())
body.Add("AuxiliaryVersion", aux.AuxiliaryVersion) body.Add("AuxiliaryVersion", aux.AuxiliaryVersion)
body.Add("AdvancedAuxiliaryFilePath", aux.AdvancedAuxiliaryFilePath) body.Add("AdvancedAuxiliaryFilePath", GetRelativePath(aux.AdvancedAuxiliaryFilePath, basePath))
Dim pAdd As Double = 0.0 Dim pAdd As Double = 0.0
Dim auxList As List(Of Object) = New List(Of Object) Dim auxList As List(Of Object) = New List(Of Object)
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
' '
' See the LICENSE.txt for the specific language governing permissions and limitations. ' See the LICENSE.txt for the specific language governing permissions and limitations.
Imports System.IO
Public Class FilePathUtils Public Class FilePathUtils
Public Shared Function ValidateFilePath(ByVal filePath As String, ByVal expectedExtension As String, Public Shared Function ValidateFilePath(ByVal filePath As String, ByVal expectedExtension As String,
...@@ -21,7 +22,7 @@ Public Class FilePathUtils ...@@ -21,7 +22,7 @@ Public Class FilePathUtils
Dim fileNameOnlyNoExtension As String = fileNameOnly(filePath, False) Dim fileNameOnlyNoExtension As String = fileNameOnly(filePath, False)
'Is this filePath empty 'Is this filePath empty
If filePath.trim.Length = 0 OrElse Right(filePath, 1) = "\" Then If filePath.Trim.Length = 0 OrElse Right(filePath, 1) = "\" Then
message = "A filename cannot be empty" message = "A filename cannot be empty"
Return False Return False
End If End If
...@@ -86,7 +87,7 @@ Public Class FilePathUtils ...@@ -86,7 +87,7 @@ Public Class FilePathUtils
'Filepath is already absolute 'Filepath is already absolute
Return filename Return filename
Else Else
Return vectoPath & filename Return Path.Combine(vectoPath, filename) 'vectoPath & filename
End If End If
End Function End Function
......
...@@ -29,7 +29,7 @@ Public Class frmAuxiliaryConfig ...@@ -29,7 +29,7 @@ Public Class frmAuxiliaryConfig
Private processing As Boolean = False Private processing As Boolean = False
Private SecondsIntoCycle As Integer = 0 Private SecondsIntoCycle As Integer = 0
Private vectoFile As String = "" Private vectoFile As String = ""
Private vectoPath As String = "" Private aauxPath As String = ""
Private auxFile As String Private auxFile As String
Private cmFilesList As String() Private cmFilesList As String()
Private SaveClicked As Boolean Private SaveClicked As Boolean
...@@ -60,18 +60,18 @@ Public Class frmAuxiliaryConfig ...@@ -60,18 +60,18 @@ Public Class frmAuxiliaryConfig
Me.vectoFile = vectoFileName Me.vectoFile = vectoFileName
Me.vectoPath = FilePathUtils.filePathOnly(vectoFileName) Me.aauxPath = Path.GetDirectoryName(Path.Combine(FilePathUtils.filePathOnly(vectoFileName), fileName))
' This call is required by the designer. ' This call is required by the designer.
InitializeComponent() InitializeComponent()
' Add any initialization after the InitializeComponent() call. ' Add any initialization after the InitializeComponent() call.
auxFile = fileName auxFile = Path.Combine(FilePathUtils.filePathOnly(vectoFileName), fileName)
Try Try
auxConfig = New AuxiliaryConfig(FilePathUtils.ResolveFilePath(vectoPath, auxFile)) auxConfig = New AuxiliaryConfig(auxFile)
originalConfig = New AuxiliaryConfig(FilePathUtils.ResolveFilePath(vectoPath, auxFile)) originalConfig = New AuxiliaryConfig(FilePathUtils.ResolveFilePath(aauxPath, auxFile))
Catch ex As Exception Catch ex As Exception
...@@ -287,7 +287,7 @@ Public Class frmAuxiliaryConfig ...@@ -287,7 +287,7 @@ Public Class frmAuxiliaryConfig
Dim comp As CompressorMap Dim comp As CompressorMap
Try Try
comp = New CompressorMap(FilePathUtils.ResolveFilePath(vectoPath, txtCompressorMap.Text)) comp = New CompressorMap(FilePathUtils.ResolveFilePath(aauxPath, txtCompressorMap.Text))
comp.Initialise() comp.Initialise()
ErrorProvider.SetError(txtCompressorMap, String.Empty) ErrorProvider.SetError(txtCompressorMap, String.Empty)
Catch ex As Exception Catch ex As Exception
...@@ -324,7 +324,7 @@ Public Class frmAuxiliaryConfig ...@@ -324,7 +324,7 @@ Public Class frmAuxiliaryConfig
Dim actuations As PneumaticActuationsMAP Dim actuations As PneumaticActuationsMAP
Try Try
actuations = New PneumaticActuationsMAP(FilePathUtils.ResolveFilePath(vectoPath, txtActuationsMap.Text)) actuations = New PneumaticActuationsMAP(FilePathUtils.ResolveFilePath(aauxPath, txtActuationsMap.Text))
actuations.Initialise() actuations.Initialise()
ErrorProvider.SetError(txtActuationsMap, String.Empty) ErrorProvider.SetError(txtActuationsMap, String.Empty)
Catch ex As Exception Catch ex As Exception
...@@ -415,7 +415,7 @@ Public Class frmAuxiliaryConfig ...@@ -415,7 +415,7 @@ Public Class frmAuxiliaryConfig
'Test File is valid 'Test File is valid
Dim alt As ICombinedAlternator Dim alt As ICombinedAlternator
Try Try
alt = New CombinedAlternator(FilePathUtils.ResolveFilePath(vectoPath, txtAlternatorMapPath.Text)) alt = New CombinedAlternator(FilePathUtils.ResolveFilePath(aauxPath, txtAlternatorMapPath.Text))
ErrorProvider.SetError(txtAlternatorMapPath, String.Empty) ErrorProvider.SetError(txtAlternatorMapPath, String.Empty)
Catch ex As Exception Catch ex As Exception
ErrorProvider.SetError(txtAlternatorMapPath, ErrorProvider.SetError(txtAlternatorMapPath,
...@@ -469,7 +469,7 @@ Public Class frmAuxiliaryConfig ...@@ -469,7 +469,7 @@ Public Class frmAuxiliaryConfig
Dim message As String = "" Dim message As String = ""
'Validate abdb - Bus Database 'Validate abdb - Bus Database
Dim abdbFile As String = FilePathUtils.ResolveFilePath(vectoPath, txtBusDatabaseFilePath.Text) Dim abdbFile As String = FilePathUtils.ResolveFilePath(aauxPath, txtBusDatabaseFilePath.Text)
Dim bdb As New BusDatabase() Dim bdb As New BusDatabase()
If bdb.Initialise(abdbFile) Then If bdb.Initialise(abdbFile) Then
ErrorProvider.SetError(txtBusDatabaseFilePath, String.Empty) ErrorProvider.SetError(txtBusDatabaseFilePath, String.Empty)
...@@ -482,7 +482,7 @@ Public Class frmAuxiliaryConfig ...@@ -482,7 +482,7 @@ Public Class frmAuxiliaryConfig
'Try ahsm - HVac Steady State Model 'Try ahsm - HVac Steady State Model
Try Try
Dim ahsmFile As String = FilePathUtils.ResolveFilePath(vectoPath, txtSSMFilePath.Text) Dim ahsmFile As String = FilePathUtils.ResolveFilePath(aauxPath, txtSSMFilePath.Text)
Dim ssmTool As SSMTOOL = New SSMTOOL(ahsmFile, New HVACConstants, False) Dim ssmTool As SSMTOOL = New SSMTOOL(ahsmFile, New HVACConstants, False)
If ssmTool.Load(ahsmFile) Then If ssmTool.Load(ahsmFile) Then
...@@ -568,7 +568,7 @@ Public Class frmAuxiliaryConfig ...@@ -568,7 +568,7 @@ Public Class frmAuxiliaryConfig
Dim result As DialogResult Dim result As DialogResult
If Not File.Exists(FilePathUtils.ResolveFilePath(vectoPath, auxFile)) OrElse If Not File.Exists(FilePathUtils.ResolveFilePath(aauxPath, auxFile)) OrElse
Not auxConfig.ConfigValuesAreTheSameAs(originalConfig) Then Not auxConfig.ConfigValuesAreTheSameAs(originalConfig) Then
result = result =
...@@ -795,7 +795,7 @@ Public Class frmAuxiliaryConfig ...@@ -795,7 +795,7 @@ Public Class frmAuxiliaryConfig
End If End If
End If End If
result = auxConfig.Save(FilePathUtils.ResolveFilePath(vectoPath, auxFile)) result = auxConfig.Save(FilePathUtils.ResolveFilePath(aauxPath, auxFile))
If Not result Then MessageBox.Show(String.Format("Unable to Save the file '{0}'", auxFile)) If Not result Then MessageBox.Show(String.Format("Unable to Save the file '{0}'", auxFile))
...@@ -810,7 +810,7 @@ Public Class frmAuxiliaryConfig ...@@ -810,7 +810,7 @@ Public Class frmAuxiliaryConfig
'Release existing databindings 'Release existing databindings
UnbindAllControls(Me) UnbindAllControls(Me)
result = auxConfig.Load(FilePathUtils.ResolveFilePath(vectoPath, auxFile)) result = auxConfig.Load(FilePathUtils.ResolveFilePath(aauxPath, auxFile))
If Not result Then If Not result Then
MessageBox.Show(String.Format("Unable to load the file '{0}'", auxFile)) MessageBox.Show(String.Format("Unable to load the file '{0}'", auxFile))
...@@ -859,7 +859,7 @@ Public Class frmAuxiliaryConfig ...@@ -859,7 +859,7 @@ Public Class frmAuxiliaryConfig
'If file Exists, Check validity, else fire up a default SSM Config. 'If file Exists, Check validity, else fire up a default SSM Config.
If fileExists Then If fileExists Then
Try Try
Dim aaltFile As String = FilePathUtils.ResolveFilePath(vectoPath, absoluteAALTPath) Dim aaltFile As String = FilePathUtils.ResolveFilePath(aauxPath, absoluteAALTPath)
Dim combinedAlt As ICombinedAlternator = New CombinedAlternator(aaltFile) Dim combinedAlt As ICombinedAlternator = New CombinedAlternator(aaltFile)
Catch ex As Exception Catch ex As Exception
MessageBox.Show("The supplied .AALT File was invalid, aborting.") MessageBox.Show("The supplied .AALT File was invalid, aborting.")
...@@ -897,9 +897,9 @@ Public Class frmAuxiliaryConfig ...@@ -897,9 +897,9 @@ Public Class frmAuxiliaryConfig
Using frm As New frmCombinedAlternators(absoluteAALTPath, New CombinedAlternatorSignals) Using frm As New frmCombinedAlternators(absoluteAALTPath, New CombinedAlternatorSignals)
'If Dialog result is OK, then take action else bail 'If Dialog result is OK, then take action else bail
If frm.ShowDialog() = Windows.Forms.DialogResult.OK Then If frm.ShowDialog() = Windows.Forms.DialogResult.OK Then
If suppliedAALTPath.Contains(":\") AndAlso Not String.IsNullOrEmpty(vectoPath) Then If suppliedAALTPath.Contains(":\") AndAlso Not String.IsNullOrEmpty(aauxPath) Then
txtAlternatorMapPath.Text = txtAlternatorMapPath.Text =
If(suppliedAALTPath.Contains(vectoPath), suppliedAALTPath.Replace(vectoPath, ""), suppliedAALTPath) If(suppliedAALTPath.Contains(aauxPath), suppliedAALTPath.Replace(aauxPath, ""), suppliedAALTPath)
Else Else
txtAlternatorMapPath.Text = fFileWoDir(suppliedAALTPath) txtAlternatorMapPath.Text = fFileWoDir(suppliedAALTPath)
End If End If
...@@ -981,7 +981,7 @@ Public Class frmAuxiliaryConfig ...@@ -981,7 +981,7 @@ Public Class frmAuxiliaryConfig
Dim busDB As New BusDatabase() Dim busDB As New BusDatabase()
If Not busDB.Initialise(FilePathUtils.ResolveFilePath(vectoPath, txtBusDatabaseFilePath.Text)) Then If Not busDB.Initialise(FilePathUtils.ResolveFilePath(aauxPath, txtBusDatabaseFilePath.Text)) Then
MessageBox.Show("Unable to load") MessageBox.Show("Unable to load")
...@@ -1019,7 +1019,7 @@ Public Class frmAuxiliaryConfig ...@@ -1019,7 +1019,7 @@ Public Class frmAuxiliaryConfig
If File.Exists(absoluteSSMPath) Then If File.Exists(absoluteSSMPath) Then
'is file valid Try ahsm - HVac Steady State Model 'is file valid Try ahsm - HVac Steady State Model
Try Try
Dim ahsmFile As String = FilePathUtils.ResolveFilePath(vectoPath, absoluteSSMPath) Dim ahsmFile As String = FilePathUtils.ResolveFilePath(aauxPath, absoluteSSMPath)
Dim ssmTool As SSMTOOL = New SSMTOOL(ahsmFile, New HVACConstants, False) Dim ssmTool As SSMTOOL = New SSMTOOL(ahsmFile, New HVACConstants, False)
ssmTool.Load(ahsmFile) ssmTool.Load(ahsmFile)
Catch ex As Exception Catch ex As Exception
...@@ -1056,9 +1056,9 @@ Public Class frmAuxiliaryConfig ...@@ -1056,9 +1056,9 @@ Public Class frmAuxiliaryConfig
Using frm As New frmHVACTool(absoluteBusDatabasePath, absoluteSSMPath, vectoFile, Not fileExists) Using frm As New frmHVACTool(absoluteBusDatabasePath, absoluteSSMPath, vectoFile, Not fileExists)
If frm.ShowDialog() = Windows.Forms.DialogResult.OK Then If frm.ShowDialog() = Windows.Forms.DialogResult.OK Then
If suppliedSSMPath.Contains(":\") AndAlso Not String.IsNullOrEmpty(vectoPath) Then If suppliedSSMPath.Contains(":\") AndAlso Not String.IsNullOrEmpty(aauxPath) Then
txtSSMFilePath.Text = txtSSMFilePath.Text =
If(suppliedSSMPath.Contains(vectoPath), suppliedSSMPath.Replace(vectoPath, ""), suppliedSSMPath) If(suppliedSSMPath.Contains(aauxPath), suppliedSSMPath.Replace(aauxPath, ""), suppliedSSMPath)
Else Else
txtSSMFilePath.Text = fFileWoDir(suppliedSSMPath) txtSSMFilePath.Text = fFileWoDir(suppliedSSMPath)
End If End If
...@@ -1233,7 +1233,7 @@ Public Class frmAuxiliaryConfig ...@@ -1233,7 +1233,7 @@ Public Class frmAuxiliaryConfig
Try Try
If ssmMap.SetValuesFromMap(FilePathUtils.ResolveFilePath(vectoPath, txtSSMFilePath.Text), message) Then If ssmMap.SetValuesFromMap(FilePathUtils.ResolveFilePath(aauxPath, txtSSMFilePath.Text), message) Then
Return ssmMap Return ssmMap
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment