From 34810726ee5bede0a85842f85477d89117f1d264 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 31 Aug 2015 18:56:23 +0300 Subject: [PATCH] Updated group A. --HG-- branch : develop --- src/libs/vmisc/def.cpp | 1 + src/libs/vmisc/def.h | 1 + .../vpatterndb/vtranslatemeasurements.cpp | 69 +++++++++++++------ 3 files changed, 50 insertions(+), 21 deletions(-) diff --git a/src/libs/vmisc/def.cpp b/src/libs/vmisc/def.cpp index ab584250d..30493cf77 100644 --- a/src/libs/vmisc/def.cpp +++ b/src/libs/vmisc/def.cpp @@ -55,6 +55,7 @@ const QString heightNeckSide_M = QStringLiteral("height_neck_side"); const QString heightNeckBackToKnee_M = QStringLiteral("height_neck_back_to_knee"); // A18 const QString heightWaistSideToKnee_M = QStringLiteral("height_waist_side_to_knee"); // A19 const QString heightWaistSideToHip_M = QStringLiteral("height_waist_side_to_hip"); // A20 +const QString heightKneeToAnkle_M = QStringLiteral("height_knee_to_ankle"); // A21 // B const QString widthShoulder_M = QStringLiteral("width_shoulder"); // B01 const QString widthBust_M = QStringLiteral("width_bust"); // B02 diff --git a/src/libs/vmisc/def.h b/src/libs/vmisc/def.h index fe132b7b2..0a29b8f22 100644 --- a/src/libs/vmisc/def.h +++ b/src/libs/vmisc/def.h @@ -228,6 +228,7 @@ extern const QString heightNeckSide_M; // A17 extern const QString heightNeckBackToKnee_M; // A18 extern const QString heightWaistSideToKnee_M; // A19 extern const QString heightWaistSideToHip_M; // A20 +extern const QString heightKneeToAnkle_M; // A21 // B extern const QString widthShoulder_M; // B01 extern const QString widthBust_M; // B02 diff --git a/src/libs/vpatterndb/vtranslatemeasurements.cpp b/src/libs/vpatterndb/vtranslatemeasurements.cpp index e8adf772b..5a058bd85 100644 --- a/src/libs/vpatterndb/vtranslatemeasurements.cpp +++ b/src/libs/vpatterndb/vtranslatemeasurements.cpp @@ -174,125 +174,152 @@ void VTranslateMeasurements::InitGroupA() m = QmuTranslation::translate("Measurements", "height", "Name in a formula. Don't use math symbols and space in name!!!!"); g = QmuTranslation::translate("Measurements", "Height Total", "Full measurement name."); - d = QmuTranslation::translate("Measurements", "Height Total", "Full measurement description."); + d = QmuTranslation::translate("Measurements", "Vertical distance from crown of head to floor", + "Full measurement description."); InitMeasurement(height_M, m, g, d, "A01"); //================================================================================================================= m = QmuTranslation::translate("Measurements", "height_neck_back", "Name in a formula. Don't use math symbols and space in name!!!!"); g = QmuTranslation::translate("Measurements", "Height Neck Back", "Full measurement name."); - d = QmuTranslation::translate("Measurements", "Height Neck Back", + d = QmuTranslation::translate("Measurements", + "Vertical distance from the Neck Back (cervicale vertebra) to the floor", "Full measurement description."); InitMeasurement(heightNeckBack_M, m, g, d, "A02"); //================================================================================================================= m = QmuTranslation::translate("Measurements", "height_scapula", "Name in a formula. Don't use math symbols and space in name!!!!"); g = QmuTranslation::translate("Measurements", "Height Scapula", "Full measurement name."); - d = QmuTranslation::translate("Measurements", "Height Scapula", "Full measurement description."); + d = QmuTranslation::translate("Measurements", "Vertical distance from the Scapula (Blade point) to the floor", + "Full measurement description."); InitMeasurement(heightScapula_M, m, g, d, "A03"); //================================================================================================================= m = QmuTranslation::translate("Measurements", "height_armpit", "Name in a formula. Don't use math symbols and space in name!!!!"); g = QmuTranslation::translate("Measurements", "Height Armpit", "Full measurement name."); - d = QmuTranslation::translate("Measurements", "Height Armpit", "Full measurement description."); + d = QmuTranslation::translate("Measurements", "Vertical distance from the Armpit to the floor.", + "Full measurement description."); InitMeasurement(heightArmpit_M, m, g, d, "A04"); //================================================================================================================= m = QmuTranslation::translate("Measurements", "height_waist_side", "Name in a formula. Don't use math symbols and space in name!!!!"); g = QmuTranslation::translate("Measurements", "Height Waist Side", "Full measurement name."); - d = QmuTranslation::translate("Measurements", "Height Waist Side", "Full measurement description."); + d = QmuTranslation::translate("Measurements", "Vertical distance from the Waist Side to the floor", + "Full measurement description."); InitMeasurement(heightWaistSide_M, m, g, d, "A05"); //================================================================================================================= m = QmuTranslation::translate("Measurements", "height_hip", "Name in a formula. Don't use math symbols and space in name!!!!"); g = QmuTranslation::translate("Measurements", "Height Hip", "Full measurement name."); - d = QmuTranslation::translate("Measurements", "Height Hip", "Full measurement description."); + d = QmuTranslation::translate("Measurements", "Vertical distance from the Hip level to the floor.", + "Full measurement description."); InitMeasurement(heightHip_M, m, g, d, "A06"); //================================================================================================================= m = QmuTranslation::translate("Measurements", "height_gluteal_fold", "Name in a formula. Don't use math symbols and space in name!!!!"); g = QmuTranslation::translate("Measurements", "Height Gluteal Fold", "Full measurement name."); - d = QmuTranslation::translate("Measurements", "Height Gluteal Fold", "Full measurement description."); + d = QmuTranslation::translate("Measurements", "Vertical distance from the Gluteal fold, where the Gluteal muscle " + "meets the top of the back thigh, to the floor", "Full measurement description."); InitMeasurement(heightGlutealFold_M, m, g, d, "A07"); //================================================================================================================= m = QmuTranslation::translate("Measurements", "height_knee", "Name in a formula. Don't use math symbols and space in name!!!!"); g = QmuTranslation::translate("Measurements", "Height Knee", "Full measurement name."); - d = QmuTranslation::translate("Measurements", "Height Knee", "Full measurement description."); + d = QmuTranslation::translate("Measurements", "Vertical distance from the fold at the back of the Knee to " + "the floor", "Full measurement description."); InitMeasurement(heightKnee_M, m, g, d, "A08"); //================================================================================================================= m = QmuTranslation::translate("Measurements", "height_calf", "Name in a formula. Don't use math symbols and space in name!!!!"); g = QmuTranslation::translate("Measurements", "Height Calf", "Full measurement name."); - d = QmuTranslation::translate("Measurements", "Height Calf", "Full measurement description."); + d = QmuTranslation::translate("Measurements", "Vertical distance from the widest point of the calf to the floor", + "Full measurement description."); InitMeasurement(heightCalf_M, m, g, d, "A09"); //================================================================================================================= m = QmuTranslation::translate("Measurements", "height_ankle_high", "Name in a formula. Don't use math symbols and space in name!!!!"); g = QmuTranslation::translate("Measurements", "Height Ankle High", "Full measurement name."); - d = QmuTranslation::translate("Measurements", "Height Ankle High", "Full measurement description."); + d = QmuTranslation::translate("Measurements", "Vertical distance from the deepest indentation of the back of the " + "ankle to the floor", "Full measurement description."); InitMeasurement(heightAnkleHigh_M, m, g, d, "A10"); //================================================================================================================= m = QmuTranslation::translate("Measurements", "height_ankle", "Name in a formula. Don't use math symbols and space in name!!!!"); g = QmuTranslation::translate("Measurements", "Height Ankle", "Full measurement name."); - d = QmuTranslation::translate("Measurements", "Height Ankle", "Full measurement description."); + d = QmuTranslation::translate("Measurements", "Vertical distance from point where the front leg meets the foot " + "to the floor", "Full measurement description."); InitMeasurement(heightAnkle_M, m, g, d, "A11"); //================================================================================================================= m = QmuTranslation::translate("Measurements", "height_highhip", "Name in a formula. Don't use math symbols and space in name!!!!"); g = QmuTranslation::translate("Measurements", "Height Highhip", "Full measurement name."); - d = QmuTranslation::translate("Measurements", "Height Highhip", "Full measurement description."); + d = QmuTranslation::translate("Measurements", "Vertical distance from the Highhip level, where front abdomen is " + "most prominent, to the floor", "Full measurement description."); InitMeasurement(heightHighhip_M, m, g, d, "A12"); //================================================================================================================= m = QmuTranslation::translate("Measurements", "height_waist_front", "Name in a formula. Don't use math symbols and space in name!!!!"); g = QmuTranslation::translate("Measurements", "Height Waist Front", "Full measurement name."); - d = QmuTranslation::translate("Measurements", "Height Waist Front", "Full measurement description."); + d = QmuTranslation::translate("Measurements", "Vertical distance from the Waist Front to the floor", + "Full measurement description."); InitMeasurement(heightWaistFront_M, m, g, d, "A13"); //================================================================================================================= m = QmuTranslation::translate("Measurements", "height_bustpoint", "Name in a formula. Don't use math symbols and space in name!!!!"); g = QmuTranslation::translate("Measurements", "Height Bustpoint", "Full measurement name."); - d = QmuTranslation::translate("Measurements", "Height Bustpoint", "Full measurement description."); + d = QmuTranslation::translate("Measurements", "Vertical distance from Bustpoint to the floor", + "Full measurement description."); InitMeasurement(heightBustpoint_M, m, g, d, "A14"); //================================================================================================================= m = QmuTranslation::translate("Measurements", "height_shoulder_tip", "Name in a formula. Don't use math symbols and space in name!!!!"); g = QmuTranslation::translate("Measurements", "Height Shoulder Tip", "Full measurement name."); - d = QmuTranslation::translate("Measurements", "Height Shoulder Tip", "Full measurement description."); + d = QmuTranslation::translate("Measurements", "Vertical distance from the Shoulder Tip to the floor", + "Full measurement description."); InitMeasurement(heightShoulderTip_M, m, g, d, "A15"); //================================================================================================================= m = QmuTranslation::translate("Measurements", "height_neck_front", "Name in a formula. Don't use math symbols and space in name!!!!"); g = QmuTranslation::translate("Measurements", "Height Neck Front", "Full measurement name."); - d = QmuTranslation::translate("Measurements", "Height Neck Front", "Full measurement description."); + d = QmuTranslation::translate("Measurements", "Vertical distance from the Neck Front to the floor", + "Full measurement description."); InitMeasurement(heightNeckFront_M, m, g, d, "A16"); //================================================================================================================= m = QmuTranslation::translate("Measurements", "height_neck_side", "Name in a formula. Don't use math symbols and space in name!!!!"); g = QmuTranslation::translate("Measurements", "Height Neck Side", "Full measurement name."); - d = QmuTranslation::translate("Measurements", "Height Neck Side", "Full measurement description."); + d = QmuTranslation::translate("Measurements", "Vertical distance from the Neck Side to the floor", + "Full measurement description."); InitMeasurement(heightNeckSide_M, m, g, d, "A17"); //================================================================================================================= m = QmuTranslation::translate("Measurements", "height_neck_back_to_knee", "Name in a formula. Don't use math symbols and space in name!!!!"); g = QmuTranslation::translate("Measurements", "Height Neck Back to Knee", "Full measurement name."); - d = QmuTranslation::translate("Measurements", "Height Neck Back to Knee", "Full measurement description."); + d = QmuTranslation::translate("Measurements", "Vertical distance from the Neck Back (cervicale vertebra) to the " + "fold at the back of the knee", "Full measurement description."); InitMeasurement(heightNeckBackToKnee_M, m, g, d, "A18", "(height_neck_back - height_knee)"); //================================================================================================================= m = QmuTranslation::translate("Measurements", "height_waist_side_to_knee", "Name in a formula. Don't use math symbols and space in name!!!!"); g = QmuTranslation::translate("Measurements", "Height Waist Side to Knee", "Full measurement name."); - d = QmuTranslation::translate("Measurements", "Height Waist Side to Knee", - "Full measurement description."); + d = QmuTranslation::translate("Measurements", "Vertical distance from the Waist Side to the fold at the back of " + "the knee", "Full measurement description."); InitMeasurement(heightWaistSideToKnee_M, m, g, d, "A19", "(height_waist_side - height_knee)"); //================================================================================================================= m = QmuTranslation::translate("Measurements", "height_waist_side_to_hip", "Name in a formula. Don't use math symbols and space in name!!!!"); g = QmuTranslation::translate("Measurements", "Height Waist Side to Hip", "Full measurement name."); - d = QmuTranslation::translate("Measurements", "Height Waist Side to Hip", "Full measurement description."); + d = QmuTranslation::translate("Measurements", "Vertical distance from the Waist Side to the Hip level", + "Full measurement description."); InitMeasurement(heightWaistSideToHip_M, m, g, d, "A20", "(height_waist_side - height_hip)"); //================================================================================================================= + m = QmuTranslation::translate("Measurements", "height_knee_to_ankle", + "Name in a formula. Don't use math symbols and space in name!!!!"); + g = QmuTranslation::translate("Measurements", "Height knee to ankle", "Full measurement name."); + d = QmuTranslation::translate("Measurements", "Vertical distance from the fold at the back of the knee to the " + "point where the front leg meets the top of the foot", + "Full measurement description."); + InitMeasurement(heightKneeToAnkle_M, m, g, d, "A21"); + //================================================================================================================= } //---------------------------------------------------------------------------------------------------------------------