From 37724fe83c50a70a2a618dab39c8bef30bba9eae Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 2 Sep 2015 16:16:03 +0300 Subject: [PATCH] Updated group E. --HG-- branch : develop --- src/libs/vmisc/def.cpp | 57 +++--- src/libs/vmisc/def.h | 57 +++--- .../vpatterndb/vtranslatemeasurements.cpp | 176 ++++++++++-------- 3 files changed, 163 insertions(+), 127 deletions(-) diff --git a/src/libs/vmisc/def.cpp b/src/libs/vmisc/def.cpp index 30493cf77..0842aa45c 100644 --- a/src/libs/vmisc/def.cpp +++ b/src/libs/vmisc/def.cpp @@ -123,33 +123,36 @@ const QString shoulderTipToWaistSideB_M = QStringLiteral("shoulder_tip_to_ const QString neckSideToWaistB_M = QStringLiteral("neck_side_to_waist_b"); // E08 const QString neckBackToWaistB_M = QStringLiteral("neck_back_to_waist_b"); // E09 const QString neckSideToWaistBladepointB_M = QStringLiteral("neck_side_to_waist_bladepoint_b"); // E10 -const QString shoulderTipToArmfoldF_M = QStringLiteral("shoulder_tip_to_armfold_f"); // E11 -const QString neckSideToBustF_M = QStringLiteral("neck_side_to_bust_f"); // E12 -const QString neckSideToHighbustF_M = QStringLiteral("neck_side_to_highbust_f"); // E13 -const QString shoulderCenterToHighbustF_M = QStringLiteral("shoulder_center_to_highbust_f"); // E14 -const QString neckFrontToHighbustF_M = QStringLiteral("neck_front_to_highbust_f"); // E15 -const QString neckFrontToBustF_M = QStringLiteral("neck_front_to_bust_f"); // E16 -const QString lowbustToWaistF_M = QStringLiteral("lowbust_to_waist_f"); // E17 -const QString shoulderTipToArmfoldB_M = QStringLiteral("shoulder_tip_to_armfold_b"); // E18 -const QString neckSideToBustB_M = QStringLiteral("neck_side_to_bust_b"); // E19 -const QString neckSideToHighbustB_M = QStringLiteral("neck_side_to_highbust_b"); // E20 -const QString shoulderCenterToHighbustB_M = QStringLiteral("shoulder_center_to_highbust_b"); // E21 -const QString neckBackToHighbustB_M = QStringLiteral("neck_back_to_highbust_b"); // E22 -const QString neckBackToBustB_M = QStringLiteral("neck_back_to_bust_b"); // E23 -const QString lowbustToWaistB_M = QStringLiteral("lowbust_to_waist_b"); // E24 -const QString waistToHighhipF_M = QStringLiteral("waist_to_highhip_f"); // E25 -const QString waistToHipF_M = QStringLiteral("waist_to_hip_f"); // E26 -const QString waistToHighhipSide_M = QStringLiteral("waist_to_highhip_side"); // E27 -const QString waistToHighhipB_M = QStringLiteral("waist_to_highhip_b"); // E28 -const QString waistToHipB_M = QStringLiteral("waist_to_hip_b"); // E29 -const QString waistToHipSide_M = QStringLiteral("waist_to_hip_side"); // E30 -const QString shoulderSlopeNeckSideLength_M = QStringLiteral("shoulder_slope_neck_side_length"); // E31 -const QString shoulderSlopeNeckSideAngle_M = QStringLiteral("shoulder_slope_neck_side_angle"); // E32 -const QString shoulderSlopeNeckBackHeight_M = QStringLiteral("shoulder_slope_neck_back_height"); // E33 -const QString shoulderSlopeNeckBackAngle_M = QStringLiteral("shoulder_slope_neck_back_angle"); // E34 -const QString shoulderSlopeShoulderTipAngle_M = QStringLiteral("shoulder_slope_shoulder_tip_angle"); // E35 -const QString highbustToWaistF_M = QStringLiteral("highbust_to_waist_f"); // E36 -const QString highbustToWaistB_M = QStringLiteral("highbust_to_waist_b"); // E37 +const QString neckFrontToHighbustF_M = QStringLiteral("neck_front_to_highbust_f"); // E11 +const QString neckFrontToBustF_M = QStringLiteral("neck_front_to_bust_f"); // E12 +const QString highbustToWaistF_M = QStringLiteral("highbust_to_waist_f"); // E13 +const QString bustToWaistF_M = QStringLiteral("bust_to_waist_f"); // E14 +const QString lowbustToWaistF_M = QStringLiteral("lowbust_to_waist_f"); // E15 +const QString ribToWaistSide_M = QStringLiteral("rib_to_waist_side"); // E16 +const QString neckBackToHighbustB_M = QStringLiteral("neck_back_to_highbust_b"); // E17 +const QString neckBackToBustB_M = QStringLiteral("neck_back_to_bust_b"); // E18 +const QString highbustToWaistB_M = QStringLiteral("highbust_to_waist_b"); // E19 +const QString bustToWaistB_M = QStringLiteral("bust_to_waist_b"); // E20 +const QString lowbustToWaistB_M = QStringLiteral("lowbust_to_waist_b"); // E21 +const QString shoulderTipToArmfoldF_M = QStringLiteral("shoulder_tip_to_armfold_f"); // E22 +const QString neckSideToBustF_M = QStringLiteral("neck_side_to_bust_f"); // E23 +const QString neckSideToHighbustF_M = QStringLiteral("neck_side_to_highbust_f"); // E24 +const QString shoulderCenterToHighbustF_M = QStringLiteral("shoulder_center_to_highbust_f"); // E25 +const QString shoulderTipToArmfoldB_M = QStringLiteral("shoulder_tip_to_armfold_b"); // E26 +const QString neckSideToBustB_M = QStringLiteral("neck_side_to_bust_b"); // E27 +const QString neckSideToHighbustB_M = QStringLiteral("neck_side_to_highbust_b"); // E28 +const QString shoulderCenterToHighbustB_M = QStringLiteral("shoulder_center_to_highbust_b"); // E29 +const QString waistToHighhipF_M = QStringLiteral("waist_to_highhip_f"); // E30 +const QString waistToHipF_M = QStringLiteral("waist_to_hip_f"); // E31 +const QString waistToHighhipSide_M = QStringLiteral("waist_to_highhip_side"); // E32 +const QString waistToHighhipB_M = QStringLiteral("waist_to_highhip_b"); // E33 +const QString waistToHipB_M = QStringLiteral("waist_to_hip_b"); // E34 +const QString waistToHipSide_M = QStringLiteral("waist_to_hip_side"); // E35 +const QString shoulderSlopeNeckSideAngle_M = QStringLiteral("shoulder_slope_neck_side_angle"); // E36 +const QString shoulderSlopeNeckSideLength_M = QStringLiteral("shoulder_slope_neck_side_length"); // E37 +const QString shoulderSlopeNeckBackAngle_M = QStringLiteral("shoulder_slope_neck_back_angle"); // E38 +const QString shoulderSlopeNeckBackHeight_M = QStringLiteral("shoulder_slope_neck_back_height"); // E39 +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 diff --git a/src/libs/vmisc/def.h b/src/libs/vmisc/def.h index 0a29b8f22..bbac6e6fa 100644 --- a/src/libs/vmisc/def.h +++ b/src/libs/vmisc/def.h @@ -296,33 +296,36 @@ extern const QString shoulderTipToWaistSideB_M; // E07 extern const QString neckSideToWaistB_M; // E08 extern const QString neckBackToWaistB_M; // E09 extern const QString neckSideToWaistBladepointB_M; // E10 -extern const QString shoulderTipToArmfoldF_M; // E11 -extern const QString neckSideToBustF_M; // E12 -extern const QString neckSideToHighbustF_M; // E13 -extern const QString shoulderCenterToHighbustF_M; // E14 -extern const QString neckFrontToHighbustF_M; // E15 -extern const QString neckFrontToBustF_M; // E16 -extern const QString lowbustToWaistF_M; // E17 -extern const QString shoulderTipToArmfoldB_M; // E18 -extern const QString neckSideToBustB_M; // E19 -extern const QString neckSideToHighbustB_M; // E20 -extern const QString shoulderCenterToHighbustB_M; // E21 -extern const QString neckBackToHighbustB_M; // E22 -extern const QString neckBackToBustB_M; // E23 -extern const QString lowbustToWaistB_M; // E24 -extern const QString waistToHighhipF_M; // E25 -extern const QString waistToHipF_M; // E26 -extern const QString waistToHighhipSide_M; // E27 -extern const QString waistToHighhipB_M; // E28 -extern const QString waistToHipB_M; // E29 -extern const QString waistToHipSide_M; // E30 -extern const QString shoulderSlopeNeckSideLength_M; // E31 -extern const QString shoulderSlopeNeckSideAngle_M; // E32 -extern const QString shoulderSlopeNeckBackHeight_M; // E33 -extern const QString shoulderSlopeNeckBackAngle_M; // E34 -extern const QString shoulderSlopeShoulderTipAngle_M; // E35 -extern const QString highbustToWaistF_M; // E36 -extern const QString highbustToWaistB_M; // E37 +extern const QString neckFrontToHighbustF_M; // E11 +extern const QString neckFrontToBustF_M; // E12 +extern const QString highbustToWaistF_M; // E13 +extern const QString bustToWaistF_M; // E14 +extern const QString lowbustToWaistF_M; // E15 +extern const QString ribToWaistSide_M; // E16 +extern const QString neckBackToHighbustB_M; // E17 +extern const QString neckBackToBustB_M; // E18 +extern const QString highbustToWaistB_M; // E19 +extern const QString bustToWaistB_M; // E20 +extern const QString lowbustToWaistB_M; // E21 +extern const QString shoulderTipToArmfoldF_M; // E22 +extern const QString neckSideToBustF_M; // E23 +extern const QString neckSideToHighbustF_M; // E24 +extern const QString shoulderCenterToHighbustF_M; // E25 +extern const QString shoulderTipToArmfoldB_M; // E26 +extern const QString neckSideToBustB_M; // E27 +extern const QString neckSideToHighbustB_M; // E28 +extern const QString shoulderCenterToHighbustB_M; // E29 +extern const QString waistToHighhipF_M; // E30 +extern const QString waistToHipF_M; // E31 +extern const QString waistToHighhipSide_M; // E32 +extern const QString waistToHighhipB_M; // E33 +extern const QString waistToHipB_M; // E34 +extern const QString waistToHipSide_M; // E35 +extern const QString shoulderSlopeNeckSideAngle_M; // E36 +extern const QString shoulderSlopeNeckSideLength_M; // E37 +extern const QString shoulderSlopeNeckBackAngle_M; // E38 +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 diff --git a/src/libs/vpatterndb/vtranslatemeasurements.cpp b/src/libs/vpatterndb/vtranslatemeasurements.cpp index 27fc5618b..a091930bb 100644 --- a/src/libs/vpatterndb/vtranslatemeasurements.cpp +++ b/src/libs/vpatterndb/vtranslatemeasurements.cpp @@ -808,23 +808,92 @@ void VTranslateMeasurements::InitGroupE() "Full measurement description."); InitMeasurement(neckSideToWaistBladepointB_M, m, g, d, "E10"); //================================================================================================================= + m = QmuTranslation::translate("Measurements", "neck_front_to_highbust_f", + "Name in a formula. Don't use math symbols and space in name!!!!"); + g = QmuTranslation::translate("Measurements", "Neck Front to Highbust (front)", "Full measurement name."); + d = QmuTranslation::translate("Measurements", "Neck Front to Highbust (front)", "Full measurement description."); + InitMeasurement(neckFrontToHighbustF_M, m, g, d, "E11"); + //================================================================================================================= + m = QmuTranslation::translate("Measurements", "neck_front_to_bust_f", + "Name in a formula. Don't use math symbols and space in name!!!!"); + g = QmuTranslation::translate("Measurements", "Neck Front to Bust (front)", "Full measurement name."); + d = QmuTranslation::translate("Measurements", "Neck Front to Bust (front)", "Full measurement description."); + InitMeasurement(neckFrontToBustF_M, m, g, d, "E12"); + //================================================================================================================= + m = QmuTranslation::translate("Measurements", "highbust_to_waist_f", + "Name in a formula. Don't use math symbols and space in name!!!!"); + g = QmuTranslation::translate("Measurements", "Highbust to Waist (front)", "Full measurement name."); + d = QmuTranslation::translate("Measurements", "Highbust to Waist (front)", "Full measurement description."); + InitMeasurement(highbustToWaistF_M, m, g, d, "E13", "(neck_front_to_waist - neck_front_to_highbust)"); + //================================================================================================================= + m = QmuTranslation::translate("Measurements", "bust_to_waist_f", + "Name in a formula. Don't use math symbols and space in name!!!!"); + g = QmuTranslation::translate("Measurements", "Bust to Waist (front)", + "Full measurement name."); + d = QmuTranslation::translate("Measurements", "Bust Center down to Waist line", "Full measurement description."); + InitMeasurement(bustToWaistF_M, m, g, d, "E14"); + //================================================================================================================= + m = QmuTranslation::translate("Measurements", "lowbust_to_waist_f", + "Name in a formula. Don't use math symbols and space in name!!!!"); + g = QmuTranslation::translate("Measurements", "Lowbust to Waist (front)", "Full measurement name."); + d = QmuTranslation::translate("Measurements", "Lowbust to Waist (front)", "Full measurement description."); + InitMeasurement(lowbustToWaistF_M, m, g, d, "E15"); + //================================================================================================================= + m = QmuTranslation::translate("Measurements", "rib_to_waist_side", + "Name in a formula. Don't use math symbols and space in name!!!!"); + g = QmuTranslation::translate("Measurements", "Rib to Waist (side)", "Full measurement name."); + d = QmuTranslation::translate("Measurements", "From lowest rib at side down to waist", + "Full measurement description."); + InitMeasurement(ribToWaistSide_M, m, g, d, "E16"); + //================================================================================================================= + m = QmuTranslation::translate("Measurements", "neck_back_to_highbust_b", + "Name in a formula. Don't use math symbols and space in name!!!!"); + g = QmuTranslation::translate("Measurements", "Neck Back to Highbust (back)", "Full measurement name."); + d = QmuTranslation::translate("Measurements", "Neck Back to Highbust (back)", "Full measurement description."); + InitMeasurement(neckBackToHighbustB_M, m, g, d, "E17"); + //================================================================================================================= + m = QmuTranslation::translate("Measurements", "neck_back_to_bust_b", + "Name in a formula. Don't use math symbols and space in name!!!!"); + g = QmuTranslation::translate("Measurements", "Neck Back to Bust (back)", "Full measurement name."); + d = QmuTranslation::translate("Measurements", "Neck Back to Bust (back)", "Full measurement description."); + InitMeasurement(neckBackToBustB_M, m, g, d, "E18"); + //================================================================================================================= + m = QmuTranslation::translate("Measurements", "highbust_to_waist_b", + "Name in a formula. Don't use math symbols and space in name!!!!"); + g = QmuTranslation::translate("Measurements", "Highbust to Waist (back)", "Full measurement name."); + d = QmuTranslation::translate("Measurements", "Highbust to Waist (back)", "Full measurement description."); + InitMeasurement(highbustToWaistB_M, m, g, d, "E19", "(neck_back_to_waist - neck_back_to_highbust)"); + //================================================================================================================= + m = QmuTranslation::translate("Measurements", "bust_to_waist_b", + "Name in a formula. Don't use math symbols and space in name!!!!"); + g = QmuTranslation::translate("Measurements", "Bust back center to waist line (back)", "Full measurement name."); + d = QmuTranslation::translate("Measurements", "Bust back center to waist line (back)", + "Full measurement description."); + InitMeasurement(bustToWaistB_M, m, g, d, "E20"); + //================================================================================================================= + m = QmuTranslation::translate("Measurements", "lowbust_to_waist_b", + "Name in a formula. Don't use math symbols and space in name!!!!"); + g = QmuTranslation::translate("Measurements", "Lowbust to Waist (back)", "Full measurement name."); + d = QmuTranslation::translate("Measurements", "Lowbust to Waist (back)", "Full measurement description."); + InitMeasurement(lowbustToWaistB_M, m, g, d, "E21"); + //================================================================================================================= m = QmuTranslation::translate("Measurements", "shoulder_tip_to_armfold_f", "Name in a formula. Don't use math symbols and space in name!!!!"); g = QmuTranslation::translate("Measurements", "Shoulder Tip to Armfold (front)", "Full measurement name."); d = QmuTranslation::translate("Measurements", "Shoulder Tip to Armfold (front)", "Full measurement description."); - InitMeasurement(shoulderTipToArmfoldF_M, m, g, d, "E11"); + InitMeasurement(shoulderTipToArmfoldF_M, m, g, d, "E22"); //================================================================================================================= m = QmuTranslation::translate("Measurements", "neck_side_to_bust_f", "Name in a formula. Don't use math symbols and space in name!!!!"); g = QmuTranslation::translate("Measurements", "Neck Side to Bust (front)", "Full measurement name."); d = QmuTranslation::translate("Measurements", "Neck Side to Bust (front)", "Full measurement description."); - InitMeasurement(neckSideToBustF_M, m, g, d, "E12"); + InitMeasurement(neckSideToBustF_M, m, g, d, "E23"); //================================================================================================================= m = QmuTranslation::translate("Measurements", "neck_side_to_highbust_f", "Name in a formula. Don't use math symbols and space in name!!!!"); g = QmuTranslation::translate("Measurements", "Neck Side to Highbust (front)", "Full measurement name."); d = QmuTranslation::translate("Measurements", "Neck Side to Highbust (front)", "Full measurement description."); - InitMeasurement(neckSideToHighbustF_M, m, g, d, "E13"); + InitMeasurement(neckSideToHighbustF_M, m, g, d, "E24"); //================================================================================================================= m = QmuTranslation::translate("Measurements", "shoulder_center_to_highbust_f", "Name in a formula. Don't use math symbols and space in name!!!!"); @@ -832,43 +901,25 @@ void VTranslateMeasurements::InitGroupE() "Full measurement name."); d = QmuTranslation::translate("Measurements", "Shoulder Center to Highbust (front), aimed at Bustpoint", "Full measurement description."); - InitMeasurement(shoulderCenterToHighbustF_M, m, g, d, "E14"); - //================================================================================================================= - m = QmuTranslation::translate("Measurements", "neck_front_to_highbust_f", - "Name in a formula. Don't use math symbols and space in name!!!!"); - g = QmuTranslation::translate("Measurements", "Neck Front to Highbust (front)", "Full measurement name."); - d = QmuTranslation::translate("Measurements", "Neck Front to Highbust (front)", "Full measurement description."); - InitMeasurement(neckFrontToHighbustF_M, m, g, d, "E15"); - //================================================================================================================= - m = QmuTranslation::translate("Measurements", "neck_front_to_bust_f", - "Name in a formula. Don't use math symbols and space in name!!!!"); - g = QmuTranslation::translate("Measurements", "Neck Front to Bust (front)", "Full measurement name."); - d = QmuTranslation::translate("Measurements", "Neck Front to Bust (front)", "Full measurement description."); - InitMeasurement(neckFrontToBustF_M, m, g, d, "E16"); - //================================================================================================================= - m = QmuTranslation::translate("Measurements", "lowbust_to_waist_f", - "Name in a formula. Don't use math symbols and space in name!!!!"); - g = QmuTranslation::translate("Measurements", "Lowbust to Waist (front)", "Full measurement name."); - d = QmuTranslation::translate("Measurements", "Lowbust to Waist (front)", "Full measurement description."); - InitMeasurement(lowbustToWaistF_M, m, g, d, "E17"); + InitMeasurement(shoulderCenterToHighbustF_M, m, g, d, "E25"); //================================================================================================================= m = QmuTranslation::translate("Measurements", "shoulder_tip_to_armfold_b", "Name in a formula. Don't use math symbols and space in name!!!!"); g = QmuTranslation::translate("Measurements", "Shoulder Tip to Armfold (back)", "Full measurement name."); d = QmuTranslation::translate("Measurements", "Shoulder Tip to Armfold (back)", "Full measurement description."); - InitMeasurement(shoulderTipToArmfoldB_M, m, g, d, "E18"); + InitMeasurement(shoulderTipToArmfoldB_M, m, g, d, "E26"); //================================================================================================================= m = QmuTranslation::translate("Measurements", "neck_side_to_bust_b", "Name in a formula. Don't use math symbols and space in name!!!!"); g = QmuTranslation::translate("Measurements", "Neck Side to Bust (back)", "Full measurement name."); d = QmuTranslation::translate("Measurements", "Neck Side to Bust (back)", "Full measurement description."); - InitMeasurement(neckSideToBustB_M, m, g, d, "E19"); + InitMeasurement(neckSideToBustB_M, m, g, d, "E27"); //================================================================================================================= m = QmuTranslation::translate("Measurements", "neck_side_to_highbust_b", "Name in a formula. Don't use math symbols and space in name!!!!"); g = QmuTranslation::translate("Measurements", "Neck Side to Highbust (back)", "Full measurement name."); d = QmuTranslation::translate("Measurements", "Neck Side to Highbust (back)", "Full measurement description."); - InitMeasurement(neckSideToHighbustB_M, m, g, d, "E20"); + InitMeasurement(neckSideToHighbustB_M, m, g, d, "E28"); //================================================================================================================= m = QmuTranslation::translate("Measurements", "shoulder_center_to_highbust_b", "Name in a formula. Don't use math symbols and space in name!!!!"); @@ -876,96 +927,81 @@ void VTranslateMeasurements::InitGroupE() "Full measurement name."); d = QmuTranslation::translate("Measurements", "Shoulder Center to Highbust (back), aimed through Bladepoint", "Full measurement description."); - InitMeasurement(shoulderCenterToHighbustB_M, m, g, d, "E21"); - //================================================================================================================= - m = QmuTranslation::translate("Measurements", "neck_back_to_highbust_b", - "Name in a formula. Don't use math symbols and space in name!!!!"); - g = QmuTranslation::translate("Measurements", "Neck Back to Highbust (back)", "Full measurement name."); - d = QmuTranslation::translate("Measurements", "Neck Back to Highbust (back)", "Full measurement description."); - InitMeasurement(neckBackToHighbustB_M, m, g, d, "E22"); - //================================================================================================================= - m = QmuTranslation::translate("Measurements", "neck_back_to_bust_b", - "Name in a formula. Don't use math symbols and space in name!!!!"); - g = QmuTranslation::translate("Measurements", "Neck Back to Bust (back)", "Full measurement name."); - d = QmuTranslation::translate("Measurements", "Neck Back to Bust (back)", "Full measurement description."); - InitMeasurement(neckBackToBustB_M, m, g, d, "E23"); - //================================================================================================================= - m = QmuTranslation::translate("Measurements", "lowbust_to_waist_b", - "Name in a formula. Don't use math symbols and space in name!!!!"); - g = QmuTranslation::translate("Measurements", "Lowbust to Waist (back)", "Full measurement name."); - d = QmuTranslation::translate("Measurements", "Lowbust to Waist (back)", "Full measurement description."); - InitMeasurement(lowbustToWaistB_M, m, g, d, "E24"); + InitMeasurement(shoulderCenterToHighbustB_M, m, g, d, "E29"); //================================================================================================================= m = QmuTranslation::translate("Measurements", "waist_to_highhip_f", "Name in a formula. Don't use math symbols and space in name!!!!"); g = QmuTranslation::translate("Measurements", "Waist to Highhip (front)", "Full measurement name."); d = QmuTranslation::translate("Measurements", "Waist to Highhip (front)", "Full measurement description."); - InitMeasurement(waistToHighhipF_M, m, g, d, "E25"); + InitMeasurement(waistToHighhipF_M, m, g, d, "E30"); //================================================================================================================= m = QmuTranslation::translate("Measurements", "waist_to_hip_f", "Name in a formula. Don't use math symbols and space in name!!!!"); g = QmuTranslation::translate("Measurements", "Waist to Hip (front)", "Full measurement name."); d = QmuTranslation::translate("Measurements", "Waist to Hip (front)", "Full measurement description."); - InitMeasurement(waistToHipF_M, m, g, d, "E26"); + InitMeasurement(waistToHipF_M, m, g, d, "E31"); //================================================================================================================= m = QmuTranslation::translate("Measurements", "waist_to_highhip_side", "Name in a formula. Don't use math symbols and space in name!!!!"); g = QmuTranslation::translate("Measurements", "Waist to Highhip (side)", "Full measurement name."); d = QmuTranslation::translate("Measurements", "Waist to Highhip (side)", "Full measurement description."); - InitMeasurement(waistToHighhipSide_M, m, g, d, "E27"); + InitMeasurement(waistToHighhipSide_M, m, g, d, "E32"); //================================================================================================================= m = QmuTranslation::translate("Measurements", "waist_to_highhip_b", "Name in a formula. Don't use math symbols and space in name!!!!"); g = QmuTranslation::translate("Measurements", "Waist to Highhip (back)", "Full measurement name."); d = QmuTranslation::translate("Measurements", "Waist to Highhip (back)", "Full measurement description."); - InitMeasurement(waistToHighhipB_M, m, g, d, "E28"); + InitMeasurement(waistToHighhipB_M, m, g, d, "E33"); //================================================================================================================= m = QmuTranslation::translate("Measurements", "waist_to_hip_b", "Name in a formula. Don't use math symbols and space in name!!!!"); g = QmuTranslation::translate("Measurements", "Waist to Hip (back)", "Full measurement name."); d = QmuTranslation::translate("Measurements", "Waist to Hip (back)", "Full measurement description."); - InitMeasurement(waistToHipB_M, m, g, d, "E29"); + InitMeasurement(waistToHipB_M, m, g, d, "E34"); //================================================================================================================= m = QmuTranslation::translate("Measurements", "waist_to_hip_side", "Name in a formula. Don't use math symbols and space in name!!!!"); g = QmuTranslation::translate("Measurements", "Waist to Hip (side)", "Full measurement name."); d = QmuTranslation::translate("Measurements", "Waist to Hip (side)", "Full measurement description."); - InitMeasurement(waistToHipSide_M, m, g, d, "E30"); - //================================================================================================================= - m = QmuTranslation::translate("Measurements", "shoulder_slope_neck_side_length", - "Name in a formula. Don't use math symbols and space in name!!!!"); - g = QmuTranslation::translate("Measurements", "Shoulder Slope length from Neck Side", "Full measurement name."); - d = QmuTranslation::translate("Measurements", "Shoulder Slope length from Neck Side", - "Full measurement description."); - InitMeasurement(shoulderSlopeNeckSideLength_M, m, g, d, "E31"); + InitMeasurement(waistToHipSide_M, m, g, d, "E35"); //================================================================================================================= m = QmuTranslation::translate("Measurements", "shoulder_slope_neck_side_angle", "Name in a formula. Don't use math symbols and space in name!!!!"); g = QmuTranslation::translate("Measurements", "Shoulder Slope angle from Neck Side", "Full measurement name."); - d = QmuTranslation::translate("Measurements", "Shoulder Slope angle from Neck Side", + d = QmuTranslation::translate("Measurements", "Angle measuredvetween line parallel to floor at Neck Side, and " + "line from Neck Side to Shoulder Tip. Usually measured with special tools.", "Full measurement description."); - InitMeasurement(shoulderSlopeNeckSideAngle_M, m, g, d, "E32"); + InitMeasurement(shoulderSlopeNeckSideAngle_M, m, g, d, "E36"); //================================================================================================================= - m = QmuTranslation::translate("Measurements", "shoulder_slope_neck_back_height", + m = QmuTranslation::translate("Measurements", "shoulder_slope_neck_side_length", "Name in a formula. Don't use math symbols and space in name!!!!"); - g = QmuTranslation::translate("Measurements", "Shoulder Slope Height from Neck Back", "Full measurement name."); - d = QmuTranslation::translate("Measurements", "Shoulder Slope Height from Neck Back", + g = QmuTranslation::translate("Measurements", "Shoulder Slope length from Neck Side", "Full measurement name."); + d = QmuTranslation::translate("Measurements", "Vertical distance between Neck Side and Shoulder Tip", "Full measurement description."); - InitMeasurement(shoulderSlopeNeckBackHeight_M, m, g, d, "E33"); + InitMeasurement(shoulderSlopeNeckSideLength_M, m, g, d, "E37"); //================================================================================================================= m = QmuTranslation::translate("Measurements", "shoulder_slope_neck_back_angle", "Name in a formula. Don't use math symbols and space in name!!!!"); g = QmuTranslation::translate("Measurements", "Shoulder Slope Angle from Neck Back", "Full measurement name."); - d = QmuTranslation::translate("Measurements", "Shoulder Slope Angle from Neck Back", + d = QmuTranslation::translate("Measurements", "Angle between line parallel to floor at Neck Back level and line " + "from Neck Back to Shoulder Tip. Usually measured with special tool.", "Full measurement description."); - InitMeasurement(shoulderSlopeNeckBackAngle_M, m, g, d, "E34"); + InitMeasurement(shoulderSlopeNeckBackAngle_M, m, g, d, "E38"); + //================================================================================================================= + m = QmuTranslation::translate("Measurements", "shoulder_slope_neck_back_height", + "Name in a formula. Don't use math symbols and space in name!!!!"); + g = QmuTranslation::translate("Measurements", "Shoulder Slope Height from Neck Back", "Full measurement name."); + d = QmuTranslation::translate("Measurements", "Vertical distance between Neck Back and Shoulder Tip", + "Full measurement description."); + InitMeasurement(shoulderSlopeNeckBackHeight_M, m, g, d, "E39"); //================================================================================================================= m = QmuTranslation::translate("Measurements", "shoulder_slope_shoulder_tip_angle", "Name in a formula. Don't use math symbols and space in name!!!!"); g = QmuTranslation::translate("Measurements", "Shoulder Slope Angle from Shoulder Tip", "Full measurement name."); - d = QmuTranslation::translate("Measurements", "Shoulder Slope Angle from Shoulder Tip", + d = QmuTranslation::translate("Measurements", "Angle between vertical line at Shoulder Tip, and line from Neck " + "Side to Shoulder Tip. Usually measured with special tools.", "Full measurement description."); - InitMeasurement(shoulderSlopeShoulderTipAngle_M, m, g, d, "E35"); + InitMeasurement(shoulderSlopeShoulderTipAngle_M, m, g, d, "E40"); //================================================================================================================= m = QmuTranslation::translate("Measurements", "highbust_to_waist_f", "Name in a formula. Don't use math symbols and space in name!!!!"); @@ -973,12 +1009,6 @@ void VTranslateMeasurements::InitGroupE() d = QmuTranslation::translate("Measurements", "Highbust to Waist (front)", "Full measurement description."); InitMeasurement(highbustToWaistF_M, m, g, d, "E36", "(neck_front_to_waist - neck_front_to_highbust)"); //================================================================================================================= - m = QmuTranslation::translate("Measurements", "highbust_to_waist_b", - "Name in a formula. Don't use math symbols and space in name!!!!"); - g = QmuTranslation::translate("Measurements", "Highbust to Waist (back)", "Full measurement name."); - d = QmuTranslation::translate("Measurements", "Highbust to Waist (back)", "Full measurement description."); - InitMeasurement(highbustToWaistB_M, m, g, d, "E37", "(neck_back_to_waist - neck_back_to_highbust)"); - //================================================================================================================= } //---------------------------------------------------------------------------------------------------------------------