diff --git a/AuxillaryTestHarness/AuxiliaryTestHarness.vbproj b/AuxillaryTestHarness/AuxiliaryTestHarness.vbproj
index 8b645bcc710303e0bf0c5010db97dafbc040a5f7..880739ed79424f04ba6954e5f95e287628c48a28 100644
--- a/AuxillaryTestHarness/AuxiliaryTestHarness.vbproj
+++ b/AuxillaryTestHarness/AuxiliaryTestHarness.vbproj
@@ -202,6 +202,9 @@
<Content Include="testPneumaticActuationsMap_GOODMAP.apac">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
+ <Content Include="TAKAWAY.AHSM">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
<None Include="testAlternatorMap - Copy.aalt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
diff --git a/AuxillaryTestHarness/My Project/Application.Designer.vb b/AuxillaryTestHarness/My Project/Application.Designer.vb
index 3ade07e1acc44f60cf946addae6acfe331880686..bfdd69f1fe148766099129b5e9f5b672cea53fbf 100644
--- a/AuxillaryTestHarness/My Project/Application.Designer.vb
+++ b/AuxillaryTestHarness/My Project/Application.Designer.vb
@@ -32,7 +32,7 @@ Namespace My
<Global.System.Diagnostics.DebuggerStepThroughAttribute()> _
Protected Overrides Sub OnCreateMainForm()
- Me.MainForm = Global.AuxiliaryTestHarness.Dashboard
+ Me.MainForm = Global.AuxiliaryTestHarness.AuxLauncher
End Sub
End Class
End Namespace
diff --git a/AuxillaryTestHarness/My Project/Application.myapp b/AuxillaryTestHarness/My Project/Application.myapp
index 99bb8a743650100ce3162ea0f689915faa3085fd..663394adbf3b3907cc48b5779f91a67811e5e209 100644
--- a/AuxillaryTestHarness/My Project/Application.myapp
+++ b/AuxillaryTestHarness/My Project/Application.myapp
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<MyApplicationData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<MySubMain>true</MySubMain>
- <MainForm>Dashboard</MainForm>
+ <MainForm>AuxLauncher</MainForm>
<SingleInstance>false</SingleInstance>
<ShutdownMode>0</ShutdownMode>
<EnableVisualStyles>true</EnableVisualStyles>
diff --git a/AuxillaryTestHarness/TAKAWAY.AHSM b/AuxillaryTestHarness/TAKAWAY.AHSM
new file mode 100644
index 0000000000000000000000000000000000000000..097f07c19315486d5aa3db69e645fa75dedd8900
--- /dev/null
+++ b/AuxillaryTestHarness/TAKAWAY.AHSM
@@ -0,0 +1,198 @@
+[Electrical Power (w)], [Mechanical Power (w)], [Fuelling (L/H)]
+337.25472,2281.38537,0
+[MODELSOURCE]
+
+*********************************************************************************************************
+
+USERNAME : Terry Burns
+SIM DATE : 15/12/2014 18:16:13
+TITLE : This is a little simulation from Mike Preston
+COMMENTS : Now is thee time for all good men to come to the aid of the party.
+
+*********************************************************************************************************
+
+
+*INPUT & RESULTS SHEET*
+_______________________
+
+*Bus Parameterisation*
+______________________
+
+ Known Bus Model Known Bus Model User Amended Values
+Bus Model IVECO - Citelis 12m CNG
+Number of Passengers 89 89
+Bus Type low floor low floor
+Bus Floor Surface Area 27.5145 27.5145 m^2
+Bus Surface Area (m^2) 127.87912 127.87912 m^2
+Bus Window Surface (m^2) 22.985 22.985 m^2
+Bus Volume 70.2614 70.2614 m^3
+Bus Length 11.99 11.99 m
+Bus Width 2.5 2.5 m
+
+*Boundary Conditions:*
+______________________
+
+G-Factor 1
+Solar Clouding 0.65
+Heat per Passenger into Cabin 80 W
+Passenger Boundary Temperature 13 oC
+Passenger Density: Low Floor 3 Pass/m^2
+Passenger Density: Semi Low Floor 2 Pass/m^2
+Passenger Density: Raised Floor 1.4 Pass/m^2
+Calculated Passenger Number 82.5435
+U-Values 4 W/(K*m^3)
+Heating Boundary Temperature 20 oC
+Cooling Boundary Temperature 24 oC
+High Ventilation 25 l/h
+low Ventilation 8 l/h
+High 1756.535 m^3/h
+low 562.0912 m^3/h
+High Vent Power 1053.921 W
+Low Vent Power 337.25472 W
+Specific Ventilation Power 0.6 Wh/m3
+COP 4
+Aux. Heater Efficiency 1
+GCV (Diesel / Heating oil) 13 kwh/kg
+Volumic mass (Diesel / Heating oil) 1 kg/l
+Window Area per Unit Bus Length 1.5 m^2/m
+Front + Rear Window Area 5 m^2
+Max Temperature Delta for low Floor Busses 4 K
+Max Possible Benefit from Technology List 0.03 Fraction
+
+*Enviromental Conditions*
+_________________________
+
+Enviromental Temperature 25 oC
+Solar 400 W/m²
+
+*AC-system*
+___________
+
+In-cabin room AC-System Yes
+AC-compressor type mechanical
+AC-compressor capacity 18 kW
+
+*Ventilation*
+_____________
+
+Ventilation during heating Yes
+Ventilation when both Heating and AC are inactive Yes
+Ventilation during AC Yes
+Ventilation flow setting when both Heating and AC are inactive high
+Ventilation during Heating high
+Ventilation during Cooling low
+
+*Aux. Heater*
+_____________
+
+Engine Waste Heat (kW) 2 kW
+Fuel Fired Heater (kW) 10 kW
+
+*Insulation*
+____________
+
+foils (g-value reduction) No
+double-glazing (g-value reduction, u-value reduction) No
+heat insulation glazing (u-value reduction) No
+roof insulation (u-value reduction) No
+wall insulation (u-value reduction) No
+floor insulation (u-value reduction) No
+door insulation (u-value reduction) No
+clearance between door frame / door leaf (different solutions bristles / rubberseals) (reduced leckage air) No
+insulation of heating and cooling pipes (increase heating efficiency) No
+"changable" glas (g-value) No
+reflective paintings No
+insulation of engine compartment No
+
+*ventilation*
+_____________
+
+ active ventilation: Heating active ventilation: Ventilation active ventilation: Cooling
+fan engines (EC, Brush) (efficiency) No No No No
+fan controll strategy (serial / parallel) No No No No
+
+air curtain (reduces air exchange between in-cabin room and environment No
+partial air recirculation No
+variable fresh air rate (influence on heating / cooling demand) No
+
+*heating*
+_________
+
+engine waste heat recovery (reduces heating demand for auxillary heater) ALREADY IMPLEMENTED No
+heat storage (increase heating efficiency) No
+Heatpump systems (increase heating efficiency) No
+position of heatexchangers in-cabin room (air flow towards walls / windows) [increases heat losses through increased ?T] No
+heated surfaces No
+heated seats No
+aux. Heater type (heated medium water, air) (efficiency value)(energy source, fuel ptc) No
+
+*cooling*
+_________
+
+adjustable compressorpower (cooling power variable) ALREADY IMPLEMENTED No
+
+driver ac-system No electrical
+
+ active ventilation: Heating active ventilation: Ventilation active ventilation: Cooling
+different sizes of air ducts (pressure loss effects power consumption of the fan engines) No No No No
+
+low temperature storages / storage vaporizer No
+speed depending air conditioning No
+ejector No
+"downhill" savings (determine diff. between effect for mech. & electr. Comp. regarding fuel consumpt.) No
+
+*List of technology Benefits *
+______________________________
+
+*Insulation*
+____________
+
+Insulation Units H V C H V C H V C
+foils (g-value reduction) fraction 0.01 0.01 0.01 0.01 0.01 0.01
+double-glazing (g-value reduction, u-value reduction) fraction 0.02 0.012 0.02 0.025
+heat insulation glazing (u-value reduction) fraction 0.005 0.01 0.01 0.028 0.01 0.024
+roof insulation (u-value reduction) fraction 0.02 -0.01 -0.01 -0.012 -0.01 -0.032
+wall insulation (u-value reduction) fraction 0.01 0.02 0.02 0.019 0.02 0.05
+floor insulation (u-value reduction) fraction 0.02 0.027 0.02 0.012
+door insulation (u-value reduction) fraction 0.01 0.02 0.01 0.028 0.01 0.021
+clearance between door frame / door leaf (different solutions bristles / rubberseals) (reduced leckage air) fraction 0.01 0.02 0.005 0.036 0.008 0.041
+insulation of heating and cooling pipes (increase heating efficiency) fraction 0.01 0.02 0.01 0.024 0.01 0.029
+"changable" glas (g-value) fraction 0.005 0.01 0.01 0.025 0.011 0.025
+reflective paintings fraction 0.005 0.005 0.005 0.02 0.005 0.012
+insulation of engine compartment fraction 0.01 0.023 0.02
+
+*Ventilation*
+_____________
+
+Ventilation Units H V C H V C H V C
+fan engines (EC, Brush) (efficiency) fraction 0.01 0.03 0.018
+fan controll strategy (serial / parallel) fraction 0.005 0.017 0.02
+air curtain (reduces air exchange between in-cabin room and environment fraction 0.01 -0.005 0.01
+partial air recirculation fraction 0.02 -0.01 -0.01 -0.012 -0.01 -0.032
+variable fresh air rate (influence on heating / cooling demand) fraction -0.01 -0.012 -0.01 -0.032
+
+*Heating*
+_________
+
+Heating Units H V C H V C H V C
+engine waste heat recovery (reduces heating demand for auxillary heater) ALREADY IMPLEMENTED fraction 0.0135 0.024 0.01
+heat storage (increase heating efficiency) fraction 0.012 0.028 0.005
+Heatpump systems (increase heating efficiency) fraction 0.01 0.02 0.005
+position of heatexchangers in-cabin room (air flow towards walls / windows) [increases heat losses through increased ?T] fraction 0.02 0.019 0.03
+heated surfaces fraction -0.01 -0.012 -0.032
+heated seats fraction 0.01 0.01 0.01
+aux. Heater type (heated medium water, air) (efficiency value)(energy source, fuel ptc) fraction 0.02 0.015 0.02
+
+*Cooling*
+_________
+
+Cooling Units H V C H V C H V C
+adjustable compressorpower (cooling power variable) ALREADY IMPLEMENTED fraction 0.01 0.01 0.02
+driver ac-system (mechanical) kW -0.2 -0.3 -0.4
+driver ac-system (electrical) kW -0.1 -0.15 -0.2
+different sizes of air ducts (pressure loss effects power consumption of the fan engines) fraction -0.01 -0.012 -0.032
+low temperature storages / storage vaporizer fraction 0.014 0.012 0.012
+speed depending air conditioning fraction 0.018 0.02 0.021
+ejector fraction 0.023 0.024 0.012
+"downhill" savings (determine diff. between effect for mech. & electr. Comp. regarding fuel consumpt.) fraction 0.01 0.028 0.021
+
diff --git a/VECTO/AAUX_Gobal.vb b/VECTO/AAUX_Gobal.vb
new file mode 100644
index 0000000000000000000000000000000000000000..0492702f43c0fe8d70ad58e140ab620371ab299f
--- /dev/null
+++ b/VECTO/AAUX_Gobal.vb
@@ -0,0 +1,123 @@
+Imports System.Collections.Generic
+Imports VectoAuxiliaries
+Imports System.IO
+
+Module AAUX_Gobal
+
+ 'AA-TB
+ ''' <summary>
+ ''' Discovers Advanced Auxiliaries Assemblies in 'targetDirectory' Directory
+ ''' </summary>
+ ''' <returns>List(Of cAdvancedAuxiliary)</returns>
+ ''' <remarks>Target Directory would normally be the executing directory, but can be in another location.</remarks>
+ Public Function DiscoverAdvancedAuxiliaries() As List(Of cAdvancedAuxiliary)
+
+ Dim returnList As List(Of cAdvancedAuxiliary) = New List(Of cAdvancedAuxiliary)
+ Dim fileNameWoPath As String
+ Dim fileNameWoExtentsion As String
+ Dim advancedAuxiliary As cAdvancedAuxiliary
+ Dim o As System.Runtime.Remoting.ObjectHandle
+ Dim iAdvancedAux As IAdvancedAuxiliaries
+
+
+ 'Create Default
+ returnList.Add(New cAdvancedAuxiliary("Classic Vecto Auxiliary", "CLASSIC", "CLASSIC", "CLASSIC"))
+
+
+
+ Try
+ Dim fileEntries As String() = Directory.GetFiles(GetAAUXSourceDirectory)
+ ' Process the list of files found in the directory.
+ Dim fileName As String
+
+ For Each fileName In fileEntries
+
+ If fileName.Contains("Auxiliaries.dll") Then
+
+ 'Get filenamewith
+ fileNameWoPath = fFILE(fileName, True)
+ fileNameWoExtentsion = fFILE(fileName, False)
+
+ o = Activator.CreateInstance(fileNameWoExtentsion, "VectoAuxiliaries.AdvancedAuxiliaries")
+
+ iAdvancedAux = DirectCast(o.Unwrap, IAdvancedAuxiliaries)
+
+ advancedAuxiliary = New cAdvancedAuxiliary(iAdvancedAux.AuxiliaryName, iAdvancedAux.AuxiliaryVersion, fileNameWoPath, fileNameWoExtentsion)
+
+ returnList.Add(advancedAuxiliary)
+
+
+ End If
+
+ Next fileName
+
+ Catch ex As Exception
+
+ MessageBox.Show("Unable to obtain Advanced Auxiliary Assemblies" )
+
+ End Try
+
+
+ Return returnList
+
+ End Function
+
+ 'AA-TB
+ ''' <summary>
+ ''' Invokes Advanced Auxiliaries Configuration Screen
+ ''' </summary>
+ ''' <param name="vectoFilePath">String : Contains the path of the vecto file.</param>
+ ''' <returns>Boolean. True if aauxFile is valid after operation , false of not.</returns>
+ ''' <remarks></remarks>
+ Public Function ConfigureAdvancedAuxiliaries( ByVal assemblyName As String, byval version As string, filePath As String, vectoFilePath As string) As Boolean
+
+
+ Dim auxList As List(of cAdvancedAuxiliary ) = DiscoverAdvancedAuxiliaries()
+ Dim chosenAssembly As String
+ Dim o As System.Runtime.Remoting.ObjectHandle
+ Dim iAdvancedAux As IAdvancedAuxiliaries
+ Dim result As Boolean
+
+ chosenAssembly = auxList.Find( Function(x) x.AssemblyName= assemblyName ANDalso x.AuxiliaryVersion= version).AssemblyName
+ If String.IsNullOrEmpty( chosenAssembly) then Return False
+
+
+ 'Open Assembly and invoke the configuration using the paths supplied.
+
+ Try
+ o = Activator.CreateInstance(chosenAssembly, "VectoAuxiliaries.AdvancedAuxiliaries")
+ iAdvancedAux = DirectCast(o.Unwrap, IAdvancedAuxiliaries)
+
+ iAdvancedAux.Configure(filePath, vectoFilePath)
+
+ Catch ex As Exception
+
+ result = false
+
+ End Try
+
+ Return result
+
+
+
+ End Function
+
+
+''' <summary>
+''' Gets location of Advanced Auxiliaries Directory which contains all the assemblies available.
+''' </summary>
+''' <returns>Path where Auxiliaries can be found : String</returns>
+''' <remarks></remarks>
+Public Function GetAAUXSourceDirectory() As String
+
+
+ Return Path.GetDirectoryName(Application.ExecutablePath)
+
+
+ End Function
+
+
+
+
+
+End Module
diff --git a/VECTO/GUI/F_VECTO.Designer.vb b/VECTO/GUI/F_VECTO.Designer.vb
index b121c8e048c23cdadb4b695232fc06527adc739e..28aa3b35496e488b0f3355f890afe107e30ae940 100644
--- a/VECTO/GUI/F_VECTO.Designer.vb
+++ b/VECTO/GUI/F_VECTO.Designer.vb
@@ -28,15 +28,17 @@ Partial Class F_VECTO
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.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.picAuxInfo = New System.Windows.Forms.PictureBox()
+ Me.cboAdvancedAuxiliaries = New System.Windows.Forms.ComboBox()
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.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()
@@ -115,25 +117,33 @@ Partial Class F_VECTO
Me.TbHVCclass = New System.Windows.Forms.TextBox()
Me.TbGbxTxt = New System.Windows.Forms.TextBox()
Me.TbMass = New System.Windows.Forms.TextBox()
- Me.TabPgGen.SuspendLayout()
- Me.GrCycles.SuspendLayout()
- Me.GrAux.SuspendLayout()
- Me.TabControl1.SuspendLayout()
- Me.TabPgDriver.SuspendLayout()
- Me.GrVACC.SuspendLayout()
- Me.GrLAC.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()
- Me.CmOpenFile.SuspendLayout()
- CType(Me.PicVehicle, System.ComponentModel.ISupportInitialize).BeginInit()
- CType(Me.PicBox, System.ComponentModel.ISupportInitialize).BeginInit()
- Me.SuspendLayout()
+ Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
+ Me.txtAdvancedAuxiliaryFile = New System.Windows.Forms.TextBox()
+ Me.btnBrowseAAUXFile = New System.Windows.Forms.Button()
+ Me.lbAdvancedAuxiliaries = New System.Windows.Forms.Label()
+ Me.Label1 = New System.Windows.Forms.Label()
+ Me.picCreateNewAAConfig = New System.Windows.Forms.PictureBox()
+ Me.TabPgGen.SuspendLayout
+ Me.GrCycles.SuspendLayout
+ Me.GrAux.SuspendLayout
+ CType(Me.picAuxInfo,System.ComponentModel.ISupportInitialize).BeginInit
+ Me.TabControl1.SuspendLayout
+ Me.TabPgDriver.SuspendLayout
+ Me.GrVACC.SuspendLayout
+ Me.GrLAC.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
+ Me.CmOpenFile.SuspendLayout
+ CType(Me.PicVehicle,System.ComponentModel.ISupportInitialize).BeginInit
+ CType(Me.PicBox,System.ComponentModel.ISupportInitialize).BeginInit
+ CType(Me.picCreateNewAAConfig,System.ComponentModel.ISupportInitialize).BeginInit
+ Me.SuspendLayout
'
'TabPgGen
'
@@ -151,32 +161,32 @@ Partial Class F_VECTO
Me.TabPgGen.Location = New System.Drawing.Point(4, 22)
Me.TabPgGen.Name = "TabPgGen"
Me.TabPgGen.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPgGen.Size = New System.Drawing.Size(527, 491)
+ Me.TabPgGen.Size = New System.Drawing.Size(527, 542)
Me.TabPgGen.TabIndex = 0
Me.TabPgGen.Text = "General"
- Me.TabPgGen.UseVisualStyleBackColor = True
+ 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((((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.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, 271)
+ Me.GrCycles.Location = New System.Drawing.Point(7, 314)
Me.GrCycles.Name = "GrCycles"
- Me.GrCycles.Size = New System.Drawing.Size(515, 208)
+ Me.GrCycles.Size = New System.Drawing.Size(515, 216)
Me.GrCycles.TabIndex = 34
- Me.GrCycles.TabStop = False
+ 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.AutoSize = True
- Me.Label2.Location = New System.Drawing.Point(387, 153)
+ Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.Label2.AutoSize = true
+ Me.Label2.Location = New System.Drawing.Point(387, 188)
Me.Label2.Name = "Label2"
Me.Label2.Size = New System.Drawing.Size(122, 13)
Me.Label2.TabIndex = 33
@@ -184,21 +194,21 @@ Partial Class F_VECTO
'
'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.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.FullRowSelect = True
- Me.LvCycles.GridLines = True
+ Me.LvCycles.FullRowSelect = true
+ Me.LvCycles.GridLines = true
Me.LvCycles.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None
- Me.LvCycles.HideSelection = False
- Me.LvCycles.LabelEdit = True
- Me.LvCycles.Location = New System.Drawing.Point(6, 19)
- Me.LvCycles.MultiSelect = False
+ Me.LvCycles.HideSelection = false
+ Me.LvCycles.LabelEdit = true
+ Me.LvCycles.Location = New System.Drawing.Point(6, 25)
+ Me.LvCycles.MultiSelect = false
Me.LvCycles.Name = "LvCycles"
Me.LvCycles.Size = New System.Drawing.Size(503, 123)
Me.LvCycles.TabIndex = 0
- Me.LvCycles.TabStop = False
- Me.LvCycles.UseCompatibleStateImageBehavior = False
+ Me.LvCycles.TabStop = false
+ Me.LvCycles.UseCompatibleStateImageBehavior = false
Me.LvCycles.View = System.Windows.Forms.View.Details
'
'ColumnHeader1
@@ -208,45 +218,71 @@ 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.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(41, 148)
+ Me.BtDRIrem.Location = New System.Drawing.Point(41, 156)
Me.BtDRIrem.Name = "BtDRIrem"
Me.BtDRIrem.Size = New System.Drawing.Size(29, 23)
Me.BtDRIrem.TabIndex = 32
- Me.BtDRIrem.UseVisualStyleBackColor = True
+ 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.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(6, 148)
+ Me.BtDRIadd.Location = New System.Drawing.Point(6, 156)
Me.BtDRIadd.Name = "BtDRIadd"
Me.BtDRIadd.Size = New System.Drawing.Size(29, 23)
Me.BtDRIadd.TabIndex = 31
- Me.BtDRIadd.UseVisualStyleBackColor = True
+ 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((((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.Controls.Add(Me.picCreateNewAAConfig)
+ Me.GrAux.Controls.Add(Me.Label1)
+ Me.GrAux.Controls.Add(Me.btnBrowseAAUXFile)
+ Me.GrAux.Controls.Add(Me.txtAdvancedAuxiliaryFile)
+ Me.GrAux.Controls.Add(Me.picAuxInfo)
+ Me.GrAux.Controls.Add(Me.cboAdvancedAuxiliaries)
+ Me.GrAux.Controls.Add(Me.lbAdvancedAuxiliaries)
Me.GrAux.Controls.Add(Me.Label32)
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.Name = "GrAux"
- Me.GrAux.Size = New System.Drawing.Size(515, 209)
+ Me.GrAux.Size = New System.Drawing.Size(515, 260)
Me.GrAux.TabIndex = 33
- Me.GrAux.TabStop = False
+ Me.GrAux.TabStop = false
Me.GrAux.Text = "Auxiliaries"
'
+ '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.Name = "picAuxInfo"
+ Me.picAuxInfo.Size = New System.Drawing.Size(16, 16)
+ Me.picAuxInfo.SizeMode = System.Windows.Forms.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.Name = "cboAdvancedAuxiliaries"
+ Me.cboAdvancedAuxiliaries.Size = New System.Drawing.Size(321, 21)
+ Me.cboAdvancedAuxiliaries.TabIndex = 36
+ '
'Label32
'
- Me.Label32.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.Label32.AutoSize = True
- Me.Label32.Location = New System.Drawing.Point(369, 147)
+ Me.Label32.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.Label32.AutoSize = true
+ Me.Label32.Location = New System.Drawing.Point(369, 200)
Me.Label32.Name = "Label32"
Me.Label32.Size = New System.Drawing.Size(139, 13)
Me.Label32.TabIndex = 34
@@ -254,19 +290,19 @@ Partial Class F_VECTO
'
'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.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.FullRowSelect = True
- Me.LvAux.GridLines = True
- Me.LvAux.HideSelection = False
- Me.LvAux.Location = New System.Drawing.Point(6, 19)
- Me.LvAux.MultiSelect = False
+ Me.LvAux.FullRowSelect = true
+ Me.LvAux.GridLines = true
+ Me.LvAux.HideSelection = false
+ Me.LvAux.Location = New System.Drawing.Point(6, 72)
+ Me.LvAux.MultiSelect = false
Me.LvAux.Name = "LvAux"
Me.LvAux.Size = New System.Drawing.Size(503, 117)
Me.LvAux.TabIndex = 30
- Me.LvAux.TabStop = False
- Me.LvAux.UseCompatibleStateImageBehavior = False
+ Me.LvAux.TabStop = false
+ Me.LvAux.UseCompatibleStateImageBehavior = false
Me.LvAux.View = System.Windows.Forms.View.Details
'
'ColumnHeader4
@@ -287,25 +323,25 @@ Partial Class F_VECTO
'ButAuxRem
'
Me.ButAuxRem.Image = Global.VECTO.My.Resources.Resources.minus_circle_icon
- Me.ButAuxRem.Location = New System.Drawing.Point(42, 142)
+ Me.ButAuxRem.Location = New System.Drawing.Point(42, 195)
Me.ButAuxRem.Name = "ButAuxRem"
Me.ButAuxRem.Size = New System.Drawing.Size(29, 23)
Me.ButAuxRem.TabIndex = 32
- Me.ButAuxRem.UseVisualStyleBackColor = True
+ Me.ButAuxRem.UseVisualStyleBackColor = true
'
'ButAuxAdd
'
Me.ButAuxAdd.Image = Global.VECTO.My.Resources.Resources.plus_circle_icon
- Me.ButAuxAdd.Location = New System.Drawing.Point(7, 142)
+ Me.ButAuxAdd.Location = New System.Drawing.Point(7, 195)
Me.ButAuxAdd.Name = "ButAuxAdd"
Me.ButAuxAdd.Size = New System.Drawing.Size(29, 23)
Me.ButAuxAdd.TabIndex = 31
- Me.ButAuxAdd.UseVisualStyleBackColor = True
+ 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.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.Name = "TbGBX"
Me.TbGBX.Size = New System.Drawing.Size(406, 20)
@@ -313,8 +349,8 @@ Partial Class F_VECTO
'
'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.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.Name = "TbENG"
Me.TbENG.Size = New System.Drawing.Size(406, 20)
@@ -322,8 +358,8 @@ Partial Class F_VECTO
'
'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.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.Name = "TbVEH"
Me.TbVEH.Size = New System.Drawing.Size(406, 20)
@@ -335,9 +371,9 @@ Partial Class F_VECTO
Me.ButOpenGBX.Name = "ButOpenGBX"
Me.ButOpenGBX.Size = New System.Drawing.Size(72, 21)
Me.ButOpenGBX.TabIndex = 22
- Me.ButOpenGBX.TabStop = False
+ Me.ButOpenGBX.TabStop = false
Me.ButOpenGBX.Text = "Gearbox"
- Me.ButOpenGBX.UseVisualStyleBackColor = True
+ Me.ButOpenGBX.UseVisualStyleBackColor = true
'
'ButOpenENG
'
@@ -345,9 +381,9 @@ Partial Class F_VECTO
Me.ButOpenENG.Name = "ButOpenENG"
Me.ButOpenENG.Size = New System.Drawing.Size(72, 21)
Me.ButOpenENG.TabIndex = 21
- Me.ButOpenENG.TabStop = False
+ Me.ButOpenENG.TabStop = false
Me.ButOpenENG.Text = "Engine"
- Me.ButOpenENG.UseVisualStyleBackColor = True
+ Me.ButOpenENG.UseVisualStyleBackColor = true
'
'ButOpenVEH
'
@@ -355,53 +391,53 @@ Partial Class F_VECTO
Me.ButOpenVEH.Name = "ButOpenVEH"
Me.ButOpenVEH.Size = New System.Drawing.Size(72, 21)
Me.ButOpenVEH.TabIndex = 20
- Me.ButOpenVEH.TabStop = False
+ Me.ButOpenVEH.TabStop = false
Me.ButOpenVEH.Text = "Vehicle"
- Me.ButOpenVEH.UseVisualStyleBackColor = True
+ Me.ButOpenVEH.UseVisualStyleBackColor = true
'
'ButtonVEH
'
- Me.ButtonVEH.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.ButtonVEH.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.ButtonVEH.Location = New System.Drawing.Point(496, 6)
Me.ButtonVEH.Name = "ButtonVEH"
Me.ButtonVEH.Size = New System.Drawing.Size(28, 21)
Me.ButtonVEH.TabIndex = 11
- Me.ButtonVEH.TabStop = False
+ Me.ButtonVEH.TabStop = false
Me.ButtonVEH.Text = "..."
- Me.ButtonVEH.UseVisualStyleBackColor = True
+ 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.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.ButtonGBX.Location = New System.Drawing.Point(496, 60)
Me.ButtonGBX.Name = "ButtonGBX"
Me.ButtonGBX.Size = New System.Drawing.Size(28, 21)
Me.ButtonGBX.TabIndex = 13
- Me.ButtonGBX.TabStop = False
+ Me.ButtonGBX.TabStop = false
Me.ButtonGBX.Text = "..."
- Me.ButtonGBX.UseVisualStyleBackColor = True
+ 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.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.ButtonMAP.Location = New System.Drawing.Point(496, 33)
Me.ButtonMAP.Name = "ButtonMAP"
Me.ButtonMAP.Size = New System.Drawing.Size(28, 21)
Me.ButtonMAP.TabIndex = 12
- Me.ButtonMAP.TabStop = False
+ Me.ButtonMAP.TabStop = false
Me.ButtonMAP.Text = "..."
- Me.ButtonMAP.UseVisualStyleBackColor = True
+ 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(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.TabControl1.Controls.Add(Me.TabPgGen)
Me.TabControl1.Controls.Add(Me.TabPgDriver)
Me.TabControl1.Location = New System.Drawing.Point(1, 107)
Me.TabControl1.Name = "TabControl1"
Me.TabControl1.SelectedIndex = 0
- Me.TabControl1.Size = New System.Drawing.Size(535, 517)
+ Me.TabControl1.Size = New System.Drawing.Size(535, 568)
Me.TabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed
Me.TabControl1.TabIndex = 1
'
@@ -414,10 +450,10 @@ Partial Class F_VECTO
Me.TabPgDriver.Location = New System.Drawing.Point(4, 22)
Me.TabPgDriver.Name = "TabPgDriver"
Me.TabPgDriver.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPgDriver.Size = New System.Drawing.Size(527, 491)
+ Me.TabPgDriver.Size = New System.Drawing.Size(527, 542)
Me.TabPgDriver.TabIndex = 7
Me.TabPgDriver.Text = "Driver Assist"
- Me.TabPgDriver.UseVisualStyleBackColor = True
+ Me.TabPgDriver.UseVisualStyleBackColor = true
'
'GrVACC
'
@@ -428,13 +464,13 @@ Partial Class F_VECTO
Me.GrVACC.Name = "GrVACC"
Me.GrVACC.Size = New System.Drawing.Size(515, 84)
Me.GrVACC.TabIndex = 34
- Me.GrVACC.TabStop = False
+ 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.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.Name = "TbDesMaxFile"
Me.TbDesMaxFile.Size = New System.Drawing.Size(440, 20)
@@ -442,24 +478,24 @@ Partial Class F_VECTO
'
'BtDesMaxBr
'
- Me.BtDesMaxBr.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.BtDesMaxBr.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.BtDesMaxBr.Location = New System.Drawing.Point(452, 28)
Me.BtDesMaxBr.Name = "BtDesMaxBr"
Me.BtDesMaxBr.Size = New System.Drawing.Size(28, 21)
Me.BtDesMaxBr.TabIndex = 1
Me.BtDesMaxBr.Text = "..."
- Me.BtDesMaxBr.UseVisualStyleBackColor = True
+ 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.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(486, 27)
Me.BtAccOpen.Name = "BtAccOpen"
Me.BtAccOpen.Size = New System.Drawing.Size(23, 23)
Me.BtAccOpen.TabIndex = 2
- Me.BtAccOpen.TabStop = False
- Me.BtAccOpen.UseVisualStyleBackColor = True
+ Me.BtAccOpen.TabStop = false
+ Me.BtAccOpen.UseVisualStyleBackColor = true
'
'GrLAC
'
@@ -469,7 +505,7 @@ Partial Class F_VECTO
Me.GrLAC.Name = "GrLAC"
Me.GrLAC.Size = New System.Drawing.Size(514, 105)
Me.GrLAC.TabIndex = 5
- Me.GrLAC.TabStop = False
+ Me.GrLAC.TabStop = false
Me.GrLAC.Text = "Look-Ahead Coasting"
'
'PnLookAhead
@@ -487,7 +523,7 @@ Partial Class F_VECTO
'
'Label29
'
- Me.Label29.AutoSize = True
+ Me.Label29.AutoSize = true
Me.Label29.Location = New System.Drawing.Point(197, 38)
Me.Label29.Name = "Label29"
Me.Label29.Size = New System.Drawing.Size(38, 13)
@@ -496,7 +532,7 @@ Partial Class F_VECTO
'
'Label25
'
- Me.Label25.AutoSize = True
+ Me.Label25.AutoSize = true
Me.Label25.Location = New System.Drawing.Point(197, 12)
Me.Label25.Name = "Label25"
Me.Label25.Size = New System.Drawing.Size(34, 13)
@@ -512,7 +548,7 @@ Partial Class F_VECTO
'
'Label24
'
- Me.Label24.AutoSize = True
+ Me.Label24.AutoSize = true
Me.Label24.Location = New System.Drawing.Point(25, 12)
Me.Label24.Name = "Label24"
Me.Label24.Size = New System.Drawing.Size(96, 13)
@@ -528,7 +564,7 @@ Partial Class F_VECTO
'
'Label28
'
- Me.Label28.AutoSize = True
+ Me.Label28.AutoSize = true
Me.Label28.Location = New System.Drawing.Point(41, 38)
Me.Label28.Name = "Label28"
Me.Label28.Size = New System.Drawing.Size(80, 13)
@@ -537,15 +573,15 @@ Partial Class F_VECTO
'
'CbLookAhead
'
- Me.CbLookAhead.AutoSize = True
- Me.CbLookAhead.Checked = True
+ 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.CbLookAhead.UseVisualStyleBackColor = true
'
'GroupBox1
'
@@ -557,7 +593,7 @@ Partial Class F_VECTO
Me.GroupBox1.Name = "GroupBox1"
Me.GroupBox1.Size = New System.Drawing.Size(515, 135)
Me.GroupBox1.TabIndex = 4
- Me.GroupBox1.TabStop = False
+ Me.GroupBox1.TabStop = false
Me.GroupBox1.Text = "Overspeed / Eco-Roll"
'
'PnEcoRoll
@@ -578,7 +614,7 @@ Partial Class F_VECTO
'
'Label21
'
- Me.Label21.AutoSize = True
+ Me.Label21.AutoSize = true
Me.Label21.Location = New System.Drawing.Point(178, 61)
Me.Label21.Name = "Label21"
Me.Label21.Size = New System.Drawing.Size(38, 13)
@@ -587,7 +623,7 @@ Partial Class F_VECTO
'
'Label20
'
- Me.Label20.AutoSize = True
+ Me.Label20.AutoSize = true
Me.Label20.Location = New System.Drawing.Point(178, 35)
Me.Label20.Name = "Label20"
Me.Label20.Size = New System.Drawing.Size(38, 13)
@@ -596,7 +632,7 @@ Partial Class F_VECTO
'
'Label14
'
- Me.Label14.AutoSize = True
+ Me.Label14.AutoSize = true
Me.Label14.Location = New System.Drawing.Point(178, 9)
Me.Label14.Name = "Label14"
Me.Label14.Size = New System.Drawing.Size(38, 13)
@@ -626,7 +662,7 @@ Partial Class F_VECTO
'
'Label23
'
- Me.Label23.AutoSize = True
+ Me.Label23.AutoSize = true
Me.Label23.Location = New System.Drawing.Point(22, 61)
Me.Label23.Name = "Label23"
Me.Label23.Size = New System.Drawing.Size(80, 13)
@@ -635,7 +671,7 @@ Partial Class F_VECTO
'
'Label22
'
- Me.Label22.AutoSize = True
+ Me.Label22.AutoSize = true
Me.Label22.Location = New System.Drawing.Point(11, 35)
Me.Label22.Name = "Label22"
Me.Label22.Size = New System.Drawing.Size(91, 13)
@@ -644,7 +680,7 @@ Partial Class F_VECTO
'
'Label13
'
- Me.Label13.AutoSize = True
+ Me.Label13.AutoSize = true
Me.Label13.Location = New System.Drawing.Point(17, 9)
Me.Label13.Name = "Label13"
Me.Label13.Size = New System.Drawing.Size(85, 13)
@@ -653,35 +689,35 @@ Partial Class F_VECTO
'
'RdEcoRoll
'
- Me.RdEcoRoll.AutoSize = True
- Me.RdEcoRoll.Checked = True
+ Me.RdEcoRoll.AutoSize = true
+ Me.RdEcoRoll.Checked = true
Me.RdEcoRoll.Location = New System.Drawing.Point(13, 68)
Me.RdEcoRoll.Name = "RdEcoRoll"
Me.RdEcoRoll.Size = New System.Drawing.Size(65, 17)
Me.RdEcoRoll.TabIndex = 2
- Me.RdEcoRoll.TabStop = True
+ Me.RdEcoRoll.TabStop = true
Me.RdEcoRoll.Text = "Eco-Roll"
- Me.RdEcoRoll.UseVisualStyleBackColor = True
+ Me.RdEcoRoll.UseVisualStyleBackColor = true
'
'RdOverspeed
'
- Me.RdOverspeed.AutoSize = True
+ Me.RdOverspeed.AutoSize = true
Me.RdOverspeed.Location = New System.Drawing.Point(13, 45)
Me.RdOverspeed.Name = "RdOverspeed"
Me.RdOverspeed.Size = New System.Drawing.Size(77, 17)
Me.RdOverspeed.TabIndex = 1
Me.RdOverspeed.Text = "Overspeed"
- Me.RdOverspeed.UseVisualStyleBackColor = True
+ Me.RdOverspeed.UseVisualStyleBackColor = true
'
'RdOff
'
- Me.RdOff.AutoSize = True
+ Me.RdOff.AutoSize = true
Me.RdOff.Location = New System.Drawing.Point(13, 22)
Me.RdOff.Name = "RdOff"
Me.RdOff.Size = New System.Drawing.Size(39, 17)
Me.RdOff.TabIndex = 0
Me.RdOff.Text = "Off"
- Me.RdOff.UseVisualStyleBackColor = True
+ Me.RdOff.UseVisualStyleBackColor = true
'
'GrStartStop
'
@@ -691,7 +727,7 @@ Partial Class F_VECTO
Me.GrStartStop.Name = "GrStartStop"
Me.GrStartStop.Size = New System.Drawing.Size(515, 137)
Me.GrStartStop.TabIndex = 3
- Me.GrStartStop.TabStop = False
+ Me.GrStartStop.TabStop = false
Me.GrStartStop.Text = "Engine Start Stop"
'
'PnStartStop
@@ -712,7 +748,7 @@ Partial Class F_VECTO
'
'Label31
'
- Me.Label31.AutoSize = True
+ Me.Label31.AutoSize = true
Me.Label31.Location = New System.Drawing.Point(228, 58)
Me.Label31.Name = "Label31"
Me.Label31.Size = New System.Drawing.Size(18, 13)
@@ -721,7 +757,7 @@ Partial Class F_VECTO
'
'Label27
'
- Me.Label27.AutoSize = True
+ Me.Label27.AutoSize = true
Me.Label27.Location = New System.Drawing.Point(228, 32)
Me.Label27.Name = "Label27"
Me.Label27.Size = New System.Drawing.Size(18, 13)
@@ -737,7 +773,7 @@ Partial Class F_VECTO
'
'LabelSSspeed
'
- Me.LabelSSspeed.AutoSize = True
+ Me.LabelSSspeed.AutoSize = true
Me.LabelSSspeed.Location = New System.Drawing.Point(91, 6)
Me.LabelSSspeed.Name = "LabelSSspeed"
Me.LabelSSspeed.Size = New System.Drawing.Size(61, 13)
@@ -746,7 +782,7 @@ Partial Class F_VECTO
'
'Label26
'
- Me.Label26.AutoSize = True
+ Me.Label26.AutoSize = true
Me.Label26.Location = New System.Drawing.Point(228, 6)
Me.Label26.Name = "Label26"
Me.Label26.Size = New System.Drawing.Size(38, 13)
@@ -755,7 +791,7 @@ Partial Class F_VECTO
'
'Label30
'
- Me.Label30.AutoSize = True
+ Me.Label30.AutoSize = true
Me.Label30.Location = New System.Drawing.Point(68, 58)
Me.Label30.Name = "Label30"
Me.Label30.Size = New System.Drawing.Size(84, 13)
@@ -764,7 +800,7 @@ Partial Class F_VECTO
'
'LabelSStime
'
- Me.LabelSStime.AutoSize = True
+ Me.LabelSStime.AutoSize = true
Me.LabelSStime.Location = New System.Drawing.Point(65, 32)
Me.LabelSStime.Name = "LabelSStime"
Me.LabelSStime.Size = New System.Drawing.Size(87, 13)
@@ -787,23 +823,23 @@ Partial Class F_VECTO
'
'ChBStartStop
'
- Me.ChBStartStop.AutoSize = True
- Me.ChBStartStop.Checked = True
+ 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.Name = "ChBStartStop"
Me.ChBStartStop.Size = New System.Drawing.Size(65, 17)
Me.ChBStartStop.TabIndex = 0
Me.ChBStartStop.Text = "Enabled"
- Me.ChBStartStop.UseVisualStyleBackColor = True
+ Me.ChBStartStop.UseVisualStyleBackColor = true
'
'StatusStrip1
'
Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripStatusLabelGEN})
- Me.StatusStrip1.Location = New System.Drawing.Point(0, 627)
+ Me.StatusStrip1.Location = New System.Drawing.Point(0, 678)
Me.StatusStrip1.Name = "StatusStrip1"
Me.StatusStrip1.Size = New System.Drawing.Size(944, 22)
- Me.StatusStrip1.SizingGrip = False
+ Me.StatusStrip1.SizingGrip = false
Me.StatusStrip1.TabIndex = 6
Me.StatusStrip1.Text = "StatusStrip1"
'
@@ -815,24 +851,24 @@ Partial Class F_VECTO
'
'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, 601)
+ 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, 652)
Me.ButOK.Name = "ButOK"
Me.ButOK.Size = New System.Drawing.Size(75, 23)
Me.ButOK.TabIndex = 11
Me.ButOK.Text = "Save"
- Me.ButOK.UseVisualStyleBackColor = True
+ 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.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, 601)
+ Me.ButCancel.Location = New System.Drawing.Point(860, 652)
Me.ButCancel.Name = "ButCancel"
Me.ButCancel.Size = New System.Drawing.Size(75, 23)
Me.ButCancel.TabIndex = 19
Me.ButCancel.Text = "Cancel"
- Me.ButCancel.UseVisualStyleBackColor = True
+ Me.ButCancel.UseVisualStyleBackColor = true
'
'ToolStrip1
'
@@ -921,17 +957,17 @@ Partial Class F_VECTO
Me.PictureBox1.Name = "PictureBox1"
Me.PictureBox1.Size = New System.Drawing.Size(920, 40)
Me.PictureBox1.TabIndex = 21
- Me.PictureBox1.TabStop = False
+ Me.PictureBox1.TabStop = false
'
'CbEngOnly
'
- Me.CbEngOnly.AutoSize = True
+ Me.CbEngOnly.AutoSize = true
Me.CbEngOnly.Location = New System.Drawing.Point(17, 84)
Me.CbEngOnly.Name = "CbEngOnly"
Me.CbEngOnly.Size = New System.Drawing.Size(113, 17)
Me.CbEngOnly.TabIndex = 35
Me.CbEngOnly.Text = "Engine Only Mode"
- Me.CbEngOnly.UseVisualStyleBackColor = True
+ Me.CbEngOnly.UseVisualStyleBackColor = true
'
'CmOpenFile
'
@@ -959,7 +995,7 @@ Partial Class F_VECTO
Me.PicVehicle.Size = New System.Drawing.Size(300, 88)
Me.PicVehicle.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
Me.PicVehicle.TabIndex = 36
- Me.PicVehicle.TabStop = False
+ Me.PicVehicle.TabStop = false
'
'PicBox
'
@@ -968,13 +1004,13 @@ Partial Class F_VECTO
Me.PicBox.Name = "PicBox"
Me.PicBox.Size = New System.Drawing.Size(390, 327)
Me.PicBox.TabIndex = 36
- Me.PicBox.TabStop = False
+ Me.PicBox.TabStop = false
'
'TbEngTxt
'
Me.TbEngTxt.Location = New System.Drawing.Point(542, 216)
Me.TbEngTxt.Name = "TbEngTxt"
- Me.TbEngTxt.ReadOnly = True
+ Me.TbEngTxt.ReadOnly = true
Me.TbEngTxt.Size = New System.Drawing.Size(390, 20)
Me.TbEngTxt.TabIndex = 37
'
@@ -982,7 +1018,7 @@ Partial Class F_VECTO
'
Me.TbVehCat.Location = New System.Drawing.Point(848, 126)
Me.TbVehCat.Name = "TbVehCat"
- Me.TbVehCat.ReadOnly = True
+ Me.TbVehCat.ReadOnly = true
Me.TbVehCat.Size = New System.Drawing.Size(87, 20)
Me.TbVehCat.TabIndex = 37
'
@@ -990,7 +1026,7 @@ Partial Class F_VECTO
'
Me.TbAxleConf.Location = New System.Drawing.Point(904, 155)
Me.TbAxleConf.Name = "TbAxleConf"
- Me.TbAxleConf.ReadOnly = True
+ Me.TbAxleConf.ReadOnly = true
Me.TbAxleConf.Size = New System.Drawing.Size(31, 20)
Me.TbAxleConf.TabIndex = 37
'
@@ -998,7 +1034,7 @@ Partial Class F_VECTO
'
Me.TbHVCclass.Location = New System.Drawing.Point(848, 184)
Me.TbHVCclass.Name = "TbHVCclass"
- Me.TbHVCclass.ReadOnly = True
+ Me.TbHVCclass.ReadOnly = true
Me.TbHVCclass.Size = New System.Drawing.Size(87, 20)
Me.TbHVCclass.TabIndex = 37
'
@@ -1006,7 +1042,7 @@ Partial Class F_VECTO
'
Me.TbGbxTxt.Location = New System.Drawing.Point(542, 242)
Me.TbGbxTxt.Name = "TbGbxTxt"
- Me.TbGbxTxt.ReadOnly = True
+ Me.TbGbxTxt.ReadOnly = true
Me.TbGbxTxt.Size = New System.Drawing.Size(390, 20)
Me.TbGbxTxt.TabIndex = 37
'
@@ -1014,17 +1050,61 @@ Partial Class F_VECTO
'
Me.TbMass.Location = New System.Drawing.Point(848, 155)
Me.TbMass.Name = "TbMass"
- Me.TbMass.ReadOnly = True
+ Me.TbMass.ReadOnly = true
Me.TbMass.Size = New System.Drawing.Size(50, 20)
Me.TbMass.TabIndex = 37
'
+ 'txtAdvancedAuxiliaryFile
+ '
+ Me.txtAdvancedAuxiliaryFile.Location = New System.Drawing.Point(119, 47)
+ Me.txtAdvancedAuxiliaryFile.Name = "txtAdvancedAuxiliaryFile"
+ Me.txtAdvancedAuxiliaryFile.Size = New System.Drawing.Size(321, 20)
+ Me.txtAdvancedAuxiliaryFile.TabIndex = 38
+ '
+ 'btnBrowseAAUXFile
+ '
+ Me.btnBrowseAAUXFile.Location = New System.Drawing.Point(451, 47)
+ Me.btnBrowseAAUXFile.Name = "btnBrowseAAUXFile"
+ Me.btnBrowseAAUXFile.Size = New System.Drawing.Size(36, 23)
+ Me.btnBrowseAAUXFile.TabIndex = 39
+ Me.btnBrowseAAUXFile.Text = ". . ."
+ Me.btnBrowseAAUXFile.UseVisualStyleBackColor = true
+ '
+ 'lbAdvancedAuxiliaries
+ '
+ Me.lbAdvancedAuxiliaries.AutoSize = true
+ Me.lbAdvancedAuxiliaries.Location = New System.Drawing.Point(7, 21)
+ Me.lbAdvancedAuxiliaries.Name = "lbAdvancedAuxiliaries"
+ Me.lbAdvancedAuxiliaries.Size = New System.Drawing.Size(72, 13)
+ Me.lbAdvancedAuxiliaries.TabIndex = 35
+ Me.lbAdvancedAuxiliaries.Text = "Auxiliary Type"
+ '
+ 'Label1
+ '
+ Me.Label1.AutoSize = true
+ Me.Label1.Location = New System.Drawing.Point(7, 52)
+ Me.Label1.Name = "Label1"
+ Me.Label1.Size = New System.Drawing.Size(96, 13)
+ Me.Label1.TabIndex = 40
+ Me.Label1.Text = "Advanced Aux File"
+ '
+ 'picCreateNewAAConfig
+ '
+ Me.picCreateNewAAConfig.Image = Global.VECTO.My.Resources.Resources.application_add_icon
+ Me.picCreateNewAAConfig.Location = New System.Drawing.Point(494, 47)
+ Me.picCreateNewAAConfig.Name = "picCreateNewAAConfig"
+ Me.picCreateNewAAConfig.Size = New System.Drawing.Size(16, 16)
+ Me.picCreateNewAAConfig.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize
+ Me.picCreateNewAAConfig.TabIndex = 41
+ Me.picCreateNewAAConfig.TabStop = false
+ '
'F_VECTO
'
Me.AcceptButton = Me.ButOK
- Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.CancelButton = Me.ButCancel
- Me.ClientSize = New System.Drawing.Size(944, 649)
+ Me.ClientSize = New System.Drawing.Size(944, 700)
Me.Controls.Add(Me.TbHVCclass)
Me.Controls.Add(Me.TbMass)
Me.Controls.Add(Me.TbAxleConf)
@@ -1041,43 +1121,45 @@ Partial Class F_VECTO
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.MaximizeBox = False
+ Me.Icon = CType(resources.GetObject("$this.Icon"),System.Drawing.Icon)
+ Me.MaximizeBox = false
Me.Name = "F_VECTO"
Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
Me.Text = "Job Editor"
- Me.TabPgGen.ResumeLayout(False)
- Me.TabPgGen.PerformLayout()
- Me.GrCycles.ResumeLayout(False)
- Me.GrCycles.PerformLayout()
- Me.GrAux.ResumeLayout(False)
- Me.GrAux.PerformLayout()
- Me.TabControl1.ResumeLayout(False)
- Me.TabPgDriver.ResumeLayout(False)
- Me.GrVACC.ResumeLayout(False)
- Me.GrVACC.PerformLayout()
- Me.GrLAC.ResumeLayout(False)
- Me.GrLAC.PerformLayout()
- Me.PnLookAhead.ResumeLayout(False)
- Me.PnLookAhead.PerformLayout()
- Me.GroupBox1.ResumeLayout(False)
- Me.GroupBox1.PerformLayout()
- Me.PnEcoRoll.ResumeLayout(False)
- Me.PnEcoRoll.PerformLayout()
- Me.GrStartStop.ResumeLayout(False)
- Me.GrStartStop.PerformLayout()
- Me.PnStartStop.ResumeLayout(False)
- Me.PnStartStop.PerformLayout()
- Me.StatusStrip1.ResumeLayout(False)
- Me.StatusStrip1.PerformLayout()
- Me.ToolStrip1.ResumeLayout(False)
- Me.ToolStrip1.PerformLayout()
- CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
- Me.CmOpenFile.ResumeLayout(False)
- CType(Me.PicVehicle, System.ComponentModel.ISupportInitialize).EndInit()
- CType(Me.PicBox, System.ComponentModel.ISupportInitialize).EndInit()
- Me.ResumeLayout(False)
- Me.PerformLayout()
+ Me.TabPgGen.ResumeLayout(false)
+ Me.TabPgGen.PerformLayout
+ Me.GrCycles.ResumeLayout(false)
+ Me.GrCycles.PerformLayout
+ Me.GrAux.ResumeLayout(false)
+ Me.GrAux.PerformLayout
+ CType(Me.picAuxInfo,System.ComponentModel.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.PnLookAhead.ResumeLayout(false)
+ Me.PnLookAhead.PerformLayout
+ Me.GroupBox1.ResumeLayout(false)
+ Me.GroupBox1.PerformLayout
+ Me.PnEcoRoll.ResumeLayout(false)
+ Me.PnEcoRoll.PerformLayout
+ Me.GrStartStop.ResumeLayout(false)
+ Me.GrStartStop.PerformLayout
+ Me.PnStartStop.ResumeLayout(false)
+ Me.PnStartStop.PerformLayout
+ Me.StatusStrip1.ResumeLayout(false)
+ Me.StatusStrip1.PerformLayout
+ Me.ToolStrip1.ResumeLayout(false)
+ Me.ToolStrip1.PerformLayout
+ CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).EndInit
+ Me.CmOpenFile.ResumeLayout(false)
+ CType(Me.PicVehicle,System.ComponentModel.ISupportInitialize).EndInit
+ CType(Me.PicBox,System.ComponentModel.ISupportInitialize).EndInit
+ CType(Me.picCreateNewAAConfig,System.ComponentModel.ISupportInitialize).EndInit
+ Me.ResumeLayout(false)
+ Me.PerformLayout
End Sub
Friend WithEvents TabPgGen As System.Windows.Forms.TabPage
@@ -1171,4 +1253,12 @@ End Sub
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 picCreateNewAAConfig As System.Windows.Forms.PictureBox
End Class
diff --git a/VECTO/GUI/F_VECTO.resx b/VECTO/GUI/F_VECTO.resx
index 0bc9c5fae26c125e5c75c9b88d58d575b7f167ea..8c5a485976b5e77176f0a291594cac256a891737 100644
--- a/VECTO/GUI/F_VECTO.resx
+++ b/VECTO/GUI/F_VECTO.resx
@@ -126,6 +126,9 @@
<metadata name="CmOpenFile.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>350, 15</value>
</metadata>
+ <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>468, 15</value>
+ </metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>49</value>
</metadata>
diff --git a/VECTO/GUI/F_VECTO.vb b/VECTO/GUI/F_VECTO.vb
index 5450c0c75739e3230fb50bf670063fa86530cb0f..f46cac0c3be030b7f0be33332bad048f9f14eb08 100644
--- a/VECTO/GUI/F_VECTO.vb
+++ b/VECTO/GUI/F_VECTO.vb
@@ -10,6 +10,8 @@
' See the LICENSE.txt for the specific language governing permissions and limitations.
Imports System.Collections.Generic
+Imports System.IO
+Imports VectoAuxiliaries
''' <summary>
''' Job Editor. Create/Edit VECTO job files (.vecto)
@@ -28,6 +30,21 @@ Public Class F_VECTO
Private EStechs As New List(Of String)
+ 'AA-TB
+ 'Populate Advanced Auxiliaries
+ Private Sub PopulateAdvancedAuxiliaries()
+
+
+ 'Scan the program directory for DLL's which are AdvancedAuxiliaries and display
+ Dim AList As List(Of cAdvancedAuxiliary ) = AAUX_Gobal.DiscoverAdvancedAuxiliaries()
+
+ cboAdvancedAuxiliaries.DataSource=AList
+ cboAdvancedAuxiliaries.DisplayMember= "AuxiliaryName"
+
+
+ End Sub
+
+
'Initialise form
Private Sub F02_GEN_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
Dim x As Int16
@@ -61,6 +78,11 @@ Public Class F_VECTO
Changed = False
+ 'AA-TB
+ PopulateAdvancedAuxiliaries()
+
+
+
End Sub
'Close - Check for unsaved changes
@@ -954,7 +976,7 @@ lbDlog:
#End Region
- Public Sub UpdatePic()
+Public Sub UpdatePic()
Dim VEH0 As New cVEH
Dim ENG0 As cENG
Dim GBX0 As cGBX
@@ -1243,5 +1265,65 @@ lbDlog:
#End Region
+'AA-TB
+Private Sub picAuxInfo_MouseEnter( sender As Object, e As EventArgs) Handles picAuxInfo.MouseEnter
+
+
+ If cboAdvancedAuxiliaries.SelectedIndex=-1 then Exit Sub
+
+ 'Get tooltip
+ Dim item As cAdvancedAuxiliary
+
+ item = DirectCast(cboAdvancedAuxiliaries.SelectedItem, cAdvancedAuxiliary)
+
+ If item.AuxiliaryVersion="CLASSIC" then
+
+ ToolTip1.ToolTipTitle="Classic Vecto Auxiliaries"
+ ToolTip1.SetToolTip(picAuxInfo,"Uses original basic auxiliaries calculation")
+
+ Else
+
+ ToolTip1.ToolTipTitle="Advanced Auxiliary Information"
+ ToolTip1.SetToolTip(picAuxInfo, item.AuxiliaryName & " : Version=" & item.AuxiliaryVersion)
+
+ End If
+
+
+
+
+
+
+End Sub
+
+'AA-TB
+Private Sub btnBrowseAAUXFile_Click( sender As Object, e As EventArgs) Handles btnBrowseAAUXFile.Click
+
+
+ Dim fbAux As New cFileBrowser(True, False)
+ Dim ssmMap As New Hvac.HVACSteadyStateModel()
+ Dim message As String = String.Empty
+
+
+ fbAux.Extensions = New String() {"AAUX"}
+
+ If fbAux.CustomDialog(fPATH(vectoFile),False,True, tFbExtMode.ForceExt,False,"") Then
+
+ txtAdvancedAuxiliaryFile.Text = fFileWoDir(fbAux.Files(0), fPATH(vectoFile))
+
+ Dim assembly As cAdvancedAuxiliary = DirectCast( cboAdvancedAuxiliaries.SelectedItem, cAdvancedAuxiliary)
+
+ AAUX_Gobal.ConfigureAdvancedAuxiliaries(assembly.AssemblyName,assembly.AuxiliaryVersion,txtAdvancedAuxiliaryFile.Text,VECTOfile)
+
+
+ End If
+
+
+End Sub
+
+
+
+
+
+
End Class
diff --git a/VECTO/Input Files/cAdvancedAuxiliary.vb b/VECTO/Input Files/cAdvancedAuxiliary.vb
new file mode 100644
index 0000000000000000000000000000000000000000..c3516d78e1db71bce6c8285aa1d7f76526df4d41
--- /dev/null
+++ b/VECTO/Input Files/cAdvancedAuxiliary.vb
@@ -0,0 +1,47 @@
+'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
+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/VECTO.vbproj b/VECTO/VECTO.vbproj
index 79274f9429bb321777d320a0c605e74c609f1e5a..6f13fff835feff480e024d5286a14926e7af6ca0 100644
--- a/VECTO/VECTO.vbproj
+++ b/VECTO/VECTO.vbproj
@@ -175,6 +175,7 @@
<Compile Include="GUI\F_VEH_Axle.vb">
<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" />
@@ -184,6 +185,7 @@
<Compile Include="cDelaunayMap.vb" />
<Compile Include="cDEV.vb" />
<Compile Include="File Browser\cFileBrowser.vb" />
+ <Compile Include="AAUX_Gobal.vb" />
<Compile Include="MODcalc\cVh.vb" />
<Compile Include="File Browser\FB_Dialog.designer.vb">
<DependentUpon>FB_Dialog.vb</DependentUpon>
@@ -346,6 +348,27 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
+ <Content Include="bin\Debug\Generic Vehicles\Declaration Mode\12t Delivery Truck\testAlternatorMap.aalt">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="bin\Debug\Generic Vehicles\Declaration Mode\12t Delivery Truck\testCompressorMap.acmp">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="bin\Debug\Generic Vehicles\Declaration Mode\12t Delivery Truck\testFuelGoodMap.vmap">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="bin\Debug\Generic Vehicles\Declaration Mode\12t Delivery Truck\TAKAWAY.AHSM">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="bin\Debug\bin\Debug\TAKAWAY.AHSM">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="bin\Debug\bin\Debug\Generic Vehicles\Declaration Mode\12t Delivery Truck\TAKAWAY.AHSM">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="bin\Debug\bin\Debug\bin\Debug\Generic Vehicles\Declaration Mode\12t Delivery Truck\TAKAWAY.AHSM">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
<None Include="ClassDiagram1.cd" />
<None Include="ClassDiagram2.cd" />
<None Include="My Project\app.manifest">
@@ -441,6 +464,10 @@
<Project>{fdeee460-0b8a-4ef6-8d9e-72f203a50f65}</Project>
<Name>VectoAuxiliaries</Name>
</ProjectReference>
+ <ProjectReference Include="..\AdvancedAuxiliaryInterfaces\AdvancedAuxiliaryInterfaces.vbproj">
+ <Project>{b4b9bd2f-fd8f-4bb8-82fa-e2154d2c7fbd}</Project>
+ <Name>AdvancedAuxiliaryInterfaces</Name>
+ </ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/AlternatorMap.vb b/VECTOAux/VectoAuxiliaries/Electrics/AlternatorMap.vb
index 4a540d0e8c4903e78483a22ef89e43d768412e38..b82b4409b7b81c61ecda189b5cb920200ac498a0 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/AlternatorMap.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/AlternatorMap.vb
@@ -296,6 +296,10 @@ Implements IAlternatorMap
For Each line As String In lines
If Not firstline Then
+
+ 'Advanced Alternator Source Check.
+ If line.contains("[MODELSOURCE") then Exit For
+
'split the line
Dim elements() As String = line.Split(New Char() {","}, StringSplitOptions.RemoveEmptyEntries)
'3 entries per line required
diff --git a/VECTOAux/VectoAuxiliaries/FilePathUtils.vb b/VECTOAux/VectoAuxiliaries/FilePathUtils.vb
index 1425bdebeeb03b7fbe4812ab694c8768d4cf6eb9..747a30d5582fd56543e29911fac65b87f7bf5057 100644
--- a/VECTOAux/VectoAuxiliaries/FilePathUtils.vb
+++ b/VECTOAux/VectoAuxiliaries/FilePathUtils.vb
@@ -68,6 +68,22 @@ Public Shared function fileNameLegal( fileName as string) As Boolean
End Function
+
+ Public shared function ResolveFilePath( vectoPath as String, filename As string) as string
+
+ 'No Vecto Path supplied
+ If vectoPath="" then Return filename
+
+ 'This is not relative
+ If filename.Contains(":\") then
+
+ 'Filepath is already absolute
+ Return filename
+ Else
+ return vectoPath & filename
+ End If
+
+ End Function
diff --git a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb
index fab56e8045371abd1215d3523f4003729433c43d..948a4f5688b9419fbd96e731ebc123c117702e78 100644
--- a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb
+++ b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb
@@ -16,6 +16,7 @@ Private processing As Boolean = False
Private SecondsIntoCycle As Integer = 0
Private vectoFile As String = ""
+Private vectoPath As String = ""
Private auxFile As string
@@ -44,6 +45,7 @@ Public Sub new( byval fileName As String, byval vectoFileName As String )
Me.vectoFile = vectoFileName
+ Me.vectoPath = FilePathUtils.filePathOnly( vectoFileName)
' This call is required by the designer.
InitializeComponent()
@@ -598,7 +600,7 @@ Dim result As Boolean = True
'Test File is valid
Dim alt As AlternatorMap
Try
- alt = New AlternatorMap(txtAlternatorMapPath.Text)
+ alt = New AlternatorMap(FilePathUtils.ResolveFilePath( vectoPath,txtAlternatorMapPath.Text))
alt.Initialise()
ErrorProvider.SetError(txtAlternatorMapPath, String.Empty)
Catch ex As Exception
@@ -1143,7 +1145,6 @@ Private Sub btnCancel_Click( sender As Object, e As EventArgs) Handles btnCance
End Sub
-
Private Sub frmAuxiliaryConfig_FormClosing( sender As Object, e As FormClosingEventArgs) Handles MyBase.FormClosing
@@ -1184,8 +1185,6 @@ Private Sub frmAuxiliaryConfig_FormClosing( sender As Object, e As FormClosingE
End Sub
-
-
Private Sub btnSSMBSource_Click( sender As Object, e As EventArgs) Handles btnSSMBSource.Click