diff --git a/src/app/valentina/share/resources/tables/standard/GOST_man_ru.vst b/src/app/valentina/share/resources/tables/standard/GOST_man_ru.vst index fc90b849f..60af9cba0 100644 --- a/src/app/valentina/share/resources/tables/standard/GOST_man_ru.vst +++ b/src/app/valentina/share/resources/tables/standard/GOST_man_ru.vst @@ -40,6 +40,7 @@ + diff --git a/src/libs/ifc/xml/vabstractmconverter.cpp b/src/libs/ifc/xml/vabstractmconverter.cpp index ebe85ffbf..637e0963f 100644 --- a/src/libs/ifc/xml/vabstractmconverter.cpp +++ b/src/libs/ifc/xml/vabstractmconverter.cpp @@ -52,6 +52,7 @@ void VAbstractMConverter::AddRootComment() //--------------------------------------------------------------------------------------------------------------------- QMultiMap VAbstractMConverter::OldNamesToNewNames_InV0_3_0() { + // new name, old name QMultiMap names; // A02 @@ -307,5 +308,7 @@ QMultiMap VAbstractMConverter::OldNamesToNewNames_InV0_3_0() // P12 names.insert(QStringLiteral("armscye_arc"), QStringLiteral("arc_through_shoulder_joint")); + names.insert(QStringLiteral("head_circ"), QStringLiteral("head_girth")); + return names; } diff --git a/src/libs/ifc/xml/vpatternconverter.cpp b/src/libs/ifc/xml/vpatternconverter.cpp index 1f4b44988..a62291fc9 100644 --- a/src/libs/ifc/xml/vpatternconverter.cpp +++ b/src/libs/ifc/xml/vpatternconverter.cpp @@ -750,6 +750,7 @@ QStringList VPatternConverter::ListPathPointExpressionsV0_1_4() const //--------------------------------------------------------------------------------------------------------------------- QMap VPatternConverter::OldNamesToNewNames_InV0_2_0() { + // old name, new name QMap names; // A02 @@ -976,5 +977,7 @@ QMap VPatternConverter::OldNamesToNewNames_InV0_2_0() // P12 names.insert(QStringLiteral("arc_through_shoulder_joint"), QStringLiteral("armscye_arc")); + names.insert(QStringLiteral("head_girth"), QStringLiteral("head_circ")); + return names; } diff --git a/src/libs/vformat/vmeasurements.cpp b/src/libs/vformat/vmeasurements.cpp index 54babd2e5..5abf25aa0 100644 --- a/src/libs/vformat/vmeasurements.cpp +++ b/src/libs/vformat/vmeasurements.cpp @@ -647,6 +647,13 @@ QStringList VMeasurements::ListKnown() const bool VMeasurements::IsDefinedKnownNamesValid() const { QStringList names = AllGroupNames(); + + if (type == MeasurementsType::Standard) + { + names.append(size_M); + names.append(height_M); + } + QSet set; foreach (const QString &var, names) { diff --git a/src/libs/vmisc/def.cpp b/src/libs/vmisc/def.cpp index b3c0e6650..eef9ab839 100644 --- a/src/libs/vmisc/def.cpp +++ b/src/libs/vmisc/def.cpp @@ -964,9 +964,7 @@ QStringList AllGroupNames() << ListGroupN() << ListGroupO() << ListGroupP() - << ListGroupQ() - << size_M - << height_M; + << ListGroupQ(); return originalNames; }