From 1eaccd6a41f70955f384d7c1a70b7d776d76d8b7 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 24 Sep 2018 14:44:45 +0300 Subject: [PATCH] New pattern file format version. Reserved for future use. --HG-- branch : release --- src/libs/ifc/schema.qrc | 1 + src/libs/ifc/schema/pattern/v0.7.11.xsd | 1067 +++++++++++++++++++++++ src/libs/ifc/xml/vpatternconverter.cpp | 23 +- src/libs/ifc/xml/vpatternconverter.h | 3 +- 4 files changed, 1089 insertions(+), 5 deletions(-) create mode 100644 src/libs/ifc/schema/pattern/v0.7.11.xsd diff --git a/src/libs/ifc/schema.qrc b/src/libs/ifc/schema.qrc index 268d9c0d5..868f095d9 100644 --- a/src/libs/ifc/schema.qrc +++ b/src/libs/ifc/schema.qrc @@ -48,6 +48,7 @@ schema/pattern/v0.7.8.xsd schema/pattern/v0.7.9.xsd schema/pattern/v0.7.10.xsd + schema/pattern/v0.7.11.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.7.11.xsd b/src/libs/ifc/schema/pattern/v0.7.11.xsd new file mode 100644 index 000000000..deedcfe29 --- /dev/null +++ b/src/libs/ifc/schema/pattern/v0.7.11.xsd @@ -0,0 +1,1067 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/libs/ifc/xml/vpatternconverter.cpp b/src/libs/ifc/xml/vpatternconverter.cpp index cd27d8f68..cf63b1c28 100644 --- a/src/libs/ifc/xml/vpatternconverter.cpp +++ b/src/libs/ifc/xml/vpatternconverter.cpp @@ -59,8 +59,8 @@ class QDomElement; */ const QString VPatternConverter::PatternMinVerStr = QStringLiteral("0.1.4"); -const QString VPatternConverter::PatternMaxVerStr = QStringLiteral("0.7.10"); -const QString VPatternConverter::CurrentSchema = QStringLiteral("://schema/pattern/v0.7.10.xsd"); +const QString VPatternConverter::PatternMaxVerStr = QStringLiteral("0.7.11"); +const QString VPatternConverter::CurrentSchema = QStringLiteral("://schema/pattern/v0.7.11.xsd"); //VPatternConverter::PatternMinVer; // <== DON'T FORGET TO UPDATE TOO!!!! //VPatternConverter::PatternMaxVer; // <== DON'T FORGET TO UPDATE TOO!!!! @@ -226,7 +226,8 @@ QString VPatternConverter::XSDSchema(int ver) const std::make_pair(FORMAT_VERSION(0, 7, 7), QStringLiteral("://schema/pattern/v0.7.7.xsd")), std::make_pair(FORMAT_VERSION(0, 7, 8), QStringLiteral("://schema/pattern/v0.7.8.xsd")), std::make_pair(FORMAT_VERSION(0, 7, 9), QStringLiteral("://schema/pattern/v0.7.9.xsd")), - std::make_pair(FORMAT_VERSION(0, 7, 10), CurrentSchema) + std::make_pair(FORMAT_VERSION(0, 7, 10), QStringLiteral("://schema/pattern/v0.7.10.xsd")), + std::make_pair(FORMAT_VERSION(0, 7, 11), CurrentSchema) }; if (schemas.contains(ver)) @@ -433,6 +434,10 @@ void VPatternConverter::ApplyPatches() ValidateXML(XSDSchema(FORMAT_VERSION(0, 7, 10)), m_convertedFileName); V_FALLTHROUGH case (FORMAT_VERSION(0, 7, 10)): + ToV0_7_11(); + ValidateXML(XSDSchema(FORMAT_VERSION(0, 7, 11)), m_convertedFileName); + V_FALLTHROUGH + case (FORMAT_VERSION(0, 7, 11)): break; default: InvalidVersion(m_ver); @@ -450,7 +455,7 @@ void VPatternConverter::DowngradeToCurrentMaxVersion() bool VPatternConverter::IsReadOnly() const { // Check if attribute readOnly was not changed in file format - Q_STATIC_ASSERT_X(VPatternConverter::PatternMaxVer == FORMAT_VERSION(0, 7, 10), + Q_STATIC_ASSERT_X(VPatternConverter::PatternMaxVer == FORMAT_VERSION(0, 7, 11), "Check attribute readOnly."); // Possibly in future attribute readOnly will change position etc. @@ -980,6 +985,16 @@ void VPatternConverter::ToV0_7_10() Save(); } +//--------------------------------------------------------------------------------------------------------------------- +void VPatternConverter::ToV0_7_11() +{ + // TODO. Delete if minimal supported version is 0.7.11 + Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < FORMAT_VERSION(0, 7, 11), + "Time to refactor the code."); + SetVersion(QStringLiteral("0.7.11")); + Save(); +} + //--------------------------------------------------------------------------------------------------------------------- void VPatternConverter::TagUnitToV0_2_0() { diff --git a/src/libs/ifc/xml/vpatternconverter.h b/src/libs/ifc/xml/vpatternconverter.h index 42dc51e5a..8fe07638f 100644 --- a/src/libs/ifc/xml/vpatternconverter.h +++ b/src/libs/ifc/xml/vpatternconverter.h @@ -53,7 +53,7 @@ public: static const QString PatternMaxVerStr; static const QString CurrentSchema; static Q_DECL_CONSTEXPR const int PatternMinVer = FORMAT_VERSION(0, 1, 4); - static Q_DECL_CONSTEXPR const int PatternMaxVer = FORMAT_VERSION(0, 7, 10); + static Q_DECL_CONSTEXPR const int PatternMaxVer = FORMAT_VERSION(0, 7, 11); protected: virtual int MinVer() const override; @@ -119,6 +119,7 @@ private: void ToV0_7_8(); void ToV0_7_9(); void ToV0_7_10(); + void ToV0_7_11(); void TagUnitToV0_2_0(); void TagIncrementToV0_2_0();