Merge pull request #614 in VECTO/vecto-sim from...

Merge pull request #614 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-699-output-in-manufacturer-report-and-customer-report-units to develop

* commit '6a404a9c':
  update css for report
  adapt generate xml output to new schema
  new schema version for report xmls

Documentation/XML/CSS/VectoReports.css

@@ -59,6 +59,9 @@ VectoVTPReport TestConditions { display: none; }
 *[unit="MJ/kg"]:after { content: "MJ/kg" }
 *[unit="g/kWh"]:after { content: "g/kWh" }
 *[unit="rpm"]:after { content: "rpm" }
+*[unit="t"]:after { content: "t" }
+*[unit="ltr"]:after { content: "ltr" }
+
 
 
 Data {
@@ -198,13 +201,13 @@ Vehicle *:after {
 	padding-left: 0.3em; 
 	text-align: left;
 }
-Vehicle CurbMassChassis:after { content: "kg"; }
+/*Vehicle CurbMassChassis:after { content: "kg"; }
 Vehicle GrossVehicleMass:after { content: "kg"; }
 Vehicle RatedPower:after,
 Vehicle EngineRatedPower:after { content: "W"; }
 Vehicle Displacement:after,
 Vehicle EngineDisplacement:after { content: "cm³"; }
-
+*/
 Vehicle Components {
 	/*margin-left: 20px;*/
 	display: flex;

VECTO_XML-Schema.spp

@@ -23,6 +23,7 @@
 		<File FilePath="VectoCore\VectoCore\Resources\XSD\VectoInput.1.0.xsd" HomeFolder="Yes"/>
 		<File FilePath="VectoCore\VectoCore\Resources\XSD\VectoOutputCustomer.0.4.xsd" HomeFolder="Yes"/>
 		<File FilePath="VectoCore\VectoCore\Resources\XSD\VectoOutputManufacturer.0.4.xsd" HomeFolder="Yes"/>
+		<File FilePath="VectoCore\VectoCore\Resources\XSD\VectoOutputManufacturer.0.5.xsd" HomeFolder="Yes"/>
 		<File FilePath="VectoCore\VectoCore\Resources\XSD\VTPReport.0.1.xsd" HomeFolder="Yes"/>
 		<File FilePath="VectoCore\VectoCore\Resources\XSD\xmldsig-core-schema.xsd" HomeFolder="Yes"/>
 	</Folder>

VectoCore/VectoCore/OutputData/XML/XMLCustomerReport.cs

@@ -50,7 +50,7 @@ namespace TUGraz.VectoCore.OutputData.XML
 {
 	public class XMLCustomerReport
 	{
-		public const string CURRENT_SCHEMA_VERSION = "0.4";
+		public const string CURRENT_SCHEMA_VERSION = "0.5";
 
 		protected readonly XElement VehiclePart;
 
@@ -80,11 +80,11 @@ namespace TUGraz.VectoCore.OutputData.XML
 				new XElement(tns + XMLNames.Vehicle_LegislativeClass, modelData.VehicleData.LegislativeClass.ToXMLFormat()),
 				new XElement(tns + XMLNames.Report_Vehicle_VehicleGroup, modelData.VehicleData.VehicleClass.GetClassNumber()),
 				new XElement(tns + XMLNames.Vehicle_AxleConfiguration, modelData.VehicleData.AxleConfiguration.GetName()),
-				new XElement(tns + XMLNames.Vehicle_GrossVehicleMass, modelData.VehicleData.GrossVehicleWeight.ToXMLFormat(0)),
-				new XElement(tns + XMLNames.Vehicle_CurbMassChassis, modelData.VehicleData.CurbWeight.ToXMLFormat(0)),
-				new XElement(tns + XMLNames.Report_Vehicle_EngineRatedPower, modelData.EngineData.RatedPowerDeclared.ToXMLFormat(0)),
-				new XElement(tns + XMLNames.Report_Vehicle_EngineDisplacement,
-					modelData.EngineData.Displacement.ConvertToCubicCentiMeter().ToXMLFormat(0)),
+				new XElement(tns + XMLNames.Vehicle_GrossVehicleMass, XMLHelper.ValueAsUnit(modelData.VehicleData.GrossVehicleWeight, XMLNames.Unit_t, 1)),
+					
+				new XElement(tns + XMLNames.Vehicle_CurbMassChassis, XMLHelper.ValueAsUnit(modelData.VehicleData.CurbWeight, XMLNames.Unit_kg)),
+				new XElement(tns + XMLNames.Report_Vehicle_EngineRatedPower, XMLHelper.ValueAsUnit(modelData.EngineData.RatedPowerDeclared, XMLNames.Unit_kW)),
+				new XElement(tns + XMLNames.Report_Vehicle_EngineDisplacement, XMLHelper.ValueAsUnit(modelData.EngineData.Displacement, XMLNames.Unit_ltr, 1)),
 				new XElement(tns + XMLNames.Engine_FuelType, modelData.EngineData.FuelType.ToXMLFormat()),
 				new XElement(tns + XMLNames.Report_Vehicle_TransmissionCertificationMethod,
 					modelData.GearboxData.CertificationMethod.ToXMLFormat()),

VectoCore/VectoCore/Utils/XMLValidator.cs

@@ -52,7 +52,7 @@ namespace TUGraz.VectoCore.Utils
 			{XmlDocumentType.DeclarationComponentData, Tuple.Create("VectoComponent{0}.xsd", new [] {"1.0"}) },
 			{XmlDocumentType.EngineeringData, Tuple.Create("VectoEngineeringInput{0}.xsd", new [] {"0.7"}) },
 			{XmlDocumentType.ManufacturerReport, Tuple.Create("VectoOutputManufacturer{0}.xsd", new [] {"0.4", "0.5"}) },
-			{ XmlDocumentType.CustomerReport , Tuple.Create("VectoOutputCustomer{0}.xsd", new [] {"0.4"})},
+			{ XmlDocumentType.CustomerReport , Tuple.Create("VectoOutputCustomer{0}.xsd", new [] {"0.4", "0.5"})},
 		};
 
 		private XMLValidator(Action<bool> resultaction, Action<XmlSeverityType, ValidationEvent> validationErrorAction)