diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/ComponentGroup.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/ComponentGroup.cs index 88572149f3d369c5b5e415258dbfe5670583beb7..8df3e7ff070f5da78b7901a769a5b0cf2eedf59f 100644 --- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/ComponentGroup.cs +++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/ComponentGroup.cs @@ -1,12 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Xml.Linq; +using System.Xml.Linq; using TUGraz.VectoCommon.InputData; using TUGraz.VectoCommon.Resources; -using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportGroupWriter; using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter; namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationFile.VehicleInformationFile_0_1 @@ -28,7 +22,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF #endregion } - + public class ConventionalComponentVIFType : ComponentVIFType { @@ -88,10 +82,14 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF _vifReportFactory.GetEngineType().GetElement(inputData), _vifReportFactory.GetIepcType().GetElement(inputData), _vifReportFactory.GetElectricEnergyStorageType().GetElement(inputData), - _vifReportFactory.GetElectricMachineGENType().GetElement(inputData) - //_vifReportFactory().GetElement(inputData), - //_vifReportFactory.GetAxleWheelsType().GetElement(inputData), - //_vifReportFactory.GetAuxiliaryType().GetElement(inputData)); + _vifReportFactory.GetElectricMachineGENType().GetElement(inputData), + _vifReportFactory.GetElectricMachineType().GetElement(inputData), + _vifReportFactory.GetTransmissionType().GetElement(inputData), + _vifReportFactory.GetTorqueConvertType().GetElement(inputData), + _vifReportFactory.GetAngelDriveType().GetElement(inputData), + _vifReportFactory.GetAxlegearType().GetElement(inputData), + _vifReportFactory.GetAxleWheelsType().GetElement(inputData), + _vifReportFactory.GetAuxiliaryHevPType().GetElement(inputData)); } #endregion diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/VIFNinjectModule.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/VIFNinjectModule.cs index 9a2d69977646e5070ec2e1f2396d73e68d95b365..e4c9dce18aab12eec83ecc9afa464c049640b905 100644 --- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/VIFNinjectModule.cs +++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/VIFNinjectModule.cs @@ -39,6 +39,10 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF Bind<IXmlTypeWriter>().To<HevIepcSComponentVIFType>().When(AccessedViaVIFFactory) .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetHevIepcSComponentVIFType()); + Bind<IXmlTypeWriter>().To<HevPxComponentVIFType>().When(AccessedViaVIFFactory) + .NamedLikeFactoryMethod((IVIFReportFactory f) => f.GetHevPxComponentVIFType()); + + #endregion #region Vehicle Group