From 0f4659c46d899b44011eb43bc9fcbb28647c5f37 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Thu, 10 Oct 2019 15:06:28 +0200
Subject: [PATCH] removing old vb project fiels
---
.../VectoAuxiliaries/AdvancedAuxiliaries.vb | 504 ------------------
VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb | 457 ----------------
VECTOAux/VectoAuxiliaries/FilePathUtils.vb | 144 -----
VECTOAux/VectoAuxiliaries/IAuxiliaryConfig.vb | 39 --
.../VectoAuxiliaries/Images/Delete-32.png | Bin 1430 -> 0 bytes
VECTOAux/VectoAuxiliaries/Images/Delete.png | Bin 1430 -> 0 bytes
VECTOAux/VectoAuxiliaries/Images/Delete1.png | Bin 1430 -> 0 bytes
.../Images/application-export-icon-small.png | Bin 645 -> 0 bytes
.../My Project/Application.Designer.vb | 13 -
.../My Project/Application.myapp | 10 -
.../My Project/AssemblyInfo.vb | 34 --
.../My Project/Resources.Designer.vb | 160 ------
.../My Project/Resources.resx | 151 ------
.../My Project/Settings.Designer.vb | 73 ---
.../My Project/Settings.settings | 9 -
VECTOAux/VectoAuxiliaries/Resources/Blank.bmp | Bin 4150 -> 0 bytes
.../VectoAuxiliaries/Resources/Image1.png | Bin 233 -> 0 bytes
VECTOAux/VectoAuxiliaries/Resources/Info.bmp | Bin 4150 -> 0 bytes
.../VectoAuxiliaries/Resources/Open-icon.png | Bin 786 -> 0 bytes
.../VectoAuxiliaries/Resources/desktop.png | Bin 642 -> 0 bytes
.../VectoAuxiliaries/Resources/favorites.png | Bin 850 -> 0 bytes
.../Resources/file-history.png | Bin 757 -> 0 bytes
.../VectoAuxiliaries/Resources/new_dir.png | Bin 625 -> 0 bytes
.../VectoAuxiliaries/VectoAuxiliaries.vbproj | 226 --------
VECTOAux/VectoAuxiliaries/packages.config | 6 -
25 files changed, 1826 deletions(-)
delete mode 100644 VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
delete mode 100644 VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb
delete mode 100644 VECTOAux/VectoAuxiliaries/FilePathUtils.vb
delete mode 100644 VECTOAux/VectoAuxiliaries/IAuxiliaryConfig.vb
delete mode 100644 VECTOAux/VectoAuxiliaries/Images/Delete-32.png
delete mode 100644 VECTOAux/VectoAuxiliaries/Images/Delete.png
delete mode 100644 VECTOAux/VectoAuxiliaries/Images/Delete1.png
delete mode 100644 VECTOAux/VectoAuxiliaries/Images/application-export-icon-small.png
delete mode 100644 VECTOAux/VectoAuxiliaries/My Project/Application.Designer.vb
delete mode 100644 VECTOAux/VectoAuxiliaries/My Project/Application.myapp
delete mode 100644 VECTOAux/VectoAuxiliaries/My Project/AssemblyInfo.vb
delete mode 100644 VECTOAux/VectoAuxiliaries/My Project/Resources.Designer.vb
delete mode 100644 VECTOAux/VectoAuxiliaries/My Project/Resources.resx
delete mode 100644 VECTOAux/VectoAuxiliaries/My Project/Settings.Designer.vb
delete mode 100644 VECTOAux/VectoAuxiliaries/My Project/Settings.settings
delete mode 100644 VECTOAux/VectoAuxiliaries/Resources/Blank.bmp
delete mode 100644 VECTOAux/VectoAuxiliaries/Resources/Image1.png
delete mode 100644 VECTOAux/VectoAuxiliaries/Resources/Info.bmp
delete mode 100644 VECTOAux/VectoAuxiliaries/Resources/Open-icon.png
delete mode 100644 VECTOAux/VectoAuxiliaries/Resources/desktop.png
delete mode 100644 VECTOAux/VectoAuxiliaries/Resources/favorites.png
delete mode 100644 VECTOAux/VectoAuxiliaries/Resources/file-history.png
delete mode 100644 VECTOAux/VectoAuxiliaries/Resources/new_dir.png
delete mode 100644 VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
delete mode 100644 VECTOAux/VectoAuxiliaries/packages.config
diff --git a/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb b/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
deleted file mode 100644
index 6a8179abea..0000000000
--- a/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
+++ /dev/null
@@ -1,504 +0,0 @@
-' Copyright 2017 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-' software distributed under the Licence is distributed on an "AS IS" basis,
-' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-
-Imports System.Runtime.CompilerServices
-Imports VectoAuxiliaries.Electrics
-Imports VectoAuxiliaries.Pneumatics
-Imports VectoAuxiliaries.Hvac
-Imports System.Windows.Forms
-Imports DownstreamModules
-Imports DownstreamModules.Electrics
-Imports Electrics
-Imports Hvac
-Imports Pneumatics
-Imports TUGraz.VectoCommon.Utils
-Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
-Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics
-Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC
-Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Pneumatics
-Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
-
-<Assembly: InternalsVisibleTo("VectoCore")>
-
-''' <summary>
-''' Main entry point for the advanced auxiliary module.
-''' This class represents slide number 17 titled Calculations of Cycle FC accounting for Smart Auxiliaries.
-''' </summary>
-''' <remarks></remarks>
-Public Class AdvancedAuxiliaries
- Implements IAdvancedAuxiliaries
-
- Protected Friend auxConfig As AuxiliaryConfig
-
- 'Supporting classes which may generate event messages
- Private WithEvents compressorMap As ICompressorMap
-
- Private WithEvents ssmTool As SSMTOOL
- Private WithEvents ssmToolModule14 As SSMTOOL
-
- Private WithEvents alternatorMap As IAlternatorMap
- Protected Friend WithEvents actuationsMap As IPneumaticActuationsMAP
- Private fuelMap As IFuelConsumptionMap
-
- 'Classes which compose the model.
- Private WithEvents M0 As IM0_NonSmart_AlternatorsSetEfficiency
- Private WithEvents M05 As IM0_5_SmartAlternatorSetEfficiency
- Private WithEvents M1 As IM1_AverageHVACLoadDemand
- Private WithEvents M2 As IM2_AverageElectricalLoadDemand
- Private WithEvents M3 As IM3_AveragePneumaticLoadDemand
- Private WithEvents M4 As IM4_AirCompressor
- Private WithEvents M5 As IM5_SmartAlternatorSetGeneration
- Private WithEvents M6 As IM6
- Private WithEvents M7 As IM7
- Private WithEvents M8 As IM8
- Private WithEvents M9 As IM9
- Private WithEvents M10 As IM10
- Private WithEvents M11 As IM11
- Private WithEvents M12 As IM12
- Private WithEvents M13 As IM13
- Private WithEvents M14 As IM14
-
- Private vectoDirectory As String
-
- Private hvacConstants As HVACConstants
-
- 'Event Handler top level bubble.
- 'Public Sub VectoEventHandler(ByRef sender As Object, message As String, messageType As AdvancedAuxiliaryMessageType) _
- ' Handles compressorMap.AuxiliaryEvent, alternatorMap.AuxiliaryEvent, ssmTool.Message, ssmToolModule14.Message
-
- ' If Signals.AuxiliaryEventReportingLevel <= messageType Then
-
- ' RaiseEvent AuxiliaryEvent(sender, message, messageType)
-
- ' End If
- 'End Sub
-
- 'Constructor
- Public Sub New()
-
- VectoInputs = New VectoInputs()
- Signals = New Signals()
- End Sub
-
- 'Initialise Model
- Public Sub Initialise(IAuxPath As String, vectoFilePath As String)
-
- Dim auxPath As String
- vectoDirectory = fPATH(vectoFilePath)
-
- auxPath = FilePathUtils.ResolveFilePath(vectoDirectory, IAuxPath)
-
- hvacConstants = New HVACConstants(VectoInputs.FuelDensity)
-
- Signals.CurrentCycleTimeInSeconds = 0
- auxConfig = New AuxiliaryConfig(auxPath)
-
- 'Pass some signals from config to Signals. ( These are stored in the configuration but shared in the signal distribution around modules )
- Signals.SmartElectrics = auxConfig.ElectricalUserInputsConfig.SmartElectrical
- Signals.StoredEnergyEfficiency = auxConfig.ElectricalUserInputsConfig.StoredEnergyEfficiency
- Signals.SmartPneumatics = auxConfig.PneumaticUserInputsConfig.SmartAirCompression
- Signals.PneumaticOverrunUtilisation =
- auxConfig.PneumaticAuxillariesConfig.OverrunUtilisationForCompressionFraction
-
- alternatorMap = New CombinedAlternator(
- FilePathUtils.ResolveFilePath(vectoDirectory, auxConfig.ElectricalUserInputsConfig.AlternatorMap), Signals)
-
- actuationsMap = New PneumaticActuationsMAP(FilePathUtils.ResolveFilePath(vectoDirectory,
- auxConfig.PneumaticUserInputsConfig.
- ActuationsMap))
-
- compressorMap = New CompressorMap(FilePathUtils.ResolveFilePath(vectoDirectory,
- auxConfig.PneumaticUserInputsConfig.
- CompressorMap))
- compressorMap.Initialise()
-
- 'fuelMap = New cMAP()
- 'fuelMap.FilePath = FilePathUtils.ResolveFilePath(vectoDirectory, VectoInputs.FuelMap)
- 'If Not fuelMap.ReadFile() Then
- ' MessageBox.Show("Unable to read fuel map, aborting.")
- ' Return
- 'End If
- 'fuelMap.Triangulate()
- fuelMap = VectoInputs.FuelMap
-
- auxConfig.ElectricalUserInputsConfig.ElectricalConsumers.DoorDutyCycleFraction = GetDoorActuationTimeFraction()
-
- 'SSM HVAC
- Dim ssmPath As String = FilePathUtils.ResolveFilePath(vectoDirectory, auxConfig.HvacUserInputsConfig.SSMFilePath)
- Dim BusDatabase As String = FilePathUtils.ResolveFilePath(vectoDirectory,
- auxConfig.HvacUserInputsConfig.BusDatabasePath)
- ssmTool = New SSMTOOL(ssmPath, hvacConstants, auxConfig.HvacUserInputsConfig.SSMDisabled)
-
- 'This duplicate SSM is being created for use in M14 as its properties will be dynamically changed at that point
- 'to honour EngineWaste Heat Usage in Fueling calculations.
- ssmToolModule14 = New SSMTOOL(ssmPath, hvacConstants, auxConfig.HvacUserInputsConfig.SSMDisabled)
-
-
- If (ssmTool.Load(ssmPath) = False OrElse ssmToolModule14.Load(ssmPath) = False) Then
-
- Throw New Exception(String.Format("Unable to load the ssmTOOL with file {0}", ssmPath))
-
- End If
-
-
- M0 = New M00Impl(auxConfig.ElectricalUserInputsConfig.ElectricalConsumers,
- alternatorMap,
- auxConfig.ElectricalUserInputsConfig.PowerNetVoltage.SI (Of Volt),
- Signals,
- ssmTool)
-
-
- Dim M05tmp As IM0_5_SmartAlternatorSetEfficiency = New M0_5Impl(M0,
- auxConfig.ElectricalUserInputsConfig.
- ElectricalConsumers,
- alternatorMap,
- auxConfig.ElectricalUserInputsConfig.
- ResultCardIdle,
- auxConfig.ElectricalUserInputsConfig.
- ResultCardTraction,
- auxConfig.ElectricalUserInputsConfig.
- ResultCardOverrun, Signals)
- M05 = M05tmp
-
- M1 = New M01Impl(M0,
- auxConfig.ElectricalUserInputsConfig.AlternatorGearEfficiency,
- auxConfig.PneumaticUserInputsConfig.CompressorGearEfficiency,
- auxConfig.ElectricalUserInputsConfig.PowerNetVoltage.SI (Of Volt),
- Signals,
- ssmTool)
-
-
- M2 = New M02Impl(auxConfig.ElectricalUserInputsConfig.ElectricalConsumers,
- M0,
- auxConfig.ElectricalUserInputsConfig.AlternatorGearEfficiency,
- auxConfig.ElectricalUserInputsConfig.PowerNetVoltage.SI (Of Volt), Signals)
-
-
- M3 = New M03Impl(auxConfig.PneumaticUserInputsConfig,
- auxConfig.PneumaticAuxillariesConfig,
- actuationsMap,
- compressorMap,
- VectoInputs.VehicleWeightKG,
- VectoInputs.Cycle,
- Signals)
-
- M4 = New M04Impl(compressorMap, auxConfig.PneumaticUserInputsConfig.CompressorGearRatio,
- auxConfig.PneumaticUserInputsConfig.CompressorGearEfficiency, Signals)
- M5 = New M05Impl(M05tmp, auxConfig.ElectricalUserInputsConfig.PowerNetVoltage.SI (Of Volt),
- auxConfig.ElectricalUserInputsConfig.AlternatorGearEfficiency)
- M6 = New M06Impl(M1, M2, M3, M4, M5, Signals)
- M7 = New M07Impl(M5, M6, Signals)
- M8 = New M08Impl(M1, M6, M7, Signals)
- M9 = New M09Impl(M1, M4, M6, M8, fuelMap, auxConfig.PneumaticAuxillariesConfig, Signals)
- M10 = New M10Impl(M3, M9, Signals)
- M11 = New M11Impl(M1, M3, M6, M8, fuelMap, Signals)
- M12 = New M12Impl(M10, M11, Signals)
- M13 = New M13Impl(M10, M11, M12, Signals)
- M14 = New M14Impl(M13, ssmToolModule14, hvacConstants, Signals)
- End Sub
-
-#Region "Interface implementation"
-
- Public Property Signals As ISignals Implements IAdvancedAuxiliaries.Signals
- Public Property VectoInputs As IVectoInputs Implements IAdvancedAuxiliaries.VectoInputs
-
- Public Event AuxiliaryEvent(ByRef sender As Object, message As String, messageType As AdvancedAuxiliaryMessageType) _
- Implements IAdvancedAuxiliaries.AuxiliaryEvent
-
- Public Function Configure(filePath As String, vectoFilePath As String) As Boolean _
- Implements IAdvancedAuxiliaries.Configure
-
- Try
-
- Dim frmAuxiliaryConfig As New frmAuxiliaryConfig(filePath, vectoFilePath)
-
- frmAuxiliaryConfig.Show()
-
- If frmAuxiliaryConfig.DialogResult <> DialogResult.OK Then
-
- Return True
-
- Else
-
- Return False
-
- End If
-
-
- Catch ex As Exception
-
- Return False
-
- Return False
-
- End Try
-
-
- Return True
- End Function
-
- Public Function CycleStep(seconds As Second, ByRef message As String) As Boolean _
- Implements IAdvancedAuxiliaries.CycleStep
-
- Try
- M9.CycleStep(seconds)
- M10.CycleStep(seconds)
- M11.CycleStep(seconds)
-
- Signals.CurrentCycleTimeInSeconds += seconds.Value()
- Catch ex As Exception
- MessageBox.Show("Exception: " + ex.Message + " Stack Trace: " + ex.StackTrace)
- Return False
- End Try
-
-
- Return True
- End Function
-
- Public ReadOnly Property Running As Boolean Implements IAdvancedAuxiliaries.Running
- Get
- Throw New NotImplementedException
- End Get
- End Property
-
- Public Function RunStart(ByVal auxFilePath As String, ByVal vectoFilePath As String) As Boolean _
- Implements IAdvancedAuxiliaries.RunStart
-
- Try
-
- Initialise(auxFilePath, vectoFilePath)
-
- Catch ex As Exception
-
- Return False
-
- End Try
-
- Return True
- End Function
-
- Public Function RunStop(ByRef message As String) As Boolean Implements IAdvancedAuxiliaries.RunStop
- Throw New NotImplementedException
- End Function
-
- Public Sub IAdvancedAuxiliaries_ResetCalculations() Implements IAdvancedAuxiliaries.ResetCalculations
- Dim modules As List(Of IAbstractModule) = New List(Of IAbstractModule)() From {
- M0, M05, M1, M2, M3, M4, M5, M6, M7, M8, M9, M10, M11, M12, M13, M14}
- For Each moduel As IAbstractModule In modules
- moduel.ResetCalculations()
- Next
- End Sub
-
- Public ReadOnly Property TotalFuelGRAMS As Kilogram Implements IAdvancedAuxiliaries.TotalFuelGRAMS
- Get
- If Not M13 Is Nothing Then
- Return M14.TotalCycleFCGrams
- Else
- Return 0.SI (Of Kilogram)()
- End If
- End Get
- End Property
-
- Public ReadOnly Property TotalFuelLITRES As Liter Implements IAdvancedAuxiliaries.TotalFuelLITRES
- Get
- If Not M14 Is Nothing Then
- Return M14.TotalCycleFCLitres
- Else
- Return 0.SI (Of Liter)()
- End If
- End Get
- End Property
-
- Public ReadOnly Property AuxiliaryName As String Implements IAdvancedAuxiliaries.AuxiliaryName
- Get
- Return "BusAuxiliaries"
- End Get
- End Property
-
- Public ReadOnly Property AuxiliaryVersion As String Implements IAdvancedAuxiliaries.AuxiliaryVersion
- Get
- Return "Version 1.0 Beta"
- End Get
- End Property
-
-
-#End Region
-
- 'Helpers
- Private Function GetDoorActuationTimeFraction() As Single
-
- Dim actuationsMap As PneumaticActuationsMAP =
- New PneumaticActuationsMAP(FilePathUtils.ResolveFilePath(vectoDirectory,
- auxConfig.PneumaticUserInputsConfig.
- ActuationsMap))
- Dim actuationsKey As ActuationsKey = New ActuationsKey("Park brake + 2 doors", VectoInputs.Cycle)
-
- Dim numActuations As Single = actuationsMap.GetNumActuations(actuationsKey)
- Dim secondsPerActuation As Single = auxConfig.ElectricalUserInputsConfig.DoorActuationTimeSecond
-
- Dim doorDutyCycleFraction As Single = (numActuations*secondsPerActuation)/Signals.TotalCycleTimeSeconds
-
- Return doorDutyCycleFraction
- End Function
-
- Public Function ValidateAAUXFile(filePath As String, ByRef message As String) As Boolean _
- Implements IAdvancedAuxiliaries.ValidateAAUXFile
-
-
- Dim validResult As Boolean = FilePathUtils.ValidateFilePath(filePath, ".aaux", message)
-
- If Not validResult Then Return False
-
-
- Return True
- End Function
-
- 'Diagnostics outputs for testing purposes in Vecto.
- 'Eventually this can be removed or rendered non effective to reduce calculation load on the model.
- Public ReadOnly Property AA_NonSmartAlternatorsEfficiency As Double _
- Implements IAdvancedAuxiliaries.AA_NonSmartAlternatorsEfficiency
- Get
- Return M0.AlternatorsEfficiency
- End Get
- End Property
-
- Public ReadOnly Property AA_SmartIdleCurrent_Amps As Ampere Implements IAdvancedAuxiliaries.AA_SmartIdleCurrent_Amps
- Get
- Return M05.SmartIdleCurrent
- End Get
- End Property
-
- Public ReadOnly Property AA_SmartIdleAlternatorsEfficiency As Double _
- Implements IAdvancedAuxiliaries.AA_SmartIdleAlternatorsEfficiency
- Get
- Return M05.AlternatorsEfficiencyIdleResultCard
- End Get
- End Property
-
- Public ReadOnly Property AA_SmartTractionCurrent_Amps As Ampere _
- Implements IAdvancedAuxiliaries.AA_SmartTractionCurrent_Amps
- Get
- Return M05.SmartTractionCurrent
- End Get
- End Property
-
- Public ReadOnly Property AA_SmartTractionAlternatorEfficiency As Double _
- Implements IAdvancedAuxiliaries.AA_SmartTractionAlternatorEfficiency
- Get
- Return M05.AlternatorsEfficiencyTractionOnResultCard
- End Get
- End Property
-
- Public ReadOnly Property AA_SmartOverrunCurrent_Amps As Ampere _
- Implements IAdvancedAuxiliaries.AA_SmartOverrunCurrent_Amps
- Get
- Return M05.SmartOverrunCurrent
- End Get
- End Property
-
- Public ReadOnly Property AA_SmartOverrunAlternatorEfficiency As Double _
- Implements IAdvancedAuxiliaries.AA_SmartOverrunAlternatorEfficiency
- Get
- Return M05.AlternatorsEfficiencyOverrunResultCard
- End Get
- End Property
-
- Public ReadOnly Property AA_CompressorFlowRate_LitrePerSec As NormLiterPerSecond _
- Implements IAdvancedAuxiliaries.AA_CompressorFlowRate_LitrePerSec
- Get
- Return M4.GetFlowRate
- End Get
- End Property
-
- Public ReadOnly Property AA_OverrunFlag As Boolean Implements IAdvancedAuxiliaries.AA_OverrunFlag
- Get
- Return M6.OverrunFlag
- End Get
- End Property
-
- Public ReadOnly Property AA_EngineIdleFlag As Integer? Implements IAdvancedAuxiliaries.AA_EngineIdleFlag
- Get
-
- Return _
- If _
- (
- Signals.EngineSpeed <= _Signals.EngineIdleSpeed AndAlso
- (Not Signals.ClutchEngaged OrElse Signals.InNeutral), 1, 0)
- End Get
- End Property
-
- Public ReadOnly Property AA_CompressorFlag As Boolean Implements IAdvancedAuxiliaries.AA_CompressorFlag
- Get
- Return M8.CompressorFlag
- End Get
- End Property
-
- Public ReadOnly Property AA_TotalCycleFC_Grams As Kilogram Implements IAdvancedAuxiliaries.AA_TotalCycleFC_Grams
- Get
- Return M14.TotalCycleFCGrams
- End Get
- End Property
-
- Public ReadOnly Property AA_TotalCycleFC_Litres As Liter Implements IAdvancedAuxiliaries.AA_TotalCycleFC_Litres
- Get
- Return M14.TotalCycleFCLitres
- End Get
- End Property
-
- Public ReadOnly Property AuxiliaryPowerAtCrankWatts As Watt _
- Implements IAdvancedAuxiliaries.AuxiliaryPowerAtCrankWatts
- Get
- Return M8.AuxPowerAtCrankFromElectricalHVACAndPneumaticsAncillaries
- End Get
- End Property
-
- Public ReadOnly Property AA_AveragePowerDemandCrankHVACMechanicals As Watt _
- Implements IAdvancedAuxiliaries.AA_AveragePowerDemandCrankHVACMechanicals
- Get
- Return M1.AveragePowerDemandAtCrankFromHVACMechanicalsWatts()
- End Get
- End Property
-
- Public ReadOnly Property AA_AveragePowerDemandCrankHVACElectricals As Watt _
- Implements IAdvancedAuxiliaries.AA_AveragePowerDemandCrankHVACElectricals
- Get
- Return M1.AveragePowerDemandAtCrankFromHVACElectricsWatts()
- End Get
- End Property
-
- Public ReadOnly Property AA_AveragePowerDemandCrankElectrics As Watt _
- Implements IAdvancedAuxiliaries.AA_AveragePowerDemandCrankElectrics
- Get
- Return M2.GetAveragePowerAtCrankFromElectrics()
- End Get
- End Property
-
- Public ReadOnly Property AA_AveragePowerDemandCrankPneumatics As Watt _
- Implements IAdvancedAuxiliaries.AA_AveragePowerDemandCrankPneumatics
- Get
- Return M3.GetAveragePowerDemandAtCrankFromPneumatics()
- End Get
- End Property
-
- Public ReadOnly Property AA_TotalCycleFuelConsumptionCompressorOff As Kilogram _
- Implements IAdvancedAuxiliaries.AA_TotalCycleFuelConsumptionCompressorOff
- Get
- Return M9.TotalCycleFuelConsumptionCompressorOffContinuously
- End Get
- End Property
-
- Public ReadOnly Property AA_TotalCycleFuelConsumptionCompressorOn As Kilogram _
- Implements IAdvancedAuxiliaries.AA_TotalCycleFuelConsumptionCompressorOn
- Get
- Return M9.TotalCycleFuelConsumptionCompressorOnContinuously
- End Get
- End Property
-End Class
diff --git a/VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb b/VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb
deleted file mode 100644
index b79a10ba6e..0000000000
--- a/VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb
+++ /dev/null
@@ -1,457 +0,0 @@
-' Copyright 2017 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-' software distributed under the Licence is distributed on an "AS IS" basis,
-' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-
-Imports VectoAuxiliaries.Electrics
-Imports VectoAuxiliaries.Pneumatics
-Imports VectoAuxiliaries.Hvac
-Imports System.IO
-Imports System.Windows.Forms
-Imports Newtonsoft.Json
-Imports TUGraz.VectoCommon.Utils
-Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics
-Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC
-Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Pneumatics
-Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
-Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
-Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.HVAC
-Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.PneumaticSystem
-Imports TUGraz.VectoCore.BusAuxiliaries.Legacy
-
-<Serializable()>
-Public Class AuxiliaryConfig
- Implements IAuxiliaryConfig
-
- 'Vecto
- Public Property VectoInputs As IVectoInputs Implements IAuxiliaryConfig.VectoInputs
-
- 'Electrical
- Public Property ElectricalUserInputsConfig As IElectricsUserInputsConfig _
- Implements IAuxiliaryConfig.ElectricalUserInputsConfig
-
- 'Pneumatics
- Public Property PneumaticUserInputsConfig As IPneumaticUserInputsConfig _
- Implements IAuxiliaryConfig.PneumaticUserInputsConfig
-
- Public Property PneumaticAuxillariesConfig As IPneumaticsAuxilliariesConfig _
- Implements IAuxiliaryConfig.PneumaticAuxillariesConfig
-
- 'Hvac
- Public Property HvacUserInputsConfig As IHVACUserInputsConfig Implements IAuxiliaryConfig.HvacUserInputsConfig
-
- 'Vecto Signals
- <JsonIgnore>
- Public Property Signals As ISignals
-
- 'Constructors
- Sub New()
-
- Call Me.New("EMPTY")
- End Sub
-
- Public Sub New(auxConfigFile As String)
-
- 'Special Condition
- If auxConfigFile = "EMPTY" Then
- ElectricalUserInputsConfig = New ElectricsUserInputsConfig() With {.PowerNetVoltage = 28.3}
- ElectricalUserInputsConfig.ElectricalConsumers = New ElectricalConsumerList(28.3, 0.096,
- False)
- ElectricalUserInputsConfig.ResultCardIdle = New ResultCard(New List(Of SmartResult))
- ElectricalUserInputsConfig.ResultCardOverrun = New ResultCard(New List(Of SmartResult))
- ElectricalUserInputsConfig.ResultCardTraction = New ResultCard(New List(Of SmartResult))
- PneumaticAuxillariesConfig = New PneumaticsAuxilliariesConfig(False)
- PneumaticUserInputsConfig = New PneumaticUserInputsConfig(False)
- HvacUserInputsConfig = New HVACUserInputsConfig(String.Empty, String.Empty, False)
- Exit Sub
-
- End If
-
- If auxConfigFile Is Nothing OrElse auxConfigFile.Trim().Length = 0 OrElse Not File.Exists(auxConfigFile) Then
-
- setDefaults()
-
- Else
-
- setDefaults()
-
- If Not Load(auxConfigFile) Then
- MessageBox.Show(String.Format("Unable to load file {0}", auxConfigFile))
- End If
-
- End If
- End Sub
-
- 'Set Default Values
- Private Sub setDefaults()
-
- Dim tmp As VectoInputs = New VectoInputs _
- With {.Cycle = "Urban", .VehicleWeightKG = 16500.SI(Of Kilogram)(), .PowerNetVoltage = 28.3.SI(Of Volt)()}
- VectoInputs = tmp
- Signals = New Signals With {.EngineSpeed = 2000.RPMtoRad(), .TotalCycleTimeSeconds = 3114, .ClutchEngaged = False}
-
- 'Pneumatics set deault values
- PneumaticUserInputsConfig = New PneumaticUserInputsConfig(True)
- PneumaticAuxillariesConfig = New PneumaticsAuxilliariesConfig(True)
-
- 'Electrical set deault values
- ElectricalUserInputsConfig = New ElectricsUserInputsConfig(True, tmp)
- ElectricalUserInputsConfig.ElectricalConsumers = New ElectricalConsumerList(28.3, 0.096, True)
-
- 'HVAC set deault values
- HvacUserInputsConfig = New HVACUserInputsConfig(String.Empty, String.Empty, False)
- End Sub
-
- Private Function GetDoorActuationTimeFraction() As Single
-
- Dim actuationsMap As PneumaticActuationsMAP = New PneumaticActuationsMAP(PneumaticUserInputsConfig.ActuationsMap)
- Dim actuationsKey As ActuationsKey = New ActuationsKey("Park brake + 2 doors", VectoInputs.Cycle)
-
- Dim numActuations As Single = actuationsMap.GetNumActuations(actuationsKey)
- Dim secondsPerActuation As Single = ElectricalUserInputsConfig.DoorActuationTimeSecond
-
- Dim doorDutyCycleFraction As Single = (numActuations * secondsPerActuation) / Signals.TotalCycleTimeSeconds
-
- Return doorDutyCycleFraction
- End Function
-
-#Region "Comparison"
-
- Private Function CompareElectricalConfiguration(other As AuxiliaryConfig) As Boolean
-
- 'AlternatorGearEfficiency
- If Me.ElectricalUserInputsConfig.AlternatorGearEfficiency <> other.ElectricalUserInputsConfig.AlternatorGearEfficiency _
- Then Return False
-
- 'AlternatorMap
- If Me.ElectricalUserInputsConfig.AlternatorMap <> other.ElectricalUserInputsConfig.AlternatorMap Then Return False
-
- 'DoorActuationTimeSecond
- If Me.ElectricalUserInputsConfig.DoorActuationTimeSecond <> other.ElectricalUserInputsConfig.DoorActuationTimeSecond _
- Then Return False
-
-
- 'Consumer list
- If _
- Me.ElectricalUserInputsConfig.ElectricalConsumers.Items.Count <>
- other.ElectricalUserInputsConfig.ElectricalConsumers.Items.Count Then Return False
- Dim i As Integer
- For i = 0 To Me.ElectricalUserInputsConfig.ElectricalConsumers.Items.Count - 1
- Dim thisConsumer, otherConsumer As IElectricalConsumer
- thisConsumer = Me.ElectricalUserInputsConfig.ElectricalConsumers.Items(i)
- otherConsumer = other.ElectricalUserInputsConfig.ElectricalConsumers.Items(i)
-
- If thisConsumer.AvgConsumptionAmps <> otherConsumer.AvgConsumptionAmps OrElse
- thisConsumer.BaseVehicle <> otherConsumer.BaseVehicle OrElse
- thisConsumer.Category <> otherConsumer.Category OrElse
- thisConsumer.ConsumerName <> otherConsumer.ConsumerName OrElse
- thisConsumer.NominalConsumptionAmps <> otherConsumer.NominalConsumptionAmps OrElse
- thisConsumer.NumberInActualVehicle <> otherConsumer.NumberInActualVehicle OrElse
- thisConsumer.PhaseIdle_TractionOn <> otherConsumer.PhaseIdle_TractionOn OrElse
- thisConsumer.TotalAvgConsumptionInWatts <> otherConsumer.TotalAvgConsumptionInWatts OrElse
- thisConsumer.TotalAvgConumptionAmps <> otherConsumer.TotalAvgConumptionAmps Then Return False
-
- Next
-
- 'PowerNetVoltage
- If Me.ElectricalUserInputsConfig.PowerNetVoltage <> other.ElectricalUserInputsConfig.PowerNetVoltage Then Return False
-
- 'ResultCardIdle
- If _
- Me.ElectricalUserInputsConfig.ResultCardIdle.Results.Count <>
- other.ElectricalUserInputsConfig.ResultCardIdle.Results.Count Then Return False
- For i = 0 To Me.ElectricalUserInputsConfig.ResultCardIdle.Results.Count - 1
- If _
- Me.ElectricalUserInputsConfig.ResultCardIdle.Results(i).Amps <>
- other.ElectricalUserInputsConfig.ResultCardIdle.Results(i).Amps OrElse
- Me.ElectricalUserInputsConfig.ResultCardIdle.Results(i).SmartAmps <>
- other.ElectricalUserInputsConfig.ResultCardIdle.Results(i).SmartAmps Then Return False
- Next
-
- 'ResultCardOverrun
- If _
- Me.ElectricalUserInputsConfig.ResultCardOverrun.Results.Count <>
- other.ElectricalUserInputsConfig.ResultCardOverrun.Results.Count Then Return False
- For i = 0 To Me.ElectricalUserInputsConfig.ResultCardOverrun.Results.Count - 1
- If _
- Me.ElectricalUserInputsConfig.ResultCardOverrun.Results(i).Amps <>
- other.ElectricalUserInputsConfig.ResultCardOverrun.Results(i).Amps OrElse
- Me.ElectricalUserInputsConfig.ResultCardOverrun.Results(i).SmartAmps <>
- other.ElectricalUserInputsConfig.ResultCardOverrun.Results(i).SmartAmps Then Return False
- Next
-
-
- 'ResultCardTraction
- If _
- Me.ElectricalUserInputsConfig.ResultCardTraction.Results.Count <>
- other.ElectricalUserInputsConfig.ResultCardTraction.Results.Count Then Return False
- For i = 0 To Me.ElectricalUserInputsConfig.ResultCardTraction.Results.Count - 1
- If _
- Me.ElectricalUserInputsConfig.ResultCardTraction.Results(i).Amps <>
- other.ElectricalUserInputsConfig.ResultCardTraction.Results(i).Amps OrElse
- Me.ElectricalUserInputsConfig.ResultCardTraction.Results(i).SmartAmps <>
- other.ElectricalUserInputsConfig.ResultCardTraction.Results(i).SmartAmps Then Return False
- Next
-
- 'SmartElectrical
- If Me.ElectricalUserInputsConfig.SmartElectrical <> other.ElectricalUserInputsConfig.SmartElectrical Then Return False
-
-
- Return True
- End Function
-
- Private Function ComparePneumaticAuxiliariesConfig(other As AuxiliaryConfig) As Boolean
-
- If Me.PneumaticAuxillariesConfig.AdBlueNIperMinute <> other.PneumaticAuxillariesConfig.AdBlueNIperMinute Then _
- Return False
- If _
- Me.PneumaticAuxillariesConfig.AirControlledSuspensionNIperMinute <>
- other.PneumaticAuxillariesConfig.AirControlledSuspensionNIperMinute Then Return False
- If Me.PneumaticAuxillariesConfig.BrakingNoRetarderNIperKG <> other.PneumaticAuxillariesConfig.BrakingNoRetarderNIperKG _
- Then Return False
- If _
- Me.PneumaticAuxillariesConfig.BrakingWithRetarderNIperKG <>
- other.PneumaticAuxillariesConfig.BrakingWithRetarderNIperKG Then Return False
- If _
- Me.PneumaticAuxillariesConfig.BreakingPerKneelingNIperKGinMM <>
- other.PneumaticAuxillariesConfig.BreakingPerKneelingNIperKGinMM Then Return False
- If _
- Me.PneumaticAuxillariesConfig.DeadVolBlowOutsPerLitresperHour <>
- other.PneumaticAuxillariesConfig.DeadVolBlowOutsPerLitresperHour Then Return False
- If Me.PneumaticAuxillariesConfig.DeadVolumeLitres <> other.PneumaticAuxillariesConfig.DeadVolumeLitres Then _
- Return False
- If _
- Me.PneumaticAuxillariesConfig.NonSmartRegenFractionTotalAirDemand <>
- other.PneumaticAuxillariesConfig.NonSmartRegenFractionTotalAirDemand Then Return False
- If Me.PneumaticAuxillariesConfig.PerDoorOpeningNI <> other.PneumaticAuxillariesConfig.PerDoorOpeningNI Then _
- Return False
- If _
- Me.PneumaticAuxillariesConfig.PerStopBrakeActuationNIperKG <>
- other.PneumaticAuxillariesConfig.PerStopBrakeActuationNIperKG Then Return False
- If _
- Me.PneumaticAuxillariesConfig.SmartRegenFractionTotalAirDemand <>
- other.PneumaticAuxillariesConfig.SmartRegenFractionTotalAirDemand Then Return False
- If _
- Me.PneumaticAuxillariesConfig.OverrunUtilisationForCompressionFraction <>
- other.PneumaticAuxillariesConfig.OverrunUtilisationForCompressionFraction Then Return False
-
- Return True
- End Function
-
- Private Function ComparePneumaticUserConfig(other As AuxiliaryConfig) As Boolean
-
- If Me.PneumaticUserInputsConfig.ActuationsMap <> other.PneumaticUserInputsConfig.ActuationsMap Then Return False
- If Me.PneumaticUserInputsConfig.AdBlueDosing <> other.PneumaticUserInputsConfig.AdBlueDosing Then Return False
- If Me.PneumaticUserInputsConfig.AirSuspensionControl <> other.PneumaticUserInputsConfig.AirSuspensionControl Then _
- Return False
- If Me.PneumaticUserInputsConfig.CompressorGearEfficiency <> other.PneumaticUserInputsConfig.CompressorGearEfficiency _
- Then Return False
- If Me.PneumaticUserInputsConfig.CompressorGearRatio <> other.PneumaticUserInputsConfig.CompressorGearRatio Then _
- Return False
- If Me.PneumaticUserInputsConfig.CompressorMap <> other.PneumaticUserInputsConfig.CompressorMap Then Return False
- If Me.PneumaticUserInputsConfig.Doors <> other.PneumaticUserInputsConfig.Doors Then Return False
- If Me.PneumaticUserInputsConfig.KneelingHeightMillimeters <> other.PneumaticUserInputsConfig.KneelingHeightMillimeters _
- Then Return False
- If Me.PneumaticUserInputsConfig.RetarderBrake <> other.PneumaticUserInputsConfig.RetarderBrake Then Return False
- If Me.PneumaticUserInputsConfig.SmartAirCompression <> other.PneumaticUserInputsConfig.SmartAirCompression Then _
- Return False
- If Me.PneumaticUserInputsConfig.SmartRegeneration <> other.PneumaticUserInputsConfig.SmartRegeneration Then _
- Return False
-
- Return True
- End Function
-
- Private Function CompareHVACConfig(other As AuxiliaryConfig) As Boolean _
- Implements IAuxiliaryConfig.ConfigValuesAreTheSameAs
-
- If Me.HvacUserInputsConfig.SSMFilePath <> other.HvacUserInputsConfig.SSMFilePath Then Return False
- If Me.HvacUserInputsConfig.BusDatabasePath <> other.HvacUserInputsConfig.BusDatabasePath Then Return False
- If Me.HvacUserInputsConfig.SSMDisabled <> other.HvacUserInputsConfig.SSMDisabled Then Return False
-
- Return True
- End Function
-
- Public Function ConfigValuesAreTheSameAs(other As AuxiliaryConfig) As Boolean
-
- If Not CompareElectricalConfiguration(other) Then Return False
- If Not ComparePneumaticAuxiliariesConfig(other) Then Return False
- If Not ComparePneumaticUserConfig(other) Then Return False
- If Not CompareHVACConfig(other) Then Return False
-
- Return True
- End Function
-
-
-#End Region
-
-#Region "Persistance"
-
- 'Persistance Functions
- Public Function Save(auxFile As String) As Boolean Implements IAuxiliaryConfig.Save
-
- Dim returnValue As Boolean = True
- Dim settings As JsonSerializerSettings = New JsonSerializerSettings()
- settings.TypeNameHandling = TypeNameHandling.Objects
-
- 'JSON METHOD
- Try
-
- Dim output As String = JsonConvert.SerializeObject(Me, Formatting.Indented, settings)
-
- File.WriteAllText(auxFile, output)
-
- Catch ex As Exception
-
- returnValue = False
-
- End Try
-
- Return returnValue
- End Function
-
- Public Function Load(auxFile As String) As Boolean Implements IAuxiliaryConfig.Load
-
- Dim returnValue As Boolean = True
- Dim settings As JsonSerializerSettings = New JsonSerializerSettings()
- Dim tmpAux As AuxiliaryConfig
-
- settings.TypeNameHandling = TypeNameHandling.Objects
-
- 'JSON METHOD
- Try
-
- Dim output As String = File.ReadAllText(auxFile)
-
-
- tmpAux = JsonConvert.DeserializeObject(Of AuxiliaryConfig)(output, settings)
-
- 'This is where we Assume values of loaded( Deserialized ) object.
- AssumeValuesOfOther(tmpAux)
- If Not tmpAux.VectoInputs.FuelMapFile Is Nothing Then
- Dim tmp As cMAP = New cMAP
- tmp.FilePath = Path.Combine(Path.GetDirectoryName(auxFile), tmpAux.VectoInputs.FuelMapFile)
- If Not tmp.ReadFile() Then
- MessageBox.Show("Unable to read fuel map, aborting.")
- Return False
- End If
- tmp.Triangulate()
- VectoInputs.FuelMap = tmp
- End If
- Catch ex As Exception
-
- returnValue = False
- End Try
-
- Return returnValue
- End Function
-
- 'Persistance Helpers
- Public Sub AssumeValuesOfOther(other As AuxiliaryConfig)
-
- CloneElectricaConfiguration(other)
- ClonePneumaticsAuxiliariesConfig(other)
- ClonePneumaticsUserInputsConfig(other)
- CloneHVAC(other)
- End Sub
-
- Private Sub CloneElectricaConfiguration(other As AuxiliaryConfig)
-
- 'AlternatorGearEfficiency
- Me.ElectricalUserInputsConfig.AlternatorGearEfficiency = other.ElectricalUserInputsConfig.AlternatorGearEfficiency
- 'AlternatorMap
- Me.ElectricalUserInputsConfig.AlternatorMap = other.ElectricalUserInputsConfig.AlternatorMap
- 'DoorActuationTimeSecond
- Me.ElectricalUserInputsConfig.DoorActuationTimeSecond = other.ElectricalUserInputsConfig.DoorActuationTimeSecond
-
- 'Electrical Consumer list
- Me.ElectricalUserInputsConfig.ElectricalConsumers.Items.Clear()
- For Each otherConsumer As IElectricalConsumer In other.ElectricalUserInputsConfig.ElectricalConsumers.Items
-
- Dim newConsumer As ElectricalConsumer = New ElectricalConsumer(otherConsumer.BaseVehicle,
- otherConsumer.Category,
- otherConsumer.ConsumerName,
- otherConsumer.NominalConsumptionAmps,
- otherConsumer.PhaseIdle_TractionOn,
- otherConsumer.PowerNetVoltage,
- otherConsumer.NumberInActualVehicle,
- otherConsumer.Info)
-
- Me.ElectricalUserInputsConfig.ElectricalConsumers.Items.Add(newConsumer)
-
- Next
-
- 'PowerNetVoltage
- Me.ElectricalUserInputsConfig.PowerNetVoltage = other.ElectricalUserInputsConfig.PowerNetVoltage
- 'ResultCardIdle
- Me.ElectricalUserInputsConfig.ResultCardIdle.Results.Clear()
- For Each result As SmartResult In other.ElectricalUserInputsConfig.ResultCardIdle.Results
- Me.ElectricalUserInputsConfig.ResultCardIdle.Results.Add(New SmartResult(result.Amps, result.SmartAmps))
- Next
- 'ResultCardOverrun
- Me.ElectricalUserInputsConfig.ResultCardOverrun.Results.Clear()
- For Each result As SmartResult In other.ElectricalUserInputsConfig.ResultCardOverrun.Results
- Me.ElectricalUserInputsConfig.ResultCardOverrun.Results.Add(New SmartResult(result.Amps, result.SmartAmps))
- Next
- 'ResultCardTraction
- Me.ElectricalUserInputsConfig.ResultCardTraction.Results.Clear()
- For Each result As SmartResult In other.ElectricalUserInputsConfig.ResultCardTraction.Results
- Me.ElectricalUserInputsConfig.ResultCardTraction.Results.Add(New SmartResult(result.Amps, result.SmartAmps))
- Next
- 'SmartElectrical
- Me.ElectricalUserInputsConfig.SmartElectrical = other.ElectricalUserInputsConfig.SmartElectrical
- End Sub
-
- Private Sub ClonePneumaticsAuxiliariesConfig(other As AuxiliaryConfig)
-
- Me.PneumaticAuxillariesConfig.AdBlueNIperMinute = other.PneumaticAuxillariesConfig.AdBlueNIperMinute
- Me.PneumaticAuxillariesConfig.AirControlledSuspensionNIperMinute =
- other.PneumaticAuxillariesConfig.AirControlledSuspensionNIperMinute
- Me.PneumaticAuxillariesConfig.BrakingNoRetarderNIperKG = other.PneumaticAuxillariesConfig.BrakingNoRetarderNIperKG
- Me.PneumaticAuxillariesConfig.BrakingWithRetarderNIperKG = other.PneumaticAuxillariesConfig.BrakingWithRetarderNIperKG
- Me.PneumaticAuxillariesConfig.BreakingPerKneelingNIperKGinMM =
- other.PneumaticAuxillariesConfig.BreakingPerKneelingNIperKGinMM
- Me.PneumaticAuxillariesConfig.DeadVolBlowOutsPerLitresperHour =
- other.PneumaticAuxillariesConfig.DeadVolBlowOutsPerLitresperHour
- Me.PneumaticAuxillariesConfig.DeadVolumeLitres = other.PneumaticAuxillariesConfig.DeadVolumeLitres
- Me.PneumaticAuxillariesConfig.NonSmartRegenFractionTotalAirDemand =
- other.PneumaticAuxillariesConfig.NonSmartRegenFractionTotalAirDemand
- Me.PneumaticAuxillariesConfig.PerDoorOpeningNI = other.PneumaticAuxillariesConfig.PerDoorOpeningNI
- Me.PneumaticAuxillariesConfig.PerStopBrakeActuationNIperKG =
- other.PneumaticAuxillariesConfig.PerStopBrakeActuationNIperKG
- Me.PneumaticAuxillariesConfig.SmartRegenFractionTotalAirDemand =
- other.PneumaticAuxillariesConfig.SmartRegenFractionTotalAirDemand
- Me.PneumaticAuxillariesConfig.OverrunUtilisationForCompressionFraction =
- other.PneumaticAuxillariesConfig.OverrunUtilisationForCompressionFraction
- End Sub
-
- Private Sub ClonePneumaticsUserInputsConfig(other As AuxiliaryConfig)
-
- Me.PneumaticUserInputsConfig.ActuationsMap = other.PneumaticUserInputsConfig.ActuationsMap
- Me.PneumaticUserInputsConfig.AdBlueDosing = other.PneumaticUserInputsConfig.AdBlueDosing
- Me.PneumaticUserInputsConfig.AirSuspensionControl = other.PneumaticUserInputsConfig.AirSuspensionControl
- Me.PneumaticUserInputsConfig.CompressorGearEfficiency = other.PneumaticUserInputsConfig.CompressorGearEfficiency
- Me.PneumaticUserInputsConfig.CompressorGearRatio = other.PneumaticUserInputsConfig.CompressorGearRatio
- Me.PneumaticUserInputsConfig.CompressorMap = other.PneumaticUserInputsConfig.CompressorMap
- Me.PneumaticUserInputsConfig.Doors = other.PneumaticUserInputsConfig.Doors
- Me.PneumaticUserInputsConfig.KneelingHeightMillimeters = other.PneumaticUserInputsConfig.KneelingHeightMillimeters
- Me.PneumaticUserInputsConfig.RetarderBrake = other.PneumaticUserInputsConfig.RetarderBrake
- Me.PneumaticUserInputsConfig.SmartAirCompression = other.PneumaticUserInputsConfig.SmartAirCompression
- Me.PneumaticUserInputsConfig.SmartRegeneration = other.PneumaticUserInputsConfig.SmartRegeneration
- End Sub
-
- Private Sub CloneHVAC(other As AuxiliaryConfig)
-
- Me.HvacUserInputsConfig.SSMFilePath = other.HvacUserInputsConfig.SSMFilePath
- Me.HvacUserInputsConfig.BusDatabasePath = other.HvacUserInputsConfig.BusDatabasePath
- Me.HvacUserInputsConfig.SSMDisabled = other.HvacUserInputsConfig.SSMDisabled
- End Sub
-
-#End Region
-End Class
-
diff --git a/VECTOAux/VectoAuxiliaries/FilePathUtils.vb b/VECTOAux/VectoAuxiliaries/FilePathUtils.vb
deleted file mode 100644
index 8b5033244c..0000000000
--- a/VECTOAux/VectoAuxiliaries/FilePathUtils.vb
+++ /dev/null
@@ -1,144 +0,0 @@
-' Copyright 2017 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-' software distributed under the Licence is distributed on an "AS IS" basis,
-' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-Imports System.IO
-
-Public Class FilePathUtils
- Public Shared Function ValidateFilePath(ByVal filePath As String, ByVal expectedExtension As String,
- ByRef message As String) As Boolean
-
-
- Dim illegalFileNameCharacters As Char() = {"<"c, ">"c, ":"c, """"c, "/"c, "\"c, "|"c, "?"c, "*"c, "~"c}
- Dim detectedExtention As String = fileExtentionOnly(filePath)
- Dim pathOnly As String = filePathOnly(filePath)
- Dim fileNameOnlyWithExtension As String = fileNameOnly(filePath, True)
- Dim fileNameOnlyNoExtension As String = fileNameOnly(filePath, False)
-
- 'Is this filePath empty
- If filePath.Trim.Length = 0 OrElse Right(filePath, 1) = "\" Then
- message = "A filename cannot be empty"
- Return False
- End If
-
-
- 'Extension Expected, but not match
- If expectedExtension.Trim.Length > 0 Then
- If String.Compare(expectedExtension, detectedExtention, True) <> 0 Then
- message = String.Format("The file extension type does not match the expected type of {0}", expectedExtension)
- Return False
- End If
- End If
-
- 'Extension Not Expected, but was supplied
- If expectedExtension.Trim.Length > 0 Then
- If detectedExtention.Length = 0 Then
- message = String.Format("No Extension was supplied, but an extension of {0}, this is not required",
- detectedExtention)
- Return False
- End If
- End If
-
-
- 'Illegal characters
- If Not fileNameLegal(fileNameOnlyWithExtension) Then
- message = String.Format("The filenames have one or more illegal characters")
- Return False
- End If
-
-
- message = "OK"
- Return True
- End Function
-
-
- Public Shared Function fileNameLegal(fileName As String) As Boolean
-
- Dim illegalFileNameCharacters As Char() = {"<"c, ">"c, ":"c, """"c, "/"c, "\"c, "|"c, "?"c, "*"c, "~"c}
-
-
- 'Illegal characters
- For Each ch As Char In illegalFileNameCharacters
-
- If fileName.Contains(ch) Then
-
- Return False
-
- End If
- Next
- Return True
- End Function
-
-
- Public Shared Function ResolveFilePath(vectoPath As String, filename As String) As String
-
- 'No Vecto Path supplied
- If vectoPath = "" Then Return filename
-
- 'This is not relative
- If filename.Contains(":\") Then
-
- 'Filepath is already absolute
- Return filename
- Else
- Return Path.Combine(vectoPath, filename) 'vectoPath & filename
- End If
- End Function
-
-
- ''' <summary>
- ''' File name without the path "C:\temp\TEST.txt" >> "TEST.txt" oder "TEST"
- ''' </summary>
- ''' <param name="filePath"></param>
- ''' <param name="WithExtention"></param>
- ''' <returns>Return file portion of the path, with or without the extension</returns>
- ''' <remarks></remarks>
- Public Shared Function fileNameOnly(ByVal filePath As String, ByVal WithExtention As Boolean) As String
- Dim x As Integer
- x = filePath.LastIndexOf("\") + 1
- filePath = Microsoft.VisualBasic.Right(filePath, Microsoft.VisualBasic.Len(filePath) - x)
- If Not WithExtention Then
- x = filePath.LastIndexOf(".")
- If x > 0 Then filePath = Microsoft.VisualBasic.Left(filePath, x)
- End If
- Return filePath
- End Function
-
-
- ''' <summary>
- ''' Extension alone "C:\temp\TEST.txt" >> ".txt"
- ''' </summary>
- ''' <param name="filePath"></param>
- ''' <returns>Extension alone Including the dot IE .EXT</returns>
- ''' <remarks></remarks>
- Public Shared Function fileExtentionOnly(ByVal filePath As String) As String
- Dim x As Integer
- x = filePath.LastIndexOf(".")
- If x = -1 Then
- Return ""
- Else
- Return Microsoft.VisualBasic.Right(filePath, Microsoft.VisualBasic.Len(filePath) - x)
- End If
- End Function
-
- ''' <summary>
- ''' File Path alone "C:\temp\TEST.txt" >> "C:\temp\"
- ''' "TEST.txt" >> ""
- ''' </summary>
- ''' <param name="filePath"></param>
- ''' <returns>Filepath without the extension</returns>
- ''' <remarks></remarks>
- Public Shared Function filePathOnly(ByVal filePath As String) As String
- Dim x As Integer
- If filePath Is Nothing OrElse filePath.Length < 3 OrElse filePath.Substring(1, 2) <> ":\" Then Return ""
- x = filePath.LastIndexOf("\")
- Return Microsoft.VisualBasic.Left(filePath, x + 1)
- End Function
-End Class
-
diff --git a/VECTOAux/VectoAuxiliaries/IAuxiliaryConfig.vb b/VECTOAux/VectoAuxiliaries/IAuxiliaryConfig.vb
deleted file mode 100644
index 4b0efbda20..0000000000
--- a/VECTOAux/VectoAuxiliaries/IAuxiliaryConfig.vb
+++ /dev/null
@@ -1,39 +0,0 @@
-' Copyright 2017 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-' software distributed under the Licence is distributed on an "AS IS" basis,
-' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-
-Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
-Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
-Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.HVAC
-Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.PneumaticSystem
-
-
-Public Interface IAuxiliaryConfig
- 'Vecto
- Property VectoInputs As IVectoInputs
-
- 'Electrical
- property ElectricalUserInputsConfig As IElectricsUserInputsConfig
-
-
- 'Pneumatics
- Property PneumaticUserInputsConfig As IPneumaticUserInputsConfig
- Property PneumaticAuxillariesConfig As IPneumaticsAuxilliariesConfig
-
- 'Hvac
- Property HvacUserInputsConfig As IHVACUserInputsConfig
-
- Function ConfigValuesAreTheSameAs(other As AuxiliaryConfig) As Boolean
-
-
- 'Persistance Functions
- Function Save(filePath As String) As Boolean
- Function Load(filePath As String) As Boolean
-End Interface
diff --git a/VECTOAux/VectoAuxiliaries/Images/Delete-32.png b/VECTOAux/VectoAuxiliaries/Images/Delete-32.png
deleted file mode 100644
index 31eab12612c7a2895ef3e9fad8110f6dcb6b3448..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1430
zcmb7EZA{!`94~MzW6C7x6wm0o5{PbceYw|G4(MImadU@wM+D=`DA#gV?ykMHJ?}V|
zD2SON8seDj!{o!1ZAJu576RFv#<`hs*>om4<7Aq!XtHcG7&MB?e9Ab+hlRu@?eq5k
z{eJ(qr>{0PY%N}AUI#%?v9F#9fDty{wQImv%Vg%jaIem`=s~4jPw}b<(Sp(@!oD~k
z76T$LbnZMYRzpz12U1gu-s0a*g_O93H*75FcmkjysJb?t;6qVShug%kB)gGckA8x{
zlHf*~?S9Ok@QM+sKBJ1kOhZ#B6Ah69Qd<L8rzt=X7j+&^$78ZarQOIPF9qhtHj2QD
zCVJG3+;FPJ-w1mZRfO#ptSW>#FxY`xaI4MfbUq9d7>=PBf#O6J?xd^)g<<g0g8(&E
zXr}@Ux1<GDZX}}X2?|A1sgxyUwJ2&B#YvJhI0&K&SX619vd*WgWUV~Mz=&E%l@hw7
z$gsi4w<$^8jQ~$?gb+^zq;N#nmdRypDOn(GXqr!;xCKMiMH?f&9Ln!s9TAT&TWfki
zyy^Tc`L(9bgop-2O-ZUDP{sE06;i7U8HP(SP<~#GilB-dAJfFe1HYeo3^*^ze2h^-
z$+#%%KE{nClafHutd+AlFqeySkqnFDw9A2!B!?3?O<*>H%n_^v0xgRGup~}8tgPMT
zv9lbGvzUjbtsW0+W1Jq`YR8!z)+cK^FNZ`!)WAwNvCdVolvfpbT~V79C6?=^#)zUT
zT0}{}-k=?BmSjOmX-1&|GYFIsRp~iV;8Z0JFXo(*ZlP`^SPyBlF)Ro4F&rmpkB#OS
z60?$=)y{g5C9Lqj(}e<0P@~6I^jvNWG_o;WzCmEId<R7tluQLTZ0xCylMs~mypN%q
z(%)ZcraMkxC3BTs&zd6}zgm-#hDx^Wcr&`mz4!R=C4nCMw;rA=Iy2lqmv?5<V99~k
zOJn7eTcQ=&+2QU&a(wH|^tnjEEBlU+lrQ^EGT%LOIeB=;@aD?RJ-xrw?K00?eScr~
zXx^?#^q{FMZK(;)*7Kk0bhz%?x$*SEBZEu@cm9d|$-##T%JT0)r@sDXiXUkGTmNEu
zPszle($mLYD0sW;{@(32UtQ(IrI%+bGHV<&U3c^k6^*4VwQt>Bd_`E_Yd?9)^30Px
z^DlkmHt*+pO0#I|p4X19{T#`QZ8_WbU}e#vos&f4Zd2AiX*#Q!5A=;se;3~Ed-2*E
zm)|Y?n5iFtIX|Y~cj_+Fy!r7vJD5Wo!ljYluzBxiv27IxPvf^8gR(ztc<*=DLgz%y
zqh8f|y^tvA?Q@l?Cey|2iHrRsT=VGI;R^#pm|S~)FUS0~z_C9D_m6ygJeUU`d0=$o
rhgYY{gg<_|{-t!mv_AiKsQKsO?vdVqjDIcUV;h)JPir@BBOLz$rKa%@
diff --git a/VECTOAux/VectoAuxiliaries/Images/Delete.png b/VECTOAux/VectoAuxiliaries/Images/Delete.png
deleted file mode 100644
index 31eab12612c7a2895ef3e9fad8110f6dcb6b3448..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1430
zcmb7EZA{!`94~MzW6C7x6wm0o5{PbceYw|G4(MImadU@wM+D=`DA#gV?ykMHJ?}V|
zD2SON8seDj!{o!1ZAJu576RFv#<`hs*>om4<7Aq!XtHcG7&MB?e9Ab+hlRu@?eq5k
z{eJ(qr>{0PY%N}AUI#%?v9F#9fDty{wQImv%Vg%jaIem`=s~4jPw}b<(Sp(@!oD~k
z76T$LbnZMYRzpz12U1gu-s0a*g_O93H*75FcmkjysJb?t;6qVShug%kB)gGckA8x{
zlHf*~?S9Ok@QM+sKBJ1kOhZ#B6Ah69Qd<L8rzt=X7j+&^$78ZarQOIPF9qhtHj2QD
zCVJG3+;FPJ-w1mZRfO#ptSW>#FxY`xaI4MfbUq9d7>=PBf#O6J?xd^)g<<g0g8(&E
zXr}@Ux1<GDZX}}X2?|A1sgxyUwJ2&B#YvJhI0&K&SX619vd*WgWUV~Mz=&E%l@hw7
z$gsi4w<$^8jQ~$?gb+^zq;N#nmdRypDOn(GXqr!;xCKMiMH?f&9Ln!s9TAT&TWfki
zyy^Tc`L(9bgop-2O-ZUDP{sE06;i7U8HP(SP<~#GilB-dAJfFe1HYeo3^*^ze2h^-
z$+#%%KE{nClafHutd+AlFqeySkqnFDw9A2!B!?3?O<*>H%n_^v0xgRGup~}8tgPMT
zv9lbGvzUjbtsW0+W1Jq`YR8!z)+cK^FNZ`!)WAwNvCdVolvfpbT~V79C6?=^#)zUT
zT0}{}-k=?BmSjOmX-1&|GYFIsRp~iV;8Z0JFXo(*ZlP`^SPyBlF)Ro4F&rmpkB#OS
z60?$=)y{g5C9Lqj(}e<0P@~6I^jvNWG_o;WzCmEId<R7tluQLTZ0xCylMs~mypN%q
z(%)ZcraMkxC3BTs&zd6}zgm-#hDx^Wcr&`mz4!R=C4nCMw;rA=Iy2lqmv?5<V99~k
zOJn7eTcQ=&+2QU&a(wH|^tnjEEBlU+lrQ^EGT%LOIeB=;@aD?RJ-xrw?K00?eScr~
zXx^?#^q{FMZK(;)*7Kk0bhz%?x$*SEBZEu@cm9d|$-##T%JT0)r@sDXiXUkGTmNEu
zPszle($mLYD0sW;{@(32UtQ(IrI%+bGHV<&U3c^k6^*4VwQt>Bd_`E_Yd?9)^30Px
z^DlkmHt*+pO0#I|p4X19{T#`QZ8_WbU}e#vos&f4Zd2AiX*#Q!5A=;se;3~Ed-2*E
zm)|Y?n5iFtIX|Y~cj_+Fy!r7vJD5Wo!ljYluzBxiv27IxPvf^8gR(ztc<*=DLgz%y
zqh8f|y^tvA?Q@l?Cey|2iHrRsT=VGI;R^#pm|S~)FUS0~z_C9D_m6ygJeUU`d0=$o
rhgYY{gg<_|{-t!mv_AiKsQKsO?vdVqjDIcUV;h)JPir@BBOLz$rKa%@
diff --git a/VECTOAux/VectoAuxiliaries/Images/Delete1.png b/VECTOAux/VectoAuxiliaries/Images/Delete1.png
deleted file mode 100644
index 31eab12612c7a2895ef3e9fad8110f6dcb6b3448..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1430
zcmb7EZA{!`94~MzW6C7x6wm0o5{PbceYw|G4(MImadU@wM+D=`DA#gV?ykMHJ?}V|
zD2SON8seDj!{o!1ZAJu576RFv#<`hs*>om4<7Aq!XtHcG7&MB?e9Ab+hlRu@?eq5k
z{eJ(qr>{0PY%N}AUI#%?v9F#9fDty{wQImv%Vg%jaIem`=s~4jPw}b<(Sp(@!oD~k
z76T$LbnZMYRzpz12U1gu-s0a*g_O93H*75FcmkjysJb?t;6qVShug%kB)gGckA8x{
zlHf*~?S9Ok@QM+sKBJ1kOhZ#B6Ah69Qd<L8rzt=X7j+&^$78ZarQOIPF9qhtHj2QD
zCVJG3+;FPJ-w1mZRfO#ptSW>#FxY`xaI4MfbUq9d7>=PBf#O6J?xd^)g<<g0g8(&E
zXr}@Ux1<GDZX}}X2?|A1sgxyUwJ2&B#YvJhI0&K&SX619vd*WgWUV~Mz=&E%l@hw7
z$gsi4w<$^8jQ~$?gb+^zq;N#nmdRypDOn(GXqr!;xCKMiMH?f&9Ln!s9TAT&TWfki
zyy^Tc`L(9bgop-2O-ZUDP{sE06;i7U8HP(SP<~#GilB-dAJfFe1HYeo3^*^ze2h^-
z$+#%%KE{nClafHutd+AlFqeySkqnFDw9A2!B!?3?O<*>H%n_^v0xgRGup~}8tgPMT
zv9lbGvzUjbtsW0+W1Jq`YR8!z)+cK^FNZ`!)WAwNvCdVolvfpbT~V79C6?=^#)zUT
zT0}{}-k=?BmSjOmX-1&|GYFIsRp~iV;8Z0JFXo(*ZlP`^SPyBlF)Ro4F&rmpkB#OS
z60?$=)y{g5C9Lqj(}e<0P@~6I^jvNWG_o;WzCmEId<R7tluQLTZ0xCylMs~mypN%q
z(%)ZcraMkxC3BTs&zd6}zgm-#hDx^Wcr&`mz4!R=C4nCMw;rA=Iy2lqmv?5<V99~k
zOJn7eTcQ=&+2QU&a(wH|^tnjEEBlU+lrQ^EGT%LOIeB=;@aD?RJ-xrw?K00?eScr~
zXx^?#^q{FMZK(;)*7Kk0bhz%?x$*SEBZEu@cm9d|$-##T%JT0)r@sDXiXUkGTmNEu
zPszle($mLYD0sW;{@(32UtQ(IrI%+bGHV<&U3c^k6^*4VwQt>Bd_`E_Yd?9)^30Px
z^DlkmHt*+pO0#I|p4X19{T#`QZ8_WbU}e#vos&f4Zd2AiX*#Q!5A=;se;3~Ed-2*E
zm)|Y?n5iFtIX|Y~cj_+Fy!r7vJD5Wo!ljYluzBxiv27IxPvf^8gR(ztc<*=DLgz%y
zqh8f|y^tvA?Q@l?Cey|2iHrRsT=VGI;R^#pm|S~)FUS0~z_C9D_m6ygJeUU`d0=$o
rhgYY{gg<_|{-t!mv_AiKsQKsO?vdVqjDIcUV;h)JPir@BBOLz$rKa%@
diff --git a/VECTOAux/VectoAuxiliaries/Images/application-export-icon-small.png b/VECTOAux/VectoAuxiliaries/Images/application-export-icon-small.png
deleted file mode 100644
index 308a361b10574649a2b733de3d933a243c4f4f4d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 645
zcmV;00($+4P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i*e?
z3L7y0&#^ZE00IR`L_t(I%gvL$Yg1tq#-H=vv^SCFqX{*LAGD=9iIqwQ5uxJ8pi_2>
z{sI00PKuk8pdttk0Xw-VSTF_$MLGx$7A(?e(`t;hHffTZ^yc38<2abK-l{mbc;Mk(
z-t&83p7R{wABzAWo6U;l)&4%M6i5gVQCGcd3}!}ZM@<(B&(zO=5CE9|k;&sHk6k1Y
zj%lM=YXhSVm>D1ef(5%z`|Q4dA%wV}&lj8kKvHV5Nk^u>)x*%nz;wliVVD6B;*k!b
z+8N2uwjKir0`{a@8<(bb!D(v-GXePVdiQiaLV3-?!UucMN*3dKe3tN%coSfYmOMDx
z52X}sH;EZ2mI>1{6%5%6-rjhrwbX3}0096}O2KTPlnkiTanWcrP+PA-D;MWZPuSz5
zUM7>tL<0cd_bsIqq?DWTeINCvhqsG9DqmfkIU42t!^yGBS8m^krN+(&Jn%fv>NQb!
zc3K;h%56+P5m;U^NDj0qF$g>=tb3)kA+;SKq*U;{EdT)Q-f82)SqmLW$Ul9K`FCO|
zckkw%aQf5(;MNwPxe*E%%Y<6p3IKX0f*A1u3-hmXZbZF)=)Sqz4E$iRA|lswtJRgd
zEx^CeYdUdA4yUVM-0B?v5@ivcIBa4k4!}y-e+<2@d#KHPiiSSVIgZl~0002{u8O~I
f&c|y8|6P3tDMAaeGu$>d00000NkvXXu0mjfx-1ar
diff --git a/VECTOAux/VectoAuxiliaries/My Project/Application.Designer.vb b/VECTOAux/VectoAuxiliaries/My Project/Application.Designer.vb
deleted file mode 100644
index 8ab460ba03..0000000000
--- a/VECTOAux/VectoAuxiliaries/My Project/Application.Designer.vb
+++ /dev/null
@@ -1,13 +0,0 @@
-'------------------------------------------------------------------------------
-' <auto-generated>
-' Dieser Code wurde von einem Tool generiert.
-' Laufzeitversion:4.0.30319.42000
-'
-' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-' der Code erneut generiert wird.
-' </auto-generated>
-'------------------------------------------------------------------------------
-
-Option Strict On
-Option Explicit On
-
diff --git a/VECTOAux/VectoAuxiliaries/My Project/Application.myapp b/VECTOAux/VectoAuxiliaries/My Project/Application.myapp
deleted file mode 100644
index 758895def2..0000000000
--- a/VECTOAux/VectoAuxiliaries/My Project/Application.myapp
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<MyApplicationData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <MySubMain>false</MySubMain>
- <SingleInstance>false</SingleInstance>
- <ShutdownMode>0</ShutdownMode>
- <EnableVisualStyles>true</EnableVisualStyles>
- <AuthenticationMode>0</AuthenticationMode>
- <ApplicationType>1</ApplicationType>
- <SaveMySettingsOnExit>true</SaveMySettingsOnExit>
-</MyApplicationData>
diff --git a/VECTOAux/VectoAuxiliaries/My Project/AssemblyInfo.vb b/VECTOAux/VectoAuxiliaries/My Project/AssemblyInfo.vb
deleted file mode 100644
index e1d034d5f3..0000000000
--- a/VECTOAux/VectoAuxiliaries/My Project/AssemblyInfo.vb
+++ /dev/null
@@ -1,34 +0,0 @@
-Imports System.Reflection
-Imports System.Runtime.InteropServices
-
-' General Information about an assembly is controlled through the following
-' set of attributes. Change these attribute values to modify the information
-' associated with an assembly.
-
-' Review the values of the assembly attributes
-
-<Assembly: AssemblyTitle("VectoAuxiliaries")>
-<Assembly: AssemblyDescription("")>
-<Assembly: AssemblyCompany("")>
-<Assembly: AssemblyProduct("VectoAuxiliaries")>
-<Assembly: AssemblyCopyright("Copyright © 2014")>
-<Assembly: AssemblyTrademark("")>
-
-<Assembly: ComVisible(False)>
-
-'The following GUID is for the ID of the typelib if this project is exposed to COM
-<Assembly: Guid("5f94e0a5-9d00-4302-90a4-a73af909bb2c")>
-
-' Version information for an assembly consists of the following four values:
-'
-' Major Version
-' Minor Version
-' Build Number
-' Revision
-'
-' You can specify all the values or you can default the Build and Revision Numbers
-' by using the '*' as shown below:
-' <Assembly: AssemblyVersion("1.0.*")>
-
-<Assembly: AssemblyVersion("1.0.0.0")>
-<Assembly: AssemblyFileVersion("1.0.0.0")>
diff --git a/VECTOAux/VectoAuxiliaries/My Project/Resources.Designer.vb b/VECTOAux/VectoAuxiliaries/My Project/Resources.Designer.vb
deleted file mode 100644
index 02dcd6f1f6..0000000000
--- a/VECTOAux/VectoAuxiliaries/My Project/Resources.Designer.vb
+++ /dev/null
@@ -1,160 +0,0 @@
-'------------------------------------------------------------------------------
-' <auto-generated>
-' This code was generated by a tool.
-' Runtime Version:4.0.30319.42000
-'
-' Changes to this file may cause incorrect behavior and will be lost if
-' the code is regenerated.
-' </auto-generated>
-'------------------------------------------------------------------------------
-
-Option Strict On
-Option Explicit On
-
-
-Namespace My.Resources
-
- 'This class was auto-generated by the StronglyTypedResourceBuilder
- 'class via a tool like ResGen or Visual Studio.
- 'To add or remove a member, edit your .ResX file then rerun ResGen
- 'with the /str option, or rebuild your VS project.
- '''<summary>
- ''' A strongly-typed resource class, for looking up localized strings, etc.
- '''</summary>
- <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"), _
- Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
- Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
- Global.Microsoft.VisualBasic.HideModuleNameAttribute()> _
- Friend Module Resources
-
- Private resourceMan As Global.System.Resources.ResourceManager
-
- Private resourceCulture As Global.System.Globalization.CultureInfo
-
- '''<summary>
- ''' Returns the cached ResourceManager instance used by this class.
- '''</summary>
- <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
- Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
- Get
- If Object.ReferenceEquals(resourceMan, Nothing) Then
- Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("VectoAuxiliaries.Resources", GetType(Resources).Assembly)
- resourceMan = temp
- End If
- Return resourceMan
- End Get
- End Property
-
- '''<summary>
- ''' Overrides the current thread's CurrentUICulture property for all
- ''' resource lookups using this strongly typed resource class.
- '''</summary>
- <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
- Friend Property Culture() As Global.System.Globalization.CultureInfo
- Get
- Return resourceCulture
- End Get
- Set
- resourceCulture = value
- End Set
- End Property
-
- '''<summary>
- ''' Looks up a localized resource of type System.Drawing.Bitmap.
- '''</summary>
- Friend ReadOnly Property Blank() As System.Drawing.Bitmap
- Get
- Dim obj As Object = ResourceManager.GetObject("Blank", resourceCulture)
- Return CType(obj,System.Drawing.Bitmap)
- End Get
- End Property
-
- '''<summary>
- ''' Looks up a localized resource of type System.Drawing.Bitmap.
- '''</summary>
- Friend ReadOnly Property Delete() As System.Drawing.Bitmap
- Get
- Dim obj As Object = ResourceManager.GetObject("Delete", resourceCulture)
- Return CType(obj,System.Drawing.Bitmap)
- End Get
- End Property
-
- '''<summary>
- ''' Looks up a localized resource of type System.Drawing.Bitmap.
- '''</summary>
- Friend ReadOnly Property desktop() As System.Drawing.Bitmap
- Get
- Dim obj As Object = ResourceManager.GetObject("desktop", resourceCulture)
- Return CType(obj,System.Drawing.Bitmap)
- End Get
- End Property
-
- '''<summary>
- ''' Looks up a localized string similar to EngineStopStart.
- '''</summary>
- Friend ReadOnly Property DriverModel_EngineStopStart() As String
- Get
- Return ResourceManager.GetString("DriverModel_EngineStopStart", resourceCulture)
- End Get
- End Property
-
- '''<summary>
- ''' Looks up a localized resource of type System.Drawing.Bitmap.
- '''</summary>
- Friend ReadOnly Property favorites() As System.Drawing.Bitmap
- Get
- Dim obj As Object = ResourceManager.GetObject("favorites", resourceCulture)
- Return CType(obj,System.Drawing.Bitmap)
- End Get
- End Property
-
- '''<summary>
- ''' Looks up a localized resource of type System.Drawing.Bitmap.
- '''</summary>
- Friend ReadOnly Property file_history() As System.Drawing.Bitmap
- Get
- Dim obj As Object = ResourceManager.GetObject("file_history", resourceCulture)
- Return CType(obj,System.Drawing.Bitmap)
- End Get
- End Property
-
- '''<summary>
- ''' Looks up a localized resource of type System.Drawing.Bitmap.
- '''</summary>
- Friend ReadOnly Property Info() As System.Drawing.Bitmap
- Get
- Dim obj As Object = ResourceManager.GetObject("Info", resourceCulture)
- Return CType(obj,System.Drawing.Bitmap)
- End Get
- End Property
-
- '''<summary>
- ''' Looks up a localized string similar to MaxTCSpeed.
- '''</summary>
- Friend ReadOnly Property MaxTCSpeed() As String
- Get
- Return ResourceManager.GetString("MaxTCSpeed", resourceCulture)
- End Get
- End Property
-
- '''<summary>
- ''' Looks up a localized resource of type System.Drawing.Bitmap.
- '''</summary>
- Friend ReadOnly Property new_dir() As System.Drawing.Bitmap
- Get
- Dim obj As Object = ResourceManager.GetObject("new_dir", resourceCulture)
- Return CType(obj,System.Drawing.Bitmap)
- End Get
- End Property
-
- '''<summary>
- ''' Looks up a localized resource of type System.Drawing.Bitmap.
- '''</summary>
- Friend ReadOnly Property Open_icon() As System.Drawing.Bitmap
- Get
- Dim obj As Object = ResourceManager.GetObject("Open_icon", resourceCulture)
- Return CType(obj,System.Drawing.Bitmap)
- End Get
- End Property
- End Module
-End Namespace
diff --git a/VECTOAux/VectoAuxiliaries/My Project/Resources.resx b/VECTOAux/VectoAuxiliaries/My Project/Resources.resx
deleted file mode 100644
index bf215fda72..0000000000
--- a/VECTOAux/VectoAuxiliaries/My Project/Resources.resx
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
- <xsd:attribute name="mimetype" type="xsd:string" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string" />
- <xsd:attribute name="name" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="Blank" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\Blank.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="Delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Images\Delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="desktop" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\desktop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="favorites" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\favorites.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="file_history" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\file-history.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="Info" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\Info.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="new_dir" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\new_dir.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="Open_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\Open-icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="MaxTCSpeed" xml:space="preserve">
- <value>MaxTCSpeed</value>
- </data>
- <data name="DriverModel_EngineStopStart" xml:space="preserve">
- <value>EngineStopStart</value>
- </data>
-</root>
\ No newline at end of file
diff --git a/VECTOAux/VectoAuxiliaries/My Project/Settings.Designer.vb b/VECTOAux/VectoAuxiliaries/My Project/Settings.Designer.vb
deleted file mode 100644
index 950881703c..0000000000
--- a/VECTOAux/VectoAuxiliaries/My Project/Settings.Designer.vb
+++ /dev/null
@@ -1,73 +0,0 @@
-'------------------------------------------------------------------------------
-' <auto-generated>
-' Dieser Code wurde von einem Tool generiert.
-' Laufzeitversion:4.0.30319.42000
-'
-' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-' der Code erneut generiert wird.
-' </auto-generated>
-'------------------------------------------------------------------------------
-
-Option Strict On
-Option Explicit On
-
-
-Namespace My
-
- <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
- Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0"), _
- Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
- Partial Friend NotInheritable Class MySettings
- Inherits Global.System.Configuration.ApplicationSettingsBase
-
- Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
-
-#Region "Funktion zum automatischen Speichern von My.Settings"
-#If _MyType = "WindowsForms" Then
- Private Shared addedHandler As Boolean
-
- Private Shared addedHandlerLockObject As New Object
-
- <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
- Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs)
- If My.Application.SaveMySettingsOnExit Then
- My.Settings.Save()
- End If
- End Sub
-#End If
-#End Region
-
- Public Shared ReadOnly Property [Default]() As MySettings
- Get
-
-#If _MyType = "WindowsForms" Then
- If Not addedHandler Then
- SyncLock addedHandlerLockObject
- If Not addedHandler Then
- AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings
- addedHandler = True
- End If
- End SyncLock
- End If
-#End If
- Return defaultInstance
- End Get
- End Property
- End Class
-End Namespace
-
-Namespace My
-
- <Global.Microsoft.VisualBasic.HideModuleNameAttribute(), _
- Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
- Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()> _
- Friend Module MySettingsProperty
-
- <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")> _
- Friend ReadOnly Property Settings() As Global.VectoAuxiliaries.My.MySettings
- Get
- Return Global.VectoAuxiliaries.My.MySettings.Default
- End Get
- End Property
- End Module
-End Namespace
diff --git a/VECTOAux/VectoAuxiliaries/My Project/Settings.settings b/VECTOAux/VectoAuxiliaries/My Project/Settings.settings
deleted file mode 100644
index 1aea3ac9cc..0000000000
--- a/VECTOAux/VectoAuxiliaries/My Project/Settings.settings
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)"
- UseMySettingsClassName="true">
- <Profiles>
- <Profile Name="(Default)" />
- </Profiles>
- <Settings />
-</SettingsFile>
\ No newline at end of file
diff --git a/VECTOAux/VectoAuxiliaries/Resources/Blank.bmp b/VECTOAux/VectoAuxiliaries/Resources/Blank.bmp
deleted file mode 100644
index 3356cb1a16ef78415ac26ff4ddfe2ec06e7f5e1a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 4150
zcmeIuK@9*P3`5ajfFOY*3MPO%uJHxUh6?hVbXl)&E^iib-J$l^5}$^$Yc`kJAqXIV
V00IagfB*srAb<b@2q5sizy)IH^cnyF
diff --git a/VECTOAux/VectoAuxiliaries/Resources/Image1.png b/VECTOAux/VectoAuxiliaries/Resources/Image1.png
deleted file mode 100644
index 3e9d6ed41b4901ee2e3811ef6e85df0978acf1d2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 233
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1SD@H<Xr$#jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCijSl0AZa85pY67#JE_7#My5g&JNkFq8sKd6mGxU^Rn*LA+qju0R{0M7pPo
zV@QPi+e;e-85DU~3}5We_#b?58J|m4r~8|^GdI8b%f7ZM{i^Bv-7+FfEn0$3EnW-C
wcm=f@Z<)HRV9B~Juuy14tTTSW>!x2AA6$+S6}hN-9%v<lr>mdKI;Vst04O9%8~^|S
diff --git a/VECTOAux/VectoAuxiliaries/Resources/Info.bmp b/VECTOAux/VectoAuxiliaries/Resources/Info.bmp
deleted file mode 100644
index c87470c216723cf67cf853cec686934aee6c9c66..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 4150
zcmZ?rH4|U}12Z700mKSW%m`)yIY4lP4}u{)28REmU^E0qLtw~+!0T^3|8Ze@cmkK*
zAaQztQTs>ZA6FU}O@Fix0bF4}n*T@3Kia3h|2XTuk&^!C5yperj=@m=U<)65roVx<
PA6Fb;bJwWY;0^%*r<-Z|
diff --git a/VECTOAux/VectoAuxiliaries/Resources/Open-icon.png b/VECTOAux/VectoAuxiliaries/Resources/Open-icon.png
deleted file mode 100644
index 5b25c5b924bd2a400e3b1a24887bad98d10b5ad2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 786
zcmV+t1MU2YP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0008nNkl<Zc-oDV
zO-vI(6vzMDZNUJgB@iJR`4Ef9H$frsK*V57{7BGvlY@k-Mo2K4s0WSVf+iZHC;2#u
za4}M2q6tC~1H=d=<ug>I<x2$G?Uq8j%g#ET7A*1NOI~K?&3nK3znNWbsIz(mK#`W$
zK&z$BbKp1*k*3kGwV)_!eeQ*pw#Yq>0@Tv;1z25hLHH%Yy&@vvU?!5%a@e?IesK-<
zz78S(Vr#-bfaB-#0W}oZmK6vTGG|*r>4`#`5zaKE!)$5CZC@X@{p9IPt*d?)P;xep
z<){o2A`O2UM^V;(1X~NYfOk`NG<Yr8BHQ3auGd-TsbGNO%3NBe?y3lywR-}2hm*il
zKy(z(Vk6TlxboXvv8j=JB&t;B<{vOXVa2iV=^+8Zsm(HpqiKoIX*oDmFK#&o!EFKN
z>TxdRS=?KXK2WvK$qNjSU!F|?Dk4RU_fI3^fDsNNqG4qKH%~vpE6YoKxNPB)8)JLK
z6zLT2;6ithb2961vC5jk)Zh#@4GLZ;3%FW#1HJR_(e<?po9^v4C6-+C8Dwzw@FixK
znV15Vgn9^y>HcoT8@&tH%kQIO@;OFVMzB1)0a>F!idV29%OI0#2w*D7q{ZPDs0X$J
zsC9hAoik17oOlAedj?)9fDK97b>D^zWtj9bKxSbEJ3Xl4=hz&B+|$@_<WLG$15R2j
z?E!c<sgFv6B9hQEX5^)V5S6KLPC2peA#f-nUK1N)(zQ@^U;sh%V|{)Lq9ZV;_{k-?
znOGShH9M6R2O*301uU=0@JlLUj5;(4{UB*{FN$Dh$c6fZ65Or-!bN_{?)XH5G0vc8
zkmb2WO#WDh*C!!4F&5E!9uJoWpqK!s&4W(U#p24EPHQB<NXJ%Pl&(sjV1(!r&~6^9
zd))HPOyje`q`0~$qau-3C7=pYvr@C?XWE%iP*o5_-8f)fDyVDxY{P%pA3>9tEbk%O
QBLDyZ07*qoM6N<$g6<?}N&o-=
diff --git a/VECTOAux/VectoAuxiliaries/Resources/desktop.png b/VECTOAux/VectoAuxiliaries/Resources/desktop.png
deleted file mode 100644
index 59c84dc6b7c229730f174dd03f2987f674fc6e20..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 642
zcmV-|0)737P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006>Nkl<Zc-qC&
zTS(Jk9L8~PgFw29pqqla@WKwXF`YIohm%s$wK6*(R$3_@n{&AgNz(;sU^7pcR-zDs
zXkuye?{T<1&oZ5dbkjA2iV6z4`L;%BvkNb}=!J*(;^q1LZho(q*MC2cTKZU@x>gfS
z#zBk&6AVpQnVwr@amj&w*~#pJgV8rOguxk_x+if1n+_DPS)#|=|2A6>7qdOIm>ow;
z*d1xWM^(z6m@@p%R}m0jP0*DZ<jJ+f<ka)T_-YM^(sZD@*2&47E{^L2j%fvsWC?_3
z8VOMwQMlg1bX`Q`cB8!2M{Hgr_3f75Kp{%a3nDe0u3``2+CCJTenMP1l-W<P>ki8?
z6OlKFQa?;|(I^-6t<*gm{{@KjgkN<{Nf%J4O~}<|S8<pi%@_x>#t7C~h$x&wdB@7B
zl3C7`z2)*<!4r@tw<AjukfjX}kTHV4`Zdz5DFU;t$ZyUORct5P;NWb9len4{k_;wK
zK$_5o=wc`0L^GmP3!?OCB-(joHx>ykSVDDgh0_)9iGA>q_`1)eR1A3nK2eqIimb&q
zegNOZ3HGMV;+JhBD0dl!-pPs551gs`MBKwKTx$4AYUPM0kW~JhjOOo%3L&AomwoF1
z)nCBq8eq6z?k<0md80AycO!ZE`5R^x$kgiGrESfCHHMujJ&48P4YLYJrBVW~H@J&i
zl=b)&^&*i-HjEp1{Is9Oj+eBX#xajiGdZ)sf_)jg!^ynu9TuyNo{>3PdMDkR_p|h8
c{`oWh09p_ty(6?-mH+?%07*qoM6N<$f(mUfGynhq
diff --git a/VECTOAux/VectoAuxiliaries/Resources/favorites.png b/VECTOAux/VectoAuxiliaries/Resources/favorites.png
deleted file mode 100644
index 12d6fc99713d7cfe23191a759747818531d77731..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 850
zcmV-Y1FigtP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0009SNkl<Zc-no_
zTTByH7{GC|ERF}wo`w&)EK#->QPXTO#5s(JGudKfF`03qCXndlVQvc9)Dlq{=;j6I
z#<T`6Lt%i(u;PXaUQ$5Y(w5%16k2S7mR@LqmePXz@6ZQh)$Al+a?VM<-*>JF38MLQ
zB~G8V*zN8(!iee+t|wB4+xIirnvea_cRYRY4YuZ7`tR<vTAFh56JBltAm}K^XE=^W
z^aC~-Rzn%l$rhePA3cw$F*&_|@36iWm=52HMc7}1&r&*D4U_s8#yoPKO`DmC8i@w~
zp}R4Q{{^C<2Bs!%U}?&xv;73dC#9mgm6=FC;Xngj@-43cw8ccjaw4I>L~<RIfoghg
zZ%3yn!O(h&kZc=)vMfUGYD^7Zz6y9XMMQ%2gvYNl>Hm|U_bOetwxW4hguYn-g~@pH
z78118i23cW0v>Vt;jvmm{wgNC6^ywqV!F9mtU!jgQp$9-gvmcr8CPG%XOq);ePdZ1
zFrq3XG+N1o=ZZ)!$3J)uWBn$S^(C}R*8)E?GqN9V`4>!B1yHe$-pn_bnLeE(i2*KU
z0psq=1e_Nbb(G;9ID@_}6UCkn&{S;@Kof-W2;W)7=<lhxN*7}LdLH`pIdw6>`S>7#
zVHrNhZ+L8_j97j`SGxg&Di^b+09+z00&=g1rz;t+e2>1Yxp#DFZ+#pChT49>Xa5zC
z^%O44afZ8!&{ls&+tKA18#6?b*oO5({xzoHzqAbfk16p7IjG3P-G35S?=gnVM{pPl
z=%`xHL#YJw?T^4I5nGTDQ7lGxbO-8d8S%jEdw2E}Gh{l9T`y%o^F8Xybv!<?2y^{X
z9QkkKJv|?~mS8@dit55A@xbh788jAR?>xXjM?O~Nx2UeBqd4>~E&JZ5??wi_vX$7S
z3$P!YkE$SLI1aG2<kHu&i=O5jx|_4<zMqY<Vhy!9$uyo_jq2Lk7^pnI3jLO(h<am^
zx-~iRjpsoBy<P8gH*Q-k?tZtn=JWHaE9uJiOKDTZUnOTA+p{9+#bRws64ONTUd5us
cxwGT{0I=j};`IYJq5uE@07*qoM6N<$g2Anq_y7O^
diff --git a/VECTOAux/VectoAuxiliaries/Resources/file-history.png b/VECTOAux/VectoAuxiliaries/Resources/file-history.png
deleted file mode 100644
index 8dbe20e0272030574f39f5c471d48a20744f7c7d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 757
zcmV<R0t)?!P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0008KNkl<Zc-pm-
zT}+Zu7{|G)3omSa+_buJ-L%!Z?aHhcEpz466iv(NYE7GjGn<VvT$r}ya;Z5#rl~Ah
z%t$7p6riPOkS_=b@#4!@@FGHfq^a{9o&cAdecsgBp3C3w{Lgcqhr#$CN9L5oHrXEM
zJfg~<+#(947o|y7ZY%d`Q*&D$`v!Z*A7QEc<>@k0!4&6X4qR1aK$)xr21f``Y9>K3
zMu4zK>|t{_Nxy`9riCZ(TW_x2c3y!3c@DIwTQNPmfGX;rf!*svLs~tKh-3;SW)~M{
zY=IL5NB0&Hmz`yF9%L)dK$VJ*J^o;{A_9xuiH$Z2zaxzJEn$KlN#9aoQPF`-!37nw
zl1-;W{tOe?L-`>(Fo)f~*^tBQ3q=IeE;qJN4s0YTELTs2ljxy>&wscn$R!iWl0_D<
zed+LEoELKY{n$m%gxp?#RA3~hk=|-U1{;Npb|=!BZP3=$MKI2b;x(Kl)_Un&Hk1al
z;kq*oE*Vcj>QFp%4~wu;t&2WkP_4zPa1TawMyv~`7&BQxA{+EEw(s1wD@)FFa@TX=
znk^Yvx?{kUAAwHgb4=(dRNEnfh~UT4TkY_wuWun5KlX6Up0xf1Pv%qt9G4x0hS!bQ
zWbz>Oq!H=K4T<OTJeprwMQb5IApm4^d7(ofux$2V-?`m!C&Y)GcYDi$ARK5k3~Njl
zWOlgGr@$NvE`3F-2!Dt12Qvx$>Z<lFUs>BwS2z4#4=U{>9@TH$PSG<c@MRgTu49C8
z2tioj^#?&D7Oy0yq{RI+OoDFVfJ#Han{gfJtQ7W!qX!n3qafv`v4i$Que2X$WU^9!
zJI>WLHN}#FfrT-H1$3kX3|0r2?Jh8oc6cEc)9G1R%)c(w9UgB#_a3jXw!U82-q|_P
n*xb@zQCZ1KOgbC$PdE1)>J$2kMUY_>00000NkvXXu0mjfH-B3T
diff --git a/VECTOAux/VectoAuxiliaries/Resources/new_dir.png b/VECTOAux/VectoAuxiliaries/Resources/new_dir.png
deleted file mode 100644
index 1035fe49b199854810d1e6d33e91dfe338d3366f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 625
zcmV-%0*?KOP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006wNkl<Zc-rlf
zT}YF06vmgt#G8n`HjIL>C@M(1Nur<<32A5w>I`FB)2!JN8^u^CRF)viT7GQlD9lKR
z7JV>-V#Z9w*8FJbHrw1s+q-vrUHhu`?&)uWxQl|i?!dV?hx2<l=izWT|KpEg(o46;
z-TghuuvxP}*&eEUo3H+M7#No0$CLXB-@U<aUeypwDW3)`m)(oA^$1Q@BV;-Oc=_17
zCs&jXG7nD1oJuWaRi;ArcF?n}2w1PdZ&AQEeF>hA7vM3SVd+T$;6Dd~6r>3R=k6%t
z9u>m#HxT?pAagUmjGu*TR0!w08aUooU~aey)bwd+jXY%T%o3yt*x%o*N(MBDEZim{
z?JR9+fq&{E>zk0kJyyrMMr+|V)UrkcA4kUy;rOEiae}Q|5qLe=v>%KX2~Rho&Q37)
z<xMEEiT6Vz=<#~Qi~^Y62q3UmpnTv6L$I|g0_wKv9EAGu-P?nNyNiu}Rw86;V*@jC
zgr{U|x1NV$eIYBF;GreZz+PvhDXERmi04aV1mC=DWO4u?XQZfJ#NBrhaddzoMn)}H
zaLZ5*k*gB&m>9B94J33Kgj5MiJ%vk#9{wfJ)ggX9@}kv2Sv654bpZPq_^JlzPMAl|
z<CLTTeAzBECMr`!L-~=64V=EroQyt#Ze8ssmt^)*lgs56?bw#vP*#$!R5TrXsZ$GP
zUg?A(zONYjRC$YJChPCtat$Z%;IrM>SeH$cYW=@{_a>5CRyTeEg)&%nu0G8K00000
LNkvXXu0mjf^Clv6
diff --git a/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj b/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
deleted file mode 100644
index d359c4c660..0000000000
--- a/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProjectGuid>{FDEEE460-0B8A-4EF6-8D9E-72F203A50F65}</ProjectGuid>
- <OutputType>Library</OutputType>
- <RootNamespace>VectoAuxiliaries</RootNamespace>
- <AssemblyName>BusAuxiliariesGUI</AssemblyName>
- <FileAlignment>512</FileAlignment>
- <MyType>Windows</MyType>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
- <TargetFrameworkProfile />
- <SccProjectName>
- </SccProjectName>
- <SccLocalPath>
- </SccLocalPath>
- <SccAuxPath>
- </SccAuxPath>
- <SccProvider>
- </SccProvider>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <DefineDebug>true</DefineDebug>
- <DefineTrace>true</DefineTrace>
- <OutputPath>bin\Debug\</OutputPath>
- <DocumentationFile>BusAuxiliariesGUI.xml</DocumentationFile>
- <NoWarn>
- </NoWarn>
- <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
- <Prefer32Bit>false</Prefer32Bit>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <DefineDebug>false</DefineDebug>
- <DefineTrace>true</DefineTrace>
- <Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
- <DocumentationFile>BusAuxiliariesGUI.xml</DocumentationFile>
- <NoWarn>
- </NoWarn>
- <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
- <Prefer32Bit>false</Prefer32Bit>
- </PropertyGroup>
- <PropertyGroup>
- <OptionExplicit>On</OptionExplicit>
- </PropertyGroup>
- <PropertyGroup>
- <OptionCompare>Binary</OptionCompare>
- </PropertyGroup>
- <PropertyGroup>
- <OptionStrict>On</OptionStrict>
- </PropertyGroup>
- <PropertyGroup>
- <OptionInfer>Off</OptionInfer>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\packages\Newtonsoft.Json.8.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
- </Reference>
- <Reference Include="Omu.ValueInjecter, Version=3.1.1.0, Culture=neutral, PublicKeyToken=c7694541b0ac80e4, processorArchitecture=MSIL">
- <HintPath>..\..\packages\ValueInjecter.3.1.1.5\lib\net40\Omu.ValueInjecter.dll</HintPath>
- <Private>True</Private>
- </Reference>
- <Reference Include="System" />
- <Reference Include="System.Data" />
- <Reference Include="System.Drawing" />
- <Reference Include="System.Runtime.Serialization" />
- <Reference Include="System.Security" />
- <Reference Include="System.Web.Services" />
- <Reference Include="System.Windows.Forms" />
- <Reference Include="System.Xml" />
- <Reference Include="System.Core" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
- </ItemGroup>
- <ItemGroup>
- <Import Include="Microsoft.VisualBasic" />
- <Import Include="System" />
- <Import Include="System.Collections" />
- <Import Include="System.Collections.Generic" />
- <Import Include="System.Data" />
- <Import Include="System.Diagnostics" />
- <Import Include="System.Linq" />
- <Import Include="System.Xml.Linq" />
- <Import Include="System.Threading.Tasks" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="My Project\AssemblyInfo.vb" />
- <Compile Include="My Project\Application.Designer.vb">
- <AutoGen>True</AutoGen>
- <DependentUpon>Application.myapp</DependentUpon>
- </Compile>
- <Compile Include="My Project\Resources.Designer.vb">
- <AutoGen>True</AutoGen>
- <DesignTime>True</DesignTime>
- <DependentUpon>Resources.resx</DependentUpon>
- </Compile>
- <Compile Include="My Project\Settings.Designer.vb">
- <AutoGen>True</AutoGen>
- <DependentUpon>Settings.settings</DependentUpon>
- <DesignTimeSharedInput>True</DesignTimeSharedInput>
- </Compile>
- <Compile Include="UI\cFileBrowser.vb" />
- <Compile Include="UI\FB_Dialog.designer.vb">
- <DependentUpon>FB_Dialog.vb</DependentUpon>
- </Compile>
- <Compile Include="UI\FB_Dialog.vb">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="UI\FB_FavDlog.designer.vb">
- <DependentUpon>FB_FavDlog.vb</DependentUpon>
- </Compile>
- <Compile Include="UI\FB_FavDlog.vb">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="UI\frmAuxiliaryConfig.Designer.vb">
- <DependentUpon>frmAuxiliaryConfig.vb</DependentUpon>
- </Compile>
- <Compile Include="UI\frmAuxiliaryConfig.vb">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="UI\FB_Global.vb" />
- <Compile Include="UI\frmCombinedAlternators.Designer.vb">
- <DependentUpon>frmCombinedAlternators.vb</DependentUpon>
- </Compile>
- <Compile Include="UI\frmCombinedAlternators.vb">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="UI\frmHVACTool.Designer.vb">
- <DependentUpon>frmHVACTool.vb</DependentUpon>
- </Compile>
- <Compile Include="UI\frmHVACTool.vb">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="UI\VECTO_Types.vb" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="My Project\Resources.resx">
- <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
- <LastGenOutput>Resources.Designer.vb</LastGenOutput>
- <CustomToolNamespace>My.Resources</CustomToolNamespace>
- <SubType>Designer</SubType>
- </EmbeddedResource>
- <EmbeddedResource Include="UI\FB_Dialog.resx">
- <DependentUpon>FB_Dialog.vb</DependentUpon>
- <SubType>Designer</SubType>
- </EmbeddedResource>
- <EmbeddedResource Include="UI\FB_FavDlog.resx">
- <DependentUpon>FB_FavDlog.vb</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="UI\frmAuxiliaryConfig.resx">
- <DependentUpon>frmAuxiliaryConfig.vb</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="UI\frmCombinedAlternators.resx">
- <DependentUpon>frmCombinedAlternators.vb</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="UI\frmHVACTool.resx">
- <DependentUpon>frmHVACTool.vb</DependentUpon>
- </EmbeddedResource>
- </ItemGroup>
- <ItemGroup>
- <None Include="My Project\Application.myapp">
- <Generator>MyApplicationCodeGenerator</Generator>
- <LastGenOutput>Application.Designer.vb</LastGenOutput>
- </None>
- <None Include="My Project\Settings.settings">
- <Generator>SettingsSingleFileGenerator</Generator>
- <CustomToolNamespace>My</CustomToolNamespace>
- <LastGenOutput>Settings.Designer.vb</LastGenOutput>
- </None>
- <None Include="packages.config">
- <SubType>Designer</SubType>
- </None>
- </ItemGroup>
- <ItemGroup />
- <ItemGroup>
- <None Include="Images\application-export-icon-small.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\Blank.bmp" />
- <None Include="Images\Delete1.png" />
- <None Include="Resources\Info.bmp" />
- <None Include="Resources\Image1.png" />
- <Resource Include="Images\Delete.png">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </Resource>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\VectoCommon\VectoCommon\VectoCommon.csproj">
- <Project>{79A066AD-69A9-4223-90F6-6ED5D2D084F4}</Project>
- <Name>VectoCommon</Name>
- </ProjectReference>
- <ProjectReference Include="..\BusAuxiliaries\BusAuxiliaries.csproj">
- <Project>{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}</Project>
- <Name>BusAuxiliaries</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\Open-icon.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\new_dir.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\desktop.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\favorites.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\file-history.png" />
- </ItemGroup>
- <Import Project="$(MSBuildToolsPath)\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.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- -->
-</Project>
\ No newline at end of file
diff --git a/VECTOAux/VectoAuxiliaries/packages.config b/VECTOAux/VectoAuxiliaries/packages.config
deleted file mode 100644
index ae14addfc3..0000000000
--- a/VECTOAux/VectoAuxiliaries/packages.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<packages>
- <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net40" requireReinstallation="True" />
- <package id="ValueInjecter" version="3.1.1.5" targetFramework="net45" />
-</packages>
\ No newline at end of file
--
GitLab