From 0244667890229cd6d4ae9828f29d86d0d8ddd3d0 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Fri, 2 Sep 2016 13:43:48 +0200
Subject: [PATCH] more cleanup: remove batch tab, remove developer options,
remove shutdown, remove cmdline args
---
VECTO/ApplicationEvents.vb | 18 +-
VECTO/Configuration.vb | 42 +-
VECTO/File Browser/FB_Dialog.vb | 7 -
VECTO/GUI/F_ENG.vb | 84 +-
VECTO/GUI/F_FileSign.vb | 93 ++-
VECTO/GUI/F_GBX.vb | 112 ++-
VECTO/GUI/F_Graph.vb | 92 +--
VECTO/GUI/F_Graph_ChEdit.vb | 2 -
VECTO/GUI/F_JIRA.vb | 17 +-
VECTO/GUI/F_MAINForm.Designer.vb | 827 +++++++-------------
VECTO/GUI/F_MAINForm.resx | 3 +
VECTO/GUI/F_MAINForm.vb | 996 +++++-------------------
VECTO/GUI/F_ShutDown.Designer.vb | 104 ---
VECTO/GUI/F_ShutDown.resx | 123 ---
VECTO/GUI/F_ShutDown.vb | 105 ---
VECTO/GUI/F_StrInpBox.designer.vb | 125 ---
VECTO/GUI/F_StrInpBox.resx | 120 ---
VECTO/GUI/F_StrInpBox.vb | 45 --
VECTO/GUI/F_VECTO.vb | 5 -
VECTO/GUI/F_VEH_AuxDlog.vb | 1 -
VECTO/GUI/GUI_Subs.vb | 75 +-
VECTO/GUI/GearboxGearDialog.vb | 1 -
VECTO/Input Files/cAdvancedAuxiliary.vb | 6 -
VECTO/Input Files/cENG.vb | 5 -
VECTO/Input Files/cFLD.vb | 17 -
VECTO/Input Files/cGBX.vb | 1 -
VECTO/Input Files/cVECTO.vb | 36 +-
VECTO/Input Files/cVEH.vb | 4 -
VECTO/M_MAIN.vb | 1 -
VECTO/VECTO.vbproj | 20 -
VECTO/VECTO.vbproj.user | 2 +-
VECTO/VECTO_Global.vb | 7 +-
VECTO/cDEV.vb | 533 -------------
VECTO/cJSONparser.vb | 5 -
34 files changed, 728 insertions(+), 2906 deletions(-)
delete mode 100644 VECTO/GUI/F_ShutDown.Designer.vb
delete mode 100644 VECTO/GUI/F_ShutDown.resx
delete mode 100644 VECTO/GUI/F_ShutDown.vb
delete mode 100644 VECTO/GUI/F_StrInpBox.designer.vb
delete mode 100644 VECTO/GUI/F_StrInpBox.resx
delete mode 100644 VECTO/GUI/F_StrInpBox.vb
delete mode 100644 VECTO/cDEV.vb
diff --git a/VECTO/ApplicationEvents.vb b/VECTO/ApplicationEvents.vb
index 92766cee5b..44992b90aa 100644
--- a/VECTO/ApplicationEvents.vb
+++ b/VECTO/ApplicationEvents.vb
@@ -10,8 +10,6 @@
' See the LICENSE.txt for the specific language governing permissions and limitations.
Imports System.Collections.Generic
-Imports TUGraz.VECTO.File_Browser
-
Namespace My
' The following events are available for MyApplication:
'
@@ -30,7 +28,7 @@ Namespace My
Dim file As cFile_V3
'Paths
- MyAppPath = My.Application.Info.DirectoryPath & "\"
+ MyAppPath = Application.Info.DirectoryPath & "\"
MyConfPath = MyAppPath & "Config\"
FB_FilHisDir = MyConfPath & "FileHistory\"
@@ -60,7 +58,7 @@ Namespace My
'Preconfigure Directories.txt
Try
- s = IO.Directory.GetParent(My.Application.Info.DirectoryPath).ToString & "\"
+ s = IO.Directory.GetParent(Application.Info.DirectoryPath).ToString & "\"
Catch ex As Exception
s = MyAppPath
End Try
@@ -85,12 +83,10 @@ Namespace My
End If
'Separator!
- SetCulture = False
- If System.Globalization.CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator <> "." Then
- SetCulture = True
+ If Globalization.CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator <> "." Then
Try
- System.Threading.Thread.CurrentThread.CurrentCulture = New System.Globalization.CultureInfo("en-US")
- System.Threading.Thread.CurrentThread.CurrentUICulture = New System.Globalization.CultureInfo("en-US")
+ Threading.Thread.CurrentThread.CurrentCulture = New Globalization.CultureInfo("en-US")
+ Threading.Thread.CurrentThread.CurrentUICulture = New Globalization.CultureInfo("en-US")
'MSGtoForm(8, "Set CurrentCulture to 'en-US'", True)
Catch ex As Exception
GUImsg(tMsgID.Err,
@@ -101,8 +97,8 @@ Namespace My
'Initialise Classes
sKey = New csKey
JobFileList = New List(Of String)
- JobCycleList = New List(Of String)
- DEV = New cDEV
+
+ 'DEV = New cDEV
Cfg = New Configuration _
'ACHTUNG: Configuration.New löst Configuration.SetDefault aus welches sKey benötigt dehalb muss sKey schon vorher initialisiert werden!!
diff --git a/VECTO/Configuration.vb b/VECTO/Configuration.vb
index b04bc1b74f..af972ae306 100644
--- a/VECTO/Configuration.vb
+++ b/VECTO/Configuration.vb
@@ -15,12 +15,12 @@ Imports TUGraz.VectoCore.Models.Declaration
Public Class Configuration
Public FilePath As String
Public GnUfromCycle As Boolean
- Public BatchMode As Boolean
+ 'Public BatchMode As Boolean
Public ModOut As Boolean
Public Mod1Hz As Boolean
- Public BATCHoutpath As String 'Output path for BATCH Mode
- Public BATCHoutSubD As Boolean
- Public DistCorr As Boolean
+ 'Public BATCHoutpath As String 'Output path for BATCH Mode
+ ' Public BATCHoutSubD As Boolean
+ 'Public DistCorr As Boolean
Public LogSize As Single
Public AirDensity As Single
Public OpenCmd As String
@@ -40,18 +40,18 @@ Public Class Configuration
AirDensity = DeclarationData.Physics.AirDensity.Value() ' cDeclaration.AirDensity
FuelDens = DeclarationData.Physics.FuelDensity.Value() ' cDeclaration.FuelDens
CO2perFC = DeclarationData.Physics.CO2PerFuelWeight ' cDeclaration.CO2perFC
- DistCorr = True
+ 'DistCorr = True
GnUfromCycle = False
End Sub
Public Sub SetDefault()
GnUfromCycle = True
- BatchMode = False
+ 'BatchMode = False
ModOut = True
Mod1Hz = False
- BATCHoutpath = sKey.JobPath
- BATCHoutSubD = False
- DistCorr = True
+ 'BATCHoutpath = sKey.JobPath
+ 'BATCHoutSubD = False
+ 'DistCorr = True
LogSize = 2
AirDensity = 1.2
OpenCmd = "notepad"
@@ -78,11 +78,11 @@ Public Class Configuration
Try
Dim fileVersion As Short = json.Content("Header")("FileVersion")
- If fileVersion < 2 Then
- BatchMode = (json.Content("Body")("LastMode") = 1)
- Else
- BatchMode = json.Content("Body")("LastModeBatch")
- End If
+ 'If fileVersion < 2 Then
+ ' BatchMode = (json.Content("Body")("LastMode") = 1)
+ 'Else
+ ' BatchMode = json.Content("Body")("LastModeBatch")
+ 'End If
Try
Mod1Hz = json.Content("Body")("Mod1Hz")
@@ -90,11 +90,11 @@ Public Class Configuration
End Try
ModOut = json.Content("Body")("ModOut")
- DistCorr = json.Content("Body")("DistCorrection")
+ 'DistCorr = json.Content("Body")("DistCorrection")
GnUfromCycle = json.Content("Body")("UseGnUfromCycle")
LogSize = json.Content("Body")("LogSize")
- BATCHoutpath = json.Content("Body")("BATCHoutpath")
- BATCHoutSubD = json.Content("Body")("BATCHoutSubD")
+ 'BATCHoutpath = json.Content("Body")("BATCHoutpath")
+ 'BATCHoutSubD = json.Content("Body")("BATCHoutSubD")
AirDensity = json.Content("Body")("AirDensity")
FuelDens = json.Content("Body")("FuelDensity")
CO2perFC = json.Content("Body")("CO2perFC")
@@ -119,14 +119,14 @@ Public Class Configuration
json.Content.Add("Header", dic)
dic = New Dictionary(Of String, Object)
- dic.Add("LastModeBatch", BatchMode)
+ 'dic.Add("LastModeBatch", BatchMode)
dic.Add("ModOut", ModOut)
dic.Add("Mod1Hz", Mod1Hz)
- dic.Add("DistCorrection", DistCorr)
+ 'dic.Add("DistCorrection", DistCorr)
dic.Add("UseGnUfromCycle", GnUfromCycle)
dic.Add("LogSize", LogSize)
- dic.Add("BATCHoutpath", BATCHoutpath)
- dic.Add("BATCHoutSubD", BATCHoutSubD)
+ 'dic.Add("BATCHoutpath", BATCHoutpath)
+ 'dic.Add("BATCHoutSubD", BATCHoutSubD)
dic.Add("AirDensity", AirDensity)
dic.Add("FuelDensity", FuelDens)
dic.Add("CO2perFC", CO2perFC)
diff --git a/VECTO/File Browser/FB_Dialog.vb b/VECTO/File Browser/FB_Dialog.vb
index 798443190f..56b8ff9bc6 100644
--- a/VECTO/File Browser/FB_Dialog.vb
+++ b/VECTO/File Browser/FB_Dialog.vb
@@ -14,7 +14,6 @@ Imports System.IO
Imports System.Text
Imports Microsoft.VisualBasic.FileIO
Imports System.Runtime.InteropServices
-Imports TUGraz.VECTO.File_Browser
''' <summary>
@@ -922,12 +921,6 @@ lb10:
End If
End Function
- Public ReadOnly Property Folder As String
- Get
- Return _myFolder
- End Get
- End Property
-
Public ReadOnly Property Files As String()
Get
Return _myFiles
diff --git a/VECTO/GUI/F_ENG.vb b/VECTO/GUI/F_ENG.vb
index 0b41113759..bdfd6154d6 100644
--- a/VECTO/GUI/F_ENG.vb
+++ b/VECTO/GUI/F_ENG.vb
@@ -39,8 +39,8 @@ Public Class F_ENG
'Initialise.
Private Sub F_ENG_Load(sender As Object, e As EventArgs) Handles Me.Load
- Me.PnInertia.Enabled = Not Cfg.DeclMode
- Me.GrWHTC.Enabled = Cfg.DeclMode
+ PnInertia.Enabled = Not Cfg.DeclMode
+ GrWHTC.Enabled = Cfg.DeclMode
Changed = False
@@ -52,9 +52,9 @@ Public Class F_ENG
If Not Cfg.DeclMode Then Exit Sub
- Me.TbInertia.Text =
+ TbInertia.Text =
CStr(
- DeclarationData.Engine.EngineInertia((fTextboxToNumString(Me.TbDispl.Text) / 1000.0).SI(Of CubicMeter),
+ DeclarationData.Engine.EngineInertia((fTextboxToNumString(TbDispl.Text) / 1000.0).SI(Of CubicMeter),
GearboxType.AMT).Value())
End Sub
@@ -107,7 +107,7 @@ Public Class F_ENG
Dim DefaultBrowserPath As String =
Regex.Match(BrowserRegistryString, "(\"".*?\"")").Captures(0).ToString
Process.Start(DefaultBrowserPath,
- String.Format("""{0}{1}""", MyAppPath, "User Manual\help.html#engine-editor"))
+ String.Format("""{0}{1}""", MyAppPath, "User Manual\help.html#engine-editor"))
Else
MsgBox("User Manual not found!", MsgBoxStyle.Critical)
End If
@@ -120,23 +120,21 @@ Public Class F_ENG
If ChangeCheckCancel() Then Exit Sub
- Me.TbName.Text = ""
- Me.TbDispl.Text = ""
- Me.TbInertia.Text = ""
- Me.TbNleerl.Text = ""
- Me.TbMAP.Text = ""
- Me.TbFLD.Text = ""
- Me.TbWHTCurban.Text = ""
- Me.TbWHTCrural.Text = ""
- Me.TbWHTCmw.Text = ""
-
+ TbName.Text = ""
+ TbDispl.Text = ""
+ TbInertia.Text = ""
+ TbNleerl.Text = ""
+ TbMAP.Text = ""
+ TbFLD.Text = ""
+ TbWHTCurban.Text = ""
+ TbWHTCrural.Text = ""
+ TbWHTCmw.Text = ""
DeclInit()
-
EngFile = ""
- Me.Text = "ENG Editor"
- Me.LbStatus.Text = ""
+ Text = "ENG Editor"
+ LbStatus.Text = ""
Changed = False
@@ -161,7 +159,7 @@ Public Class F_ENG
If Cfg.DeclMode <> ENG0.SavedInDeclMode Then
Select Case WrongMode()
Case 1
- Me.Close()
+ Close()
F_MAINForm.RbDecl.Checked = Not F_MAINForm.RbDecl.Checked
F_MAINForm.OpenVectoFile(file)
Case -1
@@ -171,26 +169,24 @@ Public Class F_ENG
End Select
End If
- Me.TbName.Text = ENG0.ModelName
- Me.TbDispl.Text = ENG0.Displ.ToString
- Me.TbInertia.Text = ENG0.I_mot.ToString
- Me.TbNleerl.Text = ENG0.Nidle.ToString
-
- Me.TbMAP.Text = ENG0.PathMAP(True)
- Me.TbFLD.Text = ENG0.PathFLD(True)
- Me.TbWHTCurban.Text = ENG0.WHTCurban
- Me.TbWHTCrural.Text = ENG0.WHTCrural
- Me.TbWHTCmw.Text = ENG0.WHTCmw
+ TbName.Text = ENG0.ModelName
+ TbDispl.Text = ENG0.Displ.ToString
+ TbInertia.Text = ENG0.I_mot.ToString
+ TbNleerl.Text = ENG0.Nidle.ToString
+ TbMAP.Text = ENG0.PathMAP(True)
+ TbFLD.Text = ENG0.PathFLD(True)
+ TbWHTCurban.Text = ENG0.WHTCurban
+ TbWHTCrural.Text = ENG0.WHTCrural
+ TbWHTCmw.Text = ENG0.WHTCmw
DeclInit()
-
fbENG.UpdateHistory(file)
- Me.Text = fFILE(file, True)
- Me.LbStatus.Text = ""
+ Text = fFILE(file, True)
+ LbStatus.Text = ""
EngFile = file
- Me.Activate()
+ Activate()
Changed = False
UpdatePic()
@@ -215,19 +211,19 @@ Public Class F_ENG
ENG0 = New cENG
ENG0.FilePath = file
- ENG0.ModelName = Me.TbName.Text
+ ENG0.ModelName = TbName.Text
If Trim(ENG0.ModelName) = "" Then ENG0.ModelName = "Undefined"
- ENG0.Displ = CSng(fTextboxToNumString(Me.TbDispl.Text))
- ENG0.I_mot = CSng(fTextboxToNumString(Me.TbInertia.Text))
- ENG0.Nidle = CSng(fTextboxToNumString(Me.TbNleerl.Text))
+ ENG0.Displ = CSng(fTextboxToNumString(TbDispl.Text))
+ ENG0.I_mot = CSng(fTextboxToNumString(TbInertia.Text))
+ ENG0.Nidle = CSng(fTextboxToNumString(TbNleerl.Text))
- ENG0.PathFLD = Me.TbFLD.Text
- ENG0.PathMAP = Me.TbMAP.Text
+ ENG0.PathFLD = TbFLD.Text
+ ENG0.PathMAP = TbMAP.Text
- ENG0.WHTCurban = CSng(fTextboxToNumString(Me.TbWHTCurban.Text))
- ENG0.WHTCrural = CSng(fTextboxToNumString(Me.TbWHTCrural.Text))
- ENG0.WHTCmw = CSng(fTextboxToNumString(Me.TbWHTCmw.Text))
+ ENG0.WHTCurban = CSng(fTextboxToNumString(TbWHTCurban.Text))
+ ENG0.WHTCrural = CSng(fTextboxToNumString(TbWHTCrural.Text))
+ ENG0.WHTCmw = CSng(fTextboxToNumString(TbWHTCmw.Text))
If Not ENG0.SaveFile Then
@@ -243,8 +239,8 @@ Public Class F_ENG
End If
fbENG.UpdateHistory(file)
- Me.Text = fFILE(file, True)
- Me.LbStatus.Text = ""
+ Text = fFILE(file, True)
+ LbStatus.Text = ""
Changed = False
diff --git a/VECTO/GUI/F_FileSign.vb b/VECTO/GUI/F_FileSign.vb
index 791ddac4d7..1ff0ae35ab 100644
--- a/VECTO/GUI/F_FileSign.vb
+++ b/VECTO/GUI/F_FileSign.vb
@@ -10,7 +10,6 @@
' See the LICENSE.txt for the specific language governing permissions and limitations.
Imports System.IO
Imports System.Windows.Forms
-Imports TUGraz.VECTO.File_Browser
Imports vectolic
''' <summary>
@@ -23,51 +22,51 @@ Public Class F_FileSign
Dim lv0 As ListViewItem
Dim MainDir As String
- If Me.lvFiles.Items.Count = 0 Then
+ If lvFiles.Items.Count = 0 Then
MsgBox("No files selected!", MsgBoxStyle.Critical)
Exit Sub
End If
- If Trim(Me.TbSigFile.Text) = "" Then
+ If Trim(TbSigFile.Text) = "" Then
MsgBox("No signature file path defined!", MsgBoxStyle.Critical)
Exit Sub
End If
- If File.Exists(Me.TbSigFile.Text) Then
+ If File.Exists(TbSigFile.Text) Then
If MsgBox("Overwrite existing signature file?", MsgBoxStyle.YesNo) = MsgBoxResult.No Then Exit Sub
End If
ClearForm(False)
- MainDir = fPATH(Me.TbSigFile.Text)
+ MainDir = fPATH(TbSigFile.Text)
Lic.FileSigning.NewFile()
Lic.FileSigning.Mode = cFileSigning.tMode.Manual
- For Each lv0 In Me.lvFiles.Items
+ For Each lv0 In lvFiles.Items
Lic.FileSigning.AddFile(fFileRepl(lv0.SubItems(0).Text, MainDir))
lv0.SubItems(1).Text = ""
lv0.ForeColor = Color.Black
Next
- If Lic.FileSigning.WriteSigFile(Me.TbSigFile.Text, LicSigAppCode) Then
- Me.LbStatus.Text = "Signature file created successfully"
- Me.LbStatus.ForeColor = Color.DarkGreen
+ If Lic.FileSigning.WriteSigFile(TbSigFile.Text, LicSigAppCode) Then
+ LbStatus.Text = "Signature file created successfully"
+ LbStatus.ForeColor = Color.DarkGreen
Else
- Me.LbStatus.Text = "Fail to create signature file! " & Lic.FileSigning.ErrorMsg
- Me.LbStatus.ForeColor = Color.Red
+ LbStatus.Text = "Fail to create signature file! " & Lic.FileSigning.ErrorMsg
+ LbStatus.ForeColor = Color.Red
End If
- Me.TbLicStr.Text = Lic.FileSigning.CreatorLicStr
- Me.TbPubKey.Text = Lic.FileSigning.PubKey
- Me.LbMode.Text = Lic.FileSigning.ModeConv(Lic.FileSigning.Mode)
- Me.LbDateStr.Text = Lic.FileSigning.DateStr
+ TbLicStr.Text = Lic.FileSigning.CreatorLicStr
+ TbPubKey.Text = Lic.FileSigning.PubKey
+ LbMode.Text = Lic.FileSigning.ModeConv(Lic.FileSigning.Mode)
+ LbDateStr.Text = Lic.FileSigning.DateStr
If Lic.FileSigning.FilesOK.Count > 0 Then
- For Each lv0 In Me.lvFiles.Items
+ For Each lv0 In lvFiles.Items
lv0.SubItems(1).Text = Lic.FileSigning.FilesMsg(lv0.Index)
If Lic.FileSigning.FilesOK(lv0.Index) Then
lv0.ForeColor = Color.DarkGreen
@@ -84,30 +83,30 @@ Public Class F_FileSign
Dim lv0 As ListViewItem
Dim i As Integer
- If Not File.Exists(Me.TbSigFile.Text) Then
+ If Not File.Exists(TbSigFile.Text) Then
MsgBox("Signature file not found!", MsgBoxStyle.Critical)
Exit Sub
End If
ClearForm(True)
- If Lic.FileSigning.ReadSigFile(Me.TbSigFile.Text, LicSigAppCode) Then
- Me.LbStatus.Text = "File signature verified"
- Me.LbStatus.ForeColor = Color.DarkGreen
+ If Lic.FileSigning.ReadSigFile(TbSigFile.Text, LicSigAppCode) Then
+ LbStatus.Text = "File signature verified"
+ LbStatus.ForeColor = Color.DarkGreen
Else
- Me.LbStatus.Text = "ERROR! " & Lic.FileSigning.ErrorMsg
- Me.LbStatus.ForeColor = Color.Red
+ LbStatus.Text = "ERROR! " & Lic.FileSigning.ErrorMsg
+ LbStatus.ForeColor = Color.Red
End If
- Me.TbLicStr.Text = Lic.FileSigning.CreatorLicStr
- Me.TbPubKey.Text = Lic.FileSigning.PubKey
- Me.LbMode.Text = Lic.FileSigning.ModeConv(Lic.FileSigning.Mode)
+ TbLicStr.Text = Lic.FileSigning.CreatorLicStr
+ TbPubKey.Text = Lic.FileSigning.PubKey
+ LbMode.Text = Lic.FileSigning.ModeConv(Lic.FileSigning.Mode)
If Lic.FileSigning.Mode = cFileSigning.tMode.Auto Then
- Me.LbMode.ForeColor = Color.DarkGreen
+ LbMode.ForeColor = Color.DarkGreen
Else
- Me.LbMode.ForeColor = Color.Red
+ LbMode.ForeColor = Color.Red
End If
- Me.LbDateStr.Text = Lic.FileSigning.DateStr
+ LbDateStr.Text = Lic.FileSigning.DateStr
For i = 0 To Lic.FileSigning.FilesOK.Count - 1
lv0 = New ListViewItem(Lic.FileSigning.Files(i))
@@ -124,15 +123,15 @@ Public Class F_FileSign
'Clear form
Private Sub ClearForm(ByVal ClearFileList As Boolean)
If ClearFileList Then lvFiles.Items.Clear()
- Me.TbLicStr.Text = ""
- Me.TbPubKey.Text = ""
- Me.LbMode.Text = ""
- Me.LbDateStr.Text = ""
- Me.LbStatus.Text = ""
- Me.LbMode.ForeColor = DefaultForeColor
- Me.LbMode.BackColor = DefaultBackColor
- Me.LbStatus.ForeColor = DefaultForeColor
- Me.LbStatus.BackColor = DefaultBackColor
+ TbLicStr.Text = ""
+ TbPubKey.Text = ""
+ LbMode.Text = ""
+ LbDateStr.Text = ""
+ LbStatus.Text = ""
+ LbMode.ForeColor = DefaultForeColor
+ LbMode.BackColor = DefaultBackColor
+ LbStatus.ForeColor = DefaultForeColor
+ LbStatus.BackColor = DefaultBackColor
End Sub
@@ -194,10 +193,10 @@ Public Class F_FileSign
lvi.SubItems.Add("")
lvi.ForeColor = Color.Black
- Me.lvFiles.Items.Add(lvi)
+ lvFiles.Items.Add(lvi)
lvi.EnsureVisible()
- Me.lvFiles.Focus()
+ lvFiles.Focus()
Next
@@ -208,19 +207,19 @@ Public Class F_FileSign
Private Sub RemoveFile()
Dim i0 As Int16
- If Me.lvFiles.Items.Count = 0 Then Exit Sub
+ If lvFiles.Items.Count = 0 Then Exit Sub
- If Me.lvFiles.SelectedItems.Count = 0 Then Me.lvFiles.Items(Me.lvFiles.Items.Count - 1).Selected = True
+ If lvFiles.SelectedItems.Count = 0 Then lvFiles.Items(lvFiles.Items.Count - 1).Selected = True
- i0 = Me.lvFiles.SelectedItems(0).Index
+ i0 = lvFiles.SelectedItems(0).Index
- Me.lvFiles.SelectedItems(0).Remove()
+ lvFiles.SelectedItems(0).Remove()
- If i0 < Me.lvFiles.Items.Count Then
- Me.lvFiles.Items(i0).Selected = True
- Me.lvFiles.Items(i0).EnsureVisible()
+ If i0 < lvFiles.Items.Count Then
+ lvFiles.Items(i0).Selected = True
+ lvFiles.Items(i0).EnsureVisible()
End If
- Me.lvFiles.Focus()
+ lvFiles.Focus()
End Sub
End Class
diff --git a/VECTO/GUI/F_GBX.vb b/VECTO/GUI/F_GBX.vb
index e244940c19..32fde22de6 100644
--- a/VECTO/GUI/F_GBX.vb
+++ b/VECTO/GUI/F_GBX.vb
@@ -23,7 +23,6 @@ Imports TUGraz.VectoCore.Configuration
Imports TUGraz.VectoCore.InputData.Impl
Imports TUGraz.VectoCore.Models.Declaration
Imports TUGraz.VectoCore.Models.SimulationComponent.Data
-Imports TUGraz.VectoCore.Models.SimulationComponent.Data.Engine
Imports TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox
''' <summary>
@@ -62,11 +61,11 @@ Public Class F_GBX
Init = False
GearDia = New GearboxGearDialog
- Me.PnInertiaTI.Enabled = Not Cfg.DeclMode
- Me.GrGearShift.Enabled = Not Cfg.DeclMode
- Me.ChTCon.Enabled = Not Cfg.DeclMode
+ PnInertiaTI.Enabled = Not Cfg.DeclMode
+ GrGearShift.Enabled = Not Cfg.DeclMode
+ ChTCon.Enabled = Not Cfg.DeclMode
- Me.CbGStype.Items.Clear()
+ CbGStype.Items.Clear()
CbGStype.ValueMember = "Value"
CbGStype.DisplayMember = "Label"
@@ -97,23 +96,23 @@ Public Class F_GBX
If Not Cfg.DeclMode Then Exit Sub
- Me.TBI_getr.Text = DeclarationData.Gearbox.Inertia.Value() 'cDeclaration.GbInertia
+ TBI_getr.Text = DeclarationData.Gearbox.Inertia.Value() 'cDeclaration.GbInertia
GStype = CbGStype.SelectedValue 'CType(Me.CbGStype.SelectedIndex, tGearbox)
- Me.TbTracInt.Text = GStype.TractionInterruption().Value()
- Me.TbShiftTime.Text = DeclarationData.Gearbox.MinTimeBetweenGearshifts.Value() 'cDeclaration.ShiftTime(GStype)
+ TbTracInt.Text = GStype.TractionInterruption().Value()
+ TbShiftTime.Text = DeclarationData.Gearbox.MinTimeBetweenGearshifts.Value() 'cDeclaration.ShiftTime(GStype)
- Me.TbTqResv.Text = DeclarationData.Gearbox.TorqueReserve ' cDeclaration.TqResv
- Me.TbTqResvStart.Text = DeclarationData.Gearbox.TorqueReserveStart 'cDeclaration.TqResvStart
- Me.TbStartSpeed.Text = DeclarationData.Gearbox.StartSpeed.Value() 'cDeclaration.StartSpeed
- Me.TbStartAcc.Text = DeclarationData.Gearbox.StartAcceleration.Value() ' cDeclaration.StartAcc
+ TbTqResv.Text = DeclarationData.Gearbox.TorqueReserve ' cDeclaration.TqResv
+ TbTqResvStart.Text = DeclarationData.Gearbox.TorqueReserveStart 'cDeclaration.TqResvStart
+ TbStartSpeed.Text = DeclarationData.Gearbox.StartSpeed.Value() 'cDeclaration.StartSpeed
+ TbStartAcc.Text = DeclarationData.Gearbox.StartAcceleration.Value() ' cDeclaration.StartAcc
tbUpshiftMinAcceleration.Text = DeclarationData.Gearbox.UpshiftMinAcceleration.Value()
tbDownshiftAfterUpshift.Text = DeclarationData.Gearbox.DownshiftAfterUpshiftDelay.Value()
tbUpshiftAfterDownshift.Text = DeclarationData.Gearbox.UpshiftAfterDownshiftDelay.Value()
- For Each lv0 In Me.LvGears.Items
+ For Each lv0 In LvGears.Items
lv0.SubItems(GearboxTbl.ShiftPolygons).Text = "-"
Next
End Sub
@@ -167,7 +166,7 @@ Public Class F_GBX
Dim DefaultBrowserPath As String =
Regex.Match(BrowserRegistryString, "(\"".*?\"")").Captures(0).ToString
Process.Start(DefaultBrowserPath,
- String.Format("""{0}{1}""", MyAppPath, "User Manual\help.html#gearbox-editor"))
+ String.Format("""{0}{1}""", MyAppPath, "User Manual\help.html#gearbox-editor"))
Else
MsgBox("User Manual not found!", MsgBoxStyle.Critical)
End If
@@ -181,34 +180,34 @@ Public Class F_GBX
If ChangeCheckCancel() Then Exit Sub
- Me.CbGStype.SelectedIndex = 0
+ CbGStype.SelectedIndex = 0
- Me.TbName.Text = ""
- Me.TbTracInt.Text = ""
- Me.TBI_getr.Text = ""
+ TbName.Text = ""
+ TbTracInt.Text = ""
+ TBI_getr.Text = ""
- Me.LvGears.Items.Clear()
+ LvGears.Items.Clear()
- Me.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
- Me.TbTqResv.Text = ""
- Me.TbShiftTime.Text = ""
- Me.TbTqResvStart.Text = ""
- Me.TbStartSpeed.Text = ""
- Me.TbStartAcc.Text = ""
+ TbTqResv.Text = ""
+ TbShiftTime.Text = ""
+ TbTqResvStart.Text = ""
+ TbStartSpeed.Text = ""
+ TbStartAcc.Text = ""
'Me.ChTCon.Checked = False 'set by CbGStype.SelectedIndexChanged
- Me.TbTCfile.Text = ""
- Me.TbTCrefrpm.Text = ""
- Me.TbTCinertia.Text = ""
+ TbTCfile.Text = ""
+ TbTCrefrpm.Text = ""
+ TbTCinertia.Text = ""
DeclInit()
GbxFile = ""
- Me.Text = "GBX Editor"
- Me.LbStatus.Text = ""
+ Text = "GBX Editor"
+ LbStatus.Text = ""
Changed = False
UpdatePic()
@@ -244,39 +243,39 @@ Public Class F_GBX
End Select
End If
- Me.TbName.Text = GBX0.ModelName
- Me.TbTracInt.Text = GBX0.TracIntrSi.ToString
- Me.TBI_getr.Text = GBX0.GbxInertia.ToString
+ TbName.Text = GBX0.ModelName
+ TbTracInt.Text = GBX0.TracIntrSi.ToString
+ TBI_getr.Text = GBX0.GbxInertia.ToString
- Me.ChTCon.Checked = GBX0.TCon
+ ChTCon.Checked = GBX0.TCon
- Me.LvGears.Items.Clear()
+ LvGears.Items.Clear()
For i = 0 To GBX0.Igetr.Count - 1
If i = 0 Then
'lv0 = New ListViewItem("Axle")
- Me.LvGears.Items.Add(CreateListviewItem("Axle", "-", GBX0.Igetr(i), GBX0.GetrMap(i, True), GBX0.gsFile(i, True),
- GBX0.MaxTorque(i)))
+ LvGears.Items.Add(CreateListviewItem("Axle", "-", GBX0.Igetr(i), GBX0.GetrMap(i, True), GBX0.gsFile(i, True),
+ GBX0.MaxTorque(i)))
Else
'lv0 = New ListViewItem(i.ToString("00"))
- Me.LvGears.Items.Add(CreateListviewItem(i.ToString("00"), "-", GBX0.Igetr(i), GBX0.GetrMap(i, True),
- GBX0.gsFile(i, True), GBX0.MaxTorque(i)))
+ LvGears.Items.Add(CreateListviewItem(i.ToString("00"), "-", GBX0.Igetr(i), GBX0.GetrMap(i, True),
+ GBX0.gsFile(i, True), GBX0.MaxTorque(i)))
End If
Next
- Me.ChSkipGears.Checked = GBX0.gs_SkipGears
- Me.TbTqResv.Text = GBX0.gs_TorqueResv.ToString
- Me.TbShiftTime.Text = GBX0.gs_ShiftTime.ToString
- Me.TbTqResvStart.Text = GBX0.gs_TorqueResvStart.ToString
- Me.TbStartSpeed.Text = GBX0.gs_StartSpeed.ToString
- Me.TbStartAcc.Text = GBX0.gs_StartAcc.ToString
- Me.ChShiftInside.Checked = GBX0.gs_ShiftInside
-
- Me.TbTCfile.Text = GBX0.TCfile(True)
- Me.TbTCrefrpm.Text = GBX0.TCrefrpm
- Me.TbTCinertia.Text = GBX0.TCinertia
+ ChSkipGears.Checked = GBX0.gs_SkipGears
+ TbTqResv.Text = GBX0.gs_TorqueResv.ToString
+ TbShiftTime.Text = GBX0.gs_ShiftTime.ToString
+ TbTqResvStart.Text = GBX0.gs_TorqueResvStart.ToString
+ TbStartSpeed.Text = GBX0.gs_StartSpeed.ToString
+ TbStartAcc.Text = GBX0.gs_StartAcc.ToString
+ ChShiftInside.Checked = GBX0.gs_ShiftInside
+
+ TbTCfile.Text = GBX0.TCfile(True)
+ TbTCrefrpm.Text = GBX0.TCrefrpm
+ TbTCinertia.Text = GBX0.TCinertia
TBTCShiftPolygon.Text = GBX0.TCshiftFile
tbUpshiftMinAcceleration.Text = GBX0.UpshiftMinAcceleration
@@ -294,10 +293,10 @@ Public Class F_GBX
fbGBX.UpdateHistory(file)
- Me.Text = fFILE(file, True)
- Me.LbStatus.Text = ""
+ Text = fFILE(file, True)
+ LbStatus.Text = ""
GbxFile = file
- Me.Activate()
+ Activate()
Changed = False
UpdatePic()
@@ -385,8 +384,8 @@ Public Class F_GBX
End If
fbGBX.UpdateHistory(file)
- Me.Text = fFILE(file, True)
- Me.LbStatus.Text = ""
+ Text = fFILE(file, True)
+ LbStatus.Text = ""
Changed = False
@@ -398,7 +397,7 @@ Public Class F_GBX
'Change Status ändern |@@| Change Status change
Private Sub Change()
If Not Changed Then
- Me.LbStatus.Text = "Unsaved changes in current file"
+ LbStatus.Text = "Unsaved changes in current file"
Changed = True
End If
End Sub
@@ -908,7 +907,6 @@ Public Class F_GBX
End Sub
-
Private Function ConvertToGears(gbx As ListView.ListViewItemCollection) As IList(Of ITransmissionInputData)
Dim retVal As List(Of ITransmissionInputData) = New List(Of ITransmissionInputData)
Dim value As Double
diff --git a/VECTO/GUI/F_Graph.vb b/VECTO/GUI/F_Graph.vb
index f1143fb423..18500f7667 100644
--- a/VECTO/GUI/F_Graph.vb
+++ b/VECTO/GUI/F_Graph.vb
@@ -38,7 +38,7 @@ Public Class F_Graph
Clear()
- Me.CbXaxis.SelectedIndex = 0
+ CbXaxis.SelectedIndex = 0
End Sub
Private Sub ToolStripBtOpen_Click(sender As Object, e As EventArgs) Handles ToolStripBtOpen.Click
@@ -72,7 +72,7 @@ Public Class F_Graph
lv0.SubItems.Add("Left")
lv0.Tag = i
lv0.Checked = True
- Me.ListView1.Items.Add(lv0)
+ ListView1.Items.Add(lv0)
End If
i += 1
Next
@@ -132,10 +132,10 @@ Public Class F_Graph
SetxMax0()
- Me.TbXmin.Text = 0
- Me.TbXmax.Text = xMax0
+ TbXmin.Text = 0
+ TbXmax.Text = xMax0
- Me.Text = fFILE(Filepath, True)
+ Text = fFILE(Filepath, True)
Catch ex As Exception
file.Close()
@@ -151,7 +151,7 @@ Public Class F_Graph
If Channels.Count = 0 Then Exit Sub
- If Me.CbXaxis.SelectedIndex = 0 Then
+ If CbXaxis.SelectedIndex = 0 Then
xMax0 = DistList(DistList.Count - 1)
Else
xMax0 = TimeList(TimeList.Count - 1)
@@ -171,26 +171,26 @@ Public Class F_Graph
Dim i As Integer
Dim img As Image
- If Me.WindowState = FormWindowState.Minimized Then Exit Sub
+ If WindowState = FormWindowState.Minimized Then Exit Sub
- If Me.ListView1.CheckedItems.Count = 0 Then
- Me.PictureBox1.Image = Nothing
+ If ListView1.CheckedItems.Count = 0 Then
+ PictureBox1.Image = Nothing
Exit Sub
End If
- OverDist = (Me.CbXaxis.SelectedIndex = 0)
+ OverDist = (CbXaxis.SelectedIndex = 0)
SetxMax0()
MyChart = New Chart
- MyChart.Width = Me.PictureBox1.Width
- MyChart.Height = Me.PictureBox1.Height
+ MyChart.Width = PictureBox1.Width
+ MyChart.Height = PictureBox1.Height
a = New ChartArea
- For Each lv0 In Me.ListView1.CheckedItems
+ For Each lv0 In ListView1.CheckedItems
IsLeft = (lv0.SubItems(1).Text = "Left")
@@ -296,9 +296,9 @@ Public Class F_Graph
MyChart.Update()
img = New Bitmap(MyChart.Width, MyChart.Height, PixelFormat.Format32bppArgb)
- MyChart.DrawToBitmap(img, New Rectangle(0, 0, Me.PictureBox1.Width, Me.PictureBox1.Height))
+ MyChart.DrawToBitmap(img, New Rectangle(0, 0, PictureBox1.Width, PictureBox1.Height))
- Me.PictureBox1.Image = img
+ PictureBox1.Image = img
End Sub
Private Function xAutoInt() As Single
@@ -342,12 +342,12 @@ Public Class F_Graph
Filepath = ""
- Me.ListView1.Items.Clear()
+ ListView1.Items.Clear()
- Me.TbXmin.Text = ""
- Me.TbXmax.Text = ""
+ TbXmin.Text = ""
+ TbXmax.Text = ""
- Me.PictureBox1.Image = Nothing
+ PictureBox1.Image = Nothing
End Sub
Private Class cChannel
@@ -382,7 +382,7 @@ Public Class F_Graph
lv0.SubItems.Add("Right")
End If
- Me.ListView1.Items.Add(lv0)
+ ListView1.Items.Add(lv0)
UpdateGraph()
@@ -394,9 +394,9 @@ Public Class F_Graph
Dim i As Integer
Dim lv0 As ListViewItem
- If Me.ListView1.SelectedItems.Count = 0 Or Channels.Count = 0 Then Exit Sub
+ If ListView1.SelectedItems.Count = 0 Or Channels.Count = 0 Then Exit Sub
- lv0 = Me.ListView1.SelectedItems(0)
+ lv0 = ListView1.SelectedItems(0)
For i = 0 To Channels.Count - 1
dlog.ComboBox1.Items.Add(Channels(i).Name)
@@ -429,25 +429,25 @@ Public Class F_Graph
Private Sub RemoveChannel()
Dim i0 As Int16
- If Me.ListView1.Items.Count = 0 Then Exit Sub
+ If ListView1.Items.Count = 0 Then Exit Sub
- If Me.ListView1.SelectedItems.Count = 0 Then Me.ListView1.Items(Me.ListView1.Items.Count - 1).Selected = True
+ If ListView1.SelectedItems.Count = 0 Then ListView1.Items(ListView1.Items.Count - 1).Selected = True
- i0 = Me.ListView1.SelectedItems(0).Index
+ i0 = ListView1.SelectedItems(0).Index
- Me.ListView1.SelectedItems(0).Remove()
+ ListView1.SelectedItems(0).Remove()
- If i0 < Me.ListView1.Items.Count Then
- Me.ListView1.Items(i0).Selected = True
- Me.ListView1.Items(i0).EnsureVisible()
+ If i0 < ListView1.Items.Count Then
+ ListView1.Items(i0).Selected = True
+ ListView1.Items(i0).EnsureVisible()
End If
UpdateGraph()
End Sub
Private Sub ListView1_DoubleClick(sender As Object, e As EventArgs) Handles ListView1.DoubleClick
- If Me.ListView1.SelectedItems.Count > 0 Then
- Me.ListView1.SelectedItems(0).Checked = Not Me.ListView1.SelectedItems(0).Checked
+ If ListView1.SelectedItems.Count > 0 Then
+ ListView1.SelectedItems(0).Checked = Not ListView1.SelectedItems(0).Checked
EditChannel()
End If
End Sub
@@ -473,25 +473,25 @@ Public Class F_Graph
Private Sub CbXaxis_SelectedIndexChanged(sender As Object, e As EventArgs) _
Handles CbXaxis.SelectedIndexChanged
SetxMax0()
- Me.TbXmin.Text = 0
- Me.TbXmax.Text = xMax0
+ TbXmin.Text = 0
+ TbXmax.Text = xMax0
UpdateGraph()
End Sub
Private Sub BtReset_Click(sender As Object, e As EventArgs) Handles BtReset.Click
xMin = 0
xMax = xMax0
- Me.TbXmin.Text = 0
- Me.TbXmax.Text = xMax0
+ TbXmin.Text = 0
+ TbXmax.Text = xMax0
End Sub
Private Sub TbXmin_TextChanged(sender As Object, e As EventArgs) Handles TbXmin.TextChanged
- If IsNumeric(Me.TbXmin.Text) Then xMin = Me.TbXmin.Text
+ If IsNumeric(TbXmin.Text) Then xMin = TbXmin.Text
UpdateGraph()
End Sub
Private Sub TbXmax_TextChanged(sender As Object, e As EventArgs) Handles TbXmax.TextChanged
- If IsNumeric(Me.TbXmax.Text) Then xMax = Me.TbXmax.Text
+ If IsNumeric(TbXmax.Text) Then xMax = TbXmax.Text
UpdateGraph()
End Sub
@@ -518,8 +518,8 @@ Public Class F_Graph
xMin = Math.Round(xMin, 0)
End If
- Me.TbXmin.Text = xMin
- Me.TbXmax.Text = xMax
+ TbXmin.Text = xMin
+ TbXmax.Text = xMax
End Sub
Private Sub BtZoomOut_Click(sender As Object, e As EventArgs) Handles BtZoomOut.Click
@@ -536,8 +536,8 @@ Public Class F_Graph
xMin = Math.Round(xMin, 0)
End If
- Me.TbXmin.Text = xMin
- Me.TbXmax.Text = xMax
+ TbXmin.Text = xMin
+ TbXmax.Text = xMax
End Sub
Private Sub BtMoveL_Click(sender As Object, e As EventArgs) Handles BtMoveL.Click
@@ -555,8 +555,8 @@ Public Class F_Graph
xMin = Math.Round(xMin, 0)
End If
- Me.TbXmin.Text = xMin
- Me.TbXmax.Text = xMax
+ TbXmin.Text = xMin
+ TbXmax.Text = xMax
End Sub
Private Sub BtMoveR_Click(sender As Object, e As EventArgs) Handles BtMoveR.Click
@@ -574,8 +574,8 @@ Public Class F_Graph
xMin = Math.Round(xMin, 0)
End If
- Me.TbXmin.Text = xMin
- Me.TbXmax.Text = xMax
+ TbXmin.Text = xMin
+ TbXmax.Text = xMax
End Sub
Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click
@@ -585,7 +585,7 @@ Public Class F_Graph
Dim DefaultBrowserPath As String =
Regex.Match(BrowserRegistryString, "(\"".*?\"")").Captures(0).ToString
Process.Start(DefaultBrowserPath,
- String.Format("""{0}{1}""", MyAppPath, "User Manual\help.html#graph-window"))
+ String.Format("""{0}{1}""", MyAppPath, "User Manual\help.html#graph-window"))
Else
MsgBox("User Manual not found!", MsgBoxStyle.Critical)
End If
diff --git a/VECTO/GUI/F_Graph_ChEdit.vb b/VECTO/GUI/F_Graph_ChEdit.vb
index 5c4de58090..a1b32d8728 100644
--- a/VECTO/GUI/F_Graph_ChEdit.vb
+++ b/VECTO/GUI/F_Graph_ChEdit.vb
@@ -11,7 +11,6 @@
Public Class F_Graph_ChEdit
-
Private Sub OK_Button_Click(ByVal sender As Object, ByVal e As EventArgs) Handles OK_Button.Click
Me.DialogResult = DialogResult.OK
Me.Close()
@@ -21,5 +20,4 @@ Public Class F_Graph_ChEdit
Me.DialogResult = DialogResult.Cancel
Me.Close()
End Sub
-
End Class
diff --git a/VECTO/GUI/F_JIRA.vb b/VECTO/GUI/F_JIRA.vb
index c3ff5c58d0..43157fae55 100644
--- a/VECTO/GUI/F_JIRA.vb
+++ b/VECTO/GUI/F_JIRA.vb
@@ -2,10 +2,9 @@
Imports System.Windows.Forms
Public Class F_JIRA
-
Private Sub OK_Button_Click(ByVal sender As Object, ByVal e As EventArgs) Handles OK_Button.Click
- Me.DialogResult = DialogResult.OK
- Me.Close()
+ DialogResult = DialogResult.OK
+ Close()
End Sub
Private Sub LinkLabel1_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel1.LinkClicked
@@ -19,18 +18,16 @@ Public Class F_JIRA
Private Sub LinkLabel3_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel3.LinkClicked
Dim bodytext As String
- bodytext = "Please provide the following information:" & "%0A" & _
- "- Email" & "%0A" & _
- "- Name, Surname" & "%0A" & _
- "- Country of workplace" & "%0A" & _
- "- Position"
+ bodytext = "Please provide the following information:" & "%0A" &
+ "- Email" & "%0A" &
+ "- Name, Surname" & "%0A" &
+ "- Country of workplace" & "%0A" &
+ "- Position"
Process.Start("mailto:vecto@jrc.ec.europa.eu?subject=CITnet%20account&body=" & bodytext)
-
End Sub
Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
Process.Start("https://webgate.ec.europa.eu/CITnet/jira/browse/VECTO")
End Sub
-
End Class
diff --git a/VECTO/GUI/F_MAINForm.Designer.vb b/VECTO/GUI/F_MAINForm.Designer.vb
index 50c464fd39..717812fe0d 100644
--- a/VECTO/GUI/F_MAINForm.Designer.vb
+++ b/VECTO/GUI/F_MAINForm.Designer.vb
@@ -35,175 +35,151 @@ Partial Class F_MAINForm
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<DebuggerStepThrough()> _
Private Sub InitializeComponent()
- Me.components = New Container()
- Dim resources As ComponentResourceManager = New ComponentResourceManager(GetType(F_MAINForm))
- Me.StatusBAR = New StatusStrip()
- Me.ToolStripLbStatus = New ToolStripStatusLabel()
- Me.ToolStripProgBarJob = New ToolStripProgressBar()
- Me.ToolStripProgBarOverall = New ToolStripProgressBar()
- Me.TabControl1 = New TabControl()
- Me.TabPageGEN = New TabPage()
- Me.Label6 = New Label()
- Me.btStartV3 = New Button()
- Me.LbDecl = New Label()
- Me.PictureBox1 = New PictureBox()
- Me.BtGENdown = New Button()
- Me.BtGENup = New Button()
- Me.LbAutoShDown = New Label()
- Me.ChBoxAllGEN = New CheckBox()
- Me.LvGEN = New ListView()
- Me.ColGENpath = CType(New ColumnHeader(), ColumnHeader)
- Me.ColGENstatus = CType(New ColumnHeader(), ColumnHeader)
- Me.ButtonGENremove = New Button()
- Me.ButtonGENadd = New Button()
- Me.TabPageDRI = New TabPage()
- Me.Label3 = New Label()
- Me.BtDRIdown = New Button()
- Me.BtDRIup = New Button()
- Me.ChBoxAllDRI = New CheckBox()
- Me.LvDRI = New ListView()
- Me.ColDRIpath = CType(New ColumnHeader(), ColumnHeader)
- Me.ColDRIstatus = CType(New ColumnHeader(), ColumnHeader)
- Me.ButtonDRIremove = New Button()
- Me.ButtonDRIadd = New Button()
- Me.TabPgOptions = New TabPage()
- Me.GrBoxBATCH = New GroupBox()
- Me.ChBoxBatchSubD = New CheckBox()
- Me.Label2 = New Label()
- Me.ButBObrowse = New Button()
- Me.CbBOmode = New ComboBox()
- Me.TbBOpath = New TextBox()
- Me.GrBoxSTD = New GroupBox()
- Me.ChBoxAutoSD = New CheckBox()
- Me.PanelOptAllg = New Panel()
- Me.ChBoxMod1Hz = New CheckBox()
- Me.ChBoxModOut = New CheckBox()
- Me.GroupBox1 = New GroupBox()
- Me.RbDev = New RadioButton()
- Me.RbDecl = New RadioButton()
- Me.PnDeclOpt = New Panel()
- Me.CbBatch = New CheckBox()
- Me.ChBoxCyclDistCor = New CheckBox()
- Me.ChBoxUseGears = New CheckBox()
- Me.TabPageDEV = New TabPage()
- Me.Label1 = New Label()
- Me.LvDEVoptions = New ListView()
- Me.ColumnHeader4 = CType(New ColumnHeader(), ColumnHeader)
- Me.ColumnHeader7 = CType(New ColumnHeader(), ColumnHeader)
- Me.ColumnHeader5 = CType(New ColumnHeader(), ColumnHeader)
- Me.ColumnHeader6 = CType(New ColumnHeader(), ColumnHeader)
- Me.ColumnHeader8 = CType(New ColumnHeader(), ColumnHeader)
- Me.ColumnHeader9 = CType(New ColumnHeader(), ColumnHeader)
- Me.ConMenFilelist = New ContextMenuStrip(Me.components)
- Me.SaveListToolStripMenuItem = New ToolStripMenuItem()
- Me.LoadListToolStripMenuItem = New ToolStripMenuItem()
- Me.LoadDefaultListToolStripMenuItem = New ToolStripMenuItem()
- Me.ClearListToolStripMenuItem = New ToolStripMenuItem()
- Me.BackgroundWorker1 = New BackgroundWorker()
- Me.LvMsg = New ListView()
- Me.ColumnHeader1 = CType(New ColumnHeader(), ColumnHeader)
- Me.ColumnHeader2 = CType(New ColumnHeader(), ColumnHeader)
- Me.ColumnHeader3 = CType(New ColumnHeader(), ColumnHeader)
- Me.SplitContainer1 = New SplitContainer()
- Me.ToolStrip1 = New ToolStrip()
- Me.ToolStripBtNew = New ToolStripButton()
- Me.ToolStripBtOpen = New ToolStripButton()
- Me.ToolStripSeparator2 = New ToolStripSeparator()
- Me.ToolStripDrDnBtTools = New ToolStripDropDownButton()
- Me.GENEditorToolStripMenuItem1 = New ToolStripMenuItem()
- Me.VEHEditorToolStripMenuItem = New ToolStripMenuItem()
- Me.EngineEditorToolStripMenuItem = New ToolStripMenuItem()
- Me.GearboxEditorToolStripMenuItem = New ToolStripMenuItem()
- Me.GraphToolStripMenuItem = New ToolStripMenuItem()
- Me.ToolStripSeparator6 = New ToolStripSeparator()
- Me.SignOrVerifyFilesToolStripMenuItem = New ToolStripMenuItem()
- Me.ToolStripSeparator4 = New ToolStripSeparator()
- Me.OpenLogToolStripMenuItem = New ToolStripMenuItem()
- Me.SettingsToolStripMenuItem = New ToolStripMenuItem()
- Me.ToolStripDrDnBtInfo = New ToolStripDropDownButton()
- Me.UserManualToolStripMenuItem = New ToolStripMenuItem()
- Me.UpdateNotesToolStripMenuItem = New ToolStripMenuItem()
- Me.ReportBugViaCITnetToolStripMenuItem = New ToolStripMenuItem()
- Me.ToolStripSeparator3 = New ToolStripSeparator()
- Me.CreateActivationFileToolStripMenuItem = New ToolStripMenuItem()
- Me.AboutVECTOToolStripMenuItem1 = New ToolStripMenuItem()
- Me.CmDEV = New ContextMenuStrip(Me.components)
- Me.TmProgSec = New Timer(Me.components)
- Me.CmOpenFile = New ContextMenuStrip(Me.components)
- Me.OpenWithToolStripMenuItem = New ToolStripMenuItem()
- Me.OpenInGraphWindowToolStripMenuItem = New ToolStripMenuItem()
- Me.ShowInFolderToolStripMenuItem = New ToolStripMenuItem()
- Me.ToolTip1 = New ToolTip(Me.components)
+ Me.components = New System.ComponentModel.Container()
+ Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(F_MAINForm))
+ Me.StatusBAR = New System.Windows.Forms.StatusStrip()
+ Me.ToolStripLbStatus = New System.Windows.Forms.ToolStripStatusLabel()
+ Me.ToolStripProgBarJob = New System.Windows.Forms.ToolStripProgressBar()
+ Me.ToolStripProgBarOverall = New System.Windows.Forms.ToolStripProgressBar()
+ Me.TabControl1 = New System.Windows.Forms.TabControl()
+ Me.TabPageGEN = New System.Windows.Forms.TabPage()
+ Me.Label6 = New System.Windows.Forms.Label()
+ Me.btStartV3 = New System.Windows.Forms.Button()
+ Me.LbDecl = New System.Windows.Forms.Label()
+ Me.PictureBox1 = New System.Windows.Forms.PictureBox()
+ Me.BtGENdown = New System.Windows.Forms.Button()
+ Me.BtGENup = New System.Windows.Forms.Button()
+ Me.LbAutoShDown = New System.Windows.Forms.Label()
+ Me.ChBoxAllGEN = New System.Windows.Forms.CheckBox()
+ Me.LvGEN = New System.Windows.Forms.ListView()
+ Me.ColGENpath = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+ Me.ColGENstatus = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+ Me.ButtonGENremove = New System.Windows.Forms.Button()
+ Me.ButtonGENadd = New System.Windows.Forms.Button()
+ Me.TabPgOptions = New System.Windows.Forms.TabPage()
+ Me.PanelOptAllg = New System.Windows.Forms.Panel()
+ Me.ChBoxMod1Hz = New System.Windows.Forms.CheckBox()
+ Me.ChBoxModOut = New System.Windows.Forms.CheckBox()
+ Me.GroupBox1 = New System.Windows.Forms.GroupBox()
+ Me.RbDev = New System.Windows.Forms.RadioButton()
+ Me.RbDecl = New System.Windows.Forms.RadioButton()
+ Me.TabPageDEV = New System.Windows.Forms.TabPage()
+ Me.Label1 = New System.Windows.Forms.Label()
+ Me.LvDEVoptions = New System.Windows.Forms.ListView()
+ Me.ColumnHeader4 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader7 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader5 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader6 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader8 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader9 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+ Me.ConMenFilelist = New System.Windows.Forms.ContextMenuStrip(Me.components)
+ Me.SaveListToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.LoadListToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.LoadDefaultListToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.ClearListToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.BackgroundWorker1 = New System.ComponentModel.BackgroundWorker()
+ Me.LvMsg = New System.Windows.Forms.ListView()
+ Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader2 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+ Me.ColumnHeader3 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+ Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
+ Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
+ Me.ToolStripBtNew = New System.Windows.Forms.ToolStripButton()
+ Me.ToolStripBtOpen = New System.Windows.Forms.ToolStripButton()
+ Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator()
+ Me.ToolStripDrDnBtTools = New System.Windows.Forms.ToolStripDropDownButton()
+ Me.GENEditorToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
+ Me.VEHEditorToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.EngineEditorToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.GearboxEditorToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.GraphToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.ToolStripSeparator6 = New System.Windows.Forms.ToolStripSeparator()
+ Me.SignOrVerifyFilesToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator()
+ Me.OpenLogToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.SettingsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.ToolStripDrDnBtInfo = New System.Windows.Forms.ToolStripDropDownButton()
+ Me.UserManualToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.UpdateNotesToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.ReportBugViaCITnetToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
+ Me.CreateActivationFileToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.AboutVECTOToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
+ Me.CmDEV = New System.Windows.Forms.ContextMenuStrip(Me.components)
+ Me.TmProgSec = New System.Windows.Forms.Timer(Me.components)
+ Me.CmOpenFile = New System.Windows.Forms.ContextMenuStrip(Me.components)
+ Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.OpenInGraphWindowToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
+ Me.GroupBox2 = New System.Windows.Forms.GroupBox()
Me.StatusBAR.SuspendLayout()
Me.TabControl1.SuspendLayout()
Me.TabPageGEN.SuspendLayout()
- CType(Me.PictureBox1, ISupportInitialize).BeginInit()
- Me.TabPageDRI.SuspendLayout()
+ CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.TabPgOptions.SuspendLayout()
- Me.GrBoxBATCH.SuspendLayout()
Me.PanelOptAllg.SuspendLayout()
Me.GroupBox1.SuspendLayout()
- Me.PnDeclOpt.SuspendLayout()
Me.TabPageDEV.SuspendLayout()
Me.ConMenFilelist.SuspendLayout()
- CType(Me.SplitContainer1, ISupportInitialize).BeginInit()
+ CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SplitContainer1.Panel1.SuspendLayout()
Me.SplitContainer1.Panel2.SuspendLayout()
Me.SplitContainer1.SuspendLayout()
Me.ToolStrip1.SuspendLayout()
Me.CmOpenFile.SuspendLayout()
+ Me.GroupBox2.SuspendLayout()
Me.SuspendLayout()
'
'StatusBAR
'
- Me.StatusBAR.Items.AddRange(New ToolStripItem() {Me.ToolStripLbStatus, Me.ToolStripProgBarJob, Me.ToolStripProgBarOverall})
- Me.StatusBAR.Location = New Point(0, 648)
+ Me.StatusBAR.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripLbStatus, Me.ToolStripProgBarJob, Me.ToolStripProgBarOverall})
+ Me.StatusBAR.Location = New System.Drawing.Point(0, 648)
Me.StatusBAR.Name = "StatusBAR"
- Me.StatusBAR.Size = New Size(1045, 22)
+ Me.StatusBAR.Size = New System.Drawing.Size(1045, 22)
Me.StatusBAR.TabIndex = 7
Me.StatusBAR.Text = "StatusBAR"
'
'ToolStripLbStatus
'
Me.ToolStripLbStatus.Name = "ToolStripLbStatus"
- Me.ToolStripLbStatus.Size = New Size(1030, 17)
+ Me.ToolStripLbStatus.Size = New System.Drawing.Size(1030, 17)
Me.ToolStripLbStatus.Spring = True
Me.ToolStripLbStatus.Text = "Status Text"
- Me.ToolStripLbStatus.TextAlign = ContentAlignment.MiddleLeft
+ Me.ToolStripLbStatus.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
'
'ToolStripProgBarJob
'
- Me.ToolStripProgBarJob.Alignment = ToolStripItemAlignment.Right
+ Me.ToolStripProgBarJob.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
Me.ToolStripProgBarJob.AutoSize = False
Me.ToolStripProgBarJob.Name = "ToolStripProgBarJob"
- Me.ToolStripProgBarJob.Size = New Size(100, 16)
- Me.ToolStripProgBarJob.Style = ProgressBarStyle.Continuous
+ Me.ToolStripProgBarJob.Size = New System.Drawing.Size(100, 16)
+ Me.ToolStripProgBarJob.Style = System.Windows.Forms.ProgressBarStyle.Continuous
Me.ToolStripProgBarJob.ToolTipText = "overall progress"
Me.ToolStripProgBarJob.Visible = False
'
'ToolStripProgBarOverall
'
- Me.ToolStripProgBarOverall.Alignment = ToolStripItemAlignment.Right
+ Me.ToolStripProgBarOverall.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
Me.ToolStripProgBarOverall.AutoSize = False
Me.ToolStripProgBarOverall.Name = "ToolStripProgBarOverall"
- Me.ToolStripProgBarOverall.Size = New Size(100, 16)
- Me.ToolStripProgBarOverall.Style = ProgressBarStyle.Continuous
+ Me.ToolStripProgBarOverall.Size = New System.Drawing.Size(100, 16)
+ Me.ToolStripProgBarOverall.Style = System.Windows.Forms.ProgressBarStyle.Continuous
Me.ToolStripProgBarOverall.ToolTipText = "job progress"
Me.ToolStripProgBarOverall.Visible = False
'
'TabControl1
'
Me.TabControl1.Controls.Add(Me.TabPageGEN)
- Me.TabControl1.Controls.Add(Me.TabPageDRI)
Me.TabControl1.Controls.Add(Me.TabPgOptions)
Me.TabControl1.Controls.Add(Me.TabPageDEV)
- Me.TabControl1.Dock = DockStyle.Fill
- Me.TabControl1.Location = New Point(3, 3)
- Me.TabControl1.Margin = New Padding(0)
+ Me.TabControl1.Dock = System.Windows.Forms.DockStyle.Fill
+ Me.TabControl1.Location = New System.Drawing.Point(3, 3)
+ Me.TabControl1.Margin = New System.Windows.Forms.Padding(0)
Me.TabControl1.Name = "TabControl1"
- Me.TabControl1.Padding = New Point(0, 0)
+ Me.TabControl1.Padding = New System.Drawing.Point(0, 0)
Me.TabControl1.SelectedIndex = 0
- Me.TabControl1.Size = New Size(1042, 328)
+ Me.TabControl1.Size = New System.Drawing.Size(1042, 328)
Me.TabControl1.TabIndex = 10
'
'TabPageGEN
@@ -219,100 +195,100 @@ Partial Class F_MAINForm
Me.TabPageGEN.Controls.Add(Me.LvGEN)
Me.TabPageGEN.Controls.Add(Me.ButtonGENremove)
Me.TabPageGEN.Controls.Add(Me.ButtonGENadd)
- Me.TabPageGEN.Location = New Point(4, 22)
- Me.TabPageGEN.Margin = New Padding(0)
+ Me.TabPageGEN.Location = New System.Drawing.Point(4, 22)
+ Me.TabPageGEN.Margin = New System.Windows.Forms.Padding(0)
Me.TabPageGEN.Name = "TabPageGEN"
- Me.TabPageGEN.Size = New Size(1034, 302)
+ Me.TabPageGEN.Size = New System.Drawing.Size(1034, 302)
Me.TabPageGEN.TabIndex = 0
Me.TabPageGEN.Text = "Job Files"
Me.TabPageGEN.UseVisualStyleBackColor = True
'
'Label6
'
- Me.Label6.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles)
+ Me.Label6.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.Label6.AutoSize = True
- Me.Label6.Location = New Point(814, 268)
+ Me.Label6.Location = New System.Drawing.Point(814, 268)
Me.Label6.Name = "Label6"
- Me.Label6.Size = New Size(217, 13)
+ Me.Label6.Size = New System.Drawing.Size(217, 13)
Me.Label6.TabIndex = 21
Me.Label6.Text = "(Double-Click to Edit, Right-Click for Options)"
'
'btStartV3
'
- Me.btStartV3.Font = New Font("Microsoft Sans Serif", 8.25!, FontStyle.Regular, GraphicsUnit.Point, CType(0, Byte))
- Me.btStartV3.Image = My.Resources.Resources.Play_icon
- Me.btStartV3.ImageAlign = ContentAlignment.MiddleLeft
- Me.btStartV3.Location = New Point(3, 56)
+ Me.btStartV3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.btStartV3.Image = Global.TUGraz.VECTO.My.Resources.Resources.Play_icon
+ Me.btStartV3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+ Me.btStartV3.Location = New System.Drawing.Point(3, 56)
Me.btStartV3.Name = "btStartV3"
- Me.btStartV3.Size = New Size(108, 50)
+ Me.btStartV3.Size = New System.Drawing.Size(108, 50)
Me.btStartV3.TabIndex = 20
Me.btStartV3.Text = "START"
- Me.btStartV3.TextImageRelation = TextImageRelation.ImageBeforeText
+ Me.btStartV3.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText
Me.ToolTip1.SetToolTip(Me.btStartV3, "Start Simulation")
Me.btStartV3.UseVisualStyleBackColor = True
'
'LbDecl
'
Me.LbDecl.AutoSize = True
- Me.LbDecl.Font = New Font("Microsoft Sans Serif", 8.25!, FontStyle.Bold, GraphicsUnit.Point, CType(0, Byte))
- Me.LbDecl.Location = New Point(5, 109)
+ Me.LbDecl.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.LbDecl.Location = New System.Drawing.Point(5, 109)
Me.LbDecl.Name = "LbDecl"
- Me.LbDecl.Size = New Size(107, 13)
+ Me.LbDecl.Size = New System.Drawing.Size(107, 13)
Me.LbDecl.TabIndex = 19
Me.LbDecl.Text = "Declaration Mode"
Me.LbDecl.Visible = False
'
'PictureBox1
'
- Me.PictureBox1.Image = CType(resources.GetObject("PictureBox1.Image"), Image)
- Me.PictureBox1.Location = New Point(3, 3)
+ Me.PictureBox1.Image = CType(resources.GetObject("PictureBox1.Image"), System.Drawing.Image)
+ Me.PictureBox1.Location = New System.Drawing.Point(3, 3)
Me.PictureBox1.Name = "PictureBox1"
- Me.PictureBox1.Size = New Size(108, 47)
+ Me.PictureBox1.Size = New System.Drawing.Size(108, 47)
Me.PictureBox1.TabIndex = 18
Me.PictureBox1.TabStop = False
'
'BtGENdown
'
- Me.BtGENdown.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles)
- Me.BtGENdown.Image = My.Resources.Resources.Actions_arrow_down_icon
- Me.BtGENdown.Location = New Point(307, 267)
+ Me.BtGENdown.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+ Me.BtGENdown.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_arrow_down_icon
+ Me.BtGENdown.Location = New System.Drawing.Point(307, 267)
Me.BtGENdown.Name = "BtGENdown"
- Me.BtGENdown.Size = New Size(30, 30)
+ Me.BtGENdown.Size = New System.Drawing.Size(30, 30)
Me.BtGENdown.TabIndex = 6
Me.ToolTip1.SetToolTip(Me.BtGENdown, "Move job down one row")
Me.BtGENdown.UseVisualStyleBackColor = True
'
'BtGENup
'
- Me.BtGENup.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles)
- Me.BtGENup.Image = My.Resources.Resources.Actions_arrow_up_icon
- Me.BtGENup.Location = New Point(276, 267)
+ Me.BtGENup.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+ Me.BtGENup.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_arrow_up_icon
+ Me.BtGENup.Location = New System.Drawing.Point(276, 267)
Me.BtGENup.Name = "BtGENup"
- Me.BtGENup.Size = New Size(30, 30)
+ Me.BtGENup.Size = New System.Drawing.Size(30, 30)
Me.BtGENup.TabIndex = 4
Me.ToolTip1.SetToolTip(Me.BtGENup, "Move job up one row")
Me.BtGENup.UseVisualStyleBackColor = True
'
'LbAutoShDown
'
- Me.LbAutoShDown.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles)
+ Me.LbAutoShDown.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.LbAutoShDown.AutoSize = True
- Me.LbAutoShDown.Font = New Font("Microsoft Sans Serif", 8.25!, FontStyle.Bold, GraphicsUnit.Point, CType(0, Byte))
- Me.LbAutoShDown.ForeColor = Color.Red
- Me.LbAutoShDown.Location = New Point(408, 275)
+ Me.LbAutoShDown.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.LbAutoShDown.ForeColor = System.Drawing.Color.Red
+ Me.LbAutoShDown.Location = New System.Drawing.Point(408, 275)
Me.LbAutoShDown.Name = "LbAutoShDown"
- Me.LbAutoShDown.Size = New Size(225, 13)
+ Me.LbAutoShDown.Size = New System.Drawing.Size(225, 13)
Me.LbAutoShDown.TabIndex = 17
Me.LbAutoShDown.Text = "!!! Automatic Shutdown is activated !!!"
Me.LbAutoShDown.Visible = False
'
'ChBoxAllGEN
'
- Me.ChBoxAllGEN.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles)
+ Me.ChBoxAllGEN.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.ChBoxAllGEN.AutoSize = True
- Me.ChBoxAllGEN.Location = New Point(195, 274)
+ Me.ChBoxAllGEN.Location = New System.Drawing.Point(195, 274)
Me.ChBoxAllGEN.Name = "ChBoxAllGEN"
- Me.ChBoxAllGEN.Size = New Size(70, 17)
+ Me.ChBoxAllGEN.Size = New System.Drawing.Size(70, 17)
Me.ChBoxAllGEN.TabIndex = 16
Me.ChBoxAllGEN.Text = "Select All"
Me.ToolTip1.SetToolTip(Me.ChBoxAllGEN, "Select All / None")
@@ -321,22 +297,22 @@ Partial Class F_MAINForm
'LvGEN
'
Me.LvGEN.AllowDrop = True
- Me.LvGEN.Anchor = CType((((AnchorStyles.Top Or AnchorStyles.Bottom) _
- Or AnchorStyles.Left) _
- Or AnchorStyles.Right), AnchorStyles)
+ Me.LvGEN.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.LvGEN.CheckBoxes = True
- Me.LvGEN.Columns.AddRange(New ColumnHeader() {Me.ColGENpath, Me.ColGENstatus})
+ Me.LvGEN.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColGENpath, Me.ColGENstatus})
Me.LvGEN.FullRowSelect = True
Me.LvGEN.GridLines = True
- Me.LvGEN.HeaderStyle = ColumnHeaderStyle.Nonclickable
+ Me.LvGEN.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable
Me.LvGEN.HideSelection = False
Me.LvGEN.LabelEdit = True
- Me.LvGEN.Location = New Point(114, 3)
+ Me.LvGEN.Location = New System.Drawing.Point(114, 3)
Me.LvGEN.Name = "LvGEN"
- Me.LvGEN.Size = New Size(917, 263)
+ Me.LvGEN.Size = New System.Drawing.Size(917, 263)
Me.LvGEN.TabIndex = 14
Me.LvGEN.UseCompatibleStateImageBehavior = False
- Me.LvGEN.View = View.Details
+ Me.LvGEN.View = System.Windows.Forms.View.Details
'
'ColGENpath
'
@@ -350,257 +326,54 @@ Partial Class F_MAINForm
'
'ButtonGENremove
'
- Me.ButtonGENremove.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles)
- Me.ButtonGENremove.Font = New Font("Microsoft Sans Serif", 8.25!, FontStyle.Bold, GraphicsUnit.Point, CType(0, Byte))
- Me.ButtonGENremove.Image = My.Resources.Resources.minus_circle_icon
- Me.ButtonGENremove.Location = New Point(147, 267)
+ Me.ButtonGENremove.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+ Me.ButtonGENremove.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.ButtonGENremove.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
+ Me.ButtonGENremove.Location = New System.Drawing.Point(147, 267)
Me.ButtonGENremove.Name = "ButtonGENremove"
- Me.ButtonGENremove.Size = New Size(33, 30)
+ Me.ButtonGENremove.Size = New System.Drawing.Size(33, 30)
Me.ButtonGENremove.TabIndex = 2
Me.ToolTip1.SetToolTip(Me.ButtonGENremove, "Remove selected entries")
Me.ButtonGENremove.UseVisualStyleBackColor = True
'
'ButtonGENadd
'
- Me.ButtonGENadd.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles)
- Me.ButtonGENadd.Font = New Font("Microsoft Sans Serif", 8.25!, FontStyle.Bold, GraphicsUnit.Point, CType(0, Byte))
- Me.ButtonGENadd.Image = My.Resources.Resources.plus_circle_icon
- Me.ButtonGENadd.Location = New Point(113, 267)
+ Me.ButtonGENadd.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+ Me.ButtonGENadd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.ButtonGENadd.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
+ Me.ButtonGENadd.Location = New System.Drawing.Point(113, 267)
Me.ButtonGENadd.Name = "ButtonGENadd"
- Me.ButtonGENadd.Size = New Size(33, 30)
+ Me.ButtonGENadd.Size = New System.Drawing.Size(33, 30)
Me.ButtonGENadd.TabIndex = 1
Me.ToolTip1.SetToolTip(Me.ButtonGENadd, "Add Job File")
Me.ButtonGENadd.UseVisualStyleBackColor = True
'
- 'TabPageDRI
- '
- Me.TabPageDRI.Controls.Add(Me.Label3)
- Me.TabPageDRI.Controls.Add(Me.BtDRIdown)
- Me.TabPageDRI.Controls.Add(Me.BtDRIup)
- Me.TabPageDRI.Controls.Add(Me.ChBoxAllDRI)
- Me.TabPageDRI.Controls.Add(Me.LvDRI)
- Me.TabPageDRI.Controls.Add(Me.ButtonDRIremove)
- Me.TabPageDRI.Controls.Add(Me.ButtonDRIadd)
- Me.TabPageDRI.Location = New Point(4, 22)
- Me.TabPageDRI.Name = "TabPageDRI"
- Me.TabPageDRI.Padding = New Padding(3)
- Me.TabPageDRI.Size = New Size(1034, 302)
- Me.TabPageDRI.TabIndex = 1
- Me.TabPageDRI.Text = "Driving Cycles"
- Me.TabPageDRI.UseVisualStyleBackColor = True
- '
- 'Label3
- '
- Me.Label3.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles)
- Me.Label3.AutoSize = True
- Me.Label3.Location = New Point(814, 268)
- Me.Label3.Name = "Label3"
- Me.Label3.Size = New Size(217, 13)
- Me.Label3.TabIndex = 22
- Me.Label3.Text = "(Double-Click to Edit, Right-Click for Options)"
- '
- 'BtDRIdown
- '
- Me.BtDRIdown.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles)
- Me.BtDRIdown.Image = My.Resources.Resources.Actions_arrow_down_icon
- Me.BtDRIdown.Location = New Point(196, 268)
- Me.BtDRIdown.Name = "BtDRIdown"
- Me.BtDRIdown.Size = New Size(33, 30)
- Me.BtDRIdown.TabIndex = 3
- Me.BtDRIdown.UseVisualStyleBackColor = True
- '
- 'BtDRIup
- '
- Me.BtDRIup.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles)
- Me.BtDRIup.Image = My.Resources.Resources.Actions_arrow_up_icon
- Me.BtDRIup.Location = New Point(163, 268)
- Me.BtDRIup.Name = "BtDRIup"
- Me.BtDRIup.Size = New Size(33, 30)
- Me.BtDRIup.TabIndex = 2
- Me.BtDRIup.UseVisualStyleBackColor = True
- '
- 'ChBoxAllDRI
- '
- Me.ChBoxAllDRI.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles)
- Me.ChBoxAllDRI.AutoSize = True
- Me.ChBoxAllDRI.Location = New Point(85, 275)
- Me.ChBoxAllDRI.Name = "ChBoxAllDRI"
- Me.ChBoxAllDRI.Size = New Size(70, 17)
- Me.ChBoxAllDRI.TabIndex = 7
- Me.ChBoxAllDRI.Text = "Select All"
- Me.ChBoxAllDRI.UseVisualStyleBackColor = True
- '
- 'LvDRI
- '
- Me.LvDRI.AllowDrop = True
- Me.LvDRI.Anchor = CType((((AnchorStyles.Top Or AnchorStyles.Bottom) _
- Or AnchorStyles.Left) _
- Or AnchorStyles.Right), AnchorStyles)
- Me.LvDRI.CheckBoxes = True
- Me.LvDRI.Columns.AddRange(New ColumnHeader() {Me.ColDRIpath, Me.ColDRIstatus})
- Me.LvDRI.FullRowSelect = True
- Me.LvDRI.GridLines = True
- Me.LvDRI.HeaderStyle = ColumnHeaderStyle.Nonclickable
- Me.LvDRI.HideSelection = False
- Me.LvDRI.LabelEdit = True
- Me.LvDRI.Location = New Point(6, 6)
- Me.LvDRI.Name = "LvDRI"
- Me.LvDRI.Size = New Size(1022, 261)
- Me.LvDRI.TabIndex = 6
- Me.LvDRI.UseCompatibleStateImageBehavior = False
- Me.LvDRI.View = View.Details
- '
- 'ColDRIpath
- '
- Me.ColDRIpath.Text = "Filepath"
- Me.ColDRIpath.Width = 915
- '
- 'ColDRIstatus
- '
- Me.ColDRIstatus.Text = ""
- Me.ColDRIstatus.Width = 150
- '
- 'ButtonDRIremove
- '
- Me.ButtonDRIremove.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles)
- Me.ButtonDRIremove.Font = New Font("Microsoft Sans Serif", 8.25!, FontStyle.Bold, GraphicsUnit.Point, CType(0, Byte))
- Me.ButtonDRIremove.Image = My.Resources.Resources.minus_circle_icon
- Me.ButtonDRIremove.Location = New Point(38, 268)
- Me.ButtonDRIremove.Name = "ButtonDRIremove"
- Me.ButtonDRIremove.Size = New Size(33, 30)
- Me.ButtonDRIremove.TabIndex = 1
- Me.ButtonDRIremove.UseVisualStyleBackColor = True
- '
- 'ButtonDRIadd
- '
- Me.ButtonDRIadd.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles)
- Me.ButtonDRIadd.Font = New Font("Microsoft Sans Serif", 8.25!, FontStyle.Bold, GraphicsUnit.Point, CType(0, Byte))
- Me.ButtonDRIadd.Image = My.Resources.Resources.plus_circle_icon
- Me.ButtonDRIadd.Location = New Point(5, 268)
- Me.ButtonDRIadd.Name = "ButtonDRIadd"
- Me.ButtonDRIadd.Size = New Size(33, 30)
- Me.ButtonDRIadd.TabIndex = 0
- Me.ButtonDRIadd.UseVisualStyleBackColor = True
- '
'TabPgOptions
'
- Me.TabPgOptions.Controls.Add(Me.GrBoxBATCH)
- Me.TabPgOptions.Controls.Add(Me.GrBoxSTD)
- Me.TabPgOptions.Controls.Add(Me.ChBoxAutoSD)
Me.TabPgOptions.Controls.Add(Me.PanelOptAllg)
- Me.TabPgOptions.Location = New Point(4, 22)
+ Me.TabPgOptions.Location = New System.Drawing.Point(4, 22)
Me.TabPgOptions.Name = "TabPgOptions"
- Me.TabPgOptions.Padding = New Padding(3)
- Me.TabPgOptions.Size = New Size(1034, 302)
+ Me.TabPgOptions.Padding = New System.Windows.Forms.Padding(3)
+ Me.TabPgOptions.Size = New System.Drawing.Size(1034, 302)
Me.TabPgOptions.TabIndex = 2
Me.TabPgOptions.Text = "Options"
Me.TabPgOptions.UseVisualStyleBackColor = True
'
- 'GrBoxBATCH
- '
- Me.GrBoxBATCH.Anchor = CType((((AnchorStyles.Top Or AnchorStyles.Bottom) _
- Or AnchorStyles.Left) _
- Or AnchorStyles.Right), AnchorStyles)
- Me.GrBoxBATCH.Controls.Add(Me.ChBoxBatchSubD)
- Me.GrBoxBATCH.Controls.Add(Me.Label2)
- Me.GrBoxBATCH.Controls.Add(Me.ButBObrowse)
- Me.GrBoxBATCH.Controls.Add(Me.CbBOmode)
- Me.GrBoxBATCH.Controls.Add(Me.TbBOpath)
- Me.GrBoxBATCH.Location = New Point(6, 224)
- Me.GrBoxBATCH.Name = "GrBoxBATCH"
- Me.GrBoxBATCH.Size = New Size(1022, 72)
- Me.GrBoxBATCH.TabIndex = 5
- Me.GrBoxBATCH.TabStop = False
- Me.GrBoxBATCH.Text = "Batch Options"
- '
- 'ChBoxBatchSubD
- '
- Me.ChBoxBatchSubD.AutoSize = True
- Me.ChBoxBatchSubD.Location = New Point(14, 46)
- Me.ChBoxBatchSubD.Name = "ChBoxBatchSubD"
- Me.ChBoxBatchSubD.Size = New Size(206, 17)
- Me.ChBoxBatchSubD.TabIndex = 4
- Me.ChBoxBatchSubD.Text = "Create Subdirectories for modal results"
- Me.ChBoxBatchSubD.UseVisualStyleBackColor = True
- '
- 'Label2
- '
- Me.Label2.AutoSize = True
- Me.Label2.Location = New Point(11, 22)
- Me.Label2.Name = "Label2"
- Me.Label2.Size = New Size(64, 13)
- Me.Label2.TabIndex = 2
- Me.Label2.Text = "Output Path"
- '
- 'ButBObrowse
- '
- Me.ButBObrowse.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles)
- Me.ButBObrowse.Image = My.Resources.Resources.Open_icon
- Me.ButBObrowse.Location = New Point(961, 16)
- Me.ButBObrowse.Name = "ButBObrowse"
- Me.ButBObrowse.Size = New Size(24, 24)
- Me.ButBObrowse.TabIndex = 3
- Me.ButBObrowse.UseVisualStyleBackColor = True
- '
- 'CbBOmode
- '
- Me.CbBOmode.DropDownStyle = ComboBoxStyle.DropDownList
- Me.CbBOmode.FormattingEnabled = True
- Me.CbBOmode.Items.AddRange(New Object() {"Directory of .vecto File", "Custom Directory"})
- Me.CbBOmode.Location = New Point(81, 19)
- Me.CbBOmode.Name = "CbBOmode"
- Me.CbBOmode.Size = New Size(140, 21)
- Me.CbBOmode.TabIndex = 0
- '
- 'TbBOpath
- '
- Me.TbBOpath.Anchor = CType(((AnchorStyles.Top Or AnchorStyles.Left) _
- Or AnchorStyles.Right), AnchorStyles)
- Me.TbBOpath.Location = New Point(227, 18)
- Me.TbBOpath.Name = "TbBOpath"
- Me.TbBOpath.Size = New Size(734, 20)
- Me.TbBOpath.TabIndex = 1
- '
- 'GrBoxSTD
- '
- Me.GrBoxSTD.Anchor = CType((((AnchorStyles.Top Or AnchorStyles.Bottom) _
- Or AnchorStyles.Left) _
- Or AnchorStyles.Right), AnchorStyles)
- Me.GrBoxSTD.Location = New Point(6, 224)
- Me.GrBoxSTD.Name = "GrBoxSTD"
- Me.GrBoxSTD.Size = New Size(1022, 72)
- Me.GrBoxSTD.TabIndex = 14
- Me.GrBoxSTD.TabStop = False
- Me.GrBoxSTD.Text = "Standard Options"
- '
- 'ChBoxAutoSD
- '
- Me.ChBoxAutoSD.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles)
- Me.ChBoxAutoSD.AutoSize = True
- Me.ChBoxAutoSD.Location = New Point(859, 6)
- Me.ChBoxAutoSD.Name = "ChBoxAutoSD"
- Me.ChBoxAutoSD.Size = New Size(169, 17)
- Me.ChBoxAutoSD.TabIndex = 13
- Me.ChBoxAutoSD.Text = "Shutdown system after last job"
- Me.ChBoxAutoSD.UseVisualStyleBackColor = True
- '
'PanelOptAllg
'
- Me.PanelOptAllg.Controls.Add(Me.ChBoxMod1Hz)
- Me.PanelOptAllg.Controls.Add(Me.ChBoxModOut)
+ Me.PanelOptAllg.Controls.Add(Me.GroupBox2)
Me.PanelOptAllg.Controls.Add(Me.GroupBox1)
- Me.PanelOptAllg.Controls.Add(Me.PnDeclOpt)
- Me.PanelOptAllg.Location = New Point(6, 6)
+ Me.PanelOptAllg.Location = New System.Drawing.Point(6, 6)
Me.PanelOptAllg.Name = "PanelOptAllg"
- Me.PanelOptAllg.Size = New Size(519, 212)
+ Me.PanelOptAllg.Size = New System.Drawing.Size(1022, 290)
Me.PanelOptAllg.TabIndex = 0
'
'ChBoxMod1Hz
'
Me.ChBoxMod1Hz.AutoSize = True
- Me.ChBoxMod1Hz.Location = New Point(9, 182)
+ Me.ChBoxMod1Hz.Location = New System.Drawing.Point(6, 42)
Me.ChBoxMod1Hz.Name = "ChBoxMod1Hz"
- Me.ChBoxMod1Hz.Size = New Size(121, 17)
+ Me.ChBoxMod1Hz.Size = New System.Drawing.Size(121, 17)
Me.ChBoxMod1Hz.TabIndex = 16
Me.ChBoxMod1Hz.Text = "Modal results in 1Hz"
Me.ChBoxMod1Hz.UseVisualStyleBackColor = True
@@ -609,10 +382,10 @@ Partial Class F_MAINForm
'
Me.ChBoxModOut.AutoSize = True
Me.ChBoxModOut.Checked = True
- Me.ChBoxModOut.CheckState = CheckState.Checked
- Me.ChBoxModOut.Location = New Point(9, 159)
+ Me.ChBoxModOut.CheckState = System.Windows.Forms.CheckState.Checked
+ Me.ChBoxModOut.Location = New System.Drawing.Point(6, 19)
Me.ChBoxModOut.Name = "ChBoxModOut"
- Me.ChBoxModOut.Size = New Size(115, 17)
+ Me.ChBoxModOut.Size = New System.Drawing.Size(115, 17)
Me.ChBoxModOut.TabIndex = 0
Me.ChBoxModOut.Text = "Write modal results"
Me.ChBoxModOut.UseVisualStyleBackColor = True
@@ -621,9 +394,9 @@ Partial Class F_MAINForm
'
Me.GroupBox1.Controls.Add(Me.RbDev)
Me.GroupBox1.Controls.Add(Me.RbDecl)
- Me.GroupBox1.Location = New Point(3, 3)
+ Me.GroupBox1.Location = New System.Drawing.Point(3, 3)
Me.GroupBox1.Name = "GroupBox1"
- Me.GroupBox1.Size = New Size(121, 72)
+ Me.GroupBox1.Size = New System.Drawing.Size(173, 72)
Me.GroupBox1.TabIndex = 15
Me.GroupBox1.TabStop = False
Me.GroupBox1.Text = "Mode"
@@ -632,9 +405,9 @@ Partial Class F_MAINForm
'
Me.RbDev.AutoSize = True
Me.RbDev.Checked = True
- Me.RbDev.Location = New Point(6, 42)
+ Me.RbDev.Location = New System.Drawing.Point(6, 42)
Me.RbDev.Name = "RbDev"
- Me.RbDev.Size = New Size(111, 17)
+ Me.RbDev.Size = New System.Drawing.Size(111, 17)
Me.RbDev.TabIndex = 1
Me.RbDev.TabStop = True
Me.RbDev.Text = "Engineering Mode"
@@ -643,91 +416,51 @@ Partial Class F_MAINForm
'RbDecl
'
Me.RbDecl.AutoSize = True
- Me.RbDecl.Location = New Point(6, 19)
+ Me.RbDecl.Location = New System.Drawing.Point(6, 19)
Me.RbDecl.Name = "RbDecl"
- Me.RbDecl.Size = New Size(109, 17)
+ Me.RbDecl.Size = New System.Drawing.Size(109, 17)
Me.RbDecl.TabIndex = 0
Me.RbDecl.TabStop = True
Me.RbDecl.Text = "Declaration Mode"
Me.RbDecl.UseVisualStyleBackColor = True
'
- 'PnDeclOpt
- '
- Me.PnDeclOpt.Controls.Add(Me.CbBatch)
- Me.PnDeclOpt.Controls.Add(Me.ChBoxCyclDistCor)
- Me.PnDeclOpt.Controls.Add(Me.ChBoxUseGears)
- Me.PnDeclOpt.Location = New Point(3, 81)
- Me.PnDeclOpt.Name = "PnDeclOpt"
- Me.PnDeclOpt.Size = New Size(202, 72)
- Me.PnDeclOpt.TabIndex = 13
- '
- 'CbBatch
- '
- Me.CbBatch.AutoSize = True
- Me.CbBatch.Location = New Point(6, 3)
- Me.CbBatch.Name = "CbBatch"
- Me.CbBatch.Size = New Size(84, 17)
- Me.CbBatch.TabIndex = 15
- Me.CbBatch.Text = "Batch Mode"
- Me.CbBatch.UseVisualStyleBackColor = True
- '
- 'ChBoxCyclDistCor
- '
- Me.ChBoxCyclDistCor.AutoSize = True
- Me.ChBoxCyclDistCor.Location = New Point(6, 26)
- Me.ChBoxCyclDistCor.Name = "ChBoxCyclDistCor"
- Me.ChBoxCyclDistCor.Size = New Size(148, 17)
- Me.ChBoxCyclDistCor.TabIndex = 0
- Me.ChBoxCyclDistCor.Text = "Cycle Distance Correction"
- Me.ChBoxCyclDistCor.UseVisualStyleBackColor = True
- '
- 'ChBoxUseGears
- '
- Me.ChBoxUseGears.AutoSize = True
- Me.ChBoxUseGears.Location = New Point(6, 49)
- Me.ChBoxUseGears.Name = "ChBoxUseGears"
- Me.ChBoxUseGears.Size = New Size(188, 17)
- Me.ChBoxUseGears.TabIndex = 0
- Me.ChBoxUseGears.Text = "Use gears/rpm's form driving cycle"
- Me.ChBoxUseGears.UseVisualStyleBackColor = True
- '
'TabPageDEV
'
Me.TabPageDEV.Controls.Add(Me.Label1)
Me.TabPageDEV.Controls.Add(Me.LvDEVoptions)
- Me.TabPageDEV.Location = New Point(4, 22)
+ Me.TabPageDEV.Location = New System.Drawing.Point(4, 22)
Me.TabPageDEV.Name = "TabPageDEV"
- Me.TabPageDEV.Padding = New Padding(3)
- Me.TabPageDEV.Size = New Size(1034, 302)
+ Me.TabPageDEV.Padding = New System.Windows.Forms.Padding(3)
+ Me.TabPageDEV.Size = New System.Drawing.Size(1034, 302)
Me.TabPageDEV.TabIndex = 3
Me.TabPageDEV.Text = "Test"
Me.TabPageDEV.UseVisualStyleBackColor = True
'
'Label1
'
- Me.Label1.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles)
+ Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.Label1.AutoSize = True
- Me.Label1.Location = New Point(1012, 283)
+ Me.Label1.Location = New System.Drawing.Point(1012, 283)
Me.Label1.Name = "Label1"
- Me.Label1.Size = New Size(106, 13)
+ Me.Label1.Size = New System.Drawing.Size(106, 13)
Me.Label1.TabIndex = 1
Me.Label1.Text = "(Double-Click to Edit)"
'
'LvDEVoptions
'
- Me.LvDEVoptions.Anchor = CType((((AnchorStyles.Top Or AnchorStyles.Bottom) _
- Or AnchorStyles.Left) _
- Or AnchorStyles.Right), AnchorStyles)
- Me.LvDEVoptions.Columns.AddRange(New ColumnHeader() {Me.ColumnHeader4, Me.ColumnHeader7, Me.ColumnHeader5, Me.ColumnHeader6, Me.ColumnHeader8, Me.ColumnHeader9})
+ Me.LvDEVoptions.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.LvDEVoptions.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader4, Me.ColumnHeader7, Me.ColumnHeader5, Me.ColumnHeader6, Me.ColumnHeader8, Me.ColumnHeader9})
Me.LvDEVoptions.FullRowSelect = True
Me.LvDEVoptions.GridLines = True
- Me.LvDEVoptions.Location = New Point(6, 6)
+ Me.LvDEVoptions.Location = New System.Drawing.Point(6, 6)
Me.LvDEVoptions.MultiSelect = False
Me.LvDEVoptions.Name = "LvDEVoptions"
- Me.LvDEVoptions.Size = New Size(1022, 277)
+ Me.LvDEVoptions.Size = New System.Drawing.Size(1022, 277)
Me.LvDEVoptions.TabIndex = 0
Me.LvDEVoptions.UseCompatibleStateImageBehavior = False
- Me.LvDEVoptions.View = View.Details
+ Me.LvDEVoptions.View = System.Windows.Forms.View.Details
'
'ColumnHeader4
'
@@ -761,32 +494,32 @@ Partial Class F_MAINForm
'
'ConMenFilelist
'
- Me.ConMenFilelist.Items.AddRange(New ToolStripItem() {Me.SaveListToolStripMenuItem, Me.LoadListToolStripMenuItem, Me.LoadDefaultListToolStripMenuItem, Me.ClearListToolStripMenuItem})
+ Me.ConMenFilelist.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.SaveListToolStripMenuItem, Me.LoadListToolStripMenuItem, Me.LoadDefaultListToolStripMenuItem, Me.ClearListToolStripMenuItem})
Me.ConMenFilelist.Name = "ConMenFilelist"
- Me.ConMenFilelist.Size = New Size(176, 92)
+ Me.ConMenFilelist.Size = New System.Drawing.Size(176, 92)
'
'SaveListToolStripMenuItem
'
Me.SaveListToolStripMenuItem.Name = "SaveListToolStripMenuItem"
- Me.SaveListToolStripMenuItem.Size = New Size(175, 22)
+ Me.SaveListToolStripMenuItem.Size = New System.Drawing.Size(175, 22)
Me.SaveListToolStripMenuItem.Text = "Save List..."
'
'LoadListToolStripMenuItem
'
Me.LoadListToolStripMenuItem.Name = "LoadListToolStripMenuItem"
- Me.LoadListToolStripMenuItem.Size = New Size(175, 22)
+ Me.LoadListToolStripMenuItem.Size = New System.Drawing.Size(175, 22)
Me.LoadListToolStripMenuItem.Text = "Load List..."
'
'LoadDefaultListToolStripMenuItem
'
Me.LoadDefaultListToolStripMenuItem.Name = "LoadDefaultListToolStripMenuItem"
- Me.LoadDefaultListToolStripMenuItem.Size = New Size(175, 22)
+ Me.LoadDefaultListToolStripMenuItem.Size = New System.Drawing.Size(175, 22)
Me.LoadDefaultListToolStripMenuItem.Text = "Load Autosave-List"
'
'ClearListToolStripMenuItem
'
Me.ClearListToolStripMenuItem.Name = "ClearListToolStripMenuItem"
- Me.ClearListToolStripMenuItem.Size = New Size(175, 22)
+ Me.ClearListToolStripMenuItem.Size = New System.Drawing.Size(175, 22)
Me.ClearListToolStripMenuItem.Text = "Clear List"
'
'BackgroundWorker1
@@ -795,21 +528,21 @@ Partial Class F_MAINForm
'LvMsg
'
Me.LvMsg.AllowColumnReorder = True
- Me.LvMsg.BorderStyle = BorderStyle.FixedSingle
- Me.LvMsg.Columns.AddRange(New ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader2, Me.ColumnHeader3})
- Me.LvMsg.Dock = DockStyle.Fill
- Me.LvMsg.Font = New Font("Courier New", 8.25!, FontStyle.Regular, GraphicsUnit.Point, CType(0, Byte))
+ Me.LvMsg.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+ Me.LvMsg.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader2, Me.ColumnHeader3})
+ Me.LvMsg.Dock = System.Windows.Forms.DockStyle.Fill
+ Me.LvMsg.Font = New System.Drawing.Font("Courier New", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.LvMsg.FullRowSelect = True
Me.LvMsg.GridLines = True
- Me.LvMsg.HeaderStyle = ColumnHeaderStyle.Nonclickable
+ Me.LvMsg.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable
Me.LvMsg.LabelWrap = False
- Me.LvMsg.Location = New Point(0, 0)
- Me.LvMsg.Margin = New Padding(0)
+ Me.LvMsg.Location = New System.Drawing.Point(0, 0)
+ Me.LvMsg.Margin = New System.Windows.Forms.Padding(0)
Me.LvMsg.Name = "LvMsg"
- Me.LvMsg.Size = New Size(1045, 281)
+ Me.LvMsg.Size = New System.Drawing.Size(1045, 281)
Me.LvMsg.TabIndex = 0
Me.LvMsg.UseCompatibleStateImageBehavior = False
- Me.LvMsg.View = View.Details
+ Me.LvMsg.View = System.Windows.Forms.View.Details
'
'ColumnHeader1
'
@@ -828,184 +561,184 @@ Partial Class F_MAINForm
'
'SplitContainer1
'
- Me.SplitContainer1.Anchor = CType((((AnchorStyles.Top Or AnchorStyles.Bottom) _
- Or AnchorStyles.Left) _
- Or AnchorStyles.Right), AnchorStyles)
- Me.SplitContainer1.Location = New Point(0, 27)
- Me.SplitContainer1.Margin = New Padding(0)
+ Me.SplitContainer1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.SplitContainer1.Location = New System.Drawing.Point(0, 27)
+ Me.SplitContainer1.Margin = New System.Windows.Forms.Padding(0)
Me.SplitContainer1.Name = "SplitContainer1"
- Me.SplitContainer1.Orientation = Orientation.Horizontal
+ Me.SplitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal
'
'SplitContainer1.Panel1
'
Me.SplitContainer1.Panel1.Controls.Add(Me.TabControl1)
- Me.SplitContainer1.Panel1.Padding = New Padding(3, 3, 0, 2)
+ Me.SplitContainer1.Panel1.Padding = New System.Windows.Forms.Padding(3, 3, 0, 2)
'
'SplitContainer1.Panel2
'
Me.SplitContainer1.Panel2.Controls.Add(Me.LvMsg)
- Me.SplitContainer1.Size = New Size(1045, 618)
+ Me.SplitContainer1.Size = New System.Drawing.Size(1045, 618)
Me.SplitContainer1.SplitterDistance = 333
Me.SplitContainer1.TabIndex = 12
'
'ToolStrip1
'
- Me.ToolStrip1.BackgroundImageLayout = ImageLayout.None
- Me.ToolStrip1.GripStyle = ToolStripGripStyle.Hidden
- Me.ToolStrip1.Items.AddRange(New ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripSeparator2, Me.ToolStripDrDnBtTools, Me.ToolStripDrDnBtInfo})
- Me.ToolStrip1.Location = New Point(0, 0)
+ Me.ToolStrip1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
+ Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
+ Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripSeparator2, Me.ToolStripDrDnBtTools, Me.ToolStripDrDnBtInfo})
+ Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
Me.ToolStrip1.Name = "ToolStrip1"
- Me.ToolStrip1.Size = New Size(1045, 25)
+ Me.ToolStrip1.Size = New System.Drawing.Size(1045, 25)
Me.ToolStrip1.TabIndex = 11
Me.ToolStrip1.Text = "ToolStrip1"
'
'ToolStripBtNew
'
- Me.ToolStripBtNew.DisplayStyle = ToolStripItemDisplayStyle.Image
- Me.ToolStripBtNew.Image = My.Resources.Resources.blue_document_icon
- Me.ToolStripBtNew.ImageTransparentColor = Color.Magenta
+ Me.ToolStripBtNew.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+ Me.ToolStripBtNew.Image = Global.TUGraz.VECTO.My.Resources.Resources.blue_document_icon
+ Me.ToolStripBtNew.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripBtNew.Name = "ToolStripBtNew"
- Me.ToolStripBtNew.Size = New Size(23, 22)
+ Me.ToolStripBtNew.Size = New System.Drawing.Size(23, 22)
Me.ToolStripBtNew.Text = "ToolStripBtNew"
Me.ToolStripBtNew.ToolTipText = "New Job File"
'
'ToolStripBtOpen
'
- Me.ToolStripBtOpen.DisplayStyle = ToolStripItemDisplayStyle.Image
- Me.ToolStripBtOpen.Image = My.Resources.Resources.Open_icon
- Me.ToolStripBtOpen.ImageTransparentColor = Color.Magenta
+ Me.ToolStripBtOpen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+ Me.ToolStripBtOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
+ Me.ToolStripBtOpen.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripBtOpen.Name = "ToolStripBtOpen"
- Me.ToolStripBtOpen.Size = New Size(23, 22)
+ Me.ToolStripBtOpen.Size = New System.Drawing.Size(23, 22)
Me.ToolStripBtOpen.Text = "ToolStripButton1"
Me.ToolStripBtOpen.ToolTipText = "Open File..."
'
'ToolStripSeparator2
'
Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
- Me.ToolStripSeparator2.Size = New Size(6, 25)
+ Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 25)
'
'ToolStripDrDnBtTools
'
- Me.ToolStripDrDnBtTools.DropDownItems.AddRange(New ToolStripItem() {Me.GENEditorToolStripMenuItem1, Me.VEHEditorToolStripMenuItem, Me.EngineEditorToolStripMenuItem, Me.GearboxEditorToolStripMenuItem, Me.GraphToolStripMenuItem, Me.ToolStripSeparator6, Me.SignOrVerifyFilesToolStripMenuItem, Me.ToolStripSeparator4, Me.OpenLogToolStripMenuItem, Me.SettingsToolStripMenuItem})
- Me.ToolStripDrDnBtTools.Image = My.Resources.Resources.Misc_Tools_icon
- Me.ToolStripDrDnBtTools.ImageTransparentColor = Color.Magenta
+ Me.ToolStripDrDnBtTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GENEditorToolStripMenuItem1, Me.VEHEditorToolStripMenuItem, Me.EngineEditorToolStripMenuItem, Me.GearboxEditorToolStripMenuItem, Me.GraphToolStripMenuItem, Me.ToolStripSeparator6, Me.SignOrVerifyFilesToolStripMenuItem, Me.ToolStripSeparator4, Me.OpenLogToolStripMenuItem, Me.SettingsToolStripMenuItem})
+ Me.ToolStripDrDnBtTools.Image = Global.TUGraz.VECTO.My.Resources.Resources.Misc_Tools_icon
+ Me.ToolStripDrDnBtTools.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripDrDnBtTools.Name = "ToolStripDrDnBtTools"
- Me.ToolStripDrDnBtTools.Size = New Size(65, 22)
+ Me.ToolStripDrDnBtTools.Size = New System.Drawing.Size(65, 22)
Me.ToolStripDrDnBtTools.Text = "Tools"
'
'GENEditorToolStripMenuItem1
'
- Me.GENEditorToolStripMenuItem1.Image = My.Resources.Resources.F_VECTO
+ Me.GENEditorToolStripMenuItem1.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
Me.GENEditorToolStripMenuItem1.Name = "GENEditorToolStripMenuItem1"
- Me.GENEditorToolStripMenuItem1.Size = New Size(170, 22)
+ Me.GENEditorToolStripMenuItem1.Size = New System.Drawing.Size(170, 22)
Me.GENEditorToolStripMenuItem1.Text = "Job Editor"
'
'VEHEditorToolStripMenuItem
'
- Me.VEHEditorToolStripMenuItem.Image = My.Resources.Resources.F_VEH
+ Me.VEHEditorToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VEH
Me.VEHEditorToolStripMenuItem.Name = "VEHEditorToolStripMenuItem"
- Me.VEHEditorToolStripMenuItem.Size = New Size(170, 22)
+ Me.VEHEditorToolStripMenuItem.Size = New System.Drawing.Size(170, 22)
Me.VEHEditorToolStripMenuItem.Text = "Vehicle Editor"
'
'EngineEditorToolStripMenuItem
'
- Me.EngineEditorToolStripMenuItem.Image = My.Resources.Resources.F_ENG
+ Me.EngineEditorToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_ENG
Me.EngineEditorToolStripMenuItem.Name = "EngineEditorToolStripMenuItem"
- Me.EngineEditorToolStripMenuItem.Size = New Size(170, 22)
+ Me.EngineEditorToolStripMenuItem.Size = New System.Drawing.Size(170, 22)
Me.EngineEditorToolStripMenuItem.Text = "Engine Editor"
'
'GearboxEditorToolStripMenuItem
'
- Me.GearboxEditorToolStripMenuItem.Image = My.Resources.Resources.F_GBX
+ Me.GearboxEditorToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_GBX
Me.GearboxEditorToolStripMenuItem.Name = "GearboxEditorToolStripMenuItem"
- Me.GearboxEditorToolStripMenuItem.Size = New Size(170, 22)
+ Me.GearboxEditorToolStripMenuItem.Size = New System.Drawing.Size(170, 22)
Me.GearboxEditorToolStripMenuItem.Text = "Gearbox Editor"
'
'GraphToolStripMenuItem
'
- Me.GraphToolStripMenuItem.Image = My.Resources.Resources.F_Graph
+ Me.GraphToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_Graph
Me.GraphToolStripMenuItem.Name = "GraphToolStripMenuItem"
- Me.GraphToolStripMenuItem.Size = New Size(170, 22)
+ Me.GraphToolStripMenuItem.Size = New System.Drawing.Size(170, 22)
Me.GraphToolStripMenuItem.Text = "Graph"
'
'ToolStripSeparator6
'
Me.ToolStripSeparator6.Name = "ToolStripSeparator6"
- Me.ToolStripSeparator6.Size = New Size(167, 6)
+ Me.ToolStripSeparator6.Size = New System.Drawing.Size(167, 6)
'
'SignOrVerifyFilesToolStripMenuItem
'
- Me.SignOrVerifyFilesToolStripMenuItem.Image = My.Resources.Resources.Status_dialog_password_icon
+ Me.SignOrVerifyFilesToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.Status_dialog_password_icon
Me.SignOrVerifyFilesToolStripMenuItem.Name = "SignOrVerifyFilesToolStripMenuItem"
- Me.SignOrVerifyFilesToolStripMenuItem.Size = New Size(170, 22)
+ Me.SignOrVerifyFilesToolStripMenuItem.Size = New System.Drawing.Size(170, 22)
Me.SignOrVerifyFilesToolStripMenuItem.Text = "Sign or Verify Files"
'
'ToolStripSeparator4
'
Me.ToolStripSeparator4.Name = "ToolStripSeparator4"
- Me.ToolStripSeparator4.Size = New Size(167, 6)
+ Me.ToolStripSeparator4.Size = New System.Drawing.Size(167, 6)
Me.ToolStripSeparator4.Visible = False
'
'OpenLogToolStripMenuItem
'
Me.OpenLogToolStripMenuItem.Name = "OpenLogToolStripMenuItem"
- Me.OpenLogToolStripMenuItem.Size = New Size(170, 22)
+ Me.OpenLogToolStripMenuItem.Size = New System.Drawing.Size(170, 22)
Me.OpenLogToolStripMenuItem.Text = "Open Log"
'
'SettingsToolStripMenuItem
'
Me.SettingsToolStripMenuItem.Name = "SettingsToolStripMenuItem"
- Me.SettingsToolStripMenuItem.Size = New Size(170, 22)
+ Me.SettingsToolStripMenuItem.Size = New System.Drawing.Size(170, 22)
Me.SettingsToolStripMenuItem.Text = "Settings"
'
'ToolStripDrDnBtInfo
'
- Me.ToolStripDrDnBtInfo.DropDownItems.AddRange(New ToolStripItem() {Me.UserManualToolStripMenuItem, Me.UpdateNotesToolStripMenuItem, Me.ReportBugViaCITnetToolStripMenuItem, Me.ToolStripSeparator3, Me.CreateActivationFileToolStripMenuItem, Me.AboutVECTOToolStripMenuItem1})
- Me.ToolStripDrDnBtInfo.Image = My.Resources.Resources.Help_icon
- Me.ToolStripDrDnBtInfo.ImageTransparentColor = Color.Magenta
+ Me.ToolStripDrDnBtInfo.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.UserManualToolStripMenuItem, Me.UpdateNotesToolStripMenuItem, Me.ReportBugViaCITnetToolStripMenuItem, Me.ToolStripSeparator3, Me.CreateActivationFileToolStripMenuItem, Me.AboutVECTOToolStripMenuItem1})
+ Me.ToolStripDrDnBtInfo.Image = Global.TUGraz.VECTO.My.Resources.Resources.Help_icon
+ Me.ToolStripDrDnBtInfo.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripDrDnBtInfo.Name = "ToolStripDrDnBtInfo"
- Me.ToolStripDrDnBtInfo.Size = New Size(61, 22)
+ Me.ToolStripDrDnBtInfo.Size = New System.Drawing.Size(61, 22)
Me.ToolStripDrDnBtInfo.Text = "Help"
'
'UserManualToolStripMenuItem
'
Me.UserManualToolStripMenuItem.Name = "UserManualToolStripMenuItem"
- Me.UserManualToolStripMenuItem.Size = New Size(222, 22)
+ Me.UserManualToolStripMenuItem.Size = New System.Drawing.Size(222, 22)
Me.UserManualToolStripMenuItem.Text = "User Manual"
'
'UpdateNotesToolStripMenuItem
'
Me.UpdateNotesToolStripMenuItem.Name = "UpdateNotesToolStripMenuItem"
- Me.UpdateNotesToolStripMenuItem.Size = New Size(222, 22)
+ Me.UpdateNotesToolStripMenuItem.Size = New System.Drawing.Size(222, 22)
Me.UpdateNotesToolStripMenuItem.Text = "Release Notes"
'
'ReportBugViaCITnetToolStripMenuItem
'
Me.ReportBugViaCITnetToolStripMenuItem.Name = "ReportBugViaCITnetToolStripMenuItem"
- Me.ReportBugViaCITnetToolStripMenuItem.Size = New Size(222, 22)
+ Me.ReportBugViaCITnetToolStripMenuItem.Size = New System.Drawing.Size(222, 22)
Me.ReportBugViaCITnetToolStripMenuItem.Text = "Report Bug via CITnet / JIRA"
'
'ToolStripSeparator3
'
Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
- Me.ToolStripSeparator3.Size = New Size(219, 6)
+ Me.ToolStripSeparator3.Size = New System.Drawing.Size(219, 6)
'
'CreateActivationFileToolStripMenuItem
'
Me.CreateActivationFileToolStripMenuItem.Name = "CreateActivationFileToolStripMenuItem"
- Me.CreateActivationFileToolStripMenuItem.Size = New Size(222, 22)
+ Me.CreateActivationFileToolStripMenuItem.Size = New System.Drawing.Size(222, 22)
Me.CreateActivationFileToolStripMenuItem.Text = "Create Activation File"
'
'AboutVECTOToolStripMenuItem1
'
Me.AboutVECTOToolStripMenuItem1.Name = "AboutVECTOToolStripMenuItem1"
- Me.AboutVECTOToolStripMenuItem1.Size = New Size(222, 22)
+ Me.AboutVECTOToolStripMenuItem1.Size = New System.Drawing.Size(222, 22)
Me.AboutVECTOToolStripMenuItem1.Text = "About VECTO"
'
'CmDEV
'
Me.CmDEV.Name = "CmDEV"
- Me.CmDEV.Size = New Size(61, 4)
+ Me.CmDEV.Size = New System.Drawing.Size(61, 4)
'
'TmProgSec
'
@@ -1013,39 +746,48 @@ Partial Class F_MAINForm
'
'CmOpenFile
'
- Me.CmOpenFile.Items.AddRange(New ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.OpenInGraphWindowToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
+ Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.OpenInGraphWindowToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
Me.CmOpenFile.Name = "CmOpenFile"
- Me.CmOpenFile.Size = New Size(199, 70)
+ Me.CmOpenFile.Size = New System.Drawing.Size(199, 70)
'
'OpenWithToolStripMenuItem
'
Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem"
- Me.OpenWithToolStripMenuItem.Size = New Size(198, 22)
+ Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(198, 22)
Me.OpenWithToolStripMenuItem.Text = "Open with ..."
'
'OpenInGraphWindowToolStripMenuItem
'
Me.OpenInGraphWindowToolStripMenuItem.Name = "OpenInGraphWindowToolStripMenuItem"
- Me.OpenInGraphWindowToolStripMenuItem.Size = New Size(198, 22)
+ Me.OpenInGraphWindowToolStripMenuItem.Size = New System.Drawing.Size(198, 22)
Me.OpenInGraphWindowToolStripMenuItem.Text = "Open in Graph Window"
'
'ShowInFolderToolStripMenuItem
'
Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem"
- Me.ShowInFolderToolStripMenuItem.Size = New Size(198, 22)
+ Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(198, 22)
Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
'
+ 'GroupBox2
+ '
+ Me.GroupBox2.Controls.Add(Me.ChBoxModOut)
+ Me.GroupBox2.Controls.Add(Me.ChBoxMod1Hz)
+ Me.GroupBox2.Location = New System.Drawing.Point(9, 81)
+ Me.GroupBox2.Name = "GroupBox2"
+ Me.GroupBox2.Size = New System.Drawing.Size(167, 89)
+ Me.GroupBox2.TabIndex = 16
+ Me.GroupBox2.TabStop = False
+ Me.GroupBox2.Text = "Mode"
+ '
'F_MAINForm
'
Me.AcceptButton = Me.btStartV3
- Me.AutoScaleDimensions = New SizeF(6.0!, 13.0!)
- Me.AutoScaleMode = AutoScaleMode.Font
- Me.ClientSize = New Size(1045, 670)
+ Me.ClientSize = New System.Drawing.Size(1045, 670)
Me.Controls.Add(Me.ToolStrip1)
Me.Controls.Add(Me.SplitContainer1)
Me.Controls.Add(Me.StatusBAR)
- Me.Icon = CType(resources.GetObject("$this.Icon"), Icon)
- Me.MinimumSize = New Size(785, 485)
+ Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+ Me.MinimumSize = New System.Drawing.Size(785, 485)
Me.Name = "F_MAINForm"
Me.Text = "VECTO"
Me.StatusBAR.ResumeLayout(False)
@@ -1053,29 +795,23 @@ Partial Class F_MAINForm
Me.TabControl1.ResumeLayout(False)
Me.TabPageGEN.ResumeLayout(False)
Me.TabPageGEN.PerformLayout()
- CType(Me.PictureBox1, ISupportInitialize).EndInit()
- Me.TabPageDRI.ResumeLayout(False)
- Me.TabPageDRI.PerformLayout()
+ CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
Me.TabPgOptions.ResumeLayout(False)
- Me.TabPgOptions.PerformLayout()
- Me.GrBoxBATCH.ResumeLayout(False)
- Me.GrBoxBATCH.PerformLayout()
Me.PanelOptAllg.ResumeLayout(False)
- Me.PanelOptAllg.PerformLayout()
Me.GroupBox1.ResumeLayout(False)
Me.GroupBox1.PerformLayout()
- Me.PnDeclOpt.ResumeLayout(False)
- Me.PnDeclOpt.PerformLayout()
Me.TabPageDEV.ResumeLayout(False)
Me.TabPageDEV.PerformLayout()
Me.ConMenFilelist.ResumeLayout(False)
Me.SplitContainer1.Panel1.ResumeLayout(False)
Me.SplitContainer1.Panel2.ResumeLayout(False)
- CType(Me.SplitContainer1, ISupportInitialize).EndInit()
+ CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).EndInit()
Me.SplitContainer1.ResumeLayout(False)
Me.ToolStrip1.ResumeLayout(False)
Me.ToolStrip1.PerformLayout()
Me.CmOpenFile.ResumeLayout(False)
+ Me.GroupBox2.ResumeLayout(False)
+ Me.GroupBox2.PerformLayout()
Me.ResumeLayout(False)
Me.PerformLayout()
@@ -1084,11 +820,8 @@ Partial Class F_MAINForm
Friend WithEvents ToolStripLbStatus As ToolStripStatusLabel
Friend WithEvents TabControl1 As TabControl
Friend WithEvents TabPageGEN As TabPage
- Friend WithEvents TabPageDRI As TabPage
Friend WithEvents ButtonGENadd As Button
Friend WithEvents ButtonGENremove As Button
- Friend WithEvents ButtonDRIremove As Button
- Friend WithEvents ButtonDRIadd As Button
Friend WithEvents ConMenFilelist As ContextMenuStrip
Friend WithEvents SaveListToolStripMenuItem As ToolStripMenuItem
Friend WithEvents LoadListToolStripMenuItem As ToolStripMenuItem
@@ -1099,29 +832,16 @@ Partial Class F_MAINForm
Friend WithEvents LvGEN As ListView
Friend WithEvents ColGENpath As ColumnHeader
Friend WithEvents ColGENstatus As ColumnHeader
- Friend WithEvents LvDRI As ListView
- Friend WithEvents ColDRIpath As ColumnHeader
- Friend WithEvents ColDRIstatus As ColumnHeader
Friend WithEvents ChBoxAllGEN As CheckBox
- Friend WithEvents ChBoxAllDRI As CheckBox
Friend WithEvents TabPgOptions As TabPage
Friend WithEvents ChBoxModOut As CheckBox
- Friend WithEvents ChBoxUseGears As CheckBox
- Friend WithEvents ChBoxCyclDistCor As CheckBox
Friend WithEvents PanelOptAllg As Panel
Friend WithEvents LbAutoShDown As Label
- Friend WithEvents ChBoxAutoSD As CheckBox
- Friend WithEvents TbBOpath As TextBox
- Friend WithEvents CbBOmode As ComboBox
- Friend WithEvents Label2 As Label
- Friend WithEvents ButBObrowse As Button
- Friend WithEvents ChBoxBatchSubD As CheckBox
Friend WithEvents LvMsg As ListView
Friend WithEvents ColumnHeader1 As ColumnHeader
Friend WithEvents SplitContainer1 As SplitContainer
Friend WithEvents ColumnHeader2 As ColumnHeader
Friend WithEvents ColumnHeader3 As ColumnHeader
- Friend WithEvents GrBoxBATCH As GroupBox
Friend WithEvents TabPageDEV As TabPage
Friend WithEvents LvDEVoptions As ListView
Friend WithEvents ColumnHeader4 As ColumnHeader
@@ -1131,8 +851,6 @@ Partial Class F_MAINForm
Friend WithEvents ColumnHeader7 As ColumnHeader
Friend WithEvents BtGENup As Button
Friend WithEvents BtGENdown As Button
- Friend WithEvents BtDRIdown As Button
- Friend WithEvents BtDRIup As Button
Friend WithEvents ToolStrip1 As ToolStrip
Friend WithEvents ToolStripBtNew As ToolStripButton
Friend WithEvents ToolStripBtOpen As ToolStripButton
@@ -1161,12 +879,9 @@ Partial Class F_MAINForm
Friend WithEvents UpdateNotesToolStripMenuItem As ToolStripMenuItem
Friend WithEvents SignOrVerifyFilesToolStripMenuItem As ToolStripMenuItem
Friend WithEvents ToolStripSeparator6 As ToolStripSeparator
- Friend WithEvents GrBoxSTD As GroupBox
- Friend WithEvents PnDeclOpt As Panel
Friend WithEvents LbDecl As Label
Friend WithEvents GraphToolStripMenuItem As ToolStripMenuItem
Friend WithEvents OpenInGraphWindowToolStripMenuItem As ToolStripMenuItem
- Friend WithEvents CbBatch As CheckBox
Friend WithEvents RbDev As RadioButton
Friend WithEvents RbDecl As RadioButton
Friend WithEvents GroupBox1 As GroupBox
@@ -1186,6 +901,6 @@ Partial Class F_MAINForm
Friend WithEvents PasteToolStripButton As ToolStripButton
Friend WithEvents toolStripSeparator1 As ToolStripSeparator
Friend WithEvents HelpToolStripButton As ToolStripButton
- Friend WithEvents Label3 As Label
+ Friend WithEvents GroupBox2 As System.Windows.Forms.GroupBox
End Class
diff --git a/VECTO/GUI/F_MAINForm.resx b/VECTO/GUI/F_MAINForm.resx
index 0d31c37361..315e332dbf 100644
--- a/VECTO/GUI/F_MAINForm.resx
+++ b/VECTO/GUI/F_MAINForm.resx
@@ -223,6 +223,9 @@
<metadata name="CmOpenFile.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>732, 12</value>
</metadata>
+ <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>850, 12</value>
+ </metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>49</value>
</metadata>
diff --git a/VECTO/GUI/F_MAINForm.vb b/VECTO/GUI/F_MAINForm.vb
index b3452ce30f..8f14dbf22d 100644
--- a/VECTO/GUI/F_MAINForm.vb
+++ b/VECTO/GUI/F_MAINForm.vb
@@ -30,7 +30,6 @@
'
Imports System.Collections.Generic
-Imports System.Collections.ObjectModel
Imports System.ComponentModel
Imports System.IO
Imports System.Linq
@@ -60,23 +59,15 @@ Public Class F_MAINForm
Private ConMenTarget As ListView
Private ConMenTarJob As Boolean
- Private CycleTabPage As TabPage
- Private CycleTabPageVisible As Boolean
+ 'Private CycleTabPage As TabPage
+ 'Private CycleTabPageVisible As Boolean
- Private ComLineShutDown As Boolean
Private GUIlocked As Boolean
- Private CheckedItems As List(Of ListViewItem)
-
- Private DEVpage As TabPage
- Private CmDEVitem As ListViewItem
-
Private CheckLock As Boolean
Private GENchecked As Integer
- Private DRIchecked As Integer
Private GENcheckAllLock As Boolean
- Private DRIcheckAllLock As Boolean
Private CbDeclLock As Boolean = False
@@ -187,81 +178,16 @@ Public Class F_MAINForm
#End Region
-#Region "VECTO-Worker"
'VECTO-Launcher
- Public Sub VECTO_Launcher()
- Dim ProgOverall As Boolean
- Dim GEN0 As cVECTO
-
- 'Called when VECTO already running
- If VECTOworker.IsBusy Then
- GUImsg(tMsgID.Err, "VECTO is already running!")
- Exit Sub
- End If
-
- 'Delete GENlist-Selection
- LvGEN.SelectedItems.Clear()
-
- 'If more than 100 calculations, ask whether to write by-second results
- If _
- Cfg.BatchMode And ((LvGEN.CheckedItems.Count) * (LvDRI.CheckedItems.Count) > 100) And
- ChBoxModOut.Checked _
- Then
- Select Case _
- MsgBox(
- "You are about to run Batch Mode with " &
- (LvGEN.CheckedItems.Count) * (LvDRI.CheckedItems.Count) &
- " calculations!" & ChrW(10) & "Do you still want to write modal results?", MsgBoxStyle.YesNoCancel)
- Case MsgBoxResult.No
- ChBoxModOut.Checked = False
- Case MsgBoxResult.Cancel
- GUImsg(tMsgID.Normal, "Aborted by User")
- Exit Sub
- End Select
- End If
-
- 'Status
- Status("Launching VECTO...")
-
-
- 'Define Job-0list
-
- 'Define File / Cycle list
- SetJobList()
-
- 'Zyklus-Liste definieren (falls nicht BATCH-Modus wird in SetCycleList nur die Liste gelöscht und nicht neu belegt) |@@| Define Cycle-list (if not BATCH mode in SetCycleList deleted only the list and not reassigned)
- SetCycleList()
-
- If JobFileList.Count = 0 Then
- GUImsg(tMsgID.Err, "No job file selected!")
- Exit Sub
- End If
-
- 'Check whether Overall-progbar is needed
- If Cfg.BatchMode Or JobFileList.Count > 1 Or Cfg.DeclMode Then
- ProgOverall = True
- Else
- GEN0 = New cVECTO
- GEN0.FilePath = JobFileList(0)
- If Not GEN0.ReadFile Then
- GUImsg(tMsgID.Err, "Failed to job file (" & fFILE(JobFileList(0), True) & ")!")
- Exit Sub
- End If
- ProgOverall = (GEN0.CycleFiles.Count > 1)
- End If
-
- 'Launch through Job_Launcher
- Job_Launcher(ProgOverall)
- End Sub
'Lock certain GUI elements while VECTO is running
Private Sub LockGUI(Lock As Boolean)
GUIlocked = Lock
PanelOptAllg.Enabled = Not Lock
- GrBoxSTD.Enabled = Not Lock
- GrBoxBATCH.Enabled = Not Lock
+ 'GrBoxSTD.Enabled = Not Lock
+ 'GrBoxBATCH.Enabled = Not Lock
BtGENup.Enabled = Not Lock
BtGENdown.Enabled = Not Lock
@@ -270,182 +196,22 @@ Public Class F_MAINForm
LvGEN.LabelEdit = Not Lock
ChBoxAllGEN.Enabled = Not Lock
- BtDRIup.Enabled = Not Lock
- BtDRIdown.Enabled = Not Lock
- ButtonDRIadd.Enabled = Not Lock
- ButtonDRIremove.Enabled = Not Lock
- LvDRI.LabelEdit = Not Lock
- ChBoxAllDRI.Enabled = Not Lock
+ 'BtDRIup.Enabled = Not Lock
+ 'BtDRIdown.Enabled = Not Lock
+ 'ButtonDRIadd.Enabled = Not Lock
+ 'ButtonDRIremove.Enabled = Not Lock
+ 'LvDRI.LabelEdit = Not Lock
+ 'ChBoxAllDRI.Enabled = Not Lock
btStartV3.Enabled = Not Lock
- If DEV.Enabled Then
- LvDEVoptions.Enabled = Not Lock
- End If
+ 'If DEV.Enabled Then
+ ' LvDEVoptions.Enabled = Not Lock
+ 'End If
End Sub
'Define job file list
- Private Sub SetJobList()
- Dim LV0 As ListViewItem
- Dim x As Integer
-
- JobFileList.Clear()
- CheckedItems.Clear()
-
- x = -1
- For Each LV0 In LvGEN.CheckedItems
- x += 1
- LV0.SubItems(1).Text = ""
- CheckedItems.Add(LV0)
- SetCheckedItemColor(x, tJobStatus.Queued)
- JobFileList.Add(fFileRepl(LV0.SubItems(0).Text))
- Next
- End Sub
-
- 'Define cycle list (BATCH mode only)
- Private Sub SetCycleList()
- Dim LV0 As ListViewItem
-
- JobCycleList.Clear()
-
- If Cfg.BatchMode Then
- For Each LV0 In LvDRI.CheckedItems
- JobCycleList.Add(fFileRepl(LV0.SubItems(0).Text))
- Next
- End If
- End Sub
-
- 'Job Launcher
- Private Sub Job_Launcher(ProgOverallEnabled As Boolean)
-
- If VECTOworker.IsBusy Then Exit Sub
-
- 'Load Options from Options Tab
- SetOptions()
-
- 'Save Config
- Cfg.Save()
-
- If DEV.Enabled Then DEV.SaveToFile()
-
- 'Reset Msg-output
- ClearMSG()
-
- 'Disable Options
- LockGUI(True)
-
-
- 'ProgBars start
- If ProgOverallEnabled Then
- ToolStripProgBarOverall.Value = 0
- ToolStripProgBarOverall.Style = ProgressBarStyle.Marquee
- ToolStripProgBarOverall.Visible = True
- End If
-
- ProgBarCtrl.ProgJobInt = 0
- ProgSecStart()
-
- 'BG-Worker start
- VECTOworker.RunWorkerAsync()
- End Sub
-
- 'Abort Job
- Private Sub JobAbort()
- VECTOworker.CancelAsync()
- End Sub
-
-
-#Region "BackgroundWorker Events"
-
-
- 'Progress Report - Progressbar, Messages, etc.
- Private Sub BackgroundWorker1_ProgressChanged(sender As Object,
- e As ProgressChangedEventArgs) _
- Handles BackgroundWorker1.ProgressChanged
- Dim x As cWorkProg
- x = e.UserState
-
- Select Case x.Target
- Case tWorkMsgType.StatusListBox
- MSGtoForm(e.UserState.ID, e.UserState.Msg, x.Source, x.Link)
-
- Case tWorkMsgType.StatusBar
- Status(e.UserState.Msg)
-
- Case tWorkMsgType.ProgBars
- ToolStripProgBarOverall.Value = e.ProgressPercentage
- ProgSecStart()
-
- Case tWorkMsgType.JobStatus
- CheckedItems(x.FileIndex).SubItems(1).Text = x.Msg
- SetCheckedItemColor(x.FileIndex, x.Status)
-
- Case tWorkMsgType.CycleStatus
- Try
- LvDRI.CheckedItems(x.FileIndex).SubItems(1).Text = x.Msg
- Catch ex As Exception
- End Try
-
- Case tWorkMsgType.InitProgBar
- ToolStripProgBarOverall.Style = ProgressBarStyle.Continuous
-
- Case Else ' tWorkMsgType.Abort
- JobAbort()
-
- End Select
- End Sub
-
- 'Work completed
- Private Sub BackgroundWorker1_RunWorkerCompleted(sender As Object,
- e As RunWorkerCompletedEventArgs) _
- Handles BackgroundWorker1.RunWorkerCompleted
-
- Dim Result As tCalcResult
-
- 'Progbar reset
- ToolStripProgBarOverall.Visible = False
- ToolStripProgBarOverall.Style = ProgressBarStyle.Continuous
- ToolStripProgBarOverall.Value = 0
- ProgSecStop()
-
- 'So ListView-Item Colors (Warning = Yellow, etc..) are correctly visible
- LvGEN.SelectedIndices.Clear()
-
- Result = e.Result
- 'ShutDown when Unexpected Error
- If e.Error IsNot Nothing Then
- MsgBox("An Unexpected Error occurred!" & ChrW(10) & ChrW(10) &
- e.Error.Message.ToString, MsgBoxStyle.Critical, "Unexpected Error")
- LogFile.WriteToLog(tMsgID.Err, ">>>Unexpected Error:" & e.Error.ToString())
- Close()
- End If
-
- 'Options enable / GUI reset
- LockGUI(False)
- Status(LastModeName & " Mode")
-
- 'Command Line Shutdown
- If ComLineShutDown Then Close()
-
- 'Auto Shutdown
- If ChBoxAutoSD.Checked Then
- ChBoxAutoSD.Checked = False
- If Not Result = tCalcResult.Abort Then
- If F_ShutDown.ShutDown Then
- GUImsg(tMsgID.Warn, "Shutting down...")
- Close()
- End If
- End If
- End If
-
- 'SLEEP reactivate
- AllowSleepON()
- End Sub
-
-#End Region
-
-#End Region
#Region "Form Init/Close"
@@ -456,26 +222,25 @@ Public Class F_MAINForm
GUIlocked = False
CheckLock = False
GENcheckAllLock = False
- DRIcheckAllLock = False
- DRIchecked = 0
+ 'DRIcheckAllLock = False
+ 'DRIchecked = 0
GENchecked = 0
- CheckedItems = New List(Of ListViewItem)
'Load Tabs properly (otherwise problem with ListViews)
For x = 0 To TabControl1.TabCount - 1
TabControl1.TabPages(x).Show()
Next
- CycleTabPageVisible = True
- CycleTabPage = TabPageDRI
+ 'CycleTabPageVisible = True
+ 'CycleTabPage = TabPageDRI
- DEVpage = TabPageDEV
+ 'DEVpage = TabPageDEV
'TabControl1.Controls.Remove(DEVpage)
LastModeName = ""
- ComLineShutDown = False
+ 'ComLineShutDown = False
FB_Initialize()
@@ -486,7 +251,7 @@ Public Class F_MAINForm
JobListView = New cFileListView(MyConfPath & "joblist.txt")
JobListView.LVbox = LvGEN
CycleListView = New cFileListView(MyConfPath & "cyclelist.txt")
- CycleListView.LVbox = LvDRI
+ 'CycleListView.LVbox = LvDRI
JobListView.LoadList()
@@ -495,13 +260,10 @@ Public Class F_MAINForm
'Resize columns ... after Loading the @file-lists
LvGEN.Columns(1).Width = -2
- LvDRI.Columns(1).Width = -2
+ 'LvDRI.Columns(1).Width = -2
LvMsg.Columns(2).Width = -2
'Initialize BackgroundWorker
- VECTOworker = BackgroundWorker1
- VECTOworker.WorkerReportsProgress = True
- VECTOworker.WorkerSupportsCancellation = True
VECTOworkerV3 = New BackgroundWorker()
AddHandler VECTOworkerV3.DoWork, AddressOf VectoWorkerV3_OnDoWork
@@ -535,12 +297,12 @@ Public Class F_MAINForm
If Lic.TimeWarn Then GUImsg(tMsgID.Warn, "License expiring date (y/m/d): " & Lic.ExpTime)
End If
- DEV.Enabled = True ' Lic.LicFeature(9)
+ 'DEV.Enabled = True ' Lic.LicFeature(9)
- If DEV.Enabled Then
- DEV.LoadFromFile()
- LoadDEVconfigs()
- End If
+ 'If DEV.Enabled Then
+ ' DEV.LoadFromFile()
+ ' LoadDEVconfigs()
+ 'End If
DeclOnOff()
End Sub
@@ -563,7 +325,6 @@ Public Class F_MAINForm
If Cfg.DeclMode Then
Text = "VECTO " & COREvers & " - Declaration Mode"
- CbBatch.Checked = False
Cfg.DeclInit()
Else
Text = "VECTO " & COREvers
@@ -572,23 +333,23 @@ Public Class F_MAINForm
If Cfg.DeclMode Then
LastModeName = "Declaration"
Else
- If Cfg.BatchMode Then
- LastModeName = "Batch"
- Else
- LastModeName = "Engineering"
- End If
- End If
-
- If DEV.Enabled Then
- If Not Cfg.DeclMode Then
- If Not TabControl1.TabPages.Contains(DEVpage) Then _
- TabControl1.TabPages.Insert(TabControl1.TabPages.Count, DEVpage)
- LoadDEVconfigs()
- Else
- If TabControl1.TabPages.Contains(DEVpage) Then TabControl1.Controls.Remove(DEVpage)
- DEV.SetDefault()
- End If
- End If
+ 'If Cfg.BatchMode Then
+ ' LastModeName = "Batch"
+ 'Else
+ LastModeName = "Engineering"
+ 'End If
+ End If
+
+ 'If DEV.Enabled Then
+ ' If Not Cfg.DeclMode Then
+ ' If Not TabControl1.TabPages.Contains(DEVpage) Then _
+ ' TabControl1.TabPages.Insert(TabControl1.TabPages.Count, DEVpage)
+ ' LoadDEVconfigs()
+ ' Else
+ ' If TabControl1.TabPages.Contains(DEVpage) Then TabControl1.Controls.Remove(DEVpage)
+ ' DEV.SetDefault()
+ ' End If
+ 'End If
Status(LastModeName & " Mode")
@@ -596,7 +357,7 @@ Public Class F_MAINForm
LbDecl.Visible = Cfg.DeclMode
- PnDeclOpt.Enabled = Not Cfg.DeclMode
+ 'PnDeclOpt.Enabled = Not Cfg.DeclMode
End Sub
'Shown Event (Form-Load finished) ... here StartUp Forms are loaded (DEV, GEN/ADV- Editor ..)
@@ -612,83 +373,18 @@ Public Class F_MAINForm
'Declaration.Init()
'Command Line Args
- If Command() <> "" Then
- CmdLineCtrl(My.Application.CommandLineArgs)
- Else
- If Cfg.FirstRun Then
- Cfg.FirstRun = False
- fwelcome = New F_Welcome
- fwelcome.ShowDialog()
- End If
+ 'If Command() <> "" Then
+ ' CmdLineCtrl(My.Application.CommandLineArgs)
+ 'Else
+ If Cfg.FirstRun Then
+ Cfg.FirstRun = False
+ fwelcome = New F_Welcome
+ fwelcome.ShowDialog()
End If
+ 'End If
End Sub
'Open file
- Private Sub CmdLineCtrl(ComLineArgs As ReadOnlyCollection(Of String))
- Dim bBATCH As Boolean
- Dim bRUN As Boolean
- Dim x As Object
- Dim str As String
- Dim ComFile As String
- Dim vecFiles As New List(Of String)
- Dim driFiles As New List(Of String)
-
- bBATCH = False
- bRUN = False
- ComFile = sKey.NoFile
-
- 'Read Command-Line Args
- For Each x In ComLineArgs
- str = Trim(Replace(x.ToString, ChrW(34), ""))
- Select Case UCase(str)
- Case "-BATCH"
- bBATCH = True
- Case "-CLOSE"
- ComLineShutDown = True
- Case "-RUN"
- bRUN = True
- Case Else
- Select Case UCase(fEXT(str))
- Case ".VECTO"
- vecFiles.Add(fFileRepl(str))
- Case ".VDRI"
- driFiles.Add(fFileRepl(str))
- Case Else
- ComFile = fFileRepl(str)
- End Select
- End Select
- Next
-
- 'Mode switch and load Driving Cycles
- If bBATCH Then
- CbBatch.Checked = True
-
- If driFiles.Count > 0 Then
- LvDRI.Items.Clear()
- AddToCycleListView(driFiles.ToArray)
- End If
-
- Else
- CbBatch.Checked = False
- End If
-
- 'Load Vecto files or open editor (if only one file)
- If vecFiles.Count > 0 Then
- If vecFiles.Count > 1 Or bRUN Then
- LvGEN.Items.Clear()
- AddToJobListView(vecFiles.ToArray)
- Else
- ComFile = vecFiles(0)
- End If
- End If
-
- 'Run or open file editor if file is specified
- If bRUN Then
- VECTO_Launcher()
- Else
- If ComFile <> sKey.NoFile Then OpenVectoFile(ComFile)
- End If
- End Sub
'Close
Private Sub F01_MAINForm_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
@@ -702,7 +398,7 @@ Public Class F_MAINForm
'Config save
SetOptions()
Cfg.Save()
- If DEV.Enabled Then DEV.SaveToFile()
+ 'If DEV.Enabled Then DEV.SaveToFile()
'File browser instances close
FB_Close()
@@ -759,7 +455,6 @@ Public Class F_MAINForm
End If
End Sub
-#Region "Job file list"
#Region "Events"
@@ -938,7 +633,8 @@ Public Class F_MAINForm
Dim ListViewItem0 As ListViewItem
'If VECTO runs: Cancel operation (because Mode-change during calculation is not very clever)
- If VECTOworker.IsBusy Then Exit Sub
+ 'If VECTOworker.IsBusy Then Exit Sub
+ If VECTOworkerV3.IsBusy Then Exit Sub
pDim = UBound(Path)
ReDim fList(0) 'um Nullverweisausnahme-Warnung zu verhindern
@@ -1029,215 +725,6 @@ lbFound:
GENcheckAllLock = False
End Sub
-#End Region
-
-#Region "Cycle list (BATCH)"
-
-
-#Region "Events"
-
- Private Sub ButtonDRIadd_Click(sender As Object, e As EventArgs) Handles ButtonDRIadd.Click
- AddCycle()
- End Sub
-
- Private Sub ButtonDRIremove_Click(sender As Object, e As EventArgs) Handles ButtonDRIremove.Click
- RemoveCycle()
- End Sub
-
- Private Sub LvDRI_ItemChecked(sender As Object, e As ItemCheckedEventArgs) Handles LvDRI.ItemChecked
-
- If e.Item.Checked Then
- DRIchecked += 1
- Else
- DRIchecked -= 1
- End If
-
- If CheckLock Then Exit Sub
- UpdateCycleTabText()
- End Sub
-
- Private Sub ChBoxAllDRI_CheckedChanged(sender As Object, e As EventArgs) Handles ChBoxAllDRI.CheckedChanged
- Dim Check As Boolean
- Dim x As ListViewItem
-
- If DRIcheckAllLock Or ChBoxAllDRI.CheckState = CheckState.Indeterminate Then Exit Sub
-
- Check = ChBoxAllDRI.Checked
-
- CheckLock = True
- LvDRI.BeginUpdate()
-
- For Each x In LvDRI.Items
- x.Checked = Check
- Next
-
- LvDRI.EndUpdate()
- CheckLock = False
-
- DRIchecked = LvDRI.CheckedItems.Count
- UpdateCycleTabText()
- End Sub
-
- Private Sub ListViewDRI_DoubleClick(sender As Object, e As EventArgs) Handles LvDRI.DoubleClick
- If LvDRI.SelectedItems.Count > 0 Then
- LvDRI.SelectedItems(0).Checked = Not LvDRI.SelectedItems(0).Checked
- OpenCycle()
- Else
- AddCycle()
- End If
- End Sub
-
- Private Sub ListViewDRI_KeyDown(sender As Object, e As KeyEventArgs) Handles LvDRI.KeyDown
- Select Case e.KeyCode
- Case Keys.Delete, Keys.Back
- If Not GUIlocked Then RemoveCycle()
- Case Keys.Enter
- OpenCycle()
- End Select
- End Sub
-
- 'Drag n' Drop
- Private Sub ListDRI_DragEnter(sender As Object, e As DragEventArgs) Handles LvDRI.DragEnter
- If (e.Data.GetDataPresent(DataFormats.FileDrop)) Then e.Effect = DragDropEffects.Copy
- End Sub
-
- Private Sub ListDRI_DragDrop(sender As Object, e As DragEventArgs) Handles LvDRI.DragDrop
- Dim f As String()
- f = CType(e.Data.GetData(DataFormats.FileDrop), Array)
- AddToCycleListView(f)
- If LvDRI.Items.Count > 0 Then LvDRI.Items(LvDRI.Items.Count - 1).Selected = True
- End Sub
-
- Private Sub BtDRIup_Click(sender As Object, e As EventArgs) Handles BtDRIup.Click
- MoveItem(LvDRI, True)
- End Sub
-
- Private Sub BtDRIdown_Click(sender As Object, e As EventArgs) Handles BtDRIdown.Click
- MoveItem(LvDRI, False)
- End Sub
-
-#End Region
-
- 'Remove selected file(s) from cycle list
- Private Sub RemoveCycle()
- Dim lastindx As Integer
- Dim SelIx() As Integer
- Dim i As Integer
-
- If LvDRI.SelectedItems.Count < 1 Then
- If LvDRI.Items.Count = 1 Then
- LvDRI.Items(0).Selected = True
- Else
- Exit Sub
- End If
- End If
-
- CheckLock = True
- LvDRI.BeginUpdate()
-
- ReDim SelIx(LvDRI.SelectedItems.Count - 1)
- LvDRI.SelectedIndices.CopyTo(SelIx, 0)
-
- lastindx = LvDRI.SelectedIndices(LvDRI.SelectedItems.Count - 1)
-
- For i = UBound(SelIx) To 0 Step -1
- LvDRI.Items.RemoveAt(SelIx(i))
- Next
-
- If lastindx < LvDRI.Items.Count Then
- LvDRI.Items(lastindx).Selected = True
- Else
- If LvDRI.Items.Count > 0 Then LvDRI.Items(LvDRI.Items.Count - 1).Selected = True
- End If
-
- CheckLock = False
- LvDRI.EndUpdate()
-
- DRIchecked = LvDRI.CheckedItems.Count
- UpdateCycleTabText()
- End Sub
-
- 'Browse for cycle file(s) and add to cycle list with AddToCycleListView
- Private Sub AddCycle()
- If fbDRI.OpenDialog("", True) Then
- AddToCycleListView(fbDRI.Files)
- If LvDRI.Items.Count > 0 Then LvDRI.Items(LvDRI.Items.Count - 1).Selected = True
- End If
- End Sub
-
- 'Open cycle in list
- Private Sub OpenCycle()
-
- If LvDRI.SelectedItems.Count < 1 Then
- If LvDRI.Items.Count = 1 Then
- LvDRI.Items(0).Selected = True
- Else
- Exit Sub
- End If
- End If
-
- OpenFiles(fFileRepl(LvDRI.SelectedItems(0).SubItems(0).Text))
- End Sub
-
- 'Add File to cycle listview (multiple files)
- Private Sub AddToCycleListView(Path As String())
- Dim pDim As Int16
- Dim p As Int16
- Dim ListViewItem0 As ListViewItem
-
- pDim = UBound(Path)
-
- LvDRI.BeginUpdate()
- CheckLock = True
-
- 'Mode switch if necessary
- If Not CbBatch.Checked Then CbBatch.Checked = True
-
- For p = 0 To pDim
- ListViewItem0 = New ListViewItem(Path(p)) 'fFileWD(Path(p)))
- ListViewItem0.SubItems.Add(" ")
- ListViewItem0.Checked = True
- LvDRI.Items.Add(ListViewItem0)
-lbFound:
- Next
-
- LvDRI.EndUpdate()
- CheckLock = False
-
- 'Number update
- DRIchecked = LvDRI.CheckedItems.Count
- UpdateCycleTabText()
- End Sub
-
- 'Add File to cycle listview (single file)
- Private Sub AddToCycleListView(Path As String)
- Dim p(0) As String
- p(0) = Path
- AddToCycleListView(p)
- End Sub
-
- 'Update cycle files counter in tab titel
- Private Sub UpdateCycleTabText()
- Dim c As Integer
- c = LvDRI.Items.Count
-
- TabPageDRI.Text = "Driving Cycles ( " & DRIchecked & " / " & c & " )"
- 'TabPageDRI.Text = "Driving Cycles (" & c & ")"
-
- DRIcheckAllLock = True
-
- If DRIchecked = 0 Then
- ChBoxAllDRI.CheckState = CheckState.Unchecked
- ElseIf DRIchecked = c Then
- ChBoxAllDRI.CheckState = CheckState.Checked
- Else
- ChBoxAllDRI.CheckState = CheckState.Indeterminate
- End If
-
- DRIcheckAllLock = False
- End Sub
-
-#End Region
#Region "Toolstrip"
@@ -1442,10 +929,10 @@ lbFound:
UpdateJobTabText()
Else 'DRI
'Mode toggle
- If Not CbBatch.Checked Then CbBatch.Checked = True
+ 'If Not CbBatch.Checked Then CbBatch.Checked = True
CycleListView.LoadList(fbFileLists.Files(0))
- DRIchecked = LvDRI.CheckedItems.Count
- UpdateCycleTabText()
+ 'DRIchecked = LvDRI.CheckedItems.Count
+ 'UpdateCycleTabText()
End If
End If
@@ -1465,8 +952,8 @@ lbFound:
UpdateJobTabText()
Else
CycleListView.LoadList()
- DRIchecked = LvDRI.CheckedItems.Count
- UpdateCycleTabText()
+ 'DRIchecked = LvDRI.CheckedItems.Count
+ 'UpdateCycleTabText()
End If
End Sub
@@ -1484,8 +971,8 @@ lbFound:
GENchecked = LvGEN.CheckedItems.Count
UpdateJobTabText()
Else
- DRIchecked = LvDRI.CheckedItems.Count
- UpdateCycleTabText()
+ 'DRIchecked = LvDRI.CheckedItems.Count
+ 'UpdateCycleTabText()
End If
End Sub
@@ -1740,62 +1227,35 @@ lbFound:
AllowSleepON()
End Sub
- 'Mode Change (STANDARD/BATCH)
- Private Sub CbBatch_CheckedChanged(sender As Object, e As EventArgs) Handles CbBatch.CheckedChanged
- ModeUpdate()
- End Sub
Private Sub ModeUpdate()
'Save lists
JobListView.SaveList()
- If Cfg.BatchMode Then CycleListView.SaveList()
+ 'If Cfg.BatchMode Then CycleListView.SaveList()
'New mode
- Cfg.BatchMode = CbBatch.Checked
+ 'Cfg.BatchMode = CbBatch.Checked
'GUI changes according to current mode
- If Cfg.BatchMode Then
-
- LastModeName = "Batch"
-
- 'Load cycle list
- CycleListView.LoadList()
-
- 'Update cycle counter
- DRIchecked = LvDRI.CheckedItems.Count
- UpdateCycleTabText()
-
- 'Show mode-specific settings
- GrBoxSTD.Visible = False
- GrBoxBATCH.Visible = True
-
- 'Show Cycle Tab Page
- If Not CycleTabPageVisible Then
- TabControl1.TabPages.Insert(1, CycleTabPage)
- CycleTabPageVisible = True
- End If
+ If Cfg.DeclMode Then
+ LastModeName = "Declaration"
Else
+ LastModeName = "Engineering"
+ End If
- If Cfg.DeclMode Then
- LastModeName = "Declaration"
- Else
- LastModeName = "Engineering"
- End If
-
- 'Show mode-specific settings
- GrBoxSTD.Visible = False 'Currently no specific settings for STANDARD mode, therefore always 'False'
- GrBoxBATCH.Visible = False
+ 'Show mode-specific settings
+ 'GrBoxSTD.Visible = False 'Currently no specific settings for STANDARD mode, therefore always 'False'
+ 'GrBoxBATCH.Visible = False
- 'Hide Cycle Tab Page
- If CycleTabPageVisible Then
- TabControl1.Controls.Remove(CycleTabPage)
- CycleTabPageVisible = False
- End If
+ 'Hide Cycle Tab Page
+ 'If CycleTabPageVisible Then
+ ' TabControl1.Controls.Remove(CycleTabPage)
+ ' CycleTabPageVisible = False
+ 'End If
- End If
'Update job counter
GENchecked = LvGEN.CheckedItems.Count
@@ -1830,7 +1290,6 @@ lbFound:
file.WriteLine(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 = "")
@@ -1890,32 +1349,32 @@ lbFound:
End Class
'Set color of job files in list (Error, Warnings, Currently running, etc.)
- Private Sub SetCheckedItemColor(LvID As Integer, Status As tJobStatus)
- Dim lv0 As ListViewItem
-
- lv0 = CheckedItems(LvID)
-
- Select Case Status
- Case tJobStatus.Err
- lv0.BackColor = Color.Red
- lv0.ForeColor = Color.White
- Case tJobStatus.OK
- lv0.BackColor = Color.White
- lv0.ForeColor = Color.DarkGreen
- Case tJobStatus.Warn
- lv0.BackColor = Color.Khaki
- lv0.ForeColor = Color.DarkBlue 'FromArgb(218, 125, 0) 'DarkOrange 'OrangeRed
- Case tJobStatus.Queued
- lv0.BackColor = Color.LightGray
- lv0.ForeColor = Color.DarkBlue
- Case tJobStatus.Running
- lv0.BackColor = Color.DarkBlue
- lv0.ForeColor = Color.White
- Case tJobStatus.Undef
- lv0.BackColor = Color.FromKnownColor(KnownColor.Window)
- lv0.ForeColor = Color.FromKnownColor(KnownColor.WindowText)
- End Select
- End Sub
+ 'Private Sub SetCheckedItemColor(LvID As Integer, Status As tJobStatus)
+ ' Dim lv0 As ListViewItem
+
+ ' lv0 = CheckedItems(LvID)
+
+ ' Select Case Status
+ ' Case tJobStatus.Err
+ ' lv0.BackColor = Color.Red
+ ' lv0.ForeColor = Color.White
+ ' Case tJobStatus.OK
+ ' lv0.BackColor = Color.White
+ ' lv0.ForeColor = Color.DarkGreen
+ ' Case tJobStatus.Warn
+ ' lv0.BackColor = Color.Khaki
+ ' lv0.ForeColor = Color.DarkBlue 'FromArgb(218, 125, 0) 'DarkOrange 'OrangeRed
+ ' Case tJobStatus.Queued
+ ' lv0.BackColor = Color.LightGray
+ ' lv0.ForeColor = Color.DarkBlue
+ ' Case tJobStatus.Running
+ ' lv0.BackColor = Color.DarkBlue
+ ' lv0.ForeColor = Color.White
+ ' Case tJobStatus.Undef
+ ' lv0.BackColor = Color.FromKnownColor(KnownColor.Window)
+ ' lv0.ForeColor = Color.FromKnownColor(KnownColor.WindowText)
+ ' End Select
+ 'End Sub
'Open Job Editor and open file (or new file)
Friend Sub OpenVECTOeditor(x As String)
@@ -1951,19 +1410,13 @@ lbFound:
'Save job and cycle file lists
Private Sub SaveFileLists()
JobListView.SaveList()
- If Cfg.BatchMode Then CycleListView.SaveList()
+ 'If Cfg.BatchMode Then CycleListView.SaveList()
End Sub
#Region "Progressbar controls"
'Initialise progress bar (Start of next job in calculation)
- Private Sub ProgSecStart()
- ToolStripProgBarJob.Value = 0
- ToolStripProgBarJob.Style = ProgressBarStyle.Marquee
- ToolStripProgBarJob.Visible = True
- TmProgSec.Start()
- End Sub
'Stop - Hide progress bar
Private Sub ProgSecStop()
@@ -2014,22 +1467,22 @@ lbFound:
'Load options from config class
Public Sub LoadOptions()
- ChBoxCyclDistCor.Checked = Cfg.DistCorr
- ChBoxUseGears.Checked = Cfg.GnUfromCycle
+ 'ChBoxCyclDistCor.Checked = Cfg.DistCorr
+ 'ChBoxUseGears.Checked = Cfg.GnUfromCycle
ChBoxModOut.Checked = Cfg.ModOut
ChBoxMod1Hz.Checked = Cfg.Mod1Hz
- CbBOmode.SelectedIndex = -1
- Select Case UCase(Cfg.BATCHoutpath)
- Case sKey.JobPath
- CbBOmode.SelectedIndex = 0
- Case Else
- CbBOmode.SelectedIndex = 1
- TbBOpath.Text = Cfg.BATCHoutpath
- End Select
- ChBoxBatchSubD.Checked = Cfg.BATCHoutSubD
+ 'CbBOmode.SelectedIndex = -1
+ 'Select Case UCase(Cfg.BATCHoutpath)
+ ' Case sKey.JobPath
+ ' CbBOmode.SelectedIndex = 0
+ ' Case Else
+ ' CbBOmode.SelectedIndex = 1
+ ' TbBOpath.Text = Cfg.BATCHoutpath
+ 'End Select
+ 'ChBoxBatchSubD.Checked = Cfg.BATCHoutSubD
'Set Mode
- If Not Cfg.DeclMode Then CbBatch.Checked = Cfg.BatchMode
+ 'If Not Cfg.DeclMode Then CbBatch.Checked = Cfg.BatchMode
RbDecl.Checked = Cfg.DeclMode
End Sub
@@ -2038,166 +1491,140 @@ lbFound:
Private Sub SetOptions()
'General(Allgemein)
- Cfg.DistCorr = ChBoxCyclDistCor.Checked
- Cfg.GnUfromCycle = ChBoxUseGears.Checked
+ 'Cfg.DistCorr = ChBoxCyclDistCor.Checked
+ 'Cfg.GnUfromCycle = ChBoxUseGears.Checked
'BATCH
Cfg.ModOut = ChBoxModOut.Checked
Cfg.Mod1Hz = ChBoxMod1Hz.Checked
- Select Case CbBOmode.SelectedIndex
- Case 0
- Cfg.BATCHoutpath = sKey.JobPath
- Case Else
- Cfg.BATCHoutpath = Trim(TbBOpath.Text)
- If Microsoft.VisualBasic.Right(Cfg.BATCHoutpath, 1) <> "\" Then Cfg.BATCHoutpath &= "\"
- End Select
- Cfg.BATCHoutSubD = ChBoxBatchSubD.Checked
-
- DEV.SetOptions()
- End Sub
-
-#Region "Events"
-
- Private Sub ChBoxAutoSD_CheckedChanged(sender As Object, e As EventArgs) _
- Handles ChBoxAutoSD.CheckedChanged
- LbAutoShDown.Visible = ChBoxAutoSD.Checked
- End Sub
-
- Private Sub CbBOmode_SelectedIndexChanged(sender As Object, e As EventArgs) _
- Handles CbBOmode.SelectedIndexChanged
- TbBOpath.Visible = (CbBOmode.SelectedIndex = 2)
- ButBObrowse.Visible = (CbBOmode.SelectedIndex = 2)
- End Sub
+ 'Select Case CbBOmode.SelectedIndex
+ ' Case 0
+ ' Cfg.BATCHoutpath = sKey.JobPath
+ ' Case Else
+ ' Cfg.BATCHoutpath = Trim(TbBOpath.Text)
+ ' If Microsoft.VisualBasic.Right(Cfg.BATCHoutpath, 1) <> "\" Then Cfg.BATCHoutpath &= "\"
+ 'End Select
+ 'Cfg.BATCHoutSubD = ChBoxBatchSubD.Checked
- Private Sub ButBObrowse_Click(sender As Object, e As EventArgs) Handles ButBObrowse.Click
- If fbFolder.OpenDialog(TbBOpath.Text) Then
- TbBOpath.Text = fbFolder.Files(0)
- End If
- End Sub
-
- Private Sub ChBoxBatchOut_CheckedChanged(sender As Object, e As EventArgs) _
- Handles ChBoxModOut.CheckedChanged
- ChBoxBatchSubD.Enabled = ChBoxModOut.Checked
+ 'DEV.SetOptions()
End Sub
#End Region
-#End Region
-
#Region "Developer options (DEV) Tab"
- 'Load DEV options
- Private Sub LoadDEVconfigs()
- Dim LV0 As ListViewItem
- Dim i As Integer
- Dim Config0 As KeyValuePair(Of String, cDEVoption)
+ ''Load DEV options
+ 'Private Sub LoadDEVconfigs()
+ ' Dim LV0 As ListViewItem
+ ' Dim i As Integer
+ ' Dim Config0 As KeyValuePair(Of String, cDEVoption)
- LvDEVoptions.Items.Clear()
+ ' LvDEVoptions.Items.Clear()
- i = -1
- For Each Config0 In DEV.Options
- i += 1
+ ' i = -1
+ ' For Each Config0 In DEV.Options
+ ' i += 1
- LV0 = New ListViewItem
- LV0.SubItems(0).Text = Config0.Key
- LV0.SubItems.Add(Config0.Value.Description)
- LV0.SubItems.Add(Config0.Value.TypeString)
- LV0.SubItems.Add("")
- LV0.SubItems.Add(Config0.Value.ValTextDef)
+ ' LV0 = New ListViewItem
+ ' LV0.SubItems(0).Text = Config0.Key
+ ' LV0.SubItems.Add(Config0.Value.Description)
+ ' LV0.SubItems.Add(Config0.Value.TypeString)
+ ' LV0.SubItems.Add("")
+ ' LV0.SubItems.Add(Config0.Value.ValTextDef)
- If Config0.Value.ConfigType = tDEVconfType.tAction Then
- LV0.SubItems.Add("")
- Else
- If Config0.Value.SaveInFile Then
- LV0.SubItems.Add("True")
- Else
- LV0.SubItems.Add("False")
- End If
- End If
+ ' If Config0.Value.ConfigType = tDEVconfType.tAction Then
+ ' LV0.SubItems.Add("")
+ ' Else
+ ' If Config0.Value.SaveInFile Then
+ ' LV0.SubItems.Add("True")
+ ' Else
+ ' LV0.SubItems.Add("False")
+ ' End If
+ ' End If
- LV0.Tag = Config0.Key
+ ' LV0.Tag = Config0.Key
- If Not Config0.Value.Enabled Then
- LV0.ForeColor = Color.DarkGray
- End If
+ ' If Not Config0.Value.Enabled Then
+ ' LV0.ForeColor = Color.DarkGray
+ ' End If
- LvDEVoptions.Items.Add(LV0)
+ ' LvDEVoptions.Items.Add(LV0)
- UpdateDEVconfigs(LV0)
+ ' UpdateDEVconfigs(LV0)
- Next
- End Sub
+ ' Next
+ 'End Sub
- 'Update value of specific DEV option
- Private Sub UpdateDEVconfigs(ByRef LV0 As ListViewItem)
- DEV.UpdateDevConfigs()
- End Sub
+ ''Update value of specific DEV option
+ 'Private Sub UpdateDEVconfigs(ByRef LV0 As ListViewItem)
+ ' DEV.UpdateDevConfigs()
+ 'End Sub
'Change value of DEV option or execute action-type DEV options
- Private Sub LvDEVoptions_DoubleClick(sender As Object, e As EventArgs) Handles LvDEVoptions.DoubleClick
- Dim Config0 As cDEVoption
- Dim str As String
- Dim i As Integer
+ 'Private Sub LvDEVoptions_DoubleClick(sender As Object, e As EventArgs) Handles LvDEVoptions.DoubleClick
+ ' 'Dim Config0 As cDEVoption
+ ' Dim str As String
+ ' Dim i As Integer
- Config0 = DEV.Options(LvDEVoptions.SelectedItems(0).Tag)
+ ' 'Config0 = DEV.Options(LvDEVoptions.SelectedItems(0).Tag)
- If Not Config0.Enabled Then Exit Sub
+ ' If Not Config0.Enabled Then Exit Sub
- Select Case Config0.ConfigType
- Case tDEVconfType.tAction
- Config0.DoAction()
+ ' Select Case Config0.ConfigType
+ ' Case tDEVconfType.tAction
+ ' Config0.DoAction()
- Case tDEVconfType.tBoolean
- Config0.BoolVal = Not Config0.BoolVal
+ ' Case tDEVconfType.tBoolean
+ ' Config0.BoolVal = Not Config0.BoolVal
- Case tDEVconfType.tSelection
+ ' Case tDEVconfType.tSelection
- CmDEVitem = LvDEVoptions.SelectedItems(0)
+ ' CmDEVitem = LvDEVoptions.SelectedItems(0)
- CmDEV.Items.Clear()
+ ' CmDEV.Items.Clear()
- i = -1
- For Each str In Config0.Modes
- i += 1
- CmDEV.Items.Add("(" & i & ") " & str)
- CmDEV.Items(i).Tag = i
- Next
+ ' i = -1
+ ' For Each str In Config0.Modes
+ ' i += 1
+ ' CmDEV.Items.Add("(" & i & ") " & str)
+ ' CmDEV.Items(i).Tag = i
+ ' Next
- CmDEV.Show(Cursor.Position)
+ ' CmDEV.Show(Cursor.Position)
- Case tDEVconfType.tIntVal
- str = InputBox("New Value <" & Config0.TypeString & "> =", , Config0.ValToString)
- If str <> "" AndAlso IsNumeric(str) Then
- Config0.IntVal = CInt(str)
- End If
+ ' Case tDEVconfType.tIntVal
+ ' str = InputBox("New Value <" & Config0.TypeString & "> =", , Config0.ValToString)
+ ' If str <> "" AndAlso IsNumeric(str) Then
+ ' Config0.IntVal = CInt(str)
+ ' End If
- Case tDEVconfType.tSingleVal
- str = InputBox("New Value <" & Config0.TypeString & "> =", , Config0.ValToString)
- If str <> "" AndAlso IsNumeric(str) Then
- Config0.SingleVal = CSng(str)
- End If
+ ' Case tDEVconfType.tSingleVal
+ ' str = InputBox("New Value <" & Config0.TypeString & "> =", , Config0.ValToString)
+ ' If str <> "" AndAlso IsNumeric(str) Then
+ ' Config0.SingleVal = CSng(str)
+ ' End If
- Case Else 'tDEVconfType.tStringVal
- Dim dlg As New F_StrInpBox
- Config0.StringVal = dlg.ShowDlog("New Value <" & Config0.TypeString & "> =", Config0.StringVal)
- End Select
+ ' Case Else 'tDEVconfType.tStringVal
+ ' Dim dlg As New F_StrInpBox
+ ' Config0.StringVal = dlg.ShowDlog("New Value <" & Config0.TypeString & "> =", Config0.StringVal)
+ ' End Select
- UpdateDEVconfigs(LvDEVoptions.SelectedItems(0))
- End Sub
+ ' UpdateDEVconfigs(LvDEVoptions.SelectedItems(0))
+ 'End Sub
- 'Context menu for selection-type DEV options
- Private Sub CmDEV_ItemClicked(sender As Object, e As ToolStripItemClickedEventArgs) _
- Handles CmDEV.ItemClicked
- Dim i As Integer
+ ''Context menu for selection-type DEV options
+ 'Private Sub CmDEV_ItemClicked(sender As Object, e As ToolStripItemClickedEventArgs) _
+ ' Handles CmDEV.ItemClicked
+ ' Dim i As Integer
- i = e.ClickedItem.Tag
+ ' i = e.ClickedItem.Tag
- DEV.Options(CmDEVitem.Tag).ModeIndex = i
+ ' DEV.Options(CmDEVitem.Tag).ModeIndex = i
- UpdateDEVconfigs(CmDEVitem)
- End Sub
+ ' UpdateDEVconfigs(CmDEVitem)
+ 'End Sub
#End Region
@@ -2205,7 +1632,7 @@ lbFound:
'Add message to message list
Public Sub MSGtoForm(ID As tMsgID, Msg As String, Source As String, Link As String)
- If (Me.InvokeRequired) Then
+ If (InvokeRequired) Then
'Me.Invoke(New MsgToFormDelegate(AddressOf MSGtoForm), ID, Msg, Source, Link)
Exit Sub
End If
@@ -2760,11 +2187,6 @@ Lb1:
End If
End Sub
- Private Sub LvDRI_MouseUp(sender As Object, e As MouseEventArgs) Handles LvDRI.MouseUp
- If e.Button = MouseButtons.Right Then
- ConMenTarget = LvDRI
- ConMenTarJob = False
- ConMenFilelist.Show(MousePosition)
- End If
+ Private Sub RbDev_CheckedChanged(sender As Object, e As EventArgs) Handles RbDev.CheckedChanged
End Sub
End Class
diff --git a/VECTO/GUI/F_ShutDown.Designer.vb b/VECTO/GUI/F_ShutDown.Designer.vb
deleted file mode 100644
index 5fa0582cdd..0000000000
--- a/VECTO/GUI/F_ShutDown.Designer.vb
+++ /dev/null
@@ -1,104 +0,0 @@
-' Copyright 2014 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-' software distributed under the Licence is distributed on an "AS IS" basis,
-' 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.ComponentModel
-Imports Microsoft.VisualBasic.CompilerServices
-
-
-<DesignerGenerated()> _
-Partial Class F_ShutDown
- Inherits Form
-
- 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
- <DebuggerNonUserCode()> _
- Protected Overrides Sub Dispose(ByVal disposing As Boolean)
- Try
- If disposing AndAlso components IsNot Nothing Then
- components.Dispose()
- End If
- Finally
- MyBase.Dispose(disposing)
- End Try
- End Sub
-
- 'Wird vom Windows Form-Designer benötigt.
- Private components As IContainer
-
- 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
- 'Das Bearbeiten ist mit dem Windows Form-Designer möglich.
- 'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
- <DebuggerStepThrough()> _
- Private Sub InitializeComponent()
- Me.components = New Container
- Me.Cancel_Button = New Button
- Me.Label1 = New Label
- Me.LbTime = New Label
- Me.Timer1 = New Timer(Me.components)
- Me.SuspendLayout()
- '
- 'Cancel_Button
- '
- Me.Cancel_Button.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles)
- Me.Cancel_Button.DialogResult = DialogResult.Cancel
- Me.Cancel_Button.Location = New Point(12, 54)
- Me.Cancel_Button.Name = "Cancel_Button"
- Me.Cancel_Button.Size = New Size(191, 49)
- Me.Cancel_Button.TabIndex = 1
- Me.Cancel_Button.Text = "ABORT"
- '
- 'Label1
- '
- Me.Label1.AutoSize = True
- Me.Label1.Location = New Point(12, 21)
- Me.Label1.Name = "Label1"
- Me.Label1.Size = New Size(127, 13)
- Me.Label1.TabIndex = 2
- Me.Label1.Text = "System will shut down in: "
- '
- 'LbTime
- '
- Me.LbTime.AutoSize = True
- Me.LbTime.Location = New Point(145, 21)
- Me.LbTime.Name = "LbTime"
- Me.LbTime.Size = New Size(19, 13)
- Me.LbTime.TabIndex = 3
- Me.LbTime.Text = "00"
- '
- 'Timer1
- '
- Me.Timer1.Interval = 1000
- '
- 'F_ShutDown
- '
- Me.AutoScaleDimensions = New SizeF(6.0!, 13.0!)
- Me.AutoScaleMode = AutoScaleMode.Font
- Me.CancelButton = Me.Cancel_Button
- Me.ClientSize = New Size(215, 115)
- Me.ControlBox = False
- Me.Controls.Add(Me.LbTime)
- Me.Controls.Add(Me.Label1)
- Me.Controls.Add(Me.Cancel_Button)
- Me.FormBorderStyle = FormBorderStyle.FixedToolWindow
- Me.MaximizeBox = False
- Me.MinimizeBox = False
- Me.Name = "F_ShutDown"
- Me.ShowInTaskbar = False
- Me.StartPosition = FormStartPosition.CenterParent
- Me.Text = "Automatic Shutdown"
- Me.ResumeLayout(False)
- Me.PerformLayout()
-
- End Sub
- Friend WithEvents Cancel_Button As Button
- Friend WithEvents Label1 As Label
- Friend WithEvents LbTime As Label
- Friend WithEvents Timer1 As Timer
-
-End Class
diff --git a/VECTO/GUI/F_ShutDown.resx b/VECTO/GUI/F_ShutDown.resx
deleted file mode 100644
index cce5ec210e..0000000000
--- a/VECTO/GUI/F_ShutDown.resx
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
- <xsd:attribute name="mimetype" type="xsd:string" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string" />
- <xsd:attribute name="name" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <metadata name="Timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>17, 17</value>
- </metadata>
-</root>
\ No newline at end of file
diff --git a/VECTO/GUI/F_ShutDown.vb b/VECTO/GUI/F_ShutDown.vb
deleted file mode 100644
index 8b437f85d8..0000000000
--- a/VECTO/GUI/F_ShutDown.vb
+++ /dev/null
@@ -1,105 +0,0 @@
-' Copyright 2014 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-' software distributed under the Licence is distributed on an "AS IS" basis,
-' 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.Runtime.InteropServices
-
-''' <summary>
-''' Automatic shutdown dialog. Allows to abort automatic shutdown within 100 seconds.
-''' </summary>
-''' <remarks></remarks>
-Public Class F_ShutDown
-
- Private iTime As Int16
- Private objExitWin As New cWrapExitWindows()
-
- Public Function ShutDown() As Boolean
- If Me.ShowDialog = DialogResult.Cancel Then
- Me.Timer1.Stop()
- Return False
- Else
- Me.Timer1.Stop()
- Return True
- End If
- End Function
-
- Private Sub F_ShutDown_Load(ByVal sender As Object, ByVal e As EventArgs) Handles Me.Load
- iTime = 99
- Me.LbTime.Text = iTime + 1
- Me.Timer1.Start()
- End Sub
-
- Private Sub Cancel_Button_Click(ByVal sender As Object, ByVal e As EventArgs) Handles Cancel_Button.Click
- Me.Timer1.Stop()
- Me.DialogResult = DialogResult.Cancel
- Me.Close()
- End Sub
-
- Private Sub Timer1_Tick(ByVal sender As Object, ByVal e As EventArgs) Handles Timer1.Tick
- Me.LbTime.Text = iTime
- If iTime = 0 Then
- Me.Timer1.Stop()
- Try
- objExitWin.ExitWindows(cWrapExitWindows.Action.Shutdown)
- Me.DialogResult = DialogResult.OK
- Catch ex As Exception
- Me.DialogResult = DialogResult.Cancel
- End Try
- Me.Close()
- End If
- iTime -= 1
- End Sub
-
- Private Class cWrapExitWindows
-
- Private Declare Function ExitWindowsEx Lib "user32.dll" (ByVal uFlags As Int32, ByVal dwReserved As Int32) As Boolean
- Private Declare Function GetCurrentProcess Lib "kernel32.dll" () As IntPtr
- Private Declare Sub OpenProcessToken Lib "advapi32.dll" (ByVal ProcessHandle As IntPtr, ByVal DesiredAccess As Int32, ByRef TokenHandle As IntPtr)
- Private Declare Sub LookupPrivilegeValue Lib "advapi32.dll" Alias "LookupPrivilegeValueA" (ByVal lpSystemName As String, ByVal lpName As String, ByRef lpLuid As Long)
- Private Declare Function AdjustTokenPrivileges Lib "advapi32.dll" (ByVal TokenHandle As IntPtr, ByVal DisableAllPrivileges As Boolean, ByRef NewState As LUID, ByVal BufferLength As Int32, ByVal PreviousState As IntPtr, ByVal ReturnLength As IntPtr) As Boolean
-
- <StructLayout(LayoutKind.Sequential, Pack:=1)> _
- Friend Structure LUID
- Public Count As Integer
- Public LUID As Long
- Public Attribute As Integer
- End Structure
-
- Public Enum Action
- LogOff = 0
- Shutdown = 1
- Restart = 2
- PowerOff = 8
- End Enum
-
- Public Sub ExitWindows(ByVal how As Action, Optional ByVal Forced As Boolean = True)
- Dim TokenPrivilege As LUID
- Dim hProcess As IntPtr = GetCurrentProcess()
- Dim hToken As IntPtr = IntPtr.Zero
- OpenProcessToken(hProcess, &H28, hToken)
- TokenPrivilege.Count = 1
- TokenPrivilege.LUID = 0
- TokenPrivilege.Attribute = 2
- LookupPrivilegeValue(Nothing, "SeShutdownPrivilege", TokenPrivilege.LUID)
- AdjustTokenPrivileges(hToken, False, TokenPrivilege, 0, IntPtr.Zero, IntPtr.Zero)
- If Forced Then
- ExitWindowsEx(how + 4, 0)
- Else
- ExitWindowsEx(how, 0)
- End If
- End Sub
-
- End Class
-
-
-End Class
-
-
-
diff --git a/VECTO/GUI/F_StrInpBox.designer.vb b/VECTO/GUI/F_StrInpBox.designer.vb
deleted file mode 100644
index 01f2d9e3d9..0000000000
--- a/VECTO/GUI/F_StrInpBox.designer.vb
+++ /dev/null
@@ -1,125 +0,0 @@
-' Copyright 2014 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-' software distributed under the Licence is distributed on an "AS IS" basis,
-' 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.ComponentModel
-Imports Microsoft.VisualBasic.CompilerServices
-
-
-<DesignerGenerated()> _
-Partial Class F_StrInpBox
- Inherits Form
-
- 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
- <DebuggerNonUserCode()> _
- Protected Overrides Sub Dispose(ByVal disposing As Boolean)
- Try
- If disposing AndAlso components IsNot Nothing Then
- components.Dispose()
- End If
- Finally
- MyBase.Dispose(disposing)
- End Try
- End Sub
-
- 'Wird vom Windows Form-Designer benötigt.
- Private components As IContainer
-
- 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
- 'Das Bearbeiten ist mit dem Windows Form-Designer möglich.
- 'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
- <DebuggerStepThrough()> _
- Private Sub InitializeComponent()
- Me.TableLayoutPanel1 = New TableLayoutPanel()
- Me.OK_Button = New Button()
- Me.Cancel_Button = New Button()
- Me.Label1 = New Label()
- Me.TextBox1 = New TextBox()
- Me.TableLayoutPanel1.SuspendLayout()
- Me.SuspendLayout()
- '
- 'TableLayoutPanel1
- '
- Me.TableLayoutPanel1.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles)
- Me.TableLayoutPanel1.ColumnCount = 2
- Me.TableLayoutPanel1.ColumnStyles.Add(New ColumnStyle(SizeType.Percent, 50.0!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New ColumnStyle(SizeType.Percent, 50.0!))
- Me.TableLayoutPanel1.Controls.Add(Me.OK_Button, 0, 0)
- Me.TableLayoutPanel1.Controls.Add(Me.Cancel_Button, 1, 0)
- Me.TableLayoutPanel1.Location = New Point(277, 82)
- Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
- Me.TableLayoutPanel1.RowCount = 1
- Me.TableLayoutPanel1.RowStyles.Add(New RowStyle(SizeType.Percent, 50.0!))
- Me.TableLayoutPanel1.Size = New Size(146, 29)
- Me.TableLayoutPanel1.TabIndex = 5
- '
- 'OK_Button
- '
- Me.OK_Button.Anchor = AnchorStyles.None
- Me.OK_Button.Location = New Point(3, 3)
- Me.OK_Button.Name = "OK_Button"
- Me.OK_Button.Size = New Size(67, 23)
- Me.OK_Button.TabIndex = 0
- Me.OK_Button.Text = "OK"
- '
- 'Cancel_Button
- '
- Me.Cancel_Button.Anchor = AnchorStyles.None
- Me.Cancel_Button.DialogResult = DialogResult.Cancel
- Me.Cancel_Button.Location = New Point(76, 3)
- Me.Cancel_Button.Name = "Cancel_Button"
- Me.Cancel_Button.Size = New Size(67, 23)
- Me.Cancel_Button.TabIndex = 1
- Me.Cancel_Button.Text = "Cancel"
- '
- 'Label1
- '
- Me.Label1.AutoSize = True
- Me.Label1.Location = New Point(12, 9)
- Me.Label1.Name = "Label1"
- Me.Label1.Size = New Size(39, 13)
- Me.Label1.TabIndex = 1
- Me.Label1.Text = "Label1"
- '
- 'TextBox1
- '
- Me.TextBox1.Location = New Point(12, 35)
- Me.TextBox1.Name = "TextBox1"
- Me.TextBox1.Size = New Size(411, 20)
- Me.TextBox1.TabIndex = 2
- '
- 'F_StrInpBox
- '
- Me.AcceptButton = Me.OK_Button
- Me.AutoScaleDimensions = New SizeF(6.0!, 13.0!)
- Me.AutoScaleMode = AutoScaleMode.Font
- Me.CancelButton = Me.Cancel_Button
- Me.ClientSize = New Size(435, 123)
- Me.Controls.Add(Me.TextBox1)
- Me.Controls.Add(Me.Label1)
- Me.Controls.Add(Me.TableLayoutPanel1)
- Me.FormBorderStyle = FormBorderStyle.FixedDialog
- Me.MaximizeBox = False
- Me.MinimizeBox = False
- Me.Name = "F_StrInpBox"
- Me.ShowInTaskbar = False
- Me.StartPosition = FormStartPosition.CenterParent
- Me.Text = "VECTO"
- Me.TableLayoutPanel1.ResumeLayout(False)
- Me.ResumeLayout(False)
- Me.PerformLayout()
-
- End Sub
- Friend WithEvents TableLayoutPanel1 As TableLayoutPanel
- Friend WithEvents OK_Button As Button
- Friend WithEvents Cancel_Button As Button
- Friend WithEvents Label1 As Label
- Friend WithEvents TextBox1 As TextBox
-
-End Class
diff --git a/VECTO/GUI/F_StrInpBox.resx b/VECTO/GUI/F_StrInpBox.resx
deleted file mode 100644
index 1af7de150c..0000000000
--- a/VECTO/GUI/F_StrInpBox.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
- <xsd:attribute name="mimetype" type="xsd:string" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string" />
- <xsd:attribute name="name" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
-</root>
\ No newline at end of file
diff --git a/VECTO/GUI/F_StrInpBox.vb b/VECTO/GUI/F_StrInpBox.vb
deleted file mode 100644
index 4c65dfe65e..0000000000
--- a/VECTO/GUI/F_StrInpBox.vb
+++ /dev/null
@@ -1,45 +0,0 @@
-' Copyright 2014 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-' software distributed under the Licence is distributed on an "AS IS" basis,
-' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-
-
-''' <summary>
-''' String input dialog for changing DEV option values. Default input box cannot process empty strings (emtpy string = Cancel).
-''' </summary>
-''' <remarks></remarks>
-Public Class F_StrInpBox
-
- Public Function ShowDlog(ByVal Prompt As String, ByVal DefaultRespone As String) As String
- Me.Label1.Text = Prompt
- Me.TextBox1.Text = DefaultRespone
- If Me.ShowDialog = DialogResult.OK Then
- DefaultRespone = Me.TextBox1.Text
- End If
- Return DefaultRespone
- End Function
-
- Private Sub F_StrInpBox_Shown(sender As Object, e As EventArgs) Handles Me.Shown
- Me.TextBox1.SelectAll()
- Me.TextBox1.Focus()
- End Sub
-
- Private Sub OK_Button_Click(ByVal sender As Object, ByVal e As EventArgs) Handles OK_Button.Click
- Me.DialogResult = DialogResult.OK
- Me.Close()
- End Sub
-
- Private Sub Cancel_Button_Click(ByVal sender As Object, ByVal e As EventArgs) Handles Cancel_Button.Click
- Me.DialogResult = DialogResult.Cancel
- Me.Close()
- End Sub
-
-
-
-End Class
diff --git a/VECTO/GUI/F_VECTO.vb b/VECTO/GUI/F_VECTO.vb
index 767c95ff32..89c3de450b 100644
--- a/VECTO/GUI/F_VECTO.vb
+++ b/VECTO/GUI/F_VECTO.vb
@@ -1410,11 +1410,6 @@ lbDlog:
If fbDfTargetSpeed.OpenDialog(fFileRepl(tbLacDfTargetSpeedFile.Text, fPATH(VECTOfile))) Then _
tbLacDfTargetSpeedFile.Text = fFileWoDir(fbDfTargetSpeed.Files(0), fPATH(VECTOfile))
End Sub
-
- Private Sub btnDfVelocityDrop_Click(sender As Object, e As EventArgs)
- If fbDfVelocityDrop.OpenDialog(fFileRepl(tbLacDfVelocityDropFile.Text, fPATH(VECTOfile))) Then _
- tbLacDfVelocityDropFile.Text = fFileWoDir(fbDfVelocityDrop.Files(0), fPATH(VECTOfile))
- End Sub
End Class
diff --git a/VECTO/GUI/F_VEH_AuxDlog.vb b/VECTO/GUI/F_VEH_AuxDlog.vb
index 824f7954f8..44d9659ea4 100644
--- a/VECTO/GUI/F_VEH_AuxDlog.vb
+++ b/VECTO/GUI/F_VEH_AuxDlog.vb
@@ -12,7 +12,6 @@ Option Infer On
Imports System.Windows.Forms
Imports TUGraz.VectoCore.Models.Declaration
-Imports TUGraz.VECTO.File_Browser
''' <summary>
diff --git a/VECTO/GUI/GUI_Subs.vb b/VECTO/GUI/GUI_Subs.vb
index a50a257448..56bd7959e7 100644
--- a/VECTO/GUI/GUI_Subs.vb
+++ b/VECTO/GUI/GUI_Subs.vb
@@ -15,8 +15,6 @@
''' <remarks></remarks>
Public Module GUI_Subs
- Public test As Integer = 0
-
#Region "GUI control via background worker"
'Status Message => Msg-Listview
@@ -25,15 +23,12 @@ Public Module GUI_Subs
WorkProg.ID = ID
Select Case ID
Case tMsgID.Err
- MSGerror += 1
Case tMsgID.Warn
- MSGwarn += 1
End Select
WorkProg.Msg = Msg
WorkProg.Source = Source
- WorkProg.Link = Link
Try
- VECTOworker.ReportProgress(0, WorkProg)
+ 'VECTOworker.ReportProgress(0, WorkProg)
Catch ex As Exception
GUImsg(ID, Msg)
End Try
@@ -62,30 +57,14 @@ Public Module GUI_Subs
'Class used to pass Messages from BackgroundWorker to GUI
Public Class cWorkProg
- Private MyTarget As tWorkMsgType
Private MyID As tMsgID
Private MyMsg As String
- Private MyFileIndex As Int16
Private MySource As String
- Private MyStatus As tJobStatus
- Public Link As String
Public Sub New(ByVal MsgTarget As tWorkMsgType)
- MyTarget = MsgTarget
MySource = ""
- MyStatus = tJobStatus.Undef
- Link = ""
End Sub
- Public Property Status As tJobStatus
- Get
- Return MyStatus
- End Get
- Set(value As tJobStatus)
- MyStatus = value
- End Set
- End Property
-
Public Property Source As String
Get
@@ -113,23 +92,6 @@ Public Module GUI_Subs
MyMsg = value
End Set
End Property
-
- Public ReadOnly Property Target() As tWorkMsgType
- Get
- Return MyTarget
- End Get
- End Property
-
- Public Property FileIndex() As Int16
- Get
- Return MyFileIndex
- End Get
- Set(ByVal value As Int16)
- MyFileIndex = value
- End Set
- End Property
-
-
End Class
'Progress bar control
@@ -151,23 +113,7 @@ Public Module GUI_Subs
End If
End Function
- 'Empty text to writable placeholder
- Public Function fStringOrDummySet(ByVal txt As String) As String
- If txt = "" Then
- Return sKey.EmptyString
- Else
- Return txt
- End If
- End Function
-
- 'Placeholder to empty string
- Public Function fStringOrDummyGet(ByVal txt As String) As String
- If Trim(UCase(txt)) = sKey.EmptyString Then
- Return ""
- Else
- Return txt
- End If
- End Function
+
#End Region
@@ -185,19 +131,13 @@ Public Module GUI_Subs
Catch ex As Exception
Return False
End Try
-
End Function
Public Function WrongMode() As Integer
If Cfg.DeclMode Then
- Select Case MsgBox("This file was created in Engineering Mode! Opening in Declaration Mode will overwrite some parameters with generic values." & vbCrLf & vbCrLf & _
- "Do you want to switch to Engineering Mode?" & vbCrLf & vbCrLf & _
- "[Yes] Switch mode and open file" & vbCrLf & _
- "[No] Open file without changing mode" & vbCrLf & _
- "[Cancel] Abort opening file" _
- , MsgBoxStyle.YesNoCancel, "Warning")
+ Select Case MsgBox("This file was created in Engineering Mode! Opening in Declaration Mode will overwrite some parameters with generic values." & vbCrLf & vbCrLf & "Do you want to switch to Engineering Mode?" & vbCrLf & vbCrLf & "[Yes] Switch mode and open file" & vbCrLf & "[No] Open file without changing mode" & vbCrLf & "[Cancel] Abort opening file", MsgBoxStyle.YesNoCancel, "Warning")
Case MsgBoxResult.Yes
Return 1
@@ -211,12 +151,7 @@ Public Module GUI_Subs
Else
- Select Case MsgBox("This file was created in Declaration Mode! For use in Engineering Mode missing parameters must be defined." & vbCrLf & vbCrLf & _
- "Do you want to switch to Declaration Mode?" & vbCrLf & vbCrLf & _
- "[Yes] Switch mode and open file" & vbCrLf & _
- "[No] Open file without changing mode" & vbCrLf & _
- "[Cancel] Abort opening file" _
- , MsgBoxStyle.YesNoCancel, "Warning")
+ Select Case MsgBox("This file was created in Declaration Mode! For use in Engineering Mode missing parameters must be defined." & vbCrLf & vbCrLf & "Do you want to switch to Declaration Mode?" & vbCrLf & vbCrLf & "[Yes] Switch mode and open file" & vbCrLf & "[No] Open file without changing mode" & vbCrLf & "[Cancel] Abort opening file", MsgBoxStyle.YesNoCancel, "Warning")
Case MsgBoxResult.Yes
Return 1
@@ -229,7 +164,5 @@ Public Module GUI_Subs
End Select
End If
-
End Function
-
End Module
diff --git a/VECTO/GUI/GearboxGearDialog.vb b/VECTO/GUI/GearboxGearDialog.vb
index 6393070d11..50d2b97c31 100644
--- a/VECTO/GUI/GearboxGearDialog.vb
+++ b/VECTO/GUI/GearboxGearDialog.vb
@@ -9,7 +9,6 @@
'
' See the LICENSE.txt for the specific language governing permissions and limitations.
Imports System.Windows.Forms
-Imports TUGraz.VECTO.File_Browser
''' <summary>
diff --git a/VECTO/Input Files/cAdvancedAuxiliary.vb b/VECTO/Input Files/cAdvancedAuxiliary.vb
index 2a78b2e67c..c38fb317a0 100644
--- a/VECTO/Input Files/cAdvancedAuxiliary.vb
+++ b/VECTO/Input Files/cAdvancedAuxiliary.vb
@@ -21,12 +21,6 @@ Public Class cAdvancedAuxiliary
End Get
End Property
- Public ReadOnly Property FileName As String
- Get
- Return _FileName
- End Get
- End Property
-
Public ReadOnly Property AssemblyName As String
Get
Return _AssemblyName
diff --git a/VECTO/Input Files/cENG.vb b/VECTO/Input Files/cENG.vb
index 22a8e3bacd..5a3bdb4493 100644
--- a/VECTO/Input Files/cENG.vb
+++ b/VECTO/Input Files/cENG.vb
@@ -77,11 +77,6 @@ Public Class cENG
''' <remarks></remarks>
Private sFilePath As String
- ''' <summary>
- ''' List of sub input files (e.g. FC map). Can be accessed by FileList property. Generated by CreateFileList.
- ''' </summary>
- ''' <remarks></remarks>
- Private MyFileList As List(Of String)
''' <summary>
''' WHTC Urban test results. Saved in input file.
diff --git a/VECTO/Input Files/cFLD.vb b/VECTO/Input Files/cFLD.vb
index 4e9b7a71ae..1f5ed97382 100644
--- a/VECTO/Input Files/cFLD.vb
+++ b/VECTO/Input Files/cFLD.vb
@@ -447,23 +447,6 @@ lbInt:
Return nUtarget
End Function
- ''' <summary>
- ''' Calculates and returns maximum torque [Nm].
- ''' </summary>
- ''' <returns>maximum torque [Nm]</returns>
- ''' <remarks></remarks>
- Public Function Tmax() As Single
- Dim i As Int16
- Dim Tm As Single
-
- Tm = LTq(0)
- For i = 1 To iDim
- If LTq(i) > Tm Then Tm = LTq(i)
- Next
-
- Return Tm
- End Function
-
Public Function Init(ByVal Nidle As Single) As Boolean
Dim Pmax As Single
Dim MsgSrc As String
diff --git a/VECTO/Input Files/cGBX.vb b/VECTO/Input Files/cGBX.vb
index 64a071d60b..cd90d6b655 100644
--- a/VECTO/Input Files/cGBX.vb
+++ b/VECTO/Input Files/cGBX.vb
@@ -51,7 +51,6 @@ Public Class cGBX
Public TCinertia As Single
- Private MyFileList As List(Of String)
Public SavedInDeclMode As Boolean
Public UpshiftMinAcceleration As Single
Public DownshiftAfterUpshift As Single
diff --git a/VECTO/Input Files/cVECTO.vb b/VECTO/Input Files/cVECTO.vb
index db54db9ea3..9f06d2497a 100644
--- a/VECTO/Input Files/cVECTO.vb
+++ b/VECTO/Input Files/cVECTO.vb
@@ -39,11 +39,10 @@ Public Class cVECTO
Private _siStStT As Single
Public StStDelay As Integer
- Private ReadOnly _stDesMaxFile As cSubPath
- Private ReadOnly _laDesV As List(Of Single)
- Private ReadOnly _laDesMax As List(Of Single)
- Private ReadOnly _laDesMin As List(Of Single)
- Private _desMaxDim As Integer
+ Private ReadOnly _driverAccelerationFile As cSubPath
+ 'Private ReadOnly _laDesV As List(Of Single)
+ 'Private ReadOnly _laDesMax As List(Of Single)
+ 'Private ReadOnly _laDesMin As List(Of Single)
Public ReadOnly AuxPaths As Dictionary(Of String, AuxEntry)
'Alle Nebenverbraucher die in der Veh-Datei UND im Zyklus definiert sind
@@ -82,11 +81,11 @@ Public Class cVECTO
_stPathEng = New cSubPath
_stPathGbx = New cSubPath
- _stDesMaxFile = New cSubPath
+ _driverAccelerationFile = New cSubPath
- _laDesV = New List(Of Single)
- _laDesMax = New List(Of Single)
- _laDesMin = New List(Of Single)
+ '_laDesV = New List(Of Single)
+ '_laDesMax = New List(Of Single)
+ '_laDesMin = New List(Of Single)
AuxPaths = New Dictionary(Of String, AuxEntry)
'AuxRefs = New Dictionary(Of String, cAux)
@@ -135,7 +134,7 @@ Public Class cVECTO
}))
End If
- dic0.Add("VACC", _stDesMaxFile.PathOrDummy)
+ dic0.Add("VACC", _driverAccelerationFile.PathOrDummy)
dic0.Add("EngineOnlyMode", EngOnly)
dic0.Add("StartStop", New Dictionary(Of String, Object) From {
{"Enabled", _boStartStop},
@@ -304,7 +303,7 @@ Public Class cVECTO
End If
If Not body("VACC") Is Nothing Then
- _stDesMaxFile.Init(_myPath, body("VACC"))
+ _driverAccelerationFile.Init(_myPath, body("VACC"))
End If
EngOnly = body("EngineOnlyMode")
@@ -390,11 +389,10 @@ Public Class cVECTO
CycleFiles.Clear()
_stPathGbx.Clear()
- _stDesMaxFile.Clear()
- _laDesV.Clear()
- _laDesMax.Clear()
- _laDesMin.Clear()
- _desMaxDim = -1
+ _driverAccelerationFile.Clear()
+ '_laDesV.Clear()
+ '_laDesMax.Clear()
+ '_laDesMin.Clear()
AuxPaths.Clear()
EngOnly = False
@@ -502,13 +500,13 @@ Public Class cVECTO
Public Property DesMaxFile(Optional ByVal original As Boolean = False) As String
Get
If original Then
- Return _stDesMaxFile.OriginalPath
+ Return _driverAccelerationFile.OriginalPath
Else
- Return _stDesMaxFile.FullPath
+ Return _driverAccelerationFile.FullPath
End If
End Get
Set(value As String)
- _stDesMaxFile.Init(_myPath, value)
+ _driverAccelerationFile.Init(_myPath, value)
End Set
End Property
diff --git a/VECTO/Input Files/cVEH.vb b/VECTO/Input Files/cVEH.vb
index c5c531bc98..7304813e7d 100644
--- a/VECTO/Input Files/cVEH.vb
+++ b/VECTO/Input Files/cVEH.vb
@@ -28,7 +28,6 @@ Public Class cVEH
Public Mass As Single
Public Loading As Single
- Private siFr0 As Single
Public CdA0 As Single
'Public CdA02 As Single
@@ -55,8 +54,6 @@ Public Class cVEH
Public MassMax As Single
Public AxleConf As AxleConfiguration
- Private _myFileList As List(Of String)
-
Public SavedInDeclMode As Boolean
Public AngularGearType As AngularGearType '0=None, 1=Separate, 2=Included
Public AngularGearRatio As Single
@@ -99,7 +96,6 @@ Public Class cVEH
CdX.Clear()
CdY.Clear()
- siFr0 = 0
rdyn = 0
RtType = RetarderType.None
diff --git a/VECTO/M_MAIN.vb b/VECTO/M_MAIN.vb
index 2a0865967d..853a8c4dec 100644
--- a/VECTO/M_MAIN.vb
+++ b/VECTO/M_MAIN.vb
@@ -19,7 +19,6 @@ Imports TUGraz.VectoCore.Models.SimulationComponent.Data.Engine
''' <remarks></remarks>
Module M_MAIN
Public JobFileList As List(Of String)
- Public JobCycleList As List(Of String)
Public Function ConvertToEngineData(fld As cFLD, nIdle As Single) As CombustionEngineData
diff --git a/VECTO/VECTO.vbproj b/VECTO/VECTO.vbproj
index 3f5d27cd76..03fb546e15 100644
--- a/VECTO/VECTO.vbproj
+++ b/VECTO/VECTO.vbproj
@@ -198,12 +198,6 @@
<Compile Include="GUI\F_GBX.vb">
<SubType>Form</SubType>
</Compile>
- <Compile Include="GUI\F_StrInpBox.designer.vb">
- <DependentUpon>F_StrInpBox.vb</DependentUpon>
- </Compile>
- <Compile Include="GUI\F_StrInpBox.vb">
- <SubType>Form</SubType>
- </Compile>
<Compile Include="GUI\F_VEH_AuxDlog.Designer.vb">
<DependentUpon>F_VEH_AuxDlog.vb</DependentUpon>
</Compile>
@@ -220,7 +214,6 @@
<Compile Include="Input Files\cENG.vb" />
<Compile Include="Input Files\cGBX.vb" />
<Compile Include="Configuration.vb" />
- <Compile Include="cDEV.vb" />
<Compile Include="File Browser\cFileBrowser.vb" />
<Compile Include="mAAUX_Global.vb" />
<Compile Include="File Browser\FB_Dialog.designer.vb">
@@ -246,12 +239,6 @@
<SubType>Form</SubType>
</Compile>
<Compile Include="Input Files\cSubPath.vb" />
- <Compile Include="GUI\F_ShutDown.Designer.vb">
- <DependentUpon>F_ShutDown.vb</DependentUpon>
- </Compile>
- <Compile Include="GUI\F_ShutDown.vb">
- <SubType>Form</SubType>
- </Compile>
<Compile Include="GUI\F_VECTO.Designer.vb">
<DependentUpon>F_VECTO.vb</DependentUpon>
</Compile>
@@ -342,13 +329,6 @@
<SubType>Designer</SubType>
<DependentUpon>F_VECTO.vb</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="GUI\F_ShutDown.resx">
- <SubType>Designer</SubType>
- <DependentUpon>F_ShutDown.vb</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="GUI\F_StrInpBox.resx">
- <DependentUpon>F_StrInpBox.vb</DependentUpon>
- </EmbeddedResource>
<EmbeddedResource Include="GUI\F_VEH.resx">
<SubType>Designer</SubType>
<DependentUpon>F_VEH.vb</DependentUpon>
diff --git a/VECTO/VECTO.vbproj.user b/VECTO/VECTO.vbproj.user
index 42332ddfe4..de2f13e5e6 100644
--- a/VECTO/VECTO.vbproj.user
+++ b/VECTO/VECTO.vbproj.user
@@ -13,7 +13,7 @@
<FallbackCulture>de-DE</FallbackCulture>
<VerifyUploadedFiles>false</VerifyUploadedFiles>
<ErrorReportUrlHistory />
- <ProjectView>ProjectFiles</ProjectView>
+ <ProjectView>ShowAllFiles</ProjectView>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<StartArguments>
diff --git a/VECTO/VECTO_Global.vb b/VECTO/VECTO_Global.vb
index 7f97e4eae6..9176b3729f 100644
--- a/VECTO/VECTO_Global.vb
+++ b/VECTO/VECTO_Global.vb
@@ -25,14 +25,9 @@ Public Module VECTO_Global
Public LogFile As cLogFile
'to ensure correct format for backgroundworker thread
- Public SetCulture As Boolean
- Public VECTOworker As BackgroundWorker
Public VECTOworkerV3 As BackgroundWorker
- Public MSGerror As Integer
- Public MSGwarn As Integer
-
Public Cfg As Configuration
Public sKey As csKey
@@ -41,7 +36,7 @@ Public Module VECTO_Global
Public Lic As cLicense
'Public VSUM As cVSUM
- Public DEV As cDEV
+ 'Public DEV As cDEV
Public ProgBarCtrl As cProgBarCtrl
diff --git a/VECTO/cDEV.vb b/VECTO/cDEV.vb
deleted file mode 100644
index d27524dc7a..0000000000
--- a/VECTO/cDEV.vb
+++ /dev/null
@@ -1,533 +0,0 @@
-' Copyright 2014 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-' software distributed under the Licence is distributed on an "AS IS" basis,
-' 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
-
-Public Class cDEV
- Public Enabled As Boolean
-
- Private ReadOnly MyOptions As Dictionary(Of String, cDEVoption)
-
-
- '**************************************************************************************************************
- '**************************************************************************************************************
- '********************************* Instructions for integrating new DEV-Options *********************************
-
- '1. Entry in "Sub New()"
- '
- ' I) Define new cDEVoption Object with "Conf0 = New cDEVoption(ConfigType, Description, SaveInConfg, Enabled)"
- '
- ' ConfigType <tDEVconfType> ...Type definition: Boolean, Integer, Single, String, menu selection (Integer) or Reference to Function
- ' Description <String> ...Description of the parameters
- ' SaveInConfg <Boolean> ...Whether you want to save settings for next VECTO-startup
- ' Enabled <Boolean> ...Whether settings in the DEV-tab can be changed
- '
- ' II) default value definition. Distinguish which ConfigType to use:
- '
- ' a) ConfigType = tBoolean:
- '
- ' Conf0.BoolVal = ... <Boolean>
- '
- ' b) ConfigType = tSingleVal:
- '
- ' Conf0.SingleVal = ... <Single>
- '
- ' c) ConfigType = tStringVal:
- '
- ' Conf0.StringVal = ... <String>
- '
- ' d) ConfigType = tIntVal:
- '
- ' Conf0.IntVal = ... <Integer>
- '
- ' e) ConfigType = tAction:
- '
- ' Conf0.ActionDelegate = New cDEVoption.dActionDelegate(AddressOf NameDerFunktion)
- '
- ' Where NameDerFunktion is a function to call returning a <String>: "Public Function NameDerFunktion() As String"
- '
- ' f) ConfigType = tContMenIndex:
- '
- ' Definition of Available selection options as <String>:
- '
- ' Conf0.AddMode ("select 1")
- ' Conf0.AddMode ("Option 2")
- ' and so forth.
- '
- ' Default value definition: First choice = 0
- '
- ' Conf0.ModeIndex = ... <Integer>
-
-
- '**************************************************************************************************************
- '**************************************************************************************************************
-
-
- Public Sub New()
-
- Enabled = False
- MyOptions = New Dictionary(Of String, cDEVoption)
-
- '*****************************************************************************************
- '*****************************************************************************************
- '**************************** START: Parameters Configuration '****************************
-
- Dim Conf0 As cDEVoption
-
-
- 'Conf0 = New cDEVoption(tDEVconfType.tSingleVal, "TC iteration: target precision for torque ratio")
- 'Conf0.SingleVal = 0.001
- 'MyOptions.Add("TCiterPrec", Conf0)
-
- 'Conf0 = New cDEVoption(tDEVconfType.tBoolean, "Advanced output files format")
- 'Conf0.BoolVal = False
- 'MyOptions.Add("AdvFormat", Conf0)
-
- 'Conf0 = New cDEVoption(tDEVconfType.tBoolean,
- ' "Limit engine speed in torque converter operation if Pe(acc_min) < Pe_max")
- 'Conf0.BoolVal = True
- 'MyOptions.Add("TClimitOn", Conf0)
-
- 'Conf0 = New cDEVoption(tDEVconfType.tSingleVal, "Max. engine speed for torque converter operation [1/min]")
- 'Conf0.SingleVal = 1600
- 'MyOptions.Add("TClimit", Conf0)
-
- 'Conf0 = New cDEVoption(tDEVconfType.tSelection,
- ' "Acceleration for AT Up-Shift power condition")
- 'Conf0.AddMode("acc_target") '0
- 'Conf0.AddMode("acc_min") '1
- 'Conf0.ModeIndex = 1
- 'MyOptions.Add("TCshiftMode", Conf0)
-
-
- 'Conf0 = New cDEVoption(tDEVconfType.tSingleVal, "Minimum acceleration (acc_min) for TC rpm limit and AT-Shift [m/s²]")
- 'Conf0.SingleVal = 0.025
- 'MyOptions.Add("TCaccMin", Conf0)
-
-
- '**************************** END: Parameters Configuration '*****************************
- '*****************************************************************************************
- '*****************************************************************************************
- End Sub
-
- 'Initialize the actual Config-Parameters from MyConfigs list
- Public Sub SetOptions()
- 'TCiterPrec = MyOptions("TCiterPrec").SingleVal
- 'AdvFormat = MyOptions("AdvFormat").BoolVal
- 'TClimitOn = MyOptions("TClimitOn").BoolVal
- 'TClimit = MyOptions("TClimit").SingleVal
- 'TCshiftModeNew = (MyOptions("TCshiftMode").ModeIndex = 1)
- 'TCaccmin = MyOptions("TCaccMin").SingleVal
- End Sub
-
- Public Sub SetDefault()
- Dim opt0 As cDEVoption
-
- For Each opt0 In MyOptions.Values
- opt0.SetDefault()
- Next
- End Sub
-
-
- Public Sub UpdateDevConfigs()
- Dim lv0 As ListViewItem
-
- EnabledOptCheck()
-
- For Each lv0 In F_MAINForm.LvDEVoptions.Items
- lv0.SubItems(3).Text = DEV.Options(lv0.Tag).ValText
- If DEV.Options(lv0.Tag).Enabled Then
- lv0.ForeColor = Color.Black
- Else
- lv0.ForeColor = Color.DarkGray
- End If
- Next
- End Sub
-
- Private Sub EnabledOptCheck()
- MyOptions("TClimit").EnabledOpt = MyOptions("TClimitOn").BoolVal
- MyOptions("TCaccMin").EnabledOpt = MyOptions("TClimitOn").BoolVal Or MyOptions("TCshiftMode").ModeIndex = 1
- End Sub
-
-
- Public Function LoadFromFile() As Boolean
- Dim file As cFile_V3
- Dim ConfigFromFile As Dictionary(Of String, String)
- Dim Key As String
- Dim Val As String
- Dim KV As KeyValuePair(Of String, String)
-
- file = New cFile_V3
-
- If Not file.OpenRead(MyConfPath & "DEVconfig.txt") Then Return False
-
- ConfigFromFile = New Dictionary(Of String, String)
-
- Do While Not file.EndOfFile
-
- Key = file.ReadLine(0)
- Val = file.ReadLine(0)
-
- If ConfigFromFile.ContainsKey(Key) Then
- GUImsg(tMsgID.Err, "Multiple definitions of DEV Config '" & Key & "' !")
- Return False
- End If
-
- ConfigFromFile.Add(Key, Val)
-
- Loop
-
- file.Close()
-
- For Each KV In ConfigFromFile
- If Not MyOptions.ContainsKey(KV.Key) Then
- GUImsg(tMsgID.Warn, "DEV Config '" & KV.Key & "' not defined!")
- Else
- If MyOptions(KV.Key).SaveInFile Then MyOptions(KV.Key).StringToVal(KV.Value)
- End If
- Next
-
- UpdateDevConfigs()
-
- Return True
- End Function
-
- Public Function SaveToFile() As Boolean
- Dim file As cFile_V3
- Dim Conf0 As KeyValuePair(Of String, cDEVoption)
-
- file = New cFile_V3
-
- If Not file.OpenWrite(MyConfPath & "DEVconfig.txt") Then Return False
-
- For Each Conf0 In MyOptions
-
- If Conf0.Value.SaveInFile And Conf0.Value.ConfigType <> tDEVconfType.tAction Then
-
- If Conf0.Value.ConfigType = tDEVconfType.tSelection Then
- file.WriteLine("# " & Conf0.Value.Description & " <" & Conf0.Value.TypeString & "> (" & Conf0.Value.Mode & ")")
- Else
- file.WriteLine("# " & Conf0.Value.Description & " <" & Conf0.Value.TypeString & ">")
- End If
-
- file.WriteLine(Conf0.Key)
- file.WriteLine(fStringOrDummySet(Conf0.Value.ValToString))
-
- End If
-
- Next
-
- file.Close()
-
- Return True
- End Function
-
-
- Public ReadOnly Property Options As Dictionary(Of String, cDEVoption)
- Get
- Return MyOptions
- End Get
- End Property
-
- Protected Overrides Sub Finalize()
- MyBase.Finalize()
- End Sub
-End Class
-
-
-Public Class cDEVoption
- Private MyConfType As tDEVconfType
- Private sTypeString As String
- Private MyDescr As String
- Private sModes As List(Of String)
- Private iModesDim As Integer
- Private bEnabled As Boolean
- Private bSaveInFile As Boolean
-
- Private sValText As String
- Private iIntVal As Integer
- Private sSingleVal As Single
- Private bBoolVal As Boolean
- Private sStringVal As String
- Private iModeIndex As Integer
-
- Private sValTextDef As String
- Private sValTextDefdef As Boolean
-
- Public EnabledOpt As Boolean
-
- Public Delegate Function dActionDelegate() As String
-
- Public ActionDelegate As dActionDelegate
-
- Public Sub New(ByVal ConfigType As tDEVconfType, ByVal Description As String, Optional SaveInConfg As Boolean = True,
- Optional ByVal Enabled As Boolean = True)
- MyConfType = ConfigType
- MyDescr = Description
- bEnabled = Enabled
- bSaveInFile = SaveInConfg
- EnabledOpt = True
-
- Select Case MyConfType
- Case tDEVconfType.tAction
- sTypeString = "Subroutine"
- Case tDEVconfType.tBoolean
- sTypeString = "Boolean"
- Case tDEVconfType.tSelection
- sTypeString = "Selection (Int)"
- Case tDEVconfType.tIntVal
- sTypeString = "Integer"
- Case tDEVconfType.tSingleVal
- sTypeString = "Single"
- Case tDEVconfType.tStringVal
- sTypeString = "String"
- End Select
-
- sModes = New List(Of String)
- iModesDim = -1
-
- iIntVal = 0
- sSingleVal = 0.0F
- bBoolVal = False
- sStringVal = ""
- iModeIndex = -1
-
- If MyConfType = tDEVconfType.tAction Then
- sValText = ""
- Else
- sValText = "<undefined>"
- End If
-
- sValTextDef = ""
- sValTextDefdef = False
- End Sub
-
- Private Sub DefValTextDef()
- sValTextDefdef = True
- sValTextDef = sValText
- End Sub
-
- Public Sub SetDefault()
- Dim si As String = sValTextDef
-
- If MyConfType = tDEVconfType.tSelection Then
- Try
- If sValTextDef(0) = "(" AndAlso sValTextDef.Contains(")") Then
- si = sValTextDef.Substring(1, sValTextDef.IndexOf(")") - 1)
- End If
- Catch ex As Exception
- Exit Sub
- End Try
- End If
-
- StringToVal(si)
- End Sub
-
- Public Sub DoAction()
- sValText = ActionDelegate.Invoke()
- End Sub
-
- Public Sub AddMode(ByVal Txt As String)
- sModes.Add(Txt)
- iModesDim += 1
- End Sub
-
- Public Function StringToVal(ByVal StrExpr As String) As Boolean
-
- Try
- Select Case MyConfType
- Case tDEVconfType.tAction
-
- Return False
-
- Case tDEVconfType.tBoolean
- BoolVal = CBool(StrExpr)
-
- Case tDEVconfType.tSelection
- If CInt(StrExpr) > iModesDim Then
- Return False
- Else
- ModeIndex = CInt(StrExpr)
- End If
- Case tDEVconfType.tIntVal
- IntVal = CInt(StrExpr)
-
- Case tDEVconfType.tSingleVal
- SingleVal = CSng(StrExpr)
-
- Case tDEVconfType.tStringVal
- StringVal = fStringOrDummyGet(StrExpr)
-
- End Select
-
- Return True
-
- Catch ex As Exception
-
- Return False
-
- End Try
- End Function
-
- Public Function ValToString() As String
-
- Select Case MyConfType
- Case tDEVconfType.tBoolean
- Return CStr(Math.Abs(CDec(bBoolVal)))
-
- Case tDEVconfType.tSelection
- Return iModeIndex.ToString
-
- Case tDEVconfType.tIntVal
- Return IntVal.ToString
-
- Case tDEVconfType.tSingleVal
- Return SingleVal.ToString
-
- Case Else ' tDEVconfType.tStringVal (tDEVconfType.tAction ...darf nicht sein)
- Return StringVal
-
- End Select
- End Function
-
- Public ReadOnly Property ValText As String
- Get
- Return sValText
- End Get
- End Property
-
- Public ReadOnly Property ValTextDef As String
- Get
- Return sValTextDef
- End Get
- End Property
-
- Public Property IntVal As Integer
- Get
- Return iIntVal
- End Get
- Set(value As Integer)
- iIntVal = value
- sValText = iIntVal.ToString
- If Not sValTextDefdef Then DefValTextDef()
- End Set
- End Property
-
- Public Property SingleVal As Single
- Get
- Return sSingleVal
- End Get
- Set(value As Single)
- sSingleVal = value
- sValText = sSingleVal.ToString
- If Not sValTextDefdef Then DefValTextDef()
- End Set
- End Property
-
- Public Property BoolVal As Boolean
- Get
- Return bBoolVal
- End Get
- Set(value As Boolean)
- bBoolVal = value
- If bBoolVal Then
- sValText = "True"
- Else
- sValText = "False"
- End If
- If Not sValTextDefdef Then DefValTextDef()
- End Set
- End Property
-
- Public Property StringVal As String
- Get
- Return sStringVal
- End Get
- Set(value As String)
- sStringVal = value
- sValText = ChrW(34) & sStringVal & ChrW(34)
- If Not sValTextDefdef Then DefValTextDef()
- End Set
- End Property
-
- Public Property ModeIndex As Integer
- Get
- Return iModeIndex
- End Get
- Set(value As Integer)
- iModeIndex = value
- sValText = "(" & iModeIndex & ") " & sModes(iModeIndex)
- If Not sValTextDefdef Then DefValTextDef()
- End Set
- End Property
-
- Public ReadOnly Property Modes As List(Of String)
- Get
- Return sModes
- End Get
- End Property
-
- Public ReadOnly Property Mode As String
- Get
- If iModeIndex = -1 Then
- Return "<undefined>"
- Else
- Return sModes(iModeIndex)
- End If
- End Get
- End Property
-
- Public ReadOnly Property ModesDim As Integer
- Get
- Return iModesDim
- End Get
- End Property
-
- Public ReadOnly Property Description As String
- Get
- Return MyDescr
- End Get
- End Property
-
- Public ReadOnly Property ConfigType As tDEVconfType
- Get
- Return MyConfType
- End Get
- End Property
-
- Public ReadOnly Property TypeString As String
- Get
- Return sTypeString
- End Get
- End Property
-
- Public ReadOnly Property Enabled As Boolean
- Get
- Return (bEnabled And EnabledOpt)
- End Get
- End Property
-
- Public ReadOnly Property SaveInFile As Boolean
- Get
- Return bSaveInFile
- End Get
- End Property
-End Class
-
-Public Enum tDEVconfType
- tBoolean
- tSingleVal
- tStringVal
- tIntVal
- tAction
- tSelection
-End Enum
-
-
diff --git a/VECTO/cJSONparser.vb b/VECTO/cJSONparser.vb
index 79f2d37ca1..9870c5ada4 100644
--- a/VECTO/cJSONparser.vb
+++ b/VECTO/cJSONparser.vb
@@ -20,7 +20,6 @@ Imports Newtonsoft.Json
''' <remarks></remarks>
Public Class JSON
Public Content As Dictionary(Of String, Object)
- Public ErrorMsg As String
Public Sub New()
Content = New Dictionary(Of String, Object)
@@ -39,20 +38,17 @@ Public Class JSON
Content.Clear()
If Not IO.File.Exists(path) Then
- ErrorMsg = "file not found"
Return False
End If
Try
file = New TextFieldParser(path)
Catch ex As Exception
- ErrorMsg = ex.Message
Return False
End Try
If file.EndOfData Then
file.Close()
- ErrorMsg = "file is empty"
Return False
End If
@@ -63,7 +59,6 @@ Public Class JSON
Try
Content = JsonConvert.DeserializeObject(str, Content.GetType)
Catch ex As Exception
- ErrorMsg = ex.Message
Return False
End Try
--
GitLab