From 4537106991d9080ea0536f6292c5e5ee32cad7bd Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 13 May 2016 20:33:52 +0300 Subject: [PATCH] Updated XSD scheme. --HG-- branch : feature --- src/libs/ifc/schema.qrc | 1 + src/libs/ifc/schema/pattern/v0.3.1.xsd | 502 +++++++++++++++++++++++++ src/libs/ifc/xml/vpatternconverter.cpp | 22 +- src/libs/ifc/xml/vpatternconverter.h | 1 + 4 files changed, 523 insertions(+), 3 deletions(-) create mode 100644 src/libs/ifc/schema/pattern/v0.3.1.xsd diff --git a/src/libs/ifc/schema.qrc b/src/libs/ifc/schema.qrc index d8aa89e47..5868055e2 100644 --- a/src/libs/ifc/schema.qrc +++ b/src/libs/ifc/schema.qrc @@ -14,6 +14,7 @@ schema/pattern/v0.2.6.xsd schema/pattern/v0.2.7.xsd schema/pattern/v0.3.0.xsd + schema/pattern/v0.3.1.xsd schema/standard_measurements/v0.3.0.xsd schema/standard_measurements/v0.4.0.xsd schema/standard_measurements/v0.4.1.xsd diff --git a/src/libs/ifc/schema/pattern/v0.3.1.xsd b/src/libs/ifc/schema/pattern/v0.3.1.xsd new file mode 100644 index 000000000..bee4401df --- /dev/null +++ b/src/libs/ifc/schema/pattern/v0.3.1.xsd @@ -0,0 +1,502 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/libs/ifc/xml/vpatternconverter.cpp b/src/libs/ifc/xml/vpatternconverter.cpp index 46e09ae74..c0e2914b8 100644 --- a/src/libs/ifc/xml/vpatternconverter.cpp +++ b/src/libs/ifc/xml/vpatternconverter.cpp @@ -43,8 +43,8 @@ */ const QString VPatternConverter::PatternMinVerStr = QStringLiteral("0.1.0"); -const QString VPatternConverter::PatternMaxVerStr = QStringLiteral("0.3.0"); -const QString VPatternConverter::CurrentSchema = QStringLiteral("://schema/pattern/v0.3.0.xsd"); +const QString VPatternConverter::PatternMaxVerStr = QStringLiteral("0.3.1"); +const QString VPatternConverter::CurrentSchema = QStringLiteral("://schema/pattern/v0.3.1.xsd"); //--------------------------------------------------------------------------------------------------------------------- VPatternConverter::VPatternConverter(const QString &fileName) @@ -111,8 +111,10 @@ QString VPatternConverter::XSDSchema(int ver) const case (0x000206): return QStringLiteral("://schema/pattern/v0.2.6.xsd"); case (0x000207): - return QStringLiteral("://schema/pattern/v0.3.0.xsd"); + return QStringLiteral("://schema/pattern/v0.2.7.xsd"); case (0x000300): + return QStringLiteral("://schema/pattern/v0.3.0.xsd"); + case (0x000301): return CurrentSchema; default: InvalidVersion(ver); @@ -219,6 +221,13 @@ void VPatternConverter::ApplyPatches() V_FALLTHROUGH } case (0x000300): + { + ToV0_3_1(); + const QString schema = XSDSchema(0x000301); + ValidateXML(schema, fileName); + V_FALLTHROUGH + } + case (0x000301): break; default: break; @@ -347,6 +356,13 @@ void VPatternConverter::ToV0_3_0() Save(); } +//--------------------------------------------------------------------------------------------------------------------- +void VPatternConverter::ToV0_3_1() +{ + SetVersion(QStringLiteral("0.3.1")); + Save(); +} + //--------------------------------------------------------------------------------------------------------------------- void VPatternConverter::TagUnitToV0_2_0() { diff --git a/src/libs/ifc/xml/vpatternconverter.h b/src/libs/ifc/xml/vpatternconverter.h index 9cf256872..96bdcd864 100644 --- a/src/libs/ifc/xml/vpatternconverter.h +++ b/src/libs/ifc/xml/vpatternconverter.h @@ -69,6 +69,7 @@ private: void ToV0_2_6(); void ToV0_2_7(); void ToV0_3_0(); + void ToV0_3_1(); void TagUnitToV0_2_0(); void TagIncrementToV0_2_0();