Code development platform for open source projects from the European Union institutions

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

Merge pull request #216 in VECTO/vecto-sim from...

Merge pull request #216 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:hotfix/VECTO-302-aaux-does-not-store-hvac-filepath to master

* commit 'b5dd8824':
  update data source after chaning UI property via code
  show filebrowser in file dialog for alternator map and hvac ssm file
parents fa1386be b5dd8824
No related branches found
No related tags found
No related merge requests found
...@@ -611,7 +611,7 @@ Public Class frmAuxiliaryConfig ...@@ -611,7 +611,7 @@ Public Class frmAuxiliaryConfig
Dim s As Single Dim s As Single
If e.ColumnIndex = - 1 Then If e.ColumnIndex = -1 Then
e.Cancel = True e.Cancel = True
Exit Sub Exit Sub
...@@ -840,7 +840,7 @@ Public Class frmAuxiliaryConfig ...@@ -840,7 +840,7 @@ Public Class frmAuxiliaryConfig
Private Sub btnAlternatorMapPath_Click(sender As Object, e As EventArgs) Handles btnAlternatorMapPath.Click Private Sub btnAlternatorMapPath_Click(sender As Object, e As EventArgs) Handles btnAlternatorMapPath.Click
Dim fbAux As New cFileBrowser("AAUXALT", True, False) Dim fbAux As New cFileBrowser("AAUXALT", False, False)
fbAux.Extensions = New String() {"AALT"} fbAux.Extensions = New String() {"AALT"}
Dim suppliedAALTPath As String = txtAlternatorMapPath.Text Dim suppliedAALTPath As String = txtAlternatorMapPath.Text
...@@ -907,7 +907,7 @@ Public Class frmAuxiliaryConfig ...@@ -907,7 +907,7 @@ Public Class frmAuxiliaryConfig
Return Return
End If End If
End Using End Using
BindingContext(auxConfig.ElectricalUserInputsConfig).EndCurrentEdit()
Validate_Electrics() Validate_Electrics()
End If End If
...@@ -935,6 +935,10 @@ Public Class frmAuxiliaryConfig ...@@ -935,6 +935,10 @@ Public Class frmAuxiliaryConfig
txtCompressorMap.Focus() txtCompressorMap.Focus()
End Sub End Sub
Private Sub btnActuationsMap_BindingContextChanged(sender As Object, e As EventArgs) _
Handles btnActuationsMap.BindingContextChanged
End Sub
Private Sub btnActuationsMap_Click(sender As Object, e As EventArgs) Handles btnActuationsMap.Click Private Sub btnActuationsMap_Click(sender As Object, e As EventArgs) Handles btnActuationsMap.Click
Dim fbAux As New cFileBrowser("AAUXPneuAct", True, False) Dim fbAux As New cFileBrowser("AAUXPneuAct", True, False)
...@@ -987,9 +991,13 @@ Public Class frmAuxiliaryConfig ...@@ -987,9 +991,13 @@ Public Class frmAuxiliaryConfig
End If End If
End Sub End Sub
Private Sub btnSSMBSource_BindingContextChanged(sender As Object, e As EventArgs) _
Handles btnSSMBSource.BindingContextChanged
End Sub
Private Sub btnSSMBSource_Click(sender As Object, e As EventArgs) Handles btnSSMBSource.Click Private Sub btnSSMBSource_Click(sender As Object, e As EventArgs) Handles btnSSMBSource.Click
Dim fbAux As New cFileBrowser("AAUXSSM", True, False) Dim fbAux As New cFileBrowser("AAUXSSM", False, False)
fbAux.Extensions = New String() {"AHSM"} fbAux.Extensions = New String() {"AHSM"}
Dim suppliedSSMPath As String = txtSSMFilePath.Text.Trim() Dim suppliedSSMPath As String = txtSSMFilePath.Text.Trim()
...@@ -1058,7 +1066,7 @@ Public Class frmAuxiliaryConfig ...@@ -1058,7 +1066,7 @@ Public Class frmAuxiliaryConfig
Return Return
End If End If
End Using End Using
BindingContext(auxConfig.HvacUserInputsConfig).EndCurrentEdit()
Validate_HVAC() Validate_HVAC()
End If End If
...@@ -1188,10 +1196,10 @@ Public Class frmAuxiliaryConfig ...@@ -1188,10 +1196,10 @@ Public Class frmAuxiliaryConfig
e.Graphics.FillRectangle(br, e.Bounds) e.Graphics.FillRectangle(br, e.Bounds)
Dim sz As SizeF = e.Graphics.MeasureString(tabMain.TabPages(e.Index).Text, e.Font) Dim sz As SizeF = e.Graphics.MeasureString(tabMain.TabPages(e.Index).Text, e.Font)
e.Graphics.DrawString(tabMain.TabPages(e.Index).Text, e.Font, Brushes.Black, e.Graphics.DrawString(tabMain.TabPages(e.Index).Text, e.Font, Brushes.Black,
e.Bounds.Left + (e.Bounds.Width - sz.Width)/2, e.Bounds.Top + (e.Bounds.Height - sz.Height)/2 + 1) e.Bounds.Left + (e.Bounds.Width - sz.Width) / 2, e.Bounds.Top + (e.Bounds.Height - sz.Height) / 2 + 1)
Dim rect As Rectangle = e.Bounds Dim rect As Rectangle = e.Bounds
rect.Offset(- 1, - 1) rect.Offset(-1, -1)
rect.Inflate(1, 1) rect.Inflate(1, 1)
' e.Graphics.DrawRectangle(Pens.DarkGray, rect) ' e.Graphics.DrawRectangle(Pens.DarkGray, rect)
'e.DrawFocusRectangle() 'e.DrawFocusRectangle()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment