diff --git a/VECTO/AdvancedAuxiliariesModule.vb b/VECTO/AdvancedAuxiliariesModule.vb
index 70f3617bb5b52983b57bc4f0097d478c7d9167bc..0d2bcfc212251226e1ce122c6571b3dfa4d1ef0c 100644
--- a/VECTO/AdvancedAuxiliariesModule.vb
+++ b/VECTO/AdvancedAuxiliariesModule.vb
@@ -22,18 +22,18 @@ Module AdvancedAuxiliariesModule
''' </summary>
''' <returns>List(Of cAdvancedAuxiliary)</returns>
''' <remarks>Target Directory would normally be the executing directory, but can be in another location.</remarks>
- Public Function DiscoverAdvancedAuxiliaries() As List(Of cAdvancedAuxiliary)
+ Public Function DiscoverAdvancedAuxiliaries() As List(Of AdvancedAuxiliary)
- Dim returnList As List(Of cAdvancedAuxiliary) = New List(Of cAdvancedAuxiliary)
+ Dim returnList As List(Of AdvancedAuxiliary) = New List(Of AdvancedAuxiliary)
Dim fileNameWoPath As String
Dim fileNameWoExtentsion As String
- Dim advancedAuxiliary As cAdvancedAuxiliary
+ Dim advancedAuxiliary As AdvancedAuxiliary
Dim o As ObjectHandle
Dim iAdvancedAux As IAdvancedAuxiliaries
'Create Default
- returnList.Add(New cAdvancedAuxiliary())
+ returnList.Add(New AdvancedAuxiliary())
Try
@@ -46,14 +46,14 @@ Module AdvancedAuxiliariesModule
If fileName.Contains("Auxiliaries.dll") Then
'Get filenamewith
- fileNameWoPath = fFILE(fileName, True)
- fileNameWoExtentsion = fFILE(fileName, False)
+ fileNameWoPath = GetFilenameWithoutPath(fileName, True)
+ fileNameWoExtentsion = GetFilenameWithoutPath(fileName, False)
o = Activator.CreateInstance(fileNameWoExtentsion, "VectoAuxiliaries.AdvancedAuxiliaries")
iAdvancedAux = DirectCast(o.Unwrap, IAdvancedAuxiliaries)
- advancedAuxiliary = New cAdvancedAuxiliary(iAdvancedAux.AuxiliaryName, iAdvancedAux.AuxiliaryVersion,
+ advancedAuxiliary = New AdvancedAuxiliary(iAdvancedAux.AuxiliaryName, iAdvancedAux.AuxiliaryVersion,
fileNameWoPath, fileNameWoExtentsion)
returnList.Add(advancedAuxiliary)
@@ -84,7 +84,7 @@ Module AdvancedAuxiliariesModule
vectoFilePath As String) As Boolean
- Dim auxList As List(Of cAdvancedAuxiliary) = DiscoverAdvancedAuxiliaries()
+ Dim auxList As List(Of AdvancedAuxiliary) = DiscoverAdvancedAuxiliaries()
Dim chosenAssembly As String
Dim o As ObjectHandle
Dim iAdvancedAux As IAdvancedAuxiliaries
@@ -146,7 +146,7 @@ Module AdvancedAuxiliariesModule
ByVal version As String,
ByRef message As String) As Boolean
- Dim auxList As List(Of cAdvancedAuxiliary) = DiscoverAdvancedAuxiliaries()
+ Dim auxList As List(Of AdvancedAuxiliary) = DiscoverAdvancedAuxiliaries()
Dim chosenAssembly As String
Dim o As ObjectHandle
Dim iAdvancedAux As IAdvancedAuxiliaries
diff --git a/VECTO/GUI/EngineForm.vb b/VECTO/GUI/EngineForm.vb
index 9259aa0a3b24f1e266b812efbbf52762796b983c..03ec3d2acdd8faf66a55b6975cab888a37d09467 100644
--- a/VECTO/GUI/EngineForm.vb
+++ b/VECTO/GUI/EngineForm.vb
@@ -97,7 +97,7 @@ Public Class EngineForm
VectoJobForm.WindowState = FormWindowState.Normal
End If
- VectoJobForm.TbENG.Text = fFileWoDir(_engFile, JobDir)
+ VectoJobForm.TbENG.Text = GetFilenameWithoutDirectory(_engFile, JobDir)
End Sub
Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click
@@ -170,9 +170,9 @@ Public Class EngineForm
End If
TbName.Text = ENG0.ModelName
- TbDispl.Text = ENG0.Displ.ToString
- TbInertia.Text = ENG0.I_mot.ToString
- TbNleerl.Text = ENG0.Nidle.ToString
+ TbDispl.Text = ENG0.Displacement.ToString
+ TbInertia.Text = ENG0.EngineInertia.ToString
+ TbNleerl.Text = ENG0.IdleSpeed.ToString
TbMAP.Text = ENG0.PathMAP(True)
TbFLD.Text = ENG0.PathFLD(True)
@@ -183,7 +183,7 @@ Public Class EngineForm
DeclInit()
EngineFileBrowser.UpdateHistory(file)
- Text = fFILE(file, True)
+ Text = GetFilenameWithoutPath(file, True)
LbStatus.Text = ""
_engFile = file
Activate()
@@ -212,9 +212,9 @@ Public Class EngineForm
engine.ModelName = TbName.Text
If Trim(engine.ModelName) = "" Then engine.ModelName = "Undefined"
- engine.Displ = CSng(fTextboxToNumString(TbDispl.Text))
- engine.I_mot = CSng(fTextboxToNumString(TbInertia.Text))
- engine.Nidle = CSng(fTextboxToNumString(TbNleerl.Text))
+ engine.Displacement = CSng(fTextboxToNumString(TbDispl.Text))
+ engine.EngineInertia = CSng(fTextboxToNumString(TbInertia.Text))
+ engine.IdleSpeed = CSng(fTextboxToNumString(TbNleerl.Text))
engine.PathFLD = TbFLD.Text
engine.PathMAP = TbMAP.Text
@@ -232,13 +232,14 @@ Public Class EngineForm
If AutoSendTo Then
If VectoJobForm.Visible Then
- If UCase(fFileRepl(VectoJobForm.TbENG.Text, JobDir)) <> UCase(file) Then VectoJobForm.TbENG.Text = fFileWoDir(file, JobDir)
+ If UCase(fFileRepl(VectoJobForm.TbENG.Text, JobDir)) <> UCase(file) Then _
+ VectoJobForm.TbENG.Text = GetFilenameWithoutDirectory(file, JobDir)
VectoJobForm.UpdatePic()
End If
End If
EngineFileBrowser.UpdateHistory(file)
- Text = fFILE(file, True)
+ Text = GetFilenameWithoutPath(file, True)
LbStatus.Text = ""
_changed = False
@@ -320,8 +321,8 @@ Public Class EngineForm
'Browse for VMAP file
Private Sub BtMAP_Click(sender As Object, e As EventArgs) Handles BtMAP.Click
- If FuelConsumptionMapFileBrowser.OpenDialog(fFileRepl(TbMAP.Text, fPATH(_engFile))) Then _
- TbMAP.Text = fFileWoDir(FuelConsumptionMapFileBrowser.Files(0), fPATH(_engFile))
+ If FuelConsumptionMapFileBrowser.OpenDialog(fFileRepl(TbMAP.Text, GetPath(_engFile))) Then _
+ TbMAP.Text = GetFilenameWithoutDirectory(FuelConsumptionMapFileBrowser.Files(0), GetPath(_engFile))
End Sub
@@ -329,12 +330,12 @@ Public Class EngineForm
Private Sub BtMAPopen_Click(sender As Object, e As EventArgs) Handles BtMAPopen.Click
Dim fldfile As String
- fldfile = fFileRepl(TbFLD.Text, fPATH(_engFile))
+ fldfile = fFileRepl(TbFLD.Text, GetPath(_engFile))
If fldfile <> sKey.NoFile AndAlso File.Exists(fldfile) Then
- OpenFiles(fFileRepl(TbMAP.Text, fPATH(_engFile)), fldfile)
+ OpenFiles(fFileRepl(TbMAP.Text, GetPath(_engFile)), fldfile)
Else
- OpenFiles(fFileRepl(TbMAP.Text, fPATH(_engFile)))
+ OpenFiles(fFileRepl(TbMAP.Text, GetPath(_engFile)))
End If
End Sub
@@ -353,9 +354,9 @@ Public Class EngineForm
Dim fldOK As Boolean = False
Dim mapOK As Boolean = False
- Dim FLD0 As New EngineFullLoadCurve
- Dim MAP0 As New FuelconsumptionMap
- Dim MyChart As Chart
+ Dim fullLoadCurve As New EngineFullLoadCurve
+ Dim fcMap As New FuelconsumptionMap
+ Dim chart As Chart
Dim s As Series
Dim a As ChartArea
Dim img As Image
@@ -365,11 +366,11 @@ Public Class EngineForm
Try
'Read Files
- FLD0.FilePath = fFileRepl(TbFLD.Text, fPATH(_engFile))
- fldOK = FLD0.ReadFile(False, False)
+ fullLoadCurve.FilePath = fFileRepl(TbFLD.Text, GetPath(_engFile))
+ fldOK = fullLoadCurve.ReadFile(False, False)
- MAP0.FilePath = fFileRepl(TbMAP.Text, fPATH(_engFile))
- mapOK = MAP0.ReadFile(False)
+ fcMap.FilePath = fFileRepl(TbMAP.Text, GetPath(_engFile))
+ mapOK = fcMap.ReadFile(False)
Catch ex As Exception
@@ -379,40 +380,40 @@ Public Class EngineForm
'Create plot
- MyChart = New Chart
- MyChart.Width = PicBox.Width
- MyChart.Height = PicBox.Height
+ chart = New Chart
+ chart.Width = PicBox.Width
+ chart.Height = PicBox.Height
a = New ChartArea
If fldOK Then
s = New Series
- s.Points.DataBindXY(FLD0.EngineSpeedList, FLD0.MaxTorqueList)
+ s.Points.DataBindXY(fullLoadCurve.EngineSpeedList, fullLoadCurve.MaxTorqueList)
s.ChartType = SeriesChartType.FastLine
s.BorderWidth = 2
s.Color = Color.DarkBlue
- s.Name = "Full load (" & fFILE(FLD0.FilePath, True) & ")"
- MyChart.Series.Add(s)
+ s.Name = "Full load (" & GetFilenameWithoutPath(fullLoadCurve.FilePath, True) & ")"
+ chart.Series.Add(s)
s = New Series
- s.Points.DataBindXY(FLD0.EngineSpeedList, FLD0.DragTorqueList)
+ s.Points.DataBindXY(fullLoadCurve.EngineSpeedList, fullLoadCurve.DragTorqueList)
s.ChartType = SeriesChartType.FastLine
s.BorderWidth = 2
s.Color = Color.Blue
- s.Name = "Motoring (" & fFILE(FLD0.FilePath, True) & ")"
- MyChart.Series.Add(s)
+ s.Name = "Motoring (" & GetFilenameWithoutPath(fullLoadCurve.FilePath, True) & ")"
+ chart.Series.Add(s)
End If
If mapOK Then
s = New Series
- s.Points.DataBindXY(MAP0.nU, MAP0.Tq)
+ s.Points.DataBindXY(fcMap.nU, fcMap.Tq)
s.ChartType = SeriesChartType.Point
s.MarkerSize = 3
s.Color = Color.Red
s.Name = "Map"
- MyChart.Series.Add(s)
+ chart.Series.Add(s)
End If
a.Name = "main"
@@ -435,12 +436,12 @@ Public Class EngineForm
a.BackColor = Color.GhostWhite
- MyChart.ChartAreas.Add(a)
+ chart.ChartAreas.Add(a)
- MyChart.Update()
+ chart.Update()
- img = New Bitmap(MyChart.Width, MyChart.Height, PixelFormat.Format32bppArgb)
- MyChart.DrawToBitmap(img, New Rectangle(0, 0, PicBox.Width, PicBox.Height))
+ img = New Bitmap(chart.Width, chart.Height, PixelFormat.Format32bppArgb)
+ chart.DrawToBitmap(img, New Rectangle(0, 0, PicBox.Width, PicBox.Height))
PicBox.Image = img
@@ -484,14 +485,14 @@ Public Class EngineForm
Private Sub BtFLD_Click(sender As Object, e As EventArgs) Handles BtFLD.Click
- If FullLoadCurveFileBrowser.OpenDialog(fFileRepl(TbFLD.Text, fPATH(_engFile))) Then _
- TbFLD.Text = fFileWoDir(FullLoadCurveFileBrowser.Files(0), fPATH(_engFile))
+ If FullLoadCurveFileBrowser.OpenDialog(fFileRepl(TbFLD.Text, GetPath(_engFile))) Then _
+ TbFLD.Text = GetFilenameWithoutDirectory(FullLoadCurveFileBrowser.Files(0), GetPath(_engFile))
End Sub
Private Sub BtFLDopen_Click(sender As Object, e As EventArgs) Handles BtFLDopen.Click
Dim fldfile As String
- fldfile = fFileRepl(TbFLD.Text, fPATH(_engFile))
+ fldfile = fFileRepl(TbFLD.Text, GetPath(_engFile))
If fldfile <> sKey.NoFile AndAlso File.Exists(fldfile) Then
OpenFiles(fldfile)
diff --git a/VECTO/GUI/GearboxGearDialog.vb b/VECTO/GUI/GearboxGearDialog.vb
index 2052373ebb457ca4c313790463eec3a0ad55fb66..b4de37c3b57d2ed84bb65980a61d0ddf754a8f88 100644
--- a/VECTO/GUI/GearboxGearDialog.vb
+++ b/VECTO/GUI/GearboxGearDialog.vb
@@ -77,14 +77,14 @@ Public Class GearboxGearDialog
'Browse for transmission loss map
Private Sub BtBrowse_Click(sender As Object, e As EventArgs) Handles BtBrowse.Click
If TransmissionLossMapFileBrowser.OpenDialog(fFileRepl(TbMapPath.Text, GbxPath)) Then
- TbMapPath.Text = fFileWoDir(TransmissionLossMapFileBrowser.Files(0), GbxPath)
+ TbMapPath.Text = GetFilenameWithoutDirectory(TransmissionLossMapFileBrowser.Files(0), GbxPath)
End If
End Sub
'Browse for shift polygons file
Private Sub BtShiftPolyBrowse_Click(sender As Object, e As EventArgs) Handles BtShiftPolyBrowse.Click
If GearboxShiftPolygonFileBrowser.OpenDialog(fFileRepl(TbShiftPolyFile.Text, GbxPath)) Then
- TbShiftPolyFile.Text = fFileWoDir(GearboxShiftPolygonFileBrowser.Files(0), GbxPath)
+ TbShiftPolyFile.Text = GetFilenameWithoutDirectory(GearboxShiftPolygonFileBrowser.Files(0), GbxPath)
End If
End Sub
diff --git a/VECTO/Input Files/cAdvancedAuxiliary.vb b/VECTO/Input Files/AdvancedAuxiliary.vb
similarity index 77%
rename from VECTO/Input Files/cAdvancedAuxiliary.vb
rename to VECTO/Input Files/AdvancedAuxiliary.vb
index f2d123221e28ec1d646ec0f6fef8b1030106ebb1..88f68d528596c04901fd59e073a17d8265840e91 100644
--- a/VECTO/Input Files/cAdvancedAuxiliary.vb
+++ b/VECTO/Input Files/AdvancedAuxiliary.vb
@@ -1,6 +1,6 @@
'AA-TB
-Public Class cAdvancedAuxiliary
+Public Class AdvancedAuxiliary
'Private properties. Set on Constructor
Private ReadOnly _auxiliaryName As String
Private ReadOnly _auxiliaryVersion As String
@@ -11,19 +11,19 @@ Public Class cAdvancedAuxiliary
'Public Readonly properties
Public ReadOnly Property AuxiliaryName As String
Get
- Return _AuxiliaryName
+ Return _auxiliaryName
End Get
End Property
Public ReadOnly Property AuxiliaryVersion As String
Get
- Return _AuxiliaryVersion
+ Return _auxiliaryVersion
End Get
End Property
Public ReadOnly Property AssemblyName As String
Get
- Return _AssemblyName
+ Return _assemblyName
End Get
End Property
@@ -32,10 +32,10 @@ Public Class cAdvancedAuxiliary
Public Sub New()
- _AuxiliaryName = "Classic Vecto Auxiliary"
- _AuxiliaryVersion = "CLASSIC"
- _FileName = "CLASSIC"
- _AssemblyName = "CLASSIC"
+ _auxiliaryName = "Classic Vecto Auxiliary"
+ _auxiliaryVersion = "CLASSIC"
+ _fileName = "CLASSIC"
+ _assemblyName = "CLASSIC"
End Sub
Public Sub New(auxiliaryName As String, auxiliaryVersion As String, fileName As String, assemblyName As String)
diff --git a/VECTO/Input Files/Engine.vb b/VECTO/Input Files/Engine.vb
index 4f3f60a48506e310b144f0bb0dd4fb2bb01d8d44..464e0898b92a8194920559f02a76c02da64ab756 100644
--- a/VECTO/Input Files/Engine.vb
+++ b/VECTO/Input Files/Engine.vb
@@ -27,7 +27,7 @@ Public Class Engine
''' Format version of input file. Defined in ReadFile.
''' </summary>
''' <remarks></remarks>
- Private FileVersion As Short
+ Private _fileVersion As Short
''' <summary>
''' Engine description (model, type, etc.). Saved in input file.
@@ -39,43 +39,43 @@ Public Class Engine
''' Engine displacement [ccm]. Saved in input file.
''' </summary>
''' <remarks></remarks>
- Public Displ As Single
+ Public Displacement As Single
''' <summary>
''' Idling speed [1/min]. Saved in input file.
''' </summary>
''' <remarks></remarks>
- Public Nidle As Single
+ Public IdleSpeed As Single
''' <summary>
''' Rotational inertia including flywheel [kgm²]. Saved in input file. Overwritten by generic value in Declaration mode.
''' </summary>
''' <remarks></remarks>
- Public I_mot As Single
+ Public EngineInertia As Single
''' <summary>
''' List of full load/motoring curve files (.vfld)
''' </summary>
''' <remarks></remarks>
- Public ReadOnly fFLD As SubPath
+ Private ReadOnly _fullLoadCurvePath As SubPath
''' <summary>
''' Path to fuel consumption map
''' </summary>
''' <remarks></remarks>
- Private ReadOnly fMAP As SubPath
+ Private ReadOnly _fuelConsumptionMapPath As SubPath
''' <summary>
''' Directory of engine file. Defined in FilePath property (Set)
''' </summary>
''' <remarks></remarks>
- Private MyPath As String
+ Private _myPath As String
''' <summary>
''' Full file path. Needs to be defined via FilePath property before calling ReadFile or SaveFile.
''' </summary>
''' <remarks></remarks>
- Private sFilePath As String
+ Private _filePath As String
''' <summary>
@@ -97,7 +97,6 @@ Public Class Engine
Public WHTCmw As Single
-
Public SavedInDeclMode As Boolean
@@ -106,10 +105,10 @@ Public Class Engine
''' </summary>
''' <remarks></remarks>
Public Sub New()
- MyPath = ""
- sFilePath = ""
- fMAP = New SubPath
- fFLD = New SubPath
+ _myPath = ""
+ _filePath = ""
+ _fuelConsumptionMapPath = New SubPath
+ _fullLoadCurvePath = New SubPath
SetDefault()
End Sub
@@ -119,13 +118,13 @@ Public Class Engine
''' <remarks></remarks>
Private Sub SetDefault()
ModelName = "Undefined"
- Displ = 0
- Nidle = 0
- I_mot = 0
+ Displacement = 0
+ IdleSpeed = 0
+ EngineInertia = 0
- fMAP.Clear()
- fFLD.Clear()
+ _fuelConsumptionMapPath.Clear()
+ _fullLoadCurvePath.Clear()
WHTCurban = 0
WHTCrural = 0
@@ -159,13 +158,13 @@ Public Class Engine
dic.Add("ModelName", ModelName)
- dic.Add("Displacement", Displ)
- dic.Add("IdlingSpeed", Nidle)
- dic.Add("Inertia", I_mot)
+ dic.Add("Displacement", Displacement)
+ dic.Add("IdlingSpeed", IdleSpeed)
+ dic.Add("Inertia", EngineInertia)
- dic.Add("FullLoadCurve", fFLD.PathOrDummy)
+ dic.Add("FullLoadCurve", _fullLoadCurvePath.PathOrDummy)
- dic.Add("FuelMap", fMAP.PathOrDummy)
+ dic.Add("FuelMap", _fuelConsumptionMapPath.PathOrDummy)
dic.Add("WHTC-Urban", WHTCurban)
dic.Add("WHTC-Rural", WHTCrural)
@@ -175,7 +174,7 @@ Public Class Engine
JSON.Content.Add("Body", dic)
- Return JSON.WriteFile(sFilePath)
+ Return JSON.WriteFile(_filePath)
End Function
''' <summary>
@@ -192,13 +191,13 @@ Public Class Engine
SetDefault()
- If Not JSON.ReadFile(sFilePath) Then Return False
+ If Not JSON.ReadFile(_filePath) Then Return False
Try
- FileVersion = JSON.Content("Header")("FileVersion")
+ _fileVersion = JSON.Content("Header")("FileVersion")
- If FileVersion > 1 Then
+ If _fileVersion > 1 Then
SavedInDeclMode = JSON.Content("Body")("SavedInDeclMode")
Else
SavedInDeclMode = Cfg.DeclMode
@@ -206,19 +205,19 @@ Public Class Engine
ModelName = JSON.Content("Body")("ModelName")
- Displ = JSON.Content("Body")("Displacement")
- Nidle = JSON.Content("Body")("IdlingSpeed")
- I_mot = JSON.Content("Body")("Inertia")
+ Displacement = JSON.Content("Body")("Displacement")
+ IdleSpeed = JSON.Content("Body")("IdlingSpeed")
+ EngineInertia = JSON.Content("Body")("Inertia")
- If FileVersion < 3 Then
- fFLD.Init(MyPath, JSON.Content("Body")("FullLoadCurves")(0)("Path"))
+ If _fileVersion < 3 Then
+ _fullLoadCurvePath.Init(_myPath, JSON.Content("Body")("FullLoadCurves")(0)("Path"))
Else
- fFLD.Init(MyPath, JSON.Content("Body")("FullLoadCurve"))
+ _fullLoadCurvePath.Init(_myPath, JSON.Content("Body")("FullLoadCurve"))
End If
- fMAP.Init(MyPath, JSON.Content("Body")("FuelMap"))
+ _fuelConsumptionMapPath.Init(_myPath, JSON.Content("Body")("FuelMap"))
- If FileVersion > 2 AndAlso Not JSON.Content("Body")("WHTC-Urban") Is Nothing Then
+ If _fileVersion > 2 AndAlso Not JSON.Content("Body")("WHTC-Urban") Is Nothing Then
WHTCurban = CSng(JSON.Content("Body")("WHTC-Urban"))
WHTCrural = CSng(JSON.Content("Body")("WHTC-Rural"))
WHTCmw = CSng(JSON.Content("Body")("WHTC-Motorway"))
@@ -241,14 +240,14 @@ Public Class Engine
''' <remarks></remarks>
Public Property FilePath() As String
Get
- Return sFilePath
+ Return _filePath
End Get
Set(ByVal value As String)
- sFilePath = value
- If sFilePath = "" Then
- MyPath = ""
+ _filePath = value
+ If _filePath = "" Then
+ _myPath = ""
Else
- MyPath = Path.GetDirectoryName(sFilePath) & "\"
+ _myPath = Path.GetDirectoryName(_filePath) & "\"
End If
End Set
End Property
@@ -257,13 +256,13 @@ Public Class Engine
Public Property PathFLD(Optional ByVal Original As Boolean = False) As String
Get
If Original Then
- Return fFLD.OriginalPath
+ Return _fullLoadCurvePath.OriginalPath
Else
- Return fFLD.FullPath
+ Return _fullLoadCurvePath.FullPath
End If
End Get
Set(ByVal value As String)
- fFLD.Init(MyPath, value)
+ _fullLoadCurvePath.Init(_myPath, value)
End Set
End Property
@@ -277,13 +276,13 @@ Public Class Engine
Public Property PathMAP(Optional ByVal Original As Boolean = False) As String
Get
If Original Then
- Return fMAP.OriginalPath
+ Return _fuelConsumptionMapPath.OriginalPath
Else
- Return fMAP.FullPath
+ Return _fuelConsumptionMapPath.FullPath
End If
End Get
Set(ByVal value As String)
- fMAP.Init(MyPath, value)
+ _fuelConsumptionMapPath.Init(_myPath, value)
End Set
End Property
End Class
diff --git a/VECTO/Input Files/EngineFullLoadCurve.vb b/VECTO/Input Files/EngineFullLoadCurve.vb
index 75ad3e685b52e8c1c04fc32cab6bcd079996f0aa..da6b43cd41f7320d1fc80b310237d718ebd5157e 100644
--- a/VECTO/Input Files/EngineFullLoadCurve.vb
+++ b/VECTO/Input Files/EngineFullLoadCurve.vb
@@ -40,12 +40,6 @@ Public Class EngineFullLoadCurve
''' <remarks></remarks>
Private _pt1List As List(Of Single)
- ''' <summary>
- ''' Last index of lists (items count - 1)
- ''' </summary>
- ''' <remarks></remarks>
- 'Private _iDim As Integer
-
''' <summary>
''' Read file. FilePath must be set before calling.
''' </summary>
diff --git a/VECTO/VECTO_Global.vb b/VECTO/VECTO_Global.vb
index a31ae060a2ae38cbab9f97e177c12d9d508a8830..eb1e42703d140c150d19cd6df0fc467a24dde0fd 100644
--- a/VECTO/VECTO_Global.vb
+++ b/VECTO/VECTO_Global.vb
@@ -26,7 +26,7 @@ Public Module VECTO_Global
'to ensure correct format for backgroundworker thread
- Public VECTOworkerV3 As BackgroundWorker
+ Public VectoWorkerV3 As BackgroundWorker
Public Cfg As Configuration
@@ -175,7 +175,7 @@ Public Module VECTO_Global
'Supplement Path, if not available
- If fPATH(file) = "" Then
+ If GetPath(file) = "" Then
Return ReplPath & file
@@ -198,51 +198,51 @@ Public Module VECTO_Global
End Function
'File name without the path "C:\temp\TEST.txt" >> "TEST.txt" oder "TEST"
- Public Function fFILE(Pfad As String, MitEndung As Boolean) As String
+ Public Function GetFilenameWithoutPath(file As String, includeFileExtension As Boolean) As String
Dim x As Int16
- x = Pfad.LastIndexOf("\") + 1
- Pfad = Right(Pfad, Len(Pfad) - x)
- If Not MitEndung Then
- x = Pfad.LastIndexOf(".")
- If x > 0 Then Pfad = Left(Pfad, x)
+ x = file.LastIndexOf("\", StringComparison.Ordinal) + 1
+ file = Right(file, Len(file) - x)
+ If Not includeFileExtension Then
+ x = file.LastIndexOf(".", StringComparison.Ordinal)
+ If x > 0 Then file = Left(file, x)
End If
- Return Pfad
+ Return file
End Function
'Filename without extension "C:\temp\TEST.txt" >> "C:\temp\TEST"
'Filename without path if Path = WorkDir or MainDir
- Public Function fFileWoDir(file As String, Optional ByVal MainDir As String = "") As String
+ Public Function fFileWoDir(file As String, Optional ByVal mainDir As String = "") As String
Dim path As String
- If MainDir = "" Then
+ If mainDir = "" Then
path = MyAppPath
Else
- path = MainDir
+ path = mainDir
End If
- If UCase(fPATH(file)) = UCase(path) Then file = fFILE(file, True)
+ If UCase(GetPath(file)) = UCase(path) Then file = GetFilenameWithoutPath(file, True)
Return file
End Function
'Path alone "C:\temp\TEST.txt" >> "C:\temp\"
' "TEST.txt" >> ""
- Public Function fPATH(Pfad As String) As String
- Dim x As Int16
- If Pfad Is Nothing OrElse Pfad.Length < 3 OrElse Pfad.Substring(1, 2) <> ":\" Then Return ""
- x = Pfad.LastIndexOf("\")
- Return Left(Pfad, x + 1)
+ Public Function GetPath(file As String) As String
+ Dim x As Integer
+ If file Is Nothing OrElse file.Length < 3 OrElse file.Substring(1, 2) <> ":\" Then Return ""
+ x = file.LastIndexOf("\", StringComparison.Ordinal)
+ Return Left(file, x + 1)
End Function
'Extension alone "C:\temp\TEST.txt" >> ".txt"
- Public Function fEXT(Pfad As String) As String
+ Public Function GetExtension(file As String) As String
Dim x As Int16
- x = Pfad.LastIndexOf(".")
+ x = file.LastIndexOf(".", StringComparison.Ordinal)
If x = -1 Then
Return ""
Else
- Return Right(Pfad, Len(Pfad) - x)
+ Return Right(file, Len(file) - x)
End If
End Function
@@ -255,17 +255,8 @@ Public Class csKey
Public ReadOnly AUX As csKeyAux
Public HomePath As String = "<HOME>"
- Public JobPath As String = "<JOBPATH>"
Public DefVehPath As String = "<VEHDIR>"
Public NoFile As String = "<NOFILE>"
- Public EmptyString As String = "<EMPTYSTRING>"
- Public Break As String = "<//>"
-
- Public Normed As String = "NORM"
-
- Public PauxSply As String = "<AUX_"
-
- Public EngDrag As String = "<DRAG>"
Public Sub New()