Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit 94f37b30 authored by Harald Martini's avatar Harald Martini
Browse files

dont write angledrive component if Angledrive.Type == NONE

parent 5bc4c7d8
No related branches found
No related tags found
No related merge requests found
...@@ -17,8 +17,9 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF ...@@ -17,8 +17,9 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
public XElement GetElement(IDeclarationInputDataProvider inputData) public XElement GetElement(IDeclarationInputDataProvider inputData)
{ {
var angelDrive = inputData.JobInputData.Vehicle.Components.AngledriveInputData; var angelDrive = inputData.JobInputData.Vehicle.Components.AngledriveInputData;
if (angelDrive == null) if (angelDrive?.Type == AngledriveType.None || angelDrive == null) {
return null; return null;
}
return new XElement(_vif + XMLNames.Component_Angledrive, return new XElement(_vif + XMLNames.Component_Angledrive,
new XElement(_vif + XMLNames.ComponentDataWrapper, new XElement(_vif + XMLNames.ComponentDataWrapper,
......
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Xml.Linq;
using TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Interfaces; using TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Interfaces;
using TUGraz.VectoCore.Models.Declaration; using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.Simulation.Data; using TUGraz.VectoCore.Models.Simulation.Data;
...@@ -14,21 +15,56 @@ namespace TUGraz.VectoCore.OutputData.XML ...@@ -14,21 +15,56 @@ namespace TUGraz.VectoCore.OutputData.XML
/// <summary> /// <summary>
/// Create MRF and VIF for primary bus /// Create MRF and VIF for primary bus
/// </summary> /// </summary>
public class XMLDeclarationReportPrimaryVehicle_09 : XMLDeclarationReportPrimaryVehicle public class XMLDeclarationReportPrimaryVehicle_09 : XMLDeclarationReport09
{ {
private readonly IManufacturerReportFactory _mrfFactory; private readonly IManufacturerReportFactory _mrfFactory;
private readonly IVIFReportFactory _vifFactory; private readonly IVIFReportFactory _vifFactory;
protected IXMLVehicleInformationFile VehicleInformationFile;
public override XDocument CustomerReport => null;
public override XDocument PrimaryVehicleReport => VehicleInformationFile?.Report;
public XMLDeclarationReportPrimaryVehicle_09(IReportWriter writer, public XMLDeclarationReportPrimaryVehicle_09(IReportWriter writer,
IManufacturerReportFactory mrfFactory, IManufacturerReportFactory mrfFactory,
ICustomerInformationFileFactory cifFactory, ICustomerInformationFileFactory cifFactory,
IVIFReportFactory vifFactory) : base(writer) IVIFReportFactory vifFactory) : base(writer, mrfFactory, cifFactory)
{ {
_mrfFactory = mrfFactory; _mrfFactory = mrfFactory;
//_cifFactory = cifFactory; //_cifFactory = cifFactory;
_vifFactory = vifFactory; _vifFactory = vifFactory;
} }
public override void InitializeReport(VectoRunData modelData, List<List<FuelData.Entry>> fuelModes)
{
base.InitializeReport(modelData, fuelModes);
VehicleInformationFile.Initialize(modelData, fuelModes);
}
protected override void WriteResult(ResultEntry result)
{
base.WriteResult(result);
VehicleInformationFile.WriteResult(result);
}
protected override void GenerateReports()
{
ManufacturerRpt.GenerateReport();
var fullReportHash = GetSignature(ManufacturerRpt.Report);
CustomerRpt.GenerateReport(fullReportHash);
VehicleInformationFile.GenerateReport(fullReportHash);
}
protected override void OutputReports()
{
Writer.WriteReport(ReportType.DeclarationReportManufacturerXML, ManufacturerRpt.Report);
Writer.WriteReport(ReportType.DeclarationReportPrimaryVehicleXML, VehicleInformationFile.Report);
}
...@@ -63,7 +99,7 @@ namespace TUGraz.VectoCore.OutputData.XML ...@@ -63,7 +99,7 @@ namespace TUGraz.VectoCore.OutputData.XML
/// <summary> /// <summary>
/// Create VIF of an interim (or the complete(d) step /// Create VIF of an interim (or the complete(d) step
/// </summary> /// </summary>
public class XMLDeclarationReportInterimVehicle_09 : XMLDeclarationReport public class XMLDeclarationReportInterimVehicle_09 : XMLDeclarationReport09
{ {
protected readonly IVIFReportFactory _vifFactory; protected readonly IVIFReportFactory _vifFactory;
...@@ -73,7 +109,7 @@ namespace TUGraz.VectoCore.OutputData.XML ...@@ -73,7 +109,7 @@ namespace TUGraz.VectoCore.OutputData.XML
public XMLDeclarationReportInterimVehicle_09(IReportWriter writer, public XMLDeclarationReportInterimVehicle_09(IReportWriter writer,
IManufacturerReportFactory mrfFactory, IManufacturerReportFactory mrfFactory,
ICustomerInformationFileFactory cifFactory, ICustomerInformationFileFactory cifFactory,
IVIFReportFactory vifFactory, IVIFReportInterimFactory interimFactory) : base(writer) IVIFReportFactory vifFactory, IVIFReportInterimFactory interimFactory) : base(writer, mrfFactory, cifFactory)
{ {
_vifFactory = vifFactory; _vifFactory = vifFactory;
_interimFactory = interimFactory; _interimFactory = interimFactory;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment