From 64cb9e57091e10179aeee9cce48c0cf08f3b9067 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Fri, 2 Sep 2016 14:07:08 +0200
Subject: [PATCH] removing commented lines (during refactoring/removing vecto
2.2 core), removing redundant qualifiers
---
VECTO/Configuration.vb | 25 ---
VECTO/File Browser/FB_Dialog.vb | 2 +-
VECTO/GUI/F_AboutBox.vb | 6 +-
VECTO/GUI/F_ENG.vb | 42 ++---
VECTO/GUI/F_FileSign.vb | 14 +-
VECTO/GUI/F_GBX.vb | 132 +++++++-------
VECTO/GUI/F_Graph_ChEdit.vb | 8 +-
VECTO/GUI/F_MAINForm.Designer.vb | 51 +++---
VECTO/GUI/F_MAINForm.resx | 3 -
VECTO/GUI/F_MAINForm.vb | 301 ++-----------------------------
VECTO/GUI/F_Settings.vb | 32 ++--
VECTO/GUI/F_VECTO.vb | 9 +-
VECTO/GUI/F_VEH.Designer.vb | 26 +--
VECTO/GUI/F_VEH.vb | 77 ++++----
VECTO/GUI/F_Welcome.vb | 6 +-
VECTO/GUI/GUI_Subs.vb | 18 +-
VECTO/Input Files/cGBX.vb | 16 +-
VECTO/Input Files/cMAP.vb | 12 --
VECTO/Input Files/cVECTO.vb | 19 --
VECTO/Input Files/cVEH.vb | 26 +--
VECTO/cFile V3.vb | 10 +-
VECTO/cJSONparser.vb | 1 -
22 files changed, 231 insertions(+), 605 deletions(-)
diff --git a/VECTO/Configuration.vb b/VECTO/Configuration.vb
index af972ae306..bd176c1d3d 100644
--- a/VECTO/Configuration.vb
+++ b/VECTO/Configuration.vb
@@ -15,12 +15,8 @@ Imports TUGraz.VectoCore.Models.Declaration
Public Class Configuration
Public FilePath As String
Public GnUfromCycle 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 LogSize As Single
Public AirDensity As Single
Public OpenCmd As String
@@ -40,18 +36,13 @@ 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
GnUfromCycle = False
End Sub
Public Sub SetDefault()
GnUfromCycle = True
- 'BatchMode = False
ModOut = True
Mod1Hz = False
- 'BATCHoutpath = sKey.JobPath
- 'BATCHoutSubD = False
- 'DistCorr = True
LogSize = 2
AirDensity = 1.2
OpenCmd = "notepad"
@@ -76,25 +67,14 @@ Public Class Configuration
End If
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
-
Try
Mod1Hz = json.Content("Body")("Mod1Hz")
Catch
End Try
ModOut = json.Content("Body")("ModOut")
- '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")
AirDensity = json.Content("Body")("AirDensity")
FuelDens = json.Content("Body")("FuelDensity")
CO2perFC = json.Content("Body")("CO2perFC")
@@ -119,14 +99,9 @@ Public Class Configuration
json.Content.Add("Header", dic)
dic = New Dictionary(Of String, Object)
- 'dic.Add("LastModeBatch", BatchMode)
dic.Add("ModOut", ModOut)
dic.Add("Mod1Hz", Mod1Hz)
- 'dic.Add("DistCorrection", DistCorr)
- dic.Add("UseGnUfromCycle", GnUfromCycle)
dic.Add("LogSize", LogSize)
- '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 56b8ff9bc6..5b084d362c 100644
--- a/VECTO/File Browser/FB_Dialog.vb
+++ b/VECTO/File Browser/FB_Dialog.vb
@@ -741,7 +741,7 @@ Public Class FB_Dialog
_myFolder = path
If Microsoft.VisualBasic.Right(_myFolder, 1) <> "\" Then _myFolder &= "\"
- Me.Text = Me.Title & " " & _myFolder
+ Text = Title & " " & _myFolder
LoadListFolder()
LoadListFiles()
diff --git a/VECTO/GUI/F_AboutBox.vb b/VECTO/GUI/F_AboutBox.vb
index cfb3e549d9..f171627c9d 100644
--- a/VECTO/GUI/F_AboutBox.vb
+++ b/VECTO/GUI/F_AboutBox.vb
@@ -17,9 +17,9 @@
Public Class F_AboutBox
'Initialize
Private Sub F10_AboutBox_Load(ByVal sender As Object, ByVal e As EventArgs) Handles MyBase.Load
- Me.Text = "VECTO " & VECTOvers & " / VectoCore " & COREVers
- Me.LabelLic.Text = Lic.LicString
- Me.LabelLicDate.Text = "Expiring date (y/m/d): " & Lic.ExpTime
+ Text = "VECTO " & VECTOvers & " / VectoCore " & COREvers
+ LabelLic.Text = Lic.LicString
+ LabelLicDate.Text = "Expiring date (y/m/d): " & Lic.ExpTime
End Sub
'e-mail links----------------------------------------------------------------
diff --git a/VECTO/GUI/F_ENG.vb b/VECTO/GUI/F_ENG.vb
index bdfd6154d6..27df8b7a10 100644
--- a/VECTO/GUI/F_ENG.vb
+++ b/VECTO/GUI/F_ENG.vb
@@ -253,7 +253,7 @@ Public Class F_ENG
'Flags current file as modified.
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
@@ -321,8 +321,8 @@ Public Class F_ENG
'Browse for VMAP file
Private Sub BtMAP_Click(sender As Object, e As EventArgs) Handles BtMAP.Click
- If fbMAP.OpenDialog(fFileRepl(Me.TbMAP.Text, fPATH(EngFile))) Then _
- Me.TbMAP.Text = fFileWoDir(fbMAP.Files(0), fPATH(EngFile))
+ If fbMAP.OpenDialog(fFileRepl(TbMAP.Text, fPATH(EngFile))) Then _
+ TbMAP.Text = fFileWoDir(fbMAP.Files(0), fPATH(EngFile))
End Sub
@@ -330,24 +330,24 @@ Public Class F_ENG
Private Sub BtMAPopen_Click(sender As Object, e As EventArgs) Handles BtMAPopen.Click
Dim fldfile As String
- fldfile = fFileRepl(Me.TbFLD.Text, fPATH(EngFile))
+ fldfile = fFileRepl(TbFLD.Text, fPATH(EngFile))
If fldfile <> sKey.NoFile AndAlso File.Exists(fldfile) Then
- OpenFiles(fFileRepl(Me.TbMAP.Text, fPATH(EngFile)), fldfile)
+ OpenFiles(fFileRepl(TbMAP.Text, fPATH(EngFile)), fldfile)
Else
- OpenFiles(fFileRepl(Me.TbMAP.Text, fPATH(EngFile)))
+ OpenFiles(fFileRepl(TbMAP.Text, fPATH(EngFile)))
End If
End Sub
'Save and close
Private Sub ButOK_Click(sender As Object, e As EventArgs) Handles ButOK.Click
- If SaveOrSaveAs(False) Then Me.Close()
+ If SaveOrSaveAs(False) Then Close()
End Sub
'Close without saving (see FormClosing Event)
Private Sub ButCancel_Click(sender As Object, e As EventArgs) Handles ButCancel.Click
- Me.Close()
+ Close()
End Sub
Private Sub UpdatePic()
@@ -361,15 +361,15 @@ Public Class F_ENG
Dim a As ChartArea
Dim img As Image
- Me.PicBox.Image = Nothing
+ PicBox.Image = Nothing
Try
'Read Files
- FLD0.FilePath = fFileRepl(Me.TbFLD.Text, fPATH(EngFile))
+ FLD0.FilePath = fFileRepl(TbFLD.Text, fPATH(EngFile))
fldOK = FLD0.ReadFile(False, False)
- MAP0.FilePath = fFileRepl(Me.TbMAP.Text, fPATH(EngFile))
+ MAP0.FilePath = fFileRepl(TbMAP.Text, fPATH(EngFile))
mapOK = MAP0.ReadFile(False)
Catch ex As Exception
@@ -381,8 +381,8 @@ Public Class F_ENG
'Create plot
MyChart = New Chart
- MyChart.Width = Me.PicBox.Width
- MyChart.Height = Me.PicBox.Height
+ MyChart.Width = PicBox.Width
+ MyChart.Height = PicBox.Height
a = New ChartArea
@@ -441,10 +441,10 @@ Public Class F_ENG
MyChart.Update()
img = New Bitmap(MyChart.Width, MyChart.Height, PixelFormat.Format32bppArgb)
- MyChart.DrawToBitmap(img, New Rectangle(0, 0, Me.PicBox.Width, Me.PicBox.Height))
+ MyChart.DrawToBitmap(img, New Rectangle(0, 0, PicBox.Width, PicBox.Height))
- Me.PicBox.Image = img
+ PicBox.Image = img
End Sub
@@ -485,14 +485,14 @@ Public Class F_ENG
Private Sub BtFLD_Click(sender As Object, e As EventArgs) Handles BtFLD.Click
- If fbFLD.OpenDialog(fFileRepl(Me.TbFLD.Text, fPATH(EngFile))) Then _
- Me.TbFLD.Text = fFileWoDir(fbFLD.Files(0), fPATH(EngFile))
+ If fbFLD.OpenDialog(fFileRepl(TbFLD.Text, fPATH(EngFile))) Then _
+ TbFLD.Text = fFileWoDir(fbFLD.Files(0), fPATH(EngFile))
End Sub
Private Sub BtFLDopen_Click(sender As Object, e As EventArgs) Handles BtFLDopen.Click
Dim fldfile As String
- fldfile = fFileRepl(Me.TbFLD.Text, fPATH(EngFile))
+ fldfile = fFileRepl(TbFLD.Text, fPATH(EngFile))
If fldfile <> sKey.NoFile AndAlso File.Exists(fldfile) Then
OpenFiles(fldfile)
@@ -510,9 +510,9 @@ Public Class F_ENG
Try
xml = XDocument.Load(dlog.Files(0))
- Me.TbWHTCurban.Text = xml.<VECTO-Engine-TransferFile>.<WHTCCorrectionFactors>.<Urban>.Value
- Me.TbWHTCrural.Text = xml.<VECTO-Engine-TransferFile>.<WHTCCorrectionFactors>.<Rural>.Value
- Me.TbWHTCmw.Text = xml.<VECTO-Engine-TransferFile>.<WHTCCorrectionFactors>.<Motorway>.Value
+ TbWHTCurban.Text = xml.<VECTO-Engine-TransferFile>.<WHTCCorrectionFactors>.<Urban>.Value
+ TbWHTCrural.Text = xml.<VECTO-Engine-TransferFile>.<WHTCCorrectionFactors>.<Rural>.Value
+ TbWHTCmw.Text = xml.<VECTO-Engine-TransferFile>.<WHTCCorrectionFactors>.<Motorway>.Value
Catch ex As Exception
MsgBox("Failed to load file! " & ex.Message, MsgBoxStyle.Critical)
diff --git a/VECTO/GUI/F_FileSign.vb b/VECTO/GUI/F_FileSign.vb
index 1ff0ae35ab..bcc1baa60c 100644
--- a/VECTO/GUI/F_FileSign.vb
+++ b/VECTO/GUI/F_FileSign.vb
@@ -116,12 +116,12 @@ Public Class F_FileSign
Else
lv0.ForeColor = Color.Red
End If
- Me.lvFiles.Items.Add(lv0)
+ lvFiles.Items.Add(lv0)
Next
End Sub
'Clear form
- Private Sub ClearForm(ByVal ClearFileList As Boolean)
+ Private Sub ClearForm(ClearFileList As Boolean)
If ClearFileList Then lvFiles.Items.Clear()
TbLicStr.Text = ""
TbPubKey.Text = ""
@@ -141,11 +141,11 @@ Public Class F_FileSign
Dim fb As New cFileBrowser("sig", False, True)
fb.Extensions = New String() {"vsig"}
- If fb.CustomDialog(Me.TbSigFile.Text, False, False, tFbExtMode.ForceExt, False, "vsig") Then
- Me.TbSigFile.Text = fb.Files(0)
+ If fb.CustomDialog(TbSigFile.Text, False, False, tFbExtMode.ForceExt, False, "vsig") Then
+ TbSigFile.Text = fb.Files(0)
End If
- If File.Exists(Me.TbSigFile.Text) Then
+ If File.Exists(TbSigFile.Text) Then
VerifySigFile()
End If
End Sub
@@ -159,11 +159,11 @@ Public Class F_FileSign
End Sub
Private Sub BtClose_Click(sender As Object, e As EventArgs) Handles BtClose.Click
- Me.Close()
+ Close()
End Sub
Private Sub BtClearList_Click(sender As Object, e As EventArgs) Handles BtClearList.Click
- Me.lvFiles.Items.Clear()
+ lvFiles.Items.Clear()
End Sub
Private Sub BtReload_Click(sender As Object, e As EventArgs) Handles BtReload.Click
diff --git a/VECTO/GUI/F_GBX.vb b/VECTO/GUI/F_GBX.vb
index 32fde22de6..85bacf736e 100644
--- a/VECTO/GUI/F_GBX.vb
+++ b/VECTO/GUI/F_GBX.vb
@@ -233,7 +233,7 @@ Public Class F_GBX
If Cfg.DeclMode <> GBX0.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
@@ -333,38 +333,38 @@ Public Class F_GBX
GBX0 = New cGBX
GBX0.FilePath = file
- GBX0.ModelName = Me.TbName.Text
+ GBX0.ModelName = TbName.Text
If Trim(GBX0.ModelName) = "" Then GBX0.ModelName = "Undefined"
- GBX0.TracIntrSi = fTextboxToNumString(Me.TbTracInt.Text)
- GBX0.GbxInertia = fTextboxToNumString(Me.TBI_getr.Text)
+ GBX0.TracIntrSi = fTextboxToNumString(TbTracInt.Text)
+ GBX0.GbxInertia = fTextboxToNumString(TBI_getr.Text)
- For i = 0 To Me.LvGears.Items.Count - 1
+ For i = 0 To LvGears.Items.Count - 1
'GBX0.IsTCgear.Add(Me.LvGears.Items(i).SubItems(GearboxTbl.TorqueConverter).Text = "on" And i > 0)
- GBX0.Igetr.Add(CSng(Me.LvGears.Items(i).SubItems(GearboxTbl.Ratio).Text))
+ GBX0.Igetr.Add(CSng(LvGears.Items(i).SubItems(GearboxTbl.Ratio).Text))
GBX0.GetrMaps.Add(New cSubPath)
- GBX0.GetrMap(i) = Me.LvGears.Items(i).SubItems(GearboxTbl.LossMapEfficiency).Text
+ GBX0.GetrMap(i) = LvGears.Items(i).SubItems(GearboxTbl.LossMapEfficiency).Text
GBX0.gs_files.Add(New cSubPath)
- GBX0.gsFile(i) = Me.LvGears.Items(i).SubItems(GearboxTbl.ShiftPolygons).Text
+ GBX0.gsFile(i) = LvGears.Items(i).SubItems(GearboxTbl.ShiftPolygons).Text
'GBX0.FldFiles.Add(New cSubPath)
'GBX0.FldFile(i) = Me.LvGears.Items(i).SubItems(GearboxTbl.MaxTorque).Text
GBX0.MaxTorque.Add(LvGears.Items(i).SubItems(GearboxTbl.MaxTorque).Text)
Next
- GBX0.gs_TorqueResv = fTextboxToNumString(Me.TbTqResv.Text)
- GBX0.gs_SkipGears = Me.ChSkipGears.Checked
- GBX0.gs_ShiftTime = fTextboxToNumString(Me.TbShiftTime.Text)
- GBX0.gs_TorqueResvStart = fTextboxToNumString(Me.TbTqResvStart.Text)
- GBX0.gs_StartSpeed = fTextboxToNumString(Me.TbStartSpeed.Text)
- GBX0.gs_StartAcc = fTextboxToNumString(Me.TbStartAcc.Text)
- GBX0.gs_ShiftInside = Me.ChShiftInside.Checked
+ GBX0.gs_TorqueResv = fTextboxToNumString(TbTqResv.Text)
+ GBX0.gs_SkipGears = ChSkipGears.Checked
+ GBX0.gs_ShiftTime = fTextboxToNumString(TbShiftTime.Text)
+ GBX0.gs_TorqueResvStart = fTextboxToNumString(TbTqResvStart.Text)
+ GBX0.gs_StartSpeed = fTextboxToNumString(TbStartSpeed.Text)
+ GBX0.gs_StartAcc = fTextboxToNumString(TbStartAcc.Text)
+ GBX0.gs_ShiftInside = ChShiftInside.Checked
GBX0.gs_Type = CbGStype.SelectedValue
- GBX0.TCon = Me.ChTCon.Checked
- GBX0.TCfile = Me.TbTCfile.Text
- GBX0.TCrefrpm = fTextboxToNumString(Me.TbTCrefrpm.Text)
- GBX0.TCinertia = fTextboxToNumString(Me.TbTCinertia.Text)
+ GBX0.TCon = ChTCon.Checked
+ GBX0.TCfile = TbTCfile.Text
+ GBX0.TCrefrpm = fTextboxToNumString(TbTCrefrpm.Text)
+ GBX0.TCinertia = fTextboxToNumString(TbTCinertia.Text)
GBX0.TCshiftFile = TBTCShiftPolygon.Text
GBX0.DownshiftAfterUpshift = fTextboxToNumString(tbDownshiftAfterUpshift.Text)
@@ -481,10 +481,10 @@ Public Class F_GBX
Private Sub CheckEnableTorqRes()
- If Me.ChShiftInside.Checked Or Me.ChSkipGears.Checked Then
- Me.PnTorqRes.Enabled = True
+ If ChShiftInside.Checked Or ChSkipGears.Checked Then
+ PnTorqRes.Enabled = True
Else
- Me.PnTorqRes.Enabled = False
+ PnTorqRes.Enabled = False
End If
End Sub
@@ -493,12 +493,12 @@ Public Class F_GBX
'Save and close
Private Sub ButOK_Click(sender As Object, e As EventArgs) Handles ButOK.Click
- If SaveOrSaveAs(False) Then Me.Close()
+ If SaveOrSaveAs(False) Then Close()
End Sub
'Cancel
Private Sub ButCancel_Click(sender As Object, e As EventArgs) Handles ButCancel.Click
- Me.Close()
+ Close()
End Sub
'Enable/Disable settings for specific transmission types
@@ -545,7 +545,7 @@ Public Class F_GBX
'Add Gear button
Private Sub BtAddGear_Click(sender As Object, e As EventArgs) Handles BtAddGear.Click
AddGear()
- Me.LvGears.Items(Me.LvGears.Items.Count - 1).Selected = True
+ LvGears.Items(LvGears.Items.Count - 1).Selected = True
EditGear()
End Sub
@@ -555,15 +555,15 @@ Public Class F_GBX
Do
'GearDia.ChIsTCgear.Enabled = (Me.ChTCon.Checked And Me.LvGears.SelectedIndices(0) > 0)
- GearDia.PnShiftPoly.Enabled = (Not Cfg.DeclMode And Me.LvGears.SelectedIndices(0) > 0)
- GearDia.PnFld.Enabled = (Me.LvGears.SelectedIndices(0) > 0)
+ GearDia.PnShiftPoly.Enabled = (Not Cfg.DeclMode And LvGears.SelectedIndices(0) > 0)
+ GearDia.PnFld.Enabled = (LvGears.SelectedIndices(0) > 0)
GearDia.GbxPath = fPATH(GbxFile)
- GearDia.TbGear.Text = Me.LvGears.SelectedItems(0).SubItems(GearboxTbl.GearNr).Text
- GearDia.TbRatio.Text = Me.LvGears.SelectedItems(0).SubItems(GearboxTbl.Ratio).Text
- GearDia.TbMapPath.Text = Me.LvGears.SelectedItems(0).SubItems(GearboxTbl.LossMapEfficiency).Text
- If Me.LvGears.SelectedIndices(0) > 0 Then
- GearDia.TbShiftPolyFile.Text = Me.LvGears.SelectedItems(0).SubItems(GearboxTbl.ShiftPolygons).Text
- GearDia.TbMaxTorque.Text = Me.LvGears.SelectedItems(0).SubItems(GearboxTbl.MaxTorque).Text
+ GearDia.TbGear.Text = LvGears.SelectedItems(0).SubItems(GearboxTbl.GearNr).Text
+ GearDia.TbRatio.Text = LvGears.SelectedItems(0).SubItems(GearboxTbl.Ratio).Text
+ GearDia.TbMapPath.Text = LvGears.SelectedItems(0).SubItems(GearboxTbl.LossMapEfficiency).Text
+ If LvGears.SelectedIndices(0) > 0 Then
+ GearDia.TbShiftPolyFile.Text = LvGears.SelectedItems(0).SubItems(GearboxTbl.ShiftPolygons).Text
+ GearDia.TbMaxTorque.Text = LvGears.SelectedItems(0).SubItems(GearboxTbl.MaxTorque).Text
Else
GearDia.TbShiftPolyFile.Text = ""
GearDia.TbMaxTorque.Text = ""
@@ -580,10 +580,10 @@ Public Class F_GBX
'Me.LvGears.SelectedItems(0).SubItems(GearboxTbl.TorqueConverter).Text = "-"
- Me.LvGears.SelectedItems(0).SubItems(GearboxTbl.Ratio).Text = GearDia.TbRatio.Text
- Me.LvGears.SelectedItems(0).SubItems(GearboxTbl.LossMapEfficiency).Text = GearDia.TbMapPath.Text
- Me.LvGears.SelectedItems(0).SubItems(GearboxTbl.ShiftPolygons).Text = GearDia.TbShiftPolyFile.Text
- Me.LvGears.SelectedItems(0).SubItems(GearboxTbl.MaxTorque).Text = GearDia.TbMaxTorque.Text
+ LvGears.SelectedItems(0).SubItems(GearboxTbl.Ratio).Text = GearDia.TbRatio.Text
+ LvGears.SelectedItems(0).SubItems(GearboxTbl.LossMapEfficiency).Text = GearDia.TbMapPath.Text
+ LvGears.SelectedItems(0).SubItems(GearboxTbl.ShiftPolygons).Text = GearDia.TbShiftPolyFile.Text
+ LvGears.SelectedItems(0).SubItems(GearboxTbl.MaxTorque).Text = GearDia.TbMaxTorque.Text
UpdatePic()
Change()
@@ -611,13 +611,13 @@ Public Class F_GBX
Private Sub AddGear()
Dim lvi As ListViewItem
- lvi = CreateListviewItem(Me.LvGears.Items.Count.ToString("00"), "-", 1, "", "", "")
+ lvi = CreateListviewItem(LvGears.Items.Count.ToString("00"), "-", 1, "", "", "")
- Me.LvGears.Items.Add(lvi)
+ LvGears.Items.Add(lvi)
lvi.EnsureVisible()
- Me.LvGears.Focus()
+ LvGears.Focus()
'Change() => NO! Change() is already handled by EditGear
End Sub
@@ -628,29 +628,29 @@ Public Class F_GBX
Dim i As Int16
Dim lv0 As ListViewItem
- If Me.LvGears.Items.Count < 2 Then Exit Sub
+ If LvGears.Items.Count < 2 Then Exit Sub
- If Me.LvGears.SelectedItems.Count = 0 Then Me.LvGears.Items(Me.LvGears.Items.Count - 1).Selected = True
+ If LvGears.SelectedItems.Count = 0 Then LvGears.Items(LvGears.Items.Count - 1).Selected = True
- i0 = Me.LvGears.SelectedItems(0).Index
+ i0 = LvGears.SelectedItems(0).Index
If i0 = 0 Then Exit Sub 'Must not remove axle
- Me.LvGears.SelectedItems(0).Remove()
+ LvGears.SelectedItems(0).Remove()
i = 0
- For Each lv0 In Me.LvGears.Items
+ For Each lv0 In LvGears.Items
If lv0.SubItems(GearboxTbl.GearNr).Text = "Axle" Then Continue For
i += 1
lv0.SubItems(GearboxTbl.GearNr).Text = i.ToString("00")
Next
- If i0 < Me.LvGears.Items.Count Then
- Me.LvGears.Items(i0).Selected = True
- Me.LvGears.Items(i0).EnsureVisible()
+ If i0 < LvGears.Items.Count Then
+ LvGears.Items(i0).Selected = True
+ LvGears.Items(i0).EnsureVisible()
End If
- Me.LvGears.Focus()
+ LvGears.Focus()
UpdatePic()
If Not NoChange Then Change()
@@ -715,19 +715,19 @@ Public Class F_GBX
Dim ShiftOK As Boolean
- Me.PicBox.Image = Nothing
+ PicBox.Image = Nothing
Try
'Check Files
- If Me.LvGears.Items.Count > 1 Then
+ If LvGears.Items.Count > 1 Then
- If Me.LvGears.SelectedItems.Count > 0 AndAlso Me.LvGears.SelectedIndices(0) > 0 Then
- path = fFileRepl(Me.LvGears.SelectedItems(0).SubItems(GearboxTbl.ShiftPolygons).Text, fPATH(GbxFile))
- 'fldpath = fFileRepl(Me.LvGears.SelectedItems(0).SubItems(GearboxTbl.MaxTorque).Text, fPATH(GbxFile))
- Gear = Me.LvGears.SelectedIndices(0)
+ If LvGears.SelectedItems.Count > 0 AndAlso LvGears.SelectedIndices(0) > 0 Then
+ path = fFileRepl(LvGears.SelectedItems(0).SubItems(GearboxTbl.ShiftPolygons).Text, fPATH(GbxFile))
+ 'fldpath = fFileRepl(LvGears.SelectedItems(0).SubItems(GearboxTbl.MaxTorque).Text, fPATH(GbxFile))
+ Gear = LvGears.SelectedIndices(0)
Else
- path = fFileRepl(Me.LvGears.Items(1).SubItems(GearboxTbl.ShiftPolygons).Text, fPATH(GbxFile))
+ path = fFileRepl(LvGears.Items(1).SubItems(GearboxTbl.ShiftPolygons).Text, fPATH(GbxFile))
'fldpath = fFileRepl(Me.LvGears.Items(1).SubItems(GearboxTbl.MaxTorque).Text, fPATH(GbxFile))
Gear = 1
End If
@@ -790,8 +790,8 @@ Public Class F_GBX
If Not ShiftOK And Not fldOK Then Exit Sub
MyChart = New Chart
- MyChart.Width = Me.PicBox.Width
- MyChart.Height = Me.PicBox.Height
+ MyChart.Width = PicBox.Width
+ MyChart.Height = PicBox.Height
a = New ChartArea
@@ -901,9 +901,9 @@ Public Class F_GBX
MyChart.Update()
img = New Bitmap(MyChart.Width, MyChart.Height, PixelFormat.Format32bppArgb)
- MyChart.DrawToBitmap(img, New Rectangle(0, 0, Me.PicBox.Width, Me.PicBox.Height))
+ MyChart.DrawToBitmap(img, New Rectangle(0, 0, PicBox.Width, PicBox.Height))
- Me.PicBox.Image = img
+ PicBox.Image = img
End Sub
@@ -938,14 +938,14 @@ Public Class F_GBX
'Browse TC file
Private Sub BtTCfileBrowse_Click(sender As Object, e As EventArgs) Handles BtTCfileBrowse.Click
- If fbTCC.OpenDialog(fFileRepl(Me.TbTCfile.Text, fPATH(GbxFile))) Then
- Me.TbTCfile.Text = fFileWoDir(fbTCC.Files(0), fPATH(GbxFile))
+ If fbTCC.OpenDialog(fFileRepl(TbTCfile.Text, fPATH(GbxFile))) Then
+ TbTCfile.Text = fFileWoDir(fbTCC.Files(0), fPATH(GbxFile))
End If
End Sub
'Open TC file
Private Sub BtTCfileOpen_Click(sender As Object, e As EventArgs) Handles BtTCfileOpen.Click
- OpenFiles(fFileRepl(Me.TbTCfile.Text, fPATH(GbxFile)))
+ OpenFiles(fFileRepl(TbTCfile.Text, fPATH(GbxFile)))
End Sub
Private Sub CheckGearTC()
@@ -953,7 +953,7 @@ Public Class F_GBX
If Not Init Then Exit Sub
- For Each lv0 In Me.LvGears.Items
+ For Each lv0 In LvGears.Items
If lv0.SubItems(GearboxTbl.GearNr).Text = "Axle" Then Continue For
@@ -976,8 +976,8 @@ Public Class F_GBX
End Sub
Private Sub BtTCShiftFileBrowse_Click(sender As Object, e As EventArgs) Handles BtTCShiftFileBrowse.Click
- If fbTCCShift.OpenDialog(fFileRepl(Me.TBTCShiftPolygon.Text, fPATH(GbxFile))) Then
- Me.TBTCShiftPolygon.Text = fFileWoDir(fbTCCShift.Files(0), fPATH(GbxFile))
+ If fbTCCShift.OpenDialog(fFileRepl(TBTCShiftPolygon.Text, fPATH(GbxFile))) Then
+ TBTCShiftPolygon.Text = fFileWoDir(fbTCCShift.Files(0), fPATH(GbxFile))
End If
End Sub
End Class
diff --git a/VECTO/GUI/F_Graph_ChEdit.vb b/VECTO/GUI/F_Graph_ChEdit.vb
index a1b32d8728..b01f7207d3 100644
--- a/VECTO/GUI/F_Graph_ChEdit.vb
+++ b/VECTO/GUI/F_Graph_ChEdit.vb
@@ -12,12 +12,12 @@
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()
+ DialogResult = DialogResult.OK
+ 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()
+ DialogResult = DialogResult.Cancel
+ Close()
End Sub
End Class
diff --git a/VECTO/GUI/F_MAINForm.Designer.vb b/VECTO/GUI/F_MAINForm.Designer.vb
index 717812fe0d..08cf1e715d 100644
--- a/VECTO/GUI/F_MAINForm.Designer.vb
+++ b/VECTO/GUI/F_MAINForm.Designer.vb
@@ -58,8 +58,9 @@ Partial Class F_MAINForm
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.GroupBox2 = New System.Windows.Forms.GroupBox()
Me.ChBoxModOut = New System.Windows.Forms.CheckBox()
+ Me.ChBoxMod1Hz = 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()
@@ -112,13 +113,13 @@ Partial Class F_MAINForm
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, System.ComponentModel.ISupportInitialize).BeginInit()
Me.TabPgOptions.SuspendLayout()
Me.PanelOptAllg.SuspendLayout()
+ Me.GroupBox2.SuspendLayout()
Me.GroupBox1.SuspendLayout()
Me.TabPageDEV.SuspendLayout()
Me.ConMenFilelist.SuspendLayout()
@@ -128,7 +129,6 @@ Partial Class F_MAINForm
Me.SplitContainer1.SuspendLayout()
Me.ToolStrip1.SuspendLayout()
Me.CmOpenFile.SuspendLayout()
- Me.GroupBox2.SuspendLayout()
Me.SuspendLayout()
'
'StatusBAR
@@ -368,15 +368,16 @@ Partial Class F_MAINForm
Me.PanelOptAllg.Size = New System.Drawing.Size(1022, 290)
Me.PanelOptAllg.TabIndex = 0
'
- 'ChBoxMod1Hz
+ 'GroupBox2
'
- Me.ChBoxMod1Hz.AutoSize = True
- Me.ChBoxMod1Hz.Location = New System.Drawing.Point(6, 42)
- Me.ChBoxMod1Hz.Name = "ChBoxMod1Hz"
- Me.ChBoxMod1Hz.Size = New System.Drawing.Size(121, 17)
- Me.ChBoxMod1Hz.TabIndex = 16
- Me.ChBoxMod1Hz.Text = "Modal results in 1Hz"
- Me.ChBoxMod1Hz.UseVisualStyleBackColor = True
+ 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"
'
'ChBoxModOut
'
@@ -390,6 +391,16 @@ Partial Class F_MAINForm
Me.ChBoxModOut.Text = "Write modal results"
Me.ChBoxModOut.UseVisualStyleBackColor = True
'
+ 'ChBoxMod1Hz
+ '
+ Me.ChBoxMod1Hz.AutoSize = True
+ Me.ChBoxMod1Hz.Location = New System.Drawing.Point(6, 42)
+ Me.ChBoxMod1Hz.Name = "ChBoxMod1Hz"
+ Me.ChBoxMod1Hz.Size = New System.Drawing.Size(121, 17)
+ Me.ChBoxMod1Hz.TabIndex = 16
+ Me.ChBoxMod1Hz.Text = "Modal results in 1Hz"
+ Me.ChBoxMod1Hz.UseVisualStyleBackColor = True
+ '
'GroupBox1
'
Me.GroupBox1.Controls.Add(Me.RbDev)
@@ -522,9 +533,6 @@ Partial Class F_MAINForm
Me.ClearListToolStripMenuItem.Size = New System.Drawing.Size(175, 22)
Me.ClearListToolStripMenuItem.Text = "Clear List"
'
- 'BackgroundWorker1
- '
- '
'LvMsg
'
Me.LvMsg.AllowColumnReorder = True
@@ -768,17 +776,6 @@ Partial Class F_MAINForm
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
@@ -798,6 +795,8 @@ Partial Class F_MAINForm
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
Me.TabPgOptions.ResumeLayout(False)
Me.PanelOptAllg.ResumeLayout(False)
+ Me.GroupBox2.ResumeLayout(False)
+ Me.GroupBox2.PerformLayout()
Me.GroupBox1.ResumeLayout(False)
Me.GroupBox1.PerformLayout()
Me.TabPageDEV.ResumeLayout(False)
@@ -810,8 +809,6 @@ Partial Class F_MAINForm
Me.ToolStrip1.ResumeLayout(False)
Me.ToolStrip1.PerformLayout()
Me.CmOpenFile.ResumeLayout(False)
- Me.GroupBox2.ResumeLayout(False)
- Me.GroupBox2.PerformLayout()
Me.ResumeLayout(False)
Me.PerformLayout()
diff --git a/VECTO/GUI/F_MAINForm.resx b/VECTO/GUI/F_MAINForm.resx
index 315e332dbf..0d31c37361 100644
--- a/VECTO/GUI/F_MAINForm.resx
+++ b/VECTO/GUI/F_MAINForm.resx
@@ -223,9 +223,6 @@
<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 8f14dbf22d..3fe73dfb0f 100644
--- a/VECTO/GUI/F_MAINForm.vb
+++ b/VECTO/GUI/F_MAINForm.vb
@@ -59,10 +59,6 @@ Public Class F_MAINForm
Private ConMenTarget As ListView
Private ConMenTarJob As Boolean
- 'Private CycleTabPage As TabPage
- 'Private CycleTabPageVisible As Boolean
-
-
Private GUIlocked As Boolean
Private CheckLock As Boolean
@@ -178,17 +174,12 @@ Public Class F_MAINForm
#End Region
-
- 'VECTO-Launcher
-
'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
-
+
BtGENup.Enabled = Not Lock
BtGENdown.Enabled = Not Lock
ButtonGENadd.Enabled = Not Lock
@@ -196,21 +187,11 @@ 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
-
btStartV3.Enabled = Not Lock
- 'If DEV.Enabled Then
- ' LvDEVoptions.Enabled = Not Lock
- 'End If
End Sub
- 'Define job file list
+
#Region "Form Init/Close"
@@ -222,8 +203,6 @@ Public Class F_MAINForm
GUIlocked = False
CheckLock = False
GENcheckAllLock = False
- 'DRIcheckAllLock = False
- 'DRIchecked = 0
GENchecked = 0
@@ -232,16 +211,8 @@ Public Class F_MAINForm
TabControl1.TabPages(x).Show()
Next
- 'CycleTabPageVisible = True
- 'CycleTabPage = TabPageDRI
-
- 'DEVpage = TabPageDEV
- 'TabControl1.Controls.Remove(DEVpage)
-
LastModeName = ""
- 'ComLineShutDown = False
-
FB_Initialize()
Text = "VECTO " & VECTOvers & " / VectoCore " & COREvers
@@ -251,16 +222,13 @@ Public Class F_MAINForm
JobListView = New cFileListView(MyConfPath & "joblist.txt")
JobListView.LVbox = LvGEN
CycleListView = New cFileListView(MyConfPath & "cyclelist.txt")
- 'CycleListView.LVbox = LvDRI
-
+
JobListView.LoadList()
- 'Load GUI Options (here, the GEN/ADV/DRI lists are loaded)
LoadOptions()
'Resize columns ... after Loading the @file-lists
LvGEN.Columns(1).Width = -2
- 'LvDRI.Columns(1).Width = -2
LvMsg.Columns(2).Width = -2
'Initialize BackgroundWorker
@@ -297,13 +265,6 @@ 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)
-
- 'If DEV.Enabled Then
- ' DEV.LoadFromFile()
- ' LoadDEVconfigs()
- 'End If
-
DeclOnOff()
End Sub
@@ -333,23 +294,8 @@ 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
+ End If
Status(LastModeName & " Mode")
@@ -357,25 +303,13 @@ Public Class F_MAINForm
LbDecl.Visible = Cfg.DeclMode
- 'PnDeclOpt.Enabled = Not Cfg.DeclMode
+
End Sub
'Shown Event (Form-Load finished) ... here StartUp Forms are loaded (DEV, GEN/ADV- Editor ..)
Private Sub F01_MAINForm_Shown(sender As Object, e As EventArgs) Handles Me.Shown
Dim fwelcome As F_Welcome
- 'DEV Form
- 'If DEV.Enabled And Not Cfg.DeclMode Then
- ' TabControl1.TabPages.Insert(TabControl1.TabPages.Count, DEVpage)
- 'End If
-
- 'VECTO Init
- 'Declaration.Init()
-
- 'Command Line Args
- 'If Command() <> "" Then
- ' CmdLineCtrl(My.Application.CommandLineArgs)
- 'Else
If Cfg.FirstRun Then
Cfg.FirstRun = False
fwelcome = New F_Welcome
@@ -398,8 +332,7 @@ Public Class F_MAINForm
'Config save
SetOptions()
Cfg.Save()
- 'If DEV.Enabled Then DEV.SaveToFile()
-
+
'File browser instances close
FB_Close()
End Sub
@@ -633,7 +566,6 @@ 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 VECTOworkerV3.IsBusy Then Exit Sub
pDim = UBound(Path)
@@ -710,8 +642,7 @@ lbFound:
c = LvGEN.Items.Count
TabPageGEN.Text = "Job Files ( " & GENchecked & " / " & c & " )"
- 'TabPageGEN.Text = "Job Files (" & c & ")"
-
+
GENcheckAllLock = True
If GENchecked = 0 Then
@@ -888,7 +819,6 @@ lbFound:
Next
'Items select and Insert
- 'For y = y1 To 0 Step -1
For y = 0 To y1
If Not check(y) Then GENchecked += 1
ListViewItem0 = ListV.Items.Insert(index(y), items(y))
@@ -929,11 +859,8 @@ lbFound:
UpdateJobTabText()
Else 'DRI
'Mode toggle
- 'If Not CbBatch.Checked Then CbBatch.Checked = True
CycleListView.LoadList(fbFileLists.Files(0))
- 'DRIchecked = LvDRI.CheckedItems.Count
- 'UpdateCycleTabText()
- End If
+ End If
End If
End Sub
@@ -952,27 +879,20 @@ lbFound:
UpdateJobTabText()
Else
CycleListView.LoadList()
- 'DRIchecked = LvDRI.CheckedItems.Count
- 'UpdateCycleTabText()
+
End If
End Sub
'Clear List
Private Sub ClearListToolStripMenuItem_Click(sender As Object, e As EventArgs) _
Handles ClearListToolStripMenuItem.Click
- 'Dim ListViewItem0 As ListViewItem
- 'For Each ListViewItem0 In ConMenTarget.SelectedItems
- ' ListViewItem0.Remove()
- 'Next
+
If GUIlocked Then Exit Sub
ConMenTarget.Items.Clear()
If ConMenTarJob Then
GENchecked = LvGEN.CheckedItems.Count
UpdateJobTabText()
- Else
- 'DRIchecked = LvDRI.CheckedItems.Count
- 'UpdateCycleTabText()
End If
End Sub
@@ -1232,31 +1152,15 @@ lbFound:
'Save lists
JobListView.SaveList()
- 'If Cfg.BatchMode Then CycleListView.SaveList()
-
- 'New mode
- 'Cfg.BatchMode = CbBatch.Checked
-
+
'GUI changes according to current mode
-
-
+
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
-
- 'Hide Cycle Tab Page
- 'If CycleTabPageVisible Then
- ' TabControl1.Controls.Remove(CycleTabPage)
- ' CycleTabPageVisible = False
- 'End If
-
-
'Update job counter
GENchecked = LvGEN.CheckedItems.Count
UpdateJobTabText()
@@ -1348,34 +1252,7 @@ lbFound:
End Sub
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
-
+
'Open Job Editor and open file (or new file)
Friend Sub OpenVECTOeditor(x As String)
@@ -1467,168 +1344,22 @@ lbFound:
'Load options from config class
Public Sub LoadOptions()
- '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
-
- 'Set Mode
- 'If Not Cfg.DeclMode Then CbBatch.Checked = Cfg.BatchMode
-
+
RbDecl.Checked = Cfg.DeclMode
End Sub
'Update config class from options in GUI, e.g. before running calculations
Private Sub SetOptions()
-
- 'General(Allgemein)
- 'Cfg.DistCorr = ChBoxCyclDistCor.Checked
- 'Cfg.GnUfromCycle = ChBoxUseGears.Checked
-
- 'BATCH
- Cfg.ModOut = ChBoxModOut.Checked
+ 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
#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)
-
- ' LvDEVoptions.Items.Clear()
-
- ' 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)
-
- ' 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
-
- ' If Not Config0.Value.Enabled Then
- ' LV0.ForeColor = Color.DarkGray
- ' End If
-
- ' LvDEVoptions.Items.Add(LV0)
-
- ' UpdateDEVconfigs(LV0)
-
- ' Next
- '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
-
- ' 'Config0 = DEV.Options(LvDEVoptions.SelectedItems(0).Tag)
-
- ' If Not Config0.Enabled Then Exit Sub
-
- ' Select Case Config0.ConfigType
- ' Case tDEVconfType.tAction
- ' Config0.DoAction()
-
- ' Case tDEVconfType.tBoolean
- ' Config0.BoolVal = Not Config0.BoolVal
-
- ' Case tDEVconfType.tSelection
-
- ' CmDEVitem = LvDEVoptions.SelectedItems(0)
-
- ' CmDEV.Items.Clear()
-
- ' 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)
-
- ' 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 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
-
- ''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
-
- ' DEV.Options(CmDEVitem.Tag).ModeIndex = i
-
- ' UpdateDEVconfigs(CmDEVitem)
- 'End Sub
-
-
-#End Region
-
'Add message to message list
Public Sub MSGtoForm(ID As tMsgID, Msg As String, Source As String, Link As String)
diff --git a/VECTO/GUI/F_Settings.vb b/VECTO/GUI/F_Settings.vb
index 340bdb29f6..c784039944 100644
--- a/VECTO/GUI/F_Settings.vb
+++ b/VECTO/GUI/F_Settings.vb
@@ -24,14 +24,14 @@ Public Class F_Settings
Private Sub LoadSettings()
- Me.TextBoxLogSize.Text = Cfg.LogSize
- Me.TbAirDensity.Text = CStr(Cfg.AirDensity)
- Me.TbOpenCmd.Text = Cfg.OpenCmd
- Me.TbOpenCmdName.Text = Cfg.OpenCmdName
- Me.TbFuelDens.Text = Cfg.FuelDens.ToString
- Me.TbCO2toFC.Text = Cfg.CO2perFC.ToString
+ TextBoxLogSize.Text = Cfg.LogSize
+ TbAirDensity.Text = CStr(Cfg.AirDensity)
+ TbOpenCmd.Text = Cfg.OpenCmd
+ TbOpenCmdName.Text = Cfg.OpenCmdName
+ TbFuelDens.Text = Cfg.FuelDens.ToString
+ TbCO2toFC.Text = Cfg.CO2perFC.ToString
- Me.GrCalc.Enabled = Not Cfg.DeclMode
+ GrCalc.Enabled = Not Cfg.DeclMode
End Sub
@@ -45,28 +45,28 @@ Public Class F_Settings
If Cfg.DeclMode Then Cfg.DeclInit()
F_MAINForm.LoadOptions()
LoadSettings()
- Me.Close()
+ Close()
End If
End Sub
'Save and close
Private Sub ButtonOK_Click(ByVal sender As Object, ByVal e As EventArgs) Handles ButtonOK.Click
- Cfg.LogSize = CSng(Me.TextBoxLogSize.Text)
- Cfg.AirDensity = CSng(Me.TbAirDensity.Text)
- Cfg.OpenCmd = Me.TbOpenCmd.Text
- Cfg.OpenCmdName = Me.TbOpenCmdName.Text
- Cfg.FuelDens = CSng(Me.TbFuelDens.Text)
- Cfg.CO2perFC = CSng(Me.TbCO2toFC.Text)
+ Cfg.LogSize = CSng(TextBoxLogSize.Text)
+ Cfg.AirDensity = CSng(TbAirDensity.Text)
+ Cfg.OpenCmd = TbOpenCmd.Text
+ Cfg.OpenCmdName = TbOpenCmdName.Text
+ Cfg.FuelDens = CSng(TbFuelDens.Text)
+ Cfg.CO2perFC = CSng(TbCO2toFC.Text)
'----------------------------------------------------
Cfg.Save()
- Me.Close()
+ Close()
End Sub
'Cancel
Private Sub ButtonCancel_Click(ByVal sender As Object, ByVal e As EventArgs) Handles ButtonCancel.Click
- Me.Close()
+ Close()
End Sub
'Help button
diff --git a/VECTO/GUI/F_VECTO.vb b/VECTO/GUI/F_VECTO.vb
index 89c3de450b..56243eedbb 100644
--- a/VECTO/GUI/F_VECTO.vb
+++ b/VECTO/GUI/F_VECTO.vb
@@ -12,7 +12,6 @@ Option Infer On
Imports System.Collections.Generic
Imports System.Drawing.Imaging
-Imports System.Globalization
Imports System.IO
Imports System.Linq
Imports System.Text.RegularExpressions
@@ -20,11 +19,7 @@ Imports System.Windows.Forms.DataVisualization.Charting
Imports TUGraz.VECTO.Input_Files
Imports TUGraz.VectoCommon.Models
Imports TUGraz.VectoCommon.Utils
-Imports TUGraz.VectoCore.Configuration
Imports TUGraz.VectoCore.Models.Declaration
-Imports TUGraz.VectoCore.Models.SimulationComponent.Data
-Imports TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox
-Imports TUGraz.VectoCore.Models.SimulationComponent.Impl
''' <summary>
''' Job Editor. Create/Edit VECTO job files (.vecto)
@@ -146,11 +141,11 @@ Public Class F_VECTO
End If
End Sub
- Protected Function GetTechListForAux(key As String, name As String, aux As IDeclarationAuxiliaryTable) As ListViewItem
+ Protected Function GetTechListForAux(key As String, nameStr As String, aux As IDeclarationAuxiliaryTable) As ListViewItem
Dim LV0 As ListViewItem
LV0 = New ListViewItem(key)
- LV0.SubItems.Add(name)
+ LV0.SubItems.Add(nameStr)
Dim auxtech As String() = aux.GetTechnologies()
If auxtech.Count > 1 Then
LV0.SubItems.Add("")
diff --git a/VECTO/GUI/F_VEH.Designer.vb b/VECTO/GUI/F_VEH.Designer.vb
index 67cdb652fb..5277f4332f 100644
--- a/VECTO/GUI/F_VEH.Designer.vb
+++ b/VECTO/GUI/F_VEH.Designer.vb
@@ -262,11 +262,6 @@ Partial Class F_VEH
'
Me.CbCdMode.DropDownStyle = ComboBoxStyle.DropDownList
Me.CbCdMode.FormattingEnabled = True
- CbCdMode.ValueMember = "Value"
- CbCdMode.DisplayMember = "Label"
- CbCdMode.DataSource = [Enum].GetValues(GetType(CrossWindCorrectionMode)) _
- .Cast(Of CrossWindCorrectionMode) _
- .Select(Function(mode) New With {Key .Value = mode, .Label = mode.GetLabel()}).ToList()
Me.CbCdMode.Location = New Point(6, 19)
Me.CbCdMode.Name = "CbCdMode"
Me.CbCdMode.Size = New Size(207, 21)
@@ -490,9 +485,7 @@ Partial Class F_VEH
'
Me.CbRtType.DropDownStyle = ComboBoxStyle.DropDownList
Me.CbRtType.FormattingEnabled = True
- CbRtType.ValueMember = "Value"
- CbRtType.DisplayMember = "Label"
- Me.CbRtType.DataSource = [Enum].GetValues(GetType(RetarderType)).Cast(Of RetarderType).Select(Function(type) New With {Key .Value = type, .Label = type.GetLabel()}).ToList()
+
Me.CbRtType.Location = New Point(6, 19)
Me.CbRtType.Name = "CbRtType"
Me.CbRtType.Size = New Size(266, 21)
@@ -630,11 +623,7 @@ Partial Class F_VEH
'
Me.CbAxleConfig.DropDownStyle = ComboBoxStyle.DropDownList
Me.CbAxleConfig.FormattingEnabled = True
- CbAxleConfig.ValueMember = "Value"
- CbAxleConfig.DisplayMember = "Label"
- Me.CbAxleConfig.DataSource = [Enum].GetValues(GetType(AxleConfiguration)) _
- .Cast(Of AxleConfiguration) _
- .Select(Function(category) New With {Key .Value = category, .Label = category.GetName()}).ToList()
+
Me.CbAxleConfig.Location = New Point(153, 80)
Me.CbAxleConfig.Name = "CbAxleConfig"
Me.CbAxleConfig.Size = New Size(60, 21)
@@ -644,11 +633,7 @@ Partial Class F_VEH
'
Me.CbCat.DropDownStyle = ComboBoxStyle.DropDownList
Me.CbCat.FormattingEnabled = True
- CbCat.ValueMember = "Value"
- CbCat.DisplayMember = "Label"
- Me.CbCat.DataSource = [Enum].GetValues(GetType(VehicleCategory)) _
- .Cast(Of VehicleCategory) _
- .Select(Function(category) New With {Key .Value = category, .label = category.GetLabel()}).ToList()
+
Me.CbCat.Location = New Point(12, 80)
Me.CbCat.Name = "CbCat"
Me.CbCat.Size = New Size(135, 21)
@@ -916,10 +901,7 @@ Partial Class F_VEH
'
Me.cbAngularGearType.DropDownStyle = ComboBoxStyle.DropDownList
Me.cbAngularGearType.FormattingEnabled = True
- cbAngularGearType.ValueMember = "Value"
- cbAngularGearType.DisplayMember = "Label"
- Me.cbAngularGearType.DataSource = [Enum].GetValues(GetType(AngularGearType)) _
- .Cast(Of AngularGearType).Select(Function(type) New With {Key .Value = type, .Label = type.GetLabel()}).ToList()
+
Me.cbAngularGearType.Location = New Point(6, 19)
Me.cbAngularGearType.Name = "cbAngularGearType"
Me.cbAngularGearType.Size = New Size(266, 21)
diff --git a/VECTO/GUI/F_VEH.vb b/VECTO/GUI/F_VEH.vb
index bb48a5bc81..18ac97f023 100644
--- a/VECTO/GUI/F_VEH.vb
+++ b/VECTO/GUI/F_VEH.vb
@@ -46,6 +46,34 @@ Public Class F_VEH
CbCdMode.Enabled = Not Cfg.DeclMode
PnWheelDiam.Enabled = Not Cfg.DeclMode
+ CbCdMode.ValueMember = "Value"
+ CbCdMode.DisplayMember = "Label"
+ CbCdMode.DataSource = [Enum].GetValues(GetType(CrossWindCorrectionMode)) _
+ .Cast(Of CrossWindCorrectionMode) _
+ .Select(Function(mode) New With {Key .Value = mode, .Label = mode.GetLabel()}).ToList()
+
+ CbRtType.ValueMember = "Value"
+ CbRtType.DisplayMember = "Label"
+ CbRtType.DataSource = [Enum].GetValues(GetType(RetarderType)) _
+ .Cast(Of RetarderType) _
+ .Select(Function(type) New With {Key .Value = type, .Label = type.GetLabel()}).ToList()
+
+ CbAxleConfig.ValueMember = "Value"
+ CbAxleConfig.DisplayMember = "Label"
+ CbAxleConfig.DataSource = [Enum].GetValues(GetType(AxleConfiguration)) _
+ .Cast(Of AxleConfiguration) _
+ .Select(Function(category) New With {Key .Value = category, .Label = category.GetName()}).ToList()
+
+ CbCat.ValueMember = "Value"
+ CbCat.DisplayMember = "Label"
+ CbCat.DataSource = [Enum].GetValues(GetType(VehicleCategory)) _
+ .Cast(Of VehicleCategory) _
+ .Select(Function(category) New With {Key .Value = category, .label = category.GetLabel()}).ToList()
+
+ cbAngularGearType.ValueMember = "Value"
+ cbAngularGearType.DisplayMember = "Label"
+ cbAngularGearType.DataSource = [Enum].GetValues(GetType(AngularGearType)) _
+ .Cast(Of AngularGearType).Select(Function(type) New With {Key .Value = type, .Label = type.GetLabel()}).ToList()
_axlDlog = New F_VEH_Axle
_changed = False
@@ -59,15 +87,15 @@ Public Class F_VEH
TbHDVclass.Text = "-"
Exit Sub
End If
- Dim vehC = CbCat.SelectedValue 'CType(CbCat.SelectedIndex, tVehCat)
- Dim axlC = CbAxleConfig.SelectedValue 'CType(CbAxleConfig.SelectedIndex, tAxleConf)
- Dim maxMass = (TbMassMass.Text.ToDouble() * 1000).SI(Of Kilogram)() 'CSng(fTextboxToNumString(TbMassMass.Text))
+ Dim vehC = CbCat.SelectedValue
+ Dim axlC = CbAxleConfig.SelectedValue
+ Dim maxMass = (TbMassMass.Text.ToDouble() * 1000).SI(Of Kilogram)()
_hdVclass = "-"
Dim s0 As Segment = Nothing
Try
- s0 = DeclarationData.Segments.Lookup(vehC, axlC, maxMass, 0.SI(Of Kilogram), True) _
- ' Declaration.SegmentTable.SetRef(vehC, axlC, maxMass)
+ s0 = DeclarationData.Segments.Lookup(vehC, axlC, maxMass, 0.SI(Of Kilogram), True)
+
Catch
' no segment found - ignore
End Try
@@ -89,20 +117,19 @@ Public Class F_VEH
TbHDVclass.Text = "-"
Exit Sub
End If
- Dim vehC = CbCat.SelectedValue 'CType(CbCat.SelectedIndex, tVehCat)
- Dim axlC = CbAxleConfig.SelectedValue 'CType(CbAxleConfig.SelectedIndex, tAxleConf)
- Dim maxMass = (TbMassMass.Text.ToDouble() * 1000).SI(Of Kilogram)() 'CSng(fTextboxToNumString(TbMassMass.Text))
+ Dim vehC = CbCat.SelectedValue
+ Dim axlC = CbAxleConfig.SelectedValue
+ Dim maxMass = (TbMassMass.Text.ToDouble() * 1000).SI(Of Kilogram)()
Dim s0 As Segment = Nothing
Try
- s0 = DeclarationData.Segments.Lookup(vehC, axlC, maxMass, 0.SI(Of Kilogram), True) _
- ' Declaration.SegmentTable.SetRef(vehC, axlC, maxMass)
+ s0 = DeclarationData.Segments.Lookup(vehC, axlC, maxMass, 0.SI(Of Kilogram), True)
Catch
' no segment found - ignore
End Try
If Not s0 Is Nothing Then
_hdVclass = s0.VehicleClass
- Dim axleCount As Short = s0.Missions(0).AxleWeightDistribution.Count() '.AxleShares(s0.Missions(0)).Count
+ Dim axleCount As Short = s0.Missions(0).AxleWeightDistribution.Count()
Dim i0 = LvRRC.Items.Count
If axleCount > i0 Then
@@ -375,30 +402,6 @@ Public Class F_VEH
veh.Loading = CSng(fTextboxToNumString(TbLoad.Text))
veh.CdA0 = CSng(fTextboxToNumString(TBcdA.Text))
- 'veh.CdA02 = veh.CdA0
-
- ' @@@quam: CdA2 is no longer used, Vecto 3 takes this into account internally
-
- 'Dim vehC = EnumHelper.ParseEnum(Of VehicleCategory)(CbCat.SelectedItem) 'CType(CbCat.SelectedIndex, tVehCat)
- 'Dim axlC = AxleConfigurationHelper.Parse(CbAxleConfig.SelectedItem) 'CType(CbAxleConfig.SelectedIndex, tAxleConf)
- 'Dim maxMass = (TbMassMass.Text.ToDouble() * 1000).SI(Of Kilogram)() 'CSng(fTextboxToNumString(TbMassMass.Text))
-
- 'Dim s0 As Segment
- 'Try
- ' s0 = DeclarationData.Segments.Lookup(vehC, axlC, maxMass, 0.SI(Of Kilogram))
- 'Catch
- 'End Try
-
- 'If Not s0 Is Nothing Then
- ' If s0.VehicleClass = VehicleClass.Class2 Then
- ' ' CdA Addition for T1 Trailer
- ' veh.CdA02 += 1.1
- ' End If
- ' If s0.VehicleClass = VehicleClass.Class4 OrElse s0.VehicleClass = VehicleClass.Class9 Then
- ' ' CdA Addition for T2 Trailer
- ' veh.CdA02 += 0.6
- ' End If
- 'End If
veh.rdyn = CSng(fTextboxToNumString(TBrdyn.Text))
veh.CdMode = CbCdMode.SelectedValue
@@ -433,8 +436,8 @@ Public Class F_VEH
veh.MassMax = CSng(fTextboxToNumString(TbMassMass.Text))
veh.MassExtra = CSng(fTextboxToNumString(TbMassExtra.Text))
- veh.AxleConf = CbAxleConfig.SelectedValue _
- 'CType(CbAxleConfig.SelectedIndex, tAxleConf)
+ veh.AxleConf = CbAxleConfig.SelectedValue
+
'---------------------------------------------------------------------------------
If Not veh.SaveFile Then
diff --git a/VECTO/GUI/F_Welcome.vb b/VECTO/GUI/F_Welcome.vb
index 0b7ae664e0..0a775f793b 100644
--- a/VECTO/GUI/F_Welcome.vb
+++ b/VECTO/GUI/F_Welcome.vb
@@ -17,13 +17,13 @@ Imports System.IO
Public Class F_Welcome
'Close
Private Sub Cancel_Button_Click(ByVal sender As Object, ByVal e As EventArgs) Handles Cancel_Button.Click
- Me.DialogResult = DialogResult.Cancel
- Me.Close()
+ DialogResult = DialogResult.Cancel
+ Close()
End Sub
'Init
Private Sub F_Welcome_Load(sender As Object, e As EventArgs) Handles Me.Load
- Me.Text = "VECTO " & VECTOvers & " / VectoCore " & COREvers
+ Text = "VECTO " & VECTOvers & " / VectoCore " & COREvers
End Sub
'Open Release Notes
diff --git a/VECTO/GUI/GUI_Subs.vb b/VECTO/GUI/GUI_Subs.vb
index 56bd7959e7..f6afa23443 100644
--- a/VECTO/GUI/GUI_Subs.vb
+++ b/VECTO/GUI/GUI_Subs.vb
@@ -18,7 +18,8 @@ Public Module GUI_Subs
#Region "GUI control via background worker"
'Status Message => Msg-Listview
- Public Sub WorkerMsg(ByVal ID As tMsgID, ByVal Msg As String, ByVal Source As String, Optional ByVal Link As String = "")
+ Public Sub WorkerMsg(ByVal ID As tMsgID, ByVal Msg As String, ByVal Source As String,
+ Optional ByVal Link As String = "")
Dim WorkProg As New cWorkProg(tWorkMsgType.StatusListBox)
WorkProg.ID = ID
Select Case ID
@@ -113,7 +114,6 @@ Public Module GUI_Subs
End If
End Function
-
#End Region
@@ -137,7 +137,12 @@ Public Module GUI_Subs
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
@@ -151,7 +156,12 @@ 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
diff --git a/VECTO/Input Files/cGBX.vb b/VECTO/Input Files/cGBX.vb
index cd90d6b655..609dbf4a1d 100644
--- a/VECTO/Input Files/cGBX.vb
+++ b/VECTO/Input Files/cGBX.vb
@@ -71,7 +71,6 @@ Public Class cGBX
TracIntrSi = 0
Igetr = New List(Of Single)
- 'IsTCgear = New List(Of Boolean)
GetrMaps = New List(Of cSubPath)
gs_files = New List(Of cSubPath)
MaxTorque = New List(Of String)
@@ -125,15 +124,13 @@ Public Class cGBX
For i = 0 To Igetr.Count - 1
dic0 = New Dictionary(Of String, Object)
dic0.Add("Ratio", Igetr(i))
- If IsNumeric(Me.GetrMap(i, True)) Then
+ If IsNumeric(GetrMap(i, True)) Then
dic0.Add("Efficiency", GetrMaps(i).PathOrDummy)
Else
dic0.Add("LossMap", GetrMaps(i).PathOrDummy)
End If
If i > 0 Then
- 'dic0.Add("TCactive", IsTCgear(i))
dic0.Add("ShiftPolygon", gs_files(i).PathOrDummy)
- 'dic0.Add("FullLoadCurve", FldFiles(i).PathOrDummy)
dic0.Add("MaxTorque", MaxTorque(i))
End If
@@ -211,24 +208,15 @@ Public Class cGBX
MaxTorque.Add(dic("MaxTorque"))
gs_files.Add(New cSubPath)
- 'FldFiles.Add(New cSubPath)
If i = 0 Then
- 'IsTCgear.Add(False)
gs_files(i).Init(MyPath, sKey.NoFile)
- 'FldFiles(i).Init(MyPath, sKey.NoFile)
Else
- 'IsTCgear.Add(dic("TCactive"))
If FileVersion < 2 Then
gs_files(i).Init(MyPath, JSON.Content("Body")("ShiftPolygons"))
Else
gs_files(i).Init(MyPath, dic("ShiftPolygon"))
End If
- 'If FileVersion < 5 Then
- ' FldFiles(i).Init(MyPath, sKey.NoFile)
- 'Else
- ' FldFiles(i).Init(MyPath, dic("FullLoadCurve"))
- 'End If
End If
Next
@@ -284,7 +272,7 @@ Public Class cGBX
Public Function GearCount() As Integer
- Return Me.Igetr.Count - 1
+ Return Igetr.Count - 1
End Function
diff --git a/VECTO/Input Files/cMAP.vb b/VECTO/Input Files/cMAP.vb
index 9bb67d4444..0f8494554d 100644
--- a/VECTO/Input Files/cMAP.vb
+++ b/VECTO/Input Files/cMAP.vb
@@ -9,9 +9,6 @@
'
' See the LICENSE.txt for the specific language governing permissions and limitations.
Imports System.Collections.Generic
-Imports TUGraz.VectoCommon.Utils
-Imports TUGraz.VectoCore.Configuration
-Imports VectoAuxiliaries
Public Class cMAP
'Implements IFuelConsumptionMap
@@ -28,7 +25,6 @@ Public Class cMAP
LTq = Nothing
LnU = Nothing
iMapDim = -1
-
End Sub
Public Function ReadFile(Optional ByVal ShowMsg As Boolean = True) As Boolean
@@ -107,7 +103,6 @@ Public Class cMAP
file.Close()
-
Return True
@@ -144,13 +139,6 @@ lbEr:
End Property
#End Region
-
- 'Public Function GetFuelConsumption(torque As NewtonMeter, angularVelocity As PerSecond) As KilogramPerSecond _
- ' Implements IFuelConsumptionMap.GetFuelConsumption
- ' 'MQ: TODO: check units!
- ' Return _
- ' (fFCdelaunay_Intp(angularVelocity.Value() / Constants.RPMToRad, torque.Value()) / 3600 / 1000).SI(Of KilogramPerSecond)()
- 'End Function
End Class
diff --git a/VECTO/Input Files/cVECTO.vb b/VECTO/Input Files/cVECTO.vb
index 9f06d2497a..beff758414 100644
--- a/VECTO/Input Files/cVECTO.vb
+++ b/VECTO/Input Files/cVECTO.vb
@@ -40,9 +40,6 @@ Public Class cVECTO
Public StStDelay 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
@@ -51,9 +48,7 @@ Public Class cVECTO
Public EngOnly As Boolean
- Public ALookahead As Single
Public VMin As Single
- Public VMinLa As Single
Public LookAheadOn As Boolean
Public OverSpeedOn As Boolean
Public OverSpeed As Single
@@ -83,12 +78,7 @@ Public Class cVECTO
_driverAccelerationFile = New cSubPath
- '_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)
CycleFiles = New List(Of cSubPath)
End Sub
@@ -143,8 +133,6 @@ Public Class cVECTO
{"Delay", StStDelay}})
dic0.Add("LAC", New Dictionary(Of String, Object) From {
{"Enabled", LookAheadOn},
- {"Dec", ALookahead},
- {"MinSpeed", VMinLa},
{"PreviewDistanceFactor", LacPreviewFactor},
{"DF_offset", LacDfOffset},
{"DF_scaling", LacDfScale},
@@ -321,8 +309,6 @@ Public Class cVECTO
If Not body("LAC") Is Nothing Then
Dim dic = body("LAC")
LookAheadOn = dic("Enabled")
- ALookahead = dic("Dec")
- VMinLa = dic("MinSpeed")
LacPreviewFactor = If(dic("PreviewDistanceFactor") Is Nothing, 10, dic("PreviewDistanceFactor"))
LacDfOffset = If(dic("DF_offset") Is Nothing, 2.5, dic("DF_offset"))
LacDfScale = If(dic("DF_scaling") Is Nothing, 1.5, dic("DF_scaling"))
@@ -390,21 +376,16 @@ Public Class cVECTO
_stPathGbx.Clear()
_driverAccelerationFile.Clear()
- '_laDesV.Clear()
- '_laDesMax.Clear()
- '_laDesMin.Clear()
AuxPaths.Clear()
EngOnly = False
- ALookahead = 0
VMin = 0
LookAheadOn = True
OverSpeedOn = False
EcoRollOn = False
OverSpeed = 0
UnderSpeed = 0
- VMinLa = 0
SavedInDeclMode = False
End Sub
diff --git a/VECTO/Input Files/cVEH.vb b/VECTO/Input Files/cVEH.vb
index 7304813e7d..f406bd478e 100644
--- a/VECTO/Input Files/cVEH.vb
+++ b/VECTO/Input Files/cVEH.vb
@@ -30,8 +30,6 @@ Public Class cVEH
Public Loading As Single
Public CdA0 As Single
- 'Public CdA02 As Single
- 'Private CdA0Act As Single
Public CdMode As CrossWindCorrectionMode
Public CdFile As cSubPath
@@ -139,9 +137,7 @@ Public Class cVEH
MassExtra = body("CurbWeightExtra")
Loading = body("Loading")
VehCat = body("VehCat").ToString.ParseEnum(Of VehicleCategory)() 'ConvVehCat(body("VehCat").ToString)
- AxleConf = AxleConfigurationHelper.Parse(body("AxleConfig")("Type").ToString) _
- 'ConvAxleConf(body("AxleConfig")("Type").ToString)
-
+ AxleConf = AxleConfigurationHelper.Parse(body("AxleConfig")("Type").ToString)
If FileVersion < 2 Then
'convert kg to ton
MassMax /= 1000
@@ -158,23 +154,7 @@ Public Class cVEH
'CdA02 = CdA0
- 'If FileVersion < 4 Then
- ' If Not body("CdRigid") Is Nothing AndAlso Not body("CrossSecAreaRigid") Is Nothing Then
- ' CdA02 = CSng(body("CdRigid")) * CSng(body("CrossSecAreaRigid"))
- ' End If
- 'ElseIf FileVersion < 7 Then
- ' If Not body("Cd2") Is Nothing AndAlso Not body("CrossSecArea2") Is Nothing Then
- ' CdA02 = CSng(body("Cd2")) * CSng(body("CrossSecArea2"))
- ' End If
- 'Else
- ' If Not body("CdA2") Is Nothing Then
- ' CdA02 = body("CdA2")
- ' End If
- 'End If
-
- 'CdA0Act = CdA0
-
- CdMode = CrossWindCorrectionModeHelper.Parse(body("CdCorrMode").ToString) 'CdModeConv(body("CdCorrMode").ToString)
+ CdMode = CrossWindCorrectionModeHelper.Parse(body("CdCorrMode").ToString)
If Not body("CdCorrFile") Is Nothing Then
CdFile.Init(MyPath, body("CdCorrFile"))
End If
@@ -182,7 +162,7 @@ Public Class cVEH
If body("Retarder") Is Nothing Then
RtType = RetarderType.None
Else
- RtType = RetarderTypeHelper.Parse(body("Retarder")("Type").ToString) 'RtTypeConv(body("Retarder")("Type").ToString)
+ RtType = RetarderTypeHelper.Parse(body("Retarder")("Type").ToString)
If Not body("Retarder")("Ratio") Is Nothing Then
RtRatio = body("Retarder")("Ratio")
End If
diff --git a/VECTO/cFile V3.vb b/VECTO/cFile V3.vb
index f6765d62d2..69eb390df0 100644
--- a/VECTO/cFile V3.vb
+++ b/VECTO/cFile V3.vb
@@ -26,7 +26,7 @@ Public Class cFile_V3
Private FileEnd As Boolean
Public Sub New()
- Me.Reset()
+ Reset()
End Sub
Private Sub Reset()
@@ -37,7 +37,7 @@ Public Class cFile_V3
End Sub
Public Function OpenRead(ByVal FileName As String, Optional ByVal Separator As String = ",", Optional ByVal SkipComment As Boolean = True, Optional ByVal StopAtE As Boolean = False) As Boolean
- Me.Reset()
+ Reset()
StopE = StopAtE
Path = FileName
Sepp = Separator
@@ -56,7 +56,7 @@ Public Class cFile_V3
'If TxtFldParser.EndOfData Then Return False
- Me.ReadLine()
+ ReadLine()
Return True
End Function
@@ -97,7 +97,7 @@ lb10:
If FileOpen Then StrWrter.Close()
StrWrter = Nothing
End Select
- Me.Reset()
+ Reset()
End Sub
Public ReadOnly Property EndOfFile() As Boolean
@@ -107,7 +107,7 @@ lb10:
End Property
Public Function OpenWrite(ByVal FileName As String, Optional ByVal Separator As String = ",", Optional ByVal AutoFlush As Boolean = False, Optional ByVal Append As Boolean = False) As Boolean
- Me.Reset()
+ Reset()
Path = FileName
Sepp = Separator
If Not (Mode = FileMode.Undefined) Then Return False
diff --git a/VECTO/cJSONparser.vb b/VECTO/cJSONparser.vb
index 9870c5ada4..fd1e8a46ee 100644
--- a/VECTO/cJSONparser.vb
+++ b/VECTO/cJSONparser.vb
@@ -10,7 +10,6 @@
' See the LICENSE.txt for the specific language governing permissions and limitations.
Imports System.Collections.Generic
Imports System.IO
-Imports System.Text
Imports Microsoft.VisualBasic.FileIO
Imports Newtonsoft.Json
--
GitLab