From 37cab897fafeb32df0766b008f72c0915d109374 Mon Sep 17 00:00:00 2001 From: dismine Date: Fri, 16 May 2014 14:17:25 +0300 Subject: [PATCH] Make measurements names more unique. --HG-- branch : feature --- src/app/options.cpp | 258 +++++++++++------------ src/app/options.h | 258 +++++++++++------------ src/app/widgets/vapplication.cpp | 256 +++++++++++------------ src/app/xml/vindividualmeasurements.cpp | 258 +++++++++++------------ src/app/xml/vstandardmeasurements.cpp | 262 ++++++++++++------------ 5 files changed, 646 insertions(+), 646 deletions(-) diff --git a/src/app/options.cpp b/src/app/options.cpp index 7098b299e..3bea6b6af 100644 --- a/src/app/options.cpp +++ b/src/app/options.cpp @@ -29,137 +29,137 @@ #include "options.h" //measurements -const QString headGirth = QStringLiteral("head_girth"); -const QString midNeckGirth = QStringLiteral("mid_neck_girth"); -const QString neckBaseGirth = QStringLiteral("neck_base_girth"); -const QString headAndNeckLength = QStringLiteral("head_and_neck_length"); -const QString centerFrontWaistLength = QStringLiteral("center_front_waist_length"); -const QString centerBackWaistLength = QStringLiteral("center_back_waist_length"); -const QString shoulderLength = QStringLiteral("shoulder_length"); -const QString sideWaistLength = QStringLiteral("side_waist_length"); -const QString trunkLength = QStringLiteral("trunk_length"); -const QString shoulderGirth = QStringLiteral("shoulder_girth"); -const QString upperChestGirth = QStringLiteral("upper_chest_girth"); -const QString bustGirth = QStringLiteral("bust_girth"); -const QString underBustGirth = QStringLiteral("under_bust_girth"); -const QString waistGirth = QStringLiteral("waist_girth"); -const QString highHipGirth = QStringLiteral("high_hip_girth"); -const QString hipGirth = QStringLiteral("hip_girth"); -const QString upperFrontChestWidth = QStringLiteral("upper_front_chest_width"); -const QString frontChestWidth = QStringLiteral("front_chest_width"); -const QString acrossFrontShoulderWidth = QStringLiteral("across_front_shoulder_width"); -const QString acrossBackShoulderWidth = QStringLiteral("across_back_shoulder_width"); -const QString upperBackWidth = QStringLiteral("upper_back_width"); -const QString backWidth = QStringLiteral("back_width"); -const QString bustpointToBustpoint = QStringLiteral("bustpoint_to_bustpoint"); -const QString halterBustpointToBustpoint = QStringLiteral("halter_bustpoint_to_bustpoint"); -const QString neckToBustpoint = QStringLiteral("neck_to_bustpoint"); -const QString crotchLength = QStringLiteral("crotch_length"); -const QString riseHeight = QStringLiteral("rise_height"); -const QString shoulderDrop = QStringLiteral("shoulder_drop"); -const QString shoulderSlopeDegrees = QStringLiteral("shoulder_slope_degrees"); -const QString frontShoulderSlopeLength = QStringLiteral("front_shoulder_slope_length"); -const QString backShoulderSlopeLength = QStringLiteral("back_shoulder_slope_length"); -const QString frontShoulderToWaistLength = QStringLiteral("front_shoulder_to_waist_length"); -const QString backShoulderToWaistLength = QStringLiteral("back_shoulder_to_waist_length"); -const QString frontNeckArc = QStringLiteral("front_neck_arc"); -const QString backNeckArc = QStringLiteral("back_neck_arc"); -const QString frontUpperChestArc = QStringLiteral("front_upper_chest_arc"); -const QString backUpperChestArc = QStringLiteral("back_upper_chest_arc"); -const QString frontWaistArc = QStringLiteral("front_waist_arc"); -const QString backWaistArc = QStringLiteral("back_waist_arc"); -const QString frontUpperHipArc = QStringLiteral("front_upper_hip_arc"); -const QString backUpperHipArc = QStringLiteral("back_upper_hip_arc"); -const QString frontHipArc = QStringLiteral("front_hip_arc"); -const QString backHipArc = QStringLiteral("back_hip_arc"); -const QString chestSlope = QStringLiteral("chest_slope"); -const QString backSlope = QStringLiteral("back_slope"); -const QString frontWaistSlope = QStringLiteral("front_waist_slope"); -const QString backWaistSlope = QStringLiteral("back_waist_slope"); -const QString frontNeckToUpperChestHeight = QStringLiteral("front_neck_to_upper_chest_height"); -const QString frontNeckToBustHeight = QStringLiteral("front_neck_to_bust_height"); -const QString armscyeGirth = QStringLiteral("armscye_girth"); -const QString elbowGirth = QStringLiteral("elbow_girth"); -const QString upperArmGirth = QStringLiteral("upper_arm_girth"); -const QString wristGirth = QStringLiteral("wrist_girth"); -const QString scyeDepth = QStringLiteral("scye_depth"); -const QString shoulderAndArmLength = QStringLiteral("shoulder_and_arm_length"); -const QString underarmLength = QStringLiteral("underarm_length"); -const QString cervicaleToWristLength = QStringLiteral("cervicale_to_wrist_length"); -const QString shoulderToElbowLength = QStringLiteral("shoulder_to_elbow_length"); -const QString armLength = QStringLiteral("arm_length"); -const QString handWidth = QStringLiteral("hand_width"); -const QString handLength = QStringLiteral("hand_length"); -const QString handGirth = QStringLiteral("hand_girth"); -const QString thighGirth = QStringLiteral("thigh_girth"); -const QString midThighGirth = QStringLiteral("mid_thigh_girth"); -const QString kneeGirth = QStringLiteral("knee_girth"); -const QString calfGirth = QStringLiteral("calf_girth"); -const QString ankleGirth = QStringLiteral("ankle_girth"); -const QString kneeHeight = QStringLiteral("knee_height"); -const QString ankleHeight = QStringLiteral("ankle_height"); -const QString footWidth = QStringLiteral("foot_width"); -const QString footLength = QStringLiteral("foot_length"); -const QString height = QStringLiteral("height"); -const QString cervicaleHeight = QStringLiteral("cervicale_height"); -const QString cervicaleToKneeHeight = QStringLiteral("cervicale_to_knee_height"); -const QString waistHeight = QStringLiteral("waist_height"); -const QString highHipHeight = QStringLiteral("high_hip_height"); -const QString hipHeight = QStringLiteral("hip_height"); -const QString waistToHipHeight = QStringLiteral("waist_to_hip_height"); -const QString waistToKneeHeight = QStringLiteral("waist_to_knee_height"); -const QString crotchHeight = QStringLiteral("crotch_height"); +const QString headGirth_M = QStringLiteral("head_girth"); +const QString midNeckGirth_M = QStringLiteral("mid_neck_girth"); +const QString neckBaseGirth_M = QStringLiteral("neck_base_girth"); +const QString headAndNeckLength_M = QStringLiteral("head_and_neck_length"); +const QString centerFrontWaistLength_M = QStringLiteral("center_front_waist_length"); +const QString centerBackWaistLength_M = QStringLiteral("center_back_waist_length"); +const QString shoulderLength_M = QStringLiteral("shoulder_length"); +const QString sideWaistLength_M = QStringLiteral("side_waist_length"); +const QString trunkLength_M = QStringLiteral("trunk_length"); +const QString shoulderGirth_M = QStringLiteral("shoulder_girth"); +const QString upperChestGirth_M = QStringLiteral("upper_chest_girth"); +const QString bustGirth_M = QStringLiteral("bust_girth"); +const QString underBustGirth_M = QStringLiteral("under_bust_girth"); +const QString waistGirth_M = QStringLiteral("waist_girth"); +const QString highHipGirth_M = QStringLiteral("high_hip_girth"); +const QString hipGirth_M = QStringLiteral("hip_girth"); +const QString upperFrontChestWidth_M = QStringLiteral("upper_front_chest_width"); +const QString frontChestWidth_M = QStringLiteral("front_chest_width"); +const QString acrossFrontShoulderWidth_M = QStringLiteral("across_front_shoulder_width"); +const QString acrossBackShoulderWidth_M = QStringLiteral("across_back_shoulder_width"); +const QString upperBackWidth_M = QStringLiteral("upper_back_width"); +const QString backWidth_M = QStringLiteral("back_width"); +const QString bustpointToBustpoint_M = QStringLiteral("bustpoint_to_bustpoint"); +const QString halterBustpointToBustpoint_M = QStringLiteral("halter_bustpoint_to_bustpoint"); +const QString neckToBustpoint_M = QStringLiteral("neck_to_bustpoint"); +const QString crotchLength_M = QStringLiteral("crotch_length"); +const QString riseHeight_M = QStringLiteral("rise_height"); +const QString shoulderDrop_M = QStringLiteral("shoulder_drop"); +const QString shoulderSlopeDegrees_M = QStringLiteral("shoulder_slope_degrees"); +const QString frontShoulderSlopeLength_M = QStringLiteral("front_shoulder_slope_length"); +const QString backShoulderSlopeLength_M = QStringLiteral("back_shoulder_slope_length"); +const QString frontShoulderToWaistLength_M = QStringLiteral("front_shoulder_to_waist_length"); +const QString backShoulderToWaistLength_M = QStringLiteral("back_shoulder_to_waist_length"); +const QString frontNeckArc_M = QStringLiteral("front_neck_arc"); +const QString backNeckArc_M = QStringLiteral("back_neck_arc"); +const QString frontUpperChestArc_M = QStringLiteral("front_upper_chest_arc"); +const QString backUpperChestArc_M = QStringLiteral("back_upper_chest_arc"); +const QString frontWaistArc_M = QStringLiteral("front_waist_arc"); +const QString backWaistArc_M = QStringLiteral("back_waist_arc"); +const QString frontUpperHipArc_M = QStringLiteral("front_upper_hip_arc"); +const QString backUpperHipArc_M = QStringLiteral("back_upper_hip_arc"); +const QString frontHipArc_M = QStringLiteral("front_hip_arc"); +const QString backHipArc_M = QStringLiteral("back_hip_arc"); +const QString chestSlope_M = QStringLiteral("chest_slope"); +const QString backSlope_M = QStringLiteral("back_slope"); +const QString frontWaistSlope_M = QStringLiteral("front_waist_slope"); +const QString backWaistSlope_M = QStringLiteral("back_waist_slope"); +const QString frontNeckToUpperChestHeight_M = QStringLiteral("front_neck_to_upper_chest_height"); +const QString frontNeckToBustHeight_M = QStringLiteral("front_neck_to_bust_height"); +const QString armscyeGirth_M = QStringLiteral("armscye_girth"); +const QString elbowGirth_M = QStringLiteral("elbow_girth"); +const QString upperArmGirth_M = QStringLiteral("upper_arm_girth"); +const QString wristGirth_M = QStringLiteral("wrist_girth"); +const QString scyeDepth_M = QStringLiteral("scye_depth"); +const QString shoulderAndArmLength_M = QStringLiteral("shoulder_and_arm_length"); +const QString underarmLength_M = QStringLiteral("underarm_length"); +const QString cervicaleToWristLength_M = QStringLiteral("cervicale_to_wrist_length"); +const QString shoulderToElbowLength_M = QStringLiteral("shoulder_to_elbow_length"); +const QString armLength_M = QStringLiteral("arm_length"); +const QString handWidth_M = QStringLiteral("hand_width"); +const QString handLength_M = QStringLiteral("hand_length"); +const QString handGirth_M = QStringLiteral("hand_girth"); +const QString thighGirth_M = QStringLiteral("thigh_girth"); +const QString midThighGirth_M = QStringLiteral("mid_thigh_girth"); +const QString kneeGirth_M = QStringLiteral("knee_girth"); +const QString calfGirth_M = QStringLiteral("calf_girth"); +const QString ankleGirth_M = QStringLiteral("ankle_girth"); +const QString kneeHeight_M = QStringLiteral("knee_height"); +const QString ankleHeight_M = QStringLiteral("ankle_height"); +const QString footWidth_M = QStringLiteral("foot_width"); +const QString footLength_M = QStringLiteral("foot_length"); +const QString height_M = QStringLiteral("height"); +const QString cervicaleHeight_M = QStringLiteral("cervicale_height"); +const QString cervicaleToKneeHeight_M = QStringLiteral("cervicale_to_knee_height"); +const QString waistHeight_M = QStringLiteral("waist_height"); +const QString highHipHeight_M = QStringLiteral("high_hip_height"); +const QString hipHeight_M = QStringLiteral("hip_height"); +const QString waistToHipHeight_M = QStringLiteral("waist_to_hip_height"); +const QString waistToKneeHeight_M = QStringLiteral("waist_to_knee_height"); +const QString crotchHeight_M = QStringLiteral("crotch_height"); //extended measurements -const QString size = QStringLiteral("size"); -const QString heightFrontNeckBasePoint = QStringLiteral("height_front_neck_base_point"); -const QString heightBaseNeckSidePoint = QStringLiteral("height_base_neck_side_point"); -const QString heightShoulderPoint = QStringLiteral("height_shoulder_point"); -const QString heightNipplePoint = QStringLiteral("height_nipple_point"); -const QString heightBackAngleAxilla = QStringLiteral("height_back_angle_axilla"); -const QString heightScapularPoint = QStringLiteral("height_scapular_point"); -const QString heightUnderButtockFolds = QStringLiteral("height_under_buttock_folds"); -const QString hipsExcludingProtrudingAbdomen = QStringLiteral("hips_excluding_protruding_abdomen"); -const QString girthFootInstep = QStringLiteral("girth_foot_instep"); -const QString sideWaistToFloor = QStringLiteral("side_waist_to_floor"); -const QString frontWaistToFloor = QStringLiteral("front_waist_to_floor"); -const QString arcThroughGroinArea = QStringLiteral("arc_through_groin_area"); -const QString waistToPlaneSeat = QStringLiteral("waist_to_plane_seat"); -const QString neckToRadialPoint = QStringLiteral("neck_to_radial_point"); -const QString neckToThirdFinger = QStringLiteral("neck_to_third_finger"); -const QString neckToFirstLineChestCircumference = QStringLiteral("neck_to_first_line_chest_circumference"); -const QString frontWaistLength = QStringLiteral("front_waist_length"); -const QString arcThroughShoulderJoint = QStringLiteral("arc_through_shoulder_joint"); -const QString neckToBackLineChestCircumference = QStringLiteral("neck_to_back_line_chest_circumference"); -const QString waistToNeckSide = QStringLiteral("waist_to_neck_side"); -const QString arcLengthUpperBody = QStringLiteral("arc_length_upper_body"); -const QString chestWidth = QStringLiteral("chest_width"); -const QString anteroposteriorDiameterHands = QStringLiteral("anteroposterior_diameter_hands"); -const QString heightClavicularPoint = QStringLiteral("height_clavicular_point"); -const QString heightArmholeSlash = QStringLiteral("height_armhole_slash"); -const QString slashShoulderHeight = QStringLiteral("slash_shoulder_height"); -const QString halfGirthNeck = QStringLiteral("half_girth_neck"); -const QString halfGirthNeckForShirts = QStringLiteral("half_girth_neck_for_shirts"); -const QString halfGirthChestFirst = QStringLiteral("half_girth_chest_first"); -const QString halfGirthChestSecond = QStringLiteral("half_girth_chest_second"); -const QString halfGirthChestThird = QStringLiteral("half_girth_chest_third"); -const QString halfGirthWaist = QStringLiteral("half_girth_waist"); -const QString halfGirthHipsConsideringProtrudingAbdomen +const QString size_M = QStringLiteral("size"); +const QString heightFrontNeckBasePoint_M = QStringLiteral("height_front_neck_base_point"); +const QString heightBaseNeckSidePoint_M = QStringLiteral("height_base_neck_side_point"); +const QString heightShoulderPoint_M = QStringLiteral("height_shoulder_point"); +const QString heightNipplePoint_M = QStringLiteral("height_nipple_point"); +const QString heightBackAngleAxilla_M = QStringLiteral("height_back_angle_axilla"); +const QString heightScapularPoint_M = QStringLiteral("height_scapular_point"); +const QString heightUnderButtockFolds_M = QStringLiteral("height_under_buttock_folds"); +const QString hipsExcludingProtrudingAbdomen_M = QStringLiteral("hips_excluding_protruding_abdomen"); +const QString girthFootInstep_M = QStringLiteral("girth_foot_instep"); +const QString sideWaistToFloor_M = QStringLiteral("side_waist_to_floor"); +const QString frontWaistToFloor_M = QStringLiteral("front_waist_to_floor"); +const QString arcThroughGroinArea_M = QStringLiteral("arc_through_groin_area"); +const QString waistToPlaneSeat_M = QStringLiteral("waist_to_plane_seat"); +const QString neckToRadialPoint_M = QStringLiteral("neck_to_radial_point"); +const QString neckToThirdFinger_M = QStringLiteral("neck_to_third_finger"); +const QString neckToFirstLineChestCircumference_M = QStringLiteral("neck_to_first_line_chest_circumference"); +const QString frontWaistLength_M = QStringLiteral("front_waist_length"); +const QString arcThroughShoulderJoint_M = QStringLiteral("arc_through_shoulder_joint"); +const QString neckToBackLineChestCircumference_M = QStringLiteral("neck_to_back_line_chest_circumference"); +const QString waistToNeckSide_M = QStringLiteral("waist_to_neck_side"); +const QString arcLengthUpperBody_M = QStringLiteral("arc_length_upper_body"); +const QString chestWidth_M = QStringLiteral("chest_width"); +const QString anteroposteriorDiameterHands_M = QStringLiteral("anteroposterior_diameter_hands"); +const QString heightClavicularPoint_M = QStringLiteral("height_clavicular_point"); +const QString heightArmholeSlash_M = QStringLiteral("height_armhole_slash"); +const QString slashShoulderHeight_M = QStringLiteral("slash_shoulder_height"); +const QString halfGirthNeck_M = QStringLiteral("half_girth_neck"); +const QString halfGirthNeckForShirts_M = QStringLiteral("half_girth_neck_for_shirts"); +const QString halfGirthChestFirst_M = QStringLiteral("half_girth_chest_first"); +const QString halfGirthChestSecond_M = QStringLiteral("half_girth_chest_second"); +const QString halfGirthChestThird_M = QStringLiteral("half_girth_chest_third"); +const QString halfGirthWaist_M = QStringLiteral("half_girth_waist"); +const QString halfGirthHipsConsideringProtrudingAbdomen_M = QStringLiteral("half_girth_hips_considering_protruding_abdomen"); -const QString halfGirthHipsExcludingProtrudingAbdomen = QStringLiteral("half_girth_hips_excluding_protruding_abdomen"); -const QString girthKneeFlexedFeet = QStringLiteral("girth_knee_flexed_feet"); -const QString neckTransverseDiameter = QStringLiteral("neck_transverse_diameter"); -const QString frontSlashShoulderHeight = QStringLiteral("front_slash_shoulder_height"); -const QString neckToFrontWaistLine = QStringLiteral("neck_to_front_waist_line"); -const QString handVerticalDiameter = QStringLiteral("hand_vertical_diameter"); -const QString neckToKneePoint = QStringLiteral("neck_to_knee_point"); -const QString waistToKnee = QStringLiteral("waist_to_knee"); -const QString shoulderHeight = QStringLiteral("shoulder_height"); -const QString headHeight = QStringLiteral("head_height"); -const QString bodyPosition = QStringLiteral("body_position"); -const QString arcBehindShoulderGirdle = QStringLiteral("arc_behind_shoulder_girdle"); -const QString neckToNeckBase = QStringLiteral("neck_to_neck_base"); -const QString depthWaistFirst = QStringLiteral("depth_waist_first"); -const QString depthWaistSecond = QStringLiteral("depth_waist_second"); +const QString halfGirthHipsExcludingProtrudingAbdomen_M = QStringLiteral("half_girth_hips_excluding_protruding_abdomen"); +const QString girthKneeFlexedFeet_M = QStringLiteral("girth_knee_flexed_feet"); +const QString neckTransverseDiameter_M = QStringLiteral("neck_transverse_diameter"); +const QString frontSlashShoulderHeight_M = QStringLiteral("front_slash_shoulder_height"); +const QString neckToFrontWaistLine_M = QStringLiteral("neck_to_front_waist_line"); +const QString handVerticalDiameter_M = QStringLiteral("hand_vertical_diameter"); +const QString neckToKneePoint_M = QStringLiteral("neck_to_knee_point"); +const QString waistToKnee_M = QStringLiteral("waist_to_knee"); +const QString shoulderHeight_M = QStringLiteral("shoulder_height"); +const QString headHeight_M = QStringLiteral("head_height"); +const QString bodyPosition_M = QStringLiteral("body_position"); +const QString arcBehindShoulderGirdle_M = QStringLiteral("arc_behind_shoulder_girdle"); +const QString neckToNeckBase_M = QStringLiteral("neck_to_neck_base"); +const QString depthWaistFirst_M = QStringLiteral("depth_waist_first"); +const QString depthWaistSecond_M = QStringLiteral("depth_waist_second"); //variables const QString line_ = QStringLiteral("Line_"); diff --git a/src/app/options.h b/src/app/options.h index 37dfe1c1f..119bf164d 100644 --- a/src/app/options.h +++ b/src/app/options.h @@ -113,136 +113,136 @@ namespace Pattern Q_DECLARE_OPERATORS_FOR_FLAGS( Pattern::Measurements ) // measurements -extern const QString headGirth; -extern const QString midNeckGirth; -extern const QString neckBaseGirth; -extern const QString headAndNeckLength; -extern const QString centerFrontWaistLength; -extern const QString centerBackWaistLength; -extern const QString shoulderLength; -extern const QString sideWaistLength; -extern const QString trunkLength; -extern const QString shoulderGirth; -extern const QString upperChestGirth; -extern const QString bustGirth; -extern const QString underBustGirth; -extern const QString waistGirth; -extern const QString highHipGirth; -extern const QString hipGirth; -extern const QString upperFrontChestWidth; -extern const QString frontChestWidth; -extern const QString acrossFrontShoulderWidth; -extern const QString acrossBackShoulderWidth; -extern const QString upperBackWidth; -extern const QString backWidth; -extern const QString bustpointToBustpoint; -extern const QString halterBustpointToBustpoint; -extern const QString neckToBustpoint; -extern const QString crotchLength; -extern const QString riseHeight; -extern const QString shoulderDrop; -extern const QString shoulderSlopeDegrees; -extern const QString frontShoulderSlopeLength; -extern const QString backShoulderSlopeLength; -extern const QString frontShoulderToWaistLength; -extern const QString backShoulderToWaistLength; -extern const QString frontNeckArc; -extern const QString backNeckArc; -extern const QString frontUpperChestArc; -extern const QString backUpperChestArc; -extern const QString frontWaistArc; -extern const QString backWaistArc; -extern const QString frontUpperHipArc; -extern const QString backUpperHipArc; -extern const QString frontHipArc; -extern const QString backHipArc; -extern const QString chestSlope; -extern const QString backSlope; -extern const QString frontWaistSlope; -extern const QString backWaistSlope; -extern const QString frontNeckToUpperChestHeight; -extern const QString frontNeckToBustHeight; -extern const QString armscyeGirth; -extern const QString elbowGirth; -extern const QString upperArmGirth; -extern const QString wristGirth; -extern const QString scyeDepth; -extern const QString shoulderAndArmLength; -extern const QString underarmLength; -extern const QString cervicaleToWristLength; -extern const QString shoulderToElbowLength; -extern const QString armLength; -extern const QString handWidth; -extern const QString handLength; -extern const QString handGirth; -extern const QString thighGirth; -extern const QString midThighGirth; -extern const QString kneeGirth; -extern const QString calfGirth; -extern const QString ankleGirth; -extern const QString kneeHeight; -extern const QString ankleHeight; -extern const QString footWidth; -extern const QString footLength; -extern const QString height; -extern const QString cervicaleHeight; -extern const QString cervicaleToKneeHeight; -extern const QString waistHeight; -extern const QString highHipHeight; -extern const QString hipHeight; -extern const QString waistToHipHeight; -extern const QString waistToKneeHeight; -extern const QString crotchHeight; +extern const QString headGirth_M; +extern const QString midNeckGirth_M; +extern const QString neckBaseGirth_M; +extern const QString headAndNeckLength_M; +extern const QString centerFrontWaistLength_M; +extern const QString centerBackWaistLength_M; +extern const QString shoulderLength_M; +extern const QString sideWaistLength_M; +extern const QString trunkLength_M; +extern const QString shoulderGirth_M; +extern const QString upperChestGirth_M; +extern const QString bustGirth_M; +extern const QString underBustGirth_M; +extern const QString waistGirth_M; +extern const QString highHipGirth_M; +extern const QString hipGirth_M; +extern const QString upperFrontChestWidth_M; +extern const QString frontChestWidth_M; +extern const QString acrossFrontShoulderWidth_M; +extern const QString acrossBackShoulderWidth_M; +extern const QString upperBackWidth_M; +extern const QString backWidth_M; +extern const QString bustpointToBustpoint_M; +extern const QString halterBustpointToBustpoint_M; +extern const QString neckToBustpoint_M; +extern const QString crotchLength_M; +extern const QString riseHeight_M; +extern const QString shoulderDrop_M; +extern const QString shoulderSlopeDegrees_M; +extern const QString frontShoulderSlopeLength_M; +extern const QString backShoulderSlopeLength_M; +extern const QString frontShoulderToWaistLength_M; +extern const QString backShoulderToWaistLength_M; +extern const QString frontNeckArc_M; +extern const QString backNeckArc_M; +extern const QString frontUpperChestArc_M; +extern const QString backUpperChestArc_M; +extern const QString frontWaistArc_M; +extern const QString backWaistArc_M; +extern const QString frontUpperHipArc_M; +extern const QString backUpperHipArc_M; +extern const QString frontHipArc_M; +extern const QString backHipArc_M; +extern const QString chestSlope_M; +extern const QString backSlope_M; +extern const QString frontWaistSlope_M; +extern const QString backWaistSlope_M; +extern const QString frontNeckToUpperChestHeight_M; +extern const QString frontNeckToBustHeight_M; +extern const QString armscyeGirth_M; +extern const QString elbowGirth_M; +extern const QString upperArmGirth_M; +extern const QString wristGirth_M; +extern const QString scyeDepth_M; +extern const QString shoulderAndArmLength_M; +extern const QString underarmLength_M; +extern const QString cervicaleToWristLength_M; +extern const QString shoulderToElbowLength_M; +extern const QString armLength_M; +extern const QString handWidth_M; +extern const QString handLength_M; +extern const QString handGirth_M; +extern const QString thighGirth_M; +extern const QString midThighGirth_M; +extern const QString kneeGirth_M; +extern const QString calfGirth_M; +extern const QString ankleGirth_M; +extern const QString kneeHeight_M; +extern const QString ankleHeight_M; +extern const QString footWidth_M; +extern const QString footLength_M; +extern const QString height_M; +extern const QString cervicaleHeight_M; +extern const QString cervicaleToKneeHeight_M; +extern const QString waistHeight_M; +extern const QString highHipHeight_M; +extern const QString hipHeight_M; +extern const QString waistToHipHeight_M; +extern const QString waistToKneeHeight_M; +extern const QString crotchHeight_M; //extended measurements -extern const QString size; -extern const QString heightFrontNeckBasePoint; -extern const QString heightBaseNeckSidePoint; -extern const QString heightShoulderPoint; -extern const QString heightNipplePoint; -extern const QString heightBackAngleAxilla; -extern const QString heightScapularPoint; -extern const QString heightUnderButtockFolds; -extern const QString hipsExcludingProtrudingAbdomen; -extern const QString girthFootInstep; -extern const QString sideWaistToFloor; -extern const QString frontWaistToFloor; -extern const QString arcThroughGroinArea; -extern const QString waistToPlaneSeat; -extern const QString neckToRadialPoint; -extern const QString neckToThirdFinger; -extern const QString neckToFirstLineChestCircumference; -extern const QString frontWaistLength; -extern const QString arcThroughShoulderJoint; -extern const QString neckToBackLineChestCircumference; -extern const QString waistToNeckSide; -extern const QString arcLengthUpperBody; -extern const QString chestWidth; -extern const QString anteroposteriorDiameterHands; -extern const QString heightClavicularPoint; -extern const QString heightArmholeSlash; -extern const QString slashShoulderHeight; -extern const QString halfGirthNeck; -extern const QString halfGirthNeckForShirts; -extern const QString halfGirthChestFirst; -extern const QString halfGirthChestSecond; -extern const QString halfGirthChestThird; -extern const QString halfGirthWaist; -extern const QString halfGirthHipsConsideringProtrudingAbdomen; -extern const QString halfGirthHipsExcludingProtrudingAbdomen; -extern const QString girthKneeFlexedFeet; -extern const QString neckTransverseDiameter; -extern const QString frontSlashShoulderHeight; -extern const QString neckToFrontWaistLine; -extern const QString handVerticalDiameter; -extern const QString neckToKneePoint; -extern const QString waistToKnee; -extern const QString shoulderHeight; -extern const QString headHeight; -extern const QString bodyPosition; -extern const QString arcBehindShoulderGirdle; -extern const QString neckToNeckBase; -extern const QString depthWaistFirst; -extern const QString depthWaistSecond; +extern const QString size_M; +extern const QString heightFrontNeckBasePoint_M; +extern const QString heightBaseNeckSidePoint_M; +extern const QString heightShoulderPoint_M; +extern const QString heightNipplePoint_M; +extern const QString heightBackAngleAxilla_M; +extern const QString heightScapularPoint_M; +extern const QString heightUnderButtockFolds_M; +extern const QString hipsExcludingProtrudingAbdomen_M; +extern const QString girthFootInstep_M; +extern const QString sideWaistToFloor_M; +extern const QString frontWaistToFloor_M; +extern const QString arcThroughGroinArea_M; +extern const QString waistToPlaneSeat_M; +extern const QString neckToRadialPoint_M; +extern const QString neckToThirdFinger_M; +extern const QString neckToFirstLineChestCircumference_M; +extern const QString frontWaistLength_M; +extern const QString arcThroughShoulderJoint_M; +extern const QString neckToBackLineChestCircumference_M; +extern const QString waistToNeckSide_M; +extern const QString arcLengthUpperBody_M; +extern const QString chestWidth_M; +extern const QString anteroposteriorDiameterHands_M; +extern const QString heightClavicularPoint_M; +extern const QString heightArmholeSlash_M; +extern const QString slashShoulderHeight_M; +extern const QString halfGirthNeck_M; +extern const QString halfGirthNeckForShirts_M; +extern const QString halfGirthChestFirst_M; +extern const QString halfGirthChestSecond_M; +extern const QString halfGirthChestThird_M; +extern const QString halfGirthWaist_M; +extern const QString halfGirthHipsConsideringProtrudingAbdomen_M; +extern const QString halfGirthHipsExcludingProtrudingAbdomen_M; +extern const QString girthKneeFlexedFeet_M; +extern const QString neckTransverseDiameter_M; +extern const QString frontSlashShoulderHeight_M; +extern const QString neckToFrontWaistLine_M; +extern const QString handVerticalDiameter_M; +extern const QString neckToKneePoint_M; +extern const QString waistToKnee_M; +extern const QString shoulderHeight_M; +extern const QString headHeight_M; +extern const QString bodyPosition_M; +extern const QString arcBehindShoulderGirdle_M; +extern const QString neckToNeckBase_M; +extern const QString depthWaistFirst_M; +extern const QString depthWaistSecond_M; // variables name extern const QString line_; diff --git a/src/app/widgets/vapplication.cpp b/src/app/widgets/vapplication.cpp index 4d0ba00d8..abf18de97 100644 --- a/src/app/widgets/vapplication.cpp +++ b/src/app/widgets/vapplication.cpp @@ -217,355 +217,355 @@ void VApplication::InitLineWidth() void VApplication::InitMeasurements() { // head_and_neck - InitMeasurement(headGirth, QStringLiteral("Head girth"), QStringLiteral("Around fullest part of Head")); + InitMeasurement(headGirth_M, QStringLiteral("Head girth"), QStringLiteral("Around fullest part of Head")); - InitMeasurement(midNeckGirth, QStringLiteral("Mid-neck girth"), QStringLiteral("Around middle part of Neck")); + InitMeasurement(midNeckGirth_M, QStringLiteral("Mid-neck girth"), QStringLiteral("Around middle part of Neck")); - InitMeasurement(neckBaseGirth, QStringLiteral("Neck Base girth"), QStringLiteral("Around Neck at base")); + InitMeasurement(neckBaseGirth_M, QStringLiteral("Neck Base girth"), QStringLiteral("Around Neck at base")); - InitMeasurement(headAndNeckLength, QStringLiteral("Head and Neck length"), + InitMeasurement(headAndNeckLength_M, QStringLiteral("Head and Neck length"), QStringLiteral("Vertical Distance from Crown to Nape")); // torso - InitMeasurement(centerFrontWaistLength, QStringLiteral("Front Center length"), + InitMeasurement(centerFrontWaistLength_M, QStringLiteral("Front Center length"), QStringLiteral("Front Neck Center over tape at Bustline to Front Waist Center")); - InitMeasurement(centerBackWaistLength, QStringLiteral("Back Center length"), + InitMeasurement(centerBackWaistLength_M, QStringLiteral("Back Center length"), QStringLiteral("Back Neck Center to Back Waist Center")); - InitMeasurement(shoulderLength, QStringLiteral("Shoulder length"), QStringLiteral("NeckPoint to ShoulderTip")); + InitMeasurement(shoulderLength_M, QStringLiteral("Shoulder length"), QStringLiteral("NeckPoint to ShoulderTip")); - InitMeasurement(sideWaistLength, QStringLiteral("Side Waist length"), QStringLiteral("Armpit to Waist side")); + InitMeasurement(sideWaistLength_M, QStringLiteral("Side Waist length"), QStringLiteral("Armpit to Waist side")); - InitMeasurement(trunkLength, QStringLiteral("Trunk length"), + InitMeasurement(trunkLength_M, QStringLiteral("Trunk length"), QStringLiteral("Around Body from middle of Shoulder length to BustPoint to Crotch up back to beginning point")); - InitMeasurement(shoulderGirth, QStringLiteral("Shoulder girth"), + InitMeasurement(shoulderGirth_M, QStringLiteral("Shoulder girth"), QStringLiteral("Around Arms and Torso, at bicep level parallel to floor, with arms hanging at the sides")); - InitMeasurement(upperChestGirth, QStringLiteral("Upper Chest girth"), + InitMeasurement(upperChestGirth_M, QStringLiteral("Upper Chest girth"), QStringLiteral("Around Chest at Armfold level, will be parallel to floor across back, will not be parallel to floor" " across front chest")); - InitMeasurement(bustGirth, QStringLiteral("Bust girth"), + InitMeasurement(bustGirth_M, QStringLiteral("Bust girth"), QStringLiteral("Around fullest part of Bust, parallel to floor")); - InitMeasurement(underBustGirth, QStringLiteral("Under Bust girth"), + InitMeasurement(underBustGirth_M, QStringLiteral("Under Bust girth"), QStringLiteral("Around Chest below the Bust, parallel to floor")); - InitMeasurement(waistGirth, QStringLiteral("Waist girth"), + InitMeasurement(waistGirth_M, QStringLiteral("Waist girth"), QStringLiteral("Tie a string around smallest part of waist, keep string tied while taking meaasurements. Not" " usually parallel to floor for front waist or back waist.")); - InitMeasurement(highHipGirth, QStringLiteral("HighHip girth"), QStringLiteral("Around HighHip, parallel to floor")); + InitMeasurement(highHipGirth_M, QStringLiteral("HighHip girth"), QStringLiteral("Around HighHip, parallel to floor")); - InitMeasurement(hipGirth, QStringLiteral("Hip girth"), QStringLiteral("Around Hip, parallel to floor")); + InitMeasurement(hipGirth_M, QStringLiteral("Hip girth"), QStringLiteral("Around Hip, parallel to floor")); - InitMeasurement(upperFrontChestWidth, QStringLiteral("Front Upper Chest width"), + InitMeasurement(upperFrontChestWidth_M, QStringLiteral("Front Upper Chest width"), QStringLiteral("Across Front UpperChest, smallest width from armscye to armscye")); - InitMeasurement(frontChestWidth, QStringLiteral("Front Chest width"), + InitMeasurement(frontChestWidth_M, QStringLiteral("Front Chest width"), QStringLiteral("Across Front Chest, from armfold to armfold")); - InitMeasurement(acrossFrontShoulderWidth, QStringLiteral("Front Across Shoulder width"), + InitMeasurement(acrossFrontShoulderWidth_M, QStringLiteral("Front Across Shoulder width"), QStringLiteral("From ShoulderTip to ShoulderTip, across Front")); - InitMeasurement(acrossBackShoulderWidth, QStringLiteral("Back Across Shoulder width"), + InitMeasurement(acrossBackShoulderWidth_M, QStringLiteral("Back Across Shoulder width"), QStringLiteral("From ShoulderTip to ShoulderTip, across Back")); - InitMeasurement(acrossBackShoulderWidth, QStringLiteral("Back Upper Chest width"), + InitMeasurement(acrossBackShoulderWidth_M, QStringLiteral("Back Upper Chest width"), QStringLiteral("Across Back UpperChest, smallest width from armscye to armscye")); - InitMeasurement(backWidth, QStringLiteral("Back Chest width"), + InitMeasurement(backWidth_M, QStringLiteral("Back Chest width"), QStringLiteral("Across Back Chest, from armfold to armfold")); - InitMeasurement(bustpointToBustpoint, QStringLiteral("BustPoint to BustPoint"), + InitMeasurement(bustpointToBustpoint_M, QStringLiteral("BustPoint to BustPoint"), QStringLiteral("Distance between BustPoints, across Chest")); - InitMeasurement(halterBustpointToBustpoint, QStringLiteral("Halter Bustpoint to Bustpoint"), + InitMeasurement(halterBustpointToBustpoint_M, QStringLiteral("Halter Bustpoint to Bustpoint"), QStringLiteral("Distance from Bustpoint, behind neck, down to Bustpoint")); - InitMeasurement(neckToBustpoint, QStringLiteral("NeckPoint to BustPoint"), + InitMeasurement(neckToBustpoint_M, QStringLiteral("NeckPoint to BustPoint"), QStringLiteral("From NeckPoint to BustPoint")); - InitMeasurement(crotchLength, QStringLiteral("Crotch length"), + InitMeasurement(crotchLength_M, QStringLiteral("Crotch length"), QStringLiteral("From Front Waist Center, down to crotch, up to Back Waist Center")); - InitMeasurement(riseHeight, QStringLiteral("Rise height"), + InitMeasurement(riseHeight_M, QStringLiteral("Rise height"), QStringLiteral("Sit on hard chair, measure from side waist straight down to chair bottom")); - InitMeasurement(shoulderDrop, QStringLiteral("Shoulder Drop"), + InitMeasurement(shoulderDrop_M, QStringLiteral("Shoulder Drop"), QStringLiteral("Vertical Distance from NeckPoint level to ShoulderTip level")); - InitMeasurement(shoulderSlopeDegrees, QStringLiteral("Shoulder Slope degrees"), + InitMeasurement(shoulderSlopeDegrees_M, QStringLiteral("Shoulder Slope degrees"), QStringLiteral("Degrees of angle from NeckPoint to ShoulderTip – requires goniometer")); - InitMeasurement(frontShoulderSlopeLength, QStringLiteral("Front Shoulder Balance"), + InitMeasurement(frontShoulderSlopeLength_M, QStringLiteral("Front Shoulder Balance"), QStringLiteral("ShoulderTip to Front Waist Center")); - InitMeasurement(backShoulderSlopeLength, QStringLiteral("Back Shoulder Balance"), + InitMeasurement(backShoulderSlopeLength_M, QStringLiteral("Back Shoulder Balance"), QStringLiteral("ShoulderTip to Back Waist Center")); - InitMeasurement(frontShoulderToWaistLength, QStringLiteral("Front Full Length"), + InitMeasurement(frontShoulderToWaistLength_M, QStringLiteral("Front Full Length"), QStringLiteral("NeckPoint straight down front chest to Waistline")); - InitMeasurement(backShoulderToWaistLength, QStringLiteral("Back Full Length"), + InitMeasurement(backShoulderToWaistLength_M, QStringLiteral("Back Full Length"), QStringLiteral("Back NeckPoint straight down back chest to Waistline")); - InitMeasurement(frontNeckArc, QStringLiteral("Front Neck arc"), + InitMeasurement(frontNeckArc_M, QStringLiteral("Front Neck arc"), QStringLiteral("NeckPoint to NeckPoint through Front Neck Center")); - InitMeasurement(backNeckArc, QStringLiteral("Back Neck arc"), QStringLiteral("NeckPoint to NeckPoint across Nape")); + InitMeasurement(backNeckArc_M, QStringLiteral("Back Neck arc"), QStringLiteral("NeckPoint to NeckPoint across Nape")); - InitMeasurement(frontUpperChestArc, QStringLiteral("front_upper-bust_arc"), QStringLiteral("front_upper-bust_arc")); + InitMeasurement(frontUpperChestArc_M, QStringLiteral("front_upper-bust_arc"), QStringLiteral("front_upper-bust_arc")); - InitMeasurement(backUpperChestArc, QStringLiteral("Back UpperBust arc"), + InitMeasurement(backUpperChestArc_M, QStringLiteral("Back UpperBust arc"), QStringLiteral("Back UpperBust side to side")); - InitMeasurement(frontWaistArc, QStringLiteral("Front Waist arc"), QStringLiteral("Front Waist side to side")); + InitMeasurement(frontWaistArc_M, QStringLiteral("Front Waist arc"), QStringLiteral("Front Waist side to side")); - InitMeasurement(backWaistArc, QStringLiteral("Back Waist arc"), QStringLiteral("Back Waist side to side")); + InitMeasurement(backWaistArc_M, QStringLiteral("Back Waist arc"), QStringLiteral("Back Waist side to side")); - InitMeasurement(frontUpperHipArc, QStringLiteral("Front UpperHip arc"), + InitMeasurement(frontUpperHipArc_M, QStringLiteral("Front UpperHip arc"), QStringLiteral("Front UpperHip side to side")); - InitMeasurement(backUpperHipArc, QStringLiteral("Back UpperHip arc"), QStringLiteral("Back UpperHip side to side")); + InitMeasurement(backUpperHipArc_M, QStringLiteral("Back UpperHip arc"), QStringLiteral("Back UpperHip side to side")); - InitMeasurement(frontHipArc, QStringLiteral("Front Hip arc"), QStringLiteral("Front Hip side to side")); + InitMeasurement(frontHipArc_M, QStringLiteral("Front Hip arc"), QStringLiteral("Front Hip side to side")); - InitMeasurement(backHipArc, QStringLiteral("Back Hip arc"), QStringLiteral("Back Hip side to side")); + InitMeasurement(backHipArc_M, QStringLiteral("Back Hip arc"), QStringLiteral("Back Hip side to side")); - InitMeasurement(chestSlope, QStringLiteral("Chest Balance"), QStringLiteral("NeckPoint to Front ArmfoldPoint")); + InitMeasurement(chestSlope_M, QStringLiteral("Chest Balance"), QStringLiteral("NeckPoint to Front ArmfoldPoint")); - InitMeasurement(backSlope, QStringLiteral("Back Balance"), QStringLiteral("NeckPoint to Back ArmfoldPoint")); + InitMeasurement(backSlope_M, QStringLiteral("Back Balance"), QStringLiteral("NeckPoint to Back ArmfoldPoint")); - InitMeasurement(frontWaistSlope, QStringLiteral("Front Waist Balance"), + InitMeasurement(frontWaistSlope_M, QStringLiteral("Front Waist Balance"), QStringLiteral("NeckPoint across Front Chest to Waist side")); - InitMeasurement(backWaistSlope, QStringLiteral("Back Waist Balance"), + InitMeasurement(backWaistSlope_M, QStringLiteral("Back Waist Balance"), QStringLiteral("NeckPoint across Back Chest to Waist side")); - InitMeasurement(frontNeckToUpperChestHeight, QStringLiteral("Front UpperChest height"), + InitMeasurement(frontNeckToUpperChestHeight_M, QStringLiteral("Front UpperChest height"), QStringLiteral("Front Neck Center straight down to UpperChest line")); - InitMeasurement(frontNeckToBustHeight, QStringLiteral("Bust height"), + InitMeasurement(frontNeckToBustHeight_M, QStringLiteral("Bust height"), QStringLiteral("Front Neck Center straight down to Bust line")); // arm - InitMeasurement(armscyeGirth, QStringLiteral("Armscye Girth"), QStringLiteral("Around Armscye")); + InitMeasurement(armscyeGirth_M, QStringLiteral("Armscye Girth"), QStringLiteral("Around Armscye")); - InitMeasurement(elbowGirth, QStringLiteral("Elbow Girth"), QStringLiteral("Around Elbow with elbow bent")); + InitMeasurement(elbowGirth_M, QStringLiteral("Elbow Girth"), QStringLiteral("Around Elbow with elbow bent")); - InitMeasurement(upperArmGirth, QStringLiteral("Upperarm Girth"), QStringLiteral("Around UpperArm")); + InitMeasurement(upperArmGirth_M, QStringLiteral("Upperarm Girth"), QStringLiteral("Around UpperArm")); - InitMeasurement(wristGirth, QStringLiteral("Wrist girth"), QStringLiteral("Around Wrist")); + InitMeasurement(wristGirth_M, QStringLiteral("Wrist girth"), QStringLiteral("Around Wrist")); - InitMeasurement(scyeDepth, QStringLiteral("Armscye depth"), + InitMeasurement(scyeDepth_M, QStringLiteral("Armscye depth"), QStringLiteral("Nape straight down to UnderBust line (same as Back UpperBust height)")); - InitMeasurement(shoulderAndArmLength, QStringLiteral("Shoulder and Arm length"), + InitMeasurement(shoulderAndArmLength_M, QStringLiteral("Shoulder and Arm length"), QStringLiteral("NeckPoint to ShoulderTip to Wrist, with elbow bent and hand on hip")); - InitMeasurement(underarmLength, QStringLiteral("Underarm length"), + InitMeasurement(underarmLength_M, QStringLiteral("Underarm length"), QStringLiteral("Armpit to Wrist, with arm straight and hanging at side")); - InitMeasurement(cervicaleToWristLength, QStringLiteral("Nape to wrist length"), + InitMeasurement(cervicaleToWristLength_M, QStringLiteral("Nape to wrist length"), QStringLiteral("Nape to Wrist, with elbow bent and hand on hip")); - InitMeasurement(shoulderToElbowLength, QStringLiteral("Elbow length"), + InitMeasurement(shoulderToElbowLength_M, QStringLiteral("Elbow length"), QStringLiteral("ShoulderTip to Elbow, with elbow bent and hand on hip")); - InitMeasurement(armLength, QStringLiteral("Arm length"), + InitMeasurement(armLength_M, QStringLiteral("Arm length"), QStringLiteral("ShoulderTip to Wrist, with elbow bent and hand on hip")); // hand - InitMeasurement(handWidth, QStringLiteral("Hand width"), QStringLiteral("Hand side to side")); + InitMeasurement(handWidth_M, QStringLiteral("Hand width"), QStringLiteral("Hand side to side")); - InitMeasurement(handLength, QStringLiteral("Hand length"), QStringLiteral("Hand Middle Finger tip to wrist")); + InitMeasurement(handLength_M, QStringLiteral("Hand length"), QStringLiteral("Hand Middle Finger tip to wrist")); - InitMeasurement(handGirth, QStringLiteral("Hand girth"), QStringLiteral("Around Hand")); + InitMeasurement(handGirth_M, QStringLiteral("Hand girth"), QStringLiteral("Around Hand")); // leg - InitMeasurement(thighGirth, QStringLiteral("Thigh girth"), QStringLiteral("Around Thigh")); + InitMeasurement(thighGirth_M, QStringLiteral("Thigh girth"), QStringLiteral("Around Thigh")); - InitMeasurement(midThighGirth, QStringLiteral("Midthigh girth"), QStringLiteral("Around MidThigh")); + InitMeasurement(midThighGirth_M, QStringLiteral("Midthigh girth"), QStringLiteral("Around MidThigh")); - InitMeasurement(kneeGirth, QStringLiteral("Knee girth"), QStringLiteral("Around Knee")); + InitMeasurement(kneeGirth_M, QStringLiteral("Knee girth"), QStringLiteral("Around Knee")); - InitMeasurement(calfGirth, QStringLiteral("Calf girth"), QStringLiteral("Around Calf")); + InitMeasurement(calfGirth_M, QStringLiteral("Calf girth"), QStringLiteral("Around Calf")); - InitMeasurement(ankleGirth, QStringLiteral("Ankle girth"), QStringLiteral("Around Ankle")); + InitMeasurement(ankleGirth_M, QStringLiteral("Ankle girth"), QStringLiteral("Around Ankle")); - InitMeasurement(kneeHeight, QStringLiteral("Knee height"), QStringLiteral("Knee to Floor")); + InitMeasurement(kneeHeight_M, QStringLiteral("Knee height"), QStringLiteral("Knee to Floor")); - InitMeasurement(ankleHeight, QStringLiteral("Ankle height"), QStringLiteral("Ankle to Floor")); + InitMeasurement(ankleHeight_M, QStringLiteral("Ankle height"), QStringLiteral("Ankle to Floor")); // foot - InitMeasurement(footWidth, QStringLiteral("Foot width"), QStringLiteral("Widest part of Foot side to side")); + InitMeasurement(footWidth_M, QStringLiteral("Foot width"), QStringLiteral("Widest part of Foot side to side")); - InitMeasurement(footLength, QStringLiteral("Foot length"), + InitMeasurement(footLength_M, QStringLiteral("Foot length"), QStringLiteral("Tip of Longest Toe straight to back of heel")); // heights - InitMeasurement(height, QStringLiteral("Total Height"), QStringLiteral("Top of head to floor")); + InitMeasurement(height_M, QStringLiteral("Total Height"), QStringLiteral("Top of head to floor")); - InitMeasurement(cervicaleHeight, QStringLiteral("Nape height"), QStringLiteral("Nape to Floor")); + InitMeasurement(cervicaleHeight_M, QStringLiteral("Nape height"), QStringLiteral("Nape to Floor")); - InitMeasurement(cervicaleToKneeHeight, QStringLiteral("Nape to knee height"), QStringLiteral("Nape to Knee")); + InitMeasurement(cervicaleToKneeHeight_M, QStringLiteral("Nape to knee height"), QStringLiteral("Nape to Knee")); - InitMeasurement(waistHeight, QStringLiteral("Waist height"), QStringLiteral("Waist side to floor")); + InitMeasurement(waistHeight_M, QStringLiteral("Waist height"), QStringLiteral("Waist side to floor")); - InitMeasurement(highHipHeight, QStringLiteral("HighHip height"), QStringLiteral("HighHip side to Floor")); + InitMeasurement(highHipHeight_M, QStringLiteral("HighHip height"), QStringLiteral("HighHip side to Floor")); - InitMeasurement(hipHeight, QStringLiteral("Hip height"), QStringLiteral("Hip side to Floor")); + InitMeasurement(hipHeight_M, QStringLiteral("Hip height"), QStringLiteral("Hip side to Floor")); - InitMeasurement(waistToHipHeight, QStringLiteral("Waist to Hip height"), QStringLiteral("Waist side to Hip")); + InitMeasurement(waistToHipHeight_M, QStringLiteral("Waist to Hip height"), QStringLiteral("Waist side to Hip")); - InitMeasurement(waistToKneeHeight, QStringLiteral("Waist to Knee height"), QStringLiteral("Waist side to Knee")); + InitMeasurement(waistToKneeHeight_M, QStringLiteral("Waist to Knee height"), QStringLiteral("Waist side to Knee")); - InitMeasurement(crotchHeight, QStringLiteral("Crotch height/Inseam"), + InitMeasurement(crotchHeight_M, QStringLiteral("Crotch height/Inseam"), QStringLiteral("Crotch to Floor along inside leg")); //extended - InitMeasurement(heightFrontNeckBasePoint, QStringLiteral("Height front neck base point"), + InitMeasurement(heightFrontNeckBasePoint_M, QStringLiteral("Height front neck base point"), QStringLiteral("Height of the point base of the neck in front")); - InitMeasurement(heightBaseNeckSidePoint, QStringLiteral("Height base neck side point"), + InitMeasurement(heightBaseNeckSidePoint_M, QStringLiteral("Height base neck side point"), QStringLiteral("Height of the base of the neck side point")); - InitMeasurement(heightShoulderPoint, QStringLiteral("Height shoulder point"), + InitMeasurement(heightShoulderPoint_M, QStringLiteral("Height shoulder point"), QStringLiteral("The height of the shoulder point")); - InitMeasurement(heightNipplePoint, QStringLiteral("Height nipple point"), QStringLiteral("Height nipple point")); + InitMeasurement(heightNipplePoint_M, QStringLiteral("Height nipple point"), QStringLiteral("Height nipple point")); - InitMeasurement(heightBackAngleAxilla, QStringLiteral("Height back angle axilla"), + InitMeasurement(heightBackAngleAxilla_M, QStringLiteral("Height back angle axilla"), QStringLiteral("Height back angle axilla")); - InitMeasurement(heightScapularPoint, QStringLiteral("Height scapular point"), + InitMeasurement(heightScapularPoint_M, QStringLiteral("Height scapular point"), QStringLiteral("Height scapular point")); - InitMeasurement(heightUnderButtockFolds, QStringLiteral("Height under buttock folds"), + InitMeasurement(heightUnderButtockFolds_M, QStringLiteral("Height under buttock folds"), QStringLiteral("Height under buttock folds")); - InitMeasurement(hipsExcludingProtrudingAbdomen, QStringLiteral("Hips excluding protruding abdomen"), + InitMeasurement(hipsExcludingProtrudingAbdomen_M, QStringLiteral("Hips excluding protruding abdomen"), QStringLiteral("Hips excluding protruding abdomen")); - InitMeasurement(girthFootInstep, QStringLiteral("Girth foot instep"), QStringLiteral("Girth foot instep")); + InitMeasurement(girthFootInstep_M, QStringLiteral("Girth foot instep"), QStringLiteral("Girth foot instep")); - InitMeasurement(sideWaistToFloor, QStringLiteral("Side waist to floor"), + InitMeasurement(sideWaistToFloor_M, QStringLiteral("Side waist to floor"), QStringLiteral("The distance from the side waist to floor")); - InitMeasurement(frontWaistToFloor, QStringLiteral("Front waist to floor"), + InitMeasurement(frontWaistToFloor_M, QStringLiteral("Front waist to floor"), QStringLiteral("The distance from the front waist to floor")); - InitMeasurement(arcThroughGroinArea, QStringLiteral("Arc through groin area"), + InitMeasurement(arcThroughGroinArea_M, QStringLiteral("Arc through groin area"), QStringLiteral("Arc through groin area")); - InitMeasurement(waistToPlaneSeat, QStringLiteral("Waist to plane seat"), + InitMeasurement(waistToPlaneSeat_M, QStringLiteral("Waist to plane seat"), QStringLiteral("The distance from the waist to the plane seat")); - InitMeasurement(neckToRadialPoint, QStringLiteral("Neck to radial point"), + InitMeasurement(neckToRadialPoint_M, QStringLiteral("Neck to radial point"), QStringLiteral("The distance from the base of the neck to the side of the radial point")); - InitMeasurement(neckToThirdFinger, QStringLiteral("Neck to third finger"), + InitMeasurement(neckToThirdFinger_M, QStringLiteral("Neck to third finger"), QStringLiteral("Distance from the base of the neck side point to the end of the third finger")); - InitMeasurement(neckToFirstLineChestCircumference, QStringLiteral("Neck to first line chest circumference"), + InitMeasurement(neckToFirstLineChestCircumference_M, QStringLiteral("Neck to first line chest circumference"), QStringLiteral("The distance from the base of the neck to the side of the first line in front of " "chest circumference")); - InitMeasurement(frontWaistLength, QStringLiteral("Front waist length"), + InitMeasurement(frontWaistLength_M, QStringLiteral("Front waist length"), QStringLiteral("The distance from the base of the neck to the waist side front (waist length in " "the front)")); - InitMeasurement(arcThroughShoulderJoint, QStringLiteral("Arc through shoulder joint"), + InitMeasurement(arcThroughShoulderJoint_M, QStringLiteral("Arc through shoulder joint"), QStringLiteral("Arc through the highest point of the shoulder joint")); - InitMeasurement(neckToBackLineChestCircumference, QStringLiteral("Neck to back line chest circumference"), + InitMeasurement(neckToBackLineChestCircumference_M, QStringLiteral("Neck to back line chest circumference"), QStringLiteral("The distance from the base of the neck to the back line of chest circumference of " "the first and the second based on ledge vanes")); - InitMeasurement(waistToNeckSide, QStringLiteral("Waist to neck side"), + InitMeasurement(waistToNeckSide_M, QStringLiteral("Waist to neck side"), QStringLiteral("The distance from the waist to the back base of the neck side point")); - InitMeasurement(arcLengthUpperBody, QStringLiteral("Arc length upper body"), + InitMeasurement(arcLengthUpperBody_M, QStringLiteral("Arc length upper body"), QStringLiteral("Arc length of the upper body through the base of the neck side point")); - InitMeasurement(chestWidth, QStringLiteral("Chest width"), QStringLiteral("Chest width")); + InitMeasurement(chestWidth_M, QStringLiteral("Chest width"), QStringLiteral("Chest width")); - InitMeasurement(anteroposteriorDiameterHands, QStringLiteral("Anteroposterior diameter hands"), + InitMeasurement(anteroposteriorDiameterHands_M, QStringLiteral("Anteroposterior diameter hands"), QStringLiteral("Anteroposterior diameter of the hands")); - InitMeasurement(heightClavicularPoint, QStringLiteral("Height clavicular point"), + InitMeasurement(heightClavicularPoint_M, QStringLiteral("Height clavicular point"), QStringLiteral("Height clavicular point")); - InitMeasurement(heightArmholeSlash, QStringLiteral("Height armhole slash"), + InitMeasurement(heightArmholeSlash_M, QStringLiteral("Height armhole slash"), QStringLiteral("The distance from the point to the cervical level of the posterior angle of the " "front armpit (underarm height oblique)")); - InitMeasurement(slashShoulderHeight, QStringLiteral("Slash shoulder height"), + InitMeasurement(slashShoulderHeight_M, QStringLiteral("Slash shoulder height"), QStringLiteral("Slash shoulder height")); - InitMeasurement(halfGirthNeck, QStringLiteral("Half girth neck"), QStringLiteral("Half girth neck")); + InitMeasurement(halfGirthNeck_M, QStringLiteral("Half girth neck"), QStringLiteral("Half girth neck")); - InitMeasurement(halfGirthNeckForShirts, QStringLiteral("Half girth neck for shirts"), + InitMeasurement(halfGirthNeckForShirts_M, QStringLiteral("Half girth neck for shirts"), QStringLiteral("Half girth neck for shirts")); - InitMeasurement(halfGirthChestFirst, QStringLiteral("Half girth chest first"), + InitMeasurement(halfGirthChestFirst_M, QStringLiteral("Half girth chest first"), QStringLiteral("Half girth chest first")); - InitMeasurement(halfGirthChestSecond, QStringLiteral("Half girth chest second"), + InitMeasurement(halfGirthChestSecond_M, QStringLiteral("Half girth chest second"), QStringLiteral("Half girth chest second")); - InitMeasurement(halfGirthChestThird, QStringLiteral("Half girth chest third"), + InitMeasurement(halfGirthChestThird_M, QStringLiteral("Half girth chest third"), QStringLiteral("Half girth chest third")); - InitMeasurement(halfGirthWaist, QStringLiteral("Half girth waist"), QStringLiteral("Half girth waist")); + InitMeasurement(halfGirthWaist_M, QStringLiteral("Half girth waist"), QStringLiteral("Half girth waist")); - InitMeasurement(halfGirthHipsConsideringProtrudingAbdomen, + InitMeasurement(halfGirthHipsConsideringProtrudingAbdomen_M, QStringLiteral("Half girth hips considering protruding abdomen"), QStringLiteral("Half girth hips considering protruding abdomen")); - InitMeasurement(halfGirthHipsExcludingProtrudingAbdomen, + InitMeasurement(halfGirthHipsExcludingProtrudingAbdomen_M, QStringLiteral("Half girth hips excluding protruding abdomen"), QStringLiteral("Half girth hips excluding protruding abdomen")); - InitMeasurement(girthKneeFlexedFeet, QStringLiteral("Girth knee flexed feet"), + InitMeasurement(girthKneeFlexedFeet_M, QStringLiteral("Girth knee flexed feet"), QStringLiteral("Girth knee flexed feet")); - InitMeasurement(neckTransverseDiameter, QStringLiteral("Neck transverse diameter"), + InitMeasurement(neckTransverseDiameter_M, QStringLiteral("Neck transverse diameter"), QStringLiteral("Neck transverse diameter")); - InitMeasurement(frontSlashShoulderHeight, QStringLiteral("Front slash shoulder height"), + InitMeasurement(frontSlashShoulderHeight_M, QStringLiteral("Front slash shoulder height"), QStringLiteral("Front slash shoulder height")); - InitMeasurement(neckToFrontWaistLine, QStringLiteral("Neck to front waist line"), + InitMeasurement(neckToFrontWaistLine_M, QStringLiteral("Neck to front waist line"), QStringLiteral("The distance from the base of the neck to the waist line front")); - InitMeasurement(handVerticalDiameter, QStringLiteral("Hand vertical diameter"), + InitMeasurement(handVerticalDiameter_M, QStringLiteral("Hand vertical diameter"), QStringLiteral("Hand vertical diameter")); - InitMeasurement(neckToKneePoint, QStringLiteral("Neck to knee point"), + InitMeasurement(neckToKneePoint_M, QStringLiteral("Neck to knee point"), QStringLiteral("Distance from neck to knee point")); - InitMeasurement(waistToKnee, QStringLiteral("Waist to knee"), + InitMeasurement(waistToKnee_M, QStringLiteral("Waist to knee"), QStringLiteral("The distance from the waist to the knee")); - InitMeasurement(shoulderHeight, QStringLiteral("Shoulder height"), QStringLiteral("Shoulder height")); + InitMeasurement(shoulderHeight_M, QStringLiteral("Shoulder height"), QStringLiteral("Shoulder height")); - InitMeasurement(headHeight, QStringLiteral("Head height"), QStringLiteral("Head height")); + InitMeasurement(headHeight_M, QStringLiteral("Head height"), QStringLiteral("Head height")); - InitMeasurement(bodyPosition, QStringLiteral("Body position"), QStringLiteral("Body position")); + InitMeasurement(bodyPosition_M, QStringLiteral("Body position"), QStringLiteral("Body position")); - InitMeasurement(arcBehindShoulderGirdle, QStringLiteral("Arc behind shoulder girdle"), + InitMeasurement(arcBehindShoulderGirdle_M, QStringLiteral("Arc behind shoulder girdle"), QStringLiteral("Arc behind the shoulder girdle")); - InitMeasurement(neckToNeckBase, QStringLiteral("Neck to neck base"), + InitMeasurement(neckToNeckBase_M, QStringLiteral("Neck to neck base"), QStringLiteral("Distance from neck point to point on the base of the neck side neck girth " "measurement line")); - InitMeasurement(depthWaistFirst, QStringLiteral("Depth waist first"), QStringLiteral("Depth waist first")); + InitMeasurement(depthWaistFirst_M, QStringLiteral("Depth waist first"), QStringLiteral("Depth waist first")); - InitMeasurement(depthWaistSecond, QStringLiteral("Depth waist second"), QStringLiteral("Depth waist second")); + InitMeasurement(depthWaistSecond_M, QStringLiteral("Depth waist second"), QStringLiteral("Depth waist second")); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/xml/vindividualmeasurements.cpp b/src/app/xml/vindividualmeasurements.cpp index 8a6ceaefe..3ea2f8149 100644 --- a/src/app/xml/vindividualmeasurements.cpp +++ b/src/app/xml/vindividualmeasurements.cpp @@ -60,142 +60,142 @@ void VIndividualMeasurements::setUnit(const Valentina::Units &unit) void VIndividualMeasurements::Measurements() { //head and neck - Measurement(headGirth); - Measurement(midNeckGirth); - Measurement(neckBaseGirth); - Measurement(headAndNeckLength); + Measurement(headGirth_M); + Measurement(midNeckGirth_M); + Measurement(neckBaseGirth_M); + Measurement(headAndNeckLength_M); //torso - Measurement(centerFrontWaistLength); - Measurement(centerBackWaistLength); - Measurement(shoulderLength); - Measurement(sideWaistLength); - Measurement(trunkLength); - Measurement(shoulderGirth); - Measurement(upperChestGirth); - Measurement(bustGirth); - Measurement(underBustGirth); - Measurement(waistGirth); - Measurement(highHipGirth); - Measurement(hipGirth); - Measurement(upperFrontChestWidth); - Measurement(frontChestWidth); - Measurement(acrossFrontShoulderWidth); - Measurement(acrossBackShoulderWidth); - Measurement(upperBackWidth); - Measurement(backWidth); - Measurement(bustpointToBustpoint); - Measurement(halterBustpointToBustpoint); - Measurement(neckToBustpoint); - Measurement(crotchLength); - Measurement(riseHeight); - Measurement(shoulderDrop); - Measurement(shoulderSlopeDegrees); - Measurement(frontShoulderSlopeLength); - Measurement(backShoulderSlopeLength); - Measurement(frontShoulderToWaistLength); - Measurement(backShoulderToWaistLength); - Measurement(frontNeckArc); - Measurement(backNeckArc); - Measurement(frontUpperChestArc); - Measurement(backUpperChestArc); - Measurement(frontWaistArc); - Measurement(backWaistArc); - Measurement(frontUpperHipArc); - Measurement(backUpperHipArc); - Measurement(frontHipArc); - Measurement(backHipArc); - Measurement(chestSlope); - Measurement(backSlope); - Measurement(frontWaistSlope); - Measurement(backWaistSlope); - Measurement(frontNeckToUpperChestHeight); - Measurement(frontNeckToBustHeight); + Measurement(centerFrontWaistLength_M); + Measurement(centerBackWaistLength_M); + Measurement(shoulderLength_M); + Measurement(sideWaistLength_M); + Measurement(trunkLength_M); + Measurement(shoulderGirth_M); + Measurement(upperChestGirth_M); + Measurement(bustGirth_M); + Measurement(underBustGirth_M); + Measurement(waistGirth_M); + Measurement(highHipGirth_M); + Measurement(hipGirth_M); + Measurement(upperFrontChestWidth_M); + Measurement(frontChestWidth_M); + Measurement(acrossFrontShoulderWidth_M); + Measurement(acrossBackShoulderWidth_M); + Measurement(upperBackWidth_M); + Measurement(backWidth_M); + Measurement(bustpointToBustpoint_M); + Measurement(halterBustpointToBustpoint_M); + Measurement(neckToBustpoint_M); + Measurement(crotchLength_M); + Measurement(riseHeight_M); + Measurement(shoulderDrop_M); + Measurement(shoulderSlopeDegrees_M); + Measurement(frontShoulderSlopeLength_M); + Measurement(backShoulderSlopeLength_M); + Measurement(frontShoulderToWaistLength_M); + Measurement(backShoulderToWaistLength_M); + Measurement(frontNeckArc_M); + Measurement(backNeckArc_M); + Measurement(frontUpperChestArc_M); + Measurement(backUpperChestArc_M); + Measurement(frontWaistArc_M); + Measurement(backWaistArc_M); + Measurement(frontUpperHipArc_M); + Measurement(backUpperHipArc_M); + Measurement(frontHipArc_M); + Measurement(backHipArc_M); + Measurement(chestSlope_M); + Measurement(backSlope_M); + Measurement(frontWaistSlope_M); + Measurement(backWaistSlope_M); + Measurement(frontNeckToUpperChestHeight_M); + Measurement(frontNeckToBustHeight_M); //arm - Measurement(armscyeGirth); - Measurement(elbowGirth); - Measurement(upperArmGirth); - Measurement(wristGirth); - Measurement(scyeDepth); - Measurement(shoulderAndArmLength); - Measurement(underarmLength); - Measurement(cervicaleToWristLength); - Measurement(shoulderToElbowLength); - Measurement(armLength); + Measurement(armscyeGirth_M); + Measurement(elbowGirth_M); + Measurement(upperArmGirth_M); + Measurement(wristGirth_M); + Measurement(scyeDepth_M); + Measurement(shoulderAndArmLength_M); + Measurement(underarmLength_M); + Measurement(cervicaleToWristLength_M); + Measurement(shoulderToElbowLength_M); + Measurement(armLength_M); //hand - Measurement(handWidth); - Measurement(handLength); - Measurement(handGirth); + Measurement(handWidth_M); + Measurement(handLength_M); + Measurement(handGirth_M); //leg - Measurement(thighGirth); - Measurement(midThighGirth); - Measurement(kneeGirth); - Measurement(calfGirth); - Measurement(ankleGirth); - Measurement(kneeHeight); - Measurement(ankleHeight); + Measurement(thighGirth_M); + Measurement(midThighGirth_M); + Measurement(kneeGirth_M); + Measurement(calfGirth_M); + Measurement(ankleGirth_M); + Measurement(kneeHeight_M); + Measurement(ankleHeight_M); //foot - Measurement(footWidth); - Measurement(footLength); + Measurement(footWidth_M); + Measurement(footLength_M); //heights - Measurement(height); - Measurement(cervicaleHeight); - Measurement(cervicaleToKneeHeight); - Measurement(waistHeight); - Measurement(highHipHeight); - Measurement(hipHeight); - Measurement(waistToHipHeight); - Measurement(waistToKneeHeight); - Measurement(crotchHeight); + Measurement(height_M); + Measurement(cervicaleHeight_M); + Measurement(cervicaleToKneeHeight_M); + Measurement(waistHeight_M); + Measurement(highHipHeight_M); + Measurement(hipHeight_M); + Measurement(waistToHipHeight_M); + Measurement(waistToKneeHeight_M); + Measurement(crotchHeight_M); //extended - Measurement(size); - Measurement(heightFrontNeckBasePoint); - Measurement(heightBaseNeckSidePoint); - Measurement(heightShoulderPoint); - Measurement(heightNipplePoint); - Measurement(heightBackAngleAxilla); - Measurement(heightScapularPoint); - Measurement(heightUnderButtockFolds); - Measurement(hipsExcludingProtrudingAbdomen); - Measurement(girthFootInstep); - Measurement(sideWaistToFloor); - Measurement(frontWaistToFloor); - Measurement(arcThroughGroinArea); - Measurement(waistToPlaneSeat); - Measurement(neckToRadialPoint); - Measurement(neckToThirdFinger); - Measurement(neckToFirstLineChestCircumference); - Measurement(frontWaistLength); - Measurement(arcThroughShoulderJoint); - Measurement(neckToBackLineChestCircumference); - Measurement(waistToNeckSide); - Measurement(arcLengthUpperBody); - Measurement(chestWidth); - Measurement(anteroposteriorDiameterHands); - Measurement(heightClavicularPoint); - Measurement(heightArmholeSlash); - Measurement(slashShoulderHeight); - Measurement(halfGirthNeck); - Measurement(halfGirthNeckForShirts); - Measurement(halfGirthChestFirst); - Measurement(halfGirthChestSecond); - Measurement(halfGirthChestThird); - Measurement(halfGirthWaist); - Measurement(halfGirthHipsConsideringProtrudingAbdomen); - Measurement(halfGirthHipsExcludingProtrudingAbdomen); - Measurement(girthKneeFlexedFeet); - Measurement(neckTransverseDiameter); - Measurement(frontSlashShoulderHeight); - Measurement(neckToFrontWaistLine); - Measurement(handVerticalDiameter); - Measurement(neckToKneePoint); - Measurement(waistToKnee); - Measurement(shoulderHeight); - Measurement(headHeight); - Measurement(bodyPosition); - Measurement(arcBehindShoulderGirdle); - Measurement(neckToNeckBase); - Measurement(depthWaistFirst); - Measurement(depthWaistSecond); + Measurement(size_M); + Measurement(heightFrontNeckBasePoint_M); + Measurement(heightBaseNeckSidePoint_M); + Measurement(heightShoulderPoint_M); + Measurement(heightNipplePoint_M); + Measurement(heightBackAngleAxilla_M); + Measurement(heightScapularPoint_M); + Measurement(heightUnderButtockFolds_M); + Measurement(hipsExcludingProtrudingAbdomen_M); + Measurement(girthFootInstep_M); + Measurement(sideWaistToFloor_M); + Measurement(frontWaistToFloor_M); + Measurement(arcThroughGroinArea_M); + Measurement(waistToPlaneSeat_M); + Measurement(neckToRadialPoint_M); + Measurement(neckToThirdFinger_M); + Measurement(neckToFirstLineChestCircumference_M); + Measurement(frontWaistLength_M); + Measurement(arcThroughShoulderJoint_M); + Measurement(neckToBackLineChestCircumference_M); + Measurement(waistToNeckSide_M); + Measurement(arcLengthUpperBody_M); + Measurement(chestWidth_M); + Measurement(anteroposteriorDiameterHands_M); + Measurement(heightClavicularPoint_M); + Measurement(heightArmholeSlash_M); + Measurement(slashShoulderHeight_M); + Measurement(halfGirthNeck_M); + Measurement(halfGirthNeckForShirts_M); + Measurement(halfGirthChestFirst_M); + Measurement(halfGirthChestSecond_M); + Measurement(halfGirthChestThird_M); + Measurement(halfGirthWaist_M); + Measurement(halfGirthHipsConsideringProtrudingAbdomen_M); + Measurement(halfGirthHipsExcludingProtrudingAbdomen_M); + Measurement(girthKneeFlexedFeet_M); + Measurement(neckTransverseDiameter_M); + Measurement(frontSlashShoulderHeight_M); + Measurement(neckToFrontWaistLine_M); + Measurement(handVerticalDiameter_M); + Measurement(neckToKneePoint_M); + Measurement(waistToKnee_M); + Measurement(shoulderHeight_M); + Measurement(headHeight_M); + Measurement(bodyPosition_M); + Measurement(arcBehindShoulderGirdle_M); + Measurement(neckToNeckBase_M); + Measurement(depthWaistFirst_M); + Measurement(depthWaistSecond_M); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/xml/vstandardmeasurements.cpp b/src/app/xml/vstandardmeasurements.cpp index f0e970f2d..5c82c89fa 100644 --- a/src/app/xml/vstandardmeasurements.cpp +++ b/src/app/xml/vstandardmeasurements.cpp @@ -63,140 +63,140 @@ QString VStandardMeasurements::Description() void VStandardMeasurements::Measurements() { //head and neck - Measurement(headGirth); - Measurement(midNeckGirth); - Measurement(neckBaseGirth); - Measurement(headAndNeckLength); + Measurement(headGirth_M); + Measurement(midNeckGirth_M); + Measurement(neckBaseGirth_M); + Measurement(headAndNeckLength_M); //torso - Measurement(centerFrontWaistLength); - Measurement(centerBackWaistLength); - Measurement(shoulderLength); - Measurement(sideWaistLength); - Measurement(trunkLength); - Measurement(shoulderGirth); - Measurement(upperChestGirth); - Measurement(bustGirth); - Measurement(underBustGirth); - Measurement(waistGirth); - Measurement(highHipGirth); - Measurement(hipGirth); - Measurement(upperFrontChestWidth); - Measurement(frontChestWidth); - Measurement(acrossFrontShoulderWidth); - Measurement(acrossBackShoulderWidth); - Measurement(upperBackWidth); - Measurement(backWidth); - Measurement(bustpointToBustpoint); - Measurement(halterBustpointToBustpoint); - Measurement(neckToBustpoint); - Measurement(crotchLength); - Measurement(riseHeight); - Measurement(shoulderDrop); - Measurement(shoulderSlopeDegrees); - Measurement(frontShoulderSlopeLength); - Measurement(backShoulderSlopeLength); - Measurement(frontShoulderToWaistLength); - Measurement(backShoulderToWaistLength); - Measurement(frontNeckArc); - Measurement(backNeckArc); - Measurement(frontUpperChestArc); - Measurement(backUpperChestArc); - Measurement(frontWaistArc); - Measurement(backWaistArc); - Measurement(frontUpperHipArc); - Measurement(backUpperHipArc); - Measurement(frontHipArc); - Measurement(backHipArc); - Measurement(chestSlope); - Measurement(backSlope); - Measurement(frontWaistSlope); - Measurement(backWaistSlope); - Measurement(frontNeckToUpperChestHeight); - Measurement(frontNeckToBustHeight); + Measurement(centerFrontWaistLength_M); + Measurement(centerBackWaistLength_M); + Measurement(shoulderLength_M); + Measurement(sideWaistLength_M); + Measurement(trunkLength_M); + Measurement(shoulderGirth_M); + Measurement(upperChestGirth_M); + Measurement(bustGirth_M); + Measurement(underBustGirth_M); + Measurement(waistGirth_M); + Measurement(highHipGirth_M); + Measurement(hipGirth_M); + Measurement(upperFrontChestWidth_M); + Measurement(frontChestWidth_M); + Measurement(acrossFrontShoulderWidth_M); + Measurement(acrossBackShoulderWidth_M); + Measurement(upperBackWidth_M); + Measurement(backWidth_M); + Measurement(bustpointToBustpoint_M); + Measurement(halterBustpointToBustpoint_M); + Measurement(neckToBustpoint_M); + Measurement(crotchLength_M); + Measurement(riseHeight_M); + Measurement(shoulderDrop_M); + Measurement(shoulderSlopeDegrees_M); + Measurement(frontShoulderSlopeLength_M); + Measurement(backShoulderSlopeLength_M); + Measurement(frontShoulderToWaistLength_M); + Measurement(backShoulderToWaistLength_M); + Measurement(frontNeckArc_M); + Measurement(backNeckArc_M); + Measurement(frontUpperChestArc_M); + Measurement(backUpperChestArc_M); + Measurement(frontWaistArc_M); + Measurement(backWaistArc_M); + Measurement(frontUpperHipArc_M); + Measurement(backUpperHipArc_M); + Measurement(frontHipArc_M); + Measurement(backHipArc_M); + Measurement(chestSlope_M); + Measurement(backSlope_M); + Measurement(frontWaistSlope_M); + Measurement(backWaistSlope_M); + Measurement(frontNeckToUpperChestHeight_M); + Measurement(frontNeckToBustHeight_M); //arm - Measurement(armscyeGirth); - Measurement(elbowGirth); - Measurement(upperArmGirth); - Measurement(wristGirth); - Measurement(scyeDepth); - Measurement(shoulderAndArmLength); - Measurement(underarmLength); - Measurement(cervicaleToWristLength); - Measurement(shoulderToElbowLength); - Measurement(armLength); + Measurement(armscyeGirth_M); + Measurement(elbowGirth_M); + Measurement(upperArmGirth_M); + Measurement(wristGirth_M); + Measurement(scyeDepth_M); + Measurement(shoulderAndArmLength_M); + Measurement(underarmLength_M); + Measurement(cervicaleToWristLength_M); + Measurement(shoulderToElbowLength_M); + Measurement(armLength_M); //hand - Measurement(handWidth); - Measurement(handLength); - Measurement(handGirth); + Measurement(handWidth_M); + Measurement(handLength_M); + Measurement(handGirth_M); //leg - Measurement(thighGirth); - Measurement(midThighGirth); - Measurement(kneeGirth); - Measurement(calfGirth); - Measurement(ankleGirth); - Measurement(kneeHeight); - Measurement(ankleHeight); + Measurement(thighGirth_M); + Measurement(midThighGirth_M); + Measurement(kneeGirth_M); + Measurement(calfGirth_M); + Measurement(ankleGirth_M); + Measurement(kneeHeight_M); + Measurement(ankleHeight_M); //foot - Measurement(footWidth); - Measurement(footLength); + Measurement(footWidth_M); + Measurement(footLength_M); //heights - Measurement(cervicaleHeight); - Measurement(cervicaleToKneeHeight); - Measurement(waistHeight); - Measurement(highHipHeight); - Measurement(hipHeight); - Measurement(waistToHipHeight); - Measurement(waistToKneeHeight); - Measurement(crotchHeight); + Measurement(cervicaleHeight_M); + Measurement(cervicaleToKneeHeight_M); + Measurement(waistHeight_M); + Measurement(highHipHeight_M); + Measurement(hipHeight_M); + Measurement(waistToHipHeight_M); + Measurement(waistToKneeHeight_M); + Measurement(crotchHeight_M); //extended - Measurement(heightFrontNeckBasePoint); - Measurement(heightBaseNeckSidePoint); - Measurement(heightShoulderPoint); - Measurement(heightNipplePoint); - Measurement(heightBackAngleAxilla); - Measurement(heightScapularPoint); - Measurement(heightUnderButtockFolds); - Measurement(hipsExcludingProtrudingAbdomen); - Measurement(girthFootInstep); - Measurement(sideWaistToFloor); - Measurement(frontWaistToFloor); - Measurement(arcThroughGroinArea); - Measurement(waistToPlaneSeat); - Measurement(neckToRadialPoint); - Measurement(neckToThirdFinger); - Measurement(neckToFirstLineChestCircumference); - Measurement(frontWaistLength); - Measurement(arcThroughShoulderJoint); - Measurement(neckToBackLineChestCircumference); - Measurement(waistToNeckSide); - Measurement(arcLengthUpperBody); - Measurement(chestWidth); - Measurement(anteroposteriorDiameterHands); - Measurement(heightClavicularPoint); - Measurement(heightArmholeSlash); - Measurement(slashShoulderHeight); - Measurement(halfGirthNeck); - Measurement(halfGirthNeckForShirts); - Measurement(halfGirthChestFirst); - Measurement(halfGirthChestSecond); - Measurement(halfGirthChestThird); - Measurement(halfGirthWaist); - Measurement(halfGirthHipsConsideringProtrudingAbdomen); - Measurement(halfGirthHipsExcludingProtrudingAbdomen); - Measurement(girthKneeFlexedFeet); - Measurement(neckTransverseDiameter); - Measurement(frontSlashShoulderHeight); - Measurement(neckToFrontWaistLine); - Measurement(handVerticalDiameter); - Measurement(neckToKneePoint); - Measurement(waistToKnee); - Measurement(shoulderHeight); - Measurement(headHeight); - Measurement(bodyPosition); - Measurement(arcBehindShoulderGirdle); - Measurement(neckToNeckBase); - Measurement(depthWaistFirst); - Measurement(depthWaistSecond); + Measurement(heightFrontNeckBasePoint_M); + Measurement(heightBaseNeckSidePoint_M); + Measurement(heightShoulderPoint_M); + Measurement(heightNipplePoint_M); + Measurement(heightBackAngleAxilla_M); + Measurement(heightScapularPoint_M); + Measurement(heightUnderButtockFolds_M); + Measurement(hipsExcludingProtrudingAbdomen_M); + Measurement(girthFootInstep_M); + Measurement(sideWaistToFloor_M); + Measurement(frontWaistToFloor_M); + Measurement(arcThroughGroinArea_M); + Measurement(waistToPlaneSeat_M); + Measurement(neckToRadialPoint_M); + Measurement(neckToThirdFinger_M); + Measurement(neckToFirstLineChestCircumference_M); + Measurement(frontWaistLength_M); + Measurement(arcThroughShoulderJoint_M); + Measurement(neckToBackLineChestCircumference_M); + Measurement(waistToNeckSide_M); + Measurement(arcLengthUpperBody_M); + Measurement(chestWidth_M); + Measurement(anteroposteriorDiameterHands_M); + Measurement(heightClavicularPoint_M); + Measurement(heightArmholeSlash_M); + Measurement(slashShoulderHeight_M); + Measurement(halfGirthNeck_M); + Measurement(halfGirthNeckForShirts_M); + Measurement(halfGirthChestFirst_M); + Measurement(halfGirthChestSecond_M); + Measurement(halfGirthChestThird_M); + Measurement(halfGirthWaist_M); + Measurement(halfGirthHipsConsideringProtrudingAbdomen_M); + Measurement(halfGirthHipsExcludingProtrudingAbdomen_M); + Measurement(girthKneeFlexedFeet_M); + Measurement(neckTransverseDiameter_M); + Measurement(frontSlashShoulderHeight_M); + Measurement(neckToFrontWaistLine_M); + Measurement(handVerticalDiameter_M); + Measurement(neckToKneePoint_M); + Measurement(waistToKnee_M); + Measurement(shoulderHeight_M); + Measurement(headHeight_M); + Measurement(bodyPosition_M); + Measurement(arcBehindShoulderGirdle_M); + Measurement(neckToNeckBase_M); + Measurement(depthWaistFirst_M); + Measurement(depthWaistSecond_M); } //--------------------------------------------------------------------------------------------------------------------- @@ -242,7 +242,7 @@ void VStandardMeasurements::SetSize() if (nodeList.isEmpty()) { data->SetSize(50); - data->SetSizeName(size); + data->SetSizeName(size_M); } else { @@ -258,7 +258,7 @@ void VStandardMeasurements::SetSize() value = value/10.0; } data->SetSize(value); - data->SetSizeName(size); + data->SetSizeName(size_M); } } } @@ -271,7 +271,7 @@ void VStandardMeasurements::SetHeight() if (nodeList.isEmpty()) { data->SetHeight(176); - data->SetHeightName(height); + data->SetHeightName(height_M); } else { @@ -287,7 +287,7 @@ void VStandardMeasurements::SetHeight() value = value / 10.0; } data->SetHeight(value); - data->SetHeightName(height); + data->SetHeightName(height_M); } } }