diff --git a/Tools/VectoLegacyTests/TorqueConverterTest.cs b/Tools/VectoLegacyTests/TorqueConverterTest.cs index 079d6b9438cc74e1acb3b44f2c9234ccfaf0075e..4de9b40dd7610e4cfe99e8485970078c1b0c4204 100644 --- a/Tools/VectoLegacyTests/TorqueConverterTest.cs +++ b/Tools/VectoLegacyTests/TorqueConverterTest.cs @@ -3,7 +3,7 @@ using System.Diagnostics; using System.Globalization; using System.Threading; using Microsoft.VisualStudio.TestTools.UnitTesting; -using VECTO; +using TUGraz.VECTO; namespace VectoLegacyTests { diff --git a/VECTO/ApplicationEvents.vb b/VECTO/ApplicationEvents.vb index 915b69e17ded3977d2c1b236fdcd43187fd809fa..92766cee5bb679143cadaedf9ad56c8ac02de592 100644 --- a/VECTO/ApplicationEvents.vb +++ b/VECTO/ApplicationEvents.vb @@ -10,125 +10,126 @@ ' See the LICENSE.txt for the specific language governing permissions and limitations. Imports System.Collections.Generic -Namespace My - - ' The following events are available for MyApplication: - ' - ' Startup: Raised when the application starts even before the creation of the Startup-forms. - ' Shutdown: Raised after closing all the application forms. This event is not raised if the application terminates abnormally. - ' UnhandledException: Raised if the application encounters an unhandled exception. - ' StartupNextInstance: Raised when launching a single-instance application, and one is already active. - ' NetworkAvailabilityChanged: Occurs when connecting or disconnecting to the network. - Partial Friend Class MyApplication - - 'Initialization - Private Sub MyApplication_Startup(ByVal sender As Object, ByVal e As Microsoft.VisualBasic.ApplicationServices.StartupEventArgs) Handles Me.Startup - - Dim s As String - Dim i As Int16 - Dim file As cFile_V3 - - 'Paths - MyAppPath = My.Application.Info.DirectoryPath & "\" - MyConfPath = MyAppPath & "Config\" - MyDeclPath = MyAppPath & "Declaration\" - FB_FilHisDir = MyConfPath & "FileHistory\" - - 'Log - LogFile = New cLogFile - If Not LogFile.StartLog() Then - MsgBox("Error! Can't access log file. Application folder needs read/write permissions!") - e.Cancel = True - End If - - 'If folder does not exist: Create! - If Not IO.Directory.Exists(MyConfPath) Then - Try - IO.Directory.CreateDirectory(MyConfPath) - Catch ex As Exception - MsgBox("Failed to create directory '" & MyConfPath & "'!", MsgBoxStyle.Critical) - LogFile.WriteToLog(tMsgID.Err, "Failed to create directory '" & MyConfPath & "'!") - e.Cancel = True - End Try - IO.File.Create(MyConfPath & "joblist.txt") - IO.File.Create(MyConfPath & "cyclelist.txt") - End If - If Not IO.Directory.Exists(FB_FilHisDir) Then - Try - IO.Directory.CreateDirectory(FB_FilHisDir) - - 'Preconfigure Directories.txt - Try - s = IO.Directory.GetParent(My.Application.Info.DirectoryPath).ToString & "\" - Catch ex As Exception - s = MyAppPath - End Try - Try - - file = New cFile_V3 - file.OpenWrite(FB_FilHisDir & "Directories.txt") - file.WriteLine(s) - For i = 2 To 20 - file.WriteLine(" ") - Next - file.Close() - Catch ex As Exception - - End Try - - Catch ex As Exception - MsgBox("Failed to create directory '" & FB_FilHisDir & "'!", MsgBoxStyle.Critical) - LogFile.WriteToLog(tMsgID.Err, "Failed to create directory '" & FB_FilHisDir & "'!") - e.Cancel = True - End Try - End If - - 'Separator! - SetCulture = False - If System.Globalization.CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator <> "." Then - SetCulture = True - Try - System.Threading.Thread.CurrentThread.CurrentCulture = New System.Globalization.CultureInfo("en-US") - System.Threading.Thread.CurrentThread.CurrentUICulture = New System.Globalization.CultureInfo("en-US") - 'MSGtoForm(8, "Set CurrentCulture to 'en-US'", True) - Catch ex As Exception - GUImsg(tMsgID.Err, "Failed to set Application Regional Settings to 'en-US'! Check system decimal- and group- separators!") - End Try - End If - - 'Initialise Classes - sKey = New csKey - JobFileList = New List(Of String) - JobCycleList = New List(Of String) - DEV = New cDEV - Declaration = New cDeclaration - - Cfg = New Configuration 'ACHTUNG: Configuration.New löst Configuration.SetDefault aus welches sKey benötigt dehalb muss sKey schon vorher initialisiert werden!! - Cfg.FilePath = MyConfPath & "settings.json" - - ProgBarCtrl = New cProgBarCtrl - - 'Config - Cfg.Load() - - 'Restart log if log file too large - LogFile.SizeCheck() - - - 'License initialization - Lic = New vectolic.cLicense - Lic.AppVersion = VECTOvers - Lic.FilePath = MyAppPath & "license.dat" - - End Sub - - Private Sub MyApplication_UnhandledException(ByVal sender As Object, ByVal e As Microsoft.VisualBasic.ApplicationServices.UnhandledExceptionEventArgs) Handles Me.UnhandledException - e.ExitApplication = True - MsgBox("ERROR!" & ChrW(10) & ChrW(10) & e.Exception.Message.ToString, MsgBoxStyle.Critical, "Unexpected Error") - LogFile.WriteToLog(tMsgID.Err, ">>>Unexpected Error:" & e.Exception.ToString()) - End Sub - - End Class +Imports TUGraz.VECTO.File_Browser +Namespace My + ' The following events are available for MyApplication: + ' + ' Startup: Raised when the application starts even before the creation of the Startup-forms. + ' Shutdown: Raised after closing all the application forms. This event is not raised if the application terminates abnormally. + ' UnhandledException: Raised if the application encounters an unhandled exception. + ' StartupNextInstance: Raised when launching a single-instance application, and one is already active. + ' NetworkAvailabilityChanged: Occurs when connecting or disconnecting to the network. + Partial Friend Class MyApplication + 'Initialization + Private Sub MyApplication_Startup(ByVal sender As Object, + ByVal e As Microsoft.VisualBasic.ApplicationServices.StartupEventArgs) Handles Me.Startup + + Dim s As String + Dim i As Int16 + Dim file As cFile_V3 + + 'Paths + MyAppPath = My.Application.Info.DirectoryPath & "\" + MyConfPath = MyAppPath & "Config\" + + FB_FilHisDir = MyConfPath & "FileHistory\" + + 'Log + LogFile = New cLogFile + If Not LogFile.StartLog() Then + MsgBox("Error! Can't access log file. Application folder needs read/write permissions!") + e.Cancel = True + End If + + 'If folder does not exist: Create! + If Not IO.Directory.Exists(MyConfPath) Then + Try + IO.Directory.CreateDirectory(MyConfPath) + Catch ex As Exception + MsgBox("Failed to create directory '" & MyConfPath & "'!", MsgBoxStyle.Critical) + LogFile.WriteToLog(tMsgID.Err, "Failed to create directory '" & MyConfPath & "'!") + e.Cancel = True + End Try + IO.File.Create(MyConfPath & "joblist.txt") + IO.File.Create(MyConfPath & "cyclelist.txt") + End If + If Not IO.Directory.Exists(FB_FilHisDir) Then + Try + IO.Directory.CreateDirectory(FB_FilHisDir) + + 'Preconfigure Directories.txt + Try + s = IO.Directory.GetParent(My.Application.Info.DirectoryPath).ToString & "\" + Catch ex As Exception + s = MyAppPath + End Try + Try + + file = New cFile_V3 + file.OpenWrite(FB_FilHisDir & "Directories.txt") + file.WriteLine(s) + For i = 2 To 20 + file.WriteLine(" ") + Next + file.Close() + Catch ex As Exception + + End Try + + Catch ex As Exception + MsgBox("Failed to create directory '" & FB_FilHisDir & "'!", MsgBoxStyle.Critical) + LogFile.WriteToLog(tMsgID.Err, "Failed to create directory '" & FB_FilHisDir & "'!") + e.Cancel = True + End Try + End If + + 'Separator! + SetCulture = False + If System.Globalization.CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator <> "." Then + SetCulture = True + Try + System.Threading.Thread.CurrentThread.CurrentCulture = New System.Globalization.CultureInfo("en-US") + System.Threading.Thread.CurrentThread.CurrentUICulture = New System.Globalization.CultureInfo("en-US") + 'MSGtoForm(8, "Set CurrentCulture to 'en-US'", True) + Catch ex As Exception + GUImsg(tMsgID.Err, + "Failed to set Application Regional Settings to 'en-US'! Check system decimal- and group- separators!") + End Try + End If + + 'Initialise Classes + sKey = New csKey + JobFileList = New List(Of String) + JobCycleList = New List(Of String) + 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!! + Cfg.FilePath = MyConfPath & "settings.json" + + ProgBarCtrl = New cProgBarCtrl + + 'Config + Cfg.Load() + + 'Restart log if log file too large + LogFile.SizeCheck() + + + 'License initialization + Lic = New vectolic.cLicense + Lic.AppVersion = VECTOvers + Lic.FilePath = MyAppPath & "license.dat" + End Sub + + Private Sub MyApplication_UnhandledException(ByVal sender As Object, + ByVal e As Microsoft.VisualBasic.ApplicationServices.UnhandledExceptionEventArgs) _ + Handles Me.UnhandledException + e.ExitApplication = True + MsgBox("ERROR!" & ChrW(10) & ChrW(10) & e.Exception.Message.ToString, MsgBoxStyle.Critical, "Unexpected Error") + LogFile.WriteToLog(tMsgID.Err, ">>>Unexpected Error:" & e.Exception.ToString()) + End Sub + End Class End Namespace diff --git a/VECTO/ClassDiagram1.cd b/VECTO/ClassDiagram1.cd deleted file mode 100644 index 7b894197b9d8d79b2ad4afafc2c11c60f33c4b42..0000000000000000000000000000000000000000 --- a/VECTO/ClassDiagram1.cd +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<ClassDiagram /> \ No newline at end of file diff --git a/VECTO/ClassDiagram2.cd b/VECTO/ClassDiagram2.cd deleted file mode 100644 index 262a721bfa660d09669ce0fd657b27119f9e2c93..0000000000000000000000000000000000000000 --- a/VECTO/ClassDiagram2.cd +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<ClassDiagram MajorVersion="1" MinorVersion="1"> - <Class Name="VECTO.cVECTO"> - <Position X="0.5" Y="0.5" Width="1.5" /> - <TypeIdentifier> - <HashCode>ADFGAASAAQQCYoKYBgiIAAAIIAOAgAIAFidCSCCApAA=</HashCode> - <FileName>Input Files\cVECTO.vb</FileName> - </TypeIdentifier> - </Class> - <Font Name="Segoe UI" Size="9" /> -</ClassDiagram> \ No newline at end of file diff --git a/VECTO/Configuration.vb b/VECTO/Configuration.vb index 7ef8bfea2d8c5fcc3e5b391c968513a1a87d47dd..b04bc1b74fff331c983abec18711dd9888e17463 100644 --- a/VECTO/Configuration.vb +++ b/VECTO/Configuration.vb @@ -9,6 +9,8 @@ ' ' See the LICENSE.txt for the specific language governing permissions and limitations. Imports System.Collections.Generic +Imports System.IO +Imports TUGraz.VectoCore.Models.Declaration Public Class Configuration Public FilePath As String @@ -35,9 +37,9 @@ Public Class Configuration End Sub Public Sub DeclInit() - AirDensity = cDeclaration.AirDensity - FuelDens = cDeclaration.FuelDens - CO2perFC = cDeclaration.CO2perFC + 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 @@ -54,8 +56,8 @@ Public Class Configuration AirDensity = 1.2 OpenCmd = "notepad" OpenCmdName = "Notepad" - FuelDens = 0.835 - CO2perFC = 3.153 + FuelDens = DeclarationData.Physics.FuelDensity.Value() + CO2perFC = DeclarationData.Physics.CO2PerFuelWeight FirstRun = True DeclMode = True End Sub @@ -63,7 +65,7 @@ Public Class Configuration Public Sub Load() SetDefault() - If Not IO.File.Exists(FilePath) Then + If Not File.Exists(FilePath) Then Exit Sub End If diff --git a/VECTO/File Browser/FB_Dialog.designer.vb b/VECTO/File Browser/FB_Dialog.designer.vb index 5f9329e3f85c31655474bcefffddc9b96ffb796f..fb94a27048f208ca886c3cdcc0e6132730ca9cd4 100644 --- a/VECTO/File Browser/FB_Dialog.designer.vb +++ b/VECTO/File Browser/FB_Dialog.designer.vb @@ -8,64 +8,67 @@ ' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ' ' See the LICENSE.txt for the specific language governing permissions and limitations. -<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _ +Imports System.ComponentModel +Imports Microsoft.VisualBasic.CompilerServices + +<DesignerGenerated()> _ Partial Class FB_Dialog - Inherits System.Windows.Forms.Form + Inherits Form - 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - <System.Diagnostics.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 + '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 System.ComponentModel.IContainer + '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. - <System.Diagnostics.DebuggerStepThrough()> _ - Private Sub InitializeComponent() - Me.components = New System.ComponentModel.Container() - Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(FB_Dialog)) - Me.SplitContainer1 = New System.Windows.Forms.SplitContainer() - Me.Label1 = New System.Windows.Forms.Label() - Me.ButtonNewDir = New System.Windows.Forms.Button() - Me.ButtonDesktop = New System.Windows.Forms.Button() - Me.ButtonHisFolder = New System.Windows.Forms.Button() - Me.ButtonFolderBack = New System.Windows.Forms.Button() - Me.TextBoxSearchFolder = New System.Windows.Forms.TextBox() - Me.ListViewFolder = New System.Windows.Forms.ListView() - Me.ColumnHeader3 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) - Me.ImageList1 = New System.Windows.Forms.ImageList(Me.components) - Me.ComboBoxDrive = New System.Windows.Forms.ComboBox() - Me.Label5 = New System.Windows.Forms.Label() - Me.Label2 = New System.Windows.Forms.Label() - Me.ButtonAll = New System.Windows.Forms.Button() - Me.ComboBoxExt = New System.Windows.Forms.ComboBox() - Me.ButtonHisFile = New System.Windows.Forms.Button() - Me.TextBoxSearchFile = New System.Windows.Forms.TextBox() - Me.ListViewFiles = New System.Windows.Forms.ListView() - Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) - Me.ContextMenuFile = New System.Windows.Forms.ContextMenuStrip(Me.components) - Me.RenameFileToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.DeleteFileToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.TextBoxPath = New System.Windows.Forms.TextBox() - Me.ContextMenuHisFolder = New System.Windows.Forms.ContextMenuStrip(Me.components) - Me.ContextMenuHisFile = New System.Windows.Forms.ContextMenuStrip(Me.components) - Me.ButtonOK = New System.Windows.Forms.Button() - Me.ButtonCancel = New System.Windows.Forms.Button() - Me.TextBoxCurrent = New System.Windows.Forms.TextBox() - Me.Label3 = New System.Windows.Forms.Label() - Me.Label4 = New System.Windows.Forms.Label() - Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components) - CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit() + '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() + Dim resources As ComponentResourceManager = New ComponentResourceManager(GetType(FB_Dialog)) + Me.SplitContainer1 = New SplitContainer() + Me.Label1 = New Label() + Me.ButtonNewDir = New Button() + Me.ButtonDesktop = New Button() + Me.ButtonHisFolder = New Button() + Me.ButtonFolderBack = New Button() + Me.TextBoxSearchFolder = New TextBox() + Me.ListViewFolder = New ListView() + Me.ColumnHeader3 = CType(New ColumnHeader(), ColumnHeader) + Me.ImageList1 = New ImageList(Me.components) + Me.ComboBoxDrive = New ComboBox() + Me.Label5 = New Label() + Me.Label2 = New Label() + Me.ButtonAll = New Button() + Me.ComboBoxExt = New ComboBox() + Me.ButtonHisFile = New Button() + Me.TextBoxSearchFile = New TextBox() + Me.ListViewFiles = New ListView() + Me.ColumnHeader1 = CType(New ColumnHeader(), ColumnHeader) + Me.ContextMenuFile = New ContextMenuStrip(Me.components) + Me.RenameFileToolStripMenuItem = New ToolStripMenuItem() + Me.DeleteFileToolStripMenuItem = New ToolStripMenuItem() + Me.TextBoxPath = New TextBox() + Me.ContextMenuHisFolder = New ContextMenuStrip(Me.components) + Me.ContextMenuHisFile = New ContextMenuStrip(Me.components) + Me.ButtonOK = New Button() + Me.ButtonCancel = New Button() + Me.TextBoxCurrent = New TextBox() + Me.Label3 = New Label() + Me.Label4 = New Label() + Me.ToolTip1 = New ToolTip(Me.components) + CType(Me.SplitContainer1, ISupportInitialize).BeginInit() Me.SplitContainer1.Panel1.SuspendLayout() Me.SplitContainer1.Panel2.SuspendLayout() Me.SplitContainer1.SuspendLayout() @@ -74,11 +77,11 @@ Partial Class FB_Dialog ' 'SplitContainer1 ' - 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.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D - Me.SplitContainer1.Location = New System.Drawing.Point(0, 46) + Me.SplitContainer1.Anchor = CType((((AnchorStyles.Top Or AnchorStyles.Bottom) _ + Or AnchorStyles.Left) _ + Or AnchorStyles.Right), AnchorStyles) + Me.SplitContainer1.BorderStyle = BorderStyle.Fixed3D + Me.SplitContainer1.Location = New Point(0, 46) Me.SplitContainer1.Name = "SplitContainer1" ' 'SplitContainer1.Panel1 @@ -101,27 +104,27 @@ Partial Class FB_Dialog Me.SplitContainer1.Panel2.Controls.Add(Me.ButtonHisFile) Me.SplitContainer1.Panel2.Controls.Add(Me.TextBoxSearchFile) Me.SplitContainer1.Panel2.Controls.Add(Me.ListViewFiles) - Me.SplitContainer1.Size = New System.Drawing.Size(663, 308) + Me.SplitContainer1.Size = New Size(663, 308) Me.SplitContainer1.SplitterDistance = 329 Me.SplitContainer1.TabIndex = 5 Me.SplitContainer1.TabStop = False ' 'Label1 ' - Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.Label1.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles) Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(3, 284) + Me.Label1.Location = New Point(3, 284) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(32, 13) + Me.Label1.Size = New Size(32, 13) Me.Label1.TabIndex = 28 Me.Label1.Text = "Filter:" ' 'ButtonNewDir ' - Me.ButtonNewDir.Image = Global.VECTO.My.Resources.Resources.new_dir - Me.ButtonNewDir.Location = New System.Drawing.Point(119, 1) + Me.ButtonNewDir.Image = My.Resources.Resources.new_dir + Me.ButtonNewDir.Location = New Point(119, 1) Me.ButtonNewDir.Name = "ButtonNewDir" - Me.ButtonNewDir.Size = New System.Drawing.Size(26, 25) + Me.ButtonNewDir.Size = New Size(26, 25) Me.ButtonNewDir.TabIndex = 21 Me.ButtonNewDir.TabStop = False Me.ToolTip1.SetToolTip(Me.ButtonNewDir, "Create new Directory") @@ -129,10 +132,10 @@ Partial Class FB_Dialog ' 'ButtonDesktop ' - Me.ButtonDesktop.Image = Global.VECTO.My.Resources.Resources.desktop - Me.ButtonDesktop.Location = New System.Drawing.Point(90, 1) + Me.ButtonDesktop.Image = My.Resources.Resources.desktop + Me.ButtonDesktop.Location = New Point(90, 1) Me.ButtonDesktop.Name = "ButtonDesktop" - Me.ButtonDesktop.Size = New System.Drawing.Size(26, 25) + Me.ButtonDesktop.Size = New Size(26, 25) Me.ButtonDesktop.TabIndex = 22 Me.ButtonDesktop.TabStop = False Me.ToolTip1.SetToolTip(Me.ButtonDesktop, "Go to Desktop") @@ -140,11 +143,11 @@ Partial Class FB_Dialog ' 'ButtonHisFolder ' - Me.ButtonHisFolder.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.ButtonHisFolder.Image = Global.VECTO.My.Resources.Resources.file_history - Me.ButtonHisFolder.Location = New System.Drawing.Point(298, 1) + Me.ButtonHisFolder.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles) + Me.ButtonHisFolder.Image = My.Resources.Resources.file_history + Me.ButtonHisFolder.Location = New Point(298, 1) Me.ButtonHisFolder.Name = "ButtonHisFolder" - Me.ButtonHisFolder.Size = New System.Drawing.Size(26, 25) + Me.ButtonHisFolder.Size = New Size(26, 25) Me.ButtonHisFolder.TabIndex = 24 Me.ButtonHisFolder.TabStop = False Me.ToolTip1.SetToolTip(Me.ButtonHisFolder, "History / Favorites") @@ -152,10 +155,10 @@ Partial Class FB_Dialog ' 'ButtonFolderBack ' - Me.ButtonFolderBack.Image = CType(resources.GetObject("ButtonFolderBack.Image"), System.Drawing.Image) - Me.ButtonFolderBack.Location = New System.Drawing.Point(61, 1) + Me.ButtonFolderBack.Image = CType(resources.GetObject("ButtonFolderBack.Image"), Image) + Me.ButtonFolderBack.Location = New Point(61, 1) Me.ButtonFolderBack.Name = "ButtonFolderBack" - Me.ButtonFolderBack.Size = New System.Drawing.Size(26, 25) + Me.ButtonFolderBack.Size = New Size(26, 25) Me.ButtonFolderBack.TabIndex = 20 Me.ButtonFolderBack.TabStop = False Me.ToolTip1.SetToolTip(Me.ButtonFolderBack, "Move up one directory") @@ -163,31 +166,31 @@ Partial Class FB_Dialog ' 'TextBoxSearchFolder ' - Me.TextBoxSearchFolder.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.TextBoxSearchFolder.Location = New System.Drawing.Point(37, 281) + Me.TextBoxSearchFolder.Anchor = CType(((AnchorStyles.Bottom Or AnchorStyles.Left) _ + Or AnchorStyles.Right), AnchorStyles) + Me.TextBoxSearchFolder.Location = New Point(37, 281) Me.TextBoxSearchFolder.Name = "TextBoxSearchFolder" - Me.TextBoxSearchFolder.Size = New System.Drawing.Size(288, 20) + Me.TextBoxSearchFolder.Size = New Size(288, 20) Me.TextBoxSearchFolder.TabIndex = 15 Me.ToolTip1.SetToolTip(Me.TextBoxSearchFolder, "Filter the directories") ' 'ListViewFolder ' - Me.ListViewFolder.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.ListViewFolder.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader3}) + Me.ListViewFolder.Anchor = CType((((AnchorStyles.Top Or AnchorStyles.Bottom) _ + Or AnchorStyles.Left) _ + Or AnchorStyles.Right), AnchorStyles) + Me.ListViewFolder.Columns.AddRange(New ColumnHeader() {Me.ColumnHeader3}) Me.ListViewFolder.FullRowSelect = True Me.ListViewFolder.GridLines = True Me.ListViewFolder.HideSelection = False - Me.ListViewFolder.Location = New System.Drawing.Point(-2, 27) + Me.ListViewFolder.Location = New Point(-2, 27) Me.ListViewFolder.MultiSelect = False Me.ListViewFolder.Name = "ListViewFolder" - Me.ListViewFolder.Size = New System.Drawing.Size(327, 253) + Me.ListViewFolder.Size = New Size(327, 253) Me.ListViewFolder.SmallImageList = Me.ImageList1 Me.ListViewFolder.TabIndex = 10 Me.ListViewFolder.UseCompatibleStateImageBehavior = False - Me.ListViewFolder.View = System.Windows.Forms.View.Details + Me.ListViewFolder.View = View.Details ' 'ColumnHeader3 ' @@ -196,44 +199,44 @@ Partial Class FB_Dialog ' 'ImageList1 ' - Me.ImageList1.ColorDepth = System.Windows.Forms.ColorDepth.Depth32Bit - Me.ImageList1.ImageSize = New System.Drawing.Size(16, 16) - Me.ImageList1.TransparentColor = System.Drawing.Color.Transparent + Me.ImageList1.ColorDepth = ColorDepth.Depth32Bit + Me.ImageList1.ImageSize = New Size(16, 16) + Me.ImageList1.TransparentColor = Color.Transparent ' 'ComboBoxDrive ' - Me.ComboBoxDrive.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.ComboBoxDrive.DropDownStyle = ComboBoxStyle.DropDownList Me.ComboBoxDrive.FormattingEnabled = True - Me.ComboBoxDrive.Location = New System.Drawing.Point(3, 3) + Me.ComboBoxDrive.Location = New Point(3, 3) Me.ComboBoxDrive.Name = "ComboBoxDrive" - Me.ComboBoxDrive.Size = New System.Drawing.Size(54, 21) + Me.ComboBoxDrive.Size = New Size(54, 21) Me.ComboBoxDrive.TabIndex = 5 ' 'Label5 ' - Me.Label5.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Label5.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles) Me.Label5.AutoSize = True - Me.Label5.Location = New System.Drawing.Point(256, 284) + Me.Label5.Location = New Point(256, 284) Me.Label5.Name = "Label5" - Me.Label5.Size = New System.Drawing.Size(10, 13) + Me.Label5.Size = New Size(10, 13) Me.Label5.TabIndex = 30 Me.Label5.Text = "." ' 'Label2 ' - Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.Label2.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles) Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(3, 284) + Me.Label2.Location = New Point(3, 284) Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(32, 13) + Me.Label2.Size = New Size(32, 13) Me.Label2.TabIndex = 29 Me.Label2.Text = "Filter:" ' 'ButtonAll ' - Me.ButtonAll.Location = New System.Drawing.Point(2, 2) + Me.ButtonAll.Location = New Point(2, 2) Me.ButtonAll.Name = "ButtonAll" - Me.ButtonAll.Size = New System.Drawing.Size(71, 23) + Me.ButtonAll.Size = New Size(71, 23) Me.ButtonAll.TabIndex = 19 Me.ButtonAll.Text = "Select All" Me.ToolTip1.SetToolTip(Me.ButtonAll, "Select all shown files") @@ -241,21 +244,21 @@ Partial Class FB_Dialog ' 'ComboBoxExt ' - Me.ComboBoxExt.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.ComboBoxExt.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles) Me.ComboBoxExt.FormattingEnabled = True - Me.ComboBoxExt.Location = New System.Drawing.Point(268, 281) + Me.ComboBoxExt.Location = New Point(268, 281) Me.ComboBoxExt.Name = "ComboBoxExt" - Me.ComboBoxExt.Size = New System.Drawing.Size(57, 21) + Me.ComboBoxExt.Size = New Size(57, 21) Me.ComboBoxExt.TabIndex = 20 Me.ToolTip1.SetToolTip(Me.ComboBoxExt, "Filter the file type") ' 'ButtonHisFile ' - Me.ButtonHisFile.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.ButtonHisFile.Image = Global.VECTO.My.Resources.Resources.file_history - Me.ButtonHisFile.Location = New System.Drawing.Point(299, 1) + Me.ButtonHisFile.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles) + Me.ButtonHisFile.Image = My.Resources.Resources.file_history + Me.ButtonHisFile.Location = New Point(299, 1) Me.ButtonHisFile.Name = "ButtonHisFile" - Me.ButtonHisFile.Size = New System.Drawing.Size(26, 25) + Me.ButtonHisFile.Size = New Size(26, 25) Me.ButtonHisFile.TabIndex = 24 Me.ButtonHisFile.TabStop = False Me.ToolTip1.SetToolTip(Me.ButtonHisFile, "History") @@ -263,31 +266,31 @@ Partial Class FB_Dialog ' 'TextBoxSearchFile ' - Me.TextBoxSearchFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.TextBoxSearchFile.Location = New System.Drawing.Point(36, 281) + Me.TextBoxSearchFile.Anchor = CType(((AnchorStyles.Bottom Or AnchorStyles.Left) _ + Or AnchorStyles.Right), AnchorStyles) + Me.TextBoxSearchFile.Location = New Point(36, 281) Me.TextBoxSearchFile.Name = "TextBoxSearchFile" - Me.TextBoxSearchFile.Size = New System.Drawing.Size(218, 20) + Me.TextBoxSearchFile.Size = New Size(218, 20) Me.TextBoxSearchFile.TabIndex = 15 Me.ToolTip1.SetToolTip(Me.TextBoxSearchFile, "Filter the files") ' 'ListViewFiles ' - Me.ListViewFiles.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.ListViewFiles.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1}) + Me.ListViewFiles.Anchor = CType((((AnchorStyles.Top Or AnchorStyles.Bottom) _ + Or AnchorStyles.Left) _ + Or AnchorStyles.Right), AnchorStyles) + Me.ListViewFiles.Columns.AddRange(New ColumnHeader() {Me.ColumnHeader1}) Me.ListViewFiles.ContextMenuStrip = Me.ContextMenuFile Me.ListViewFiles.FullRowSelect = True Me.ListViewFiles.GridLines = True Me.ListViewFiles.HideSelection = False - Me.ListViewFiles.Location = New System.Drawing.Point(0, 27) + Me.ListViewFiles.Location = New Point(0, 27) Me.ListViewFiles.Name = "ListViewFiles" - Me.ListViewFiles.Size = New System.Drawing.Size(328, 253) + Me.ListViewFiles.Size = New Size(328, 253) Me.ListViewFiles.SmallImageList = Me.ImageList1 Me.ListViewFiles.TabIndex = 10 Me.ListViewFiles.UseCompatibleStateImageBehavior = False - Me.ListViewFiles.View = System.Windows.Forms.View.Details + Me.ListViewFiles.View = View.Details ' 'ColumnHeader1 ' @@ -296,48 +299,48 @@ Partial Class FB_Dialog ' 'ContextMenuFile ' - Me.ContextMenuFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.RenameFileToolStripMenuItem, Me.DeleteFileToolStripMenuItem}) + Me.ContextMenuFile.Items.AddRange(New ToolStripItem() {Me.RenameFileToolStripMenuItem, Me.DeleteFileToolStripMenuItem}) Me.ContextMenuFile.Name = "ContextMenuFile" - Me.ContextMenuFile.Size = New System.Drawing.Size(148, 48) + Me.ContextMenuFile.Size = New Size(148, 48) ' 'RenameFileToolStripMenuItem ' Me.RenameFileToolStripMenuItem.Name = "RenameFileToolStripMenuItem" - Me.RenameFileToolStripMenuItem.Size = New System.Drawing.Size(147, 22) + Me.RenameFileToolStripMenuItem.Size = New Size(147, 22) Me.RenameFileToolStripMenuItem.Text = "Rename File..." ' 'DeleteFileToolStripMenuItem ' Me.DeleteFileToolStripMenuItem.Name = "DeleteFileToolStripMenuItem" - Me.DeleteFileToolStripMenuItem.Size = New System.Drawing.Size(147, 22) + Me.DeleteFileToolStripMenuItem.Size = New Size(147, 22) Me.DeleteFileToolStripMenuItem.Text = "Delete File..." ' 'TextBoxPath ' - Me.TextBoxPath.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.TextBoxPath.Location = New System.Drawing.Point(47, 370) + Me.TextBoxPath.Anchor = CType(((AnchorStyles.Bottom Or AnchorStyles.Left) _ + Or AnchorStyles.Right), AnchorStyles) + Me.TextBoxPath.Location = New Point(47, 370) Me.TextBoxPath.Name = "TextBoxPath" - Me.TextBoxPath.Size = New System.Drawing.Size(609, 20) + Me.TextBoxPath.Size = New Size(609, 20) Me.TextBoxPath.TabIndex = 15 ' 'ContextMenuHisFolder ' Me.ContextMenuHisFolder.Name = "ContextMenuFolderHis" - Me.ContextMenuHisFolder.Size = New System.Drawing.Size(61, 4) + Me.ContextMenuHisFolder.Size = New Size(61, 4) ' 'ContextMenuHisFile ' Me.ContextMenuHisFile.Name = "ContextMenuFileHis" - Me.ContextMenuHisFile.Size = New System.Drawing.Size(61, 4) + Me.ContextMenuHisFile.Size = New Size(61, 4) ' 'ButtonOK ' - Me.ButtonOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.ButtonOK.DialogResult = System.Windows.Forms.DialogResult.OK - Me.ButtonOK.Location = New System.Drawing.Point(503, 399) + Me.ButtonOK.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles) + Me.ButtonOK.DialogResult = DialogResult.OK + Me.ButtonOK.Location = New Point(503, 399) Me.ButtonOK.Name = "ButtonOK" - Me.ButtonOK.Size = New System.Drawing.Size(75, 23) + Me.ButtonOK.Size = New Size(75, 23) Me.ButtonOK.TabIndex = 20 Me.ButtonOK.TabStop = False Me.ButtonOK.Text = "OK" @@ -345,11 +348,11 @@ Partial Class FB_Dialog ' 'ButtonCancel ' - Me.ButtonCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.ButtonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel - Me.ButtonCancel.Location = New System.Drawing.Point(581, 399) + Me.ButtonCancel.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles) + Me.ButtonCancel.DialogResult = DialogResult.Cancel + Me.ButtonCancel.Location = New Point(581, 399) Me.ButtonCancel.Name = "ButtonCancel" - Me.ButtonCancel.Size = New System.Drawing.Size(75, 23) + Me.ButtonCancel.Size = New Size(75, 23) Me.ButtonCancel.TabIndex = 25 Me.ButtonCancel.TabStop = False Me.ButtonCancel.Text = "Cancel" @@ -357,42 +360,42 @@ Partial Class FB_Dialog ' 'TextBoxCurrent ' - Me.TextBoxCurrent.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.TextBoxCurrent.Cursor = System.Windows.Forms.Cursors.Hand - Me.TextBoxCurrent.Location = New System.Drawing.Point(5, 17) + Me.TextBoxCurrent.Anchor = CType(((AnchorStyles.Top Or AnchorStyles.Left) _ + Or AnchorStyles.Right), AnchorStyles) + Me.TextBoxCurrent.Cursor = Cursors.Hand + Me.TextBoxCurrent.Location = New Point(5, 17) Me.TextBoxCurrent.Name = "TextBoxCurrent" Me.TextBoxCurrent.ReadOnly = True - Me.TextBoxCurrent.Size = New System.Drawing.Size(651, 20) + Me.TextBoxCurrent.Size = New Size(651, 20) Me.TextBoxCurrent.TabIndex = 0 Me.TextBoxCurrent.TabStop = False Me.ToolTip1.SetToolTip(Me.TextBoxCurrent, "Click for changing the directory") ' 'Label3 ' - Me.Label3.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.Label3.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles) Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(5, 373) + Me.Label3.Location = New Point(5, 373) Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(38, 13) + Me.Label3.Size = New Size(38, 13) Me.Label3.TabIndex = 29 Me.Label3.Text = "Name:" ' 'Label4 ' Me.Label4.AutoSize = True - Me.Label4.Location = New System.Drawing.Point(4, 3) + Me.Label4.Location = New Point(4, 3) Me.Label4.Name = "Label4" - Me.Label4.Size = New System.Drawing.Size(89, 13) + Me.Label4.Size = New Size(89, 13) Me.Label4.TabIndex = 30 Me.Label4.Text = "Current Directory:" ' 'FB_Dialog ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.AutoScaleDimensions = New SizeF(6.0!, 13.0!) + Me.AutoScaleMode = AutoScaleMode.Font Me.CancelButton = Me.ButtonCancel - Me.ClientSize = New System.Drawing.Size(663, 428) + Me.ClientSize = New Size(663, 428) Me.Controls.Add(Me.Label4) Me.Controls.Add(Me.Label3) Me.Controls.Add(Me.TextBoxCurrent) @@ -401,53 +404,53 @@ Partial Class FB_Dialog Me.Controls.Add(Me.TextBoxPath) Me.Controls.Add(Me.SplitContainer1) Me.MinimizeBox = False - Me.MinimumSize = New System.Drawing.Size(341, 272) + Me.MinimumSize = New Size(341, 272) Me.Name = "FB_Dialog" Me.ShowIcon = False Me.ShowInTaskbar = False - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent + Me.StartPosition = FormStartPosition.CenterParent Me.Text = "File Browser" Me.SplitContainer1.Panel1.ResumeLayout(False) Me.SplitContainer1.Panel1.PerformLayout() Me.SplitContainer1.Panel2.ResumeLayout(False) Me.SplitContainer1.Panel2.PerformLayout() - CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.SplitContainer1, ISupportInitialize).EndInit() Me.SplitContainer1.ResumeLayout(False) Me.ContextMenuFile.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() End Sub - Friend WithEvents SplitContainer1 As System.Windows.Forms.SplitContainer - Friend WithEvents ComboBoxDrive As System.Windows.Forms.ComboBox - Friend WithEvents ListViewFolder As System.Windows.Forms.ListView - Friend WithEvents ListViewFiles As System.Windows.Forms.ListView - Friend WithEvents ColumnHeader1 As System.Windows.Forms.ColumnHeader - Friend WithEvents TextBoxSearchFolder As System.Windows.Forms.TextBox - Friend WithEvents TextBoxPath As System.Windows.Forms.TextBox - Friend WithEvents ButtonFolderBack As System.Windows.Forms.Button - Friend WithEvents ContextMenuHisFolder As System.Windows.Forms.ContextMenuStrip - Friend WithEvents ContextMenuHisFile As System.Windows.Forms.ContextMenuStrip - Friend WithEvents ButtonHisFolder As System.Windows.Forms.Button - Friend WithEvents ButtonHisFile As System.Windows.Forms.Button - Friend WithEvents ButtonOK As System.Windows.Forms.Button - Friend WithEvents ButtonCancel As System.Windows.Forms.Button - Friend WithEvents TextBoxCurrent As System.Windows.Forms.TextBox - Friend WithEvents ColumnHeader3 As System.Windows.Forms.ColumnHeader - Friend WithEvents ButtonDesktop As System.Windows.Forms.Button - Friend WithEvents ContextMenuFile As System.Windows.Forms.ContextMenuStrip - Friend WithEvents RenameFileToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents DeleteFileToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents ButtonNewDir As System.Windows.Forms.Button - Friend WithEvents ButtonAll As System.Windows.Forms.Button - Friend WithEvents Label1 As System.Windows.Forms.Label - Friend WithEvents Label3 As System.Windows.Forms.Label - Friend WithEvents Label4 As System.Windows.Forms.Label - Friend WithEvents ImageList1 As System.Windows.Forms.ImageList - Friend WithEvents ToolTip1 As System.Windows.Forms.ToolTip - Friend WithEvents Label5 As System.Windows.Forms.Label - Friend WithEvents Label2 As System.Windows.Forms.Label - Friend WithEvents ComboBoxExt As System.Windows.Forms.ComboBox - Friend WithEvents TextBoxSearchFile As System.Windows.Forms.TextBox + Friend WithEvents SplitContainer1 As SplitContainer + Friend WithEvents ComboBoxDrive As ComboBox + Friend WithEvents ListViewFolder As ListView + Friend WithEvents ListViewFiles As ListView + Friend WithEvents ColumnHeader1 As ColumnHeader + Friend WithEvents TextBoxSearchFolder As TextBox + Friend WithEvents TextBoxPath As TextBox + Friend WithEvents ButtonFolderBack As Button + Friend WithEvents ContextMenuHisFolder As ContextMenuStrip + Friend WithEvents ContextMenuHisFile As ContextMenuStrip + Friend WithEvents ButtonHisFolder As Button + Friend WithEvents ButtonHisFile As Button + Friend WithEvents ButtonOK As Button + Friend WithEvents ButtonCancel As Button + Friend WithEvents TextBoxCurrent As TextBox + Friend WithEvents ColumnHeader3 As ColumnHeader + Friend WithEvents ButtonDesktop As Button + Friend WithEvents ContextMenuFile As ContextMenuStrip + Friend WithEvents RenameFileToolStripMenuItem As ToolStripMenuItem + Friend WithEvents DeleteFileToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ButtonNewDir As Button + Friend WithEvents ButtonAll As Button + Friend WithEvents Label1 As Label + Friend WithEvents Label3 As Label + Friend WithEvents Label4 As Label + Friend WithEvents ImageList1 As ImageList + Friend WithEvents ToolTip1 As ToolTip + Friend WithEvents Label5 As Label + Friend WithEvents Label2 As Label + Friend WithEvents ComboBoxExt As ComboBox + Friend WithEvents TextBoxSearchFile As TextBox End Class diff --git a/VECTO/File Browser/FB_Dialog.vb b/VECTO/File Browser/FB_Dialog.vb index a9e7deecdcb779cc65ebcf7600aacd6a38502210..798443190ff459b1a8f4763453b2fdad4617277d 100644 --- a/VECTO/File Browser/FB_Dialog.vb +++ b/VECTO/File Browser/FB_Dialog.vb @@ -14,6 +14,8 @@ Imports System.IO Imports System.Text Imports Microsoft.VisualBasic.FileIO Imports System.Runtime.InteropServices +Imports TUGraz.VECTO.File_Browser + ''' <summary> ''' File Browser dialog. Entirely controlled by cFilebrowser class. @@ -58,7 +60,7 @@ Public Class FB_Dialog _bMultiFiles = False _noExt = True _bBrowseFolder = False - _bLightMode = LightMode + _bLightMode = lightMode ButtonHisFile.Enabled = Not _bLightMode End Sub @@ -954,3 +956,4 @@ lb10: End Class + diff --git a/VECTO/File Browser/FB_FavDlog.designer.vb b/VECTO/File Browser/FB_FavDlog.designer.vb index 08648f65220913d18dce26957dde772943cc8884..2486082918ea92e1bd1e004780a32d67273e3a7c 100644 --- a/VECTO/File Browser/FB_FavDlog.designer.vb +++ b/VECTO/File Browser/FB_FavDlog.designer.vb @@ -1,4 +1,4 @@ -' Copyright 2014 European Union. +' Copyright 2014 European Union. ' Licensed under the EUPL (the 'Licence'); ' ' * You may not use this work except in compliance with the Licence. @@ -8,121 +8,125 @@ ' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ' ' See the LICENSE.txt for the specific language governing permissions and limitations. -<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _ +Imports System.ComponentModel +Imports Microsoft.VisualBasic.CompilerServices + + +<DesignerGenerated()> _ Partial Class FB_FavDlog - Inherits System.Windows.Forms.Form + Inherits Form - 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - <System.Diagnostics.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 + '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 System.ComponentModel.IContainer + '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. - <System.Diagnostics.DebuggerStepThrough()> _ - Private Sub InitializeComponent() - Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel() - Me.OK_Button = New System.Windows.Forms.Button() - Me.Cancel_Button = New System.Windows.Forms.Button() - Me.ListBox1 = New System.Windows.Forms.ListBox() - Me.Label1 = New System.Windows.Forms.Label() + '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.ListBox1 = New ListBox() + Me.Label1 = New Label() Me.TableLayoutPanel1.SuspendLayout() Me.SuspendLayout() ' 'TableLayoutPanel1 ' - Me.TableLayoutPanel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.TableLayoutPanel1.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles) Me.TableLayoutPanel1.ColumnCount = 2 - Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!)) - Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!)) + 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 System.Drawing.Point(326, 173) + Me.TableLayoutPanel1.Location = New Point(326, 173) Me.TableLayoutPanel1.Name = "TableLayoutPanel1" Me.TableLayoutPanel1.RowCount = 1 - Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.0!)) - Me.TableLayoutPanel1.Size = New System.Drawing.Size(146, 29) + Me.TableLayoutPanel1.RowStyles.Add(New RowStyle(SizeType.Percent, 50.0!)) + Me.TableLayoutPanel1.Size = New Size(146, 29) Me.TableLayoutPanel1.TabIndex = 0 ' 'OK_Button ' - Me.OK_Button.Anchor = System.Windows.Forms.AnchorStyles.None - Me.OK_Button.Location = New System.Drawing.Point(3, 3) + 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 System.Drawing.Size(67, 23) + Me.OK_Button.Size = New Size(67, 23) Me.OK_Button.TabIndex = 0 Me.OK_Button.Text = "OK" ' 'Cancel_Button ' - Me.Cancel_Button.Anchor = System.Windows.Forms.AnchorStyles.None - Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel - Me.Cancel_Button.Location = New System.Drawing.Point(76, 3) + 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 System.Drawing.Size(67, 23) + Me.Cancel_Button.Size = New Size(67, 23) Me.Cancel_Button.TabIndex = 1 Me.Cancel_Button.Text = "Cancel" ' 'ListBox1 ' - Me.ListBox1.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.ListBox1.Anchor = CType((((AnchorStyles.Top Or AnchorStyles.Bottom) _ + Or AnchorStyles.Left) _ + Or AnchorStyles.Right), AnchorStyles) Me.ListBox1.FormattingEnabled = True - Me.ListBox1.Location = New System.Drawing.Point(12, 12) + Me.ListBox1.Location = New Point(12, 12) Me.ListBox1.Name = "ListBox1" - Me.ListBox1.Size = New System.Drawing.Size(460, 134) + Me.ListBox1.Size = New Size(460, 134) Me.ListBox1.TabIndex = 1 ' 'Label1 ' - Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Label1.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles) Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(369, 147) + Me.Label1.Location = New Point(369, 147) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(106, 13) + Me.Label1.Size = New Size(106, 13) Me.Label1.TabIndex = 2 Me.Label1.Text = "(Double-Click to Edit)" ' 'FB_FavDlog ' Me.AcceptButton = Me.OK_Button - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit + Me.AutoScaleMode = AutoScaleMode.Inherit Me.CancelButton = Me.Cancel_Button - Me.ClientSize = New System.Drawing.Size(484, 208) + Me.ClientSize = New Size(484, 208) Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.ListBox1) Me.Controls.Add(Me.TableLayoutPanel1) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow + Me.FormBorderStyle = FormBorderStyle.SizableToolWindow Me.MaximizeBox = False - Me.MaximumSize = New System.Drawing.Size(5000, 242) + Me.MaximumSize = New Size(5000, 242) Me.MinimizeBox = False - Me.MinimumSize = New System.Drawing.Size(0, 242) + Me.MinimumSize = New Size(0, 242) Me.Name = "FB_FavDlog" Me.ShowIcon = False Me.ShowInTaskbar = False - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent + Me.StartPosition = FormStartPosition.CenterParent Me.Text = "Edit Favorites" Me.TableLayoutPanel1.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() End Sub - Friend WithEvents TableLayoutPanel1 As System.Windows.Forms.TableLayoutPanel - Friend WithEvents OK_Button As System.Windows.Forms.Button - Friend WithEvents Cancel_Button As System.Windows.Forms.Button - Friend WithEvents ListBox1 As System.Windows.Forms.ListBox - Friend WithEvents Label1 As System.Windows.Forms.Label + Friend WithEvents TableLayoutPanel1 As TableLayoutPanel + Friend WithEvents OK_Button As Button + Friend WithEvents Cancel_Button As Button + Friend WithEvents ListBox1 As ListBox + Friend WithEvents Label1 As Label End Class diff --git a/VECTO/File Browser/FB_FavDlog.vb b/VECTO/File Browser/FB_FavDlog.vb index df7d5029d833f6da64376ab65419babe7534c607..116a75efa6726fcbca275ba0de54d36e349f0869 100644 --- a/VECTO/File Browser/FB_FavDlog.vb +++ b/VECTO/File Browser/FB_FavDlog.vb @@ -12,6 +12,7 @@ Option Infer On Imports System.Windows.Forms + ''' <summary> ''' Sub-dialog for File Browser. Entirely controlled by cFilebrowser class (via FB_Dialog). ''' </summary> @@ -57,6 +58,5 @@ Public Class FB_FavDlog End Sub Private Sub ListBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ListBox1.SelectedIndexChanged - End Sub End Class diff --git a/VECTO/File Browser/FB_Global.vb b/VECTO/File Browser/FB_Global.vb index ff68f211244100772c8964bc62d61034393e811c..b469ad3852b234fdd5d4ff1bf10a9d3e64c6939f 100644 --- a/VECTO/File Browser/FB_Global.vb +++ b/VECTO/File Browser/FB_Global.vb @@ -43,4 +43,3 @@ Public Module FB_Global Public fbVMOD As cFileBrowser End Module - diff --git a/VECTO/GUI/F_AboutBox.Designer.vb b/VECTO/GUI/F_AboutBox.Designer.vb index 93257a1e3100b3161165f351007d96d6da5bd6cf..316c30ef5f62b807207c7d07ee675933dbf43256 100644 --- a/VECTO/GUI/F_AboutBox.Designer.vb +++ b/VECTO/GUI/F_AboutBox.Designer.vb @@ -8,133 +8,137 @@ ' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ' ' See the LICENSE.txt for the specific language governing permissions and limitations. -<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _ +Imports System.ComponentModel +Imports Microsoft.VisualBasic.CompilerServices +Imports TUGraz.VECTO.My.Resources + +<DesignerGenerated()> _ Partial Class F_AboutBox - Inherits System.Windows.Forms.Form + Inherits Form - 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - <System.Diagnostics.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 + '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 System.ComponentModel.IContainer + '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. - <System.Diagnostics.DebuggerStepThrough()> _ - Private Sub InitializeComponent() - Me.Label10 = New System.Windows.Forms.Label() - Me.LabelLic = New System.Windows.Forms.Label() - Me.LabelLicDate = New System.Windows.Forms.Label() - Me.Label2 = New System.Windows.Forms.Label() - Me.Label8 = New System.Windows.Forms.Label() - Me.Panel1 = New System.Windows.Forms.Panel() - Me.PictureBox1 = New System.Windows.Forms.PictureBox() - Me.Label1 = New System.Windows.Forms.Label() - Me.LinkLabel1 = New System.Windows.Forms.LinkLabel() - Me.LinkLabel2 = New System.Windows.Forms.LinkLabel() - Me.Label3 = New System.Windows.Forms.Label() - Me.PictureBoxJRC = New System.Windows.Forms.PictureBox() + '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.Label10 = New Label() + Me.LabelLic = New Label() + Me.LabelLicDate = New Label() + Me.Label2 = New Label() + Me.Label8 = New Label() + Me.Panel1 = New Panel() + Me.PictureBox1 = New PictureBox() + Me.Label1 = New Label() + Me.LinkLabel1 = New LinkLabel() + Me.LinkLabel2 = New LinkLabel() + Me.Label3 = New Label() + Me.PictureBoxJRC = New PictureBox() Me.Panel1.SuspendLayout() - CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.PictureBoxJRC, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PictureBox1, ISupportInitialize).BeginInit() + CType(Me.PictureBoxJRC, ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'Label10 ' Me.Label10.AutoSize = True - Me.Label10.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label10.Location = New System.Drawing.Point(9, 250) + Me.Label10.Font = New Font("Verdana", 8.25!, FontStyle.Regular, GraphicsUnit.Point, CType(0, Byte)) + Me.Label10.Location = New Point(9, 250) Me.Label10.Name = "Label10" - Me.Label10.Size = New System.Drawing.Size(75, 13) + Me.Label10.Size = New Size(75, 13) Me.Label10.TabIndex = 11 Me.Label10.Text = "License file:" ' 'LabelLic ' Me.LabelLic.AutoSize = True - Me.LabelLic.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.LabelLic.Location = New System.Drawing.Point(3, 0) + Me.LabelLic.Font = New Font("Verdana", 8.25!, FontStyle.Regular, GraphicsUnit.Point, CType(0, Byte)) + Me.LabelLic.Location = New Point(3, 0) Me.LabelLic.Name = "LabelLic" - Me.LabelLic.Size = New System.Drawing.Size(22, 13) + Me.LabelLic.Size = New Size(22, 13) Me.LabelLic.TabIndex = 12 Me.LabelLic.Text = "Lic" ' 'LabelLicDate ' - Me.LabelLicDate.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.LabelLicDate.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles) Me.LabelLicDate.AutoSize = True - Me.LabelLicDate.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.LabelLicDate.Location = New System.Drawing.Point(3, 26) + Me.LabelLicDate.Font = New Font("Verdana", 8.25!, FontStyle.Regular, GraphicsUnit.Point, CType(0, Byte)) + Me.LabelLicDate.Location = New Point(3, 26) Me.LabelLicDate.Name = "LabelLicDate" - Me.LabelLicDate.Size = New System.Drawing.Size(12, 13) + Me.LabelLicDate.Size = New Size(12, 13) Me.LabelLicDate.TabIndex = 13 Me.LabelLicDate.Text = "-" ' 'Label2 ' Me.Label2.AutoSize = True - Me.Label2.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label2.Location = New System.Drawing.Point(9, 346) + Me.Label2.Font = New Font("Verdana", 8.25!, FontStyle.Regular, GraphicsUnit.Point, CType(0, Byte)) + Me.Label2.Location = New Point(9, 346) Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(162, 13) + Me.Label2.Size = New Size(162, 13) Me.Label2.TabIndex = 7 Me.Label2.Text = "Developed on behalf of the" ' 'Label8 ' Me.Label8.AutoSize = True - Me.Label8.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label8.Location = New System.Drawing.Point(24, 368) + Me.Label8.Font = New Font("Verdana", 8.25!, FontStyle.Regular, GraphicsUnit.Point, CType(0, Byte)) + Me.Label8.Location = New Point(24, 368) Me.Label8.Name = "Label8" - Me.Label8.Size = New System.Drawing.Size(158, 39) + Me.Label8.Size = New Size(158, 39) Me.Label8.TabIndex = 3 - Me.Label8.Text = "Joint Research Centre" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Sustainable Transport Unit" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "European Commission" + Me.Label8.Text = "Joint Research Centre" & ChrW(13) & ChrW(10) & "Sustainable Transport Unit" & ChrW(13) & ChrW(10) & "European Commission" ' 'Panel1 ' - Me.Panel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D + Me.Panel1.BorderStyle = BorderStyle.Fixed3D Me.Panel1.Controls.Add(Me.LabelLic) Me.Panel1.Controls.Add(Me.LabelLicDate) - Me.Panel1.Location = New System.Drawing.Point(12, 266) + Me.Panel1.Location = New Point(12, 266) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(464, 52) + Me.Panel1.Size = New Size(464, 52) Me.Panel1.TabIndex = 16 ' 'PictureBox1 ' - Me.PictureBox1.Image = Global.VECTO.My.Resources.Resources.VECTO_About - Me.PictureBox1.Location = New System.Drawing.Point(23, 12) + Me.PictureBox1.Image = VECTO_About + Me.PictureBox1.Location = New Point(23, 12) Me.PictureBox1.Name = "PictureBox1" - Me.PictureBox1.Size = New System.Drawing.Size(447, 182) + Me.PictureBox1.Size = New Size(447, 182) Me.PictureBox1.TabIndex = 14 Me.PictureBox1.TabStop = False ' 'Label1 ' Me.Label1.AutoSize = True - Me.Label1.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label1.Location = New System.Drawing.Point(9, 436) + Me.Label1.Font = New Font("Verdana", 8.25!, FontStyle.Regular, GraphicsUnit.Point, CType(0, Byte)) + Me.Label1.Location = New Point(9, 436) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(105, 13) + Me.Label1.Size = New Size(105, 13) Me.Label1.TabIndex = 7 Me.Label1.Text = "Support Contact:" ' 'LinkLabel1 ' Me.LinkLabel1.AutoSize = True - Me.LinkLabel1.Location = New System.Drawing.Point(120, 436) + Me.LinkLabel1.Location = New Point(120, 436) Me.LinkLabel1.Name = "LinkLabel1" - Me.LinkLabel1.Size = New System.Drawing.Size(122, 13) + Me.LinkLabel1.Size = New Size(122, 13) Me.LinkLabel1.TabIndex = 17 Me.LinkLabel1.TabStop = True Me.LinkLabel1.Text = "vecto@jrc.ec.europa.eu" @@ -142,10 +146,10 @@ Partial Class F_AboutBox 'LinkLabel2 ' Me.LinkLabel2.AutoSize = True - Me.LinkLabel2.Font = New System.Drawing.Font("Verdana", 8.25!) - Me.LinkLabel2.Location = New System.Drawing.Point(20, 197) + Me.LinkLabel2.Font = New Font("Verdana", 8.25!) + Me.LinkLabel2.Location = New Point(20, 197) Me.LinkLabel2.Name = "LinkLabel2" - Me.LinkLabel2.Size = New System.Drawing.Size(210, 13) + Me.LinkLabel2.Size = New Size(210, 13) Me.LinkLabel2.TabIndex = 18 Me.LinkLabel2.TabStop = True Me.LinkLabel2.Text = "VECTO is licensed under EUPL 1.1+" @@ -153,29 +157,29 @@ Partial Class F_AboutBox 'Label3 ' Me.Label3.AutoSize = True - Me.Label3.Font = New System.Drawing.Font("Verdana", 8.25!) - Me.Label3.Location = New System.Drawing.Point(20, 213) + Me.Label3.Font = New Font("Verdana", 8.25!) + Me.Label3.Location = New Point(20, 213) Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(237, 13) + Me.Label3.Size = New Size(237, 13) Me.Label3.TabIndex = 19 Me.Label3.Text = "Copyright © 2012-2016 European Union" ' 'PictureBoxJRC ' - Me.PictureBoxJRC.Cursor = System.Windows.Forms.Cursors.Hand - Me.PictureBoxJRC.Image = Global.VECTO.My.Resources.Resources.JRC_About - Me.PictureBoxJRC.Location = New System.Drawing.Point(216, 353) + Me.PictureBoxJRC.Cursor = Cursors.Hand + Me.PictureBoxJRC.Image = JRC_About + Me.PictureBoxJRC.Location = New Point(216, 353) Me.PictureBoxJRC.Name = "PictureBoxJRC" - Me.PictureBoxJRC.Size = New System.Drawing.Size(260, 54) + Me.PictureBoxJRC.Size = New Size(260, 54) Me.PictureBoxJRC.TabIndex = 15 Me.PictureBoxJRC.TabStop = False ' 'F_AboutBox ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.BackColor = System.Drawing.Color.White - Me.ClientSize = New System.Drawing.Size(491, 474) + Me.AutoScaleDimensions = New SizeF(6.0!, 13.0!) + Me.AutoScaleMode = AutoScaleMode.Font + Me.BackColor = Color.White + Me.ClientSize = New Size(491, 474) Me.Controls.Add(Me.Label3) Me.Controls.Add(Me.LinkLabel2) Me.Controls.Add(Me.LinkLabel1) @@ -186,28 +190,28 @@ Partial Class F_AboutBox Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.Label2) Me.Controls.Add(Me.Label8) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.FormBorderStyle = FormBorderStyle.FixedToolWindow Me.Name = "F_AboutBox" - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent + Me.StartPosition = FormStartPosition.CenterParent Me.Text = "About VECTO" Me.Panel1.ResumeLayout(False) Me.Panel1.PerformLayout() - CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.PictureBoxJRC, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PictureBox1, ISupportInitialize).EndInit() + CType(Me.PictureBoxJRC, ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() End Sub - Friend WithEvents Label10 As System.Windows.Forms.Label - Friend WithEvents LabelLic As System.Windows.Forms.Label - Friend WithEvents LabelLicDate As System.Windows.Forms.Label - Friend WithEvents PictureBox1 As System.Windows.Forms.PictureBox - Friend WithEvents Label2 As System.Windows.Forms.Label - Friend WithEvents Label8 As System.Windows.Forms.Label - Friend WithEvents Panel1 As System.Windows.Forms.Panel - Friend WithEvents Label1 As System.Windows.Forms.Label - Friend WithEvents LinkLabel1 As System.Windows.Forms.LinkLabel - Friend WithEvents LinkLabel2 As System.Windows.Forms.LinkLabel - Friend WithEvents Label3 As System.Windows.Forms.Label - Friend WithEvents PictureBoxJRC As System.Windows.Forms.PictureBox + Friend WithEvents Label10 As Label + Friend WithEvents LabelLic As Label + Friend WithEvents LabelLicDate As Label + Friend WithEvents PictureBox1 As PictureBox + Friend WithEvents Label2 As Label + Friend WithEvents Label8 As Label + Friend WithEvents Panel1 As Panel + Friend WithEvents Label1 As Label + Friend WithEvents LinkLabel1 As LinkLabel + Friend WithEvents LinkLabel2 As LinkLabel + Friend WithEvents Label3 As Label + Friend WithEvents PictureBoxJRC As PictureBox End Class diff --git a/VECTO/GUI/F_AboutBox.vb b/VECTO/GUI/F_AboutBox.vb index f9c8357b85cd027de24fd994e6a46790cc8f2113..cfb3e549d9952d23d06709802a2457f535d3386e 100644 --- a/VECTO/GUI/F_AboutBox.vb +++ b/VECTO/GUI/F_AboutBox.vb @@ -8,8 +8,7 @@ ' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ' ' See the LICENSE.txt for the specific language governing permissions and limitations. -Imports System.Linq -Imports System.Reflection + ''' <summary> ''' About Dialog. Shows Licence and contact/support information @@ -17,28 +16,28 @@ Imports System.Reflection ''' <remarks></remarks> Public Class F_AboutBox 'Initialize - Private Sub F10_AboutBox_Load(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles MyBase.Load + 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 End Sub 'e-mail links---------------------------------------------------------------- - Private Sub LinkLabel1_LinkClicked_1(sender As System.Object, e As System.Windows.Forms.LinkLabelLinkClickedEventArgs) _ + Private Sub LinkLabel1_LinkClicked_1(sender As Object, e As LinkLabelLinkClickedEventArgs) _ Handles LinkLabel1.LinkClicked - System.Diagnostics.Process.Start("mailto:vecto@jrc.ec.europa.eu") + Process.Start("mailto:vecto@jrc.ec.europa.eu") End Sub '---------------------------------------------------------------------------- 'Picture Links------------------------------------------------------------------ - Private Sub PictureBoxJRC_Click(sender As System.Object, e As System.EventArgs) Handles PictureBoxJRC.Click - System.Diagnostics.Process.Start("http://ec.europa.eu/dgs/jrc/index.cfm") + Private Sub PictureBoxJRC_Click(sender As Object, e As EventArgs) Handles PictureBoxJRC.Click + Process.Start("http://ec.europa.eu/dgs/jrc/index.cfm") End Sub - Private Sub LinkLabel2_LinkClicked(sender As System.Object, e As System.Windows.Forms.LinkLabelLinkClickedEventArgs) _ + Private Sub LinkLabel2_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) _ Handles LinkLabel2.LinkClicked - System.Diagnostics.Process.Start("https://joinup.ec.europa.eu/community/eupl/og_page/eupl") + Process.Start("https://joinup.ec.europa.eu/community/eupl/og_page/eupl") End Sub End Class diff --git a/VECTO/GUI/F_ENG.Designer.vb b/VECTO/GUI/F_ENG.Designer.vb index d2d15446259de2a862bdd50108ee504e2547d062..afa948e1f61c7c1dd3584359ee45b6f6ce42cad2 100644 --- a/VECTO/GUI/F_ENG.Designer.vb +++ b/VECTO/GUI/F_ENG.Designer.vb @@ -8,12 +8,15 @@ ' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ' ' See the LICENSE.txt for the specific language governing permissions and limitations. -<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _ +Imports System.ComponentModel +Imports Microsoft.VisualBasic.CompilerServices + +<DesignerGenerated()> _ Partial Class F_ENG - Inherits System.Windows.Forms.Form + Inherits Form 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - <System.Diagnostics.DebuggerNonUserCode()> _ + <DebuggerNonUserCode()> _ Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -25,227 +28,227 @@ Partial Class F_ENG End Sub 'Wird vom Windows Form-Designer benötigt. - Private components As System.ComponentModel.IContainer + 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. - <System.Diagnostics.DebuggerStepThrough()> _ + <DebuggerStepThrough()> _ Private Sub InitializeComponent() - Me.components = New System.ComponentModel.Container() - Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(F_ENG)) - Me.TbNleerl = New System.Windows.Forms.TextBox() - Me.Label11 = New System.Windows.Forms.Label() - Me.TbInertia = New System.Windows.Forms.TextBox() - Me.Label41 = New System.Windows.Forms.Label() - Me.Label40 = New System.Windows.Forms.Label() - Me.Label5 = New System.Windows.Forms.Label() - Me.ButCancel = New System.Windows.Forms.Button() - Me.ButOK = New System.Windows.Forms.Button() - Me.ToolStrip1 = New System.Windows.Forms.ToolStrip() - Me.ToolStripBtNew = New System.Windows.Forms.ToolStripButton() - Me.ToolStripBtOpen = New System.Windows.Forms.ToolStripButton() - Me.ToolStripBtSave = New System.Windows.Forms.ToolStripButton() - Me.ToolStripBtSaveAs = New System.Windows.Forms.ToolStripButton() - Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator() - Me.ToolStripBtSendTo = New System.Windows.Forms.ToolStripButton() - Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator() - Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton() - Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() - Me.LbStatus = New System.Windows.Forms.ToolStripStatusLabel() - Me.Label1 = New System.Windows.Forms.Label() - Me.Label2 = New System.Windows.Forms.Label() - Me.TbDispl = New System.Windows.Forms.TextBox() - Me.TbName = New System.Windows.Forms.TextBox() - Me.Label3 = New System.Windows.Forms.Label() - Me.TbMAP = New System.Windows.Forms.TextBox() - Me.Label6 = New System.Windows.Forms.Label() - Me.BtMAP = New System.Windows.Forms.Button() - Me.PictureBox1 = New System.Windows.Forms.PictureBox() - Me.CmOpenFile = New System.Windows.Forms.ContextMenuStrip(Me.components) - Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.BtMAPopen = New System.Windows.Forms.Button() - Me.PnInertia = New System.Windows.Forms.Panel() - Me.GrWHTC = New System.Windows.Forms.GroupBox() - Me.BtWHTCimport = New System.Windows.Forms.Button() - Me.Label13 = New System.Windows.Forms.Label() - Me.TbWHTCmw = New System.Windows.Forms.TextBox() - Me.TbWHTCrural = New System.Windows.Forms.TextBox() - Me.TbWHTCurban = New System.Windows.Forms.TextBox() - Me.Label8 = New System.Windows.Forms.Label() - Me.Label7 = New System.Windows.Forms.Label() - Me.Label4 = New System.Windows.Forms.Label() - Me.PicBox = New System.Windows.Forms.PictureBox() - Me.TbFLD = New System.Windows.Forms.TextBox() - Me.Label14 = New System.Windows.Forms.Label() - Me.BtFLD = New System.Windows.Forms.Button() - Me.BtFLDopen = New System.Windows.Forms.Button() + Me.components = New Container() + Dim resources As ComponentResourceManager = New ComponentResourceManager(GetType(F_ENG)) + Me.TbNleerl = New TextBox() + Me.Label11 = New Label() + Me.TbInertia = New TextBox() + Me.Label41 = New Label() + Me.Label40 = New Label() + Me.Label5 = New Label() + Me.ButCancel = New Button() + Me.ButOK = New Button() + Me.ToolStrip1 = New ToolStrip() + Me.ToolStripBtNew = New ToolStripButton() + Me.ToolStripBtOpen = New ToolStripButton() + Me.ToolStripBtSave = New ToolStripButton() + Me.ToolStripBtSaveAs = New ToolStripButton() + Me.ToolStripSeparator3 = New ToolStripSeparator() + Me.ToolStripBtSendTo = New ToolStripButton() + Me.ToolStripSeparator1 = New ToolStripSeparator() + Me.ToolStripButton1 = New ToolStripButton() + Me.StatusStrip1 = New StatusStrip() + Me.LbStatus = New ToolStripStatusLabel() + Me.Label1 = New Label() + Me.Label2 = New Label() + Me.TbDispl = New TextBox() + Me.TbName = New TextBox() + Me.Label3 = New Label() + Me.TbMAP = New TextBox() + Me.Label6 = New Label() + Me.BtMAP = New Button() + Me.PictureBox1 = New PictureBox() + Me.CmOpenFile = New ContextMenuStrip(Me.components) + Me.OpenWithToolStripMenuItem = New ToolStripMenuItem() + Me.ShowInFolderToolStripMenuItem = New ToolStripMenuItem() + Me.BtMAPopen = New Button() + Me.PnInertia = New Panel() + Me.GrWHTC = New GroupBox() + Me.BtWHTCimport = New Button() + Me.Label13 = New Label() + Me.TbWHTCmw = New TextBox() + Me.TbWHTCrural = New TextBox() + Me.TbWHTCurban = New TextBox() + Me.Label8 = New Label() + Me.Label7 = New Label() + Me.Label4 = New Label() + Me.PicBox = New PictureBox() + Me.TbFLD = New TextBox() + Me.Label14 = New Label() + Me.BtFLD = New Button() + Me.BtFLDopen = New Button() Me.ToolStrip1.SuspendLayout() Me.StatusStrip1.SuspendLayout() - CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PictureBox1, ISupportInitialize).BeginInit() Me.CmOpenFile.SuspendLayout() Me.PnInertia.SuspendLayout() Me.GrWHTC.SuspendLayout() - CType(Me.PicBox, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PicBox, ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'TbNleerl ' - Me.TbNleerl.Location = New System.Drawing.Point(123, 108) + Me.TbNleerl.Location = New Point(123, 108) Me.TbNleerl.Name = "TbNleerl" - Me.TbNleerl.Size = New System.Drawing.Size(57, 20) + Me.TbNleerl.Size = New Size(57, 20) Me.TbNleerl.TabIndex = 1 ' 'Label11 ' Me.Label11.AutoSize = True - Me.Label11.Location = New System.Drawing.Point(15, 111) + Me.Label11.Location = New Point(15, 111) Me.Label11.Name = "Label11" - Me.Label11.Size = New System.Drawing.Size(102, 13) + Me.Label11.Size = New Size(102, 13) Me.Label11.TabIndex = 15 Me.Label11.Text = "Idling Engine Speed" ' 'TbInertia ' - Me.TbInertia.Location = New System.Drawing.Point(120, 2) + Me.TbInertia.Location = New Point(120, 2) Me.TbInertia.Name = "TbInertia" - Me.TbInertia.Size = New System.Drawing.Size(57, 20) + Me.TbInertia.Size = New Size(57, 20) Me.TbInertia.TabIndex = 3 ' 'Label41 ' Me.Label41.AutoSize = True - Me.Label41.Location = New System.Drawing.Point(183, 5) + Me.Label41.Location = New Point(183, 5) Me.Label41.Name = "Label41" - Me.Label41.Size = New System.Drawing.Size(36, 13) + Me.Label41.Size = New Size(36, 13) Me.Label41.TabIndex = 24 Me.Label41.Text = "[kgm²]" ' 'Label40 ' Me.Label40.AutoSize = True - Me.Label40.Location = New System.Drawing.Point(186, 111) + Me.Label40.Location = New Point(186, 111) Me.Label40.Name = "Label40" - Me.Label40.Size = New System.Drawing.Size(30, 13) + Me.Label40.Size = New Size(30, 13) Me.Label40.TabIndex = 24 Me.Label40.Text = "[rpm]" ' 'Label5 ' Me.Label5.AutoSize = True - Me.Label5.Location = New System.Drawing.Point(12, 5) + Me.Label5.Location = New Point(12, 5) Me.Label5.Name = "Label5" - Me.Label5.Size = New System.Drawing.Size(102, 13) + Me.Label5.Size = New Size(102, 13) Me.Label5.TabIndex = 0 Me.Label5.Text = "Inertia incl. Flywheel" ' 'ButCancel ' - Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.ButCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel - Me.ButCancel.Location = New System.Drawing.Point(898, 469) + Me.ButCancel.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles) + Me.ButCancel.DialogResult = DialogResult.Cancel + Me.ButCancel.Location = New Point(898, 469) Me.ButCancel.Name = "ButCancel" - Me.ButCancel.Size = New System.Drawing.Size(75, 23) + Me.ButCancel.Size = New Size(75, 23) Me.ButCancel.TabIndex = 13 Me.ButCancel.Text = "Cancel" Me.ButCancel.UseVisualStyleBackColor = True ' 'ButOK ' - Me.ButOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.ButOK.Location = New System.Drawing.Point(817, 469) + Me.ButOK.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles) + Me.ButOK.Location = New Point(817, 469) Me.ButOK.Name = "ButOK" - Me.ButOK.Size = New System.Drawing.Size(75, 23) + Me.ButOK.Size = New Size(75, 23) Me.ButOK.TabIndex = 12 Me.ButOK.Text = "Save" Me.ButOK.UseVisualStyleBackColor = True ' 'ToolStrip1 ' - Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden - Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator3, Me.ToolStripBtSendTo, Me.ToolStripSeparator1, Me.ToolStripButton1}) - Me.ToolStrip1.Location = New System.Drawing.Point(0, 0) + Me.ToolStrip1.GripStyle = ToolStripGripStyle.Hidden + Me.ToolStrip1.Items.AddRange(New ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator3, Me.ToolStripBtSendTo, Me.ToolStripSeparator1, Me.ToolStripButton1}) + Me.ToolStrip1.Location = New Point(0, 0) Me.ToolStrip1.Name = "ToolStrip1" - Me.ToolStrip1.Size = New System.Drawing.Size(985, 25) + Me.ToolStrip1.Size = New Size(985, 25) Me.ToolStrip1.TabIndex = 30 Me.ToolStrip1.Text = "ToolStrip1" ' 'ToolStripBtNew ' - Me.ToolStripBtNew.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripBtNew.Image = Global.VECTO.My.Resources.Resources.blue_document_icon - Me.ToolStripBtNew.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripBtNew.DisplayStyle = ToolStripItemDisplayStyle.Image + Me.ToolStripBtNew.Image = My.Resources.Resources.blue_document_icon + Me.ToolStripBtNew.ImageTransparentColor = Color.Magenta Me.ToolStripBtNew.Name = "ToolStripBtNew" - Me.ToolStripBtNew.Size = New System.Drawing.Size(23, 22) + Me.ToolStripBtNew.Size = New Size(23, 22) Me.ToolStripBtNew.Text = "ToolStripButton1" Me.ToolStripBtNew.ToolTipText = "New" ' 'ToolStripBtOpen ' - Me.ToolStripBtOpen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripBtOpen.Image = Global.VECTO.My.Resources.Resources.Open_icon - Me.ToolStripBtOpen.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripBtOpen.DisplayStyle = ToolStripItemDisplayStyle.Image + Me.ToolStripBtOpen.Image = My.Resources.Resources.Open_icon + Me.ToolStripBtOpen.ImageTransparentColor = Color.Magenta Me.ToolStripBtOpen.Name = "ToolStripBtOpen" - Me.ToolStripBtOpen.Size = New System.Drawing.Size(23, 22) + Me.ToolStripBtOpen.Size = New Size(23, 22) Me.ToolStripBtOpen.Text = "ToolStripButton1" Me.ToolStripBtOpen.ToolTipText = "Open..." ' 'ToolStripBtSave ' - Me.ToolStripBtSave.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripBtSave.Image = Global.VECTO.My.Resources.Resources.Actions_document_save_icon - Me.ToolStripBtSave.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripBtSave.DisplayStyle = ToolStripItemDisplayStyle.Image + Me.ToolStripBtSave.Image = My.Resources.Resources.Actions_document_save_icon + Me.ToolStripBtSave.ImageTransparentColor = Color.Magenta Me.ToolStripBtSave.Name = "ToolStripBtSave" - Me.ToolStripBtSave.Size = New System.Drawing.Size(23, 22) + Me.ToolStripBtSave.Size = New Size(23, 22) Me.ToolStripBtSave.Text = "ToolStripButton1" Me.ToolStripBtSave.ToolTipText = "Save" ' 'ToolStripBtSaveAs ' - Me.ToolStripBtSaveAs.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripBtSaveAs.Image = Global.VECTO.My.Resources.Resources.Actions_document_save_as_icon - Me.ToolStripBtSaveAs.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripBtSaveAs.DisplayStyle = ToolStripItemDisplayStyle.Image + Me.ToolStripBtSaveAs.Image = My.Resources.Resources.Actions_document_save_as_icon + Me.ToolStripBtSaveAs.ImageTransparentColor = Color.Magenta Me.ToolStripBtSaveAs.Name = "ToolStripBtSaveAs" - Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(23, 22) + Me.ToolStripBtSaveAs.Size = New Size(23, 22) Me.ToolStripBtSaveAs.Text = "ToolStripButton1" Me.ToolStripBtSaveAs.ToolTipText = "Save As..." ' 'ToolStripSeparator3 ' Me.ToolStripSeparator3.Name = "ToolStripSeparator3" - Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 25) + Me.ToolStripSeparator3.Size = New Size(6, 25) ' 'ToolStripBtSendTo ' - Me.ToolStripBtSendTo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripBtSendTo.Image = Global.VECTO.My.Resources.Resources.export_icon - Me.ToolStripBtSendTo.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripBtSendTo.DisplayStyle = ToolStripItemDisplayStyle.Image + Me.ToolStripBtSendTo.Image = My.Resources.Resources.export_icon + Me.ToolStripBtSendTo.ImageTransparentColor = Color.Magenta Me.ToolStripBtSendTo.Name = "ToolStripBtSendTo" - Me.ToolStripBtSendTo.Size = New System.Drawing.Size(23, 22) + Me.ToolStripBtSendTo.Size = New Size(23, 22) Me.ToolStripBtSendTo.Text = "Send to Job Editor" Me.ToolStripBtSendTo.ToolTipText = "Send to Job Editor" ' 'ToolStripSeparator1 ' Me.ToolStripSeparator1.Name = "ToolStripSeparator1" - Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 25) + Me.ToolStripSeparator1.Size = New Size(6, 25) ' 'ToolStripButton1 ' - Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripButton1.Image = Global.VECTO.My.Resources.Resources.Help_icon - Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripButton1.DisplayStyle = ToolStripItemDisplayStyle.Image + Me.ToolStripButton1.Image = My.Resources.Resources.Help_icon + Me.ToolStripButton1.ImageTransparentColor = Color.Magenta Me.ToolStripButton1.Name = "ToolStripButton1" - Me.ToolStripButton1.Size = New System.Drawing.Size(23, 22) + Me.ToolStripButton1.Size = New Size(23, 22) Me.ToolStripButton1.Text = "Help" ' 'StatusStrip1 ' - Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LbStatus}) - Me.StatusStrip1.Location = New System.Drawing.Point(0, 495) + Me.StatusStrip1.Items.AddRange(New ToolStripItem() {Me.LbStatus}) + Me.StatusStrip1.Location = New Point(0, 495) Me.StatusStrip1.Name = "StatusStrip1" - Me.StatusStrip1.Size = New System.Drawing.Size(985, 22) + Me.StatusStrip1.Size = New Size(985, 22) Me.StatusStrip1.SizingGrip = False Me.StatusStrip1.TabIndex = 37 Me.StatusStrip1.Text = "StatusStrip1" @@ -253,110 +256,110 @@ Partial Class F_ENG 'LbStatus ' Me.LbStatus.Name = "LbStatus" - Me.LbStatus.Size = New System.Drawing.Size(39, 17) + Me.LbStatus.Size = New Size(39, 17) Me.LbStatus.Text = "Status" ' 'Label1 ' Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(186, 137) + Me.Label1.Location = New Point(186, 137) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(33, 13) + Me.Label1.Size = New Size(33, 13) Me.Label1.TabIndex = 24 Me.Label1.Text = "[ccm]" ' 'Label2 ' Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(46, 137) + Me.Label2.Location = New Point(46, 137) Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(71, 13) + Me.Label2.Size = New Size(71, 13) Me.Label2.TabIndex = 13 Me.Label2.Text = "Displacement" ' 'TbDispl ' - Me.TbDispl.Location = New System.Drawing.Point(123, 134) + Me.TbDispl.Location = New Point(123, 134) Me.TbDispl.Name = "TbDispl" - Me.TbDispl.Size = New System.Drawing.Size(57, 20) + Me.TbDispl.Size = New Size(57, 20) Me.TbDispl.TabIndex = 2 ' 'TbName ' - Me.TbName.Location = New System.Drawing.Point(123, 82) + Me.TbName.Location = New Point(123, 82) Me.TbName.Name = "TbName" - Me.TbName.Size = New System.Drawing.Size(370, 20) + Me.TbName.Size = New Size(370, 20) Me.TbName.TabIndex = 0 ' 'Label3 ' Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(30, 85) + Me.Label3.Location = New Point(30, 85) Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(87, 13) + Me.Label3.Size = New Size(87, 13) Me.Label3.TabIndex = 11 Me.Label3.Text = "Make and Model" ' 'TbMAP ' - Me.TbMAP.Location = New System.Drawing.Point(12, 259) + Me.TbMAP.Location = New Point(12, 259) Me.TbMAP.Name = "TbMAP" - Me.TbMAP.Size = New System.Drawing.Size(434, 20) + Me.TbMAP.Size = New Size(434, 20) Me.TbMAP.TabIndex = 5 ' 'Label6 ' Me.Label6.AutoSize = True - Me.Label6.Location = New System.Drawing.Point(12, 243) + Me.Label6.Location = New Point(12, 243) Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(115, 13) + Me.Label6.Size = New Size(115, 13) Me.Label6.TabIndex = 38 Me.Label6.Text = "Fuel Consumption Map" ' 'BtMAP ' - Me.BtMAP.Image = Global.VECTO.My.Resources.Resources.Open_icon - Me.BtMAP.Location = New System.Drawing.Point(446, 257) + Me.BtMAP.Image = My.Resources.Resources.Open_icon + Me.BtMAP.Location = New Point(446, 257) Me.BtMAP.Name = "BtMAP" - Me.BtMAP.Size = New System.Drawing.Size(24, 24) + Me.BtMAP.Size = New Size(24, 24) Me.BtMAP.TabIndex = 6 Me.BtMAP.TabStop = False Me.BtMAP.UseVisualStyleBackColor = True ' 'PictureBox1 ' - Me.PictureBox1.BackColor = System.Drawing.Color.White - Me.PictureBox1.Image = Global.VECTO.My.Resources.Resources.VECTO_ENG - Me.PictureBox1.Location = New System.Drawing.Point(12, 28) + Me.PictureBox1.BackColor = Color.White + Me.PictureBox1.Image = My.Resources.Resources.VECTO_ENG + Me.PictureBox1.Location = New Point(12, 28) Me.PictureBox1.Name = "PictureBox1" - Me.PictureBox1.Size = New System.Drawing.Size(481, 40) + Me.PictureBox1.Size = New Size(481, 40) Me.PictureBox1.TabIndex = 39 Me.PictureBox1.TabStop = False ' 'CmOpenFile ' - Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem}) + Me.CmOpenFile.Items.AddRange(New ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem}) Me.CmOpenFile.Name = "CmOpenFile" - Me.CmOpenFile.Size = New System.Drawing.Size(153, 48) + Me.CmOpenFile.Size = New Size(153, 48) ' 'OpenWithToolStripMenuItem ' Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem" - Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(152, 22) + Me.OpenWithToolStripMenuItem.Size = New Size(152, 22) Me.OpenWithToolStripMenuItem.Text = "Open with ..." ' 'ShowInFolderToolStripMenuItem ' Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem" - Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(152, 22) + Me.ShowInFolderToolStripMenuItem.Size = New Size(152, 22) Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder" ' 'BtMAPopen ' - Me.BtMAPopen.Image = Global.VECTO.My.Resources.Resources.application_export_icon_small - Me.BtMAPopen.Location = New System.Drawing.Point(469, 257) + Me.BtMAPopen.Image = My.Resources.Resources.application_export_icon_small + Me.BtMAPopen.Location = New Point(469, 257) Me.BtMAPopen.Name = "BtMAPopen" - Me.BtMAPopen.Size = New System.Drawing.Size(24, 24) + Me.BtMAPopen.Size = New Size(24, 24) Me.BtMAPopen.TabIndex = 7 Me.BtMAPopen.TabStop = False Me.BtMAPopen.UseVisualStyleBackColor = True @@ -366,9 +369,9 @@ Partial Class F_ENG Me.PnInertia.Controls.Add(Me.Label5) Me.PnInertia.Controls.Add(Me.Label41) Me.PnInertia.Controls.Add(Me.TbInertia) - Me.PnInertia.Location = New System.Drawing.Point(264, 106) + Me.PnInertia.Location = New Point(264, 106) Me.PnInertia.Name = "PnInertia" - Me.PnInertia.Size = New System.Drawing.Size(229, 32) + Me.PnInertia.Size = New Size(229, 32) Me.PnInertia.TabIndex = 3 ' 'GrWHTC @@ -382,18 +385,18 @@ Partial Class F_ENG Me.GrWHTC.Controls.Add(Me.Label7) Me.GrWHTC.Controls.Add(Me.Label4) Me.GrWHTC.Enabled = False - Me.GrWHTC.Location = New System.Drawing.Point(12, 300) + Me.GrWHTC.Location = New Point(12, 300) Me.GrWHTC.Name = "GrWHTC" - Me.GrWHTC.Size = New System.Drawing.Size(481, 91) + Me.GrWHTC.Size = New Size(481, 91) Me.GrWHTC.TabIndex = 9 Me.GrWHTC.TabStop = False Me.GrWHTC.Text = "WHTC Correction" ' 'BtWHTCimport ' - Me.BtWHTCimport.Location = New System.Drawing.Point(305, 19) + Me.BtWHTCimport.Location = New Point(305, 19) Me.BtWHTCimport.Name = "BtWHTCimport" - Me.BtWHTCimport.Size = New System.Drawing.Size(170, 28) + Me.BtWHTCimport.Size = New Size(170, 28) Me.BtWHTCimport.TabIndex = 4 Me.BtWHTCimport.Text = "Import from VECTO-Engine" Me.BtWHTCimport.UseVisualStyleBackColor = True @@ -401,101 +404,101 @@ Partial Class F_ENG 'Label13 ' Me.Label13.AutoSize = True - Me.Label13.Location = New System.Drawing.Point(6, 27) + Me.Label13.Location = New Point(6, 27) Me.Label13.Name = "Label13" - Me.Label13.Size = New System.Drawing.Size(242, 13) + Me.Label13.Size = New Size(242, 13) Me.Label13.TabIndex = 3 Me.Label13.Text = "Correction Factors calculated with VECTO-Engine" ' 'TbWHTCmw ' - Me.TbWHTCmw.Location = New System.Drawing.Point(348, 56) + Me.TbWHTCmw.Location = New Point(348, 56) Me.TbWHTCmw.Name = "TbWHTCmw" - Me.TbWHTCmw.Size = New System.Drawing.Size(57, 20) + Me.TbWHTCmw.Size = New Size(57, 20) Me.TbWHTCmw.TabIndex = 2 ' 'TbWHTCrural ' - Me.TbWHTCrural.Location = New System.Drawing.Point(192, 56) + Me.TbWHTCrural.Location = New Point(192, 56) Me.TbWHTCrural.Name = "TbWHTCrural" - Me.TbWHTCrural.Size = New System.Drawing.Size(57, 20) + Me.TbWHTCrural.Size = New Size(57, 20) Me.TbWHTCrural.TabIndex = 1 ' 'TbWHTCurban ' - Me.TbWHTCurban.Location = New System.Drawing.Point(48, 56) + Me.TbWHTCurban.Location = New Point(48, 56) Me.TbWHTCurban.Name = "TbWHTCurban" - Me.TbWHTCurban.Size = New System.Drawing.Size(57, 20) + Me.TbWHTCurban.Size = New Size(57, 20) Me.TbWHTCurban.TabIndex = 0 ' 'Label8 ' Me.Label8.AutoSize = True - Me.Label8.Location = New System.Drawing.Point(289, 59) + Me.Label8.Location = New Point(289, 59) Me.Label8.Name = "Label8" - Me.Label8.Size = New System.Drawing.Size(53, 13) + Me.Label8.Size = New Size(53, 13) Me.Label8.TabIndex = 0 Me.Label8.Text = "Motorway" ' 'Label7 ' Me.Label7.AutoSize = True - Me.Label7.Location = New System.Drawing.Point(154, 59) + Me.Label7.Location = New Point(154, 59) Me.Label7.Name = "Label7" - Me.Label7.Size = New System.Drawing.Size(32, 13) + Me.Label7.Size = New Size(32, 13) Me.Label7.TabIndex = 0 Me.Label7.Text = "Rural" ' 'Label4 ' Me.Label4.AutoSize = True - Me.Label4.Location = New System.Drawing.Point(6, 59) + Me.Label4.Location = New Point(6, 59) Me.Label4.Name = "Label4" - Me.Label4.Size = New System.Drawing.Size(36, 13) + Me.Label4.Size = New Size(36, 13) Me.Label4.TabIndex = 0 Me.Label4.Text = "Urban" ' 'PicBox ' - Me.PicBox.BackColor = System.Drawing.Color.LightGray - Me.PicBox.Location = New System.Drawing.Point(499, 28) + Me.PicBox.BackColor = Color.LightGray + Me.PicBox.Location = New Point(499, 28) Me.PicBox.Name = "PicBox" - Me.PicBox.Size = New System.Drawing.Size(474, 425) + Me.PicBox.Size = New Size(474, 425) Me.PicBox.TabIndex = 40 Me.PicBox.TabStop = False ' 'TbFLD ' - Me.TbFLD.Location = New System.Drawing.Point(12, 202) + Me.TbFLD.Location = New Point(12, 202) Me.TbFLD.Name = "TbFLD" - Me.TbFLD.Size = New System.Drawing.Size(434, 20) + Me.TbFLD.Size = New Size(434, 20) Me.TbFLD.TabIndex = 5 ' 'Label14 ' Me.Label14.AutoSize = True - Me.Label14.Location = New System.Drawing.Point(12, 186) + Me.Label14.Location = New Point(12, 186) Me.Label14.Name = "Label14" - Me.Label14.Size = New System.Drawing.Size(128, 13) + Me.Label14.Size = New Size(128, 13) Me.Label14.TabIndex = 38 Me.Label14.Text = "Full Load and Drag Curve" ' 'BtFLD ' - Me.BtFLD.Image = Global.VECTO.My.Resources.Resources.Open_icon - Me.BtFLD.Location = New System.Drawing.Point(446, 200) + Me.BtFLD.Image = My.Resources.Resources.Open_icon + Me.BtFLD.Location = New Point(446, 200) Me.BtFLD.Name = "BtFLD" - Me.BtFLD.Size = New System.Drawing.Size(24, 24) + Me.BtFLD.Size = New Size(24, 24) Me.BtFLD.TabIndex = 6 Me.BtFLD.TabStop = False Me.BtFLD.UseVisualStyleBackColor = True ' 'BtFLDopen ' - Me.BtFLDopen.Image = Global.VECTO.My.Resources.Resources.application_export_icon_small - Me.BtFLDopen.Location = New System.Drawing.Point(469, 200) + Me.BtFLDopen.Image = My.Resources.Resources.application_export_icon_small + Me.BtFLDopen.Location = New Point(469, 200) Me.BtFLDopen.Name = "BtFLDopen" - Me.BtFLDopen.Size = New System.Drawing.Size(24, 24) + Me.BtFLDopen.Size = New Size(24, 24) Me.BtFLDopen.TabIndex = 7 Me.BtFLDopen.TabStop = False Me.BtFLDopen.UseVisualStyleBackColor = True @@ -503,10 +506,10 @@ Partial Class F_ENG 'F_ENG ' Me.AcceptButton = Me.ButOK - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.AutoScaleDimensions = New SizeF(6.0!, 13.0!) + Me.AutoScaleMode = AutoScaleMode.Font Me.CancelButton = Me.ButCancel - Me.ClientSize = New System.Drawing.Size(985, 517) + Me.ClientSize = New Size(985, 517) Me.Controls.Add(Me.PicBox) Me.Controls.Add(Me.GrWHTC) Me.Controls.Add(Me.PnInertia) @@ -531,72 +534,72 @@ Partial Class F_ENG Me.Controls.Add(Me.Label40) Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.TbName) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle - Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) + Me.FormBorderStyle = FormBorderStyle.FixedSingle + Me.Icon = CType(resources.GetObject("$this.Icon"), Icon) Me.MaximizeBox = False Me.Name = "F_ENG" - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent + Me.StartPosition = FormStartPosition.CenterParent Me.Text = "F_ENG" Me.ToolStrip1.ResumeLayout(False) Me.ToolStrip1.PerformLayout() Me.StatusStrip1.ResumeLayout(False) Me.StatusStrip1.PerformLayout() - CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PictureBox1, ISupportInitialize).EndInit() Me.CmOpenFile.ResumeLayout(False) Me.PnInertia.ResumeLayout(False) Me.PnInertia.PerformLayout() Me.GrWHTC.ResumeLayout(False) Me.GrWHTC.PerformLayout() - CType(Me.PicBox, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PicBox, ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() End Sub - Friend WithEvents TbNleerl As System.Windows.Forms.TextBox - Friend WithEvents Label11 As System.Windows.Forms.Label - Friend WithEvents TbInertia As System.Windows.Forms.TextBox - Friend WithEvents Label41 As System.Windows.Forms.Label - Friend WithEvents Label40 As System.Windows.Forms.Label - Friend WithEvents Label5 As System.Windows.Forms.Label - Friend WithEvents ButCancel As System.Windows.Forms.Button - Friend WithEvents ButOK As System.Windows.Forms.Button - Friend WithEvents ToolStrip1 As System.Windows.Forms.ToolStrip - Friend WithEvents ToolStripBtNew As System.Windows.Forms.ToolStripButton - Friend WithEvents ToolStripBtOpen As System.Windows.Forms.ToolStripButton - Friend WithEvents ToolStripBtSave As System.Windows.Forms.ToolStripButton - Friend WithEvents ToolStripBtSaveAs As System.Windows.Forms.ToolStripButton - Friend WithEvents ToolStripSeparator3 As System.Windows.Forms.ToolStripSeparator - Friend WithEvents ToolStripBtSendTo As System.Windows.Forms.ToolStripButton - Friend WithEvents StatusStrip1 As System.Windows.Forms.StatusStrip - Friend WithEvents LbStatus As System.Windows.Forms.ToolStripStatusLabel - Friend WithEvents Label1 As System.Windows.Forms.Label - Friend WithEvents Label2 As System.Windows.Forms.Label - Friend WithEvents TbDispl As System.Windows.Forms.TextBox - Friend WithEvents TbName As System.Windows.Forms.TextBox - Friend WithEvents Label3 As System.Windows.Forms.Label - Friend WithEvents TbMAP As System.Windows.Forms.TextBox - Friend WithEvents Label6 As System.Windows.Forms.Label - Friend WithEvents BtMAP As System.Windows.Forms.Button - Friend WithEvents PictureBox1 As System.Windows.Forms.PictureBox - Friend WithEvents ToolStripSeparator1 As System.Windows.Forms.ToolStripSeparator - Friend WithEvents ToolStripButton1 As System.Windows.Forms.ToolStripButton - Friend WithEvents CmOpenFile As System.Windows.Forms.ContextMenuStrip - Friend WithEvents OpenWithToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents ShowInFolderToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents BtMAPopen As System.Windows.Forms.Button - Friend WithEvents PnInertia As System.Windows.Forms.Panel - Friend WithEvents GrWHTC As System.Windows.Forms.GroupBox - Friend WithEvents TbWHTCmw As System.Windows.Forms.TextBox - Friend WithEvents TbWHTCrural As System.Windows.Forms.TextBox - Friend WithEvents TbWHTCurban As System.Windows.Forms.TextBox - Friend WithEvents Label8 As System.Windows.Forms.Label - Friend WithEvents Label7 As System.Windows.Forms.Label - Friend WithEvents Label4 As System.Windows.Forms.Label - Friend WithEvents PicBox As System.Windows.Forms.PictureBox - Friend WithEvents Label13 As System.Windows.Forms.Label - Friend WithEvents TbFLD As System.Windows.Forms.TextBox - Friend WithEvents Label14 As System.Windows.Forms.Label - Friend WithEvents BtFLD As System.Windows.Forms.Button - Friend WithEvents BtFLDopen As System.Windows.Forms.Button - Friend WithEvents BtWHTCimport As System.Windows.Forms.Button + Friend WithEvents TbNleerl As TextBox + Friend WithEvents Label11 As Label + Friend WithEvents TbInertia As TextBox + Friend WithEvents Label41 As Label + Friend WithEvents Label40 As Label + Friend WithEvents Label5 As Label + Friend WithEvents ButCancel As Button + Friend WithEvents ButOK As Button + Friend WithEvents ToolStrip1 As ToolStrip + Friend WithEvents ToolStripBtNew As ToolStripButton + Friend WithEvents ToolStripBtOpen As ToolStripButton + Friend WithEvents ToolStripBtSave As ToolStripButton + Friend WithEvents ToolStripBtSaveAs As ToolStripButton + Friend WithEvents ToolStripSeparator3 As ToolStripSeparator + Friend WithEvents ToolStripBtSendTo As ToolStripButton + Friend WithEvents StatusStrip1 As StatusStrip + Friend WithEvents LbStatus As ToolStripStatusLabel + Friend WithEvents Label1 As Label + Friend WithEvents Label2 As Label + Friend WithEvents TbDispl As TextBox + Friend WithEvents TbName As TextBox + Friend WithEvents Label3 As Label + Friend WithEvents TbMAP As TextBox + Friend WithEvents Label6 As Label + Friend WithEvents BtMAP As Button + Friend WithEvents PictureBox1 As PictureBox + Friend WithEvents ToolStripSeparator1 As ToolStripSeparator + Friend WithEvents ToolStripButton1 As ToolStripButton + Friend WithEvents CmOpenFile As ContextMenuStrip + Friend WithEvents OpenWithToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ShowInFolderToolStripMenuItem As ToolStripMenuItem + Friend WithEvents BtMAPopen As Button + Friend WithEvents PnInertia As Panel + Friend WithEvents GrWHTC As GroupBox + Friend WithEvents TbWHTCmw As TextBox + Friend WithEvents TbWHTCrural As TextBox + Friend WithEvents TbWHTCurban As TextBox + Friend WithEvents Label8 As Label + Friend WithEvents Label7 As Label + Friend WithEvents Label4 As Label + Friend WithEvents PicBox As PictureBox + Friend WithEvents Label13 As Label + Friend WithEvents TbFLD As TextBox + Friend WithEvents Label14 As Label + Friend WithEvents BtFLD As Button + Friend WithEvents BtFLDopen As Button + Friend WithEvents BtWHTCimport As Button End Class diff --git a/VECTO/GUI/F_ENG.vb b/VECTO/GUI/F_ENG.vb index 963279e7abf4083a9ae1761dc7fe2f6bdf1d9cb3..0b411137592d2499d71c71c0bdb1b6279844aaba 100644 --- a/VECTO/GUI/F_ENG.vb +++ b/VECTO/GUI/F_ENG.vb @@ -1,5 +1,12 @@ -Imports System.Web + +Imports System.Drawing.Imaging +Imports System.IO +Imports System.Text.RegularExpressions +Imports System.Windows.Forms.DataVisualization.Charting Imports System.Xml.Linq +Imports TUGraz.VectoCommon.Models +Imports TUGraz.VectoCommon.Utils +Imports TUGraz.VectoCore.Models.Declaration ' Copyright 2014 European Union. ' Licensed under the EUPL (the 'Licence'); ' @@ -23,14 +30,14 @@ Public Class F_ENG 'Before closing Editor: Check if file was changed and ask to save. - Private Sub F_ENG_FormClosing(sender As Object, e As System.Windows.Forms.FormClosingEventArgs) Handles Me.FormClosing + Private Sub F_ENG_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing If e.CloseReason <> CloseReason.ApplicationExitCall And e.CloseReason <> CloseReason.WindowsShutDown Then e.Cancel = ChangeCheckCancel() End If End Sub 'Initialise. - Private Sub F_ENG_Load(sender As Object, e As System.EventArgs) Handles Me.Load + 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 @@ -45,29 +52,32 @@ Public Class F_ENG If Not Cfg.DeclMode Then Exit Sub - Me.TbInertia.Text = CStr(cDeclaration.EngInertia(fTextboxToNumString(Me.TbDispl.Text))) + Me.TbInertia.Text = + CStr( + DeclarationData.Engine.EngineInertia((fTextboxToNumString(Me.TbDispl.Text) / 1000.0).SI(Of CubicMeter), + GearboxType.AMT).Value()) End Sub #Region "Toolbar" - Private Sub ToolStripBtNew_Click(sender As System.Object, e As System.EventArgs) Handles ToolStripBtNew.Click + Private Sub ToolStripBtNew_Click(sender As Object, e As EventArgs) Handles ToolStripBtNew.Click newENG() End Sub - Private Sub ToolStripBtOpen_Click(sender As System.Object, e As System.EventArgs) Handles ToolStripBtOpen.Click + Private Sub ToolStripBtOpen_Click(sender As Object, e As EventArgs) Handles ToolStripBtOpen.Click If fbENG.OpenDialog(EngFile) Then openENG(fbENG.Files(0)) End Sub - Private Sub ToolStripBtSave_Click(sender As System.Object, e As System.EventArgs) Handles ToolStripBtSave.Click + Private Sub ToolStripBtSave_Click(sender As Object, e As EventArgs) Handles ToolStripBtSave.Click SaveOrSaveAs(False) End Sub - Private Sub ToolStripBtSaveAs_Click(sender As System.Object, e As System.EventArgs) Handles ToolStripBtSaveAs.Click + Private Sub ToolStripBtSaveAs_Click(sender As Object, e As EventArgs) Handles ToolStripBtSaveAs.Click SaveOrSaveAs(True) End Sub - Private Sub ToolStripBtSendTo_Click(sender As System.Object, e As System.EventArgs) Handles ToolStripBtSendTo.Click + Private Sub ToolStripBtSendTo_Click(sender As Object, e As EventArgs) Handles ToolStripBtSendTo.Click If ChangeCheckCancel() Then Exit Sub @@ -90,13 +100,13 @@ Public Class F_ENG F_VECTO.TbENG.Text = fFileWoDir(EngFile, JobDir) End Sub - Private Sub ToolStripButton1_Click(sender As System.Object, e As System.EventArgs) Handles ToolStripButton1.Click - If IO.File.Exists(MyAppPath & "User Manual\help.html") Then + Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click + If File.Exists(MyAppPath & "User Manual\help.html") Then Dim BrowserRegistryString As String = My.Computer.Registry.ClassesRoot.OpenSubKey("\http\shell\open\command\").GetValue("").ToString Dim DefaultBrowserPath As String = - System.Text.RegularExpressions.Regex.Match(BrowserRegistryString, "(\"".*?\"")").Captures(0).ToString - System.Diagnostics.Process.Start(DefaultBrowserPath, + Regex.Match(BrowserRegistryString, "(\"".*?\"")").Captures(0).ToString + Process.Start(DefaultBrowserPath, String.Format("""{0}{1}""", MyAppPath, "User Manual\help.html#engine-editor")) Else MsgBox("User Manual not found!", MsgBoxStyle.Critical) @@ -154,7 +164,7 @@ Public Class F_ENG Me.Close() F_MAINForm.RbDecl.Checked = Not F_MAINForm.RbDecl.Checked F_MAINForm.OpenVectoFile(file) - Case - 1 + Case -1 Exit Sub Case Else '0 'Continue... @@ -274,39 +284,39 @@ Public Class F_ENG End Function - Private Sub TbName_TextChanged(sender As System.Object, e As System.EventArgs) Handles TbName.TextChanged + Private Sub TbName_TextChanged(sender As Object, e As EventArgs) Handles TbName.TextChanged Change() End Sub - Private Sub TbDispl_TextChanged(sender As System.Object, e As System.EventArgs) Handles TbDispl.TextChanged + Private Sub TbDispl_TextChanged(sender As Object, e As EventArgs) Handles TbDispl.TextChanged Change() DeclInit() End Sub - Private Sub TbInertia_TextChanged(sender As System.Object, e As System.EventArgs) Handles TbInertia.TextChanged + Private Sub TbInertia_TextChanged(sender As Object, e As EventArgs) Handles TbInertia.TextChanged Change() End Sub - Private Sub TbNleerl_TextChanged(sender As System.Object, e As System.EventArgs) Handles TbNleerl.TextChanged + Private Sub TbNleerl_TextChanged(sender As Object, e As EventArgs) Handles TbNleerl.TextChanged UpdatePic() Change() End Sub - Private Sub TbMAP_TextChanged(sender As System.Object, e As System.EventArgs) _ + Private Sub TbMAP_TextChanged(sender As Object, e As EventArgs) _ Handles TbMAP.TextChanged, TbFLD.TextChanged UpdatePic() Change() End Sub - Private Sub TbWHTCurban_TextChanged(sender As System.Object, e As System.EventArgs) Handles TbWHTCurban.TextChanged + Private Sub TbWHTCurban_TextChanged(sender As Object, e As EventArgs) Handles TbWHTCurban.TextChanged Change() End Sub - Private Sub TbWHTCrural_TextChanged(sender As System.Object, e As System.EventArgs) Handles TbWHTCrural.TextChanged + Private Sub TbWHTCrural_TextChanged(sender As Object, e As EventArgs) Handles TbWHTCrural.TextChanged Change() End Sub - Private Sub TbWHTCmw_TextChanged(sender As System.Object, e As System.EventArgs) Handles TbWHTCmw.TextChanged + Private Sub TbWHTCmw_TextChanged(sender As Object, e As EventArgs) Handles TbWHTCmw.TextChanged Change() End Sub @@ -314,19 +324,19 @@ Public Class F_ENG #End Region 'Browse for VMAP file - Private Sub BtMAP_Click(sender As System.Object, e As System.EventArgs) Handles BtMAP.Click + 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)) End Sub 'Open VMAP file - Private Sub BtMAPopen_Click(sender As System.Object, e As System.EventArgs) Handles BtMAPopen.Click + Private Sub BtMAPopen_Click(sender As Object, e As EventArgs) Handles BtMAPopen.Click Dim fldfile As String fldfile = fFileRepl(Me.TbFLD.Text, fPATH(EngFile)) - If fldfile <> sKey.NoFile AndAlso IO.File.Exists(fldfile) Then + If fldfile <> sKey.NoFile AndAlso File.Exists(fldfile) Then OpenFiles(fFileRepl(Me.TbMAP.Text, fPATH(EngFile)), fldfile) Else OpenFiles(fFileRepl(Me.TbMAP.Text, fPATH(EngFile))) @@ -335,12 +345,12 @@ Public Class F_ENG 'Save and close - Private Sub ButOK_Click(sender As System.Object, e As System.EventArgs) Handles ButOK.Click + Private Sub ButOK_Click(sender As Object, e As EventArgs) Handles ButOK.Click If SaveOrSaveAs(False) Then Me.Close() End Sub 'Close without saving (see FormClosing Event) - Private Sub ButCancel_Click(sender As System.Object, e As System.EventArgs) Handles ButCancel.Click + Private Sub ButCancel_Click(sender As Object, e As EventArgs) Handles ButCancel.Click Me.Close() End Sub @@ -350,9 +360,9 @@ Public Class F_ENG Dim mapOK As Boolean = False Dim FLD0 As New cFLD Dim MAP0 As New cMAP - Dim MyChart As System.Windows.Forms.DataVisualization.Charting.Chart - Dim s As System.Windows.Forms.DataVisualization.Charting.Series - Dim a As System.Windows.Forms.DataVisualization.Charting.ChartArea + Dim MyChart As Chart + Dim s As Series + Dim a As ChartArea Dim img As Image Me.PicBox.Image = Nothing @@ -374,25 +384,25 @@ Public Class F_ENG 'Create plot - MyChart = New System.Windows.Forms.DataVisualization.Charting.Chart + MyChart = New Chart MyChart.Width = Me.PicBox.Width MyChart.Height = Me.PicBox.Height - a = New System.Windows.Forms.DataVisualization.Charting.ChartArea + a = New ChartArea If fldOK Then - s = New System.Windows.Forms.DataVisualization.Charting.Series + s = New Series s.Points.DataBindXY(FLD0.LnU, FLD0.LTq) - s.ChartType = DataVisualization.Charting.SeriesChartType.FastLine + s.ChartType = SeriesChartType.FastLine s.BorderWidth = 2 s.Color = Color.DarkBlue s.Name = "Full load (" & fFILE(FLD0.FilePath, True) & ")" MyChart.Series.Add(s) - s = New System.Windows.Forms.DataVisualization.Charting.Series + s = New Series s.Points.DataBindXY(FLD0.LnU, FLD0.LTqDrag) - s.ChartType = DataVisualization.Charting.SeriesChartType.FastLine + s.ChartType = SeriesChartType.FastLine s.BorderWidth = 2 s.Color = Color.Blue s.Name = "Motoring (" & fFILE(FLD0.FilePath, True) & ")" @@ -401,9 +411,9 @@ Public Class F_ENG End If If mapOK Then - s = New System.Windows.Forms.DataVisualization.Charting.Series + s = New Series s.Points.DataBindXY(MAP0.nU, MAP0.Tq) - s.ChartType = DataVisualization.Charting.SeriesChartType.Point + s.ChartType = SeriesChartType.Point s.MarkerSize = 3 s.Color = Color.Red s.Name = "Map" @@ -415,17 +425,17 @@ Public Class F_ENG a.AxisX.Title = "engine speed [1/min]" a.AxisX.TitleFont = New Font("Helvetica", 10) a.AxisX.LabelStyle.Font = New Font("Helvetica", 8) - a.AxisX.LabelAutoFitStyle = DataVisualization.Charting.LabelAutoFitStyles.None - a.AxisX.MajorGrid.LineDashStyle = DataVisualization.Charting.ChartDashStyle.Dot + a.AxisX.LabelAutoFitStyle = LabelAutoFitStyles.None + a.AxisX.MajorGrid.LineDashStyle = ChartDashStyle.Dot a.AxisY.Title = "engine torque [Nm]" a.AxisY.TitleFont = New Font("Helvetica", 10) a.AxisY.LabelStyle.Font = New Font("Helvetica", 8) - a.AxisY.LabelAutoFitStyle = DataVisualization.Charting.LabelAutoFitStyles.None - a.AxisY.MajorGrid.LineDashStyle = DataVisualization.Charting.ChartDashStyle.Dot + a.AxisY.LabelAutoFitStyle = LabelAutoFitStyles.None + a.AxisY.MajorGrid.LineDashStyle = ChartDashStyle.Dot a.AxisX.Minimum = 300 - a.BorderDashStyle = DataVisualization.Charting.ChartDashStyle.Solid + a.BorderDashStyle = ChartDashStyle.Solid a.BorderWidth = 1 a.BackColor = Color.GhostWhite @@ -434,7 +444,7 @@ Public Class F_ENG MyChart.Update() - img = New Bitmap(MyChart.Width, MyChart.Height, Imaging.PixelFormat.Format32bppArgb) + img = New Bitmap(MyChart.Width, MyChart.Height, PixelFormat.Format32bppArgb) MyChart.DrawToBitmap(img, New Rectangle(0, 0, Me.PicBox.Width, Me.PicBox.Height)) @@ -454,19 +464,19 @@ Public Class F_ENG OpenWithToolStripMenuItem.Text = "Open with " & Cfg.OpenCmdName - CmOpenFile.Show(Cursor.Position) + CmOpenFile.Show(Windows.Forms.Cursor.Position) End Sub - Private Sub OpenWithToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) _ + Private Sub OpenWithToolStripMenuItem_Click(sender As Object, e As EventArgs) _ Handles OpenWithToolStripMenuItem.Click If Not FileOpenAlt(CmFiles(0)) Then MsgBox("Failed to open file!") End Sub - Private Sub ShowInFolderToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) _ + Private Sub ShowInFolderToolStripMenuItem_Click(sender As Object, e As EventArgs) _ Handles ShowInFolderToolStripMenuItem.Click - If IO.File.Exists(CmFiles(0)) Then + If File.Exists(CmFiles(0)) Then Try - System.Diagnostics.Process.Start("explorer", "/select,""" & CmFiles(0) & "") + Process.Start("explorer", "/select,""" & CmFiles(0) & "") Catch ex As Exception MsgBox("Failed to open file!") End Try @@ -488,7 +498,7 @@ Public Class F_ENG fldfile = fFileRepl(Me.TbFLD.Text, fPATH(EngFile)) - If fldfile <> sKey.NoFile AndAlso IO.File.Exists(fldfile) Then + If fldfile <> sKey.NoFile AndAlso File.Exists(fldfile) Then OpenFiles(fldfile) End If End Sub diff --git a/VECTO/GUI/F_FileSign.Designer.vb b/VECTO/GUI/F_FileSign.Designer.vb index 86f7c9e621bf0afbb7b65ba7890edac1f3e991e2..fff034502dc0fa5d327bd0ea09325f2b9fa1cce4 100644 --- a/VECTO/GUI/F_FileSign.Designer.vb +++ b/VECTO/GUI/F_FileSign.Designer.vb @@ -8,103 +8,106 @@ ' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ' ' See the LICENSE.txt for the specific language governing permissions and limitations. -<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _ +Imports System.ComponentModel +Imports Microsoft.VisualBasic.CompilerServices + +<DesignerGenerated()> _ Partial Class F_FileSign - Inherits System.Windows.Forms.Form + Inherits Form - 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - <System.Diagnostics.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 + '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 System.ComponentModel.IContainer + '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. - <System.Diagnostics.DebuggerStepThrough()> _ - Private Sub InitializeComponent() - Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(F_FileSign)) - Me.TbSigFile = New System.Windows.Forms.TextBox() - Me.Label1 = New System.Windows.Forms.Label() - Me.BtBrowse = New System.Windows.Forms.Button() - Me.lvFiles = 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.BtSign = New System.Windows.Forms.Button() - Me.BtClose = New System.Windows.Forms.Button() - Me.BtRemFLD = New System.Windows.Forms.Button() - Me.BtAddFLD = New System.Windows.Forms.Button() - Me.GroupBox1 = New System.Windows.Forms.GroupBox() - Me.BtClearList = New System.Windows.Forms.Button() - Me.BtReload = New System.Windows.Forms.Button() - Me.GroupBox2 = New System.Windows.Forms.GroupBox() - Me.LbStatus = New System.Windows.Forms.Label() - Me.LbMode = New System.Windows.Forms.Label() - Me.LbDateStr = New System.Windows.Forms.Label() - Me.TbPubKey = New System.Windows.Forms.TextBox() - Me.TbLicStr = New System.Windows.Forms.TextBox() - Me.Label5 = New System.Windows.Forms.Label() - Me.Label6 = New System.Windows.Forms.Label() - Me.Label3 = New System.Windows.Forms.Label() - Me.Label4 = New System.Windows.Forms.Label() - Me.Label2 = New System.Windows.Forms.Label() + '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() + Dim resources As ComponentResourceManager = New ComponentResourceManager(GetType(F_FileSign)) + Me.TbSigFile = New TextBox() + Me.Label1 = New Label() + Me.BtBrowse = New Button() + Me.lvFiles = New ListView() + Me.ColumnHeader1 = CType(New ColumnHeader(), ColumnHeader) + Me.ColumnHeader2 = CType(New ColumnHeader(), ColumnHeader) + Me.BtSign = New Button() + Me.BtClose = New Button() + Me.BtRemFLD = New Button() + Me.BtAddFLD = New Button() + Me.GroupBox1 = New GroupBox() + Me.BtClearList = New Button() + Me.BtReload = New Button() + Me.GroupBox2 = New GroupBox() + Me.LbStatus = New Label() + Me.LbMode = New Label() + Me.LbDateStr = New Label() + Me.TbPubKey = New TextBox() + Me.TbLicStr = New TextBox() + Me.Label5 = New Label() + Me.Label6 = New Label() + Me.Label3 = New Label() + Me.Label4 = New Label() + Me.Label2 = New Label() Me.GroupBox1.SuspendLayout() Me.GroupBox2.SuspendLayout() Me.SuspendLayout() ' 'TbSigFile ' - Me.TbSigFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.TbSigFile.Location = New System.Drawing.Point(12, 29) + Me.TbSigFile.Anchor = CType(((AnchorStyles.Top Or AnchorStyles.Left) _ + Or AnchorStyles.Right), AnchorStyles) + Me.TbSigFile.Location = New Point(12, 29) Me.TbSigFile.Name = "TbSigFile" - Me.TbSigFile.Size = New System.Drawing.Size(528, 20) + Me.TbSigFile.Size = New Size(528, 20) Me.TbSigFile.TabIndex = 0 ' 'Label1 ' Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(12, 13) + Me.Label1.Location = New Point(12, 13) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(99, 13) + Me.Label1.Size = New Size(99, 13) Me.Label1.TabIndex = 4 Me.Label1.Text = "Signature file (.vsig)" ' 'BtBrowse ' - Me.BtBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.BtBrowse.Image = Global.VECTO.My.Resources.Resources.Open_icon - Me.BtBrowse.Location = New System.Drawing.Point(541, 27) + Me.BtBrowse.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles) + Me.BtBrowse.Image = My.Resources.Resources.Open_icon + Me.BtBrowse.Location = New Point(541, 27) Me.BtBrowse.Name = "BtBrowse" - Me.BtBrowse.Size = New System.Drawing.Size(24, 24) + Me.BtBrowse.Size = New Size(24, 24) Me.BtBrowse.TabIndex = 1 Me.BtBrowse.UseVisualStyleBackColor = True ' 'lvFiles ' - Me.lvFiles.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.lvFiles.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader2}) + Me.lvFiles.Anchor = CType((((AnchorStyles.Top Or AnchorStyles.Bottom) _ + Or AnchorStyles.Left) _ + Or AnchorStyles.Right), AnchorStyles) + Me.lvFiles.Columns.AddRange(New ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader2}) Me.lvFiles.FullRowSelect = True Me.lvFiles.GridLines = True Me.lvFiles.LabelEdit = True - Me.lvFiles.Location = New System.Drawing.Point(6, 19) + Me.lvFiles.Location = New Point(6, 19) Me.lvFiles.MultiSelect = False Me.lvFiles.Name = "lvFiles" - Me.lvFiles.Size = New System.Drawing.Size(565, 368) + Me.lvFiles.Size = New Size(565, 368) Me.lvFiles.TabIndex = 0 Me.lvFiles.UseCompatibleStateImageBehavior = False - Me.lvFiles.View = System.Windows.Forms.View.Details + Me.lvFiles.View = View.Details ' 'ColumnHeader1 ' @@ -118,84 +121,84 @@ Partial Class F_FileSign ' 'BtSign ' - Me.BtSign.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.BtSign.Location = New System.Drawing.Point(12, 638) + Me.BtSign.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles) + Me.BtSign.Location = New Point(12, 638) Me.BtSign.Name = "BtSign" - Me.BtSign.Size = New System.Drawing.Size(126, 23) + Me.BtSign.Size = New Size(126, 23) Me.BtSign.TabIndex = 5 Me.BtSign.Text = "Create Signature File" Me.BtSign.UseVisualStyleBackColor = True ' 'BtClose ' - Me.BtClose.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.BtClose.Location = New System.Drawing.Point(522, 638) + Me.BtClose.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles) + Me.BtClose.Location = New Point(522, 638) Me.BtClose.Name = "BtClose" - Me.BtClose.Size = New System.Drawing.Size(67, 23) + Me.BtClose.Size = New Size(67, 23) Me.BtClose.TabIndex = 6 Me.BtClose.Text = "Close" Me.BtClose.UseVisualStyleBackColor = True ' 'BtRemFLD ' - Me.BtRemFLD.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.BtRemFLD.Image = Global.VECTO.My.Resources.Resources.minus_circle_icon - Me.BtRemFLD.Location = New System.Drawing.Point(29, 387) + Me.BtRemFLD.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles) + Me.BtRemFLD.Image = My.Resources.Resources.minus_circle_icon + Me.BtRemFLD.Location = New Point(29, 387) Me.BtRemFLD.Name = "BtRemFLD" - Me.BtRemFLD.Size = New System.Drawing.Size(24, 24) + Me.BtRemFLD.Size = New Size(24, 24) Me.BtRemFLD.TabIndex = 2 Me.BtRemFLD.UseVisualStyleBackColor = True ' 'BtAddFLD ' - Me.BtAddFLD.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.BtAddFLD.Image = Global.VECTO.My.Resources.Resources.plus_circle_icon - Me.BtAddFLD.Location = New System.Drawing.Point(5, 387) + Me.BtAddFLD.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles) + Me.BtAddFLD.Image = My.Resources.Resources.plus_circle_icon + Me.BtAddFLD.Location = New Point(5, 387) Me.BtAddFLD.Name = "BtAddFLD" - Me.BtAddFLD.Size = New System.Drawing.Size(24, 24) + Me.BtAddFLD.Size = New Size(24, 24) Me.BtAddFLD.TabIndex = 1 Me.BtAddFLD.UseVisualStyleBackColor = True ' 'GroupBox1 ' - Me.GroupBox1.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.GroupBox1.Anchor = CType((((AnchorStyles.Top Or AnchorStyles.Bottom) _ + Or AnchorStyles.Left) _ + Or AnchorStyles.Right), AnchorStyles) Me.GroupBox1.Controls.Add(Me.lvFiles) Me.GroupBox1.Controls.Add(Me.BtClearList) Me.GroupBox1.Controls.Add(Me.BtRemFLD) Me.GroupBox1.Controls.Add(Me.BtAddFLD) - Me.GroupBox1.Location = New System.Drawing.Point(12, 210) + Me.GroupBox1.Location = New Point(12, 210) Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(577, 422) + Me.GroupBox1.Size = New Size(577, 422) Me.GroupBox1.TabIndex = 4 Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Files" ' 'BtClearList ' - Me.BtClearList.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.BtClearList.Location = New System.Drawing.Point(508, 387) + Me.BtClearList.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles) + Me.BtClearList.Location = New Point(508, 387) Me.BtClearList.Name = "BtClearList" - Me.BtClearList.Size = New System.Drawing.Size(63, 24) + Me.BtClearList.Size = New Size(63, 24) Me.BtClearList.TabIndex = 3 Me.BtClearList.Text = "Clear List" Me.BtClearList.UseVisualStyleBackColor = True ' 'BtReload ' - Me.BtReload.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.BtReload.Image = Global.VECTO.My.Resources.Resources.Refresh_icon - Me.BtReload.Location = New System.Drawing.Point(565, 27) + Me.BtReload.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles) + Me.BtReload.Image = My.Resources.Resources.Refresh_icon + Me.BtReload.Location = New Point(565, 27) Me.BtReload.Name = "BtReload" - Me.BtReload.Size = New System.Drawing.Size(24, 24) + Me.BtReload.Size = New Size(24, 24) Me.BtReload.TabIndex = 2 Me.BtReload.UseVisualStyleBackColor = True ' 'GroupBox2 ' - Me.GroupBox2.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.GroupBox2.Anchor = CType(((AnchorStyles.Top Or AnchorStyles.Left) _ + Or AnchorStyles.Right), AnchorStyles) Me.GroupBox2.Controls.Add(Me.LbStatus) Me.GroupBox2.Controls.Add(Me.LbMode) Me.GroupBox2.Controls.Add(Me.LbDateStr) @@ -206,9 +209,9 @@ Partial Class F_FileSign Me.GroupBox2.Controls.Add(Me.Label3) Me.GroupBox2.Controls.Add(Me.Label4) Me.GroupBox2.Controls.Add(Me.Label2) - Me.GroupBox2.Location = New System.Drawing.Point(18, 55) + Me.GroupBox2.Location = New Point(18, 55) Me.GroupBox2.Name = "GroupBox2" - Me.GroupBox2.Size = New System.Drawing.Size(571, 149) + Me.GroupBox2.Size = New Size(571, 149) Me.GroupBox2.TabIndex = 3 Me.GroupBox2.TabStop = False Me.GroupBox2.Text = "File Information" @@ -216,99 +219,99 @@ Partial Class F_FileSign 'LbStatus ' Me.LbStatus.AutoSize = True - Me.LbStatus.Location = New System.Drawing.Point(99, 116) + Me.LbStatus.Location = New Point(99, 116) Me.LbStatus.Name = "LbStatus" - Me.LbStatus.Size = New System.Drawing.Size(0, 13) + Me.LbStatus.Size = New Size(0, 13) Me.LbStatus.TabIndex = 4 ' 'LbMode ' Me.LbMode.AutoSize = True - Me.LbMode.Location = New System.Drawing.Point(99, 87) + Me.LbMode.Location = New Point(99, 87) Me.LbMode.Name = "LbMode" - Me.LbMode.Size = New System.Drawing.Size(0, 13) + Me.LbMode.Size = New Size(0, 13) Me.LbMode.TabIndex = 3 ' 'LbDateStr ' - Me.LbDateStr.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.LbDateStr.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles) Me.LbDateStr.AutoSize = True - Me.LbDateStr.Location = New System.Drawing.Point(415, 87) + Me.LbDateStr.Location = New Point(415, 87) Me.LbDateStr.Name = "LbDateStr" - Me.LbDateStr.Size = New System.Drawing.Size(0, 13) + Me.LbDateStr.Size = New Size(0, 13) Me.LbDateStr.TabIndex = 2 ' 'TbPubKey ' - Me.TbPubKey.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.TbPubKey.Location = New System.Drawing.Point(99, 48) + Me.TbPubKey.Anchor = CType(((AnchorStyles.Top Or AnchorStyles.Left) _ + Or AnchorStyles.Right), AnchorStyles) + Me.TbPubKey.Location = New Point(99, 48) Me.TbPubKey.Name = "TbPubKey" Me.TbPubKey.ReadOnly = True - Me.TbPubKey.Size = New System.Drawing.Size(466, 20) + Me.TbPubKey.Size = New Size(466, 20) Me.TbPubKey.TabIndex = 1 ' 'TbLicStr ' - Me.TbLicStr.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.TbLicStr.Location = New System.Drawing.Point(99, 22) + Me.TbLicStr.Anchor = CType(((AnchorStyles.Top Or AnchorStyles.Left) _ + Or AnchorStyles.Right), AnchorStyles) + Me.TbLicStr.Location = New Point(99, 22) Me.TbLicStr.Name = "TbLicStr" Me.TbLicStr.ReadOnly = True - Me.TbLicStr.Size = New System.Drawing.Size(466, 20) + Me.TbLicStr.Size = New Size(466, 20) Me.TbLicStr.TabIndex = 0 ' 'Label5 ' Me.Label5.AutoSize = True - Me.Label5.Location = New System.Drawing.Point(33, 51) + Me.Label5.Location = New Point(33, 51) Me.Label5.Name = "Label5" - Me.Label5.Size = New System.Drawing.Size(60, 13) + Me.Label5.Size = New Size(60, 13) Me.Label5.TabIndex = 0 Me.Label5.Text = "Public Key:" ' 'Label6 ' Me.Label6.AutoSize = True - Me.Label6.Location = New System.Drawing.Point(53, 116) + Me.Label6.Location = New Point(53, 116) Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(40, 13) + Me.Label6.Size = New Size(40, 13) Me.Label6.TabIndex = 0 Me.Label6.Text = "Status:" ' 'Label3 ' Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(56, 87) + Me.Label3.Location = New Point(56, 87) Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(37, 13) + Me.Label3.Size = New Size(37, 13) Me.Label3.TabIndex = 0 Me.Label3.Text = "Mode:" ' 'Label4 ' - Me.Label4.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Label4.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles) Me.Label4.AutoSize = True - Me.Label4.Location = New System.Drawing.Point(334, 87) + Me.Label4.Location = New Point(334, 87) Me.Label4.Name = "Label4" - Me.Label4.Size = New System.Drawing.Size(75, 13) + Me.Label4.Size = New Size(75, 13) Me.Label4.TabIndex = 0 Me.Label4.Text = "Creation Time:" ' 'Label2 ' Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(12, 25) + Me.Label2.Location = New Point(12, 25) Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(81, 13) + Me.Label2.Size = New Size(81, 13) Me.Label2.TabIndex = 0 Me.Label2.Text = "License Owner:" ' 'F_FileSign ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(601, 673) + Me.AutoScaleDimensions = New SizeF(6.0!, 13.0!) + Me.AutoScaleMode = AutoScaleMode.Font + Me.ClientSize = New Size(601, 673) Me.Controls.Add(Me.GroupBox2) Me.Controls.Add(Me.BtReload) Me.Controls.Add(Me.GroupBox1) @@ -317,13 +320,13 @@ Partial Class F_FileSign Me.Controls.Add(Me.BtBrowse) Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.TbSigFile) - Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) + Me.Icon = CType(resources.GetObject("$this.Icon"), Icon) Me.MaximizeBox = False Me.MinimizeBox = False - Me.MinimumSize = New System.Drawing.Size(480, 400) + Me.MinimumSize = New Size(480, 400) Me.Name = "F_FileSign" - Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Show - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent + Me.SizeGripStyle = SizeGripStyle.Show + Me.StartPosition = FormStartPosition.CenterParent Me.Text = "Sign & Verify Files" Me.GroupBox1.ResumeLayout(False) Me.GroupBox2.ResumeLayout(False) @@ -332,29 +335,29 @@ Partial Class F_FileSign Me.PerformLayout() End Sub - Friend WithEvents TbSigFile As System.Windows.Forms.TextBox - Friend WithEvents Label1 As System.Windows.Forms.Label - Friend WithEvents BtBrowse As System.Windows.Forms.Button - Friend WithEvents lvFiles As System.Windows.Forms.ListView - Friend WithEvents ColumnHeader1 As System.Windows.Forms.ColumnHeader - Friend WithEvents ColumnHeader2 As System.Windows.Forms.ColumnHeader - Friend WithEvents BtSign As System.Windows.Forms.Button - Friend WithEvents BtClose As System.Windows.Forms.Button - Friend WithEvents BtRemFLD As System.Windows.Forms.Button - Friend WithEvents BtAddFLD As System.Windows.Forms.Button - Friend WithEvents GroupBox1 As System.Windows.Forms.GroupBox - Friend WithEvents BtClearList As System.Windows.Forms.Button - Friend WithEvents BtReload As System.Windows.Forms.Button - Friend WithEvents GroupBox2 As System.Windows.Forms.GroupBox - Friend WithEvents Label3 As System.Windows.Forms.Label - Friend WithEvents Label4 As System.Windows.Forms.Label - Friend WithEvents Label2 As System.Windows.Forms.Label - Friend WithEvents LbMode As System.Windows.Forms.Label - Friend WithEvents LbDateStr As System.Windows.Forms.Label - Friend WithEvents TbPubKey As System.Windows.Forms.TextBox - Friend WithEvents TbLicStr As System.Windows.Forms.TextBox - Friend WithEvents Label5 As System.Windows.Forms.Label - Friend WithEvents LbStatus As System.Windows.Forms.Label - Friend WithEvents Label6 As System.Windows.Forms.Label + Friend WithEvents TbSigFile As TextBox + Friend WithEvents Label1 As Label + Friend WithEvents BtBrowse As Button + Friend WithEvents lvFiles As ListView + Friend WithEvents ColumnHeader1 As ColumnHeader + Friend WithEvents ColumnHeader2 As ColumnHeader + Friend WithEvents BtSign As Button + Friend WithEvents BtClose As Button + Friend WithEvents BtRemFLD As Button + Friend WithEvents BtAddFLD As Button + Friend WithEvents GroupBox1 As GroupBox + Friend WithEvents BtClearList As Button + Friend WithEvents BtReload As Button + Friend WithEvents GroupBox2 As GroupBox + Friend WithEvents Label3 As Label + Friend WithEvents Label4 As Label + Friend WithEvents Label2 As Label + Friend WithEvents LbMode As Label + Friend WithEvents LbDateStr As Label + Friend WithEvents TbPubKey As TextBox + Friend WithEvents TbLicStr As TextBox + Friend WithEvents Label5 As Label + Friend WithEvents LbStatus As Label + Friend WithEvents Label6 As Label End Class diff --git a/VECTO/GUI/F_FileSign.vb b/VECTO/GUI/F_FileSign.vb index 4a93a9ee57e52b1422fc2ae3db9ab25ba2eb5ef3..791ddac4d75a13ee0f1e1d2c11bba7daa080fd59 100644 --- a/VECTO/GUI/F_FileSign.vb +++ b/VECTO/GUI/F_FileSign.vb @@ -8,225 +8,219 @@ ' 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.IO Imports System.Windows.Forms +Imports TUGraz.VECTO.File_Browser +Imports vectolic ''' <summary> ''' Create/Verify signature files (.vsig). ''' </summary> ''' <remarks></remarks> Public Class F_FileSign - - 'Create signature file - Private Sub BtSign_Click(sender As System.Object, e As System.EventArgs) Handles BtSign.Click - Dim lv0 As ListViewItem - Dim MainDir As String - - If Me.lvFiles.Items.Count = 0 Then - MsgBox("No files selected!", MsgBoxStyle.Critical) - Exit Sub - End If - - If Trim(Me.TbSigFile.Text) = "" Then - MsgBox("No signature file path defined!", MsgBoxStyle.Critical) - Exit Sub - End If - - If IO.File.Exists(Me.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) - - - Lic.FileSigning.NewFile() - Lic.FileSigning.Mode = vectolic.cFileSigning.tMode.Manual - - - For Each lv0 In Me.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 - Else - Me.LbStatus.Text = "Fail to create signature file! " & Lic.FileSigning.ErrorMsg - Me.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 - - If Lic.FileSigning.FilesOK.Count > 0 Then - For Each lv0 In Me.lvFiles.Items - lv0.SubItems(1).Text = Lic.FileSigning.FilesMsg(lv0.Index) - If Lic.FileSigning.FilesOK(lv0.Index) Then - lv0.ForeColor = Color.DarkGreen - Else - lv0.ForeColor = Color.Red - Exit For - End If - Next - End If - - - End Sub - - 'Verify existing signature file - Public Sub VerifySigFile() - Dim lv0 As ListViewItem - Dim i As Integer - - If Not IO.File.Exists(Me.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 - Else - Me.LbStatus.Text = "ERROR! " & Lic.FileSigning.ErrorMsg - Me.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) - If Lic.FileSigning.Mode = vectolic.cFileSigning.tMode.Auto Then - Me.LbMode.ForeColor = Color.DarkGreen - Else - Me.LbMode.ForeColor = Color.Red - End If - Me.LbDateStr.Text = Lic.FileSigning.DateStr - - For i = 0 To Lic.FileSigning.FilesOK.Count - 1 - lv0 = New ListViewItem(Lic.FileSigning.Files(i)) - lv0.SubItems.Add(Lic.FileSigning.FilesMsg(i)) - If Lic.FileSigning.FilesOK(i) Then - lv0.ForeColor = Color.DarkGreen - Else - lv0.ForeColor = Color.Red - End If - Me.lvFiles.Items.Add(lv0) - Next - - End Sub - - '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 = Control.DefaultForeColor - Me.LbMode.BackColor = Control.DefaultBackColor - Me.LbStatus.ForeColor = Control.DefaultForeColor - Me.LbStatus.BackColor = Control.DefaultBackColor - End Sub + 'Create signature file + Private Sub BtSign_Click(sender As Object, e As EventArgs) Handles BtSign.Click + Dim lv0 As ListViewItem + Dim MainDir As String + + If Me.lvFiles.Items.Count = 0 Then + MsgBox("No files selected!", MsgBoxStyle.Critical) + Exit Sub + End If + + If Trim(Me.TbSigFile.Text) = "" Then + MsgBox("No signature file path defined!", MsgBoxStyle.Critical) + Exit Sub + End If + + If File.Exists(Me.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) + + + Lic.FileSigning.NewFile() + Lic.FileSigning.Mode = cFileSigning.tMode.Manual + + + For Each lv0 In Me.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 + Else + Me.LbStatus.Text = "Fail to create signature file! " & Lic.FileSigning.ErrorMsg + Me.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 + + If Lic.FileSigning.FilesOK.Count > 0 Then + For Each lv0 In Me.lvFiles.Items + lv0.SubItems(1).Text = Lic.FileSigning.FilesMsg(lv0.Index) + If Lic.FileSigning.FilesOK(lv0.Index) Then + lv0.ForeColor = Color.DarkGreen + Else + lv0.ForeColor = Color.Red + Exit For + End If + Next + End If + End Sub + + 'Verify existing signature file + Public Sub VerifySigFile() + Dim lv0 As ListViewItem + Dim i As Integer + + If Not File.Exists(Me.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 + Else + Me.LbStatus.Text = "ERROR! " & Lic.FileSigning.ErrorMsg + Me.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) + If Lic.FileSigning.Mode = cFileSigning.tMode.Auto Then + Me.LbMode.ForeColor = Color.DarkGreen + Else + Me.LbMode.ForeColor = Color.Red + End If + Me.LbDateStr.Text = Lic.FileSigning.DateStr + + For i = 0 To Lic.FileSigning.FilesOK.Count - 1 + lv0 = New ListViewItem(Lic.FileSigning.Files(i)) + lv0.SubItems.Add(Lic.FileSigning.FilesMsg(i)) + If Lic.FileSigning.FilesOK(i) Then + lv0.ForeColor = Color.DarkGreen + Else + lv0.ForeColor = Color.Red + End If + Me.lvFiles.Items.Add(lv0) + Next + End Sub + + '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 + End Sub #Region "GUI Controls" - Private Sub BtBrowse_Click(sender As System.Object, e As System.EventArgs) Handles BtBrowse.Click - 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) - End If + Private Sub BtBrowse_Click(sender As Object, e As EventArgs) Handles BtBrowse.Click + Dim fb As New cFileBrowser("sig", False, True) + fb.Extensions = New String() {"vsig"} - If IO.File.Exists(Me.TbSigFile.Text) Then - VerifySigFile() - End If + If fb.CustomDialog(Me.TbSigFile.Text, False, False, tFbExtMode.ForceExt, False, "vsig") Then + Me.TbSigFile.Text = fb.Files(0) + End If - End Sub + If File.Exists(Me.TbSigFile.Text) Then + VerifySigFile() + End If + End Sub - Private Sub BtAddFLD_Click(sender As System.Object, e As System.EventArgs) Handles BtAddFLD.Click - AddFile() - End Sub + Private Sub BtAddFLD_Click(sender As Object, e As EventArgs) Handles BtAddFLD.Click + AddFile() + End Sub - Private Sub BtRemFLD_Click(sender As System.Object, e As System.EventArgs) Handles BtRemFLD.Click - RemoveFile() - End Sub + Private Sub BtRemFLD_Click(sender As Object, e As EventArgs) Handles BtRemFLD.Click + RemoveFile() + End Sub - Private Sub BtClose_Click(sender As System.Object, e As System.EventArgs) Handles BtClose.Click - Me.Close() - End Sub + Private Sub BtClose_Click(sender As Object, e As EventArgs) Handles BtClose.Click + Me.Close() + End Sub - Private Sub BtClearList_Click(sender As System.Object, e As System.EventArgs) Handles BtClearList.Click - Me.lvFiles.Items.Clear() - End Sub + Private Sub BtClearList_Click(sender As Object, e As EventArgs) Handles BtClearList.Click + Me.lvFiles.Items.Clear() + End Sub - Private Sub BtReload_Click(sender As System.Object, e As System.EventArgs) Handles BtReload.Click - VerifySigFile() - End Sub + Private Sub BtReload_Click(sender As Object, e As EventArgs) Handles BtReload.Click + VerifySigFile() + End Sub - Private Sub lvFiles_KeyDown(sender As Object, e As System.Windows.Forms.KeyEventArgs) Handles lvFiles.KeyDown - Select Case e.KeyCode - Case Keys.Delete, Keys.Back - RemoveFile() - End Select - End Sub + Private Sub lvFiles_KeyDown(sender As Object, e As KeyEventArgs) Handles lvFiles.KeyDown + Select Case e.KeyCode + Case Keys.Delete, Keys.Back + RemoveFile() + End Select + End Sub #End Region - 'Add File - Private Sub AddFile() - Dim lvi As ListViewItem - Dim fb As New cFileBrowser("xxx", False, True) - Dim str As String - - If fb.OpenDialog("", True) Then - - For Each str In fb.Files - - lvi = New ListViewItem(str) - lvi.SubItems.Add("") - lvi.ForeColor = Color.Black - - Me.lvFiles.Items.Add(lvi) - lvi.EnsureVisible() + 'Add File + Private Sub AddFile() + Dim lvi As ListViewItem + Dim fb As New cFileBrowser("xxx", False, True) + Dim str As String - Me.lvFiles.Focus() + If fb.OpenDialog("", True) Then - Next + For Each str In fb.Files - End If + lvi = New ListViewItem(str) + lvi.SubItems.Add("") + lvi.ForeColor = Color.Black - End Sub + Me.lvFiles.Items.Add(lvi) + lvi.EnsureVisible() - 'Remove File - Private Sub RemoveFile() - Dim i0 As Int16 + Me.lvFiles.Focus() - If Me.lvFiles.Items.Count = 0 Then Exit Sub + Next - If Me.lvFiles.SelectedItems.Count = 0 Then Me.lvFiles.Items(Me.lvFiles.Items.Count - 1).Selected = True + End If + End Sub - i0 = Me.lvFiles.SelectedItems(0).Index + 'Remove File + Private Sub RemoveFile() + Dim i0 As Int16 - Me.lvFiles.SelectedItems(0).Remove() + If Me.lvFiles.Items.Count = 0 Then Exit Sub - If i0 < Me.lvFiles.Items.Count Then - Me.lvFiles.Items(i0).Selected = True - Me.lvFiles.Items(i0).EnsureVisible() - End If + If Me.lvFiles.SelectedItems.Count = 0 Then Me.lvFiles.Items(Me.lvFiles.Items.Count - 1).Selected = True - Me.lvFiles.Focus() + i0 = Me.lvFiles.SelectedItems(0).Index - End Sub + Me.lvFiles.SelectedItems(0).Remove() + If i0 < Me.lvFiles.Items.Count Then + Me.lvFiles.Items(i0).Selected = True + Me.lvFiles.Items(i0).EnsureVisible() + End If + Me.lvFiles.Focus() + End Sub End Class diff --git a/VECTO/GUI/F_GBX.Designer.vb b/VECTO/GUI/F_GBX.Designer.vb index db02054df92c0b76a732482cad234ebecb9bfe43..f0e4afe8316310a120d04e10a7b7ae7581c30099 100644 --- a/VECTO/GUI/F_GBX.Designer.vb +++ b/VECTO/GUI/F_GBX.Designer.vb @@ -8,120 +8,123 @@ ' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ' ' See the LICENSE.txt for the specific language governing permissions and limitations. -<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _ +Imports System.ComponentModel +Imports Microsoft.VisualBasic.CompilerServices + +<DesignerGenerated()> _ Partial Class F_GBX - Inherits System.Windows.Forms.Form + Inherits Form - 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - <System.Diagnostics.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 + '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 System.ComponentModel.IContainer + '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. - <System.Diagnostics.DebuggerStepThrough()> _ - Private Sub InitializeComponent() - Me.components = New System.ComponentModel.Container() - Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(F_GBX)) - Me.ToolStrip1 = New System.Windows.Forms.ToolStrip() - Me.ToolStripBtNew = New System.Windows.Forms.ToolStripButton() - Me.ToolStripBtOpen = New System.Windows.Forms.ToolStripButton() - Me.ToolStripBtSave = New System.Windows.Forms.ToolStripButton() - Me.ToolStripBtSaveAs = New System.Windows.Forms.ToolStripButton() - Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator() - Me.ToolStripBtSendTo = New System.Windows.Forms.ToolStripButton() - Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator() - Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton() - Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() - Me.LbStatus = New System.Windows.Forms.ToolStripStatusLabel() - Me.ButCancel = New System.Windows.Forms.Button() - Me.ButOK = New System.Windows.Forms.Button() - Me.TbTracInt = New System.Windows.Forms.TextBox() - Me.LvGears = 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.ColumnHeader5 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) - Me.ColumnHeader6 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) - Me.TBI_getr = New System.Windows.Forms.TextBox() - Me.Label49 = New System.Windows.Forms.Label() - Me.Label33 = New System.Windows.Forms.Label() - Me.Label48 = New System.Windows.Forms.Label() - Me.Label6 = New System.Windows.Forms.Label() - Me.Label3 = New System.Windows.Forms.Label() - Me.TbName = New System.Windows.Forms.TextBox() - Me.PictureBox1 = New System.Windows.Forms.PictureBox() - Me.BtRemGear = New System.Windows.Forms.Button() - Me.GrGearShift = New System.Windows.Forms.GroupBox() - Me.GroupBox1 = New System.Windows.Forms.GroupBox() - Me.tbUpshiftMinAcceleration = New System.Windows.Forms.TextBox() - Me.tbUpshiftAfterDownshift = New System.Windows.Forms.TextBox() - Me.tbDownshiftAfterUpshift = New System.Windows.Forms.TextBox() - Me.Label24 = New System.Windows.Forms.Label() - Me.Label23 = New System.Windows.Forms.Label() - Me.Label22 = New System.Windows.Forms.Label() - Me.Label21 = New System.Windows.Forms.Label() - Me.Label20 = New System.Windows.Forms.Label() - Me.Label19 = New System.Windows.Forms.Label() - Me.PnTorqRes = New System.Windows.Forms.Panel() - Me.Label2 = New System.Windows.Forms.Label() - Me.Label4 = New System.Windows.Forms.Label() - Me.TbTqResv = New System.Windows.Forms.TextBox() - Me.ChShiftInside = New System.Windows.Forms.CheckBox() - Me.TbShiftTime = New System.Windows.Forms.TextBox() - Me.Label12 = New System.Windows.Forms.Label() - Me.Label13 = New System.Windows.Forms.Label() - Me.ChSkipGears = New System.Windows.Forms.CheckBox() - Me.GroupBox2 = New System.Windows.Forms.GroupBox() - Me.TbStartAcc = New System.Windows.Forms.TextBox() - Me.Label11 = New System.Windows.Forms.Label() - Me.TbStartSpeed = New System.Windows.Forms.TextBox() - Me.Label9 = New System.Windows.Forms.Label() - Me.Label10 = New System.Windows.Forms.Label() - Me.TbTqResvStart = New System.Windows.Forms.TextBox() - Me.Label8 = New System.Windows.Forms.Label() - Me.Label5 = New System.Windows.Forms.Label() - Me.Label7 = New System.Windows.Forms.Label() - Me.CmOpenFile = New System.Windows.Forms.ContextMenuStrip(Me.components) - Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.GroupBox3 = New System.Windows.Forms.GroupBox() - Me.PnTC = New System.Windows.Forms.Panel() - Me.Label17 = New System.Windows.Forms.Label() - Me.Label18 = New System.Windows.Forms.Label() - Me.Label15 = New System.Windows.Forms.Label() - Me.TbTCinertia = New System.Windows.Forms.TextBox() - Me.Label1 = New System.Windows.Forms.Label() - Me.Label14 = New System.Windows.Forms.Label() - Me.BtTCfileBrowse = New System.Windows.Forms.Button() - Me.TbTCfile = New System.Windows.Forms.TextBox() - Me.BtTCfileOpen = New System.Windows.Forms.Button() - Me.TbTCrefrpm = New System.Windows.Forms.TextBox() - Me.ChTCon = New System.Windows.Forms.CheckBox() - Me.Label16 = New System.Windows.Forms.Label() - Me.CbGStype = New System.Windows.Forms.ComboBox() - Me.BtAddGear = New System.Windows.Forms.Button() - Me.GroupBox4 = New System.Windows.Forms.GroupBox() - Me.Label32 = New System.Windows.Forms.Label() - Me.PnInertiaTI = New System.Windows.Forms.Panel() - Me.PicBox = New System.Windows.Forms.PictureBox() - Me.TBTCShiftPolygon = New System.Windows.Forms.TextBox() - Me.LblTCShiftFile = New System.Windows.Forms.Label() - Me.BtTCShiftFileBrowse = New System.Windows.Forms.Button() + '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() + Dim resources As ComponentResourceManager = New ComponentResourceManager(GetType(F_GBX)) + Me.ToolStrip1 = New ToolStrip() + Me.ToolStripBtNew = New ToolStripButton() + Me.ToolStripBtOpen = New ToolStripButton() + Me.ToolStripBtSave = New ToolStripButton() + Me.ToolStripBtSaveAs = New ToolStripButton() + Me.ToolStripSeparator3 = New ToolStripSeparator() + Me.ToolStripBtSendTo = New ToolStripButton() + Me.ToolStripSeparator1 = New ToolStripSeparator() + Me.ToolStripButton1 = New ToolStripButton() + Me.StatusStrip1 = New StatusStrip() + Me.LbStatus = New ToolStripStatusLabel() + Me.ButCancel = New Button() + Me.ButOK = New Button() + Me.TbTracInt = New TextBox() + Me.LvGears = New ListView() + Me.ColumnHeader1 = CType(New ColumnHeader(), ColumnHeader) + Me.ColumnHeader2 = CType(New ColumnHeader(), ColumnHeader) + Me.ColumnHeader3 = CType(New ColumnHeader(), ColumnHeader) + Me.ColumnHeader5 = CType(New ColumnHeader(), ColumnHeader) + Me.ColumnHeader6 = CType(New ColumnHeader(), ColumnHeader) + Me.TBI_getr = New TextBox() + Me.Label49 = New Label() + Me.Label33 = New Label() + Me.Label48 = New Label() + Me.Label6 = New Label() + Me.Label3 = New Label() + Me.TbName = New TextBox() + Me.PictureBox1 = New PictureBox() + Me.BtRemGear = New Button() + Me.GrGearShift = New GroupBox() + Me.GroupBox1 = New GroupBox() + Me.tbUpshiftMinAcceleration = New TextBox() + Me.tbUpshiftAfterDownshift = New TextBox() + Me.tbDownshiftAfterUpshift = New TextBox() + Me.Label24 = New Label() + Me.Label23 = New Label() + Me.Label22 = New Label() + Me.Label21 = New Label() + Me.Label20 = New Label() + Me.Label19 = New Label() + Me.PnTorqRes = New Panel() + Me.Label2 = New Label() + Me.Label4 = New Label() + Me.TbTqResv = New TextBox() + Me.ChShiftInside = New CheckBox() + Me.TbShiftTime = New TextBox() + Me.Label12 = New Label() + Me.Label13 = New Label() + Me.ChSkipGears = New CheckBox() + Me.GroupBox2 = New GroupBox() + Me.TbStartAcc = New TextBox() + Me.Label11 = New Label() + Me.TbStartSpeed = New TextBox() + Me.Label9 = New Label() + Me.Label10 = New Label() + Me.TbTqResvStart = New TextBox() + Me.Label8 = New Label() + Me.Label5 = New Label() + Me.Label7 = New Label() + Me.CmOpenFile = New ContextMenuStrip(Me.components) + Me.OpenWithToolStripMenuItem = New ToolStripMenuItem() + Me.ShowInFolderToolStripMenuItem = New ToolStripMenuItem() + Me.GroupBox3 = New GroupBox() + Me.PnTC = New Panel() + Me.Label17 = New Label() + Me.Label18 = New Label() + Me.Label15 = New Label() + Me.TbTCinertia = New TextBox() + Me.Label1 = New Label() + Me.Label14 = New Label() + Me.BtTCfileBrowse = New Button() + Me.TbTCfile = New TextBox() + Me.BtTCfileOpen = New Button() + Me.TbTCrefrpm = New TextBox() + Me.ChTCon = New CheckBox() + Me.Label16 = New Label() + Me.CbGStype = New ComboBox() + Me.BtAddGear = New Button() + Me.GroupBox4 = New GroupBox() + Me.Label32 = New Label() + Me.PnInertiaTI = New Panel() + Me.PicBox = New PictureBox() + Me.TBTCShiftPolygon = New TextBox() + Me.LblTCShiftFile = New Label() + Me.BtTCShiftFileBrowse = New Button() Me.ToolStrip1.SuspendLayout() Me.StatusStrip1.SuspendLayout() - CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PictureBox1, ISupportInitialize).BeginInit() Me.GrGearShift.SuspendLayout() Me.GroupBox1.SuspendLayout() Me.PnTorqRes.SuspendLayout() @@ -131,94 +134,94 @@ Partial Class F_GBX Me.PnTC.SuspendLayout() Me.GroupBox4.SuspendLayout() Me.PnInertiaTI.SuspendLayout() - CType(Me.PicBox, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PicBox, ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'ToolStrip1 ' - Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden - Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator3, Me.ToolStripBtSendTo, Me.ToolStripSeparator1, Me.ToolStripButton1}) - Me.ToolStrip1.Location = New System.Drawing.Point(0, 0) + Me.ToolStrip1.GripStyle = ToolStripGripStyle.Hidden + Me.ToolStrip1.Items.AddRange(New ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator3, Me.ToolStripBtSendTo, Me.ToolStripSeparator1, Me.ToolStripButton1}) + Me.ToolStrip1.Location = New Point(0, 0) Me.ToolStrip1.Name = "ToolStrip1" - Me.ToolStrip1.Size = New System.Drawing.Size(877, 25) + Me.ToolStrip1.Size = New Size(877, 25) Me.ToolStrip1.TabIndex = 30 Me.ToolStrip1.Text = "ToolStrip1" ' 'ToolStripBtNew ' - Me.ToolStripBtNew.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripBtNew.Image = Global.VECTO.My.Resources.Resources.blue_document_icon - Me.ToolStripBtNew.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripBtNew.DisplayStyle = ToolStripItemDisplayStyle.Image + Me.ToolStripBtNew.Image = My.Resources.Resources.blue_document_icon + Me.ToolStripBtNew.ImageTransparentColor = Color.Magenta Me.ToolStripBtNew.Name = "ToolStripBtNew" - Me.ToolStripBtNew.Size = New System.Drawing.Size(23, 22) + Me.ToolStripBtNew.Size = New Size(23, 22) Me.ToolStripBtNew.Text = "ToolStripButton1" Me.ToolStripBtNew.ToolTipText = "New" ' 'ToolStripBtOpen ' - Me.ToolStripBtOpen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripBtOpen.Image = Global.VECTO.My.Resources.Resources.Open_icon - Me.ToolStripBtOpen.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripBtOpen.DisplayStyle = ToolStripItemDisplayStyle.Image + Me.ToolStripBtOpen.Image = My.Resources.Resources.Open_icon + Me.ToolStripBtOpen.ImageTransparentColor = Color.Magenta Me.ToolStripBtOpen.Name = "ToolStripBtOpen" - Me.ToolStripBtOpen.Size = New System.Drawing.Size(23, 22) + Me.ToolStripBtOpen.Size = New Size(23, 22) Me.ToolStripBtOpen.Text = "ToolStripButton1" Me.ToolStripBtOpen.ToolTipText = "Open..." ' 'ToolStripBtSave ' - Me.ToolStripBtSave.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripBtSave.Image = Global.VECTO.My.Resources.Resources.Actions_document_save_icon - Me.ToolStripBtSave.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripBtSave.DisplayStyle = ToolStripItemDisplayStyle.Image + Me.ToolStripBtSave.Image = My.Resources.Resources.Actions_document_save_icon + Me.ToolStripBtSave.ImageTransparentColor = Color.Magenta Me.ToolStripBtSave.Name = "ToolStripBtSave" - Me.ToolStripBtSave.Size = New System.Drawing.Size(23, 22) + Me.ToolStripBtSave.Size = New Size(23, 22) Me.ToolStripBtSave.Text = "ToolStripButton1" Me.ToolStripBtSave.ToolTipText = "Save" ' 'ToolStripBtSaveAs ' - Me.ToolStripBtSaveAs.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripBtSaveAs.Image = Global.VECTO.My.Resources.Resources.Actions_document_save_as_icon - Me.ToolStripBtSaveAs.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripBtSaveAs.DisplayStyle = ToolStripItemDisplayStyle.Image + Me.ToolStripBtSaveAs.Image = My.Resources.Resources.Actions_document_save_as_icon + Me.ToolStripBtSaveAs.ImageTransparentColor = Color.Magenta Me.ToolStripBtSaveAs.Name = "ToolStripBtSaveAs" - Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(23, 22) + Me.ToolStripBtSaveAs.Size = New Size(23, 22) Me.ToolStripBtSaveAs.Text = "ToolStripButton1" Me.ToolStripBtSaveAs.ToolTipText = "Save As..." ' 'ToolStripSeparator3 ' Me.ToolStripSeparator3.Name = "ToolStripSeparator3" - Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 25) + Me.ToolStripSeparator3.Size = New Size(6, 25) ' 'ToolStripBtSendTo ' - Me.ToolStripBtSendTo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripBtSendTo.Image = Global.VECTO.My.Resources.Resources.export_icon - Me.ToolStripBtSendTo.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripBtSendTo.DisplayStyle = ToolStripItemDisplayStyle.Image + Me.ToolStripBtSendTo.Image = My.Resources.Resources.export_icon + Me.ToolStripBtSendTo.ImageTransparentColor = Color.Magenta Me.ToolStripBtSendTo.Name = "ToolStripBtSendTo" - Me.ToolStripBtSendTo.Size = New System.Drawing.Size(23, 22) + Me.ToolStripBtSendTo.Size = New Size(23, 22) Me.ToolStripBtSendTo.Text = "Send to Job Editor" Me.ToolStripBtSendTo.ToolTipText = "Send to Job Editor" ' 'ToolStripSeparator1 ' Me.ToolStripSeparator1.Name = "ToolStripSeparator1" - Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 25) + Me.ToolStripSeparator1.Size = New Size(6, 25) ' 'ToolStripButton1 ' - Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripButton1.Image = Global.VECTO.My.Resources.Resources.Help_icon - Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripButton1.DisplayStyle = ToolStripItemDisplayStyle.Image + Me.ToolStripButton1.Image = My.Resources.Resources.Help_icon + Me.ToolStripButton1.ImageTransparentColor = Color.Magenta Me.ToolStripButton1.Name = "ToolStripButton1" - Me.ToolStripButton1.Size = New System.Drawing.Size(23, 22) + Me.ToolStripButton1.Size = New Size(23, 22) Me.ToolStripButton1.Text = "Help" ' 'StatusStrip1 ' - Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LbStatus}) - Me.StatusStrip1.Location = New System.Drawing.Point(0, 684) + Me.StatusStrip1.Items.AddRange(New ToolStripItem() {Me.LbStatus}) + Me.StatusStrip1.Location = New Point(0, 684) Me.StatusStrip1.Name = "StatusStrip1" - Me.StatusStrip1.Size = New System.Drawing.Size(877, 22) + Me.StatusStrip1.Size = New Size(877, 22) Me.StatusStrip1.SizingGrip = False Me.StatusStrip1.TabIndex = 37 Me.StatusStrip1.Text = "StatusStrip1" @@ -226,51 +229,51 @@ Partial Class F_GBX 'LbStatus ' Me.LbStatus.Name = "LbStatus" - Me.LbStatus.Size = New System.Drawing.Size(39, 17) + Me.LbStatus.Size = New Size(39, 17) Me.LbStatus.Text = "Status" ' 'ButCancel ' - Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.ButCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel - Me.ButCancel.Location = New System.Drawing.Point(790, 658) + Me.ButCancel.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles) + Me.ButCancel.DialogResult = DialogResult.Cancel + Me.ButCancel.Location = New Point(790, 658) Me.ButCancel.Name = "ButCancel" - Me.ButCancel.Size = New System.Drawing.Size(75, 23) + Me.ButCancel.Size = New Size(75, 23) Me.ButCancel.TabIndex = 7 Me.ButCancel.Text = "Cancel" Me.ButCancel.UseVisualStyleBackColor = True ' 'ButOK ' - Me.ButOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.ButOK.Location = New System.Drawing.Point(709, 658) + Me.ButOK.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles) + Me.ButOK.Location = New Point(709, 658) Me.ButOK.Name = "ButOK" - Me.ButOK.Size = New System.Drawing.Size(75, 23) + Me.ButOK.Size = New Size(75, 23) Me.ButOK.TabIndex = 6 Me.ButOK.Text = "Save" Me.ButOK.UseVisualStyleBackColor = True ' 'TbTracInt ' - Me.TbTracInt.Location = New System.Drawing.Point(303, 3) + Me.TbTracInt.Location = New Point(303, 3) Me.TbTracInt.Name = "TbTracInt" - Me.TbTracInt.Size = New System.Drawing.Size(40, 20) + Me.TbTracInt.Size = New Size(40, 20) Me.TbTracInt.TabIndex = 1 ' 'LvGears ' - Me.LvGears.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader2, Me.ColumnHeader3, Me.ColumnHeader5, Me.ColumnHeader6}) + Me.LvGears.Columns.AddRange(New ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader2, Me.ColumnHeader3, Me.ColumnHeader5, Me.ColumnHeader6}) Me.LvGears.FullRowSelect = True Me.LvGears.GridLines = True Me.LvGears.HideSelection = False - Me.LvGears.Location = New System.Drawing.Point(6, 18) + Me.LvGears.Location = New Point(6, 18) Me.LvGears.MultiSelect = False Me.LvGears.Name = "LvGears" - Me.LvGears.Size = New System.Drawing.Size(429, 183) + Me.LvGears.Size = New Size(429, 183) Me.LvGears.TabIndex = 0 Me.LvGears.TabStop = False Me.LvGears.UseCompatibleStateImageBehavior = False - Me.LvGears.View = System.Windows.Forms.View.Details + Me.LvGears.View = View.Details ' 'ColumnHeader1 ' @@ -299,79 +302,79 @@ Partial Class F_GBX ' 'TBI_getr ' - Me.TBI_getr.Location = New System.Drawing.Point(53, 3) + Me.TBI_getr.Location = New Point(53, 3) Me.TBI_getr.Name = "TBI_getr" - Me.TBI_getr.Size = New System.Drawing.Size(57, 20) + Me.TBI_getr.Size = New Size(57, 20) Me.TBI_getr.TabIndex = 0 ' 'Label49 ' Me.Label49.AutoSize = True - Me.Label49.Location = New System.Drawing.Point(349, 6) + Me.Label49.Location = New Point(349, 6) Me.Label49.Name = "Label49" - Me.Label49.Size = New System.Drawing.Size(18, 13) + Me.Label49.Size = New Size(18, 13) Me.Label49.TabIndex = 2 Me.Label49.Text = "[s]" ' 'Label33 ' Me.Label33.AutoSize = True - Me.Label33.Location = New System.Drawing.Point(116, 6) + Me.Label33.Location = New Point(116, 6) Me.Label33.Name = "Label33" - Me.Label33.Size = New System.Drawing.Size(36, 13) + Me.Label33.Size = New Size(36, 13) Me.Label33.TabIndex = 2 Me.Label33.Text = "[kgm²]" ' 'Label48 ' Me.Label48.AutoSize = True - Me.Label48.Location = New System.Drawing.Point(195, 6) + Me.Label48.Location = New Point(195, 6) Me.Label48.Name = "Label48" - Me.Label48.Size = New System.Drawing.Size(102, 13) + Me.Label48.Size = New Size(102, 13) Me.Label48.TabIndex = 2 Me.Label48.Text = "Traction Interruption" ' 'Label6 ' Me.Label6.AutoSize = True - Me.Label6.Location = New System.Drawing.Point(11, 6) + Me.Label6.Location = New Point(11, 6) Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(36, 13) + Me.Label6.Size = New Size(36, 13) Me.Label6.TabIndex = 2 Me.Label6.Text = "Inertia" ' 'Label3 ' Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(26, 85) + Me.Label3.Location = New Point(26, 85) Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(87, 13) + Me.Label3.Size = New Size(87, 13) Me.Label3.TabIndex = 42 Me.Label3.Text = "Make and Model" ' 'TbName ' - Me.TbName.Location = New System.Drawing.Point(119, 82) + Me.TbName.Location = New Point(119, 82) Me.TbName.Name = "TbName" - Me.TbName.Size = New System.Drawing.Size(334, 20) + Me.TbName.Size = New Size(334, 20) Me.TbName.TabIndex = 0 ' 'PictureBox1 ' - Me.PictureBox1.BackColor = System.Drawing.Color.White - Me.PictureBox1.Image = Global.VECTO.My.Resources.Resources.VECTO_GBX - Me.PictureBox1.Location = New System.Drawing.Point(12, 28) + Me.PictureBox1.BackColor = Color.White + Me.PictureBox1.Image = My.Resources.Resources.VECTO_GBX + Me.PictureBox1.Location = New Point(12, 28) Me.PictureBox1.Name = "PictureBox1" - Me.PictureBox1.Size = New System.Drawing.Size(441, 40) + Me.PictureBox1.Size = New Size(441, 40) Me.PictureBox1.TabIndex = 43 Me.PictureBox1.TabStop = False ' 'BtRemGear ' - Me.BtRemGear.Image = Global.VECTO.My.Resources.Resources.minus_circle_icon - Me.BtRemGear.Location = New System.Drawing.Point(30, 202) + Me.BtRemGear.Image = My.Resources.Resources.minus_circle_icon + Me.BtRemGear.Location = New Point(30, 202) Me.BtRemGear.Name = "BtRemGear" - Me.BtRemGear.Size = New System.Drawing.Size(24, 24) + Me.BtRemGear.Size = New Size(24, 24) Me.BtRemGear.TabIndex = 2 Me.BtRemGear.UseVisualStyleBackColor = True ' @@ -385,9 +388,9 @@ Partial Class F_GBX Me.GrGearShift.Controls.Add(Me.Label13) Me.GrGearShift.Controls.Add(Me.ChSkipGears) Me.GrGearShift.Controls.Add(Me.GroupBox2) - Me.GrGearShift.Location = New System.Drawing.Point(12, 377) + Me.GrGearShift.Location = New Point(12, 377) Me.GrGearShift.Name = "GrGearShift" - Me.GrGearShift.Size = New System.Drawing.Size(441, 291) + Me.GrGearShift.Size = New Size(441, 291) Me.GrGearShift.TabIndex = 3 Me.GrGearShift.TabStop = False Me.GrGearShift.Text = "Gear shift parameters" @@ -403,85 +406,85 @@ Partial Class F_GBX Me.GroupBox1.Controls.Add(Me.Label21) Me.GroupBox1.Controls.Add(Me.Label20) Me.GroupBox1.Controls.Add(Me.Label19) - Me.GroupBox1.Location = New System.Drawing.Point(6, 82) + Me.GroupBox1.Location = New Point(6, 82) Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(429, 100) + Me.GroupBox1.Size = New Size(429, 100) Me.GroupBox1.TabIndex = 10 Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Shift Strategy Parameters" ' 'tbUpshiftMinAcceleration ' - Me.tbUpshiftMinAcceleration.Location = New System.Drawing.Point(209, 71) + Me.tbUpshiftMinAcceleration.Location = New Point(209, 71) Me.tbUpshiftMinAcceleration.Name = "tbUpshiftMinAcceleration" - Me.tbUpshiftMinAcceleration.Size = New System.Drawing.Size(57, 20) + Me.tbUpshiftMinAcceleration.Size = New Size(57, 20) Me.tbUpshiftMinAcceleration.TabIndex = 8 ' 'tbUpshiftAfterDownshift ' - Me.tbUpshiftAfterDownshift.Location = New System.Drawing.Point(209, 45) + Me.tbUpshiftAfterDownshift.Location = New Point(209, 45) Me.tbUpshiftAfterDownshift.Name = "tbUpshiftAfterDownshift" - Me.tbUpshiftAfterDownshift.Size = New System.Drawing.Size(57, 20) + Me.tbUpshiftAfterDownshift.Size = New Size(57, 20) Me.tbUpshiftAfterDownshift.TabIndex = 7 ' 'tbDownshiftAfterUpshift ' - Me.tbDownshiftAfterUpshift.Location = New System.Drawing.Point(209, 20) + Me.tbDownshiftAfterUpshift.Location = New Point(209, 20) Me.tbDownshiftAfterUpshift.Name = "tbDownshiftAfterUpshift" - Me.tbDownshiftAfterUpshift.Size = New System.Drawing.Size(57, 20) + Me.tbDownshiftAfterUpshift.Size = New Size(57, 20) Me.tbDownshiftAfterUpshift.TabIndex = 6 ' 'Label24 ' Me.Label24.AutoSize = True - Me.Label24.Location = New System.Drawing.Point(275, 74) + Me.Label24.Location = New Point(275, 74) Me.Label24.Name = "Label24" - Me.Label24.Size = New System.Drawing.Size(34, 13) + Me.Label24.Size = New Size(34, 13) Me.Label24.TabIndex = 5 Me.Label24.Text = "[m/s²]" ' 'Label23 ' Me.Label23.AutoSize = True - Me.Label23.Location = New System.Drawing.Point(275, 48) + Me.Label23.Location = New Point(275, 48) Me.Label23.Name = "Label23" - Me.Label23.Size = New System.Drawing.Size(18, 13) + Me.Label23.Size = New Size(18, 13) Me.Label23.TabIndex = 4 Me.Label23.Text = "[s]" ' 'Label22 ' Me.Label22.AutoSize = True - Me.Label22.Location = New System.Drawing.Point(275, 25) + Me.Label22.Location = New Point(275, 25) Me.Label22.Name = "Label22" - Me.Label22.Size = New System.Drawing.Size(18, 13) + Me.Label22.Size = New Size(18, 13) Me.Label22.TabIndex = 3 Me.Label22.Text = "[s]" ' 'Label21 ' Me.Label21.AutoSize = True - Me.Label21.Location = New System.Drawing.Point(20, 74) + Me.Label21.Location = New Point(20, 74) Me.Label21.Name = "Label21" - Me.Label21.Size = New System.Drawing.Size(146, 13) + Me.Label21.Size = New Size(146, 13) Me.Label21.TabIndex = 2 Me.Label21.Text = "Min. acceleration after upshift" ' 'Label20 ' Me.Label20.AutoSize = True - Me.Label20.Location = New System.Drawing.Point(20, 48) + Me.Label20.Location = New Point(20, 48) Me.Label20.Name = "Label20" - Me.Label20.Size = New System.Drawing.Size(137, 13) + Me.Label20.Size = New Size(137, 13) Me.Label20.TabIndex = 1 Me.Label20.Text = "Upshift afer downshift delay" ' 'Label19 ' Me.Label19.AutoSize = True - Me.Label19.Location = New System.Drawing.Point(20, 25) + Me.Label19.Location = New Point(20, 25) Me.Label19.Name = "Label19" - Me.Label19.Size = New System.Drawing.Size(137, 13) + Me.Label19.Size = New Size(137, 13) Me.Label19.TabIndex = 0 Me.Label19.Text = "Downshift afer upshift delay" ' @@ -490,82 +493,82 @@ Partial Class F_GBX Me.PnTorqRes.Controls.Add(Me.Label2) Me.PnTorqRes.Controls.Add(Me.Label4) Me.PnTorqRes.Controls.Add(Me.TbTqResv) - Me.PnTorqRes.Location = New System.Drawing.Point(230, 19) + Me.PnTorqRes.Location = New Point(230, 19) Me.PnTorqRes.Name = "PnTorqRes" - Me.PnTorqRes.Size = New System.Drawing.Size(190, 32) + Me.PnTorqRes.Size = New Size(190, 32) Me.PnTorqRes.TabIndex = 2 ' 'Label2 ' - Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Label2.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles) Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(10, 9) + Me.Label2.Location = New Point(10, 9) Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(79, 13) + Me.Label2.Size = New Size(79, 13) Me.Label2.TabIndex = 0 Me.Label2.Text = "Torque reserve" ' 'Label4 ' - Me.Label4.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Label4.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles) Me.Label4.AutoSize = True - Me.Label4.Location = New System.Drawing.Point(158, 9) + Me.Label4.Location = New Point(158, 9) Me.Label4.Name = "Label4" - Me.Label4.Size = New System.Drawing.Size(21, 13) + Me.Label4.Size = New Size(21, 13) Me.Label4.TabIndex = 0 Me.Label4.Text = "[%]" ' 'TbTqResv ' - Me.TbTqResv.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.TbTqResv.Location = New System.Drawing.Point(95, 6) + Me.TbTqResv.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles) + Me.TbTqResv.Location = New Point(95, 6) Me.TbTqResv.Name = "TbTqResv" - Me.TbTqResv.Size = New System.Drawing.Size(57, 20) + Me.TbTqResv.Size = New Size(57, 20) Me.TbTqResv.TabIndex = 0 ' 'ChShiftInside ' Me.ChShiftInside.AutoSize = True Me.ChShiftInside.Checked = True - Me.ChShiftInside.CheckState = System.Windows.Forms.CheckState.Checked - Me.ChShiftInside.Location = New System.Drawing.Point(9, 27) + Me.ChShiftInside.CheckState = CheckState.Checked + Me.ChShiftInside.Location = New Point(9, 27) Me.ChShiftInside.Name = "ChShiftInside" - Me.ChShiftInside.Size = New System.Drawing.Size(195, 17) + Me.ChShiftInside.Size = New Size(195, 17) Me.ChShiftInside.TabIndex = 0 Me.ChShiftInside.Text = "Allow shift-up inside polygons (AMT)" Me.ChShiftInside.UseVisualStyleBackColor = True ' 'TbShiftTime ' - Me.TbShiftTime.Location = New System.Drawing.Point(325, 51) + Me.TbShiftTime.Location = New Point(325, 51) Me.TbShiftTime.Name = "TbShiftTime" - Me.TbShiftTime.Size = New System.Drawing.Size(57, 20) + Me.TbShiftTime.Size = New Size(57, 20) Me.TbShiftTime.TabIndex = 3 ' 'Label12 ' Me.Label12.AutoSize = True - Me.Label12.Location = New System.Drawing.Point(388, 54) + Me.Label12.Location = New Point(388, 54) Me.Label12.Name = "Label12" - Me.Label12.Size = New System.Drawing.Size(18, 13) + Me.Label12.Size = New Size(18, 13) Me.Label12.TabIndex = 9 Me.Label12.Text = "[s]" ' 'Label13 ' Me.Label13.AutoSize = True - Me.Label13.Location = New System.Drawing.Point(227, 54) + Me.Label13.Location = New Point(227, 54) Me.Label13.Name = "Label13" - Me.Label13.Size = New System.Drawing.Size(92, 13) + Me.Label13.Size = New Size(92, 13) Me.Label13.TabIndex = 8 Me.Label13.Text = "Minimum shift time" ' 'ChSkipGears ' Me.ChSkipGears.AutoSize = True - Me.ChSkipGears.Location = New System.Drawing.Point(9, 53) + Me.ChSkipGears.Location = New Point(9, 53) Me.ChSkipGears.Name = "ChSkipGears" - Me.ChSkipGears.Size = New System.Drawing.Size(132, 17) + Me.ChSkipGears.Size = New Size(132, 17) Me.ChSkipGears.TabIndex = 1 Me.ChSkipGears.Text = "Skip Gears (MT, AMT)" Me.ChSkipGears.UseVisualStyleBackColor = True @@ -581,104 +584,104 @@ Partial Class F_GBX Me.GroupBox2.Controls.Add(Me.Label8) Me.GroupBox2.Controls.Add(Me.Label5) Me.GroupBox2.Controls.Add(Me.Label7) - Me.GroupBox2.Location = New System.Drawing.Point(6, 186) + Me.GroupBox2.Location = New Point(6, 186) Me.GroupBox2.Name = "GroupBox2" - Me.GroupBox2.Size = New System.Drawing.Size(429, 99) + Me.GroupBox2.Size = New Size(429, 99) Me.GroupBox2.TabIndex = 4 Me.GroupBox2.TabStop = False Me.GroupBox2.Text = "Start Gear" ' 'TbStartAcc ' - Me.TbStartAcc.Location = New System.Drawing.Point(209, 71) + Me.TbStartAcc.Location = New Point(209, 71) Me.TbStartAcc.Name = "TbStartAcc" - Me.TbStartAcc.Size = New System.Drawing.Size(57, 20) + Me.TbStartAcc.Size = New Size(57, 20) Me.TbStartAcc.TabIndex = 2 ' 'Label11 ' Me.Label11.AutoSize = True - Me.Label11.Location = New System.Drawing.Point(20, 74) + Me.Label11.Location = New Point(20, 74) Me.Label11.Name = "Label11" - Me.Label11.Size = New System.Drawing.Size(173, 13) + Me.Label11.Size = New Size(173, 13) Me.Label11.TabIndex = 0 Me.Label11.Text = "Reference acceleration at clutch-in" ' 'TbStartSpeed ' - Me.TbStartSpeed.Location = New System.Drawing.Point(209, 45) + Me.TbStartSpeed.Location = New Point(209, 45) Me.TbStartSpeed.Name = "TbStartSpeed" - Me.TbStartSpeed.Size = New System.Drawing.Size(57, 20) + Me.TbStartSpeed.Size = New Size(57, 20) Me.TbStartSpeed.TabIndex = 1 ' 'Label9 ' Me.Label9.AutoSize = True - Me.Label9.Location = New System.Drawing.Point(20, 48) + Me.Label9.Location = New Point(20, 48) Me.Label9.Name = "Label9" - Me.Label9.Size = New System.Drawing.Size(181, 13) + Me.Label9.Size = New Size(181, 13) Me.Label9.TabIndex = 0 Me.Label9.Text = "Reference vehicle speed at clutch-in" ' 'Label10 ' Me.Label10.AutoSize = True - Me.Label10.Location = New System.Drawing.Point(272, 74) + Me.Label10.Location = New Point(272, 74) Me.Label10.Name = "Label10" - Me.Label10.Size = New System.Drawing.Size(34, 13) + Me.Label10.Size = New Size(34, 13) Me.Label10.TabIndex = 0 Me.Label10.Text = "[m/s²]" ' 'TbTqResvStart ' - Me.TbTqResvStart.Location = New System.Drawing.Point(209, 19) + Me.TbTqResvStart.Location = New Point(209, 19) Me.TbTqResvStart.Name = "TbTqResvStart" - Me.TbTqResvStart.Size = New System.Drawing.Size(57, 20) + Me.TbTqResvStart.Size = New Size(57, 20) Me.TbTqResvStart.TabIndex = 0 ' 'Label8 ' Me.Label8.AutoSize = True - Me.Label8.Location = New System.Drawing.Point(272, 48) + Me.Label8.Location = New Point(272, 48) Me.Label8.Name = "Label8" - Me.Label8.Size = New System.Drawing.Size(31, 13) + Me.Label8.Size = New Size(31, 13) Me.Label8.TabIndex = 0 Me.Label8.Text = "[m/s]" ' 'Label5 ' Me.Label5.AutoSize = True - Me.Label5.Location = New System.Drawing.Point(20, 22) + Me.Label5.Location = New Point(20, 22) Me.Label5.Name = "Label5" - Me.Label5.Size = New System.Drawing.Size(79, 13) + Me.Label5.Size = New Size(79, 13) Me.Label5.TabIndex = 0 Me.Label5.Text = "Torque reserve" ' 'Label7 ' Me.Label7.AutoSize = True - Me.Label7.Location = New System.Drawing.Point(272, 22) + Me.Label7.Location = New Point(272, 22) Me.Label7.Name = "Label7" - Me.Label7.Size = New System.Drawing.Size(21, 13) + Me.Label7.Size = New Size(21, 13) Me.Label7.TabIndex = 0 Me.Label7.Text = "[%]" ' 'CmOpenFile ' - Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem}) + Me.CmOpenFile.Items.AddRange(New ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem}) Me.CmOpenFile.Name = "CmOpenFile" - Me.CmOpenFile.Size = New System.Drawing.Size(153, 48) + Me.CmOpenFile.Size = New Size(153, 48) ' 'OpenWithToolStripMenuItem ' Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem" - Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(152, 22) + Me.OpenWithToolStripMenuItem.Size = New Size(152, 22) Me.OpenWithToolStripMenuItem.Text = "Open with ..." ' 'ShowInFolderToolStripMenuItem ' Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem" - Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(152, 22) + Me.ShowInFolderToolStripMenuItem.Size = New Size(152, 22) Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder" ' 'GroupBox3 @@ -688,9 +691,9 @@ Partial Class F_GBX Me.GroupBox3.Controls.Add(Me.TBTCShiftPolygon) Me.GroupBox3.Controls.Add(Me.PnTC) Me.GroupBox3.Controls.Add(Me.ChTCon) - Me.GroupBox3.Location = New System.Drawing.Point(459, 440) + Me.GroupBox3.Location = New Point(459, 440) Me.GroupBox3.Name = "GroupBox3" - Me.GroupBox3.Size = New System.Drawing.Size(414, 162) + Me.GroupBox3.Size = New Size(414, 162) Me.GroupBox3.TabIndex = 5 Me.GroupBox3.TabStop = False Me.GroupBox3.Text = "Torque Converter" @@ -707,112 +710,112 @@ Partial Class F_GBX Me.PnTC.Controls.Add(Me.TbTCfile) Me.PnTC.Controls.Add(Me.BtTCfileOpen) Me.PnTC.Controls.Add(Me.TbTCrefrpm) - Me.PnTC.Location = New System.Drawing.Point(6, 39) + Me.PnTC.Location = New Point(6, 39) Me.PnTC.Name = "PnTC" - Me.PnTC.Size = New System.Drawing.Size(402, 72) + Me.PnTC.Size = New Size(402, 72) Me.PnTC.TabIndex = 36 ' 'Label17 ' Me.Label17.AutoSize = True - Me.Label17.Location = New System.Drawing.Point(0, 5) + Me.Label17.Location = New Point(0, 5) Me.Label17.Name = "Label17" - Me.Label17.Size = New System.Drawing.Size(176, 13) + Me.Label17.Size = New Size(176, 13) Me.Label17.TabIndex = 0 Me.Label17.Text = "Torque converter characteristics file" ' 'Label18 ' Me.Label18.AutoSize = True - Me.Label18.Location = New System.Drawing.Point(5, 50) + Me.Label18.Location = New Point(5, 50) Me.Label18.Name = "Label18" - Me.Label18.Size = New System.Drawing.Size(36, 13) + Me.Label18.Size = New Size(36, 13) Me.Label18.TabIndex = 2 Me.Label18.Text = "Inertia" ' 'Label15 ' - Me.Label15.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Label15.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles) Me.Label15.AutoSize = True - Me.Label15.Location = New System.Drawing.Point(185, 50) + Me.Label15.Location = New Point(185, 50) Me.Label15.Name = "Label15" - Me.Label15.Size = New System.Drawing.Size(77, 13) + Me.Label15.Size = New Size(77, 13) Me.Label15.TabIndex = 0 Me.Label15.Text = "Reference rpm" ' 'TbTCinertia ' - Me.TbTCinertia.Location = New System.Drawing.Point(47, 47) + Me.TbTCinertia.Location = New Point(47, 47) Me.TbTCinertia.Name = "TbTCinertia" - Me.TbTCinertia.Size = New System.Drawing.Size(67, 20) + Me.TbTCinertia.Size = New Size(67, 20) Me.TbTCinertia.TabIndex = 3 ' 'Label1 ' Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(120, 50) + Me.Label1.Location = New Point(120, 50) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(36, 13) + Me.Label1.Size = New Size(36, 13) Me.Label1.TabIndex = 2 Me.Label1.Text = "[kgm²]" ' 'Label14 ' - Me.Label14.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Label14.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles) Me.Label14.AutoSize = True - Me.Label14.Location = New System.Drawing.Point(341, 50) + Me.Label14.Location = New Point(341, 50) Me.Label14.Name = "Label14" - Me.Label14.Size = New System.Drawing.Size(40, 13) + Me.Label14.Size = New Size(40, 13) Me.Label14.TabIndex = 0 Me.Label14.Text = "[1/min]" ' 'BtTCfileBrowse ' - Me.BtTCfileBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.BtTCfileBrowse.Image = Global.VECTO.My.Resources.Resources.Open_icon - Me.BtTCfileBrowse.Location = New System.Drawing.Point(348, 19) + Me.BtTCfileBrowse.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles) + Me.BtTCfileBrowse.Image = My.Resources.Resources.Open_icon + Me.BtTCfileBrowse.Location = New Point(348, 19) Me.BtTCfileBrowse.Name = "BtTCfileBrowse" - Me.BtTCfileBrowse.Size = New System.Drawing.Size(24, 24) + Me.BtTCfileBrowse.Size = New Size(24, 24) Me.BtTCfileBrowse.TabIndex = 1 Me.BtTCfileBrowse.TabStop = False Me.BtTCfileBrowse.UseVisualStyleBackColor = True ' 'TbTCfile ' - Me.TbTCfile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.TbTCfile.Location = New System.Drawing.Point(4, 21) + Me.TbTCfile.Anchor = CType(((AnchorStyles.Top Or AnchorStyles.Left) _ + Or AnchorStyles.Right), AnchorStyles) + Me.TbTCfile.Location = New Point(4, 21) Me.TbTCfile.Name = "TbTCfile" - Me.TbTCfile.Size = New System.Drawing.Size(343, 20) + Me.TbTCfile.Size = New Size(343, 20) Me.TbTCfile.TabIndex = 0 ' 'BtTCfileOpen ' - Me.BtTCfileOpen.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.BtTCfileOpen.Image = Global.VECTO.My.Resources.Resources.application_export_icon_small - Me.BtTCfileOpen.Location = New System.Drawing.Point(372, 19) + Me.BtTCfileOpen.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles) + Me.BtTCfileOpen.Image = My.Resources.Resources.application_export_icon_small + Me.BtTCfileOpen.Location = New Point(372, 19) Me.BtTCfileOpen.Name = "BtTCfileOpen" - Me.BtTCfileOpen.Size = New System.Drawing.Size(24, 24) + Me.BtTCfileOpen.Size = New Size(24, 24) Me.BtTCfileOpen.TabIndex = 2 Me.BtTCfileOpen.TabStop = False Me.BtTCfileOpen.UseVisualStyleBackColor = True ' 'TbTCrefrpm ' - Me.TbTCrefrpm.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.TbTCrefrpm.Location = New System.Drawing.Point(268, 47) + Me.TbTCrefrpm.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles) + Me.TbTCrefrpm.Location = New Point(268, 47) Me.TbTCrefrpm.Name = "TbTCrefrpm" - Me.TbTCrefrpm.Size = New System.Drawing.Size(67, 20) + Me.TbTCrefrpm.Size = New Size(67, 20) Me.TbTCrefrpm.TabIndex = 4 ' 'ChTCon ' Me.ChTCon.AutoSize = True Me.ChTCon.Checked = True - Me.ChTCon.CheckState = System.Windows.Forms.CheckState.Checked - Me.ChTCon.Location = New System.Drawing.Point(9, 19) + Me.ChTCon.CheckState = CheckState.Checked + Me.ChTCon.Location = New Point(9, 19) Me.ChTCon.Name = "ChTCon" - Me.ChTCon.Size = New System.Drawing.Size(88, 17) + Me.ChTCon.Size = New Size(88, 17) Me.ChTCon.TabIndex = 0 Me.ChTCon.Text = "Installed (AT)" Me.ChTCon.UseVisualStyleBackColor = True @@ -820,27 +823,27 @@ Partial Class F_GBX 'Label16 ' Me.Label16.AutoSize = True - Me.Label16.Location = New System.Drawing.Point(18, 111) + Me.Label16.Location = New Point(18, 111) Me.Label16.Name = "Label16" - Me.Label16.Size = New System.Drawing.Size(95, 13) + Me.Label16.Size = New Size(95, 13) Me.Label16.TabIndex = 45 Me.Label16.Text = "Transmission Type" ' 'CbGStype ' - Me.CbGStype.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.CbGStype.DropDownStyle = ComboBoxStyle.DropDownList Me.CbGStype.FormattingEnabled = True - Me.CbGStype.Location = New System.Drawing.Point(119, 108) + Me.CbGStype.Location = New Point(119, 108) Me.CbGStype.Name = "CbGStype" - Me.CbGStype.Size = New System.Drawing.Size(227, 21) + Me.CbGStype.Size = New Size(227, 21) Me.CbGStype.TabIndex = 1 ' 'BtAddGear ' - Me.BtAddGear.Image = Global.VECTO.My.Resources.Resources.plus_circle_icon - Me.BtAddGear.Location = New System.Drawing.Point(6, 202) + Me.BtAddGear.Image = My.Resources.Resources.plus_circle_icon + Me.BtAddGear.Location = New Point(6, 202) Me.BtAddGear.Name = "BtAddGear" - Me.BtAddGear.Size = New System.Drawing.Size(24, 24) + Me.BtAddGear.Size = New Size(24, 24) Me.BtAddGear.TabIndex = 1 Me.BtAddGear.UseVisualStyleBackColor = True ' @@ -850,9 +853,9 @@ Partial Class F_GBX Me.GroupBox4.Controls.Add(Me.LvGears) Me.GroupBox4.Controls.Add(Me.BtRemGear) Me.GroupBox4.Controls.Add(Me.BtAddGear) - Me.GroupBox4.Location = New System.Drawing.Point(12, 135) + Me.GroupBox4.Location = New Point(12, 135) Me.GroupBox4.Name = "GroupBox4" - Me.GroupBox4.Size = New System.Drawing.Size(441, 232) + Me.GroupBox4.Size = New Size(441, 232) Me.GroupBox4.TabIndex = 2 Me.GroupBox4.TabStop = False Me.GroupBox4.Text = "Gears" @@ -860,9 +863,9 @@ Partial Class F_GBX 'Label32 ' Me.Label32.AutoSize = True - Me.Label32.Location = New System.Drawing.Point(331, 202) + Me.Label32.Location = New Point(331, 202) Me.Label32.Name = "Label32" - Me.Label32.Size = New System.Drawing.Size(106, 13) + Me.Label32.Size = New Size(106, 13) Me.Label32.TabIndex = 3 Me.Label32.Text = "(Double-Click to Edit)" ' @@ -874,45 +877,45 @@ Partial Class F_GBX Me.PnInertiaTI.Controls.Add(Me.Label48) Me.PnInertiaTI.Controls.Add(Me.Label49) Me.PnInertiaTI.Controls.Add(Me.TbTracInt) - Me.PnInertiaTI.Location = New System.Drawing.Point(469, 406) + Me.PnInertiaTI.Location = New Point(469, 406) Me.PnInertiaTI.Name = "PnInertiaTI" - Me.PnInertiaTI.Size = New System.Drawing.Size(398, 30) + Me.PnInertiaTI.Size = New Size(398, 30) Me.PnInertiaTI.TabIndex = 4 ' 'PicBox ' - Me.PicBox.BackColor = System.Drawing.Color.LightGray - Me.PicBox.Location = New System.Drawing.Point(459, 28) + Me.PicBox.BackColor = Color.LightGray + Me.PicBox.Location = New Point(459, 28) Me.PicBox.Name = "PicBox" - Me.PicBox.Size = New System.Drawing.Size(406, 372) + Me.PicBox.Size = New Size(406, 372) Me.PicBox.TabIndex = 48 Me.PicBox.TabStop = False ' 'TBTCShiftPolygon ' - Me.TBTCShiftPolygon.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.TBTCShiftPolygon.Location = New System.Drawing.Point(10, 136) + Me.TBTCShiftPolygon.Anchor = CType(((AnchorStyles.Top Or AnchorStyles.Left) _ + Or AnchorStyles.Right), AnchorStyles) + Me.TBTCShiftPolygon.Location = New Point(10, 136) Me.TBTCShiftPolygon.Name = "TBTCShiftPolygon" - Me.TBTCShiftPolygon.Size = New System.Drawing.Size(343, 20) + Me.TBTCShiftPolygon.Size = New Size(343, 20) Me.TBTCShiftPolygon.TabIndex = 37 ' 'LblTCShiftFile ' Me.LblTCShiftFile.AutoSize = True - Me.LblTCShiftFile.Location = New System.Drawing.Point(7, 120) + Me.LblTCShiftFile.Location = New Point(7, 120) Me.LblTCShiftFile.Name = "LblTCShiftFile" - Me.LblTCShiftFile.Size = New System.Drawing.Size(172, 13) + Me.LblTCShiftFile.Size = New Size(172, 13) Me.LblTCShiftFile.TabIndex = 5 Me.LblTCShiftFile.Text = "Torque converter shift polygons file" ' 'BtTCShiftFileBrowse ' - Me.BtTCShiftFileBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.BtTCShiftFileBrowse.Image = Global.VECTO.My.Resources.Resources.Open_icon - Me.BtTCShiftFileBrowse.Location = New System.Drawing.Point(354, 134) + Me.BtTCShiftFileBrowse.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles) + Me.BtTCShiftFileBrowse.Image = My.Resources.Resources.Open_icon + Me.BtTCShiftFileBrowse.Location = New Point(354, 134) Me.BtTCShiftFileBrowse.Name = "BtTCShiftFileBrowse" - Me.BtTCShiftFileBrowse.Size = New System.Drawing.Size(24, 24) + Me.BtTCShiftFileBrowse.Size = New Size(24, 24) Me.BtTCShiftFileBrowse.TabIndex = 5 Me.BtTCShiftFileBrowse.TabStop = False Me.BtTCShiftFileBrowse.UseVisualStyleBackColor = True @@ -920,10 +923,10 @@ Partial Class F_GBX 'F_GBX ' Me.AcceptButton = Me.ButOK - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.AutoScaleDimensions = New SizeF(6.0!, 13.0!) + Me.AutoScaleMode = AutoScaleMode.Font Me.CancelButton = Me.ButCancel - Me.ClientSize = New System.Drawing.Size(877, 706) + Me.ClientSize = New Size(877, 706) Me.Controls.Add(Me.PicBox) Me.Controls.Add(Me.PnInertiaTI) Me.Controls.Add(Me.GroupBox4) @@ -938,17 +941,17 @@ Partial Class F_GBX Me.Controls.Add(Me.ButOK) Me.Controls.Add(Me.StatusStrip1) Me.Controls.Add(Me.ToolStrip1) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle - Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) + Me.FormBorderStyle = FormBorderStyle.FixedSingle + Me.Icon = CType(resources.GetObject("$this.Icon"), Icon) Me.MaximizeBox = False Me.Name = "F_GBX" - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent + Me.StartPosition = FormStartPosition.CenterParent Me.Text = "F_GBX" Me.ToolStrip1.ResumeLayout(False) Me.ToolStrip1.PerformLayout() Me.StatusStrip1.ResumeLayout(False) Me.StatusStrip1.PerformLayout() - CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PictureBox1, ISupportInitialize).EndInit() Me.GrGearShift.ResumeLayout(False) Me.GrGearShift.PerformLayout() Me.GroupBox1.ResumeLayout(False) @@ -966,95 +969,95 @@ Partial Class F_GBX Me.GroupBox4.PerformLayout() Me.PnInertiaTI.ResumeLayout(False) Me.PnInertiaTI.PerformLayout() - CType(Me.PicBox, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PicBox, ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() End Sub - Friend WithEvents ToolStrip1 As System.Windows.Forms.ToolStrip - Friend WithEvents ToolStripBtNew As System.Windows.Forms.ToolStripButton - Friend WithEvents ToolStripBtOpen As System.Windows.Forms.ToolStripButton - Friend WithEvents ToolStripBtSave As System.Windows.Forms.ToolStripButton - Friend WithEvents ToolStripBtSaveAs As System.Windows.Forms.ToolStripButton - Friend WithEvents ToolStripSeparator3 As System.Windows.Forms.ToolStripSeparator - Friend WithEvents ToolStripBtSendTo As System.Windows.Forms.ToolStripButton - Friend WithEvents StatusStrip1 As System.Windows.Forms.StatusStrip - Friend WithEvents LbStatus As System.Windows.Forms.ToolStripStatusLabel - Friend WithEvents ButCancel As System.Windows.Forms.Button - Friend WithEvents ButOK As System.Windows.Forms.Button - Friend WithEvents BtRemGear As System.Windows.Forms.Button - Friend WithEvents TbTracInt As System.Windows.Forms.TextBox - Friend WithEvents LvGears As System.Windows.Forms.ListView - Friend WithEvents ColumnHeader1 As System.Windows.Forms.ColumnHeader - Friend WithEvents ColumnHeader2 As System.Windows.Forms.ColumnHeader - Friend WithEvents ColumnHeader3 As System.Windows.Forms.ColumnHeader - Friend WithEvents TBI_getr As System.Windows.Forms.TextBox - Friend WithEvents Label49 As System.Windows.Forms.Label - Friend WithEvents Label33 As System.Windows.Forms.Label - Friend WithEvents Label48 As System.Windows.Forms.Label - Friend WithEvents Label6 As System.Windows.Forms.Label - Friend WithEvents Label3 As System.Windows.Forms.Label - Friend WithEvents TbName As System.Windows.Forms.TextBox - Friend WithEvents PictureBox1 As System.Windows.Forms.PictureBox - Friend WithEvents ToolStripSeparator1 As System.Windows.Forms.ToolStripSeparator - Friend WithEvents ToolStripButton1 As System.Windows.Forms.ToolStripButton - Friend WithEvents GrGearShift As System.Windows.Forms.GroupBox - Friend WithEvents Label2 As System.Windows.Forms.Label - Friend WithEvents TbTqResvStart As System.Windows.Forms.TextBox - Friend WithEvents TbTqResv As System.Windows.Forms.TextBox - Friend WithEvents Label7 As System.Windows.Forms.Label - Friend WithEvents Label5 As System.Windows.Forms.Label - Friend WithEvents Label4 As System.Windows.Forms.Label - Friend WithEvents GroupBox2 As System.Windows.Forms.GroupBox - Friend WithEvents TbStartAcc As System.Windows.Forms.TextBox - Friend WithEvents Label11 As System.Windows.Forms.Label - Friend WithEvents TbStartSpeed As System.Windows.Forms.TextBox - Friend WithEvents Label9 As System.Windows.Forms.Label - Friend WithEvents Label10 As System.Windows.Forms.Label - Friend WithEvents Label8 As System.Windows.Forms.Label - Friend WithEvents TbShiftTime As System.Windows.Forms.TextBox - Friend WithEvents Label12 As System.Windows.Forms.Label - Friend WithEvents Label13 As System.Windows.Forms.Label - Friend WithEvents ChSkipGears As System.Windows.Forms.CheckBox - Friend WithEvents ChShiftInside As System.Windows.Forms.CheckBox - Friend WithEvents CmOpenFile As System.Windows.Forms.ContextMenuStrip - Friend WithEvents OpenWithToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents ShowInFolderToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents GroupBox3 As System.Windows.Forms.GroupBox - Friend WithEvents TbTCfile As System.Windows.Forms.TextBox - Friend WithEvents ChTCon As System.Windows.Forms.CheckBox - Friend WithEvents BtTCfileBrowse As System.Windows.Forms.Button - Friend WithEvents BtTCfileOpen As System.Windows.Forms.Button - Friend WithEvents TbTCrefrpm As System.Windows.Forms.TextBox - Friend WithEvents Label14 As System.Windows.Forms.Label - Friend WithEvents Label15 As System.Windows.Forms.Label - Friend WithEvents Label16 As System.Windows.Forms.Label - Friend WithEvents CbGStype As System.Windows.Forms.ComboBox - Friend WithEvents Label17 As System.Windows.Forms.Label - Friend WithEvents PnTC As System.Windows.Forms.Panel - Friend WithEvents PnTorqRes As System.Windows.Forms.Panel - Friend WithEvents BtAddGear As System.Windows.Forms.Button - Friend WithEvents ColumnHeader4 As System.Windows.Forms.ColumnHeader - Friend WithEvents GroupBox4 As System.Windows.Forms.GroupBox - Friend WithEvents Label32 As System.Windows.Forms.Label - Friend WithEvents PnInertiaTI As System.Windows.Forms.Panel - Friend WithEvents ColumnHeader5 As System.Windows.Forms.ColumnHeader - Friend WithEvents PicBox As System.Windows.Forms.PictureBox - Friend WithEvents TbTCinertia As System.Windows.Forms.TextBox - Friend WithEvents Label1 As System.Windows.Forms.Label - Friend WithEvents Label18 As System.Windows.Forms.Label - Friend WithEvents ColumnHeader6 As System.Windows.Forms.ColumnHeader - Friend WithEvents GroupBox1 As System.Windows.Forms.GroupBox - Friend WithEvents tbUpshiftMinAcceleration As System.Windows.Forms.TextBox - Friend WithEvents tbUpshiftAfterDownshift As System.Windows.Forms.TextBox - Friend WithEvents tbDownshiftAfterUpshift As System.Windows.Forms.TextBox - Friend WithEvents Label24 As System.Windows.Forms.Label - Friend WithEvents Label23 As System.Windows.Forms.Label - Friend WithEvents Label22 As System.Windows.Forms.Label - Friend WithEvents Label21 As System.Windows.Forms.Label - Friend WithEvents Label20 As System.Windows.Forms.Label - Friend WithEvents Label19 As System.Windows.Forms.Label - Friend WithEvents BtTCShiftFileBrowse As System.Windows.Forms.Button - Friend WithEvents LblTCShiftFile As System.Windows.Forms.Label - Friend WithEvents TBTCShiftPolygon As System.Windows.Forms.TextBox + Friend WithEvents ToolStrip1 As ToolStrip + Friend WithEvents ToolStripBtNew As ToolStripButton + Friend WithEvents ToolStripBtOpen As ToolStripButton + Friend WithEvents ToolStripBtSave As ToolStripButton + Friend WithEvents ToolStripBtSaveAs As ToolStripButton + Friend WithEvents ToolStripSeparator3 As ToolStripSeparator + Friend WithEvents ToolStripBtSendTo As ToolStripButton + Friend WithEvents StatusStrip1 As StatusStrip + Friend WithEvents LbStatus As ToolStripStatusLabel + Friend WithEvents ButCancel As Button + Friend WithEvents ButOK As Button + Friend WithEvents BtRemGear As Button + Friend WithEvents TbTracInt As TextBox + Friend WithEvents LvGears As ListView + Friend WithEvents ColumnHeader1 As ColumnHeader + Friend WithEvents ColumnHeader2 As ColumnHeader + Friend WithEvents ColumnHeader3 As ColumnHeader + Friend WithEvents TBI_getr As TextBox + Friend WithEvents Label49 As Label + Friend WithEvents Label33 As Label + Friend WithEvents Label48 As Label + Friend WithEvents Label6 As Label + Friend WithEvents Label3 As Label + Friend WithEvents TbName As TextBox + Friend WithEvents PictureBox1 As PictureBox + Friend WithEvents ToolStripSeparator1 As ToolStripSeparator + Friend WithEvents ToolStripButton1 As ToolStripButton + Friend WithEvents GrGearShift As GroupBox + Friend WithEvents Label2 As Label + Friend WithEvents TbTqResvStart As TextBox + Friend WithEvents TbTqResv As TextBox + Friend WithEvents Label7 As Label + Friend WithEvents Label5 As Label + Friend WithEvents Label4 As Label + Friend WithEvents GroupBox2 As GroupBox + Friend WithEvents TbStartAcc As TextBox + Friend WithEvents Label11 As Label + Friend WithEvents TbStartSpeed As TextBox + Friend WithEvents Label9 As Label + Friend WithEvents Label10 As Label + Friend WithEvents Label8 As Label + Friend WithEvents TbShiftTime As TextBox + Friend WithEvents Label12 As Label + Friend WithEvents Label13 As Label + Friend WithEvents ChSkipGears As CheckBox + Friend WithEvents ChShiftInside As CheckBox + Friend WithEvents CmOpenFile As ContextMenuStrip + Friend WithEvents OpenWithToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ShowInFolderToolStripMenuItem As ToolStripMenuItem + Friend WithEvents GroupBox3 As GroupBox + Friend WithEvents TbTCfile As TextBox + Friend WithEvents ChTCon As CheckBox + Friend WithEvents BtTCfileBrowse As Button + Friend WithEvents BtTCfileOpen As Button + Friend WithEvents TbTCrefrpm As TextBox + Friend WithEvents Label14 As Label + Friend WithEvents Label15 As Label + Friend WithEvents Label16 As Label + Friend WithEvents CbGStype As ComboBox + Friend WithEvents Label17 As Label + Friend WithEvents PnTC As Panel + Friend WithEvents PnTorqRes As Panel + Friend WithEvents BtAddGear As Button + Friend WithEvents ColumnHeader4 As ColumnHeader + Friend WithEvents GroupBox4 As GroupBox + Friend WithEvents Label32 As Label + Friend WithEvents PnInertiaTI As Panel + Friend WithEvents ColumnHeader5 As ColumnHeader + Friend WithEvents PicBox As PictureBox + Friend WithEvents TbTCinertia As TextBox + Friend WithEvents Label1 As Label + Friend WithEvents Label18 As Label + Friend WithEvents ColumnHeader6 As ColumnHeader + Friend WithEvents GroupBox1 As GroupBox + Friend WithEvents tbUpshiftMinAcceleration As TextBox + Friend WithEvents tbUpshiftAfterDownshift As TextBox + Friend WithEvents tbDownshiftAfterUpshift As TextBox + Friend WithEvents Label24 As Label + Friend WithEvents Label23 As Label + Friend WithEvents Label22 As Label + Friend WithEvents Label21 As Label + Friend WithEvents Label20 As Label + Friend WithEvents Label19 As Label + Friend WithEvents BtTCShiftFileBrowse As Button + Friend WithEvents LblTCShiftFile As Label + Friend WithEvents TBTCShiftPolygon As TextBox End Class diff --git a/VECTO/GUI/F_GBX.vb b/VECTO/GUI/F_GBX.vb index a2b716c9a3bce3a49f35edc559ec07ea9e0d7492..e244940c19aeb837b5de0b385fc425c070793af0 100644 --- a/VECTO/GUI/F_GBX.vb +++ b/VECTO/GUI/F_GBX.vb @@ -9,9 +9,15 @@ ' ' See the LICENSE.txt for the specific language governing permissions and limitations. Imports System.Collections.Generic +Imports System.Drawing.Imaging Imports System.Globalization +Imports System.IO Imports System.Linq +Imports System.Text.RegularExpressions +Imports System.Windows.Forms.DataVisualization.Charting +Imports TUGraz.VECTO.Input_Files Imports TUGraz.VectoCommon.InputData +Imports TUGraz.VectoCommon.Models Imports TUGraz.VectoCommon.Utils Imports TUGraz.VectoCore.Configuration Imports TUGraz.VectoCore.InputData.Impl @@ -44,14 +50,14 @@ Public Class F_GBX Private Changed As Boolean = False 'Before closing Editor: Check if file was changed and ask to save. - Private Sub F_GBX_FormClosing(sender As Object, e As System.Windows.Forms.FormClosingEventArgs) Handles Me.FormClosing + Private Sub F_GBX_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing If e.CloseReason <> CloseReason.ApplicationExitCall And e.CloseReason <> CloseReason.WindowsShutDown Then e.Cancel = ChangeCheckCancel() End If End Sub 'Initialise. - Private Sub F_GBX_Load(sender As Object, e As System.EventArgs) Handles Me.Load + Private Sub F_GBX_Load(sender As Object, e As EventArgs) Handles Me.Load Init = False GearDia = New GearboxGearDialog @@ -61,12 +67,19 @@ Public Class F_GBX Me.ChTCon.Enabled = Not Cfg.DeclMode Me.CbGStype.Items.Clear() - Me.CbGStype.Items.Add("Manual Transmission (MT)") - Me.CbGStype.Items.Add("Automated Manual Transmission (AMT)") - If Not Cfg.DeclMode Then - Me.CbGStype.Items.Add("Automatic Transmission - Serial (AT-S)") - Me.CbGStype.Items.Add("Automatic Transmission - PowerSplit (AT-P)") - Me.CbGStype.Items.Add("Custom") + CbGStype.ValueMember = "Value" + CbGStype.DisplayMember = "Label" + + If Cfg.DeclMode Then + CbGStype.DataSource = [Enum].GetValues(GetType(GearboxType)) _ + .Cast(Of GearboxType)() _ + .Where(Function(type) type.ManualTransmission()) _ + .Select(Function(type) New With {Key .Value = type, .Label = type.GetLabel()}).ToList() + Else + CbGStype.DataSource = [Enum].GetValues(GetType(GearboxType)) _ + .Cast(Of GearboxType) _ + .Where(Function(type) type.AutomaticTransmission() OrElse type.ManualTransmission()) _ + .Select(Function(type) New With {Key .Value = type, .Label = type.GetLabel()}).ToList() End If Init = True @@ -79,26 +92,26 @@ Public Class F_GBX 'Set generic values for Declaration mode. Private Sub DeclInit() - Dim GStype As tGearbox + Dim GStype As GearboxType Dim lv0 As ListViewItem If Not Cfg.DeclMode Then Exit Sub - Me.TBI_getr.Text = cDeclaration.GbInertia + Me.TBI_getr.Text = DeclarationData.Gearbox.Inertia.Value() 'cDeclaration.GbInertia - GStype = CType(Me.CbGStype.SelectedIndex, tGearbox) + GStype = CbGStype.SelectedValue 'CType(Me.CbGStype.SelectedIndex, tGearbox) - Me.TbTracInt.Text = cDeclaration.TracInt(GStype) - Me.TbShiftTime.Text = cDeclaration.ShiftTime(GStype) + Me.TbTracInt.Text = GStype.TractionInterruption().Value() + Me.TbShiftTime.Text = DeclarationData.Gearbox.MinTimeBetweenGearshifts.Value() 'cDeclaration.ShiftTime(GStype) - Me.TbTqResv.Text = cDeclaration.TqResv - Me.TbTqResvStart.Text = cDeclaration.TqResvStart - Me.TbStartSpeed.Text = cDeclaration.StartSpeed - Me.TbStartAcc.Text = cDeclaration.StartAcc + 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 - tbUpshiftMinAcceleration.Text = cDeclaration.UpshiftMinAcceleration - tbDownshiftAfterUpshift.Text = cDeclaration.DownshiftAfterUpshiftDelay - tbUpshiftAfterDownshift.Text = cDeclaration.UpshiftAfterDownshiftDelay + 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 lv0.SubItems(GearboxTbl.ShiftPolygons).Text = "-" @@ -107,23 +120,23 @@ Public Class F_GBX #Region "Toolbar" - Private Sub ToolStripBtNew_Click(sender As System.Object, e As System.EventArgs) Handles ToolStripBtNew.Click + Private Sub ToolStripBtNew_Click(sender As Object, e As EventArgs) Handles ToolStripBtNew.Click newGBX() End Sub - Private Sub ToolStripBtOpen_Click(sender As System.Object, e As System.EventArgs) Handles ToolStripBtOpen.Click + Private Sub ToolStripBtOpen_Click(sender As Object, e As EventArgs) Handles ToolStripBtOpen.Click If fbGBX.OpenDialog(GbxFile) Then openGBX(fbGBX.Files(0)) End Sub - Private Sub ToolStripBtSave_Click(sender As System.Object, e As System.EventArgs) Handles ToolStripBtSave.Click + Private Sub ToolStripBtSave_Click(sender As Object, e As EventArgs) Handles ToolStripBtSave.Click SaveOrSaveAs(False) End Sub - Private Sub ToolStripBtSaveAs_Click(sender As System.Object, e As System.EventArgs) Handles ToolStripBtSaveAs.Click + Private Sub ToolStripBtSaveAs_Click(sender As Object, e As EventArgs) Handles ToolStripBtSaveAs.Click SaveOrSaveAs(True) End Sub - Private Sub ToolStripBtSendTo_Click(sender As System.Object, e As System.EventArgs) Handles ToolStripBtSendTo.Click + Private Sub ToolStripBtSendTo_Click(sender As Object, e As EventArgs) Handles ToolStripBtSendTo.Click If ChangeCheckCancel() Then Exit Sub @@ -147,13 +160,13 @@ Public Class F_GBX End Sub 'Help - Private Sub ToolStripButton1_Click(sender As System.Object, e As System.EventArgs) Handles ToolStripButton1.Click - If IO.File.Exists(MyAppPath & "User Manual\help.html") Then + Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click + If File.Exists(MyAppPath & "User Manual\help.html") Then Dim BrowserRegistryString As String = My.Computer.Registry.ClassesRoot.OpenSubKey("\http\shell\open\command\").GetValue("").ToString Dim DefaultBrowserPath As String = - System.Text.RegularExpressions.Regex.Match(BrowserRegistryString, "(\"".*?\"")").Captures(0).ToString - System.Diagnostics.Process.Start(DefaultBrowserPath, + Regex.Match(BrowserRegistryString, "(\"".*?\"")").Captures(0).ToString + Process.Start(DefaultBrowserPath, String.Format("""{0}{1}""", MyAppPath, "User Manual\help.html#gearbox-editor")) Else MsgBox("User Manual not found!", MsgBoxStyle.Critical) @@ -270,11 +283,12 @@ Public Class F_GBX tbDownshiftAfterUpshift.Text = GBX0.DownshiftAfterUpshift tbUpshiftAfterDownshift.Text = GBX0.UpshiftAfterDownshift - If CType(GBX0.gs_Type, Integer) <= Me.CbGStype.Items.Count - 1 Then - Me.CbGStype.SelectedIndex = CType(GBX0.gs_Type, Integer) - Else - Me.CbGStype.SelectedIndex = 0 - End If + CbGStype.SelectedValue = GBX0.gs_Type + 'If CType(GBX0.gs_Type, Integer) <= Me.CbGStype.Items.Count - 1 Then + ' Me.CbGStype.SelectedIndex = CType(GBX0.gs_Type, Integer) + 'Else + ' Me.CbGStype.SelectedIndex = 0 + 'End If DeclInit() @@ -346,7 +360,7 @@ Public Class F_GBX GBX0.gs_StartAcc = fTextboxToNumString(Me.TbStartAcc.Text) GBX0.gs_ShiftInside = Me.ChShiftInside.Checked - GBX0.gs_Type = CType(Me.CbGStype.SelectedIndex, tGearbox) + GBX0.gs_Type = CbGStype.SelectedValue GBX0.TCon = Me.ChTCon.Checked GBX0.TCfile = Me.TbTCfile.Text @@ -410,59 +424,59 @@ Public Class F_GBX End If End Function - Private Sub TbName_TextChanged(sender As System.Object, e As System.EventArgs) Handles TbName.TextChanged + Private Sub TbName_TextChanged(sender As Object, e As EventArgs) Handles TbName.TextChanged Change() End Sub - Private Sub TBI_getr_TextChanged(sender As System.Object, e As System.EventArgs) Handles TBI_getr.TextChanged + Private Sub TBI_getr_TextChanged(sender As Object, e As EventArgs) Handles TBI_getr.TextChanged Change() End Sub - Private Sub TbTracInt_TextChanged(sender As System.Object, e As System.EventArgs) Handles TbTracInt.TextChanged + Private Sub TbTracInt_TextChanged(sender As Object, e As EventArgs) Handles TbTracInt.TextChanged Change() End Sub - Private Sub ChSkipGears_CheckedChanged(sender As System.Object, e As System.EventArgs) _ + Private Sub ChSkipGears_CheckedChanged(sender As Object, e As EventArgs) _ Handles ChSkipGears.CheckedChanged CheckEnableTorqRes() Change() End Sub - Private Sub ChShiftInside_CheckedChanged(sender As System.Object, e As System.EventArgs) _ + Private Sub ChShiftInside_CheckedChanged(sender As Object, e As EventArgs) _ Handles ChShiftInside.CheckedChanged CheckEnableTorqRes() Change() End Sub - Private Sub TbTqResv_TextChanged(sender As System.Object, e As System.EventArgs) Handles TbTqResv.TextChanged + Private Sub TbTqResv_TextChanged(sender As Object, e As EventArgs) Handles TbTqResv.TextChanged Change() End Sub - Private Sub TbShiftTime_TextChanged(sender As System.Object, e As System.EventArgs) Handles TbShiftTime.TextChanged + Private Sub TbShiftTime_TextChanged(sender As Object, e As EventArgs) Handles TbShiftTime.TextChanged Change() End Sub - Private Sub TbTqResvStart_TextChanged(sender As System.Object, e As System.EventArgs) Handles TbTqResvStart.TextChanged + Private Sub TbTqResvStart_TextChanged(sender As Object, e As EventArgs) Handles TbTqResvStart.TextChanged Change() End Sub - Private Sub TbStartSpeed_TextChanged(sender As System.Object, e As System.EventArgs) Handles TbStartSpeed.TextChanged + Private Sub TbStartSpeed_TextChanged(sender As Object, e As EventArgs) Handles TbStartSpeed.TextChanged Change() End Sub - Private Sub TbStartAcc_TextChanged(sender As System.Object, e As System.EventArgs) Handles TbStartAcc.TextChanged + Private Sub TbStartAcc_TextChanged(sender As Object, e As EventArgs) Handles TbStartAcc.TextChanged Change() End Sub - Private Sub TbTCfile_TextChanged(sender As System.Object, e As System.EventArgs) Handles TbTCfile.TextChanged + Private Sub TbTCfile_TextChanged(sender As Object, e As EventArgs) Handles TbTCfile.TextChanged Change() End Sub - Private Sub TbTCrefrpm_TextChanged(sender As System.Object, e As System.EventArgs) Handles TbTCrefrpm.TextChanged + Private Sub TbTCrefrpm_TextChanged(sender As Object, e As EventArgs) Handles TbTCrefrpm.TextChanged Change() End Sub - Private Sub TbTCinertia_TextChanged(sender As System.Object, e As System.EventArgs) Handles TbTCinertia.TextChanged + Private Sub TbTCinertia_TextChanged(sender As Object, e As EventArgs) Handles TbTCinertia.TextChanged Change() End Sub @@ -479,37 +493,29 @@ Public Class F_GBX #End Region 'Save and close - Private Sub ButOK_Click(sender As System.Object, e As System.EventArgs) Handles ButOK.Click + Private Sub ButOK_Click(sender As Object, e As EventArgs) Handles ButOK.Click If SaveOrSaveAs(False) Then Me.Close() End Sub 'Cancel - Private Sub ButCancel_Click(sender As System.Object, e As System.EventArgs) Handles ButCancel.Click + Private Sub ButCancel_Click(sender As Object, e As EventArgs) Handles ButCancel.Click Me.Close() End Sub 'Enable/Disable settings for specific transmission types - Private Sub CbGStype_SelectedIndexChanged(sender As System.Object, e As System.EventArgs) _ + Private Sub CbGStype_SelectedIndexChanged(sender As Object, e As EventArgs) _ Handles CbGStype.SelectedIndexChanged - Dim GStype As tGearbox + Dim GStype As GearboxType = CbGStype.SelectedItem.Value Change() - GStype = CType(Me.CbGStype.SelectedIndex, tGearbox) - - Me.ChShiftInside.Enabled = (GStype = tGearbox.Custom) - Me.ChSkipGears.Enabled = (GStype = tGearbox.Custom) - Me.ChTCon.Enabled = (GStype = tGearbox.Custom) - - If GStype <> tGearbox.Custom Then - Me.ChShiftInside.Checked = cDeclaration.ShiftInside(GStype) - Me.ChSkipGears.Checked = cDeclaration.SkipGears(GStype) - Me.ChTCon.Checked = (GStype = tGearbox.AutomaticSerial OrElse GStype = tGearbox.AutomaticPowerSplit) - End If + ChShiftInside.Enabled = (GStype.EarlyShiftGears()) + ChSkipGears.Enabled = (GStype.SkipGears()) + ChTCon.Enabled = (GStype.AutomaticTransmission()) End Sub - Private Sub LvGears_SelectedIndexChanged(sender As System.Object, e As System.EventArgs) _ + Private Sub LvGears_SelectedIndexChanged(sender As Object, e As EventArgs) _ Handles LvGears.SelectedIndexChanged UpdatePic() End Sub @@ -517,13 +523,13 @@ Public Class F_GBX #Region "Gears" 'Gear-DoubleClick - Private Sub LvGears_MouseDoubleClick(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) _ + Private Sub LvGears_MouseDoubleClick(ByVal sender As Object, ByVal e As MouseEventArgs) _ Handles LvGears.MouseDoubleClick EditGear() End Sub 'Gear-KeyDown - Private Sub LvGears_KeyDown(sender As Object, e As System.Windows.Forms.KeyEventArgs) Handles LvGears.KeyDown + Private Sub LvGears_KeyDown(sender As Object, e As KeyEventArgs) Handles LvGears.KeyDown Select Case e.KeyCode Case Keys.Delete, Keys.Back RemoveGear(False) @@ -533,12 +539,12 @@ Public Class F_GBX End Sub 'Remove Gear Button - Private Sub BtClearGear_Click(sender As System.Object, e As System.EventArgs) Handles BtRemGear.Click + Private Sub BtClearGear_Click(sender As Object, e As EventArgs) Handles BtRemGear.Click RemoveGear(False) End Sub 'Add Gear button - Private Sub BtAddGear_Click(sender As System.Object, e As System.EventArgs) Handles BtAddGear.Click + Private Sub BtAddGear_Click(sender As Object, e As EventArgs) Handles BtAddGear.Click AddGear() Me.LvGears.Items(Me.LvGears.Items.Count - 1).Selected = True EditGear() @@ -570,7 +576,7 @@ Public Class F_GBX GearDia.BtPrevious.Enabled = True End If - If GearDia.ShowDialog = Windows.Forms.DialogResult.OK Then + If GearDia.ShowDialog = DialogResult.OK Then 'Me.LvGears.SelectedItems(0).SubItems(GearboxTbl.TorqueConverter).Text = "-" @@ -667,19 +673,19 @@ Public Class F_GBX OpenWithToolStripMenuItem.Text = "Open with " & Cfg.OpenCmdName - CmOpenFile.Show(Cursor.Position) + CmOpenFile.Show(Windows.Forms.Cursor.Position) End Sub - Private Sub OpenWithToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) _ + Private Sub OpenWithToolStripMenuItem_Click(sender As Object, e As EventArgs) _ Handles OpenWithToolStripMenuItem.Click If Not FileOpenAlt(CmFiles(0)) Then MsgBox("Failed to open file!") End Sub - Private Sub ShowInFolderToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) _ + Private Sub ShowInFolderToolStripMenuItem_Click(sender As Object, e As EventArgs) _ Handles ShowInFolderToolStripMenuItem.Click - If IO.File.Exists(CmFiles(0)) Then + If File.Exists(CmFiles(0)) Then Try - System.Diagnostics.Process.Start("explorer", "/select,""" & CmFiles(0) & "") + Process.Start("explorer", "/select,""" & CmFiles(0) & "") Catch ex As Exception MsgBox("Failed to open file!") End Try @@ -693,22 +699,22 @@ Public Class F_GBX Private Sub UpdatePic() - Dim f As cFile_V3 = Nothing + Dim f As cFile_V3 Dim path As String Dim lM As List(Of Single) = Nothing Dim lup As List(Of Single) = Nothing Dim ldown As List(Of Single) = Nothing - Dim line As String() = Nothing - Dim MyChart As System.Windows.Forms.DataVisualization.Charting.Chart - Dim s As System.Windows.Forms.DataVisualization.Charting.Series - Dim a As System.Windows.Forms.DataVisualization.Charting.ChartArea + Dim line As String() + Dim MyChart As Chart + Dim s As Series + Dim a As ChartArea Dim img As Image Dim Gear As Integer - Dim fldOK As Boolean = False + Dim fldOK As Boolean Dim fldpath As String Dim FLD0 As cFLD = Nothing - Dim ShiftOK As Boolean = False - Dim Shiftpoly As cGBX.cShiftPolygon + Dim ShiftOK As Boolean + Me.PicBox.Image = Nothing @@ -730,8 +736,8 @@ Public Class F_GBX f = New cFile_V3 ShiftOK = f.OpenRead(path) - fldpath = F_VECTO.FLDfile - + fldpath = F_VECTO.FLDfile + fldOK = fldpath.Trim <> "" If fldOK Then @@ -784,25 +790,25 @@ Public Class F_GBX 'Create plot If Not ShiftOK And Not fldOK Then Exit Sub - MyChart = New System.Windows.Forms.DataVisualization.Charting.Chart + MyChart = New Chart MyChart.Width = Me.PicBox.Width MyChart.Height = Me.PicBox.Height - a = New System.Windows.Forms.DataVisualization.Charting.ChartArea + a = New ChartArea 'Shiftpolygons from file If ShiftOK Then - s = New System.Windows.Forms.DataVisualization.Charting.Series + s = New Series s.Points.DataBindXY(lup, lM) - s.ChartType = DataVisualization.Charting.SeriesChartType.FastLine + s.ChartType = SeriesChartType.FastLine s.BorderWidth = 2 s.Color = Color.DarkRed s.Name = "Upshift curve" MyChart.Series.Add(s) - s = New System.Windows.Forms.DataVisualization.Charting.Series + s = New Series s.Points.DataBindXY(ldown, lM) - s.ChartType = DataVisualization.Charting.SeriesChartType.FastLine + s.ChartType = SeriesChartType.FastLine s.BorderWidth = 2 s.Color = Color.DarkRed s.Name = "Downshift curve" @@ -817,9 +823,9 @@ Public Class F_GBX 'Fld If fldOK AndAlso vectoOk AndAlso vehicleOk Then - s = New System.Windows.Forms.DataVisualization.Charting.Series + s = New Series s.Points.DataBindXY(FLD0.LnU, FLD0.LTq) - s.ChartType = DataVisualization.Charting.SeriesChartType.FastLine + s.ChartType = SeriesChartType.FastLine s.BorderWidth = 2 s.Color = Color.DarkBlue s.Name = "Full load" @@ -828,39 +834,37 @@ Public Class F_GBX If F_VECTO.Visible AndAlso F_VECTO.n_idle > 0 Then If FLD0.Init(F_VECTO.n_idle) Then - Shiftpoly = New cGBX.cShiftPolygon("", 0) - Shiftpoly.SetGenericShiftPoly(FLD0, F_VECTO.n_idle) 'Dim fullLoadCurve As FullLoadCurve = ConvertToFullLoadCurve(FLD0.LnU, FLD0.LTq) Dim gears As IList(Of ITransmissionInputData) = ConvertToGears(LvGears.Items) - If (Not AutomaticTransmission(CType(Me.CbGStype.SelectedIndex, tGearbox)) AndAlso gears.Count > 1) Then + If (CType(CbGStype.SelectedValue, GearboxType).ManualTransmission() AndAlso gears.Count > 1) Then Dim engine As CombustionEngineData = ConvertToEngineData(FLD0, F_VECTO.n_idle) Dim shiftLines As ShiftPolygon = DeclarationData.Gearbox.ComputeShiftPolygon(Gear - 1, engine.FullLoadCurve, gears, engine, Double.Parse(LvGears.Items(0).SubItems(GearboxTbl.Ratio).Text, CultureInfo.InvariantCulture), (vehicle.rdyn / 1000.0).SI(Of Meter)) - s = New System.Windows.Forms.DataVisualization.Charting.Series + s = New Series 's.Points.DataBindXY(Shiftpoly.gs_nUup, Shiftpoly.gs_TqUp) s.Points.DataBindXY( shiftLines.Upshift.Select(Function(pt) pt.AngularSpeed.Value() / Constants.RPMToRad).ToList(), shiftLines.Upshift.Select(Function(pt) pt.Torque.Value()).ToList()) - s.ChartType = DataVisualization.Charting.SeriesChartType.FastLine + s.ChartType = SeriesChartType.FastLine s.BorderWidth = 2 s.Color = Color.DarkRed - s.BorderDashStyle = DataVisualization.Charting.ChartDashStyle.Dash + s.BorderDashStyle = ChartDashStyle.Dash s.Name = "Upshift curve (generic)" MyChart.Series.Add(s) - s = New System.Windows.Forms.DataVisualization.Charting.Series + s = New Series 's.Points.DataBindXY(Shiftpoly.gs_nUdown, Shiftpoly.gs_TqDown) s.Points.DataBindXY( shiftLines.Downshift.Select(Function(pt) pt.AngularSpeed.Value() / Constants.RPMToRad).ToList(), shiftLines.Downshift.Select(Function(pt) pt.Torque.Value()).ToList()) - s.ChartType = DataVisualization.Charting.SeriesChartType.FastLine + s.ChartType = SeriesChartType.FastLine s.BorderWidth = 2 s.Color = Color.DarkRed - s.BorderDashStyle = DataVisualization.Charting.ChartDashStyle.Dash + s.BorderDashStyle = ChartDashStyle.Dash s.Name = "Downshift curve (generic)" MyChart.Series.Add(s) End If @@ -875,17 +879,17 @@ Public Class F_GBX a.AxisX.Title = "engine speed [1/min]" a.AxisX.TitleFont = New Font("Helvetica", 10) a.AxisX.LabelStyle.Font = New Font("Helvetica", 8) - a.AxisX.LabelAutoFitStyle = DataVisualization.Charting.LabelAutoFitStyles.None - a.AxisX.MajorGrid.LineDashStyle = DataVisualization.Charting.ChartDashStyle.Dot + a.AxisX.LabelAutoFitStyle = LabelAutoFitStyles.None + a.AxisX.MajorGrid.LineDashStyle = ChartDashStyle.Dot a.AxisY.Title = "engine torque [Nm]" a.AxisY.TitleFont = New Font("Helvetica", 10) a.AxisY.LabelStyle.Font = New Font("Helvetica", 8) - a.AxisY.LabelAutoFitStyle = DataVisualization.Charting.LabelAutoFitStyles.None - a.AxisY.MajorGrid.LineDashStyle = DataVisualization.Charting.ChartDashStyle.Dot + a.AxisY.LabelAutoFitStyle = LabelAutoFitStyles.None + a.AxisY.MajorGrid.LineDashStyle = ChartDashStyle.Dot a.AxisX.Minimum = 300 - a.BorderDashStyle = DataVisualization.Charting.ChartDashStyle.Solid + a.BorderDashStyle = ChartDashStyle.Solid a.BorderWidth = 1 a.BackColor = Color.GhostWhite @@ -897,28 +901,13 @@ Public Class F_GBX MyChart.Update() - img = New Bitmap(MyChart.Width, MyChart.Height, Imaging.PixelFormat.Format32bppArgb) + img = New Bitmap(MyChart.Width, MyChart.Height, PixelFormat.Format32bppArgb) MyChart.DrawToBitmap(img, New Rectangle(0, 0, Me.PicBox.Width, Me.PicBox.Height)) Me.PicBox.Image = img End Sub - Private Function ConvertToEngineData(fld As cFLD, nIdle As Single) As CombustionEngineData - - Dim retVal As CombustionEngineData = New CombustionEngineData() - retVal.FullLoadCurve = New EngineFullLoadCurve() - retVal.FullLoadCurve.FullLoadEntries = New List(Of FullLoadCurve.FullLoadCurveEntry) - For i As Integer = 0 To fld.LnU.Count - 1 - retVal.FullLoadCurve.FullLoadEntries.Add( - New FullLoadCurve.FullLoadCurveEntry() _ - With {.EngineSpeed = CType(fld.LnU(i), Double).RPMtoRad(), - .TorqueFullLoad = CType(fld.LTq(i), Double).SI(Of NewtonMeter)(), - .TorqueDrag = CType(fld.LTqDrag(i), Double).SI(Of NewtonMeter)()}) - Next - retVal.IdleSpeed = CType(nIdle, Double).RPMtoRad() - Return retVal - End Function Private Function ConvertToGears(gbx As ListView.ListViewItemCollection) As IList(Of ITransmissionInputData) Dim retVal As List(Of ITransmissionInputData) = New List(Of ITransmissionInputData) @@ -941,7 +930,7 @@ Public Class F_GBX #Region "Torque Converter" 'TC on/off - Private Sub ChTCon_CheckedChanged(sender As System.Object, e As System.EventArgs) Handles ChTCon.CheckedChanged + Private Sub ChTCon_CheckedChanged(sender As Object, e As EventArgs) Handles ChTCon.CheckedChanged Change() CheckGearTC() PnTC.Enabled = ChTCon.Checked @@ -950,14 +939,14 @@ Public Class F_GBX End Sub 'Browse TC file - Private Sub BtTCfileBrowse_Click(sender As System.Object, e As System.EventArgs) Handles BtTCfileBrowse.Click + 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)) End If End Sub 'Open TC file - Private Sub BtTCfileOpen_Click(sender As System.Object, e As System.EventArgs) Handles BtTCfileOpen.Click + Private Sub BtTCfileOpen_Click(sender As Object, e As EventArgs) Handles BtTCfileOpen.Click OpenFiles(fFileRepl(Me.TbTCfile.Text, fPATH(GbxFile))) End Sub diff --git a/VECTO/GUI/F_Graph.Designer.vb b/VECTO/GUI/F_Graph.Designer.vb index db7594de7d0832e6afd08c03d2193cf80cda1eb4..d9b26b9e350e288b88975b8d20b430b7c81653dd 100644 --- a/VECTO/GUI/F_Graph.Designer.vb +++ b/VECTO/GUI/F_Graph.Designer.vb @@ -1,119 +1,122 @@ -<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _ +Imports System.ComponentModel +Imports Microsoft.VisualBasic.CompilerServices + +<DesignerGenerated()> _ Partial Class F_Graph - Inherits System.Windows.Forms.Form + Inherits Form - 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - <System.Diagnostics.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 + '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 System.ComponentModel.IContainer + '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. - <System.Diagnostics.DebuggerStepThrough()> _ - Private Sub InitializeComponent() - Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(F_Graph)) - Me.PictureBox1 = New System.Windows.Forms.PictureBox() - Me.GroupBox1 = New System.Windows.Forms.GroupBox() - Me.BtRemCh = New System.Windows.Forms.Button() - Me.BtAddCh = New System.Windows.Forms.Button() - Me.ListView1 = New System.Windows.Forms.ListView() - Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) - Me.ColumnHeader3 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) - Me.CbXaxis = New System.Windows.Forms.ComboBox() - Me.ToolStrip1 = New System.Windows.Forms.ToolStrip() - Me.ToolStripBtOpen = New System.Windows.Forms.ToolStripButton() - Me.ToolStripButton3 = New System.Windows.Forms.ToolStripButton() - Me.ToolStripButton2 = New System.Windows.Forms.ToolStripButton() - Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator() - Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton() - Me.Label1 = New System.Windows.Forms.Label() - Me.TbXmin = New System.Windows.Forms.TextBox() - Me.TbXmax = New System.Windows.Forms.TextBox() - Me.BtReset = New System.Windows.Forms.Button() - Me.Label2 = New System.Windows.Forms.Label() - Me.Label3 = New System.Windows.Forms.Label() - Me.BtZoomIn = New System.Windows.Forms.Button() - Me.BtZoomOut = New System.Windows.Forms.Button() - Me.BtMoveL = New System.Windows.Forms.Button() - Me.BtMoveR = New System.Windows.Forms.Button() - CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() + '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() + Dim resources As ComponentResourceManager = New ComponentResourceManager(GetType(F_Graph)) + Me.PictureBox1 = New PictureBox() + Me.GroupBox1 = New GroupBox() + Me.BtRemCh = New Button() + Me.BtAddCh = New Button() + Me.ListView1 = New ListView() + Me.ColumnHeader1 = CType(New ColumnHeader(), ColumnHeader) + Me.ColumnHeader3 = CType(New ColumnHeader(), ColumnHeader) + Me.CbXaxis = New ComboBox() + Me.ToolStrip1 = New ToolStrip() + Me.ToolStripBtOpen = New ToolStripButton() + Me.ToolStripButton3 = New ToolStripButton() + Me.ToolStripButton2 = New ToolStripButton() + Me.ToolStripSeparator1 = New ToolStripSeparator() + Me.ToolStripButton1 = New ToolStripButton() + Me.Label1 = New Label() + Me.TbXmin = New TextBox() + Me.TbXmax = New TextBox() + Me.BtReset = New Button() + Me.Label2 = New Label() + Me.Label3 = New Label() + Me.BtZoomIn = New Button() + Me.BtZoomOut = New Button() + Me.BtMoveL = New Button() + Me.BtMoveR = New Button() + CType(Me.PictureBox1, ISupportInitialize).BeginInit() Me.GroupBox1.SuspendLayout() Me.ToolStrip1.SuspendLayout() Me.SuspendLayout() ' 'PictureBox1 ' - Me.PictureBox1.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.PictureBox1.BackColor = System.Drawing.Color.LightGray - Me.PictureBox1.Location = New System.Drawing.Point(262, 28) + Me.PictureBox1.Anchor = CType((((AnchorStyles.Top Or AnchorStyles.Bottom) _ + Or AnchorStyles.Left) _ + Or AnchorStyles.Right), AnchorStyles) + Me.PictureBox1.BackColor = Color.LightGray + Me.PictureBox1.Location = New Point(262, 28) Me.PictureBox1.Name = "PictureBox1" - Me.PictureBox1.Size = New System.Drawing.Size(984, 332) + Me.PictureBox1.Size = New Size(984, 332) Me.PictureBox1.TabIndex = 0 Me.PictureBox1.TabStop = False ' 'GroupBox1 ' - Me.GroupBox1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.GroupBox1.Anchor = CType(((AnchorStyles.Top Or AnchorStyles.Bottom) _ + Or AnchorStyles.Left), AnchorStyles) Me.GroupBox1.Controls.Add(Me.BtRemCh) Me.GroupBox1.Controls.Add(Me.BtAddCh) Me.GroupBox1.Controls.Add(Me.ListView1) - Me.GroupBox1.Location = New System.Drawing.Point(12, 28) + Me.GroupBox1.Location = New Point(12, 28) Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(244, 362) + Me.GroupBox1.Size = New Size(244, 362) Me.GroupBox1.TabIndex = 0 Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Channels" ' 'BtRemCh ' - Me.BtRemCh.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.BtRemCh.Image = Global.VECTO.My.Resources.Resources.minus_circle_icon - Me.BtRemCh.Location = New System.Drawing.Point(29, 327) + Me.BtRemCh.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles) + Me.BtRemCh.Image = My.Resources.Resources.minus_circle_icon + Me.BtRemCh.Location = New Point(29, 327) Me.BtRemCh.Name = "BtRemCh" - Me.BtRemCh.Size = New System.Drawing.Size(24, 24) + Me.BtRemCh.Size = New Size(24, 24) Me.BtRemCh.TabIndex = 2 Me.BtRemCh.UseVisualStyleBackColor = True ' 'BtAddCh ' - Me.BtAddCh.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.BtAddCh.Image = Global.VECTO.My.Resources.Resources.plus_circle_icon - Me.BtAddCh.Location = New System.Drawing.Point(5, 327) + Me.BtAddCh.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles) + Me.BtAddCh.Image = My.Resources.Resources.plus_circle_icon + Me.BtAddCh.Location = New Point(5, 327) Me.BtAddCh.Name = "BtAddCh" - Me.BtAddCh.Size = New System.Drawing.Size(24, 24) + Me.BtAddCh.Size = New Size(24, 24) Me.BtAddCh.TabIndex = 1 Me.BtAddCh.UseVisualStyleBackColor = True ' 'ListView1 ' - Me.ListView1.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.ListView1.BackColor = System.Drawing.Color.GhostWhite + Me.ListView1.Anchor = CType((((AnchorStyles.Top Or AnchorStyles.Bottom) _ + Or AnchorStyles.Left) _ + Or AnchorStyles.Right), AnchorStyles) + Me.ListView1.BackColor = Color.GhostWhite Me.ListView1.CheckBoxes = True - Me.ListView1.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader3}) + Me.ListView1.Columns.AddRange(New ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader3}) Me.ListView1.FullRowSelect = True Me.ListView1.GridLines = True - Me.ListView1.Location = New System.Drawing.Point(6, 19) + Me.ListView1.Location = New Point(6, 19) Me.ListView1.Name = "ListView1" - Me.ListView1.Size = New System.Drawing.Size(232, 308) + Me.ListView1.Size = New Size(232, 308) Me.ListView1.TabIndex = 0 Me.ListView1.UseCompatibleStateImageBehavior = False - Me.ListView1.View = System.Windows.Forms.View.Details + Me.ListView1.View = View.Details ' 'ColumnHeader1 ' @@ -127,170 +130,170 @@ Partial Class F_Graph ' 'CbXaxis ' - Me.CbXaxis.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.CbXaxis.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.CbXaxis.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles) + Me.CbXaxis.DropDownStyle = ComboBoxStyle.DropDownList Me.CbXaxis.FormattingEnabled = True Me.CbXaxis.Items.AddRange(New Object() {"Distance", "Time"}) - Me.CbXaxis.Location = New System.Drawing.Point(325, 369) + Me.CbXaxis.Location = New Point(325, 369) Me.CbXaxis.Name = "CbXaxis" - Me.CbXaxis.Size = New System.Drawing.Size(90, 21) + Me.CbXaxis.Size = New Size(90, 21) Me.CbXaxis.TabIndex = 1 ' 'ToolStrip1 ' - Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden - Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtOpen, Me.ToolStripButton3, Me.ToolStripButton2, Me.ToolStripSeparator1, Me.ToolStripButton1}) - Me.ToolStrip1.Location = New System.Drawing.Point(0, 0) + Me.ToolStrip1.GripStyle = ToolStripGripStyle.Hidden + Me.ToolStrip1.Items.AddRange(New ToolStripItem() {Me.ToolStripBtOpen, Me.ToolStripButton3, Me.ToolStripButton2, Me.ToolStripSeparator1, Me.ToolStripButton1}) + Me.ToolStrip1.Location = New Point(0, 0) Me.ToolStrip1.Name = "ToolStrip1" - Me.ToolStrip1.Size = New System.Drawing.Size(1258, 25) + Me.ToolStrip1.Size = New Size(1258, 25) Me.ToolStrip1.TabIndex = 31 Me.ToolStrip1.Text = "ToolStrip1" ' 'ToolStripBtOpen ' - Me.ToolStripBtOpen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripBtOpen.Image = Global.VECTO.My.Resources.Resources.Open_icon - Me.ToolStripBtOpen.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripBtOpen.DisplayStyle = ToolStripItemDisplayStyle.Image + Me.ToolStripBtOpen.Image = My.Resources.Resources.Open_icon + Me.ToolStripBtOpen.ImageTransparentColor = Color.Magenta Me.ToolStripBtOpen.Name = "ToolStripBtOpen" - Me.ToolStripBtOpen.Size = New System.Drawing.Size(23, 22) + Me.ToolStripBtOpen.Size = New Size(23, 22) Me.ToolStripBtOpen.Text = "ToolStripButton1" Me.ToolStripBtOpen.ToolTipText = "Open .vmod file" ' 'ToolStripButton3 ' - Me.ToolStripButton3.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripButton3.Image = Global.VECTO.My.Resources.Resources.application_add_icon - Me.ToolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripButton3.DisplayStyle = ToolStripItemDisplayStyle.Image + Me.ToolStripButton3.Image = My.Resources.Resources.application_add_icon + Me.ToolStripButton3.ImageTransparentColor = Color.Magenta Me.ToolStripButton3.Name = "ToolStripButton3" - Me.ToolStripButton3.Size = New System.Drawing.Size(23, 22) + Me.ToolStripButton3.Size = New Size(23, 22) Me.ToolStripButton3.Text = "ToolStripButton3" Me.ToolStripButton3.ToolTipText = "New window" ' 'ToolStripButton2 ' - Me.ToolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripButton2.Image = Global.VECTO.My.Resources.Resources.Refresh_icon - Me.ToolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripButton2.DisplayStyle = ToolStripItemDisplayStyle.Image + Me.ToolStripButton2.Image = My.Resources.Resources.Refresh_icon + Me.ToolStripButton2.ImageTransparentColor = Color.Magenta Me.ToolStripButton2.Name = "ToolStripButton2" - Me.ToolStripButton2.Size = New System.Drawing.Size(23, 22) + Me.ToolStripButton2.Size = New Size(23, 22) Me.ToolStripButton2.Text = "ToolStripButton2" Me.ToolStripButton2.ToolTipText = "Reload file" ' 'ToolStripSeparator1 ' Me.ToolStripSeparator1.Name = "ToolStripSeparator1" - Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 25) + Me.ToolStripSeparator1.Size = New Size(6, 25) ' 'ToolStripButton1 ' - Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripButton1.Image = Global.VECTO.My.Resources.Resources.Help_icon - Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripButton1.DisplayStyle = ToolStripItemDisplayStyle.Image + Me.ToolStripButton1.Image = My.Resources.Resources.Help_icon + Me.ToolStripButton1.ImageTransparentColor = Color.Magenta Me.ToolStripButton1.Name = "ToolStripButton1" - Me.ToolStripButton1.Size = New System.Drawing.Size(23, 22) + Me.ToolStripButton1.Size = New Size(23, 22) Me.ToolStripButton1.Text = "Help" ' 'Label1 ' - Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.Label1.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles) Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(283, 372) + Me.Label1.Location = New Point(283, 372) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(36, 13) + Me.Label1.Size = New Size(36, 13) Me.Label1.TabIndex = 32 Me.Label1.Text = "X Axis" ' 'TbXmin ' - Me.TbXmin.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.TbXmin.Location = New System.Drawing.Point(497, 369) + Me.TbXmin.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles) + Me.TbXmin.Location = New Point(497, 369) Me.TbXmin.Name = "TbXmin" - Me.TbXmin.Size = New System.Drawing.Size(71, 20) + Me.TbXmin.Size = New Size(71, 20) Me.TbXmin.TabIndex = 2 ' 'TbXmax ' - Me.TbXmax.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.TbXmax.Location = New System.Drawing.Point(609, 369) + Me.TbXmax.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles) + Me.TbXmax.Location = New Point(609, 369) Me.TbXmax.Name = "TbXmax" - Me.TbXmax.Size = New System.Drawing.Size(71, 20) + Me.TbXmax.Size = New Size(71, 20) Me.TbXmax.TabIndex = 3 ' 'BtReset ' - Me.BtReset.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.BtReset.Location = New System.Drawing.Point(691, 367) + Me.BtReset.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles) + Me.BtReset.Location = New Point(691, 367) Me.BtReset.Name = "BtReset" - Me.BtReset.Size = New System.Drawing.Size(75, 23) + Me.BtReset.Size = New Size(75, 23) Me.BtReset.TabIndex = 4 Me.BtReset.Text = "Reset" Me.BtReset.UseVisualStyleBackColor = True ' 'Label2 ' - Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.Label2.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles) Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(467, 372) + Me.Label2.Location = New Point(467, 372) Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(24, 13) + Me.Label2.Size = New Size(24, 13) Me.Label2.TabIndex = 35 Me.Label2.Text = "Min" ' 'Label3 ' - Me.Label3.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.Label3.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles) Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(576, 372) + Me.Label3.Location = New Point(576, 372) Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(27, 13) + Me.Label3.Size = New Size(27, 13) Me.Label3.TabIndex = 35 Me.Label3.Text = "Max" ' 'BtZoomIn ' - Me.BtZoomIn.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.BtZoomIn.Location = New System.Drawing.Point(1103, 366) + Me.BtZoomIn.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles) + Me.BtZoomIn.Location = New Point(1103, 366) Me.BtZoomIn.Name = "BtZoomIn" - Me.BtZoomIn.Size = New System.Drawing.Size(24, 24) + Me.BtZoomIn.Size = New Size(24, 24) Me.BtZoomIn.TabIndex = 36 Me.BtZoomIn.Text = "+" Me.BtZoomIn.UseVisualStyleBackColor = True ' 'BtZoomOut ' - Me.BtZoomOut.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.BtZoomOut.Location = New System.Drawing.Point(1126, 366) + Me.BtZoomOut.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles) + Me.BtZoomOut.Location = New Point(1126, 366) Me.BtZoomOut.Name = "BtZoomOut" - Me.BtZoomOut.Size = New System.Drawing.Size(24, 24) + Me.BtZoomOut.Size = New Size(24, 24) Me.BtZoomOut.TabIndex = 36 Me.BtZoomOut.Text = "-" Me.BtZoomOut.UseVisualStyleBackColor = True ' 'BtMoveL ' - Me.BtMoveL.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.BtMoveL.Location = New System.Drawing.Point(1199, 366) + Me.BtMoveL.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles) + Me.BtMoveL.Location = New Point(1199, 366) Me.BtMoveL.Name = "BtMoveL" - Me.BtMoveL.Size = New System.Drawing.Size(24, 24) + Me.BtMoveL.Size = New Size(24, 24) Me.BtMoveL.TabIndex = 36 Me.BtMoveL.Text = "<" Me.BtMoveL.UseVisualStyleBackColor = True ' 'BtMoveR ' - Me.BtMoveR.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.BtMoveR.Location = New System.Drawing.Point(1222, 366) + Me.BtMoveR.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles) + Me.BtMoveR.Location = New Point(1222, 366) Me.BtMoveR.Name = "BtMoveR" - Me.BtMoveR.Size = New System.Drawing.Size(24, 24) + Me.BtMoveR.Size = New Size(24, 24) Me.BtMoveR.TabIndex = 36 Me.BtMoveR.Text = ">" Me.BtMoveR.UseVisualStyleBackColor = True ' 'F_Graph ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(1258, 400) + Me.AutoScaleDimensions = New SizeF(6.0!, 13.0!) + Me.AutoScaleMode = AutoScaleMode.Font + Me.ClientSize = New Size(1258, 400) Me.Controls.Add(Me.BtZoomOut) Me.Controls.Add(Me.BtMoveR) Me.Controls.Add(Me.BtMoveL) @@ -305,12 +308,12 @@ Partial Class F_Graph Me.Controls.Add(Me.ToolStrip1) Me.Controls.Add(Me.GroupBox1) Me.Controls.Add(Me.PictureBox1) - Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) - Me.MinimumSize = New System.Drawing.Size(1000, 300) + Me.Icon = CType(resources.GetObject("$this.Icon"), Icon) + Me.MinimumSize = New Size(1000, 300) Me.Name = "F_Graph" - Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Show + Me.SizeGripStyle = SizeGripStyle.Show Me.Text = "Graph" - CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PictureBox1, ISupportInitialize).EndInit() Me.GroupBox1.ResumeLayout(False) Me.ToolStrip1.ResumeLayout(False) Me.ToolStrip1.PerformLayout() @@ -318,28 +321,28 @@ Partial Class F_Graph Me.PerformLayout() End Sub - Friend WithEvents PictureBox1 As System.Windows.Forms.PictureBox - Friend WithEvents GroupBox1 As System.Windows.Forms.GroupBox - Friend WithEvents ListView1 As System.Windows.Forms.ListView - Friend WithEvents BtRemCh As System.Windows.Forms.Button - Friend WithEvents BtAddCh As System.Windows.Forms.Button - Friend WithEvents ColumnHeader1 As System.Windows.Forms.ColumnHeader - Friend WithEvents ToolStrip1 As System.Windows.Forms.ToolStrip - Friend WithEvents ToolStripBtOpen As System.Windows.Forms.ToolStripButton - Friend WithEvents ToolStripSeparator1 As System.Windows.Forms.ToolStripSeparator - Friend WithEvents ToolStripButton1 As System.Windows.Forms.ToolStripButton - Friend WithEvents ToolStripButton2 As System.Windows.Forms.ToolStripButton - Friend WithEvents CbXaxis As System.Windows.Forms.ComboBox - Friend WithEvents ColumnHeader3 As System.Windows.Forms.ColumnHeader - Friend WithEvents Label1 As System.Windows.Forms.Label - Friend WithEvents TbXmin As System.Windows.Forms.TextBox - Friend WithEvents TbXmax As System.Windows.Forms.TextBox - Friend WithEvents BtReset As System.Windows.Forms.Button - Friend WithEvents Label2 As System.Windows.Forms.Label - Friend WithEvents Label3 As System.Windows.Forms.Label - Friend WithEvents ToolStripButton3 As System.Windows.Forms.ToolStripButton - Friend WithEvents BtZoomIn As System.Windows.Forms.Button - Friend WithEvents BtZoomOut As System.Windows.Forms.Button - Friend WithEvents BtMoveL As System.Windows.Forms.Button - Friend WithEvents BtMoveR As System.Windows.Forms.Button + Friend WithEvents PictureBox1 As PictureBox + Friend WithEvents GroupBox1 As GroupBox + Friend WithEvents ListView1 As ListView + Friend WithEvents BtRemCh As Button + Friend WithEvents BtAddCh As Button + Friend WithEvents ColumnHeader1 As ColumnHeader + Friend WithEvents ToolStrip1 As ToolStrip + Friend WithEvents ToolStripBtOpen As ToolStripButton + Friend WithEvents ToolStripSeparator1 As ToolStripSeparator + Friend WithEvents ToolStripButton1 As ToolStripButton + Friend WithEvents ToolStripButton2 As ToolStripButton + Friend WithEvents CbXaxis As ComboBox + Friend WithEvents ColumnHeader3 As ColumnHeader + Friend WithEvents Label1 As Label + Friend WithEvents TbXmin As TextBox + Friend WithEvents TbXmax As TextBox + Friend WithEvents BtReset As Button + Friend WithEvents Label2 As Label + Friend WithEvents Label3 As Label + Friend WithEvents ToolStripButton3 As ToolStripButton + Friend WithEvents BtZoomIn As Button + Friend WithEvents BtZoomOut As Button + Friend WithEvents BtMoveL As Button + Friend WithEvents BtMoveR As Button End Class diff --git a/VECTO/GUI/F_Graph.vb b/VECTO/GUI/F_Graph.vb index c2c7eb2fce07848f0cf4bb5a91242df204e035f9..f1143fb423ebd195a50185d150f305d05b24e17a 100644 --- a/VECTO/GUI/F_Graph.vb +++ b/VECTO/GUI/F_Graph.vb @@ -10,7 +10,11 @@ ' See the LICENSE.txt for the specific language governing permissions and limitations. Imports System.Collections.Generic +Imports System.Drawing.Imaging +Imports System.IO Imports System.Linq +Imports System.Text.RegularExpressions +Imports System.Windows.Forms.DataVisualization.Charting Public Class F_Graph Private Filepath As String @@ -37,7 +41,7 @@ Public Class F_Graph Me.CbXaxis.SelectedIndex = 0 End Sub - Private Sub ToolStripBtOpen_Click(sender As System.Object, e As System.EventArgs) Handles ToolStripBtOpen.Click + Private Sub ToolStripBtOpen_Click(sender As Object, e As EventArgs) Handles ToolStripBtOpen.Click If fbVMOD.OpenDialog(Filepath) Then @@ -47,7 +51,7 @@ Public Class F_Graph End Sub - Private Sub ToolStripButton2_Click(sender As System.Object, e As System.EventArgs) Handles ToolStripButton2.Click + Private Sub ToolStripButton2_Click(sender As Object, e As EventArgs) Handles ToolStripButton2.Click LoadFile() End Sub @@ -156,9 +160,9 @@ Public Class F_Graph Private Sub UpdateGraph() Dim lv0 As ListViewItem - Dim MyChart As System.Windows.Forms.DataVisualization.Charting.Chart - Dim s As System.Windows.Forms.DataVisualization.Charting.Series - Dim a As System.Windows.Forms.DataVisualization.Charting.ChartArea + Dim MyChart As Chart + Dim s As Series + Dim a As ChartArea Dim OverDist As Boolean Dim leftaxis As New List(Of String) Dim rightaxis As New List(Of String) @@ -179,18 +183,18 @@ Public Class F_Graph SetxMax0() - MyChart = New System.Windows.Forms.DataVisualization.Charting.Chart + MyChart = New Chart MyChart.Width = Me.PictureBox1.Width MyChart.Height = Me.PictureBox1.Height - a = New System.Windows.Forms.DataVisualization.Charting.ChartArea + a = New ChartArea For Each lv0 In Me.ListView1.CheckedItems IsLeft = (lv0.SubItems(1).Text = "Left") - s = New System.Windows.Forms.DataVisualization.Charting.Series + s = New Series If OverDist Then s.Points.DataBindXY(DistList, Channels(lv0.Tag).Values) @@ -198,7 +202,7 @@ Public Class F_Graph s.Points.DataBindXY(TimeList, Channels(lv0.Tag).Values) End If - s.ChartType = DataVisualization.Charting.SeriesChartType.FastLine + s.ChartType = SeriesChartType.FastLine s.Name = lv0.Text s.BorderWidth = 2 @@ -206,7 +210,7 @@ Public Class F_Graph If Not leftaxis.Contains(lv0.SubItems(0).Text) Then leftaxis.Add(lv0.SubItems(0).Text) Else If Not rightaxis.Contains(lv0.SubItems(0).Text) Then rightaxis.Add(lv0.SubItems(0).Text) - s.YAxisType = DataVisualization.Charting.AxisType.Secondary + s.YAxisType = AxisType.Secondary End If MyChart.Series.Add(s) @@ -223,8 +227,8 @@ Public Class F_Graph End If a.AxisX.TitleFont = New Font("Helvetica", 10) a.AxisX.LabelStyle.Font = New Font("Helvetica", 8) - a.AxisX.LabelAutoFitStyle = DataVisualization.Charting.LabelAutoFitStyles.None - a.AxisX.MajorGrid.LineDashStyle = DataVisualization.Charting.ChartDashStyle.Dot + a.AxisX.LabelAutoFitStyle = LabelAutoFitStyles.None + a.AxisX.MajorGrid.LineDashStyle = ChartDashStyle.Dot If xMax > xMin Then a.AxisX.Minimum = xMin @@ -246,7 +250,7 @@ Public Class F_Graph a.AxisY.Title = txt a.AxisY.TitleFont = New Font("Helvetica", 10) a.AxisY.LabelStyle.Font = New Font("Helvetica", 8) - a.AxisY.LabelAutoFitStyle = DataVisualization.Charting.LabelAutoFitStyles.None + a.AxisY.LabelAutoFitStyle = LabelAutoFitStyles.None End If @@ -260,7 +264,7 @@ Public Class F_Graph a.AxisY2.Title = txt a.AxisY2.TitleFont = New Font("Helvetica", 10) a.AxisY2.LabelStyle.Font = New Font("Helvetica", 8) - a.AxisY2.LabelAutoFitStyle = DataVisualization.Charting.LabelAutoFitStyles.None + a.AxisY2.LabelAutoFitStyle = LabelAutoFitStyles.None a.AxisY2.MinorGrid.Enabled = False a.AxisY2.MajorGrid.Enabled = False @@ -268,7 +272,7 @@ Public Class F_Graph a.BackColor = Color.GhostWhite - a.BorderDashStyle = DataVisualization.Charting.ChartDashStyle.Solid + a.BorderDashStyle = ChartDashStyle.Solid a.BorderWidth = 1 MyChart.ChartAreas.Add(a) @@ -291,7 +295,7 @@ Public Class F_Graph MyChart.Update() - img = New Bitmap(MyChart.Width, MyChart.Height, Imaging.PixelFormat.Format32bppArgb) + img = New Bitmap(MyChart.Width, MyChart.Height, PixelFormat.Format32bppArgb) MyChart.DrawToBitmap(img, New Rectangle(0, 0, Me.PictureBox1.Width, Me.PictureBox1.Height)) Me.PictureBox1.Image = img @@ -351,7 +355,7 @@ Public Class F_Graph Public Values As List(Of String) End Class - Private Sub BtAddCh_Click(sender As System.Object, e As System.EventArgs) Handles BtAddCh.Click + Private Sub BtAddCh_Click(sender As Object, e As EventArgs) Handles BtAddCh.Click Dim dlog As New F_Graph_ChEdit Dim i As Integer Dim lv0 As ListViewItem @@ -366,7 +370,7 @@ Public Class F_Graph dlog.ComboBox1.SelectedIndex = 0 - If dlog.ShowDialog = Windows.Forms.DialogResult.OK Then + If dlog.ShowDialog = DialogResult.OK Then lv0 = New ListViewItem i = dlog.ComboBox1.SelectedIndex lv0.Text = Channels(i).Name @@ -406,7 +410,7 @@ Public Class F_Graph dlog.ComboBox1.SelectedIndex = lv0.Tag - If dlog.ShowDialog = Windows.Forms.DialogResult.OK Then + If dlog.ShowDialog = DialogResult.OK Then i = dlog.ComboBox1.SelectedIndex lv0.Text = Channels(i).Name lv0.Tag = i @@ -441,23 +445,23 @@ Public Class F_Graph UpdateGraph() End Sub - Private Sub ListView1_DoubleClick(sender As Object, e As System.EventArgs) Handles ListView1.DoubleClick + 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 EditChannel() End If End Sub - Private Sub BtRemCh_Click(sender As System.Object, e As System.EventArgs) Handles BtRemCh.Click + Private Sub BtRemCh_Click(sender As Object, e As EventArgs) Handles BtRemCh.Click RemoveChannel() End Sub - Private Sub ListView1_ItemChecked(sender As Object, e As System.Windows.Forms.ItemCheckedEventArgs) _ + Private Sub ListView1_ItemChecked(sender As Object, e As ItemCheckedEventArgs) _ Handles ListView1.ItemChecked UpdateGraph() End Sub - Private Sub ListView1_KeyDown(sender As Object, e As System.Windows.Forms.KeyEventArgs) Handles ListView1.KeyDown + Private Sub ListView1_KeyDown(sender As Object, e As KeyEventArgs) Handles ListView1.KeyDown Select Case e.KeyCode Case Keys.Delete, Keys.Back RemoveChannel() @@ -466,7 +470,7 @@ Public Class F_Graph End Select End Sub - Private Sub CbXaxis_SelectedIndexChanged(sender As System.Object, e As System.EventArgs) _ + Private Sub CbXaxis_SelectedIndexChanged(sender As Object, e As EventArgs) _ Handles CbXaxis.SelectedIndexChanged SetxMax0() Me.TbXmin.Text = 0 @@ -474,33 +478,33 @@ Public Class F_Graph UpdateGraph() End Sub - Private Sub BtReset_Click(sender As System.Object, e As System.EventArgs) Handles BtReset.Click + 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 End Sub - Private Sub TbXmin_TextChanged(sender As System.Object, e As System.EventArgs) Handles TbXmin.TextChanged + Private Sub TbXmin_TextChanged(sender As Object, e As EventArgs) Handles TbXmin.TextChanged If IsNumeric(Me.TbXmin.Text) Then xMin = Me.TbXmin.Text UpdateGraph() End Sub - Private Sub TbXmax_TextChanged(sender As System.Object, e As System.EventArgs) Handles TbXmax.TextChanged + Private Sub TbXmax_TextChanged(sender As Object, e As EventArgs) Handles TbXmax.TextChanged If IsNumeric(Me.TbXmax.Text) Then xMax = Me.TbXmax.Text UpdateGraph() End Sub - Private Sub ToolStripButton3_Click(sender As System.Object, e As System.EventArgs) Handles ToolStripButton3.Click + Private Sub ToolStripButton3_Click(sender As Object, e As EventArgs) Handles ToolStripButton3.Click Dim FGraph As New F_Graph FGraph.Show() End Sub - Private Sub F_Graph_SizeChanged(sender As Object, e As System.EventArgs) Handles Me.SizeChanged + Private Sub F_Graph_SizeChanged(sender As Object, e As EventArgs) Handles Me.SizeChanged UpdateGraph() End Sub - Private Sub BtZoomIn_Click(sender As System.Object, e As System.EventArgs) Handles BtZoomIn.Click + Private Sub BtZoomIn_Click(sender As Object, e As EventArgs) Handles BtZoomIn.Click Dim d As Single d = (xMax - xMin) / 10 @@ -518,7 +522,7 @@ Public Class F_Graph Me.TbXmax.Text = xMax End Sub - Private Sub BtZoomOut_Click(sender As System.Object, e As System.EventArgs) Handles BtZoomOut.Click + Private Sub BtZoomOut_Click(sender As Object, e As EventArgs) Handles BtZoomOut.Click Dim d As Single d = (xMax - xMin) / 10 @@ -536,7 +540,7 @@ Public Class F_Graph Me.TbXmax.Text = xMax End Sub - Private Sub BtMoveL_Click(sender As System.Object, e As System.EventArgs) Handles BtMoveL.Click + Private Sub BtMoveL_Click(sender As Object, e As EventArgs) Handles BtMoveL.Click Dim d As Single If xMin <= 0 Then Exit Sub @@ -555,7 +559,7 @@ Public Class F_Graph Me.TbXmax.Text = xMax End Sub - Private Sub BtMoveR_Click(sender As System.Object, e As System.EventArgs) Handles BtMoveR.Click + Private Sub BtMoveR_Click(sender As Object, e As EventArgs) Handles BtMoveR.Click Dim d As Single If xMax >= xMax0 Then Exit Sub @@ -574,13 +578,13 @@ Public Class F_Graph Me.TbXmax.Text = xMax End Sub - Private Sub ToolStripButton1_Click(sender As System.Object, e As System.EventArgs) Handles ToolStripButton1.Click - If IO.File.Exists(MyAppPath & "User Manual\help.html") Then + Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click + If File.Exists(MyAppPath & "User Manual\help.html") Then Dim BrowserRegistryString As String = My.Computer.Registry.ClassesRoot.OpenSubKey("\http\shell\open\command\").GetValue("").ToString Dim DefaultBrowserPath As String = - System.Text.RegularExpressions.Regex.Match(BrowserRegistryString, "(\"".*?\"")").Captures(0).ToString - System.Diagnostics.Process.Start(DefaultBrowserPath, + Regex.Match(BrowserRegistryString, "(\"".*?\"")").Captures(0).ToString + Process.Start(DefaultBrowserPath, String.Format("""{0}{1}""", MyAppPath, "User Manual\help.html#graph-window")) Else MsgBox("User Manual not found!", MsgBoxStyle.Critical) diff --git a/VECTO/GUI/F_Graph_ChEdit.Designer.vb b/VECTO/GUI/F_Graph_ChEdit.Designer.vb index dbc273bf4836781c8f8708f4a535e9ec9f5df892..051a181016f2a46a687111bbd1e6896d87d388fb 100644 --- a/VECTO/GUI/F_Graph_ChEdit.Designer.vb +++ b/VECTO/GUI/F_Graph_ChEdit.Designer.vb @@ -1,143 +1,147 @@ -<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _ +Imports System.ComponentModel +Imports Microsoft.VisualBasic.CompilerServices + + +<DesignerGenerated()> _ Partial Class F_Graph_ChEdit - Inherits System.Windows.Forms.Form + Inherits Form - 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - <System.Diagnostics.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 + '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 System.ComponentModel.IContainer + '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. - <System.Diagnostics.DebuggerStepThrough()> _ - Private Sub InitializeComponent() - Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel() - Me.OK_Button = New System.Windows.Forms.Button() - Me.Cancel_Button = New System.Windows.Forms.Button() - Me.ComboBox1 = New System.Windows.Forms.ComboBox() - Me.GroupBox1 = New System.Windows.Forms.GroupBox() - Me.RbRight = New System.Windows.Forms.RadioButton() - Me.RbLeft = New System.Windows.Forms.RadioButton() - Me.TableLayoutPanel1.SuspendLayout() - Me.GroupBox1.SuspendLayout() - Me.SuspendLayout() - ' - 'TableLayoutPanel1 - ' - Me.TableLayoutPanel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.TableLayoutPanel1.ColumnCount = 2 - Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!)) - Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.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 System.Drawing.Point(58, 110) - Me.TableLayoutPanel1.Name = "TableLayoutPanel1" - Me.TableLayoutPanel1.RowCount = 1 - Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.0!)) - Me.TableLayoutPanel1.Size = New System.Drawing.Size(146, 29) - Me.TableLayoutPanel1.TabIndex = 0 - ' - 'OK_Button - ' - Me.OK_Button.Anchor = System.Windows.Forms.AnchorStyles.None - Me.OK_Button.Location = New System.Drawing.Point(3, 3) - Me.OK_Button.Name = "OK_Button" - Me.OK_Button.Size = New System.Drawing.Size(67, 23) - Me.OK_Button.TabIndex = 0 - Me.OK_Button.Text = "OK" - ' - 'Cancel_Button - ' - Me.Cancel_Button.Anchor = System.Windows.Forms.AnchorStyles.None - Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel - Me.Cancel_Button.Location = New System.Drawing.Point(76, 3) - Me.Cancel_Button.Name = "Cancel_Button" - Me.Cancel_Button.Size = New System.Drawing.Size(67, 23) - Me.Cancel_Button.TabIndex = 1 - Me.Cancel_Button.Text = "Cancel" - ' - 'ComboBox1 - ' - Me.ComboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.ComboBox1.FormattingEnabled = True - Me.ComboBox1.Location = New System.Drawing.Point(12, 12) - Me.ComboBox1.Name = "ComboBox1" - Me.ComboBox1.Size = New System.Drawing.Size(188, 21) - Me.ComboBox1.TabIndex = 1 - ' - 'GroupBox1 - ' - Me.GroupBox1.Controls.Add(Me.RbRight) - Me.GroupBox1.Controls.Add(Me.RbLeft) - Me.GroupBox1.Location = New System.Drawing.Point(12, 39) - Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(188, 55) - Me.GroupBox1.TabIndex = 2 - Me.GroupBox1.TabStop = False - Me.GroupBox1.Text = "Y Axis" - ' - 'RbRight - ' - Me.RbRight.AutoSize = True - Me.RbRight.Location = New System.Drawing.Point(80, 19) - Me.RbRight.Name = "RbRight" - Me.RbRight.Size = New System.Drawing.Size(50, 17) - Me.RbRight.TabIndex = 3 - Me.RbRight.TabStop = True - Me.RbRight.Text = "Right" - Me.RbRight.UseVisualStyleBackColor = True - ' - 'RbLeft - ' - Me.RbLeft.AutoSize = True - Me.RbLeft.Location = New System.Drawing.Point(16, 19) - Me.RbLeft.Name = "RbLeft" - Me.RbLeft.Size = New System.Drawing.Size(43, 17) - Me.RbLeft.TabIndex = 3 - Me.RbLeft.TabStop = True - Me.RbLeft.Text = "Left" - Me.RbLeft.UseVisualStyleBackColor = True - ' - 'F_Graph_ChEdit - ' - Me.AcceptButton = Me.OK_Button - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.CancelButton = Me.Cancel_Button - Me.ClientSize = New System.Drawing.Size(216, 151) - Me.Controls.Add(Me.GroupBox1) - Me.Controls.Add(Me.ComboBox1) - Me.Controls.Add(Me.TableLayoutPanel1) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog - Me.MaximizeBox = False - Me.MinimizeBox = False - Me.Name = "F_Graph_ChEdit" - Me.ShowInTaskbar = False - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent - Me.Text = "Edit Channel" - Me.TableLayoutPanel1.ResumeLayout(False) - Me.GroupBox1.ResumeLayout(False) - Me.GroupBox1.PerformLayout() - Me.ResumeLayout(False) + '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.ComboBox1 = New ComboBox() + Me.GroupBox1 = New GroupBox() + Me.RbRight = New RadioButton() + Me.RbLeft = New RadioButton() + Me.TableLayoutPanel1.SuspendLayout() + Me.GroupBox1.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(58, 110) + 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 = 0 + ' + '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" + ' + 'ComboBox1 + ' + Me.ComboBox1.DropDownStyle = ComboBoxStyle.DropDownList + Me.ComboBox1.FormattingEnabled = True + Me.ComboBox1.Location = New Point(12, 12) + Me.ComboBox1.Name = "ComboBox1" + Me.ComboBox1.Size = New Size(188, 21) + Me.ComboBox1.TabIndex = 1 + ' + 'GroupBox1 + ' + Me.GroupBox1.Controls.Add(Me.RbRight) + Me.GroupBox1.Controls.Add(Me.RbLeft) + Me.GroupBox1.Location = New Point(12, 39) + Me.GroupBox1.Name = "GroupBox1" + Me.GroupBox1.Size = New Size(188, 55) + Me.GroupBox1.TabIndex = 2 + Me.GroupBox1.TabStop = False + Me.GroupBox1.Text = "Y Axis" + ' + 'RbRight + ' + Me.RbRight.AutoSize = True + Me.RbRight.Location = New Point(80, 19) + Me.RbRight.Name = "RbRight" + Me.RbRight.Size = New Size(50, 17) + Me.RbRight.TabIndex = 3 + Me.RbRight.TabStop = True + Me.RbRight.Text = "Right" + Me.RbRight.UseVisualStyleBackColor = True + ' + 'RbLeft + ' + Me.RbLeft.AutoSize = True + Me.RbLeft.Location = New Point(16, 19) + Me.RbLeft.Name = "RbLeft" + Me.RbLeft.Size = New Size(43, 17) + Me.RbLeft.TabIndex = 3 + Me.RbLeft.TabStop = True + Me.RbLeft.Text = "Left" + Me.RbLeft.UseVisualStyleBackColor = True + ' + 'F_Graph_ChEdit + ' + 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(216, 151) + Me.Controls.Add(Me.GroupBox1) + Me.Controls.Add(Me.ComboBox1) + Me.Controls.Add(Me.TableLayoutPanel1) + Me.FormBorderStyle = FormBorderStyle.FixedDialog + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "F_Graph_ChEdit" + Me.ShowInTaskbar = False + Me.StartPosition = FormStartPosition.CenterParent + Me.Text = "Edit Channel" + Me.TableLayoutPanel1.ResumeLayout(False) + Me.GroupBox1.ResumeLayout(False) + Me.GroupBox1.PerformLayout() + Me.ResumeLayout(False) - End Sub - Friend WithEvents TableLayoutPanel1 As System.Windows.Forms.TableLayoutPanel - Friend WithEvents OK_Button As System.Windows.Forms.Button - Friend WithEvents Cancel_Button As System.Windows.Forms.Button - Friend WithEvents ComboBox1 As System.Windows.Forms.ComboBox - Friend WithEvents GroupBox1 As System.Windows.Forms.GroupBox - Friend WithEvents RbRight As System.Windows.Forms.RadioButton - Friend WithEvents RbLeft As System.Windows.Forms.RadioButton + End Sub + Friend WithEvents TableLayoutPanel1 As TableLayoutPanel + Friend WithEvents OK_Button As Button + Friend WithEvents Cancel_Button As Button + Friend WithEvents ComboBox1 As ComboBox + Friend WithEvents GroupBox1 As GroupBox + Friend WithEvents RbRight As RadioButton + Friend WithEvents RbLeft As RadioButton End Class diff --git a/VECTO/GUI/F_Graph_ChEdit.vb b/VECTO/GUI/F_Graph_ChEdit.vb index 3fd5f7164c7c49a06dc5e5c99b7de0e71046f427..5c4de580900d9ff0938a93992dbd044da0c65ad7 100644 --- a/VECTO/GUI/F_Graph_ChEdit.vb +++ b/VECTO/GUI/F_Graph_ChEdit.vb @@ -9,18 +9,17 @@ ' ' See the LICENSE.txt for the specific language governing permissions and limitations. -Imports System.Windows.Forms Public Class F_Graph_ChEdit - Private Sub OK_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles OK_Button.Click - Me.DialogResult = System.Windows.Forms.DialogResult.OK - Me.Close() - 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 System.Object, ByVal e As System.EventArgs) Handles Cancel_Button.Click - Me.DialogResult = System.Windows.Forms.DialogResult.Cancel - 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_JIRA.Designer.vb b/VECTO/GUI/F_JIRA.Designer.vb index 64eff91b910d4ce382dba8f5836b8a7db6a26f2f..2e0d6c0342e5f5592ed8fc25214c738b5eabdb02 100644 --- a/VECTO/GUI/F_JIRA.Designer.vb +++ b/VECTO/GUI/F_JIRA.Designer.vb @@ -1,61 +1,65 @@ -<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _ +Imports System.ComponentModel +Imports Microsoft.VisualBasic.CompilerServices + + +<DesignerGenerated()> _ Partial Class F_JIRA - Inherits System.Windows.Forms.Form + Inherits Form - 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - <System.Diagnostics.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 + '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 System.ComponentModel.IContainer + '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. - <System.Diagnostics.DebuggerStepThrough()> _ - Private Sub InitializeComponent() - Me.OK_Button = New System.Windows.Forms.Button() - Me.Label1 = New System.Windows.Forms.Label() - Me.LinkLabel1 = New System.Windows.Forms.LinkLabel() - Me.GroupBox1 = New System.Windows.Forms.GroupBox() - Me.LinkLabel3 = New System.Windows.Forms.LinkLabel() - Me.Label2 = New System.Windows.Forms.Label() - Me.Button1 = New System.Windows.Forms.Button() + '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.OK_Button = New Button() + Me.Label1 = New Label() + Me.LinkLabel1 = New LinkLabel() + Me.GroupBox1 = New GroupBox() + Me.LinkLabel3 = New LinkLabel() + Me.Label2 = New Label() + Me.Button1 = New Button() Me.GroupBox1.SuspendLayout() Me.SuspendLayout() ' 'OK_Button ' - Me.OK_Button.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.OK_Button.Location = New System.Drawing.Point(356, 205) + Me.OK_Button.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles) + Me.OK_Button.Location = New Point(356, 205) Me.OK_Button.Name = "OK_Button" - Me.OK_Button.Size = New System.Drawing.Size(67, 23) + Me.OK_Button.Size = New Size(67, 23) Me.OK_Button.TabIndex = 0 Me.OK_Button.Text = "Close" ' 'Label1 ' Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(6, 16) + Me.Label1.Location = New Point(6, 16) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(269, 13) + Me.Label1.Size = New Size(269, 13) Me.Label1.TabIndex = 1 Me.Label1.Text = "You need a CITnet user account to create a new issue." ' 'LinkLabel1 ' Me.LinkLabel1.AutoSize = True - Me.LinkLabel1.Location = New System.Drawing.Point(6, 65) + Me.LinkLabel1.Location = New Point(6, 65) Me.LinkLabel1.Name = "LinkLabel1" - Me.LinkLabel1.Size = New System.Drawing.Size(141, 13) + Me.LinkLabel1.Size = New Size(141, 13) Me.LinkLabel1.TabIndex = 2 Me.LinkLabel1.TabStop = True Me.LinkLabel1.Text = "JIRA Quick Start Guide (pdf)" @@ -66,9 +70,9 @@ Partial Class F_JIRA Me.GroupBox1.Controls.Add(Me.Label1) Me.GroupBox1.Controls.Add(Me.Label2) Me.GroupBox1.Controls.Add(Me.LinkLabel1) - Me.GroupBox1.Location = New System.Drawing.Point(12, 86) + Me.GroupBox1.Location = New Point(12, 86) Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(411, 100) + Me.GroupBox1.Size = New Size(411, 100) Me.GroupBox1.TabIndex = 3 Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Help" @@ -76,9 +80,9 @@ Partial Class F_JIRA 'LinkLabel3 ' Me.LinkLabel3.AutoSize = True - Me.LinkLabel3.Location = New System.Drawing.Point(246, 33) + Me.LinkLabel3.Location = New Point(246, 33) Me.LinkLabel3.Name = "LinkLabel3" - Me.LinkLabel3.Size = New System.Drawing.Size(122, 13) + Me.LinkLabel3.Size = New Size(122, 13) Me.LinkLabel3.TabIndex = 18 Me.LinkLabel3.TabStop = True Me.LinkLabel3.Text = "vecto@jrc.ec.europa.eu" @@ -86,18 +90,18 @@ Partial Class F_JIRA 'Label2 ' Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(6, 33) + Me.Label2.Location = New Point(6, 33) Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(241, 13) + Me.Label2.Size = New Size(241, 13) Me.Label2.TabIndex = 3 Me.Label2.Text = "If you don't have one yet please contact support: " ' 'Button1 ' - Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Button1.Location = New System.Drawing.Point(12, 12) + Me.Button1.Font = New Font("Microsoft Sans Serif", 15.75!, FontStyle.Bold, GraphicsUnit.Point, CType(0, Byte)) + Me.Button1.Location = New Point(12, 12) Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(411, 54) + Me.Button1.Size = New Size(411, 54) Me.Button1.TabIndex = 4 Me.Button1.Text = "Create JIRA Issue" Me.Button1.UseVisualStyleBackColor = True @@ -105,30 +109,30 @@ Partial Class F_JIRA 'F_JIRA ' Me.AcceptButton = Me.OK_Button - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(435, 240) + Me.AutoScaleDimensions = New SizeF(6.0!, 13.0!) + Me.AutoScaleMode = AutoScaleMode.Font + Me.ClientSize = New Size(435, 240) Me.Controls.Add(Me.Button1) Me.Controls.Add(Me.GroupBox1) Me.Controls.Add(Me.OK_Button) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog + Me.FormBorderStyle = FormBorderStyle.FixedDialog Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "F_JIRA" Me.ShowInTaskbar = False - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent + Me.StartPosition = FormStartPosition.CenterParent Me.Text = "Report Issue via CITnet" Me.GroupBox1.ResumeLayout(False) Me.GroupBox1.PerformLayout() Me.ResumeLayout(False) End Sub - Friend WithEvents OK_Button As System.Windows.Forms.Button - Friend WithEvents Label1 As System.Windows.Forms.Label - Friend WithEvents LinkLabel1 As System.Windows.Forms.LinkLabel - Friend WithEvents GroupBox1 As System.Windows.Forms.GroupBox - Friend WithEvents Label2 As System.Windows.Forms.Label - Friend WithEvents LinkLabel3 As System.Windows.Forms.LinkLabel - Friend WithEvents Button1 As System.Windows.Forms.Button + Friend WithEvents OK_Button As Button + Friend WithEvents Label1 As Label + Friend WithEvents LinkLabel1 As LinkLabel + Friend WithEvents GroupBox1 As GroupBox + Friend WithEvents Label2 As Label + Friend WithEvents LinkLabel3 As LinkLabel + Friend WithEvents Button1 As Button End Class diff --git a/VECTO/GUI/F_JIRA.vb b/VECTO/GUI/F_JIRA.vb index 5094fe39c33b00b4fe130372bb7ef66de612fb93..c3ff5c58d018b0e94090e8b10690b863e8492d29 100644 --- a/VECTO/GUI/F_JIRA.vb +++ b/VECTO/GUI/F_JIRA.vb @@ -1,15 +1,16 @@ -Imports System.Windows.Forms +Imports System.IO +Imports System.Windows.Forms Public Class F_JIRA - Private Sub OK_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles OK_Button.Click - Me.DialogResult = System.Windows.Forms.DialogResult.OK - Me.Close() + 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 LinkLabel1_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel1.LinkClicked - If IO.File.Exists(MyAppPath & "User Manual\JIRA Quick Start Guide.pdf") Then - System.Diagnostics.Process.Start(MyAppPath & "User Manual\JIRA Quick Start Guide.pdf") + If File.Exists(MyAppPath & "User Manual\JIRA Quick Start Guide.pdf") Then + Process.Start(MyAppPath & "User Manual\JIRA Quick Start Guide.pdf") Else MsgBox("File not found!", MsgBoxStyle.Critical) End If @@ -24,12 +25,12 @@ Public Class F_JIRA "- Country of workplace" & "%0A" & _ "- Position" - System.Diagnostics.Process.Start("mailto:vecto@jrc.ec.europa.eu?subject=CITnet%20account&body=" & bodytext) + 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 - System.Diagnostics.Process.Start("https://webgate.ec.europa.eu/CITnet/jira/browse/VECTO") + 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 0ff00e8a52c21fe7c749defc41a90f84ea062fe2..50c464fd39b51172121f9734d08619968d6fcdff 100644 --- a/VECTO/GUI/F_MAINForm.Designer.vb +++ b/VECTO/GUI/F_MAINForm.Designer.vb @@ -8,12 +8,15 @@ ' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ' ' See the LICENSE.txt for the specific language governing permissions and limitations. -<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _ +Imports System.ComponentModel +Imports Microsoft.VisualBasic.CompilerServices + +<DesignerGenerated()> _ Partial Class F_MAINForm - Inherits System.Windows.Forms.Form + Inherits Form 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - <System.Diagnostics.DebuggerNonUserCode()> _ + <DebuggerNonUserCode()> _ Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -25,116 +28,116 @@ Partial Class F_MAINForm End Sub 'Wird vom Windows Form-Designer benötigt. - Private components As System.ComponentModel.IContainer + 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. - <System.Diagnostics.DebuggerStepThrough()> _ + <DebuggerStepThrough()> _ Private Sub InitializeComponent() - 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.TabPageDRI = New System.Windows.Forms.TabPage() - Me.Label3 = New System.Windows.Forms.Label() - Me.BtDRIdown = New System.Windows.Forms.Button() - Me.BtDRIup = New System.Windows.Forms.Button() - Me.ChBoxAllDRI = New System.Windows.Forms.CheckBox() - Me.LvDRI = New System.Windows.Forms.ListView() - Me.ColDRIpath = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) - Me.ColDRIstatus = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) - Me.ButtonDRIremove = New System.Windows.Forms.Button() - Me.ButtonDRIadd = New System.Windows.Forms.Button() - Me.TabPgOptions = New System.Windows.Forms.TabPage() - Me.GrBoxBATCH = New System.Windows.Forms.GroupBox() - Me.ChBoxBatchSubD = New System.Windows.Forms.CheckBox() - Me.Label2 = New System.Windows.Forms.Label() - Me.ButBObrowse = New System.Windows.Forms.Button() - Me.CbBOmode = New System.Windows.Forms.ComboBox() - Me.TbBOpath = New System.Windows.Forms.TextBox() - Me.GrBoxSTD = New System.Windows.Forms.GroupBox() - Me.ChBoxAutoSD = New System.Windows.Forms.CheckBox() - 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.PnDeclOpt = New System.Windows.Forms.Panel() - Me.CbBatch = New System.Windows.Forms.CheckBox() - Me.ChBoxCyclDistCor = New System.Windows.Forms.CheckBox() - Me.ChBoxUseGears = New System.Windows.Forms.CheckBox() - 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.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.StatusBAR.SuspendLayout() Me.TabControl1.SuspendLayout() Me.TabPageGEN.SuspendLayout() - CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PictureBox1, ISupportInitialize).BeginInit() Me.TabPageDRI.SuspendLayout() Me.TabPgOptions.SuspendLayout() Me.GrBoxBATCH.SuspendLayout() @@ -143,7 +146,7 @@ Partial Class F_MAINForm Me.PnDeclOpt.SuspendLayout() Me.TabPageDEV.SuspendLayout() Me.ConMenFilelist.SuspendLayout() - CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SplitContainer1, ISupportInitialize).BeginInit() Me.SplitContainer1.Panel1.SuspendLayout() Me.SplitContainer1.Panel2.SuspendLayout() Me.SplitContainer1.SuspendLayout() @@ -153,38 +156,38 @@ Partial Class F_MAINForm ' 'StatusBAR ' - 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.Items.AddRange(New ToolStripItem() {Me.ToolStripLbStatus, Me.ToolStripProgBarJob, Me.ToolStripProgBarOverall}) + Me.StatusBAR.Location = New Point(0, 648) Me.StatusBAR.Name = "StatusBAR" - Me.StatusBAR.Size = New System.Drawing.Size(1045, 22) + Me.StatusBAR.Size = New Size(1045, 22) Me.StatusBAR.TabIndex = 7 Me.StatusBAR.Text = "StatusBAR" ' 'ToolStripLbStatus ' Me.ToolStripLbStatus.Name = "ToolStripLbStatus" - Me.ToolStripLbStatus.Size = New System.Drawing.Size(1030, 17) + Me.ToolStripLbStatus.Size = New Size(1030, 17) Me.ToolStripLbStatus.Spring = True Me.ToolStripLbStatus.Text = "Status Text" - Me.ToolStripLbStatus.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.ToolStripLbStatus.TextAlign = ContentAlignment.MiddleLeft ' 'ToolStripProgBarJob ' - Me.ToolStripProgBarJob.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right + Me.ToolStripProgBarJob.Alignment = ToolStripItemAlignment.Right Me.ToolStripProgBarJob.AutoSize = False Me.ToolStripProgBarJob.Name = "ToolStripProgBarJob" - Me.ToolStripProgBarJob.Size = New System.Drawing.Size(100, 16) - Me.ToolStripProgBarJob.Style = System.Windows.Forms.ProgressBarStyle.Continuous + Me.ToolStripProgBarJob.Size = New Size(100, 16) + Me.ToolStripProgBarJob.Style = ProgressBarStyle.Continuous Me.ToolStripProgBarJob.ToolTipText = "overall progress" Me.ToolStripProgBarJob.Visible = False ' 'ToolStripProgBarOverall ' - Me.ToolStripProgBarOverall.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right + Me.ToolStripProgBarOverall.Alignment = ToolStripItemAlignment.Right Me.ToolStripProgBarOverall.AutoSize = False Me.ToolStripProgBarOverall.Name = "ToolStripProgBarOverall" - Me.ToolStripProgBarOverall.Size = New System.Drawing.Size(100, 16) - Me.ToolStripProgBarOverall.Style = System.Windows.Forms.ProgressBarStyle.Continuous + Me.ToolStripProgBarOverall.Size = New Size(100, 16) + Me.ToolStripProgBarOverall.Style = ProgressBarStyle.Continuous Me.ToolStripProgBarOverall.ToolTipText = "job progress" Me.ToolStripProgBarOverall.Visible = False ' @@ -194,13 +197,13 @@ Partial Class F_MAINForm Me.TabControl1.Controls.Add(Me.TabPageDRI) Me.TabControl1.Controls.Add(Me.TabPgOptions) Me.TabControl1.Controls.Add(Me.TabPageDEV) - 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.Dock = DockStyle.Fill + Me.TabControl1.Location = New Point(3, 3) + Me.TabControl1.Margin = New Padding(0) Me.TabControl1.Name = "TabControl1" - Me.TabControl1.Padding = New System.Drawing.Point(0, 0) + Me.TabControl1.Padding = New Point(0, 0) Me.TabControl1.SelectedIndex = 0 - Me.TabControl1.Size = New System.Drawing.Size(1042, 328) + Me.TabControl1.Size = New Size(1042, 328) Me.TabControl1.TabIndex = 10 ' 'TabPageGEN @@ -216,100 +219,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 System.Drawing.Point(4, 22) - Me.TabPageGEN.Margin = New System.Windows.Forms.Padding(0) + Me.TabPageGEN.Location = New Point(4, 22) + Me.TabPageGEN.Margin = New Padding(0) Me.TabPageGEN.Name = "TabPageGEN" - Me.TabPageGEN.Size = New System.Drawing.Size(1034, 302) + Me.TabPageGEN.Size = New Size(1034, 302) Me.TabPageGEN.TabIndex = 0 Me.TabPageGEN.Text = "Job Files" Me.TabPageGEN.UseVisualStyleBackColor = True ' 'Label6 ' - Me.Label6.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Label6.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles) Me.Label6.AutoSize = True - Me.Label6.Location = New System.Drawing.Point(814, 268) + Me.Label6.Location = New Point(814, 268) Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(217, 13) + Me.Label6.Size = New Size(217, 13) Me.Label6.TabIndex = 21 Me.Label6.Text = "(Double-Click to Edit, Right-Click for Options)" ' 'btStartV3 ' - 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.VECTO.My.Resources.Resources.Play_icon - Me.btStartV3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btStartV3.Location = New System.Drawing.Point(3, 56) + 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.Name = "btStartV3" - Me.btStartV3.Size = New System.Drawing.Size(108, 50) + Me.btStartV3.Size = New Size(108, 50) Me.btStartV3.TabIndex = 20 Me.btStartV3.Text = "START" - Me.btStartV3.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText + Me.btStartV3.TextImageRelation = TextImageRelation.ImageBeforeText Me.ToolTip1.SetToolTip(Me.btStartV3, "Start Simulation") Me.btStartV3.UseVisualStyleBackColor = True ' 'LbDecl ' Me.LbDecl.AutoSize = True - 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.Font = New Font("Microsoft Sans Serif", 8.25!, FontStyle.Bold, GraphicsUnit.Point, CType(0, Byte)) + Me.LbDecl.Location = New Point(5, 109) Me.LbDecl.Name = "LbDecl" - Me.LbDecl.Size = New System.Drawing.Size(107, 13) + Me.LbDecl.Size = New 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"), System.Drawing.Image) - Me.PictureBox1.Location = New System.Drawing.Point(3, 3) + Me.PictureBox1.Image = CType(resources.GetObject("PictureBox1.Image"), Image) + Me.PictureBox1.Location = New Point(3, 3) Me.PictureBox1.Name = "PictureBox1" - Me.PictureBox1.Size = New System.Drawing.Size(108, 47) + Me.PictureBox1.Size = New Size(108, 47) Me.PictureBox1.TabIndex = 18 Me.PictureBox1.TabStop = False ' 'BtGENdown ' - Me.BtGENdown.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.BtGENdown.Image = Global.VECTO.My.Resources.Resources.Actions_arrow_down_icon - Me.BtGENdown.Location = New System.Drawing.Point(307, 267) + 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.Name = "BtGENdown" - Me.BtGENdown.Size = New System.Drawing.Size(30, 30) + Me.BtGENdown.Size = New 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((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.BtGENup.Image = Global.VECTO.My.Resources.Resources.Actions_arrow_up_icon - Me.BtGENup.Location = New System.Drawing.Point(276, 267) + 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.Name = "BtGENup" - Me.BtGENup.Size = New System.Drawing.Size(30, 30) + Me.BtGENup.Size = New 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((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.LbAutoShDown.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles) Me.LbAutoShDown.AutoSize = True - 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.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.Name = "LbAutoShDown" - Me.LbAutoShDown.Size = New System.Drawing.Size(225, 13) + Me.LbAutoShDown.Size = New Size(225, 13) Me.LbAutoShDown.TabIndex = 17 Me.LbAutoShDown.Text = "!!! Automatic Shutdown is activated !!!" Me.LbAutoShDown.Visible = False ' 'ChBoxAllGEN ' - Me.ChBoxAllGEN.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.ChBoxAllGEN.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles) Me.ChBoxAllGEN.AutoSize = True - Me.ChBoxAllGEN.Location = New System.Drawing.Point(195, 274) + Me.ChBoxAllGEN.Location = New Point(195, 274) Me.ChBoxAllGEN.Name = "ChBoxAllGEN" - Me.ChBoxAllGEN.Size = New System.Drawing.Size(70, 17) + Me.ChBoxAllGEN.Size = New Size(70, 17) Me.ChBoxAllGEN.TabIndex = 16 Me.ChBoxAllGEN.Text = "Select All" Me.ToolTip1.SetToolTip(Me.ChBoxAllGEN, "Select All / None") @@ -318,22 +321,22 @@ Partial Class F_MAINForm 'LvGEN ' Me.LvGEN.AllowDrop = True - 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.Anchor = CType((((AnchorStyles.Top Or AnchorStyles.Bottom) _ + Or AnchorStyles.Left) _ + Or AnchorStyles.Right), AnchorStyles) Me.LvGEN.CheckBoxes = True - Me.LvGEN.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColGENpath, Me.ColGENstatus}) + Me.LvGEN.Columns.AddRange(New ColumnHeader() {Me.ColGENpath, Me.ColGENstatus}) Me.LvGEN.FullRowSelect = True Me.LvGEN.GridLines = True - Me.LvGEN.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable + Me.LvGEN.HeaderStyle = ColumnHeaderStyle.Nonclickable Me.LvGEN.HideSelection = False Me.LvGEN.LabelEdit = True - Me.LvGEN.Location = New System.Drawing.Point(114, 3) + Me.LvGEN.Location = New Point(114, 3) Me.LvGEN.Name = "LvGEN" - Me.LvGEN.Size = New System.Drawing.Size(917, 263) + Me.LvGEN.Size = New Size(917, 263) Me.LvGEN.TabIndex = 14 Me.LvGEN.UseCompatibleStateImageBehavior = False - Me.LvGEN.View = System.Windows.Forms.View.Details + Me.LvGEN.View = View.Details ' 'ColGENpath ' @@ -347,24 +350,24 @@ Partial Class F_MAINForm ' 'ButtonGENremove ' - 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.VECTO.My.Resources.Resources.minus_circle_icon - Me.ButtonGENremove.Location = New System.Drawing.Point(147, 267) + 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.Name = "ButtonGENremove" - Me.ButtonGENremove.Size = New System.Drawing.Size(33, 30) + Me.ButtonGENremove.Size = New Size(33, 30) Me.ButtonGENremove.TabIndex = 2 Me.ToolTip1.SetToolTip(Me.ButtonGENremove, "Remove selected entries") Me.ButtonGENremove.UseVisualStyleBackColor = True ' 'ButtonGENadd ' - 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.VECTO.My.Resources.Resources.plus_circle_icon - Me.ButtonGENadd.Location = New System.Drawing.Point(113, 267) + 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.Name = "ButtonGENadd" - Me.ButtonGENadd.Size = New System.Drawing.Size(33, 30) + Me.ButtonGENadd.Size = New Size(33, 30) Me.ButtonGENadd.TabIndex = 1 Me.ToolTip1.SetToolTip(Me.ButtonGENadd, "Add Job File") Me.ButtonGENadd.UseVisualStyleBackColor = True @@ -378,51 +381,51 @@ Partial Class F_MAINForm Me.TabPageDRI.Controls.Add(Me.LvDRI) Me.TabPageDRI.Controls.Add(Me.ButtonDRIremove) Me.TabPageDRI.Controls.Add(Me.ButtonDRIadd) - Me.TabPageDRI.Location = New System.Drawing.Point(4, 22) + Me.TabPageDRI.Location = New Point(4, 22) Me.TabPageDRI.Name = "TabPageDRI" - Me.TabPageDRI.Padding = New System.Windows.Forms.Padding(3) - Me.TabPageDRI.Size = New System.Drawing.Size(1034, 302) + 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((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Label3.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles) Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(814, 268) + Me.Label3.Location = New Point(814, 268) Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(217, 13) + 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((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.BtDRIdown.Image = Global.VECTO.My.Resources.Resources.Actions_arrow_down_icon - Me.BtDRIdown.Location = New System.Drawing.Point(196, 268) + 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 System.Drawing.Size(33, 30) + Me.BtDRIdown.Size = New Size(33, 30) Me.BtDRIdown.TabIndex = 3 Me.BtDRIdown.UseVisualStyleBackColor = True ' 'BtDRIup ' - Me.BtDRIup.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.BtDRIup.Image = Global.VECTO.My.Resources.Resources.Actions_arrow_up_icon - Me.BtDRIup.Location = New System.Drawing.Point(163, 268) + 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 System.Drawing.Size(33, 30) + Me.BtDRIup.Size = New Size(33, 30) Me.BtDRIup.TabIndex = 2 Me.BtDRIup.UseVisualStyleBackColor = True ' 'ChBoxAllDRI ' - Me.ChBoxAllDRI.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.ChBoxAllDRI.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles) Me.ChBoxAllDRI.AutoSize = True - Me.ChBoxAllDRI.Location = New System.Drawing.Point(85, 275) + Me.ChBoxAllDRI.Location = New Point(85, 275) Me.ChBoxAllDRI.Name = "ChBoxAllDRI" - Me.ChBoxAllDRI.Size = New System.Drawing.Size(70, 17) + Me.ChBoxAllDRI.Size = New Size(70, 17) Me.ChBoxAllDRI.TabIndex = 7 Me.ChBoxAllDRI.Text = "Select All" Me.ChBoxAllDRI.UseVisualStyleBackColor = True @@ -430,22 +433,22 @@ Partial Class F_MAINForm 'LvDRI ' Me.LvDRI.AllowDrop = True - Me.LvDRI.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.LvDRI.Anchor = CType((((AnchorStyles.Top Or AnchorStyles.Bottom) _ + Or AnchorStyles.Left) _ + Or AnchorStyles.Right), AnchorStyles) Me.LvDRI.CheckBoxes = True - Me.LvDRI.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColDRIpath, Me.ColDRIstatus}) + Me.LvDRI.Columns.AddRange(New ColumnHeader() {Me.ColDRIpath, Me.ColDRIstatus}) Me.LvDRI.FullRowSelect = True Me.LvDRI.GridLines = True - Me.LvDRI.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable + Me.LvDRI.HeaderStyle = ColumnHeaderStyle.Nonclickable Me.LvDRI.HideSelection = False Me.LvDRI.LabelEdit = True - Me.LvDRI.Location = New System.Drawing.Point(6, 6) + Me.LvDRI.Location = New Point(6, 6) Me.LvDRI.Name = "LvDRI" - Me.LvDRI.Size = New System.Drawing.Size(1022, 261) + Me.LvDRI.Size = New Size(1022, 261) Me.LvDRI.TabIndex = 6 Me.LvDRI.UseCompatibleStateImageBehavior = False - Me.LvDRI.View = System.Windows.Forms.View.Details + Me.LvDRI.View = View.Details ' 'ColDRIpath ' @@ -459,23 +462,23 @@ Partial Class F_MAINForm ' 'ButtonDRIremove ' - Me.ButtonDRIremove.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.ButtonDRIremove.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.ButtonDRIremove.Image = Global.VECTO.My.Resources.Resources.minus_circle_icon - Me.ButtonDRIremove.Location = New System.Drawing.Point(38, 268) + 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 System.Drawing.Size(33, 30) + Me.ButtonDRIremove.Size = New Size(33, 30) Me.ButtonDRIremove.TabIndex = 1 Me.ButtonDRIremove.UseVisualStyleBackColor = True ' 'ButtonDRIadd ' - Me.ButtonDRIadd.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.ButtonDRIadd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.ButtonDRIadd.Image = Global.VECTO.My.Resources.Resources.plus_circle_icon - Me.ButtonDRIadd.Location = New System.Drawing.Point(5, 268) + 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 System.Drawing.Size(33, 30) + Me.ButtonDRIadd.Size = New Size(33, 30) Me.ButtonDRIadd.TabIndex = 0 Me.ButtonDRIadd.UseVisualStyleBackColor = True ' @@ -485,27 +488,27 @@ Partial Class F_MAINForm Me.TabPgOptions.Controls.Add(Me.GrBoxSTD) Me.TabPgOptions.Controls.Add(Me.ChBoxAutoSD) Me.TabPgOptions.Controls.Add(Me.PanelOptAllg) - Me.TabPgOptions.Location = New System.Drawing.Point(4, 22) + Me.TabPgOptions.Location = New Point(4, 22) Me.TabPgOptions.Name = "TabPgOptions" - Me.TabPgOptions.Padding = New System.Windows.Forms.Padding(3) - Me.TabPgOptions.Size = New System.Drawing.Size(1034, 302) + Me.TabPgOptions.Padding = New Padding(3) + Me.TabPgOptions.Size = New Size(1034, 302) Me.TabPgOptions.TabIndex = 2 Me.TabPgOptions.Text = "Options" Me.TabPgOptions.UseVisualStyleBackColor = True ' 'GrBoxBATCH ' - Me.GrBoxBATCH.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.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 System.Drawing.Point(6, 224) + Me.GrBoxBATCH.Location = New Point(6, 224) Me.GrBoxBATCH.Name = "GrBoxBATCH" - Me.GrBoxBATCH.Size = New System.Drawing.Size(1022, 72) + Me.GrBoxBATCH.Size = New Size(1022, 72) Me.GrBoxBATCH.TabIndex = 5 Me.GrBoxBATCH.TabStop = False Me.GrBoxBATCH.Text = "Batch Options" @@ -513,9 +516,9 @@ Partial Class F_MAINForm 'ChBoxBatchSubD ' Me.ChBoxBatchSubD.AutoSize = True - Me.ChBoxBatchSubD.Location = New System.Drawing.Point(14, 46) + Me.ChBoxBatchSubD.Location = New Point(14, 46) Me.ChBoxBatchSubD.Name = "ChBoxBatchSubD" - Me.ChBoxBatchSubD.Size = New System.Drawing.Size(206, 17) + Me.ChBoxBatchSubD.Size = New Size(206, 17) Me.ChBoxBatchSubD.TabIndex = 4 Me.ChBoxBatchSubD.Text = "Create Subdirectories for modal results" Me.ChBoxBatchSubD.UseVisualStyleBackColor = True @@ -523,60 +526,60 @@ Partial Class F_MAINForm 'Label2 ' Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(11, 22) + Me.Label2.Location = New Point(11, 22) Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(64, 13) + Me.Label2.Size = New Size(64, 13) Me.Label2.TabIndex = 2 Me.Label2.Text = "Output Path" ' 'ButBObrowse ' - Me.ButBObrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.ButBObrowse.Image = Global.VECTO.My.Resources.Resources.Open_icon - Me.ButBObrowse.Location = New System.Drawing.Point(961, 16) + 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 System.Drawing.Size(24, 24) + Me.ButBObrowse.Size = New Size(24, 24) Me.ButBObrowse.TabIndex = 3 Me.ButBObrowse.UseVisualStyleBackColor = True ' 'CbBOmode ' - Me.CbBOmode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + 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 System.Drawing.Point(81, 19) + Me.CbBOmode.Location = New Point(81, 19) Me.CbBOmode.Name = "CbBOmode" - Me.CbBOmode.Size = New System.Drawing.Size(140, 21) + Me.CbBOmode.Size = New Size(140, 21) Me.CbBOmode.TabIndex = 0 ' 'TbBOpath ' - Me.TbBOpath.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.TbBOpath.Location = New System.Drawing.Point(227, 18) + 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 System.Drawing.Size(734, 20) + Me.TbBOpath.Size = New Size(734, 20) Me.TbBOpath.TabIndex = 1 ' 'GrBoxSTD ' - Me.GrBoxSTD.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.GrBoxSTD.Location = New System.Drawing.Point(6, 224) + 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 System.Drawing.Size(1022, 72) + 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((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.ChBoxAutoSD.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles) Me.ChBoxAutoSD.AutoSize = True - Me.ChBoxAutoSD.Location = New System.Drawing.Point(859, 6) + Me.ChBoxAutoSD.Location = New Point(859, 6) Me.ChBoxAutoSD.Name = "ChBoxAutoSD" - Me.ChBoxAutoSD.Size = New System.Drawing.Size(169, 17) + Me.ChBoxAutoSD.Size = New Size(169, 17) Me.ChBoxAutoSD.TabIndex = 13 Me.ChBoxAutoSD.Text = "Shutdown system after last job" Me.ChBoxAutoSD.UseVisualStyleBackColor = True @@ -587,17 +590,17 @@ Partial Class F_MAINForm Me.PanelOptAllg.Controls.Add(Me.ChBoxModOut) Me.PanelOptAllg.Controls.Add(Me.GroupBox1) Me.PanelOptAllg.Controls.Add(Me.PnDeclOpt) - Me.PanelOptAllg.Location = New System.Drawing.Point(6, 6) + Me.PanelOptAllg.Location = New Point(6, 6) Me.PanelOptAllg.Name = "PanelOptAllg" - Me.PanelOptAllg.Size = New System.Drawing.Size(519, 212) + Me.PanelOptAllg.Size = New Size(519, 212) Me.PanelOptAllg.TabIndex = 0 ' 'ChBoxMod1Hz ' Me.ChBoxMod1Hz.AutoSize = True - Me.ChBoxMod1Hz.Location = New System.Drawing.Point(9, 182) + Me.ChBoxMod1Hz.Location = New Point(9, 182) Me.ChBoxMod1Hz.Name = "ChBoxMod1Hz" - Me.ChBoxMod1Hz.Size = New System.Drawing.Size(121, 17) + Me.ChBoxMod1Hz.Size = New Size(121, 17) Me.ChBoxMod1Hz.TabIndex = 16 Me.ChBoxMod1Hz.Text = "Modal results in 1Hz" Me.ChBoxMod1Hz.UseVisualStyleBackColor = True @@ -606,10 +609,10 @@ Partial Class F_MAINForm ' Me.ChBoxModOut.AutoSize = True Me.ChBoxModOut.Checked = True - Me.ChBoxModOut.CheckState = System.Windows.Forms.CheckState.Checked - Me.ChBoxModOut.Location = New System.Drawing.Point(9, 159) + Me.ChBoxModOut.CheckState = CheckState.Checked + Me.ChBoxModOut.Location = New Point(9, 159) Me.ChBoxModOut.Name = "ChBoxModOut" - Me.ChBoxModOut.Size = New System.Drawing.Size(115, 17) + Me.ChBoxModOut.Size = New Size(115, 17) Me.ChBoxModOut.TabIndex = 0 Me.ChBoxModOut.Text = "Write modal results" Me.ChBoxModOut.UseVisualStyleBackColor = True @@ -618,9 +621,9 @@ Partial Class F_MAINForm ' Me.GroupBox1.Controls.Add(Me.RbDev) Me.GroupBox1.Controls.Add(Me.RbDecl) - Me.GroupBox1.Location = New System.Drawing.Point(3, 3) + Me.GroupBox1.Location = New Point(3, 3) Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(121, 72) + Me.GroupBox1.Size = New Size(121, 72) Me.GroupBox1.TabIndex = 15 Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Mode" @@ -629,9 +632,9 @@ Partial Class F_MAINForm ' Me.RbDev.AutoSize = True Me.RbDev.Checked = True - Me.RbDev.Location = New System.Drawing.Point(6, 42) + Me.RbDev.Location = New Point(6, 42) Me.RbDev.Name = "RbDev" - Me.RbDev.Size = New System.Drawing.Size(111, 17) + Me.RbDev.Size = New Size(111, 17) Me.RbDev.TabIndex = 1 Me.RbDev.TabStop = True Me.RbDev.Text = "Engineering Mode" @@ -640,9 +643,9 @@ Partial Class F_MAINForm 'RbDecl ' Me.RbDecl.AutoSize = True - Me.RbDecl.Location = New System.Drawing.Point(6, 19) + Me.RbDecl.Location = New Point(6, 19) Me.RbDecl.Name = "RbDecl" - Me.RbDecl.Size = New System.Drawing.Size(109, 17) + Me.RbDecl.Size = New Size(109, 17) Me.RbDecl.TabIndex = 0 Me.RbDecl.TabStop = True Me.RbDecl.Text = "Declaration Mode" @@ -653,17 +656,17 @@ Partial Class F_MAINForm Me.PnDeclOpt.Controls.Add(Me.CbBatch) Me.PnDeclOpt.Controls.Add(Me.ChBoxCyclDistCor) Me.PnDeclOpt.Controls.Add(Me.ChBoxUseGears) - Me.PnDeclOpt.Location = New System.Drawing.Point(3, 81) + Me.PnDeclOpt.Location = New Point(3, 81) Me.PnDeclOpt.Name = "PnDeclOpt" - Me.PnDeclOpt.Size = New System.Drawing.Size(202, 72) + Me.PnDeclOpt.Size = New Size(202, 72) Me.PnDeclOpt.TabIndex = 13 ' 'CbBatch ' Me.CbBatch.AutoSize = True - Me.CbBatch.Location = New System.Drawing.Point(6, 3) + Me.CbBatch.Location = New Point(6, 3) Me.CbBatch.Name = "CbBatch" - Me.CbBatch.Size = New System.Drawing.Size(84, 17) + Me.CbBatch.Size = New Size(84, 17) Me.CbBatch.TabIndex = 15 Me.CbBatch.Text = "Batch Mode" Me.CbBatch.UseVisualStyleBackColor = True @@ -671,9 +674,9 @@ Partial Class F_MAINForm 'ChBoxCyclDistCor ' Me.ChBoxCyclDistCor.AutoSize = True - Me.ChBoxCyclDistCor.Location = New System.Drawing.Point(6, 26) + Me.ChBoxCyclDistCor.Location = New Point(6, 26) Me.ChBoxCyclDistCor.Name = "ChBoxCyclDistCor" - Me.ChBoxCyclDistCor.Size = New System.Drawing.Size(148, 17) + Me.ChBoxCyclDistCor.Size = New Size(148, 17) Me.ChBoxCyclDistCor.TabIndex = 0 Me.ChBoxCyclDistCor.Text = "Cycle Distance Correction" Me.ChBoxCyclDistCor.UseVisualStyleBackColor = True @@ -681,9 +684,9 @@ Partial Class F_MAINForm 'ChBoxUseGears ' Me.ChBoxUseGears.AutoSize = True - Me.ChBoxUseGears.Location = New System.Drawing.Point(6, 49) + Me.ChBoxUseGears.Location = New Point(6, 49) Me.ChBoxUseGears.Name = "ChBoxUseGears" - Me.ChBoxUseGears.Size = New System.Drawing.Size(188, 17) + 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 @@ -692,39 +695,39 @@ Partial Class F_MAINForm ' Me.TabPageDEV.Controls.Add(Me.Label1) Me.TabPageDEV.Controls.Add(Me.LvDEVoptions) - Me.TabPageDEV.Location = New System.Drawing.Point(4, 22) + Me.TabPageDEV.Location = New Point(4, 22) Me.TabPageDEV.Name = "TabPageDEV" - Me.TabPageDEV.Padding = New System.Windows.Forms.Padding(3) - Me.TabPageDEV.Size = New System.Drawing.Size(1034, 302) + Me.TabPageDEV.Padding = New Padding(3) + Me.TabPageDEV.Size = New Size(1034, 302) Me.TabPageDEV.TabIndex = 3 Me.TabPageDEV.Text = "Test" Me.TabPageDEV.UseVisualStyleBackColor = True ' 'Label1 ' - Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.Label1.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles) Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(1012, 283) + Me.Label1.Location = New Point(1012, 283) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(106, 13) + Me.Label1.Size = New Size(106, 13) Me.Label1.TabIndex = 1 Me.Label1.Text = "(Double-Click to Edit)" ' 'LvDEVoptions ' - 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.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.FullRowSelect = True Me.LvDEVoptions.GridLines = True - Me.LvDEVoptions.Location = New System.Drawing.Point(6, 6) + Me.LvDEVoptions.Location = New Point(6, 6) Me.LvDEVoptions.MultiSelect = False Me.LvDEVoptions.Name = "LvDEVoptions" - Me.LvDEVoptions.Size = New System.Drawing.Size(1022, 277) + Me.LvDEVoptions.Size = New Size(1022, 277) Me.LvDEVoptions.TabIndex = 0 Me.LvDEVoptions.UseCompatibleStateImageBehavior = False - Me.LvDEVoptions.View = System.Windows.Forms.View.Details + Me.LvDEVoptions.View = View.Details ' 'ColumnHeader4 ' @@ -758,32 +761,32 @@ Partial Class F_MAINForm ' 'ConMenFilelist ' - Me.ConMenFilelist.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.SaveListToolStripMenuItem, Me.LoadListToolStripMenuItem, Me.LoadDefaultListToolStripMenuItem, Me.ClearListToolStripMenuItem}) + Me.ConMenFilelist.Items.AddRange(New ToolStripItem() {Me.SaveListToolStripMenuItem, Me.LoadListToolStripMenuItem, Me.LoadDefaultListToolStripMenuItem, Me.ClearListToolStripMenuItem}) Me.ConMenFilelist.Name = "ConMenFilelist" - Me.ConMenFilelist.Size = New System.Drawing.Size(176, 92) + Me.ConMenFilelist.Size = New Size(176, 92) ' 'SaveListToolStripMenuItem ' Me.SaveListToolStripMenuItem.Name = "SaveListToolStripMenuItem" - Me.SaveListToolStripMenuItem.Size = New System.Drawing.Size(175, 22) + Me.SaveListToolStripMenuItem.Size = New Size(175, 22) Me.SaveListToolStripMenuItem.Text = "Save List..." ' 'LoadListToolStripMenuItem ' Me.LoadListToolStripMenuItem.Name = "LoadListToolStripMenuItem" - Me.LoadListToolStripMenuItem.Size = New System.Drawing.Size(175, 22) + Me.LoadListToolStripMenuItem.Size = New Size(175, 22) Me.LoadListToolStripMenuItem.Text = "Load List..." ' 'LoadDefaultListToolStripMenuItem ' Me.LoadDefaultListToolStripMenuItem.Name = "LoadDefaultListToolStripMenuItem" - Me.LoadDefaultListToolStripMenuItem.Size = New System.Drawing.Size(175, 22) + Me.LoadDefaultListToolStripMenuItem.Size = New Size(175, 22) Me.LoadDefaultListToolStripMenuItem.Text = "Load Autosave-List" ' 'ClearListToolStripMenuItem ' Me.ClearListToolStripMenuItem.Name = "ClearListToolStripMenuItem" - Me.ClearListToolStripMenuItem.Size = New System.Drawing.Size(175, 22) + Me.ClearListToolStripMenuItem.Size = New Size(175, 22) Me.ClearListToolStripMenuItem.Text = "Clear List" ' 'BackgroundWorker1 @@ -792,21 +795,21 @@ Partial Class F_MAINForm 'LvMsg ' Me.LvMsg.AllowColumnReorder = True - 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.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.FullRowSelect = True Me.LvMsg.GridLines = True - Me.LvMsg.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable + Me.LvMsg.HeaderStyle = ColumnHeaderStyle.Nonclickable Me.LvMsg.LabelWrap = False - Me.LvMsg.Location = New System.Drawing.Point(0, 0) - Me.LvMsg.Margin = New System.Windows.Forms.Padding(0) + Me.LvMsg.Location = New Point(0, 0) + Me.LvMsg.Margin = New Padding(0) Me.LvMsg.Name = "LvMsg" - Me.LvMsg.Size = New System.Drawing.Size(1045, 281) + Me.LvMsg.Size = New Size(1045, 281) Me.LvMsg.TabIndex = 0 Me.LvMsg.UseCompatibleStateImageBehavior = False - Me.LvMsg.View = System.Windows.Forms.View.Details + Me.LvMsg.View = View.Details ' 'ColumnHeader1 ' @@ -825,184 +828,184 @@ Partial Class F_MAINForm ' 'SplitContainer1 ' - 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.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.Name = "SplitContainer1" - Me.SplitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal + Me.SplitContainer1.Orientation = Orientation.Horizontal ' 'SplitContainer1.Panel1 ' Me.SplitContainer1.Panel1.Controls.Add(Me.TabControl1) - Me.SplitContainer1.Panel1.Padding = New System.Windows.Forms.Padding(3, 3, 0, 2) + Me.SplitContainer1.Panel1.Padding = New Padding(3, 3, 0, 2) ' 'SplitContainer1.Panel2 ' Me.SplitContainer1.Panel2.Controls.Add(Me.LvMsg) - Me.SplitContainer1.Size = New System.Drawing.Size(1045, 618) + Me.SplitContainer1.Size = New Size(1045, 618) Me.SplitContainer1.SplitterDistance = 333 Me.SplitContainer1.TabIndex = 12 ' 'ToolStrip1 ' - 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.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.Name = "ToolStrip1" - Me.ToolStrip1.Size = New System.Drawing.Size(1045, 25) + Me.ToolStrip1.Size = New Size(1045, 25) Me.ToolStrip1.TabIndex = 11 Me.ToolStrip1.Text = "ToolStrip1" ' 'ToolStripBtNew ' - Me.ToolStripBtNew.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripBtNew.Image = Global.VECTO.My.Resources.Resources.blue_document_icon - Me.ToolStripBtNew.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripBtNew.DisplayStyle = ToolStripItemDisplayStyle.Image + Me.ToolStripBtNew.Image = My.Resources.Resources.blue_document_icon + Me.ToolStripBtNew.ImageTransparentColor = Color.Magenta Me.ToolStripBtNew.Name = "ToolStripBtNew" - Me.ToolStripBtNew.Size = New System.Drawing.Size(23, 22) + Me.ToolStripBtNew.Size = New Size(23, 22) Me.ToolStripBtNew.Text = "ToolStripBtNew" Me.ToolStripBtNew.ToolTipText = "New Job File" ' 'ToolStripBtOpen ' - Me.ToolStripBtOpen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripBtOpen.Image = Global.VECTO.My.Resources.Resources.Open_icon - Me.ToolStripBtOpen.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripBtOpen.DisplayStyle = ToolStripItemDisplayStyle.Image + Me.ToolStripBtOpen.Image = My.Resources.Resources.Open_icon + Me.ToolStripBtOpen.ImageTransparentColor = Color.Magenta Me.ToolStripBtOpen.Name = "ToolStripBtOpen" - Me.ToolStripBtOpen.Size = New System.Drawing.Size(23, 22) + Me.ToolStripBtOpen.Size = New Size(23, 22) Me.ToolStripBtOpen.Text = "ToolStripButton1" Me.ToolStripBtOpen.ToolTipText = "Open File..." ' 'ToolStripSeparator2 ' Me.ToolStripSeparator2.Name = "ToolStripSeparator2" - Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 25) + Me.ToolStripSeparator2.Size = New Size(6, 25) ' 'ToolStripDrDnBtTools ' - 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.VECTO.My.Resources.Resources.Misc_Tools_icon - Me.ToolStripDrDnBtTools.ImageTransparentColor = System.Drawing.Color.Magenta + 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.Name = "ToolStripDrDnBtTools" - Me.ToolStripDrDnBtTools.Size = New System.Drawing.Size(65, 22) + Me.ToolStripDrDnBtTools.Size = New Size(65, 22) Me.ToolStripDrDnBtTools.Text = "Tools" ' 'GENEditorToolStripMenuItem1 ' - Me.GENEditorToolStripMenuItem1.Image = Global.VECTO.My.Resources.Resources.F_VECTO + Me.GENEditorToolStripMenuItem1.Image = My.Resources.Resources.F_VECTO Me.GENEditorToolStripMenuItem1.Name = "GENEditorToolStripMenuItem1" - Me.GENEditorToolStripMenuItem1.Size = New System.Drawing.Size(170, 22) + Me.GENEditorToolStripMenuItem1.Size = New Size(170, 22) Me.GENEditorToolStripMenuItem1.Text = "Job Editor" ' 'VEHEditorToolStripMenuItem ' - Me.VEHEditorToolStripMenuItem.Image = Global.VECTO.My.Resources.Resources.F_VEH + Me.VEHEditorToolStripMenuItem.Image = My.Resources.Resources.F_VEH Me.VEHEditorToolStripMenuItem.Name = "VEHEditorToolStripMenuItem" - Me.VEHEditorToolStripMenuItem.Size = New System.Drawing.Size(170, 22) + Me.VEHEditorToolStripMenuItem.Size = New Size(170, 22) Me.VEHEditorToolStripMenuItem.Text = "Vehicle Editor" ' 'EngineEditorToolStripMenuItem ' - Me.EngineEditorToolStripMenuItem.Image = Global.VECTO.My.Resources.Resources.F_ENG + Me.EngineEditorToolStripMenuItem.Image = My.Resources.Resources.F_ENG Me.EngineEditorToolStripMenuItem.Name = "EngineEditorToolStripMenuItem" - Me.EngineEditorToolStripMenuItem.Size = New System.Drawing.Size(170, 22) + Me.EngineEditorToolStripMenuItem.Size = New Size(170, 22) Me.EngineEditorToolStripMenuItem.Text = "Engine Editor" ' 'GearboxEditorToolStripMenuItem ' - Me.GearboxEditorToolStripMenuItem.Image = Global.VECTO.My.Resources.Resources.F_GBX + Me.GearboxEditorToolStripMenuItem.Image = My.Resources.Resources.F_GBX Me.GearboxEditorToolStripMenuItem.Name = "GearboxEditorToolStripMenuItem" - Me.GearboxEditorToolStripMenuItem.Size = New System.Drawing.Size(170, 22) + Me.GearboxEditorToolStripMenuItem.Size = New Size(170, 22) Me.GearboxEditorToolStripMenuItem.Text = "Gearbox Editor" ' 'GraphToolStripMenuItem ' - Me.GraphToolStripMenuItem.Image = Global.VECTO.My.Resources.Resources.F_Graph + Me.GraphToolStripMenuItem.Image = My.Resources.Resources.F_Graph Me.GraphToolStripMenuItem.Name = "GraphToolStripMenuItem" - Me.GraphToolStripMenuItem.Size = New System.Drawing.Size(170, 22) + Me.GraphToolStripMenuItem.Size = New Size(170, 22) Me.GraphToolStripMenuItem.Text = "Graph" ' 'ToolStripSeparator6 ' Me.ToolStripSeparator6.Name = "ToolStripSeparator6" - Me.ToolStripSeparator6.Size = New System.Drawing.Size(167, 6) + Me.ToolStripSeparator6.Size = New Size(167, 6) ' 'SignOrVerifyFilesToolStripMenuItem ' - Me.SignOrVerifyFilesToolStripMenuItem.Image = Global.VECTO.My.Resources.Resources.Status_dialog_password_icon + Me.SignOrVerifyFilesToolStripMenuItem.Image = My.Resources.Resources.Status_dialog_password_icon Me.SignOrVerifyFilesToolStripMenuItem.Name = "SignOrVerifyFilesToolStripMenuItem" - Me.SignOrVerifyFilesToolStripMenuItem.Size = New System.Drawing.Size(170, 22) + Me.SignOrVerifyFilesToolStripMenuItem.Size = New Size(170, 22) Me.SignOrVerifyFilesToolStripMenuItem.Text = "Sign or Verify Files" ' 'ToolStripSeparator4 ' Me.ToolStripSeparator4.Name = "ToolStripSeparator4" - Me.ToolStripSeparator4.Size = New System.Drawing.Size(167, 6) + Me.ToolStripSeparator4.Size = New Size(167, 6) Me.ToolStripSeparator4.Visible = False ' 'OpenLogToolStripMenuItem ' Me.OpenLogToolStripMenuItem.Name = "OpenLogToolStripMenuItem" - Me.OpenLogToolStripMenuItem.Size = New System.Drawing.Size(170, 22) + Me.OpenLogToolStripMenuItem.Size = New Size(170, 22) Me.OpenLogToolStripMenuItem.Text = "Open Log" ' 'SettingsToolStripMenuItem ' Me.SettingsToolStripMenuItem.Name = "SettingsToolStripMenuItem" - Me.SettingsToolStripMenuItem.Size = New System.Drawing.Size(170, 22) + Me.SettingsToolStripMenuItem.Size = New Size(170, 22) Me.SettingsToolStripMenuItem.Text = "Settings" ' 'ToolStripDrDnBtInfo ' - 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.VECTO.My.Resources.Resources.Help_icon - Me.ToolStripDrDnBtInfo.ImageTransparentColor = System.Drawing.Color.Magenta + 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.Name = "ToolStripDrDnBtInfo" - Me.ToolStripDrDnBtInfo.Size = New System.Drawing.Size(61, 22) + Me.ToolStripDrDnBtInfo.Size = New Size(61, 22) Me.ToolStripDrDnBtInfo.Text = "Help" ' 'UserManualToolStripMenuItem ' Me.UserManualToolStripMenuItem.Name = "UserManualToolStripMenuItem" - Me.UserManualToolStripMenuItem.Size = New System.Drawing.Size(222, 22) + Me.UserManualToolStripMenuItem.Size = New Size(222, 22) Me.UserManualToolStripMenuItem.Text = "User Manual" ' 'UpdateNotesToolStripMenuItem ' Me.UpdateNotesToolStripMenuItem.Name = "UpdateNotesToolStripMenuItem" - Me.UpdateNotesToolStripMenuItem.Size = New System.Drawing.Size(222, 22) + Me.UpdateNotesToolStripMenuItem.Size = New Size(222, 22) Me.UpdateNotesToolStripMenuItem.Text = "Release Notes" ' 'ReportBugViaCITnetToolStripMenuItem ' Me.ReportBugViaCITnetToolStripMenuItem.Name = "ReportBugViaCITnetToolStripMenuItem" - Me.ReportBugViaCITnetToolStripMenuItem.Size = New System.Drawing.Size(222, 22) + Me.ReportBugViaCITnetToolStripMenuItem.Size = New Size(222, 22) Me.ReportBugViaCITnetToolStripMenuItem.Text = "Report Bug via CITnet / JIRA" ' 'ToolStripSeparator3 ' Me.ToolStripSeparator3.Name = "ToolStripSeparator3" - Me.ToolStripSeparator3.Size = New System.Drawing.Size(219, 6) + Me.ToolStripSeparator3.Size = New Size(219, 6) ' 'CreateActivationFileToolStripMenuItem ' Me.CreateActivationFileToolStripMenuItem.Name = "CreateActivationFileToolStripMenuItem" - Me.CreateActivationFileToolStripMenuItem.Size = New System.Drawing.Size(222, 22) + Me.CreateActivationFileToolStripMenuItem.Size = New Size(222, 22) Me.CreateActivationFileToolStripMenuItem.Text = "Create Activation File" ' 'AboutVECTOToolStripMenuItem1 ' Me.AboutVECTOToolStripMenuItem1.Name = "AboutVECTOToolStripMenuItem1" - Me.AboutVECTOToolStripMenuItem1.Size = New System.Drawing.Size(222, 22) + Me.AboutVECTOToolStripMenuItem1.Size = New Size(222, 22) Me.AboutVECTOToolStripMenuItem1.Text = "About VECTO" ' 'CmDEV ' Me.CmDEV.Name = "CmDEV" - Me.CmDEV.Size = New System.Drawing.Size(61, 4) + Me.CmDEV.Size = New Size(61, 4) ' 'TmProgSec ' @@ -1010,39 +1013,39 @@ Partial Class F_MAINForm ' 'CmOpenFile ' - Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.OpenInGraphWindowToolStripMenuItem, Me.ShowInFolderToolStripMenuItem}) + Me.CmOpenFile.Items.AddRange(New ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.OpenInGraphWindowToolStripMenuItem, Me.ShowInFolderToolStripMenuItem}) Me.CmOpenFile.Name = "CmOpenFile" - Me.CmOpenFile.Size = New System.Drawing.Size(199, 70) + Me.CmOpenFile.Size = New Size(199, 70) ' 'OpenWithToolStripMenuItem ' Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem" - Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(198, 22) + Me.OpenWithToolStripMenuItem.Size = New Size(198, 22) Me.OpenWithToolStripMenuItem.Text = "Open with ..." ' 'OpenInGraphWindowToolStripMenuItem ' Me.OpenInGraphWindowToolStripMenuItem.Name = "OpenInGraphWindowToolStripMenuItem" - Me.OpenInGraphWindowToolStripMenuItem.Size = New System.Drawing.Size(198, 22) + Me.OpenInGraphWindowToolStripMenuItem.Size = New Size(198, 22) Me.OpenInGraphWindowToolStripMenuItem.Text = "Open in Graph Window" ' 'ShowInFolderToolStripMenuItem ' Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem" - Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(198, 22) + Me.ShowInFolderToolStripMenuItem.Size = New Size(198, 22) Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder" ' 'F_MAINForm ' Me.AcceptButton = Me.btStartV3 - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(1045, 670) + Me.AutoScaleDimensions = New SizeF(6.0!, 13.0!) + Me.AutoScaleMode = AutoScaleMode.Font + Me.ClientSize = New 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"), System.Drawing.Icon) - Me.MinimumSize = New System.Drawing.Size(785, 485) + Me.Icon = CType(resources.GetObject("$this.Icon"), Icon) + Me.MinimumSize = New Size(785, 485) Me.Name = "F_MAINForm" Me.Text = "VECTO" Me.StatusBAR.ResumeLayout(False) @@ -1050,7 +1053,7 @@ Partial Class F_MAINForm Me.TabControl1.ResumeLayout(False) Me.TabPageGEN.ResumeLayout(False) Me.TabPageGEN.PerformLayout() - CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PictureBox1, ISupportInitialize).EndInit() Me.TabPageDRI.ResumeLayout(False) Me.TabPageDRI.PerformLayout() Me.TabPgOptions.ResumeLayout(False) @@ -1068,7 +1071,7 @@ Partial Class F_MAINForm Me.ConMenFilelist.ResumeLayout(False) Me.SplitContainer1.Panel1.ResumeLayout(False) Me.SplitContainer1.Panel2.ResumeLayout(False) - CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.SplitContainer1, ISupportInitialize).EndInit() Me.SplitContainer1.ResumeLayout(False) Me.ToolStrip1.ResumeLayout(False) Me.ToolStrip1.PerformLayout() @@ -1077,112 +1080,112 @@ Partial Class F_MAINForm Me.PerformLayout() End Sub - Friend WithEvents StatusBAR As System.Windows.Forms.StatusStrip - Friend WithEvents ToolStripLbStatus As System.Windows.Forms.ToolStripStatusLabel - Friend WithEvents TabControl1 As System.Windows.Forms.TabControl - Friend WithEvents TabPageGEN As System.Windows.Forms.TabPage - Friend WithEvents TabPageDRI As System.Windows.Forms.TabPage - Friend WithEvents ButtonGENadd As System.Windows.Forms.Button - Friend WithEvents ButtonGENremove As System.Windows.Forms.Button - Friend WithEvents ButtonDRIremove As System.Windows.Forms.Button - Friend WithEvents ButtonDRIadd As System.Windows.Forms.Button - Friend WithEvents ConMenFilelist As System.Windows.Forms.ContextMenuStrip - Friend WithEvents SaveListToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents LoadListToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents LoadDefaultListToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents ClearListToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents BackgroundWorker1 As System.ComponentModel.BackgroundWorker - Friend WithEvents ToolStripProgBarOverall As System.Windows.Forms.ToolStripProgressBar - Friend WithEvents LvGEN As System.Windows.Forms.ListView - Friend WithEvents ColGENpath As System.Windows.Forms.ColumnHeader - Friend WithEvents ColGENstatus As System.Windows.Forms.ColumnHeader - Friend WithEvents LvDRI As System.Windows.Forms.ListView - Friend WithEvents ColDRIpath As System.Windows.Forms.ColumnHeader - Friend WithEvents ColDRIstatus As System.Windows.Forms.ColumnHeader - Friend WithEvents ChBoxAllGEN As System.Windows.Forms.CheckBox - Friend WithEvents ChBoxAllDRI As System.Windows.Forms.CheckBox - Friend WithEvents TabPgOptions As System.Windows.Forms.TabPage - Friend WithEvents ChBoxModOut As System.Windows.Forms.CheckBox - Friend WithEvents ChBoxUseGears As System.Windows.Forms.CheckBox - Friend WithEvents ChBoxCyclDistCor As System.Windows.Forms.CheckBox - Friend WithEvents PanelOptAllg As System.Windows.Forms.Panel - Friend WithEvents LbAutoShDown As System.Windows.Forms.Label - Friend WithEvents ChBoxAutoSD As System.Windows.Forms.CheckBox - Friend WithEvents TbBOpath As System.Windows.Forms.TextBox - Friend WithEvents CbBOmode As System.Windows.Forms.ComboBox - Friend WithEvents Label2 As System.Windows.Forms.Label - Friend WithEvents ButBObrowse As System.Windows.Forms.Button - Friend WithEvents ChBoxBatchSubD As System.Windows.Forms.CheckBox - Friend WithEvents LvMsg As System.Windows.Forms.ListView - Friend WithEvents ColumnHeader1 As System.Windows.Forms.ColumnHeader - Friend WithEvents SplitContainer1 As System.Windows.Forms.SplitContainer - Friend WithEvents ColumnHeader2 As System.Windows.Forms.ColumnHeader - Friend WithEvents ColumnHeader3 As System.Windows.Forms.ColumnHeader - Friend WithEvents GrBoxBATCH As System.Windows.Forms.GroupBox - Friend WithEvents TabPageDEV As System.Windows.Forms.TabPage - Friend WithEvents LvDEVoptions As System.Windows.Forms.ListView - Friend WithEvents ColumnHeader4 As System.Windows.Forms.ColumnHeader - Friend WithEvents ColumnHeader5 As System.Windows.Forms.ColumnHeader - Friend WithEvents ColumnHeader6 As System.Windows.Forms.ColumnHeader - Friend WithEvents CmDEV As System.Windows.Forms.ContextMenuStrip - Friend WithEvents ColumnHeader7 As System.Windows.Forms.ColumnHeader - Friend WithEvents BtGENup As System.Windows.Forms.Button - Friend WithEvents BtGENdown As System.Windows.Forms.Button - Friend WithEvents BtDRIdown As System.Windows.Forms.Button - Friend WithEvents BtDRIup As System.Windows.Forms.Button - Friend WithEvents ToolStrip1 As System.Windows.Forms.ToolStrip - Friend WithEvents ToolStripBtNew As System.Windows.Forms.ToolStripButton - Friend WithEvents ToolStripBtOpen As System.Windows.Forms.ToolStripButton - Friend WithEvents ToolStripDrDnBtTools As System.Windows.Forms.ToolStripDropDownButton - Friend WithEvents GENEditorToolStripMenuItem1 As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents VEHEditorToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents ToolStripSeparator4 As System.Windows.Forms.ToolStripSeparator - Friend WithEvents OpenLogToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents SettingsToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents ToolStripDrDnBtInfo As System.Windows.Forms.ToolStripDropDownButton - Friend WithEvents CreateActivationFileToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents AboutVECTOToolStripMenuItem1 As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents ToolStripSeparator2 As System.Windows.Forms.ToolStripSeparator - Friend WithEvents ToolStripProgBarJob As System.Windows.Forms.ToolStripProgressBar - Friend WithEvents TmProgSec As System.Windows.Forms.Timer - Friend WithEvents PictureBox1 As System.Windows.Forms.PictureBox - Friend WithEvents EngineEditorToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents GearboxEditorToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents UserManualToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents ToolStripSeparator3 As System.Windows.Forms.ToolStripSeparator - Friend WithEvents CmOpenFile As System.Windows.Forms.ContextMenuStrip - Friend WithEvents OpenWithToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents ShowInFolderToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents ColumnHeader8 As System.Windows.Forms.ColumnHeader - Friend WithEvents ColumnHeader9 As System.Windows.Forms.ColumnHeader - Friend WithEvents UpdateNotesToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents SignOrVerifyFilesToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents ToolStripSeparator6 As System.Windows.Forms.ToolStripSeparator - Friend WithEvents GrBoxSTD As System.Windows.Forms.GroupBox - Friend WithEvents PnDeclOpt As System.Windows.Forms.Panel - Friend WithEvents LbDecl As System.Windows.Forms.Label - Friend WithEvents GraphToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents OpenInGraphWindowToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents CbBatch As System.Windows.Forms.CheckBox - Friend WithEvents RbDev As System.Windows.Forms.RadioButton - Friend WithEvents RbDecl As System.Windows.Forms.RadioButton - Friend WithEvents GroupBox1 As System.Windows.Forms.GroupBox - Friend WithEvents Label1 As System.Windows.Forms.Label - Friend WithEvents ReportBugViaCITnetToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents btStartV3 As System.Windows.Forms.Button - Friend WithEvents ChBoxMod1Hz As System.Windows.Forms.CheckBox - Friend WithEvents Label6 As System.Windows.Forms.Label - Friend WithEvents ToolTip1 As System.Windows.Forms.ToolTip - Friend WithEvents NewToolStripButton As System.Windows.Forms.ToolStripButton - Friend WithEvents OpenToolStripButton As System.Windows.Forms.ToolStripButton - Friend WithEvents SaveToolStripButton As System.Windows.Forms.ToolStripButton - Friend WithEvents PrintToolStripButton As System.Windows.Forms.ToolStripButton - Friend WithEvents toolStripSeparator As System.Windows.Forms.ToolStripSeparator - Friend WithEvents CutToolStripButton As System.Windows.Forms.ToolStripButton - Friend WithEvents CopyToolStripButton As System.Windows.Forms.ToolStripButton - Friend WithEvents PasteToolStripButton As System.Windows.Forms.ToolStripButton - Friend WithEvents toolStripSeparator1 As System.Windows.Forms.ToolStripSeparator - Friend WithEvents HelpToolStripButton As System.Windows.Forms.ToolStripButton - Friend WithEvents Label3 As System.Windows.Forms.Label + Friend WithEvents StatusBAR As StatusStrip + 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 + Friend WithEvents LoadDefaultListToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ClearListToolStripMenuItem As ToolStripMenuItem + Friend WithEvents BackgroundWorker1 As BackgroundWorker + Friend WithEvents ToolStripProgBarOverall As ToolStripProgressBar + 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 + Friend WithEvents ColumnHeader5 As ColumnHeader + Friend WithEvents ColumnHeader6 As ColumnHeader + Friend WithEvents CmDEV As ContextMenuStrip + 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 + Friend WithEvents ToolStripDrDnBtTools As ToolStripDropDownButton + Friend WithEvents GENEditorToolStripMenuItem1 As ToolStripMenuItem + Friend WithEvents VEHEditorToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ToolStripSeparator4 As ToolStripSeparator + Friend WithEvents OpenLogToolStripMenuItem As ToolStripMenuItem + Friend WithEvents SettingsToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ToolStripDrDnBtInfo As ToolStripDropDownButton + Friend WithEvents CreateActivationFileToolStripMenuItem As ToolStripMenuItem + Friend WithEvents AboutVECTOToolStripMenuItem1 As ToolStripMenuItem + Friend WithEvents ToolStripSeparator2 As ToolStripSeparator + Friend WithEvents ToolStripProgBarJob As ToolStripProgressBar + Friend WithEvents TmProgSec As Timer + Friend WithEvents PictureBox1 As PictureBox + Friend WithEvents EngineEditorToolStripMenuItem As ToolStripMenuItem + Friend WithEvents GearboxEditorToolStripMenuItem As ToolStripMenuItem + Friend WithEvents UserManualToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ToolStripSeparator3 As ToolStripSeparator + Friend WithEvents CmOpenFile As ContextMenuStrip + Friend WithEvents OpenWithToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ShowInFolderToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ColumnHeader8 As ColumnHeader + Friend WithEvents ColumnHeader9 As ColumnHeader + 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 + Friend WithEvents Label1 As Label + Friend WithEvents ReportBugViaCITnetToolStripMenuItem As ToolStripMenuItem + Friend WithEvents btStartV3 As Button + Friend WithEvents ChBoxMod1Hz As CheckBox + Friend WithEvents Label6 As Label + Friend WithEvents ToolTip1 As ToolTip + Friend WithEvents NewToolStripButton As ToolStripButton + Friend WithEvents OpenToolStripButton As ToolStripButton + Friend WithEvents SaveToolStripButton As ToolStripButton + Friend WithEvents PrintToolStripButton As ToolStripButton + Friend WithEvents toolStripSeparator As ToolStripSeparator + Friend WithEvents CutToolStripButton As ToolStripButton + Friend WithEvents CopyToolStripButton As ToolStripButton + Friend WithEvents PasteToolStripButton As ToolStripButton + Friend WithEvents toolStripSeparator1 As ToolStripSeparator + Friend WithEvents HelpToolStripButton As ToolStripButton + Friend WithEvents Label3 As Label End Class diff --git a/VECTO/GUI/F_MAINForm.vb b/VECTO/GUI/F_MAINForm.vb index 57fc0286be87d01ad3ac2aec362b512ff60a9e99..b3452ce30f190343d38469b149c00634c2d66f12 100644 --- a/VECTO/GUI/F_MAINForm.vb +++ b/VECTO/GUI/F_MAINForm.vb @@ -32,7 +32,6 @@ Imports System.Collections.Generic Imports System.Collections.ObjectModel Imports System.ComponentModel -Imports System.Globalization Imports System.IO Imports System.Linq Imports System.Reflection @@ -610,7 +609,7 @@ Public Class F_MAINForm 'End If 'VECTO Init - Declaration.Init() + 'Declaration.Init() 'Command Line Args If Command() <> "" Then @@ -630,7 +629,7 @@ Public Class F_MAINForm Dim bRUN As Boolean Dim x As Object Dim str As String - Dim ComFile As String = "" + Dim ComFile As String Dim vecFiles As New List(Of String) Dim driFiles As New List(Of String) @@ -1831,7 +1830,7 @@ lbFound: file.WriteLine(LVbox.Items(x - 1).SubItems(0).Text, Math.Abs(CInt(LVbox.Items(x - 1).Checked))) Next file.Close() - file = Nothing + End Sub Public Sub LoadList(Optional ByVal Path As String = "") @@ -2206,6 +2205,10 @@ 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 + 'Me.Invoke(New MsgToFormDelegate(AddressOf MSGtoForm), ID, Msg, Source, Link) + Exit Sub + End If Dim lv0 As ListViewItem lv0 = New ListViewItem diff --git a/VECTO/GUI/F_Settings.Designer.vb b/VECTO/GUI/F_Settings.Designer.vb index 94a69ec499451c439fdbc76352da590f6ee53423..22886baed77d91e4c996958cf622fb327f787c29 100644 --- a/VECTO/GUI/F_Settings.Designer.vb +++ b/VECTO/GUI/F_Settings.Designer.vb @@ -1,51 +1,55 @@ -<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _ +Imports System.ComponentModel +Imports Microsoft.VisualBasic.CompilerServices +Imports TUGraz.VECTO.My.Resources + +<DesignerGenerated()> _ Partial Class F_Settings - Inherits System.Windows.Forms.Form + Inherits Form - 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - <System.Diagnostics.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 + '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 System.ComponentModel.IContainer + '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. - <System.Diagnostics.DebuggerStepThrough()> _ - Private Sub InitializeComponent() - Me.ButtonOK = New System.Windows.Forms.Button() - Me.ButtonCancel = New System.Windows.Forms.Button() - Me.GroupBox3 = New System.Windows.Forms.GroupBox() - Me.GroupBox5 = New System.Windows.Forms.GroupBox() - Me.TbOpenCmdName = New System.Windows.Forms.TextBox() - Me.Label7 = New System.Windows.Forms.Label() - Me.TbOpenCmd = New System.Windows.Forms.TextBox() - Me.Label12 = New System.Windows.Forms.Label() - Me.TextBoxLogSize = New System.Windows.Forms.TextBox() - Me.Label16 = New System.Windows.Forms.Label() - Me.TabControl1 = New System.Windows.Forms.TabControl() - Me.TabPage2 = New System.Windows.Forms.TabPage() - Me.GrCalc = New System.Windows.Forms.GroupBox() - Me.Label11 = New System.Windows.Forms.Label() - Me.Label9 = New System.Windows.Forms.Label() - Me.Label3 = New System.Windows.Forms.Label() - Me.TbCO2toFC = New System.Windows.Forms.TextBox() - Me.Label10 = New System.Windows.Forms.Label() - Me.TbFuelDens = New System.Windows.Forms.TextBox() - Me.Label8 = New System.Windows.Forms.Label() - Me.TbAirDensity = New System.Windows.Forms.TextBox() - Me.Label2 = New System.Windows.Forms.Label() - Me.ButReset = New System.Windows.Forms.Button() - Me.BtHelp = New System.Windows.Forms.Button() + '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.ButtonOK = New Button() + Me.ButtonCancel = New Button() + Me.GroupBox3 = New GroupBox() + Me.GroupBox5 = New GroupBox() + Me.TbOpenCmdName = New TextBox() + Me.Label7 = New Label() + Me.TbOpenCmd = New TextBox() + Me.Label12 = New Label() + Me.TextBoxLogSize = New TextBox() + Me.Label16 = New Label() + Me.TabControl1 = New TabControl() + Me.TabPage2 = New TabPage() + Me.GrCalc = New GroupBox() + Me.Label11 = New Label() + Me.Label9 = New Label() + Me.Label3 = New Label() + Me.TbCO2toFC = New TextBox() + Me.Label10 = New Label() + Me.TbFuelDens = New TextBox() + Me.Label8 = New Label() + Me.TbAirDensity = New TextBox() + Me.Label2 = New Label() + Me.ButReset = New Button() + Me.BtHelp = New Button() Me.GroupBox3.SuspendLayout() Me.GroupBox5.SuspendLayout() Me.TabControl1.SuspendLayout() @@ -55,21 +59,21 @@ Partial Class F_Settings ' 'ButtonOK ' - Me.ButtonOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.ButtonOK.Location = New System.Drawing.Point(347, 278) + Me.ButtonOK.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles) + Me.ButtonOK.Location = New Point(347, 278) Me.ButtonOK.Name = "ButtonOK" - Me.ButtonOK.Size = New System.Drawing.Size(75, 24) + Me.ButtonOK.Size = New Size(75, 24) Me.ButtonOK.TabIndex = 2 Me.ButtonOK.Text = "OK" Me.ButtonOK.UseVisualStyleBackColor = True ' 'ButtonCancel ' - Me.ButtonCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.ButtonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel - Me.ButtonCancel.Location = New System.Drawing.Point(428, 278) + Me.ButtonCancel.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles) + Me.ButtonCancel.DialogResult = DialogResult.Cancel + Me.ButtonCancel.Location = New Point(428, 278) Me.ButtonCancel.Name = "ButtonCancel" - Me.ButtonCancel.Size = New System.Drawing.Size(75, 24) + Me.ButtonCancel.Size = New Size(75, 24) Me.ButtonCancel.TabIndex = 3 Me.ButtonCancel.Text = "Cancel" Me.ButtonCancel.UseVisualStyleBackColor = True @@ -79,9 +83,9 @@ Partial Class F_Settings Me.GroupBox3.Controls.Add(Me.GroupBox5) Me.GroupBox3.Controls.Add(Me.TextBoxLogSize) Me.GroupBox3.Controls.Add(Me.Label16) - Me.GroupBox3.Location = New System.Drawing.Point(5, 6) + Me.GroupBox3.Location = New Point(5, 6) Me.GroupBox3.Name = "GroupBox3" - Me.GroupBox3.Size = New System.Drawing.Size(489, 124) + Me.GroupBox3.Size = New Size(489, 124) Me.GroupBox3.TabIndex = 0 Me.GroupBox3.TabStop = False Me.GroupBox3.Text = "Interface" @@ -92,81 +96,81 @@ Partial Class F_Settings Me.GroupBox5.Controls.Add(Me.Label7) Me.GroupBox5.Controls.Add(Me.TbOpenCmd) Me.GroupBox5.Controls.Add(Me.Label12) - Me.GroupBox5.Location = New System.Drawing.Point(230, 19) + Me.GroupBox5.Location = New Point(230, 19) Me.GroupBox5.Name = "GroupBox5" - Me.GroupBox5.Size = New System.Drawing.Size(253, 96) + Me.GroupBox5.Size = New Size(253, 96) Me.GroupBox5.TabIndex = 1 Me.GroupBox5.TabStop = False Me.GroupBox5.Text = "File Open Command" ' 'TbOpenCmdName ' - Me.TbOpenCmdName.Location = New System.Drawing.Point(66, 19) + Me.TbOpenCmdName.Location = New Point(66, 19) Me.TbOpenCmdName.Name = "TbOpenCmdName" - Me.TbOpenCmdName.Size = New System.Drawing.Size(174, 20) + Me.TbOpenCmdName.Size = New Size(174, 20) Me.TbOpenCmdName.TabIndex = 0 ' 'Label7 ' Me.Label7.AutoSize = True - Me.Label7.Location = New System.Drawing.Point(6, 48) + Me.Label7.Location = New Point(6, 48) Me.Label7.Name = "Label7" - Me.Label7.Size = New System.Drawing.Size(54, 13) + Me.Label7.Size = New Size(54, 13) Me.Label7.TabIndex = 12 Me.Label7.Text = "Command" ' 'TbOpenCmd ' - Me.TbOpenCmd.Location = New System.Drawing.Point(66, 45) + Me.TbOpenCmd.Location = New Point(66, 45) Me.TbOpenCmd.Name = "TbOpenCmd" - Me.TbOpenCmd.Size = New System.Drawing.Size(174, 20) + Me.TbOpenCmd.Size = New Size(174, 20) Me.TbOpenCmd.TabIndex = 1 ' 'Label12 ' Me.Label12.AutoSize = True - Me.Label12.Location = New System.Drawing.Point(25, 22) + Me.Label12.Location = New Point(25, 22) Me.Label12.Name = "Label12" - Me.Label12.Size = New System.Drawing.Size(35, 13) + Me.Label12.Size = New Size(35, 13) Me.Label12.TabIndex = 12 Me.Label12.Text = "Name" ' 'TextBoxLogSize ' - Me.TextBoxLogSize.Location = New System.Drawing.Point(134, 38) + Me.TextBoxLogSize.Location = New Point(134, 38) Me.TextBoxLogSize.Name = "TextBoxLogSize" - Me.TextBoxLogSize.Size = New System.Drawing.Size(36, 20) + Me.TextBoxLogSize.Size = New Size(36, 20) Me.TextBoxLogSize.TabIndex = 0 ' 'Label16 ' Me.Label16.AutoSize = True - Me.Label16.Location = New System.Drawing.Point(18, 41) + Me.Label16.Location = New Point(18, 41) Me.Label16.Name = "Label16" - Me.Label16.Size = New System.Drawing.Size(110, 13) + Me.Label16.Size = New Size(110, 13) Me.Label16.TabIndex = 10 Me.Label16.Text = "Logfile Size Limit [MB]" ' 'TabControl1 ' - Me.TabControl1.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.TabControl1.Anchor = CType((((AnchorStyles.Top Or AnchorStyles.Bottom) _ + Or AnchorStyles.Left) _ + Or AnchorStyles.Right), AnchorStyles) Me.TabControl1.Controls.Add(Me.TabPage2) - Me.TabControl1.Location = New System.Drawing.Point(3, 3) + Me.TabControl1.Location = New Point(3, 3) Me.TabControl1.Name = "TabControl1" Me.TabControl1.SelectedIndex = 0 - Me.TabControl1.Size = New System.Drawing.Size(508, 269) + Me.TabControl1.Size = New Size(508, 269) Me.TabControl1.TabIndex = 12 ' 'TabPage2 ' Me.TabPage2.Controls.Add(Me.GrCalc) Me.TabPage2.Controls.Add(Me.GroupBox3) - Me.TabPage2.Location = New System.Drawing.Point(4, 22) + Me.TabPage2.Location = New Point(4, 22) Me.TabPage2.Name = "TabPage2" - Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage2.Size = New System.Drawing.Size(500, 243) + Me.TabPage2.Padding = New Padding(3) + Me.TabPage2.Size = New Size(500, 243) Me.TabPage2.TabIndex = 0 Me.TabPage2.Text = "VECTO" Me.TabPage2.UseVisualStyleBackColor = True @@ -182,9 +186,9 @@ Partial Class F_Settings Me.GrCalc.Controls.Add(Me.Label8) Me.GrCalc.Controls.Add(Me.TbAirDensity) Me.GrCalc.Controls.Add(Me.Label2) - Me.GrCalc.Location = New System.Drawing.Point(6, 136) + Me.GrCalc.Location = New Point(6, 136) Me.GrCalc.Name = "GrCalc" - Me.GrCalc.Size = New System.Drawing.Size(488, 103) + Me.GrCalc.Size = New Size(488, 103) Me.GrCalc.TabIndex = 1 Me.GrCalc.TabStop = False Me.GrCalc.Text = "Calculation" @@ -192,111 +196,111 @@ Partial Class F_Settings 'Label11 ' Me.Label11.AutoSize = True - Me.Label11.Location = New System.Drawing.Point(164, 66) + Me.Label11.Location = New Point(164, 66) Me.Label11.Name = "Label11" - Me.Label11.Size = New System.Drawing.Size(77, 13) + Me.Label11.Size = New Size(77, 13) Me.Label11.TabIndex = 16 Me.Label11.Text = "[kgCO2/KgFC]" ' 'Label9 ' Me.Label9.AutoSize = True - Me.Label9.Location = New System.Drawing.Point(309, 22) + Me.Label9.Location = New Point(309, 22) Me.Label9.Name = "Label9" - Me.Label9.Size = New System.Drawing.Size(32, 13) + Me.Label9.Size = New Size(41, 13) Me.Label9.TabIndex = 16 - Me.Label9.Text = "[kg/l]" + Me.Label9.Text = "[kg/m³]" ' 'Label3 ' Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(130, 22) + Me.Label3.Location = New Point(130, 22) Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(41, 13) + Me.Label3.Size = New Size(41, 13) Me.Label3.TabIndex = 16 Me.Label3.Text = "[kg/m³]" ' 'TbCO2toFC ' - Me.TbCO2toFC.Location = New System.Drawing.Point(108, 63) + Me.TbCO2toFC.Location = New Point(108, 63) Me.TbCO2toFC.Name = "TbCO2toFC" - Me.TbCO2toFC.Size = New System.Drawing.Size(50, 20) + Me.TbCO2toFC.Size = New Size(50, 20) Me.TbCO2toFC.TabIndex = 2 ' 'Label10 ' Me.Label10.AutoSize = True - Me.Label10.Location = New System.Drawing.Point(11, 66) + Me.Label10.Location = New Point(11, 66) Me.Label10.Name = "Label10" - Me.Label10.Size = New System.Drawing.Size(91, 13) + Me.Label10.Size = New Size(91, 13) Me.Label10.TabIndex = 14 Me.Label10.Text = "CO2-to-Fuel Ratio" ' 'TbFuelDens ' - Me.TbFuelDens.Location = New System.Drawing.Point(253, 19) + Me.TbFuelDens.Location = New Point(253, 19) Me.TbFuelDens.Name = "TbFuelDens" - Me.TbFuelDens.Size = New System.Drawing.Size(50, 20) + Me.TbFuelDens.Size = New Size(50, 20) Me.TbFuelDens.TabIndex = 1 ' 'Label8 ' Me.Label8.AutoSize = True - Me.Label8.Location = New System.Drawing.Point(184, 22) + Me.Label8.Location = New Point(184, 22) Me.Label8.Name = "Label8" - Me.Label8.Size = New System.Drawing.Size(63, 13) + Me.Label8.Size = New Size(63, 13) Me.Label8.TabIndex = 14 Me.Label8.Text = "Fuel density" ' 'TbAirDensity ' - Me.TbAirDensity.Location = New System.Drawing.Point(74, 19) + Me.TbAirDensity.Location = New Point(74, 19) Me.TbAirDensity.Name = "TbAirDensity" - Me.TbAirDensity.Size = New System.Drawing.Size(50, 20) + Me.TbAirDensity.Size = New Size(50, 20) Me.TbAirDensity.TabIndex = 0 ' 'Label2 ' Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(11, 22) + Me.Label2.Location = New Point(11, 22) Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(57, 13) + Me.Label2.Size = New Size(57, 13) Me.Label2.TabIndex = 14 Me.Label2.Text = "Air Density" ' 'ButReset ' - Me.ButReset.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.ButReset.Location = New System.Drawing.Point(31, 278) + Me.ButReset.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles) + Me.ButReset.Location = New Point(31, 278) Me.ButReset.Name = "ButReset" - Me.ButReset.Size = New System.Drawing.Size(108, 24) + Me.ButReset.Size = New Size(108, 24) Me.ButReset.TabIndex = 1 Me.ButReset.Text = "Reset All Settings" Me.ButReset.UseVisualStyleBackColor = True ' 'BtHelp ' - Me.BtHelp.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.BtHelp.Image = Global.VECTO.My.Resources.Resources.Help_icon - Me.BtHelp.Location = New System.Drawing.Point(4, 278) + Me.BtHelp.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles) + Me.BtHelp.Image = Help_icon + Me.BtHelp.Location = New Point(4, 278) Me.BtHelp.Name = "BtHelp" - Me.BtHelp.Size = New System.Drawing.Size(24, 24) + Me.BtHelp.Size = New Size(24, 24) Me.BtHelp.TabIndex = 0 Me.BtHelp.UseVisualStyleBackColor = True ' 'F_Settings ' Me.AcceptButton = Me.ButtonOK - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.AutoScaleDimensions = New SizeF(6.0!, 13.0!) + Me.AutoScaleMode = AutoScaleMode.Font Me.CancelButton = Me.ButtonCancel - Me.ClientSize = New System.Drawing.Size(515, 310) + Me.ClientSize = New Size(515, 310) Me.Controls.Add(Me.BtHelp) Me.Controls.Add(Me.ButReset) Me.Controls.Add(Me.TabControl1) Me.Controls.Add(Me.ButtonCancel) Me.Controls.Add(Me.ButtonOK) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.FormBorderStyle = FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "F_Settings" @@ -312,28 +316,28 @@ Partial Class F_Settings Me.ResumeLayout(False) End Sub - Friend WithEvents ButtonOK As System.Windows.Forms.Button - Friend WithEvents ButtonCancel As System.Windows.Forms.Button - Friend WithEvents GroupBox3 As System.Windows.Forms.GroupBox - Friend WithEvents TabControl1 As System.Windows.Forms.TabControl - Friend WithEvents TabPage2 As System.Windows.Forms.TabPage - Friend WithEvents TextBoxLogSize As System.Windows.Forms.TextBox - Friend WithEvents Label16 As System.Windows.Forms.Label - Friend WithEvents ButReset As System.Windows.Forms.Button - Friend WithEvents TbOpenCmd As System.Windows.Forms.TextBox - Friend WithEvents Label7 As System.Windows.Forms.Label - Friend WithEvents GrCalc As System.Windows.Forms.GroupBox - Friend WithEvents Label3 As System.Windows.Forms.Label - Friend WithEvents TbAirDensity As System.Windows.Forms.TextBox - Friend WithEvents Label2 As System.Windows.Forms.Label - Friend WithEvents Label9 As System.Windows.Forms.Label - Friend WithEvents TbFuelDens As System.Windows.Forms.TextBox - Friend WithEvents Label8 As System.Windows.Forms.Label - Friend WithEvents Label11 As System.Windows.Forms.Label - Friend WithEvents TbCO2toFC As System.Windows.Forms.TextBox - Friend WithEvents Label10 As System.Windows.Forms.Label - Friend WithEvents BtHelp As System.Windows.Forms.Button - Friend WithEvents GroupBox5 As System.Windows.Forms.GroupBox - Friend WithEvents TbOpenCmdName As System.Windows.Forms.TextBox - Friend WithEvents Label12 As System.Windows.Forms.Label + Friend WithEvents ButtonOK As Button + Friend WithEvents ButtonCancel As Button + Friend WithEvents GroupBox3 As GroupBox + Friend WithEvents TabControl1 As TabControl + Friend WithEvents TabPage2 As TabPage + Friend WithEvents TextBoxLogSize As TextBox + Friend WithEvents Label16 As Label + Friend WithEvents ButReset As Button + Friend WithEvents TbOpenCmd As TextBox + Friend WithEvents Label7 As Label + Friend WithEvents GrCalc As GroupBox + Friend WithEvents Label3 As Label + Friend WithEvents TbAirDensity As TextBox + Friend WithEvents Label2 As Label + Friend WithEvents Label9 As Label + Friend WithEvents TbFuelDens As TextBox + Friend WithEvents Label8 As Label + Friend WithEvents Label11 As Label + Friend WithEvents TbCO2toFC As TextBox + Friend WithEvents Label10 As Label + Friend WithEvents BtHelp As Button + Friend WithEvents GroupBox5 As GroupBox + Friend WithEvents TbOpenCmdName As TextBox + Friend WithEvents Label12 As Label End Class diff --git a/VECTO/GUI/F_Settings.vb b/VECTO/GUI/F_Settings.vb index 73d618bb4633a0e58f1745af7a673c7063657a9f..340bdb29f6d467b5d87a5b40373577aae92e76f7 100644 --- a/VECTO/GUI/F_Settings.vb +++ b/VECTO/GUI/F_Settings.vb @@ -8,6 +8,8 @@ ' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ' ' See the LICENSE.txt for the specific language governing permissions and limitations. +Imports System.IO +Imports System.Text.RegularExpressions ''' <summary> ''' Settings form @@ -15,7 +17,7 @@ ''' <remarks></remarks> Public Class F_Settings 'Initialize - load config - Private Sub F03_Options_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load + Private Sub F03_Options_Load(ByVal sender As Object, ByVal e As EventArgs) Handles Me.Load LoadSettings() End Sub @@ -34,7 +36,7 @@ Public Class F_Settings 'Reset Button - Private Sub ButReset_Click(sender As System.Object, e As System.EventArgs) Handles ButReset.Click + Private Sub ButReset_Click(sender As Object, e As EventArgs) Handles ButReset.Click If _ MsgBox( "This will reset all application settings including the Options Tab. Filehistory will not be deleted." & vbCrLf & @@ -48,7 +50,7 @@ Public Class F_Settings End Sub 'Save and close - Private Sub ButtonOK_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ButtonOK.Click + 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 @@ -63,18 +65,18 @@ Public Class F_Settings End Sub 'Cancel - Private Sub ButtonCancel_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ButtonCancel.Click + Private Sub ButtonCancel_Click(ByVal sender As Object, ByVal e As EventArgs) Handles ButtonCancel.Click Me.Close() End Sub 'Help button - Private Sub BtHelp_Click(sender As System.Object, e As System.EventArgs) Handles BtHelp.Click - If IO.File.Exists(MyAppPath & "User Manual\help.html") Then + Private Sub BtHelp_Click(sender As Object, e As EventArgs) Handles BtHelp.Click + If File.Exists(MyAppPath & "User Manual\help.html") Then Dim BrowserRegistryString As String = My.Computer.Registry.ClassesRoot.OpenSubKey("\http\shell\open\command\").GetValue("").ToString Dim DefaultBrowserPath As String = - System.Text.RegularExpressions.Regex.Match(BrowserRegistryString, "(\"".*?\"")").Captures(0).ToString - System.Diagnostics.Process.Start(DefaultBrowserPath, + Regex.Match(BrowserRegistryString, "(\"".*?\"")").Captures(0).ToString + Process.Start(DefaultBrowserPath, String.Format("""{0}{1}""", MyAppPath, "User Manual\help.html#settings")) Else MsgBox("User Manual not found!", MsgBoxStyle.Critical) diff --git a/VECTO/GUI/F_ShutDown.Designer.vb b/VECTO/GUI/F_ShutDown.Designer.vb index fa354eadf5ba2c932c3b116d501bc155659b297f..5fa0582cdd9500ded41a89c4caea063063b6bd9d 100644 --- a/VECTO/GUI/F_ShutDown.Designer.vb +++ b/VECTO/GUI/F_ShutDown.Designer.vb @@ -1,4 +1,4 @@ -' Copyright 2014 European Union. +' Copyright 2014 European Union. ' Licensed under the EUPL (the 'Licence'); ' ' * You may not use this work except in compliance with the Licence. @@ -8,93 +8,97 @@ ' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ' ' See the LICENSE.txt for the specific language governing permissions and limitations. -<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _ +Imports System.ComponentModel +Imports Microsoft.VisualBasic.CompilerServices + + +<DesignerGenerated()> _ Partial Class F_ShutDown - Inherits System.Windows.Forms.Form + Inherits Form - 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - <System.Diagnostics.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 + '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 System.ComponentModel.IContainer + '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. - <System.Diagnostics.DebuggerStepThrough()> _ - Private Sub InitializeComponent() - Me.components = New System.ComponentModel.Container - Me.Cancel_Button = New System.Windows.Forms.Button - Me.Label1 = New System.Windows.Forms.Label - Me.LbTime = New System.Windows.Forms.Label - Me.Timer1 = New System.Windows.Forms.Timer(Me.components) - Me.SuspendLayout() - ' - 'Cancel_Button - ' - Me.Cancel_Button.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel - Me.Cancel_Button.Location = New System.Drawing.Point(12, 54) - Me.Cancel_Button.Name = "Cancel_Button" - Me.Cancel_Button.Size = New System.Drawing.Size(191, 49) - Me.Cancel_Button.TabIndex = 1 - Me.Cancel_Button.Text = "ABORT" - ' - 'Label1 - ' - Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(12, 21) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(127, 13) - Me.Label1.TabIndex = 2 - Me.Label1.Text = "System will shut down in: " - ' - 'LbTime - ' - Me.LbTime.AutoSize = True - Me.LbTime.Location = New System.Drawing.Point(145, 21) - Me.LbTime.Name = "LbTime" - Me.LbTime.Size = New System.Drawing.Size(19, 13) - Me.LbTime.TabIndex = 3 - Me.LbTime.Text = "00" - ' - 'Timer1 - ' - Me.Timer1.Interval = 1000 - ' - 'F_ShutDown - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.CancelButton = Me.Cancel_Button - Me.ClientSize = New System.Drawing.Size(215, 115) - Me.ControlBox = False - Me.Controls.Add(Me.LbTime) - Me.Controls.Add(Me.Label1) - Me.Controls.Add(Me.Cancel_Button) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.MaximizeBox = False - Me.MinimizeBox = False - Me.Name = "F_ShutDown" - Me.ShowInTaskbar = False - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent - Me.Text = "Automatic Shutdown" - Me.ResumeLayout(False) - Me.PerformLayout() + '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 System.Windows.Forms.Button - Friend WithEvents Label1 As System.Windows.Forms.Label - Friend WithEvents LbTime As System.Windows.Forms.Label - Friend WithEvents Timer1 As System.Windows.Forms.Timer + 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.vb b/VECTO/GUI/F_ShutDown.vb index 0f363507004a93a71390bf32347eb27f646b5565..8b437f85d86ec01a418c1701c26fc160a35ff493 100644 --- a/VECTO/GUI/F_ShutDown.vb +++ b/VECTO/GUI/F_ShutDown.vb @@ -8,7 +8,7 @@ ' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ' ' See the LICENSE.txt for the specific language governing permissions and limitations. -Imports System.Windows.Forms + Imports System.Runtime.InteropServices ''' <summary> @@ -21,41 +21,41 @@ Public Class F_ShutDown Private objExitWin As New cWrapExitWindows() Public Function ShutDown() As Boolean - If Me.ShowDialog = Windows.Forms.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 System.EventArgs) Handles Me.Load - iTime = 99 - Me.LbTime.Text = iTime + 1 - Me.Timer1.Start() - End Sub - - Private Sub Cancel_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles Cancel_Button.Click - Me.Timer1.Stop() - Me.DialogResult = System.Windows.Forms.DialogResult.Cancel - Me.Close() - End Sub - - Private Sub Timer1_Tick(ByVal sender As Object, ByVal e As System.EventArgs) Handles Timer1.Tick - Me.LbTime.Text = iTime - If iTime = 0 Then - Me.Timer1.Stop() - Try - objExitWin.ExitWindows(cWrapExitWindows.Action.Shutdown) - Me.DialogResult = System.Windows.Forms.DialogResult.OK - Catch ex As Exception - Me.DialogResult = System.Windows.Forms.DialogResult.Cancel - End Try - Me.Close() - End If - iTime -= 1 - End Sub + 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 diff --git a/VECTO/GUI/F_StrInpBox.designer.vb b/VECTO/GUI/F_StrInpBox.designer.vb index de52d55a6802ad61fd45ac39617473db445ea344..01f2d9e3d90a6cb9dcc4168eb4c07603e1253cf1 100644 --- a/VECTO/GUI/F_StrInpBox.designer.vb +++ b/VECTO/GUI/F_StrInpBox.designer.vb @@ -1,4 +1,4 @@ -' Copyright 2014 European Union. +' Copyright 2014 European Union. ' Licensed under the EUPL (the 'Licence'); ' ' * You may not use this work except in compliance with the Licence. @@ -8,114 +8,118 @@ ' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ' ' See the LICENSE.txt for the specific language governing permissions and limitations. -<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _ +Imports System.ComponentModel +Imports Microsoft.VisualBasic.CompilerServices + + +<DesignerGenerated()> _ Partial Class F_StrInpBox - Inherits System.Windows.Forms.Form + Inherits Form - 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - <System.Diagnostics.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 + '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 System.ComponentModel.IContainer + '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. - <System.Diagnostics.DebuggerStepThrough()> _ - Private Sub InitializeComponent() - Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel() - Me.OK_Button = New System.Windows.Forms.Button() - Me.Cancel_Button = New System.Windows.Forms.Button() - Me.Label1 = New System.Windows.Forms.Label() - Me.TextBox1 = New System.Windows.Forms.TextBox() - Me.TableLayoutPanel1.SuspendLayout() - Me.SuspendLayout() - ' - 'TableLayoutPanel1 - ' - Me.TableLayoutPanel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.TableLayoutPanel1.ColumnCount = 2 - Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!)) - Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.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 System.Drawing.Point(277, 82) - Me.TableLayoutPanel1.Name = "TableLayoutPanel1" - Me.TableLayoutPanel1.RowCount = 1 - Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.0!)) - Me.TableLayoutPanel1.Size = New System.Drawing.Size(146, 29) - Me.TableLayoutPanel1.TabIndex = 5 - ' - 'OK_Button - ' - Me.OK_Button.Anchor = System.Windows.Forms.AnchorStyles.None - Me.OK_Button.Location = New System.Drawing.Point(3, 3) - Me.OK_Button.Name = "OK_Button" - Me.OK_Button.Size = New System.Drawing.Size(67, 23) - Me.OK_Button.TabIndex = 0 - Me.OK_Button.Text = "OK" - ' - 'Cancel_Button - ' - Me.Cancel_Button.Anchor = System.Windows.Forms.AnchorStyles.None - Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel - Me.Cancel_Button.Location = New System.Drawing.Point(76, 3) - Me.Cancel_Button.Name = "Cancel_Button" - Me.Cancel_Button.Size = New System.Drawing.Size(67, 23) - Me.Cancel_Button.TabIndex = 1 - Me.Cancel_Button.Text = "Cancel" - ' - 'Label1 - ' - Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(12, 9) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(39, 13) - Me.Label1.TabIndex = 1 - Me.Label1.Text = "Label1" - ' - 'TextBox1 - ' - Me.TextBox1.Location = New System.Drawing.Point(12, 35) - Me.TextBox1.Name = "TextBox1" - Me.TextBox1.Size = New System.Drawing.Size(411, 20) - Me.TextBox1.TabIndex = 2 - ' - 'F_StrInpBox - ' - Me.AcceptButton = Me.OK_Button - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.CancelButton = Me.Cancel_Button - Me.ClientSize = New System.Drawing.Size(435, 123) - Me.Controls.Add(Me.TextBox1) - Me.Controls.Add(Me.Label1) - Me.Controls.Add(Me.TableLayoutPanel1) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog - Me.MaximizeBox = False - Me.MinimizeBox = False - Me.Name = "F_StrInpBox" - Me.ShowInTaskbar = False - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent - Me.Text = "VECTO" - Me.TableLayoutPanel1.ResumeLayout(False) - Me.ResumeLayout(False) - Me.PerformLayout() + '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 System.Windows.Forms.TableLayoutPanel - Friend WithEvents OK_Button As System.Windows.Forms.Button - Friend WithEvents Cancel_Button As System.Windows.Forms.Button - Friend WithEvents Label1 As System.Windows.Forms.Label - Friend WithEvents TextBox1 As System.Windows.Forms.TextBox + 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.vb b/VECTO/GUI/F_StrInpBox.vb index 819c24cdba770fcb38765d9b80ec7ab8da57e26d..4c65dfe65ee47a598d8d7d9f39525b5319d5306e 100644 --- a/VECTO/GUI/F_StrInpBox.vb +++ b/VECTO/GUI/F_StrInpBox.vb @@ -8,7 +8,7 @@ ' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ' ' See the LICENSE.txt for the specific language governing permissions and limitations. -Imports System.Windows.Forms + ''' <summary> ''' String input dialog for changing DEV option values. Default input box cannot process empty strings (emtpy string = Cancel). @@ -19,26 +19,26 @@ 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 = Windows.Forms.DialogResult.OK Then - DefaultRespone = Me.TextBox1.Text - End If - Return DefaultRespone - End Function + 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 System.EventArgs) Handles Me.Shown - Me.TextBox1.SelectAll() - Me.TextBox1.Focus() - End Sub + 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 System.Object, ByVal e As System.EventArgs) Handles OK_Button.Click - Me.DialogResult = System.Windows.Forms.DialogResult.OK - Me.Close() - 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 System.Object, ByVal e As System.EventArgs) Handles Cancel_Button.Click - Me.DialogResult = System.Windows.Forms.DialogResult.Cancel - 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 diff --git a/VECTO/GUI/F_VECTO.Designer.vb b/VECTO/GUI/F_VECTO.Designer.vb index 1daf3feb55ced6af4b99708ba5888f7e02f264e2..350fe1e3870c5e956282b0cb6e6b2377af542234 100644 --- a/VECTO/GUI/F_VECTO.Designer.vb +++ b/VECTO/GUI/F_VECTO.Designer.vb @@ -1,162 +1,154 @@ -<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _ +Imports System.ComponentModel +Imports Microsoft.VisualBasic.CompilerServices + +<DesignerGenerated()> _ Partial Class F_VECTO - Inherits System.Windows.Forms.Form + Inherits Form - 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - <System.Diagnostics.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 + '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 System.ComponentModel.IContainer + '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. - <System.Diagnostics.DebuggerStepThrough()> _ - Private Sub InitializeComponent() - Me.components = New System.ComponentModel.Container() - Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(F_VECTO)) - Me.TabPgGen = New System.Windows.Forms.TabPage() - Me.GrCycles = New System.Windows.Forms.GroupBox() - Me.Label2 = New System.Windows.Forms.Label() - Me.LvCycles = New System.Windows.Forms.ListView() - Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) - Me.BtDRIrem = New System.Windows.Forms.Button() - Me.BtDRIadd = New System.Windows.Forms.Button() - Me.GrAux = New System.Windows.Forms.GroupBox() - Me.btnAAUXOpen = New System.Windows.Forms.Button() - Me.Label1 = New System.Windows.Forms.Label() - Me.btnBrowseAAUXFile = New System.Windows.Forms.Button() - Me.txtAdvancedAuxiliaryFile = New System.Windows.Forms.TextBox() - Me.picAuxInfo = New System.Windows.Forms.PictureBox() - Me.cboAdvancedAuxiliaries = New System.Windows.Forms.ComboBox() - Me.lbAdvancedAuxiliaries = New System.Windows.Forms.Label() - Me.Label32 = New System.Windows.Forms.Label() - Me.LvAux = New System.Windows.Forms.ListView() - Me.ColumnHeader4 = 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.ButAuxRem = New System.Windows.Forms.Button() - Me.ButAuxAdd = New System.Windows.Forms.Button() - Me.TbGBX = New System.Windows.Forms.TextBox() - Me.TbENG = New System.Windows.Forms.TextBox() - Me.TbVEH = New System.Windows.Forms.TextBox() - Me.ButOpenGBX = New System.Windows.Forms.Button() - Me.ButOpenENG = New System.Windows.Forms.Button() - Me.ButOpenVEH = New System.Windows.Forms.Button() - Me.ButtonVEH = New System.Windows.Forms.Button() - Me.ButtonGBX = New System.Windows.Forms.Button() - Me.ButtonMAP = New System.Windows.Forms.Button() - Me.TabControl1 = New System.Windows.Forms.TabControl() - Me.TabPgDriver = New System.Windows.Forms.TabPage() - Me.GrVACC = New System.Windows.Forms.GroupBox() - Me.TbDesMaxFile = New System.Windows.Forms.TextBox() - Me.BtDesMaxBr = New System.Windows.Forms.Button() - Me.BtAccOpen = New System.Windows.Forms.Button() - Me.GrLAC = New System.Windows.Forms.GroupBox() - Me.GroupBox2 = New System.Windows.Forms.GroupBox() - Me.Label12 = New System.Windows.Forms.Label() - Me.tbDfCoastingScale = New System.Windows.Forms.TextBox() - Me.Label11 = New System.Windows.Forms.Label() - Me.tbDfCoastingOffset = New System.Windows.Forms.TextBox() - Me.Label10 = New System.Windows.Forms.Label() - Me.Label5 = New System.Windows.Forms.Label() - Me.Label3 = New System.Windows.Forms.Label() - Me.tbLacDfVelocityDropFile = New System.Windows.Forms.TextBox() - Me.tbLacPreviewFactor = New System.Windows.Forms.TextBox() - Me.btnDfVelocityDrop = New System.Windows.Forms.Button() - Me.btnDfTargetSpeed = New System.Windows.Forms.Button() - Me.Label4 = New System.Windows.Forms.Label() - Me.tbLacDfTargetSpeedFile = New System.Windows.Forms.TextBox() - Me.PnLookAhead = New System.Windows.Forms.Panel() - Me.Label9 = New System.Windows.Forms.Label() - Me.Label8 = New System.Windows.Forms.Label() - Me.TbAlookahead = New System.Windows.Forms.TextBox() - Me.Label7 = New System.Windows.Forms.Label() - Me.TbVminLA = New System.Windows.Forms.TextBox() - Me.Label6 = New System.Windows.Forms.Label() - Me.CbLookAhead = New System.Windows.Forms.CheckBox() - Me.GroupBox1 = New System.Windows.Forms.GroupBox() - Me.PnEcoRoll = New System.Windows.Forms.Panel() - Me.Label21 = New System.Windows.Forms.Label() - Me.Label20 = New System.Windows.Forms.Label() - Me.Label14 = New System.Windows.Forms.Label() - Me.TbVmin = New System.Windows.Forms.TextBox() - Me.TbUnderSpeed = New System.Windows.Forms.TextBox() - Me.TbOverspeed = New System.Windows.Forms.TextBox() - Me.Label23 = New System.Windows.Forms.Label() - Me.Label22 = New System.Windows.Forms.Label() - Me.Label13 = New System.Windows.Forms.Label() - Me.RdEcoRoll = New System.Windows.Forms.RadioButton() - Me.RdOverspeed = New System.Windows.Forms.RadioButton() - Me.RdOff = New System.Windows.Forms.RadioButton() - Me.GrStartStop = New System.Windows.Forms.GroupBox() - Me.PnStartStop = New System.Windows.Forms.Panel() - Me.Label31 = New System.Windows.Forms.Label() - Me.Label27 = New System.Windows.Forms.Label() - Me.TbSSspeed = New System.Windows.Forms.TextBox() - Me.LabelSSspeed = New System.Windows.Forms.Label() - Me.Label26 = New System.Windows.Forms.Label() - Me.Label30 = New System.Windows.Forms.Label() - Me.LabelSStime = New System.Windows.Forms.Label() - Me.TbSSdelay = New System.Windows.Forms.TextBox() - Me.TbSStime = New System.Windows.Forms.TextBox() - Me.ChBStartStop = New System.Windows.Forms.CheckBox() - Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() - Me.ToolStripStatusLabelGEN = New System.Windows.Forms.ToolStripStatusLabel() - Me.ButOK = New System.Windows.Forms.Button() - Me.ButCancel = New System.Windows.Forms.Button() - Me.ToolStrip1 = New System.Windows.Forms.ToolStrip() - Me.ToolStripBtNew = New System.Windows.Forms.ToolStripButton() - Me.ToolStripBtOpen = New System.Windows.Forms.ToolStripButton() - Me.ToolStripBtSave = New System.Windows.Forms.ToolStripButton() - Me.ToolStripBtSaveAs = New System.Windows.Forms.ToolStripButton() - Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator() - Me.ToolStripBtSendTo = New System.Windows.Forms.ToolStripButton() - Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator() - Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton() - Me.PictureBox1 = New System.Windows.Forms.PictureBox() - Me.CbEngOnly = New System.Windows.Forms.CheckBox() - Me.CmOpenFile = New System.Windows.Forms.ContextMenuStrip(Me.components) - Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.PicVehicle = New System.Windows.Forms.PictureBox() - Me.PicBox = New System.Windows.Forms.PictureBox() - Me.TbEngTxt = New System.Windows.Forms.TextBox() - Me.TbVehCat = New System.Windows.Forms.TextBox() - Me.TbAxleConf = New System.Windows.Forms.TextBox() - Me.TbHVCclass = New System.Windows.Forms.TextBox() - Me.TbGbxTxt = New System.Windows.Forms.TextBox() - Me.TbMass = New System.Windows.Forms.TextBox() - Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components) + '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() + Dim resources As ComponentResourceManager = New ComponentResourceManager(GetType(F_VECTO)) + Me.TabPgGen = New TabPage() + Me.GrCycles = New GroupBox() + Me.Label2 = New Label() + Me.LvCycles = New ListView() + Me.ColumnHeader1 = CType(New ColumnHeader(), ColumnHeader) + Me.BtDRIrem = New Button() + Me.BtDRIadd = New Button() + Me.GrAux = New GroupBox() + Me.btnAAUXOpen = New Button() + Me.Label1 = New Label() + Me.btnBrowseAAUXFile = New Button() + Me.txtAdvancedAuxiliaryFile = New TextBox() + Me.picAuxInfo = New PictureBox() + Me.cboAdvancedAuxiliaries = New ComboBox() + Me.lbAdvancedAuxiliaries = New Label() + Me.Label32 = New Label() + Me.LvAux = New ListView() + Me.ColumnHeader4 = CType(New ColumnHeader(), ColumnHeader) + Me.ColumnHeader5 = CType(New ColumnHeader(), ColumnHeader) + Me.ColumnHeader6 = CType(New ColumnHeader(), ColumnHeader) + Me.ButAuxRem = New Button() + Me.ButAuxAdd = New Button() + Me.TbGBX = New TextBox() + Me.TbENG = New TextBox() + Me.TbVEH = New TextBox() + Me.ButOpenGBX = New Button() + Me.ButOpenENG = New Button() + Me.ButOpenVEH = New Button() + Me.ButtonVEH = New Button() + Me.ButtonGBX = New Button() + Me.ButtonMAP = New Button() + Me.TabControl1 = New TabControl() + Me.TabPgDriver = New TabPage() + Me.GrVACC = New GroupBox() + Me.TbDesMaxFile = New TextBox() + Me.BtDesMaxBr = New Button() + Me.BtAccOpen = New Button() + Me.GrLAC = New GroupBox() + Me.Label12 = New Label() + Me.tbDfCoastingScale = New TextBox() + Me.CbLookAhead = New CheckBox() + Me.Label11 = New Label() + Me.Label3 = New Label() + Me.tbDfCoastingOffset = New TextBox() + Me.tbLacDfTargetSpeedFile = New TextBox() + Me.Label10 = New Label() + Me.Label4 = New Label() + Me.Label5 = New Label() + Me.btnDfTargetSpeed = New Button() + Me.tbLacPreviewFactor = New TextBox() + Me.tbLacDfVelocityDropFile = New TextBox() + Me.GroupBox1 = New GroupBox() + Me.PnEcoRoll = New Panel() + Me.Label21 = New Label() + Me.Label20 = New Label() + Me.Label14 = New Label() + Me.TbVmin = New TextBox() + Me.TbUnderSpeed = New TextBox() + Me.TbOverspeed = New TextBox() + Me.Label23 = New Label() + Me.Label22 = New Label() + Me.Label13 = New Label() + Me.RdEcoRoll = New RadioButton() + Me.RdOverspeed = New RadioButton() + Me.RdOff = New RadioButton() + Me.GrStartStop = New GroupBox() + Me.PnStartStop = New Panel() + Me.Label31 = New Label() + Me.Label27 = New Label() + Me.TbSSspeed = New TextBox() + Me.LabelSSspeed = New Label() + Me.Label26 = New Label() + Me.Label30 = New Label() + Me.LabelSStime = New Label() + Me.TbSSdelay = New TextBox() + Me.TbSStime = New TextBox() + Me.ChBStartStop = New CheckBox() + Me.StatusStrip1 = New StatusStrip() + Me.ToolStripStatusLabelGEN = New ToolStripStatusLabel() + Me.ButOK = New Button() + Me.ButCancel = New Button() + Me.ToolStrip1 = New ToolStrip() + Me.ToolStripBtNew = New ToolStripButton() + Me.ToolStripBtOpen = New ToolStripButton() + Me.ToolStripBtSave = New ToolStripButton() + Me.ToolStripBtSaveAs = New ToolStripButton() + Me.ToolStripSeparator1 = New ToolStripSeparator() + Me.ToolStripBtSendTo = New ToolStripButton() + Me.ToolStripSeparator2 = New ToolStripSeparator() + Me.ToolStripButton1 = New ToolStripButton() + Me.PictureBox1 = New PictureBox() + Me.CbEngOnly = New CheckBox() + Me.CmOpenFile = New ContextMenuStrip(Me.components) + Me.OpenWithToolStripMenuItem = New ToolStripMenuItem() + Me.ShowInFolderToolStripMenuItem = New ToolStripMenuItem() + Me.PicVehicle = New PictureBox() + Me.PicBox = New PictureBox() + Me.TbEngTxt = New TextBox() + Me.TbVehCat = New TextBox() + Me.TbAxleConf = New TextBox() + Me.TbHVCclass = New TextBox() + Me.TbGbxTxt = New TextBox() + Me.TbMass = New TextBox() + Me.ToolTip1 = New ToolTip(Me.components) Me.TabPgGen.SuspendLayout() Me.GrCycles.SuspendLayout() Me.GrAux.SuspendLayout() - CType(Me.picAuxInfo, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.picAuxInfo, ISupportInitialize).BeginInit() Me.TabControl1.SuspendLayout() Me.TabPgDriver.SuspendLayout() Me.GrVACC.SuspendLayout() Me.GrLAC.SuspendLayout() - Me.GroupBox2.SuspendLayout() - Me.PnLookAhead.SuspendLayout() Me.GroupBox1.SuspendLayout() Me.PnEcoRoll.SuspendLayout() Me.GrStartStop.SuspendLayout() Me.PnStartStop.SuspendLayout() Me.StatusStrip1.SuspendLayout() Me.ToolStrip1.SuspendLayout() - CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PictureBox1, ISupportInitialize).BeginInit() Me.CmOpenFile.SuspendLayout() - CType(Me.PicVehicle, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.PicBox, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PicVehicle, ISupportInitialize).BeginInit() + CType(Me.PicBox, ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'TabPgGen @@ -172,58 +164,58 @@ Partial Class F_VECTO Me.TabPgGen.Controls.Add(Me.ButtonVEH) Me.TabPgGen.Controls.Add(Me.ButtonGBX) Me.TabPgGen.Controls.Add(Me.ButtonMAP) - Me.TabPgGen.Location = New System.Drawing.Point(4, 22) + Me.TabPgGen.Location = New Point(4, 22) Me.TabPgGen.Name = "TabPgGen" - Me.TabPgGen.Padding = New System.Windows.Forms.Padding(3) - Me.TabPgGen.Size = New System.Drawing.Size(527, 573) + Me.TabPgGen.Padding = New Padding(3) + Me.TabPgGen.Size = New Size(527, 534) Me.TabPgGen.TabIndex = 0 Me.TabPgGen.Text = "General" Me.TabPgGen.UseVisualStyleBackColor = True ' 'GrCycles ' - Me.GrCycles.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.GrCycles.Anchor = CType((((AnchorStyles.Top Or AnchorStyles.Bottom) _ + Or AnchorStyles.Left) _ + Or AnchorStyles.Right), AnchorStyles) Me.GrCycles.Controls.Add(Me.Label2) Me.GrCycles.Controls.Add(Me.LvCycles) Me.GrCycles.Controls.Add(Me.BtDRIrem) Me.GrCycles.Controls.Add(Me.BtDRIadd) - Me.GrCycles.Location = New System.Drawing.Point(7, 314) + Me.GrCycles.Location = New Point(9, 314) Me.GrCycles.Name = "GrCycles" - Me.GrCycles.Size = New System.Drawing.Size(515, 184) + Me.GrCycles.Size = New Size(515, 184) Me.GrCycles.TabIndex = 10 Me.GrCycles.TabStop = False Me.GrCycles.Text = "Cycles" ' 'Label2 ' - Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Label2.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles) Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(379, 148) + Me.Label2.Location = New Point(379, 148) Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(133, 13) + Me.Label2.Size = New Size(133, 13) Me.Label2.TabIndex = 3 Me.Label2.Text = "(Double-Click to Open File)" ' 'LvCycles ' - Me.LvCycles.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.LvCycles.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1}) + Me.LvCycles.Anchor = CType(((AnchorStyles.Top Or AnchorStyles.Left) _ + Or AnchorStyles.Right), AnchorStyles) + Me.LvCycles.Columns.AddRange(New ColumnHeader() {Me.ColumnHeader1}) Me.LvCycles.FullRowSelect = True Me.LvCycles.GridLines = True - Me.LvCycles.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None + Me.LvCycles.HeaderStyle = ColumnHeaderStyle.None Me.LvCycles.HideSelection = False Me.LvCycles.LabelEdit = True - Me.LvCycles.Location = New System.Drawing.Point(6, 25) + Me.LvCycles.Location = New Point(6, 25) Me.LvCycles.MultiSelect = False Me.LvCycles.Name = "LvCycles" - Me.LvCycles.Size = New System.Drawing.Size(503, 123) + Me.LvCycles.Size = New Size(503, 123) Me.LvCycles.TabIndex = 0 Me.LvCycles.TabStop = False Me.LvCycles.UseCompatibleStateImageBehavior = False - Me.LvCycles.View = System.Windows.Forms.View.Details + Me.LvCycles.View = View.Details ' 'ColumnHeader1 ' @@ -232,29 +224,29 @@ Partial Class F_VECTO ' 'BtDRIrem ' - Me.BtDRIrem.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.BtDRIrem.Image = Global.VECTO.My.Resources.Resources.minus_circle_icon - Me.BtDRIrem.Location = New System.Drawing.Point(29, 149) + Me.BtDRIrem.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles) + Me.BtDRIrem.Image = My.Resources.Resources.minus_circle_icon + Me.BtDRIrem.Location = New Point(29, 149) Me.BtDRIrem.Name = "BtDRIrem" - Me.BtDRIrem.Size = New System.Drawing.Size(24, 24) + Me.BtDRIrem.Size = New Size(24, 24) Me.BtDRIrem.TabIndex = 2 Me.BtDRIrem.UseVisualStyleBackColor = True ' 'BtDRIadd ' - Me.BtDRIadd.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.BtDRIadd.Image = Global.VECTO.My.Resources.Resources.plus_circle_icon - Me.BtDRIadd.Location = New System.Drawing.Point(5, 149) + Me.BtDRIadd.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles) + Me.BtDRIadd.Image = My.Resources.Resources.plus_circle_icon + Me.BtDRIadd.Location = New Point(5, 149) Me.BtDRIadd.Name = "BtDRIadd" - Me.BtDRIadd.Size = New System.Drawing.Size(24, 24) + Me.BtDRIadd.Size = New Size(24, 24) Me.BtDRIadd.TabIndex = 1 Me.BtDRIadd.UseVisualStyleBackColor = True ' 'GrAux ' - Me.GrAux.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.GrAux.Anchor = CType((((AnchorStyles.Top Or AnchorStyles.Bottom) _ + Or AnchorStyles.Left) _ + Or AnchorStyles.Right), AnchorStyles) Me.GrAux.Controls.Add(Me.btnAAUXOpen) Me.GrAux.Controls.Add(Me.Label1) Me.GrAux.Controls.Add(Me.btnBrowseAAUXFile) @@ -266,102 +258,102 @@ Partial Class F_VECTO Me.GrAux.Controls.Add(Me.LvAux) Me.GrAux.Controls.Add(Me.ButAuxRem) Me.GrAux.Controls.Add(Me.ButAuxAdd) - Me.GrAux.Location = New System.Drawing.Point(6, 87) + Me.GrAux.Location = New Point(6, 87) Me.GrAux.Name = "GrAux" - Me.GrAux.Size = New System.Drawing.Size(515, 221) + Me.GrAux.Size = New Size(515, 221) Me.GrAux.TabIndex = 9 Me.GrAux.TabStop = False Me.GrAux.Text = "Auxiliaries" ' 'btnAAUXOpen ' - Me.btnAAUXOpen.Image = Global.VECTO.My.Resources.Resources.application_export_icon_small - Me.btnAAUXOpen.Location = New System.Drawing.Point(465, 45) + Me.btnAAUXOpen.Image = My.Resources.Resources.application_export_icon_small + Me.btnAAUXOpen.Location = New Point(465, 45) Me.btnAAUXOpen.Name = "btnAAUXOpen" - Me.btnAAUXOpen.Size = New System.Drawing.Size(24, 24) + Me.btnAAUXOpen.Size = New Size(24, 24) Me.btnAAUXOpen.TabIndex = 41 Me.btnAAUXOpen.UseVisualStyleBackColor = True ' 'Label1 ' Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(7, 52) + Me.Label1.Location = New Point(7, 52) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(96, 13) + Me.Label1.Size = New Size(96, 13) Me.Label1.TabIndex = 40 Me.Label1.Text = "Advanced Aux File" ' 'btnBrowseAAUXFile ' - Me.btnBrowseAAUXFile.Image = Global.VECTO.My.Resources.Resources.Open_icon - Me.btnBrowseAAUXFile.Location = New System.Drawing.Point(441, 45) + Me.btnBrowseAAUXFile.Image = My.Resources.Resources.Open_icon + Me.btnBrowseAAUXFile.Location = New Point(441, 45) Me.btnBrowseAAUXFile.Name = "btnBrowseAAUXFile" - Me.btnBrowseAAUXFile.Size = New System.Drawing.Size(24, 24) + Me.btnBrowseAAUXFile.Size = New Size(24, 24) Me.btnBrowseAAUXFile.TabIndex = 39 Me.ToolTip1.SetToolTip(Me.btnBrowseAAUXFile, "Configure/Browser Advanced Auxiliary Files") Me.btnBrowseAAUXFile.UseVisualStyleBackColor = True ' 'txtAdvancedAuxiliaryFile ' - Me.txtAdvancedAuxiliaryFile.Location = New System.Drawing.Point(119, 47) + Me.txtAdvancedAuxiliaryFile.Location = New Point(119, 47) Me.txtAdvancedAuxiliaryFile.Name = "txtAdvancedAuxiliaryFile" - Me.txtAdvancedAuxiliaryFile.Size = New System.Drawing.Size(321, 20) + Me.txtAdvancedAuxiliaryFile.Size = New Size(321, 20) Me.txtAdvancedAuxiliaryFile.TabIndex = 38 ' 'picAuxInfo ' - Me.picAuxInfo.Image = Global.VECTO.My.Resources.Resources.Information_icon - Me.picAuxInfo.InitialImage = Global.VECTO.My.Resources.Resources.Information_icon - Me.picAuxInfo.Location = New System.Drawing.Point(451, 19) + Me.picAuxInfo.Image = My.Resources.Resources.Information_icon + Me.picAuxInfo.InitialImage = My.Resources.Resources.Information_icon + Me.picAuxInfo.Location = New Point(451, 19) Me.picAuxInfo.Name = "picAuxInfo" - Me.picAuxInfo.Size = New System.Drawing.Size(16, 16) - Me.picAuxInfo.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize + Me.picAuxInfo.Size = New Size(16, 16) + Me.picAuxInfo.SizeMode = PictureBoxSizeMode.AutoSize Me.picAuxInfo.TabIndex = 37 Me.picAuxInfo.TabStop = False ' 'cboAdvancedAuxiliaries ' Me.cboAdvancedAuxiliaries.FormattingEnabled = True - Me.cboAdvancedAuxiliaries.Location = New System.Drawing.Point(119, 18) + Me.cboAdvancedAuxiliaries.Location = New Point(119, 18) Me.cboAdvancedAuxiliaries.Name = "cboAdvancedAuxiliaries" - Me.cboAdvancedAuxiliaries.Size = New System.Drawing.Size(321, 21) + Me.cboAdvancedAuxiliaries.Size = New Size(321, 21) Me.cboAdvancedAuxiliaries.TabIndex = 36 ' 'lbAdvancedAuxiliaries ' Me.lbAdvancedAuxiliaries.AutoSize = True - Me.lbAdvancedAuxiliaries.Location = New System.Drawing.Point(7, 21) + Me.lbAdvancedAuxiliaries.Location = New Point(7, 21) Me.lbAdvancedAuxiliaries.Name = "lbAdvancedAuxiliaries" - Me.lbAdvancedAuxiliaries.Size = New System.Drawing.Size(72, 13) + Me.lbAdvancedAuxiliaries.Size = New Size(72, 13) Me.lbAdvancedAuxiliaries.TabIndex = 35 Me.lbAdvancedAuxiliaries.Text = "Auxiliary Type" ' 'Label32 ' - Me.Label32.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Label32.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles) Me.Label32.AutoSize = True - Me.Label32.Location = New System.Drawing.Point(406, 189) + Me.Label32.Location = New Point(406, 189) Me.Label32.Name = "Label32" - Me.Label32.Size = New System.Drawing.Size(106, 13) + Me.Label32.Size = New Size(106, 13) Me.Label32.TabIndex = 3 Me.Label32.Text = "(Double-Click to Edit)" ' 'LvAux ' - Me.LvAux.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.LvAux.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader4, Me.ColumnHeader5, Me.ColumnHeader6}) + Me.LvAux.Anchor = CType(((AnchorStyles.Top Or AnchorStyles.Left) _ + Or AnchorStyles.Right), AnchorStyles) + Me.LvAux.Columns.AddRange(New ColumnHeader() {Me.ColumnHeader4, Me.ColumnHeader5, Me.ColumnHeader6}) Me.LvAux.FullRowSelect = True Me.LvAux.GridLines = True Me.LvAux.HideSelection = False - Me.LvAux.Location = New System.Drawing.Point(6, 72) + Me.LvAux.Location = New Point(6, 72) Me.LvAux.MultiSelect = False Me.LvAux.Name = "LvAux" - Me.LvAux.Size = New System.Drawing.Size(503, 117) + Me.LvAux.Size = New Size(503, 117) Me.LvAux.TabIndex = 0 Me.LvAux.TabStop = False Me.LvAux.UseCompatibleStateImageBehavior = False - Me.LvAux.View = System.Windows.Forms.View.Details + Me.LvAux.View = View.Details ' 'ColumnHeader4 ' @@ -380,54 +372,54 @@ Partial Class F_VECTO ' 'ButAuxRem ' - Me.ButAuxRem.Image = Global.VECTO.My.Resources.Resources.minus_circle_icon - Me.ButAuxRem.Location = New System.Drawing.Point(29, 190) + Me.ButAuxRem.Image = My.Resources.Resources.minus_circle_icon + Me.ButAuxRem.Location = New Point(29, 190) Me.ButAuxRem.Name = "ButAuxRem" - Me.ButAuxRem.Size = New System.Drawing.Size(24, 24) + Me.ButAuxRem.Size = New Size(24, 24) Me.ButAuxRem.TabIndex = 2 Me.ButAuxRem.UseVisualStyleBackColor = True ' 'ButAuxAdd ' - Me.ButAuxAdd.Image = Global.VECTO.My.Resources.Resources.plus_circle_icon - Me.ButAuxAdd.Location = New System.Drawing.Point(5, 190) + Me.ButAuxAdd.Image = My.Resources.Resources.plus_circle_icon + Me.ButAuxAdd.Location = New Point(5, 190) Me.ButAuxAdd.Name = "ButAuxAdd" - Me.ButAuxAdd.Size = New System.Drawing.Size(24, 24) + Me.ButAuxAdd.Size = New Size(24, 24) Me.ButAuxAdd.TabIndex = 1 Me.ButAuxAdd.UseVisualStyleBackColor = True ' 'TbGBX ' - Me.TbGBX.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.TbGBX.Location = New System.Drawing.Point(84, 60) + Me.TbGBX.Anchor = CType(((AnchorStyles.Top Or AnchorStyles.Left) _ + Or AnchorStyles.Right), AnchorStyles) + Me.TbGBX.Location = New Point(84, 60) Me.TbGBX.Name = "TbGBX" - Me.TbGBX.Size = New System.Drawing.Size(411, 20) + Me.TbGBX.Size = New Size(411, 20) Me.TbGBX.TabIndex = 7 ' 'TbENG ' - Me.TbENG.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.TbENG.Location = New System.Drawing.Point(84, 33) + Me.TbENG.Anchor = CType(((AnchorStyles.Top Or AnchorStyles.Left) _ + Or AnchorStyles.Right), AnchorStyles) + Me.TbENG.Location = New Point(84, 33) Me.TbENG.Name = "TbENG" - Me.TbENG.Size = New System.Drawing.Size(411, 20) + Me.TbENG.Size = New Size(411, 20) Me.TbENG.TabIndex = 4 ' 'TbVEH ' - Me.TbVEH.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.TbVEH.Location = New System.Drawing.Point(84, 7) + Me.TbVEH.Anchor = CType(((AnchorStyles.Top Or AnchorStyles.Left) _ + Or AnchorStyles.Right), AnchorStyles) + Me.TbVEH.Location = New Point(84, 7) Me.TbVEH.Name = "TbVEH" - Me.TbVEH.Size = New System.Drawing.Size(411, 20) + Me.TbVEH.Size = New Size(411, 20) Me.TbVEH.TabIndex = 1 ' 'ButOpenGBX ' - Me.ButOpenGBX.Location = New System.Drawing.Point(6, 60) + Me.ButOpenGBX.Location = New Point(6, 60) Me.ButOpenGBX.Name = "ButOpenGBX" - Me.ButOpenGBX.Size = New System.Drawing.Size(72, 21) + Me.ButOpenGBX.Size = New Size(72, 21) Me.ButOpenGBX.TabIndex = 6 Me.ButOpenGBX.TabStop = False Me.ButOpenGBX.Text = "Gearbox" @@ -435,9 +427,9 @@ Partial Class F_VECTO ' 'ButOpenENG ' - Me.ButOpenENG.Location = New System.Drawing.Point(6, 33) + Me.ButOpenENG.Location = New Point(6, 33) Me.ButOpenENG.Name = "ButOpenENG" - Me.ButOpenENG.Size = New System.Drawing.Size(72, 21) + Me.ButOpenENG.Size = New Size(72, 21) Me.ButOpenENG.TabIndex = 3 Me.ButOpenENG.TabStop = False Me.ButOpenENG.Text = "Engine" @@ -445,9 +437,9 @@ Partial Class F_VECTO ' 'ButOpenVEH ' - Me.ButOpenVEH.Location = New System.Drawing.Point(6, 6) + Me.ButOpenVEH.Location = New Point(6, 6) Me.ButOpenVEH.Name = "ButOpenVEH" - Me.ButOpenVEH.Size = New System.Drawing.Size(72, 21) + Me.ButOpenVEH.Size = New Size(72, 21) Me.ButOpenVEH.TabIndex = 0 Me.ButOpenVEH.TabStop = False Me.ButOpenVEH.Text = "Vehicle" @@ -455,48 +447,48 @@ Partial Class F_VECTO ' 'ButtonVEH ' - Me.ButtonVEH.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.ButtonVEH.Image = CType(resources.GetObject("ButtonVEH.Image"), System.Drawing.Image) - Me.ButtonVEH.Location = New System.Drawing.Point(496, 5) + Me.ButtonVEH.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles) + Me.ButtonVEH.Image = CType(resources.GetObject("ButtonVEH.Image"), Image) + Me.ButtonVEH.Location = New Point(496, 5) Me.ButtonVEH.Name = "ButtonVEH" - Me.ButtonVEH.Size = New System.Drawing.Size(24, 24) + Me.ButtonVEH.Size = New Size(24, 24) Me.ButtonVEH.TabIndex = 2 Me.ButtonVEH.TabStop = False Me.ButtonVEH.UseVisualStyleBackColor = True ' 'ButtonGBX ' - Me.ButtonGBX.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.ButtonGBX.Image = CType(resources.GetObject("ButtonGBX.Image"), System.Drawing.Image) - Me.ButtonGBX.Location = New System.Drawing.Point(496, 58) + Me.ButtonGBX.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles) + Me.ButtonGBX.Image = CType(resources.GetObject("ButtonGBX.Image"), Image) + Me.ButtonGBX.Location = New Point(496, 58) Me.ButtonGBX.Name = "ButtonGBX" - Me.ButtonGBX.Size = New System.Drawing.Size(24, 24) + Me.ButtonGBX.Size = New Size(24, 24) Me.ButtonGBX.TabIndex = 8 Me.ButtonGBX.TabStop = False Me.ButtonGBX.UseVisualStyleBackColor = True ' 'ButtonMAP ' - Me.ButtonMAP.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.ButtonMAP.Image = CType(resources.GetObject("ButtonMAP.Image"), System.Drawing.Image) - Me.ButtonMAP.Location = New System.Drawing.Point(496, 31) + Me.ButtonMAP.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles) + Me.ButtonMAP.Image = CType(resources.GetObject("ButtonMAP.Image"), Image) + Me.ButtonMAP.Location = New Point(496, 31) Me.ButtonMAP.Name = "ButtonMAP" - Me.ButtonMAP.Size = New System.Drawing.Size(24, 24) + Me.ButtonMAP.Size = New Size(24, 24) Me.ButtonMAP.TabIndex = 5 Me.ButtonMAP.TabStop = False Me.ButtonMAP.UseVisualStyleBackColor = True ' 'TabControl1 ' - Me.TabControl1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.TabControl1.Anchor = CType(((AnchorStyles.Top Or AnchorStyles.Left) _ + Or AnchorStyles.Right), AnchorStyles) Me.TabControl1.Controls.Add(Me.TabPgGen) Me.TabControl1.Controls.Add(Me.TabPgDriver) - Me.TabControl1.Location = New System.Drawing.Point(1, 107) + Me.TabControl1.Location = New Point(1, 107) Me.TabControl1.Name = "TabControl1" Me.TabControl1.SelectedIndex = 0 - Me.TabControl1.Size = New System.Drawing.Size(535, 599) - Me.TabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed + Me.TabControl1.Size = New Size(535, 560) + Me.TabControl1.SizeMode = TabSizeMode.Fixed Me.TabControl1.TabIndex = 0 ' 'TabPgDriver @@ -505,10 +497,10 @@ Partial Class F_VECTO Me.TabPgDriver.Controls.Add(Me.GrLAC) Me.TabPgDriver.Controls.Add(Me.GroupBox1) Me.TabPgDriver.Controls.Add(Me.GrStartStop) - Me.TabPgDriver.Location = New System.Drawing.Point(4, 22) + Me.TabPgDriver.Location = New Point(4, 22) Me.TabPgDriver.Name = "TabPgDriver" - Me.TabPgDriver.Padding = New System.Windows.Forms.Padding(3) - Me.TabPgDriver.Size = New System.Drawing.Size(527, 573) + Me.TabPgDriver.Padding = New Padding(3) + Me.TabPgDriver.Size = New Size(527, 534) Me.TabPgDriver.TabIndex = 7 Me.TabPgDriver.Text = "Driver Assist" Me.TabPgDriver.UseVisualStyleBackColor = True @@ -518,272 +510,183 @@ Partial Class F_VECTO Me.GrVACC.Controls.Add(Me.TbDesMaxFile) Me.GrVACC.Controls.Add(Me.BtDesMaxBr) Me.GrVACC.Controls.Add(Me.BtAccOpen) - Me.GrVACC.Location = New System.Drawing.Point(7, 502) + Me.GrVACC.Location = New Point(6, 459) Me.GrVACC.Name = "GrVACC" - Me.GrVACC.Size = New System.Drawing.Size(515, 65) + Me.GrVACC.Size = New Size(515, 65) Me.GrVACC.TabIndex = 3 Me.GrVACC.TabStop = False Me.GrVACC.Text = "Max. acceleration and brake curves" ' 'TbDesMaxFile ' - Me.TbDesMaxFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.TbDesMaxFile.Location = New System.Drawing.Point(6, 29) + Me.TbDesMaxFile.Anchor = CType(((AnchorStyles.Top Or AnchorStyles.Left) _ + Or AnchorStyles.Right), AnchorStyles) + Me.TbDesMaxFile.Location = New Point(6, 29) Me.TbDesMaxFile.Name = "TbDesMaxFile" - Me.TbDesMaxFile.Size = New System.Drawing.Size(440, 20) + Me.TbDesMaxFile.Size = New Size(440, 20) Me.TbDesMaxFile.TabIndex = 0 ' 'BtDesMaxBr ' - Me.BtDesMaxBr.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.BtDesMaxBr.Image = Global.VECTO.My.Resources.Resources.Open_icon - Me.BtDesMaxBr.Location = New System.Drawing.Point(446, 27) + Me.BtDesMaxBr.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles) + Me.BtDesMaxBr.Image = My.Resources.Resources.Open_icon + Me.BtDesMaxBr.Location = New Point(446, 27) Me.BtDesMaxBr.Name = "BtDesMaxBr" - Me.BtDesMaxBr.Size = New System.Drawing.Size(24, 24) + Me.BtDesMaxBr.Size = New Size(24, 24) Me.BtDesMaxBr.TabIndex = 1 Me.BtDesMaxBr.UseVisualStyleBackColor = True ' 'BtAccOpen ' - Me.BtAccOpen.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.BtAccOpen.Image = Global.VECTO.My.Resources.Resources.application_export_icon_small - Me.BtAccOpen.Location = New System.Drawing.Point(469, 27) + Me.BtAccOpen.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles) + Me.BtAccOpen.Image = My.Resources.Resources.application_export_icon_small + Me.BtAccOpen.Location = New Point(469, 27) Me.BtAccOpen.Name = "BtAccOpen" - Me.BtAccOpen.Size = New System.Drawing.Size(24, 24) + Me.BtAccOpen.Size = New Size(24, 24) Me.BtAccOpen.TabIndex = 2 Me.BtAccOpen.TabStop = False Me.BtAccOpen.UseVisualStyleBackColor = True ' 'GrLAC ' - Me.GrLAC.Controls.Add(Me.GroupBox2) - Me.GrLAC.Controls.Add(Me.PnLookAhead) + Me.GrLAC.Controls.Add(Me.Label12) + Me.GrLAC.Controls.Add(Me.tbDfCoastingScale) Me.GrLAC.Controls.Add(Me.CbLookAhead) - Me.GrLAC.Location = New System.Drawing.Point(7, 290) + Me.GrLAC.Controls.Add(Me.Label11) + Me.GrLAC.Controls.Add(Me.Label3) + Me.GrLAC.Controls.Add(Me.tbDfCoastingOffset) + Me.GrLAC.Controls.Add(Me.tbLacDfTargetSpeedFile) + Me.GrLAC.Controls.Add(Me.Label10) + Me.GrLAC.Controls.Add(Me.Label4) + Me.GrLAC.Controls.Add(Me.Label5) + Me.GrLAC.Controls.Add(Me.btnDfTargetSpeed) + Me.GrLAC.Controls.Add(Me.tbLacPreviewFactor) + Me.GrLAC.Controls.Add(Me.tbLacDfVelocityDropFile) + Me.GrLAC.Location = New Point(7, 290) Me.GrLAC.Name = "GrLAC" - Me.GrLAC.Size = New System.Drawing.Size(514, 206) + Me.GrLAC.Size = New Size(514, 163) Me.GrLAC.TabIndex = 2 Me.GrLAC.TabStop = False Me.GrLAC.Text = "Look-Ahead Coasting" ' - 'GroupBox2 - ' - Me.GroupBox2.Controls.Add(Me.Label12) - Me.GroupBox2.Controls.Add(Me.tbDfCoastingScale) - Me.GroupBox2.Controls.Add(Me.Label11) - Me.GroupBox2.Controls.Add(Me.tbDfCoastingOffset) - Me.GroupBox2.Controls.Add(Me.Label10) - Me.GroupBox2.Controls.Add(Me.Label5) - Me.GroupBox2.Controls.Add(Me.Label3) - Me.GroupBox2.Controls.Add(Me.tbLacDfVelocityDropFile) - Me.GroupBox2.Controls.Add(Me.tbLacPreviewFactor) - Me.GroupBox2.Controls.Add(Me.btnDfVelocityDrop) - Me.GroupBox2.Controls.Add(Me.btnDfTargetSpeed) - Me.GroupBox2.Controls.Add(Me.Label4) - Me.GroupBox2.Controls.Add(Me.tbLacDfTargetSpeedFile) - Me.GroupBox2.Location = New System.Drawing.Point(15, 76) - Me.GroupBox2.Name = "GroupBox2" - Me.GroupBox2.Size = New System.Drawing.Size(478, 124) - Me.GroupBox2.TabIndex = 3 - Me.GroupBox2.TabStop = False - Me.GroupBox2.Text = "Coasting Parameters" - ' 'Label12 ' Me.Label12.AutoSize = True - Me.Label12.Location = New System.Drawing.Point(272, 102) + Me.Label12.Location = New Point(279, 133) Me.Label12.Name = "Label12" - Me.Label12.Size = New System.Drawing.Size(130, 13) + Me.Label12.Size = New Size(130, 13) Me.Label12.TabIndex = 17 Me.Label12.Text = "* DF_vTarget * DF_vDrop" ' 'tbDfCoastingScale ' - Me.tbDfCoastingScale.Location = New System.Drawing.Point(229, 99) + Me.tbDfCoastingScale.Location = New Point(236, 130) Me.tbDfCoastingScale.Name = "tbDfCoastingScale" - Me.tbDfCoastingScale.Size = New System.Drawing.Size(37, 20) + Me.tbDfCoastingScale.Size = New Size(37, 20) Me.tbDfCoastingScale.TabIndex = 16 ' + 'CbLookAhead + ' + Me.CbLookAhead.AutoSize = True + Me.CbLookAhead.Checked = True + Me.CbLookAhead.CheckState = CheckState.Checked + Me.CbLookAhead.Location = New Point(16, 21) + Me.CbLookAhead.Name = "CbLookAhead" + Me.CbLookAhead.Size = New Size(65, 17) + Me.CbLookAhead.TabIndex = 0 + Me.CbLookAhead.Text = "Enabled" + Me.CbLookAhead.UseVisualStyleBackColor = True + ' 'Label11 ' Me.Label11.AutoSize = True - Me.Label11.Location = New System.Drawing.Point(212, 101) + Me.Label11.Location = New Point(219, 132) Me.Label11.Name = "Label11" - Me.Label11.Size = New System.Drawing.Size(13, 13) + Me.Label11.Size = New Size(13, 13) Me.Label11.TabIndex = 15 Me.Label11.Text = "- " ' + 'Label3 + ' + Me.Label3.AutoSize = True + Me.Label3.Location = New Point(50, 54) + Me.Label3.Name = "Label3" + Me.Label3.Size = New Size(118, 13) + Me.Label3.TabIndex = 4 + Me.Label3.Text = "Preview distance factor" + Me.Label3.TextAlign = ContentAlignment.MiddleRight + ' 'tbDfCoastingOffset ' - Me.tbDfCoastingOffset.Location = New System.Drawing.Point(168, 99) + Me.tbDfCoastingOffset.Location = New Point(175, 130) Me.tbDfCoastingOffset.Name = "tbDfCoastingOffset" - Me.tbDfCoastingOffset.Size = New System.Drawing.Size(37, 20) + Me.tbDfCoastingOffset.Size = New Size(37, 20) Me.tbDfCoastingOffset.TabIndex = 14 ' + 'tbLacDfTargetSpeedFile + ' + Me.tbLacDfTargetSpeedFile.Anchor = CType(((AnchorStyles.Top Or AnchorStyles.Left) _ + Or AnchorStyles.Right), AnchorStyles) + Me.tbLacDfTargetSpeedFile.Location = New Point(174, 77) + Me.tbLacDfTargetSpeedFile.Name = "tbLacDfTargetSpeedFile" + Me.tbLacDfTargetSpeedFile.Size = New Size(264, 20) + Me.tbLacDfTargetSpeedFile.TabIndex = 6 + ' 'Label10 ' Me.Label10.AutoSize = True - Me.Label10.Location = New System.Drawing.Point(82, 102) + Me.Label10.Location = New Point(89, 133) Me.Label10.Name = "Label10" - Me.Label10.Size = New System.Drawing.Size(79, 13) + Me.Label10.Size = New Size(79, 13) Me.Label10.TabIndex = 12 Me.Label10.Text = "DF_coasting = " ' + 'Label4 + ' + Me.Label4.AutoSize = True + Me.Label4.Location = New Point(13, 80) + Me.Label4.Name = "Label4" + Me.Label4.Size = New Size(155, 13) + Me.Label4.TabIndex = 8 + Me.Label4.Text = "Decision Factor - Target Speed" + Me.Label4.TextAlign = ContentAlignment.MiddleRight + ' 'Label5 ' Me.Label5.AutoSize = True - Me.Label5.Location = New System.Drawing.Point(8, 76) + Me.Label5.Location = New Point(15, 107) Me.Label5.Name = "Label5" - Me.Label5.Size = New System.Drawing.Size(153, 13) + Me.Label5.Size = New Size(153, 13) Me.Label5.TabIndex = 11 Me.Label5.Text = "Decision Factor - Velocity Drop" - Me.Label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight - ' - 'Label3 - ' - Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(43, 23) - Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(118, 13) - Me.Label3.TabIndex = 4 - Me.Label3.Text = "Preview distance factor" - Me.Label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight - ' - 'tbLacDfVelocityDropFile - ' - Me.tbLacDfVelocityDropFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.tbLacDfVelocityDropFile.Location = New System.Drawing.Point(167, 73) - Me.tbLacDfVelocityDropFile.Name = "tbLacDfVelocityDropFile" - Me.tbLacDfVelocityDropFile.Size = New System.Drawing.Size(264, 20) - Me.tbLacDfVelocityDropFile.TabIndex = 9 - ' - 'tbLacPreviewFactor - ' - Me.tbLacPreviewFactor.Location = New System.Drawing.Point(167, 20) - Me.tbLacPreviewFactor.Name = "tbLacPreviewFactor" - Me.tbLacPreviewFactor.Size = New System.Drawing.Size(64, 20) - Me.tbLacPreviewFactor.TabIndex = 5 - ' - 'btnDfVelocityDrop - ' - Me.btnDfVelocityDrop.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.btnDfVelocityDrop.Image = CType(resources.GetObject("btnDfVelocityDrop.Image"), System.Drawing.Image) - Me.btnDfVelocityDrop.Location = New System.Drawing.Point(431, 72) - Me.btnDfVelocityDrop.Name = "btnDfVelocityDrop" - Me.btnDfVelocityDrop.Size = New System.Drawing.Size(24, 24) - Me.btnDfVelocityDrop.TabIndex = 10 - Me.btnDfVelocityDrop.TabStop = False - Me.btnDfVelocityDrop.UseVisualStyleBackColor = True + Me.Label5.TextAlign = ContentAlignment.MiddleRight ' 'btnDfTargetSpeed ' - Me.btnDfTargetSpeed.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.btnDfTargetSpeed.Image = CType(resources.GetObject("btnDfTargetSpeed.Image"), System.Drawing.Image) - Me.btnDfTargetSpeed.Location = New System.Drawing.Point(431, 45) + Me.btnDfTargetSpeed.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles) + Me.btnDfTargetSpeed.Image = CType(resources.GetObject("btnDfTargetSpeed.Image"), Image) + Me.btnDfTargetSpeed.Location = New Point(438, 76) Me.btnDfTargetSpeed.Name = "btnDfTargetSpeed" - Me.btnDfTargetSpeed.Size = New System.Drawing.Size(24, 24) + Me.btnDfTargetSpeed.Size = New Size(24, 24) Me.btnDfTargetSpeed.TabIndex = 7 Me.btnDfTargetSpeed.TabStop = False Me.btnDfTargetSpeed.UseVisualStyleBackColor = True ' - 'Label4 - ' - Me.Label4.AutoSize = True - Me.Label4.Location = New System.Drawing.Point(6, 49) - Me.Label4.Name = "Label4" - Me.Label4.Size = New System.Drawing.Size(155, 13) - Me.Label4.TabIndex = 8 - Me.Label4.Text = "Decision Factor - Target Speed" - Me.Label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight - ' - 'tbLacDfTargetSpeedFile - ' - Me.tbLacDfTargetSpeedFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.tbLacDfTargetSpeedFile.Location = New System.Drawing.Point(167, 46) - Me.tbLacDfTargetSpeedFile.Name = "tbLacDfTargetSpeedFile" - Me.tbLacDfTargetSpeedFile.Size = New System.Drawing.Size(264, 20) - Me.tbLacDfTargetSpeedFile.TabIndex = 6 + 'tbLacPreviewFactor ' - 'PnLookAhead - ' - Me.PnLookAhead.BackColor = System.Drawing.Color.Transparent - Me.PnLookAhead.Controls.Add(Me.Label9) - Me.PnLookAhead.Controls.Add(Me.Label8) - Me.PnLookAhead.Controls.Add(Me.TbAlookahead) - Me.PnLookAhead.Controls.Add(Me.Label7) - Me.PnLookAhead.Controls.Add(Me.TbVminLA) - Me.PnLookAhead.Controls.Add(Me.Label6) - Me.PnLookAhead.Location = New System.Drawing.Point(136, 12) - Me.PnLookAhead.Name = "PnLookAhead" - Me.PnLookAhead.Size = New System.Drawing.Size(232, 59) - Me.PnLookAhead.TabIndex = 1 - ' - 'Label9 - ' - Me.Label9.AutoSize = True - Me.Label9.Location = New System.Drawing.Point(182, 12) - Me.Label9.Name = "Label9" - Me.Label9.Size = New System.Drawing.Size(34, 13) - Me.Label9.TabIndex = 7 - Me.Label9.Text = "[m/s²]" - ' - 'Label8 - ' - Me.Label8.AutoSize = True - Me.Label8.Location = New System.Drawing.Point(182, 38) - Me.Label8.Name = "Label8" - Me.Label8.Size = New System.Drawing.Size(38, 13) - Me.Label8.TabIndex = 4 - Me.Label8.Text = "[km/h]" - ' - 'TbAlookahead - ' - Me.TbAlookahead.Location = New System.Drawing.Point(112, 9) - Me.TbAlookahead.Name = "TbAlookahead" - Me.TbAlookahead.Size = New System.Drawing.Size(64, 20) - Me.TbAlookahead.TabIndex = 0 - ' - 'Label7 - ' - Me.Label7.AutoSize = True - Me.Label7.Location = New System.Drawing.Point(26, 38) - Me.Label7.Name = "Label7" - Me.Label7.Size = New System.Drawing.Size(80, 13) - Me.Label7.TabIndex = 6 - Me.Label7.Text = "Minimum speed" - Me.Label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight - ' - 'TbVminLA - ' - Me.TbVminLA.Location = New System.Drawing.Point(112, 35) - Me.TbVminLA.Name = "TbVminLA" - Me.TbVminLA.Size = New System.Drawing.Size(64, 20) - Me.TbVminLA.TabIndex = 1 - ' - 'Label6 - ' - Me.Label6.AutoSize = True - Me.Label6.Location = New System.Drawing.Point(10, 12) - Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(96, 13) - Me.Label6.TabIndex = 5 - Me.Label6.Text = "Target Retardation" - Me.Label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.tbLacPreviewFactor.Location = New Point(174, 51) + Me.tbLacPreviewFactor.Name = "tbLacPreviewFactor" + Me.tbLacPreviewFactor.Size = New Size(64, 20) + Me.tbLacPreviewFactor.TabIndex = 5 ' - 'CbLookAhead + 'tbLacDfVelocityDropFile ' - Me.CbLookAhead.AutoSize = True - Me.CbLookAhead.Checked = True - Me.CbLookAhead.CheckState = System.Windows.Forms.CheckState.Checked - Me.CbLookAhead.Location = New System.Drawing.Point(16, 21) - Me.CbLookAhead.Name = "CbLookAhead" - Me.CbLookAhead.Size = New System.Drawing.Size(65, 17) - Me.CbLookAhead.TabIndex = 0 - Me.CbLookAhead.Text = "Enabled" - Me.CbLookAhead.UseVisualStyleBackColor = True + Me.tbLacDfVelocityDropFile.Anchor = CType(((AnchorStyles.Top Or AnchorStyles.Left) _ + Or AnchorStyles.Right), AnchorStyles) + Me.tbLacDfVelocityDropFile.Location = New Point(174, 104) + Me.tbLacDfVelocityDropFile.Name = "tbLacDfVelocityDropFile" + Me.tbLacDfVelocityDropFile.Size = New Size(264, 20) + Me.tbLacDfVelocityDropFile.TabIndex = 9 ' 'GroupBox1 ' @@ -791,9 +694,9 @@ Partial Class F_VECTO Me.GroupBox1.Controls.Add(Me.RdEcoRoll) Me.GroupBox1.Controls.Add(Me.RdOverspeed) Me.GroupBox1.Controls.Add(Me.RdOff) - Me.GroupBox1.Location = New System.Drawing.Point(6, 149) + Me.GroupBox1.Location = New Point(6, 149) Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(515, 135) + Me.GroupBox1.Size = New Size(515, 135) Me.GroupBox1.TabIndex = 1 Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Overspeed / Eco-Roll" @@ -809,83 +712,83 @@ Partial Class F_VECTO Me.PnEcoRoll.Controls.Add(Me.Label23) Me.PnEcoRoll.Controls.Add(Me.Label22) Me.PnEcoRoll.Controls.Add(Me.Label13) - Me.PnEcoRoll.Location = New System.Drawing.Point(137, 16) + Me.PnEcoRoll.Location = New Point(137, 16) Me.PnEcoRoll.Name = "PnEcoRoll" - Me.PnEcoRoll.Size = New System.Drawing.Size(232, 102) + Me.PnEcoRoll.Size = New Size(232, 102) Me.PnEcoRoll.TabIndex = 3 ' 'Label21 ' Me.Label21.AutoSize = True - Me.Label21.Location = New System.Drawing.Point(178, 61) + Me.Label21.Location = New Point(178, 61) Me.Label21.Name = "Label21" - Me.Label21.Size = New System.Drawing.Size(38, 13) + Me.Label21.Size = New Size(38, 13) Me.Label21.TabIndex = 3 Me.Label21.Text = "[km/h]" ' 'Label20 ' Me.Label20.AutoSize = True - Me.Label20.Location = New System.Drawing.Point(178, 35) + Me.Label20.Location = New Point(178, 35) Me.Label20.Name = "Label20" - Me.Label20.Size = New System.Drawing.Size(38, 13) + Me.Label20.Size = New Size(38, 13) Me.Label20.TabIndex = 3 Me.Label20.Text = "[km/h]" ' 'Label14 ' Me.Label14.AutoSize = True - Me.Label14.Location = New System.Drawing.Point(178, 9) + Me.Label14.Location = New Point(178, 9) Me.Label14.Name = "Label14" - Me.Label14.Size = New System.Drawing.Size(38, 13) + Me.Label14.Size = New Size(38, 13) Me.Label14.TabIndex = 3 Me.Label14.Text = "[km/h]" ' 'TbVmin ' - Me.TbVmin.Location = New System.Drawing.Point(108, 58) + Me.TbVmin.Location = New Point(108, 58) Me.TbVmin.Name = "TbVmin" - Me.TbVmin.Size = New System.Drawing.Size(64, 20) + Me.TbVmin.Size = New Size(64, 20) Me.TbVmin.TabIndex = 2 ' 'TbUnderSpeed ' - Me.TbUnderSpeed.Location = New System.Drawing.Point(108, 32) + Me.TbUnderSpeed.Location = New Point(108, 32) Me.TbUnderSpeed.Name = "TbUnderSpeed" - Me.TbUnderSpeed.Size = New System.Drawing.Size(64, 20) + Me.TbUnderSpeed.Size = New Size(64, 20) Me.TbUnderSpeed.TabIndex = 1 ' 'TbOverspeed ' - Me.TbOverspeed.Location = New System.Drawing.Point(108, 6) + Me.TbOverspeed.Location = New Point(108, 6) Me.TbOverspeed.Name = "TbOverspeed" - Me.TbOverspeed.Size = New System.Drawing.Size(64, 20) + Me.TbOverspeed.Size = New Size(64, 20) Me.TbOverspeed.TabIndex = 0 ' 'Label23 ' Me.Label23.AutoSize = True - Me.Label23.Location = New System.Drawing.Point(22, 61) + Me.Label23.Location = New Point(22, 61) Me.Label23.Name = "Label23" - Me.Label23.Size = New System.Drawing.Size(80, 13) + Me.Label23.Size = New Size(80, 13) Me.Label23.TabIndex = 1 Me.Label23.Text = "Minimum speed" ' 'Label22 ' Me.Label22.AutoSize = True - Me.Label22.Location = New System.Drawing.Point(11, 35) + Me.Label22.Location = New Point(11, 35) Me.Label22.Name = "Label22" - Me.Label22.Size = New System.Drawing.Size(91, 13) + Me.Label22.Size = New Size(91, 13) Me.Label22.TabIndex = 1 Me.Label22.Text = "Max. Underspeed" ' 'Label13 ' Me.Label13.AutoSize = True - Me.Label13.Location = New System.Drawing.Point(17, 9) + Me.Label13.Location = New Point(17, 9) Me.Label13.Name = "Label13" - Me.Label13.Size = New System.Drawing.Size(85, 13) + Me.Label13.Size = New Size(85, 13) Me.Label13.TabIndex = 1 Me.Label13.Text = "Max. Overspeed" ' @@ -893,9 +796,9 @@ Partial Class F_VECTO ' Me.RdEcoRoll.AutoSize = True Me.RdEcoRoll.Checked = True - Me.RdEcoRoll.Location = New System.Drawing.Point(13, 68) + Me.RdEcoRoll.Location = New Point(13, 68) Me.RdEcoRoll.Name = "RdEcoRoll" - Me.RdEcoRoll.Size = New System.Drawing.Size(65, 17) + Me.RdEcoRoll.Size = New Size(65, 17) Me.RdEcoRoll.TabIndex = 2 Me.RdEcoRoll.TabStop = True Me.RdEcoRoll.Text = "Eco-Roll" @@ -904,9 +807,9 @@ Partial Class F_VECTO 'RdOverspeed ' Me.RdOverspeed.AutoSize = True - Me.RdOverspeed.Location = New System.Drawing.Point(13, 45) + Me.RdOverspeed.Location = New Point(13, 45) Me.RdOverspeed.Name = "RdOverspeed" - Me.RdOverspeed.Size = New System.Drawing.Size(77, 17) + Me.RdOverspeed.Size = New Size(77, 17) Me.RdOverspeed.TabIndex = 1 Me.RdOverspeed.Text = "Overspeed" Me.RdOverspeed.UseVisualStyleBackColor = True @@ -914,9 +817,9 @@ Partial Class F_VECTO 'RdOff ' Me.RdOff.AutoSize = True - Me.RdOff.Location = New System.Drawing.Point(13, 22) + Me.RdOff.Location = New Point(13, 22) Me.RdOff.Name = "RdOff" - Me.RdOff.Size = New System.Drawing.Size(39, 17) + Me.RdOff.Size = New Size(39, 17) Me.RdOff.TabIndex = 0 Me.RdOff.Text = "Off" Me.RdOff.UseVisualStyleBackColor = True @@ -925,9 +828,9 @@ Partial Class F_VECTO ' Me.GrStartStop.Controls.Add(Me.PnStartStop) Me.GrStartStop.Controls.Add(Me.ChBStartStop) - Me.GrStartStop.Location = New System.Drawing.Point(6, 6) + Me.GrStartStop.Location = New Point(6, 6) Me.GrStartStop.Name = "GrStartStop" - Me.GrStartStop.Size = New System.Drawing.Size(515, 137) + Me.GrStartStop.Size = New Size(515, 137) Me.GrStartStop.TabIndex = 0 Me.GrStartStop.TabStop = False Me.GrStartStop.Text = "Engine Start Stop" @@ -943,104 +846,104 @@ Partial Class F_VECTO Me.PnStartStop.Controls.Add(Me.LabelSStime) Me.PnStartStop.Controls.Add(Me.TbSSdelay) Me.PnStartStop.Controls.Add(Me.TbSStime) - Me.PnStartStop.Location = New System.Drawing.Point(87, 21) + Me.PnStartStop.Location = New Point(87, 21) Me.PnStartStop.Name = "PnStartStop" - Me.PnStartStop.Size = New System.Drawing.Size(422, 95) + Me.PnStartStop.Size = New Size(422, 95) Me.PnStartStop.TabIndex = 1 ' 'Label31 ' Me.Label31.AutoSize = True - Me.Label31.Location = New System.Drawing.Point(228, 58) + Me.Label31.Location = New Point(228, 58) Me.Label31.Name = "Label31" - Me.Label31.Size = New System.Drawing.Size(18, 13) + Me.Label31.Size = New Size(18, 13) Me.Label31.TabIndex = 38 Me.Label31.Text = "[s]" ' 'Label27 ' Me.Label27.AutoSize = True - Me.Label27.Location = New System.Drawing.Point(228, 32) + Me.Label27.Location = New Point(228, 32) Me.Label27.Name = "Label27" - Me.Label27.Size = New System.Drawing.Size(18, 13) + Me.Label27.Size = New Size(18, 13) Me.Label27.TabIndex = 38 Me.Label27.Text = "[s]" ' 'TbSSspeed ' - Me.TbSSspeed.Location = New System.Drawing.Point(158, 3) + Me.TbSSspeed.Location = New Point(158, 3) Me.TbSSspeed.Name = "TbSSspeed" - Me.TbSSspeed.Size = New System.Drawing.Size(64, 20) + Me.TbSSspeed.Size = New Size(64, 20) Me.TbSSspeed.TabIndex = 0 ' 'LabelSSspeed ' Me.LabelSSspeed.AutoSize = True - Me.LabelSSspeed.Location = New System.Drawing.Point(91, 6) + Me.LabelSSspeed.Location = New Point(91, 6) Me.LabelSSspeed.Name = "LabelSSspeed" - Me.LabelSSspeed.Size = New System.Drawing.Size(61, 13) + Me.LabelSSspeed.Size = New Size(61, 13) Me.LabelSSspeed.TabIndex = 37 Me.LabelSSspeed.Text = "Max Speed" ' 'Label26 ' Me.Label26.AutoSize = True - Me.Label26.Location = New System.Drawing.Point(228, 6) + Me.Label26.Location = New Point(228, 6) Me.Label26.Name = "Label26" - Me.Label26.Size = New System.Drawing.Size(38, 13) + Me.Label26.Size = New Size(38, 13) Me.Label26.TabIndex = 38 Me.Label26.Text = "[km/h]" ' 'Label30 ' Me.Label30.AutoSize = True - Me.Label30.Location = New System.Drawing.Point(68, 58) + Me.Label30.Location = New Point(68, 58) Me.Label30.Name = "Label30" - Me.Label30.Size = New System.Drawing.Size(84, 13) + Me.Label30.Size = New Size(84, 13) Me.Label30.TabIndex = 35 Me.Label30.Text = "Activation Delay" ' 'LabelSStime ' Me.LabelSStime.AutoSize = True - Me.LabelSStime.Location = New System.Drawing.Point(65, 32) + Me.LabelSStime.Location = New Point(65, 32) Me.LabelSStime.Name = "LabelSStime" - Me.LabelSStime.Size = New System.Drawing.Size(87, 13) + Me.LabelSStime.Size = New Size(87, 13) Me.LabelSStime.TabIndex = 35 Me.LabelSStime.Text = "Min ICE-On Time" ' 'TbSSdelay ' - Me.TbSSdelay.Location = New System.Drawing.Point(158, 55) + Me.TbSSdelay.Location = New Point(158, 55) Me.TbSSdelay.Name = "TbSSdelay" - Me.TbSSdelay.Size = New System.Drawing.Size(64, 20) + Me.TbSSdelay.Size = New Size(64, 20) Me.TbSSdelay.TabIndex = 2 ' 'TbSStime ' - Me.TbSStime.Location = New System.Drawing.Point(158, 29) + Me.TbSStime.Location = New Point(158, 29) Me.TbSStime.Name = "TbSStime" - Me.TbSStime.Size = New System.Drawing.Size(64, 20) + Me.TbSStime.Size = New Size(64, 20) Me.TbSStime.TabIndex = 1 ' 'ChBStartStop ' Me.ChBStartStop.AutoSize = True Me.ChBStartStop.Checked = True - Me.ChBStartStop.CheckState = System.Windows.Forms.CheckState.Checked - Me.ChBStartStop.Location = New System.Drawing.Point(16, 21) + Me.ChBStartStop.CheckState = CheckState.Checked + Me.ChBStartStop.Location = New Point(16, 21) Me.ChBStartStop.Name = "ChBStartStop" - Me.ChBStartStop.Size = New System.Drawing.Size(65, 17) + Me.ChBStartStop.Size = New Size(65, 17) Me.ChBStartStop.TabIndex = 0 Me.ChBStartStop.Text = "Enabled" Me.ChBStartStop.UseVisualStyleBackColor = True ' 'StatusStrip1 ' - Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripStatusLabelGEN}) - Me.StatusStrip1.Location = New System.Drawing.Point(0, 725) + Me.StatusStrip1.Items.AddRange(New ToolStripItem() {Me.ToolStripStatusLabelGEN}) + Me.StatusStrip1.Location = New Point(0, 672) Me.StatusStrip1.Name = "StatusStrip1" - Me.StatusStrip1.Size = New System.Drawing.Size(944, 22) + Me.StatusStrip1.Size = New Size(944, 22) Me.StatusStrip1.SizingGrip = False Me.StatusStrip1.TabIndex = 6 Me.StatusStrip1.Text = "StatusStrip1" @@ -1048,221 +951,221 @@ Partial Class F_VECTO 'ToolStripStatusLabelGEN ' Me.ToolStripStatusLabelGEN.Name = "ToolStripStatusLabelGEN" - Me.ToolStripStatusLabelGEN.Size = New System.Drawing.Size(121, 17) + Me.ToolStripStatusLabelGEN.Size = New Size(121, 17) Me.ToolStripStatusLabelGEN.Text = "ToolStripStatusLabel1" ' 'ButOK ' - Me.ButOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.ButOK.Location = New System.Drawing.Point(779, 699) + Me.ButOK.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles) + Me.ButOK.Location = New Point(779, 646) Me.ButOK.Name = "ButOK" - Me.ButOK.Size = New System.Drawing.Size(75, 23) + Me.ButOK.Size = New Size(75, 23) Me.ButOK.TabIndex = 0 Me.ButOK.Text = "Save" Me.ButOK.UseVisualStyleBackColor = True ' 'ButCancel ' - Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.ButCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel - Me.ButCancel.Location = New System.Drawing.Point(860, 699) + Me.ButCancel.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles) + Me.ButCancel.DialogResult = DialogResult.Cancel + Me.ButCancel.Location = New Point(860, 646) Me.ButCancel.Name = "ButCancel" - Me.ButCancel.Size = New System.Drawing.Size(75, 23) + Me.ButCancel.Size = New Size(75, 23) Me.ButCancel.TabIndex = 1 Me.ButCancel.Text = "Cancel" Me.ButCancel.UseVisualStyleBackColor = True ' 'ToolStrip1 ' - Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden - Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator1, Me.ToolStripBtSendTo, Me.ToolStripSeparator2, Me.ToolStripButton1}) - Me.ToolStrip1.Location = New System.Drawing.Point(0, 0) + Me.ToolStrip1.GripStyle = ToolStripGripStyle.Hidden + Me.ToolStrip1.Items.AddRange(New ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator1, Me.ToolStripBtSendTo, Me.ToolStripSeparator2, Me.ToolStripButton1}) + Me.ToolStrip1.Location = New Point(0, 0) Me.ToolStrip1.Name = "ToolStrip1" - Me.ToolStrip1.Size = New System.Drawing.Size(944, 25) + Me.ToolStrip1.Size = New Size(944, 25) Me.ToolStrip1.TabIndex = 20 Me.ToolStrip1.Text = "ToolStrip1" ' 'ToolStripBtNew ' - Me.ToolStripBtNew.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripBtNew.Image = Global.VECTO.My.Resources.Resources.blue_document_icon - Me.ToolStripBtNew.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripBtNew.DisplayStyle = ToolStripItemDisplayStyle.Image + Me.ToolStripBtNew.Image = My.Resources.Resources.blue_document_icon + Me.ToolStripBtNew.ImageTransparentColor = Color.Magenta Me.ToolStripBtNew.Name = "ToolStripBtNew" - Me.ToolStripBtNew.Size = New System.Drawing.Size(23, 22) + Me.ToolStripBtNew.Size = New Size(23, 22) Me.ToolStripBtNew.Text = "New" Me.ToolStripBtNew.ToolTipText = "New" ' 'ToolStripBtOpen ' - Me.ToolStripBtOpen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripBtOpen.Image = Global.VECTO.My.Resources.Resources.Open_icon - Me.ToolStripBtOpen.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripBtOpen.DisplayStyle = ToolStripItemDisplayStyle.Image + Me.ToolStripBtOpen.Image = My.Resources.Resources.Open_icon + Me.ToolStripBtOpen.ImageTransparentColor = Color.Magenta Me.ToolStripBtOpen.Name = "ToolStripBtOpen" - Me.ToolStripBtOpen.Size = New System.Drawing.Size(23, 22) + Me.ToolStripBtOpen.Size = New Size(23, 22) Me.ToolStripBtOpen.Text = "Open" Me.ToolStripBtOpen.ToolTipText = "Open..." ' 'ToolStripBtSave ' - Me.ToolStripBtSave.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripBtSave.Image = Global.VECTO.My.Resources.Resources.Actions_document_save_icon - Me.ToolStripBtSave.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripBtSave.DisplayStyle = ToolStripItemDisplayStyle.Image + Me.ToolStripBtSave.Image = My.Resources.Resources.Actions_document_save_icon + Me.ToolStripBtSave.ImageTransparentColor = Color.Magenta Me.ToolStripBtSave.Name = "ToolStripBtSave" - Me.ToolStripBtSave.Size = New System.Drawing.Size(23, 22) + Me.ToolStripBtSave.Size = New Size(23, 22) Me.ToolStripBtSave.Text = "Save" Me.ToolStripBtSave.ToolTipText = "Save" ' 'ToolStripBtSaveAs ' - Me.ToolStripBtSaveAs.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripBtSaveAs.Image = Global.VECTO.My.Resources.Resources.Actions_document_save_as_icon - Me.ToolStripBtSaveAs.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripBtSaveAs.DisplayStyle = ToolStripItemDisplayStyle.Image + Me.ToolStripBtSaveAs.Image = My.Resources.Resources.Actions_document_save_as_icon + Me.ToolStripBtSaveAs.ImageTransparentColor = Color.Magenta Me.ToolStripBtSaveAs.Name = "ToolStripBtSaveAs" - Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(23, 22) + Me.ToolStripBtSaveAs.Size = New Size(23, 22) Me.ToolStripBtSaveAs.Text = "Save As" Me.ToolStripBtSaveAs.ToolTipText = "Save As..." ' 'ToolStripSeparator1 ' Me.ToolStripSeparator1.Name = "ToolStripSeparator1" - Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 25) + Me.ToolStripSeparator1.Size = New Size(6, 25) ' 'ToolStripBtSendTo ' - Me.ToolStripBtSendTo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripBtSendTo.Image = Global.VECTO.My.Resources.Resources.export_icon - Me.ToolStripBtSendTo.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripBtSendTo.DisplayStyle = ToolStripItemDisplayStyle.Image + Me.ToolStripBtSendTo.Image = My.Resources.Resources.export_icon + Me.ToolStripBtSendTo.ImageTransparentColor = Color.Magenta Me.ToolStripBtSendTo.Name = "ToolStripBtSendTo" - Me.ToolStripBtSendTo.Size = New System.Drawing.Size(23, 22) + Me.ToolStripBtSendTo.Size = New Size(23, 22) Me.ToolStripBtSendTo.Text = "Send to Job List" Me.ToolStripBtSendTo.ToolTipText = "Send to Job List" ' 'ToolStripSeparator2 ' Me.ToolStripSeparator2.Name = "ToolStripSeparator2" - Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 25) + Me.ToolStripSeparator2.Size = New Size(6, 25) ' 'ToolStripButton1 ' - Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripButton1.Image = Global.VECTO.My.Resources.Resources.Help_icon - Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripButton1.DisplayStyle = ToolStripItemDisplayStyle.Image + Me.ToolStripButton1.Image = My.Resources.Resources.Help_icon + Me.ToolStripButton1.ImageTransparentColor = Color.Magenta Me.ToolStripButton1.Name = "ToolStripButton1" - Me.ToolStripButton1.Size = New System.Drawing.Size(23, 22) + Me.ToolStripButton1.Size = New Size(23, 22) Me.ToolStripButton1.Text = "Help" ' 'PictureBox1 ' - Me.PictureBox1.BackColor = System.Drawing.Color.White - Me.PictureBox1.Image = Global.VECTO.My.Resources.Resources.VECTO_VECTO - Me.PictureBox1.Location = New System.Drawing.Point(12, 28) + Me.PictureBox1.BackColor = Color.White + Me.PictureBox1.Image = My.Resources.Resources.VECTO_VECTO + Me.PictureBox1.Location = New Point(12, 28) Me.PictureBox1.Name = "PictureBox1" - Me.PictureBox1.Size = New System.Drawing.Size(920, 40) + Me.PictureBox1.Size = New Size(920, 40) Me.PictureBox1.TabIndex = 21 Me.PictureBox1.TabStop = False ' 'CbEngOnly ' Me.CbEngOnly.AutoSize = True - Me.CbEngOnly.Location = New System.Drawing.Point(17, 84) + Me.CbEngOnly.Location = New Point(17, 84) Me.CbEngOnly.Name = "CbEngOnly" - Me.CbEngOnly.Size = New System.Drawing.Size(113, 17) + Me.CbEngOnly.Size = New Size(113, 17) Me.CbEngOnly.TabIndex = 0 Me.CbEngOnly.Text = "Engine Only Mode" Me.CbEngOnly.UseVisualStyleBackColor = True ' 'CmOpenFile ' - Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem}) + Me.CmOpenFile.Items.AddRange(New ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem}) Me.CmOpenFile.Name = "CmOpenFile" - Me.CmOpenFile.Size = New System.Drawing.Size(153, 48) + Me.CmOpenFile.Size = New Size(153, 48) ' 'OpenWithToolStripMenuItem ' Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem" - Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(152, 22) + Me.OpenWithToolStripMenuItem.Size = New Size(152, 22) Me.OpenWithToolStripMenuItem.Text = "Open with ..." ' 'ShowInFolderToolStripMenuItem ' Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem" - Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(152, 22) + Me.ShowInFolderToolStripMenuItem.Size = New Size(152, 22) Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder" ' 'PicVehicle ' - Me.PicVehicle.BackColor = System.Drawing.Color.LightGray - Me.PicVehicle.Location = New System.Drawing.Point(542, 122) + Me.PicVehicle.BackColor = Color.LightGray + Me.PicVehicle.Location = New Point(542, 122) Me.PicVehicle.Name = "PicVehicle" - Me.PicVehicle.Size = New System.Drawing.Size(300, 88) - Me.PicVehicle.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage + Me.PicVehicle.Size = New Size(300, 88) + Me.PicVehicle.SizeMode = PictureBoxSizeMode.StretchImage Me.PicVehicle.TabIndex = 36 Me.PicVehicle.TabStop = False ' 'PicBox ' - Me.PicBox.BackColor = System.Drawing.Color.LightGray - Me.PicBox.Location = New System.Drawing.Point(542, 268) + Me.PicBox.BackColor = Color.LightGray + Me.PicBox.Location = New Point(542, 268) Me.PicBox.Name = "PicBox" - Me.PicBox.Size = New System.Drawing.Size(390, 327) + Me.PicBox.Size = New Size(390, 327) Me.PicBox.TabIndex = 36 Me.PicBox.TabStop = False ' 'TbEngTxt ' - Me.TbEngTxt.Location = New System.Drawing.Point(542, 216) + Me.TbEngTxt.Location = New Point(542, 216) Me.TbEngTxt.Name = "TbEngTxt" Me.TbEngTxt.ReadOnly = True - Me.TbEngTxt.Size = New System.Drawing.Size(390, 20) + Me.TbEngTxt.Size = New Size(390, 20) Me.TbEngTxt.TabIndex = 6 ' 'TbVehCat ' - Me.TbVehCat.Location = New System.Drawing.Point(848, 126) + Me.TbVehCat.Location = New Point(848, 126) Me.TbVehCat.Name = "TbVehCat" Me.TbVehCat.ReadOnly = True - Me.TbVehCat.Size = New System.Drawing.Size(87, 20) + Me.TbVehCat.Size = New Size(87, 20) Me.TbVehCat.TabIndex = 2 ' 'TbAxleConf ' - Me.TbAxleConf.Location = New System.Drawing.Point(904, 155) + Me.TbAxleConf.Location = New Point(904, 155) Me.TbAxleConf.Name = "TbAxleConf" Me.TbAxleConf.ReadOnly = True - Me.TbAxleConf.Size = New System.Drawing.Size(31, 20) + Me.TbAxleConf.Size = New Size(31, 20) Me.TbAxleConf.TabIndex = 4 ' 'TbHVCclass ' - Me.TbHVCclass.Location = New System.Drawing.Point(848, 184) + Me.TbHVCclass.Location = New Point(848, 184) Me.TbHVCclass.Name = "TbHVCclass" Me.TbHVCclass.ReadOnly = True - Me.TbHVCclass.Size = New System.Drawing.Size(87, 20) + Me.TbHVCclass.Size = New Size(87, 20) Me.TbHVCclass.TabIndex = 5 ' 'TbGbxTxt ' - Me.TbGbxTxt.Location = New System.Drawing.Point(542, 242) + Me.TbGbxTxt.Location = New Point(542, 242) Me.TbGbxTxt.Name = "TbGbxTxt" Me.TbGbxTxt.ReadOnly = True - Me.TbGbxTxt.Size = New System.Drawing.Size(390, 20) + Me.TbGbxTxt.Size = New Size(390, 20) Me.TbGbxTxt.TabIndex = 7 ' 'TbMass ' - Me.TbMass.Location = New System.Drawing.Point(848, 155) + Me.TbMass.Location = New Point(848, 155) Me.TbMass.Name = "TbMass" Me.TbMass.ReadOnly = True - Me.TbMass.Size = New System.Drawing.Size(50, 20) + Me.TbMass.Size = New Size(50, 20) Me.TbMass.TabIndex = 3 ' 'F_VECTO ' Me.AcceptButton = Me.ButOK - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.AutoScaleDimensions = New SizeF(6.0!, 13.0!) + Me.AutoScaleMode = AutoScaleMode.Font Me.CancelButton = Me.ButCancel - Me.ClientSize = New System.Drawing.Size(944, 747) + Me.ClientSize = New Size(944, 694) Me.Controls.Add(Me.TbHVCclass) Me.Controls.Add(Me.TbMass) Me.Controls.Add(Me.TbAxleConf) @@ -1278,11 +1181,11 @@ Partial Class F_VECTO Me.Controls.Add(Me.TabControl1) Me.Controls.Add(Me.ButOK) Me.Controls.Add(Me.StatusStrip1) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle - Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) + Me.FormBorderStyle = FormBorderStyle.FixedSingle + Me.Icon = CType(resources.GetObject("$this.Icon"), Icon) Me.MaximizeBox = False Me.Name = "F_VECTO" - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent + Me.StartPosition = FormStartPosition.CenterParent Me.Text = "Job Editor" Me.TabPgGen.ResumeLayout(False) Me.TabPgGen.PerformLayout() @@ -1290,17 +1193,13 @@ Partial Class F_VECTO Me.GrCycles.PerformLayout() Me.GrAux.ResumeLayout(False) Me.GrAux.PerformLayout() - CType(Me.picAuxInfo, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.picAuxInfo, ISupportInitialize).EndInit() Me.TabControl1.ResumeLayout(False) Me.TabPgDriver.ResumeLayout(False) Me.GrVACC.ResumeLayout(False) Me.GrVACC.PerformLayout() Me.GrLAC.ResumeLayout(False) Me.GrLAC.PerformLayout() - Me.GroupBox2.ResumeLayout(False) - Me.GroupBox2.PerformLayout() - Me.PnLookAhead.ResumeLayout(False) - Me.PnLookAhead.PerformLayout() Me.GroupBox1.ResumeLayout(False) Me.GroupBox1.PerformLayout() Me.PnEcoRoll.ResumeLayout(False) @@ -1313,125 +1212,116 @@ Partial Class F_VECTO Me.StatusStrip1.PerformLayout() Me.ToolStrip1.ResumeLayout(False) Me.ToolStrip1.PerformLayout() - CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PictureBox1, ISupportInitialize).EndInit() Me.CmOpenFile.ResumeLayout(False) - CType(Me.PicVehicle, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.PicBox, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PicVehicle, ISupportInitialize).EndInit() + CType(Me.PicBox, ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() End Sub - Friend WithEvents TabPgGen As System.Windows.Forms.TabPage - Friend WithEvents TabControl1 As System.Windows.Forms.TabControl - Friend WithEvents StatusStrip1 As System.Windows.Forms.StatusStrip - Friend WithEvents ButtonVEH As System.Windows.Forms.Button - Friend WithEvents ButtonMAP As System.Windows.Forms.Button - Friend WithEvents ButtonGBX As System.Windows.Forms.Button - Friend WithEvents ButOpenVEH As System.Windows.Forms.Button - Friend WithEvents ButOpenGBX As System.Windows.Forms.Button - Friend WithEvents ButOpenENG As System.Windows.Forms.Button - Friend WithEvents ToolStripStatusLabelGEN As System.Windows.Forms.ToolStripStatusLabel - Friend WithEvents ButOK As System.Windows.Forms.Button - Friend WithEvents TbGBX As System.Windows.Forms.TextBox - Friend WithEvents TbENG As System.Windows.Forms.TextBox - Friend WithEvents TbVEH As System.Windows.Forms.TextBox - Friend WithEvents ButCancel As System.Windows.Forms.Button - Friend WithEvents ToolStrip1 As System.Windows.Forms.ToolStrip - Friend WithEvents ToolStripBtNew As System.Windows.Forms.ToolStripButton - Friend WithEvents ToolStripBtOpen As System.Windows.Forms.ToolStripButton - Friend WithEvents ToolStripBtSave As System.Windows.Forms.ToolStripButton - Friend WithEvents ToolStripBtSaveAs As System.Windows.Forms.ToolStripButton - Friend WithEvents ToolStripBtSendTo As System.Windows.Forms.ToolStripButton - Friend WithEvents ToolStripSeparator1 As System.Windows.Forms.ToolStripSeparator - Friend WithEvents GrAux As System.Windows.Forms.GroupBox - Friend WithEvents LvAux As System.Windows.Forms.ListView - Friend WithEvents ColumnHeader4 As System.Windows.Forms.ColumnHeader - Friend WithEvents ColumnHeader5 As System.Windows.Forms.ColumnHeader - Friend WithEvents ColumnHeader6 As System.Windows.Forms.ColumnHeader - Friend WithEvents ButAuxRem As System.Windows.Forms.Button - Friend WithEvents ButAuxAdd As System.Windows.Forms.Button - Friend WithEvents PictureBox1 As System.Windows.Forms.PictureBox - Friend WithEvents TabPgDriver As System.Windows.Forms.TabPage - Friend WithEvents BtDesMaxBr As System.Windows.Forms.Button - Friend WithEvents TbDesMaxFile As System.Windows.Forms.TextBox - Friend WithEvents GrCycles As System.Windows.Forms.GroupBox - Friend WithEvents LvCycles As System.Windows.Forms.ListView - Friend WithEvents ColumnHeader1 As System.Windows.Forms.ColumnHeader - Friend WithEvents BtDRIrem As System.Windows.Forms.Button - Friend WithEvents BtDRIadd As System.Windows.Forms.Button - Friend WithEvents ToolStripSeparator2 As System.Windows.Forms.ToolStripSeparator - Friend WithEvents ToolStripButton1 As System.Windows.Forms.ToolStripButton - Friend WithEvents CbEngOnly As System.Windows.Forms.CheckBox - Friend WithEvents BtAccOpen As System.Windows.Forms.Button - Friend WithEvents Label2 As System.Windows.Forms.Label - Friend WithEvents CmOpenFile As System.Windows.Forms.ContextMenuStrip - Friend WithEvents OpenWithToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents ShowInFolderToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents ChBStartStop As System.Windows.Forms.CheckBox - Friend WithEvents GrStartStop As System.Windows.Forms.GroupBox - Friend WithEvents TbSSspeed As System.Windows.Forms.TextBox - Friend WithEvents TbSStime As System.Windows.Forms.TextBox - Friend WithEvents LabelSStime As System.Windows.Forms.Label - Friend WithEvents LabelSSspeed As System.Windows.Forms.Label - Friend WithEvents GrLAC As System.Windows.Forms.GroupBox - Friend WithEvents CbLookAhead As System.Windows.Forms.CheckBox - Friend WithEvents GroupBox1 As System.Windows.Forms.GroupBox - Friend WithEvents Label21 As System.Windows.Forms.Label - Friend WithEvents Label20 As System.Windows.Forms.Label - Friend WithEvents Label14 As System.Windows.Forms.Label - Friend WithEvents TbVmin As System.Windows.Forms.TextBox - Friend WithEvents TbUnderSpeed As System.Windows.Forms.TextBox - Friend WithEvents TbOverspeed As System.Windows.Forms.TextBox - Friend WithEvents Label23 As System.Windows.Forms.Label - Friend WithEvents Label22 As System.Windows.Forms.Label - Friend WithEvents Label13 As System.Windows.Forms.Label - Friend WithEvents RdEcoRoll As System.Windows.Forms.RadioButton - Friend WithEvents RdOverspeed As System.Windows.Forms.RadioButton - Friend WithEvents RdOff As System.Windows.Forms.RadioButton - Friend WithEvents PnStartStop As System.Windows.Forms.Panel - Friend WithEvents Label27 As System.Windows.Forms.Label - Friend WithEvents Label26 As System.Windows.Forms.Label - Friend WithEvents PnLookAhead As System.Windows.Forms.Panel - Friend WithEvents Label31 As System.Windows.Forms.Label - Friend WithEvents Label30 As System.Windows.Forms.Label - Friend WithEvents TbSSdelay As System.Windows.Forms.TextBox - Friend WithEvents Label32 As System.Windows.Forms.Label - Friend WithEvents PnEcoRoll As System.Windows.Forms.Panel - Friend WithEvents PicVehicle As System.Windows.Forms.PictureBox - Friend WithEvents PicBox As System.Windows.Forms.PictureBox - Friend WithEvents TbEngTxt As System.Windows.Forms.TextBox - Friend WithEvents TbVehCat As System.Windows.Forms.TextBox - Friend WithEvents TbAxleConf As System.Windows.Forms.TextBox - Friend WithEvents TbHVCclass As System.Windows.Forms.TextBox - Friend WithEvents TbGbxTxt As System.Windows.Forms.TextBox - Friend WithEvents TbMass As System.Windows.Forms.TextBox - Friend WithEvents GrVACC As System.Windows.Forms.GroupBox - Friend WithEvents cboAdvancedAuxiliaries As System.Windows.Forms.ComboBox - Friend WithEvents picAuxInfo As System.Windows.Forms.PictureBox - Friend WithEvents ToolTip1 As System.Windows.Forms.ToolTip - Friend WithEvents Label1 As System.Windows.Forms.Label - Friend WithEvents btnBrowseAAUXFile As System.Windows.Forms.Button - Friend WithEvents txtAdvancedAuxiliaryFile As System.Windows.Forms.TextBox - Friend WithEvents lbAdvancedAuxiliaries As System.Windows.Forms.Label - Friend WithEvents btnAAUXOpen As System.Windows.Forms.Button - Friend WithEvents Label3 As System.Windows.Forms.Label - Friend WithEvents tbLacPreviewFactor As System.Windows.Forms.TextBox - Friend WithEvents tbLacDfTargetSpeedFile As System.Windows.Forms.TextBox - Friend WithEvents btnDfTargetSpeed As System.Windows.Forms.Button - Friend WithEvents Label4 As System.Windows.Forms.Label - Friend WithEvents Label5 As System.Windows.Forms.Label - Friend WithEvents tbLacDfVelocityDropFile As System.Windows.Forms.TextBox - Friend WithEvents btnDfVelocityDrop As System.Windows.Forms.Button - Friend WithEvents TbVminLA As System.Windows.Forms.TextBox - Friend WithEvents TbAlookahead As System.Windows.Forms.TextBox - Friend WithEvents Label9 As System.Windows.Forms.Label - Friend WithEvents Label8 As System.Windows.Forms.Label - Friend WithEvents Label7 As System.Windows.Forms.Label - Friend WithEvents Label6 As System.Windows.Forms.Label - Friend WithEvents GroupBox2 As System.Windows.Forms.GroupBox - Friend WithEvents Label12 As System.Windows.Forms.Label - Friend WithEvents tbDfCoastingScale As System.Windows.Forms.TextBox - Friend WithEvents Label11 As System.Windows.Forms.Label - Friend WithEvents tbDfCoastingOffset As System.Windows.Forms.TextBox - Friend WithEvents Label10 As System.Windows.Forms.Label + Friend WithEvents TabPgGen As TabPage + Friend WithEvents TabControl1 As TabControl + Friend WithEvents StatusStrip1 As StatusStrip + Friend WithEvents ButtonVEH As Button + Friend WithEvents ButtonMAP As Button + Friend WithEvents ButtonGBX As Button + Friend WithEvents ButOpenVEH As Button + Friend WithEvents ButOpenGBX As Button + Friend WithEvents ButOpenENG As Button + Friend WithEvents ToolStripStatusLabelGEN As ToolStripStatusLabel + Friend WithEvents ButOK As Button + Friend WithEvents TbGBX As TextBox + Friend WithEvents TbENG As TextBox + Friend WithEvents TbVEH As TextBox + Friend WithEvents ButCancel As Button + Friend WithEvents ToolStrip1 As ToolStrip + Friend WithEvents ToolStripBtNew As ToolStripButton + Friend WithEvents ToolStripBtOpen As ToolStripButton + Friend WithEvents ToolStripBtSave As ToolStripButton + Friend WithEvents ToolStripBtSaveAs As ToolStripButton + Friend WithEvents ToolStripBtSendTo As ToolStripButton + Friend WithEvents ToolStripSeparator1 As ToolStripSeparator + Friend WithEvents GrAux As GroupBox + Friend WithEvents LvAux As ListView + Friend WithEvents ColumnHeader4 As ColumnHeader + Friend WithEvents ColumnHeader5 As ColumnHeader + Friend WithEvents ColumnHeader6 As ColumnHeader + Friend WithEvents ButAuxRem As Button + Friend WithEvents ButAuxAdd As Button + Friend WithEvents PictureBox1 As PictureBox + Friend WithEvents TabPgDriver As TabPage + Friend WithEvents BtDesMaxBr As Button + Friend WithEvents TbDesMaxFile As TextBox + Friend WithEvents GrCycles As GroupBox + Friend WithEvents LvCycles As ListView + Friend WithEvents ColumnHeader1 As ColumnHeader + Friend WithEvents BtDRIrem As Button + Friend WithEvents BtDRIadd As Button + Friend WithEvents ToolStripSeparator2 As ToolStripSeparator + Friend WithEvents ToolStripButton1 As ToolStripButton + Friend WithEvents CbEngOnly As CheckBox + Friend WithEvents BtAccOpen As Button + Friend WithEvents Label2 As Label + Friend WithEvents CmOpenFile As ContextMenuStrip + Friend WithEvents OpenWithToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ShowInFolderToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ChBStartStop As CheckBox + Friend WithEvents GrStartStop As GroupBox + Friend WithEvents TbSSspeed As TextBox + Friend WithEvents TbSStime As TextBox + Friend WithEvents LabelSStime As Label + Friend WithEvents LabelSSspeed As Label + Friend WithEvents GrLAC As GroupBox + Friend WithEvents CbLookAhead As CheckBox + Friend WithEvents GroupBox1 As GroupBox + Friend WithEvents Label21 As Label + Friend WithEvents Label20 As Label + Friend WithEvents Label14 As Label + Friend WithEvents TbVmin As TextBox + Friend WithEvents TbUnderSpeed As TextBox + Friend WithEvents TbOverspeed As TextBox + Friend WithEvents Label23 As Label + Friend WithEvents Label22 As Label + Friend WithEvents Label13 As Label + Friend WithEvents RdEcoRoll As RadioButton + Friend WithEvents RdOverspeed As RadioButton + Friend WithEvents RdOff As RadioButton + Friend WithEvents PnStartStop As Panel + Friend WithEvents Label27 As Label + Friend WithEvents Label26 As Label + Friend WithEvents Label31 As Label + Friend WithEvents Label30 As Label + Friend WithEvents TbSSdelay As TextBox + Friend WithEvents Label32 As Label + Friend WithEvents PnEcoRoll As Panel + Friend WithEvents PicVehicle As PictureBox + Friend WithEvents PicBox As PictureBox + Friend WithEvents TbEngTxt As TextBox + Friend WithEvents TbVehCat As TextBox + Friend WithEvents TbAxleConf As TextBox + Friend WithEvents TbHVCclass As TextBox + Friend WithEvents TbGbxTxt As TextBox + Friend WithEvents TbMass As TextBox + Friend WithEvents GrVACC As GroupBox + Friend WithEvents cboAdvancedAuxiliaries As ComboBox + Friend WithEvents picAuxInfo As PictureBox + Friend WithEvents ToolTip1 As ToolTip + Friend WithEvents Label1 As Label + Friend WithEvents btnBrowseAAUXFile As Button + Friend WithEvents txtAdvancedAuxiliaryFile As TextBox + Friend WithEvents lbAdvancedAuxiliaries As Label + Friend WithEvents btnAAUXOpen As Button + Friend WithEvents Label12 As Label + Friend WithEvents tbDfCoastingScale As TextBox + Friend WithEvents Label11 As Label + Friend WithEvents Label3 As Label + Friend WithEvents tbDfCoastingOffset As TextBox + Friend WithEvents tbLacDfTargetSpeedFile As TextBox + Friend WithEvents Label10 As Label + Friend WithEvents Label4 As Label + Friend WithEvents Label5 As Label + Friend WithEvents btnDfTargetSpeed As Button + Friend WithEvents tbLacPreviewFactor As TextBox + Friend WithEvents tbLacDfVelocityDropFile As TextBox End Class diff --git a/VECTO/GUI/F_VECTO.resx b/VECTO/GUI/F_VECTO.resx index b53e4abbcd1d58b6fec50a9a9c854a7d6206d530..087e6067950a3b7e0a6a1305861d5674430ef6b6 100644 --- a/VECTO/GUI/F_VECTO.resx +++ b/VECTO/GUI/F_VECTO.resx @@ -124,7 +124,7 @@ <data name="ButtonVEH.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAALVSURBVDhPhZJrSJNhGIYXOs1Nc8o8gJWZ+UNEEupPxDAw + YQUAAAAJcEhZcwAADr8AAA6/ATgFUyQAAALVSURBVDhPhZJrSJNhGIYXOs1Nc8o8gJWZ+UNEEupPxDAw 0kIrs5JsTOcKRANNEs0827KM0BA1MlSo0G3o1DxkEsso1JqH8rBUSlPzPOfSeajkbu+7NSl/9MD147u/ 776eF96P0VbB7+6Q8tFZJcCH2gj01wsx0BD5F5+aRFA1iTR99ZERjH+HlKHLxexgEoZao0Geh96mY2FC AkBpYlX7HL3PhBpjbXNIYWP5DjaWDKwv3MKMKomKMHIXGDWikaGu5gw8n3LhUWKXZ6wbBL+0tyk/Fwk5 @@ -142,7 +142,7 @@ <data name="ButtonGBX.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAALVSURBVDhPhZJrSJNhGIYXOs1Nc8o8gJWZ+UNEEupPxDAw + YQUAAAAJcEhZcwAADr8AAA6/ATgFUyQAAALVSURBVDhPhZJrSJNhGIYXOs1Nc8o8gJWZ+UNEEupPxDAw 0kIrs5JsTOcKRANNEs0827KM0BA1MlSo0G3o1DxkEsso1JqH8rBUSlPzPOfSeajkbu+7NSl/9MD147u/ 776eF96P0VbB7+6Q8tFZJcCH2gj01wsx0BD5F5+aRFA1iTR99ZERjH+HlKHLxexgEoZao0Geh96mY2FC AkBpYlX7HL3PhBpjbXNIYWP5DjaWDKwv3MKMKomKMHIXGDWikaGu5gw8n3LhUWKXZ6wbBL+0tyk/Fwk5 @@ -160,25 +160,7 @@ <data name="ButtonMAP.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAALVSURBVDhPhZJrSJNhGIYXOs1Nc8o8gJWZ+UNEEupPxDAw - 0kIrs5JsTOcKRANNEs0827KM0BA1MlSo0G3o1DxkEsso1JqH8rBUSlPzPOfSeajkbu+7NSl/9MD147u/ - 776eF96P0VbB7+6Q8tFZJcCH2gj01wsx0BD5F5+aRFA1iTR99ZERjH+HlKHLxexgEoZao0Geh96mY2FC - AkBpYlX7HL3PhBpjbXNIYWP5DjaWDKwv3MKMKomKMHIXGDWikaGu5gw8n3LhUWKXZ6wbBL+0tyk/Fwk5 - FJKv98Rjo/ca0J9AqakKxr5ye7iU7sCufBuFSfBjIYduXldvQnKdMg5r3fEmQVe1AO7FtkecH1rDvtAK - TtnsDCpYmxNjddbIjBgreki+2BELXWccVEoRAqu8EPTEC2Sp03223KqUCbsMSw0VrEzfhG4qG7rJbCwb - Ifnsmyt4/1oAX5kHqtUSnKj2pQIHsZWCCKzTLUAFSxNZWBrPwnfCWCa0ekiuaL6As408yNVSxPYI4FbI - gWM2u4ybxwIRsJKZBoH2ayYWRzOg+ULQX+HndMikpxDSxINC9wJRyiAcatiJPQUcuBTawOGxQWCZYG4Q - kIJ6OA3qoTTMD6bhW08iAmp98GqlBdHKABxrcacCb7kj3CQcKmAVM8G8vE1BBfODqZhTpWJ2IIUevV3C - x1HZfkS1+yOk1XOLgFvGgmWcuYYZzvChAlKc7ruBqY/JVNBYEobiB4HgFbnCv9HdJPCs4MIxl43tMWYj - zEv6MhlSIMXJnuuY6DL8gTVFoajMP4+68ovg5bvisHw3FXDTWBDn8ehNmKatIlSjehmDcWUSxt4lUkF5 - znEUpPhBmncStY+CcSDLGT4VzrBPtkJz2TnD5j/TLQ/ndEjD5F01Qgy3XkWnXIj4yIOx+ld7DV8wGLax - DI5ltLncQmRWZoy2Tnsl/zQ5DTnBvRQ/b2P8n2EwfgPZDDiygt3V8AAAAABJRU5ErkJggg== -</value> - </data> - <data name="btnDfVelocityDrop.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> - <value> - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAALVSURBVDhPhZJrSJNhGIYXOs1Nc8o8gJWZ+UNEEupPxDAw + YQUAAAAJcEhZcwAADr8AAA6/ATgFUyQAAALVSURBVDhPhZJrSJNhGIYXOs1Nc8o8gJWZ+UNEEupPxDAw 0kIrs5JsTOcKRANNEs0827KM0BA1MlSo0G3o1DxkEsso1JqH8rBUSlPzPOfSeajkbu+7NSl/9MD147u/ 776eF96P0VbB7+6Q8tFZJcCH2gj01wsx0BD5F5+aRFA1iTR99ZERjH+HlKHLxexgEoZao0Geh96mY2FC AkBpYlX7HL3PhBpjbXNIYWP5DjaWDKwv3MKMKomKMHIXGDWikaGu5gw8n3LhUWKXZ6wbBL+0tyk/Fwk5 @@ -196,7 +178,7 @@ <data name="btnDfTargetSpeed.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAALVSURBVDhPhZJrSJNhGIYXOs1Nc8o8gJWZ+UNEEupPxDAw + YQUAAAAJcEhZcwAADr4AAA6+AepCscAAAALVSURBVDhPhZJrSJNhGIYXOs1Nc8o8gJWZ+UNEEupPxDAw 0kIrs5JsTOcKRANNEs0827KM0BA1MlSo0G3o1DxkEsso1JqH8rBUSlPzPOfSeajkbu+7NSl/9MD147u/ 776eF96P0VbB7+6Q8tFZJcCH2gj01wsx0BD5F5+aRFA1iTR99ZERjH+HlKHLxexgEoZao0Geh96mY2FC AkBpYlX7HL3PhBpjbXNIYWP5DjaWDKwv3MKMKomKMHIXGDWikaGu5gw8n3LhUWKXZ6wbBL+0tyk/Fwk5 diff --git a/VECTO/GUI/F_VECTO.vb b/VECTO/GUI/F_VECTO.vb index 773946ca649d3fcb7aa3ea6426f8a7c570fc762d..767c95ff320417d872489946728b13f9db90497a 100644 --- a/VECTO/GUI/F_VECTO.vb +++ b/VECTO/GUI/F_VECTO.vb @@ -12,10 +12,19 @@ Option Infer On Imports System.Collections.Generic Imports System.Drawing.Imaging +Imports System.Globalization Imports System.IO Imports System.Linq Imports System.Text.RegularExpressions 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) @@ -95,7 +104,6 @@ Public Class F_VECTO 'Set generic values for Declaration mode Private Sub DeclInit() - Dim LV0 As ListViewItem If Not Cfg.DeclMode Then Exit Sub @@ -105,18 +113,17 @@ Public Class F_VECTO If Not RdEcoRoll.Checked Then RdOverspeed.Checked = True CbLookAhead.Checked = True - TbSSspeed.Text = cDeclaration.SSspeed - TbSStime.Text = cDeclaration.SStime - TbSSdelay.Text = cDeclaration.SSdelay - TbAlookahead.Text = cDeclaration.LACa - TbVminLA.Text = cDeclaration.LACvmin - tbLacPreviewFactor.Text = "10" + TbSSspeed.Text = DeclarationData.Driver.StartStop.MaxSpeed.AsKmph() 'cDeclaration.SSspeed + TbSStime.Text = DeclarationData.Driver.StartStop.MinTime.Value() 'cDeclaration.SStime + TbSSdelay.Text = DeclarationData.Driver.StartStop.Delay.Value() ' cDeclaration.SSdelay + + tbLacPreviewFactor.Text = DeclarationData.Driver.LookAhead.LookAheadDistanceFactor tbLacDfTargetSpeedFile.Text = "" tbLacDfVelocityDropFile.Text = "" - TbOverspeed.Text = cDeclaration.Overspeed - TbUnderSpeed.Text = cDeclaration.Underspeed - TbVmin.Text = cDeclaration.ECvmin + TbOverspeed.Text = DeclarationData.Driver.OverSpeedEcoRoll.OverSpeed.AsKmph() 'cDeclaration.Overspeed + TbUnderSpeed.Text = DeclarationData.Driver.OverSpeedEcoRoll.UnderSpeed.AsKmph() ' cDeclaration.Underspeed + TbVmin.Text = DeclarationData.Driver.OverSpeedEcoRoll.MinSpeed.AsKmph() 'cDeclaration.ECvmin If _ LvAux.Items.Count <> 5 OrElse @@ -125,50 +132,34 @@ Public Class F_VECTO LvAux.Items(4).Text <> sKey.AUX.PneumSys) Then LvAux.Items.Clear() - LV0 = New ListViewItem(sKey.AUX.Fan) - LV0.SubItems.Add("Fan") - If Declaration.AuxTechs(tAux.Fan).Count > 1 Then - LV0.SubItems.Add("") - Else - LV0.SubItems.Add(Declaration.AuxTechs(tAux.Fan)(0)) - End If - LvAux.Items.Add(LV0) - LV0 = New ListViewItem(sKey.AUX.SteerPump) - LV0.SubItems.Add("Steering pump") - If Declaration.AuxTechs(tAux.SteerPump).Count > 1 Then - LV0.SubItems.Add("") - Else - LV0.SubItems.Add(Declaration.AuxTechs(tAux.SteerPump)(0)) - End If - LvAux.Items.Add(LV0) + LvAux.Items.Add(GetTechListForAux(sKey.AUX.Fan, "Fan", DeclarationData.Fan)) - LV0 = New ListViewItem(sKey.AUX.HVAC) - LV0.SubItems.Add("HVAC") - LV0.SubItems.Add("") - LvAux.Items.Add(LV0) + LvAux.Items.Add(GetTechListForAux(sKey.AUX.SteerPump, "Steering pump", DeclarationData.SteeringPump)) - LV0 = New ListViewItem(sKey.AUX.ElecSys) - LV0.SubItems.Add("Electric System") - If Declaration.AuxTechs(tAux.ElectricSys).Count > 1 Then - LV0.SubItems.Add("") - Else - LV0.SubItems.Add(Declaration.AuxTechs(tAux.ElectricSys)(0)) - End If - LvAux.Items.Add(LV0) + LvAux.Items.Add(GetTechListForAux(sKey.AUX.HVAC, "HVAC", DeclarationData.HeatingVentilationAirConditioning)) - LV0 = New ListViewItem(sKey.AUX.PneumSys) - LV0.SubItems.Add("Pneumatic System") - If Declaration.AuxTechs(tAux.PneumSys).Count > 1 Then - LV0.SubItems.Add("") - Else - LV0.SubItems.Add(Declaration.AuxTechs(tAux.PneumSys)(0)) - End If - LvAux.Items.Add(LV0) + LvAux.Items.Add(GetTechListForAux(sKey.AUX.ElecSys, "Electric System", DeclarationData.ElectricSystem)) + + LvAux.Items.Add(GetTechListForAux(sKey.AUX.PneumSys, "Pneymatic System", DeclarationData.PneumaticSystem)) End If End Sub + Protected Function GetTechListForAux(key As String, name As String, aux As IDeclarationAuxiliaryTable) As ListViewItem + Dim LV0 As ListViewItem + + LV0 = New ListViewItem(key) + LV0.SubItems.Add(name) + Dim auxtech As String() = aux.GetTechnologies() + If auxtech.Count > 1 Then + LV0.SubItems.Add("") + Else + LV0.SubItems.Add(auxtech(0)) + End If + Return LV0 + End Function + 'Show/Hide "Driver Assist" Tab Private Sub SetDrivertab(onOff As Boolean) @@ -456,8 +447,8 @@ Public Class F_VECTO TbUnderSpeed.Text = CStr(VEC0.UnderSpeed) TbVmin.Text = CStr(VEC0.VMin) CbLookAhead.Checked = VEC0.LookAheadOn - TbAlookahead.Text = CStr(VEC0.ALookahead) - TbVminLA.Text = CStr(VEC0.VMinLa) + 'TbAlookahead.Text = CStr(VEC0.ALookahead) + 'TbVminLA.Text = CStr(VEC0.VMinLa) tbLacPreviewFactor.Text = CStr(VEC0.LacPreviewFactor) tbDfCoastingOffset.Text = CStr(VEC0.LacDfOffset) tbDfCoastingScale.Text = CStr(VEC0.LacDfScale) @@ -568,8 +559,8 @@ Public Class F_VECTO vec0.UnderSpeed = CSng(fTextboxToNumString(TbUnderSpeed.Text)) vec0.VMin = CSng(fTextboxToNumString(TbVmin.Text)) vec0.LookAheadOn = CbLookAhead.Checked - vec0.ALookahead = CSng(fTextboxToNumString(TbAlookahead.Text)) - vec0.VMinLa = CSng(fTextboxToNumString(TbVminLA.Text)) + 'vec0.ALookahead = CSng(fTextboxToNumString(TbAlookahead.Text)) + 'vec0.VMinLa = CSng(fTextboxToNumString(TbVminLA.Text)) vec0.LacPreviewFactor = CSng(fTextboxToNumString(tbLacPreviewFactor.Text)) vec0.LacDfOffset = CSng(fTextboxToNumString(tbDfCoastingOffset.Text)) @@ -624,11 +615,11 @@ Public Class F_VECTO RdOff.Checked = True CbLookAhead.Checked = True - TbAlookahead.Text = "-0.5" + 'TbAlookahead.Text = "-0.5" TbOverspeed.Text = "" TbUnderSpeed.Text = "" TbVmin.Text = "" - TbVminLA.Text = "50" + 'TbVminLA.Text = "50" tbLacPreviewFactor.Text = "10" tbDfCoastingOffset.Text = "2.5" tbDfCoastingScale.Text = "1.5" @@ -959,7 +950,6 @@ lbDlog: Private Sub CbLookAhead_CheckedChanged(sender As Object, e As EventArgs) _ Handles CbLookAhead.CheckedChanged Change() - PnLookAhead.Enabled = CbLookAhead.Checked End Sub 'EcoRoll / Overspeed changed @@ -999,9 +989,9 @@ lbDlog: Dim ldown As List(Of Single) Dim line As String() - Dim s0 As cSegmentTableEntry + Dim HDVclass As String - Dim m0 As tMission + 'Dim m0 As Dim s As Series Dim a As ChartArea @@ -1021,14 +1011,20 @@ lbDlog: VEH0.FilePath = fFileRepl(TbVEH.Text, fPATH(VECTOfile)) If VEH0.ReadFile(False) Then - s0 = Declaration.SegmentTable.SetRef(VEH0.VehCat, VEH0.AxleConf, VEH0.MassMax) + Dim maxMass = (VEH0.MassMax * 1000).SI(Of Kilogram)() 'CSng(fTextboxToNumString(TbMassMass.Text)) + + Dim s0 As Segment = Nothing + Try + s0 = DeclarationData.Segments.Lookup(VEH0.VehCat, VEH0.AxleConf, maxMass, 0.SI(Of Kilogram), True) + Catch + End Try If Not s0 Is Nothing Then - HDVclass = s0.HDVclass + HDVclass = s0.VehicleClass.GetClassNumber() If Cfg.DeclMode Then LvCycles.Items.Clear() For Each m0 In s0.Missions - LvCycles.Items.Add(Declaration.Missions(m0).NameStr) + LvCycles.Items.Add(m0.MissionType.ToString()) Next End If @@ -1036,12 +1032,12 @@ lbDlog: HDVclass = "-" End If - PicVehicle.Image = Image.FromFile(cDeclaration.ConvPicPath(HDVclass, False)) + PicVehicle.Image = ConvPicPath(HDVclass, False) 'Image.FromFile(cDeclaration.ConvPicPath(HDVclass, False)) TbHVCclass.Text = "HDV Class " & HDVclass - TbVehCat.Text = ConvVehCat(VEH0.VehCat, True) + TbVehCat.Text = VEH0.VehCat.GetCategoryName() 'ConvVehCat(VEH0.VehCat, True) TbMass.Text = VEH0.MassMax & " t" - TbAxleConf.Text = ConvAxleConf(VEH0.AxleConf) + TbAxleConf.Text = VEH0.AxleConf.GetName() 'ConvAxleConf(VEH0.AxleConf) End If @@ -1119,7 +1115,7 @@ lbDlog: If GBX0.ReadFile(False) Then - TbGbxTxt.Text = GBX0.GearCount & "-Speed " & GearboxConv(GBX0.gs_Type) & " " & GBX0.ModelName + TbGbxTxt.Text = GBX0.GearCount & "-Speed " & GBX0.gs_Type.ShortName() & " " & GBX0.ModelName If Cfg.DeclMode Then @@ -1132,24 +1128,33 @@ lbDlog: If FLD0.ReadFile(True, False) Then If FLD0.Init(ENG0.Nidle) Then - Dim Shiftpoly = New cGBX.cShiftPolygon("", 0) - Shiftpoly.SetGenericShiftPoly(FLD0, ENG0.Nidle) - - s = New Series - s.Points.DataBindXY(Shiftpoly.gs_nUup, Shiftpoly.gs_TqUp) - s.ChartType = SeriesChartType.FastLine - s.BorderWidth = 2 - s.Color = Color.DarkRed - s.Name = "Upshift curve (" & i & ")" - MyChart.Series.Add(s) - - s = New Series - s.Points.DataBindXY(Shiftpoly.gs_nUdown, Shiftpoly.gs_TqDown) - s.ChartType = SeriesChartType.FastLine - s.BorderWidth = 2 - s.Color = Color.DarkRed - s.Name = "Downshift curve (" & i & ")" - MyChart.Series.Add(s) + + 'Dim engine As CombustionEngineData = ConvertToEngineData(FLD0, F_VECTO.n_idle) + 'Dim shiftLines As ShiftPolygon = DeclarationData.Gearbox.ComputeShiftPolygon(Gear - 1, + ' engine.FullLoadCurve, gears, + ' engine, + ' Double.Parse(LvGears.Items(0).SubItems(F_GBX.GearboxTbl.Ratio).Text, + ' CultureInfo.InvariantCulture), + ' (.rdyn / 1000.0).SI(Of Meter)) + + 's = New Series + 's.Points.DataBindXY(shiftLines.Upshift.Select(Function(pt) pt.AngularSpeed.Value() / Constants.RPMToRad).ToList(), + ' shiftLines.Upshift.Select(Function(pt) pt.Torque.Value()).ToList()) + 's.ChartType = SeriesChartType.FastLine + 's.BorderWidth = 2 + 's.Color = Color.DarkRed + 's.Name = "Upshift curve (" & i & ")" + 'MyChart.Series.Add(s) + + 's = New Series + 's.Points.DataBindXY( + ' shiftLines.Downshift.Select(Function(pt) pt.AngularSpeed.Value() / Constants.RPMToRad).ToList(), + ' shiftLines.Downshift.Select(Function(pt) pt.Torque.Value()).ToList()) + 's.ChartType = SeriesChartType.FastLine + 's.BorderWidth = 2 + 's.Color = Color.DarkRed + 's.Name = "Downshift curve (" & i & ")" + 'MyChart.Series.Add(s) End If @@ -1394,6 +1399,7 @@ lbDlog: End If End Sub + 'AA-TB Private Sub btnAAUXOpen_Click(sender As Object, e As EventArgs) Handles btnAAUXOpen.Click @@ -1405,7 +1411,7 @@ lbDlog: tbLacDfTargetSpeedFile.Text = fFileWoDir(fbDfTargetSpeed.Files(0), fPATH(VECTOfile)) End Sub - Private Sub btnDfVelocityDrop_Click(sender As Object, e As EventArgs) Handles btnDfVelocityDrop.Click + 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 diff --git a/VECTO/GUI/F_VEH.Designer.vb b/VECTO/GUI/F_VEH.Designer.vb index def429ea6185eb80985c55d0e16aed343e89d7b6..67cdb652fb5f625e1ad60cba84b0461bafe0a98f 100644 --- a/VECTO/GUI/F_VEH.Designer.vb +++ b/VECTO/GUI/F_VEH.Designer.vb @@ -8,119 +8,124 @@ ' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ' ' See the LICENSE.txt for the specific language governing permissions and limitations. -<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _ +Imports System.ComponentModel +Imports System.Linq +Imports Microsoft.VisualBasic.CompilerServices +Imports TUGraz.VectoCommon.Models + +<DesignerGenerated()> _ Partial Class F_VEH - Inherits System.Windows.Forms.Form + Inherits Form - 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - <System.Diagnostics.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 + '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 System.ComponentModel.IContainer + '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. - <System.Diagnostics.DebuggerStepThrough()> _ - Private Sub InitializeComponent() - Me.components = New System.ComponentModel.Container() - Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(F_VEH)) - Me.Label1 = New System.Windows.Forms.Label() - Me.TbMass = New System.Windows.Forms.TextBox() - Me.Label2 = New System.Windows.Forms.Label() - Me.TbLoad = New System.Windows.Forms.TextBox() - Me.Label3 = New System.Windows.Forms.Label() - Me.TBcdA = New System.Windows.Forms.TextBox() - Me.Label13 = New System.Windows.Forms.Label() - Me.TBrdyn = New System.Windows.Forms.TextBox() - Me.ButOK = New System.Windows.Forms.Button() - Me.ButCancel = New System.Windows.Forms.Button() - Me.Label14 = New System.Windows.Forms.Label() - Me.Label31 = New System.Windows.Forms.Label() - Me.Label35 = New System.Windows.Forms.Label() - Me.CbCdMode = New System.Windows.Forms.ComboBox() - Me.TbCdFile = New System.Windows.Forms.TextBox() - Me.BtCdFileBrowse = New System.Windows.Forms.Button() - Me.GroupBox6 = New System.Windows.Forms.GroupBox() - Me.BtCdFileOpen = New System.Windows.Forms.Button() - Me.LbCdMode = New System.Windows.Forms.Label() - Me.ToolStrip1 = New System.Windows.Forms.ToolStrip() - Me.ToolStripBtNew = New System.Windows.Forms.ToolStripButton() - Me.ToolStripBtOpen = New System.Windows.Forms.ToolStripButton() - Me.ToolStripBtSave = New System.Windows.Forms.ToolStripButton() - Me.ToolStripBtSaveAs = New System.Windows.Forms.ToolStripButton() - Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator() - Me.ToolStripBtSendTo = New System.Windows.Forms.ToolStripButton() - Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator() - Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton() - Me.GroupBox7 = New System.Windows.Forms.GroupBox() - Me.PnRt = New System.Windows.Forms.Panel() - Me.Label15 = New System.Windows.Forms.Label() - Me.BtRtBrowse = New System.Windows.Forms.Button() - Me.TbRtPath = New System.Windows.Forms.TextBox() - Me.Label45 = New System.Windows.Forms.Label() - Me.LbRtRatio = New System.Windows.Forms.Label() - Me.TbRtRatio = New System.Windows.Forms.TextBox() - Me.CbRtType = New System.Windows.Forms.ComboBox() - Me.Label46 = New System.Windows.Forms.Label() - Me.Label50 = New System.Windows.Forms.Label() - Me.TbMassExtra = New System.Windows.Forms.TextBox() - Me.GroupBox8 = New System.Windows.Forms.GroupBox() - Me.PnWheelDiam = New System.Windows.Forms.Panel() - Me.Label6 = New System.Windows.Forms.Label() - Me.ButAxlRem = New System.Windows.Forms.Button() - Me.LvRRC = New System.Windows.Forms.ListView() - Me.ColumnHeader7 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) - Me.ColumnHeader8 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) - Me.ColumnHeader2 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) - Me.ColumnHeader9 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) - Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) - Me.ColumnHeader3 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) - Me.ColumnHeader4 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) - Me.ButAxlAdd = New System.Windows.Forms.Button() - Me.CbAxleConfig = New System.Windows.Forms.ComboBox() - Me.CbCat = New System.Windows.Forms.ComboBox() - Me.Label5 = New System.Windows.Forms.Label() - Me.Label9 = New System.Windows.Forms.Label() - Me.TbMassMass = New System.Windows.Forms.TextBox() - Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() - Me.LbStatus = New System.Windows.Forms.ToolStripStatusLabel() - Me.TbHDVclass = New System.Windows.Forms.TextBox() - Me.Label11 = New System.Windows.Forms.Label() - Me.TbLoadingMax = New System.Windows.Forms.TextBox() - Me.Label22 = New System.Windows.Forms.Label() - Me.GroupBox1 = New System.Windows.Forms.GroupBox() - Me.PnLoad = New System.Windows.Forms.Panel() - Me.GrAirRes = New System.Windows.Forms.GroupBox() - Me.PnCdATrTr = New System.Windows.Forms.Panel() - Me.Label38 = New System.Windows.Forms.Label() - Me.PictureBox1 = New System.Windows.Forms.PictureBox() - Me.CmOpenFile = New System.Windows.Forms.ContextMenuStrip(Me.components) - Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.PnAll = New System.Windows.Forms.Panel() - Me.GroupBox2 = New System.Windows.Forms.GroupBox() - Me.pnAngularGearFields = New System.Windows.Forms.Panel() - Me.Label4 = New System.Windows.Forms.Label() - Me.Label12 = New System.Windows.Forms.Label() - Me.Label10 = New System.Windows.Forms.Label() - Me.tbAngularGearRatio = New System.Windows.Forms.TextBox() - Me.btAngularGearLossMapBrowse = New System.Windows.Forms.Button() - Me.tbAngularGearLossMapPath = New System.Windows.Forms.TextBox() - Me.cbAngularGearType = New System.Windows.Forms.ComboBox() - Me.PicVehicle = New System.Windows.Forms.PictureBox() - Me.Label8 = New System.Windows.Forms.Label() - Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components) - Me.GroupBox3 = New System.Windows.Forms.GroupBox() + '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() + Dim resources As ComponentResourceManager = New ComponentResourceManager(GetType(F_VEH)) + Me.Label1 = New Label() + Me.TbMass = New TextBox() + Me.Label2 = New Label() + Me.TbLoad = New TextBox() + Me.Label3 = New Label() + Me.TBcdA = New TextBox() + Me.Label13 = New Label() + Me.TBrdyn = New TextBox() + Me.ButOK = New Button() + Me.ButCancel = New Button() + Me.Label14 = New Label() + Me.Label31 = New Label() + Me.Label35 = New Label() + Me.CbCdMode = New ComboBox() + Me.TbCdFile = New TextBox() + Me.BtCdFileBrowse = New Button() + Me.GroupBox6 = New GroupBox() + Me.BtCdFileOpen = New Button() + Me.LbCdMode = New Label() + Me.ToolStrip1 = New ToolStrip() + Me.ToolStripBtNew = New ToolStripButton() + Me.ToolStripBtOpen = New ToolStripButton() + Me.ToolStripBtSave = New ToolStripButton() + Me.ToolStripBtSaveAs = New ToolStripButton() + Me.ToolStripSeparator3 = New ToolStripSeparator() + Me.ToolStripBtSendTo = New ToolStripButton() + Me.ToolStripSeparator1 = New ToolStripSeparator() + Me.ToolStripButton1 = New ToolStripButton() + Me.GroupBox7 = New GroupBox() + Me.PnRt = New Panel() + Me.Label15 = New Label() + Me.BtRtBrowse = New Button() + Me.TbRtPath = New TextBox() + Me.Label45 = New Label() + Me.LbRtRatio = New Label() + Me.TbRtRatio = New TextBox() + Me.CbRtType = New ComboBox() + Me.Label46 = New Label() + Me.Label50 = New Label() + Me.TbMassExtra = New TextBox() + Me.GroupBox8 = New GroupBox() + Me.PnWheelDiam = New Panel() + Me.Label6 = New Label() + Me.ButAxlRem = New Button() + Me.LvRRC = New ListView() + Me.ColumnHeader7 = CType(New ColumnHeader(), ColumnHeader) + Me.ColumnHeader8 = CType(New ColumnHeader(), ColumnHeader) + Me.ColumnHeader2 = CType(New ColumnHeader(), ColumnHeader) + Me.ColumnHeader9 = CType(New ColumnHeader(), ColumnHeader) + Me.ColumnHeader1 = CType(New ColumnHeader(), ColumnHeader) + Me.ColumnHeader3 = CType(New ColumnHeader(), ColumnHeader) + Me.ColumnHeader4 = CType(New ColumnHeader(), ColumnHeader) + Me.ButAxlAdd = New Button() + Me.CbAxleConfig = New ComboBox() + Me.CbCat = New ComboBox() + Me.Label5 = New Label() + Me.Label9 = New Label() + Me.TbMassMass = New TextBox() + Me.StatusStrip1 = New StatusStrip() + Me.LbStatus = New ToolStripStatusLabel() + Me.TbHDVclass = New TextBox() + Me.Label11 = New Label() + Me.TbLoadingMax = New TextBox() + Me.Label22 = New Label() + Me.GroupBox1 = New GroupBox() + Me.PnLoad = New Panel() + Me.GrAirRes = New GroupBox() + Me.PnCdATrTr = New Panel() + Me.Label38 = New Label() + Me.PictureBox1 = New PictureBox() + Me.CmOpenFile = New ContextMenuStrip(Me.components) + Me.OpenWithToolStripMenuItem = New ToolStripMenuItem() + Me.ShowInFolderToolStripMenuItem = New ToolStripMenuItem() + Me.PnAll = New Panel() + Me.GroupBox2 = New GroupBox() + Me.pnAngularGearFields = New Panel() + Me.Label4 = New Label() + Me.Label12 = New Label() + Me.Label10 = New Label() + Me.tbAngularGearRatio = New TextBox() + Me.btAngularGearLossMapBrowse = New Button() + Me.tbAngularGearLossMapPath = New TextBox() + Me.cbAngularGearType = New ComboBox() + Me.PicVehicle = New PictureBox() + Me.Label8 = New Label() + Me.ToolTip1 = New ToolTip(Me.components) + Me.GroupBox3 = New GroupBox() Me.GroupBox6.SuspendLayout() Me.ToolStrip1.SuspendLayout() Me.GroupBox7.SuspendLayout() @@ -132,96 +137,96 @@ Partial Class F_VEH Me.PnLoad.SuspendLayout() Me.GrAirRes.SuspendLayout() Me.PnCdATrTr.SuspendLayout() - CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PictureBox1, ISupportInitialize).BeginInit() Me.CmOpenFile.SuspendLayout() Me.PnAll.SuspendLayout() Me.GroupBox2.SuspendLayout() Me.pnAngularGearFields.SuspendLayout() - CType(Me.PicVehicle, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PicVehicle, ISupportInitialize).BeginInit() Me.GroupBox3.SuspendLayout() Me.SuspendLayout() ' 'Label1 ' Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(62, 22) + Me.Label1.Location = New Point(62, 22) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(104, 13) + Me.Label1.Size = New Size(104, 13) Me.Label1.TabIndex = 0 Me.Label1.Text = "Curb Weight Vehicle" ' 'TbMass ' - Me.TbMass.Location = New System.Drawing.Point(172, 19) + Me.TbMass.Location = New Point(172, 19) Me.TbMass.Name = "TbMass" - Me.TbMass.Size = New System.Drawing.Size(57, 20) + Me.TbMass.Size = New Size(57, 20) Me.TbMass.TabIndex = 0 ' 'Label2 ' Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(115, 31) + Me.Label2.Location = New Point(115, 31) Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(45, 13) + Me.Label2.Size = New Size(45, 13) Me.Label2.TabIndex = 2 Me.Label2.Text = "Loading" ' 'TbLoad ' - Me.TbLoad.Location = New System.Drawing.Point(166, 28) + Me.TbLoad.Location = New Point(166, 28) Me.TbLoad.Name = "TbLoad" - Me.TbLoad.Size = New System.Drawing.Size(57, 20) + Me.TbLoad.Size = New Size(57, 20) Me.TbLoad.TabIndex = 1 ' 'Label3 ' Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(3, 6) + Me.Label3.Location = New Point(3, 6) Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(37, 13) + Me.Label3.Size = New Size(37, 13) Me.Label3.TabIndex = 8 Me.Label3.Text = "cd x A" ' 'TBcdA ' - Me.TBcdA.Location = New System.Drawing.Point(46, 3) + Me.TBcdA.Location = New Point(46, 3) Me.TBcdA.Name = "TBcdA" - Me.TBcdA.Size = New System.Drawing.Size(57, 20) + Me.TBcdA.Size = New Size(57, 20) Me.TBcdA.TabIndex = 0 ' 'Label13 ' Me.Label13.AutoSize = True - Me.Label13.Location = New System.Drawing.Point(3, 7) + Me.Label13.Location = New Point(3, 7) Me.Label13.Name = "Label13" - Me.Label13.Size = New System.Drawing.Size(40, 13) + Me.Label13.Size = New Size(40, 13) Me.Label13.TabIndex = 6 Me.Label13.Text = "Radius" ' 'TBrdyn ' - Me.TBrdyn.Location = New System.Drawing.Point(46, 4) + Me.TBrdyn.Location = New Point(46, 4) Me.TBrdyn.Name = "TBrdyn" - Me.TBrdyn.Size = New System.Drawing.Size(57, 20) + Me.TBrdyn.Size = New Size(57, 20) Me.TBrdyn.TabIndex = 0 ' 'ButOK ' - Me.ButOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.ButOK.Location = New System.Drawing.Point(421, 661) + Me.ButOK.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles) + Me.ButOK.Location = New Point(421, 661) Me.ButOK.Name = "ButOK" - Me.ButOK.Size = New System.Drawing.Size(75, 23) + Me.ButOK.Size = New Size(75, 23) Me.ButOK.TabIndex = 5 Me.ButOK.Text = "Save" Me.ButOK.UseVisualStyleBackColor = True ' 'ButCancel ' - Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.ButCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel - Me.ButCancel.Location = New System.Drawing.Point(502, 661) + Me.ButCancel.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles) + Me.ButCancel.DialogResult = DialogResult.Cancel + Me.ButCancel.Location = New Point(502, 661) Me.ButCancel.Name = "ButCancel" - Me.ButCancel.Size = New System.Drawing.Size(75, 23) + Me.ButCancel.Size = New Size(75, 23) Me.ButCancel.TabIndex = 6 Me.ButCancel.Text = "Cancel" Me.ButCancel.UseVisualStyleBackColor = True @@ -229,59 +234,63 @@ Partial Class F_VEH 'Label14 ' Me.Label14.AutoSize = True - Me.Label14.Location = New System.Drawing.Point(231, 22) + Me.Label14.Location = New Point(231, 22) Me.Label14.Name = "Label14" - Me.Label14.Size = New System.Drawing.Size(25, 13) + Me.Label14.Size = New Size(25, 13) Me.Label14.TabIndex = 24 Me.Label14.Text = "[kg]" ' 'Label31 ' Me.Label31.AutoSize = True - Me.Label31.Location = New System.Drawing.Point(225, 31) + Me.Label31.Location = New Point(225, 31) Me.Label31.Name = "Label31" - Me.Label31.Size = New System.Drawing.Size(25, 13) + Me.Label31.Size = New Size(25, 13) Me.Label31.TabIndex = 24 Me.Label31.Text = "[kg]" ' 'Label35 ' Me.Label35.AutoSize = True - Me.Label35.Location = New System.Drawing.Point(105, 7) + Me.Label35.Location = New Point(105, 7) Me.Label35.Name = "Label35" - Me.Label35.Size = New System.Drawing.Size(29, 13) + Me.Label35.Size = New Size(29, 13) Me.Label35.TabIndex = 24 Me.Label35.Text = "[mm]" ' 'CbCdMode ' - Me.CbCdMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.CbCdMode.DropDownStyle = ComboBoxStyle.DropDownList Me.CbCdMode.FormattingEnabled = True - Me.CbCdMode.Items.AddRange(New Object() {"No Correction", "Speed dependent (User-defined)", "Speed dependent (Declaration Mode)", "Vair & Beta Input"}) - Me.CbCdMode.Location = New System.Drawing.Point(6, 19) + 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 System.Drawing.Size(207, 21) + Me.CbCdMode.Size = New Size(207, 21) Me.CbCdMode.TabIndex = 0 ' 'TbCdFile ' - Me.TbCdFile.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.TbCdFile.Anchor = CType((((AnchorStyles.Top Or AnchorStyles.Bottom) _ + Or AnchorStyles.Left) _ + Or AnchorStyles.Right), AnchorStyles) Me.TbCdFile.Enabled = False - Me.TbCdFile.Location = New System.Drawing.Point(6, 46) + Me.TbCdFile.Location = New Point(6, 46) Me.TbCdFile.Name = "TbCdFile" - Me.TbCdFile.Size = New System.Drawing.Size(504, 20) + Me.TbCdFile.Size = New Size(504, 20) Me.TbCdFile.TabIndex = 1 ' 'BtCdFileBrowse ' - Me.BtCdFileBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.BtCdFileBrowse.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles) Me.BtCdFileBrowse.Enabled = False - Me.BtCdFileBrowse.Image = Global.VECTO.My.Resources.Resources.Open_icon - Me.BtCdFileBrowse.Location = New System.Drawing.Point(510, 43) + Me.BtCdFileBrowse.Image = My.Resources.Resources.Open_icon + Me.BtCdFileBrowse.Location = New Point(510, 43) Me.BtCdFileBrowse.Name = "BtCdFileBrowse" - Me.BtCdFileBrowse.Size = New System.Drawing.Size(24, 24) + Me.BtCdFileBrowse.Size = New Size(24, 24) Me.BtCdFileBrowse.TabIndex = 2 Me.BtCdFileBrowse.UseVisualStyleBackColor = True ' @@ -292,21 +301,21 @@ Partial Class F_VEH Me.GroupBox6.Controls.Add(Me.CbCdMode) Me.GroupBox6.Controls.Add(Me.BtCdFileBrowse) Me.GroupBox6.Controls.Add(Me.TbCdFile) - Me.GroupBox6.Location = New System.Drawing.Point(6, 407) + Me.GroupBox6.Location = New Point(6, 407) Me.GroupBox6.Name = "GroupBox6" - Me.GroupBox6.Size = New System.Drawing.Size(562, 74) + Me.GroupBox6.Size = New Size(562, 74) Me.GroupBox6.TabIndex = 5 Me.GroupBox6.TabStop = False Me.GroupBox6.Text = "Cross Wind Correction" ' 'BtCdFileOpen ' - Me.BtCdFileOpen.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.BtCdFileOpen.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles) Me.BtCdFileOpen.Enabled = False - Me.BtCdFileOpen.Image = Global.VECTO.My.Resources.Resources.application_export_icon_small - Me.BtCdFileOpen.Location = New System.Drawing.Point(533, 43) + Me.BtCdFileOpen.Image = My.Resources.Resources.application_export_icon_small + Me.BtCdFileOpen.Location = New Point(533, 43) Me.BtCdFileOpen.Name = "BtCdFileOpen" - Me.BtCdFileOpen.Size = New System.Drawing.Size(24, 24) + Me.BtCdFileOpen.Size = New Size(24, 24) Me.BtCdFileOpen.TabIndex = 3 Me.BtCdFileOpen.TabStop = False Me.BtCdFileOpen.UseVisualStyleBackColor = True @@ -314,98 +323,98 @@ Partial Class F_VEH 'LbCdMode ' Me.LbCdMode.AutoSize = True - Me.LbCdMode.Location = New System.Drawing.Point(219, 22) + Me.LbCdMode.Location = New Point(219, 22) Me.LbCdMode.Name = "LbCdMode" - Me.LbCdMode.Size = New System.Drawing.Size(59, 13) + Me.LbCdMode.Size = New Size(59, 13) Me.LbCdMode.TabIndex = 28 Me.LbCdMode.Text = "LbCdMode" ' 'ToolStrip1 ' - Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden - Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator3, Me.ToolStripBtSendTo, Me.ToolStripSeparator1, Me.ToolStripButton1}) - Me.ToolStrip1.Location = New System.Drawing.Point(0, 0) + Me.ToolStrip1.GripStyle = ToolStripGripStyle.Hidden + Me.ToolStrip1.Items.AddRange(New ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator3, Me.ToolStripBtSendTo, Me.ToolStripSeparator1, Me.ToolStripButton1}) + Me.ToolStrip1.Location = New Point(0, 0) Me.ToolStrip1.Name = "ToolStrip1" - Me.ToolStrip1.Size = New System.Drawing.Size(589, 25) + Me.ToolStrip1.Size = New Size(589, 25) Me.ToolStrip1.TabIndex = 29 Me.ToolStrip1.Text = "ToolStrip1" ' 'ToolStripBtNew ' - Me.ToolStripBtNew.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripBtNew.Image = Global.VECTO.My.Resources.Resources.blue_document_icon - Me.ToolStripBtNew.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripBtNew.DisplayStyle = ToolStripItemDisplayStyle.Image + Me.ToolStripBtNew.Image = My.Resources.Resources.blue_document_icon + Me.ToolStripBtNew.ImageTransparentColor = Color.Magenta Me.ToolStripBtNew.Name = "ToolStripBtNew" - Me.ToolStripBtNew.Size = New System.Drawing.Size(23, 22) + Me.ToolStripBtNew.Size = New Size(23, 22) Me.ToolStripBtNew.Text = "ToolStripButton1" Me.ToolStripBtNew.ToolTipText = "New" ' 'ToolStripBtOpen ' - Me.ToolStripBtOpen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripBtOpen.Image = Global.VECTO.My.Resources.Resources.Open_icon - Me.ToolStripBtOpen.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripBtOpen.DisplayStyle = ToolStripItemDisplayStyle.Image + Me.ToolStripBtOpen.Image = My.Resources.Resources.Open_icon + Me.ToolStripBtOpen.ImageTransparentColor = Color.Magenta Me.ToolStripBtOpen.Name = "ToolStripBtOpen" - Me.ToolStripBtOpen.Size = New System.Drawing.Size(23, 22) + Me.ToolStripBtOpen.Size = New Size(23, 22) Me.ToolStripBtOpen.Text = "ToolStripButton1" Me.ToolStripBtOpen.ToolTipText = "Open..." ' 'ToolStripBtSave ' - Me.ToolStripBtSave.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripBtSave.Image = Global.VECTO.My.Resources.Resources.Actions_document_save_icon - Me.ToolStripBtSave.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripBtSave.DisplayStyle = ToolStripItemDisplayStyle.Image + Me.ToolStripBtSave.Image = My.Resources.Resources.Actions_document_save_icon + Me.ToolStripBtSave.ImageTransparentColor = Color.Magenta Me.ToolStripBtSave.Name = "ToolStripBtSave" - Me.ToolStripBtSave.Size = New System.Drawing.Size(23, 22) + Me.ToolStripBtSave.Size = New Size(23, 22) Me.ToolStripBtSave.Text = "ToolStripButton1" Me.ToolStripBtSave.ToolTipText = "Save" ' 'ToolStripBtSaveAs ' - Me.ToolStripBtSaveAs.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripBtSaveAs.Image = Global.VECTO.My.Resources.Resources.Actions_document_save_as_icon - Me.ToolStripBtSaveAs.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripBtSaveAs.DisplayStyle = ToolStripItemDisplayStyle.Image + Me.ToolStripBtSaveAs.Image = My.Resources.Resources.Actions_document_save_as_icon + Me.ToolStripBtSaveAs.ImageTransparentColor = Color.Magenta Me.ToolStripBtSaveAs.Name = "ToolStripBtSaveAs" - Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(23, 22) + Me.ToolStripBtSaveAs.Size = New Size(23, 22) Me.ToolStripBtSaveAs.Text = "ToolStripButton1" Me.ToolStripBtSaveAs.ToolTipText = "Save As..." ' 'ToolStripSeparator3 ' Me.ToolStripSeparator3.Name = "ToolStripSeparator3" - Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 25) + Me.ToolStripSeparator3.Size = New Size(6, 25) ' 'ToolStripBtSendTo ' - Me.ToolStripBtSendTo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripBtSendTo.Image = Global.VECTO.My.Resources.Resources.export_icon - Me.ToolStripBtSendTo.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripBtSendTo.DisplayStyle = ToolStripItemDisplayStyle.Image + Me.ToolStripBtSendTo.Image = My.Resources.Resources.export_icon + Me.ToolStripBtSendTo.ImageTransparentColor = Color.Magenta Me.ToolStripBtSendTo.Name = "ToolStripBtSendTo" - Me.ToolStripBtSendTo.Size = New System.Drawing.Size(23, 22) + Me.ToolStripBtSendTo.Size = New Size(23, 22) Me.ToolStripBtSendTo.Text = "Send to Job Editor" Me.ToolStripBtSendTo.ToolTipText = "Send to Job Editor" ' 'ToolStripSeparator1 ' Me.ToolStripSeparator1.Name = "ToolStripSeparator1" - Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 25) + Me.ToolStripSeparator1.Size = New Size(6, 25) ' 'ToolStripButton1 ' - Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.ToolStripButton1.Image = Global.VECTO.My.Resources.Resources.Help_icon - Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripButton1.DisplayStyle = ToolStripItemDisplayStyle.Image + Me.ToolStripButton1.Image = My.Resources.Resources.Help_icon + Me.ToolStripButton1.ImageTransparentColor = Color.Magenta Me.ToolStripButton1.Name = "ToolStripButton1" - Me.ToolStripButton1.Size = New System.Drawing.Size(23, 22) + Me.ToolStripButton1.Size = New Size(23, 22) Me.ToolStripButton1.Text = "Help" ' 'GroupBox7 ' Me.GroupBox7.Controls.Add(Me.PnRt) Me.GroupBox7.Controls.Add(Me.CbRtType) - Me.GroupBox7.Location = New System.Drawing.Point(6, 290) + Me.GroupBox7.Location = New Point(6, 290) Me.GroupBox7.Name = "GroupBox7" - Me.GroupBox7.Size = New System.Drawing.Size(278, 111) + Me.GroupBox7.Size = New Size(278, 111) Me.GroupBox7.TabIndex = 3 Me.GroupBox7.TabStop = False Me.GroupBox7.Text = "Retarder Losses" @@ -418,98 +427,100 @@ Partial Class F_VEH Me.PnRt.Controls.Add(Me.Label45) Me.PnRt.Controls.Add(Me.LbRtRatio) Me.PnRt.Controls.Add(Me.TbRtRatio) - Me.PnRt.Location = New System.Drawing.Point(3, 42) + Me.PnRt.Location = New Point(3, 42) Me.PnRt.Name = "PnRt" - Me.PnRt.Size = New System.Drawing.Size(272, 63) + Me.PnRt.Size = New Size(272, 63) Me.PnRt.TabIndex = 1 ' 'Label15 ' - Me.Label15.Location = New System.Drawing.Point(6, 23) + Me.Label15.Location = New Point(6, 23) Me.Label15.Name = "Label15" - Me.Label15.Size = New System.Drawing.Size(201, 16) + Me.Label15.Size = New Size(201, 16) Me.Label15.TabIndex = 15 Me.Label15.Text = "Retarder Loss Map" - Me.Label15.TextAlign = System.Drawing.ContentAlignment.BottomLeft + Me.Label15.TextAlign = ContentAlignment.BottomLeft ' 'BtRtBrowse ' - Me.BtRtBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.BtRtBrowse.Image = Global.VECTO.My.Resources.Resources.Open_icon - Me.BtRtBrowse.Location = New System.Drawing.Point(245, 39) + Me.BtRtBrowse.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles) + Me.BtRtBrowse.Image = My.Resources.Resources.Open_icon + Me.BtRtBrowse.Location = New Point(245, 39) Me.BtRtBrowse.Name = "BtRtBrowse" - Me.BtRtBrowse.Size = New System.Drawing.Size(24, 24) + Me.BtRtBrowse.Size = New Size(24, 24) Me.BtRtBrowse.TabIndex = 14 Me.BtRtBrowse.UseVisualStyleBackColor = True ' 'TbRtPath ' - Me.TbRtPath.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.TbRtPath.Location = New System.Drawing.Point(6, 41) + Me.TbRtPath.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles) + Me.TbRtPath.Location = New Point(6, 41) Me.TbRtPath.Name = "TbRtPath" - Me.TbRtPath.Size = New System.Drawing.Size(239, 20) + Me.TbRtPath.Size = New Size(239, 20) Me.TbRtPath.TabIndex = 13 ' 'Label45 ' - Me.Label45.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Label45.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles) Me.Label45.AutoSize = True - Me.Label45.Location = New System.Drawing.Point(251, 4) + Me.Label45.Location = New Point(251, 4) Me.Label45.Name = "Label45" - Me.Label45.Size = New System.Drawing.Size(16, 13) + Me.Label45.Size = New Size(16, 13) Me.Label45.TabIndex = 10 Me.Label45.Text = "[-]" ' 'LbRtRatio ' - Me.LbRtRatio.Location = New System.Drawing.Point(19, 4) + Me.LbRtRatio.Location = New Point(19, 4) Me.LbRtRatio.Name = "LbRtRatio" - Me.LbRtRatio.Size = New System.Drawing.Size(167, 17) + Me.LbRtRatio.Size = New Size(167, 17) Me.LbRtRatio.TabIndex = 5 Me.LbRtRatio.Text = "Ratio" - Me.LbRtRatio.TextAlign = System.Drawing.ContentAlignment.TopRight + Me.LbRtRatio.TextAlign = ContentAlignment.TopRight ' 'TbRtRatio ' - Me.TbRtRatio.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.TbRtRatio.Location = New System.Drawing.Point(193, 2) + Me.TbRtRatio.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles) + Me.TbRtRatio.Location = New Point(193, 2) Me.TbRtRatio.Name = "TbRtRatio" - Me.TbRtRatio.Size = New System.Drawing.Size(56, 20) + Me.TbRtRatio.Size = New Size(56, 20) Me.TbRtRatio.TabIndex = 0 ' 'CbRtType ' - Me.CbRtType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.CbRtType.DropDownStyle = ComboBoxStyle.DropDownList Me.CbRtType.FormattingEnabled = True - Me.CbRtType.Items.AddRange(New Object() {"Included in Transmission Loss Maps", "Primary Retarder", "Secondary Retarder"}) - Me.CbRtType.Location = New System.Drawing.Point(6, 19) + 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 System.Drawing.Size(266, 21) + Me.CbRtType.Size = New Size(266, 21) Me.CbRtType.TabIndex = 0 ' 'Label46 ' Me.Label46.AutoSize = True - Me.Label46.Location = New System.Drawing.Point(6, 5) + Me.Label46.Location = New Point(6, 5) Me.Label46.Name = "Label46" - Me.Label46.Size = New System.Drawing.Size(154, 13) + Me.Label46.Size = New Size(154, 13) Me.Label46.TabIndex = 31 Me.Label46.Text = "Curb Weight Extra Trailer/Body" ' 'Label50 ' Me.Label50.AutoSize = True - Me.Label50.Location = New System.Drawing.Point(225, 5) + Me.Label50.Location = New Point(225, 5) Me.Label50.Name = "Label50" - Me.Label50.Size = New System.Drawing.Size(25, 13) + Me.Label50.Size = New Size(25, 13) Me.Label50.TabIndex = 24 Me.Label50.Text = "[kg]" ' 'TbMassExtra ' - Me.TbMassExtra.Location = New System.Drawing.Point(166, 2) + Me.TbMassExtra.Location = New Point(166, 2) Me.TbMassExtra.Name = "TbMassExtra" - Me.TbMassExtra.Size = New System.Drawing.Size(57, 20) + Me.TbMassExtra.Size = New Size(57, 20) Me.TbMassExtra.TabIndex = 0 ' 'GroupBox8 @@ -518,59 +529,59 @@ Partial Class F_VEH Me.GroupBox8.Controls.Add(Me.ButAxlRem) Me.GroupBox8.Controls.Add(Me.LvRRC) Me.GroupBox8.Controls.Add(Me.ButAxlAdd) - Me.GroupBox8.Location = New System.Drawing.Point(6, 133) + Me.GroupBox8.Location = New Point(6, 133) Me.GroupBox8.Name = "GroupBox8" - Me.GroupBox8.Size = New System.Drawing.Size(562, 151) + Me.GroupBox8.Size = New Size(562, 151) Me.GroupBox8.TabIndex = 2 Me.GroupBox8.TabStop = False Me.GroupBox8.Text = "Axles / Wheels" ' 'PnWheelDiam ' - Me.PnWheelDiam.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.PnWheelDiam.Anchor = CType(((AnchorStyles.Top Or AnchorStyles.Left) _ + Or AnchorStyles.Right), AnchorStyles) Me.PnWheelDiam.Controls.Add(Me.Label13) Me.PnWheelDiam.Controls.Add(Me.TBrdyn) Me.PnWheelDiam.Controls.Add(Me.Label35) - Me.PnWheelDiam.Location = New System.Drawing.Point(3, 16) + Me.PnWheelDiam.Location = New Point(3, 16) Me.PnWheelDiam.Name = "PnWheelDiam" - Me.PnWheelDiam.Size = New System.Drawing.Size(228, 34) + Me.PnWheelDiam.Size = New Size(228, 34) Me.PnWheelDiam.TabIndex = 5 ' 'Label6 ' Me.Label6.AutoSize = True - Me.Label6.Location = New System.Drawing.Point(450, 121) + Me.Label6.Location = New Point(450, 121) Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(106, 13) + Me.Label6.Size = New Size(106, 13) Me.Label6.TabIndex = 3 Me.Label6.Text = "(Double-Click to Edit)" ' 'ButAxlRem ' - Me.ButAxlRem.Image = Global.VECTO.My.Resources.Resources.minus_circle_icon - Me.ButAxlRem.Location = New System.Drawing.Point(29, 122) + Me.ButAxlRem.Image = My.Resources.Resources.minus_circle_icon + Me.ButAxlRem.Location = New Point(29, 122) Me.ButAxlRem.Name = "ButAxlRem" - Me.ButAxlRem.Size = New System.Drawing.Size(24, 24) + Me.ButAxlRem.Size = New Size(24, 24) Me.ButAxlRem.TabIndex = 2 Me.ButAxlRem.UseVisualStyleBackColor = True ' 'LvRRC ' - Me.LvRRC.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.LvRRC.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader7, Me.ColumnHeader8, Me.ColumnHeader2, Me.ColumnHeader9, Me.ColumnHeader1, Me.ColumnHeader3, Me.ColumnHeader4}) + Me.LvRRC.Anchor = CType(((AnchorStyles.Top Or AnchorStyles.Left) _ + Or AnchorStyles.Right), AnchorStyles) + Me.LvRRC.Columns.AddRange(New ColumnHeader() {Me.ColumnHeader7, Me.ColumnHeader8, Me.ColumnHeader2, Me.ColumnHeader9, Me.ColumnHeader1, Me.ColumnHeader3, Me.ColumnHeader4}) Me.LvRRC.FullRowSelect = True Me.LvRRC.GridLines = True Me.LvRRC.HideSelection = False - Me.LvRRC.Location = New System.Drawing.Point(6, 19) + Me.LvRRC.Location = New Point(6, 19) Me.LvRRC.MultiSelect = False Me.LvRRC.Name = "LvRRC" - Me.LvRRC.Size = New System.Drawing.Size(550, 102) + Me.LvRRC.Size = New Size(550, 102) Me.LvRRC.TabIndex = 0 Me.LvRRC.TabStop = False Me.LvRRC.UseCompatibleStateImageBehavior = False - Me.LvRRC.View = System.Windows.Forms.View.Details + Me.LvRRC.View = View.Details ' 'ColumnHeader7 ' @@ -608,65 +619,73 @@ Partial Class F_VEH ' 'ButAxlAdd ' - Me.ButAxlAdd.Image = Global.VECTO.My.Resources.Resources.plus_circle_icon - Me.ButAxlAdd.Location = New System.Drawing.Point(5, 122) + Me.ButAxlAdd.Image = My.Resources.Resources.plus_circle_icon + Me.ButAxlAdd.Location = New Point(5, 122) Me.ButAxlAdd.Name = "ButAxlAdd" - Me.ButAxlAdd.Size = New System.Drawing.Size(24, 24) + Me.ButAxlAdd.Size = New Size(24, 24) Me.ButAxlAdd.TabIndex = 1 Me.ButAxlAdd.UseVisualStyleBackColor = True ' 'CbAxleConfig ' - Me.CbAxleConfig.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.CbAxleConfig.DropDownStyle = ComboBoxStyle.DropDownList Me.CbAxleConfig.FormattingEnabled = True - Me.CbAxleConfig.Items.AddRange(New Object() {"-", "4x2", "4x4", "6x2", "6x4", "6x6", "8x2", "8x4", "8x6", "8x8"}) - Me.CbAxleConfig.Location = New System.Drawing.Point(153, 80) + 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 System.Drawing.Size(60, 21) + Me.CbAxleConfig.Size = New Size(60, 21) Me.CbAxleConfig.TabIndex = 1 ' 'CbCat ' - Me.CbCat.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.CbCat.DropDownStyle = ComboBoxStyle.DropDownList Me.CbCat.FormattingEnabled = True - Me.CbCat.Items.AddRange(New Object() {"-", "Rigid Truck", "Tractor", "City Bus", "Interurban Bus", "Coach"}) - Me.CbCat.Location = New System.Drawing.Point(12, 80) + 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 System.Drawing.Size(135, 21) + Me.CbCat.Size = New Size(135, 21) Me.CbCat.TabIndex = 0 ' 'Label5 ' Me.Label5.AutoSize = True - Me.Label5.Location = New System.Drawing.Point(13, 110) + Me.Label5.Location = New Point(13, 110) Me.Label5.Name = "Label5" - Me.Label5.Size = New System.Drawing.Size(134, 13) + Me.Label5.Size = New Size(134, 13) Me.Label5.TabIndex = 2 Me.Label5.Text = "Gross Vehicle Mass Rating" ' 'Label9 ' Me.Label9.AutoSize = True - Me.Label9.Location = New System.Drawing.Point(197, 110) + Me.Label9.Location = New Point(197, 110) Me.Label9.Name = "Label9" - Me.Label9.Size = New System.Drawing.Size(16, 13) + Me.Label9.Size = New Size(16, 13) Me.Label9.TabIndex = 3 Me.Label9.Text = "[t]" - Me.Label9.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Label9.TextAlign = ContentAlignment.MiddleLeft ' 'TbMassMass ' - Me.TbMassMass.Location = New System.Drawing.Point(153, 107) + Me.TbMassMass.Location = New Point(153, 107) Me.TbMassMass.Name = "TbMassMass" - Me.TbMassMass.Size = New System.Drawing.Size(42, 20) + Me.TbMassMass.Size = New Size(42, 20) Me.TbMassMass.TabIndex = 2 ' 'StatusStrip1 ' - Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LbStatus}) - Me.StatusStrip1.Location = New System.Drawing.Point(0, 687) + Me.StatusStrip1.Items.AddRange(New ToolStripItem() {Me.LbStatus}) + Me.StatusStrip1.Location = New Point(0, 687) Me.StatusStrip1.Name = "StatusStrip1" - Me.StatusStrip1.Size = New System.Drawing.Size(589, 22) + Me.StatusStrip1.Size = New Size(589, 22) Me.StatusStrip1.SizingGrip = False Me.StatusStrip1.TabIndex = 36 Me.StatusStrip1.Text = "StatusStrip1" @@ -674,43 +693,43 @@ Partial Class F_VEH 'LbStatus ' Me.LbStatus.Name = "LbStatus" - Me.LbStatus.Size = New System.Drawing.Size(39, 17) + Me.LbStatus.Size = New Size(39, 17) Me.LbStatus.Text = "Status" ' 'TbHDVclass ' - Me.TbHDVclass.Location = New System.Drawing.Point(153, 133) + Me.TbHDVclass.Location = New Point(153, 133) Me.TbHDVclass.Name = "TbHDVclass" Me.TbHDVclass.ReadOnly = True - Me.TbHDVclass.Size = New System.Drawing.Size(42, 20) + Me.TbHDVclass.Size = New Size(42, 20) Me.TbHDVclass.TabIndex = 3 Me.TbHDVclass.TabStop = False - Me.TbHDVclass.TextAlign = System.Windows.Forms.HorizontalAlignment.Center + Me.TbHDVclass.TextAlign = HorizontalAlignment.Center ' 'Label11 ' Me.Label11.AutoSize = True - Me.Label11.Location = New System.Drawing.Point(89, 57) + Me.Label11.Location = New Point(89, 57) Me.Label11.Name = "Label11" - Me.Label11.Size = New System.Drawing.Size(71, 13) + Me.Label11.Size = New Size(71, 13) Me.Label11.TabIndex = 31 Me.Label11.Text = "Max. Loading" ' 'TbLoadingMax ' - Me.TbLoadingMax.Location = New System.Drawing.Point(166, 54) + Me.TbLoadingMax.Location = New Point(166, 54) Me.TbLoadingMax.Name = "TbLoadingMax" Me.TbLoadingMax.ReadOnly = True - Me.TbLoadingMax.Size = New System.Drawing.Size(57, 20) + Me.TbLoadingMax.Size = New Size(57, 20) Me.TbLoadingMax.TabIndex = 2 Me.TbLoadingMax.TabStop = False ' 'Label22 ' Me.Label22.AutoSize = True - Me.Label22.Location = New System.Drawing.Point(225, 57) + Me.Label22.Location = New Point(225, 57) Me.Label22.Name = "Label22" - Me.Label22.Size = New System.Drawing.Size(25, 13) + Me.Label22.Size = New Size(25, 13) Me.Label22.TabIndex = 24 Me.Label22.Text = "[kg]" ' @@ -720,9 +739,9 @@ Partial Class F_VEH Me.GroupBox1.Controls.Add(Me.TbMass) Me.GroupBox1.Controls.Add(Me.Label1) Me.GroupBox1.Controls.Add(Me.Label14) - Me.GroupBox1.Location = New System.Drawing.Point(6, 3) + Me.GroupBox1.Location = New Point(6, 3) Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(278, 124) + Me.GroupBox1.Size = New Size(278, 124) Me.GroupBox1.TabIndex = 0 Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Weight / Loading" @@ -738,17 +757,17 @@ Partial Class F_VEH Me.PnLoad.Controls.Add(Me.Label46) Me.PnLoad.Controls.Add(Me.Label22) Me.PnLoad.Controls.Add(Me.Label11) - Me.PnLoad.Location = New System.Drawing.Point(6, 43) + Me.PnLoad.Location = New Point(6, 43) Me.PnLoad.Name = "PnLoad" - Me.PnLoad.Size = New System.Drawing.Size(256, 75) + Me.PnLoad.Size = New Size(256, 75) Me.PnLoad.TabIndex = 1 ' 'GrAirRes ' Me.GrAirRes.Controls.Add(Me.PnCdATrTr) - Me.GrAirRes.Location = New System.Drawing.Point(290, 3) + Me.GrAirRes.Location = New Point(290, 3) Me.GrAirRes.Name = "GrAirRes" - Me.GrAirRes.Size = New System.Drawing.Size(278, 48) + Me.GrAirRes.Size = New Size(278, 48) Me.GrAirRes.TabIndex = 1 Me.GrAirRes.TabStop = False Me.GrAirRes.Text = "Air Resistance" @@ -758,47 +777,47 @@ Partial Class F_VEH Me.PnCdATrTr.Controls.Add(Me.TBcdA) Me.PnCdATrTr.Controls.Add(Me.Label38) Me.PnCdATrTr.Controls.Add(Me.Label3) - Me.PnCdATrTr.Dock = System.Windows.Forms.DockStyle.Fill - Me.PnCdATrTr.Location = New System.Drawing.Point(3, 16) + Me.PnCdATrTr.Dock = DockStyle.Fill + Me.PnCdATrTr.Location = New Point(3, 16) Me.PnCdATrTr.Name = "PnCdATrTr" - Me.PnCdATrTr.Size = New System.Drawing.Size(272, 29) + Me.PnCdATrTr.Size = New Size(272, 29) Me.PnCdATrTr.TabIndex = 0 ' 'Label38 ' Me.Label38.AutoSize = True - Me.Label38.Location = New System.Drawing.Point(105, 6) + Me.Label38.Location = New Point(105, 6) Me.Label38.Name = "Label38" - Me.Label38.Size = New System.Drawing.Size(24, 13) + Me.Label38.Size = New Size(24, 13) Me.Label38.TabIndex = 24 Me.Label38.Text = "[m²]" ' 'PictureBox1 ' - Me.PictureBox1.BackColor = System.Drawing.Color.White - Me.PictureBox1.Image = Global.VECTO.My.Resources.Resources.VECTO_VEH - Me.PictureBox1.Location = New System.Drawing.Point(12, 28) + Me.PictureBox1.BackColor = Color.White + Me.PictureBox1.Image = My.Resources.Resources.VECTO_VEH + Me.PictureBox1.Location = New Point(12, 28) Me.PictureBox1.Name = "PictureBox1" - Me.PictureBox1.Size = New System.Drawing.Size(569, 40) + Me.PictureBox1.Size = New Size(569, 40) Me.PictureBox1.TabIndex = 37 Me.PictureBox1.TabStop = False ' 'CmOpenFile ' - Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem}) + Me.CmOpenFile.Items.AddRange(New ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem}) Me.CmOpenFile.Name = "CmOpenFile" - Me.CmOpenFile.Size = New System.Drawing.Size(153, 48) + Me.CmOpenFile.Size = New Size(153, 48) ' 'OpenWithToolStripMenuItem ' Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem" - Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(152, 22) + Me.OpenWithToolStripMenuItem.Size = New Size(152, 22) Me.OpenWithToolStripMenuItem.Text = "Open with ..." ' 'ShowInFolderToolStripMenuItem ' Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem" - Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(152, 22) + Me.ShowInFolderToolStripMenuItem.Size = New Size(152, 22) Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder" ' 'PnAll @@ -810,18 +829,18 @@ Partial Class F_VEH Me.PnAll.Controls.Add(Me.GroupBox8) Me.PnAll.Controls.Add(Me.GroupBox7) Me.PnAll.Controls.Add(Me.GroupBox6) - Me.PnAll.Location = New System.Drawing.Point(6, 172) + Me.PnAll.Location = New Point(6, 172) Me.PnAll.Name = "PnAll" - Me.PnAll.Size = New System.Drawing.Size(575, 485) + Me.PnAll.Size = New Size(575, 485) Me.PnAll.TabIndex = 4 ' 'GroupBox2 ' Me.GroupBox2.Controls.Add(Me.pnAngularGearFields) Me.GroupBox2.Controls.Add(Me.cbAngularGearType) - Me.GroupBox2.Location = New System.Drawing.Point(290, 290) + Me.GroupBox2.Location = New Point(290, 290) Me.GroupBox2.Name = "GroupBox2" - Me.GroupBox2.Size = New System.Drawing.Size(278, 111) + Me.GroupBox2.Size = New Size(278, 111) Me.GroupBox2.TabIndex = 4 Me.GroupBox2.TabStop = False Me.GroupBox2.Text = "Angular Gear" @@ -834,100 +853,103 @@ Partial Class F_VEH Me.pnAngularGearFields.Controls.Add(Me.tbAngularGearRatio) Me.pnAngularGearFields.Controls.Add(Me.btAngularGearLossMapBrowse) Me.pnAngularGearFields.Controls.Add(Me.tbAngularGearLossMapPath) - Me.pnAngularGearFields.Location = New System.Drawing.Point(3, 42) + Me.pnAngularGearFields.Location = New Point(3, 42) Me.pnAngularGearFields.Name = "pnAngularGearFields" - Me.pnAngularGearFields.Size = New System.Drawing.Size(272, 63) + Me.pnAngularGearFields.Size = New Size(272, 63) Me.pnAngularGearFields.TabIndex = 6 ' 'Label4 ' - Me.Label4.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Label4.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles) Me.Label4.AutoSize = True - Me.Label4.Location = New System.Drawing.Point(251, 4) + Me.Label4.Location = New Point(251, 4) Me.Label4.Name = "Label4" - Me.Label4.Size = New System.Drawing.Size(16, 13) + Me.Label4.Size = New Size(16, 13) Me.Label4.TabIndex = 16 Me.Label4.Text = "[-]" ' 'Label12 ' - Me.Label12.Location = New System.Drawing.Point(6, 24) + Me.Label12.Location = New Point(6, 24) Me.Label12.Name = "Label12" - Me.Label12.Size = New System.Drawing.Size(263, 16) + Me.Label12.Size = New Size(263, 16) Me.Label12.TabIndex = 17 Me.Label12.Text = "Transmission Loss Map or Efficiency Value [0..1]" - Me.Label12.TextAlign = System.Drawing.ContentAlignment.BottomLeft + Me.Label12.TextAlign = ContentAlignment.BottomLeft ' 'Label10 ' - Me.Label10.Location = New System.Drawing.Point(144, 4) + Me.Label10.Location = New Point(144, 4) Me.Label10.Name = "Label10" - Me.Label10.Size = New System.Drawing.Size(44, 18) + Me.Label10.Size = New Size(44, 18) Me.Label10.TabIndex = 15 Me.Label10.Text = "Ratio" - Me.Label10.TextAlign = System.Drawing.ContentAlignment.TopRight + Me.Label10.TextAlign = ContentAlignment.TopRight ' 'tbAngularGearRatio ' - Me.tbAngularGearRatio.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.tbAngularGearRatio.Location = New System.Drawing.Point(193, 2) + Me.tbAngularGearRatio.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles) + Me.tbAngularGearRatio.Location = New Point(193, 2) Me.tbAngularGearRatio.Name = "tbAngularGearRatio" - Me.tbAngularGearRatio.Size = New System.Drawing.Size(56, 20) + Me.tbAngularGearRatio.Size = New Size(56, 20) Me.tbAngularGearRatio.TabIndex = 12 ' 'btAngularGearLossMapBrowse ' - Me.btAngularGearLossMapBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.btAngularGearLossMapBrowse.Image = Global.VECTO.My.Resources.Resources.Open_icon - Me.btAngularGearLossMapBrowse.Location = New System.Drawing.Point(244, 39) + Me.btAngularGearLossMapBrowse.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles) + Me.btAngularGearLossMapBrowse.Image = My.Resources.Resources.Open_icon + Me.btAngularGearLossMapBrowse.Location = New Point(244, 39) Me.btAngularGearLossMapBrowse.Name = "btAngularGearLossMapBrowse" - Me.btAngularGearLossMapBrowse.Size = New System.Drawing.Size(24, 24) + Me.btAngularGearLossMapBrowse.Size = New Size(24, 24) Me.btAngularGearLossMapBrowse.TabIndex = 14 Me.btAngularGearLossMapBrowse.UseVisualStyleBackColor = True ' 'tbAngularGearLossMapPath ' - Me.tbAngularGearLossMapPath.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.tbAngularGearLossMapPath.Location = New System.Drawing.Point(6, 41) + Me.tbAngularGearLossMapPath.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles) + Me.tbAngularGearLossMapPath.Location = New Point(6, 41) Me.tbAngularGearLossMapPath.Name = "tbAngularGearLossMapPath" - Me.tbAngularGearLossMapPath.Size = New System.Drawing.Size(238, 20) + Me.tbAngularGearLossMapPath.Size = New Size(238, 20) Me.tbAngularGearLossMapPath.TabIndex = 13 ' 'cbAngularGearType ' - Me.cbAngularGearType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cbAngularGearType.DropDownStyle = ComboBoxStyle.DropDownList Me.cbAngularGearType.FormattingEnabled = True - Me.cbAngularGearType.Items.AddRange(New Object() {"No Angular Gear", "Separate Angular Gear", "Included in Transmission Loss Maps"}) - Me.cbAngularGearType.Location = New System.Drawing.Point(6, 19) + 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 System.Drawing.Size(266, 21) + Me.cbAngularGearType.Size = New Size(266, 21) Me.cbAngularGearType.TabIndex = 0 ' 'PicVehicle ' - Me.PicVehicle.BackColor = System.Drawing.Color.LightGray - Me.PicVehicle.Location = New System.Drawing.Point(281, 74) + Me.PicVehicle.BackColor = Color.LightGray + Me.PicVehicle.Location = New Point(281, 74) Me.PicVehicle.Name = "PicVehicle" - Me.PicVehicle.Size = New System.Drawing.Size(300, 88) - Me.PicVehicle.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage + Me.PicVehicle.Size = New Size(300, 88) + Me.PicVehicle.SizeMode = PictureBoxSizeMode.StretchImage Me.PicVehicle.TabIndex = 39 Me.PicVehicle.TabStop = False ' 'Label8 ' Me.Label8.AutoSize = True - Me.Label8.Location = New System.Drawing.Point(89, 136) + Me.Label8.Location = New Point(89, 136) Me.Label8.Name = "Label8" - Me.Label8.Size = New System.Drawing.Size(58, 13) + Me.Label8.Size = New Size(58, 13) Me.Label8.TabIndex = 10 Me.Label8.Text = "HDV Class" ' 'GroupBox3 ' Me.GroupBox3.Controls.Add(Me.PnWheelDiam) - Me.GroupBox3.Location = New System.Drawing.Point(290, 54) + Me.GroupBox3.Location = New Point(290, 54) Me.GroupBox3.Name = "GroupBox3" - Me.GroupBox3.Size = New System.Drawing.Size(278, 73) + Me.GroupBox3.Size = New Size(278, 73) Me.GroupBox3.TabIndex = 6 Me.GroupBox3.TabStop = False Me.GroupBox3.Text = "Dynamic Tire Radius" @@ -935,10 +957,10 @@ Partial Class F_VEH 'F_VEH ' Me.AcceptButton = Me.ButOK - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.AutoScaleDimensions = New SizeF(6.0!, 13.0!) + Me.AutoScaleMode = AutoScaleMode.Font Me.CancelButton = Me.ButCancel - Me.ClientSize = New System.Drawing.Size(589, 709) + Me.ClientSize = New Size(589, 709) Me.Controls.Add(Me.Label8) Me.Controls.Add(Me.TbHDVclass) Me.Controls.Add(Me.PicVehicle) @@ -953,11 +975,11 @@ Partial Class F_VEH Me.Controls.Add(Me.ToolStrip1) Me.Controls.Add(Me.ButCancel) Me.Controls.Add(Me.ButOK) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle - Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) + Me.FormBorderStyle = FormBorderStyle.FixedSingle + Me.Icon = CType(resources.GetObject("$this.Icon"), Icon) Me.MaximizeBox = False Me.Name = "F_VEH" - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent + Me.StartPosition = FormStartPosition.CenterParent Me.Text = "F05_VEH" Me.GroupBox6.ResumeLayout(False) Me.GroupBox6.PerformLayout() @@ -979,103 +1001,103 @@ Partial Class F_VEH Me.GrAirRes.ResumeLayout(False) Me.PnCdATrTr.ResumeLayout(False) Me.PnCdATrTr.PerformLayout() - CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PictureBox1, ISupportInitialize).EndInit() Me.CmOpenFile.ResumeLayout(False) Me.PnAll.ResumeLayout(False) Me.GroupBox2.ResumeLayout(False) Me.pnAngularGearFields.ResumeLayout(False) Me.pnAngularGearFields.PerformLayout() - CType(Me.PicVehicle, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PicVehicle, ISupportInitialize).EndInit() Me.GroupBox3.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() End Sub - Friend WithEvents Label1 As System.Windows.Forms.Label - Friend WithEvents TbMass As System.Windows.Forms.TextBox - Friend WithEvents Label2 As System.Windows.Forms.Label - Friend WithEvents TbLoad As System.Windows.Forms.TextBox - Friend WithEvents Label3 As System.Windows.Forms.Label - Friend WithEvents TBcdA As System.Windows.Forms.TextBox - Friend WithEvents Label13 As System.Windows.Forms.Label - Friend WithEvents TBrdyn As System.Windows.Forms.TextBox - Friend WithEvents ButOK As System.Windows.Forms.Button - Friend WithEvents ButCancel As System.Windows.Forms.Button - Friend WithEvents Label14 As System.Windows.Forms.Label - Friend WithEvents Label31 As System.Windows.Forms.Label - Friend WithEvents Label35 As System.Windows.Forms.Label - Friend WithEvents CbCdMode As System.Windows.Forms.ComboBox - Friend WithEvents TbCdFile As System.Windows.Forms.TextBox - Friend WithEvents BtCdFileBrowse As System.Windows.Forms.Button - Friend WithEvents GroupBox6 As System.Windows.Forms.GroupBox - Friend WithEvents LbCdMode As System.Windows.Forms.Label - Friend WithEvents ToolStrip1 As System.Windows.Forms.ToolStrip - Friend WithEvents ToolStripBtNew As System.Windows.Forms.ToolStripButton - Friend WithEvents ToolStripBtOpen As System.Windows.Forms.ToolStripButton - Friend WithEvents ToolStripBtSave As System.Windows.Forms.ToolStripButton - Friend WithEvents ToolStripBtSaveAs As System.Windows.Forms.ToolStripButton - Friend WithEvents ToolStripSeparator3 As System.Windows.Forms.ToolStripSeparator - Friend WithEvents ToolStripBtSendTo As System.Windows.Forms.ToolStripButton - Friend WithEvents GroupBox7 As System.Windows.Forms.GroupBox - Friend WithEvents LbRtRatio As System.Windows.Forms.Label - Friend WithEvents TbRtRatio As System.Windows.Forms.TextBox - Friend WithEvents CbRtType As System.Windows.Forms.ComboBox - Friend WithEvents Label45 As System.Windows.Forms.Label - Friend WithEvents PnRt As System.Windows.Forms.Panel - Friend WithEvents Label46 As System.Windows.Forms.Label - Friend WithEvents Label50 As System.Windows.Forms.Label - Friend WithEvents TbMassExtra As System.Windows.Forms.TextBox - Friend WithEvents GroupBox8 As System.Windows.Forms.GroupBox - Friend WithEvents ButAxlRem As System.Windows.Forms.Button - Friend WithEvents LvRRC As System.Windows.Forms.ListView - Friend WithEvents ColumnHeader7 As System.Windows.Forms.ColumnHeader - Friend WithEvents ColumnHeader8 As System.Windows.Forms.ColumnHeader - Friend WithEvents ButAxlAdd As System.Windows.Forms.Button - Friend WithEvents CbCat As System.Windows.Forms.ComboBox - Friend WithEvents Label5 As System.Windows.Forms.Label - Friend WithEvents Label9 As System.Windows.Forms.Label - Friend WithEvents TbMassMass As System.Windows.Forms.TextBox - Friend WithEvents ColumnHeader9 As System.Windows.Forms.ColumnHeader - Friend WithEvents StatusStrip1 As System.Windows.Forms.StatusStrip - Friend WithEvents LbStatus As System.Windows.Forms.ToolStripStatusLabel - Friend WithEvents CbAxleConfig As System.Windows.Forms.ComboBox - Friend WithEvents TbHDVclass As System.Windows.Forms.TextBox - Friend WithEvents Label11 As System.Windows.Forms.Label - Friend WithEvents TbLoadingMax As System.Windows.Forms.TextBox - Friend WithEvents Label22 As System.Windows.Forms.Label - Friend WithEvents GroupBox1 As System.Windows.Forms.GroupBox - Friend WithEvents GrAirRes As System.Windows.Forms.GroupBox - Friend WithEvents PictureBox1 As System.Windows.Forms.PictureBox - Friend WithEvents ToolStripSeparator1 As System.Windows.Forms.ToolStripSeparator - Friend WithEvents ToolStripButton1 As System.Windows.Forms.ToolStripButton - Friend WithEvents CmOpenFile As System.Windows.Forms.ContextMenuStrip - Friend WithEvents OpenWithToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents ShowInFolderToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents BtCdFileOpen As System.Windows.Forms.Button - Friend WithEvents ColumnHeader1 As System.Windows.Forms.ColumnHeader - Friend WithEvents ColumnHeader2 As System.Windows.Forms.ColumnHeader - Friend WithEvents PnLoad As System.Windows.Forms.Panel - Friend WithEvents PnAll As System.Windows.Forms.Panel - Friend WithEvents Label6 As System.Windows.Forms.Label - Friend WithEvents ColumnHeader3 As System.Windows.Forms.ColumnHeader - Friend WithEvents ColumnHeader4 As System.Windows.Forms.ColumnHeader - Friend WithEvents PnWheelDiam As System.Windows.Forms.Panel - Friend WithEvents PicVehicle As System.Windows.Forms.PictureBox - Friend WithEvents Label8 As System.Windows.Forms.Label - Friend WithEvents PnCdATrTr As System.Windows.Forms.Panel - Friend WithEvents Label38 As System.Windows.Forms.Label - Friend WithEvents GroupBox2 As System.Windows.Forms.GroupBox - Friend WithEvents cbAngularGearType As System.Windows.Forms.ComboBox - Friend WithEvents Label15 As System.Windows.Forms.Label - Friend WithEvents BtRtBrowse As System.Windows.Forms.Button - Friend WithEvents TbRtPath As System.Windows.Forms.TextBox - Friend WithEvents pnAngularGearFields As System.Windows.Forms.Panel - Friend WithEvents Label4 As System.Windows.Forms.Label - Friend WithEvents Label12 As System.Windows.Forms.Label - Friend WithEvents Label10 As System.Windows.Forms.Label - Friend WithEvents tbAngularGearRatio As System.Windows.Forms.TextBox - Friend WithEvents btAngularGearLossMapBrowse As System.Windows.Forms.Button - Friend WithEvents tbAngularGearLossMapPath As System.Windows.Forms.TextBox - Friend WithEvents ToolTip1 As System.Windows.Forms.ToolTip - Friend WithEvents GroupBox3 As System.Windows.Forms.GroupBox + Friend WithEvents Label1 As Label + Friend WithEvents TbMass As TextBox + Friend WithEvents Label2 As Label + Friend WithEvents TbLoad As TextBox + Friend WithEvents Label3 As Label + Friend WithEvents TBcdA As TextBox + Friend WithEvents Label13 As Label + Friend WithEvents TBrdyn As TextBox + Friend WithEvents ButOK As Button + Friend WithEvents ButCancel As Button + Friend WithEvents Label14 As Label + Friend WithEvents Label31 As Label + Friend WithEvents Label35 As Label + Friend WithEvents CbCdMode As ComboBox + Friend WithEvents TbCdFile As TextBox + Friend WithEvents BtCdFileBrowse As Button + Friend WithEvents GroupBox6 As GroupBox + Friend WithEvents LbCdMode As Label + Friend WithEvents ToolStrip1 As ToolStrip + Friend WithEvents ToolStripBtNew As ToolStripButton + Friend WithEvents ToolStripBtOpen As ToolStripButton + Friend WithEvents ToolStripBtSave As ToolStripButton + Friend WithEvents ToolStripBtSaveAs As ToolStripButton + Friend WithEvents ToolStripSeparator3 As ToolStripSeparator + Friend WithEvents ToolStripBtSendTo As ToolStripButton + Friend WithEvents GroupBox7 As GroupBox + Friend WithEvents LbRtRatio As Label + Friend WithEvents TbRtRatio As TextBox + Friend WithEvents CbRtType As ComboBox + Friend WithEvents Label45 As Label + Friend WithEvents PnRt As Panel + Friend WithEvents Label46 As Label + Friend WithEvents Label50 As Label + Friend WithEvents TbMassExtra As TextBox + Friend WithEvents GroupBox8 As GroupBox + Friend WithEvents ButAxlRem As Button + Friend WithEvents LvRRC As ListView + Friend WithEvents ColumnHeader7 As ColumnHeader + Friend WithEvents ColumnHeader8 As ColumnHeader + Friend WithEvents ButAxlAdd As Button + Friend WithEvents CbCat As ComboBox + Friend WithEvents Label5 As Label + Friend WithEvents Label9 As Label + Friend WithEvents TbMassMass As TextBox + Friend WithEvents ColumnHeader9 As ColumnHeader + Friend WithEvents StatusStrip1 As StatusStrip + Friend WithEvents LbStatus As ToolStripStatusLabel + Friend WithEvents CbAxleConfig As ComboBox + Friend WithEvents TbHDVclass As TextBox + Friend WithEvents Label11 As Label + Friend WithEvents TbLoadingMax As TextBox + Friend WithEvents Label22 As Label + Friend WithEvents GroupBox1 As GroupBox + Friend WithEvents GrAirRes As GroupBox + Friend WithEvents PictureBox1 As PictureBox + Friend WithEvents ToolStripSeparator1 As ToolStripSeparator + Friend WithEvents ToolStripButton1 As ToolStripButton + Friend WithEvents CmOpenFile As ContextMenuStrip + Friend WithEvents OpenWithToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ShowInFolderToolStripMenuItem As ToolStripMenuItem + Friend WithEvents BtCdFileOpen As Button + Friend WithEvents ColumnHeader1 As ColumnHeader + Friend WithEvents ColumnHeader2 As ColumnHeader + Friend WithEvents PnLoad As Panel + Friend WithEvents PnAll As Panel + Friend WithEvents Label6 As Label + Friend WithEvents ColumnHeader3 As ColumnHeader + Friend WithEvents ColumnHeader4 As ColumnHeader + Friend WithEvents PnWheelDiam As Panel + Friend WithEvents PicVehicle As PictureBox + Friend WithEvents Label8 As Label + Friend WithEvents PnCdATrTr As Panel + Friend WithEvents Label38 As Label + Friend WithEvents GroupBox2 As GroupBox + Friend WithEvents cbAngularGearType As ComboBox + Friend WithEvents Label15 As Label + Friend WithEvents BtRtBrowse As Button + Friend WithEvents TbRtPath As TextBox + Friend WithEvents pnAngularGearFields As Panel + Friend WithEvents Label4 As Label + Friend WithEvents Label12 As Label + Friend WithEvents Label10 As Label + Friend WithEvents tbAngularGearRatio As TextBox + Friend WithEvents btAngularGearLossMapBrowse As Button + Friend WithEvents tbAngularGearLossMapPath As TextBox + Friend WithEvents ToolTip1 As ToolTip + Friend WithEvents GroupBox3 As GroupBox End Class diff --git a/VECTO/GUI/F_VEH.vb b/VECTO/GUI/F_VEH.vb index 341a85eab07244217b1c37fa358def214a3fcd95..bb48a5bc81319f7c6271cb61a7b2c901cd72f804 100644 --- a/VECTO/GUI/F_VEH.vb +++ b/VECTO/GUI/F_VEH.vb @@ -11,8 +11,11 @@ Option Infer On Imports System.IO +Imports System.Linq Imports System.Text.RegularExpressions Imports TUGraz.VectoCommon.Models +Imports TUGraz.VectoCommon.Utils +Imports TUGraz.VectoCore.Models.Declaration ''' <summary> ''' Vehicle Editor. @@ -52,18 +55,29 @@ Public Class F_VEH 'Set HDVclasss Private Sub SetHdVclass() - Dim vehC = CType(CbCat.SelectedIndex, tVehCat) - Dim axlC = CType(CbAxleConfig.SelectedIndex, tAxleConf) - Dim maxMass = CSng(fTextboxToNumString(TbMassMass.Text)) + If String.IsNullOrEmpty(TbMassMass.Text) Then + 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 s0 As cSegmentTableEntry = Declaration.SegmentTable.SetRef(vehC, axlC, maxMass) _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) + Catch + ' no segment found - ignore + End Try If Not s0 Is Nothing Then - _hdVclass = s0.HDVclass + _hdVclass = s0.VehicleClass End If + TbHDVclass.Text = _hdVclass - PicVehicle.Image = Image.FromFile(cDeclaration.ConvPicPath(_hdVclass, False)) + PicVehicle.Image = ConvPicPath(_hdVclass, False) End Sub @@ -71,14 +85,24 @@ Public Class F_VEH Private Sub DeclInit() If Not Cfg.DeclMode Then Exit Sub - Dim vehC = CType(CbCat.SelectedIndex, tVehCat) - Dim axlC = CType(CbAxleConfig.SelectedIndex, tAxleConf) - Dim maxMass = CSng(fTextboxToNumString(TbMassMass.Text)) - Dim s0 = Declaration.SegmentTable.SetRef(vehC, axlC, maxMass) - + If String.IsNullOrEmpty(TbMassMass.Text) Then + 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 s0 As Segment = Nothing + Try + s0 = DeclarationData.Segments.Lookup(vehC, axlC, maxMass, 0.SI(Of Kilogram), True) _ + ' Declaration.SegmentTable.SetRef(vehC, axlC, maxMass) + Catch + ' no segment found - ignore + End Try If Not s0 Is Nothing Then - _hdVclass = s0.HDVclass - Dim axleCount As Short = s0.AxleShares(s0.Missions(0)).Count + _hdVclass = s0.VehicleClass + Dim axleCount As Short = s0.Missions(0).AxleWeightDistribution.Count() '.AxleShares(s0.Missions(0)).Count Dim i0 = LvRRC.Items.Count If axleCount > i0 Then @@ -109,7 +133,7 @@ Public Class F_VEH TbMassExtra.Text = "-" TbLoad.Text = "-" - CbCdMode.SelectedIndex = CType(tCdMode.CdOfVdecl, Integer) + CbCdMode.SelectedValue = CrossWindCorrectionMode.DeclarationModeCorrection TbCdFile.Text = "" Dim rdyn As Single @@ -272,18 +296,18 @@ Public Class F_VEH TbLoad.Text = veh.Loading TBrdyn.Text = veh.rdyn - CbCdMode.SelectedIndex = CType(veh.CdMode, Integer) + CbCdMode.SelectedValue = veh.CdMode TbCdFile.Text = veh.CdFile.OriginalPath - CbRtType.SelectedIndex = CType(veh.RtType, Integer) + CbRtType.SelectedValue = veh.RtType TbRtRatio.Text = veh.RtRatio TbRtPath.Text = veh.RtFile.OriginalPath - cbAngularGearType.SelectedIndex = CType(veh.AngularGearType, Integer) + cbAngularGearType.SelectedValue = veh.AngularGearType tbAngularGearRatio.Text = veh.AngularGearRatio tbAngularGearLossMapPath.Text = veh.AngularGearLossMapFile.OriginalPath - CbCat.SelectedIndex = CType(veh.VehCat, Integer) + CbCat.SelectedValue = veh.VehCat LvRRC.Items.Clear() @@ -309,7 +333,7 @@ Public Class F_VEH lvi.SubItems.Add(a0.Wheels) If Cfg.DeclMode Then - inertia = Declaration.WheelsInertia(a0.Wheels) + inertia = DeclarationData.Wheels.Lookup(a0.Wheels).Inertia.Value() If inertia < 0 Then lvi.SubItems.Add("-") Else @@ -325,7 +349,7 @@ Public Class F_VEH TbMassMass.Text = veh.MassMax TbMassExtra.Text = veh.MassExtra - CbAxleConfig.SelectedIndex = CType(veh.AxleConf, Integer) + CbAxleConfig.SelectedValue = veh.AxleConf TBcdA.Text = veh.CdA0 @@ -351,35 +375,43 @@ Public Class F_VEH veh.Loading = CSng(fTextboxToNumString(TbLoad.Text)) veh.CdA0 = CSng(fTextboxToNumString(TBcdA.Text)) - veh.CdA02 = veh.CdA0 - - Dim vehC = CType(CbCat.SelectedIndex, tVehCat) - Dim axlC = CType(CbAxleConfig.SelectedIndex, tAxleConf) - Dim maxMass = CSng(fTextboxToNumString(TbMassMass.Text)) - Dim s0 As cSegmentTableEntry = Declaration.SegmentTable.SetRef(vehC, axlC, maxMass) - If Not s0 Is Nothing Then - If s0.HDVclass = "2" Then - ' CdA Addition for T1 Trailer - veh.CdA02 += 1.1 - End If - If s0.HDVclass = "4" OrElse s0.HDVclass = "9" Then - ' CdA Addition for T2 Trailer - veh.CdA02 += 0.6 - End If - End If + '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 = CType(CbCdMode.SelectedIndex, tCdMode) + veh.CdMode = CbCdMode.SelectedValue veh.CdFile.Init(fPATH(file), TbCdFile.Text) - veh.RtType = CType(CbRtType.SelectedIndex, tRtType) + veh.RtType = CbRtType.SelectedValue veh.RtRatio = CSng(fTextboxToNumString(TbRtRatio.Text)) veh.RtFile.Init(fPATH(file), TbRtPath.Text) - veh.AngularGearType = CType(cbAngularGearType.SelectedIndex, AngularGearType) + veh.AngularGearType = cbAngularGearType.SelectedValue veh.AngularGearRatio = CSng(fTextboxToNumString(tbAngularGearRatio.Text)) veh.AngularGearLossMapFile.Init(fPATH(file), tbAngularGearLossMapPath.Text) - veh.VehCat = CType(CbCat.SelectedIndex, tVehCat) + veh.VehCat = CbCat.SelectedValue 'CType(CbCat.SelectedIndex, tVehCat) Dim axleShareCheck As Double For Each LV0 In LvRRC.Items @@ -401,7 +433,8 @@ Public Class F_VEH veh.MassMax = CSng(fTextboxToNumString(TbMassMass.Text)) veh.MassExtra = CSng(fTextboxToNumString(TbMassExtra.Text)) - veh.AxleConf = CType(CbAxleConfig.SelectedIndex, tAxleConf) + veh.AxleConf = CbAxleConfig.SelectedValue _ + 'CType(CbAxleConfig.SelectedIndex, tAxleConf) '--------------------------------------------------------------------------------- If Not veh.SaveFile Then @@ -432,15 +465,16 @@ Public Class F_VEH Handles CbCdMode.SelectedIndexChanged Dim bEnabled As Boolean - Select Case CType(CbCdMode.SelectedIndex, tCdMode) + Select Case CType(CbCdMode.SelectedValue, CrossWindCorrectionMode) - Case tCdMode.CdOfBeta + Case CrossWindCorrectionMode.VAirBetaLookupTable bEnabled = True LbCdMode.Text = "Input file: Yaw Angle [°], Cd Scaling Factor [-]" - Case tCdMode.CdOfVeng + Case CrossWindCorrectionMode.SpeedDependentCorrectionFactor bEnabled = True - LbCdMode.Text = "Input file: Vehicle Speed [km/h], Cd Scaling Factor [-]" + LbCdMode.Text = "Input file: Vehicle Speed [km/h], Cd Scaling Factor [-]" _ + 'TODO: MQ 20160901: check if scaling factor or absolue value! Case Else ' tCdMode.ConstCd0, tCdMode.CdOfVdecl bEnabled = False @@ -731,8 +765,8 @@ Public Class F_VEH Private Sub cbAngularGearType_SelectedIndexChanged(sender As Object, e As EventArgs) _ Handles cbAngularGearType.SelectedIndexChanged - Select Case cbAngularGearType.SelectedIndex - Case 1 'Separate Angular Gear + Select Case CType(cbAngularGearType.SelectedValue, AngularGearType) + Case AngularGearType.SeparateAngularGear pnAngularGearFields.Enabled = True tbAngularGearRatio.Text = "1.0" Case Else 'Losses included in Transmission, None diff --git a/VECTO/GUI/F_VEH_AuxDlog.Designer.vb b/VECTO/GUI/F_VEH_AuxDlog.Designer.vb index 240ac0a9a0c68f1671f71c167bec1afc97aac9f6..b017cd6cd871685aead4cbd43830dc1d2df8e4a8 100644 --- a/VECTO/GUI/F_VEH_AuxDlog.Designer.vb +++ b/VECTO/GUI/F_VEH_AuxDlog.Designer.vb @@ -8,45 +8,49 @@ ' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ' ' See the LICENSE.txt for the specific language governing permissions and limitations. -<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _ +Imports System.ComponentModel +Imports Microsoft.VisualBasic.CompilerServices +Imports TUGraz.VECTO.My.Resources + +<DesignerGenerated()> _ Partial Class F_VEH_AuxDlog - Inherits System.Windows.Forms.Form + Inherits Form - 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - <System.Diagnostics.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 + '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 System.ComponentModel.IContainer + '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. - <System.Diagnostics.DebuggerStepThrough()> _ - Private Sub InitializeComponent() - Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel() - Me.OK_Button = New System.Windows.Forms.Button() - Me.Cancel_Button = New System.Windows.Forms.Button() - Me.Label1 = New System.Windows.Forms.Label() - Me.Label2 = New System.Windows.Forms.Label() - Me.Label3 = New System.Windows.Forms.Label() - Me.TbID = New System.Windows.Forms.TextBox() - Me.TbPath = New System.Windows.Forms.TextBox() - Me.BtBrowse = New System.Windows.Forms.Button() - Me.CbType = New System.Windows.Forms.ComboBox() - Me.LbIDhelp = New System.Windows.Forms.Label() - Me.Label4 = New System.Windows.Forms.Label() - Me.CbTech = New System.Windows.Forms.ComboBox() - Me.PnTech = New System.Windows.Forms.Panel() - Me.PnFile = New System.Windows.Forms.Panel() + '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.Label2 = New Label() + Me.Label3 = New Label() + Me.TbID = New TextBox() + Me.TbPath = New TextBox() + Me.BtBrowse = New Button() + Me.CbType = New ComboBox() + Me.LbIDhelp = New Label() + Me.Label4 = New Label() + Me.CbTech = New ComboBox() + Me.PnTech = New Panel() + Me.PnFile = New Panel() Me.TableLayoutPanel1.SuspendLayout() Me.PnTech.SuspendLayout() Me.PnFile.SuspendLayout() @@ -54,135 +58,135 @@ Partial Class F_VEH_AuxDlog ' 'TableLayoutPanel1 ' - Me.TableLayoutPanel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.TableLayoutPanel1.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles) Me.TableLayoutPanel1.ColumnCount = 2 - Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!)) - Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!)) + 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 System.Drawing.Point(301, 100) + Me.TableLayoutPanel1.Location = New Point(301, 100) Me.TableLayoutPanel1.Name = "TableLayoutPanel1" Me.TableLayoutPanel1.RowCount = 1 - Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.0!)) - Me.TableLayoutPanel1.Size = New System.Drawing.Size(146, 29) + Me.TableLayoutPanel1.RowStyles.Add(New RowStyle(SizeType.Percent, 50.0!)) + Me.TableLayoutPanel1.Size = New Size(146, 29) Me.TableLayoutPanel1.TabIndex = 25 ' 'OK_Button ' - Me.OK_Button.Anchor = System.Windows.Forms.AnchorStyles.None - Me.OK_Button.DialogResult = System.Windows.Forms.DialogResult.OK - Me.OK_Button.Location = New System.Drawing.Point(3, 3) + Me.OK_Button.Anchor = AnchorStyles.None + Me.OK_Button.DialogResult = DialogResult.OK + Me.OK_Button.Location = New Point(3, 3) Me.OK_Button.Name = "OK_Button" - Me.OK_Button.Size = New System.Drawing.Size(67, 23) + Me.OK_Button.Size = New Size(67, 23) Me.OK_Button.TabIndex = 0 Me.OK_Button.Text = "OK" ' 'Cancel_Button ' - Me.Cancel_Button.Anchor = System.Windows.Forms.AnchorStyles.None - Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel - Me.Cancel_Button.Location = New System.Drawing.Point(76, 3) + 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 System.Drawing.Size(67, 23) + 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 System.Drawing.Point(171, 10) + Me.Label1.Location = New Point(171, 10) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(18, 13) + Me.Label1.Size = New Size(18, 13) Me.Label1.TabIndex = 1 Me.Label1.Text = "ID" ' 'Label2 ' Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(9, 10) + Me.Label2.Location = New Point(9, 10) Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(31, 13) + Me.Label2.Size = New Size(31, 13) Me.Label2.TabIndex = 1 Me.Label2.Text = "Type" ' 'Label3 ' Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(7, 39) + Me.Label3.Location = New Point(7, 39) Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(50, 13) + Me.Label3.Size = New Size(50, 13) Me.Label3.TabIndex = 1 Me.Label3.Text = "Input File" ' 'TbID ' - Me.TbID.Location = New System.Drawing.Point(195, 7) + Me.TbID.Location = New Point(195, 7) Me.TbID.Name = "TbID" - Me.TbID.Size = New System.Drawing.Size(39, 20) + Me.TbID.Size = New Size(39, 20) Me.TbID.TabIndex = 5 ' 'TbPath ' - Me.TbPath.Location = New System.Drawing.Point(7, 55) + Me.TbPath.Location = New Point(7, 55) Me.TbPath.Name = "TbPath" - Me.TbPath.Size = New System.Drawing.Size(401, 20) + Me.TbPath.Size = New Size(401, 20) Me.TbPath.TabIndex = 10 ' 'BtBrowse ' - Me.BtBrowse.Image = Global.VECTO.My.Resources.Resources.Open_icon - Me.BtBrowse.Location = New System.Drawing.Point(408, 53) + Me.BtBrowse.Image = Open_icon + Me.BtBrowse.Location = New Point(408, 53) Me.BtBrowse.Name = "BtBrowse" - Me.BtBrowse.Size = New System.Drawing.Size(24, 24) + Me.BtBrowse.Size = New Size(24, 24) Me.BtBrowse.TabIndex = 15 Me.BtBrowse.UseVisualStyleBackColor = True ' 'CbType ' Me.CbType.FormattingEnabled = True - Me.CbType.Location = New System.Drawing.Point(46, 7) + Me.CbType.Location = New Point(46, 7) Me.CbType.Name = "CbType" - Me.CbType.Size = New System.Drawing.Size(109, 21) + Me.CbType.Size = New Size(109, 21) Me.CbType.TabIndex = 0 ' 'LbIDhelp ' Me.LbIDhelp.AutoSize = True - Me.LbIDhelp.Location = New System.Drawing.Point(240, 10) + Me.LbIDhelp.Location = New Point(240, 10) Me.LbIDhelp.Name = "LbIDhelp" - Me.LbIDhelp.Size = New System.Drawing.Size(0, 13) + Me.LbIDhelp.Size = New Size(0, 13) Me.LbIDhelp.TabIndex = 26 ' 'Label4 ' Me.Label4.AutoSize = True - Me.Label4.Location = New System.Drawing.Point(6, 9) + Me.Label4.Location = New Point(6, 9) Me.Label4.Name = "Label4" - Me.Label4.Size = New System.Drawing.Size(63, 13) + Me.Label4.Size = New Size(63, 13) Me.Label4.TabIndex = 1 Me.Label4.Text = "Technology" ' 'CbTech ' - Me.CbTech.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.CbTech.DropDownStyle = ComboBoxStyle.DropDownList Me.CbTech.FormattingEnabled = True - Me.CbTech.Location = New System.Drawing.Point(75, 6) + Me.CbTech.Location = New Point(75, 6) Me.CbTech.Name = "CbTech" - Me.CbTech.Size = New System.Drawing.Size(352, 21) + Me.CbTech.Size = New Size(352, 21) Me.CbTech.TabIndex = 27 ' 'PnTech ' Me.PnTech.Controls.Add(Me.CbTech) Me.PnTech.Controls.Add(Me.Label4) - Me.PnTech.Location = New System.Drawing.Point(12, 12) + Me.PnTech.Location = New Point(12, 12) Me.PnTech.Name = "PnTech" - Me.PnTech.Size = New System.Drawing.Size(435, 34) + Me.PnTech.Size = New Size(435, 34) Me.PnTech.TabIndex = 28 ' 'PnFile ' - Me.PnFile.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.PnFile.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles) Me.PnFile.Controls.Add(Me.LbIDhelp) Me.PnFile.Controls.Add(Me.BtBrowse) Me.PnFile.Controls.Add(Me.CbType) @@ -191,27 +195,27 @@ Partial Class F_VEH_AuxDlog Me.PnFile.Controls.Add(Me.Label2) Me.PnFile.Controls.Add(Me.Label3) Me.PnFile.Controls.Add(Me.Label1) - Me.PnFile.Location = New System.Drawing.Point(12, 8) + Me.PnFile.Location = New Point(12, 8) Me.PnFile.Name = "PnFile" - Me.PnFile.Size = New System.Drawing.Size(435, 89) + Me.PnFile.Size = New Size(435, 89) Me.PnFile.TabIndex = 29 ' 'F_VEH_AuxDlog ' Me.AcceptButton = Me.OK_Button - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.AutoScaleDimensions = New SizeF(6.0!, 13.0!) + Me.AutoScaleMode = AutoScaleMode.Font Me.CancelButton = Me.Cancel_Button - Me.ClientSize = New System.Drawing.Size(459, 141) + Me.ClientSize = New Size(459, 141) Me.Controls.Add(Me.PnFile) Me.Controls.Add(Me.PnTech) Me.Controls.Add(Me.TableLayoutPanel1) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog + Me.FormBorderStyle = FormBorderStyle.FixedDialog Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "F_VEH_AuxDlog" Me.ShowInTaskbar = False - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent + Me.StartPosition = FormStartPosition.CenterParent Me.Text = "Auxiliary" Me.TableLayoutPanel1.ResumeLayout(False) Me.PnTech.ResumeLayout(False) @@ -221,20 +225,20 @@ Partial Class F_VEH_AuxDlog Me.ResumeLayout(False) End Sub - Friend WithEvents TableLayoutPanel1 As System.Windows.Forms.TableLayoutPanel - Friend WithEvents OK_Button As System.Windows.Forms.Button - Friend WithEvents Cancel_Button As System.Windows.Forms.Button - Friend WithEvents Label1 As System.Windows.Forms.Label - Friend WithEvents Label2 As System.Windows.Forms.Label - Friend WithEvents Label3 As System.Windows.Forms.Label - Friend WithEvents TbID As System.Windows.Forms.TextBox - Friend WithEvents TbPath As System.Windows.Forms.TextBox - Friend WithEvents BtBrowse As System.Windows.Forms.Button - Friend WithEvents CbType As System.Windows.Forms.ComboBox - Friend WithEvents LbIDhelp As System.Windows.Forms.Label - Friend WithEvents Label4 As System.Windows.Forms.Label - Friend WithEvents CbTech As System.Windows.Forms.ComboBox - Friend WithEvents PnTech As System.Windows.Forms.Panel - Friend WithEvents PnFile As System.Windows.Forms.Panel + Friend WithEvents TableLayoutPanel1 As TableLayoutPanel + Friend WithEvents OK_Button As Button + Friend WithEvents Cancel_Button As Button + Friend WithEvents Label1 As Label + Friend WithEvents Label2 As Label + Friend WithEvents Label3 As Label + Friend WithEvents TbID As TextBox + Friend WithEvents TbPath As TextBox + Friend WithEvents BtBrowse As Button + Friend WithEvents CbType As ComboBox + Friend WithEvents LbIDhelp As Label + Friend WithEvents Label4 As Label + Friend WithEvents CbTech As ComboBox + Friend WithEvents PnTech As Panel + Friend WithEvents PnFile As Panel End Class diff --git a/VECTO/GUI/F_VEH_AuxDlog.vb b/VECTO/GUI/F_VEH_AuxDlog.vb index ab5b6a27ec558b095587f55e25df74cc4a86dd3f..824f7954f80459ac66162c3c59b29c7b485f66e6 100644 --- a/VECTO/GUI/F_VEH_AuxDlog.vb +++ b/VECTO/GUI/F_VEH_AuxDlog.vb @@ -11,6 +11,9 @@ Option Infer On Imports System.Windows.Forms +Imports TUGraz.VectoCore.Models.Declaration +Imports TUGraz.VECTO.File_Browser + ''' <summary> ''' Aux Config Editor (Job Editor sub-dialog) @@ -39,15 +42,15 @@ Public Class F_VEH_AuxDlog CbTech.Items.Clear() Select Case TbID.Text Case sKey.AUX.Fan - CbTech.Items.AddRange(Declaration.AuxTechs(tAux.Fan).ToArray()) + CbTech.Items.AddRange(DeclarationData.Fan.GetTechnologies()) Case sKey.AUX.SteerPump - CbTech.Items.AddRange(Declaration.AuxTechs(tAux.SteerPump).ToArray()) + CbTech.Items.AddRange(DeclarationData.SteeringPump.GetTechnologies()) Case sKey.AUX.HVAC - CbTech.Items.AddRange(Declaration.AuxTechs(tAux.HVAC).ToArray()) + CbTech.Items.AddRange(DeclarationData.HeatingVentilationAirConditioning.GetTechnologies()) Case sKey.AUX.ElecSys - CbTech.Items.AddRange(Declaration.AuxTechs(tAux.ElectricSys).ToArray()) - Case Else 'sKey.AUX.PneumSys - CbTech.Items.AddRange(Declaration.AuxTechs(tAux.PneumSys).ToArray()) + CbTech.Items.AddRange(DeclarationData.ElectricSystem.GetTechnologies()) + Case sKey.AUX.PneumSys + CbTech.Items.AddRange(DeclarationData.PneumaticSystem.GetTechnologies()) End Select If CbTech.Items.Count > 0 Then CbTech.SelectedIndex = 0 diff --git a/VECTO/GUI/F_VEH_Axle.Designer.vb b/VECTO/GUI/F_VEH_Axle.Designer.vb index 0dae260a74b97db74cffdd695dc6efc499a8465c..9e3467ae73549510cfc1ec9e64b556b9410ba288 100644 --- a/VECTO/GUI/F_VEH_Axle.Designer.vb +++ b/VECTO/GUI/F_VEH_Axle.Designer.vb @@ -1,4 +1,4 @@ -' Copyright 2014 European Union. +' Copyright 2014 European Union. ' Licensed under the EUPL (the 'Licence'); ' ' * You may not use this work except in compliance with the Licence. @@ -8,188 +8,191 @@ ' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ' ' See the LICENSE.txt for the specific language governing permissions and limitations. -<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _ +Imports System.ComponentModel +Imports Microsoft.VisualBasic.CompilerServices + +<DesignerGenerated()> _ Partial Class F_VEH_Axle - Inherits System.Windows.Forms.Form + Inherits Form - 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - <System.Diagnostics.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 + '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 System.ComponentModel.IContainer + '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. - <System.Diagnostics.DebuggerStepThrough()> _ - Private Sub InitializeComponent() - Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel() - Me.OK_Button = New System.Windows.Forms.Button() - Me.Cancel_Button = New System.Windows.Forms.Button() - Me.Label1 = New System.Windows.Forms.Label() - Me.TbAxleShare = New System.Windows.Forms.TextBox() - Me.Label2 = New System.Windows.Forms.Label() - Me.Label3 = New System.Windows.Forms.Label() - Me.Label4 = New System.Windows.Forms.Label() - Me.TbRRC = New System.Windows.Forms.TextBox() - Me.Label5 = New System.Windows.Forms.Label() - Me.Label6 = New System.Windows.Forms.Label() - Me.TbFzISO = New System.Windows.Forms.TextBox() - Me.Label9 = New System.Windows.Forms.Label() - Me.Label10 = New System.Windows.Forms.Label() - Me.CbTwinT = New System.Windows.Forms.CheckBox() - Me.PnAxle = New System.Windows.Forms.Panel() - Me.TbI_wheels = New System.Windows.Forms.TextBox() - Me.Label7 = New System.Windows.Forms.Label() - Me.Label32 = New System.Windows.Forms.Label() - Me.Label8 = New System.Windows.Forms.Label() - Me.CbWheels = New System.Windows.Forms.ComboBox() + '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.TbAxleShare = New TextBox() + Me.Label2 = New Label() + Me.Label3 = New Label() + Me.Label4 = New Label() + Me.TbRRC = New TextBox() + Me.Label5 = New Label() + Me.Label6 = New Label() + Me.TbFzISO = New TextBox() + Me.Label9 = New Label() + Me.Label10 = New Label() + Me.CbTwinT = New CheckBox() + Me.PnAxle = New Panel() + Me.TbI_wheels = New TextBox() + Me.Label7 = New Label() + Me.Label32 = New Label() + Me.Label8 = New Label() + Me.CbWheels = New ComboBox() Me.TableLayoutPanel1.SuspendLayout() Me.PnAxle.SuspendLayout() Me.SuspendLayout() ' 'TableLayoutPanel1 ' - Me.TableLayoutPanel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.TableLayoutPanel1.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles) Me.TableLayoutPanel1.ColumnCount = 2 - Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!)) - Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!)) + 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 System.Drawing.Point(250, 217) + Me.TableLayoutPanel1.Location = New Point(250, 217) Me.TableLayoutPanel1.Name = "TableLayoutPanel1" Me.TableLayoutPanel1.RowCount = 1 - Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.0!)) - Me.TableLayoutPanel1.Size = New System.Drawing.Size(146, 29) + Me.TableLayoutPanel1.RowStyles.Add(New RowStyle(SizeType.Percent, 50.0!)) + Me.TableLayoutPanel1.Size = New Size(146, 29) Me.TableLayoutPanel1.TabIndex = 4 ' 'OK_Button ' - Me.OK_Button.Anchor = System.Windows.Forms.AnchorStyles.None - Me.OK_Button.Location = New System.Drawing.Point(3, 3) + 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 System.Drawing.Size(67, 23) + Me.OK_Button.Size = New Size(67, 23) Me.OK_Button.TabIndex = 0 Me.OK_Button.Text = "OK" ' 'Cancel_Button ' - Me.Cancel_Button.Anchor = System.Windows.Forms.AnchorStyles.None - Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel - Me.Cancel_Button.Location = New System.Drawing.Point(76, 3) + 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 System.Drawing.Size(67, 23) + 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 System.Drawing.Point(7, 10) + Me.Label1.Location = New Point(7, 10) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(96, 13) + Me.Label1.Size = New Size(96, 13) Me.Label1.TabIndex = 1 Me.Label1.Text = "Relative Axle Load" ' 'TbAxleShare ' - Me.TbAxleShare.Location = New System.Drawing.Point(109, 8) + Me.TbAxleShare.Location = New Point(109, 8) Me.TbAxleShare.Name = "TbAxleShare" - Me.TbAxleShare.Size = New System.Drawing.Size(53, 20) + Me.TbAxleShare.Size = New Size(53, 20) Me.TbAxleShare.TabIndex = 0 ' 'Label2 ' Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(168, 11) + Me.Label2.Location = New Point(168, 11) Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(40, 13) + Me.Label2.Size = New Size(40, 13) Me.Label2.TabIndex = 1 Me.Label2.Text = "[-][0..1]" ' 'Label3 ' Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(41, 108) + Me.Label3.Location = New Point(41, 108) Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(51, 13) + Me.Label3.Size = New Size(51, 13) Me.Label3.TabIndex = 1 Me.Label3.Text = "RRC ISO" ' 'Label4 ' Me.Label4.AutoSize = True - Me.Label4.Location = New System.Drawing.Point(188, 108) + Me.Label4.Location = New Point(188, 108) Me.Label4.Name = "Label4" - Me.Label4.Size = New System.Drawing.Size(16, 13) + Me.Label4.Size = New Size(16, 13) Me.Label4.TabIndex = 1 Me.Label4.Text = "[-]" ' 'TbRRC ' - Me.TbRRC.Location = New System.Drawing.Point(98, 105) + Me.TbRRC.Location = New Point(98, 105) Me.TbRRC.Name = "TbRRC" - Me.TbRRC.Size = New System.Drawing.Size(84, 20) + Me.TbRRC.Size = New Size(84, 20) Me.TbRRC.TabIndex = 2 ' 'Label5 ' Me.Label5.AutoSize = True - Me.Label5.Location = New System.Drawing.Point(53, 154) + Me.Label5.Location = New Point(53, 154) Me.Label5.Name = "Label5" - Me.Label5.Size = New System.Drawing.Size(39, 13) + Me.Label5.Size = New Size(39, 13) Me.Label5.TabIndex = 1 Me.Label5.Text = "Fz ISO" ' 'Label6 ' Me.Label6.AutoSize = True - Me.Label6.Location = New System.Drawing.Point(188, 154) + Me.Label6.Location = New Point(188, 154) Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(21, 13) + Me.Label6.Size = New Size(21, 13) Me.Label6.TabIndex = 1 Me.Label6.Text = "[N]" ' 'TbFzISO ' - Me.TbFzISO.Location = New System.Drawing.Point(98, 151) + Me.TbFzISO.Location = New Point(98, 151) Me.TbFzISO.Name = "TbFzISO" - Me.TbFzISO.Size = New System.Drawing.Size(84, 20) + Me.TbFzISO.Size = New Size(84, 20) Me.TbFzISO.TabIndex = 3 ' 'Label9 ' Me.Label9.AutoSize = True - Me.Label9.Location = New System.Drawing.Point(223, 108) + Me.Label9.Location = New Point(223, 108) Me.Label9.Name = "Label9" - Me.Label9.Size = New System.Drawing.Size(146, 13) + Me.Label9.Size = New Size(146, 13) Me.Label9.TabIndex = 1 Me.Label9.Text = "RRC according to ISO 28580" ' 'Label10 ' Me.Label10.AutoSize = True - Me.Label10.Location = New System.Drawing.Point(223, 154) + Me.Label10.Location = New Point(223, 154) Me.Label10.Name = "Label10" - Me.Label10.Size = New System.Drawing.Size(167, 26) + Me.Label10.Size = New Size(167, 26) Me.Label10.TabIndex = 1 - Me.Label10.Text = "Test load according to ISO 28580" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "(85% of max. tyre load capacity)" + Me.Label10.Text = "Test load according to ISO 28580" & ChrW(13) & ChrW(10) & "(85% of max. tyre load capacity)" ' 'CbTwinT ' Me.CbTwinT.AutoSize = True - Me.CbTwinT.Location = New System.Drawing.Point(255, 19) + Me.CbTwinT.Location = New Point(255, 19) Me.CbTwinT.Name = "CbTwinT" - Me.CbTwinT.Size = New System.Drawing.Size(78, 17) + Me.CbTwinT.Size = New Size(78, 17) Me.CbTwinT.TabIndex = 1 Me.CbTwinT.Text = "Twin Tyres" Me.CbTwinT.UseVisualStyleBackColor = True @@ -202,61 +205,61 @@ Partial Class F_VEH_Axle Me.PnAxle.Controls.Add(Me.Label2) Me.PnAxle.Controls.Add(Me.Label32) Me.PnAxle.Controls.Add(Me.TbAxleShare) - Me.PnAxle.Location = New System.Drawing.Point(9, 49) + Me.PnAxle.Location = New Point(9, 49) Me.PnAxle.Name = "PnAxle" - Me.PnAxle.Size = New System.Drawing.Size(394, 39) + Me.PnAxle.Size = New Size(394, 39) Me.PnAxle.TabIndex = 5 ' 'TbI_wheels ' - Me.TbI_wheels.Location = New System.Drawing.Point(292, 8) + Me.TbI_wheels.Location = New Point(292, 8) Me.TbI_wheels.Name = "TbI_wheels" - Me.TbI_wheels.Size = New System.Drawing.Size(57, 20) + Me.TbI_wheels.Size = New Size(57, 20) Me.TbI_wheels.TabIndex = 26 ' 'Label7 ' Me.Label7.AutoSize = True - Me.Label7.Location = New System.Drawing.Point(211, 11) + Me.Label7.Location = New Point(211, 11) Me.Label7.Name = "Label7" - Me.Label7.Size = New System.Drawing.Size(75, 13) + Me.Label7.Size = New Size(75, 13) Me.Label7.TabIndex = 25 Me.Label7.Text = "Wheels Inertia" ' 'Label32 ' Me.Label32.AutoSize = True - Me.Label32.Location = New System.Drawing.Point(355, 11) + Me.Label32.Location = New Point(355, 11) Me.Label32.Name = "Label32" - Me.Label32.Size = New System.Drawing.Size(36, 13) + Me.Label32.Size = New Size(36, 13) Me.Label32.TabIndex = 27 Me.Label32.Text = "[kgm²]" ' 'Label8 ' Me.Label8.AutoSize = True - Me.Label8.Location = New System.Drawing.Point(6, 20) + Me.Label8.Location = New Point(6, 20) Me.Label8.Name = "Label8" - Me.Label8.Size = New System.Drawing.Size(43, 13) + Me.Label8.Size = New Size(43, 13) Me.Label8.TabIndex = 6 Me.Label8.Text = "Wheels" ' 'CbWheels ' - Me.CbWheels.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.CbWheels.DropDownStyle = ComboBoxStyle.DropDownList Me.CbWheels.FormattingEnabled = True - Me.CbWheels.Location = New System.Drawing.Point(55, 17) + Me.CbWheels.Location = New Point(55, 17) Me.CbWheels.Name = "CbWheels" - Me.CbWheels.Size = New System.Drawing.Size(176, 21) + Me.CbWheels.Size = New Size(176, 21) Me.CbWheels.TabIndex = 7 ' 'F_VEH_Axle ' Me.AcceptButton = Me.OK_Button - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.AutoScaleDimensions = New SizeF(6.0!, 13.0!) + Me.AutoScaleMode = AutoScaleMode.Font Me.CancelButton = Me.Cancel_Button - Me.ClientSize = New System.Drawing.Size(408, 258) + Me.ClientSize = New Size(408, 258) Me.Controls.Add(Me.CbWheels) Me.Controls.Add(Me.Label8) Me.Controls.Add(Me.PnAxle) @@ -270,12 +273,12 @@ Partial Class F_VEH_Axle Me.Controls.Add(Me.Label9) Me.Controls.Add(Me.Label3) Me.Controls.Add(Me.TableLayoutPanel1) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog + Me.FormBorderStyle = FormBorderStyle.FixedDialog Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "F_VEH_Axle" Me.ShowInTaskbar = False - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent + Me.StartPosition = FormStartPosition.CenterParent Me.Text = "Axle configuration" Me.TableLayoutPanel1.ResumeLayout(False) Me.PnAxle.ResumeLayout(False) @@ -284,26 +287,26 @@ Partial Class F_VEH_Axle Me.PerformLayout() End Sub - Friend WithEvents TableLayoutPanel1 As System.Windows.Forms.TableLayoutPanel - Friend WithEvents OK_Button As System.Windows.Forms.Button - Friend WithEvents Cancel_Button As System.Windows.Forms.Button - Friend WithEvents Label1 As System.Windows.Forms.Label - Friend WithEvents TbAxleShare As System.Windows.Forms.TextBox - Friend WithEvents Label2 As System.Windows.Forms.Label - Friend WithEvents Label3 As System.Windows.Forms.Label - Friend WithEvents Label4 As System.Windows.Forms.Label - Friend WithEvents TbRRC As System.Windows.Forms.TextBox - Friend WithEvents Label5 As System.Windows.Forms.Label - Friend WithEvents Label6 As System.Windows.Forms.Label - Friend WithEvents TbFzISO As System.Windows.Forms.TextBox - Friend WithEvents Label9 As System.Windows.Forms.Label - Friend WithEvents Label10 As System.Windows.Forms.Label - Friend WithEvents CbTwinT As System.Windows.Forms.CheckBox - Friend WithEvents PnAxle As System.Windows.Forms.Panel - Friend WithEvents TbI_wheels As System.Windows.Forms.TextBox - Friend WithEvents Label7 As System.Windows.Forms.Label - Friend WithEvents Label32 As System.Windows.Forms.Label - Friend WithEvents Label8 As System.Windows.Forms.Label - Friend WithEvents CbWheels As System.Windows.Forms.ComboBox + Friend WithEvents TableLayoutPanel1 As TableLayoutPanel + Friend WithEvents OK_Button As Button + Friend WithEvents Cancel_Button As Button + Friend WithEvents Label1 As Label + Friend WithEvents TbAxleShare As TextBox + Friend WithEvents Label2 As Label + Friend WithEvents Label3 As Label + Friend WithEvents Label4 As Label + Friend WithEvents TbRRC As TextBox + Friend WithEvents Label5 As Label + Friend WithEvents Label6 As Label + Friend WithEvents TbFzISO As TextBox + Friend WithEvents Label9 As Label + Friend WithEvents Label10 As Label + Friend WithEvents CbTwinT As CheckBox + Friend WithEvents PnAxle As Panel + Friend WithEvents TbI_wheels As TextBox + Friend WithEvents Label7 As Label + Friend WithEvents Label32 As Label + Friend WithEvents Label8 As Label + Friend WithEvents CbWheels As ComboBox End Class diff --git a/VECTO/GUI/F_VEH_Axle.vb b/VECTO/GUI/F_VEH_Axle.vb index 6efbbd19002e0a3763ec266012f96701291eecba..e8626c4a610da9ef1e8d959b07874e85c164cb73 100644 --- a/VECTO/GUI/F_VEH_Axle.vb +++ b/VECTO/GUI/F_VEH_Axle.vb @@ -12,6 +12,9 @@ Option Infer On Option Strict On Option Explicit On +Imports TUGraz.VectoCore.Models.Declaration + + ''' <summary> ''' Axle Config Editor (Vehicle Editor sub-dialog) ''' </summary> @@ -20,7 +23,7 @@ Public Class F_VEH_Axle InitializeComponent() CbWheels.Items.Add("-") - CbWheels.Items.AddRange(Declaration.WheelsList) + CbWheels.Items.AddRange(DeclarationData.Wheels.GetWheelsDimensions()) End Sub Public Sub Clear() @@ -62,13 +65,13 @@ Public Class F_VEH_Axle End Sub Private Sub CbWheels_SelectedIndexChanged(sender As Object, e As EventArgs) Handles CbWheels.SelectedIndexChanged - Dim inertia As Single + 'Dim inertia As Double If Cfg.DeclMode Then - inertia = Declaration.WheelsInertia(CbWheels.Text) - If inertia < 0 Then + 'inertia = DeclarationData.Wheels.Lookup(CbWheels.Text).Inertia.Value() + If CbWheels.Text = "-" Then TbI_wheels.Text = "-" Else - TbI_wheels.Text = inertia.ToString() + TbI_wheels.Text = DeclarationData.Wheels.Lookup(CbWheels.Text).Inertia.Value().ToString() End If End If End Sub diff --git a/VECTO/GUI/F_Welcome.Designer.vb b/VECTO/GUI/F_Welcome.Designer.vb index 4a3fe6396abb68c2a79a809670a60165e6ca5d25..3daaeef2bb5c7dcaef15013b9cda53ba4b7db63a 100644 --- a/VECTO/GUI/F_Welcome.Designer.vb +++ b/VECTO/GUI/F_Welcome.Designer.vb @@ -1,4 +1,4 @@ -' Copyright 2014 European Union. +' Copyright 2014 European Union. ' Licensed under the EUPL (the 'Licence'); ' ' * You may not use this work except in compliance with the Licence. @@ -8,98 +8,102 @@ ' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ' ' See the LICENSE.txt for the specific language governing permissions and limitations. -<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _ +Imports System.ComponentModel +Imports Microsoft.VisualBasic.CompilerServices + + +<DesignerGenerated()> _ Partial Class F_Welcome - Inherits System.Windows.Forms.Form + Inherits Form - 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - <System.Diagnostics.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 + '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 System.ComponentModel.IContainer + '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. - <System.Diagnostics.DebuggerStepThrough()> _ - Private Sub InitializeComponent() - Me.Cancel_Button = New System.Windows.Forms.Button() - Me.Label1 = New System.Windows.Forms.Label() - Me.Button1 = New System.Windows.Forms.Button() - Me.Button2 = New System.Windows.Forms.Button() - Me.SuspendLayout() - ' - 'Cancel_Button - ' - Me.Cancel_Button.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel - Me.Cancel_Button.Location = New System.Drawing.Point(239, 152) - Me.Cancel_Button.Name = "Cancel_Button" - Me.Cancel_Button.Size = New System.Drawing.Size(67, 23) - Me.Cancel_Button.TabIndex = 1 - Me.Cancel_Button.Text = "Close" - ' - 'Label1 - ' - Me.Label1.AutoSize = True - Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label1.Location = New System.Drawing.Point(12, 18) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(77, 16) - Me.Label1.TabIndex = 1 - Me.Label1.Text = "Welcome!" - ' - 'Button1 - ' - Me.Button1.Location = New System.Drawing.Point(12, 47) - Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(294, 37) - Me.Button1.TabIndex = 2 - Me.Button1.Text = "Open Release Notes (pdf)" - Me.Button1.UseVisualStyleBackColor = True - ' - 'Button2 - ' - Me.Button2.Location = New System.Drawing.Point(12, 90) - Me.Button2.Name = "Button2" - Me.Button2.Size = New System.Drawing.Size(294, 37) - Me.Button2.TabIndex = 2 - Me.Button2.Text = "Open User Manual (html)" - Me.Button2.UseVisualStyleBackColor = True - ' - 'F_Welcome - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.CancelButton = Me.Cancel_Button - Me.ClientSize = New System.Drawing.Size(318, 187) - Me.Controls.Add(Me.Button2) - Me.Controls.Add(Me.Cancel_Button) - Me.Controls.Add(Me.Button1) - Me.Controls.Add(Me.Label1) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog - Me.MaximizeBox = False - Me.MinimizeBox = False - Me.Name = "F_Welcome" - Me.ShowInTaskbar = False - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent - Me.Text = "F_Welcome" - Me.ResumeLayout(False) - Me.PerformLayout() + '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.Cancel_Button = New Button() + Me.Label1 = New Label() + Me.Button1 = New Button() + Me.Button2 = New Button() + 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(239, 152) + Me.Cancel_Button.Name = "Cancel_Button" + Me.Cancel_Button.Size = New Size(67, 23) + Me.Cancel_Button.TabIndex = 1 + Me.Cancel_Button.Text = "Close" + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Font = New Font("Microsoft Sans Serif", 9.75!, FontStyle.Bold, GraphicsUnit.Point, CType(0, Byte)) + Me.Label1.Location = New Point(12, 18) + Me.Label1.Name = "Label1" + Me.Label1.Size = New Size(77, 16) + Me.Label1.TabIndex = 1 + Me.Label1.Text = "Welcome!" + ' + 'Button1 + ' + Me.Button1.Location = New Point(12, 47) + Me.Button1.Name = "Button1" + Me.Button1.Size = New Size(294, 37) + Me.Button1.TabIndex = 2 + Me.Button1.Text = "Open Release Notes (pdf)" + Me.Button1.UseVisualStyleBackColor = True + ' + 'Button2 + ' + Me.Button2.Location = New Point(12, 90) + Me.Button2.Name = "Button2" + Me.Button2.Size = New Size(294, 37) + Me.Button2.TabIndex = 2 + Me.Button2.Text = "Open User Manual (html)" + Me.Button2.UseVisualStyleBackColor = True + ' + 'F_Welcome + ' + Me.AutoScaleDimensions = New SizeF(6.0!, 13.0!) + Me.AutoScaleMode = AutoScaleMode.Font + Me.CancelButton = Me.Cancel_Button + Me.ClientSize = New Size(318, 187) + Me.Controls.Add(Me.Button2) + Me.Controls.Add(Me.Cancel_Button) + Me.Controls.Add(Me.Button1) + Me.Controls.Add(Me.Label1) + Me.FormBorderStyle = FormBorderStyle.FixedDialog + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "F_Welcome" + Me.ShowInTaskbar = False + Me.StartPosition = FormStartPosition.CenterParent + Me.Text = "F_Welcome" + Me.ResumeLayout(False) + Me.PerformLayout() - End Sub - Friend WithEvents Cancel_Button As System.Windows.Forms.Button - Friend WithEvents Label1 As System.Windows.Forms.Label - Friend WithEvents Button1 As System.Windows.Forms.Button - Friend WithEvents Button2 As System.Windows.Forms.Button + End Sub + Friend WithEvents Cancel_Button As Button + Friend WithEvents Label1 As Label + Friend WithEvents Button1 As Button + Friend WithEvents Button2 As Button End Class diff --git a/VECTO/GUI/F_Welcome.vb b/VECTO/GUI/F_Welcome.vb index 1daa1694e2288363090091b5b432734d5046e722..0b7ae664e09439080f088af07286a2e599c4c3b0 100644 --- a/VECTO/GUI/F_Welcome.vb +++ b/VECTO/GUI/F_Welcome.vb @@ -8,7 +8,7 @@ ' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ' ' See the LICENSE.txt for the specific language governing permissions and limitations. -Imports System.Windows.Forms +Imports System.IO ''' <summary> ''' Welcome screen. Shows only on the first time application start @@ -16,29 +16,29 @@ Imports System.Windows.Forms ''' <remarks></remarks> Public Class F_Welcome 'Close - Private Sub Cancel_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles Cancel_Button.Click - Me.DialogResult = System.Windows.Forms.DialogResult.Cancel + 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 'Init - Private Sub F_Welcome_Load(sender As Object, e As System.EventArgs) Handles Me.Load + Private Sub F_Welcome_Load(sender As Object, e As EventArgs) Handles Me.Load Me.Text = "VECTO " & VECTOvers & " / VectoCore " & COREvers End Sub 'Open Release Notes - Private Sub Button1_Click(sender As System.Object, e As System.EventArgs) Handles Button1.Click - If IO.File.Exists(MyAppPath & "User Manual\Release Notes.pdf") Then - System.Diagnostics.Process.Start(MyAppPath & "User Manual\Release Notes.pdf") + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + If File.Exists(MyAppPath & "User Manual\Release Notes.pdf") Then + Process.Start(MyAppPath & "User Manual\Release Notes.pdf") Else MsgBox("Release Notes not found!", MsgBoxStyle.Critical) End If End Sub 'Open Quick Start Guide - Private Sub Button2_Click(sender As System.Object, e As System.EventArgs) Handles Button2.Click - If IO.File.Exists(MyAppPath & "User Manual\help.html") Then - System.Diagnostics.Process.Start(MyAppPath & "User Manual\help.html") + Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click + If File.Exists(MyAppPath & "User Manual\help.html") Then + Process.Start(MyAppPath & "User Manual\help.html") Else MsgBox("User manual not found!", MsgBoxStyle.Critical) End If diff --git a/VECTO/GUI/GUI_Subs.vb b/VECTO/GUI/GUI_Subs.vb index d15fbf5dbf8796320d75224ea6358b42d98f939a..a50a257448431bf2893a43f72ee35f3324439ffc 100644 --- a/VECTO/GUI/GUI_Subs.vb +++ b/VECTO/GUI/GUI_Subs.vb @@ -39,52 +39,6 @@ Public Module GUI_Subs End Try End Sub - 'Status => Statusbar - Public Sub WorkerStatus(ByVal Msg As String) - Dim WorkProg As New cWorkProg(tWorkMsgType.StatusBar) - WorkProg.Msg = Msg - VECTOworker.ReportProgress(0, WorkProg) - End Sub - - 'Job status => Job listview - Public Sub WorkerJobStatus(ByVal JobIndex As Int16, ByVal Msg As String, ByVal Status As tJobStatus) - Dim WorkProg As cWorkProg - WorkProg = New cWorkProg(tWorkMsgType.JobStatus) - WorkProg.FileIndex = JobIndex - WorkProg.Msg = Msg - WorkProg.Status = Status - VECTOworker.ReportProgress(0, WorkProg) - End Sub - - 'Cycle status => Cycle listview - Public Sub WorkerCycleStatus(ByVal CycleIndex As Int16, ByVal Msg As String) - Dim WorkProg As cWorkProg - WorkProg = New cWorkProg(tWorkMsgType.CycleStatus) - WorkProg.FileIndex = CycleIndex - WorkProg.Msg = Msg - VECTOworker.ReportProgress(0, WorkProg) - End Sub - - 'Worker Progress => Progbar - Public Sub WorkerProgJobEnd(ByVal Prog As Int16) - Dim WorkProg As New cWorkProg(tWorkMsgType.ProgBars) - VECTOworker.ReportProgress(Prog, WorkProg) - End Sub - - 'Progbar set to Continuous - Public Sub WorkerProgInit() - Dim WorkProg As New cWorkProg(tWorkMsgType.InitProgBar) - VECTOworker.ReportProgress(0, WorkProg) - End Sub - - 'Abort - Public Sub WorkerAbort() - Dim WorkProg As New cWorkProg(tWorkMsgType.Abort) - VECTOworker.ReportProgress(0, WorkProg) - End Sub - - - #End Region #Region "Direct GUI control - Cannot be called by background worker!" diff --git a/VECTO/GUI/GearboxGearDialog.Designer.vb b/VECTO/GUI/GearboxGearDialog.Designer.vb index ee93d30b9390a9bc40dd3bbfb084f879c63f5bc2..9c9fca529ffc4023be05d28cd0d05e5ca3165d74 100644 --- a/VECTO/GUI/GearboxGearDialog.Designer.vb +++ b/VECTO/GUI/GearboxGearDialog.Designer.vb @@ -1,9 +1,14 @@ -<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _ +Imports System.ComponentModel +Imports Microsoft.VisualBasic.CompilerServices + + + +<DesignerGenerated()> _ Partial Class GearboxGearDialog - Inherits System.Windows.Forms.Form + Inherits Form 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - <System.Diagnostics.DebuggerNonUserCode()> _ + <DebuggerNonUserCode()> _ Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -15,34 +20,34 @@ Partial Class GearboxGearDialog End Sub 'Wird vom Windows Form-Designer benötigt. - Private components As System.ComponentModel.IContainer + 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. - <System.Diagnostics.DebuggerStepThrough()> _ + <DebuggerStepThrough()> _ Private Sub InitializeComponent() - Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(GearboxGearDialog)) - Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel() - Me.OK_Button = New System.Windows.Forms.Button() - Me.Cancel_Button = New System.Windows.Forms.Button() - Me.TbGear = New System.Windows.Forms.TextBox() - Me.Label1 = New System.Windows.Forms.Label() - Me.TbRatio = New System.Windows.Forms.TextBox() - Me.Label2 = New System.Windows.Forms.Label() - Me.TbMapPath = New System.Windows.Forms.TextBox() - Me.Label3 = New System.Windows.Forms.Label() - Me.BtBrowse = New System.Windows.Forms.Button() - Me.BtNext = New System.Windows.Forms.Button() - Me.TbShiftPolyFile = New System.Windows.Forms.TextBox() - Me.BtShiftPolyBrowse = New System.Windows.Forms.Button() - Me.Label4 = New System.Windows.Forms.Label() - Me.PnShiftPoly = New System.Windows.Forms.Panel() - Me.Label5 = New System.Windows.Forms.Label() - Me.TbMaxTorque = New System.Windows.Forms.TextBox() - Me.PnFld = New System.Windows.Forms.Panel() - Me.BtPrevious = New System.Windows.Forms.Button() - Me.Label6 = New System.Windows.Forms.Label() + Dim resources As ComponentResourceManager = New ComponentResourceManager(GetType(GearboxGearDialog)) + Me.TableLayoutPanel1 = New TableLayoutPanel() + Me.OK_Button = New Button() + Me.Cancel_Button = New Button() + Me.TbGear = New TextBox() + Me.Label1 = New Label() + Me.TbRatio = New TextBox() + Me.Label2 = New Label() + Me.TbMapPath = New TextBox() + Me.Label3 = New Label() + Me.BtBrowse = New Button() + Me.BtNext = New Button() + Me.TbShiftPolyFile = New TextBox() + Me.BtShiftPolyBrowse = New Button() + Me.Label4 = New Label() + Me.PnShiftPoly = New Panel() + Me.Label5 = New Label() + Me.TbMaxTorque = New TextBox() + Me.PnFld = New Panel() + Me.BtPrevious = New Button() + Me.Label6 = New Label() Me.TableLayoutPanel1.SuspendLayout() Me.PnShiftPoly.SuspendLayout() Me.PnFld.SuspendLayout() @@ -50,122 +55,122 @@ Partial Class GearboxGearDialog ' 'TableLayoutPanel1 ' - Me.TableLayoutPanel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.TableLayoutPanel1.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles) Me.TableLayoutPanel1.ColumnCount = 2 - Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!)) - Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!)) + 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 System.Drawing.Point(370, 184) + Me.TableLayoutPanel1.Location = New Point(370, 184) Me.TableLayoutPanel1.Name = "TableLayoutPanel1" Me.TableLayoutPanel1.RowCount = 1 - Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.0!)) - Me.TableLayoutPanel1.Size = New System.Drawing.Size(146, 29) + Me.TableLayoutPanel1.RowStyles.Add(New RowStyle(SizeType.Percent, 50.0!)) + Me.TableLayoutPanel1.Size = New Size(146, 29) Me.TableLayoutPanel1.TabIndex = 12 ' 'OK_Button ' - Me.OK_Button.Anchor = System.Windows.Forms.AnchorStyles.None - Me.OK_Button.Location = New System.Drawing.Point(3, 3) + 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 System.Drawing.Size(67, 23) + Me.OK_Button.Size = New Size(67, 23) Me.OK_Button.TabIndex = 0 Me.OK_Button.Text = "OK" ' 'Cancel_Button ' - Me.Cancel_Button.Anchor = System.Windows.Forms.AnchorStyles.None - Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel - Me.Cancel_Button.Location = New System.Drawing.Point(76, 3) + 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 System.Drawing.Size(67, 23) + Me.Cancel_Button.Size = New Size(67, 23) Me.Cancel_Button.TabIndex = 1 Me.Cancel_Button.Text = "Cancel" ' 'TbGear ' - Me.TbGear.Location = New System.Drawing.Point(48, 6) + Me.TbGear.Location = New Point(48, 6) Me.TbGear.Name = "TbGear" Me.TbGear.ReadOnly = True - Me.TbGear.Size = New System.Drawing.Size(37, 20) + Me.TbGear.Size = New Size(37, 20) Me.TbGear.TabIndex = 1 Me.TbGear.TabStop = False ' 'Label1 ' Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(12, 9) + Me.Label1.Location = New Point(12, 9) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(30, 13) + Me.Label1.Size = New Size(30, 13) Me.Label1.TabIndex = 0 Me.Label1.Text = "Gear" ' 'TbRatio ' - Me.TbRatio.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.TbRatio.Location = New System.Drawing.Point(139, 6) + Me.TbRatio.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles) + Me.TbRatio.Location = New Point(139, 6) Me.TbRatio.Name = "TbRatio" - Me.TbRatio.Size = New System.Drawing.Size(66, 20) + Me.TbRatio.Size = New Size(66, 20) Me.TbRatio.TabIndex = 3 ' 'Label2 ' - Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Label2.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles) Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(101, 9) + Me.Label2.Location = New Point(101, 9) Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(32, 13) + Me.Label2.Size = New Size(32, 13) Me.Label2.TabIndex = 2 Me.Label2.Text = "Ratio" ' 'TbMapPath ' - Me.TbMapPath.Location = New System.Drawing.Point(12, 51) + Me.TbMapPath.Location = New Point(12, 51) Me.TbMapPath.Name = "TbMapPath" - Me.TbMapPath.Size = New System.Drawing.Size(476, 20) + Me.TbMapPath.Size = New Size(476, 20) Me.TbMapPath.TabIndex = 6 ' 'Label3 ' Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(11, 37) + Me.Label3.Location = New Point(11, 37) Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(187, 13) + Me.Label3.Size = New Size(187, 13) Me.Label3.TabIndex = 5 Me.Label3.Text = "Loss Map file or Efficiency Value [0..1]" ' 'BtBrowse ' - Me.BtBrowse.Image = CType(resources.GetObject("BtBrowse.Image"), System.Drawing.Image) - Me.BtBrowse.Location = New System.Drawing.Point(488, 49) + Me.BtBrowse.Image = CType(resources.GetObject("BtBrowse.Image"), Image) + Me.BtBrowse.Location = New Point(488, 49) Me.BtBrowse.Name = "BtBrowse" - Me.BtBrowse.Size = New System.Drawing.Size(24, 24) + Me.BtBrowse.Size = New Size(24, 24) Me.BtBrowse.TabIndex = 7 Me.BtBrowse.UseVisualStyleBackColor = True ' 'BtNext ' - Me.BtNext.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.BtNext.Location = New System.Drawing.Point(196, 187) + Me.BtNext.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles) + Me.BtNext.Location = New Point(196, 187) Me.BtNext.Name = "BtNext" - Me.BtNext.Size = New System.Drawing.Size(67, 23) + Me.BtNext.Size = New Size(67, 23) Me.BtNext.TabIndex = 11 Me.BtNext.Text = "&Next >" Me.BtNext.UseVisualStyleBackColor = True ' 'TbShiftPolyFile ' - Me.TbShiftPolyFile.Location = New System.Drawing.Point(2, 17) + Me.TbShiftPolyFile.Location = New Point(2, 17) Me.TbShiftPolyFile.Name = "TbShiftPolyFile" - Me.TbShiftPolyFile.Size = New System.Drawing.Size(476, 20) + Me.TbShiftPolyFile.Size = New Size(476, 20) Me.TbShiftPolyFile.TabIndex = 1 ' 'BtShiftPolyBrowse ' - Me.BtShiftPolyBrowse.Image = CType(resources.GetObject("BtShiftPolyBrowse.Image"), System.Drawing.Image) - Me.BtShiftPolyBrowse.Location = New System.Drawing.Point(478, 15) + Me.BtShiftPolyBrowse.Image = CType(resources.GetObject("BtShiftPolyBrowse.Image"), Image) + Me.BtShiftPolyBrowse.Location = New Point(478, 15) Me.BtShiftPolyBrowse.Name = "BtShiftPolyBrowse" - Me.BtShiftPolyBrowse.Size = New System.Drawing.Size(24, 24) + Me.BtShiftPolyBrowse.Size = New Size(24, 24) Me.BtShiftPolyBrowse.TabIndex = 2 Me.BtShiftPolyBrowse.TabStop = False Me.BtShiftPolyBrowse.UseVisualStyleBackColor = True @@ -173,9 +178,9 @@ Partial Class GearboxGearDialog 'Label4 ' Me.Label4.AutoSize = True - Me.Label4.Location = New System.Drawing.Point(1, 3) + Me.Label4.Location = New Point(1, 3) Me.Label4.Name = "Label4" - Me.Label4.Size = New System.Drawing.Size(89, 13) + Me.Label4.Size = New Size(89, 13) Me.Label4.TabIndex = 0 Me.Label4.Text = "Shift polygons file" ' @@ -184,25 +189,25 @@ Partial Class GearboxGearDialog Me.PnShiftPoly.Controls.Add(Me.TbShiftPolyFile) Me.PnShiftPoly.Controls.Add(Me.BtShiftPolyBrowse) Me.PnShiftPoly.Controls.Add(Me.Label4) - Me.PnShiftPoly.Location = New System.Drawing.Point(10, 79) + Me.PnShiftPoly.Location = New Point(10, 79) Me.PnShiftPoly.Name = "PnShiftPoly" - Me.PnShiftPoly.Size = New System.Drawing.Size(513, 41) + Me.PnShiftPoly.Size = New Size(513, 41) Me.PnShiftPoly.TabIndex = 8 ' 'Label5 ' Me.Label5.AutoSize = True - Me.Label5.Location = New System.Drawing.Point(1, 5) + Me.Label5.Location = New Point(1, 5) Me.Label5.Name = "Label5" - Me.Label5.Size = New System.Drawing.Size(123, 13) + Me.Label5.Size = New Size(123, 13) Me.Label5.TabIndex = 0 Me.Label5.Text = "Maximum allowed torque" ' 'TbMaxTorque ' - Me.TbMaxTorque.Location = New System.Drawing.Point(2, 19) + Me.TbMaxTorque.Location = New Point(2, 19) Me.TbMaxTorque.Name = "TbMaxTorque" - Me.TbMaxTorque.Size = New System.Drawing.Size(88, 20) + Me.TbMaxTorque.Size = New Size(88, 20) Me.TbMaxTorque.TabIndex = 1 ' 'PnFld @@ -210,17 +215,17 @@ Partial Class GearboxGearDialog Me.PnFld.Controls.Add(Me.Label6) Me.PnFld.Controls.Add(Me.TbMaxTorque) Me.PnFld.Controls.Add(Me.Label5) - Me.PnFld.Location = New System.Drawing.Point(10, 126) + Me.PnFld.Location = New Point(10, 126) Me.PnFld.Name = "PnFld" - Me.PnFld.Size = New System.Drawing.Size(513, 46) + Me.PnFld.Size = New Size(513, 46) Me.PnFld.TabIndex = 9 ' 'BtPrevious ' - Me.BtPrevious.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.BtPrevious.Location = New System.Drawing.Point(129, 187) + Me.BtPrevious.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles) + Me.BtPrevious.Location = New Point(129, 187) Me.BtPrevious.Name = "BtPrevious" - Me.BtPrevious.Size = New System.Drawing.Size(67, 23) + Me.BtPrevious.Size = New Size(67, 23) Me.BtPrevious.TabIndex = 10 Me.BtPrevious.Text = "< &Previous" Me.BtPrevious.UseVisualStyleBackColor = True @@ -228,19 +233,19 @@ Partial Class GearboxGearDialog 'Label6 ' Me.Label6.AutoSize = True - Me.Label6.Location = New System.Drawing.Point(96, 22) + Me.Label6.Location = New Point(96, 22) Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(29, 13) + Me.Label6.Size = New Size(29, 13) Me.Label6.TabIndex = 2 Me.Label6.Text = "[Nm]" ' 'GearboxGearDialog ' Me.AcceptButton = Me.OK_Button - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.AutoScaleDimensions = New SizeF(6.0!, 13.0!) + Me.AutoScaleMode = AutoScaleMode.Font Me.CancelButton = Me.Cancel_Button - Me.ClientSize = New System.Drawing.Size(528, 225) + Me.ClientSize = New Size(528, 225) Me.Controls.Add(Me.BtPrevious) Me.Controls.Add(Me.PnFld) Me.Controls.Add(Me.PnShiftPoly) @@ -253,12 +258,12 @@ Partial Class GearboxGearDialog Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.TbGear) Me.Controls.Add(Me.TableLayoutPanel1) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog + Me.FormBorderStyle = FormBorderStyle.FixedDialog Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "GearboxGearDialog" Me.ShowInTaskbar = False - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent + Me.StartPosition = FormStartPosition.CenterParent Me.Text = "Edit Gears" Me.TableLayoutPanel1.ResumeLayout(False) Me.PnShiftPoly.ResumeLayout(False) @@ -269,25 +274,25 @@ Partial Class GearboxGearDialog Me.PerformLayout() End Sub - Friend WithEvents TableLayoutPanel1 As System.Windows.Forms.TableLayoutPanel - Friend WithEvents OK_Button As System.Windows.Forms.Button - Friend WithEvents Cancel_Button As System.Windows.Forms.Button - Friend WithEvents TbGear As System.Windows.Forms.TextBox - Friend WithEvents Label1 As System.Windows.Forms.Label - Friend WithEvents TbRatio As System.Windows.Forms.TextBox - Friend WithEvents Label2 As System.Windows.Forms.Label - Friend WithEvents TbMapPath As System.Windows.Forms.TextBox - Friend WithEvents Label3 As System.Windows.Forms.Label - Friend WithEvents BtBrowse As System.Windows.Forms.Button - Friend WithEvents BtNext As System.Windows.Forms.Button - Friend WithEvents TbShiftPolyFile As System.Windows.Forms.TextBox - Friend WithEvents BtShiftPolyBrowse As System.Windows.Forms.Button - Friend WithEvents Label4 As System.Windows.Forms.Label - Friend WithEvents PnShiftPoly As System.Windows.Forms.Panel - Friend WithEvents Label5 As System.Windows.Forms.Label - Friend WithEvents TbMaxTorque As System.Windows.Forms.TextBox - Friend WithEvents PnFld As System.Windows.Forms.Panel - Friend WithEvents BtPrevious As System.Windows.Forms.Button - Friend WithEvents Label6 As System.Windows.Forms.Label + Friend WithEvents TableLayoutPanel1 As TableLayoutPanel + Friend WithEvents OK_Button As Button + Friend WithEvents Cancel_Button As Button + Friend WithEvents TbGear As TextBox + Friend WithEvents Label1 As Label + Friend WithEvents TbRatio As TextBox + Friend WithEvents Label2 As Label + Friend WithEvents TbMapPath As TextBox + Friend WithEvents Label3 As Label + Friend WithEvents BtBrowse As Button + Friend WithEvents BtNext As Button + Friend WithEvents TbShiftPolyFile As TextBox + Friend WithEvents BtShiftPolyBrowse As Button + Friend WithEvents Label4 As Label + Friend WithEvents PnShiftPoly As Panel + Friend WithEvents Label5 As Label + Friend WithEvents TbMaxTorque As TextBox + Friend WithEvents PnFld As Panel + Friend WithEvents BtPrevious As Button + Friend WithEvents Label6 As Label End Class diff --git a/VECTO/GUI/GearboxGearDialog.vb b/VECTO/GUI/GearboxGearDialog.vb index df1841fa57ade9d095badc59374bdf961b495a19..6393070d11cbb208d3b75206704490ecd87c49c7 100644 --- a/VECTO/GUI/GearboxGearDialog.vb +++ b/VECTO/GUI/GearboxGearDialog.vb @@ -8,8 +8,9 @@ ' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ' ' See the LICENSE.txt for the specific language governing permissions and limitations. - Imports System.Windows.Forms +Imports TUGraz.VECTO.File_Browser + ''' <summary> ''' Gear Editor (Vehicle Editor sub-dialog) diff --git a/VECTO/Input Files/cAdvancedAuxiliary.vb b/VECTO/Input Files/cAdvancedAuxiliary.vb index ecd7c2b8a203b436335890f6e667f8c337edde51..2a78b2e67ce3399af15d55d8041d697449b3f778 100644 --- a/VECTO/Input Files/cAdvancedAuxiliary.vb +++ b/VECTO/Input Files/cAdvancedAuxiliary.vb @@ -1,58 +1,54 @@ 'AA-TB Public Class cAdvancedAuxiliary - -'Private properties. Set on Constructor -private _AuxiliaryName As string -private _AuxiliaryVersion As String -private _FileName As String -private _AssemblyName As String - - -'Public Readonly properties -Public readonly property AuxiliaryName As string - Get - Return _AuxiliaryName - End Get -End Property -Public readonly Property AuxiliaryVersion As String - Get - Return _AuxiliaryVersion - 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 - End Get -End Property - - -'Constructor(s) - -Public Sub new() - - _AuxiliaryName ="Classic Vecto Auxiliary" - _AuxiliaryVersion = "CLASSIC" - _FileName = "CLASSIC" - _AssemblyName = "CLASSIC" - - -End Sub - -Public Sub new ( AuxiliaryName As String, AuxiliaryVersion As String, FileName As string, AssemblyName As string ) - - _AuxiliaryName = AuxiliaryName - _AuxiliaryVersion = AuxiliaryVersion - _FileName = FileName - _AssemblyName = AssemblyName - -End Sub - - - -End Class + 'Private properties. Set on Constructor + Private ReadOnly _auxiliaryName As String + Private ReadOnly _auxiliaryVersion As String + Private ReadOnly _fileName As String + Private ReadOnly _assemblyName As String + + + 'Public Readonly properties + Public ReadOnly Property AuxiliaryName As String + Get + Return _AuxiliaryName + End Get + End Property + + Public ReadOnly Property AuxiliaryVersion As String + Get + Return _AuxiliaryVersion + 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 + End Get + End Property + + + 'Constructor(s) + + Public Sub New() + + _AuxiliaryName = "Classic Vecto Auxiliary" + _AuxiliaryVersion = "CLASSIC" + _FileName = "CLASSIC" + _AssemblyName = "CLASSIC" + End Sub + + Public Sub New(AuxiliaryName As String, AuxiliaryVersion As String, FileName As String, AssemblyName As String) + + _AuxiliaryName = AuxiliaryName + _AuxiliaryVersion = AuxiliaryVersion + _FileName = FileName + _AssemblyName = AssemblyName + End Sub +End Class diff --git a/VECTO/Input Files/cAux.vb b/VECTO/Input Files/cAux.vb deleted file mode 100644 index f24758078d6b24cae5447edc08a9d265dd9a0407..0000000000000000000000000000000000000000 --- a/VECTO/Input Files/cAux.vb +++ /dev/null @@ -1,142 +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> -''' Auxiliary -''' </summary> -''' <remarks></remarks> -Public Class cAux - ''' <summary> - ''' Input file path (.vaux) - ''' </summary> - ''' <remarks></remarks> - Public Filepath As String - - ''' <summary> - ''' Transmission ratio to engine speed [-] - ''' </summary> - ''' <remarks></remarks> - Public TransRatio As Single - - ''' <summary> - ''' Efficiency to engine [-] - ''' </summary> - ''' <remarks></remarks> - Public EffToEng As Single - - ''' <summary> - ''' Efficiency auxiliary to supply [-] - ''' </summary> - ''' <remarks></remarks> - Public EffToSply As Single - - ''' <summary> - ''' Efficiency map - ''' </summary> - ''' <remarks>x= Auxiliary speed [rpm]; y= Supply power [kW]; z= Mechanical power [kW]. Note that the columns in the input file are different!</remarks> - Private EffMap As cDelaunayMap - - ''' <summary> - ''' New instance. Creates new efficiency map - ''' </summary> - ''' <remarks></remarks> - Public Sub New() - EffMap = New cDelaunayMap - End Sub - - ''' <summary> - ''' Read input file (.vaux) - ''' </summary> - ''' <returns>True if successful, else False.</returns> - ''' <remarks></remarks> - Public Function Readfile() As Boolean - Dim MsgSrc As String - Dim file As cFile_V3 - Dim line As String() - - MsgSrc = "Main/ReadInp/Aux" - - 'Open file - Abort if file not accessible - file = New cFile_V3 - If Not file.OpenRead(Filepath) Then - file = Nothing - WorkerMsg(tMsgID.Err, "Failed to open file (" & Filepath & ") !", MsgSrc) - Return False - End If - - 'Map reset - EffMap = New cDelaunayMap - - 'Abort if file is empty - If file.EndOfFile Then GoTo lbFileEndErr - - 'Read file - Try - - 'Transmission ration to engine rpm [-] - file.ReadLine() - If file.EndOfFile Then GoTo lbFileEndErr - line = file.ReadLine - TransRatio = CSng(line(0)) - - 'Efficiency to engine [-] - file.ReadLine() - If file.EndOfFile Then GoTo lbFileEndErr - line = file.ReadLine - EffToEng = CSng(line(0)) - - 'Efficiency auxiliary to supply [-] - file.ReadLine() - If file.EndOfFile Then GoTo lbFileEndErr - line = file.ReadLine - EffToSply = CSng(line(0)) - - 'Efficiency Map - file.ReadLine() - If file.EndOfFile Then GoTo lbFileEndErr - - 'Column 1 = Auxiliary speed [rpm] => X-axis - 'Column 2 = Mechanical power [kW] => Z-Axis (!) - 'Column 3 = Output power [kW] => Y-Axis (!) - - Do While Not file.EndOfFile - line = file.ReadLine - EffMap.AddPoints(CDbl(line(0)), CDbl(line(2)), CDbl(line(1))) - Loop - - 'Triangulate map - If Not EffMap.Triangulate Then - WorkerMsg(tMsgID.Err, "Aux Map is invalid! (Triangulation Error)", MsgSrc) - GoTo lbErr - End If - - Catch ex As Exception - - WorkerMsg(tMsgID.Err, "Error while reading aux file! (" & ex.Message & ")", MsgSrc) - GoTo lbErr - - End Try - - file.Close() - - Return True - - -lbFileEndErr: - - WorkerMsg(tMsgID.Err, "Unexpected end of file (aux)!", MsgSrc) - - -lbErr: - file.Close() - Return False - End Function -End Class diff --git a/VECTO/Input Files/cAuxEntry.vb b/VECTO/Input Files/cAuxEntry.vb deleted file mode 100644 index 2ae508c9bd74200ac0a86970f6404524e32bd08f..0000000000000000000000000000000000000000 --- a/VECTO/Input Files/cAuxEntry.vb +++ /dev/null @@ -1,24 +0,0 @@ -Imports System.Collections.Generic - - Public Class cAuxEntry - Public Type As String - Public Path As cSubPath - Public TechStr As String = "" - - Public PulleyGearEfficiencyES As Single - Public PulleyGearRatioES As Single - Public PulleyGearEfficiencyPS As Single - Public PulleyGearRatioPS As Single - Public PulleyGearEfficiencyHVAC As Single - Public PulleyGearRatioHVAC As Single - - - 'Public ConsumerListES As List(Of VectoAuxiliaries.Electrics.ElectricalConsumer) - 'Public ConsumerListPS As List(Of VectoAuxiliaries.Pneumatics.PneumaticConsumer) - 'Public HVACMapInputs As Dictionary(Of String, Single) - - Public Sub New() - Path = New cSubPath - End Sub - - End Class \ No newline at end of file diff --git a/VECTO/Input Files/cAuxEntryPS.vb b/VECTO/Input Files/cAuxEntryPS.vb deleted file mode 100644 index 3441f33e67b6e9a147577b252654601165cce12f..0000000000000000000000000000000000000000 --- a/VECTO/Input Files/cAuxEntryPS.vb +++ /dev/null @@ -1,13 +0,0 @@ -Public Class cAuxEntryPS - Inherits cAuxEntry - - -Sub New() - - MyBase.New() - -End Sub - - - -End Class diff --git a/VECTO/Input Files/cDRI.vb b/VECTO/Input Files/cDRI.vb deleted file mode 100644 index 846c5b1fc8254391eeba77b7bd8ac4f6db4fbf5d..0000000000000000000000000000000000000000 --- a/VECTO/Input Files/cDRI.vb +++ /dev/null @@ -1,666 +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 - -''' <summary> -''' Driving cycle input file -''' </summary> -''' <remarks></remarks> -Public Class cDRI - ''' <summary> - ''' Last index of driving cycle columns - ''' </summary> - ''' <remarks></remarks> - Public tDim As Integer - - ''' <summary> - ''' Dictionary holding all driving cycle columns. Key= Parameter-ID (enum), Value= parameter value per time step - ''' </summary> - ''' <remarks></remarks> - Public Values As Dictionary(Of tDriComp, List(Of Double)) - - ''' <summary> - ''' First time stamp in driving cycle - ''' </summary> - ''' <remarks></remarks> - Public t0 As Integer - - ''' <summary> - ''' Full filepath. Needs to be defined before calling ReadFile. - ''' </summary> - ''' <remarks></remarks> - Public FilePath As String - - ''' <summary> - ''' True= Cycle includes time stamps. Defined in ReadFile. - ''' </summary> - ''' <remarks></remarks> - Public Tvorg As Boolean - - ''' <summary> - ''' True= Cycle includes time vehicle speed. Defined in ReadFile. - ''' </summary> - ''' <remarks></remarks> - Public Vvorg As Boolean - - ''' <summary> - ''' True= Cycle includes engine power. Defined in ReadFile. - ''' </summary> - ''' <remarks></remarks> - Public Pvorg As Boolean - - - Public PwheelVorg As Boolean - - ''' <summary> - ''' True= Cycle includes additional auxiliary power demand (not to be confused with auxiliary supply power). Defined in ReadFile. - ''' </summary> - ''' <remarks></remarks> - Public PaddVorg As Boolean - - ''' <summary> - ''' True= Cycle includes engine speed. Defined in ReadFile. - ''' </summary> - ''' <remarks></remarks> - Public Nvorg As Boolean - - ''' <summary> - ''' True= Cycle includes gear input. Defined in ReadFile. - ''' </summary> - ''' <remarks></remarks> - Public Gvorg As Boolean - - ''' <summary> - ''' True= Cycle includes slope. Defined in ReadFile. - ''' </summary> - ''' <remarks></remarks> - Public GradVorg As Boolean - - ''' <summary> - ''' True= Cycle includes auxiliary supply power for at least one auxiliary. Defined in ReadFile. - ''' </summary> - ''' <remarks></remarks> - Public AuxDef As Boolean - - ''' <summary> - ''' Auxiliary supply power input. Key= Aux-ID, Value= Supply power [kW] per time step - ''' </summary> - ''' <remarks></remarks> - Public AuxComponents As Dictionary(Of String, List(Of Single)) - - ''' <summary> - ''' True= Cycle includes VairRes and VairBeta for side wind correction. Defined in ReadFile. - ''' </summary> - ''' <remarks></remarks> - Public VairVorg As Boolean - - ''' <summary> - ''' True= Cycle includes distance. Defined in ReadFile. - ''' </summary> - ''' <remarks></remarks> - Public Scycle As Boolean - - ''' <summary> - ''' True= Cycle includes slope. Defined in ReadFile. - ''' </summary> - ''' <remarks></remarks> - Public VoglS As List(Of Double) - - ''' <summary> - ''' Reset all fields, etc. berfore loading new file. Called by ReadFile. - ''' </summary> - ''' <remarks></remarks> - Private Sub ResetMe() - Values = Nothing - PaddVorg = False - Tvorg = False - Vvorg = False - GradVorg = False - Nvorg = False - Gvorg = False - Pvorg = False - PwheelVorg = False - tDim = -1 - t0 = 1 'Default if no time steps are defined in driving cycle - AuxDef = False - AuxComponents = Nothing - VairVorg = False - Scycle = False - End Sub - - ''' <summary> - ''' Read driving cycle. FilePath must be defined before calling. - ''' </summary> - ''' <returns>True= File loaded successfully.</returns> - ''' <remarks></remarks> - Public Function ReadFile() As Boolean - Dim file As cFile_V3 - Dim line As String() - Dim s1 As Integer - Dim s As Integer - Dim txt As String - Dim Comp As tDriComp - Dim AuxComp As tAuxComp - Dim AuxID As String - Dim Svorg As Boolean = False - - Dim DRIcheck As Dictionary(Of tDriComp, Boolean) - Dim Spalten As Dictionary(Of tDriComp, Integer) - Dim sKV As KeyValuePair(Of tDriComp, Integer) - - Dim AuxSpalten As Dictionary(Of String, Integer) = Nothing - Dim Mvorg As Boolean = False - - - Dim MsgSrc As String - - - MsgSrc = "Main/ReadInp/DRI" - - - 'Reset - ResetMe() - - 'Abort if there's no file - If FilePath = "" OrElse Not IO.File.Exists(FilePath) Then - WorkerMsg(tMsgID.Err, "Cycle file not found (" & FilePath & ") !", MsgSrc) - Return False - End If - - 'EmComp Init - '...now in New() - - 'Open file - file = New cFile_V3 - If Not file.OpenRead(FilePath) Then - WorkerMsg(tMsgID.Err, "Failed to open file (" & FilePath & ") !", MsgSrc) - file = Nothing - Return False - End If - - DRIcheck = New Dictionary(Of tDriComp, Boolean) - DRIcheck.Add(tDriComp.t, False) - DRIcheck.Add(tDriComp.V, False) - DRIcheck.Add(tDriComp.Grad, False) - DRIcheck.Add(tDriComp.nU, False) - DRIcheck.Add(tDriComp.Gears, False) - DRIcheck.Add(tDriComp.Padd, False) - DRIcheck.Add(tDriComp.Pe, False) - DRIcheck.Add(tDriComp.VairVres, False) - DRIcheck.Add(tDriComp.VairBeta, False) - DRIcheck.Add(tDriComp.s, False) - DRIcheck.Add(tDriComp.StopTime, False) - DRIcheck.Add(tDriComp.Torque, False) - DRIcheck.Add(tDriComp.Pwheel, False) - - If file.EndOfFile Then - WorkerMsg(tMsgID.Err, "Driving cycle invalid!", MsgSrc) - Return False - End If - - Spalten = New Dictionary(Of tDriComp, Integer) - Values = New Dictionary(Of tDriComp, List(Of Double)) - - '*** - '*** First row: Name/Identification of the Components - line = file.ReadLine - - 'Check Number of Columns/Components - s1 = UBound(line) - - For s = 0 To s1 - - Comp = fDriComp(line(s)) - - 'Falls DRIcomp = Undefined dann wirds als EXS-Comp oder als Emission für KF-Erstellung / Eng-Analysis verwendet |@@| If used DRIcomp = Undefined it will get as EXS-Comp or Emission for KF-Creation / Eng-Analysis - If Comp = tDriComp.Undefined Then - - AuxComp = fAuxComp(line(s)) - - If AuxComp = tAuxComp.Undefined Then - - 'ERROR when component is unknown - WorkerMsg(tMsgID.Err, "'" & line(s) & "' is no valid cycle input parameter!", MsgSrc) - GoTo lbEr - - Else - - txt = fCompSubStr(line(s)) - - If Not AuxDef Then - AuxComponents = New Dictionary(Of String, List(Of Single)) - AuxSpalten = New Dictionary(Of String, Integer) - End If - - If AuxComponents.ContainsKey(txt) Then - WorkerMsg(tMsgID.Err, "Multiple definitions of auxiliary '" & txt & "' in driving cycle! Column " & s + 1, MsgSrc) - GoTo lbEr - End If - - AuxComponents.Add(txt, New List(Of Single)) - AuxSpalten.Add(txt, s) - - AuxDef = True - - End If - - - Else - - If DRIcheck(Comp) Then - WorkerMsg(tMsgID.Err, "Component '" & line(s) & "' already defined! Column " & s + 1, MsgSrc) - GoTo lbEr - End If - - DRIcheck(Comp) = True - Spalten.Add(Comp, s) - Values.Add(Comp, New List(Of Double)) - - End If - - Next - - 'Set Gvorg/Nvorg: - Tvorg = DRIcheck(tDriComp.t) - Vvorg = DRIcheck(tDriComp.V) - Svorg = DRIcheck(tDriComp.s) - Gvorg = DRIcheck(tDriComp.Gears) - Nvorg = DRIcheck(tDriComp.nU) - Pvorg = DRIcheck(tDriComp.Pe) - PaddVorg = DRIcheck(tDriComp.Padd) - GradVorg = DRIcheck(tDriComp.Grad) - VairVorg = DRIcheck(tDriComp.VairVres) And DRIcheck(tDriComp.VairBeta) - Mvorg = DRIcheck(tDriComp.Torque) - PwheelVorg = DRIcheck(tDriComp.Pwheel) - - If Mvorg And Pvorg Then - WorkerMsg(tMsgID.Warn, "Engine torque and power defined in cycle! Torque will be ignored!", MsgSrc) - Mvorg = False - End If - - - Try - Do While Not file.EndOfFile - tDim += 1 'wird in ResetMe zurück gesetzt - line = file.ReadLine - - For Each sKV In Spalten - - If sKV.Key = tDriComp.Pe Or sKV.Key = tDriComp.Torque Then - If Trim(line(sKV.Value)) = sKey.EngDrag Then line(sKV.Value) = -999999 - End If - - Values(sKV.Key).Add(CDbl(line(sKV.Value))) - Next - - If AuxDef Then - For Each AuxID In AuxSpalten.Keys - AuxComponents(AuxID).Add(CSng(line(AuxSpalten(AuxID)))) - Next - End If - - Loop - Catch ex As Exception - - WorkerMsg(tMsgID.Err, "Error during file read! Line number: " & tDim + 1 & " (" & FilePath & ")", MsgSrc, FilePath) - GoTo lbEr - - End Try - - file.Close() - - Scycle = (Svorg And Not Tvorg) - - If Vvorg Then - For s = 0 To tDim - Values(tDriComp.V)(s) /= 3.6 - If Values(tDriComp.V)(s) < 0.025 Then Values(tDriComp.V)(s) = 0 - Next - End If - - If Mvorg And Nvorg Then - Values.Add(tDriComp.Pe, New List(Of Double)) - Pvorg = True - For s = 0 To tDim - Values(tDriComp.Pe).Add(nMtoPe(Values(tDriComp.nU)(s), Values(tDriComp.Torque)(s))) - Next - End If - - Return True - -lbEr: - file.Close() - - Return False - End Function - - ''' <summary> - ''' Calculates altitude for each time step if driving cycle includes slope. - ''' </summary> - ''' <remarks></remarks> - Public Sub GradToAlt() - Dim i As Integer - Dim v0 As New List(Of Double) - Dim vg As List(Of Double) - Dim vs As List(Of Double) - Dim vv As List(Of Double) - Dim vt As List(Of Double) - - 'Skip if altitude is defined already - If Values.ContainsKey(tDriComp.Alt) Then Exit Sub - - If GradVorg And Vvorg Then - - vg = Values(tDriComp.Grad) - - v0.Add(0) - - If Scycle Then - - vs = Values(tDriComp.s) - - For i = 1 To tDim - v0.Add(v0(i - 1) + ((vg(i) + vg(i - 1)) / 200) * (vs(i) - vs(i - 1))) - Next - - - Else - - vv = Values(tDriComp.V) - - If Tvorg Then - - vt = Values(tDriComp.t) - - For i = 1 To tDim - v0.Add(v0(i - 1) + ((vg(i) + vg(i - 1)) / 200) * vv(i) * (vt(i) - vt(i - 1))) - Next - - Else - - For i = 1 To tDim - v0.Add(v0(i - 1) + ((vg(i) + vg(i - 1)) / 200) * vv(i) * 1) - Next - - End If - End If - - - Else - - For i = 0 To tDim - v0.Add(0) - Next - - End If - - Values.Add(tDriComp.Alt, v0) - Values.Remove(tDriComp.Grad) - End Sub - - - ''' <summary> - ''' Convert cycle to 1Hz. - ''' </summary> - ''' <returns>True= Convertion successful.</returns> - ''' <remarks></remarks> - Public Function ConvTo1Hz() As Boolean - - Dim tMin As Double - Dim tMax As Double - Dim tMid As Integer - Dim Anz As Integer - Dim z As Integer - Dim Time As Double - Dim t1 As Double - Dim Finish As Boolean - Dim NewValues As Dictionary(Of tDriComp, List(Of Double)) - Dim KV As KeyValuePair(Of tDriComp, List(Of Double)) - Dim KVd As KeyValuePair(Of tDriComp, Double) - Dim fTime As List(Of Double) - Dim Summe As Dictionary(Of tDriComp, Double) - - Dim NewAuxValues As Dictionary(Of String, List(Of Single)) = Nothing - Dim AuxKV As KeyValuePair(Of String, List(Of Single)) - Dim AuxSumme As Dictionary(Of String, Single) = Nothing - - Dim MsgSrc As String - - MsgSrc = "DRI/Convert" - - fTime = Values(tDriComp.t) - - 'Check whether Time is not reversed - For z = 1 To tDim - If fTime(z) < fTime(z - 1) Then - WorkerMsg(tMsgID.Err, - "Time step invalid! t(" & z - 1 & ") = " & fTime(z - 1) & "[s], t(" & z & ") = " & fTime(z) & "[s]", MsgSrc) - Return False - End If - Next - - 'Define Time-range - t0 = CInt(Math.Round(fTime(0), 0, MidpointRounding.AwayFromZero)) - t1 = fTime(tDim) - - 'Create Output, Total and Num-of-Dictionaries - NewValues = New Dictionary(Of tDriComp, List(Of Double)) - Summe = New Dictionary(Of tDriComp, Double) - - For Each KV In Values - NewValues.Add(KV.Key, New List(Of Double)) - If KV.Key <> tDriComp.t Then Summe.Add(KV.Key, 0) - Next - - If AuxDef Then - NewAuxValues = New Dictionary(Of String, List(Of Single)) - AuxSumme = New Dictionary(Of String, Single) - For Each AuxKV In AuxComponents - NewAuxValues.Add(AuxKV.Key, New List(Of Single)) - AuxSumme.Add(AuxKV.Key, 0) - Next - End If - - 'Start-values - tMin = fTime(0) - tMid = CInt(tMin) - tMax = tMid + 0.5 - - If fTime(0) >= tMax Then - tMid = tMid + 1 - tMin = tMid - 0.5 - tMax = tMid + 0.5 - t0 = tMid - End If - - Anz = 0 - Finish = False - - For z = 0 To tDim - - 'Next Time-step - Time = fTime(z) - -lb10: - - 'If Time-step > tMax: - If Time >= tMax Or z = tDim Then - - 'Conclude Second - NewValues(tDriComp.t).Add(tMid) - - 'If no values in Sum: Interpolate - If Anz = 0 Then - - For Each KVd In Summe - NewValues(KVd.Key).Add( - (tMid - fTime(z - 1)) * (Values(KVd.Key)(z) - Values(KVd.Key)(z - 1)) / (fTime(z) - fTime(z - 1)) + - Values(KVd.Key)(z - 1)) - Next - - If AuxDef Then - For Each AuxKV In AuxComponents - NewAuxValues(AuxKV.Key).Add( - (tMid - fTime(z - 1)) * (AuxKV.Value(z) - AuxKV.Value(z - 1)) / (fTime(z) - fTime(z - 1)) + AuxKV.Value(z - 1)) - Next - End If - - Else - - If Time = tMax Then - - For Each KVd In Summe - NewValues(KVd.Key).Add((Summe(KVd.Key) + Values(KVd.Key)(z)) / (Anz + 1)) - Next - - If AuxDef Then - For Each AuxKV In AuxComponents - NewAuxValues(AuxKV.Key).Add((AuxSumme(AuxKV.Key) + AuxKV.Value(z)) / (Anz + 1)) - Next - End If - - Else - 'If only one Value: Inter- /Extrapolate - If Anz = 1 Then - - If z < 2 OrElse fTime(z - 1) < tMid Then - - For Each KVd In Summe - NewValues(KVd.Key).Add( - (tMid - fTime(z - 1)) * (Values(KVd.Key)(z) - Values(KVd.Key)(z - 1)) / (fTime(z) - fTime(z - 1)) + - Values(KVd.Key)(z - 1)) - Next - - If AuxDef Then - For Each AuxKV In AuxComponents - NewAuxValues(AuxKV.Key).Add( - (tMid - fTime(z - 1)) * (AuxKV.Value(z) - AuxKV.Value(z - 1)) / (fTime(z) - fTime(z - 1)) + AuxKV.Value(z - 1)) - Next - End If - - Else - - For Each KVd In Summe - NewValues(KVd.Key).Add( - (tMid - fTime(z - 2)) * (Values(KVd.Key)(z - 1) - Values(KVd.Key)(z - 2)) / (fTime(z - 1) - fTime(z - 2)) + - Values(KVd.Key)(z - 2)) - Next - - If AuxDef Then - For Each AuxKV In AuxComponents - NewAuxValues(AuxKV.Key).Add( - (tMid - fTime(z - 2)) * (AuxKV.Value(z - 1) - AuxKV.Value(z - 2)) / (fTime(z - 1) - fTime(z - 2)) + - AuxKV.Value(z - 2)) - Next - End If - - End If - - Else - - For Each KVd In Summe - NewValues(KVd.Key).Add(Summe(KVd.Key) / Anz) - Next - - If AuxDef Then - For Each AuxKV In AuxComponents - NewAuxValues(AuxKV.Key).Add(AuxSumme(AuxKV.Key) / Anz) - Next - End If - - End If - End If - End If - - If Not Finish Then - - 'Set New Area(Bereich) - tMid = tMid + 1 - tMin = tMid - 0.5 - tMax = tMid + 0.5 - - 'Check whether last second - If tMax > t1 Then - tMax = t1 - Finish = True - End If - - 'New Sum /Num no start - For Each KV In Values - If KV.Key <> tDriComp.t Then Summe(KV.Key) = 0 - Next - - If AuxDef Then - For Each AuxKV In AuxComponents - AuxSumme(AuxKV.Key) = 0 - Next - End If - - Anz = 0 - - GoTo lb10 - - End If - - End If - - For Each KV In Values - If KV.Key <> tDriComp.t Then Summe(KV.Key) += Values(KV.Key)(z) - Next - - If AuxDef Then - For Each AuxKV In AuxComponents - AuxSumme(AuxKV.Key) += AuxKV.Value(z) - Next - End If - - Anz = Anz + 1 - - Next - - 'Accept New fields - Values = NewValues - - If AuxDef Then - For Each AuxKV In NewAuxValues - AuxComponents(AuxKV.Key) = AuxKV.Value - Next - End If - - tDim = Values(tDriComp.t).Count - 1 - - Return True - End Function - - ''' <summary> - ''' Duplicates first time step. Needed for distance-based cycles to ensure vehicle stop at cycle start. - ''' </summary> - ''' <remarks></remarks> - Public Sub FirstZero() - Dim AuxKV As KeyValuePair(Of String, List(Of Single)) - Dim ValKV As KeyValuePair(Of tDriComp, List(Of Double)) - - tDim += 1 - - For Each ValKV In Values - ValKV.Value.Insert(0, ValKV.Value(0)) - Next - - If Scycle Then VoglS.Insert(0, VoglS(0)) - - If AuxDef Then - For Each AuxKV In AuxComponents - AuxKV.Value.Insert(0, AuxKV.Value(0)) - Next - End If - End Sub -End Class - diff --git a/VECTO/Input Files/cENG.vb b/VECTO/Input Files/cENG.vb index 587318770e0c7492c42f6cd05afad5865e263057..22a8e3bacda9423e9eeaa2353e2820df4171ea8c 100644 --- a/VECTO/Input Files/cENG.vb +++ b/VECTO/Input Files/cENG.vb @@ -9,6 +9,8 @@ ' ' See the LICENSE.txt for the specific language governing permissions and limitations. Imports System.Collections.Generic +Imports System.IO +Imports TUGraz.VECTO.Input_Files ''' <summary> ''' Engine input file @@ -57,8 +59,6 @@ Public Class cENG ''' <remarks></remarks> Public fFLD As cSubPath - Public FLD As cFLD - ''' <summary> ''' Path to fuel consumption map ''' </summary> @@ -101,47 +101,10 @@ Public Class cENG ''' <remarks></remarks> Public WHTCmw As Single - ''' <summary> - ''' Rated engine speed [1/min]. Engine speed at max. power. Defined in Init. - ''' </summary> - ''' <remarks></remarks> - Public Nrated As Single - ''' <summary> - ''' Maximum engine power [kW]. Power at rated engine speed. - ''' </summary> - ''' <remarks></remarks> - Public Pmax As Single Public SavedInDeclMode As Boolean - 'AA-TB - 'Added in order to expose readonly the full path of the fuel map being used by vecto - Public ReadOnly Property FuelMapFullPath As String - Get - - Return fMAP.FullPath - End Get - End Property - - - ''' <summary> - ''' Generates list of all sub input files (e.g. FC map). Sets MyFileList. - ''' </summary> - ''' <returns>True if successful.</returns> - ''' <remarks></remarks> - Public Function CreateFileList() As Boolean - - MyFileList = New List(Of String) - - MyFileList.Add(PathFLD) - - MyFileList.Add(PathMAP) - - 'Not used!!! MyFileList.Add(PathWHTC) - - Return True - End Function ''' <summary> ''' New instance. Initialise @@ -164,8 +127,7 @@ Public Class cENG Displ = 0 Nidle = 0 I_mot = 0 - Nrated = 0 - Pmax = 0 + fMAP.Clear() fFLD.Clear() @@ -276,32 +238,6 @@ Public Class cENG End Function - ''' <summary> - ''' Set generic values for Declaration Mode - ''' </summary> - ''' <returns>True if successful.</returns> - ''' <remarks></remarks> - Public Function DeclInit() As Boolean - - I_mot = cDeclaration.EngInertia(Displ) - - FLD.DeclInit() - - Return True - End Function - - ''' <summary> - ''' Returns list of sub input files after calling CreateFileList. - ''' </summary> - ''' <value></value> - ''' <returns>list of sub input files</returns> - ''' <remarks></remarks> - Public ReadOnly Property FileList As List(Of String) - Get - Return MyFileList - End Get - End Property - ''' <summary> ''' Get or set Filepath before calling <see cref="M:VECTO.cENG.ReadFile" /> or <see cref="M:VECTO.cENG.SaveFile" /> ''' </summary> @@ -317,7 +253,7 @@ Public Class cENG If sFilePath = "" Then MyPath = "" Else - MyPath = IO.Path.GetDirectoryName(sFilePath) & "\" + MyPath = Path.GetDirectoryName(sFilePath) & "\" End If End Set End Property diff --git a/VECTO/Input Files/cFLD.vb b/VECTO/Input Files/cFLD.vb index 7f453795d1141c7e7cf77c2b5af7cb51f2e56387..4e9b7a71aed372edbd9d4e71bd12047da07121f9 100644 --- a/VECTO/Input Files/cFLD.vb +++ b/VECTO/Input Files/cFLD.vb @@ -113,7 +113,7 @@ Public Class cFLD file = New cFile_V3 If Not file.OpenRead(sFilePath) Then If ShowMsg Then WorkerMsg(tMsgID.Err, "Failed to open file (" & sFilePath & ") !", MsgSrc) - file = Nothing + Return False End If @@ -121,10 +121,10 @@ Public Class cFLD file.ReadLine() 'Initialize Lists - LTq = New System.Collections.Generic.List(Of Single) - LTqDrag = New System.Collections.Generic.List(Of Single) - LnU = New System.Collections.Generic.List(Of Single) - LPT1 = New System.Collections.Generic.List(Of Single) + LTq = New List(Of Single) + LTqDrag = New List(Of Single) + LnU = New List(Of Single) + LPT1 = New List(Of Single) FirstLine = True Try @@ -182,78 +182,9 @@ Public Class cFLD 'ERROR-label for clean Abort lbEr: file.Close() - file = Nothing - - Return False - End Function - - ''' <summary> - ''' Returns motoring power [kW] for given engine speed - ''' </summary> - ''' <param name="nU">engine speed [1/min]</param> - ''' <returns>motoring power [kW]</returns> - ''' <remarks></remarks> - Public Function Pdrag(ByVal nU As Single) As Single - Dim i As Int32 - - 'Extrapolation for x < x(1) - If LnU(0) >= nU Then - 'If LnU(0) > nU Then MODdata.ModErrors.FLDextrapol = "n= " & nU & " [1/min]" - i = 1 - GoTo lbInt - End If - - i = 0 - Do While LnU(i) < nU And i < iDim - i += 1 - Loop - - 'Extrapolation for x > x(imax) - If LnU(i) < nU Then - 'MODdata.ModErrors.FLDextrapol = "n= " & nU & " [1/min]" - End If - -lbInt: - 'Interpolation - Return nMtoPe(nU, (nU - LnU(i - 1)) * (LTqDrag(i) - LTqDrag(i - 1)) / (LnU(i) - LnU(i - 1)) + LTqDrag(i - 1)) - End Function - - ''' <summary> - ''' Returns full load power [kW] at given engine speed considering transient torque build-up via PT1. - ''' </summary> - ''' <param name="nU">engine speed [1/min]</param> - ''' <param name="LastPe">engine power at previous time step</param> - ''' <returns>full load power [kW]</returns> - ''' <remarks></remarks> - Public Function Pfull(ByVal nU As Single, ByVal LastPe As Single) As Single - Dim i As Int32 - Dim PfullStat As Single - Dim PT1 As Single - 'Extrapolation for x < x(1) - If LnU(0) >= nU Then - 'If LnU(0) > nU Then MODdata.ModErrors.FLDextrapol = "n= " & nU & " [1/min]" - i = 1 - GoTo lbInt - End If - - i = 0 - Do While LnU(i) < nU And i < iDim - i += 1 - Loop - 'Extrapolation for x > x(imax) - If LnU(i) < nU Then - 'MODdata.ModErrors.FLDextrapol = "n= " & nU & " [1/min]" - End If - -lbInt: - 'Interpolation - PfullStat = nMtoPe(nU, (nU - LnU(i - 1)) * (LTq(i) - LTq(i - 1)) / (LnU(i) - LnU(i - 1)) + LTq(i - 1)) - PT1 = (nU - LnU(i - 1)) * (LPT1(i) - LPT1(i - 1)) / (LnU(i) - LnU(i - 1)) + LPT1(i - 1) - - 'Dynamic Full-load - Return Math.Min((1 / (PT1 + 1)) * (PfullStat + PT1 * LastPe), PfullStat) + Return False End Function ''' <summary> @@ -533,18 +464,6 @@ lbInt: Return Tm End Function - Public Sub LimitToEng() - Dim i As Integer - Dim nU As Single - Dim TqEng As Single - - For i = 0 To iDim - nU = LnU(i) - TqEng = ENG.FLD.Tq(nU) - If TqEng < LTq(i) Then LTq(i) = TqEng - Next - End Sub - Public Function Init(ByVal Nidle As Single) As Boolean Dim Pmax As Single Dim MsgSrc As String @@ -591,14 +510,6 @@ lbInt: Return True End Function - Public Sub DeclInit() - Dim i As Integer - - For i = 0 To iDim - LPT1(i) = Declaration.PT1(LnU(i)) - Next - End Sub - ''' <summary> ''' Get or set Filepath before calling ReadFile ''' </summary> diff --git a/VECTO/Input Files/cGBX.vb b/VECTO/Input Files/cGBX.vb index e564129a3909d021feecafd228b6ca46d82b8de1..64a071d60b87a75411cf4b6d8d34e8c400ee348a 100644 --- a/VECTO/Input Files/cGBX.vb +++ b/VECTO/Input Files/cGBX.vb @@ -9,6 +9,10 @@ ' ' See the LICENSE.txt for the specific language governing permissions and limitations. Imports System.Collections.Generic +Imports System.IO +Imports TUGraz.VECTO.Input_Files +Imports TUGraz.VectoCommon.Models +Imports TUGraz.VectoCommon.Utils Public Class cGBX Private Const FormatVersion As Short = 6 @@ -25,13 +29,9 @@ Public Class cGBX Public GetrMaps As List(Of cSubPath) 'Public IsTCgear As List(Of Boolean) - Private MyGBmaps As List(Of cDelaunayMap) - Private GetrEffDef As List(Of Boolean) - Private GetrEff As List(Of Single) - 'Gear shift polygons Public gs_files As List(Of cSubPath) - Public Shiftpolygons As List(Of cShiftPolygon) + Public MaxTorque As List(Of String) Public gs_TorqueResv As Single @@ -42,7 +42,7 @@ Public Class cGBX Public gs_StartAcc As Single Public gs_ShiftInside As Boolean - Public gs_Type As tGearbox + Public gs_Type As GearboxType 'Torque Converter Input Public TCon As Boolean @@ -51,25 +51,6 @@ Public Class cGBX Public TCinertia As Single - Private TCnu As New List(Of Single) - Private TCmu As New List(Of Single) - Private TCtorque As New List(Of Single) - Private TCdim As Integer - - - 'Torque Converter Iteration Results - Public TCMin As Single - Public TCnUin As Single - Public TC_PeBrake As Single - Public TCMout As Single - Public TCnUout As Single - Public TCReduce As Boolean - Public TCNeutral As Boolean - Public TC_mu As Single - Public TC_nu As Single - Private TCnuMax As Single - - Private MyFileList As List(Of String) Public SavedInDeclMode As Boolean Public UpshiftMinAcceleration As Single @@ -78,31 +59,6 @@ Public Class cGBX Public TCshiftFile As String - Public Function CreateFileList() As Boolean - Dim i As Integer - - MyFileList = New List(Of String) - - 'Transm. Loss Maps - For i = 0 To GearCount() - 1 - If Not IsNumeric(Me.GetrMap(i, True)) Then - If Not MyFileList.Contains(Me.GetrMap(i)) Then MyFileList.Add(Me.GetrMap(i)) - End If - - '.vgbs - If Not Cfg.DeclMode Then - If i > 0 AndAlso Not MyFileList.Contains(Me.gs_files(i).FullPath) Then MyFileList.Add(Me.gs_files(i).FullPath) - End If - - Next - - 'Torque Converter - If Me.TCon Then MyFileList.Add(TCfile) - - Return True - End Function - - Public Sub New() MyPath = "" sFilePath = "" @@ -121,11 +77,6 @@ Public Class cGBX gs_files = New List(Of cSubPath) MaxTorque = New List(Of String) - GetrEffDef = New List(Of Boolean) - GetrEff = New List(Of Single) - - MyGBmaps = Nothing - gs_TorqueResv = 0 gs_SkipGears = False gs_ShiftTime = 0 @@ -134,7 +85,7 @@ Public Class cGBX gs_StartAcc = 0 gs_ShiftInside = False - gs_Type = tGearbox.Manual + gs_Type = GearboxType.MT TCon = False TCrefrpm = 0 @@ -200,7 +151,7 @@ Public Class cGBX dic.Add("StartSpeed", gs_StartSpeed) dic.Add("StartAcc", gs_StartAcc) - dic.Add("GearboxType", GearboxConv(gs_Type)) + dic.Add("GearboxType", gs_Type) dic0 = New Dictionary(Of String, Object) dic0.Add("Enabled", TCon) @@ -291,7 +242,7 @@ Public Class cGBX gs_StartAcc = JSON.Content("Body")("StartAcc") gs_ShiftInside = JSON.Content("Body")("EaryShiftUp") - gs_Type = GearboxConv(JSON.Content("Body")("GearboxType").ToString) + gs_Type = JSON.Content("Body")("GearboxType").ToString.ParseEnum(Of GearboxType)() If JSON.Content("Body")("UpshiftMinAcceleration") Is Nothing Then UpshiftMinAcceleration = 0.1 @@ -332,133 +283,12 @@ Public Class cGBX Return True End Function - Public Function DeclInit() As Boolean - Dim MsgSrc As String - Dim i As Int16 - - MsgSrc = "GBX/DeclInit" - - If gs_Type = tGearbox.Custom Or tGearboxExtension.AutomaticTransmission(gs_Type) Then - WorkerMsg(tMsgID.Err, "Invalid gearbox type for Declaration Mode!", MsgSrc) - Return False - End If - - GbxInertia = cDeclaration.GbInertia - TracIntrSi = cDeclaration.TracInt(gs_Type) - gs_SkipGears = cDeclaration.SkipGears(gs_Type) - gs_ShiftTime = cDeclaration.ShiftTime(gs_Type) - gs_ShiftInside = cDeclaration.ShiftInside(gs_Type) - gs_TorqueResv = cDeclaration.TqResv - gs_TorqueResvStart = cDeclaration.TqResvStart - gs_StartSpeed = cDeclaration.StartSpeed - gs_StartAcc = cDeclaration.StartAcc - - UpshiftAfterDownshift = 10 - DownshiftAfterUpshift = 10 - UpshiftMinAcceleration = 0.1 - - TCon = (AutomaticTransmission(gs_Type)) - - For i = 1 To GearCount() - Shiftpolygons(i).SetGenericShiftPoly(ENG.FLD, ENG.Nidle) - Next - - - Return True - End Function - - Public Function TCinit() As Boolean - Dim file As New cFile_V3 - Dim MsgSrc As String - Dim line() As String - - MsgSrc = "GBX/TCinit" - - If Not file.OpenRead(TC_file.FullPath) Then - WorkerMsg(tMsgID.Err, "Torque Converter file not found! (" & TC_file.FullPath & ")", MsgSrc) - Return False - End If - - 'Skip Header - file.ReadLine() - - If TCrefrpm <= 0 Then - WorkerMsg(tMsgID.Err, "Torque converter reference torque invalid! (" & TCrefrpm & ")", MsgSrc) - Return False - End If - - TCnu.Clear() - TCmu.Clear() - TCtorque.Clear() - TCdim = -1 - - Try - Do While Not file.EndOfFile - line = file.ReadLine - TCnuMax = CSng(line(0)) - 'If CSng(line(0)) < 1 Then '@@@quam: read the complete file! - TCnu.Add(TCnuMax) - TCmu.Add(CSng(line(1))) - TCtorque.Add(CSng(line(2))) - TCdim += 1 - 'End If - Loop - Catch ex As Exception - WorkerMsg(tMsgID.Err, "Error while reading Torque Converter file! (" & ex.Message & ")", MsgSrc) - Return False - End Try - - file.Close() - - 'Check if more then one point - If TCdim < 1 Then - WorkerMsg(tMsgID.Err, "More points in Torque Converter file needed!", MsgSrc) - Return False - End If - - If TCnuMax > 1 Then TCnuMax = 1 - - If False Then ' @@@quam: don'r read default tcc file - 'Add default values for nu>1 - If Not file.OpenRead(MyDeclPath & "DefaultTC.vtcc") Then - WorkerMsg(tMsgID.Err, "Default Torque Converter file not found!", MsgSrc) - Return False - End If - - 'Skip Header - file.ReadLine() - - Try - Do While Not file.EndOfFile - line = file.ReadLine - TCnu.Add(CSng(line(0))) - TCmu.Add(CSng(line(1))) - TCtorque.Add(CSng(line(2))) - TCdim += 1 - Loop - Catch ex As Exception - WorkerMsg(tMsgID.Err, "Error while reading Default Torque Converter file! (" & ex.Message & ")", MsgSrc) - Return False - End Try - - file.Close() - End If - - Return True - End Function - Public Function GearCount() As Integer Return Me.Igetr.Count - 1 End Function - Public ReadOnly Property FileList As List(Of String) - Get - Return MyFileList - End Get - End Property - Public Property FilePath() As String Get Return sFilePath @@ -468,7 +298,7 @@ Public Class cGBX If sFilePath = "" Then MyPath = "" Else - MyPath = IO.Path.GetDirectoryName(sFilePath) & "\" + MyPath = Path.GetDirectoryName(sFilePath) & "\" End If End Set End Property @@ -499,20 +329,6 @@ Public Class cGBX End Set End Property - 'Public Property FldFile(ByVal x As Short, Optional ByVal Original As Boolean = False) As String - ' Get - ' If Original Then - ' Return FldFiles(x).OriginalPath - ' Else - ' Return FldFiles(x).FullPath - ' End If - ' End Get - ' Set(value As String) - ' FldFiles(x).Init(MyPath, value) - ' End Set - 'End Property - - Public Property TCfile(Optional ByVal Original As Boolean = False) As String Get If Original Then @@ -525,151 +341,4 @@ Public Class cGBX TC_file.Init(MyPath, value) End Set End Property - - - Public Class cShiftPolygon - Private Filepath As String - - Public gs_TqUp As New List(Of Single) - Public gs_TqDown As New List(Of Single) - Public gs_nUup As New List(Of Single) - Public gs_nUdown As New List(Of Single) - Private gs_Dup As Integer = -1 - Private gs_Ddown As Integer = -1 - - Public Sub New(ByVal Path As String, ByVal Gear As Integer) - Filepath = Path - End Sub - - Public Function ReadFile() As Boolean - Dim file As cFile_V3 - Dim line As String() - - Dim MsgSrc As String - - MsgSrc = "GBX/GSinit/ShiftPolygon.Init" - - 'Check if file exists - If Not IO.File.Exists(Filepath) Then - WorkerMsg(tMsgID.Err, "Gear Shift Polygon File not found! '" & Filepath & "'", MsgSrc) - Return False - End If - - 'Init file instance - file = New cFile_V3 - - 'Open file - If Not file.OpenRead(Filepath) Then - WorkerMsg(tMsgID.Err, "Failed to load Gear Shift Polygon File! '" & Filepath & "'", MsgSrc) - Return False - End If - - 'Skip Header - file.ReadLine() - - 'Clear lists - gs_TqUp.Clear() - gs_TqDown.Clear() - gs_nUdown.Clear() - gs_nUup.Clear() - gs_Dup = -1 - - 'Read file - Try - Do While Not file.EndOfFile - line = file.ReadLine - gs_Dup += 1 - gs_TqUp.Add(CSng(line(0))) - gs_TqDown.Add(CSng(line(0))) - gs_nUdown.Add(CSng(line(1))) - gs_nUup.Add(CSng(line(2))) - Loop - Catch ex As Exception - WorkerMsg(tMsgID.Err, "Error while reading Gear Shift Polygon File! (" & ex.Message & ")", MsgSrc) - Return False - End Try - - 'Check if more then one point - If gs_Dup < 1 Then - WorkerMsg(tMsgID.Err, "More points in Gear Shift Polygon File needed!", MsgSrc) - Return False - End If - - gs_Ddown = gs_Dup - - Return True - End Function - - - Public Sub SetGenericShiftPoly(ByVal fld0 As cFLD, ByVal nidle As Single) - Dim Tmax As Single - - 'Clear lists - gs_TqUp.Clear() - gs_TqDown.Clear() - gs_nUdown.Clear() - gs_nUup.Clear() - - Tmax = fld0.Tmax - - gs_nUdown.Add(nidle) - gs_nUdown.Add(nidle) - gs_nUdown.Add((fld0.Npref + fld0.Nlo) / 2) - - gs_TqDown.Add(0) - gs_TqDown.Add(Tmax * nidle / (fld0.Npref + fld0.Nlo - nidle)) - gs_TqDown.Add(Tmax) - - gs_nUup.Add(fld0.Npref) - gs_nUup.Add(fld0.Npref) - gs_nUup.Add(fld0.N95h) - - gs_TqUp.Add(0) - gs_TqUp.Add(Tmax * (fld0.Npref - nidle) / (fld0.N95h - nidle)) - gs_TqUp.Add(Tmax) - - gs_Ddown = 2 - gs_Dup = 2 - End Sub - - Public Function fGSnUdown(ByVal Tq As Single) As Single - Dim i As Int32 - - 'Extrapolation for x < x(1) - If gs_TqDown(0) >= Tq Then - i = 1 - GoTo lbInt - End If - - i = 0 - Do While gs_TqDown(i) < Tq And i < gs_Ddown - i += 1 - Loop - - -lbInt: - 'Interpolation - Return (Tq - gs_TqDown(i - 1)) * (gs_nUdown(i) - gs_nUdown(i - 1)) / (gs_TqDown(i) - gs_TqDown(i - 1)) + gs_nUdown(i - 1) - End Function - - Public Function fGSnUup(ByVal Tq As Single) As Single - Dim i As Int32 - - 'Extrapolation for x < x(1) - If gs_TqUp(0) >= Tq Then - i = 1 - GoTo lbInt - End If - - i = 0 - Do While gs_TqUp(i) < Tq And i < gs_Dup - i += 1 - Loop - - -lbInt: - 'Interpolation - Return (Tq - gs_TqUp(i - 1)) * (gs_nUup(i) - gs_nUup(i - 1)) / (gs_TqUp(i) - gs_TqUp(i - 1)) + gs_nUup(i - 1) - End Function - End Class End Class diff --git a/VECTO/Input Files/cMAP.vb b/VECTO/Input Files/cMAP.vb index 306c02c1df8ec90fec347d52180db66b9d2f5dd5..9bb67d444497e1f8fcf3621d40d35bfbf0b2cd6f 100644 --- a/VECTO/Input Files/cMAP.vb +++ b/VECTO/Input Files/cMAP.vb @@ -14,7 +14,7 @@ Imports TUGraz.VectoCore.Configuration Imports VectoAuxiliaries Public Class cMAP - Implements IFuelConsumptionMap + 'Implements IFuelConsumptionMap Private LnU As List(Of Single) Private LTq As List(Of Single) @@ -23,14 +23,12 @@ Public Class cMAP Private sFilePath As String Private iMapDim As Integer - Private FuelMap As cDelaunayMap - Private Sub ResetMe() lFC = Nothing LTq = Nothing LnU = Nothing iMapDim = -1 - FuelMap = New cDelaunayMap + End Sub Public Function ReadFile(Optional ByVal ShowMsg As Boolean = True) As Boolean @@ -54,7 +52,7 @@ Public Class cMAP 'Open file file = New cFile_V3 If Not file.OpenRead(sFilePath) Then - file = Nothing + If ShowMsg Then WorkerMsg(tMsgID.Err, "Failed to open file (" & sFilePath & ") !", MsgSrc) Return False End If @@ -63,9 +61,9 @@ Public Class cMAP file.ReadLine() 'Initi Lists (before version check so ReadOldFormat works) - lFC = New System.Collections.Generic.List(Of Single) - LTq = New System.Collections.Generic.List(Of Single) - LnU = New System.Collections.Generic.List(Of Single) + lFC = New List(Of Single) + LTq = New List(Of Single) + LnU = New List(Of Single) Try Do While Not file.EndOfFile @@ -108,7 +106,7 @@ Public Class cMAP 'Close file file.Close() - file = Nothing + Return True @@ -116,42 +114,12 @@ Public Class cMAP 'ERROR-label for clean Abort lbEr: file.Close() - file = Nothing - - Return False - End Function - Public Function Triangulate() As Boolean - Dim i As Integer - Dim MsgSrc As String - - MsgSrc = "MAP/Norm" - - 'FC Delauney - For i = 0 To iMapDim - FuelMap.AddPoints(LnU(i), LTq(i), lFC(i)) - Next - - Return FuelMap.Triangulate() + Return False End Function - Public Function fFCdelaunay_Intp(ByVal nU As Single, ByVal Tq As Single) As Single - Dim val As Single - - val = FuelMap.Intpol(nU, Tq) - - If FuelMap.ExtrapolError Then - WorkerMsg(tMsgID.Err, - "Cannot extrapolate FC map! n= " & nU.ToString("0.0") & " [1/min], Me= " & Tq.ToString("0.0") & " [Nm]", - "MAP/FC_Intp") - Return -10000 - Else - Return val - End If - End Function - #Region "Properties" Public Property FilePath() As String @@ -163,24 +131,12 @@ lbEr: End Set End Property - Public ReadOnly Property MapDim As Integer - Get - Return iMapDim - End Get - End Property - Public ReadOnly Property Tq As List(Of Single) Get Return LTq End Get End Property - Public ReadOnly Property FC As List(Of Single) - Get - Return lFC - End Get - End Property - Public ReadOnly Property nU As List(Of Single) Get Return LnU @@ -189,12 +145,12 @@ lbEr: #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 + '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/cSubPath.vb b/VECTO/Input Files/cSubPath.vb index 93a2d204638d8d729cf3ac84af1989b1da6e60ad..aac138b4e214b8e67f6be8abca403a21493e5430 100644 --- a/VECTO/Input Files/cSubPath.vb +++ b/VECTO/Input Files/cSubPath.vb @@ -8,73 +8,74 @@ ' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ' ' See the LICENSE.txt for the specific language governing permissions and limitations. +Namespace Input_Files + Public Class cSubPath -Public Class cSubPath + Private sFullPath As String + Private sOglPath As String + Private bDefined As Boolean - Private sFullPath As String - Private sOglPath As String - Private bDefined As Boolean - - Public Sub New() - bDefined = False - End Sub - - Public Sub Init(ByVal ParentDir As String, ByVal Path As String) - If fFileOrNot(Path) = "" Then + Public Sub New() bDefined = False - Else - bDefined = True - sOglPath = Path - sFullPath = fFileRepl(Path, ParentDir) - End If - End Sub - - Private Function fFileOrNot(ByVal f As String) As String - If Trim(UCase(f)) = sKey.NoFile Then - Return "" - Else - Return f - End If - End Function - + End Sub - Public Sub Clear() - bDefined = False - End Sub - - Public ReadOnly Property FullPath() As String - Get - If bDefined Then - Return sFullPath + Public Sub Init(ByVal ParentDir As String, ByVal Path As String) + If fFileOrNot(Path) = "" Then + bDefined = False Else - Return "" + bDefined = True + sOglPath = Path + sFullPath = fFileRepl(Path, ParentDir) End If - End Get - End Property + End Sub - Public ReadOnly Property OriginalPath() As String - Get - If bDefined Then - Return sOglPath - Else + Private Function fFileOrNot(ByVal f As String) As String + If Trim(UCase(f)) = sKey.NoFile Then Return "" - End If - End Get - End Property - - Public ReadOnly Property PathOrDummy() As String - Get - If bDefined Then - Return sOglPath Else - Return sKey.NoFile + Return f End If - End Get - End Property - + End Function - - -End Class + Public Sub Clear() + bDefined = False + End Sub + + Public ReadOnly Property FullPath() As String + Get + If bDefined Then + Return sFullPath + Else + Return "" + End If + End Get + End Property + + Public ReadOnly Property OriginalPath() As String + Get + If bDefined Then + Return sOglPath + Else + Return "" + End If + End Get + End Property + + Public ReadOnly Property PathOrDummy() As String + Get + If bDefined Then + Return sOglPath + Else + Return sKey.NoFile + End If + End Get + End Property + + + + + + End Class +End NameSpace \ No newline at end of file diff --git a/VECTO/Input Files/cVECTO.vb b/VECTO/Input Files/cVECTO.vb index 521454ebd952a6ba56641933d50a63e6618e3a1d..db54db9ea343ad18a1cd406d482ba9586eac4899 100644 --- a/VECTO/Input Files/cVECTO.vb +++ b/VECTO/Input Files/cVECTO.vb @@ -12,8 +12,10 @@ Option Infer On Option Explicit On Imports System.Collections.Generic +Imports System.IO Imports System.Linq Imports Newtonsoft.Json.Linq +Imports TUGraz.VECTO.Input_Files Public Class cVECTO Private Const FormatVersion As Short = 3 @@ -44,9 +46,7 @@ Public Class cVECTO Private _desMaxDim As Integer Public ReadOnly AuxPaths As Dictionary(Of String, AuxEntry) - Public AuxRefs As Dictionary(Of String, cAux) _ 'Alle Nebenverbraucher die in der Veh-Datei UND im Zyklus definiert sind - Public AuxDef As Boolean 'True wenn ein oder mehrere Nebenverbraucher definiert sind Public ReadOnly CycleFiles As List(Of cSubPath) @@ -61,8 +61,6 @@ Public Class cVECTO Public UnderSpeed As Single Public EcoRollOn As Boolean - Private _myFileList As List(Of String) - Public SavedInDeclMode As Boolean Public Class AuxEntry @@ -75,50 +73,6 @@ Public Class cVECTO End Sub End Class - Public Function CreateFileList() As Boolean - _myFileList = New List(Of String) - - '.vecto - _myFileList.Add(_sFilePath) - - 'Veh - If Not EngOnly Then - _myFileList.Add(PathVEH) - - If Not VEH.CreateFileList Then Return False - - _myFileList.AddRange(VEH.FileList) - End If - - 'Eng - _myFileList.Add(PathENG) - - If Not ENG.CreateFileList Then Return False - _myFileList.AddRange(ENG.FileList) - - If Not EngOnly Then - 'Gbx - _myFileList.Add(PathGBX) - - If Not GBX.CreateFileList Then Return False - _myFileList.AddRange(GBX.FileList) - - 'Aux - If AuxDef And Not Cfg.DeclMode Then - _myFileList.AddRange(AuxPaths.Values.Select(Function(entry) entry.Path.FullPath)) - End If - - '.vacc - _myFileList.Add(_stDesMaxFile.FullPath) - - End If - - 'Cycles - _myFileList.AddRange(CycleFiles.Select(Function(path) path.FullPath)) - - Return True - End Function - Public Sub New() _myPath = "" @@ -135,8 +89,7 @@ Public Class cVECTO _laDesMin = New List(Of Single) AuxPaths = New Dictionary(Of String, AuxEntry) - AuxRefs = New Dictionary(Of String, cAux) - AuxDef = False + 'AuxRefs = New Dictionary(Of String, cAux) CycleFiles = New List(Of cSubPath) End Sub @@ -192,7 +145,7 @@ Public Class cVECTO dic0.Add("LAC", New Dictionary(Of String, Object) From { {"Enabled", LookAheadOn}, {"Dec", ALookahead}, - {"MinSpeed", vMinLA}, + {"MinSpeed", VMinLa}, {"PreviewDistanceFactor", LacPreviewFactor}, {"DF_offset", LacDfOffset}, {"DF_scaling", LacDfScale}, @@ -208,7 +161,7 @@ Public Class cVECTO Else overspeedDic.Add("Mode", "Off") End If - overspeedDic.Add("MinSpeed", vMin) + overspeedDic.Add("MinSpeed", VMin) overspeedDic.Add("OverSpeed", OverSpeed) overspeedDic.Add("UnderSpeed", UnderSpeed) dic0.Add("OverSpeedEcoRoll", overspeedDic) @@ -346,7 +299,7 @@ Public Class cVECTO End If AuxPaths.Add(auxId, auxEntry) - AuxDef = True + Next End If @@ -370,7 +323,7 @@ Public Class cVECTO Dim dic = body("LAC") LookAheadOn = dic("Enabled") ALookahead = dic("Dec") - vMinLA = dic("MinSpeed") + 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")) @@ -401,7 +354,7 @@ Public Class cVECTO Return False End Select - vMin = dic("MinSpeed") + VMin = dic("MinSpeed") OverSpeed = dic("OverSpeed") If Not dic("UnderSpeed") Is Nothing Then UnderSpeed = dic("UnderSpeed") @@ -444,8 +397,6 @@ Public Class cVECTO _desMaxDim = -1 AuxPaths.Clear() - AuxRefs.Clear() - AuxDef = False EngOnly = False ALookahead = 0 @@ -460,101 +411,11 @@ Public Class cVECTO SavedInDeclMode = False End Sub - Public Function DeclInit() As Boolean - EngOnly = False - - CycleFiles.Clear() - - Dim cl = Declaration.SegRef.GetCycles - - For Each s In cl - Dim subPath = New cSubPath - subPath.Init(_myPath, s) - CycleFiles.Add(subPath) - Next - - _stDesMaxFile.Init(_myPath, Declaration.SegRef.VACCfile) - - _siStStV = cDeclaration.SSspeed - _siStStT = cDeclaration.SStime - StStDelay = cDeclaration.SSdelay - - If Not EcoRollOn Then OverSpeedOn = True - - OverSpeed = cDeclaration.Overspeed - UnderSpeed = cDeclaration.Underspeed - VMin = cDeclaration.ECvmin - - LookAheadOn = True - ALookahead = cDeclaration.LACa - VMinLa = cDeclaration.LACvmin - - 'No need to check Aux (AuxDef). Will be checked in cDeclaration.CalcInitLoad - - Return True - End Function - 'This Sub reads those Input-files that do not have their own class, etc. - Public Function Init() As Boolean - Dim file As cFile_V3 - Dim line As String() - - Dim msgSrc = "VECTO/Init" - - If Not EngOnly Then - - file = New cFile_V3 - - If Not file.OpenRead(_stDesMaxFile.FullPath) Then - WorkerMsg(tMsgID.Err, "Can't read .vacc file (" & _stDesMaxFile.FullPath & ")", msgSrc) - Return False - End If - - 'Skip Header - file.ReadLine() - - _laDesV.Clear() - _laDesMax.Clear() - _laDesMin.Clear() - _desMaxDim = -1 - Try - - Do While Not file.EndOfFile - - _desMaxDim += 1 - - line = file.ReadLine - - _laDesV.Add(CSng(line(0)) / 3.6) 'km/h => m/s !!!! - _laDesMax.Add(CSng(line(1))) - _laDesMin.Add(CSng(line(2))) - - Loop - - Catch ex As Exception - - file.Close() - WorkerMsg(tMsgID.Err, "Error in .vacc file. " & ex.Message & " (" & _stDesMaxFile.FullPath & ")", msgSrc, - _stDesMaxFile.FullPath) - Return False - - End Try - - file.Close() - - End If - - Return True - End Function #Region "Properties" - Public ReadOnly Property FileList As List(Of String) - Get - Return _myFileList - End Get - End Property Public Property FilePath As String Get @@ -565,7 +426,7 @@ Public Class cVECTO If _sFilePath = "" Then _myPath = "" Else - _myPath = IO.Path.GetDirectoryName(_sFilePath) & "\" + _myPath = Path.GetDirectoryName(_sFilePath) & "\" End If End Set End Property diff --git a/VECTO/Input Files/cVEH.vb b/VECTO/Input Files/cVEH.vb index 8308bdbdf47b97150f408b9589a502702b920710..c5c531bc98143543600d699902afd70fc8d666cf 100644 --- a/VECTO/Input Files/cVEH.vb +++ b/VECTO/Input Files/cVEH.vb @@ -13,6 +13,7 @@ Option Infer On Imports System.Collections.Generic Imports System.IO Imports System.Linq +Imports TUGraz.VECTO.Input_Files Imports TUGraz.VectoCommon.Models Imports TUGraz.VectoCommon.Utils @@ -30,16 +31,16 @@ Public Class cVEH Private siFr0 As Single Public CdA0 As Single - Public CdA02 As Single - Private CdA0Act As Single + 'Public CdA02 As Single + 'Private CdA0Act As Single - Public CdMode As tCdMode + Public CdMode As CrossWindCorrectionMode Public CdFile As cSubPath Private CdX As List(Of Single) Private CdY As List(Of Single) - Private CdDim As Integer - Public RtType As tRtType '0=None, 1=Primary, 2=Secondary + + Public RtType As RetarderType 'tRtType '0=None, 1=Primary, 2=Secondary Public RtRatio As Single = 0 Public RtFile As cSubPath Private RtnU As List(Of Single) @@ -47,12 +48,12 @@ Public Class cVEH Public rdyn As Single Public Axles As List(Of cAxle) - Private m_red0 As Single - Public VehCat As tVehCat + + Public VehCat As VehicleCategory Public MassExtra As Single Public MassMax As Single - Public AxleConf As tAxleConf + Public AxleConf As AxleConfiguration Private _myFileList As List(Of String) @@ -72,27 +73,6 @@ Public Class cVEH End Class - Public Function CreateFileList() As Boolean - _myFileList = New List(Of String) - - '.vcdv / .vcdb - If CdMode = tCdMode.CdOfVeng Or CdMode = tCdMode.CdOfBeta Then - _myFileList.Add(CdFile.FullPath) - End If - - 'Retarder - If RtType <> tRtType.None Then - _myFileList.Add(RtFile.FullPath) - End If - - 'Angular Gear - If AngularGearType <> AngularGearType.None Then - _myFileList.Add(AngularGearLossMapFile.FullPath) - End If - - Return True - End Function - Public Sub New() MyPath = "" sFilePath = "" @@ -112,18 +92,17 @@ Public Class cVEH MassExtra = 0 Loading = 0 CdA0 = 0 - CdA0Act = CdA0 - CdA02 = 0 + ' CdA0Act = CdA0 + ' CdA02 = 0 CdFile.Clear() - CdMode = tCdMode.ConstCd0 + CdMode = CrossWindCorrectionMode.NoCorrection CdX.Clear() CdY.Clear() - CdDim = -1 siFr0 = 0 rdyn = 0 - RtType = tRtType.None + RtType = RetarderType.None RtRatio = 1 RtnU.Clear() RtM.Clear() @@ -135,22 +114,13 @@ Public Class cVEH AngularGearRatio = 1 Axles.Clear() - VehCat = tVehCat.Undef + VehCat = VehicleCategory.RigidTruck 'tVehCat.Undef MassMax = 0 - AxleConf = tAxleConf.Undef + AxleConf = AxleConfiguration.AxleConfig_4x2 'tAxleConf.Undef SavedInDeclMode = False End Sub - Public Function Validate() As Boolean - Const msgSrc = "VEH/Validate" - If rdyn < 100 Then - WorkerMsg(tMsgID.Err, "Parameter 'Dynamic Tire Radius' is invalid (" & rdyn & "mm).", msgSrc, sFilePath) - Return False - End If - Return True - End Function - Public Function ReadFile(Optional showMsg As Boolean = True) As Boolean Const msgSrc = "VEH/ReadFile" SetDefault() @@ -172,8 +142,9 @@ Public Class cVEH Mass = body("CurbWeight") MassExtra = body("CurbWeightExtra") Loading = body("Loading") - VehCat = ConvVehCat(body("VehCat").ToString) - AxleConf = ConvAxleConf(body("AxleConfig")("Type").ToString) + VehCat = body("VehCat").ToString.ParseEnum(Of VehicleCategory)() 'ConvVehCat(body("VehCat").ToString) + AxleConf = AxleConfigurationHelper.Parse(body("AxleConfig")("Type").ToString) _ + 'ConvAxleConf(body("AxleConfig")("Type").ToString) If FileVersion < 2 Then 'convert kg to ton @@ -189,33 +160,33 @@ Public Class cVEH CdA0 = body("CdA") End If - 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 = CdModeConv(body("CdCorrMode").ToString) + '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) If Not body("CdCorrFile") Is Nothing Then CdFile.Init(MyPath, body("CdCorrFile")) End If If body("Retarder") Is Nothing Then - RtType = tRtType.None + RtType = RetarderType.None Else - RtType = RtTypeConv(body("Retarder")("Type").ToString) + RtType = RetarderTypeHelper.Parse(body("Retarder")("Type").ToString) 'RtTypeConv(body("Retarder")("Type").ToString) If Not body("Retarder")("Ratio") Is Nothing Then RtRatio = body("Retarder")("Ratio") End If @@ -285,18 +256,17 @@ Public Class cVEH Dim dic As Dictionary(Of String, Object) dic = New Dictionary(Of String, Object) From { {"SavedInDeclMode", Cfg.DeclMode}, - {"VehCat", ConvVehCat(VehCat, False)}, + {"VehCat", VehCat.ToString()}, {"CurbWeight", Mass}, {"CurbWeightExtra", MassExtra}, {"Loading", Loading}, {"MassMax", MassMax}, {"CdA", CdA0}, - {"CdA2", CdA02}, {"rdyn", rdyn}, - {"CdCorrMode", CdModeConv(CdMode)}, + {"CdCorrMode", CdMode.GetName()}, {"CdCorrFile", CdFile.PathOrDummy}, {"Retarder", New Dictionary(Of String, Object) From { - {"Type", RtTypeConv(RtType)}, + {"Type", RtType.GetName()}, {"Ratio", RtRatio}, {"File", RtFile.PathOrDummy}}}, {"AngularGear", New Dictionary(Of String, Object) From { @@ -304,7 +274,7 @@ Public Class cVEH {"Ratio", AngularGearRatio}, {"LossMap", AngularGearLossMapFile.PathOrDummy}}}, {"AxleConfig", New Dictionary(Of String, Object) From { - {"Type", ConvAxleConf(AxleConf)}, + {"Type", AxleConf.GetName()}, {"Axles", (From axle In Axles Select New Dictionary(Of String, Object) From { {"Inertia", axle.Inertia}, {"Wheels", axle.Wheels}, @@ -319,129 +289,8 @@ Public Class cVEH End Function - Public Function DeclInitCycle() As Boolean - Const msgSrc = "VEH/DeclInit" - Dim missionId = Declaration.CurrentMission.MissionID - - MassExtra = Declaration.SegRef.GetBodyTrWeight(missionId) - - Dim al = Declaration.SegRef.AxleShares(missionId) - If al.Count > Axles.Count Then - WorkerMsg(tMsgID.Err, "Invalid number of axles! Defined: " & Axles.Count & ", required: " & al.Count, msgSrc) - Return False - End If - - Dim i = -1 - For Each a In al - i += 1 - Axles(i).Share = a / 100 - Next - - 'Remove non-Truck axles - Do While Axles.Count > al.Count - Axles.RemoveAt(Axles.Count - 1) - Loop - - '(Semi-) Trailer - If Not Declaration.SegRef.TrailerOnlyInLongHaul OrElse missionId = tMission.LongHaul Then - al = Declaration.SegRef.AxleSharesTr(missionId) - For Each a In al - Dim a0 = New cAxle - a0.Inertia = 0 'Defined later - a0.Wheels = cDeclaration.TyreTr - a0.Share = a / 100 - a0.TwinTire = False - a0.RRC = cDeclaration.RRCTr - a0.FzISO = cDeclaration.FzISOTr - Axles.Add(a0) - Next - End If - - 'Wheels Inertias - For Each a0 In Axles - a0.Inertia = Declaration.WheelsInertia(a0.Wheels) - If a0.Inertia < 0 Then - WorkerMsg(tMsgID.Err, "Selected wheels (" & a0.Wheels & ") are not supported!", msgSrc) - Return False - End If - Next - - CdMode = tCdMode.CdOfVdecl - If Not Declaration.SegRef.VCDVparam.ContainsKey(missionId) Then - WorkerMsg(tMsgID.Err, "No Cross Wind Correction parameters defined for current vehicle & mission profile!", msgSrc) - Return False - End If - - If Declaration.SegRef.TrailerOnlyInLongHaul Then - If missionId = tMission.LongHaul Then - CdA0Act = CdA0 - Else - CdA0Act = CdA02 - End If - Else - CdA0Act = CdA0 - End If - - Return True - End Function - - Public Function DeclInitLoad(loadingId As tLoading) As Boolean - Const msgSrc = "VEH/DeclInit" - - Dim missionId As tMission = Declaration.CurrentMission.MissionID - Dim lmax = MassMax * 1000 - Mass - MassExtra - - Select Case loadingId - Case tLoading.FullLoaded - Loading = lmax - - Case tLoading.RefLoaded - Loading = Declaration.SegRef.GetLoading(missionId, MassMax) - If Loading < 0 Then - WorkerMsg(tMsgID.Err, "Invalid loading in segement table!", msgSrc) - Return False - End If - - If Loading > lmax Then - WorkerMsg(tMsgID.Warn, "Reference loading > Max. loading! Using max. loading.", msgSrc) - Loading = lmax - End If - - Case tLoading.EmptyLoaded - Loading = 0 - - Case Else ' tLoading.EmptyLoaded - WorkerMsg(tMsgID.Err, "tLoading.UserDefLoaded not allowed!", msgSrc) - Return False - - End Select - - Return True - End Function - - #Region "Properties" - Public ReadOnly Property FileList As List(Of String) - Get - Return _myFileList - End Get - End Property - - Public ReadOnly Property MRed As Single - Get - Return m_red0 - End Get - End Property - - Public Property Fr0 As Single - Get - Return siFr0 - End Get - Set(value As Single) - siFr0 = value - End Set - End Property Public Property FilePath() As String Get diff --git a/VECTO/M_MAIN.vb b/VECTO/M_MAIN.vb index 11f49623f495c1177ccef0bd68026dc971e49c17..2a0865967ddf54779011c3a26573aee789c03bea 100644 --- a/VECTO/M_MAIN.vb +++ b/VECTO/M_MAIN.vb @@ -9,23 +9,58 @@ ' ' See the LICENSE.txt for the specific language governing permissions and limitations. Imports System.Collections.Generic +Imports TUGraz.VectoCommon.Utils +Imports TUGraz.VectoCore.Models.SimulationComponent.Data +Imports TUGraz.VectoCore.Models.SimulationComponent.Data.Engine ''' <summary> ''' Main calculation routines. ''' </summary> ''' <remarks></remarks> Module M_MAIN - Public JobFileList As List(Of String) Public JobCycleList As List(Of String) - Public JobFile As String - Public CycleFiles As New List(Of String) - Public CurrentCycleFile As String + Public Function ConvertToEngineData(fld As cFLD, nIdle As Single) As CombustionEngineData + + Dim retVal As CombustionEngineData = New CombustionEngineData() + retVal.FullLoadCurve = New EngineFullLoadCurve() + retVal.FullLoadCurve.FullLoadEntries = New List(Of FullLoadCurve.FullLoadCurveEntry) + For i As Integer = 0 To fld.LnU.Count - 1 + retVal.FullLoadCurve.FullLoadEntries.Add( + New FullLoadCurve.FullLoadCurveEntry() _ + With {.EngineSpeed = CType(fld.LnU(i), Double).RPMtoRad(), + .TorqueFullLoad = CType(fld.LTq(i), Double).SI(Of NewtonMeter)(), + .TorqueDrag = CType(fld.LTqDrag(i), Double).SI(Of NewtonMeter)()}) + Next + retVal.IdleSpeed = CType(nIdle, Double).RPMtoRad() + Return retVal + End Function + Public Function ConvPicPath(hdVclass As String, isLongHaul As Boolean) As Bitmap + Dim longHaulFlag As String = "" + If isLongHaul Then + longHaulFlag = "t" + End If - '--------------------------------------------------------------------------- + Select Case hdVclass + Case 1, 2, 3 + Return My.Resources._4x2r ' resourcePath & "4x2r.png" + Case 4 + If isLongHaul Then Return My.Resources._4x2rt + Return My.Resources._4x2r 'resourcePath & "4x2r" & longHaulFlag & ".png" + Case 5 + Return My.Resources._4x2tt ' resourcePath & "4x2tt.png" + Case 9 + If isLongHaul Then Return My.Resources._6x2rt + Return My.Resources._6x2r ' resourcePath & "6x2r" & longHaulFlag & ".png" + Case 10 + Return My.Resources._6x2tt ' resourcePath & "6x2tt.png" + Case Else + Return My.Resources.Undef ' resourcePath & "Undef.png" + End Select + End Function End Module diff --git a/VECTO/My Project/Application.Designer.vb b/VECTO/My Project/Application.Designer.vb index f0ede7942f61cd60fb7b872e01b3f46ca05d5f04..c29e79c746fa68df6568206697233065bc74e72c 100644 --- a/VECTO/My Project/Application.Designer.vb +++ b/VECTO/My Project/Application.Designer.vb @@ -1,38 +1,39 @@ '------------------------------------------------------------------------------ ' <auto-generated> -' This code was generated by a tool. -' Laufzeitversion:4.0.30319.34209 +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 ' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. ' </auto-generated> '------------------------------------------------------------------------------ Option Strict On Option Explicit On +Imports Microsoft.VisualBasic.ApplicationServices Namespace My - 'NOTE: This file is auto-generated; do not modify it directly. To make changes, - ' or if you encounter build errors in this file, go to the Project Designer - ' (go to Project Properties or double-click the My Project node in - ' Solution Explorer), and make changes on the Application tab. + 'HINWEIS: Diese Datei wird automatisch generiert. Ändern Sie sie nicht direkt. Zum Ändern + ' oder bei in dieser Datei auftretenden Buildfehlern wechseln Sie zum Projekt-Designer. + ' (Wechseln Sie dazu zu den Projekteigenschaften, oder doppelklicken Sie auf den Knoten "Mein Projekt" im + ' Projektmappen-Explorer). Nehmen Sie auf der Registerkarte "Anwendung" entsprechende Änderungen vor. ' Partial Friend Class MyApplication - <Global.System.Diagnostics.DebuggerStepThroughAttribute()> _ + <DebuggerStepThrough()> _ Public Sub New() - MyBase.New(Global.Microsoft.VisualBasic.ApplicationServices.AuthenticationMode.Windows) + MyBase.New(AuthenticationMode.Windows) Me.IsSingleInstance = false Me.EnableVisualStyles = true Me.SaveMySettingsOnExit = true - Me.ShutDownStyle = Global.Microsoft.VisualBasic.ApplicationServices.ShutdownMode.AfterMainFormCloses + Me.ShutDownStyle = ShutdownMode.AfterMainFormCloses End Sub - <Global.System.Diagnostics.DebuggerStepThroughAttribute()> _ + <DebuggerStepThrough()> _ Protected Overrides Sub OnCreateMainForm() - Me.MainForm = Global.VECTO.F_MAINForm + Me.MainForm = VECTO.F_MAINForm End Sub End Class End Namespace diff --git a/VECTO/My Project/AssemblyInfo.vb b/VECTO/My Project/AssemblyInfo.vb index 6f9f65a1f16bc428e77dd4a3699d872a342fa8da..ead781488a4be9701c367c9b2b571e390a27aa40 100644 --- a/VECTO/My Project/AssemblyInfo.vb +++ b/VECTO/My Project/AssemblyInfo.vb @@ -1,4 +1,4 @@ -Imports System + Imports System.Reflection Imports System.Runtime.InteropServices diff --git a/VECTO/My Project/Resources.Designer.vb b/VECTO/My Project/Resources.Designer.vb index f46ddbaa0d0535c5f5c50e993442cf6e3cc8ccd5..ed250025c5c6fc3fdc7d2ba8e8ee72d9d61c044b 100644 --- a/VECTO/My Project/Resources.Designer.vb +++ b/VECTO/My Project/Resources.Designer.vb @@ -1,473 +1,547 @@ '------------------------------------------------------------------------------ ' <auto-generated> -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 ' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. ' </auto-generated> '------------------------------------------------------------------------------ Option Strict On Option Explicit On -Imports System +Imports System.CodeDom.Compiler +Imports System.ComponentModel +Imports System.Globalization +Imports System.Resources +Imports System.Runtime.CompilerServices Namespace My.Resources - - 'This class was auto-generated by the StronglyTypedResourceBuilder - 'class via a tool like ResGen or Visual Studio. - 'To add or remove a member, edit your .ResX file then rerun ResGen - 'with the /str option, or rebuild your VS project. - '''<summary> - ''' A strongly-typed resource class, for looking up localized strings, etc. - '''</summary> - <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"), _ - Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _ - Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _ - Global.Microsoft.VisualBasic.HideModuleNameAttribute()> _ - Friend Module Resources - - Private resourceMan As Global.System.Resources.ResourceManager - - Private resourceCulture As Global.System.Globalization.CultureInfo - - '''<summary> - ''' Returns the cached ResourceManager instance used by this class. - '''</summary> - <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _ - Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager - Get - If Object.ReferenceEquals(resourceMan, Nothing) Then - Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("VECTO.Resources", GetType(Resources).Assembly) - resourceMan = temp - End If - Return resourceMan - End Get - End Property - - '''<summary> - ''' Overrides the current thread's CurrentUICulture property for all - ''' resource lookups using this strongly typed resource class. - '''</summary> - <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _ - Friend Property Culture() As Global.System.Globalization.CultureInfo - Get - Return resourceCulture - End Get - Set - resourceCulture = value - End Set - End Property - - '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property Actions_arrow_down_icon() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("Actions_arrow_down_icon", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property Actions_arrow_up_icon() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("Actions_arrow_up_icon", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property Actions_document_save_as_icon() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("Actions_document_save_as_icon", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property Actions_document_save_icon() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("Actions_document_save_icon", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property application_add_icon() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("application_add_icon", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property application_export_icon_small() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("application_export_icon_small", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property blue_document_icon() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("blue_document_icon", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property desktop() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("desktop", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property export_icon() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("export_icon", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property F_ENG() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("F_ENG", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property F_GBX() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("F_GBX", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property F_Graph() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("F_Graph", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property F_VECTO() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("F_VECTO", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property F_VEH() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("F_VEH", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property favorites() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("favorites", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property file_history() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("file_history", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property Help_icon() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("Help_icon", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - '''<summary> - ''' Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - '''</summary> - Friend ReadOnly Property Icon2() As System.Drawing.Icon - Get - Dim obj As Object = ResourceManager.GetObject("Icon2", resourceCulture) - Return CType(obj,System.Drawing.Icon) - End Get - End Property - - '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property Information_icon() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("Information_icon", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property IVT_91x44() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("IVT_91x44", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property IVT_About() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("IVT_About", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property JRC_About() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("JRC_About", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property minus_circle_icon() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("minus_circle_icon", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property Misc_Tools_icon() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("Misc_Tools_icon", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property new_dir() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("new_dir", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property Open_icon() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("Open_icon", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property Play_icon() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("Play_icon", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property Play_icon_gray() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("Play_icon_gray", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property plus_circle_icon() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("plus_circle_icon", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property Refresh_icon() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("Refresh_icon", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property Status_dialog_password_icon() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("Status_dialog_password_icon", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property Stop_icon() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("Stop_icon", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property TUG_91x34() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("TUG_91x34", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property TUG_About() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("TUG_About", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property up_directory() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("up_directory", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property VECTO_About() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("VECTO_About", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property VECTO_ENG() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("VECTO_ENG", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property VECTO_GBX() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("VECTO_GBX", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property VECTO_Mainform() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("VECTO_Mainform", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property VECTO_VECTO() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("VECTO_VECTO", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - '''<summary> - ''' Looks up a localized resource of type System.Drawing.Bitmap. - '''</summary> - Friend ReadOnly Property VECTO_VEH() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("VECTO_VEH", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - End Module + + 'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert + '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. + 'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen + 'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. + '''<summary> + ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. + '''</summary> + <GeneratedCode("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"), _ + DebuggerNonUserCode(), _ + CompilerGenerated(), _ + HideModuleName()> _ + Friend Module Resources + + Private resourceMan As ResourceManager + + Private resourceCulture As CultureInfo + + '''<summary> + ''' Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. + '''</summary> + <EditorBrowsable(EditorBrowsableState.Advanced)> _ + Friend ReadOnly Property ResourceManager() As ResourceManager + Get + If ReferenceEquals(resourceMan, Nothing) Then + Dim temp As ResourceManager = New ResourceManager("TUGraz.VECTO.Resources", GetType(Resources).Assembly) + resourceMan = temp + End If + Return resourceMan + End Get + End Property + + '''<summary> + ''' Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle + ''' Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. + '''</summary> + <EditorBrowsable(EditorBrowsableState.Advanced)> _ + Friend Property Culture() As CultureInfo + Get + Return resourceCulture + End Get + Set(value As CultureInfo) + resourceCulture = value + End Set + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property _4x2r() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("_4x2r", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property _4x2rt() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("_4x2rt", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property _4x2tt() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("_4x2tt", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property _6x2r() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("_6x2r", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property _6x2rt() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("_6x2rt", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property _6x2tt() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("_6x2tt", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property Actions_arrow_down_icon() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Actions_arrow_down_icon", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property Actions_arrow_up_icon() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Actions_arrow_up_icon", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property Actions_document_save_as_icon() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Actions_document_save_as_icon", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property Actions_document_save_icon() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Actions_document_save_icon", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property application_add_icon() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("application_add_icon", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property application_export_icon_small() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("application_export_icon_small", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property blue_document_icon() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("blue_document_icon", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property desktop() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("desktop", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property export_icon() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("export_icon", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property F_ENG() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("F_ENG", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property F_GBX() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("F_GBX", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property F_Graph() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("F_Graph", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property F_VECTO() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("F_VECTO", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property F_VEH() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("F_VEH", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property favorites() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("favorites", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property file_history() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("file_history", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property Help_icon() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Help_icon", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol). + '''</summary> + Friend ReadOnly Property Icon2() As Icon + Get + Dim obj As Object = ResourceManager.GetObject("Icon2", resourceCulture) + Return CType(obj, Icon) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property Information_icon() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Information_icon", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property IVT_91x44() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("IVT_91x44", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property IVT_About() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("IVT_About", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property JRC_About() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("JRC_About", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property minus_circle_icon() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("minus_circle_icon", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property Misc_Tools_icon() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Misc_Tools_icon", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property new_dir() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("new_dir", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property Open_icon() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Open_icon", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property Play_icon() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Play_icon", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property Play_icon_gray() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Play_icon_gray", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property plus_circle_icon() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("plus_circle_icon", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property Refresh_icon() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Refresh_icon", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property Status_dialog_password_icon() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Status_dialog_password_icon", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property Stop_icon() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Stop_icon", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property TUG_91x34() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("TUG_91x34", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property TUG_About() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("TUG_About", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property Undef() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Undef", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property up_directory() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("up_directory", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property VECTO_About() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("VECTO_About", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property VECTO_ENG() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("VECTO_ENG", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property VECTO_GBX() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("VECTO_GBX", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property VECTO_Mainform() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("VECTO_Mainform", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property VECTO_VECTO() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("VECTO_VECTO", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + + '''<summary> + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + '''</summary> + Friend ReadOnly Property VECTO_VEH() As Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("VECTO_VEH", resourceCulture) + Return CType(obj, Bitmap) + End Get + End Property + End Module End Namespace diff --git a/VECTO/My Project/Resources.resx b/VECTO/My Project/Resources.resx index 750b31bb0f5760cd2ff8013b2006e358e384ad93..7338ebea8417c443ad6dd80922ce9e3a04cee2fd 100644 --- a/VECTO/My Project/Resources.resx +++ b/VECTO/My Project/Resources.resx @@ -241,4 +241,25 @@ <data name="up_directory" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\up-directory16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <data name="Undef" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\Undef.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="_4x2r" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\4x2r.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="_4x2rt" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\4x2rt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="_4x2tt" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\4x2tt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="_6x2r" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\6x2r.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="_6x2rt" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\6x2rt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="_6x2tt" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\6x2tt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> </root> \ No newline at end of file diff --git a/VECTO/My Project/Settings.Designer.vb b/VECTO/My Project/Settings.Designer.vb index feb79f4839ce6af100bbd2fdbfe06075976d493c..fe671d33fa12dfc6b623084a880991b314f24a58 100644 --- a/VECTO/My Project/Settings.Designer.vb +++ b/VECTO/My Project/Settings.Designer.vb @@ -1,73 +1,78 @@ '------------------------------------------------------------------------------ ' <auto-generated> -' This code was generated by a tool. -' Laufzeitversion:4.0.30319.34209 +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 ' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. ' </auto-generated> '------------------------------------------------------------------------------ Option Strict On Option Explicit On +Imports System.CodeDom.Compiler +Imports System.ComponentModel +Imports System.ComponentModel.Design +Imports System.Configuration +Imports System.Runtime.CompilerServices Namespace My - - <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _ - Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0"), _ - Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _ - Partial Friend NotInheritable Class MySettings - Inherits Global.System.Configuration.ApplicationSettingsBase - - Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings) - -#Region "My.Settings Auto-Save Functionality" + + <CompilerGenerated(), _ + GeneratedCode("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0"), _ + EditorBrowsable(EditorBrowsableState.Advanced)> _ + Partial Friend NotInheritable Class MySettings + Inherits ApplicationSettingsBase + + Private Shared defaultInstance As MySettings = CType(Synchronized(New MySettings()), MySettings) + +#Region "Funktion zum automatischen Speichern von My.Settings" #If _MyType = "WindowsForms" Then - Private Shared addedHandler As Boolean + Private Shared addedHandler As Boolean - Private Shared addedHandlerLockObject As New Object + Private Shared addedHandlerLockObject As New Object - <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _ - Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs) - If My.Application.SaveMySettingsOnExit Then - My.Settings.Save() - End If - End Sub + <DebuggerNonUserCode(), EditorBrowsable(EditorBrowsableState.Advanced)> _ + Private Shared Sub AutoSaveSettings(ByVal sender As Object, ByVal e As EventArgs) + If Application.SaveMySettingsOnExit Then + Settings.Save() + End If + End Sub #End If #End Region - - Public Shared ReadOnly Property [Default]() As MySettings - Get - + + Public Shared ReadOnly Property [Default]() As MySettings + Get + #If _MyType = "WindowsForms" Then - If Not addedHandler Then - SyncLock addedHandlerLockObject - If Not addedHandler Then - AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings - addedHandler = True - End If - End SyncLock - End If + If Not addedHandler Then + SyncLock addedHandlerLockObject + If Not addedHandler Then + AddHandler Application.Shutdown, AddressOf AutoSaveSettings + addedHandler = True + End If + End SyncLock + End If #End If - Return defaultInstance - End Get - End Property - End Class + Return defaultInstance + End Get + End Property + End Class End Namespace Namespace My - - <Global.Microsoft.VisualBasic.HideModuleNameAttribute(), _ - Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _ - Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()> _ - Friend Module MySettingsProperty - - <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")> _ - Friend ReadOnly Property Settings() As Global.VECTO.My.MySettings - Get - Return Global.VECTO.My.MySettings.Default - End Get - End Property - End Module + + <HideModuleName(), _ + DebuggerNonUserCode(), _ + CompilerGenerated()> _ + Friend Module MySettingsProperty + + <HelpKeyword("My.Settings")> _ + Friend ReadOnly Property Settings() As MySettings + Get + Return MySettings.Default + End Get + End Property + End Module End Namespace diff --git a/VECTO/VECTO.vbproj b/VECTO/VECTO.vbproj index b5591551ea24fa8af37488393e6c7de8d6505646..3f5d27cd76d900ba5b6ecd7ea839f5fa64c4ad6d 100644 --- a/VECTO/VECTO.vbproj +++ b/VECTO/VECTO.vbproj @@ -7,8 +7,8 @@ <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{AAC0F132-0A9F-45B3-B682-77AC9B24B352}</ProjectGuid> <OutputType>WinExe</OutputType> - <StartupObject>VECTO.My.MyApplication</StartupObject> - <RootNamespace>VECTO</RootNamespace> + <StartupObject>TUGraz.VECTO.My.MyApplication</StartupObject> + <RootNamespace>TUGraz.VECTO</RootNamespace> <AssemblyName>VECTO</AssemblyName> <MyType>WindowsForms</MyType> <ApplicationIcon>Resources\Icon2.ico</ApplicationIcon> @@ -156,7 +156,6 @@ <ItemGroup> <Compile Include="ApplicationEvents.vb" /> <Compile Include="cJSONparser.vb" /> - <Compile Include="cDeclaration.vb" /> <Compile Include="GUI\F_FileSign.Designer.vb"> <DependentUpon>F_FileSign.vb</DependentUpon> </Compile> @@ -218,13 +217,9 @@ <SubType>Form</SubType> </Compile> <Compile Include="Input Files\cAdvancedAuxiliary.vb" /> - <Compile Include="Input Files\cAux.vb" /> - <Compile Include="Input Files\cAuxEntry.vb" /> - <Compile Include="Input Files\cAuxEntryPS.vb" /> <Compile Include="Input Files\cENG.vb" /> <Compile Include="Input Files\cGBX.vb" /> <Compile Include="Configuration.vb" /> - <Compile Include="cDelaunayMap.vb" /> <Compile Include="cDEV.vb" /> <Compile Include="File Browser\cFileBrowser.vb" /> <Compile Include="mAAUX_Global.vb" /> @@ -242,7 +237,6 @@ </Compile> <Compile Include="Input Files\cFLD.vb" /> <Compile Include="Input Files\cMAP.vb" /> - <Compile Include="Input Files\cDRI.vb" /> <Compile Include="Input Files\cVECTO.vb" /> <Compile Include="Input Files\cVEH.vb" /> <Compile Include="GUI\GearboxGearDialog.Designer.vb"> @@ -267,7 +261,6 @@ <Compile Include="cFile V3.vb" /> <Compile Include="VECTO_Global.vb" /> <Compile Include="VECTO_Types.vb" /> - <Compile Include="cRegression.vb" /> <Compile Include="GUI\GUI_Subs.vb" /> <Compile Include="GUI\F_VEH.Designer.vb"> <DependentUpon>F_VEH.vb</DependentUpon> @@ -385,8 +378,6 @@ </EmbeddedResource> </ItemGroup> <ItemGroup> - <None Include="ClassDiagram1.cd" /> - <None Include="ClassDiagram2.cd" /> <None Include="My Project\app.manifest"> <SubType>Designer</SubType> </None> @@ -1508,12 +1499,19 @@ <None Include="Resources\desktop.png" /> <None Include="Resources\favorites.png" /> <None Include="Resources\file-history.png" /> + <EmbeddedResource Include="Resources\4x2r.png" /> + <EmbeddedResource Include="Resources\4x2rt.png" /> + <EmbeddedResource Include="Resources\4x2tt.png" /> + <EmbeddedResource Include="Resources\6x2r.png" /> + <EmbeddedResource Include="Resources\6x2rt.png" /> + <EmbeddedResource Include="Resources\6x2tt.png" /> <Content Include="Resources\F_ENG.ico" /> <Content Include="Resources\F_GBX.ico" /> <Content Include="Resources\F_VECTO.ico" /> <Content Include="Resources\F_VEH.ico" /> <Content Include="Resources\Graph.ico" /> <Content Include="Resources\Status-dialog-password-icon.ico" /> + <EmbeddedResource Include="Resources\Undef.png" /> <Content Include="Resources\up.ico" /> <Content Include="Resources\up.png" /> </ItemGroup> diff --git a/VECTO/VECTO_Global.vb b/VECTO/VECTO_Global.vb index e4dac8e2beee35bf9c9a5c93b03bd5f149a53be6..7f97e4eae67875c9ab64a0abfca90c690b5b12d7 100644 --- a/VECTO/VECTO_Global.vb +++ b/VECTO/VECTO_Global.vb @@ -11,7 +11,6 @@ Imports System.ComponentModel Imports System.IO Imports System.Text -Imports TUGraz.VectoCommon.Models Imports vectolic Public Module VECTO_Global @@ -21,7 +20,7 @@ Public Module VECTO_Global Public Const LicSigAppCode As String = "VECTO-Release-0093C61E0A2E4BFA9A7ED7E729C56AE4" Public MyAppPath As String Public MyConfPath As String - Public MyDeclPath As String + Public LogFile As cLogFile @@ -40,18 +39,10 @@ Public Module VECTO_Global Public FileFormat As Encoding = Encoding.UTF8 - Public VEC As cVECTO - Public VEH As cVEH - Public ENG As cENG - Public GBX As cGBX - Public MAP As cMAP - Public DRI As cDRI - 'Public MODdata As cMOD Public Lic As cLicense 'Public VSUM As cVSUM Public DEV As cDEV - Public Declaration As cDeclaration Public ProgBarCtrl As cProgBarCtrl @@ -66,349 +57,6 @@ Public Module VECTO_Global Return (nU * 2 * Math.PI / 60) * M / 1000 End Function - ''' <summary> - ''' Convert engine speed and power to torque. - ''' </summary> - ''' <param name="nU">engine speed</param> - ''' <param name="Pe">Power</param> - ''' <returns>Torque</returns> - ''' <remarks></remarks> - Public Function nPeToM(nU As Single, Pe As Double) As Single - Return Pe * 1000 / (nU * 2 * Math.PI / 60) - End Function - - -#Region "sKey > Typ Umwandlung" - - - Public Function GearboxConv(Gearbox As tGearbox) As String - Select Case Gearbox - Case tGearbox.Manual - Return "MT" - Case tGearbox.AutomaticSerial - Return "ATSerial" - Case tGearbox.AutomaticPowerSplit - Return "ATPowerSplit" - Case tGearbox.SemiAutomatic - Return "AMT" - Case Else 'tGearbox.Custom - Return "Custom" - End Select - End Function - - Public Function GearboxConv(Gearbox As String) As tGearbox - Select Case UCase(Trim(Gearbox)) - Case "MT" - Return tGearbox.Manual - Case "AT" - Return tGearbox.AutomaticSerial - Case "ATSERIAL" - Return tGearbox.AutomaticSerial - Case "ATPOWERSPLIT" - Return tGearbox.AutomaticPowerSplit - Case "AMT" - Return tGearbox.SemiAutomatic - Case Else '"Custom" - Return tGearbox.Custom - End Select - End Function - - Public Function fDriComp(sK As String) As tDriComp - sK = Trim(UCase(sK)) - Select Case sK - Case sKey.DRI.t - Return tDriComp.t - Case sKey.DRI.V - Return tDriComp.V - Case sKey.DRI.Grad - Return tDriComp.Grad - Case sKey.DRI.nU - Return tDriComp.nU - Case sKey.DRI.Gears - Return tDriComp.Gears - Case sKey.DRI.Padd - Return tDriComp.Padd - Case sKey.DRI.Pe - Return tDriComp.Pe - Case sKey.DRI.VairVres - Return tDriComp.VairVres - Case sKey.DRI.VairBeta - Return tDriComp.VairBeta - Case sKey.DRI.s - Return tDriComp.s - Case sKey.DRI.StopTime - Return tDriComp.StopTime - Case sKey.DRI.Torque - Return tDriComp.Torque - Case sKey.DRI.Alt - Return tDriComp.Alt - Case sKey.DRI.Pwheel - Return tDriComp.Pwheel - Case Else - Return tDriComp.Undefined - - End Select - End Function - - Public Function fAuxComp(sK As String) As tAuxComp - Dim x As Integer - sK = Trim(UCase(sK)) - - x = sK.IndexOf("_") - - If x = -1 Then Return tAuxComp.Undefined - - sK = Left(sK, x + 1) - - Select Case sK - Case sKey.PauxSply - Return tAuxComp.Psupply - Case Else - Return tAuxComp.Undefined - End Select - End Function - - - Public Function fCompSubStr(sK As String) As String - Dim x As Integer - - sK = Trim(UCase(sK)) - - x = sK.IndexOf("_") - - If x = -1 Then Return "" - - sK = Right(sK, Len(sK) - x - 1) - - x = CShort(sK.IndexOf(">")) - - If x = -1 Then Return "" - - sK = Left(sK, x) - - Return sK - End Function - - -#End Region - -#Region "Typ > Name Conversion" - - Public Function ConvLoading(load As tLoading) As String - Select Case load - Case tLoading.FullLoaded - Return "Full Loading" - - Case tLoading.RefLoaded - Return "Reference Loading" - - Case tLoading.EmptyLoaded - Return "Empty Loading" - - Case Else ' tLoading.UserDefLoaded - Return "User-defined Loading" - - End Select - End Function - - - Public Function ConvVehCat(VehCat As tVehCat, NiceName As Boolean) As String - Select Case VehCat - Case tVehCat.Citybus - Return "Citybus" - Case tVehCat.Coach - Return "Coach" - Case tVehCat.InterurbanBus - If NiceName Then - Return "Interurban Bus" - Else - Return "InterurbanBus" - End If - Case tVehCat.RigidTruck - If NiceName Then - Return "Rigid Truck" - Else - Return "RigidTruck" - End If - Case tVehCat.Tractor - If NiceName Then - Return "Semitrailer Truck" - Else - Return "Tractor" - End If - Case Else ' tVehCat.Undef - Return "not defined" - End Select - End Function - - Public Function ConvVehCat(VehCat As String) As tVehCat - Select Case UCase(Trim(VehCat)) - Case "CITYBUS" - Return tVehCat.Citybus - Case "COACH" - Return tVehCat.Coach - Case "INTERURBANBUS" - Return tVehCat.InterurbanBus - Case "RIGIDTRUCK" - Return tVehCat.RigidTruck - Case "TRACTOR" - Return tVehCat.Tractor - Case Else - Return tVehCat.Undef - End Select - End Function - - Public Function ConvAxleConf(AxleConf As tAxleConf) As String - Select Case AxleConf - Case tAxleConf.a4x2 - Return "4x2" - Case tAxleConf.a4x4 - Return "4x4" - Case tAxleConf.a6x2 - Return "6x2" - Case tAxleConf.a6x4 - Return "6x4" - Case tAxleConf.a6x6 - Return "6x6" - Case tAxleConf.a8x2 - Return "8x2" - Case tAxleConf.a8x4 - Return "8x4" - Case tAxleConf.a8x6 - Return "8x6" - Case Else 'tAxleConf.a8x8 - Return "8x8" - End Select - End Function - - Public Function ConvAxleConf(AxleConf As String) As tAxleConf - Select Case UCase(Trim(AxleConf)) - Case "4X2" - Return tAxleConf.a4x2 - Case "4X4" - Return tAxleConf.a4x4 - Case "6X2" - Return tAxleConf.a6x2 - Case "6X4" - Return tAxleConf.a6x4 - Case "6X6" - Return tAxleConf.a6x6 - Case "8X2" - Return tAxleConf.a8x2 - Case "8X4" - Return tAxleConf.a8x4 - Case "8X6" - Return tAxleConf.a8x6 - Case Else '"8X8" - Return tAxleConf.a8x8 - End Select - End Function - - Public Function ConvMission(Mission As tMission) As String - Select Case Mission - Case tMission.LongHaul - Return "LongHaul" - Case tMission.RegionalDelivery - Return "RegionalDelivery" - Case tMission.UrbanDelivery - Return "UrbanDelivery" - Case tMission.MunicipalUtility - Return "MunicipalUtility" - Case tMission.Construction - Return "Construction" - Case tMission.HeavyUrban - Return "HeavyUrban" - Case tMission.Urban - Return "Urban" - Case tMission.Suburban - Return "Suburban" - Case tMission.Interurban - Return "Interurban" - Case tMission.Coach - Return "Coach" - Case Else - Return "not defined" - End Select - End Function - - Public Function ConvMission(Mission As String) As tMission - Select Case Mission - Case "LongHaul" - Return tMission.LongHaul - Case "RegionalDelivery" - Return tMission.RegionalDelivery - Case "UrbanDelivery" - Return tMission.UrbanDelivery - Case "MunicipalUtility" - Return tMission.MunicipalUtility - Case "Construction" - Return tMission.Construction - Case "HeavyUrban" - Return tMission.HeavyUrban - Case "Urban" - Return tMission.Urban - Case "Suburban" - Return tMission.Suburban - Case "Interurban" - Return tMission.Interurban - Case "Coach" - Return tMission.Coach - Case Else - Return tMission.Undef - End Select - End Function - - - Public Function CdModeConv(CdMode As tCdMode) As String - Select Case CdMode - Case tCdMode.CdOfBeta - Return "CdOfBeta" - Case tCdMode.CdOfVeng - Return "CdOfVeng" - Case tCdMode.CdOfVdecl - Return "CdOfVdecl" - Case Else 'tCdMode.ConstCd0 - Return "Off" - End Select - End Function - - Public Function CdModeConv(CdMode As String) As tCdMode - Select Case UCase(Trim(CdMode)) - Case "CDOFBETA" - Return tCdMode.CdOfBeta - Case "CDOFV", "CDOFVENG" - Return tCdMode.CdOfVeng - Case "CDOFVDECL" - Return tCdMode.CdOfVdecl - Case Else '"OFF" - Return tCdMode.ConstCd0 - End Select - End Function - - - Public Function RtTypeConv(RtType As tRtType) As String - Select Case RtType - Case tRtType.Primary - Return "Primary" - Case tRtType.Secondary - Return "Secondary" - Case Else 'tRtType.None - Return "None" - End Select - End Function - - Public Function RtTypeConv(rtType As String) As tRtType - Select Case UCase(Trim(rtType)) - Case "PRIMARY" - Return tRtType.Primary - Case "SECONDARY" - Return tRtType.Secondary - Case Else '"NONE" - Return tRtType.None - End Select - End Function - -#End Region Public Class cLogFile Private LOGstream As StreamWriter @@ -567,9 +215,6 @@ Public Module VECTO_Global End Function 'Filename without extension "C:\temp\TEST.txt" >> "C:\temp\TEST" - Public Function fFileWoExt(Path As String) As String - Return fPATH(Path) & fFILE(Path, False) - End Function 'Filename without path if Path = WorkDir or MainDir Public Function fFileWoDir(file As String, Optional ByVal MainDir As String = "") As String @@ -612,7 +257,6 @@ End Module Public Class csKey - Public DRI As csKeyDRI Public AUX As csKeyAux Public HomePath As String = "<HOME>" @@ -629,26 +273,10 @@ Public Class csKey Public EngDrag As String = "<DRAG>" Public Sub New() - DRI = New csKeyDRI + AUX = New csKeyAux End Sub - Public Class csKeyDRI - Public t As String = "<T>" - Public V As String = "<V>" - Public Grad As String = "<GRAD>" - Public Alt As String = "<ALT>" - Public Gears As String = "<GEAR>" - Public nU As String = "<N>" - Public Pe As String = "<PE>" - Public Padd As String = "<PADD>" - Public VairVres As String = "<VAIR_RES>" - Public VairBeta As String = "<VAIR_BETA>" - Public s As String = "<S>" - Public StopTime As String = "<STOP>" - Public Torque As String = "<ME>" - Public Pwheel As String = "<PWHEEL>" - End Class Public Class csKeyAux Public Fan As String = "FAN" diff --git a/VECTO/VECTO_Types.vb b/VECTO/VECTO_Types.vb index bc848ef2b4444c664fae04091743bcd4c78e5eba..8025a593dc9bc06c1f2df8320f8a433c38b4d744 100644 --- a/VECTO/VECTO_Types.vb +++ b/VECTO/VECTO_Types.vb @@ -8,7 +8,7 @@ ' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ' ' See the LICENSE.txt for the specific language governing permissions and limitations. -Imports System.Runtime.CompilerServices + ''' <summary> ''' Determines how file extensions are set in the File Browser @@ -53,140 +53,5 @@ Public Enum tJobStatus Undef End Enum -Public Enum tDriComp - t - V - Grad - Alt - nU - Gears - Padd - Pe - VairVres - VairBeta - Undefined - s - StopTime - Torque - Pwheel -End Enum - -Public Enum tVehState - Cruise - Acc - Dec - Stopped -End Enum - -Public Enum tEngState - Idle - Drag - FullDrag - Load - FullLoad - Stopped - Undef -End Enum - -Public Enum tEngClutch - Closed - Opened - Slipping -End Enum - -Public Enum tAuxComp - Psupply - Undefined -End Enum - -Public Enum tCdMode - ConstCd0 = 0 - CdOfVeng = 1 - CdOfVdecl = 2 - CdOfBeta = 3 -End Enum - -Public Enum tRtType - None = 0 - Primary = 1 - Secondary = 2 -End Enum - -Public Enum tGearbox - Manual = 0 - SemiAutomatic = 1 - AutomaticSerial = 2 - AutomaticPowerSplit = 3 - Custom = 4 -End Enum - -<Extension> -Module tGearboxExtension - Public Function AutomaticTransmission(type As tGearbox) As Boolean - Return type = tGearbox.AutomaticPowerSplit OrElse type = tGearbox.AutomaticSerial - End Function - - - Public Function ManualTransmission(type As tGearbox) As Boolean - Return type = tGearbox.Manual OrElse type = tGearbox.SemiAutomatic - End Function -End Module - -Public Enum tVehCat As Integer - Undef = 0 - RigidTruck = 1 - Tractor = 2 - Citybus = 3 - InterurbanBus = 4 - Coach = 5 -End Enum - -Public Enum tAxleConf As Integer - Undef = 0 - a4x2 = 1 - a4x4 = 2 - a6x2 = 3 - a6x4 = 4 - a6x6 = 5 - a8x2 = 6 - a8x4 = 7 - a8x6 = 8 - a8x8 = 9 -End Enum - -Public Enum tLoading - FullLoaded - EmptyLoaded - RefLoaded - UserDefLoaded -End Enum - -Public Enum tMission - LongHaul - RegionalDelivery - UrbanDelivery - MunicipalUtility - Construction - HeavyUrban - Urban - Suburban - Interurban - Coach - Undef -End Enum - -Public Enum tWHTCpart - Urban - Rural - Motorway -End Enum - -Public Enum tAux - Fan - SteerPump - HVAC - ElectricSys - PneumSys -End Enum diff --git a/VECTO/cDEV.vb b/VECTO/cDEV.vb index 74b329765b9948b0ac06ac9d83c913caaa521666..d27524dc7a748267f17c350d2ea6fc2eac1f71c6 100644 --- a/VECTO/cDEV.vb +++ b/VECTO/cDEV.vb @@ -13,15 +13,7 @@ Imports System.Collections.Generic Public Class cDEV Public Enabled As Boolean - Private MyOptions As Dictionary(Of String, cDEVoption) - Private iOptionsDim As Integer - - Public AdvFormat As Boolean - Public TCiterPrec As Single - Public TClimitOn As Boolean - Public TClimit As Single - Public TCshiftModeNew As Boolean - Public TCaccmin As Single + Private ReadOnly MyOptions As Dictionary(Of String, cDEVoption) '************************************************************************************************************** @@ -89,80 +81,50 @@ Public Class cDEV Dim Conf0 As cDEVoption - 'Conf0 = New cDEVoption(tDEVconfType.tBoolean, "Kennfelderstellung mit Median") - 'Conf0.BoolVal = False - 'MyOptions.Add("KF-Median", Conf0) - - 'Conf0 = New cDEVoption(tDEVconfType.tAction, "Action Test") - 'Conf0.ActionDelegate = New cDEVoption.dActionDelegate(AddressOf Me.TestFunction) - 'MyOptions.Add("Action_Test", Conf0) - - 'Conf0 = New cDEVoption(tDEVconfType.tIntVal, "Integer Test", True, False) - 'Conf0.IntVal = 666 - 'MyOptions.Add("Integer_Test", Conf0) - - 'Conf0 = New cDEVoption(tDEVconfType.tSingleVal, "Single Test") - 'Conf0.SingleVal = 1.2345 - 'MyOptions.Add("Single_Test", Conf0) - 'Conf0 = New cDEVoption(tDEVconfType.tStringVal, "String Test", False) - 'Conf0.StringVal = "Hallo DU!" - 'MyOptions.Add("String_Test", Conf0) + 'Conf0 = New cDEVoption(tDEVconfType.tSingleVal, "TC iteration: target precision for torque ratio") + 'Conf0.SingleVal = 0.001 + 'MyOptions.Add("TCiterPrec", Conf0) - 'Conf0 = New cDEVoption(tDEVconfType.tSelection, "Menu Test", False, False) - 'Conf0.AddMode("Mode 0") - 'Conf0.AddMode("Hugo") - 'Conf0.AddMode("Charlie") - 'Conf0.AddMode("Mode 3") - 'Conf0.ModeIndex = 3 - 'MyOptions.Add("Menu_Test", Conf0) - - - 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, "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.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.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.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) + '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 '***************************** '***************************************************************************************** '***************************************************************************************** - - iOptionsDim = MyOptions.Count - 1 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 + '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() @@ -171,20 +133,15 @@ Public Class cDEV For Each opt0 In MyOptions.Values opt0.SetDefault() Next - End Sub - 'Demo for Delegate Function - Public Function TestFunction() As String - Return "OK...?" - End Function - - Public sub UpdateDevConfigs + + Public Sub UpdateDevConfigs() Dim lv0 As ListViewItem EnabledOptCheck() - for each lv0 In F_MAINForm.LvDEVoptions.Items + 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 @@ -194,36 +151,12 @@ Public Class cDEV Next End Sub - Private sub EnabledOptCheck + Private Sub EnabledOptCheck() MyOptions("TClimit").EnabledOpt = MyOptions("TClimitOn").BoolVal MyOptions("TCaccMin").EnabledOpt = MyOptions("TClimitOn").BoolVal Or MyOptions("TCshiftMode").ModeIndex = 1 End Sub - Public Function DEVinfo() As String - Dim s As New System.Text.StringBuilder - Dim Conf0 As KeyValuePair(Of String, cDEVoption) - - For Each Conf0 In MyOptions - - If Conf0.Value.ConfigType <> tDEVconfType.tAction Then - - s.Append(Conf0.Key & " <" & Conf0.Value.TypeString & "> (" & Conf0.Value.Description & ")") - - If Conf0.Value.ConfigType = tDEVconfType.tSelection Then - s.AppendLine("= " & Conf0.Value.ValToString & " (" & Conf0.Value.Mode & ")") - Else - s.AppendLine("= " & Conf0.Value.ValToString) - End If - - End If - - Next - - Return s.ToString - End Function - - Public Function LoadFromFile() As Boolean Dim file As cFile_V3 Dim ConfigFromFile As Dictionary(Of String, String) @@ -261,7 +194,7 @@ Public Class cDEV End If Next - UpdateDevConfigs + UpdateDevConfigs() Return True End Function @@ -303,12 +236,6 @@ Public Class cDEV End Get End Property - Public ReadOnly Property OptionsDim As Integer - Get - Return iOptionsDim - End Get - End Property - Protected Overrides Sub Finalize() MyBase.Finalize() End Sub @@ -364,13 +291,13 @@ Public Class cDEVoption End Select sModes = New List(Of String) - iModesDim = - 1 + iModesDim = -1 iIntVal = 0 sSingleVal = 0.0F bBoolVal = False sStringVal = "" - iModeIndex = - 1 + iModeIndex = -1 If MyConfType = tDEVconfType.tAction Then sValText = "" @@ -401,8 +328,6 @@ Public Class cDEVoption End If StringToVal(si) - - End Sub Public Sub DoAction() @@ -551,7 +476,7 @@ Public Class cDEVoption Public ReadOnly Property Mode As String Get - If iModeIndex = - 1 Then + If iModeIndex = -1 Then Return "<undefined>" Else Return sModes(iModeIndex) diff --git a/VECTO/cDeclaration.vb b/VECTO/cDeclaration.vb deleted file mode 100644 index a8c7554dc35e9803409a3b889df115299bd8306c..0000000000000000000000000000000000000000 --- a/VECTO/cDeclaration.vb +++ /dev/null @@ -1,1604 +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. -Option Infer On - -Imports System.Collections.Generic -Imports iTextSharp.text.pdf -Imports System.IO -Imports System.Linq -Imports iTextSharp.text - -Public Class cDeclaration - Public CurrentMission As cMission - Public CurrentLoading As tLoading - Public Missions As Dictionary(Of tMission, cMission) - Public SegmentTable As cSegmentTable - Public SegRef As cSegmentTableEntry - - Public Const SSspeed As Single = 5 - Public Const SStime As Single = 5 - Public Const SSdelay As Single = 5 - Public Const LACa As Single = -0.5 - Public Const LACvmin As Single = 50 - Public Const Overspeed As Single = 5 - Public Const Underspeed As Single = 5 - Public Const ECvmin As Single = 50 - - Public Const TqResv As Single = 20 - Public Const TqResvStart As Single = 20 - Public Const StartSpeed As Single = 2 - Public Const StartAcc As Single = 0.6 - Public Const GbInertia As Single = 0 - - Public Const RRCTr As Single = 0.00555 - Public Const FzISOTr As Single = 37500 - Public Const TyreTr As String = "385/65 R22.5" - - Public Const AirDensity As Single = 1.188 - Public Const FuelDens As Single = 0.832 - Public Const CO2perFC As Single = 3.16 - - Public Const AuxESeff As Single = 0.7 - - Public Const Vwind As Single = 3.0 - - Private lPT1nU As List(Of Single) - Private lPT1 As List(Of Single) - Private PT1dim As Integer - - Public WHTCcorrFactor As Single - - Public Report As cReport - - Public AuxTechs As Dictionary(Of tAux, List(Of String)) - Public AuxPower As Dictionary(Of String, Single) - - Private AuxFanPower As Dictionary(Of String, Dictionary(Of tMission, Single)) - Private AuxSteerPumpPower As Dictionary(Of String, Dictionary(Of tMission, Single())) - Private AuxSteepPumpFactors As Dictionary(Of String, Single()) - Private AuxHVACPower As Dictionary(Of String, Dictionary(Of tMission, Single)) - Public AuxESpower As Dictionary(Of String, Dictionary(Of tMission, Single)) - Private AuxPSpower As Dictionary(Of String, Dictionary(Of tMission, Single)) - - Private Wheels As Dictionary(Of String, cWheel) - - Private VCDVvehClassParam As Dictionary(Of String, List(Of Single)) - - Public Const UpshiftAfterDownshiftDelay As Single = 10 - - Public Const DownshiftAfterUpshiftDelay As Single = 10 - - Public Const UpshiftMinAcceleration As Single = 0.1 - - Public Function VCDVparamPerCat(VehCat As tVehCat) As List(Of Single) - Select Case VehCat - Case tVehCat.Citybus, tVehCat.Coach, tVehCat.InterurbanBus - Return VCDVvehClassParam("CoachBus") - Case tVehCat.Tractor - Return VCDVvehClassParam("TractorSemitrailer") - Case Else 'tVehCat.RigidTruck, tVehCat.Undef - Return VCDVvehClassParam("RigidSolo") - End Select - End Function - - Public Function Init() As Boolean - - Dim file As New cFile_V3 - Dim mc0 As cMission - Dim mt0 As tMission - Dim ste0 As cSegmentTableEntry - Dim line As String() - Dim i As Integer - Dim a As Integer - Dim s0 As String - Dim TrS As Single - Dim TrA As Single - Dim stl As String() - - Dim BodyTrWeightList As List(Of String) - Dim LoadingList As List(Of String) - Dim AxleShares As List(Of String) - Dim AxleSharesTr As List(Of String) - Dim l0 As List(Of Single) - - Dim at0 As List(Of String) - Dim AuxPower0 As Dictionary(Of tMission, Single) - Dim STEpower0 As Dictionary(Of tMission, Single()) - - 'Initialize - Missions = New Dictionary(Of tMission, cMission) - SegmentTable = New cSegmentTable - - If Not Directory.Exists(MyDeclPath) Then - GUImsg(tMsgID.Err, "Failed to load Declaration Config!") - Return False - End If - - 'Init Missionlist - mc0 = New cMission - mc0.MissionID = tMission.LongHaul - mc0.NameStr = "Long Haul" - mc0.CyclePath = MyDeclPath & "MissionCycles\Long_Haul.vdri" - Missions.Add(mc0.MissionID, mc0) - SegmentTable.MissionList.Add(mc0.MissionID) - - mc0 = New cMission - mc0.MissionID = tMission.RegionalDelivery - mc0.NameStr = "Regional Delivery" - mc0.CyclePath = MyDeclPath & "MissionCycles\Regional_Delivery.vdri" - Missions.Add(mc0.MissionID, mc0) - SegmentTable.MissionList.Add(mc0.MissionID) - - mc0 = New cMission - mc0.MissionID = tMission.UrbanDelivery - mc0.NameStr = "Urban Delivery" - mc0.CyclePath = MyDeclPath & "MissionCycles\Urban_Delivery.vdri" - Missions.Add(mc0.MissionID, mc0) - SegmentTable.MissionList.Add(mc0.MissionID) - - mc0 = New cMission - mc0.MissionID = tMission.MunicipalUtility - mc0.NameStr = "Municipal Utility" - mc0.CyclePath = MyDeclPath & "MissionCycles\Municipal_Utility.vdri" - Missions.Add(mc0.MissionID, mc0) - SegmentTable.MissionList.Add(mc0.MissionID) - - mc0 = New cMission - mc0.MissionID = tMission.Construction - mc0.NameStr = "Construction" - mc0.CyclePath = MyDeclPath & "MissionCycles\Construction.vdri" - Missions.Add(mc0.MissionID, mc0) - SegmentTable.MissionList.Add(mc0.MissionID) - - mc0 = New cMission - mc0.MissionID = tMission.HeavyUrban - mc0.NameStr = "HeavyUrban" - mc0.CyclePath = MyDeclPath & "MissionCycles\Citybus_Heavy_Urban.vdri" - Missions.Add(mc0.MissionID, mc0) - SegmentTable.MissionList.Add(mc0.MissionID) - - mc0 = New cMission - mc0.MissionID = tMission.Urban - mc0.NameStr = "Urban" - mc0.CyclePath = MyDeclPath & "MissionCycles\Citybus_Urban.vdri" - Missions.Add(mc0.MissionID, mc0) - SegmentTable.MissionList.Add(mc0.MissionID) - - mc0 = New cMission - mc0.MissionID = tMission.Suburban - mc0.NameStr = "Suburban" - mc0.CyclePath = MyDeclPath & "MissionCycles\Citybus_Suburban.vdri" - Missions.Add(mc0.MissionID, mc0) - SegmentTable.MissionList.Add(mc0.MissionID) - - mc0 = New cMission - mc0.MissionID = tMission.Interurban - mc0.NameStr = "Interurban" - mc0.CyclePath = MyDeclPath & "MissionCycles\Interurban_Bus.vdri" - Missions.Add(mc0.MissionID, mc0) - SegmentTable.MissionList.Add(mc0.MissionID) - - mc0 = New cMission - mc0.MissionID = tMission.Coach - mc0.NameStr = "Coach" - mc0.CyclePath = MyDeclPath & "MissionCycles\Coach.vdri" - Missions.Add(mc0.MissionID, mc0) - SegmentTable.MissionList.Add(mc0.MissionID) - - 'Cross Wind Correction parameters (BEFORE Segment Table!) - VCDVvehClassParam = New Dictionary(Of String, List(Of Single)) - - If Not file.OpenRead(MyDeclPath & "VCDV\parameters.csv") Then - GUImsg(tMsgID.Err, "Failed to load Declaration Config (VCDV\parameters)!") - Return False - End If - - 'Skip Header - file.ReadLine() - - Try - - Do While Not file.EndOfFile - line = file.ReadLine - VCDVvehClassParam.Add(line(0), New List(Of Single)) - VCDVvehClassParam(line(0)).Add(line(1)) - VCDVvehClassParam(line(0)).Add(line(2)) - VCDVvehClassParam(line(0)).Add(line(3)) - Loop - - Catch ex As Exception - file.Close() - GUImsg(tMsgID.Err, "Error in VCDV\parameters! " & ex.Message) - Return False - End Try - - file.Close() - - 'WHTC-Weighting-Factors.csv - If Not file.OpenRead(MyDeclPath & "WHTC-Weighting-Factors.csv") Then - GUImsg(tMsgID.Err, "Failed to load Declaration Config (WHTC-Weighting-Factors.csv)!") - Return False - End If - - 'Skip Header - file.ReadLine() - - Try - - For i = 0 To 2 - If file.EndOfFile Then Throw New Exception("Unexpected end of file.") - line = file.ReadLine - - a = 0 - For Each mt0 In Missions.Keys - a += 1 - mc0 = Missions(mt0) - Select Case i - Case 0 - mc0.WHTCWF = New Dictionary(Of tWHTCpart, Single) - mc0.WHTCWF.Add(tWHTCpart.Urban, line(a) / 100) - Case 1 - mc0.WHTCWF.Add(tWHTCpart.Rural, line(a) / 100) - Case Else '2 - mc0.WHTCWF.Add(tWHTCpart.Motorway, line(a) / 100) - End Select - Next - Next - - - Catch ex As Exception - file.Close() - GUImsg(tMsgID.Err, "Error in WHTC-Weighting-Factors! " & ex.Message) - Return False - End Try - - file.Close() - - 'Segment Table - If Not file.OpenRead(MyDeclPath & "SegmentTable.csv") Then - GUImsg(tMsgID.Err, "Failed to load Declaration Config (Segment Table)!") - Return False - End If - - Try - 'Header - line = file.ReadLine - - 'Data - Do While Not file.EndOfFile - line = file.ReadLine - - If CBool(line(0)) Then - ste0 = New cSegmentTableEntry - BodyTrWeightList = New List(Of String) - LoadingList = New List(Of String) - AxleShares = New List(Of String) - AxleSharesTr = New List(Of String) - - ste0.VehCat = ConvVehCat(line(1)) - - If ste0.VehCat = tVehCat.Undef Then - file.Close() - GUImsg(tMsgID.Err, - "Failed to load Declaration Config (Segment Table)! " & line(1) & " is no valid Vehicle Configuration.") - Return False - End If - - ste0.AxleConf = ConvAxleConf(line(2)) - - If ste0.AxleConf = tAxleConf.Undef Then - file.Close() - GUImsg(tMsgID.Err, - "Failed to load Declaration Config (Segment Table)! " & line(2) & " is no valid Axle Configuration.") - Return False - End If - - ste0.MinGVW = CSng(line(3)) - ste0.MaxGVW = CSng(line(4)) - ste0.HDVclass = line(5) - ste0.VACCfile = MyDeclPath & "VACC\" & line(6) - - For Each mt0 In SegmentTable.MissionList - If mt0 = tMission.LongHaul Then - s0 = line(7) - Else - s0 = line(8) - End If - If VCDVvehClassParam.ContainsKey(s0) Then ste0.VCDVparam.Add(mt0, VCDVvehClassParam(s0)) - Next - - AxleShares.Add(line(9)) 'Long Haul - For Each mt0 In SegmentTable.MissionList 'Other cycles - If mt0 <> tMission.LongHaul Then AxleShares.Add(line(10)) - Next - - AxleSharesTr.Add(line(11)) 'Long Haul - For Each mt0 In SegmentTable.MissionList 'Other cycles - If mt0 <> tMission.LongHaul Then AxleSharesTr.Add(line(12)) - Next - - ste0.TrailerOnlyInLongHaul = (Trim(line(11)) <> "-" And Trim(line(12)) = "-" And ste0.VehCat = tVehCat.RigidTruck) - - i = 12 - For Each mt0 In SegmentTable.MissionList - i += 1 - ste0.UseMission.Add(CBool(line(i))) - Next - For Each mt0 In SegmentTable.MissionList - i += 1 - BodyTrWeightList.Add(line(i)) - Next - For Each mt0 In SegmentTable.MissionList - i += 1 - LoadingList.Add(line(i)) - Next - - For i = 0 To SegmentTable.MissionList.Count - 1 - If ste0.UseMission(i) Then - ste0.Missions.Add(SegmentTable.MissionList(i)) - ste0.Loading.Add(SegmentTable.MissionList(i), LoadingList(i)) - ste0.BodyTrWeight.Add(SegmentTable.MissionList(i), BodyTrWeightList(i)) - - l0 = New List(Of Single) - For Each s0 In AxleShares(i).Split("/") - l0.Add(CSng(s0)) - Next - ste0.AxleShares.Add(SegmentTable.MissionList(i), l0) - - l0 = New List(Of Single) - - If AxleSharesTr(i) = "-" Then - TrS = 0 - TrA = 0 - Else - TrS = AxleSharesTr(i).Split("/")(0) - TrA = AxleSharesTr(i).Split("/")(1) - End If - - - For a = 1 To TrA - l0.Add(TrS / TrA) - Next - - ste0.AxleSharesTr.Add(SegmentTable.MissionList(i), l0) - - End If - Next - - SegmentTable.SegTableEntries.Add(ste0) - - End If - - Loop - - file.Close() - - Catch ex As Exception - file.Close() - GUImsg(tMsgID.Err, "Failed to load Declaration Config (Segment Table)! " & ex.Message) - Return False - End Try - - - 'Aux - AuxTechs = New Dictionary(Of tAux, List(Of String)) - - 'Aux - Fan - AuxFanPower = New Dictionary(Of String, Dictionary(Of tMission, Single)) - Try - If Not file.OpenRead(MyDeclPath & "VAUX\Fan-Tech.csv") Then - GUImsg(tMsgID.Err, "Failed to load Declaration Config (Fan aux config)!") - Return False - End If - - 'Skip Header - file.ReadLine() - at0 = New List(Of String) - Do While Not file.EndOfFile - line = file.ReadLine - at0.Add(line(0)) - AuxPower0 = New Dictionary(Of tMission, Single) - i = 0 - For Each mt0 In SegmentTable.MissionList.Take(5) - i += 1 - AuxPower0.Add(mt0, line(i)) - Next - AuxFanPower.Add(line(0), AuxPower0) - Loop - AuxTechs.Add(tAux.Fan, at0) - file.Close() - Catch ex As Exception - file.Close() - GUImsg(tMsgID.Err, "Failed to load Declaration Config (Fan aux config)!" & ex.Message) - Return False - End Try - - 'Aux - Steering Pump - AuxSteerPumpPower = New Dictionary(Of String, Dictionary(Of tMission, Single())) - AuxSteepPumpFactors = New Dictionary(Of String, Single()) - Try - If Not file.OpenRead(MyDeclPath & "VAUX\SP-Tech.csv") Then - GUImsg(tMsgID.Err, "Failed to load Declaration Config (Steering pump config)!") - Return False - End If - 'Skip Header - file.ReadLine() - at0 = New List(Of String) - Do While Not file.EndOfFile - line = file.ReadLine - at0.Add(line(0)) - AuxSteepPumpFactors.Add(line(0), New Single() {CSng(line(1)), CSng(line(2)), CSng(line(3))}) - Loop - file.Close() - If Not file.OpenRead(MyDeclPath & "VAUX\SP-Table.csv") Then - GUImsg(tMsgID.Err, "Failed to load Declaration Config (Steering pump config)!") - Return False - End If - 'Skip Header - file.ReadLine() - Do While Not file.EndOfFile - line = file.ReadLine - STEpower0 = New Dictionary(Of tMission, Single()) - i = 0 - For Each mt0 In SegmentTable.MissionList.Take(5) - i += 1 - If line(i) = "0" OrElse String.IsNullOrWhiteSpace(line(i)) Then - STEpower0.Add(mt0, New Single() {0}) - Else - stl = line(i).Split("/") - STEpower0.Add(mt0, New Single() {CSng(stl(0)), CSng(stl(1)), CSng(stl(2))}) - End If - Next - AuxSteerPumpPower.Add(line(0), STEpower0) - Loop - AuxTechs.Add(tAux.SteerPump, at0) - file.Close() - Catch ex As Exception - file.Close() - GUImsg(tMsgID.Err, "Failed to load Declaration Config (Steering pump config)!" & ex.Message) - Return False - End Try - - 'Aux - HVAC - AuxHVACPower = New Dictionary(Of String, Dictionary(Of tMission, Single)) - Try - If Not file.OpenRead(MyDeclPath & "VAUX\HVAC-Table.csv") Then - GUImsg(tMsgID.Err, "Failed to load Declaration Config (HVAC config)!") - Return False - End If - - 'Skip Header - file.ReadLine() - Do While Not file.EndOfFile - line = file.ReadLine - AuxPower0 = New Dictionary(Of tMission, Single) - i = 0 - For Each mt0 In SegmentTable.MissionList.Take(5) - i += 1 - If (String.IsNullOrWhiteSpace(line(i))) Then - AuxPower0.Add(mt0, 0) - Else - AuxPower0.Add(mt0, line(i)) - End If - Next - AuxHVACPower.Add(line(0), AuxPower0) - Loop - Catch ex As Exception - file.Close() - GUImsg(tMsgID.Err, "Failed to load Declaration Config (HVAC config)!" & ex.Message) - Return False - End Try - - AuxTechs.Add(tAux.HVAC, New List(Of String)) - - 'Aux - Electric System - AuxESpower = New Dictionary(Of String, Dictionary(Of tMission, Single)) - Try - If Not file.OpenRead(MyDeclPath & "VAUX\ES-Tech.csv") Then - GUImsg(tMsgID.Err, "Failed to load Declaration Config (Electric system aux config)!") - Return False - End If - - 'Skip Header - file.ReadLine() - at0 = New List(Of String) - Do While Not file.EndOfFile - line = file.ReadLine - at0.Add(line(0)) - AuxPower0 = New Dictionary(Of tMission, Single) - i = 0 - For Each mt0 In SegmentTable.MissionList.Take(5) - i += 1 - AuxPower0.Add(mt0, line(i)) - Next - AuxESpower.Add(line(0), AuxPower0) - Loop - AuxTechs.Add(tAux.ElectricSys, at0) - file.Close() - Catch ex As Exception - file.Close() - GUImsg(tMsgID.Err, "Failed to load Declaration Config (Electric system config)!" & ex.Message) - Return False - End Try - - - 'Aux - Pneumatic System - AuxPSpower = New Dictionary(Of String, Dictionary(Of tMission, Single)) - Try - If Not file.OpenRead(MyDeclPath & "VAUX\PS-Table.csv") Then - GUImsg(tMsgID.Err, "Failed to load Declaration Config (Pneumatic system config)!") - Return False - End If - - 'Skip Header - file.ReadLine() - at0 = New List(Of String) - Do While Not file.EndOfFile - line = file.ReadLine - at0.Add(line(0)) - AuxPower0 = New Dictionary(Of tMission, Single) - i = 0 - For Each mt0 In SegmentTable.MissionList.Take(5) - i += 1 - AuxPower0.Add(mt0, line(i)) - Next - AuxPSpower.Add(line(0), AuxPower0) - Loop - AuxTechs.Add(tAux.PneumSys, at0) - file.Close() - Catch ex As Exception - file.Close() - GUImsg(tMsgID.Err, "Failed to load Declaration Config (Pneumatic system config)!" & ex.Message) - Return False - End Try - - 'Default PT1 values - lPT1nU = New List(Of Single) - lPT1 = New List(Of Single) - PT1dim = -1 - - If Not file.OpenRead(MyDeclPath & "PT1.csv") Then - GUImsg(tMsgID.Err, "Failed to load Declaration Config (PT1 table)!") - Return False - End If - - 'Skip Header - file.ReadLine() - - Try - - Do While Not file.EndOfFile - line = file.ReadLine - PT1dim += 1 - lPT1nU.Add(CDbl(line(0))) - lPT1.Add(CDbl(line(1))) - Loop - - Catch ex As Exception - file.Close() - GUImsg(tMsgID.Err, "Failed to load Declaration Config (PT1 table)!" & ex.Message) - Return False - End Try - - file.Close() - - - 'Wheels - Wheels = New Dictionary(Of String, cWheel) - - If Not file.OpenRead(MyDeclPath & "wheels.csv") Then - GUImsg(tMsgID.Err, "Failed to load Declaration Config (Wheels table)!") - Return False - End If - - 'Skip Header - file.ReadLine() - Try - Do While Not file.EndOfFile - line = file.ReadLine - Wheels.Add(line(0), New cWheel With { - .Inertia = CSng(line(5)), - .Diam = CSng(line(4)) - }) - Loop - Catch ex As Exception - file.Close() - GUImsg(tMsgID.Err, "Failed to load Declaration Config (Wheels table)!" & ex.Message) - Return False - End Try - - file.Close() - - GUImsg(tMsgID.Normal, "Declaration Config loaded.") - - Return True - End Function - - Public Shared Function EngInertia(displ As Single) As Single - Return 1.3 + 0.41 + 0.27 * (displ / 1000) - End Function - - Public Shared Function TracInt(gearbox As tGearbox) As Single - Select Case Gearbox - Case tGearbox.Manual - Return 2 - - Case tGearbox.SemiAutomatic - Return 1 - - Case Else 'tGearbox.Automatic - Return 0.8 - - End Select - End Function - - Public Shared Function SkipGears(gearbox As tGearbox) As Boolean - If AutomaticTransmission(Gearbox) Then - Return False - Else - Return True - End If - End Function - - Public Shared Function ShiftInside(gearbox As tGearbox) As Boolean - If gearbox = tGearbox.SemiAutomatic Then - Return True - Else - Return False - End If - End Function - - Public Shared Function ShiftTime(gearbox As tGearbox) As Single - Select Case gearbox - Case tGearbox.Manual - Return 3 - - Case tGearbox.SemiAutomatic - Return 2 - - Case Else 'tGearbox.Automatic - Return 2 - - End Select - End Function - - Public Function WheelsInertia(wheel As String) As Single - - If Wheels.ContainsKey(wheel) Then - Return Wheels(wheel).Inertia - Else - Return -1 - End If - End Function - - Public Function rdyn(wheel As String) As Single - Dim F As Single = 1 - Dim w As cWheel - - If Not Wheels.ContainsKey(wheel) Then - Return -1 - End If - - w = Wheels(wheel) - - Return (F * w.Diam) / (2 * Math.PI) - End Function - - Public ReadOnly Property WheelsList As String() - Get - Return Wheels.Keys.ToArray() - End Get - End Property - - Public Shared Function ConvPicPath(hdVclass As String, isLongHaul As Boolean) As String - Dim longHaulFlag = "" - If isLongHaul Then - longHaulFlag = "t" - End If - - Select Case hdVclass - Case 1, 2, 3 - Return MyDeclPath & "Report\4x2r.png" - Case 4 - Return MyDeclPath & "Report\4x2r" & longHaulFlag & ".png" - Case 5 - Return MyDeclPath & "Report\4x2tt.png" - Case 9 - Return MyDeclPath & "Report\6x2r" & longHaulFlag & ".png" - Case 10 - Return MyDeclPath & "Report\6x2tt.png" - Case Else - Return MyDeclPath & "Report\Undef.png" - End Select - End Function - - - Public Function SetRef() As Boolean - SegRef = SegmentTable.SetRef(VEH.VehCat, VEH.AxleConf, VEH.MassMax) - If SegRef Is Nothing Then - Return False - Else - Return True - End If - End Function - - - ''' <summary> - ''' Init Vehicle for current mission. Must happen before setting loading in CalcInitLoad - ''' </summary> - ''' <param name="cycleIndex"></param> - ''' <returns></returns> - ''' <remarks></remarks> - Public Function CalcInitCycle(cycleIndex As Integer) As Boolean - - CurrentMission = Missions(SegRef.Missions(cycleIndex)) - - WHTCcorrFactor = CurrentMission.WHTCWF(tWHTCpart.Urban) * ENG.WHTCurban _ - + CurrentMission.WHTCWF(tWHTCpart.Rural) * ENG.WHTCrural _ - + CurrentMission.WHTCWF(tWHTCpart.Motorway) * ENG.WHTCmw - - - If Not VEH.DeclInitCycle Then Return False - - Return True - End Function - - ''' <summary> - ''' Set Loading. Mission-based initialisation (CalcInitCycle) must already be done before running this. - ''' </summary> - ''' <param name="Loading"></param> - ''' <returns></returns> - ''' <remarks></remarks> - Public Function CalcInitLoad(Loading As tLoading) As Boolean - Dim MsgSrc As String - Dim U As Single - Dim F As Single - Dim B As Single - Dim S As Single - Dim fU As Single - Dim fF As Single - Dim fB As Single - Dim fS As Single - Dim sl As Single() - Dim Result As Boolean - - MsgSrc = "DeclInit" - - CurrentLoading = Loading - - If Not VEH.DeclInitLoad(Loading) Then Return False - - 'AuxPower - AuxPower = New Dictionary(Of String, Single) - - Result = True - - 'Fan - Try - AuxPower.Add(sKey.AUX.Fan, AuxFanPower(VEC.AuxPaths(sKey.AUX.Fan).TechStr)(CurrentMission.MissionID) / 1000) - Catch ex As Exception - WorkerMsg(tMsgID.Err, "Failed to initialise fan! " & ex.Message, MsgSrc) - Result = False - End Try - - 'Steering pump - Try - sl = AuxSteerPumpPower(SegRef.HDVclass)(CurrentMission.MissionID) - U = sl(0) - F = sl(1) - B = sl(2) - S = sl(3) - sl = AuxSteepPumpFactors(VEC.AuxPaths(sKey.AUX.SteerPump).TechStr) - fU = sl(0) - fF = sl(1) - fB = sl(2) - fS = sl(3) - AuxPower.Add(sKey.AUX.SteerPump, (U * fU + F * fF + B * fB + S * fS) / 1000) - Catch ex As Exception - WorkerMsg(tMsgID.Err, "Failed to initialise steering pump! " & ex.Message, MsgSrc) - Result = False - End Try - - 'HVAC - Try - AuxPower.Add(sKey.AUX.HVAC, AuxHVACPower(SegRef.HDVclass)(CurrentMission.MissionID) / 1000) - Catch ex As Exception - WorkerMsg(tMsgID.Err, "Failed to initialise HVAC! " & ex.Message, MsgSrc) - Result = False - End Try - - 'Electric System - Try - AuxPower.Add(sKey.AUX.ElecSys, - AuxESpower(VEC.AuxPaths(sKey.AUX.ElecSys).TechStr)(CurrentMission.MissionID) / (1000 * AuxESeff)) - Catch ex As Exception - WorkerMsg(tMsgID.Err, "Failed to initialise electric system! " & ex.Message, MsgSrc) - Result = False - End Try - - - 'PS - Try - AuxPower.Add(sKey.AUX.PneumSys, AuxPSpower(SegRef.HDVclass)(CurrentMission.MissionID)) - Catch ex As Exception - WorkerMsg(tMsgID.Err, "Failed to initialise pneumatic system! " & ex.Message, MsgSrc) - Result = False - End Try - - - Return Result - End Function - - Public Function PT1(nU As Single) As Single - Dim i As Int32 - - 'Extrapolation for x < x(1) - If lPT1nU(0) >= nU Then - i = 1 - GoTo lbInt - End If - - i = 0 - Do While lPT1nU(i) < nU And i < PT1dim - i += 1 - Loop - -lbInt: - 'Interpolation - Return (nU - lPT1nU(i - 1)) * (lPT1(i) - lPT1(i - 1)) / (lPT1nU(i) - lPT1nU(i - 1)) + lPT1(i - 1) - End Function - - Public Sub ReportInit() - - Report = New cReport - - With Report - .Filepath = fFileWoExt(JobFile) & ".pdf" - .HDVclassStr = SegRef.HDVclass - .VehCat = SegRef.VehCat - .AxleConf = SegRef.AxleConf - .MassMaxStr = VEH.MassMax & "t" - .JobFile = fFILE(JobFile, True) - .DateStr = Now.ToUniversalTime().ToString("o") - .Creator = Lic.LicString - .EngStr = (ENG.Displ / 1000).ToString("0.0") & " l " & Math.Round(ENG.Pmax, 0).ToString("#") & " kW" - .EngModelStr = ENG.ModelName - .GbxStr = GBX.GearCount & "-Speed " & GearboxConv(GBX.gs_Type) - .GbxModelStr = GBX.ModelName - End With - End Sub - - Public Sub ReportAddCycle() - Dim mr As New cReport.cMissionResults - - mr.MissionRef = CurrentMission - - Report.CurrentMR = mr - Report.MissionResults.Add(mr) - End Sub - - 'Public Sub ReportAddResults() - ' Dim lr As New cReport.cLoadingResults - ' Dim t1 As Integer - ' Dim t As Integer - ' Dim Vquer As Single - ' Dim sum As Double - ' Dim d As Double - - ' t1 = MODdata.tDim - - ' 'Average Speed calculation - ' sum = 0 - ' For t = 0 To t1 - ' sum += MODdata.Vh.V(t) - ' Next - ' Vquer = 3.6 * sum / (t1 + 1) - - ' With lr - - ' .Loading = VEH.Loading / 1000 - ' .Speed = Vquer - ' .FCkm = (100 * MODdata.FCavgFinal / Vquer) / (Cfg.FuelDens * 1000) - ' .CO2km = Cfg.CO2perFC * (MODdata.FCavgFinal / Vquer) - ' If VEH.Loading > 0 Then - ' .FCtkm = .FCkm / .Loading - ' .CO2tkm = .CO2km / .Loading - ' End If - ' .FCerror = MODdata.FCerror - - ' d = 0 - ' MODdata.Vh.AltIntp(d, True) - ' For t = 0 To t1 - ' .ActualSpeed.Add(MODdata.Vh.V(t) * 3.6) - ' .TargetSpeed.Add(MODdata.Vh.Vsoll(t) * 3.6) - ' d += MODdata.Vh.V(t) - ' .Distance.Add(CSng(d / 1000)) - ' .Alt.Add(MODdata.Vh.AltIntp(d, False)) - ' .nU.Add(MODdata.nU(t)) - ' .Tq.Add(nPeToM(MODdata.nU(t), MODdata.Pe(t))) - ' Next - - ' End With - - ' Report.CurrentMR.Results.Add(CurrentLoading, lr) - 'End Sub - - Public Function WriteReport() As Boolean - - Report.CreateCharts() - - Return Report.WritePdfs - End Function -End Class - -Public Class cWheel - Public Inertia As Single - Public Diam As Single -End Class - -Public Class cMission - Public MissionID As tMission - Public NameStr As String - Public CyclePath As String - Public WHTCWF As New Dictionary(Of tWHTCpart, Single) -End Class - -Public Class cSegmentTable - Public SegTableEntries As New List(Of cSegmentTableEntry) - Public MissionList As New List(Of tMission) - - Public Function SetRef(vehCat As tVehCat, axleConf As tAxleConf, maxMass As Single) As cSegmentTableEntry - For Each s0 As cSegmentTableEntry In SegTableEntries - If s0.VehCat = vehCat And s0.AxleConf = axleConf And maxMass >= s0.MinGVW And maxMass <= s0.MaxGVW Then - Return s0 - End If - Next - - Return Nothing - End Function -End Class - -Public Class cSegmentTableEntry - Public VehCat As tVehCat - Public AxleConf As tAxleConf - Public MinGVW As Single - Public MaxGVW As Single - Public Missions As New List(Of tMission) - Public UseMission As New List(Of Boolean) - Public HDVclass As String - Public VACCfile As String - Public VCDVparam As New Dictionary(Of tMission, List(Of Single)) - Public BodyTrWeight As New Dictionary(Of tMission, String) - Public Loading As New Dictionary(Of tMission, String) - Public AxleShares As New Dictionary(Of tMission, List(Of Single)) - Public AxleSharesTr As New Dictionary(Of tMission, List(Of Single)) - Public TrailerOnlyInLongHaul As Boolean - - Public Function GetCycles() As List(Of String) - Dim l As New List(Of String) - Dim m As tMission - - For Each m In Missions - l.Add(Declaration.Missions(m).CyclePath) - Next - - Return l - End Function - - Public Function GetBodyTrWeight(Mission As tMission) As Single - - 'Check if Config is valid - If BodyTrWeight.ContainsKey(Mission) AndAlso IsNumeric(BodyTrWeight(Mission)) Then - Return CSng(BodyTrWeight(Mission)) - Else - Return -1 - End If - End Function - - Public Function GetLoading(Mission As tMission, MassMax As Single) As Single - - 'Check if Config is valid - If Loading.ContainsKey(Mission) Then - If Not (Loading(Mission) = "f" OrElse IsNumeric(Loading(Mission))) Then - Return -1 - End If - Else - Return -1 - End If - - 'Return Loading - If HDVclass < 4 Then - If Mission = tMission.LongHaul Then - Return 588.2 * MassMax - 2511.8 - Else - Return 394.1 * MassMax - 1705.9 - End If - Else - Return CSng(Loading(Mission)) - End If - End Function -End Class - -Public Class cReport - Public Filepath As String = "" - Public CurrentMR As cMissionResults - Public MissionResults As List(Of cMissionResults) - Public HDVclassStr As String = "" - Public VehCat As tVehCat = tVehCat.Undef - Public AxleConf As tAxleConf = tAxleConf.Undef - Public MassMaxStr As String = "" - Public JobFile As String = "" - Public DateStr As String = "" - Public Creator As String = "" - Public EngStr As String = "" - Public EngModelStr As String = "" - Public GbxStr As String = "" - Public GbxModelStr As String = "" - - Public ChartCO2tkm As Drawing.Image - Public ChartCO2speed As Drawing.Image - - - Public Sub New() - MissionResults = New List(Of cMissionResults) - End Sub - - Public Sub CreateCharts() - Dim mr As cMissionResults - Dim lr As KeyValuePair(Of tLoading, cLoadingResults) - Dim MyChart As System.Windows.Forms.DataVisualization.Charting.Chart - Dim s As System.Windows.Forms.DataVisualization.Charting.Series - Dim a As System.Windows.Forms.DataVisualization.Charting.ChartArea - Dim i As Int16 - - 'Torque, rpm - For Each mr In MissionResults - - MyChart = New System.Windows.Forms.DataVisualization.Charting.Chart - MyChart.Width = 1000 - MyChart.Height = 427 - - a = New System.Windows.Forms.DataVisualization.Charting.ChartArea - - s = New System.Windows.Forms.DataVisualization.Charting.Series - s.Points.DataBindXY(ENG.FLD.LnU, ENG.FLD.LTq) - s.ChartType = DataVisualization.Charting.SeriesChartType.FastLine - s.BorderWidth = 3 - s.Color = Color.DarkBlue - s.Name = "Full load curve" - MyChart.Series.Add(s) - - s = New System.Windows.Forms.DataVisualization.Charting.Series - s.Points.DataBindXY(ENG.FLD.LnU, ENG.FLD.LTqDrag) - s.ChartType = DataVisualization.Charting.SeriesChartType.FastLine - s.BorderWidth = 3 - s.Color = Color.Blue - s.Name = "Drag curve" - MyChart.Series.Add(s) - - 's = New System.Windows.Forms.DataVisualization.Charting.Series - 's.Points.DataBindXY(GBX.Shiftpolygons(GBX.GearCount).gs_nUdown, GBX.Shiftpolygons(GBX.GearCount).gs_Mdown) - 's.ChartType = DataVisualization.Charting.SeriesChartType.FastLine - 's.Color = Color.DarkGray - 's.BorderWidth = 3 - 's.Name = "Down-Shift threshold" - 'MyChart.Series.Add(s) - - 's = New System.Windows.Forms.DataVisualization.Charting.Series - 's.Points.DataBindXY(GBX.Shiftpolygons(GBX.GearCount).gs_nUup, GBX.Shiftpolygons(GBX.GearCount).gs_Mup) - 's.ChartType = DataVisualization.Charting.SeriesChartType.FastLine - 's.Color = Color.Gray - 's.BorderWidth = 3 - 's.Name = "Up-Shift threshold" - 'MyChart.Series.Add(s) - - s = New System.Windows.Forms.DataVisualization.Charting.Series - s.Points.DataBindXY(mr.Results(tLoading.RefLoaded).nU, mr.Results(tLoading.RefLoaded).Tq) - s.ChartType = DataVisualization.Charting.SeriesChartType.Point - s.Color = Color.Red - s.Name = "load points (Ref. load.)" - MyChart.Series.Add(s) - - - a.Name = "main" - - a.AxisX.Title = "engine speed [1/min]" - a.AxisX.TitleFont = New Drawing.Font("Helvetica", 20) - a.AxisX.LabelStyle.Font = New Drawing.Font("Helvetica", 20) - a.AxisX.LabelAutoFitStyle = DataVisualization.Charting.LabelAutoFitStyles.None - - a.AxisY.Title = "engine torque [Nm]" - a.AxisY.TitleFont = New Drawing.Font("Helvetica", 20) - a.AxisY.LabelStyle.Font = New Drawing.Font("Helvetica", 20) - a.AxisY.LabelAutoFitStyle = DataVisualization.Charting.LabelAutoFitStyles.None - - a.AxisX.Minimum = 300 - a.BorderDashStyle = DataVisualization.Charting.ChartDashStyle.Solid - a.BorderWidth = 3 - - - MyChart.ChartAreas.Add(a) - - With MyChart.ChartAreas(0) - .Position.X = 0 - .Position.Y = 0 - .Position.Width = 70 - .Position.Height = 100 - End With - - MyChart.Legends.Add("main") - MyChart.Legends(0).Font = New Drawing.Font("Helvetica", 14) - MyChart.Legends(0).BorderColor = Color.Black - MyChart.Legends(0).BorderWidth = 3 - - - 'MyChart.Titles.Add("CO2 Results [g/km]") - 'MyChart.Titles(0).Font = New Font("Helvetica", 30, FontStyle.Bold) - - - MyChart.Update() - - mr.ChartTqN = New Bitmap(MyChart.Width, MyChart.Height, Imaging.PixelFormat.Format32bppArgb) - MyChart.DrawToBitmap(mr.ChartTqN, New Drawing.Rectangle(0, 0, mr.ChartTqN.Size.Width, mr.ChartTqN.Size.Height)) - - Next - - 'Speed over distance - For Each mr In MissionResults - - MyChart = New System.Windows.Forms.DataVisualization.Charting.Chart - MyChart.Width = 2000 - MyChart.Height = 400 - - a = New System.Windows.Forms.DataVisualization.Charting.ChartArea - - 'Altitude - s = New System.Windows.Forms.DataVisualization.Charting.Series - s.Points.DataBindXY(mr.Results(tLoading.RefLoaded).Distance, mr.Results(tLoading.RefLoaded).Alt) - s.ChartType = DataVisualization.Charting.SeriesChartType.Area - s.Color = Color.Lavender - s.Name = "Altitude" - s.YAxisType = DataVisualization.Charting.AxisType.Secondary - MyChart.Series.Add(s) - - 'Target speed - s = New System.Windows.Forms.DataVisualization.Charting.Series - s.Points.DataBindXY(mr.Results(tLoading.RefLoaded).Distance, mr.Results(tLoading.RefLoaded).TargetSpeed) - s.ChartType = DataVisualization.Charting.SeriesChartType.FastLine - s.BorderWidth = 3 - s.Name = "Target speed" - MyChart.Series.Add(s) - - For Each lr In mr.Results - - s = New System.Windows.Forms.DataVisualization.Charting.Series - s.Points.DataBindXY(lr.Value.Distance, lr.Value.ActualSpeed) - s.ChartType = DataVisualization.Charting.SeriesChartType.FastLine - s.Name = ConvLoading(lr.Key) - MyChart.Series.Add(s) - - Next - - a.Name = "main" - - a.AxisX.Title = "distance [km]" - a.AxisX.TitleFont = New Drawing.Font("Helvetica", 16) - a.AxisX.LabelStyle.Font = New Drawing.Font("Helvetica", 16) - a.AxisX.LabelAutoFitStyle = DataVisualization.Charting.LabelAutoFitStyles.None - a.AxisX.LabelStyle.Format = "0.0" - - a.AxisY.Title = "vehicle speed [km/h]" - a.AxisY.TitleFont = New Drawing.Font("Helvetica", 16) - a.AxisY.LabelStyle.Font = New Drawing.Font("Helvetica", 16) - a.AxisY.LabelAutoFitStyle = DataVisualization.Charting.LabelAutoFitStyles.None - - a.AxisY2.Title = "altitude [m]" - a.AxisY2.TitleFont = New Drawing.Font("Helvetica", 16) - a.AxisY2.LabelStyle.Font = New Drawing.Font("Helvetica", 16) - a.AxisY2.LabelAutoFitStyle = DataVisualization.Charting.LabelAutoFitStyles.None - a.AxisY2.MinorGrid.Enabled = False - a.AxisY2.MajorGrid.Enabled = False - - a.AxisX.Minimum = 0 - a.BorderDashStyle = DataVisualization.Charting.ChartDashStyle.Solid - a.BorderWidth = 3 - - MyChart.ChartAreas.Add(a) - - With MyChart.ChartAreas(0) - .Position.X = 0 - .Position.Y = 0 - .Position.Width = 90 - .Position.Height = 100 - End With - - - MyChart.Legends.Add("main") - MyChart.Legends(0).Font = New Drawing.Font("Helvetica", 14) - MyChart.Legends(0).BorderColor = Color.Black - MyChart.Legends(0).BorderWidth = 3 - 'MyChart.Legends(0).Position.Auto = False - MyChart.Legends(0).Position.X = 97 - MyChart.Legends(0).Position.Y = 3 - MyChart.Legends(0).Position.Width = 10 - MyChart.Legends(0).Position.Height = 40 - - - 'MyChart.Titles.Add("CO2 Results [g/km]") - 'MyChart.Titles(0).Font = New Font("Helvetica", 30, FontStyle.Bold) - - - MyChart.Update() - - mr.ChartSpeed = New Bitmap(MyChart.Width, MyChart.Height, Imaging.PixelFormat.Format32bppArgb) - MyChart.DrawToBitmap(mr.ChartSpeed, New Drawing.Rectangle(0, 0, mr.ChartSpeed.Size.Width, mr.ChartSpeed.Size.Height)) - - Next - - 'CO2 Bars - MyChart = New System.Windows.Forms.DataVisualization.Charting.Chart - a = New System.Windows.Forms.DataVisualization.Charting.ChartArea - - For Each mr In MissionResults - s = New System.Windows.Forms.DataVisualization.Charting.Series - s.Points.AddXY(mr.MissionRef.NameStr, mr.Results(tLoading.RefLoaded).CO2tkm) - 's.IsValueShownAsLabel = True - s.Points(0).Label = s.Points(0).YValues(0).ToString("0.0") & " [g/tkm]" - s.Points(0).Font = New Drawing.Font("Helvetica", 20) - s.Points(0).LabelBackColor = Color.White - s.Name = mr.MissionRef.NameStr & " (Ref. load.)" - MyChart.Series.Add(s) - Next - - a.Name = "main" - - a.AxisX.Title = "Missions" - a.AxisX.TitleFont = New Drawing.Font("Helvetica", 20) - a.AxisX.LabelStyle.Enabled = False - - a.AxisY.Title = "CO2 [g/tkm]" - a.AxisY.TitleFont = New Drawing.Font("Helvetica", 20) - a.AxisY.LabelStyle.Font = New Drawing.Font("Helvetica", 20) - a.AxisY.LabelAutoFitStyle = DataVisualization.Charting.LabelAutoFitStyles.None - - a.BorderDashStyle = DataVisualization.Charting.ChartDashStyle.Solid - a.BorderWidth = 3 - - MyChart.ChartAreas.Add(a) - - MyChart.Legends.Add("main") - MyChart.Legends(0).Font = New Drawing.Font("Helvetica", 20) - MyChart.Legends(0).BorderColor = Color.Black - MyChart.Legends(0).BorderWidth = 3 - - MyChart.Width = 1500 - MyChart.Height = 700 - - MyChart.Update() - - ChartCO2tkm = New Bitmap(MyChart.Width, MyChart.Height, Imaging.PixelFormat.Format32bppArgb) - MyChart.DrawToBitmap(ChartCO2tkm, New Drawing.Rectangle(0, 0, ChartCO2tkm.Size.Width, ChartCO2tkm.Size.Height)) - - - 'CO2 & Speed - MyChart = New System.Windows.Forms.DataVisualization.Charting.Chart - a = New System.Windows.Forms.DataVisualization.Charting.ChartArea - - For Each mr In MissionResults - s = New System.Windows.Forms.DataVisualization.Charting.Series - s.MarkerSize = 15 - s.MarkerStyle = DataVisualization.Charting.MarkerStyle.Circle - s.ChartType = DataVisualization.Charting.SeriesChartType.Point - i = -1 - For Each lr In mr.Results - i += 1 - s.Points.AddXY(lr.Value.Speed, lr.Value.CO2km) - s.Points(i).Label = lr.Value.Loading.ToString("0.0") & " t" - If lr.Key = tLoading.RefLoaded Then - s.Points(i).Font = New Drawing.Font("Helvetica", 16) - Else - s.Points(i).MarkerSize = 10 - s.Points(i).Font = New Drawing.Font("Helvetica", 14) - End If - s.Points(i).LabelBackColor = Color.White - Next - s.Name = mr.MissionRef.NameStr - MyChart.Series.Add(s) - Next - - a.Name = "main" - - a.AxisX.Title = "vehicle speed [km/h]" - a.AxisX.TitleFont = New Drawing.Font("Helvetica", 20) - a.AxisX.LabelStyle.Font = New Drawing.Font("Helvetica", 20) - a.AxisX.LabelAutoFitStyle = DataVisualization.Charting.LabelAutoFitStyles.None - - a.AxisY.Title = "CO2 [g/km]" - a.AxisY.TitleFont = New Drawing.Font("Helvetica", 20) - a.AxisY.LabelStyle.Font = New Drawing.Font("Helvetica", 20) - a.AxisY.LabelAutoFitStyle = DataVisualization.Charting.LabelAutoFitStyles.None - - a.AxisX.Minimum = 20 - a.BorderDashStyle = DataVisualization.Charting.ChartDashStyle.Solid - a.BorderWidth = 3 - - MyChart.ChartAreas.Add(a) - - MyChart.Legends.Add("main") - MyChart.Legends(0).Font = New Drawing.Font("Helvetica", 20) - MyChart.Legends(0).BorderColor = Color.Black - MyChart.Legends(0).BorderWidth = 3 - - 'MyChart.Titles.Add("CO2 Results [g/km]") - 'MyChart.Titles(0).Font = New Font("Helvetica", 30, FontStyle.Bold) - - MyChart.Width = 1500 - MyChart.Height = 700 - - MyChart.Update() - - ChartCO2speed = New Bitmap(MyChart.Width, MyChart.Height, Imaging.PixelFormat.Format32bppArgb) - MyChart.DrawToBitmap(ChartCO2speed, New Drawing.Rectangle(0, 0, ChartCO2speed.Size.Width, ChartCO2speed.Size.Height)) - End Sub - - Public Function WritePdfs() As Boolean - Dim pdfReader As PdfReader - Dim pdfStamper As PdfStamper - Dim PdfTemp As String = "" - Dim PdfTempMR As String = "" - Dim i As Integer - Dim pgMax As Integer - Dim imgp As iTextSharp.text.Image - Dim pdfContentByte As iTextSharp.text.pdf.PdfContentByte - Dim doc As iTextSharp.text.Document - Dim pdfpage As PdfImportedPage - Dim pdfWriter As PdfWriter - Dim mr As cMissionResults - Dim lr As KeyValuePair(Of tLoading, cLoadingResults) - Dim lstr As String = "" - Dim temppdfs As New List(Of String) - Dim temppath As String - Dim pdfFormFields As AcroFields - - Select Case MissionResults.Count - Case 2 - PdfTemp = MyDeclPath & "Reports\rep2C.pdf" - pgMax = 3 - Case 3 - PdfTemp = MyDeclPath & "Reports\rep3C.pdf" - pgMax = 4 - End Select - - PdfTempMR = MyDeclPath & "Reports\repMR.pdf" - - Try - - temppath = MyDeclPath & "Reports\temp0.pdf" - temppdfs.Add(temppath) - - pdfReader = New PdfReader(PdfTemp) - pdfStamper = New PdfStamper(pdfReader, New FileStream(temppath, FileMode.Create)) - - pdfFormFields = pdfStamper.AcroFields - - pdfFormFields.SetField("version", VECTOvers) - pdfFormFields.SetField("Job", JobFile) - pdfFormFields.SetField("Date", DateStr) - pdfFormFields.SetField("Created", Creator) - pdfFormFields.SetField("Config", MassMaxStr & " " & ConvAxleConf(AxleConf) & " " & ConvVehCat(VehCat, True)) - pdfFormFields.SetField("HDVclass", "HDV Class " & HDVclassStr) - pdfFormFields.SetField("Engine", EngStr) - pdfFormFields.SetField("EngM", EngModelStr) - pdfFormFields.SetField("Gearbox", GbxStr) - pdfFormFields.SetField("GbxM", GbxModelStr) - pdfFormFields.SetField("PageNr", "Page 1 of " & pgMax) - - i = 0 - For Each mr In MissionResults - i += 1 - pdfFormFields.SetField("Mission" & i, mr.MissionRef.NameStr) - With mr.Results(tLoading.RefLoaded) - pdfFormFields.SetField("Loading" & i, .Loading.ToString("0.0") & " t") - pdfFormFields.SetField("Speed" & i, .Speed.ToString("0.0") & " km/h") - pdfFormFields.SetField("FC" & i, .FCkm.ToString("0.0")) - pdfFormFields.SetField("FCt" & i, .FCtkm.ToString("0.0")) - pdfFormFields.SetField("CO2" & i, .CO2km.ToString("0.0")) - pdfFormFields.SetField("CO2t" & i, .CO2tkm.ToString("0.0")) - - ''AA-TB - ''Advanced Auxiliary - - 'If Not pdfFormFields.GetField("AuxiliaryMode") is Nothing - ' pdfFormFields.SetField("AuxiliaryMode", VEC.AuxiliaryAssembly.ToString()) - 'End if - - End With - Next - - - 'Add Images - pdfContentByte = pdfStamper.GetOverContent(1) - - imgp = iTextSharp.text.Image.GetInstance(ChartCO2tkm, BaseColor.WHITE) - imgp.ScaleAbsolute(440, 195) - imgp.SetAbsolutePosition(360, 270) - pdfContentByte.AddImage(imgp) - - imgp = iTextSharp.text.Image.GetInstance(ChartCO2speed, BaseColor.WHITE) - imgp.ScaleAbsolute(440, 195) - imgp.SetAbsolutePosition(360, 75) - pdfContentByte.AddImage(imgp) - - imgp = iTextSharp.text.Image.GetInstance(cDeclaration.ConvPicPath(HDVclassStr, True)) - imgp.ScaleAbsolute(180, 50) - imgp.SetAbsolutePosition(30, 475) - pdfContentByte.AddImage(imgp) - - ' flatten the form to remove editting options, set it to false to leave the form open to subsequent manual edits - pdfStamper.FormFlattening = True - - ' close the pdf - pdfStamper.Close() - - - i = 0 - For Each mr In MissionResults - i += 1 - - temppath = MyDeclPath & "Reports\temp" & i & ".pdf" - temppdfs.Add(temppath) - - pdfReader = New PdfReader(PdfTempMR) - pdfStamper = New PdfStamper(pdfReader, New FileStream(temppath, FileMode.Create)) - - pdfFormFields = pdfStamper.AcroFields - - pdfFormFields.SetField("version", VECTOvers) - pdfFormFields.SetField("Job", JobFile) - pdfFormFields.SetField("Date", DateStr) - pdfFormFields.SetField("Created", Creator) - pdfFormFields.SetField("Config", MassMaxStr & " " & ConvAxleConf(AxleConf) & " " & ConvVehCat(VehCat, True)) - pdfFormFields.SetField("HDVclass", "HDV Class " & HDVclassStr) - pdfFormFields.SetField("PageNr", "Page " & i + 1 & " of " & pgMax) - - pdfFormFields.SetField("Mission", mr.MissionRef.NameStr) - - For Each lr In mr.Results - - Select Case lr.Key - Case tLoading.EmptyLoaded - lstr = "E" - Case tLoading.RefLoaded - lstr = "R" - Case tLoading.FullLoaded - lstr = "F" - Case Else - Return False - End Select - - With lr.Value - pdfFormFields.SetField("Load" & lstr, .Loading.ToString("0.0") & " t") - pdfFormFields.SetField("Speed" & lstr, .Speed.ToString("0.0")) - pdfFormFields.SetField("FCkm" & lstr, .FCkm.ToString("0.0")) - If .Loading = 0 Then - pdfFormFields.SetField("FCtkm" & lstr, "-") - pdfFormFields.SetField("CO2tkm" & lstr, "-") - Else - pdfFormFields.SetField("FCtkm" & lstr, .FCtkm.ToString("0.0")) - pdfFormFields.SetField("CO2tkm" & lstr, .CO2tkm.ToString("0.0")) - End If - pdfFormFields.SetField("CO2km" & lstr, .CO2km.ToString("0.0")) - End With - - Next - - 'Add Images - pdfContentByte = pdfStamper.GetOverContent(1) - - imgp = iTextSharp.text.Image.GetInstance(cDeclaration.ConvPicPath(HDVclassStr, - (mr.MissionRef.MissionID = tMission.LongHaul))) - imgp.ScaleAbsolute(180, 50) - imgp.SetAbsolutePosition(600, 475) - pdfContentByte.AddImage(imgp) - - imgp = iTextSharp.text.Image.GetInstance(mr.ChartSpeed, BaseColor.WHITE) - imgp.ScaleAbsolute(780, 156) - imgp.SetAbsolutePosition(17, 270) - pdfContentByte.AddImage(imgp) - - imgp = iTextSharp.text.Image.GetInstance(mr.ChartTqN, BaseColor.WHITE) - imgp.ScaleAbsolute(420, 178) - imgp.SetAbsolutePosition(375, 75) - pdfContentByte.AddImage(imgp) - - ' flatten the form to remove editting options, set it to false to leave the form open to subsequent manual edits - pdfStamper.FormFlattening = True - - ' close the pdf - pdfStamper.Close() - pdfReader.Close() - Next - - 'Merge files - doc = New iTextSharp.text.Document(iTextSharp.text.PageSize.A4.Rotate, 12, 12, 12, 12) - - pdfWriter = pdfWriter.GetInstance(doc, New FileStream(Filepath, FileMode.Create)) - - doc.Open() - - For Each temppath In temppdfs - pdfReader = New PdfReader(temppath) - pdfpage = pdfWriter.GetImportedPage(pdfReader, 1) - doc.Add(iTextSharp.text.Image.GetInstance(pdfpage)) - Next - - If (doc.IsOpen()) Then - doc.Close() - End If - - 'Delete temp files - 'For Each temppath In temppdfs - ' File.Delete(temppath) - 'Next - - Catch ex As Exception - - Return False - - End Try - - - Return True - End Function - - - Public Class cMissionResults - Public ReadOnly Results As Dictionary(Of tLoading, cLoadingResults) - - Public MissionRef As cMission - - Public ChartSpeed As Drawing.Image - Public ChartTqN As Drawing.Image - - - Public Sub New() - Results = New Dictionary(Of tLoading, cLoadingResults) - End Sub - End Class - - Public Class cLoadingResults - Public Loading As Single = 0 - Public Speed As Single = 0 - Public FCkm As Single = 0 - Public FCtkm As Single = 0 - Public CO2km As Single = 0 - Public CO2tkm As Single = 0 - Public FCerror As Boolean = False - - Public TargetSpeed As List(Of Single) - Public ActualSpeed As List(Of Single) - Public Distance As List(Of Single) - Public Alt As List(Of Single) - Public Tq As List(Of Single) - Public nU As List(Of Single) - - - Public Sub New() - TargetSpeed = New List(Of Single) - ActualSpeed = New List(Of Single) - Distance = New List(Of Single) - Alt = New List(Of Single) - Tq = New List(Of Single) - nU = New List(Of Single) - End Sub - End Class -End Class - diff --git a/VECTO/cDelaunayMap.vb b/VECTO/cDelaunayMap.vb deleted file mode 100644 index 2c35965c451b232eedc88d6af3a1a6370fe8a455..0000000000000000000000000000000000000000 --- a/VECTO/cDelaunayMap.vb +++ /dev/null @@ -1,493 +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 cDelaunayMap - - Public ptDim As Integer - - Public ptList As List(Of dPoint) - Private lDT As List(Of dTriangle) - Private planes As List(Of Double()) - - Public DualMode As Boolean - Private ptListXZ As List(Of dPoint) - Private planesXZ As List(Of Double()) - Private lDTXZ As List(Of dTriangle) - - Public ExtrapolError As Boolean - - - Public Sub New() - ptList = New List(Of dPoint) - ptListXZ = New List(Of dPoint) - DualMode = False - End Sub - - Public Sub AddPoints(ByVal X As Double, ByVal Y As Double, ByVal Z As Double) - ptList.Add(New dPoint(X, Y, Z)) - If DualMode Then ptListXZ.Add(New dPoint(X, Z, Y)) - End Sub - - Public Function Triangulate() As Boolean - Dim tr As dTriangle - Dim DT As dTriangulation - - ptDim = ptList.Count - 1 - - 'XY-triangulation - Try - DT = New dTriangulation - lDT = DT.Triangulate(ptList) - Catch ex As Exception - Return False - End Try - - planes = New List(Of Double()) - - For Each tr In lDT - planes.Add(GetPlane(tr)) - Next - - - - '#If DEBUG Then - ' Dim i As Int16 - ' Debug.Print("#,x1,y1,z1,x2,y2,z2") - ' i = -1 - ' For Each tr In lDT - ' i += 1 - ' Debug.Print(i & "," & tr.P1.X & "," & tr.P1.Y & "," & tr.P1.Z & "," & tr.P2.X & "," & tr.P2.Y & "," & tr.P2.Z) - ' Debug.Print(i & "," & tr.P3.X & "," & tr.P3.Y & "," & tr.P3.Z & "," & tr.P2.X & "," & tr.P2.Y & "," & tr.P2.Z) - ' Debug.Print(i & "," & tr.P1.X & "," & tr.P1.Y & "," & tr.P1.Z & "," & tr.P3.X & "," & tr.P3.Y & "," & tr.P3.Z) - ' Next - '#End If - - - - 'XZ-triangulation - If DualMode Then - - If ptDim <> ptListXZ.Count - 1 Then Return False - - Try - DT = New dTriangulation - lDTXZ = DT.Triangulate(ptListXZ) - Catch ex As Exception - Return False - End Try - - planesXZ = New List(Of Double()) - - For Each tr In lDTXZ - planesXZ.Add(GetPlane(tr)) - Next - - End If - - Return True - - End Function - - 'XY => Z Interpolation - Public Function Intpol(ByVal x As Double, ByVal y As Double) As Double - Dim j As Integer - Dim l0 As Double() - Dim tr As dTriangle - - ExtrapolError = False - - 'Try exact solution for IsInside() - j = -1 - For Each tr In lDT - j += 1 - If IsInside(tr, x, y, True) Then - l0 = planes(j) - Return (l0(3) - x * l0(0) - y * l0(1)) / l0(2) - End If - Next - - 'Try approx. solution (fixes rounding errors when points lies exactly on an edge of a triangle) - j = -1 - For Each tr In lDT - j += 1 - If IsInside(tr, x, y, False) Then - l0 = planes(j) - Return (l0(3) - x * l0(0) - y * l0(1)) / l0(2) - End If - Next - - - - 'ERROR: Extrapolation - ExtrapolError = True - - Return Nothing - - End Function - - 'XZ => Y Interpolation - Public Function IntpolXZ(ByVal x As Double, ByVal z As Double) As Double - Dim j As Integer - Dim l0 As Double() - Dim tr As dTriangle - - ExtrapolError = False - - If DualMode Then - - 'Try exact solution for IsInside() - j = -1 - For Each tr In lDTXZ - j += 1 - If IsInside(tr, x, z, True) Then - l0 = planesXZ(j) - Return (l0(3) - x * l0(0) - z * l0(1)) / l0(2) - End If - Next - - 'Try approx. solution (fixes rounding errors when points lies exactly on an edge of a triangle) - j = -1 - For Each tr In lDTXZ - j += 1 - If IsInside(tr, x, z, False) Then - l0 = planesXZ(j) - Return (l0(3) - x * l0(0) - z * l0(1)) / l0(2) - End If - Next - - 'ERROR: Extrapolation - ExtrapolError = True - Return Nothing - - Else - - 'ERROR: Extrapolation - ExtrapolError = True - Return Nothing - - End If - End Function - - Private Function GetPlane(ByRef tr As dTriangle) As Double() - Dim AB As dPoint - Dim AC As dPoint - Dim cross As dPoint - Dim l(3) As Double - Dim pt1 As dPoint - Dim pt2 As dPoint - Dim pt3 As dPoint - - pt1 = tr.P1 - pt2 = tr.P2 - pt3 = tr.P3 - - AB = New dPoint(pt2.X - pt1.X, pt2.Y - pt1.Y, pt2.Z - pt1.Z) - AC = New dPoint(pt3.X - pt1.X, pt3.Y - pt1.Y, pt3.Z - pt1.Z) - - cross = New dPoint(AB.Y * AC.Z - AB.Z * AC.Y, AB.Z * AC.X - AB.X * AC.Z, AB.X * AC.Y - AB.Y * AC.X) - - l(0) = cross.X - l(1) = cross.Y - l(2) = cross.Z - - l(3) = pt1.X * cross.X + pt1.Y * cross.Y + pt1.Z * cross.Z - - Return l - - End Function - - Private Function IsInside(ByRef tr As dTriangle, ByVal xges As Double, ByVal yges As Double, ByVal Exact As Boolean) As Boolean - Dim v0(1) As Double - Dim v1(1) As Double - Dim v2(1) As Double - Dim dot00 As Double - Dim dot01 As Double - Dim dot02 As Double - Dim dot11 As Double - Dim dot12 As Double - Dim invDenom As Double - Dim u As Double - Dim v As Double - Dim pt1 As dPoint - Dim pt2 As dPoint - Dim pt3 As dPoint - - pt1 = tr.P1 - pt2 = tr.P2 - pt3 = tr.P3 - - 'Quelle: http://www.blackpawn.com/texts/pointinpoly/default.html (Barycentric Technique) - - ' Compute vectors - v0(0) = pt3.X - pt1.X - v0(1) = pt3.Y - pt1.Y - - v1(0) = pt2.X - pt1.X - v1(1) = pt2.Y - pt1.Y - - v2(0) = xges - pt1.X - v2(1) = yges - pt1.Y - - ' Compute dot products - dot00 = v0(0) * v0(0) + v0(1) * v0(1) - dot01 = v0(0) * v1(0) + v0(1) * v1(1) - dot02 = v0(0) * v2(0) + v0(1) * v2(1) - dot11 = v1(0) * v1(0) + v1(1) * v1(1) - dot12 = v1(0) * v2(0) + v1(1) * v2(1) - - ' Compute barycentric coordinates - invDenom = 1 / (dot00 * dot11 - dot01 * dot01) - u = (dot11 * dot02 - dot01 * dot12) * invDenom - v = (dot00 * dot12 - dot01 * dot02) * invDenom - - 'Debug.Print(u & ", " & v & ", " & u + v) - - ' Check if point is in triangle - If Exact Then - Return (u >= 0) And (v >= 0) And (u + v <= 1) - Else - Return (u >= -0.001) And (v >= -0.001) And (u + v <= 1.001) - End If - - End Function - - Public Class dPoint - Public X As Double - Public Y As Double - Public Z As Double - - Public Sub New(ByVal xd As Double, ByVal yd As Double, ByVal zd As Double) - X = xd - Y = yd - Z = zd - End Sub - - Public Shared Operator =(left As dPoint, right As dPoint) As Boolean - - 'If DirectCast(left, Object) = DirectCast(right, Object) Then - ' Return True - 'End If - - 'If (DirectCast(left, Object) Is Nothing) OrElse (DirectCast(right, Object) Is Nothing) Then - ' Return False - 'End If - - ' Just compare x and y here... - If left.X <> right.X Then - Return False - End If - - If left.Y <> right.Y Then - Return False - End If - - Return True - - End Operator - - Public Shared Operator <>(left As dPoint, right As dPoint) As Boolean - Return Not (left = right) - End Operator - - - End Class - - Public Class dTriangle - Public P1 As dPoint - Public P2 As dPoint - Public P3 As dPoint - - Public Sub New(ByRef pp1 As dPoint, ByRef pp2 As dPoint, ByRef pp3 As dPoint) - P1 = pp1 - P2 = pp2 - P3 = pp3 - End Sub - - Public Function ContainsInCircumcircle(pt As dPoint) As Double - Dim ax As Double = Me.P1.X - pt.X - Dim ay As Double = Me.P1.Y - pt.Y - Dim bx As Double = Me.P2.X - pt.X - Dim by As Double = Me.P2.Y - pt.Y - Dim cx As Double = Me.P3.X - pt.X - Dim cy As Double = Me.P3.Y - pt.Y - Dim det_ab As Double = ax * by - bx * ay - Dim det_bc As Double = bx * cy - cx * by - Dim det_ca As Double = cx * ay - ax * cy - Dim a_squared As Double = ax * ax + ay * ay - Dim b_squared As Double = bx * bx + by * by - Dim c_squared As Double = cx * cx + cy * cy - - Return a_squared * det_bc + b_squared * det_ca + c_squared * det_ab - - End Function - - Public Function SharesVertexWith(triangle As dTriangle) As Boolean - If Me.P1.X = triangle.P1.X AndAlso Me.P1.Y = triangle.P1.Y Then - Return True - End If - If Me.P1.X = triangle.P2.X AndAlso Me.P1.Y = triangle.P2.Y Then - Return True - End If - If Me.P1.X = triangle.P3.X AndAlso Me.P1.Y = triangle.P3.Y Then - Return True - End If - - If Me.P2.X = triangle.P1.X AndAlso Me.P2.Y = triangle.P1.Y Then - Return True - End If - If Me.P2.X = triangle.P2.X AndAlso Me.P2.Y = triangle.P2.Y Then - Return True - End If - If Me.P2.X = triangle.P3.X AndAlso Me.P2.Y = triangle.P3.Y Then - Return True - End If - - If Me.P3.X = triangle.P1.X AndAlso Me.P3.Y = triangle.P1.Y Then - Return True - End If - If Me.P3.X = triangle.P2.X AndAlso Me.P3.Y = triangle.P2.Y Then - Return True - End If - If Me.P3.X = triangle.P3.X AndAlso Me.P3.Y = triangle.P3.Y Then - Return True - End If - - Return False - End Function - - End Class - - Public Class dEdge - Public StartPoint As dPoint - Public EndPoint As dPoint - - Public Sub New(ByRef p1 As dPoint, ByRef p2 As dPoint) - StartPoint = p1 - EndPoint = p2 - End Sub - - Public Shared Operator =(left As dEdge, right As dEdge) As Boolean - 'If DirectCast(left, Object) = DirectCast(right, Object) Then - ' Return True - 'End If - - 'If (DirectCast(left, Object) Is Nothing) Or (DirectCast(right, Object) Is Nothing) Then - ' Return False - 'End If - - Return ((left.StartPoint = right.StartPoint AndAlso left.EndPoint = right.EndPoint) OrElse (left.StartPoint = right.EndPoint AndAlso left.EndPoint = right.StartPoint)) - End Operator - - Public Shared Operator <>(left As dEdge, right As dEdge) As Boolean - Return Not (left = right) - End Operator - - - End Class - - Public Class dTriangulation - - Public Function Triangulate(triangulationPoints As List(Of dPoint)) As List(Of dTriangle) - If triangulationPoints.Count < 3 Then - Throw New ArgumentException("Can not triangulate less than three vertices!") - End If - - ' The triangle list - Dim triangles As New List(Of dTriangle)() - - - - ' The "supertriangle" which encompasses all triangulation points. - ' This triangle initializes the algorithm and will be removed later. - Dim superTriangle As dTriangle = Me.SuperTriangle(triangulationPoints) - triangles.Add(superTriangle) - - ' Include each point one at a time into the existing triangulation - For i As Integer = 0 To triangulationPoints.Count - 1 - ' Initialize the edge buffer. - Dim EdgeBuffer As New List(Of dEdge)() - - ' If the actual vertex lies inside the circumcircle, then the three edges of the - ' triangle are added to the edge buffer and the triangle is removed from list. - For j As Integer = triangles.Count - 1 To 0 Step -1 - Dim t As dTriangle = triangles(j) - If t.ContainsInCircumcircle(triangulationPoints(i)) > 0 Then - EdgeBuffer.Add(New dEdge(t.P1, t.P2)) - EdgeBuffer.Add(New dEdge(t.P2, t.P3)) - EdgeBuffer.Add(New dEdge(t.P3, t.P1)) - triangles.RemoveAt(j) - End If - Next - - ' Remove duplicate edges. This leaves the convex hull of the edges. - ' The edges in this convex hull are oriented counterclockwise! - For j As Integer = EdgeBuffer.Count - 2 To 0 Step -1 - For k As Integer = EdgeBuffer.Count - 1 To j + 1 Step -1 - If EdgeBuffer(j) = EdgeBuffer(k) Then - EdgeBuffer.RemoveAt(k) - EdgeBuffer.RemoveAt(j) - k -= 1 - Continue For - End If - Next - Next - - ' Generate new counterclockwise oriented triangles filling the "hole" in - ' the existing triangulation. These triangles all share the actual vertex. - For j As Integer = 0 To EdgeBuffer.Count - 1 - triangles.Add(New dTriangle(EdgeBuffer(j).StartPoint, EdgeBuffer(j).EndPoint, triangulationPoints(i))) - Next - Next - - ' We don't want the supertriangle in the triangulation, so - ' remove all triangles sharing a vertex with the supertriangle. - For i As Integer = triangles.Count - 1 To 0 Step -1 - If triangles(i).SharesVertexWith(superTriangle) Then - triangles.RemoveAt(i) - End If - Next - - ' Return the triangles - Return triangles - End Function - - - - - Private Function SuperTriangle(triangulationPoints As List(Of dPoint)) As dTriangle - Dim M As Double = triangulationPoints(0).X - - ' get the extremal x and y coordinates - For i As Integer = 1 To triangulationPoints.Count - 1 - Dim xAbs As Double = Math.Abs(triangulationPoints(i).X) - Dim yAbs As Double = Math.Abs(triangulationPoints(i).Y) - If xAbs > M Then - M = xAbs - End If - If yAbs > M Then - M = yAbs - End If - Next - - ' make a triangle - Dim sp1 As New dPoint(10 * M, 0, 0) - Dim sp2 As New dPoint(0, 10 * M, 0) - Dim sp3 As New dPoint(-10 * M, -10 * M, 0) - - Return New dTriangle(sp1, sp2, sp3) - End Function - - End Class - - -End Class - diff --git a/VECTO/cFile V3.vb b/VECTO/cFile V3.vb index efb5537c4faa6e217f4080a43739b06825c3c5d0..f6765d62d26e47f4e66e8ca54d31922f80b733de 100644 --- a/VECTO/cFile V3.vb +++ b/VECTO/cFile V3.vb @@ -8,140 +8,144 @@ ' 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.IO +Imports System.Text +Imports Microsoft.VisualBasic.FileIO + Public Class cFile_V3 - Private TxtFldParser As Microsoft.VisualBasic.FileIO.TextFieldParser - Private StrWrter As System.IO.StreamWriter - Private Mode As FileMode - Private Path As String - Private Sepp As String - Private SkipCom As Boolean - Private StopE As Boolean - Private FileOpen As Boolean - Private PreLine As String() - Private FileEnd As Boolean - - Public Sub New() - Me.Reset() - End Sub - - Private Sub Reset() - FileOpen = False - Mode = FileMode.Undefined - PreLine = Nothing - FileEnd = False - 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() - StopE = StopAtE - Path = FileName - Sepp = Separator - SkipCom = SkipComment - If Not (Mode = FileMode.Undefined) Then Return False - If Not IO.File.Exists(Path) Then Return False - Mode = FileMode.Read - Try - TxtFldParser = New Microsoft.VisualBasic.FileIO.TextFieldParser(Path, System.Text.Encoding.Default) - FileOpen = True - Catch ex As Exception - Return False - End Try - TxtFldParser.TextFieldType = Microsoft.VisualBasic.FileIO.FieldType.Delimited - TxtFldParser.Delimiters = New String() {Sepp} - - 'If TxtFldParser.EndOfData Then Return False - - Me.ReadLine() - Return True - End Function - - Public Function ReadLine() As String() - Dim line As String() - Dim line0 As String - - line = PreLine + Private TxtFldParser As TextFieldParser + Private StrWrter As StreamWriter + Private Mode As FileMode + Private Path As String + Private Sepp As String + Private SkipCom As Boolean + Private StopE As Boolean + Private FileOpen As Boolean + Private PreLine As String() + Private FileEnd As Boolean + + Public Sub New() + Me.Reset() + End Sub + + Private Sub Reset() + FileOpen = False + Mode = FileMode.Undefined + PreLine = Nothing + FileEnd = False + 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() + StopE = StopAtE + Path = FileName + Sepp = Separator + SkipCom = SkipComment + If Not (Mode = FileMode.Undefined) Then Return False + If Not File.Exists(Path) Then Return False + Mode = FileMode.Read + Try + TxtFldParser = New TextFieldParser(Path, Encoding.Default) + FileOpen = True + Catch ex As Exception + Return False + End Try + TxtFldParser.TextFieldType = FieldType.Delimited + TxtFldParser.Delimiters = New String() {Sepp} + + 'If TxtFldParser.EndOfData Then Return False + + Me.ReadLine() + Return True + End Function + + Public Function ReadLine() As String() + Dim line As String() + Dim line0 As String + + line = PreLine lb10: - If TxtFldParser.EndOfData Then - - FileEnd = True - - Else - - PreLine = TxtFldParser.ReadFields - line0 = UCase(Trim(PreLine(0))) - - If SkipCom Then - If Left(line0, 1) = "#" Then GoTo lb10 - End If - - If StopE Then FileEnd = (line0 = "E") - - End If - - Return line - - End Function - - Public Sub Close() - Select Case Mode - Case FileMode.Read - If FileOpen Then TxtFldParser.Close() - TxtFldParser = Nothing - Case FileMode.Write - If FileOpen Then StrWrter.Close() - StrWrter = Nothing - End Select - Me.Reset() - End Sub - - Public ReadOnly Property EndOfFile() As Boolean - Get - Return FileEnd - End Get - 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() - Path = FileName - Sepp = Separator - If Not (Mode = FileMode.Undefined) Then Return False - Mode = FileMode.Write - Try - StrWrter = My.Computer.FileSystem.OpenTextFileWriter(Path, Append, FileFormat) - FileOpen = True - Catch ex As Exception - Return False - End Try - StrWrter.AutoFlush = AutoFlush - Return True - End Function - - Public Sub WriteLine(ByVal ParamArray x() As Object) - Dim St As String - Dim StB As New System.Text.StringBuilder - Dim Skip As Boolean - Skip = True - For Each St In x - If Skip Then - StB.Append(St) - Skip = False - Else - StB.Append(Sepp & St) - End If - Next - StrWrter.WriteLine(StB.ToString) - StB = Nothing - End Sub - Public Sub WriteLine(ByVal x As String) - StrWrter.WriteLine(x) - End Sub - - Private Enum FileMode - Undefined - Read - Write - End Enum + If TxtFldParser.EndOfData Then + + FileEnd = True + + Else + + PreLine = TxtFldParser.ReadFields + line0 = UCase(Trim(PreLine(0))) + + If SkipCom Then + If Left(line0, 1) = "#" Then GoTo lb10 + End If + + If StopE Then FileEnd = (line0 = "E") + + End If + + Return line + + End Function + + Public Sub Close() + Select Case Mode + Case FileMode.Read + If FileOpen Then TxtFldParser.Close() + TxtFldParser = Nothing + Case FileMode.Write + If FileOpen Then StrWrter.Close() + StrWrter = Nothing + End Select + Me.Reset() + End Sub + + Public ReadOnly Property EndOfFile() As Boolean + Get + Return FileEnd + End Get + 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() + Path = FileName + Sepp = Separator + If Not (Mode = FileMode.Undefined) Then Return False + Mode = FileMode.Write + Try + StrWrter = My.Computer.FileSystem.OpenTextFileWriter(Path, Append, FileFormat) + FileOpen = True + Catch ex As Exception + Return False + End Try + StrWrter.AutoFlush = AutoFlush + Return True + End Function + + Public Sub WriteLine(ByVal ParamArray x() As Object) + Dim St As String + Dim StB As New StringBuilder + Dim Skip As Boolean + Skip = True + For Each St In x + If Skip Then + StB.Append(St) + Skip = False + Else + StB.Append(Sepp & St) + End If + Next + StrWrter.WriteLine(StB.ToString) + + End Sub + Public Sub WriteLine(ByVal x As String) + StrWrter.WriteLine(x) + End Sub + + Private Enum FileMode + Undefined + Read + Write + End Enum End Class diff --git a/VECTO/cJSONparser.vb b/VECTO/cJSONparser.vb index 6d4b57a11a30cefebc726cec7206bfbe4c25934f..79f2d37ca1a6e174a0a19f8713749142d9f40592 100644 --- a/VECTO/cJSONparser.vb +++ b/VECTO/cJSONparser.vb @@ -96,128 +96,4 @@ Public Class JSON Return True End Function - - -#Region "old self-made parser" - - Private fullfile As String - - - Private Function GetKeyValString(TabLvl As Integer, ByRef kv As KeyValuePair(Of String, Object)) As String - Dim str As New StringBuilder - Dim obj As Object - Dim kv0 As KeyValuePair(Of String, Object) - Dim First As Boolean - - str.Append(Tabs(TabLvl) & ChrW(34) & kv.Key & ChrW(34) & ": ") - - Select Case kv.Value.GetType - - Case GetType(Dictionary(Of String, Object)) - - str.AppendLine("{") - - First = True - For Each kv0 In kv.Value - If First Then - First = False - Else - str.AppendLine(",") - End If - str.Append(GetKeyValString(TabLvl + 1, kv0)) - Next - - str.AppendLine() - str.Append(Tabs(TabLvl) & "}") - - Case GetType(List(Of Object)) - - str.AppendLine("[") - - First = True - For Each obj In kv.Value - If First Then - First = False - Else - str.AppendLine(",") - End If - str.Append(Tabs(TabLvl + 1) & GetObjString(TabLvl + 1, obj)) - Next - - str.AppendLine() - str.Append(Tabs(TabLvl) & "]") - - Case Else - - str.Append(GetObjString(TabLvl + 1, kv.Value)) - - End Select - - Return str.ToString - End Function - - Private Function GetObjString(TabLvl As Integer, ByRef obj As Object) As String - Dim kv0 As KeyValuePair(Of String, Object) - Dim First As Boolean - Dim str As StringBuilder - - If obj Is Nothing Then - Return "null" - Else - Select Case obj.GetType - - Case GetType(Dictionary(Of String, Object)) - - str = New StringBuilder - str.AppendLine("{") - - First = True - For Each kv0 In obj - If First Then - First = False - Else - str.AppendLine(",") - End If - str.Append(GetKeyValString(TabLvl + 1, kv0)) - Next - - str.AppendLine() - str.Append(Tabs(TabLvl) & "}") - - Return str.ToString - - Case GetType(String) - - Return ChrW(34) & CStr(obj) & ChrW(34) - - Case GetType(Boolean) - - If CBool(obj) Then - Return "true" - Else - Return "false" - End If - - Case Else - - Return CDbl(obj).ToString - - End Select - End If - End Function - - Private Function Tabs(l As Integer) As String - Dim i As Integer - Dim str As String - - str = "" - For i = 1 To l - str &= vbTab - Next - - Return str - End Function - - -#End Region End Class diff --git a/VECTO/cRegression.vb b/VECTO/cRegression.vb deleted file mode 100644 index b48141723f55224ebed2a8fe020bb8a35102acc7..0000000000000000000000000000000000000000 --- a/VECTO/cRegression.vb +++ /dev/null @@ -1,165 +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. -Public Class cRegression - - Public Class RegressionProcessInfo - - Public SampleSize As Integer = 0 - - Public SigmaError As Double - - Public XRangeL As Double = Double.MaxValue - - Public XRangeH As Double = Double.MinValue - - Public YRangeL As Double = Double.MaxValue - - Public YRangeH As Double = Double.MinValue - - Public StandardError As Double - - Public a As Double - - Public b As Double - - Public XStdDev As Double - - Public YStdDev As Double - - Public XMean As Double - - Public YMean As Double - - Public PearsonsR As Double - - Public t As Double - - Public Overrides Function ToString() As String - - Dim ret As String = "SampleSize=" & Me.SampleSize & vbCrLf & "StandardError=" & Me.StandardError & vbCrLf & "y=" & Me.a & " + " & Me.b & "x" - - Return ret - - End Function - - End Class - - Function Regress(ByVal xval() As Double, ByVal yval() As Double) As RegressionProcessInfo - - Dim sigmax As Double = 0.0 - - Dim sigmay As Double = 0.0 - - Dim sigmaxx As Double = 0.0 - - Dim sigmayy As Double = 0.0 - - Dim sigmaxy As Double = 0.0 - - Dim x As Double - - Dim y As Double - - Dim n As Double = 0 - - Dim ret As RegressionProcessInfo = New RegressionProcessInfo - - For arrayitem As Integer = LBound(xval) To UBound(xval) - - x = xval(arrayitem) - - y = yval(arrayitem) - - If x > ret.XRangeH Then - - ret.XRangeH = x - - End If - - If x < ret.XRangeL Then - - ret.XRangeL = x - - End If - - If y > ret.YRangeH Then - - ret.YRangeH = y - - End If - - If y < ret.YRangeL Then - - ret.YRangeL = y - - End If - - sigmax += x - - sigmaxx += x * x - - sigmay += y - - sigmayy += y * y - - sigmaxy += x * y - - n = n + 1 - - Next - - ret.b = (n * sigmaxy - sigmax * sigmay) / (n * sigmaxx - sigmax * sigmax) - - ret.a = (sigmay - ret.b * sigmax) / n - - ret.SampleSize = CType(n, Integer) - - 'calculate distances for each point (residual) - - For arr2 As Integer = LBound(xval) To UBound(xval) - - y = yval(arr2) - - x = xval(arr2) - - Dim yprime As Double = ret.a + ret.b * x 'prediction - - Dim Residual As Double = y - yprime - - ret.SigmaError += Residual * Residual - - Next - - ret.XMean = sigmax / n - - ret.YMean = sigmay / n - - ret.XStdDev = Math.Sqrt((CType(n * sigmaxx - sigmax * sigmax, Double)) / (CDbl(n) * CDbl(n) - 1.0)) - - ret.YStdDev = Math.Sqrt((CType(n * sigmayy - sigmay * sigmay, Double)) / (CDbl(n) * CDbl(n) - 1.0)) - - ret.StandardError = Math.Sqrt(ret.SigmaError / ret.SampleSize) - - Dim ssx As Double = sigmaxx - ((sigmax * sigmax) / n) - - Dim ssy As Double = sigmayy - ((sigmay * sigmay) / n) - - Dim ssxy As Double = sigmaxy - ((sigmax * sigmay) / n) - - ret.PearsonsR = ssxy / Math.Sqrt(ssx * ssy) - - ret.t = ret.PearsonsR / Math.Sqrt((1 - (ret.PearsonsR * ret.PearsonsR)) / (n - 2)) - - Return ret - - End Function - -End Class diff --git a/VECTO/mAAUX_Global.vb b/VECTO/mAAUX_Global.vb index e671561c10542a6fdca33581e63d21ffa8a9c81c..9ad01ffd525dcf1ff989700ce199dfe0fe3a2e66 100644 --- a/VECTO/mAAUX_Global.vb +++ b/VECTO/mAAUX_Global.vb @@ -1,29 +1,11 @@ Imports System.Collections.Generic Imports VectoAuxiliaries Imports System.IO -Imports TUGraz.VectoCommon.Utils +Imports System.Runtime.Remoting Module mAAUX_Global - Public ClutchEngaged As Boolean - Public EngineDrivelinePower As Single - Public EngineDrivelineTorque As Single - Public EngineMotoringPower As Single - Public EngineSpeed As Single - Public PreExistingAuxPower As Single - Public Idle As Boolean - Public InNeutral As Boolean Public WithEvents advancedAuxModel As IAdvancedAuxiliaries - Public RunningCalc As Boolean = False - Public Internal_Engine_Power As Single - 'This must be set in the main loop and will be used to determin - 'the name of the file which would be offered to the model which is used - 'by it internally. In Bus Auxiliaries, it is used for Actuations of the - 'Doors during particular cycle types. - Public CurrentCycleFile As String = String.Empty - - 'This is a default setting of 3114 this will be set when the cycle begins. - Public CycleTimeInSeconds As Integer = 3114 Public Sub AAEventAuxiliaryEvent(ByRef sender As Object, ByVal message As String, ByVal messageType As AdvancedAuxiliaryMessageType) Handles advancedAuxModel.AuxiliaryEvent @@ -33,63 +15,6 @@ Module mAAUX_Global End Sub 'AA-TB - Public Function InitialiseAdvancedAuxModel(aauxFile As String) As Boolean - - Dim o As System.Runtime.Remoting.ObjectHandle - Dim result As Boolean = True - - If VECTO_Global.VEC.AuxiliaryAssembly <> "CLASSIC" Then - - Try - - - 'Open Assembly and invoke the validation using the paths supplied. - Try - o = Activator.CreateInstance(VEC.AuxiliaryAssembly, "VectoAuxiliaries.AdvancedAuxiliaries") - advancedAuxModel = DirectCast(o.Unwrap, IAdvancedAuxiliaries) - - Dim message As String = String.Empty - - Dim fuelMap As cMAP = New cMAP() - 'fuelMap = New cMAP() - fuelMap.FilePath = FilePathUtils.ResolveFilePath(fPATH(VEC.FilePath), ENG.FuelMapFullPath) - If Not fuelMap.ReadFile() Then - MessageBox.Show("Unable to read fuel map, aborting.") - Return False - End If - fuelMap.Triangulate() - - 'Set Statics - advancedAuxModel.VectoInputs.Cycle = DetermineCycleNameFromCurrentFile() - advancedAuxModel.VectoInputs.VehicleWeightKG = VEH.Mass.SI(Of Kilogram)() - advancedAuxModel.VectoInputs.FuelMap = fuelMap 'ENG.FuelMapFullPath - advancedAuxModel.VectoInputs.FuelDensity = CType(Cfg.FuelDens * 1000, Double).SI(Of KilogramPerCubicMeter)() - - 'Set Signals - advancedAuxModel.Signals.TotalCycleTimeSeconds = CycleTimeInSeconds - advancedAuxModel.Signals.EngineIdleSpeed = ENG.Nidle.RPMtoRad() - advancedAuxModel.RunStart(aauxFile, VEC.FilePath) - - - Catch Ex As Exception - - result = False - - End Try - - Return result - - - Catch ex As Exception - - - End Try - - - End If - - Return False - End Function 'AA-TB ''' <summary> @@ -103,7 +28,7 @@ Module mAAUX_Global Dim fileNameWoPath As String Dim fileNameWoExtentsion As String Dim advancedAuxiliary As cAdvancedAuxiliary - Dim o As System.Runtime.Remoting.ObjectHandle + Dim o As ObjectHandle Dim iAdvancedAux As IAdvancedAuxiliaries @@ -161,7 +86,7 @@ Module mAAUX_Global Dim auxList As List(Of cAdvancedAuxiliary) = DiscoverAdvancedAuxiliaries() Dim chosenAssembly As String - Dim o As System.Runtime.Remoting.ObjectHandle + Dim o As ObjectHandle Dim iAdvancedAux As IAdvancedAuxiliaries Dim result As Boolean @@ -223,7 +148,7 @@ Module mAAUX_Global Dim auxList As List(Of cAdvancedAuxiliary) = DiscoverAdvancedAuxiliaries() Dim chosenAssembly As String - Dim o As System.Runtime.Remoting.ObjectHandle + Dim o As ObjectHandle Dim iAdvancedAux As IAdvancedAuxiliaries Dim result As Boolean @@ -248,45 +173,4 @@ Module mAAUX_Global Return result End Function - - - ''' <summary> - ''' Will Apply an algorithm to the DRI cycle file being used and attempt to return a consitant name - ''' </summary> - ''' <returns>String : Cylename IE, Bus_Interurban, Bus_Urban,etc</returns> - ''' <remarks></remarks> - Public Function DetermineCycleNameFromCurrentFile() As String - - 'Get DriveFile without path and without extension - Dim driveFile As String = fFILE(CurrentCycleFile, False) - - Select Case (True) - - 'DJN - update to make contains test case insensitive - Case driveFile.ToLower().Contains("heavy_urban") AndAlso driveFile.ToLower().Contains("bus") - Return "Heavy urban" - - Case driveFile.ToLower().Contains("suburban") AndAlso driveFile.ToLower().Contains("bus") - Return "Suburban" - - Case driveFile.ToLower().Contains("urban") AndAlso driveFile.ToLower().Contains("bus") - Return "Urban" - - Case driveFile.ToLower().Contains("interurban") AndAlso driveFile.ToLower().Contains("bus") - Return "Interurban" - - Case driveFile.ToLower().Contains("coach") - Return "Coach" - - Case Else - WorkerMsg(tMsgID.Warn, - String.Format("UnServiced Cycle Name '{0}' in Pneumatics Actuations Map 0 Actuations returned", driveFile), - "Advanced Auxiliaries") - Return "UnknownCycleName" - - End Select - - - Return "Urban" - End Function End Module