diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/XMLInputDataFactory.cs b/VectoCore/VectoCore/InputData/FileIO/XML/XMLInputDataFactory.cs index 131d86136f99e80dac8c67a93feb99bfe771e3d6..9fc21653cd7b110a35699ce0bbbc7284ac1151da 100644 --- a/VectoCore/VectoCore/InputData/FileIO/XML/XMLInputDataFactory.cs +++ b/VectoCore/VectoCore/InputData/FileIO/XML/XMLInputDataFactory.cs @@ -113,7 +113,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML { case XmlDocumentType.DeclarationJobData: return ReadDeclarationJob(xmlDoc, source); case XmlDocumentType.EngineeringJobData: return ReadEngineeringJob(xmlDoc, source); - case XmlDocumentType.PrimaryVehicleBusOutputData: return ReadPrimaryVehicleDeclarationJob(xmlDoc, source); + //case XmlDocumentType.PrimaryVehicleBusOutputData: return ReadPrimaryVehicleDeclarationJob(xmlDoc, source); case XmlDocumentType.MultistageOutputData: return ReadMultistageDeclarationJob(xmlDoc, source); case XmlDocumentType.EngineeringComponentData: case XmlDocumentType.DeclarationComponentData: diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputPrimaryVehicleInformation.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputPrimaryVehicleInformation.xsd deleted file mode 100644 index 11b60d54f4ca6b6262775acd9f0021a8a8482f56..0000000000000000000000000000000000000000 --- a/VectoCore/VectoCore/Resources/XSD/VectoOutputPrimaryVehicleInformation.xsd +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- edited with XMLSpy v2016 rel. 2 sp1 (x64) (http://www.altova.com) by Helmut Eichlseder (TU Graz/Inst. f. VKM und THD) --> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:pbus="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns:out="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation" elementFormDefault="qualified" attributeFormDefault="unqualified"> - <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" schemaLocation="VectoDeclarationDefinitions.1.0.xsd"/> - <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" schemaLocation="VectoOutputPrimaryBus.xsd"/> - <xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" schemaLocation="VectoOutputDefinitions.xsd"/> - <xs:element name="VectoOutputPrimaryVehicle" type="tns:PrimaryVehicleHeavyBusType"> - <xs:annotation> - <xs:documentation>Comment describing your root element</xs:documentation> - </xs:annotation> - </xs:element> - <xs:complexType name="PrimaryVehicleHeavyBusType"> - <xs:sequence> - <xs:element name="Data" type="out:AbstractPrimaryVehicleDataPIFType"/> - <xs:element name="Signature" type="v1.0:SignatureType"/> - </xs:sequence> - </xs:complexType> -</xs:schema> diff --git a/VectoCore/VectoCore/Utils/XMLDefinitions.cs b/VectoCore/VectoCore/Utils/XMLDefinitions.cs index 872171ee4868ecda65145fe631654efd6288fb9e..10540a66cc5a1102dc9a96cb19193c5e2cec3b2f 100644 --- a/VectoCore/VectoCore/Utils/XMLDefinitions.cs +++ b/VectoCore/VectoCore/Utils/XMLDefinitions.cs @@ -8,7 +8,7 @@ namespace TUGraz.VectoCore.Utils public enum XmlDocumentType { DeclarationJobData = 1 << 1, - PrimaryVehicleBusOutputData = 1 << 2, + //PrimaryVehicleBusOutputData = 1 << 2, DeclarationComponentData = 1 << 3, EngineeringJobData = 1 << 4, EngineeringComponentData = 1 << 5, @@ -93,7 +93,7 @@ namespace TUGraz.VectoCore.Utils private static Dictionary<XmlDocumentType, string> schemaFilenames = new Dictionary<XmlDocumentType, string>() { {XmlDocumentType.DeclarationJobData, "VectoDeclarationJob.xsd"}, - {XmlDocumentType.PrimaryVehicleBusOutputData, "VectoOutputPrimaryVehicleInformation.xsd"}, + //{XmlDocumentType.PrimaryVehicleBusOutputData, "VectoOutputPrimaryVehicleInformation.xsd"}, {XmlDocumentType.DeclarationComponentData, "VectoDeclarationComponent.xsd"}, {XmlDocumentType.EngineeringJobData, "VectoEngineeringJob.xsd" }, {XmlDocumentType.EngineeringComponentData, "VectoEngineeringComponent.xsd" }, @@ -110,7 +110,7 @@ namespace TUGraz.VectoCore.Utils public static string GetSchemaFilename(XmlDocumentType type) { if (!schemaFilenames.ContainsKey(type)) { - throw new Exception(string.Format("Invalid argument {0} - only use single flags", type)); + throw new Exception(string.Format("Invalid argument '{0}' - only use single flags", type)); } var entry = schemaFilenames[type]; diff --git a/VectoCore/VectoCore/Utils/XMLHelper.cs b/VectoCore/VectoCore/Utils/XMLHelper.cs index e39bfdde8096cf347dc453916eba175ddce8d926..1e44881524766d936f31e5910ae2f30efd500723 100644 --- a/VectoCore/VectoCore/Utils/XMLHelper.cs +++ b/VectoCore/VectoCore/Utils/XMLHelper.cs @@ -53,7 +53,7 @@ namespace TUGraz.VectoCore.Utils case "VectoInputDeclaration": return XmlDocumentType.DeclarationJobData; case "VectoInputEngineering": return XmlDocumentType.EngineeringJobData; case "VectoComponentEngineering": return XmlDocumentType.EngineeringComponentData; - case "VectoOutputPrimaryVehicle": return XmlDocumentType.PrimaryVehicleBusOutputData; + //case "VectoOutputPrimaryVehicle": return XmlDocumentType.PrimaryVehicleBusOutputData; case "VectoOutputMultistage": return XmlDocumentType.MultistageOutputData; } diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj index c393280676f869f122f29b7781504b31d09896d3..0045dfae275730107ca29fedda726250a9b00a2c 100644 --- a/VectoCore/VectoCore/VectoCore.csproj +++ b/VectoCore/VectoCore/VectoCore.csproj @@ -936,9 +936,6 @@ <EmbeddedResource Include="Resources\XSD\VectoOutputPrimaryBus.xsd"> <SubType>Designer</SubType> </EmbeddedResource> - <EmbeddedResource Include="Resources\XSD\VectoOutputPrimaryVehicleInformation.xsd"> - <SubType>Designer</SubType> - </EmbeddedResource> <EmbeddedResource Include="Resources\XSD\VectoVTPReport.xsd"> <SubType>Designer</SubType> </EmbeddedResource> diff --git a/VectoCore/VectoXML.spp b/VectoCore/VectoXML.spp index fd412de7a1efbe608d0205fd9cb135205f3a6b25..198f2bad9dcf6df9a5848b57752179792771c797 100644 --- a/VectoCore/VectoXML.spp +++ b/VectoCore/VectoXML.spp @@ -145,7 +145,6 @@ <File FilePath="VectoCore\Resources\XSD\VectoOutputManufacturer.xsd" HomeFolder="Yes"/> <File FilePath="VectoCore\Resources\XSD\VectoOutputMultistage.0.1.xsd" HomeFolder="Yes"/> <File FilePath="VectoCore\Resources\XSD\VectoOutputPrimaryBus.xsd" HomeFolder="Yes"/> - <File FilePath="VectoCore\Resources\XSD\VectoOutputPrimaryVehicleInformation.xsd" HomeFolder="Yes"/> <File FilePath="VectoCore\Resources\XSD\VTPReport.0.1.xsd" HomeFolder="Yes"/> <File FilePath="VectoCore\Resources\XSD\VTPReport.0.2.xsd" HomeFolder="Yes"/> <File FilePath="VectoCore\Resources\XSD\VTPReport.xsd" HomeFolder="Yes"/>