From 42e356ccbd9b85d3f3fa592ad15a942192fff9d6 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 7 Apr 2016 19:56:41 +0300 Subject: [PATCH] New pattern format version 0.3.0. --HG-- branch : feature --- src/libs/ifc/schema.qrc | 1 + src/libs/ifc/schema/pattern/v0.3.0.xsd | 480 +++++++++++++++++++++++++ src/libs/ifc/xml/vpatternconverter.cpp | 20 +- src/libs/ifc/xml/vpatternconverter.h | 1 + 4 files changed, 500 insertions(+), 2 deletions(-) create mode 100644 src/libs/ifc/schema/pattern/v0.3.0.xsd diff --git a/src/libs/ifc/schema.qrc b/src/libs/ifc/schema.qrc index 1fe74a4c7..d8aa89e47 100644 --- a/src/libs/ifc/schema.qrc +++ b/src/libs/ifc/schema.qrc @@ -13,6 +13,7 @@ schema/pattern/v0.2.5.xsd schema/pattern/v0.2.6.xsd schema/pattern/v0.2.7.xsd + schema/pattern/v0.3.0.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.0.xsd b/src/libs/ifc/schema/pattern/v0.3.0.xsd new file mode 100644 index 000000000..b868553f3 --- /dev/null +++ b/src/libs/ifc/schema/pattern/v0.3.0.xsd @@ -0,0 +1,480 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/libs/ifc/xml/vpatternconverter.cpp b/src/libs/ifc/xml/vpatternconverter.cpp index f725d1d65..46e09ae74 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.2.7"); -const QString VPatternConverter::CurrentSchema = QStringLiteral("://schema/pattern/v0.2.7.xsd"); +const QString VPatternConverter::PatternMaxVerStr = QStringLiteral("0.3.0"); +const QString VPatternConverter::CurrentSchema = QStringLiteral("://schema/pattern/v0.3.0.xsd"); //--------------------------------------------------------------------------------------------------------------------- VPatternConverter::VPatternConverter(const QString &fileName) @@ -111,6 +111,8 @@ 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"); + case (0x000300): return CurrentSchema; default: InvalidVersion(ver); @@ -210,6 +212,13 @@ void VPatternConverter::ApplyPatches() V_FALLTHROUGH } case (0x000207): + { + ToV0_3_0(); + const QString schema = XSDSchema(0x000300); + ValidateXML(schema, fileName); + V_FALLTHROUGH + } + case (0x000300): break; default: break; @@ -331,6 +340,13 @@ void VPatternConverter::ToV0_2_7() Save(); } +//--------------------------------------------------------------------------------------------------------------------- +void VPatternConverter::ToV0_3_0() +{ + SetVersion(QStringLiteral("0.3.0")); + Save(); +} + //--------------------------------------------------------------------------------------------------------------------- void VPatternConverter::TagUnitToV0_2_0() { diff --git a/src/libs/ifc/xml/vpatternconverter.h b/src/libs/ifc/xml/vpatternconverter.h index d1a0be553..1a4de28d8 100644 --- a/src/libs/ifc/xml/vpatternconverter.h +++ b/src/libs/ifc/xml/vpatternconverter.h @@ -68,6 +68,7 @@ private: void ToV0_2_5(); void ToV0_2_6(); void ToV0_2_7(); + void ToV0_3_0(); void TagUnitToV0_2_0(); void TagIncrementToV0_2_0();