diff --git a/src/libs/ifc/xml/vabstractmconverter.cpp b/src/libs/ifc/xml/vabstractmconverter.cpp index 167831e54..2d8738e6e 100644 --- a/src/libs/ifc/xml/vabstractmconverter.cpp +++ b/src/libs/ifc/xml/vabstractmconverter.cpp @@ -208,7 +208,7 @@ QMultiMap VAbstractMConverter::OldNamesToNewNames_InV0_3_0() names.insert(name, QStringLiteral("arc_through_groin_area")); names.insert(name, QStringLiteral("crotch_length")); - names.insert(QStringLiteral("rise_length_side"), QStringLiteral("waist_to_plane_seat")); + names.insert(QStringLiteral("rise_length_side_sitting"), QStringLiteral("waist_to_plane_seat")); names.insert(QStringLiteral("rise_length_diag"), QStringLiteral("rise_height")); name = QStringLiteral("hand_length"); diff --git a/src/libs/ifc/xml/vpatternconverter.cpp b/src/libs/ifc/xml/vpatternconverter.cpp index 5462132e2..babf25724 100644 --- a/src/libs/ifc/xml/vpatternconverter.cpp +++ b/src/libs/ifc/xml/vpatternconverter.cpp @@ -901,7 +901,7 @@ QMap VPatternConverter::OldNamesToNewNames_InV0_2_0() names.insert(QStringLiteral("ankle_girth"), QStringLiteral("leg_ankle_circ")); names.insert(QStringLiteral("girth_knee_flexed_feet"), QStringLiteral("leg_knee_circ_bent")); names.insert(QStringLiteral("arc_through_groin_area"), QStringLiteral("crotch_length")); - names.insert(QStringLiteral("waist_to_plane_seat"), QStringLiteral("rise_length_side")); + names.insert(QStringLiteral("waist_to_plane_seat"), QStringLiteral("rise_length_side_sitting")); names.insert(QStringLiteral("rise_height"), QStringLiteral("rise_length_diag")); names.insert(QStringLiteral("hand_vertical_diameter"), QStringLiteral("hand_length")); names.insert(QStringLiteral("hand_width"), QStringLiteral("hand_palm_width")); diff --git a/src/libs/vmisc/def.cpp b/src/libs/vmisc/def.cpp index c310a7bb3..47f06f728 100644 --- a/src/libs/vmisc/def.cpp +++ b/src/libs/vmisc/def.cpp @@ -257,13 +257,13 @@ const QString legCrotchToAnkle_M = QStringLiteral("leg_crotch_to_ankle"); const QString legWaistSideToAnkle_M = QStringLiteral("leg_waist_side_to_ankle"); // M13 const QString legWaistSideToKnee_M = QStringLiteral("leg_waist_side_to_knee"); // M14 // N -const QString crotchLength_M = QStringLiteral("crotch_length"); // N01 -const QString crotchLengthB_M = QStringLiteral("crotch_length_b"); // N02 -const QString crotchLengthF_M = QStringLiteral("crotch_length_f"); // N03 -const QString riseLengthSide_M = QStringLiteral("rise_length_side"); // N04 -const QString riseLengthDiag_M = QStringLiteral("rise_length_diag"); // N05 -const QString riseLengthB_M = QStringLiteral("rise_length_b"); // N06 -const QString riseLengthF_M = QStringLiteral("rise_length_f"); // N07 +const QString crotchLength_M = QStringLiteral("crotch_length"); // N01 +const QString crotchLengthB_M = QStringLiteral("crotch_length_b"); // N02 +const QString crotchLengthF_M = QStringLiteral("crotch_length_f"); // N03 +const QString riseLengthSideSitting_M = QStringLiteral("rise_length_side_sitting"); // N04 +const QString riseLengthDiag_M = QStringLiteral("rise_length_diag"); // N05 +const QString riseLengthB_M = QStringLiteral("rise_length_b"); // N06 +const QString riseLengthF_M = QStringLiteral("rise_length_f"); // N07 // O const QString neckBackToWaistFront_M = QStringLiteral("neck_back_to_waist_front"); // O01 const QString waistToWaistHalter_M = QStringLiteral("waist_to_waist_halter"); // O02 @@ -875,13 +875,13 @@ QStringList ListGroupM() //--------------------------------------------------------------------------------------------------------------------- QStringList ListGroupN() { - const QStringList list = QStringList() << crotchLength_M // N01 - << crotchLengthB_M // N02 - << crotchLengthF_M // N03 - << riseLengthSide_M // N04 - << riseLengthDiag_M // N05 - << riseLengthB_M // N06 - << riseLengthF_M; // N07 + const QStringList list = QStringList() << crotchLength_M // N01 + << crotchLengthB_M // N02 + << crotchLengthF_M // N03 + << riseLengthSideSitting_M // N04 + << riseLengthDiag_M // N05 + << riseLengthB_M // N06 + << riseLengthF_M; // N07 return list; } diff --git a/src/libs/vmisc/def.h b/src/libs/vmisc/def.h index 8d7a3dcec..c757049d3 100644 --- a/src/libs/vmisc/def.h +++ b/src/libs/vmisc/def.h @@ -413,13 +413,13 @@ extern const QString legCrotchToAnkle_M; // M12 extern const QString legWaistSideToAnkle_M; // M13 extern const QString legWaistSideToKnee_M; // M14 // N -extern const QString crotchLength_M; // N01 -extern const QString crotchLengthB_M; // N02 -extern const QString crotchLengthF_M; // N03 -extern const QString riseLengthSide_M; // N04 -extern const QString riseLengthDiag_M; // N05 -extern const QString riseLengthB_M; // N06 -extern const QString riseLengthF_M; // N07 +extern const QString crotchLength_M; // N01 +extern const QString crotchLengthB_M; // N02 +extern const QString crotchLengthF_M; // N03 +extern const QString riseLengthSideSitting_M; // N04 +extern const QString riseLengthDiag_M; // N05 +extern const QString riseLengthB_M; // N06 +extern const QString riseLengthF_M; // N07 // O extern const QString neckBackToWaistFront_M; // O01 extern const QString waistToWaistHalter_M; // O02 diff --git a/src/libs/vpatterndb/vtranslatemeasurements.cpp b/src/libs/vpatterndb/vtranslatemeasurements.cpp index 75da2960b..48f637e08 100644 --- a/src/libs/vpatterndb/vtranslatemeasurements.cpp +++ b/src/libs/vpatterndb/vtranslatemeasurements.cpp @@ -1821,12 +1821,15 @@ void VTranslateMeasurements::InitGroupN() "Full measurement description."); InitMeasurement(crotchLengthF_M, m, g, d, "N03", "(crotch_length - crotch_length_b)"); //================================================================================================================= - m = translate("VTranslateMeasurements", "rise_length_side", + m = translate("VTranslateMeasurements", "rise_length_side_sitting", "Name in a formula. Don't use math symbols and space in name!!!!"); - g = translate("VTranslateMeasurements", "Rise length, side", "Full measurement name."); - d = translate("VTranslateMeasurements", "From Waist Side down to surface, while seated on hard surface.", + g = translate("VTranslateMeasurements", + "Sit on hard surface. Rise length, side, taken from waist over hip curve down to surface", + "Full measurement name."); + d = translate("VTranslateMeasurements", + "From Waist Side around hp curve down to surface, while seated on hard surface.", "Full measurement description."); - InitMeasurement(riseLengthSide_M, m, g, d, "N04"); + InitMeasurement(riseLengthSideSitting_M, m, g, d, "N04"); //================================================================================================================= m = translate("VTranslateMeasurements", "rise_length_diag", "Name in a formula. Don't use math symbols and space in name!!!!"); diff --git a/src/test/ValentinaTest/tst_measurementregexp.cpp b/src/test/ValentinaTest/tst_measurementregexp.cpp index 203719859..c000c23aa 100644 --- a/src/test/ValentinaTest/tst_measurementregexp.cpp +++ b/src/test/ValentinaTest/tst_measurementregexp.cpp @@ -330,7 +330,7 @@ void TST_MeasurementRegExp::TestCorrectOrderMeasurement_data() QTest::newRow("N01") << crotchLength_M << "crotch_length"; QTest::newRow("N02") << crotchLengthB_M << "crotch_length_b"; QTest::newRow("N03") << crotchLengthF_M << "crotch_length_f"; - QTest::newRow("N04") << riseLengthSide_M << "rise_length_side"; + QTest::newRow("N04") << riseLengthSideSitting_M << "rise_length_side_sitting"; QTest::newRow("N05") << riseLengthDiag_M << "rise_length_diag"; QTest::newRow("N06") << riseLengthB_M << "rise_length_b"; QTest::newRow("N07") << riseLengthF_M << "rise_length_f";