diff --git a/src/libs/ifc/schema.qrc b/src/libs/ifc/schema.qrc
index c7ad3e335..1fe74a4c7 100644
--- a/src/libs/ifc/schema.qrc
+++ b/src/libs/ifc/schema.qrc
@@ -22,6 +22,5 @@
schema/individual_measurements/v0.3.1.xsd
schema/individual_measurements/v0.3.2.xsd
schema/individual_measurements/v0.3.3.xsd
- schema/pattern/v0.2.8.xsd
diff --git a/src/libs/ifc/schema/pattern/v0.2.7.xsd b/src/libs/ifc/schema/pattern/v0.2.7.xsd
index 3db42ee88..807f16b77 100644
--- a/src/libs/ifc/schema/pattern/v0.2.7.xsd
+++ b/src/libs/ifc/schema/pattern/v0.2.7.xsd
@@ -5,6 +5,7 @@
+
diff --git a/src/libs/ifc/schema/pattern/v0.2.8.xsd b/src/libs/ifc/schema/pattern/v0.2.8.xsd
deleted file mode 100644
index 0e7fe7f7a..000000000
--- a/src/libs/ifc/schema/pattern/v0.2.8.xsd
+++ /dev/null
@@ -1,442 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/libs/ifc/xml/vabstractpattern.cpp b/src/libs/ifc/xml/vabstractpattern.cpp
index 31acb5d69..223733165 100644
--- a/src/libs/ifc/xml/vabstractpattern.cpp
+++ b/src/libs/ifc/xml/vabstractpattern.cpp
@@ -1004,18 +1004,24 @@ void VAbstractPattern::CheckTagExists(const QString &tag)
QDomNodeList list = elementsByTagName(tag);
if (list.size() == 0)
{
- QStringList tags = QStringList() << TagVersion << TagAuthor << TagDescription << TagNotes << TagImage
+ QStringList tags = QStringList() << TagVersion << TagImage << TagAuthor << TagDescription << TagNotes
<< TagGradation;
QDomElement pattern = documentElement();
switch (tags.indexOf(tag))
{
case 0: //TagVersion
break;// Mandatory tag
- case 1: //TagAuthor
+ case 1: //TagImage
+ {
+ pattern.insertAfter(createElement(TagImage), elementsByTagName(TagVersion).at(0));
+ SetVersion();
+ break;
+ }
+ case 2: //TagAuthor
pattern.insertAfter(createElement(TagAuthor), elementsByTagName(TagVersion).at(0));
SetVersion();
break;
- case 2: //TagDescription
+ case 3: //TagDescription
{
for (int i = tags.indexOf(tag)-1; i >= 0; --i)
{
@@ -1029,7 +1035,7 @@ void VAbstractPattern::CheckTagExists(const QString &tag)
SetVersion();
break;
}
- case 3: //TagNotes
+ case 4: //TagNotes
{
for (int i = tags.indexOf(tag)-1; i >= 0; --i)
{
@@ -1043,12 +1049,6 @@ void VAbstractPattern::CheckTagExists(const QString &tag)
SetVersion();
break;
}
- case 4: //TagImage
- {
- pattern.insertAfter(createElement(TagImage), elementsByTagName(TagVersion).at(0));
- SetVersion();
- break;
- }
case 5: //TagGradation
{
QDomElement gradation = createElement(TagGradation);
diff --git a/src/libs/ifc/xml/vpatternconverter.cpp b/src/libs/ifc/xml/vpatternconverter.cpp
index 4d2c4c99f..f725d1d65 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.8");
-const QString VPatternConverter::CurrentSchema = QStringLiteral("://schema/pattern/v0.2.8.xsd");
+const QString VPatternConverter::PatternMaxVerStr = QStringLiteral("0.2.7");
+const QString VPatternConverter::CurrentSchema = QStringLiteral("://schema/pattern/v0.2.7.xsd");
//---------------------------------------------------------------------------------------------------------------------
VPatternConverter::VPatternConverter(const QString &fileName)
@@ -111,8 +111,6 @@ QString VPatternConverter::XSDSchema(int ver) const
case (0x000206):
return QStringLiteral("://schema/pattern/v0.2.6.xsd");
case (0x000207):
- return QStringLiteral("://schema/pattern/v0.2.7.xsd");
- case (0x000208):
return CurrentSchema;
default:
InvalidVersion(ver);
@@ -212,13 +210,6 @@ void VPatternConverter::ApplyPatches()
V_FALLTHROUGH
}
case (0x000207):
- {
- ToV0_2_8();
- const QString schema = XSDSchema(0x000208);
- ValidateXML(schema, fileName);
- V_FALLTHROUGH
- }
- case (0x000208):
break;
default:
break;
@@ -340,15 +331,6 @@ void VPatternConverter::ToV0_2_7()
Save();
}
-//---------------------------------------------------------------------------------------------------------------------
-void VPatternConverter::ToV0_2_8()
-{
- SetVersion(QStringLiteral("0.2.8"));
- QDomElement pattern = documentElement();
- pattern.insertAfter(createElement("image"), pattern.firstChildElement("notes"));
- Save();
-}
-
//---------------------------------------------------------------------------------------------------------------------
void VPatternConverter::TagUnitToV0_2_0()
{
diff --git a/src/libs/ifc/xml/vpatternconverter.h b/src/libs/ifc/xml/vpatternconverter.h
index bae6e282e..d1a0be553 100644
--- a/src/libs/ifc/xml/vpatternconverter.h
+++ b/src/libs/ifc/xml/vpatternconverter.h
@@ -68,7 +68,6 @@ private:
void ToV0_2_5();
void ToV0_2_6();
void ToV0_2_7();
- void ToV0_2_8();
void TagUnitToV0_2_0();
void TagIncrementToV0_2_0();