From 4892a3f3c834f9496489801e0fd3056b8e0840a2 Mon Sep 17 00:00:00 2001
From: "Burns, Terry" <Terry.Burns@ricardo.com>
Date: Tue, 23 Dec 2014 11:06:46 +0000
Subject: [PATCH] Added Advanced Aux and the Persistance of Chosen Auxiliaries
Added Auxiliary UI Components to F_VECTO
Added Save and Retreive JSON into Vecto File For Assembly and Version + AAUX File.
Added Validation on Vecto Form for saving , checks the configuration of the Auxiliart Type, Selection and Entered FileName.
Corrected Bug with null retention of AAUX FILE.
Re-tested.
git-tfs-id: [http://tfs00.element.root.com:8080/tfs/TFSCollection]$/VECTO;C1702
---
VECTO/AAUX_Gobal.vb | 60 ++-
VECTO/GUI/F_MAINForm.Designer.vb | 384 +++++++++---------
VECTO/GUI/F_MAINForm.vb | 1 -
VECTO/GUI/F_VECTO.Designer.vb | 92 ++---
VECTO/GUI/F_VECTO.resx | 6 +-
VECTO/GUI/F_VECTO.vb | 131 +++++-
VECTO/Input Files/cAdvancedAuxiliary.vb | 13 +-
VECTO/Input Files/cVECTO.vb | 44 ++
VECTO/VECTO.vbproj | 17 +-
VECTO/cConfig.vb | 3 +
VECTO/packages.config | 4 +
.../VectoAuxiliaries/AdvancedAuxiliaries.vb | 18 +-
VECTOAux/VectoAuxiliaries/FilePathUtils.vb | 4 +-
VECTOAux/VectoAuxiliaries/UI/FB_Global.vb | 5 +-
.../UI/frmAuxiliaryConfig.Designer.vb | 216 +++++-----
.../VectoAuxiliaries/UI/frmAuxiliaryConfig.vb | 142 ++++---
packages/repositories.config | 1 +
17 files changed, 685 insertions(+), 456 deletions(-)
create mode 100644 VECTO/packages.config
diff --git a/VECTO/AAUX_Gobal.vb b/VECTO/AAUX_Gobal.vb
index 0492702f43..fdf853c791 100644
--- a/VECTO/AAUX_Gobal.vb
+++ b/VECTO/AAUX_Gobal.vb
@@ -4,6 +4,11 @@ Imports System.IO
Module AAUX_Gobal
+
+
+
+
+
'AA-TB
''' <summary>
''' Discovers Advanced Auxiliaries Assemblies in 'targetDirectory' Directory
@@ -21,7 +26,7 @@ Module AAUX_Gobal
'Create Default
- returnList.Add(New cAdvancedAuxiliary("Classic Vecto Auxiliary", "CLASSIC", "CLASSIC", "CLASSIC"))
+ returnList.Add(New cAdvancedAuxiliary())
@@ -88,7 +93,7 @@ Module AAUX_Gobal
o = Activator.CreateInstance(chosenAssembly, "VectoAuxiliaries.AdvancedAuxiliaries")
iAdvancedAux = DirectCast(o.Unwrap, IAdvancedAuxiliaries)
- iAdvancedAux.Configure(filePath, vectoFilePath)
+ iAdvancedAux.Configure(filePath, vectoFilePath)
Catch ex As Exception
@@ -117,6 +122,57 @@ Public Function GetAAUXSourceDirectory() As String
End Function
+ Public function ResolveAAUXFilePath( 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
+
+
+Public Function ValidateAAUXFile( ByVal absoluteAAuxPath As String,
+ ByVal assemblyName As String,
+ byval version As string,
+ byref message 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 validation using the paths supplied.
+ Try
+ o = Activator.CreateInstance(chosenAssembly, "VectoAuxiliaries.AdvancedAuxiliaries")
+ iAdvancedAux = DirectCast(o.Unwrap, IAdvancedAuxiliaries)
+
+ result = iAdvancedAux.ValidateAAUXFile(absoluteAAuxPath, message)
+
+ Catch ex As Exception
+
+ result = false
+
+ End Try
+
+ Return result
+
+End Function
+
+
diff --git a/VECTO/GUI/F_MAINForm.Designer.vb b/VECTO/GUI/F_MAINForm.Designer.vb
index 6c6bcbab3c..3fdd3a16b7 100644
--- a/VECTO/GUI/F_MAINForm.Designer.vb
+++ b/VECTO/GUI/F_MAINForm.Designer.vb
@@ -47,8 +47,8 @@ Partial Class F_MAINForm
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.ColGENpath = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.ColGENstatus = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
Me.ButtonGENopt = New System.Windows.Forms.Button()
Me.ButtonGENremove = New System.Windows.Forms.Button()
Me.Button1 = New System.Windows.Forms.Button()
@@ -58,8 +58,8 @@ Partial Class F_MAINForm
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.ColDRIpath = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+ Me.ColDRIstatus = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
Me.ButtonDRIedit = New System.Windows.Forms.Button()
Me.ButtonDRIremove = New System.Windows.Forms.Button()
Me.ButtonDRIadd = New System.Windows.Forms.Button()
@@ -83,12 +83,12 @@ Partial Class F_MAINForm
Me.ChBoxUseGears = New System.Windows.Forms.CheckBox()
Me.TabPageDEV = New System.Windows.Forms.TabPage()
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.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()
@@ -96,9 +96,9 @@ Partial Class F_MAINForm
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.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()
@@ -127,25 +127,25 @@ Partial Class F_MAINForm
Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.OpenInGraphWindowToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
- Me.StatusBAR.SuspendLayout()
- Me.TabControl1.SuspendLayout()
- Me.TabPageGEN.SuspendLayout()
- CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
- Me.TabPageDRI.SuspendLayout()
- Me.TabPgOptions.SuspendLayout()
- Me.GrBoxBATCH.SuspendLayout()
- Me.PanelOptAllg.SuspendLayout()
- Me.GroupBox1.SuspendLayout()
- Me.PnDeclOpt.SuspendLayout()
- Me.TabPageDEV.SuspendLayout()
- Me.ConMenFilelist.SuspendLayout()
- CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit()
- Me.SplitContainer1.Panel1.SuspendLayout()
- Me.SplitContainer1.Panel2.SuspendLayout()
- Me.SplitContainer1.SuspendLayout()
- Me.ToolStrip1.SuspendLayout()
- Me.CmOpenFile.SuspendLayout()
- Me.SuspendLayout()
+ Me.StatusBAR.SuspendLayout
+ Me.TabControl1.SuspendLayout
+ Me.TabPageGEN.SuspendLayout
+ CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).BeginInit
+ Me.TabPageDRI.SuspendLayout
+ Me.TabPgOptions.SuspendLayout
+ Me.GrBoxBATCH.SuspendLayout
+ Me.PanelOptAllg.SuspendLayout
+ Me.GroupBox1.SuspendLayout
+ Me.PnDeclOpt.SuspendLayout
+ Me.TabPageDEV.SuspendLayout
+ Me.ConMenFilelist.SuspendLayout
+ CType(Me.SplitContainer1,System.ComponentModel.ISupportInitialize).BeginInit
+ Me.SplitContainer1.Panel1.SuspendLayout
+ Me.SplitContainer1.Panel2.SuspendLayout
+ Me.SplitContainer1.SuspendLayout
+ Me.ToolStrip1.SuspendLayout
+ Me.CmOpenFile.SuspendLayout
+ Me.SuspendLayout
'
'StatusBAR
'
@@ -160,35 +160,35 @@ Partial Class F_MAINForm
'
Me.ToolStripLbStatus.Name = "ToolStripLbStatus"
Me.ToolStripLbStatus.Size = New System.Drawing.Size(1121, 17)
- Me.ToolStripLbStatus.Spring = True
+ Me.ToolStripLbStatus.Spring = true
Me.ToolStripLbStatus.Text = "Status Text"
Me.ToolStripLbStatus.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
'
'ToolStripProgBarJob
'
Me.ToolStripProgBarJob.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
- Me.ToolStripProgBarJob.AutoSize = False
+ 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.ToolTipText = "overall progress"
- Me.ToolStripProgBarJob.Visible = False
+ Me.ToolStripProgBarJob.Visible = false
'
'ToolStripProgBarOverall
'
Me.ToolStripProgBarOverall.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
- Me.ToolStripProgBarOverall.AutoSize = False
+ 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.ToolTipText = "job progress"
- Me.ToolStripProgBarOverall.Visible = False
+ Me.ToolStripProgBarOverall.Visible = false
'
'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((((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.Controls.Add(Me.TabPageGEN)
Me.TabControl1.Controls.Add(Me.TabPageDRI)
Me.TabControl1.Controls.Add(Me.TabPgOptions)
@@ -218,90 +218,90 @@ Partial Class F_MAINForm
Me.TabPageGEN.Size = New System.Drawing.Size(1118, 346)
Me.TabPageGEN.TabIndex = 0
Me.TabPageGEN.Text = "Job Files"
- Me.TabPageGEN.UseVisualStyleBackColor = True
+ Me.TabPageGEN.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.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(6, 97)
Me.LbDecl.Name = "LbDecl"
Me.LbDecl.Size = New System.Drawing.Size(107, 13)
Me.LbDecl.TabIndex = 19
Me.LbDecl.Text = "Declaration Mode"
- Me.LbDecl.Visible = False
+ Me.LbDecl.Visible = false
'
'PictureBox1
'
- Me.PictureBox1.Image = CType(resources.GetObject("PictureBox1.Image"), System.Drawing.Image)
+ Me.PictureBox1.Image = CType(resources.GetObject("PictureBox1.Image"),System.Drawing.Image)
Me.PictureBox1.Location = New System.Drawing.Point(6, 6)
Me.PictureBox1.Name = "PictureBox1"
Me.PictureBox1.Size = New System.Drawing.Size(105, 44)
Me.PictureBox1.TabIndex = 18
- Me.PictureBox1.TabStop = False
+ Me.PictureBox1.TabStop = false
'
'BtGENdown
'
- Me.BtGENdown.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.BtGENdown.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.BtGENdown.Image = Global.VECTO.My.Resources.Resources.Actions_arrow_down_icon
Me.BtGENdown.Location = New System.Drawing.Point(996, 317)
Me.BtGENdown.Name = "BtGENdown"
Me.BtGENdown.Size = New System.Drawing.Size(30, 23)
Me.BtGENdown.TabIndex = 6
- Me.BtGENdown.UseVisualStyleBackColor = True
+ Me.BtGENdown.UseVisualStyleBackColor = true
'
'BtGENup
'
- Me.BtGENup.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.BtGENup.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.BtGENup.Image = Global.VECTO.My.Resources.Resources.Actions_arrow_up_icon
Me.BtGENup.Location = New System.Drawing.Point(960, 317)
Me.BtGENup.Name = "BtGENup"
Me.BtGENup.Size = New System.Drawing.Size(30, 23)
Me.BtGENup.TabIndex = 4
- Me.BtGENup.UseVisualStyleBackColor = True
+ 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.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.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
+ Me.LbAutoShDown.AutoSize = true
+ Me.LbAutoShDown.Font = New 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(253, 322)
Me.LbAutoShDown.Name = "LbAutoShDown"
Me.LbAutoShDown.Size = New System.Drawing.Size(225, 13)
Me.LbAutoShDown.TabIndex = 17
Me.LbAutoShDown.Text = "!!! Automatic Shutdown is activated !!!"
- Me.LbAutoShDown.Visible = False
+ 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.AutoSize = True
+ Me.ChBoxAllGEN.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
+ Me.ChBoxAllGEN.AutoSize = true
Me.ChBoxAllGEN.Location = New System.Drawing.Point(129, 321)
Me.ChBoxAllGEN.Name = "ChBoxAllGEN"
Me.ChBoxAllGEN.Size = New System.Drawing.Size(37, 17)
Me.ChBoxAllGEN.TabIndex = 16
Me.ChBoxAllGEN.Text = "All"
- Me.ChBoxAllGEN.UseVisualStyleBackColor = True
+ Me.ChBoxAllGEN.UseVisualStyleBackColor = true
'
'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.CheckBoxes = True
+ 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.CheckBoxes = true
Me.LvGEN.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColGENpath, Me.ColGENstatus})
- Me.LvGEN.FullRowSelect = True
- Me.LvGEN.GridLines = True
+ Me.LvGEN.FullRowSelect = true
+ Me.LvGEN.GridLines = true
Me.LvGEN.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable
- Me.LvGEN.HideSelection = False
- Me.LvGEN.LabelEdit = True
+ Me.LvGEN.HideSelection = false
+ Me.LvGEN.LabelEdit = true
Me.LvGEN.Location = New System.Drawing.Point(117, 6)
Me.LvGEN.Name = "LvGEN"
Me.LvGEN.Size = New System.Drawing.Size(995, 305)
Me.LvGEN.TabIndex = 14
- Me.LvGEN.UseCompatibleStateImageBehavior = False
+ Me.LvGEN.UseCompatibleStateImageBehavior = false
Me.LvGEN.View = System.Windows.Forms.View.Details
'
'ColGENpath
@@ -316,24 +316,24 @@ Partial Class F_MAINForm
'
'ButtonGENopt
'
- Me.ButtonGENopt.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.ButtonGENopt.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.ButtonGENopt.Location = New System.Drawing.Point(1032, 317)
Me.ButtonGENopt.Name = "ButtonGENopt"
Me.ButtonGENopt.Size = New System.Drawing.Size(80, 23)
Me.ButtonGENopt.TabIndex = 8
Me.ButtonGENopt.Text = "List Options"
- Me.ButtonGENopt.UseVisualStyleBackColor = True
+ Me.ButtonGENopt.UseVisualStyleBackColor = true
'
'ButtonGENremove
'
- Me.ButtonGENremove.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), 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.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),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(924, 317)
Me.ButtonGENremove.Name = "ButtonGENremove"
Me.ButtonGENremove.Size = New System.Drawing.Size(30, 23)
Me.ButtonGENremove.TabIndex = 2
- Me.ButtonGENremove.UseVisualStyleBackColor = True
+ Me.ButtonGENremove.UseVisualStyleBackColor = true
'
'Button1
'
@@ -344,18 +344,18 @@ Partial Class F_MAINForm
Me.Button1.Size = New System.Drawing.Size(105, 41)
Me.Button1.TabIndex = 12
Me.Button1.Text = "START"
- Me.Button1.UseVisualStyleBackColor = True
+ Me.Button1.UseVisualStyleBackColor = true
'
'ButtonGENadd
'
- Me.ButtonGENadd.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), 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.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),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(888, 317)
Me.ButtonGENadd.Name = "ButtonGENadd"
Me.ButtonGENadd.Size = New System.Drawing.Size(30, 23)
Me.ButtonGENadd.TabIndex = 1
- Me.ButtonGENadd.UseVisualStyleBackColor = True
+ Me.ButtonGENadd.UseVisualStyleBackColor = true
'
'TabPageDRI
'
@@ -372,57 +372,57 @@ Partial Class F_MAINForm
Me.TabPageDRI.Size = New System.Drawing.Size(1118, 346)
Me.TabPageDRI.TabIndex = 1
Me.TabPageDRI.Text = "Driving Cycles"
- Me.TabPageDRI.UseVisualStyleBackColor = True
+ Me.TabPageDRI.UseVisualStyleBackColor = true
'
'BtDRIdown
'
- Me.BtDRIdown.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.BtDRIdown.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.BtDRIdown.Image = Global.VECTO.My.Resources.Resources.Actions_arrow_down_icon
Me.BtDRIdown.Location = New System.Drawing.Point(996, 317)
Me.BtDRIdown.Name = "BtDRIdown"
Me.BtDRIdown.Size = New System.Drawing.Size(30, 23)
Me.BtDRIdown.TabIndex = 3
- Me.BtDRIdown.UseVisualStyleBackColor = True
+ Me.BtDRIdown.UseVisualStyleBackColor = true
'
'BtDRIup
'
- Me.BtDRIup.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.BtDRIup.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.BtDRIup.Image = Global.VECTO.My.Resources.Resources.Actions_arrow_up_icon
Me.BtDRIup.Location = New System.Drawing.Point(960, 317)
Me.BtDRIup.Name = "BtDRIup"
Me.BtDRIup.Size = New System.Drawing.Size(30, 23)
Me.BtDRIup.TabIndex = 2
- Me.BtDRIup.UseVisualStyleBackColor = True
+ 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.AutoSize = True
+ Me.ChBoxAllDRI.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
+ Me.ChBoxAllDRI.AutoSize = true
Me.ChBoxAllDRI.Location = New System.Drawing.Point(15, 321)
Me.ChBoxAllDRI.Name = "ChBoxAllDRI"
Me.ChBoxAllDRI.Size = New System.Drawing.Size(37, 17)
Me.ChBoxAllDRI.TabIndex = 7
Me.ChBoxAllDRI.Text = "All"
- Me.ChBoxAllDRI.UseVisualStyleBackColor = True
+ Me.ChBoxAllDRI.UseVisualStyleBackColor = true
'
'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.CheckBoxes = True
+ 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.CheckBoxes = true
Me.LvDRI.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColDRIpath, Me.ColDRIstatus})
- Me.LvDRI.FullRowSelect = True
- Me.LvDRI.GridLines = True
+ Me.LvDRI.FullRowSelect = true
+ Me.LvDRI.GridLines = true
Me.LvDRI.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable
- Me.LvDRI.HideSelection = False
- Me.LvDRI.LabelEdit = True
+ Me.LvDRI.HideSelection = false
+ Me.LvDRI.LabelEdit = true
Me.LvDRI.Location = New System.Drawing.Point(6, 6)
Me.LvDRI.Name = "LvDRI"
Me.LvDRI.Size = New System.Drawing.Size(1106, 305)
Me.LvDRI.TabIndex = 6
- Me.LvDRI.UseCompatibleStateImageBehavior = False
+ Me.LvDRI.UseCompatibleStateImageBehavior = false
Me.LvDRI.View = System.Windows.Forms.View.Details
'
'ColDRIpath
@@ -437,35 +437,35 @@ Partial Class F_MAINForm
'
'ButtonDRIedit
'
- Me.ButtonDRIedit.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.ButtonDRIedit.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.ButtonDRIedit.Location = New System.Drawing.Point(1032, 317)
Me.ButtonDRIedit.Name = "ButtonDRIedit"
Me.ButtonDRIedit.Size = New System.Drawing.Size(80, 23)
Me.ButtonDRIedit.TabIndex = 4
Me.ButtonDRIedit.Text = "List Options"
- Me.ButtonDRIedit.UseVisualStyleBackColor = True
+ Me.ButtonDRIedit.UseVisualStyleBackColor = true
'
'ButtonDRIremove
'
- Me.ButtonDRIremove.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), 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.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),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(924, 317)
Me.ButtonDRIremove.Name = "ButtonDRIremove"
Me.ButtonDRIremove.Size = New System.Drawing.Size(30, 23)
Me.ButtonDRIremove.TabIndex = 1
- Me.ButtonDRIremove.UseVisualStyleBackColor = True
+ Me.ButtonDRIremove.UseVisualStyleBackColor = true
'
'ButtonDRIadd
'
- Me.ButtonDRIadd.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), 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.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),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(888, 317)
Me.ButtonDRIadd.Name = "ButtonDRIadd"
Me.ButtonDRIadd.Size = New System.Drawing.Size(30, 23)
Me.ButtonDRIadd.TabIndex = 0
- Me.ButtonDRIadd.UseVisualStyleBackColor = True
+ Me.ButtonDRIadd.UseVisualStyleBackColor = true
'
'TabPgOptions
'
@@ -479,13 +479,13 @@ Partial Class F_MAINForm
Me.TabPgOptions.Size = New System.Drawing.Size(1118, 346)
Me.TabPgOptions.TabIndex = 2
Me.TabPgOptions.Text = "Options"
- Me.TabPgOptions.UseVisualStyleBackColor = True
+ 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((((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.Controls.Add(Me.ChBoxBatchSubD)
Me.GrBoxBATCH.Controls.Add(Me.Label2)
Me.GrBoxBATCH.Controls.Add(Me.ButBObrowse)
@@ -495,22 +495,22 @@ Partial Class F_MAINForm
Me.GrBoxBATCH.Name = "GrBoxBATCH"
Me.GrBoxBATCH.Size = New System.Drawing.Size(1106, 116)
Me.GrBoxBATCH.TabIndex = 5
- Me.GrBoxBATCH.TabStop = False
+ Me.GrBoxBATCH.TabStop = false
Me.GrBoxBATCH.Text = "Batch Options"
'
'ChBoxBatchSubD
'
- Me.ChBoxBatchSubD.AutoSize = True
+ Me.ChBoxBatchSubD.AutoSize = true
Me.ChBoxBatchSubD.Location = New System.Drawing.Point(14, 46)
Me.ChBoxBatchSubD.Name = "ChBoxBatchSubD"
Me.ChBoxBatchSubD.Size = New System.Drawing.Size(206, 17)
Me.ChBoxBatchSubD.TabIndex = 4
Me.ChBoxBatchSubD.Text = "Create Subdirectories for modal results"
- Me.ChBoxBatchSubD.UseVisualStyleBackColor = True
+ Me.ChBoxBatchSubD.UseVisualStyleBackColor = true
'
'Label2
'
- Me.Label2.AutoSize = True
+ Me.Label2.AutoSize = true
Me.Label2.Location = New System.Drawing.Point(11, 22)
Me.Label2.Name = "Label2"
Me.Label2.Size = New System.Drawing.Size(64, 13)
@@ -519,18 +519,18 @@ Partial Class F_MAINForm
'
'ButBObrowse
'
- Me.ButBObrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.ButBObrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.ButBObrowse.Location = New System.Drawing.Point(1051, 18)
Me.ButBObrowse.Name = "ButBObrowse"
Me.ButBObrowse.Size = New System.Drawing.Size(28, 20)
Me.ButBObrowse.TabIndex = 3
Me.ButBObrowse.Text = "..."
- Me.ButBObrowse.UseVisualStyleBackColor = True
+ Me.ButBObrowse.UseVisualStyleBackColor = true
'
'CbBOmode
'
Me.CbBOmode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
- Me.CbBOmode.FormattingEnabled = True
+ 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.Name = "CbBOmode"
@@ -539,8 +539,8 @@ Partial Class F_MAINForm
'
'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.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.Name = "TbBOpath"
Me.TbBOpath.Size = New System.Drawing.Size(818, 20)
@@ -548,26 +548,26 @@ Partial Class F_MAINForm
'
'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.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.Name = "GrBoxSTD"
Me.GrBoxSTD.Size = New System.Drawing.Size(1106, 116)
Me.GrBoxSTD.TabIndex = 14
- Me.GrBoxSTD.TabStop = False
+ 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.AutoSize = True
+ Me.ChBoxAutoSD.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.ChBoxAutoSD.AutoSize = true
Me.ChBoxAutoSD.Location = New System.Drawing.Point(943, 6)
Me.ChBoxAutoSD.Name = "ChBoxAutoSD"
Me.ChBoxAutoSD.Size = New System.Drawing.Size(169, 17)
Me.ChBoxAutoSD.TabIndex = 13
Me.ChBoxAutoSD.Text = "Shutdown system after last job"
- Me.ChBoxAutoSD.UseVisualStyleBackColor = True
+ Me.ChBoxAutoSD.UseVisualStyleBackColor = true
'
'PanelOptAllg
'
@@ -581,15 +581,15 @@ Partial Class F_MAINForm
'
'ChBoxModOut
'
- Me.ChBoxModOut.AutoSize = True
- Me.ChBoxModOut.Checked = True
+ Me.ChBoxModOut.AutoSize = true
+ Me.ChBoxModOut.Checked = true
Me.ChBoxModOut.CheckState = System.Windows.Forms.CheckState.Checked
Me.ChBoxModOut.Location = New System.Drawing.Point(9, 180)
Me.ChBoxModOut.Name = "ChBoxModOut"
Me.ChBoxModOut.Size = New System.Drawing.Size(115, 17)
Me.ChBoxModOut.TabIndex = 0
Me.ChBoxModOut.Text = "Write modal results"
- Me.ChBoxModOut.UseVisualStyleBackColor = True
+ Me.ChBoxModOut.UseVisualStyleBackColor = true
'
'GroupBox1
'
@@ -599,31 +599,31 @@ Partial Class F_MAINForm
Me.GroupBox1.Name = "GroupBox1"
Me.GroupBox1.Size = New System.Drawing.Size(121, 72)
Me.GroupBox1.TabIndex = 15
- Me.GroupBox1.TabStop = False
+ Me.GroupBox1.TabStop = false
Me.GroupBox1.Text = "Mode"
'
'RbDev
'
- Me.RbDev.AutoSize = True
- Me.RbDev.Checked = True
+ Me.RbDev.AutoSize = true
+ Me.RbDev.Checked = true
Me.RbDev.Location = New System.Drawing.Point(6, 42)
Me.RbDev.Name = "RbDev"
Me.RbDev.Size = New System.Drawing.Size(111, 17)
Me.RbDev.TabIndex = 1
- Me.RbDev.TabStop = True
+ Me.RbDev.TabStop = true
Me.RbDev.Text = "Engineering Mode"
- Me.RbDev.UseVisualStyleBackColor = True
+ Me.RbDev.UseVisualStyleBackColor = true
'
'RbDecl
'
- Me.RbDecl.AutoSize = True
+ Me.RbDecl.AutoSize = true
Me.RbDecl.Location = New System.Drawing.Point(6, 19)
Me.RbDecl.Name = "RbDecl"
Me.RbDecl.Size = New System.Drawing.Size(109, 17)
Me.RbDecl.TabIndex = 0
- Me.RbDecl.TabStop = True
+ Me.RbDecl.TabStop = true
Me.RbDecl.Text = "Declaration Mode"
- Me.RbDecl.UseVisualStyleBackColor = True
+ Me.RbDecl.UseVisualStyleBackColor = true
'
'PnDeclOpt
'
@@ -637,33 +637,33 @@ Partial Class F_MAINForm
'
'CbBatch
'
- Me.CbBatch.AutoSize = True
+ Me.CbBatch.AutoSize = true
Me.CbBatch.Location = New System.Drawing.Point(6, 3)
Me.CbBatch.Name = "CbBatch"
Me.CbBatch.Size = New System.Drawing.Size(84, 17)
Me.CbBatch.TabIndex = 15
Me.CbBatch.Text = "Batch Mode"
- Me.CbBatch.UseVisualStyleBackColor = True
+ Me.CbBatch.UseVisualStyleBackColor = true
'
'ChBoxCyclDistCor
'
- Me.ChBoxCyclDistCor.AutoSize = True
+ Me.ChBoxCyclDistCor.AutoSize = true
Me.ChBoxCyclDistCor.Location = New System.Drawing.Point(6, 41)
Me.ChBoxCyclDistCor.Name = "ChBoxCyclDistCor"
Me.ChBoxCyclDistCor.Size = New System.Drawing.Size(148, 17)
Me.ChBoxCyclDistCor.TabIndex = 0
Me.ChBoxCyclDistCor.Text = "Cycle Distance Correction"
- Me.ChBoxCyclDistCor.UseVisualStyleBackColor = True
+ Me.ChBoxCyclDistCor.UseVisualStyleBackColor = true
'
'ChBoxUseGears
'
- Me.ChBoxUseGears.AutoSize = True
+ Me.ChBoxUseGears.AutoSize = true
Me.ChBoxUseGears.Location = New System.Drawing.Point(6, 64)
Me.ChBoxUseGears.Name = "ChBoxUseGears"
Me.ChBoxUseGears.Size = New System.Drawing.Size(188, 17)
Me.ChBoxUseGears.TabIndex = 0
Me.ChBoxUseGears.Text = "Use gears/rpm's form driving cycle"
- Me.ChBoxUseGears.UseVisualStyleBackColor = True
+ Me.ChBoxUseGears.UseVisualStyleBackColor = true
'
'TabPageDEV
'
@@ -674,22 +674,22 @@ Partial Class F_MAINForm
Me.TabPageDEV.Size = New System.Drawing.Size(1118, 346)
Me.TabPageDEV.TabIndex = 3
Me.TabPageDEV.Text = "DEV"
- Me.TabPageDEV.UseVisualStyleBackColor = True
+ Me.TabPageDEV.UseVisualStyleBackColor = true
'
'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.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.LvDEVoptions.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader4, Me.ColumnHeader7, Me.ColumnHeader5, Me.ColumnHeader6, Me.ColumnHeader8, Me.ColumnHeader9})
- Me.LvDEVoptions.FullRowSelect = True
- Me.LvDEVoptions.GridLines = True
+ Me.LvDEVoptions.FullRowSelect = true
+ Me.LvDEVoptions.GridLines = true
Me.LvDEVoptions.Location = New System.Drawing.Point(6, 6)
- Me.LvDEVoptions.MultiSelect = False
+ Me.LvDEVoptions.MultiSelect = false
Me.LvDEVoptions.Name = "LvDEVoptions"
Me.LvDEVoptions.Size = New System.Drawing.Size(1106, 334)
Me.LvDEVoptions.TabIndex = 0
- Me.LvDEVoptions.UseCompatibleStateImageBehavior = False
+ Me.LvDEVoptions.UseCompatibleStateImageBehavior = false
Me.LvDEVoptions.View = System.Windows.Forms.View.Details
'
'ColumnHeader4
@@ -757,21 +757,21 @@ Partial Class F_MAINForm
'
'LvMsg
'
- Me.LvMsg.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.LvMsg.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.LvMsg.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader2, Me.ColumnHeader3})
- Me.LvMsg.Font = New System.Drawing.Font("Courier New", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.LvMsg.FullRowSelect = True
- Me.LvMsg.GridLines = True
+ Me.LvMsg.Font = New System.Drawing.Font("Courier New", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ Me.LvMsg.FullRowSelect = true
+ Me.LvMsg.GridLines = true
Me.LvMsg.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable
- Me.LvMsg.LabelWrap = False
+ Me.LvMsg.LabelWrap = false
Me.LvMsg.Location = New System.Drawing.Point(3, 3)
- Me.LvMsg.MultiSelect = False
+ Me.LvMsg.MultiSelect = false
Me.LvMsg.Name = "LvMsg"
Me.LvMsg.Size = New System.Drawing.Size(1126, 190)
Me.LvMsg.TabIndex = 0
- Me.LvMsg.UseCompatibleStateImageBehavior = False
+ Me.LvMsg.UseCompatibleStateImageBehavior = false
Me.LvMsg.View = System.Windows.Forms.View.Details
'
'ColumnHeader1
@@ -791,9 +791,9 @@ 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.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, 27)
Me.SplitContainer1.Name = "SplitContainer1"
@@ -905,7 +905,7 @@ Partial Class F_MAINForm
'
Me.ToolStripSeparator4.Name = "ToolStripSeparator4"
Me.ToolStripSeparator4.Size = New System.Drawing.Size(167, 6)
- Me.ToolStripSeparator4.Visible = False
+ Me.ToolStripSeparator4.Visible = false
'
'OpenLogToolStripMenuItem
'
@@ -992,47 +992,47 @@ Partial Class F_MAINForm
'
'F_MAINForm
'
- 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.ClientSize = New System.Drawing.Size(1136, 638)
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.Icon = CType(resources.GetObject("$this.Icon"),System.Drawing.Icon)
Me.MinimumSize = New System.Drawing.Size(785, 485)
Me.Name = "F_MAINForm"
Me.Text = "VECTO"
- Me.StatusBAR.ResumeLayout(False)
- Me.StatusBAR.PerformLayout()
- Me.TabControl1.ResumeLayout(False)
- Me.TabPageGEN.ResumeLayout(False)
- Me.TabPageGEN.PerformLayout()
- CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
- Me.TabPageDRI.ResumeLayout(False)
- Me.TabPageDRI.PerformLayout()
- Me.TabPgOptions.ResumeLayout(False)
- Me.TabPgOptions.PerformLayout()
- Me.GrBoxBATCH.ResumeLayout(False)
- Me.GrBoxBATCH.PerformLayout()
- Me.PanelOptAllg.ResumeLayout(False)
- Me.PanelOptAllg.PerformLayout()
- Me.GroupBox1.ResumeLayout(False)
- Me.GroupBox1.PerformLayout()
- Me.PnDeclOpt.ResumeLayout(False)
- Me.PnDeclOpt.PerformLayout()
- Me.TabPageDEV.ResumeLayout(False)
- Me.ConMenFilelist.ResumeLayout(False)
- Me.SplitContainer1.Panel1.ResumeLayout(False)
- Me.SplitContainer1.Panel2.ResumeLayout(False)
- CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).EndInit()
- Me.SplitContainer1.ResumeLayout(False)
- Me.ToolStrip1.ResumeLayout(False)
- Me.ToolStrip1.PerformLayout()
- Me.CmOpenFile.ResumeLayout(False)
- Me.ResumeLayout(False)
- Me.PerformLayout()
+ Me.StatusBAR.ResumeLayout(false)
+ Me.StatusBAR.PerformLayout
+ Me.TabControl1.ResumeLayout(false)
+ Me.TabPageGEN.ResumeLayout(false)
+ Me.TabPageGEN.PerformLayout
+ CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).EndInit
+ Me.TabPageDRI.ResumeLayout(false)
+ Me.TabPageDRI.PerformLayout
+ Me.TabPgOptions.ResumeLayout(false)
+ Me.TabPgOptions.PerformLayout
+ Me.GrBoxBATCH.ResumeLayout(false)
+ Me.GrBoxBATCH.PerformLayout
+ Me.PanelOptAllg.ResumeLayout(false)
+ Me.PanelOptAllg.PerformLayout
+ Me.GroupBox1.ResumeLayout(false)
+ Me.GroupBox1.PerformLayout
+ Me.PnDeclOpt.ResumeLayout(false)
+ Me.PnDeclOpt.PerformLayout
+ Me.TabPageDEV.ResumeLayout(false)
+ Me.ConMenFilelist.ResumeLayout(false)
+ Me.SplitContainer1.Panel1.ResumeLayout(false)
+ Me.SplitContainer1.Panel2.ResumeLayout(false)
+ CType(Me.SplitContainer1,System.ComponentModel.ISupportInitialize).EndInit
+ Me.SplitContainer1.ResumeLayout(false)
+ Me.ToolStrip1.ResumeLayout(false)
+ Me.ToolStrip1.PerformLayout
+ Me.CmOpenFile.ResumeLayout(false)
+ Me.ResumeLayout(false)
+ Me.PerformLayout
- End Sub
+End Sub
Friend WithEvents Button1 As System.Windows.Forms.Button
Friend WithEvents StatusBAR As System.Windows.Forms.StatusStrip
Friend WithEvents ToolStripLbStatus As System.Windows.Forms.ToolStripStatusLabel
diff --git a/VECTO/GUI/F_MAINForm.vb b/VECTO/GUI/F_MAINForm.vb
index 3a8f6b1bba..e5d4404a32 100644
--- a/VECTO/GUI/F_MAINForm.vb
+++ b/VECTO/GUI/F_MAINForm.vb
@@ -2444,5 +2444,4 @@ Lb1:
#End Region
-
End Class
diff --git a/VECTO/GUI/F_VECTO.Designer.vb b/VECTO/GUI/F_VECTO.Designer.vb
index 28aa3b3549..033a80bbcf 100644
--- a/VECTO/GUI/F_VECTO.Designer.vb
+++ b/VECTO/GUI/F_VECTO.Designer.vb
@@ -32,8 +32,12 @@ Partial Class F_VECTO
Me.BtDRIrem = New System.Windows.Forms.Button()
Me.BtDRIadd = New System.Windows.Forms.Button()
Me.GrAux = New System.Windows.Forms.GroupBox()
+ 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)
@@ -118,11 +122,6 @@ Partial Class F_VECTO
Me.TbGbxTxt = New System.Windows.Forms.TextBox()
Me.TbMass = New System.Windows.Forms.TextBox()
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
@@ -142,7 +141,6 @@ Partial Class F_VECTO
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
@@ -241,7 +239,6 @@ Partial Class F_VECTO
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)
@@ -259,6 +256,32 @@ Partial Class F_VECTO
Me.GrAux.TabStop = false
Me.GrAux.Text = "Auxiliaries"
'
+ '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"
+ '
+ '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.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.Name = "txtAdvancedAuxiliaryFile"
+ Me.txtAdvancedAuxiliaryFile.Size = New System.Drawing.Size(321, 20)
+ Me.txtAdvancedAuxiliaryFile.TabIndex = 38
+ '
'picAuxInfo
'
Me.picAuxInfo.Image = Global.VECTO.My.Resources.Resources.Information_icon
@@ -278,6 +301,15 @@ Partial Class F_VECTO
Me.cboAdvancedAuxiliaries.Size = New System.Drawing.Size(321, 21)
Me.cboAdvancedAuxiliaries.TabIndex = 36
'
+ '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"
+ '
'Label32
'
Me.Label32.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
@@ -1054,50 +1086,6 @@ Partial Class F_VECTO
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
@@ -1157,7 +1145,6 @@ Partial Class F_VECTO
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
@@ -1260,5 +1247,4 @@ End Sub
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 8c5a485976..e86e231986 100644
--- a/VECTO/GUI/F_VECTO.resx
+++ b/VECTO/GUI/F_VECTO.resx
@@ -117,6 +117,9 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <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="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>125, 17</value>
</metadata>
@@ -126,9 +129,6 @@
<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 1b51fe8f40..fd83f8f6f7 100644
--- a/VECTO/GUI/F_VECTO.vb
+++ b/VECTO/GUI/F_VECTO.vb
@@ -42,6 +42,10 @@ Public Class F_VECTO
cboAdvancedAuxiliaries.DisplayMember= "AuxiliaryName"
+ 'TODO: FIND AND SELECT ANY PRE-EXISTING STORED ADVANCED AUXILIARY TYPE
+
+
+
End Sub
@@ -79,8 +83,9 @@ Public Class F_VECTO
Changed = False
'AA-TB
- PopulateAdvancedAuxiliaries()
+ PopulateAdvancedAuxiliaries( )
+ 'Attempt to select that found in Config
End Sub
@@ -405,6 +410,27 @@ Public Class F_VECTO
'VACC
Me.TbDesMaxFile.Text = VEC0.DesMaxFile(True)
+
+ 'AA-TB
+ 'Try and Select any previously selected Auxiliary Type
+ For Each item as cAdvancedAuxiliary In cboAdvancedAuxiliaries.Items
+
+ Dim aai As cAdvancedAuxiliary= DirectCast( item , cAdvancedAuxiliary)
+
+ If aai.AssemblyName = VEC0.AuxiliaryAssembly andalso VEC0.AuxiliaryVersion= aai.AuxiliaryVersion then
+
+ cboAdvancedAuxiliaries.SelectedItem= item
+ Exit for
+
+ End If
+
+ Next
+ 'AA-TB
+ 'Assign any previously saved Axiliary FilePath
+ txtAdvancedAuxiliaryFile.Text = VEC0.AdvancedAuxiliaryFilePath
+
+
+
Me.LvAux.Items.Clear()
For Each AuxEntryKV In VEC0.AuxPaths
LV0 = New ListViewItem
@@ -476,6 +502,33 @@ Public Class F_VECTO
Dim AuxEntry As cVECTO.cAuxEntry
Dim LV0 As ListViewItem
Dim sb As cSubPath
+ Dim absoluteAAUxFile As String = String.Empty
+ Dim aaAssemblyName As String = String.Empty
+ Dim aaAssemblyVersion As String = String.Empty
+ Dim message As String = String.Empty
+
+
+
+ 'AA-TB
+ 'Validation of Auxiliary Types/Advanced Auxiliaries
+ 'if not classic, check the file is valid, if not fail the operation and alert user.
+ If cboAdvancedAuxiliaries.SelectedIndex>0 then
+
+ 'resolve absolute path for auxiliary file.
+ absoluteAAUxFile = AAUX_Gobal.ResolveAAUXFilePath( fPATH(VECTOfile),txtAdvancedAuxiliaryFile.Text)
+
+ aaAssemblyName = DirectCast(cboAdvancedAuxiliaries.SelectedItem, cAdvancedAuxiliary).AssemblyName
+ aaAssemblyVersion = DirectCast(cboAdvancedAuxiliaries.SelectedItem, cAdvancedAuxiliary).AuxiliaryVersion
+
+
+ If NOT AAUX_Gobal.ValidateAAUXFile( absoluteAAUxFile,aaAssemblyName,aaAssemblyVersion, message ) then
+ MessageBox.Show (String.Format("You have selected an advanced auxiliary *Auxiliary Type*, but the file specified is invalid :{0}", message))
+ Return false
+ End If
+
+ End If
+
+
VEC0 = New cVECTO
VEC0.FilePath = file
@@ -503,6 +556,12 @@ Public Class F_VECTO
'a_DesMax
VEC0.DesMaxFile = Me.TbDesMaxFile.Text
+ 'AA-TB
+ VEC0.AuxiliaryAssembly = DirectCast(cboAdvancedAuxiliaries.SelectedItem,cAdvancedAuxiliary).AssemblyName
+ VEC0.AuxiliaryVersion = DirectCast(cboAdvancedAuxiliaries.SelectedItem,cAdvancedAuxiliary).AuxiliaryVersion
+ VEC0.AdvancedAuxiliaryFilePath = txtAdvancedAuxiliaryFile.Text
+
+
For Each LV0 In LvAux.Items
AuxEntry = New cVECTO.cAuxEntry
@@ -1299,31 +1358,87 @@ End Sub
Private Sub btnBrowseAAUXFile_Click( sender As Object, e As EventArgs) Handles btnBrowseAAUXFile.Click
+ Dim aauxFileValidated As Boolean = False
Dim fbAux As New cFileBrowser(True, False)
- ' Dim ssmMap As New Hvac.HVACSteadyStateModel()
Dim message As String = String.Empty
+ Dim absoluteAuxPath As String
+ Dim assembly As cAdvancedAuxiliary
+ Dim configResult As Boolean
+
+
+ 'If Classic is selected, then bail
+ If cboAdvancedAuxiliaries.SelectedIndex=0 then return
+
+ 'Get Absolute Path for AAUX FILE.
+ absoluteAuxPath = AAUX_Gobal.ResolveAAUXFilePath(fPATH(VECTOfile),txtAdvancedAuxiliaryFile.Text )
+
+
+ try
+
+ assembly = DirectCast( cboAdvancedAuxiliaries.SelectedItem, cAdvancedAuxiliary)
+
+ 'If supplied file valid, straight to config
+ If AAUX_Gobal.ValidateAAUXFile( absoluteAuxPath,assembly.AssemblyName, assembly.AuxiliaryVersion, message )
+
+ configResult=AAUX_Gobal.ConfigureAdvancedAuxiliaries(assembly.AssemblyName,assembly.AuxiliaryVersion,txtAdvancedAuxiliaryFile.Text,VECTOfile)
+
+ dim a=2
+
+ else
+ 'txtAdvancedAuxiliaryFile.Text="INVALIDFILENAME"
+ absoluteAuxPath=String.Empty
+
+ fbAux.Extensions = New String() {"AAUX"}
- fbAux.Extensions = New String() {"AAUX"}
+ 'Find / Create file and configure.
+ If fbAux.CustomDialog(absoluteAuxPath,False,False, tFbExtMode.ForceExt,False,"") Then
+ txtAdvancedAuxiliaryFile.Text = fFileWoDir(fbAux.Files(0), fPATH(vectoFile))
+ assembly= DirectCast( cboAdvancedAuxiliaries.SelectedItem, cAdvancedAuxiliary)
+ AAUX_Gobal.ConfigureAdvancedAuxiliaries(assembly.AssemblyName,assembly.AuxiliaryVersion,txtAdvancedAuxiliaryFile.Text,VECTOfile)
+ End If
- If fbAux.CustomDialog(fPATH(vectoFile),False,True, tFbExtMode.ForceExt,False,"") Then
+ End If
- txtAdvancedAuxiliaryFile.Text = fFileWoDir(fbAux.Files(0), fPATH(vectoFile))
- Dim assembly As cAdvancedAuxiliary = DirectCast( cboAdvancedAuxiliaries.SelectedItem, cAdvancedAuxiliary)
+ Catch ex As Exception
+
+
+ 'Bail
+ MessageBox.Show("There was an error configuring your Advanced Auxiliary File")
+
+
+ end try
+
- AAUX_Gobal.ConfigureAdvancedAuxiliaries(assembly.AssemblyName,assembly.AuxiliaryVersion,txtAdvancedAuxiliaryFile.Text,VECTOfile)
- End If
End Sub
+'AA-TB
+Private Sub cboAdvancedAuxiliaries_SelectedIndexChanged( sender As Object, e As EventArgs) Handles cboAdvancedAuxiliaries.SelectedIndexChanged
+
+'Enable or otherwise the text box and browser button associated with Advanced Axuiliaries
+If cboAdvancedAuxiliaries.SelectedIndex=0 then
+
+ btnBrowseAAUXFile.Enabled=false
+ txtAdvancedAuxiliaryFile.Enabled=False
+ txtAdvancedAuxiliaryFile.Text=String.Empty
+else
+ btnBrowseAAUXFile.Enabled=true
+ txtAdvancedAuxiliaryFile.Enabled=true
+End If
+
+
+End Sub
+
+
End Class
diff --git a/VECTO/Input Files/cAdvancedAuxiliary.vb b/VECTO/Input Files/cAdvancedAuxiliary.vb
index c3516d78e1..ecd7c2b8a2 100644
--- a/VECTO/Input Files/cAdvancedAuxiliary.vb
+++ b/VECTO/Input Files/cAdvancedAuxiliary.vb
@@ -32,7 +32,18 @@ Public readonly Property AssemblyName As String
End Property
-'Constructor
+'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
diff --git a/VECTO/Input Files/cVECTO.vb b/VECTO/Input Files/cVECTO.vb
index 05e289f9b5..f4746dc0a5 100644
--- a/VECTO/Input Files/cVECTO.vb
+++ b/VECTO/Input Files/cVECTO.vb
@@ -16,6 +16,13 @@ Public Class cVECTO
Private Const FormatVersion As Short = 2
Private FileVersion As Short
+ 'AA-TB
+ 'STORES THE Type and version of the chosen or default Auxiliary Type ( Classic/Original or other )
+ public AuxiliaryAssembly As String
+ public AuxiliaryVersion As String
+ Public AdvancedAuxiliaryFilePath As String
+
+
Private sFilePath As String
Private MyPath As String
@@ -191,6 +198,12 @@ Public Class cVECTO
dic0.Add("Cycles", ls)
End If
+ 'AA-TB
+ 'ADVANCED AUXILIARIES
+ dic0.Add("AuxiliaryAssembly",AuxiliaryAssembly)
+ dic0.Add("AuxiliaryVersion",AuxiliaryVersion)
+ dic0.Add("AdvancedAuxiliaryFilePath",AdvancedAuxiliaryFilePath)
+
'Aux
If AuxPaths.Count > 0 Then
ls = New List(Of Object)
@@ -245,6 +258,8 @@ Public Class cVECTO
dic.Add("UnderSpeed", UnderSpeed)
dic0.Add("OverSpeedEcoRoll", dic)
+ '
+
JSON.Content.Add("Body", dic0)
@@ -261,6 +276,10 @@ Public Class cVECTO
Dim str As String
Dim dic As Object
+
+
+
+
MsgSrc = "Main/ReadInp/GEN"
SetDefault()
@@ -291,6 +310,21 @@ Public Class cVECTO
Next
End If
+ 'AA-TB
+ 'ADVANCED AUXILIARIES
+ If Not JSON.Content("Body")("AuxiliaryAssembly") is Nothing AndAlso
+ NOT JSON.Content("Body")("AuxiliaryVersion") is nothing
+
+ AuxiliaryAssembly = JSON.Content("Body")("AuxiliaryAssembly").ToString()
+ AuxiliaryVersion = JSON.Content("Body")("AuxiliaryVersion").ToString()
+
+ End If
+ If NOT JSON.Content("Body")("AdvancedAuxiliaryFilePath") is nothing then
+ AdvancedAuxiliaryFilePath = JSON.Content("Body")("AdvancedAuxiliaryFilePath").ToString()
+ end if
+
+
+
If Not JSON.Content("Body")("Aux") Is Nothing Then
For Each dic In JSON.Content("Body")("Aux")
@@ -377,6 +411,10 @@ Public Class cVECTO
EcoRollOn = False
End If
+
+
+
+
Catch ex As Exception
WorkerMsg(tMsgID.Err, "Failed to read VECTO file! " & ex.Message, MsgSrc)
Return False
@@ -389,6 +427,12 @@ Public Class cVECTO
End Function
Private Sub SetDefault()
+
+ AuxiliaryAssembly ="CLASSIC"
+ AuxiliaryVersion ="CLASSIC"
+ AdvancedAuxiliaryFilePath=String.Empty
+
+
boStartStop = False
siStStV = 5
siStStT = 5
diff --git a/VECTO/VECTO.vbproj b/VECTO/VECTO.vbproj
index 973072a757..3985c76901 100644
--- a/VECTO/VECTO.vbproj
+++ b/VECTO/VECTO.vbproj
@@ -85,8 +85,9 @@
<Reference Include="itextsharp">
<HintPath>..\Third Party Libraries\itextsharp\itextsharp.dll</HintPath>
</Reference>
- <Reference Include="Newtonsoft.Json">
- <HintPath>..\Third Party Libraries\JSON.Net\Bin\Net40\Newtonsoft.Json.dll</HintPath>
+ <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
@@ -348,8 +349,7 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
- <Content Include="bin\Debug\bin\Debug\Generic Vehicles\Declaration Mode\12t Delivery Truck\TAKAWAY.AHSM" />
- <Content Include="bin\Debug\bin\Debug\bin\Debug\Generic Vehicles\Declaration Mode\12t Delivery Truck\TAKAWAY.AHSM">
+ <Content Include="bin\Debug\Generic Vehicles\Declaration Mode\12t Delivery Truck\testPneumaticActuationsMap_GOODMAP.apac">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<None Include="ClassDiagram1.cd" />
@@ -368,6 +368,7 @@
</None>
</ItemGroup>
<ItemGroup>
+ <None Include="packages.config" />
<None Include="Resources\TUG-About.png" />
<None Include="Resources\VECTO-About.png" />
<None Include="Resources\VECTO-VEH.png" />
@@ -443,14 +444,16 @@
<None Include="Resources\F_VECTO.png" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\VECTOAux\VectoAuxiliaries\VectoAuxiliaries.vbproj">
+ <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>
- <ItemGroup>
- <Folder Include="bin\Debug\Generic Vehicles\Declaration Mode\12t Delivery Truck\" />
- </ItemGroup>
+ <ItemGroup />
<Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/VECTO/cConfig.vb b/VECTO/cConfig.vb
index f64fd53ee1..f6e3cfaba3 100644
--- a/VECTO/cConfig.vb
+++ b/VECTO/cConfig.vb
@@ -35,6 +35,7 @@ Public Class cConfig
Public DeclMode As Boolean
+
Public Sub New()
SetDefault()
End Sub
@@ -48,6 +49,8 @@ Public Class cConfig
End Sub
Public Sub SetDefault()
+
+
GnUfromCycle = True
BatchMode = False
ModOut = True
diff --git a/VECTO/packages.config b/VECTO/packages.config
new file mode 100644
index 0000000000..6f5b1e06a3
--- /dev/null
+++ b/VECTO/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <package id="Newtonsoft.Json" version="6.0.6" targetFramework="net40" />
+</packages>
\ No newline at end of file
diff --git a/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb b/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
index d788e74dab..f1f6233d96 100644
--- a/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
+++ b/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
@@ -267,25 +267,13 @@ End Sub
Public Function ValidateAAUXFile(filePath As String, ByRef message As String) As Boolean Implements IAdvancedAuxiliaries.ValidateAAUXFile
- Try
- Dim AConfig As New AuxiliaryConfig( filePath )
+ Dim validResult As Boolean = FilePathUtils.ValidateFilePath( filePath, ".aaux", message)
- If Not AConfig is Nothing then
+ If Not validResult then Return False
- message="OK"
- Return true
- End If
-
- Return True
-
- Catch ex As Exception
-
- message= "AAUX File not found, or Invalid "
- Return false
-
- End Try
+ Return true
End Function
diff --git a/VECTOAux/VectoAuxiliaries/FilePathUtils.vb b/VECTOAux/VectoAuxiliaries/FilePathUtils.vb
index 747a30d558..f457893e77 100644
--- a/VECTOAux/VectoAuxiliaries/FilePathUtils.vb
+++ b/VECTOAux/VectoAuxiliaries/FilePathUtils.vb
@@ -13,8 +13,8 @@ Public shared Function ValidateFilePath( byval filePath As String , byval expect
Dim fileNameOnlyNoExtension As String = fileNameOnly(filePath,false)
'Is this filePath empty
- If filePath.trim.Length=0 then
- message = "A filename cannot be whitespace"
+ If filePath.trim.Length=0 orelse Right( filePath, 1)="\" then
+ message = "A filename cannot be empty"
Return false
End If
diff --git a/VECTOAux/VectoAuxiliaries/UI/FB_Global.vb b/VECTOAux/VectoAuxiliaries/UI/FB_Global.vb
index 80f51fe3e3..4d2c742060 100644
--- a/VECTOAux/VectoAuxiliaries/UI/FB_Global.vb
+++ b/VECTOAux/VectoAuxiliaries/UI/FB_Global.vb
@@ -56,10 +56,7 @@ Module FB_Global
private Normed As String = "NORM"
private PauxSply As String = "<AUX_"
-
- private EngDrag As String = "<DRAG>"
-
-#Region "File path functions"
+ #Region "File path functions"
'When no path is specified, then insert either HomeDir or MainDir Special-folders
Public Function fFileRepl(ByVal file As String, Optional ByVal MainDir As String = "") As String
diff --git a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.Designer.vb b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.Designer.vb
index 84f48d1cb2..c07033746a 100644
--- a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.Designer.vb
+++ b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.Designer.vb
@@ -23,18 +23,18 @@ Partial Class frmAuxiliaryConfig
<System.Diagnostics.DebuggerStepThrough()> _
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
- Dim DataGridViewCellStyle25 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle26 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle27 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle28 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle29 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle30 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle31 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle32 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle33 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle34 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle35 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle36 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Me.pnlMain = New System.Windows.Forms.Panel()
Me.btnCancel = New System.Windows.Forms.Button()
Me.btnSave = New System.Windows.Forms.Button()
@@ -286,97 +286,97 @@ Partial Class frmAuxiliaryConfig
'
'gvResultsCardOverrun
'
- DataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle25.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle25.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle25.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle25.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle25.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardOverrun.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle25
+ DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvResultsCardOverrun.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1
Me.gvResultsCardOverrun.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- DataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.Window
- DataGridViewCellStyle26.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle26.ForeColor = System.Drawing.SystemColors.ControlText
- DataGridViewCellStyle26.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle26.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.gvResultsCardOverrun.DefaultCellStyle = DataGridViewCellStyle26
+ DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window
+ DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText
+ DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+ Me.gvResultsCardOverrun.DefaultCellStyle = DataGridViewCellStyle2
Me.gvResultsCardOverrun.Location = New System.Drawing.Point(590, 451)
Me.gvResultsCardOverrun.Name = "gvResultsCardOverrun"
- DataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle27.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardOverrun.RowHeadersDefaultCellStyle = DataGridViewCellStyle27
+ DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvResultsCardOverrun.RowHeadersDefaultCellStyle = DataGridViewCellStyle3
Me.gvResultsCardOverrun.Size = New System.Drawing.Size(246, 125)
Me.gvResultsCardOverrun.TabIndex = 18
'
'gvResultsCardTraction
'
- DataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle28.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle28.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardTraction.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle28
+ DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvResultsCardTraction.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4
Me.gvResultsCardTraction.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- DataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle29.BackColor = System.Drawing.SystemColors.Window
- DataGridViewCellStyle29.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle29.ForeColor = System.Drawing.SystemColors.ControlText
- DataGridViewCellStyle29.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle29.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.gvResultsCardTraction.DefaultCellStyle = DataGridViewCellStyle29
+ DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window
+ DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText
+ DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+ Me.gvResultsCardTraction.DefaultCellStyle = DataGridViewCellStyle5
Me.gvResultsCardTraction.Location = New System.Drawing.Point(311, 451)
Me.gvResultsCardTraction.Name = "gvResultsCardTraction"
- DataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle30.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle30.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle30.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle30.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle30.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle30.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardTraction.RowHeadersDefaultCellStyle = DataGridViewCellStyle30
+ DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvResultsCardTraction.RowHeadersDefaultCellStyle = DataGridViewCellStyle6
Me.gvResultsCardTraction.Size = New System.Drawing.Size(258, 125)
Me.gvResultsCardTraction.TabIndex = 17
'
'gvResultsCardIdle
'
- DataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle31.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle31.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle31.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle31.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle31.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle31.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardIdle.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle31
+ DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvResultsCardIdle.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle7
Me.gvResultsCardIdle.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- DataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle32.BackColor = System.Drawing.SystemColors.Window
- DataGridViewCellStyle32.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle32.ForeColor = System.Drawing.SystemColors.ControlText
- DataGridViewCellStyle32.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle32.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.gvResultsCardIdle.DefaultCellStyle = DataGridViewCellStyle32
+ DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window
+ DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText
+ DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+ Me.gvResultsCardIdle.DefaultCellStyle = DataGridViewCellStyle8
Me.gvResultsCardIdle.Location = New System.Drawing.Point(35, 451)
Me.gvResultsCardIdle.Name = "gvResultsCardIdle"
- DataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle33.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle33.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle33.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle33.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle33.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardIdle.RowHeadersDefaultCellStyle = DataGridViewCellStyle33
+ DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvResultsCardIdle.RowHeadersDefaultCellStyle = DataGridViewCellStyle9
Me.gvResultsCardIdle.Size = New System.Drawing.Size(256, 125)
Me.gvResultsCardIdle.TabIndex = 16
'
@@ -428,33 +428,33 @@ Partial Class frmAuxiliaryConfig
'
'gvElectricalConsumables
'
- DataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle34.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle34.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle34.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle34.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle34.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle34.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvElectricalConsumables.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle34
+ DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvElectricalConsumables.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle10
Me.gvElectricalConsumables.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- DataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle35.BackColor = System.Drawing.SystemColors.Window
- DataGridViewCellStyle35.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle35.ForeColor = System.Drawing.SystemColors.ControlText
- DataGridViewCellStyle35.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle35.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle35.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.gvElectricalConsumables.DefaultCellStyle = DataGridViewCellStyle35
+ DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Window
+ DataGridViewCellStyle11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.ControlText
+ DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+ Me.gvElectricalConsumables.DefaultCellStyle = DataGridViewCellStyle11
Me.gvElectricalConsumables.Location = New System.Drawing.Point(33, 170)
Me.gvElectricalConsumables.Name = "gvElectricalConsumables"
- DataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle36.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle36.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle36.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle36.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle36.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle36.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvElectricalConsumables.RowHeadersDefaultCellStyle = DataGridViewCellStyle36
+ DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvElectricalConsumables.RowHeadersDefaultCellStyle = DataGridViewCellStyle12
Me.gvElectricalConsumables.Size = New System.Drawing.Size(803, 250)
Me.gvElectricalConsumables.TabIndex = 10
'
diff --git a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb
index 49da650b06..9c9946ee1d 100644
--- a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb
+++ b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb
@@ -55,8 +55,8 @@ Public Sub new( byval fileName As String, byval vectoFileName As String )
Try
- auxConfig = New AuxiliaryConfig( auxFile )
- originalConfig = New AuxiliaryConfig( auxFile)
+ auxConfig = New AuxiliaryConfig( FilePathUtils.ResolveFilePath(vectoPath,auxFile) )
+ originalConfig = New AuxiliaryConfig( FilePathUtils.ResolveFilePath(auxFile,vectoPath) )
Catch ex As Exception
@@ -189,7 +189,7 @@ Private Sub CreateBindings()
'ResultCards
'IDLE
- Dim idleBinding = New BindingList(Of SmartResult)
+ Dim idleBinding as BindingList(Of SmartResult)
idleBinding = New BindingList(Of SmartResult)(auxConfig.ElectricalUserInputsConfig.ResultCardIdle.Results)
idleBinding.AllowNew = True
idleBinding.AllowRemove = True
@@ -636,7 +636,7 @@ Dim result As Boolean = True
End Function
'****** HVAC VALIDATION
-Public Sub Validating_HVACHandler(sender As Object, e As CancelEventArgs) Handles txtHVACMechanicalLoadPowerWatts.Validating, txtHVACFuellingLitresPerHour.Validating, txtHVACElectricalLoadPowerWatts.Validating
+Public Sub Validating_HVACHandler(sender As Object, e As CancelEventArgs) Handles txtHVACMechanicalLoadPowerWatts.Validating, txtHVACFuellingLitresPerHour.Validating, txtHVACElectricalLoadPowerWatts.Validating, txtSSMFilePath.Validating
e.Cancel = Not Validate_HVAC()
@@ -644,6 +644,7 @@ End Sub
Public Function Validate_HVAC() As Boolean
Dim result As Boolean = True
+Dim message As String =""
'HVAC Electrical Load Power Watts : txtHVACElectricalLoadPowerWatts
@@ -672,16 +673,16 @@ Dim result As Boolean = True
End If
-
- If txtSSMFilePath.Text.Trim.Length=0 then
-
- ErrorProvider.SetError(txtSSMFilePath, "Please choose a vaid Steady State Model File (*.AHSM")
+ 'Check file is valid
+ If GetSSMMAP(FilePathUtils.ResolveFilePath(vectoPath,txtSSMFilePath.Text), message ) is nothing then
+ ErrorProvider.SetError(txtSSMFilePath, "Please choose a vaid Steady State Model File (*.AHSM")
result = False
- Else
+ else
ErrorProvider.SetError(txtSSMFilePath, String.Empty)
End If
+
UpdateTabStatus("tabHVACConfig", result)
Return result
@@ -946,9 +947,6 @@ End Sub
#Region "Button Handlers"
-
-
-
Private Sub btnSave_Click(sender As Object, e As EventArgs) Handles btnSave.Click
@@ -969,7 +967,11 @@ Private function SaveFile() As Boolean
Dim result As Boolean
- result = auxConfig.Save(auxFile)
+
+ If Not ValidateAll then Return false
+
+
+ result = auxConfig.Save(FilePathUtils.ResolveFilePath(vectoPath,auxFile))
If Not result then MessageBox.Show(String.Format("Unable to Save the file '{0}'",auxFile) )
@@ -985,7 +987,7 @@ Private Function LoadFile() As boolean
'Release existing databindings
UnbindAllControls(Me)
- result = auxConfig.Load(auxFile)
+ result = auxConfig.Load( FilePathUtils.ResolveFilePath( vectoPath,auxFile))
If Not result then
MessageBox.Show(String.Format("Unable to load the file '{0}'",auxFile) )
@@ -1089,6 +1091,59 @@ Private Sub btnActuationsMap_Click(sender As Object, e As EventArgs) Handles btn
End Sub
+Private Sub btnCancel_Click( sender As Object, e As EventArgs) Handles btnCancel.Click
+
+
+ Me.DialogResult = Windows.Forms.DialogResult.Cancel
+ Me.Close()
+
+
+End Sub
+
+Private Sub btnSSMBSource_Click( sender As Object, e As EventArgs) Handles btnSSMBSource.Click
+
+
+ Dim fbAux As New cFileBrowser(True, False)
+ Dim ssmMap As Hvac.HVACSteadyStateModel
+ Dim message As String = String.Empty
+
+
+ fbAux.Extensions = New String() {"ahsm"}
+
+ If fbAux.OpenDialog(fPATH(vectoFile)) Then
+
+ txtSSMFilePath.Focus()
+ txtSSMFilePath.Text = fFileWoDir(fbAux.Files(0), fPATH(vectoFile))
+
+
+
+ ssmMap = GetSSMMAP(FilePathUtils.ResolveFilePath(vectoPath,txtSSMFilePath.Text), message )
+
+ If ssmMap is nothing then
+
+ txtHVACElectricalLoadPowerWatts.Text = string.empty
+ txtHVACMechanicalLoadPowerWatts.Text = string.empty
+ txtHVACFuellingLitresPerHour.Text = string.empty
+ messagebox.Show("Unable to load")
+
+ else
+
+ 'Populate boxes
+ txtHVACElectricalLoadPowerWatts.Text = ssmMap.HVACElectricalLoadPowerWatts.ToString()
+ txtHVACMechanicalLoadPowerWatts.Text = ssmMap.HVACMechanicalLoadPowerWatts.ToString()
+ txtHVACFuellingLitresPerHour.Text = ssmMap.HVACFuellingLitresPerHour.ToString()
+
+
+ End If
+
+
+ End If
+
+ 'Causes binding to fire
+ btnSSMBSource.Focus()
+ txtSSMFilePath.Focus()
+
+End Sub
#End Region
@@ -1117,6 +1172,8 @@ Protected Overrides Function ProcessCmdKey(ByRef msg As Message, keyData As Keys
End Function
+
+
Public Sub UnbindAllControls(ByRef container As Control)
'Clear all of the controls within the container object
'If "Recurse" is true, then also clear controls within any sub-containers
@@ -1135,16 +1192,6 @@ Public Sub UnbindAllControls(ByRef container As Control)
End Sub
-Private Sub btnCancel_Click( sender As Object, e As EventArgs) Handles btnCancel.Click
-
-
- Me.DialogResult = Windows.Forms.DialogResult.Cancel
- Me.Close()
-
-
-End Sub
-
-
Private Sub frmAuxiliaryConfig_FormClosing( sender As Object, e As FormClosingEventArgs) Handles MyBase.FormClosing
@@ -1185,56 +1232,31 @@ 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
+Private Function GetSSMMAP( ByVal filePath As String , byref message As string) As Hvac.IHVACSteadyStateModel
-
- Dim fbAux As New cFileBrowser(True, False)
- Dim ssmMap As New Hvac.HVACSteadyStateModel()
- Dim message As String = String.Empty
+ Dim ssmMap As New Hvac.HVACSteadyStateModel()
- fbAux.Extensions = New String() {"ahsm"}
+ Try
- If fbAux.OpenDialog(fPATH(vectoFile)) Then
+ If ssmMap.SetValuesFromMap(FilePathUtils.ResolveFilePath(vectoPath,txtSSMFilePath.Text), message) then
- txtSSMFilePath.Text = fFileWoDir(fbAux.Files(0), fPATH(vectoFile))
+ Return ssmMap
-
- Try
-
- If Not ssmMap.SetValuesFromMap(FilePathUtils.ResolveFilePath(vectoPath,txtSSMFilePath.Text), message) then
-
- txtHVACElectricalLoadPowerWatts.Text = string.empty
- txtHVACMechanicalLoadPowerWatts.Text = string.empty
- txtHVACFuellingLitresPerHour.Text = string.empty
- messagebox.Show("Unable to load")
-
- else
-
- 'Populate boxes
-
- txtHVACElectricalLoadPowerWatts.Text = ssmMap.HVACElectricalLoadPowerWatts.ToString()
- txtHVACMechanicalLoadPowerWatts.Text = ssmMap.HVACMechanicalLoadPowerWatts.ToString()
- txtHVACFuellingLitresPerHour.Text = ssmMap.HVACFuellingLitresPerHour.ToString()
-
- End If
+ End If
-
- Catch ex As Exception
+ catch ex As Exception
- messagebox.Show("Unable to load")
+ Return Nothing
+
+ End Try
- End Try
-
+End Function
- End If
- 'Causes binding to fire
- txtSSMFilePath.Focus()
-End Sub
End Class
\ No newline at end of file
diff --git a/packages/repositories.config b/packages/repositories.config
index 4c4f0fdb20..afd6c0eee8 100644
--- a/packages/repositories.config
+++ b/packages/repositories.config
@@ -4,4 +4,5 @@
<repository path="..\..\..\..\..\Documents\Visual Studio 2013\Projects\Persistance\PersistanceUnitTesting\packages.config" />
<repository path="..\VECTOAux\VectoAuxiliaries\packages.config" />
<repository path="..\VECTOAux\VectoAuxiliariesTests\packages.config" />
+ <repository path="..\VECTO\packages.config" />
</repositories>
\ No newline at end of file
--
GitLab