From a62ef0721a5b152dc2dc29f689a08998d192c581 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Tue, 20 Sep 2016 15:12:27 +0200
Subject: [PATCH] resolve further coding issues
---
VECTO.sln.DotSettings | 1 +
VECTO/ApplicationEvents.vb | 7 +-
VECTO/Configuration.vb | 4 +-
VECTO/File Browser/FileBrowserDialog.vb | 12 +-
VECTO/File Browser/FileBrowserModule.vb | 6 +-
VECTO/GUI/EngineForm.vb | 63 +-
VECTO/GUI/FileSignDialog.vb | 4 +-
VECTO/GUI/GUI_Subs.vb | 10 +-
VECTO/GUI/GearboxForm.vb | 212 +++---
VECTO/GUI/GearboxGearDialog.vb | 4 +-
VECTO/GUI/GraphForm.vb | 8 +-
VECTO/GUI/MainForm.vb | 833 +++++++++++-----------
VECTO/GUI/Settings.vb | 8 +-
VECTO/GUI/VectoJobForm.vb | 164 ++---
VECTO/GUI/VehicleAuxiliariesDialog.vb | 3 +-
VECTO/GUI/VehicleForm.vb | 18 +-
VECTO/Input Files/Engine.vb | 38 +-
VECTO/Input Files/Gearbox.vb | 5 +-
VECTO/Input Files/SubPath.vb | 6 +-
VECTO/Input Files/VectoJob.vb | 10 +-
VECTO/Input Files/Vehicle.vb | 10 +-
VECTO/JSONWriter.vb | 5 +-
VECTO/MainModule.vb | 6 -
VECTO/VECTO.vbproj | 2 +-
VECTO/VECTO_Global.vb | 98 +--
VECTO/VECTO_Types.vb | 4 +-
VectoConsole/Properties/Version.cs | 4 +-
VectoCore/VectoCore/Properties/Version.cs | 4 +-
28 files changed, 762 insertions(+), 787 deletions(-)
diff --git a/VECTO.sln.DotSettings b/VECTO.sln.DotSettings
index 22cda3b370..ea095ae4b5 100644
--- a/VECTO.sln.DotSettings
+++ b/VECTO.sln.DotSettings
@@ -59,6 +59,7 @@
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FTYPE_005FMETHOD/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></s:String>
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FTYPE_005FPARAMETER/@EntryIndexedValue"><Policy Inspect="True" Prefix="T" Suffix="" Style="AaBb" /></s:String>
<s:String x:Key="/Default/CodeStyle/Naming/VBNaming/Abbreviations/=JSON/@EntryIndexedValue">JSON</s:String>
+ <s:String x:Key="/Default/CodeStyle/Naming/VBNaming/Abbreviations/=WHTC/@EntryIndexedValue">WHTC</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FFIELD/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></s:String>
<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FHTML_005FCONTROL/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></s:String>
<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FTAG_005FNAME/@EntryIndexedValue"><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></s:String>
diff --git a/VECTO/ApplicationEvents.vb b/VECTO/ApplicationEvents.vb
index e38a90ea83..fd08ae6d9f 100644
--- a/VECTO/ApplicationEvents.vb
+++ b/VECTO/ApplicationEvents.vb
@@ -20,6 +20,7 @@ Namespace My
' UnhandledException: Raised if the application encounters an unhandled exception.
' StartupNextInstance: Raised when launching a single-instance application, and one is already active.
' NetworkAvailabilityChanged: Occurs when connecting or disconnecting to the network.
+ ' ReSharper disable once ClassNeverInstantiated.Global
Partial Friend Class MyApplication
'Initialization
Private Sub MyApplication_Startup(sender As Object, e As Microsoft.VisualBasic.ApplicationServices.StartupEventArgs) _
@@ -35,16 +36,16 @@ Namespace My
FileHistoryPath = MyConfPath & "FileHistory\"
'Log
- LogFile = New cLogFile
+ LogFile = New FileLogger
If Not LogFile.StartLog() Then
MsgBox("Error! Can't access log file. Application folder needs read/write permissions!")
e.Cancel = True
End If
'If folder does not exist: Create!
- If Not IO.Directory.Exists(MyConfPath) Then
+ If Not Directory.Exists(MyConfPath) Then
Try
- IO.Directory.CreateDirectory(MyConfPath)
+ Directory.CreateDirectory(MyConfPath)
Catch ex As Exception
MsgBox("Failed to create directory '" & MyConfPath & "'!", MsgBoxStyle.Critical)
LogFile.WriteToLog(MessageType.Err, "Failed to create directory '" & MyConfPath & "'!")
diff --git a/VECTO/Configuration.vb b/VECTO/Configuration.vb
index add79515f3..867e09ff04 100644
--- a/VECTO/Configuration.vb
+++ b/VECTO/Configuration.vb
@@ -24,7 +24,7 @@ Public Class Configuration
Public OpenCmd As String
Public OpenCmdName As String
Public FuelDens As Double
- Public CO2perFC As Double
+ Public Co2PerFc As Double
Public FirstRun As Boolean
Public DeclMode As Boolean
@@ -85,7 +85,7 @@ Public Class Configuration
End Sub
Public Sub Save()
- Dim json As New JSONParser
+ Dim json As New JSONWriter
Dim header As Dictionary(Of String, Object) = New Dictionary(Of String, Object)
header.Add("CreatedBy", Lic.LicString & " (" & Lic.GUID & ")")
diff --git a/VECTO/File Browser/FileBrowserDialog.vb b/VECTO/File Browser/FileBrowserDialog.vb
index daabb651ae..4b1b7886b4 100644
--- a/VECTO/File Browser/FileBrowserDialog.vb
+++ b/VECTO/File Browser/FileBrowserDialog.vb
@@ -206,7 +206,7 @@ Public Class FileBrowserDialog
'Form Config
ListViewFiles.MultiSelect = multiFile
ButtonAll.Visible = multiFile
- Title = caption
+ _title = caption
Text = caption
'Ext-Combobox
@@ -288,7 +288,7 @@ Public Class FileBrowserDialog
End If
End Function
- Public Title As String
+ Private _title As String
'Close and save File / Folder History
Public Sub SaveAndClose()
@@ -671,7 +671,7 @@ Public Class FileBrowserDialog
Do While x1 > x
newpath = path
'path = Microsoft.VisualBasic.Left(path, x1 - 1)
- path = Microsoft.VisualBasic.Left(path, path.LastIndexOf("\"))
+ path = Microsoft.VisualBasic.Left(path, path.LastIndexOf("\", StringComparison.Ordinal))
x1 = path.Length
Loop
SetFolder(newpath)
@@ -741,7 +741,7 @@ Public Class FileBrowserDialog
_myFolder = path
If Microsoft.VisualBasic.Right(_myFolder, 1) <> "\" Then _myFolder &= "\"
- Text = Title & " " & _myFolder
+ Text = _title & " " & _myFolder
LoadListFolder()
LoadListFiles()
@@ -758,7 +758,7 @@ Public Class FileBrowserDialog
Private Sub FolderUp()
If _myFolder <> "" Then
Dim path = Microsoft.VisualBasic.Left(_myFolder, _myFolder.Length - 1)
- Dim x = path.LastIndexOf("\")
+ Dim x = path.LastIndexOf("\", StringComparison.Ordinal)
If x > 0 Then SetFolder(Microsoft.VisualBasic.Left(path, x))
End If
End Sub
@@ -913,7 +913,7 @@ lb10:
End Sub
Private Shared Function fPATH(path As String) As String
- Dim x = path.LastIndexOf("\")
+ Dim x = path.LastIndexOf("\", StringComparison.Ordinal)
If x = -1 Then
Return Microsoft.VisualBasic.Left(path, 0)
Else
diff --git a/VECTO/File Browser/FileBrowserModule.vb b/VECTO/File Browser/FileBrowserModule.vb
index 996df743ce..b6c7724015 100644
--- a/VECTO/File Browser/FileBrowserModule.vb
+++ b/VECTO/File Browser/FileBrowserModule.vb
@@ -36,11 +36,11 @@ Public Module FileBrowserModule
Public GearboxShiftPolygonFileBrowser As FileBrowser
Public TransmissionLossMapFileBrowser As FileBrowser
- Public fbPTOLM As FileBrowser
+ Public PtoLossMapFileBrowser As FileBrowser
Public RetarderLossMapFileBrowser As FileBrowser
Public TorqueConverterFileBrowser As FileBrowser
- Public fbTCCShift As FileBrowser
- Public fbCDx As FileBrowser
+ Public TorqueConverterShiftPolygonFileBrowser As FileBrowser
+ Public CrossWindCorrectionFileBrowser As FileBrowser
Public ModalResultsFileBrowser As FileBrowser
End Module
diff --git a/VECTO/GUI/EngineForm.vb b/VECTO/GUI/EngineForm.vb
index 6298a88a92..f125b692e7 100644
--- a/VECTO/GUI/EngineForm.vb
+++ b/VECTO/GUI/EngineForm.vb
@@ -96,7 +96,7 @@ Public Class EngineForm
If Not VectoJobForm.Visible Then
JobDir = ""
VectoJobForm.Show()
- VectoJobForm.VECTOnew()
+ VectoJobForm.VectoNew()
Else
VectoJobForm.WindowState = FormWindowState.Normal
End If
@@ -106,11 +106,11 @@ Public Class EngineForm
Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click
If File.Exists(MyAppPath & "User Manual\help.html") Then
- Dim BrowserRegistryString As String =
+ Dim browserRegistryString As String =
My.Computer.Registry.ClassesRoot.OpenSubKey("\http\shell\open\command\").GetValue("").ToString
- Dim DefaultBrowserPath As String =
- Regex.Match(BrowserRegistryString, "(\"".*?\"")").Captures(0).ToString
- Process.Start(DefaultBrowserPath,
+ Dim defaultBrowserPath As String =
+ Regex.Match(browserRegistryString, "(\"".*?\"")").Captures(0).ToString
+ Process.Start(defaultBrowserPath,
String.Format("""{0}{1}""", MyAppPath, "User Manual\help.html#engine-editor"))
Else
MsgBox("User Manual not found!", MsgBoxStyle.Critical)
@@ -165,8 +165,6 @@ Public Class EngineForm
MainForm.OpenVectoFile(file)
Case -1
Exit Sub
- Case Else '0
- 'Continue...
End Select
End If
@@ -197,8 +195,8 @@ Public Class EngineForm
End Sub
'Save or Save As function = true if file is saved
- Private Function SaveOrSaveAs(ByVal SaveAs As Boolean) As Boolean
- If _engFile = "" Or SaveAs Then
+ Private Function SaveOrSaveAs(ByVal saveAs As Boolean) As Boolean
+ If _engFile = "" Or saveAs Then
If EngineFileBrowser.SaveDialog(_engFile) Then
_engFile = EngineFileBrowser.Files(0)
Else
@@ -220,13 +218,16 @@ Public Class EngineForm
engine.EngineInertia = TbInertia.Text.ToDouble()
engine.IdleSpeed = TbNleerl.Text.ToDouble()
- engine.PathFLD = TbFLD.Text
- engine.PathMAP = TbMAP.Text
+ engine.PathFld = TbFLD.Text
+ engine.PathMap = TbMAP.Text
- engine.WHTCurbanInput = TbWHTCurban.Text.ToDouble()
- engine.WHTCruralInput = TbWHTCrural.Text.ToDouble()
- engine.WHTCmotorwayInput = TbWHTCmw.Text.ToDouble()
+ engine.WHTCUrbanInput = TbWHTCurban.Text.ToDouble(0)
+ engine.WHTCRuralInput = TbWHTCrural.Text.ToDouble(0)
+ engine.WHTCMotorwayInput = TbWHTCmw.Text.ToDouble(0)
+ engine.WHTCEngineeringInput = TbWHTCEngineering.Text.ToDouble(0)
+
+ engine.ColdHotBalancingFactorInput = TbColdHotFactor.Text.ToDouble(0)
If Not engine.SaveFile Then
@@ -236,7 +237,7 @@ Public Class EngineForm
If AutoSendTo Then
If VectoJobForm.Visible Then
- If UCase(fFileRepl(VectoJobForm.TbENG.Text, JobDir)) <> UCase(file) Then _
+ If UCase(FileRepl(VectoJobForm.TbENG.Text, JobDir)) <> UCase(file) Then _
VectoJobForm.TbENG.Text = GetFilenameWithoutDirectory(file, JobDir)
VectoJobForm.UpdatePic()
End If
@@ -325,7 +326,7 @@ 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, GetPath(_engFile))) Then _
+ If FuelConsumptionMapFileBrowser.OpenDialog(FileRepl(TbMAP.Text, GetPath(_engFile))) Then _
TbMAP.Text = GetFilenameWithoutDirectory(FuelConsumptionMapFileBrowser.Files(0), GetPath(_engFile))
End Sub
@@ -334,12 +335,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, GetPath(_engFile))
+ fldfile = FileRepl(TbFLD.Text, GetPath(_engFile))
- If fldfile <> Constants.NoFile AndAlso File.Exists(fldfile) Then
- OpenFiles(fFileRepl(TbMAP.Text, GetPath(_engFile)), fldfile)
+ If fldfile <> NoFile AndAlso File.Exists(fldfile) Then
+ OpenFiles(FileRepl(TbMAP.Text, GetPath(_engFile)), fldfile)
Else
- OpenFiles(fFileRepl(TbMAP.Text, GetPath(_engFile)))
+ OpenFiles(FileRepl(TbMAP.Text, GetPath(_engFile)))
End If
End Sub
@@ -359,12 +360,12 @@ Public Class EngineForm
'Dim fldOK As Boolean = False
'Dim mapOK As Boolean = False
Dim fullLoadCurve As FullLoadCurve = Nothing
- Dim fcMap As FuelConsumptionMap
+ Dim fcMap As FuelConsumptionMap = Nothing
Dim chart As Chart
Dim series As Series
Dim chartArea As ChartArea
Dim img As Bitmap
- Dim engine As IEngineEngineeringInputData
+ Dim engine As IEngineEngineeringInputData = Nothing
PicBox.Image = Nothing
@@ -383,7 +384,7 @@ Public Class EngineForm
End Try
- If fullLoadCurve Is Nothing OrElse fcMap Is Nothing Then Exit Sub
+ If fullLoadCurve Is Nothing OrElse engine Is Nothing OrElse fcMap Is Nothing Then Exit Sub
'Create plot
@@ -457,13 +458,13 @@ Public Class EngineForm
#Region "Open File Context Menu"
- Private CmFiles As String()
+ Private _contextMenuFiles As String()
Private Sub OpenFiles(ParamArray files() As String)
If files.Length = 0 Then Exit Sub
- CmFiles = files
+ _contextMenuFiles = files
OpenWithToolStripMenuItem.Text = "Open with " & Cfg.OpenCmdName
@@ -472,14 +473,14 @@ Public Class EngineForm
Private Sub OpenWithToolStripMenuItem_Click(sender As Object, e As EventArgs) _
Handles OpenWithToolStripMenuItem.Click
- If Not FileOpenAlt(CmFiles(0)) Then MsgBox("Failed to open file!")
+ If Not FileOpenAlt(_contextMenuFiles(0)) Then MsgBox("Failed to open file!")
End Sub
Private Sub ShowInFolderToolStripMenuItem_Click(sender As Object, e As EventArgs) _
Handles ShowInFolderToolStripMenuItem.Click
- If File.Exists(CmFiles(0)) Then
+ If File.Exists(_contextMenuFiles(0)) Then
Try
- Process.Start("explorer", "/select,""" & CmFiles(0) & "")
+ Process.Start("explorer", "/select,""" & _contextMenuFiles(0) & "")
Catch ex As Exception
MsgBox("Failed to open file!")
End Try
@@ -492,16 +493,16 @@ Public Class EngineForm
Private Sub BtFLD_Click(sender As Object, e As EventArgs) Handles BtFLD.Click
- If FullLoadCurveFileBrowser.OpenDialog(fFileRepl(TbFLD.Text, GetPath(_engFile))) Then _
+ If FullLoadCurveFileBrowser.OpenDialog(FileRepl(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, GetPath(_engFile))
+ fldfile = FileRepl(TbFLD.Text, GetPath(_engFile))
- If fldfile <> Constants.NoFile AndAlso File.Exists(fldfile) Then
+ If fldfile <> NoFile AndAlso File.Exists(fldfile) Then
OpenFiles(fldfile)
End If
End Sub
diff --git a/VECTO/GUI/FileSignDialog.vb b/VECTO/GUI/FileSignDialog.vb
index d9e6ddcad9..0e96fa5cc1 100644
--- a/VECTO/GUI/FileSignDialog.vb
+++ b/VECTO/GUI/FileSignDialog.vb
@@ -47,7 +47,7 @@ Public Class FileSignDialog
For Each listViewItem In lvFiles.Items
- Lic.FileSigning.AddFile(fFileRepl(listViewItem.SubItems(0).Text, mainDirectory))
+ Lic.FileSigning.AddFile(FileRepl(listViewItem.SubItems(0).Text, mainDirectory))
listViewItem.SubItems(1).Text = ""
listViewItem.ForeColor = Color.Black
Next
@@ -121,7 +121,7 @@ Public Class FileSignDialog
End Sub
'Clear form
- Private Sub ClearForm(ClearFileList As Boolean)
+ Private Sub ClearForm(clearFileList As Boolean)
If ClearFileList Then lvFiles.Items.Clear()
TbLicStr.Text = ""
TbPubKey.Text = ""
diff --git a/VECTO/GUI/GUI_Subs.vb b/VECTO/GUI/GUI_Subs.vb
index 9ed1673e61..cac6fccedc 100644
--- a/VECTO/GUI/GUI_Subs.vb
+++ b/VECTO/GUI/GUI_Subs.vb
@@ -8,7 +8,7 @@
' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
'
' See the LICENSE.txt for the specific language governing permissions and limitations.
-Imports System.Globalization
+
''' <summary>
''' Methods for GUI interaction
@@ -95,14 +95,14 @@ Public Module GUI_Subs
'Open File with software defined in Config
Public Function FileOpenAlt(ByVal file As String) As Boolean
- Dim PSI As New ProcessStartInfo
+ Dim psi As New ProcessStartInfo
If Not IO.File.Exists(file) Then Return False
- PSI.FileName = Cfg.OpenCmd
- PSI.Arguments = ChrW(34) & file & ChrW(34)
+ psi.FileName = Cfg.OpenCmd
+ psi.Arguments = ChrW(34) & file & ChrW(34)
Try
- Process.Start(PSI)
+ Process.Start(psi)
Return True
Catch ex As Exception
Return False
diff --git a/VECTO/GUI/GearboxForm.vb b/VECTO/GUI/GearboxForm.vb
index b51dd3ea8e..ec985dcc99 100644
--- a/VECTO/GUI/GearboxForm.vb
+++ b/VECTO/GUI/GearboxForm.vb
@@ -19,7 +19,6 @@ Imports TUGraz.VECTO.Input_Files
Imports TUGraz.VectoCommon.InputData
Imports TUGraz.VectoCommon.Models
Imports TUGraz.VectoCommon.Utils
-Imports TUGraz.VectoCore.Configuration
Imports TUGraz.VectoCore.InputData.FileIO.JSON
Imports TUGraz.VectoCore.InputData.Impl
Imports TUGraz.VectoCore.InputData.Reader
@@ -42,14 +41,12 @@ Public Class GearboxForm
MaxTorque = 4
End Enum
- Private GbxFile As String = ""
+ Private _gbxFile As String = ""
Public AutoSendTo As Boolean = False
Public JobDir As String = ""
- Private GearDia As GearboxGearDialog
+ Private _gearDialog As GearboxGearDialog
- Private Init As Boolean = False
-
- Private Changed As Boolean = False
+ Private _changed As Boolean = False
'Before closing Editor: Check if file was changed and ask to save.
Private Sub F_GBX_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
@@ -61,8 +58,7 @@ Public Class GearboxForm
'Initialise.
Private Sub F_GBX_Load(sender As Object, e As EventArgs) Handles Me.Load
- Init = False
- GearDia = New GearboxGearDialog
+ _gearDialog = New GearboxGearDialog
PnInertiaTI.Enabled = Not Cfg.DeclMode
GrGearShift.Enabled = Not Cfg.DeclMode
@@ -84,12 +80,10 @@ Public Class GearboxForm
.Select(Function(type) New With {Key .Value = type, .Label = type.GetLabel()}).ToList()
End If
- Init = True
-
DeclInit()
- Changed = False
- newGBX()
+ _changed = False
+ NewGbx()
End Sub
'Set generic values for Declaration mode.
@@ -124,11 +118,11 @@ Public Class GearboxForm
#Region "Toolbar"
Private Sub ToolStripBtNew_Click(sender As Object, e As EventArgs) Handles ToolStripBtNew.Click
- newGBX()
+ NewGbx()
End Sub
Private Sub ToolStripBtOpen_Click(sender As Object, e As EventArgs) Handles ToolStripBtOpen.Click
- If GearboxFileBrowser.OpenDialog(GbxFile) Then OpenGbx(GearboxFileBrowser.Files(0))
+ If GearboxFileBrowser.OpenDialog(_gbxFile) Then OpenGbx(GearboxFileBrowser.Files(0))
End Sub
Private Sub ToolStripBtSave_Click(sender As Object, e As EventArgs) Handles ToolStripBtSave.Click
@@ -143,7 +137,7 @@ Public Class GearboxForm
If ChangeCheckCancel() Then Exit Sub
- If GbxFile = "" Then
+ If _gbxFile = "" Then
If MsgBox("Save file now?", MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
If Not SaveOrSaveAs(True) Then Exit Sub
Else
@@ -154,22 +148,22 @@ Public Class GearboxForm
If Not VectoJobForm.Visible Then
JobDir = ""
VectoJobForm.Show()
- VectoJobForm.VECTOnew()
+ VectoJobForm.VectoNew()
Else
VectoJobForm.WindowState = FormWindowState.Normal
End If
- VectoJobForm.TbGBX.Text = GetFilenameWithoutDirectory(GbxFile, JobDir)
+ VectoJobForm.TbGBX.Text = GetFilenameWithoutDirectory(_gbxFile, JobDir)
End Sub
'Help
Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click
If File.Exists(MyAppPath & "User Manual\help.html") Then
- Dim BrowserRegistryString As String =
+ Dim browserRegistryString As String =
My.Computer.Registry.ClassesRoot.OpenSubKey("\http\shell\open\command\").GetValue("").ToString
- Dim DefaultBrowserPath As String =
- Regex.Match(BrowserRegistryString, "(\"".*?\"")").Captures(0).ToString
- Process.Start(DefaultBrowserPath,
+ Dim defaultBrowserPath As String =
+ Regex.Match(browserRegistryString, "(\"".*?\"")").Captures(0).ToString
+ Process.Start(defaultBrowserPath,
String.Format("""{0}{1}""", MyAppPath, "User Manual\help.html#gearbox-editor"))
Else
MsgBox("User Manual not found!", MsgBoxStyle.Critical)
@@ -179,7 +173,7 @@ Public Class GearboxForm
#End Region
'New file
- Private Sub newGBX()
+ Private Sub NewGbx()
'Dim lvi As ListViewItem
If ChangeCheckCancel() Then Exit Sub
@@ -192,7 +186,7 @@ Public Class GearboxForm
LvGears.Items.Clear()
- LvGears.Items.Add(CreateListviewItem("Axle", "-", 0, "0", "", ""))
+ LvGears.Items.Add(CreateListviewItem("Axle", 0, "0", "", ""))
'Me.ChSkipGears.Checked = False 'set by CbGStype.SelectedIndexChanged
'Me.ChShiftInside.Checked = False 'set by CbGStype.SelectedIndexChanged
@@ -209,11 +203,11 @@ Public Class GearboxForm
DeclInit()
- GbxFile = ""
+ _gbxFile = ""
Text = "GBX Editor"
LbStatus.Text = ""
- Changed = False
+ _changed = False
UpdatePic()
End Sub
@@ -245,11 +239,11 @@ Public Class GearboxForm
LvGears.Items.Clear()
- LvGears.Items.Add(CreateListviewItem("Axle", "-", axlegear.Ratio, GetRelativePath(axlegear.LossMap.Source, basePath),
+ LvGears.Items.Add(CreateListviewItem("Axle", axlegear.Ratio, GetRelativePath(axlegear.LossMap.Source, basePath),
"", ""))
For Each gear As ITransmissionInputData In gearbox.Gears
- LvGears.Items.Add(CreateListviewItem(gear.Gear.ToString("00"), "-", gear.Ratio, gear.LossMap.Source,
+ LvGears.Items.Add(CreateListviewItem(gear.Gear.ToString("00"), gear.Ratio, gear.LossMap.Source,
If(gear.ShiftPolygon Is Nothing, "", GetRelativePath(gear.ShiftPolygon.Source, basePath)),
If(gear.MaxTorque Is Nothing, "", gear.MaxTorque.ToGUIFormat())))
Next
@@ -289,14 +283,14 @@ Public Class GearboxForm
GearboxFileBrowser.UpdateHistory(file)
Text = GetFilenameWithoutPath(file, True)
LbStatus.Text = ""
- GbxFile = file
+ _gbxFile = file
Activate()
- Changed = False
+ _changed = False
UpdatePic()
End Sub
- Private Function CreateListviewItem(gear As String, tc As String, ratio As Double, getrMap As String,
+ Private Function CreateListviewItem(gear As String, ratio As Double, getrMap As String,
shiftPolygon As String, maxTorque As String) As ListViewItem
Dim retVal As ListViewItem = New ListViewItem(gear)
'retVal.SubItems.Add(tc)
@@ -308,71 +302,71 @@ Public Class GearboxForm
End Function
'Save or Save As function = true if file is saved
- Private Function SaveOrSaveAs(ByVal SaveAs As Boolean) As Boolean
- If GbxFile = "" Or SaveAs Then
- If GearboxFileBrowser.SaveDialog(GbxFile) Then
- GbxFile = GearboxFileBrowser.Files(0)
+ Private Function SaveOrSaveAs(saveAs As Boolean) As Boolean
+ If _gbxFile = "" Or saveAs Then
+ If GearboxFileBrowser.SaveDialog(_gbxFile) Then
+ _gbxFile = GearboxFileBrowser.Files(0)
Else
Return False
End If
End If
- Return saveGBX(GbxFile)
+ Return SaveGbx(_gbxFile)
End Function
'Save file
- Private Function saveGBX(ByVal file As String) As Boolean
- Dim GBX0 As Gearbox
+ Private Function SaveGbx(file As String) As Boolean
+ Dim gearbox As Gearbox
Dim i As Integer
- GBX0 = New Gearbox
- GBX0.FilePath = file
+ gearbox = New Gearbox
+ gearbox.FilePath = file
- GBX0.ModelName = TbName.Text
- If Trim(GBX0.ModelName) = "" Then GBX0.ModelName = "Undefined"
+ gearbox.ModelName = TbName.Text
+ If Trim(gearbox.ModelName) = "" Then gearbox.ModelName = "Undefined"
- GBX0.TracIntrSi = TbTracInt.Text.ToDouble()
- GBX0.GbxInertia = TBI_getr.Text.ToDouble()
+ gearbox.TracIntrSi = TbTracInt.Text.ToDouble()
+ gearbox.GbxInertia = TBI_getr.Text.ToDouble()
For i = 0 To LvGears.Items.Count - 1
'GBX0.IsTCgear.Add(Me.LvGears.Items(i).SubItems(GearboxTbl.TorqueConverter).Text = "on" And i > 0)
- GBX0.GearRatios.Add(CSng(LvGears.Items(i).SubItems(GearboxTbl.Ratio).Text))
- GBX0.GearLossmaps.Add(New SubPath)
- GBX0.GearLossMap(i) = LvGears.Items(i).SubItems(GearboxTbl.LossMapEfficiency).Text
- GBX0.GearshiftFiles.Add(New SubPath)
- GBX0.ShiftPolygonFile(i) = LvGears.Items(i).SubItems(GearboxTbl.ShiftPolygons).Text
+ gearbox.GearRatios.Add(CSng(LvGears.Items(i).SubItems(GearboxTbl.Ratio).Text))
+ gearbox.GearLossmaps.Add(New SubPath)
+ gearbox.GearLossMap(i) = LvGears.Items(i).SubItems(GearboxTbl.LossMapEfficiency).Text
+ gearbox.GearshiftFiles.Add(New SubPath)
+ gearbox.ShiftPolygonFile(i) = LvGears.Items(i).SubItems(GearboxTbl.ShiftPolygons).Text
'GBX0.FldFiles.Add(New cSubPath)
'GBX0.FldFile(i) = Me.LvGears.Items(i).SubItems(GearboxTbl.MaxTorque).Text
- GBX0.MaxTorque.Add(LvGears.Items(i).SubItems(GearboxTbl.MaxTorque).Text)
+ gearbox.MaxTorque.Add(LvGears.Items(i).SubItems(GearboxTbl.MaxTorque).Text)
Next
- GBX0.TorqueResv = TbTqResv.Text.ToDouble()
- GBX0.SkipGears = ChSkipGears.Checked
- GBX0.ShiftTime = TbShiftTime.Text.ToDouble()
- GBX0.TorqueResvStart = TbTqResvStart.Text.ToDouble()
- GBX0.StartSpeed = TbStartSpeed.Text.ToDouble()
- GBX0.StartAcc = TbStartAcc.Text.ToDouble()
- GBX0.ShiftInside = ChShiftInside.Checked
+ gearbox.TorqueResv = TbTqResv.Text.ToDouble()
+ gearbox.SkipGears = ChSkipGears.Checked
+ gearbox.ShiftTime = TbShiftTime.Text.ToDouble()
+ gearbox.TorqueResvStart = TbTqResvStart.Text.ToDouble()
+ gearbox.StartSpeed = TbStartSpeed.Text.ToDouble()
+ gearbox.StartAcc = TbStartAcc.Text.ToDouble()
+ gearbox.ShiftInside = ChShiftInside.Checked
- GBX0.Type = CType(CbGStype.SelectedValue, GearboxType)
+ gearbox.Type = CType(CbGStype.SelectedValue, GearboxType)
- GBX0.TorqueConverterEnabled = GBX0.Type.AutomaticTransmission()
- GBX0.TorqueConverterFile = TbTCfile.Text
- GBX0.TorqueConverterReferenceRpm = TbTCrefrpm.Text.ToDouble()
- GBX0.TorqueConverterInertia = TbTCinertia.Text.ToDouble()
- GBX0.TorqueConverterShiftPolygonFile = TBTCShiftPolygon.Text
+ gearbox.TorqueConverterEnabled = gearbox.Type.AutomaticTransmission()
+ gearbox.TorqueConverterFile = TbTCfile.Text
+ gearbox.TorqueConverterReferenceRpm = TbTCrefrpm.Text.ToDouble()
+ gearbox.TorqueConverterInertia = TbTCinertia.Text.ToDouble()
+ gearbox.TorqueConverterShiftPolygonFile = TBTCShiftPolygon.Text
- GBX0.DownshiftAfterUpshift = tbDownshiftAfterUpshift.Text.ToDouble()
- GBX0.UpshiftAfterDownshift = tbUpshiftAfterDownshift.Text.ToDouble()
- GBX0.UpshiftMinAcceleration = tbUpshiftMinAcceleration.Text.ToDouble()
+ gearbox.DownshiftAfterUpshift = tbDownshiftAfterUpshift.Text.ToDouble()
+ gearbox.UpshiftAfterDownshift = tbUpshiftAfterDownshift.Text.ToDouble()
+ gearbox.UpshiftMinAcceleration = tbUpshiftMinAcceleration.Text.ToDouble()
- If Not GBX0.SaveFile Then
+ If Not gearbox.SaveFile Then
MsgBox("Cannot safe to " & file, MsgBoxStyle.Critical)
Return False
End If
If AutoSendTo Then
If VectoJobForm.Visible Then
- If UCase(fFileRepl(VectoJobForm.TbGBX.Text, JobDir)) <> UCase(file) Then _
+ If UCase(FileRepl(VectoJobForm.TbGBX.Text, JobDir)) <> UCase(file) Then _
VectoJobForm.TbGBX.Text = GetFilenameWithoutDirectory(file, JobDir)
VectoJobForm.UpdatePic()
End If
@@ -382,7 +376,7 @@ Public Class GearboxForm
Text = GetFilenameWithoutPath(file, True)
LbStatus.Text = ""
- Changed = False
+ _changed = False
Return True
End Function
@@ -391,23 +385,23 @@ Public Class GearboxForm
'Change Status ändern |@@| Change Status change
Private Sub Change()
- If Not Changed Then
+ If Not _changed Then
LbStatus.Text = "Unsaved changes in current file"
- Changed = True
+ _changed = True
End If
End Sub
' "Save changes ?" ...liefert True wenn User Vorgang abbricht |@@| Save changes? "... Returns True if user aborts
Private Function ChangeCheckCancel() As Boolean
- If Changed Then
+ If _changed Then
Select Case MsgBox("Save changes ?", MsgBoxStyle.YesNoCancel)
Case MsgBoxResult.Yes
Return Not SaveOrSaveAs(False)
Case MsgBoxResult.Cancel
Return True
Case Else 'MsgBoxResult.No
- Changed = False
+ _changed = False
Return False
End Select
@@ -551,35 +545,35 @@ Public Class GearboxForm
Do
'GearDia.ChIsTCgear.Enabled = (Me.ChTCon.Checked And Me.LvGears.SelectedIndices(0) > 0)
- GearDia.PnShiftPoly.Enabled = (Not Cfg.DeclMode And LvGears.SelectedIndices(0) > 0)
- GearDia.PnFld.Enabled = (LvGears.SelectedIndices(0) > 0)
- GearDia.GbxPath = GetPath(GbxFile)
- GearDia.TbGear.Text = LvGears.SelectedItems(0).SubItems(GearboxTbl.GearNr).Text
- GearDia.TbRatio.Text = LvGears.SelectedItems(0).SubItems(GearboxTbl.Ratio).Text
- GearDia.TbMapPath.Text = LvGears.SelectedItems(0).SubItems(GearboxTbl.LossMapEfficiency).Text
+ _gearDialog.PnShiftPoly.Enabled = (Not Cfg.DeclMode And LvGears.SelectedIndices(0) > 0)
+ _gearDialog.PnFld.Enabled = (LvGears.SelectedIndices(0) > 0)
+ _gearDialog.GbxPath = GetPath(_gbxFile)
+ _gearDialog.TbGear.Text = LvGears.SelectedItems(0).SubItems(GearboxTbl.GearNr).Text
+ _gearDialog.TbRatio.Text = LvGears.SelectedItems(0).SubItems(GearboxTbl.Ratio).Text
+ _gearDialog.TbMapPath.Text = LvGears.SelectedItems(0).SubItems(GearboxTbl.LossMapEfficiency).Text
If LvGears.SelectedIndices(0) > 0 Then
- GearDia.TbShiftPolyFile.Text = LvGears.SelectedItems(0).SubItems(GearboxTbl.ShiftPolygons).Text
- GearDia.TbMaxTorque.Text = LvGears.SelectedItems(0).SubItems(GearboxTbl.MaxTorque).Text
+ _gearDialog.TbShiftPolyFile.Text = LvGears.SelectedItems(0).SubItems(GearboxTbl.ShiftPolygons).Text
+ _gearDialog.TbMaxTorque.Text = LvGears.SelectedItems(0).SubItems(GearboxTbl.MaxTorque).Text
Else
- GearDia.TbShiftPolyFile.Text = ""
- GearDia.TbMaxTorque.Text = ""
+ _gearDialog.TbShiftPolyFile.Text = ""
+ _gearDialog.TbMaxTorque.Text = ""
End If
If LvGears.SelectedItems(0).Index = 0 Then
- GearDia.BtPrevious.Enabled = False
+ _gearDialog.BtPrevious.Enabled = False
Else
- GearDia.BtPrevious.Enabled = True
+ _gearDialog.BtPrevious.Enabled = True
End If
- If GearDia.ShowDialog = DialogResult.OK Then
+ If _gearDialog.ShowDialog = DialogResult.OK Then
'Me.LvGears.SelectedItems(0).SubItems(GearboxTbl.TorqueConverter).Text = "-"
- LvGears.SelectedItems(0).SubItems(GearboxTbl.Ratio).Text = GearDia.TbRatio.Text
- LvGears.SelectedItems(0).SubItems(GearboxTbl.LossMapEfficiency).Text = GearDia.TbMapPath.Text
- LvGears.SelectedItems(0).SubItems(GearboxTbl.ShiftPolygons).Text = GearDia.TbShiftPolyFile.Text
- LvGears.SelectedItems(0).SubItems(GearboxTbl.MaxTorque).Text = GearDia.TbMaxTorque.Text
+ LvGears.SelectedItems(0).SubItems(GearboxTbl.Ratio).Text = _gearDialog.TbRatio.Text
+ LvGears.SelectedItems(0).SubItems(GearboxTbl.LossMapEfficiency).Text = _gearDialog.TbMapPath.Text
+ LvGears.SelectedItems(0).SubItems(GearboxTbl.ShiftPolygons).Text = _gearDialog.TbShiftPolyFile.Text
+ LvGears.SelectedItems(0).SubItems(GearboxTbl.MaxTorque).Text = _gearDialog.TbMaxTorque.Text
UpdatePic()
Change()
@@ -590,24 +584,24 @@ Public Class GearboxForm
End If
- If GearDia.NextGear Then
+ If _gearDialog.NextGear Then
If LvGears.Items.Count - 1 = LvGears.SelectedIndices(0) Then AddGear()
LvGears.Items(LvGears.SelectedIndices(0) + 1).Selected = True
End If
- If GearDia.PreviousGear AndAlso LvGears.SelectedIndices(0) > 0 Then
+ If _gearDialog.PreviousGear AndAlso LvGears.SelectedIndices(0) > 0 Then
LvGears.Items(LvGears.SelectedIndices(0) - 1).Selected = True
End If
- Loop Until Not (GearDia.NextGear OrElse GearDia.PreviousGear)
+ Loop Until Not (_gearDialog.NextGear OrElse _gearDialog.PreviousGear)
End Sub
'Add Gear
Private Sub AddGear()
Dim lvi As ListViewItem
- lvi = CreateListviewItem(LvGears.Items.Count.ToString("00"), "-", 1, "", "", "")
+ lvi = CreateListviewItem(LvGears.Items.Count.ToString("00"), 1, "", "", "")
LvGears.Items.Add(lvi)
@@ -619,7 +613,7 @@ Public Class GearboxForm
End Sub
'Remove Gear
- Private Sub RemoveGear(ByVal NoChange As Boolean)
+ Private Sub RemoveGear(noChange As Boolean)
Dim i0 As Integer
Dim i As Integer
Dim lv0 As ListViewItem
@@ -649,7 +643,7 @@ Public Class GearboxForm
LvGears.Focus()
UpdatePic()
- If Not NoChange Then Change()
+ If Not noChange Then Change()
End Sub
@@ -658,13 +652,13 @@ Public Class GearboxForm
#Region "Open File Context Menu"
- Private CmFiles As String()
+ Private _contextMenuFiles As String()
Private Sub OpenFiles(ParamArray files() As String)
If files.Length = 0 Then Exit Sub
- CmFiles = files
+ _contextMenuFiles = files
OpenWithToolStripMenuItem.Text = "Open with " & Cfg.OpenCmdName
@@ -673,14 +667,14 @@ Public Class GearboxForm
Private Sub OpenWithToolStripMenuItem_Click(sender As Object, e As EventArgs) _
Handles OpenWithToolStripMenuItem.Click
- If Not FileOpenAlt(CmFiles(0)) Then MsgBox("Failed to open file!")
+ If Not FileOpenAlt(_contextMenuFiles(0)) Then MsgBox("Failed to open file!")
End Sub
Private Sub ShowInFolderToolStripMenuItem_Click(sender As Object, e As EventArgs) _
Handles ShowInFolderToolStripMenuItem.Click
- If File.Exists(CmFiles(0)) Then
+ If File.Exists(_contextMenuFiles(0)) Then
Try
- Process.Start("explorer", "/select,""" & CmFiles(0) & "")
+ Process.Start("explorer", "/select,""" & _contextMenuFiles(0) & "")
Catch ex As Exception
MsgBox("Failed to open file!")
End Try
@@ -701,24 +695,23 @@ Public Class GearboxForm
Dim a As ChartArea
Dim img As Bitmap
Dim gear As Integer
- Dim fldOk As Boolean
'Dim fullLoadCurve As EngineFullLoadCurve = Nothing
'Dim shiftOk As Boolean
PicBox.Image = Nothing
- Dim shiftPolygon As ShiftPolygon
+ Dim shiftPolygon As ShiftPolygon = Nothing
'Dim engineFld As FullLoadCurve
If LvGears.Items.Count <= 1 Then Exit Sub
Try
If LvGears.SelectedItems.Count > 0 AndAlso LvGears.SelectedIndices(0) > 0 Then
- path = fFileRepl(LvGears.SelectedItems(0).SubItems(GearboxTbl.ShiftPolygons).Text, GetPath(GbxFile))
+ path = FileRepl(LvGears.SelectedItems(0).SubItems(GearboxTbl.ShiftPolygons).Text, GetPath(_gbxFile))
gear = LvGears.SelectedIndices(0)
Else
- path = fFileRepl(LvGears.Items(1).SubItems(GearboxTbl.ShiftPolygons).Text, GetPath(GbxFile))
+ path = FileRepl(LvGears.Items(1).SubItems(GearboxTbl.ShiftPolygons).Text, GetPath(_gbxFile))
gear = 1
End If
@@ -900,14 +893,14 @@ Public Class GearboxForm
'Browse TC file
Private Sub BtTCfileBrowse_Click(sender As Object, e As EventArgs) Handles BtTCfileBrowse.Click
- If TorqueConverterFileBrowser.OpenDialog(fFileRepl(TbTCfile.Text, GetPath(GbxFile))) Then
- TbTCfile.Text = GetFilenameWithoutDirectory(TorqueConverterFileBrowser.Files(0), GetPath(GbxFile))
+ If TorqueConverterFileBrowser.OpenDialog(FileRepl(TbTCfile.Text, GetPath(_gbxFile))) Then
+ TbTCfile.Text = GetFilenameWithoutDirectory(TorqueConverterFileBrowser.Files(0), GetPath(_gbxFile))
End If
End Sub
'Open TC file
Private Sub BtTCfileOpen_Click(sender As Object, e As EventArgs) Handles BtTCfileOpen.Click
- OpenFiles(fFileRepl(TbTCfile.Text, GetPath(GbxFile)))
+ OpenFiles(FileRepl(TbTCfile.Text, GetPath(_gbxFile)))
End Sub
@@ -925,8 +918,9 @@ Public Class GearboxForm
End Sub
Private Sub BtTCShiftFileBrowse_Click(sender As Object, e As EventArgs) Handles BtTCShiftFileBrowse.Click
- If fbTCCShift.OpenDialog(fFileRepl(TBTCShiftPolygon.Text, GetPath(GbxFile))) Then
- TBTCShiftPolygon.Text = GetFilenameWithoutDirectory(fbTCCShift.Files(0), GetPath(GbxFile))
+ If TorqueConverterShiftPolygonFileBrowser.OpenDialog(FileRepl(TBTCShiftPolygon.Text, GetPath(_gbxFile))) Then
+ TBTCShiftPolygon.Text = GetFilenameWithoutDirectory(TorqueConverterShiftPolygonFileBrowser.Files(0),
+ GetPath(_gbxFile))
End If
End Sub
End Class
diff --git a/VECTO/GUI/GearboxGearDialog.vb b/VECTO/GUI/GearboxGearDialog.vb
index 2f54d2fc04..a021447be0 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
+ If TransmissionLossMapFileBrowser.OpenDialog(FileRepl(TbMapPath.Text, GbxPath)) Then
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
+ If GearboxShiftPolygonFileBrowser.OpenDialog(FileRepl(TbShiftPolyFile.Text, GbxPath)) Then
TbShiftPolyFile.Text = GetFilenameWithoutDirectory(GearboxShiftPolygonFileBrowser.Files(0), GbxPath)
End If
End Sub
diff --git a/VECTO/GUI/GraphForm.vb b/VECTO/GUI/GraphForm.vb
index c7bf3d5994..cf3bd2673f 100644
--- a/VECTO/GUI/GraphForm.vb
+++ b/VECTO/GUI/GraphForm.vb
@@ -546,11 +546,11 @@ Public Class GraphForm
Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click
If File.Exists(MyAppPath & "User Manual\help.html") Then
- Dim BrowserRegistryString As String =
+ Dim browserRegistryString As String =
My.Computer.Registry.ClassesRoot.OpenSubKey("\http\shell\open\command\").GetValue("").ToString
- Dim DefaultBrowserPath As String =
- Regex.Match(BrowserRegistryString, "(\"".*?\"")").Captures(0).ToString
- Process.Start(DefaultBrowserPath,
+ Dim defaultBrowserPath As String =
+ Regex.Match(browserRegistryString, "(\"".*?\"")").Captures(0).ToString
+ Process.Start(defaultBrowserPath,
String.Format("""{0}{1}""", MyAppPath, "User Manual\help.html#graph-window"))
Else
MsgBox("User Manual not found!", MsgBoxStyle.Critical)
diff --git a/VECTO/GUI/MainForm.vb b/VECTO/GUI/MainForm.vb
index cfaa32e959..12177b69ae 100644
--- a/VECTO/GUI/MainForm.vb
+++ b/VECTO/GUI/MainForm.vb
@@ -53,38 +53,38 @@ Imports TUGraz.VectoCore.Utils
''' <remarks></remarks>
Public Class MainForm
- Private JobListView As cFileListView
- Private CycleListView As cFileListView
+ Private _jobListView As FileListView
+ Private _cycleListView As FileListView
- Private LastModeName As String
- Private ConMenTarget As ListView
- Private ConMenTarJob As Boolean
+ Private _lastModeName As String
+ Private _conMenTarget As ListView
+ Private _conMenTarJob As Boolean
- Private GUIlocked As Boolean
+ Private _guIlocked As Boolean
- Private CheckLock As Boolean
- Private GENchecked As Integer
- Private GENcheckAllLock As Boolean
+ Private _checkLock As Boolean
+ Private _genChecked As Integer
+ Private _genCheckAllLock As Boolean
- Private CbDeclLock As Boolean = False
+ Private _cbDeclLock As Boolean = False
#Region "SLEEP Control - Prevent sleep while VECTO is running"
Private Declare Function SetThreadExecutionState Lib "kernel32" (esFlags As Long) As Long
- Private Sub AllowSleepOFF()
+ Private Shared Sub AllowSleepOff()
#If Not PLATFORM = "x86" Then
- SetThreadExecutionState(tEXECUTION_STATE.ES_CONTINUOUS Or tEXECUTION_STATE.ES_SYSTEM_REQUIRED)
+ SetThreadExecutionState(EXECUTION_STATE.ES_CONTINUOUS Or EXECUTION_STATE.ES_SYSTEM_REQUIRED)
#End If
End Sub
- Private Sub AllowSleepON()
+ Private Shared Sub AllowSleepOn()
#If Not PLATFORM = "x86" Then
- SetThreadExecutionState(tEXECUTION_STATE.ES_CONTINUOUS)
+ SetThreadExecutionState(EXECUTION_STATE.ES_CONTINUOUS)
#End If
End Sub
- Private Enum tEXECUTION_STATE As Integer
+ Private Enum EXECUTION_STATE As Integer
''' Informs the system that the state being set should remain in effect until the next call that uses ES_CONTINUOUS and one of the other state flags is cleared.
ES_CONTINUOUS = &H80000000
''' Forces the display to be on by resetting the display idle timer.
@@ -120,10 +120,10 @@ Public Class MainForm
GearboxShiftPolygonFileBrowser = New FileBrowser("vgbs")
RetarderLossMapFileBrowser = New FileBrowser("vrlm")
TransmissionLossMapFileBrowser = New FileBrowser("vtlm")
- fbPTOLM = New FileBrowser("vptol")
+ PtoLossMapFileBrowser = New FileBrowser("vptol")
TorqueConverterFileBrowser = New FileBrowser("vtcc")
- fbTCCShift = New FileBrowser("vgbs")
- fbCDx = New FileBrowser("vcdx")
+ TorqueConverterShiftPolygonFileBrowser = New FileBrowser("vgbs")
+ CrossWindCorrectionFileBrowser = New FileBrowser("vcdx")
DriverDecisionFactorVelocityDropFileBrowser = New FileBrowser("DfVelocityDrop")
DriverDecisionFactorTargetSpeedFileBrowser = New FileBrowser("DfTargetSpeed")
DriverDecisionFactorVelocityDropFileBrowser.Extensions = New String() {"csv"}
@@ -146,10 +146,10 @@ Public Class MainForm
GearboxShiftPolygonFileBrowser.Extensions = New String() {"vgbs"}
RetarderLossMapFileBrowser.Extensions = New String() {"vrlm"}
TransmissionLossMapFileBrowser.Extensions = New String() {"vtlm"}
- fbPTOLM.Extensions = New String() {"vptol"}
+ PtoLossMapFileBrowser.Extensions = New String() {"vptol"}
TorqueConverterFileBrowser.Extensions = New String() {"vtcc"}
- fbTCCShift.Extensions = New String() {"vgbs"}
- fbCDx.Extensions = New String() {"vcdv", "vcdb"}
+ TorqueConverterShiftPolygonFileBrowser.Extensions = New String() {"vgbs"}
+ CrossWindCorrectionFileBrowser.Extensions = New String() {"vcdv", "vcdb"}
ModalResultsFileBrowser.Extensions = New String() {"vmod"}
End Sub
@@ -169,29 +169,29 @@ Public Class MainForm
GearboxShiftPolygonFileBrowser.Close()
RetarderLossMapFileBrowser.Close()
TransmissionLossMapFileBrowser.Close()
- fbPTOLM.Close()
+ PtoLossMapFileBrowser.Close()
TorqueConverterFileBrowser.Close()
- fbTCCShift.Close()
- fbCDx.Close()
+ TorqueConverterShiftPolygonFileBrowser.Close()
+ CrossWindCorrectionFileBrowser.Close()
ModalResultsFileBrowser.Close()
End Sub
#End Region
'Lock certain GUI elements while VECTO is running
- Private Sub LockGUI(Lock As Boolean)
- GUIlocked = Lock
+ Private Sub LockGUI(lock As Boolean)
+ _guIlocked = lock
- PanelOptAllg.Enabled = Not Lock
+ PanelOptAllg.Enabled = Not lock
- BtGENup.Enabled = Not Lock
- BtGENdown.Enabled = Not Lock
- ButtonGENadd.Enabled = Not Lock
- ButtonGENremove.Enabled = Not Lock
- LvGEN.LabelEdit = Not Lock
- ChBoxAllGEN.Enabled = Not Lock
+ BtGENup.Enabled = Not lock
+ BtGENdown.Enabled = Not lock
+ ButtonGENadd.Enabled = Not lock
+ ButtonGENremove.Enabled = Not lock
+ LvGEN.LabelEdit = Not lock
+ ChBoxAllGEN.Enabled = Not lock
- btStartV3.Enabled = Not Lock
+ btStartV3.Enabled = Not lock
End Sub
@@ -201,10 +201,10 @@ Public Class MainForm
Private Sub Form1_Load(sender As Object, e As EventArgs) Handles Me.Load
Dim x As Integer
- GUIlocked = False
- CheckLock = False
- GENcheckAllLock = False
- GENchecked = 0
+ _guIlocked = False
+ _checkLock = False
+ _genCheckAllLock = False
+ _genChecked = 0
'Load Tabs properly (otherwise problem with ListViews)
@@ -212,7 +212,7 @@ Public Class MainForm
TabControl1.TabPages(x).Show()
Next
- LastModeName = ""
+ _lastModeName = ""
FB_Initialize()
@@ -220,11 +220,11 @@ Public Class MainForm
'FileLists
- JobListView = New cFileListView(MyConfPath & "joblist.txt")
- JobListView.LVbox = LvGEN
- CycleListView = New cFileListView(MyConfPath & "cyclelist.txt")
+ _jobListView = New FileListView(MyConfPath & "joblist.txt")
+ _jobListView.LVbox = LvGEN
+ _cycleListView = New FileListView(MyConfPath & "cyclelist.txt")
- JobListView.LoadList()
+ _jobListView.LoadList()
LoadOptions()
@@ -249,7 +249,7 @@ Public Class MainForm
#If DEBUG Then
Const LicCheck As Boolean = False
#Else
- Const LicCheck as Boolean = True
+ Const LicCheck As Boolean = True
#End If
'License check
@@ -293,12 +293,12 @@ Public Class MainForm
End If
If Cfg.DeclMode Then
- LastModeName = "Declaration"
+ _lastModeName = "Declaration"
Else
- LastModeName = "Engineering"
+ _lastModeName = "Engineering"
End If
- Status(LastModeName & " Mode")
+ Status(_lastModeName & " Mode")
LoadOptions()
@@ -339,16 +339,16 @@ Public Class MainForm
#End Region
'Open file - Job, vehicle, engine, gearbox or signature file
- Public Sub OpenVectoFile(File As String)
+ Public Sub OpenVectoFile(file As String)
- If Not IO.File.Exists(File) Then
+ If Not IO.File.Exists(file) Then
- GUIMsg(MessageType.Err, "File not found! (" & File & ")")
- MsgBox("File not found! (" & File & ")", MsgBoxStyle.Critical)
+ GUIMsg(MessageType.Err, "File not found! (" & file & ")")
+ MsgBox("File not found! (" & file & ")", MsgBoxStyle.Critical)
Else
- Select Case UCase(GetExtension(File))
+ Select Case UCase(GetExtension(file))
Case ".VGBX"
If Not GearboxForm.Visible Then
GearboxForm.Show()
@@ -357,7 +357,7 @@ Public Class MainForm
If GearboxForm.WindowState = FormWindowState.Minimized Then GearboxForm.WindowState = FormWindowState.Normal
GearboxForm.BringToFront()
End If
- GearboxForm.OpenGbx(File)
+ GearboxForm.OpenGbx(file)
Case ".VVEH"
If Not VehicleForm.Visible Then
VehicleForm.Show()
@@ -367,7 +367,7 @@ Public Class MainForm
VehicleForm.BringToFront()
End If
Try
- VehicleForm.OpenVehicle(File)
+ VehicleForm.OpenVehicle(file)
Catch ex As Exception
MsgBox(ex.Message, MsgBoxStyle.OkOnly, "Error loading Vehicle File")
End Try
@@ -379,13 +379,13 @@ Public Class MainForm
If EngineForm.WindowState = FormWindowState.Minimized Then EngineForm.WindowState = FormWindowState.Normal
EngineForm.BringToFront()
End If
- EngineForm.OpenEngineFile(File)
+ EngineForm.OpenEngineFile(file)
Case ".VECTO"
- OpenVECTOeditor(File)
+ OpenVECTOeditor(file)
Case ".VSIG"
- OpenSigFile(File)
+ OpenSigFile(file)
Case Else
- MsgBox("Type '" & GetExtension(File) & "' unknown!", MsgBoxStyle.Critical)
+ MsgBox("Type '" & GetExtension(file) & "' unknown!", MsgBoxStyle.Critical)
End Select
End If
@@ -408,7 +408,7 @@ Public Class MainForm
Handles LvGEN.KeyDown
Select Case e.KeyCode
Case Keys.Delete, Keys.Back
- If Not GUIlocked Then RemoveJobFile()
+ If Not _guIlocked Then RemoveJobFile()
Case Keys.Enter
OpenJobFile()
End Select
@@ -425,37 +425,37 @@ Public Class MainForm
Handles LvGEN.ItemChecked
If e.Item.Checked Then
- GENchecked += 1
+ _genChecked += 1
Else
- GENchecked -= 1
+ _genChecked -= 1
End If
- If CheckLock Then Exit Sub
+ If _checkLock Then Exit Sub
UpdateJobTabText()
End Sub
Private Sub ChBoxAllGEN_CheckedChanged(sender As Object, e As EventArgs) _
Handles ChBoxAllGEN.CheckedChanged
- If GENcheckAllLock And ChBoxAllGEN.CheckState = CheckState.Indeterminate Then Exit Sub
+ If _genCheckAllLock And ChBoxAllGEN.CheckState = CheckState.Indeterminate Then Exit Sub
- CheckAllGEN(ChBoxAllGEN.Checked)
+ CheckAllGen(ChBoxAllGEN.Checked)
End Sub
- Private Sub CheckAllGEN(Check As Boolean)
+ Private Sub CheckAllGen(check As Boolean)
Dim x As ListViewItem
- CheckLock = True
+ _checkLock = True
LvGEN.BeginUpdate()
For Each x In LvGEN.Items
- x.Checked = Check
+ x.Checked = check
Next
LvGEN.EndUpdate()
- CheckLock = False
+ _checkLock = False
- GENchecked = LvGEN.CheckedItems.Count
+ _genChecked = LvGEN.CheckedItems.Count
UpdateJobTabText()
End Sub
@@ -486,7 +486,7 @@ Public Class MainForm
'Remove selected file(s) from job list
Private Sub RemoveJobFile()
Dim lastindx As Integer
- Dim SelIx() As Integer
+ Dim selIx() As Integer
Dim i As Integer
If LvGEN.SelectedItems.Count < 1 Then
@@ -498,15 +498,15 @@ Public Class MainForm
End If
LvGEN.BeginUpdate()
- CheckLock = True
+ _checkLock = True
- ReDim SelIx(LvGEN.SelectedItems.Count - 1)
- LvGEN.SelectedIndices.CopyTo(SelIx, 0)
+ ReDim selIx(LvGEN.SelectedItems.Count - 1)
+ LvGEN.SelectedIndices.CopyTo(selIx, 0)
lastindx = LvGEN.SelectedIndices(LvGEN.SelectedItems.Count - 1)
- For i = UBound(SelIx) To 0 Step -1
- LvGEN.Items.RemoveAt(SelIx(i))
+ For i = UBound(selIx) To 0 Step -1
+ LvGEN.Items.RemoveAt(selIx(i))
Next
If lastindx < LvGEN.Items.Count Then
@@ -516,26 +516,26 @@ Public Class MainForm
End If
LvGEN.EndUpdate()
- CheckLock = False
+ _checkLock = False
- GENchecked = LvGEN.CheckedItems.Count
+ _genChecked = LvGEN.CheckedItems.Count
UpdateJobTabText()
End Sub
'Browse for job file(s) and add to job list with AddToJobListView
Private Sub AddJobFile()
Dim x As String()
- Dim Chck As Boolean = False
+ Dim chck As Boolean = False
x = New String() {""}
'STANDARD/BATCH
If JobfileFileBrowser.OpenDialog("", True, "vecto") Then
- Chck = True
+ chck = True
x = JobfileFileBrowser.Files
End If
- If Chck Then AddToJobListView(x)
+ If chck Then AddToJobListView(x)
End Sub
'Open file in list
@@ -551,7 +551,7 @@ Public Class MainForm
End If
f = LvGEN.SelectedItems(0).SubItems(0).Text
- f = fFileRepl(f)
+ f = FileRepl(f)
If Not File.Exists(f) Then
MsgBox(f & " not found!")
Else
@@ -560,7 +560,7 @@ Public Class MainForm
End Sub
'Add File to job listview (multiple files)
- Private Sub AddToJobListView(Path As String(), Optional ByVal Txt As String = " ")
+ Private Sub AddToJobListView(path As String(), Optional ByVal txt As String = " ")
Dim pDim As Integer
Dim p As Integer
Dim f As Integer
@@ -571,12 +571,12 @@ Public Class MainForm
'If VECTO runs: Cancel operation (because Mode-change during calculation is not very clever)
If VectoWorkerV3.IsBusy Then Exit Sub
- pDim = UBound(Path)
+ pDim = UBound(path)
ReDim fList(0) 'um Nullverweisausnahme-Warnung zu verhindern
'******************************************* Begin Update '*******************************************
LvGEN.BeginUpdate()
- CheckLock = True
+ _checkLock = True
LvGEN.SelectedIndices.Clear()
@@ -584,7 +584,7 @@ Public Class MainForm
fListDim = LvGEN.Items.Count - 1
ReDim fList(fListDim)
For f = 0 To fListDim
- fList(f) = fFileRepl(LvGEN.Items(f).SubItems(0).Text)
+ fList(f) = FileRepl(LvGEN.Items(f).SubItems(0).Text)
Next
End If
@@ -595,10 +595,10 @@ Public Class MainForm
For f = 0 To fListDim
'If file already exists in the list: Do not append (only when a single file)
- If UCase(Path(p)) = UCase(fList(f)) Then
+ If UCase(path(p)) = UCase(fList(f)) Then
'Status reset
- LvGEN.Items(f).SubItems(1).Text = Txt
+ LvGEN.Items(f).SubItems(1).Text = txt
LvGEN.Items(f).BackColor = Color.FromKnownColor(KnownColor.Window)
LvGEN.Items(f).ForeColor = Color.FromKnownColor(KnownColor.WindowText)
@@ -614,7 +614,7 @@ Public Class MainForm
End If
'Otherwise: Add File (without WorkDir)
- listViewItem = New ListViewItem(Path(p)) 'fFileWD(Path(p)))
+ listViewItem = New ListViewItem(path(p)) 'fFileWD(Path(p)))
listViewItem.SubItems.Add(" ")
listViewItem.Checked = True
listViewItem.Selected = True
@@ -624,19 +624,19 @@ lbFound:
Next
LvGEN.EndUpdate()
- CheckLock = False
+ _checkLock = False
'******************************************* End Update '*******************************************
'Number update
- GENchecked = LvGEN.CheckedItems.Count
+ _genChecked = LvGEN.CheckedItems.Count
UpdateJobTabText()
End Sub
'Add File to job listview (single file)
- Public Sub AddToJobListView(Path As String, Optional ByVal Txt As String = " ")
+ Public Sub AddToJobListView(path As String, Optional ByVal txt As String = " ")
Dim p(0) As String
- p(0) = Path
- AddToJobListView(p, Txt)
+ p(0) = path
+ AddToJobListView(p, txt)
End Sub
'Update job files counter in tab titel
@@ -644,19 +644,19 @@ lbFound:
Dim c As Integer
c = LvGEN.Items.Count
- TabPageGEN.Text = "Job Files ( " & GENchecked & " / " & c & " )"
+ TabPageGEN.Text = "Job Files ( " & _genChecked & " / " & c & " )"
- GENcheckAllLock = True
+ _genCheckAllLock = True
- If GENchecked = 0 Then
+ If _genChecked = 0 Then
ChBoxAllGEN.CheckState = CheckState.Unchecked
- ElseIf GENchecked = c Then
+ ElseIf _genChecked = c Then
ChBoxAllGEN.CheckState = CheckState.Checked
Else
ChBoxAllGEN.CheckState = CheckState.Indeterminate
End If
- GENcheckAllLock = False
+ _genCheckAllLock = False
End Sub
@@ -712,8 +712,8 @@ lbFound:
Private Sub GraphToolStripMenuItem_Click(sender As Object, e As EventArgs) _
Handles GraphToolStripMenuItem.Click
- Dim FGraph As New GraphForm
- FGraph.Show()
+ Dim graphForm As New GraphForm
+ graphForm.Show()
End Sub
Private Sub SignOrVerifyFilesToolStripMenuItem_Click(sender As Object, e As EventArgs) _
@@ -739,11 +739,11 @@ lbFound:
Private Sub UserManualToolStripMenuItem_Click(sender As Object, e As EventArgs) _
Handles UserManualToolStripMenuItem.Click
If File.Exists(MyAppPath & "User Manual\help.html") Then
- Dim BrowserRegistryString As String =
+ Dim browserRegistryString As String =
My.Computer.Registry.ClassesRoot.OpenSubKey("\http\shell\open\command\").GetValue("").ToString
- Dim DefaultBrowserPath As String =
- Regex.Match(BrowserRegistryString, "(\"".*?\"")").Captures(0).ToString
- Process.Start(DefaultBrowserPath, Uri.EscapeDataString(MyAppPath & "User Manual\help.html"))
+ Dim defaultBrowserPath As String =
+ Regex.Match(browserRegistryString, "(\"".*?\"")").Captures(0).ToString
+ Process.Start(defaultBrowserPath, Uri.EscapeDataString(MyAppPath & "User Manual\help.html"))
Else
MsgBox("User Manual not found!", MsgBoxStyle.Critical)
End If
@@ -784,53 +784,53 @@ lbFound:
#End Region
'Move job/cycle file up or down in list view
- Private Sub MoveItem(ByRef ListV As ListView, MoveUp As Boolean)
- Dim x As Int32
- Dim y As Int32
- Dim y1 As Int32
+ Private Sub MoveItem(ByRef listView As ListView, moveUp As Boolean)
+ Dim x As Integer
+ Dim y As Integer
+ Dim y1 As Integer
Dim items() As String
Dim check() As Boolean
Dim index() As Integer
- Dim ListViewItem0 As ListViewItem
+ Dim listViewItem As ListViewItem
- If GUIlocked Then Exit Sub
+ If _guIlocked Then Exit Sub
'Cache Selected Items
- y1 = ListV.SelectedItems.Count - 1
+ y1 = listView.SelectedItems.Count - 1
ReDim items(y1)
ReDim check(y1)
ReDim index(y1)
y = 0
- For Each x In ListV.SelectedIndices
- items(y) = ListV.Items(x).SubItems(0).Text
- check(y) = ListV.Items(x).Checked
- If MoveUp Then
+ For Each x In listView.SelectedIndices
+ items(y) = listView.Items(x).SubItems(0).Text
+ check(y) = listView.Items(x).Checked
+ If moveUp Then
If x = 0 Then Exit Sub
index(y) = x - 1
Else
- If x = ListV.Items.Count - 1 Then Exit Sub
+ If x = listView.Items.Count - 1 Then Exit Sub
index(y) = x + 1
End If
y += 1
Next
- ListV.BeginUpdate()
+ listView.BeginUpdate()
'Delete Selected Items
- For Each ListViewItem0 In ListV.SelectedItems
- ListViewItem0.Remove()
+ For Each listViewItem In listView.SelectedItems
+ listViewItem.Remove()
Next
'Items select and Insert
For y = 0 To y1
- If Not check(y) Then GENchecked += 1
- ListViewItem0 = ListV.Items.Insert(index(y), items(y))
- ListViewItem0.SubItems.Add(" ")
- ListViewItem0.Checked = check(y)
- ListV.SelectedIndices.Add(index(y))
+ If Not check(y) Then _genChecked += 1
+ listViewItem = listView.Items.Insert(index(y), items(y))
+ listViewItem.SubItems.Add(" ")
+ listViewItem.Checked = check(y)
+ listView.SelectedIndices.Add(index(y))
Next
- ListV.EndUpdate()
+ listView.EndUpdate()
End Sub
@@ -840,10 +840,10 @@ lbFound:
Private Sub SaveListToolStripMenuItem_Click(sender As Object, e As EventArgs) _
Handles SaveListToolStripMenuItem.Click
If TextFileBrowser.SaveDialog("") Then
- If ConMenTarJob Then
- JobListView.SaveList(TextFileBrowser.Files(0))
+ If _conMenTarJob Then
+ _jobListView.SaveList(TextFileBrowser.Files(0))
Else
- CycleListView.SaveList(TextFileBrowser.Files(0))
+ _cycleListView.SaveList(TextFileBrowser.Files(0))
End If
End If
End Sub
@@ -852,17 +852,17 @@ lbFound:
Private Sub LoadListToolStripMenuItem_Click(sender As Object, e As EventArgs) _
Handles LoadListToolStripMenuItem.Click
- If GUIlocked Then Exit Sub
+ If _guIlocked Then Exit Sub
If TextFileBrowser.OpenDialog("") Then
- If ConMenTarJob Then 'GEN
- JobListView.LoadList(TextFileBrowser.Files(0))
- GENchecked = LvGEN.CheckedItems.Count
+ If _conMenTarJob Then 'GEN
+ _jobListView.LoadList(TextFileBrowser.Files(0))
+ _genChecked = LvGEN.CheckedItems.Count
UpdateJobTabText()
Else 'DRI
'Mode toggle
- CycleListView.LoadList(TextFileBrowser.Files(0))
+ _cycleListView.LoadList(TextFileBrowser.Files(0))
End If
End If
@@ -872,16 +872,16 @@ lbFound:
Private Sub LoadDefaultListToolStripMenuItem_Click(sender As Object, e As EventArgs) _
Handles LoadDefaultListToolStripMenuItem.Click
- If GUIlocked Then Exit Sub
+ If _guIlocked Then Exit Sub
- If ConMenTarJob Then
+ If _conMenTarJob Then
- JobListView.LoadList()
+ _jobListView.LoadList()
- GENchecked = LvGEN.CheckedItems.Count
+ _genChecked = LvGEN.CheckedItems.Count
UpdateJobTabText()
Else
- CycleListView.LoadList()
+ _cycleListView.LoadList()
End If
End Sub
@@ -890,11 +890,11 @@ lbFound:
Private Sub ClearListToolStripMenuItem_Click(sender As Object, e As EventArgs) _
Handles ClearListToolStripMenuItem.Click
- If GUIlocked Then Exit Sub
+ If _guIlocked Then Exit Sub
- ConMenTarget.Items.Clear()
- If ConMenTarJob Then
- GENchecked = LvGEN.CheckedItems.Count
+ _conMenTarget.Items.Clear()
+ If _conMenTarJob Then
+ _genChecked = LvGEN.CheckedItems.Count
UpdateJobTabText()
End If
End Sub
@@ -919,7 +919,7 @@ lbFound:
JobFileList.Clear()
JobFileList.AddRange(
From listViewItem As ListViewItem In LvGEN.CheckedItems.Cast(Of ListViewItem)()
- Select fFileRepl(listViewItem.SubItems(0).Text))
+ Select fFileRepl = FileRepl(listViewItem.SubItems(0).Text))
SetOptions()
Cfg.Save()
@@ -948,7 +948,7 @@ lbFound:
Dim sender As BackgroundWorker = TryCast(theSender, BackgroundWorker)
If sender Is Nothing Then Exit Sub
- AllowSleepOFF()
+ AllowSleepOff()
Dim sumFileWriter As FileOutputWriter = New FileOutputWriter(JobFileList(0))
Dim sumWriter As SummaryDataContainer = New SummaryDataContainer(sumFileWriter)
@@ -961,7 +961,7 @@ lbFound:
mode = ExecutionMode.Engineering
Physics.FuelDensity = New SI(Cfg.FuelDens).Kilo.Gramm.Per.Cubic.Dezi.Meter.Cast(Of KilogramPerCubicMeter)()
Physics.AirDensity = New SI(Cfg.AirDensity).Kilo.Gramm.Per.Cubic.Meter.Cast(Of KilogramPerCubicMeter)()
- Physics.CO2PerFuelWeight = Cfg.CO2perFC
+ Physics.CO2PerFuelWeight = Cfg.Co2PerFc
End If
'dictionary of run-identifiers to fileWriters (used for output directory of modfile)
@@ -1111,15 +1111,15 @@ lbFound:
Select Case progress.Target
Case "ListBox"
If progress.Link Is Nothing Then
- MSGtoForm(MessageType.Normal, progress.Message, "", "")
+ MsgToForm(MessageType.Normal, progress.Message, "", "")
Else
- MSGtoForm(MessageType.Normal, progress.Message, "", progress.Link)
+ MsgToForm(MessageType.Normal, progress.Message, "", progress.Link)
End If
Case "ListBoxWarning"
- MSGtoForm(MessageType.Warn, progress.Message, "", "")
+ MsgToForm(MessageType.Warn, progress.Message, "", "")
Return
Case "ListBoxError"
- MSGtoForm(MessageType.Err, progress.Message, "", "")
+ MsgToForm(MessageType.Err, progress.Message, "", "")
Return
Case "Status"
Status(progress.Message)
@@ -1149,83 +1149,83 @@ lbFound:
LockGUI(False)
btStartV3.Text = "START"
btStartV3.Image = My.Resources.Play_icon
- Status(LastModeName & " Mode")
+ Status(_lastModeName & " Mode")
'SLEEP reactivate
- AllowSleepON()
+ AllowSleepOn()
End Sub
Private Sub ModeUpdate()
'Save lists
- JobListView.SaveList()
+ _jobListView.SaveList()
'GUI changes according to current mode
If Cfg.DeclMode Then
- LastModeName = "Declaration"
+ _lastModeName = "Declaration"
Else
- LastModeName = "Engineering"
+ _lastModeName = "Engineering"
End If
'Update job counter
- GENchecked = LvGEN.CheckedItems.Count
+ _genChecked = LvGEN.CheckedItems.Count
UpdateJobTabText()
'Status label
- Status(LastModeName & " Mode")
+ Status(_lastModeName & " Mode")
End Sub
'Class for ListView control - Job and cycle lists
- Private Class cFileListView
- Private ReadOnly FilePath As String
- Private LoadedDefault As Boolean
+ Private Class FileListView
+ Private ReadOnly _filePath As String
+ Private _loadedDefault As Boolean
Public LVbox As ListView
- Public Sub New(Path As String)
- FilePath = Path
- LoadedDefault = False
+ Public Sub New(path As String)
+ _filePath = path
+ _loadedDefault = False
End Sub
- Public Sub SaveList(Optional ByVal Path As String = "")
- Dim x As Int32
- If Path = "" Then
- If Not LoadedDefault Then Exit Sub
- Path = FilePath
+ Public Sub SaveList(Optional ByVal path As String = "")
+ Dim x As Integer
+ If path = "" Then
+ If Not _loadedDefault Then Exit Sub
+ path = _filePath
End If
- Dim file As StreamWriter = My.Computer.FileSystem.OpenTextFileWriter(Path, False, Encoding.UTF8)
+ Dim file As StreamWriter = My.Computer.FileSystem.OpenTextFileWriter(path, False, Encoding.UTF8)
For x = 1 To LVbox.Items.Count
file.WriteLine(String.Join("?", LVbox.Items(x - 1).SubItems(0).Text, Math.Abs(CInt(LVbox.Items(x - 1).Checked))))
Next
file.Close()
End Sub
- Public Sub LoadList(Optional ByVal Path As String = "")
+ Public Sub LoadList(Optional ByVal path As String = "")
'Dim line As String()
- Dim NoCheck As Boolean
+ Dim noCheck As Boolean
'Dim file As CsvFile
- Dim ListViewItem0 As ListViewItem
+ Dim listViewItem As ListViewItem
- If Path = "" Then
- Path = FilePath
- LoadedDefault = True
+ If path = "" Then
+ path = _filePath
+ _loadedDefault = True
End If
'file = New CsvFile
- If Not File.Exists(Path) Then
- If Not LoadedDefault Then GUIMsg(MessageType.Err, "Cannot open file (" & Path & ")!")
+ If Not File.Exists(path) Then
+ If Not _loadedDefault Then GUIMsg(MessageType.Err, "Cannot open file (" & path & ")!")
Exit Sub
End If
- MainForm.CheckLock = True
+ MainForm._checkLock = True
LVbox.BeginUpdate()
LVbox.Items.Clear()
- NoCheck = False
- Dim reader As TextFieldParser = New TextFieldParser(Path, Encoding.Default)
+ noCheck = False
+ Dim reader As TextFieldParser = New TextFieldParser(path, Encoding.Default)
reader.TextFieldType = FieldType.Delimited
reader.Delimiters = New String() {"?"}
@@ -1233,30 +1233,30 @@ lbFound:
Dim line As String() = reader.ReadFields()
If Strings.Left(Trim(line(0)), 1) = "#" Then Continue Do
- ListViewItem0 = New ListViewItem(line(0))
- ListViewItem0.SubItems.Add(" ")
+ listViewItem = New ListViewItem(line(0))
+ listViewItem.SubItems.Add(" ")
- If NoCheck Then
- ListViewItem0.Checked = True
+ If noCheck Then
+ listViewItem.Checked = True
Else
If UBound(line) < 1 Then
- NoCheck = True
- ListViewItem0.Checked = True
+ noCheck = True
+ listViewItem.Checked = True
Else
If IsNumeric(line(1)) Then
- ListViewItem0.Checked = CBool(line(1))
+ listViewItem.Checked = CBool(line(1))
Else
- ListViewItem0.Checked = True
+ listViewItem.Checked = True
End If
End If
End If
- LVbox.Items.Add(ListViewItem0)
+ LVbox.Items.Add(listViewItem)
Loop
reader.Close()
LVbox.EndUpdate()
- MainForm.CheckLock = False
+ MainForm._checkLock = False
If LVbox.Items.Count > 0 Then LVbox.Items(LVbox.Items.Count - 1).EnsureVisible()
End Sub
@@ -1274,7 +1274,7 @@ lbFound:
End If
If x = "<New>" Then
- VectoJobForm.VECTOnew()
+ VectoJobForm.VectoNew()
Else
VectoJobForm.VECTOload2Form(x)
End If
@@ -1296,7 +1296,7 @@ lbFound:
'Save job and cycle file lists
Private Sub SaveFileLists()
- JobListView.SaveList()
+ _jobListView.SaveList()
'If Cfg.BatchMode Then CycleListView.SaveList()
End Sub
@@ -1314,8 +1314,8 @@ lbFound:
'Timer to update progress bar regularly
Private Sub TmProgSec_Tick(sender As Object, e As EventArgs) Handles TmProgSec.Tick
- If GUItest0.TestActive Then
- Call GUItest0.TestTick()
+ If _guItest.TestActive Then
+ Call _guItest.TestTick()
Exit Sub
Else
If Not ProgBarCtrl.ProgLock Then ProgSecUpdate()
@@ -1370,7 +1370,7 @@ lbFound:
'Add message to message list
- Public Sub MSGtoForm(ID As MessageType, Msg As String, Source As String, Link As String)
+ Public Sub MsgToForm(id As MessageType, msg As String, source As String, link As String)
If (InvokeRequired) Then
'Me.Invoke(New MsgToFormDelegate(AddressOf MSGtoForm), ID, Msg, Source, Link)
@@ -1379,15 +1379,15 @@ lbFound:
Dim lv0 As ListViewItem
lv0 = New ListViewItem
- lv0.Text = Msg
+ lv0.Text = msg
lv0.SubItems.Add(Now.ToString("HH:mm:ss.ff"))
- lv0.SubItems.Add(Source)
+ lv0.SubItems.Add(source)
If LvMsg.Items.Count > 9999 Then LvMsg.Items.RemoveAt(0)
- LogFile.WriteToLog(ID, Msg & vbTab & Source)
+ LogFile.WriteToLog(id, msg & vbTab & source)
- Select Case ID
+ Select Case id
Case MessageType.Err
@@ -1401,17 +1401,17 @@ lbFound:
Case Else
- If ID = MessageType.NewJob Then
+ If id = MessageType.NewJob Then
lv0.BackColor = Color.LightGray
lv0.ForeColor = Color.DarkBlue
End If
End Select
- If Link <> "" Then
- If Not ID = MessageType.Err Then lv0.ForeColor = Color.Blue
+ If link <> "" Then
+ If Not id = MessageType.Err Then lv0.ForeColor = Color.Blue
lv0.SubItems(0).Font = New Font(LvMsg.Font, FontStyle.Underline)
- lv0.Tag = Link
+ lv0.Tag = link
End If
@@ -1468,7 +1468,7 @@ lbFound:
Else
LvMsg.Cursor = Cursors.Hand
End If
- If mouseDownOnListView Then
+ If _mouseDownOnListView Then
Try
LvMsg.HitTest(e.Location).Item.Selected = True
Catch
@@ -1478,16 +1478,16 @@ lbFound:
#Region "Open File Context Menu"
- Private CmFiles As String()
+ Private _contextMenuFiles As String()
'Initialise and open context menu
Private Sub OpenFiles(ParamArray files() As String)
If files.Length = 0 Then Exit Sub
- CmFiles = files
+ _contextMenuFiles = files
- OpenInGraphWindowToolStripMenuItem.Enabled = (UCase(GetExtension(CmFiles(0))) = ".VMOD")
+ OpenInGraphWindowToolStripMenuItem.Enabled = (UCase(GetExtension(_contextMenuFiles(0))) = ".VMOD")
OpenWithToolStripMenuItem.Text = "Open with " & Cfg.OpenCmdName
@@ -1498,22 +1498,22 @@ lbFound:
'Open with tool defined in Settings
Private Sub OpenWithToolStripMenuItem_Click(sender As Object, e As EventArgs) _
Handles OpenWithToolStripMenuItem.Click
- If Not FileOpenAlt(CmFiles(0)) Then MsgBox("Failed to open file!")
+ If Not FileOpenAlt(_contextMenuFiles(0)) Then MsgBox("Failed to open file!")
End Sub
Private Sub OpenInGraphWindowToolStripMenuItem_Click(sender As Object, e As EventArgs) _
Handles OpenInGraphWindowToolStripMenuItem.Click
- Dim FGraph As New GraphForm
- FGraph.Show()
- FGraph.LoadNewFile(CmFiles(0))
+ Dim graphForm As New GraphForm
+ graphForm.Show()
+ graphForm.LoadNewFile(_contextMenuFiles(0))
End Sub
'Show in folder
Private Sub ShowInFolderToolStripMenuItem_Click(sender As Object, e As EventArgs) _
Handles ShowInFolderToolStripMenuItem.Click
- If File.Exists(CmFiles(0)) Then
+ If File.Exists(_contextMenuFiles(0)) Then
Try
- Process.Start("explorer", "/select,""" & CmFiles(0) & "")
+ Process.Start("explorer", "/select,""" & _contextMenuFiles(0) & "")
Catch ex As Exception
MsgBox("Failed to open file!")
End Try
@@ -1526,12 +1526,12 @@ lbFound:
'Change Declaraion Mode
Private Sub RbDecl_CheckedChanged(sender As Object, e As EventArgs) Handles RbDecl.CheckedChanged
- If CbDeclLock Then Exit Sub
+ If _cbDeclLock Then Exit Sub
If VectoJobForm.Visible Or VehicleForm.Visible Or GearboxForm.Visible Or EngineForm.Visible Then
- CbDeclLock = True
+ _cbDeclLock = True
RbDecl.Checked = Not RbDecl.Checked
- CbDeclLock = False
+ _cbDeclLock = False
MsgBox("Please close all dialog windows (e.g. Job Editor) before changing mode!")
Else
Cfg.DeclMode = RbDecl.Checked
@@ -1543,352 +1543,351 @@ lbFound:
#Region "GUI Tests"
- Private ReadOnly GUItest0 As New GUItest(Me)
- Private mouseDownOnListView As Boolean
+ Private ReadOnly _guItest As New GUItest(Me)
+ Private _mouseDownOnListView As Boolean
Private Class GUItest
- Private RowLim As Integer = 9
- Private ColLim As Integer = 45
+ Private ReadOnly RowLim As Integer = 9
+ Private ReadOnly ColLim As Integer = 45
Public TestActive As Boolean = False
- Private TestAborted As Boolean
- Private xCtrl As Integer
- Private xPanel As Integer
- Private Scr As Integer
- Private PRbAlt As Boolean
- Private ReadOnly Ctrls(RowLim + 1) As Integer
- Private ReadOnly Pnls(RowLim + 1) As Integer
- Private CtrlC As Integer
- Private CtrlCL As Integer
- Private PnDir As Integer
- Private PnDirC As Integer
- Private PnDirCL As Integer
- Private PnDirRnd As Integer
- Private CtrlRnd As Integer
- Private DiffC As Integer
- Private DiffLvl As Integer
- Private bInit As Integer
- Private ReadOnly MyForm As MainForm
- Private ReadOnly KeyCode As List(Of Integer)
+ Private _testAborted As Boolean
+ Private _xCtrl As Integer
+ Private _xPanel As Integer
+ Private _scr As Integer
+ Private _pRbAlt As Boolean
+ Private ReadOnly _ctrls(RowLim + 1) As Integer
+ Private ReadOnly _pnls(RowLim + 1) As Integer
+ Private _ctrlC As Integer
+ Private _ctrlCl As Integer
+ Private _pnDir As Integer
+ Private _pnDirC As Integer
+ Private _pnDirCl As Integer
+ Private _pnDirRnd As Integer
+ Private _ctrlRnd As Integer
+ Private _diffC As Integer
+ Private _diffLvl As Integer
+ Private _bInit As Integer
+ Private ReadOnly _mainForm As MainForm
+ Private ReadOnly _keyCode As List(Of Integer)
Private Sub TestRun()
Dim z As Integer
- xPanel = ColLim - 10
- xCtrl = ColLim - 10
- PRbAlt = False
- Scr = 0
- PnDir = 0
- PnDirCL = 10
- PnDirC = 0 ' StrDirCL
- CtrlCL = 5
- CtrlC = CtrlCL
- PnDirRnd = 5
- CtrlRnd = 8
- DiffC = 0
- DiffLvl = 1
- bInit = 0
- TestAborted = False
+ _xPanel = ColLim - 10
+ _xCtrl = ColLim - 10
+ _pRbAlt = False
+ _scr = 0
+ _pnDir = 0
+ _pnDirCl = 10
+ _pnDirC = 0 ' StrDirCL
+ _ctrlCl = 5
+ _ctrlC = _ctrlCl
+ _pnDirRnd = 5
+ _ctrlRnd = 8
+ _diffC = 0
+ _diffLvl = 1
+ _bInit = 0
+ _testAborted = False
Randomize()
- MyForm.LvMsg.Items.Clear()
- MyForm.ToolStripLbStatus.Text = "Score: 0000 Press <Esc> to Quit"
+ _mainForm.LvMsg.Items.Clear()
+ _mainForm.ToolStripLbStatus.Text = "Score: 0000 Press <Esc> to Quit"
For z = 1 To RowLim - 6
- PRbAlt = Not PRbAlt
- If Not PRbAlt Then
- MyForm.LvMsg.Items.Add(Space(ColLim - 11) & "*| |*")
+ _pRbAlt = Not _pRbAlt
+ If Not _pRbAlt Then
+ _mainForm.LvMsg.Items.Add(Space(ColLim - 11) & "*| |*")
Else
- MyForm.LvMsg.Items.Add(Space(ColLim - 11) & "*| | |*")
+ _mainForm.LvMsg.Items.Add(Space(ColLim - 11) & "*| | |*")
End If
Next
- PRbAlt = False
+ _pRbAlt = False
- MyForm.LvMsg.Items.Add(" VECTO Interactive Mode" & Space(ColLim - 35) & "*| |*")
- MyForm.LvMsg.Items.Add(Space(ColLim - 11) & "*| | |*")
- MyForm.LvMsg.Items.Add(Space(ColLim - 11) & "*| |*")
- MyForm.LvMsg.Items.Add(Space(ColLim - 11) & "*| | |*")
- MyForm.LvMsg.Items.Add(Space(ColLim - 11) & "*| |*")
- MyForm.LvMsg.Items.Add(Space(ColLim - 11) & "*| ∆ |*")
+ _mainForm.LvMsg.Items.Add(" VECTO Interactive Mode" & Space(ColLim - 35) & "*| |*")
+ _mainForm.LvMsg.Items.Add(Space(ColLim - 11) & "*| | |*")
+ _mainForm.LvMsg.Items.Add(Space(ColLim - 11) & "*| |*")
+ _mainForm.LvMsg.Items.Add(Space(ColLim - 11) & "*| | |*")
+ _mainForm.LvMsg.Items.Add(Space(ColLim - 11) & "*| |*")
+ _mainForm.LvMsg.Items.Add(Space(ColLim - 11) & "*| ∆ |*")
For z = 1 To RowLim + 1
- Pnls(z) = ColLim - 10
- Ctrls(z) = 0
+ _pnls(z) = ColLim - 10
+ _ctrls(z) = 0
Next
- MyForm.TmProgSec.Interval = 200
+ _mainForm.TmProgSec.Interval = 200
- MyForm.LvMsg.Focus()
+ _mainForm.LvMsg.Focus()
- MyForm.TmProgSec.Start()
+ _mainForm.TmProgSec.Start()
End Sub
Public Sub TestStop()
- MyForm.TmProgSec.Stop()
+ _mainForm.TmProgSec.Stop()
TestActive = False
- MyForm.LvMsg.Items.Clear()
- CtrlC = 0
- MyForm.ToolStripLbStatus.Text = MyForm.LastModeName & " Mode"
+ _mainForm.LvMsg.Items.Clear()
+ _ctrlC = 0
+ _mainForm.ToolStripLbStatus.Text = _mainForm._lastModeName & " Mode"
End Sub
Public Sub TestTick()
- If bInit = 24 Then GoTo LbRace
- bInit += 1
+ If _bInit = 24 Then GoTo LbRace
+ _bInit += 1
- Select Case bInit
+ Select Case _bInit
Case 10
- MyForm.LvMsg.Items.RemoveAt(RowLim - 6)
- MyForm.LvMsg.Items.RemoveAt(RowLim - 5)
- MyForm.LvMsg.Items.Insert(RowLim - 6, Space(ColLim - 11) & "*| |*")
- MyForm.LvMsg.Items.Insert(RowLim - 4, Space(ColLim - 30) & " 3 " & Space(10) & "*| |*")
+ _mainForm.LvMsg.Items.RemoveAt(RowLim - 6)
+ _mainForm.LvMsg.Items.RemoveAt(RowLim - 5)
+ _mainForm.LvMsg.Items.Insert(RowLim - 6, Space(ColLim - 11) & "*| |*")
+ _mainForm.LvMsg.Items.Insert(RowLim - 4, Space(ColLim - 30) & " 3 " & Space(10) & "*| |*")
Case 14
- MyForm.LvMsg.Items.RemoveAt(RowLim - 4)
- MyForm.LvMsg.Items.Insert(RowLim - 4, Space(ColLim - 30) & " 2 " & Space(10) & "*| |*")
+ _mainForm.LvMsg.Items.RemoveAt(RowLim - 4)
+ _mainForm.LvMsg.Items.Insert(RowLim - 4, Space(ColLim - 30) & " 2 " & Space(10) & "*| |*")
Case 18
- MyForm.LvMsg.Items.RemoveAt(RowLim - 4)
- MyForm.LvMsg.Items.Insert(RowLim - 4, Space(ColLim - 30) & " 1 " & Space(10) & "*| |*")
+ _mainForm.LvMsg.Items.RemoveAt(RowLim - 4)
+ _mainForm.LvMsg.Items.Insert(RowLim - 4, Space(ColLim - 30) & " 1 " & Space(10) & "*| |*")
Case 22
- MyForm.LvMsg.Items.RemoveAt(RowLim - 4)
- MyForm.LvMsg.Items.Insert(RowLim - 4, Space(ColLim - 30) & " Go! " & Space(10) & "*| |*")
+ _mainForm.LvMsg.Items.RemoveAt(RowLim - 4)
+ _mainForm.LvMsg.Items.Insert(RowLim - 4, Space(ColLim - 30) & " Go! " & Space(10) & "*| |*")
Case 24
- MyForm.LvMsg.Items.RemoveAt(RowLim - 4)
- MyForm.LvMsg.Items.Insert(RowLim - 4, Space(ColLim - 30) & " " & Space(10) & "*| |*")
+ _mainForm.LvMsg.Items.RemoveAt(RowLim - 4)
+ _mainForm.LvMsg.Items.Insert(RowLim - 4, Space(ColLim - 30) & " " & Space(10) & "*| |*")
End Select
Exit Sub
LbRace:
- PRbAlt = Not PRbAlt
+ _pRbAlt = Not _pRbAlt
- MyForm.LvMsg.BeginUpdate()
+ _mainForm.LvMsg.BeginUpdate()
- sLists()
+ Lists()
- sAlign()
+ Align()
- sSetCtrl()
+ SetCtrl()
- sSetPanel()
+ SetPanel()
- MyForm.LvMsg.Items.RemoveAt(RowLim)
+ _mainForm.LvMsg.Items.RemoveAt(RowLim)
- sUpdateCtrl()
+ UpdateCtrl()
- MyForm.LvMsg.EndUpdate()
+ _mainForm.LvMsg.EndUpdate()
- If Math.Abs(xCtrl - Pnls(2)) > 4 Then
- sAbort()
+ If Math.Abs(_xCtrl - _pnls(2)) > 4 Then
+ Abort()
Exit Sub
- ElseIf Ctrls(2) <> 0 Then
- If xCtrl = Pnls(2) + Ctrls(2) - 4 Then
- sAbort()
+ ElseIf _ctrls(2) <> 0 Then
+ If _xCtrl = _pnls(2) + _ctrls(2) - 4 Then
+ Abort()
Exit Sub
End If
- Scr += 5 * DiffLvl
+ _scr += 5 * _diffLvl
End If
- Scr += DiffLvl
- DiffC += 1
+ _scr += _diffLvl
+ _diffC += 1
'Erhöhe Schwierigkeitsgrad
- If DiffC = (DiffLvl + 3) * 4 Then
- DiffC = 0
- DiffLvl += 1
- If DiffLvl > 2 And DiffLvl < 7 Then MyForm.TmProgSec.Interval = 300 - (DiffLvl) * 30
- Scr += 100
- Select Case DiffLvl
+ If _diffC = (_diffLvl + 3) * 4 Then
+ _diffC = 0
+ _diffLvl += 1
+ If _diffLvl > 2 And _diffLvl < 7 Then _mainForm.TmProgSec.Interval = 300 - (_diffLvl) * 30
+ _scr += 100
+ Select Case _diffLvl
Case 3
- PnDirCL = 3
- CtrlCL = 4
- CtrlRnd = 6
+ _pnDirCl = 3
+ _ctrlCl = 4
+ _ctrlRnd = 6
Case 5
- PnDirCL = 2
- PnDirRnd = 4
+ _pnDirCl = 2
+ _pnDirRnd = 4
Case 8
- CtrlCL = 2
+ _ctrlCl = 2
Case 10
- CtrlRnd = 4
- PnDirRnd = 3
+ _ctrlRnd = 4
+ _pnDirRnd = 3
End Select
End If
End Sub
- Public Sub TestKey(Key0 As Integer)
+ Public Sub TestKey(key As Integer)
If TestActive Then
- Select Case Key0
+ Select Case key
Case Keys.Left
- xCtrl -= 1
- sUpdateCtrl()
+ _xCtrl -= 1
+ UpdateCtrl()
Case Keys.Right
- xCtrl += 1
- sUpdateCtrl()
+ _xCtrl += 1
+ UpdateCtrl()
Case Keys.Escape
TestStop()
End Select
Else
- If KeyCode(CtrlC) = Key0 Then
- CtrlC += 1
- If CtrlC = KeyCode.Count Then
+ If _keyCode(_ctrlC) = key Then
+ _ctrlC += 1
+ If _ctrlC = _keyCode.Count Then
TestActive = True
TestRun()
End If
Else
- CtrlC = 0
+ _ctrlC = 0
End If
End If
End Sub
- Private Sub sAbort()
+ Private Sub Abort()
Dim s As String, s1 As String
- If TestAborted Then Exit Sub
+ If _testAborted Then Exit Sub
- TestAborted = True
+ _testAborted = True
- MyForm.TmProgSec.Stop()
+ _mainForm.TmProgSec.Stop()
- MyForm.LvMsg.BeginUpdate()
+ _mainForm.LvMsg.BeginUpdate()
- s = MyForm.LvMsg.Items(0).Text
- MyForm.LvMsg.Items.RemoveAt(0)
- MyForm.LvMsg.Items.Insert(0, "You crashed!" & Microsoft.VisualBasic.Right(s, Len(s) - 12))
+ s = _mainForm.LvMsg.Items(0).Text
+ _mainForm.LvMsg.Items.RemoveAt(0)
+ _mainForm.LvMsg.Items.Insert(0, "You crashed!" & Microsoft.VisualBasic.Right(s, Len(s) - 12))
- s = MyForm.LvMsg.Items(1).Text
- s1 = "Score: " & Scr & " "
- MyForm.LvMsg.Items.RemoveAt(1)
- MyForm.LvMsg.Items.Insert(1, s1 & Microsoft.VisualBasic.Right(s, Len(s) - Len(s1)))
+ s = _mainForm.LvMsg.Items(1).Text
+ s1 = "Score: " & _scr & " "
+ _mainForm.LvMsg.Items.RemoveAt(1)
+ _mainForm.LvMsg.Items.Insert(1, s1 & Microsoft.VisualBasic.Right(s, Len(s) - Len(s1)))
- MyForm.LvMsg.EndUpdate()
+ _mainForm.LvMsg.EndUpdate()
- LogFile.WriteToLog(MessageType.Normal, "*** Race Score: " & Scr.ToString("0000") & " ***")
+ LogFile.WriteToLog(MessageType.Normal, "*** Race Score: " & _scr.ToString("0000") & " ***")
- CtrlC = 0
+ _ctrlC = 0
TestActive = False
- MyForm.ToolStripLbStatus.Text = MyForm.LastModeName & " Mode"
+ _mainForm.ToolStripLbStatus.Text = _mainForm._lastModeName & " Mode"
End Sub
- Private Sub sSetCtrl()
+ Private Sub SetCtrl()
Dim x As Integer
- If Scr < 10 Then Exit Sub
- Ctrls(RowLim + 1) = 0
- CtrlC += 1
- If CtrlC < CtrlCL Then Exit Sub
- Select Case CInt(Int((CtrlRnd * Rnd()) + 1))
+ If _scr < 10 Then Exit Sub
+ _ctrls(RowLim + 1) = 0
+ _ctrlC += 1
+ If _ctrlC < _ctrlCl Then Exit Sub
+ Select Case CInt(Int((_ctrlRnd * Rnd()) + 1))
Case 1, 2
- CtrlC = 0
+ _ctrlC = 0
x = CInt(Int((7 * Rnd()) + 1))
- Ctrls(RowLim + 1) = x
- Case Else
+ _ctrls(RowLim + 1) = x
End Select
End Sub
- Private Sub sUpdateCtrl()
+ Private Sub UpdateCtrl()
Dim s As String
- If bInit < 21 Then
- xCtrl = ColLim - 10
+ If _bInit < 21 Then
+ _xCtrl = ColLim - 10
Exit Sub
End If
- If Math.Abs(xCtrl - Pnls(1)) > 5 Then
- sAbort()
+ If Math.Abs(_xCtrl - _pnls(1)) > 5 Then
+ Abort()
Exit Sub
End If
- s = Replace(MyForm.LvMsg.Items(RowLim - 1).Text.ToString, "∆", " ") & " "
+ s = Replace(_mainForm.LvMsg.Items(RowLim - 1).Text.ToString, "∆", " ") & " "
s = Microsoft.VisualBasic.Left(s, ColLim + 15)
's = s.Remove(0, 20)
's = "Press <Esc> to Quit " & s
- If Mid(s, xCtrl + 5, 1) = "X" Then
- sAbort()
+ If Mid(s, _xCtrl + 5, 1) = "X" Then
+ Abort()
Exit Sub
End If
- s = s.Remove(xCtrl + 4, 1)
+ s = s.Remove(_xCtrl + 4, 1)
's = Trim(s.Insert(xCar + 4, "∆")) & Space(ColLim + 5 - Streets(2)) & "Pts: " & Pts & " Lv: " & DiffLvl
- s = Space(Pnls(2) - 1) & Trim(s.Insert(xCtrl + 4, "∆"))
- MyForm.LvMsg.Items.RemoveAt(RowLim - 1)
- MyForm.LvMsg.Items.Insert(RowLim - 1, s)
- MyForm.ToolStripLbStatus.Text = "Score: " & Scr.ToString("0000") & " Press <Esc> to Quit"
+ s = Space(_pnls(2) - 1) & Trim(s.Insert(_xCtrl + 4, "∆"))
+ _mainForm.LvMsg.Items.RemoveAt(RowLim - 1)
+ _mainForm.LvMsg.Items.Insert(RowLim - 1, s)
+ _mainForm.ToolStripLbStatus.Text = "Score: " & _scr.ToString("0000") & " Press <Esc> to Quit"
End Sub
- Private Sub sSetPanel()
+ Private Sub SetPanel()
Dim s As String
s = "*| | |*"
- If PRbAlt Then
+ If _pRbAlt Then
s = s.Remove(5, 1)
s = s.Insert(5, " ")
End If
- If Ctrls(RowLim + 1) <> 0 Then
- s = s.Remove(Ctrls(RowLim + 1) + 1, 1)
- s = s.Insert(Ctrls(RowLim + 1) + 1, "X")
+ If _ctrls(RowLim + 1) <> 0 Then
+ s = s.Remove(_ctrls(RowLim + 1) + 1, 1)
+ s = s.Insert(_ctrls(RowLim + 1) + 1, "X")
End If
- Select Case xPanel - Pnls(RowLim)
+ Select Case _xPanel - _pnls(RowLim)
Case -1
s = Replace(s, "|", "\")
Case 1
s = Replace(s, "|", "/")
End Select
- MyForm.LvMsg.Items.Insert(0, Space(xPanel - 1) & s)
+ _mainForm.LvMsg.Items.Insert(0, Space(_xPanel - 1) & s)
End Sub
- Private Sub sAlign()
- PnDirC += 1
- If PnDirC < PnDirCL Then GoTo Lb1
- PnDirC = 0
- Select Case CInt(Int((PnDirRnd * Rnd()) + 1))
+ Private Sub Align()
+ _pnDirC += 1
+ If _pnDirC < _pnDirCl Then GoTo Lb1
+ _pnDirC = 0
+ Select Case CInt(Int((_pnDirRnd * Rnd()) + 1))
Case 1
- PnDir = 1
+ _pnDir = 1
Case 2
- PnDir = -1
+ _pnDir = -1
Case Else
- PnDir = 0
+ _pnDir = 0
End Select
Lb1:
- xPanel += PnDir
- If xPanel > ColLim Then
- xPanel = ColLim
- ElseIf xPanel < 22 Then
- xPanel = 22
+ _xPanel += _pnDir
+ If _xPanel > ColLim Then
+ _xPanel = ColLim
+ ElseIf _xPanel < 22 Then
+ _xPanel = 22
End If
- Pnls(RowLim + 1) = xPanel
+ _pnls(RowLim + 1) = _xPanel
End Sub
- Private Sub sLists()
+ Private Sub Lists()
Dim x As Integer
For x = 2 To RowLim + 1
- Ctrls(x - 1) = Ctrls(x)
- Pnls(x - 1) = Pnls(x)
+ _ctrls(x - 1) = _ctrls(x)
+ _pnls(x - 1) = _pnls(x)
Next
End Sub
Public Sub New(form As MainForm)
- MyForm = form
- KeyCode = New List(Of Integer)
- KeyCode.Add(Keys.Up)
- KeyCode.Add(Keys.Up)
- KeyCode.Add(Keys.Down)
- KeyCode.Add(Keys.Down)
- KeyCode.Add(Keys.Left)
- KeyCode.Add(Keys.Right)
- KeyCode.Add(Keys.Left)
- KeyCode.Add(Keys.Right)
- KeyCode.Add(Keys.B)
- KeyCode.Add(Keys.A)
- CtrlC = 0
+ _mainForm = form
+ _keyCode = New List(Of Integer)
+ _keyCode.Add(Keys.Up)
+ _keyCode.Add(Keys.Up)
+ _keyCode.Add(Keys.Down)
+ _keyCode.Add(Keys.Down)
+ _keyCode.Add(Keys.Left)
+ _keyCode.Add(Keys.Right)
+ _keyCode.Add(Keys.Left)
+ _keyCode.Add(Keys.Right)
+ _keyCode.Add(Keys.B)
+ _keyCode.Add(Keys.A)
+ _ctrlC = 0
End Sub
End Class
Private Sub LvMsg_KeyDown(sender As Object, e As KeyEventArgs) Handles LvMsg.KeyDown
- GUItest0.TestKey(e.KeyValue)
- If GUItest0.TestActive Then e.SuppressKeyPress = True
+ _guItest.TestKey(e.KeyValue)
+ If _guItest.TestActive Then e.SuppressKeyPress = True
End Sub
Private Sub LvMsg_LostFocus(sender As Object, e As EventArgs) Handles LvMsg.LostFocus
- If GUItest0.TestActive Then GUItest0.TestStop()
+ If _guItest.TestActive Then _guItest.TestStop()
End Sub
#End Region
@@ -1906,22 +1905,22 @@ Lb1:
End Sub
Private Sub LvMsg_MouseDown(sender As Object, e As MouseEventArgs) Handles LvMsg.MouseDown
- mouseDownOnListView = True
+ _mouseDownOnListView = True
End Sub
Private Sub LvMsg_MouseUp(sender As Object, e As MouseEventArgs) Handles LvMsg.MouseUp
- mouseDownOnListView = False
+ _mouseDownOnListView = False
End Sub
Private Sub LvGEN_MouseUp(sender As Object, e As MouseEventArgs) Handles LvGEN.MouseUp
If e.Button = MouseButtons.Right Then
- ConMenTarget = LvGEN
- ConMenTarJob = True
+ _conMenTarget = LvGEN
+ _conMenTarJob = True
'Locked functions show/hide
- LoadListToolStripMenuItem.Enabled = Not GUIlocked
- LoadDefaultListToolStripMenuItem.Enabled = Not GUIlocked
- ClearListToolStripMenuItem.Enabled = Not GUIlocked
+ LoadListToolStripMenuItem.Enabled = Not _guIlocked
+ LoadDefaultListToolStripMenuItem.Enabled = Not _guIlocked
+ ClearListToolStripMenuItem.Enabled = Not _guIlocked
ConMenFilelist.Show(MousePosition)
End If
@@ -1937,3 +1936,5 @@ Lb1:
Public Link As String
End Class
End Class
+
+
diff --git a/VECTO/GUI/Settings.vb b/VECTO/GUI/Settings.vb
index a98ae8bdf3..d379733cf0 100644
--- a/VECTO/GUI/Settings.vb
+++ b/VECTO/GUI/Settings.vb
@@ -73,11 +73,11 @@ Public Class Settings
'Help button
Private Sub BtHelp_Click(sender As Object, e As EventArgs) Handles BtHelp.Click
If File.Exists(MyAppPath & "User Manual\help.html") Then
- Dim BrowserRegistryString As String =
+ Dim browserRegistryString As String =
My.Computer.Registry.ClassesRoot.OpenSubKey("\http\shell\open\command\").GetValue("").ToString
- Dim DefaultBrowserPath As String =
- Regex.Match(BrowserRegistryString, "(\"".*?\"")").Captures(0).ToString
- Process.Start(DefaultBrowserPath,
+ Dim defaultBrowserPath As String =
+ Regex.Match(browserRegistryString, "(\"".*?\"")").Captures(0).ToString
+ Process.Start(defaultBrowserPath,
String.Format("""{0}{1}""", MyAppPath, "User Manual\help.html#settings"))
Else
MsgBox("User Manual not found!", MsgBoxStyle.Critical)
diff --git a/VECTO/GUI/VectoJobForm.vb b/VECTO/GUI/VectoJobForm.vb
index 1efc812e59..abb35959ca 100644
--- a/VECTO/GUI/VectoJobForm.vb
+++ b/VECTO/GUI/VectoJobForm.vb
@@ -32,7 +32,7 @@ Imports TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox
''' </summary>
''' <remarks></remarks>
Public Class VectoJobForm
- Public VECTOfile As String
+ Public VectoFile As String
Private _changed As Boolean = False
Private _pgDriver As TabPage
@@ -41,9 +41,6 @@ Public Class VectoJobForm
Private _auxDialog As VehicleAuxiliariesDialog
- Public EngineIdleSpeed As Double
- Public EngineFullLoadFile As String
-
'AA-TB
'Populate Advanced Auxiliaries
Private Sub PopulateAdvancedAuxiliaries()
@@ -59,9 +56,6 @@ Public Class VectoJobForm
Private Sub F02_GEN_Load(sender As Object, e As EventArgs) Handles Me.Load
Dim x As Integer
- EngineIdleSpeed = -1
- EngineFullLoadFile = ""
-
_auxDialog = New VehicleAuxiliariesDialog
_pgDriver = TabPgDriver
@@ -151,17 +145,17 @@ Public Class VectoJobForm
Protected Function GetTechListForAux(type As AuxiliaryType, aux As IDeclarationAuxiliaryTable) _
As ListViewItem
- Dim LV0 As ListViewItem
+ Dim listViewItem As ListViewItem
- LV0 = New ListViewItem(type.Key())
- LV0.SubItems.Add(type.Name())
+ listViewItem = New ListViewItem(type.Key())
+ listViewItem.SubItems.Add(type.Name())
Dim auxtech As String() = aux.GetTechnologies()
If auxtech.Count > 1 Then
- LV0.SubItems.Add("")
+ listViewItem.SubItems.Add("")
Else
- LV0.SubItems.Add(auxtech(0))
+ listViewItem.SubItems.Add(auxtech(0))
End If
- Return LV0
+ Return listViewItem
End Function
@@ -184,31 +178,31 @@ Public Class VectoJobForm
#Region "Browse Buttons"
Private Sub ButtonVEH_Click(sender As Object, e As EventArgs) Handles ButtonVEH.Click
- If VehicleFileBrowser.OpenDialog(fFileRepl(TbVEH.Text, GetPath(VECTOfile))) Then
+ If VehicleFileBrowser.OpenDialog(FileRepl(TbVEH.Text, GetPath(VECTOfile))) Then
TbVEH.Text = GetFilenameWithoutDirectory(VehicleFileBrowser.Files(0), GetPath(VECTOfile))
End If
End Sub
Private Sub ButtonMAP_Click(sender As Object, e As EventArgs) Handles ButtonMAP.Click
- If EngineFileBrowser.OpenDialog(fFileRepl(TbENG.Text, GetPath(VECTOfile))) Then
+ If EngineFileBrowser.OpenDialog(FileRepl(TbENG.Text, GetPath(VECTOfile))) Then
TbENG.Text = GetFilenameWithoutDirectory(EngineFileBrowser.Files(0), GetPath(VECTOfile))
End If
End Sub
Private Sub ButtonGBX_Click(sender As Object, e As EventArgs) Handles ButtonGBX.Click
- If GearboxFileBrowser.OpenDialog(fFileRepl(TbGBX.Text, GetPath(VECTOfile))) Then
+ If GearboxFileBrowser.OpenDialog(FileRepl(TbGBX.Text, GetPath(VECTOfile))) Then
TbGBX.Text = GetFilenameWithoutDirectory(GearboxFileBrowser.Files(0), GetPath(VECTOfile))
End If
End Sub
Private Sub BtDesMaxBr_Click_1(sender As Object, e As EventArgs) Handles BtDesMaxBr.Click
- If DriverAccelerationFileBrowser.OpenDialog(fFileRepl(TbDesMaxFile.Text, GetPath(VECTOfile))) Then
+ If DriverAccelerationFileBrowser.OpenDialog(FileRepl(TbDesMaxFile.Text, GetPath(VECTOfile))) Then
TbDesMaxFile.Text = GetFilenameWithoutDirectory(DriverAccelerationFileBrowser.Files(0), GetPath(VECTOfile))
End If
End Sub
Private Sub BtAccOpen_Click(sender As Object, e As EventArgs) Handles BtAccOpen.Click
- OpenFiles(fFileRepl(TbDesMaxFile.Text, GetPath(VECTOfile)))
+ OpenFiles(FileRepl(TbDesMaxFile.Text, GetPath(VECTOfile)))
End Sub
#End Region
@@ -218,7 +212,7 @@ Public Class VectoJobForm
'Open Vehicle Editor
Private Sub ButOpenVEH_Click(sender As Object, e As EventArgs) Handles ButOpenVEH.Click
Dim f As String
- f = fFileRepl(TbVEH.Text, GetPath(VECTOfile))
+ f = FileRepl(TbVEH.Text, GetPath(VECTOfile))
'Thus Veh-file is returned
VehicleForm.JobDir = GetPath(VECTOfile)
@@ -250,7 +244,7 @@ Public Class VectoJobForm
'Open Engine Editor
Private Sub ButOpenENG_Click(sender As Object, e As EventArgs) Handles ButOpenENG.Click
Dim f As String
- f = fFileRepl(TbENG.Text, GetPath(VECTOfile))
+ f = FileRepl(TbENG.Text, GetPath(VECTOfile))
'Thus Veh-file is returned
EngineForm.JobDir = GetPath(VECTOfile)
@@ -276,7 +270,7 @@ Public Class VectoJobForm
'Open Gearbox Editor
Private Sub ButOpenGBX_Click(sender As Object, e As EventArgs) Handles ButOpenGBX.Click
Dim f As String
- f = fFileRepl(TbGBX.Text, GetPath(VECTOfile))
+ f = FileRepl(TbGBX.Text, GetPath(VECTOfile))
'Thus Veh-file is returned
GearboxForm.JobDir = GetPath(VECTOfile)
@@ -305,7 +299,7 @@ Public Class VectoJobForm
'New
Private Sub ToolStripBtNew_Click(sender As Object, e As EventArgs) Handles ToolStripBtNew.Click
- VECTOnew()
+ VectoNew()
End Sub
'Open
@@ -336,11 +330,11 @@ Public Class VectoJobForm
'Help
Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click
If File.Exists(MyAppPath & "User Manual\help.html") Then
- Dim BrowserRegistryString As String =
+ Dim browserRegistryString As String =
My.Computer.Registry.ClassesRoot.OpenSubKey("\http\shell\open\command\").GetValue("").ToString
- Dim DefaultBrowserPath As String =
- Regex.Match(BrowserRegistryString, "(\"".*?\"")").Captures(0).ToString
- Process.Start(DefaultBrowserPath,
+ Dim defaultBrowserPath As String =
+ Regex.Match(browserRegistryString, "(\"".*?\"")").Captures(0).ToString
+ Process.Start(defaultBrowserPath,
String.Format("""{0}{1}""", MyAppPath, "User Manual\help.html#job-editor"))
Else
MsgBox("User Manual not found!", MsgBoxStyle.Critical)
@@ -367,7 +361,7 @@ Public Class VectoJobForm
If ChangeCheckCancel() Then Exit Sub
- VECTOnew()
+ VectoNew()
'Read GEN
Dim inputData As IEngineeringInputDataProvider = TryCast(JSONInputDataFactory.ReadComponentData(file),
@@ -382,8 +376,6 @@ Public Class VectoJobForm
MainForm.OpenVectoFile(file)
Case -1
Exit Sub
- Case Else '0
- 'Continue...
End Select
End If
@@ -615,13 +607,10 @@ Public Class VectoJobForm
End Function
'New file
- Public Sub VECTOnew()
+ Public Sub VectoNew()
If ChangeCheckCancel() Then Exit Sub
- EngineIdleSpeed = -1
- EngineFullLoadFile = ""
-
'Files
TbVEH.Text = ""
TbENG.Text = ""
@@ -756,7 +745,7 @@ Public Class VectoJobForm
#Region "Aux Listview"
Private Sub ButAuxAdd_Click(sender As Object, e As EventArgs) Handles ButAuxAdd.Click
- Dim ID As String
+ Dim id As String
_auxDialog.VehPath = GetPath(VECTOfile)
_auxDialog.TbPath.Text = ""
@@ -767,12 +756,12 @@ Public Class VectoJobForm
lbDlog:
If _auxDialog.ShowDialog = DialogResult.OK Then
- ID = UCase(Trim(_auxDialog.TbID.Text))
+ id = UCase(Trim(_auxDialog.TbID.Text))
Dim lv0 As ListViewItem
For Each lv0 In LvAux.Items
- If lv0.SubItems(0).Text = ID Then
- MsgBox("ID '" & ID & "' already defined!", MsgBoxStyle.Critical)
+ If lv0.SubItems(0).Text = id Then
+ MsgBox("ID '" & id & "' already defined!", MsgBoxStyle.Critical)
_auxDialog.TbID.SelectAll()
_auxDialog.TbID.Focus()
GoTo lbDlog
@@ -883,7 +872,7 @@ lbDlog:
Private Sub LvCycles_DoubleClick(sender As Object, e As EventArgs) Handles LvCycles.DoubleClick
If LvCycles.SelectedItems.Count > 0 Then _
- OpenFiles(fFileRepl(LvCycles.SelectedItems(0).SubItems(0).Text, GetPath(VECTOfile)))
+ OpenFiles(FileRepl(LvCycles.SelectedItems(0).SubItems(0).Text, GetPath(VECTOfile)))
End Sub
Private Sub LvCycles_KeyDown(sender As Object, e As KeyEventArgs) Handles LvCycles.KeyDown
@@ -950,19 +939,19 @@ lbDlog:
End Sub
Private Sub CheckEngOnly()
- Dim OnOff As Boolean
+ Dim onOff As Boolean
- OnOff = Not CbEngOnly.Checked
+ onOff = Not CbEngOnly.Checked
- SetDrivertab(OnOff)
+ SetDrivertab(onOff)
- ButOpenVEH.Enabled = OnOff
- TbVEH.Enabled = OnOff
- ButtonVEH.Enabled = OnOff
- ButOpenGBX.Enabled = OnOff
- TbGBX.Enabled = OnOff
- ButtonGBX.Enabled = OnOff
- GrAux.Enabled = OnOff
+ ButOpenVEH.Enabled = onOff
+ TbVEH.Enabled = onOff
+ ButtonVEH.Enabled = onOff
+ ButOpenGBX.Enabled = onOff
+ TbGBX.Enabled = onOff
+ ButtonGBX.Enabled = onOff
+ GrAux.Enabled = onOff
End Sub
'Start/Stop changed
@@ -981,25 +970,25 @@ lbDlog:
'EcoRoll / Overspeed changed
Private Sub RdOff_CheckedChanged(sender As Object, e As EventArgs) _
Handles RdOff.CheckedChanged, RdOverspeed.CheckedChanged, RdEcoRoll.CheckedChanged
- Dim EcoR As Boolean
- Dim Ovr As Boolean
+ Dim ecoRoll As Boolean
+ Dim overspeed As Boolean
Change()
- EcoR = RdEcoRoll.Checked
- Ovr = RdOverspeed.Checked
+ ecoRoll = RdEcoRoll.Checked
+ overspeed = RdOverspeed.Checked
- TbOverspeed.Enabled = Ovr Or EcoR
- Label13.Enabled = Ovr Or EcoR
- Label14.Enabled = Ovr Or EcoR
+ TbOverspeed.Enabled = overspeed Or ecoRoll
+ Label13.Enabled = overspeed Or ecoRoll
+ Label14.Enabled = overspeed Or ecoRoll
- TbUnderSpeed.Enabled = EcoR
- Label22.Enabled = EcoR
- Label20.Enabled = EcoR
+ TbUnderSpeed.Enabled = ecoRoll
+ Label22.Enabled = ecoRoll
+ Label20.Enabled = ecoRoll
- TbVmin.Enabled = Ovr Or EcoR
- Label23.Enabled = Ovr Or EcoR
- Label21.Enabled = Ovr Or EcoR
+ TbVmin.Enabled = overspeed Or ecoRoll
+ Label23.Enabled = overspeed Or ecoRoll
+ Label21.Enabled = overspeed Or ecoRoll
End Sub
#End Region
@@ -1015,7 +1004,7 @@ lbDlog:
Dim a As ChartArea
Dim img As Bitmap
- Dim EngOK As Boolean = False
+ Dim engOk As Boolean = False
TbHVCclass.Text = ""
TbVehCat.Text = ""
@@ -1065,15 +1054,15 @@ lbDlog:
End If
- Dim OkCount As Integer = 0
+ Dim okCount As Integer = 0
Dim engine As IEngineEngineeringInputData = inputData.EngineInputData
'engine.FilePath = fFileRepl(TbENG.Text, GetPath(VECTOfile))
'Create plot
- Dim MyChart As Chart = New Chart
- MyChart.Width = PicBox.Width
- MyChart.Height = PicBox.Height
+ Dim chart As Chart = New Chart
+ chart.Width = PicBox.Width
+ chart.Height = PicBox.Height
a = New ChartArea
@@ -1081,7 +1070,7 @@ lbDlog:
If Not engine Is Nothing Then
- EngineIdleSpeed = engine.IdleSpeed.Value()
+ engine.IdleSpeed.Value()
Dim fullLoadCurve As FullLoadCurve = EngineFullLoadCurve.Create(engine.FullLoadCurve)
@@ -1092,7 +1081,7 @@ lbDlog:
s.BorderWidth = 2
s.Color = Color.DarkBlue
s.Name = "Full load"
- MyChart.Series.Add(s)
+ chart.Series.Add(s)
s = New Series
s.Points.DataBindXY(fullLoadCurve.FullLoadEntries.Select(Function(x) x.EngineSpeed.AsRPM).ToArray(),
@@ -1101,9 +1090,9 @@ lbDlog:
s.BorderWidth = 2
s.Color = Color.Blue
s.Name = "Motoring"
- MyChart.Series.Add(s)
+ chart.Series.Add(s)
- OkCount += 1
+ okCount += 1
pmax = fullLoadCurve.MaxPower.Value() / 1000 'FLD0.Pfull(FLD0.EngineRatedSpeed)
@@ -1120,9 +1109,9 @@ lbDlog:
s.MarkerSize = 3
s.Color = Color.Red
s.Name = "Map"
- MyChart.Series.Add(s)
+ chart.Series.Add(s)
- OkCount += 1
+ okCount += 1
End If
@@ -1135,7 +1124,7 @@ lbDlog:
If Cfg.DeclMode Then
- If EngOK Then
+ If engOk Then
For i = 1 To gearbox.Gears.Count
@@ -1204,14 +1193,14 @@ lbDlog:
s.Name = "Downshift curve"
'MyChart.Series.Add(s) 'MQ 2016-06-20:do not plot shift lines in engine dialog
- OkCount += 1
+ okCount += 1
Next
End If
End If
- If OkCount > 0 Then
+ If okCount > 0 Then
a.Name = "main"
@@ -1233,12 +1222,12 @@ lbDlog:
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
@@ -1249,27 +1238,27 @@ lbDlog:
#Region "Open File Context Menu"
- Private CmFiles As String()
+ Private _contextMenuFiles As String()
Private _basePath As String = ""
Private Sub OpenFiles(ParamArray files() As String)
If files.Length = 0 Then Exit Sub
- CmFiles = files
+ _contextMenuFiles = files
OpenWithToolStripMenuItem.Text = "Open with " & Cfg.OpenCmdName
CmOpenFile.Show(Windows.Forms.Cursor.Position)
End Sub
Private Sub OpenWithToolStripMenuItem_Click(sender As Object, e As EventArgs) _
Handles OpenWithToolStripMenuItem.Click
- If Not FileOpenAlt(CmFiles(0)) Then MsgBox("Failed to open file!")
+ If Not FileOpenAlt(_contextMenuFiles(0)) Then MsgBox("Failed to open file!")
End Sub
Private Sub ShowInFolderToolStripMenuItem_Click(sender As Object, e As EventArgs) _
Handles ShowInFolderToolStripMenuItem.Click
- If File.Exists(CmFiles(0)) Then
+ If File.Exists(_contextMenuFiles(0)) Then
Try
- Process.Start("explorer", "/select,""" & CmFiles(0) & "")
+ Process.Start("explorer", "/select,""" & _contextMenuFiles(0) & "")
Catch ex As Exception
MsgBox("Failed to open file!")
End Try
@@ -1394,11 +1383,11 @@ lbDlog:
'AA-TB
Private Sub btnAAUXOpen_Click(sender As Object, e As EventArgs) Handles btnAAUXOpen.Click
- OpenFiles(fFileRepl(txtAdvancedAuxiliaryFile.Text, GetPath(VECTOfile)))
+ OpenFiles(FileRepl(txtAdvancedAuxiliaryFile.Text, GetPath(VECTOfile)))
End Sub
Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnDfTargetSpeed.Click
- If DriverDecisionFactorTargetSpeedFileBrowser.OpenDialog(fFileRepl(tbLacDfTargetSpeedFile.Text, GetPath(VECTOfile))) _
+ If DriverDecisionFactorTargetSpeedFileBrowser.OpenDialog(FileRepl(tbLacDfTargetSpeedFile.Text, GetPath(VECTOfile))) _
Then _
tbLacDfTargetSpeedFile.Text = GetFilenameWithoutDirectory(DriverDecisionFactorTargetSpeedFileBrowser.Files(0),
GetPath(VECTOfile))
@@ -1406,3 +1395,6 @@ lbDlog:
End Class
+
+
+
diff --git a/VECTO/GUI/VehicleAuxiliariesDialog.vb b/VECTO/GUI/VehicleAuxiliariesDialog.vb
index d59afdd681..871f0be624 100644
--- a/VECTO/GUI/VehicleAuxiliariesDialog.vb
+++ b/VECTO/GUI/VehicleAuxiliariesDialog.vb
@@ -11,7 +11,6 @@
Option Infer On
Imports System.Windows.Forms
-Imports TUGraz.VectoCommon.Models
Imports TUGraz.VectoCore.Models.Declaration
@@ -95,7 +94,7 @@ Public Class VehicleAuxiliariesDialog
'Browse for .vaux files
Private Sub BtBrowse_Click(sender As Object, e As EventArgs) Handles BtBrowse.Click
- If AuxFileBrowser.OpenDialog(fFileRepl(TbPath.Text, VehPath)) Then _
+ If AuxFileBrowser.OpenDialog(FileRepl(TbPath.Text, VehPath)) Then _
TbPath.Text = GetFilenameWithoutDirectory(AuxFileBrowser.Files(0), VehPath)
End Sub
diff --git a/VECTO/GUI/VehicleForm.vb b/VECTO/GUI/VehicleForm.vb
index f8d3a15cea..d4cbe41866 100644
--- a/VECTO/GUI/VehicleForm.vb
+++ b/VECTO/GUI/VehicleForm.vb
@@ -477,7 +477,7 @@ Public Class VehicleForm
If AutoSendTo Then
If VectoJobForm.Visible Then
- If UCase(fFileRepl(VectoJobForm.TbVEH.Text, JobDir)) <> UCase(file) Then _
+ If UCase(FileRepl(VectoJobForm.TbVEH.Text, JobDir)) <> UCase(file) Then _
VectoJobForm.TbVEH.Text = GetFilenameWithoutDirectory(file, JobDir)
VectoJobForm.UpdatePic()
End If
@@ -535,13 +535,13 @@ Public Class VehicleForm
ex = "vcdb"
End If
- If fbCDx.OpenDialog(fFileRepl(TbCdFile.Text, GetPath(_vehFile)), False, ex) Then _
- TbCdFile.Text = GetFilenameWithoutDirectory(fbCDx.Files(0), GetPath(_vehFile))
+ If CrossWindCorrectionFileBrowser.OpenDialog(FileRepl(TbCdFile.Text, GetPath(_vehFile)), False, ex) Then _
+ TbCdFile.Text = GetFilenameWithoutDirectory(CrossWindCorrectionFileBrowser.Files(0), GetPath(_vehFile))
End Sub
'Open Cd File
Private Sub BtCdFileOpen_Click(sender As Object, e As EventArgs) Handles BtCdFileOpen.Click
- OpenFiles(fFileRepl(TbCdFile.Text, GetPath(_vehFile)))
+ OpenFiles(FileRepl(TbCdFile.Text, GetPath(_vehFile)))
End Sub
#End Region
@@ -570,7 +570,7 @@ Public Class VehicleForm
'Rt File Browse
Private Sub BtRtBrowse_Click(sender As Object, e As EventArgs) Handles BtRtBrowse.Click
- If RetarderLossMapFileBrowser.OpenDialog(fFileRepl(TbRtPath.Text, GetPath(_vehFile))) Then _
+ If RetarderLossMapFileBrowser.OpenDialog(FileRepl(TbRtPath.Text, GetPath(_vehFile))) Then _
TbRtPath.Text = GetFilenameWithoutDirectory(RetarderLossMapFileBrowser.Files(0), GetPath(_vehFile))
End Sub
@@ -796,7 +796,7 @@ Public Class VehicleForm
End Sub
Private Sub btAngularGearLossMapBrowse_Click(sender As Object, e As EventArgs) Handles btAngularGearLossMapBrowse.Click
- If TransmissionLossMapFileBrowser.OpenDialog(fFileRepl(TbRtPath.Text, GetPath(_vehFile))) Then _
+ If TransmissionLossMapFileBrowser.OpenDialog(FileRepl(TbRtPath.Text, GetPath(_vehFile))) Then _
tbAngularGearLossMapPath.Text = GetFilenameWithoutDirectory(TransmissionLossMapFileBrowser.Files(0),
GetPath(_vehFile))
End Sub
@@ -816,13 +816,13 @@ Public Class VehicleForm
End Sub
Private Sub btPTOLossMapBrowse_Click(sender As Object, e As EventArgs) Handles btPTOLossMapBrowse.Click
- If fbPTOLM.OpenDialog(fFileRepl(tbPTOLossMap.Text, GetPath(_vehFile))) Then
- tbPTOLossMap.Text = GetFilenameWithoutDirectory(fbPTOLM.Files(0), GetPath(_vehFile))
+ If PtoLossMapFileBrowser.OpenDialog(FileRepl(tbPTOLossMap.Text, GetPath(_vehFile))) Then
+ tbPTOLossMap.Text = GetFilenameWithoutDirectory(PtoLossMapFileBrowser.Files(0), GetPath(_vehFile))
End If
End Sub
Private Sub btPTOCycle_Click(sender As Object, e As EventArgs) Handles btPTOCycle.Click
- If DrivingCycleFileBrowser.OpenDialog(fFileRepl(tbPTOCycle.Text, GetPath(_vehFile))) Then
+ If DrivingCycleFileBrowser.OpenDialog(FileRepl(tbPTOCycle.Text, GetPath(_vehFile))) Then
tbPTOCycle.Text = GetFilenameWithoutDirectory(DrivingCycleFileBrowser.Files(0), GetPath(_vehFile))
End If
End Sub
diff --git a/VECTO/Input Files/Engine.vb b/VECTO/Input Files/Engine.vb
index 9d12402798..92be9b1eef 100644
--- a/VECTO/Input Files/Engine.vb
+++ b/VECTO/Input Files/Engine.vb
@@ -17,9 +17,7 @@ Imports TUGraz.VECTO.Input_Files
Imports TUGraz.VectoCommon.InputData
Imports TUGraz.VectoCommon.Models
Imports TUGraz.VectoCommon.Utils
-Imports TUGraz.VectoCore.InputData.FileIO.JSON
Imports TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
-Imports TUGraz.VectoCore.Models.Declaration
Imports TUGraz.VectoCore.Models.SimulationComponent.Data
Imports TUGraz.VectoCore.Utils
@@ -37,12 +35,6 @@ Public Class Engine
''' <remarks></remarks>
Private Const FormatVersion As Short = 3
- ''' <summary>
- ''' Format version of input file. Defined in ReadFile.
- ''' </summary>
- ''' <remarks></remarks>
- Private _fileVersion As Integer
-
''' <summary>
''' Engine description (model, type, etc.). Saved in input file.
''' </summary>
@@ -96,24 +88,24 @@ Public Class Engine
''' WHTC Urban test results. Saved in input file.
''' </summary>
''' <remarks></remarks>
- Public WHTCurbanInput As Double
+ Public WHTCUrbanInput As Double
''' <summary>
''' WHTC Rural test results. Saved in input file.
''' </summary>
''' <remarks></remarks>
- Public WHTCruralInput As Double
+ Public WHTCRuralInput As Double
''' <summary>
''' WHTC Motorway test results. Saved in input file.
''' </summary>
''' <remarks></remarks>
- Public WHTCmotorwayInput As Double
+ Public WHTCMotorwayInput As Double
Public WHTCEngineeringInput As Double
- Private ColdHotBalancingFactorInput As Double
+ Public ColdHotBalancingFactorInput As Double
''' <summary>
@@ -144,7 +136,8 @@ Public Class Engine
WHTCurbanInput = 0
WHTCruralInput = 0
- WHTCmotorwayInput = 0
+ WHTCMotorwayInput = 0
+ WHTCEngineeringInput = 1
End Sub
''' <summary>
@@ -165,7 +158,7 @@ Public Class Engine
Return False
End If
- Dim json As New JSONParser
+ Dim json As New JSONWriter
'Header
Dim header As Dictionary(Of String, Object) = New Dictionary(Of String, Object)
@@ -221,9 +214,9 @@ Public Class Engine
End Property
- Public Property PathFLD(Optional ByVal Original As Boolean = False) As String
+ Public Property PathFld(Optional ByVal original As Boolean = False) As String
Get
- If Original Then
+ If original Then
Return _fullLoadCurvePath.OriginalPath
Else
Return _fullLoadCurvePath.FullPath
@@ -237,13 +230,13 @@ Public Class Engine
''' <summary>
''' Get or set file path (cSubPath) to FC map (.vmap)
''' </summary>
- ''' <param name="Original">True= (relative) file path as saved in file; False= full file path</param>
+ ''' <param name="original">True= (relative) file path as saved in file; False= full file path</param>
''' <value></value>
''' <returns>Relative or absolute file path to FC map</returns>
''' <remarks></remarks>
- Public Property PathMAP(Optional ByVal Original As Boolean = False) As String
+ Public Property PathMap(Optional ByVal original As Boolean = False) As String
Get
- If Original Then
+ If original Then
Return _fuelConsumptionMapPath.OriginalPath
Else
Return _fuelConsumptionMapPath.FullPath
@@ -290,6 +283,7 @@ Public Class Engine
Return DataSourceType.JSONFile
End Get
End Property
+
Public ReadOnly Property Source As String Implements IComponentInputData.Source
Get
Return FilePath
@@ -360,19 +354,19 @@ Public Class Engine
Public ReadOnly Property WHTCMotorway As Double Implements IEngineDeclarationInputData.WHTCMotorway
Get
- Return WHTCmotorwayInput
+ Return WHTCMotorwayInput
End Get
End Property
Public ReadOnly Property WHTCRural As Double Implements IEngineDeclarationInputData.WHTCRural
Get
- Return WHTCruralInput
+ Return WHTCRuralInput
End Get
End Property
Public ReadOnly Property WHTCUrban As Double Implements IEngineDeclarationInputData.WHTCUrban
Get
- Return WHTCurbanInput
+ Return WHTCUrbanInput
End Get
End Property
diff --git a/VECTO/Input Files/Gearbox.vb b/VECTO/Input Files/Gearbox.vb
index 874728be5b..996aaa3cae 100644
--- a/VECTO/Input Files/Gearbox.vb
+++ b/VECTO/Input Files/Gearbox.vb
@@ -20,9 +20,7 @@ Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.InputData.FileIO.JSON
Imports TUGraz.VectoCore.InputData.Impl
Imports TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
-Imports TUGraz.VectoCore.Models.Declaration
Imports TUGraz.VectoCore.Models.SimulationComponent.Data
-Imports TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox
Imports TUGraz.VectoCore.Utils
<CustomValidation(GetType(Gearbox), "ValidateGearbox")>
@@ -32,7 +30,6 @@ Public Class Gearbox
ITorqueConverterDeclarationInputData
Private Const FormatVersion As Short = 6
- Private _fileVersion As Integer
Private _myPath As String
Private _filePath As String
@@ -120,7 +117,7 @@ Public Class Gearbox
End If
Dim i As Integer
- Dim json As New JSONParser
+ Dim json As New JSONWriter
'Header
Dim header As Dictionary(Of String, Object) = New Dictionary(Of String, Object)
diff --git a/VECTO/Input Files/SubPath.vb b/VECTO/Input Files/SubPath.vb
index 20d196187a..24c7cdf0e8 100644
--- a/VECTO/Input Files/SubPath.vb
+++ b/VECTO/Input Files/SubPath.vb
@@ -24,12 +24,12 @@ Namespace Input_Files
Else
_valid = True
_originalPath = path
- _fullPath = fFileRepl(path, parentDir)
+ _fullPath = FileRepl(path, parentDir)
End If
End Sub
Private Function CheckFilenameGiven(f As String) As String
- If Trim(UCase(f)) = Constants.NoFile Then
+ If Trim(UCase(f)) = NoFile Then
Return ""
Else
Return f
@@ -66,7 +66,7 @@ Namespace Input_Files
If _valid Then
Return _originalPath
Else
- Return Constants.NoFile
+ Return NoFile
End If
End Get
End Property
diff --git a/VECTO/Input Files/VectoJob.vb b/VECTO/Input Files/VectoJob.vb
index 9f254bced5..ab3b282eaa 100644
--- a/VECTO/Input Files/VectoJob.vb
+++ b/VECTO/Input Files/VectoJob.vb
@@ -23,11 +23,8 @@ Imports TUGraz.VectoCommon.Models
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.InputData.FileIO.JSON
Imports TUGraz.VectoCore.InputData.Impl
-Imports TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
Imports TUGraz.VectoCore.InputData.Reader.Impl
-Imports TUGraz.VectoCore.Models.Declaration
Imports TUGraz.VectoCore.Models.Simulation.Data
-Imports TUGraz.VectoCore.Models.SimulationComponent.Data
Imports TUGraz.VectoCore.Utils
<CustomValidation(GetType(VectoJob), "ValidateJob")>
@@ -82,7 +79,7 @@ Public Class VectoJob
Public Class AuxEntry
Public Type As String
Public ReadOnly Path As SubPath
- Public TechnologyList As List(Of String)
+ Public ReadOnly TechnologyList As List(Of String)
Public Sub New()
Path = New SubPath
@@ -107,7 +104,7 @@ Public Class VectoJob
End Sub
Public Function SaveFile() As Boolean
- Dim json As New JSONParser
+ Dim json As New JSONWriter
Dim validationResults As IList(Of ValidationResult) =
Validate(If(Cfg.DeclMode, ExecutionMode.Declaration, ExecutionMode.Engineering))
@@ -554,8 +551,7 @@ Public Class VectoJob
If Not File.Exists(_driverAccelerationFile.FullPath) Then
Try
Dim cycleDataRes As Stream =
- RessourceHelper.ReadStream(RessourceHelper.Namespace + "VACC." + _driverAccelerationFile.OriginalPath +
- TUGraz.VectoCore.Configuration.Constants.FileExtensions.DriverAccelerationCurve)
+ RessourceHelper.ReadStream(RessourceHelper.Namespace + "VACC." + _driverAccelerationFile.OriginalPath + VectoCore.Configuration.Constants.FileExtensions.DriverAccelerationCurve)
Return VectoCSVFile.ReadStream(cycleDataRes)
Catch ex As Exception
Return Nothing
diff --git a/VECTO/Input Files/Vehicle.vb b/VECTO/Input Files/Vehicle.vb
index 7d88a89fc5..9b1c302c2e 100644
--- a/VECTO/Input Files/Vehicle.vb
+++ b/VECTO/Input Files/Vehicle.vb
@@ -19,7 +19,6 @@ Imports TUGraz.VECTO.Input_Files
Imports TUGraz.VectoCommon.InputData
Imports TUGraz.VectoCommon.Models
Imports TUGraz.VectoCommon.Utils
-Imports TUGraz.VectoCore.InputData.FileIO.JSON
Imports TUGraz.VectoCore.InputData.Impl
Imports TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
Imports TUGraz.VectoCore.Models.Declaration
@@ -32,7 +31,6 @@ Public Class Vehicle
IAngularGearInputData
'V2 MassMax is now saved in [t] instead of [kg]
Private Const FormatVersion As Short = 7
- Private _fileVersion As Integer
Private _filePath As String
Private _path As String
@@ -63,9 +61,9 @@ Public Class Vehicle
Public AngularGearRatio As Double
Public ReadOnly AngularGearLossMapFile As SubPath
- Public PTOType As String
- Public ReadOnly PTOLossMap As SubPath
- Public ReadOnly PTOCycle As SubPath
+ Public PtoType As String
+ Public ReadOnly PtoLossMap As SubPath
+ Public ReadOnly PtoCycle As SubPath
Public Class Axle
Public RRC As Double
@@ -203,7 +201,7 @@ Public Class Vehicle
Return False
End If
- Dim json As New JSONParser
+ Dim json As New JSONWriter
'Header
Dim header As Dictionary(Of String, Object) = New Dictionary(Of String, Object) From {
{"CreatedBy", Lic.LicString & " (" & Lic.GUID & ")"},
diff --git a/VECTO/JSONWriter.vb b/VECTO/JSONWriter.vb
index 9d6f6ea702..7cabc5ab5d 100644
--- a/VECTO/JSONWriter.vb
+++ b/VECTO/JSONWriter.vb
@@ -8,10 +8,9 @@
' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
'
' See the LICENSE.txt for the specific language governing permissions and limitations.
-Imports System.Collections.Generic
+
Imports System.IO
Imports System.Linq
-Imports Microsoft.VisualBasic.FileIO
Imports Newtonsoft.Json
Imports Newtonsoft.Json.Linq
@@ -19,7 +18,7 @@ Imports Newtonsoft.Json.Linq
''' uses JSON.NET http://json.codeplex.com/
''' </summary>
''' <remarks></remarks>
-Public Class JSONParser
+Public Class JSONWriter
Public Content As JToken 'Dictionary(Of String, Object)
Public Sub New()
diff --git a/VECTO/MainModule.vb b/VECTO/MainModule.vb
index 2e27e75185..2c751604f6 100644
--- a/VECTO/MainModule.vb
+++ b/VECTO/MainModule.vb
@@ -30,17 +30,11 @@ Module MainModule
End Function
Public Function ConvPicPath(hdVclass As Integer, isLongHaul As Boolean) As Bitmap
- Dim longHaulFlag As String = ""
- If isLongHaul Then
- longHaulFlag = "t"
- End If
-
Select Case hdVclass
Case 1, 2, 3
Return My.Resources._4x2r ' resourcePath & "4x2r.png"
Case 4
If isLongHaul Then Return My.Resources._4x2rt
-
Return My.Resources._4x2r 'resourcePath & "4x2r" & longHaulFlag & ".png"
Case 5
Return My.Resources._4x2tt ' resourcePath & "4x2tt.png"
diff --git a/VECTO/VECTO.vbproj b/VECTO/VECTO.vbproj
index 4dd9d6f18e..7343c3210e 100644
--- a/VECTO/VECTO.vbproj
+++ b/VECTO/VECTO.vbproj
@@ -169,7 +169,7 @@
<ItemGroup>
<Compile Include="ApplicationEvents.vb" />
<Compile Include="Input Files\AdvancedAuxiliary.vb" />
- <Compile Include="JSONparser.vb" />
+ <Compile Include="JSONWriter.vb" />
<Compile Include="GUI\FileSignDialog.Designer.vb">
<DependentUpon>FileSignDialog.vb</DependentUpon>
</Compile>
diff --git a/VECTO/VECTO_Global.vb b/VECTO/VECTO_Global.vb
index 5abd346350..c6c48b3ded 100644
--- a/VECTO/VECTO_Global.vb
+++ b/VECTO/VECTO_Global.vb
@@ -22,7 +22,7 @@ Public Module VECTO_Global
Public MyConfPath As String
- Public LogFile As cLogFile
+ Public LogFile As FileLogger
'to ensure correct format for backgroundworker thread
@@ -41,25 +41,14 @@ Public Module VECTO_Global
Public ProgBarCtrl As ProgressbarControl
- ''' <summary>
- ''' Converts engine speed and torque to power.
- ''' </summary>
- ''' <param name="nU">engine speed</param>
- ''' <param name="M">Torque</param>
- ''' <returns>Power</returns>
- ''' <remarks></remarks>
- Public Function nMtoPe(nU As Double, M As Double) As Double
- Return (nU * 2 * Math.PI / 60) * M / 1000
- End Function
-
- Public Class cLogFile
- Private LOGstream As StreamWriter
+ Public Class FileLogger
+ Private _logStream As StreamWriter
Public Function StartLog() As Boolean
Try
- LOGstream = My.Computer.FileSystem.OpenTextFileWriter(MyAppPath & "LOG.txt", True, FileFormat)
- LOGstream.AutoFlush = True
+ _logStream = My.Computer.FileSystem.OpenTextFileWriter(MyAppPath & "LOG.txt", True, FileFormat)
+ _logStream.AutoFlush = True
WriteToLog(MessageType.Normal, "Starting Session " & Now)
WriteToLog(MessageType.Normal, "VECTO " & VECTOvers)
Catch ex As Exception
@@ -71,7 +60,7 @@ Public Module VECTO_Global
Public Function SizeCheck() As Boolean
Dim logfDetail As FileInfo
- Dim BackUpError As Boolean
+ Dim backUpError As Boolean
'Start new log if file size limit reached
If File.Exists(MyAppPath & "LOG.txt") Then
@@ -83,20 +72,20 @@ Public Module VECTO_Global
If logfDetail.Length / (2 ^ 20) > Cfg.LogSize Then
WriteToLog(MessageType.Normal, "Starting new logfile")
- LOGstream.Close()
+ _logStream.Close()
- BackUpError = False
+ backUpError = False
Try
If File.Exists(MyAppPath & "LOG_backup.txt") Then File.Delete(MyAppPath & "LOG_backup.txt")
File.Move(MyAppPath & "LOG.txt", MyAppPath & "LOG_backup.txt")
Catch ex As Exception
- BackUpError = True
+ backUpError = True
End Try
If Not StartLog() Then Return False
- If BackUpError Then
+ If backUpError Then
WriteToLog(MessageType.Err, "Failed to backup logfile! (" & MyAppPath & "LOG_backup.txt)")
Else
WriteToLog(MessageType.Normal, "Logfile restarted. Old log saved to LOG_backup.txt")
@@ -112,7 +101,7 @@ Public Module VECTO_Global
Public Function CloseLog() As Boolean
Try
WriteToLog(MessageType.Normal, "Closing Session " & Now)
- LOGstream.Close()
+ _logStream.Close()
Catch ex As Exception
Return False
End Try
@@ -121,20 +110,20 @@ Public Module VECTO_Global
End Function
- Public Function WriteToLog(MsgType As MessageType, Msg As String) As Boolean
- Dim MsgTypeStr As String
+ Public Function WriteToLog(msgType As MessageType, msg As String) As Boolean
+ Dim msgTypeStr As String
- Select Case MsgType
+ Select Case msgType
Case MessageType.Err
- MsgTypeStr = "Error"
+ msgTypeStr = "Error"
Case MessageType.Warn
- MsgTypeStr = "Warning"
+ msgTypeStr = "Warning"
Case Else
- MsgTypeStr = "-"
+ msgTypeStr = "-"
End Select
Try
- LOGstream.WriteLine(Now.ToString("yyyy/MM/dd-HH:mm:ss") & vbTab & MsgTypeStr & vbTab & Msg)
+ _logStream.WriteLine(Now.ToString("yyyy/MM/dd-HH:mm:ss") & vbTab & msgTypeStr & vbTab & msg)
Return True
Catch ex As Exception
Return False
@@ -145,9 +134,9 @@ Public Module VECTO_Global
#Region "File path functions"
'When no path is specified, then insert either HomeDir or MainDir Special-folders
- Public Function fFileRepl(file As String, Optional ByVal MainDir As String = "") As String
+ Public Function FileRepl(file As String, Optional ByVal mainDir As String = "") As String
- Dim ReplPath As String
+ Dim replPath As String
'Trim Path
file = Trim(file)
@@ -156,20 +145,20 @@ Public Module VECTO_Global
If file = "" Then Return ""
'Replace sKeys
- file = Replace(file, Constants.DefVehPath & "\", MyAppPath & "Default Vehicles\", 1, -1,
+ file = Replace(file, DefVehPath & "\", MyAppPath & "Default Vehicles\", 1, -1,
CompareMethod.Text)
- file = Replace(file, Constants.HomePath & "\", MyAppPath, 1, -1, CompareMethod.Text)
+ file = Replace(file, HomePath & "\", MyAppPath, 1, -1, CompareMethod.Text)
'Replace - Determine folder
- If MainDir = "" Then
- ReplPath = MyAppPath
+ If mainDir = "" Then
+ replPath = MyAppPath
Else
- ReplPath = MainDir
+ replPath = mainDir
End If
' "..\" => One folder-level up
- Do While ReplPath.Length > 0 AndAlso Left(file, 3) = "..\"
- ReplPath = fPathUp(ReplPath)
+ Do While replPath.Length > 0 AndAlso Left(file, 3) = "..\"
+ replPath = PathUp(replPath)
file = file.Substring(3)
Loop
@@ -177,7 +166,7 @@ Public Module VECTO_Global
'Supplement Path, if not available
If GetPath(file) = "" Then
- Return ReplPath & file
+ Return replPath & file
Else
Return file
@@ -185,16 +174,16 @@ Public Module VECTO_Global
End Function
'Path one-level-up "C:\temp\ordner1\" >> "C:\temp\"
- Private Function fPathUp(Pfad As String) As String
+ Private Function PathUp(pfad As String) As String
Dim x As Integer
- Pfad = Pfad.Substring(0, Pfad.Length - 1)
+ pfad = pfad.Substring(0, pfad.Length - 1)
- x = Pfad.LastIndexOf("\", StringComparison.Ordinal)
+ x = pfad.LastIndexOf("\", StringComparison.Ordinal)
If x = -1 Then Return ""
- Return Pfad.Substring(0, x + 1)
+ Return pfad.Substring(0, x + 1)
End Function
'File name without the path "C:\temp\TEST.txt" >> "TEST.txt" oder "TEST"
@@ -267,7 +256,28 @@ Module Constants
' ReSharper disable once ClassNeverInstantiated.Global
-
+
End Module
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/VECTO/VECTO_Types.vb b/VECTO/VECTO_Types.vb
index d95e991782..76140e455f 100644
--- a/VECTO/VECTO_Types.vb
+++ b/VECTO/VECTO_Types.vb
@@ -8,10 +8,8 @@
' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
'
' See the LICENSE.txt for the specific language governing permissions and limitations.
-Option Infer On
+'Option Infer On
-Imports System.Collections.Generic
-Imports System.Linq
''' <summary>
''' Determines how file extensions are set in the File Browser
diff --git a/VectoConsole/Properties/Version.cs b/VectoConsole/Properties/Version.cs
index ae81b564be..d73061c36d 100644
--- a/VectoConsole/Properties/Version.cs
+++ b/VectoConsole/Properties/Version.cs
@@ -30,5 +30,5 @@
*/
using System.Reflection;
-[assembly: AssemblyVersion("3.0.3.622")]
-[assembly: AssemblyFileVersion("3.0.3.622")]
+[assembly: AssemblyVersion("3.0.3.628")]
+[assembly: AssemblyFileVersion("3.0.3.628")]
diff --git a/VectoCore/VectoCore/Properties/Version.cs b/VectoCore/VectoCore/Properties/Version.cs
index 8ec84a2ba2..a075648383 100644
--- a/VectoCore/VectoCore/Properties/Version.cs
+++ b/VectoCore/VectoCore/Properties/Version.cs
@@ -30,5 +30,5 @@
*/
using System.Reflection;
-[assembly: AssemblyVersion("3.0.90.623")]
-[assembly: AssemblyFileVersion("3.0.90.623")]
+[assembly: AssemblyVersion("3.0.90.628")]
+[assembly: AssemblyFileVersion("3.0.90.628")]
--
GitLab