aw/valentina_old
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed conversion measurements.

Browse Source 
--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2015-11-11 12:15:42 +02:00
parent 161f1bd61c
commit 0bfd673ab8
2 changed files with 30 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/libs/ifc/xml/vabstractmconverter.cpp
View File

@ -94,10 +94,8 @@ QMultiMap<QString, QString> VAbstractMConverter::OldNamesToNewNames_InV0_3_0()
names.insert(QStringLiteral("lowbust_circ"), QStringLiteral("under_bust_girth")); names.insert(QStringLiteral("lowbust_circ"), QStringLiteral("under_bust_girth"));
names.insert(QStringLiteral("waist_circ"), QStringLiteral("waist_girth")); names.insert(QStringLiteral("waist_circ"), QStringLiteral("waist_girth"));
names.insert(QStringLiteral("highhip_circ"), QStringLiteral("high_hip_girth")); names.insert(QStringLiteral("highhip_circ"), QStringLiteral("high_hip_girth"));
names.insert(QStringLiteral("hip_circ"), QStringLiteral("hips_excluding_protruding_abdomen"));
name = QStringLiteral("hip_circ"); names.insert(QStringLiteral("hip_circ_with_abdomen"), QStringLiteral("hip_girth"));
names.insert(name, QStringLiteral("hips_excluding_protruding_abdomen"));
names.insert(name, QStringLiteral("hip_girth"));
name = QStringLiteral("neck_arc_f"); name = QStringLiteral("neck_arc_f");
names.insert(name, QStringLiteral("half_girth_neck")); names.insert(name, QStringLiteral("half_girth_neck"));
@ -129,16 +127,13 @@ QMultiMap<QString, QString> VAbstractMConverter::OldNamesToNewNames_InV0_3_0()
QStringLiteral("half_girth_hips_considering_protruding_abdomen")); QStringLiteral("half_girth_hips_considering_protruding_abdomen"));
names.insert(QStringLiteral("body_armfold_circ"), QStringLiteral("shoulder_girth")); names.insert(QStringLiteral("body_armfold_circ"), QStringLiteral("shoulder_girth"));
names.insert(QStringLiteral("body_torso_circ"), QStringLiteral("trunk_length")); names.insert(QStringLiteral("body_torso_circ"), QStringLiteral("trunk_length"));
names.insert(QStringLiteral("neck_front_to_waist_f"), QStringLiteral("front_waist_length"));
name = QStringLiteral("neck_front_to_waist_f"); names.insert(QStringLiteral("neck_front_to_waist_flat"), QStringLiteral("center_front_waist_length"));
names.insert(name, QStringLiteral("front_waist_length"));
names.insert(name, QStringLiteral("center_front_waist_length"));
names.insert(QStringLiteral("armpit_to_waist_side"), QStringLiteral("side_waist_length")); names.insert(QStringLiteral("armpit_to_waist_side"), QStringLiteral("side_waist_length"));
names.insert(QStringLiteral("neck_side_to_waist_b"), QStringLiteral("waist_to_neck_side"));
name = QStringLiteral("neck_side_to_waist_f"); name = QStringLiteral("neck_side_to_waist_f");
names.insert(name, QStringLiteral("neck_to_front_waist_line")); names.insert(name, QStringLiteral("neck_to_front_waist_line"));
names.insert(name, QStringLiteral("waist_to_neck_side"));
names.insert(name, QStringLiteral("front_shoulder_to_waist_length")); names.insert(name, QStringLiteral("front_shoulder_to_waist_length"));
names.insert(QStringLiteral("neck_side_to_waist_b"), QStringLiteral("back_shoulder_to_waist_length")); names.insert(QStringLiteral("neck_side_to_waist_b"), QStringLiteral("back_shoulder_to_waist_length"));
@ -159,10 +154,8 @@ QMultiMap<QString, QString> VAbstractMConverter::OldNamesToNewNames_InV0_3_0()
names.insert(QStringLiteral("shoulder_length"), QStringLiteral("shoulder_length")); names.insert(QStringLiteral("shoulder_length"), QStringLiteral("shoulder_length"));
names.insert(QStringLiteral("shoulder_tip_to_shoulder_tip_f"), QStringLiteral("across_front_shoulder_width")); names.insert(QStringLiteral("shoulder_tip_to_shoulder_tip_f"), QStringLiteral("across_front_shoulder_width"));
names.insert(QStringLiteral("across_chest_f"), QStringLiteral("upper_front_chest_width")); names.insert(QStringLiteral("across_chest_f"), QStringLiteral("upper_front_chest_width"));
names.insert(QStringLiteral("across_chest_f"), QStringLiteral("chest_width"));
name = QStringLiteral("armfold_to_armfold_f"); names.insert(QStringLiteral("armfold_to_armfold_f"), QStringLiteral("front_chest_width"));
names.insert(name, QStringLiteral("chest_width"));
names.insert(name, QStringLiteral("front_chest_width"));
name = QStringLiteral("shoulder_tip_to_shoulder_tip_b"); name = QStringLiteral("shoulder_tip_to_shoulder_tip_b");
names.insert(name, QStringLiteral("arc_behind_shoulder_girdle")); names.insert(name, QStringLiteral("arc_behind_shoulder_girdle"));
@ -199,11 +192,8 @@ QMultiMap<QString, QString> VAbstractMConverter::OldNamesToNewNames_InV0_3_0()
names.insert(QStringLiteral("armscye_circ"), QStringLiteral("armscye_girth")); names.insert(QStringLiteral("armscye_circ"), QStringLiteral("armscye_girth"));
names.insert(QStringLiteral("armscye_width"), QStringLiteral("anteroposterior_diameter_hands")); names.insert(QStringLiteral("armscye_width"), QStringLiteral("anteroposterior_diameter_hands"));
names.insert(QStringLiteral("arm_neck_side_to_finger_tip"), QStringLiteral("neck_to_third_finger")); names.insert(QStringLiteral("arm_neck_side_to_finger_tip"), QStringLiteral("neck_to_third_finger"));
names.insert(QStringLiteral("arm_neck_side_to_outer_elbow"), QStringLiteral("neck_to_radial_point"));
name = QStringLiteral("arm_neck_side_to_wrist"); names.insert(QStringLiteral("arm_neck_side_to_wrist"), QStringLiteral("shoulder_and_arm_length"));
names.insert(name, QStringLiteral("neck_to_radial_point"));
names.insert(name, QStringLiteral("shoulder_and_arm_length"));
names.insert(QStringLiteral("leg_crotch_to_floor"), QStringLiteral("crotch_height")); names.insert(QStringLiteral("leg_crotch_to_floor"), QStringLiteral("crotch_height"));
names.insert(QStringLiteral("leg_waist_side_to_floor"), QStringLiteral("side_waist_to_floor")); names.insert(QStringLiteral("leg_waist_side_to_floor"), QStringLiteral("side_waist_to_floor"));
names.insert(QStringLiteral("leg_waist_side_to_knee"), QStringLiteral("waist_to_knee")); names.insert(QStringLiteral("leg_waist_side_to_knee"), QStringLiteral("waist_to_knee"));
@ -218,9 +208,8 @@ QMultiMap<QString, QString> VAbstractMConverter::OldNamesToNewNames_InV0_3_0()
names.insert(name, QStringLiteral("arc_through_groin_area")); names.insert(name, QStringLiteral("arc_through_groin_area"));
names.insert(name, QStringLiteral("crotch_length")); names.insert(name, QStringLiteral("crotch_length"));
name = QStringLiteral("rise_length_side"); names.insert(QStringLiteral("rise_length_side"), QStringLiteral("waist_to_plane_seat"));
names.insert(name, QStringLiteral("waist_to_plane_seat")); names.insert(QStringLiteral("rise_length_diag"), QStringLiteral("rise_height"));
names.insert(name, QStringLiteral("rise_height"));
name = QStringLiteral("hand_length"); name = QStringLiteral("hand_length");
names.insert(name, QStringLiteral("hand_vertical_diameter")); names.insert(name, QStringLiteral("hand_vertical_diameter"));
@ -239,6 +228,10 @@ QMultiMap<QString, QString> VAbstractMConverter::OldNamesToNewNames_InV0_3_0()
names.insert(QStringLiteral("highbust_b_over_shoulder_to_highbust_f"), QStringLiteral("strap_length")); names.insert(QStringLiteral("highbust_b_over_shoulder_to_highbust_f"), QStringLiteral("strap_length"));
names.insert(QStringLiteral("armscye_arc"), QStringLiteral("arc_through_shoulder_joint")); names.insert(QStringLiteral("armscye_arc"), QStringLiteral("arc_through_shoulder_joint"));
names.insert(QStringLiteral("head_circ"), QStringLiteral("head_girth")); names.insert(QStringLiteral("head_circ"), QStringLiteral("head_girth"));
names.insert(QStringLiteral("arm_elbow_circ"), QStringLiteral("elbow_girth"));
names.insert(QStringLiteral("height_gluteal_fold"), QStringLiteral("height_under_buttock_folds"));
names.insert(QStringLiteral("neck_back_to_highbust_b"), QStringLiteral("scye_depth"));
names.insert(QStringLiteral("across_back_to_waist_b"), QStringLiteral("back_waist_to_upper_chest"));
return names; return names;
} }

40
src/libs/ifc/xml/vpatternconverter.cpp
View File

@ -792,10 +792,8 @@ QMap<QString, QString> VPatternConverter::OldNamesToNewNames_InV0_2_0()
names.insert(QStringLiteral("under_bust_girth"), QStringLiteral("lowbust_circ")); names.insert(QStringLiteral("under_bust_girth"), QStringLiteral("lowbust_circ"));
names.insert(QStringLiteral("waist_girth"), QStringLiteral("waist_circ")); names.insert(QStringLiteral("waist_girth"), QStringLiteral("waist_circ"));
names.insert(QStringLiteral("high_hip_girth"), QStringLiteral("highhip_circ")); names.insert(QStringLiteral("high_hip_girth"), QStringLiteral("highhip_circ"));
names.insert(QStringLiteral("hips_excluding_protruding_abdomen"), QStringLiteral("hip_circ"));
name = QStringLiteral("hip_circ"); names.insert(QStringLiteral("hip_girth"), QStringLiteral("hip_circ_with_abdomen"));
names.insert(QStringLiteral("hips_excluding_protruding_abdomen"), name);
names.insert(QStringLiteral("hip_girth"), name);
name = QStringLiteral("neck_arc_f"); name = QStringLiteral("neck_arc_f");
names.insert(QStringLiteral("half_girth_neck"), name); names.insert(QStringLiteral("half_girth_neck"), name);
@ -825,19 +823,15 @@ QMap<QString, QString> VPatternConverter::OldNamesToNewNames_InV0_2_0()
names.insert(QStringLiteral("back_hip_arc"), QStringLiteral("hip_arc_b")); names.insert(QStringLiteral("back_hip_arc"), QStringLiteral("hip_arc_b"));
names.insert(QStringLiteral("half_girth_hips_considering_protruding_abdomen"), names.insert(QStringLiteral("half_girth_hips_considering_protruding_abdomen"),
QStringLiteral("hip_with_abdomen_arc_f")); QStringLiteral("hip_with_abdomen_arc_f"));
names.insert(QStringLiteral("shoulder_girth"), QStringLiteral("body_armfold_circ")); names.insert(QStringLiteral("shoulder_girth"), QStringLiteral("body_armfold_circ"));
names.insert(QStringLiteral("trunk_length"), QStringLiteral("body_torso_circ")); names.insert(QStringLiteral("trunk_length"), QStringLiteral("body_torso_circ"));
names.insert(QStringLiteral("front_waist_length"), QStringLiteral("neck_front_to_waist_f"));
name = QStringLiteral("neck_front_to_waist_f"); names.insert(QStringLiteral("center_front_waist_length"), QStringLiteral("neck_front_to_waist_flat"));
names.insert(QStringLiteral("front_waist_length"), name);
names.insert(QStringLiteral("center_front_waist_length"), name);
names.insert(QStringLiteral("side_waist_length"), QStringLiteral("armpit_to_waist_side")); names.insert(QStringLiteral("side_waist_length"), QStringLiteral("armpit_to_waist_side"));
names.insert(QStringLiteral("waist_to_neck_side"), QStringLiteral("neck_side_to_waist_b"));
name = QStringLiteral("neck_side_to_waist_f"); name = QStringLiteral("neck_side_to_waist_f");
names.insert(QStringLiteral("neck_to_front_waist_line"), name); names.insert(QStringLiteral("neck_to_front_waist_line"), name);
names.insert(QStringLiteral("waist_to_neck_side"), name);
names.insert(QStringLiteral("front_shoulder_to_waist_length"), name); names.insert(QStringLiteral("front_shoulder_to_waist_length"), name);
names.insert(QStringLiteral("back_shoulder_to_waist_length"), QStringLiteral("neck_side_to_waist_b")); names.insert(QStringLiteral("back_shoulder_to_waist_length"), QStringLiteral("neck_side_to_waist_b"));
@ -857,10 +851,8 @@ QMap<QString, QString> VPatternConverter::OldNamesToNewNames_InV0_2_0()
names.insert(QStringLiteral("shoulder_drop"), QStringLiteral("shoulder_slope_neck_side_length")); names.insert(QStringLiteral("shoulder_drop"), QStringLiteral("shoulder_slope_neck_side_length"));
names.insert(QStringLiteral("across_front_shoulder_width"), QStringLiteral("shoulder_tip_to_shoulder_tip_f")); names.insert(QStringLiteral("across_front_shoulder_width"), QStringLiteral("shoulder_tip_to_shoulder_tip_f"));
names.insert(QStringLiteral("upper_front_chest_width"), QStringLiteral("across_chest_f")); names.insert(QStringLiteral("upper_front_chest_width"), QStringLiteral("across_chest_f"));
names.insert(QStringLiteral("chest_width"), QStringLiteral("across_chest_f"));
name = QStringLiteral("armfold_to_armfold_f"); names.insert(QStringLiteral("front_chest_width"), QStringLiteral("armfold_to_armfold_f"));
names.insert(QStringLiteral("chest_width"), name);
names.insert(QStringLiteral("front_chest_width"), name);
name = QStringLiteral("shoulder_tip_to_shoulder_tip_b"); name = QStringLiteral("shoulder_tip_to_shoulder_tip_b");
names.insert(QStringLiteral("arc_behind_shoulder_girdle"), name); names.insert(QStringLiteral("arc_behind_shoulder_girdle"), name);
@ -897,11 +889,8 @@ QMap<QString, QString> VPatternConverter::OldNamesToNewNames_InV0_2_0()
names.insert(QStringLiteral("armscye_girth"), QStringLiteral("armscye_circ")); names.insert(QStringLiteral("armscye_girth"), QStringLiteral("armscye_circ"));
names.insert(QStringLiteral("anteroposterior_diameter_hands"), QStringLiteral("armscye_width")); names.insert(QStringLiteral("anteroposterior_diameter_hands"), QStringLiteral("armscye_width"));
names.insert(QStringLiteral("neck_to_third_finger"), QStringLiteral("arm_neck_side_to_finger_tip")); names.insert(QStringLiteral("neck_to_third_finger"), QStringLiteral("arm_neck_side_to_finger_tip"));
names.insert(QStringLiteral("neck_to_radial_point"), QStringLiteral("arm_neck_side_to_outer_elbow"));
name = QStringLiteral("arm_neck_side_to_wrist"); names.insert(QStringLiteral("shoulder_and_arm_length"), QStringLiteral("arm_neck_side_to_wrist"));
names.insert(QStringLiteral("neck_to_radial_point"), name);
names.insert(QStringLiteral("shoulder_and_arm_length"), name);
names.insert(QStringLiteral("crotch_height"), QStringLiteral("leg_crotch_to_floor")); names.insert(QStringLiteral("crotch_height"), QStringLiteral("leg_crotch_to_floor"));
names.insert(QStringLiteral("side_waist_to_floor"), QStringLiteral("leg_waist_side_to_floor")); names.insert(QStringLiteral("side_waist_to_floor"), QStringLiteral("leg_waist_side_to_floor"));
names.insert(QStringLiteral("waist_to_knee"), QStringLiteral("leg_waist_side_to_knee")); names.insert(QStringLiteral("waist_to_knee"), QStringLiteral("leg_waist_side_to_knee"));
@ -912,11 +901,8 @@ QMap<QString, QString> VPatternConverter::OldNamesToNewNames_InV0_2_0()
names.insert(QStringLiteral("ankle_girth"), QStringLiteral("leg_ankle_circ")); names.insert(QStringLiteral("ankle_girth"), QStringLiteral("leg_ankle_circ"));
names.insert(QStringLiteral("girth_knee_flexed_feet"), QStringLiteral("leg_knee_circ_bent")); names.insert(QStringLiteral("girth_knee_flexed_feet"), QStringLiteral("leg_knee_circ_bent"));
names.insert(QStringLiteral("arc_through_groin_area"), QStringLiteral("crotch_length")); names.insert(QStringLiteral("arc_through_groin_area"), QStringLiteral("crotch_length"));
names.insert(QStringLiteral("waist_to_plane_seat"), QStringLiteral("rise_length_side"));
name = QStringLiteral("rise_length_side"); names.insert(QStringLiteral("rise_height"), QStringLiteral("rise_length_diag"));
names.insert(QStringLiteral("waist_to_plane_seat"), name);
names.insert(QStringLiteral("rise_height"), name);
names.insert(QStringLiteral("hand_vertical_diameter"), QStringLiteral("hand_length")); names.insert(QStringLiteral("hand_vertical_diameter"), QStringLiteral("hand_length"));
names.insert(QStringLiteral("hand_width"), QStringLiteral("hand_palm_width")); names.insert(QStringLiteral("hand_width"), QStringLiteral("hand_palm_width"));
names.insert(QStringLiteral("hand_girth"), QStringLiteral("hand_circ")); names.insert(QStringLiteral("hand_girth"), QStringLiteral("hand_circ"));
@ -929,6 +915,10 @@ QMap<QString, QString> VPatternConverter::OldNamesToNewNames_InV0_2_0()
names.insert(QStringLiteral("strap_length"), QStringLiteral("highbust_b_over_shoulder_to_highbust_f")); names.insert(QStringLiteral("strap_length"), QStringLiteral("highbust_b_over_shoulder_to_highbust_f"));
names.insert(QStringLiteral("arc_through_shoulder_joint"), QStringLiteral("armscye_arc")); names.insert(QStringLiteral("arc_through_shoulder_joint"), QStringLiteral("armscye_arc"));
names.insert(QStringLiteral("head_girth"), QStringLiteral("head_circ")); names.insert(QStringLiteral("head_girth"), QStringLiteral("head_circ"));
names.insert(QStringLiteral("elbow_girth"), QStringLiteral("arm_elbow_circ"));
names.insert(QStringLiteral("height_under_buttock_folds"), QStringLiteral("height_gluteal_fold"));
names.insert(QStringLiteral("scye_depth"), QStringLiteral("neck_back_to_highbust_b"));
names.insert(QStringLiteral("back_waist_to_upper_chest"), QStringLiteral("across_back_to_waist_b"));
return names; return names;
} }