From 5306415d92d7b8171adec35ae905efd09a549712 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sun, 26 Jun 2016 14:45:39 +0300 Subject: [PATCH] Conversion to new file format. --HG-- branch : feature --- src/libs/ifc/schema.qrc | 1 + src/libs/ifc/schema/pattern/v0.3.2.xsd | 516 +++++++++++++++++++++++++ src/libs/ifc/xml/vpatternconverter.cpp | 17 +- src/libs/ifc/xml/vpatternconverter.h | 1 + 4 files changed, 533 insertions(+), 2 deletions(-) create mode 100644 src/libs/ifc/schema/pattern/v0.3.2.xsd diff --git a/src/libs/ifc/schema.qrc b/src/libs/ifc/schema.qrc index 5868055e2..fe077d4dc 100644 --- a/src/libs/ifc/schema.qrc +++ b/src/libs/ifc/schema.qrc @@ -15,6 +15,7 @@ schema/pattern/v0.2.7.xsd schema/pattern/v0.3.0.xsd schema/pattern/v0.3.1.xsd + schema/pattern/v0.3.2.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.2.xsd b/src/libs/ifc/schema/pattern/v0.3.2.xsd new file mode 100644 index 000000000..c4167817b --- /dev/null +++ b/src/libs/ifc/schema/pattern/v0.3.2.xsd @@ -0,0 +1,516 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/libs/ifc/xml/vpatternconverter.cpp b/src/libs/ifc/xml/vpatternconverter.cpp index 5068702ef..cb16a65fc 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.1"); -const QString VPatternConverter::CurrentSchema = QStringLiteral("://schema/pattern/v0.3.1.xsd"); +const QString VPatternConverter::PatternMaxVerStr = QStringLiteral("0.3.2"); +const QString VPatternConverter::CurrentSchema = QStringLiteral("://schema/pattern/v0.3.2.xsd"); //--------------------------------------------------------------------------------------------------------------------- VPatternConverter::VPatternConverter(const QString &fileName) @@ -115,6 +115,8 @@ QString VPatternConverter::XSDSchema(int ver) const case (0x000300): return QStringLiteral("://schema/pattern/v0.3.0.xsd"); case (0x000301): + return QStringLiteral("://schema/pattern/v0.3.1.xsd"); + case (0x000302): return CurrentSchema; default: InvalidVersion(ver); @@ -186,6 +188,10 @@ void VPatternConverter::ApplyPatches() ValidateXML(XSDSchema(0x000301), fileName); V_FALLTHROUGH case (0x000301): + ToV0_3_2(); + ValidateXML(XSDSchema(0x000302), fileName); + V_FALLTHROUGH + case (0x000302): break; default: break; @@ -322,6 +328,13 @@ void VPatternConverter::ToV0_3_1() Save(); } +//--------------------------------------------------------------------------------------------------------------------- +void VPatternConverter::ToV0_3_2() +{ + SetVersion(QStringLiteral("0.3.2")); + Save(); +} + //--------------------------------------------------------------------------------------------------------------------- void VPatternConverter::TagUnitToV0_2_0() { diff --git a/src/libs/ifc/xml/vpatternconverter.h b/src/libs/ifc/xml/vpatternconverter.h index 55be6f196..99f3f5638 100644 --- a/src/libs/ifc/xml/vpatternconverter.h +++ b/src/libs/ifc/xml/vpatternconverter.h @@ -70,6 +70,7 @@ private: void ToV0_2_7(); void ToV0_3_0(); void ToV0_3_1(); + void ToV0_3_2(); void TagUnitToV0_2_0(); void TagIncrementToV0_2_0();