From f2cc874e7ea13d50e5e05375e0038102fbc93322 Mon Sep 17 00:00:00 2001 From: dismine Date: Thu, 15 May 2014 16:18:31 +0300 Subject: [PATCH] Initial extended measurements. --HG-- branch : feature --- src/app/options.cpp | 50 +++++++++++ src/app/options.h | 49 +++++++++++ src/app/widgets/vapplication.cpp | 141 +++++++++++++++++++++++++++++++ 3 files changed, 240 insertions(+) diff --git a/src/app/options.cpp b/src/app/options.cpp index 789858892..6f9f270ff 100644 --- a/src/app/options.cpp +++ b/src/app/options.cpp @@ -109,6 +109,56 @@ 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"); +//extended measurements +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 += 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"); //variables const QString line_ = QStringLiteral("Line_"); diff --git a/src/app/options.h b/src/app/options.h index bbc2323e7..ba971440f 100644 --- a/src/app/options.h +++ b/src/app/options.h @@ -193,6 +193,55 @@ extern const QString hipHeight; extern const QString waistToHipHeight; extern const QString waistToKneeHeight; extern const QString crotchHeight; +//extended measurements +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; // variables name extern const QString line_; diff --git a/src/app/widgets/vapplication.cpp b/src/app/widgets/vapplication.cpp index 23132be74..6f849e518 100644 --- a/src/app/widgets/vapplication.cpp +++ b/src/app/widgets/vapplication.cpp @@ -425,6 +425,147 @@ void VApplication::InitMeasurements() InitMeasurement(crotchHeight, QStringLiteral("Crotch height/Inseam"), QStringLiteral("Crotch to Floor along inside leg")); + //extended + InitMeasurement(heightFrontNeckBasePoint, 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"), + QStringLiteral("Height of the base of the neck side point")); + + InitMeasurement(heightShoulderPoint, QStringLiteral("Height shoulder point"), + QStringLiteral("The height of the shoulder point")); + + InitMeasurement(heightNipplePoint, QStringLiteral("Height nipple point"), QStringLiteral("Height nipple point")); + + InitMeasurement(heightBackAngleAxilla, QStringLiteral("Height back angle axilla"), + QStringLiteral("Height back angle axilla")); + + InitMeasurement(heightScapularPoint, QStringLiteral("Height scapular point"), + QStringLiteral("Height scapular point")); + + InitMeasurement(heightUnderButtockFolds, QStringLiteral("Height under buttock folds"), + QStringLiteral("Height under buttock folds")); + + InitMeasurement(hipsExcludingProtrudingAbdomen, QStringLiteral("Hips excluding protruding abdomen"), + QStringLiteral("Hips excluding protruding abdomen")); + + InitMeasurement(girthFootInstep, QStringLiteral("Girth foot instep"), QStringLiteral("Girth foot instep")); + + InitMeasurement(sideWaistToFloor, QStringLiteral("Side waist to floor"), + QStringLiteral("The distance from the side waist to floor")); + + InitMeasurement(frontWaistToFloor, QStringLiteral("Front waist to floor"), + QStringLiteral("The distance from the front waist to floor")); + + InitMeasurement(arcThroughGroinArea, QStringLiteral("Arc through groin area"), + QStringLiteral("Arc through groin area")); + + InitMeasurement(waistToPlaneSeat, QStringLiteral("Waist to plane seat"), + QStringLiteral("The distance from the waist to the plane seat")); + + InitMeasurement(neckToRadialPoint, 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"), + 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"), + 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"), + 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"), + QStringLiteral("Arc through the highest point of the shoulder joint")); + + InitMeasurement(neckToBackLineChestCircumference, 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"), + QStringLiteral("The distance from the waist to the back base of the neck side point")); + + InitMeasurement(arcLengthUpperBody, 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(anteroposteriorDiameterHands, QStringLiteral("Anteroposterior diameter hands"), + QStringLiteral("Anteroposterior diameter of the hands")); + + InitMeasurement(heightClavicularPoint, QStringLiteral("Height clavicular point"), + QStringLiteral("Height clavicular point")); + + InitMeasurement(heightArmholeSlash, 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"), + QStringLiteral("Slash shoulder height")); + + InitMeasurement(halfGirthNeck, QStringLiteral("Half girth neck"), QStringLiteral("Half girth neck")); + + InitMeasurement(halfGirthNeckForShirts, QStringLiteral("Half girth neck for shirts"), + QStringLiteral("Half girth neck for shirts")); + + InitMeasurement(halfGirthChestFirst, QStringLiteral("Half girth chest first"), + QStringLiteral("Half girth chest first")); + + InitMeasurement(halfGirthChestSecond, QStringLiteral("Half girth chest second"), + QStringLiteral("Half girth chest second")); + + InitMeasurement(halfGirthChestThird, QStringLiteral("Half girth chest third"), + QStringLiteral("Half girth chest third")); + + InitMeasurement(halfGirthWaist, QStringLiteral("Half girth waist"), QStringLiteral("Half girth waist")); + + InitMeasurement(halfGirthHipsConsideringProtrudingAbdomen, + QStringLiteral("Half girth hips considering protruding abdomen"), + QStringLiteral("Half girth hips considering protruding abdomen")); + + InitMeasurement(halfGirthHipsExcludingProtrudingAbdomen, + QStringLiteral("Half girth hips excluding protruding abdomen"), + QStringLiteral("Half girth hips excluding protruding abdomen")); + + InitMeasurement(girthKneeFlexedFeet, QStringLiteral("Girth knee flexed feet"), + QStringLiteral("Girth knee flexed feet")); + + InitMeasurement(neckTransverseDiameter, QStringLiteral("Neck transverse diameter"), + QStringLiteral("Neck transverse diameter")); + + InitMeasurement(frontSlashShoulderHeight, QStringLiteral("Front slash shoulder height"), + QStringLiteral("Front slash shoulder height")); + + InitMeasurement(neckToFrontWaistLine, 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"), + QStringLiteral("Hand vertical diameter")); + + InitMeasurement(neckToKneePoint, QStringLiteral("Neck to knee point"), + QStringLiteral("Distance from neck to knee point")); + + InitMeasurement(waistToKnee, QStringLiteral("Waist to knee"), + QStringLiteral("The distance from the waist to the knee")); + + InitMeasurement(shoulderHeight, QStringLiteral("Shoulder height"), QStringLiteral("Shoulder height")); + + InitMeasurement(headHeight, QStringLiteral("Head height"), QStringLiteral("Head height")); + + InitMeasurement(bodyPosition, QStringLiteral("Body position"), QStringLiteral("Body position")); + + InitMeasurement(arcBehindShoulderGirdle, QStringLiteral("Arc behind shoulder girdle"), + QStringLiteral("Arc behind the shoulder girdle")); + + InitMeasurement(neckToNeckBase, 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(depthWaistSecond, QStringLiteral("Depth waist second"), QStringLiteral("Depth waist second")); } //---------------------------------------------------------------------------------------------------------------------