diff --git a/src/libs/ifc/xml/vabstractmconverter.cpp b/src/libs/ifc/xml/vabstractmconverter.cpp index 42971585e..ab7fe6db0 100644 --- a/src/libs/ifc/xml/vabstractmconverter.cpp +++ b/src/libs/ifc/xml/vabstractmconverter.cpp @@ -179,7 +179,7 @@ QMultiMap VAbstractMConverter::OldNamesToNewNames_InV0_3_0() // F01 names.insert(QStringLiteral("shoulder_length"), QStringLiteral("shoulder_length")); // F02 - names.insert(QStringLiteral("shoulder_width_f"), QStringLiteral("across_front_shoulder_width")); + names.insert(QStringLiteral("shoulder_tip_to_shoulder_tip_f"), QStringLiteral("across_front_shoulder_width")); // F03 names.insert(QStringLiteral("across_chest_f"), QStringLiteral("upper_front_chest_width")); // F04 diff --git a/src/libs/ifc/xml/vpatternconverter.cpp b/src/libs/ifc/xml/vpatternconverter.cpp index ce9036b76..1f4b44988 100644 --- a/src/libs/ifc/xml/vpatternconverter.cpp +++ b/src/libs/ifc/xml/vpatternconverter.cpp @@ -875,7 +875,7 @@ QMap VPatternConverter::OldNamesToNewNames_InV0_2_0() // E37 names.insert(QStringLiteral("shoulder_drop"), QStringLiteral("shoulder_slope_neck_side_length")); // F02 - names.insert(QStringLiteral("across_front_shoulder_width"), QStringLiteral("shoulder_width_f")); + names.insert(QStringLiteral("across_front_shoulder_width"), QStringLiteral("shoulder_tip_to_shoulder_tip_f")); // F03 names.insert(QStringLiteral("upper_front_chest_width"), QStringLiteral("across_chest_f")); // F04 diff --git a/src/libs/vmisc/def.cpp b/src/libs/vmisc/def.cpp index e2ad5f325..44eed2cd9 100644 --- a/src/libs/vmisc/def.cpp +++ b/src/libs/vmisc/def.cpp @@ -155,7 +155,7 @@ const QString shoulderSlopeNeckBackHeight_M = QStringLiteral("shoulder_slope_n const QString shoulderSlopeShoulderTipAngle_M = QStringLiteral("shoulder_slope_shoulder_tip_angle"); // E40 // F const QString shoulderLength_M = QStringLiteral("shoulder_length"); // F01 -const QString shoulderWidthF_M = QStringLiteral("shoulder_width_f"); // F02 +const QString shoulderTipToShoulderTipF_M = QStringLiteral("shoulder_tip_to_shoulder_tip_f"); // F02 const QString acrossChestF_M = QStringLiteral("across_chest_f"); // F03 const QString armfoldToArmfoldF_M = QStringLiteral("armfold_to_armfold_f"); // F04 const QString shoulderTipToShoulderTipB_M = QStringLiteral("shoulder_tip_to_shoulder_tip_b"); // F05 @@ -712,7 +712,7 @@ QStringList ListGroupE() QStringList ListGroupF() { const QStringList list = QStringList() << shoulderLength_M // F01 - << shoulderWidthF_M // F02 + << shoulderTipToShoulderTipF_M // F02 << acrossChestF_M // F03 << armfoldToArmfoldF_M // F04 << shoulderTipToShoulderTipB_M // F05 diff --git a/src/libs/vmisc/def.h b/src/libs/vmisc/def.h index 88187143d..3fb3ab666 100644 --- a/src/libs/vmisc/def.h +++ b/src/libs/vmisc/def.h @@ -313,7 +313,7 @@ extern const QString shoulderSlopeNeckBackHeight_M; // E39 extern const QString shoulderSlopeShoulderTipAngle_M; // E40 // F extern const QString shoulderLength_M; // F01 -extern const QString shoulderWidthF_M; // F02 +extern const QString shoulderTipToShoulderTipF_M; // F02 extern const QString acrossChestF_M; // F03 extern const QString armfoldToArmfoldF_M; // F04 extern const QString shoulderTipToShoulderTipB_M; // F05 diff --git a/src/libs/vpatterndb/vtranslatemeasurements.cpp b/src/libs/vpatterndb/vtranslatemeasurements.cpp index 7629d1bb4..abf9eb2eb 100644 --- a/src/libs/vpatterndb/vtranslatemeasurements.cpp +++ b/src/libs/vpatterndb/vtranslatemeasurements.cpp @@ -1025,12 +1025,12 @@ void VTranslateMeasurements::InitGroupF() "Full measurement description."); InitMeasurement(shoulderLength_M, m, g, d, "F01"); //================================================================================================================= - m = QmuTranslation::translate("Measurements", "shoulder_width_f", + m = QmuTranslation::translate("Measurements", "shoulder_tip_to_shoulder_tip_f", "Name in a formula. Don't use math symbols and space in name!!!!"); g = QmuTranslation::translate("Measurements", "Shoulder Width (front)", "Full measurement name."); d = QmuTranslation::translate("Measurements", "From Shoulder Tip to Shoulder tip, curved around front.", "Full measurement description."); - InitMeasurement(shoulderWidthF_M, m, g, d, "F02"); + InitMeasurement(shoulderTipToShoulderTipF_M, m, g, d, "F02"); //================================================================================================================= m = QmuTranslation::translate("Measurements", "across_chest_f", "Name in a formula. Don't use math symbols and space in name!!!!");