diff --git a/VECTO/AdvancedAuxiliariesModule.vb b/VECTO/AdvancedAuxiliariesModule.vb
index 556546d550fd8c23cc0835d9a3da9940b6ef2e7f..1d53c92786d7337af6d315e75355d9db1fe7a7db 100644
--- a/VECTO/AdvancedAuxiliariesModule.vb
+++ b/VECTO/AdvancedAuxiliariesModule.vb
@@ -2,7 +2,10 @@
Imports System.IO
Imports System.Linq
Imports System.Runtime.Remoting
+Imports TUGraz.VectoCore.BusAuxiliaries
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
+Imports TUGraz.VectoCore.Models.BusAuxiliaries
+Imports TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces
Imports VectoAuxiliaries
Module AdvancedAuxiliariesModule
@@ -32,7 +35,7 @@ Module AdvancedAuxiliariesModule
End If
_returnList = New Dictionary(Of String, AdvancedAuxiliary)
- Dim o As ObjectHandle
+ 'Dim o As ObjectHandle
Dim iAdvancedAux As IAdvancedAuxiliaries
@@ -41,34 +44,34 @@ Module AdvancedAuxiliariesModule
_returnList.Add(classicAux.AssemblyName, classicAux)
- Try
- Dim fileEntries As String() = Directory.GetFiles(GetAAUXSourceDirectory)
- ' Process the list of files found in the directory.
- Dim fileName As String
+ 'Try
+ ' Dim fileEntries As String() = Directory.GetFiles(GetAAUXSourceDirectory)
+ ' ' Process the list of files found in the directory.
+ ' Dim fileName As String
- For Each fileName In fileEntries
+ ' For Each fileName In fileEntries
- If fileName.Contains("Auxiliaries.dll") Then
+ ' If fileName.Contains("Auxiliaries.dll") Then
- 'Get filenamewith
- Dim fileNameWoPath As String = GetFilenameWithoutPath(fileName, True)
- Dim fileNameWoExtentsion As String = GetFilenameWithoutPath(fileName, False)
+ ' 'Get filenamewith
+ ' Dim fileNameWoPath As String = GetFilenameWithoutPath(fileName, True)
+ ' Dim fileNameWoExtentsion As String = GetFilenameWithoutPath(fileName, False)
- o = Activator.CreateInstance(fileNameWoExtentsion, "VectoAuxiliaries.AdvancedAuxiliaries")
+ ' o = Activator.CreateInstance(fileNameWoExtentsion, "VectoAuxiliaries.AdvancedAuxiliaries")
- iAdvancedAux = DirectCast(o.Unwrap, IAdvancedAuxiliaries)
+ iAdvancedAux = new AdvancedAuxiliaries()
Dim advancedAuxiliary As AdvancedAuxiliary = New AdvancedAuxiliary(iAdvancedAux.AuxiliaryName,
iAdvancedAux.AuxiliaryVersion,
- fileNameWoPath, fileNameWoExtentsion)
+ "BUSAUX", "BusAuxiliaries")
_returnList.Add(advancedAuxiliary.AuxiliaryVersion, advancedAuxiliary)
- End If
+ ' End If
- Next fileName
+ ' Next fileName
- Catch ex As Exception
- MessageBox.Show("Unable to obtain Advanced Auxiliary Assemblies")
- End Try
+ 'Catch ex As Exception
+ ' MessageBox.Show("Unable to obtain Advanced Auxiliary Assemblies")
+ 'End Try
Return _returnList
@@ -98,8 +101,8 @@ Module AdvancedAuxiliariesModule
'Open Assembly and invoke the configuration using the paths supplied.
Try
- o = Activator.CreateInstance(chosenAssembly.Value.AssemblyName, "VectoAuxiliaries.AdvancedAuxiliaries")
- iAdvancedAux = DirectCast(o.Unwrap, IAdvancedAuxiliaries)
+ 'o = Activator.CreateInstance(chosenAssembly.Value.AssemblyName, "VectoAuxiliaries.AdvancedAuxiliaries")
+ iAdvancedAux = New AdvancedAuxiliaries() ' DirectCast(o.Unwrap, IAdvancedAuxiliaries)
Configure(filePath, vectoFilePath)
@@ -185,8 +188,8 @@ Module AdvancedAuxiliariesModule
'Open Assembly and invoke the validation using the paths supplied.
Try
- o = Activator.CreateInstance(chosenAssembly.Value.AssemblyName, "VectoAuxiliaries.AdvancedAuxiliaries")
- iAdvancedAux = DirectCast(o.Unwrap, IAdvancedAuxiliaries)
+ 'o = Activator.CreateInstance(chosenAssembly.Value.AssemblyName, "VectoAuxiliaries.AdvancedAuxiliaries")
+ iAdvancedAux = New AdvancedAuxiliaries() ' DirectCast(o.Unwrap, IAdvancedAuxiliaries)
result = iAdvancedAux.ValidateAAUXFile(absoluteAAuxPath, message)
diff --git a/VECTO/GUI/EngineForm.vb b/VECTO/GUI/EngineForm.vb
index c3e757f688f010e2f5a6d2f8a9a204c1f3a044db..98af70b5e8689ec1034e865c392b701f5c72aa7c 100644
--- a/VECTO/GUI/EngineForm.vb
+++ b/VECTO/GUI/EngineForm.vb
@@ -229,7 +229,7 @@ Public Class EngineForm
Dim basePath As String = Path.GetDirectoryName(file)
TbName.Text = engine.Model
- TbDispl.Text = (engine.Displacement*1000*1000).ToGUIFormat()
+ TbDispl.Text = (engine.Displacement.Value() * 1000.0 * 1000).ToGUIFormat()
TbInertia.Text = engine.Inertia.ToGUIFormat()
diff --git a/VECTO/GUI/VectoJobForm.vb b/VECTO/GUI/VectoJobForm.vb
index 6f7177091539f1c8248728da75a0a5b05bc9ff2c..59eda5c1b78f904cbd24a4d1c8db44c964b2d169 100644
--- a/VECTO/GUI/VectoJobForm.vb
+++ b/VECTO/GUI/VectoJobForm.vb
@@ -531,9 +531,9 @@ Public Class VectoJobForm
GetRelativePath(driver.Lookahead.CoastingDecisionFactorVelocityDropLookup.Source, _basePath))
End If
- tbEngineStopStartActivationDelay.Text = If(driver.EngineStopStartData.ActivationDelay?.ToGUIFormat(), DeclarationData.Driver.EngineStopStart.ActivationDelay.ToGUIFormat())
- tbMaxEngineOffTimespan.Text = If(driver.EngineStopStartData.MaxEngineOffTimespan?.ToGUIFormat(), DeclarationData.Driver.EngineStopStart.MaxEngineOffTimespan.ToGUIFormat())
- tbEssUtility.Text = driver.EngineStopStartData.UtilityFactor.ToGUIFormat()
+ tbEngineStopStartActivationDelay.Text = If(driver.EngineStopStartData?.ActivationDelay?.ToGUIFormat(), DeclarationData.Driver.EngineStopStart.ActivationDelay.ToGUIFormat())
+ tbMaxEngineOffTimespan.Text = If(driver.EngineStopStartData?.MaxEngineOffTimespan?.ToGUIFormat(), DeclarationData.Driver.EngineStopStart.MaxEngineOffTimespan.ToGUIFormat())
+ tbEssUtility.Text = driver.EngineStopStartData?.UtilityFactor.ToGUIFormat()
'-------------------------------------------------------------
diff --git a/VECTO/VECTO.vbproj b/VECTO/VECTO.vbproj
index f946f6135fb1819fe792125ee33762294db70518..57aa433796f162e505413d11ca12a7fbad8ef168 100644
--- a/VECTO/VECTO.vbproj
+++ b/VECTO/VECTO.vbproj
@@ -200,6 +200,41 @@
</ItemGroup>
<ItemGroup>
<Compile Include="ApplicationEvents.vb" />
+ <Compile Include="BusAuxiliaries\UI\cFileBrowser.vb" />
+ <Compile Include="BusAuxiliaries\UI\FB_Dialog.designer.vb">
+ <DependentUpon>FB_Dialog.vb</DependentUpon>
+ </Compile>
+ <Compile Include="BusAuxiliaries\UI\FB_Dialog.vb">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="BusAuxiliaries\UI\FB_FavDlog.designer.vb">
+ <DependentUpon>FB_FavDlog.vb</DependentUpon>
+ </Compile>
+ <Compile Include="BusAuxiliaries\UI\FB_FavDlog.vb">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="BusAuxiliaries\UI\FB_Global.vb" />
+ <Compile Include="BusAuxiliaries\UI\frmAuxiliaryConfig.Designer.vb">
+ <DependentUpon>frmAuxiliaryConfig.vb</DependentUpon>
+ </Compile>
+ <Compile Include="BusAuxiliaries\UI\frmAuxiliaryConfig.vb">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="BusAuxiliaries\UI\frmCombinedAlternators.Designer.vb">
+ <DependentUpon>frmCombinedAlternators.vb</DependentUpon>
+ </Compile>
+ <Compile Include="BusAuxiliaries\UI\frmCombinedAlternators.vb">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="BusAuxiliaries\UI\frmHVACTool.Designer.vb">
+ <DependentUpon>frmHVACTool.vb</DependentUpon>
+ </Compile>
+ <Compile Include="BusAuxiliaries\UI\frmHVACTool.vb">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="BusAuxiliaries\UI\VECTO_Types.vb" />
+ <Compile Include="BusAuxiliaries\Util\DeleteCell.vb" />
+ <Compile Include="BusAuxiliaries\Util\DeleteColumn.vb" />
<Compile Include="GUI\VectoVTPJobForm.Designer.vb">
<DependentUpon>VectoVTPJobForm.vb</DependentUpon>
</Compile>
@@ -355,6 +390,22 @@
</Compile>
</ItemGroup>
<ItemGroup>
+ <EmbeddedResource Include="BusAuxiliaries\UI\FB_Dialog.resx">
+ <DependentUpon>FB_Dialog.vb</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="BusAuxiliaries\UI\FB_FavDlog.resx">
+ <DependentUpon>FB_FavDlog.vb</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="BusAuxiliaries\UI\frmAuxiliaryConfig.resx">
+ <DependentUpon>frmAuxiliaryConfig.vb</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="BusAuxiliaries\UI\frmCombinedAlternators.resx">
+ <DependentUpon>frmCombinedAlternators.vb</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="BusAuxiliaries\UI\frmHVACTool.resx">
+ <DependentUpon>frmHVACTool.vb</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="File Browser\FileBrowserDialog.resx">
<DependentUpon>FileBrowserDialog.vb</DependentUpon>
<SubType>Designer</SubType>
@@ -519,14 +570,6 @@
<WCFMetadata Include="Service References\" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\VECTOAux\BusAuxiliaries\BusAuxiliaries.csproj">
- <Project>{550d99d4-25f7-48d9-b0f0-e5dd6cb3485d}</Project>
- <Name>BusAuxiliaries</Name>
- </ProjectReference>
- <ProjectReference Include="..\VECTOAux\VectoAuxiliaries\VectoAuxiliaries.vbproj">
- <Project>{FDEEE460-0B8A-4EF6-8D9E-72F203A50F65}</Project>
- <Name>VectoAuxiliaries</Name>
- </ProjectReference>
<ProjectReference Include="..\VectoCommon\VectoCommon\VectoCommon.csproj">
<Project>{79a066ad-69a9-4223-90f6-6ed5d2d084f4}</Project>
<Name>VectoCommon</Name>