After last redesign measurements order comments became useless.

--HG--
branch : develop

src/libs/ifc/xml/vabstractmconverter.cpp

@@ -55,259 +55,189 @@ QMultiMap<QString, QString> VAbstractMConverter::OldNamesToNewNames_InV0_3_0()
     // new name, old name
     QMultiMap<QString, QString> names;
 
-    // A02
     names.insert(QStringLiteral("height_neck_back"), QStringLiteral("cervicale_height"));
-    // A03
     names.insert(QStringLiteral("height_scapula"), QStringLiteral("height_scapular_point"));
-    // A04
     names.insert(QStringLiteral("height_armpit"), QStringLiteral("height_back_angle_axilla"));
-    // A05
     names.insert(QStringLiteral("height_waist_side"), QStringLiteral("waist_height"));
-    // A06
     names.insert(QStringLiteral("height_hip"), QStringLiteral("hip_height"));
-    // A08
     names.insert(QStringLiteral("height_knee"), QStringLiteral("knee_height"));
-    // A11
     names.insert(QStringLiteral("height_ankle"), QStringLiteral("ankle_height"));
-    // A12
     names.insert(QStringLiteral("height_highhip"), QStringLiteral("high_hip_height"));
-    // A13
     names.insert(QStringLiteral("height_waist_front"), QStringLiteral("front_waist_to_floor"));
-    // A14
     names.insert(QStringLiteral("height_bustpoint"), QStringLiteral("height_nipple_point"));
-    // A15
+
     QString name = QStringLiteral("height_shoulder_tip");
     names.insert(name, QStringLiteral("shoulder_height"));
     names.insert(name, QStringLiteral("height_shoulder_point"));
-    // A16
+
     name = QStringLiteral("height_neck_front");
     names.insert(name, QStringLiteral("height_clavicular_point"));
     names.insert(name, QStringLiteral("height_front_neck_base_point"));
-    // A17
+
     names.insert(QStringLiteral("height_neck_side"), QStringLiteral("height_base_neck_side_point"));
-    // A18
+
     name = QStringLiteral("height_neck_back_to_knee");
     names.insert(name, QStringLiteral("neck_to_knee_point"));
     names.insert(name, QStringLiteral("cervicale_to_knee_height"));
-    // A19
+
     names.insert(QStringLiteral("height_waist_side_to_knee"), QStringLiteral("waist_to_knee_height"));
-    // A20
     names.insert(QStringLiteral("height_waist_side_to_hip"), QStringLiteral("waist_to_hip_height"));
-    // C01
     names.insert(QStringLiteral("indent_neck_back"), QStringLiteral("body_position"));
-    // D01
+
     name = QStringLiteral("neck_mid_circ");
     names.insert(name, QStringLiteral("half_girth_neck_for_shirts"));
     names.insert(name, QStringLiteral("mid_neck_girth"));
-    // D02
+
     names.insert(QStringLiteral("neck_circ"), QStringLiteral("neck_base_girth"));
-    // D03
     names.insert(QStringLiteral("highbust_circ"), QStringLiteral("upper_chest_girth"));
-    // D04
     names.insert(QStringLiteral("bust_circ"), QStringLiteral("bust_girth"));
-    // D05
     names.insert(QStringLiteral("lowbust_circ"), QStringLiteral("under_bust_girth"));
-    // D07
     names.insert(QStringLiteral("waist_circ"), QStringLiteral("waist_girth"));
-    // D08
     names.insert(QStringLiteral("highhip_circ"), QStringLiteral("high_hip_girth"));
-    // D09
+
     name = QStringLiteral("hip_circ");
     names.insert(name, QStringLiteral("hips_excluding_protruding_abdomen"));
     names.insert(name, QStringLiteral("hip_girth"));
-    // D10
+
     name = QStringLiteral("neck_arc_f");
     names.insert(name, QStringLiteral("half_girth_neck"));
     names.insert(name, QStringLiteral("front_neck_arc"));
-    // D11
+
     name = QStringLiteral("highbust_arc_f");
     names.insert(name, QStringLiteral("half_girth_chest_first"));
     names.insert(name, QStringLiteral("front_upper_chest_arc"));
-    // D12
+
     names.insert(QStringLiteral("bust_arc_f"), QStringLiteral("half_girth_chest_second"));
-    // D13
     names.insert(QStringLiteral("lowbust_arc_f"), QStringLiteral("half_girth_chest_third"));
-    // D15
+
     name = QStringLiteral("waist_arc_f");
     names.insert(name, QStringLiteral("half_girth_waist"));
     names.insert(name, QStringLiteral("front_waist_arc"));
-    // D16
+
     names.insert(QStringLiteral("highhip_arc_f"), QStringLiteral("front_upper_hip_arc"));
-    // D17
+
     name = QStringLiteral("hip_arc_f");
     names.insert(name, QStringLiteral("half_girth_hips_excluding_protruding_abdomen"));
     names.insert(name, QStringLiteral("front_hip_arc"));
-    // D18
+
     names.insert(QStringLiteral("neck_arc_b"), QStringLiteral("back_neck_arc"));
-    // D19
     names.insert(QStringLiteral("highbust_arc_b"), QStringLiteral("back_upper_chest_arc"));
-    // D23
     names.insert(QStringLiteral("waist_arc_b"), QStringLiteral("back_waist_arc"));
-    // D24
     names.insert(QStringLiteral("highhip_arc_b"), QStringLiteral("back_upper_hip_arc"));
-    // D25
     names.insert(QStringLiteral("hip_arc_b"), QStringLiteral("back_hip_arc"));
-    // D42
     names.insert(QStringLiteral("hip_with_abdomen_arc_f"),
                  QStringLiteral("half_girth_hips_considering_protruding_abdomen"));
-    // D43
     names.insert(QStringLiteral("body_armfold_circ"), QStringLiteral("shoulder_girth"));
-    // D45
     names.insert(QStringLiteral("body_torso_circ"), QStringLiteral("trunk_length"));
-    // E01
+
     name = QStringLiteral("neck_front_to_waist_f");
     names.insert(name, QStringLiteral("front_waist_length"));
     names.insert(name, QStringLiteral("center_front_waist_length"));
-    // E03
+
     names.insert(QStringLiteral("armpit_to_waist_side"), QStringLiteral("side_waist_length"));
-    // E05
+
     name = QStringLiteral("neck_side_to_waist_f");
     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"));
-    // E08
+
     names.insert(QStringLiteral("neck_side_to_waist_b"), QStringLiteral("back_shoulder_to_waist_length"));
-    // E09
     names.insert(QStringLiteral("neck_back_to_waist_b"), QStringLiteral("center_back_waist_length"));
-    // E11
+
     name = QStringLiteral("neck_front_to_highbust_f");
     names.insert(name, QStringLiteral("neck_to_first_line_chest_circumference"));
     names.insert(name, QStringLiteral("front_neck_to_upper_chest_height"));
-    // E12
+
     names.insert(QStringLiteral("neck_front_to_bust_f"), QStringLiteral("front_neck_to_bust_height"));
-    // E13
     names.insert(QStringLiteral("highbust_to_waist_f"), QStringLiteral("front_waist_to_upper_chest"));
-    // E15
     names.insert(QStringLiteral("lowbust_to_waist_f"), QStringLiteral("front_waist_to_lower_breast"));
-    // E17
     names.insert(QStringLiteral("neck_back_to_highbust_b"), QStringLiteral("neck_to_back_line_chest_circumference"));
-    // E30
     names.insert(QStringLiteral("waist_to_highhip_f"), QStringLiteral("depth_waist_first"));
-    // E31
     names.insert(QStringLiteral("waist_to_hip_f"), QStringLiteral("depth_waist_second"));
-    // E36
     names.insert(QStringLiteral("shoulder_slope_neck_side_angle"), QStringLiteral("shoulder_slope_degrees"));
-    // E37
     names.insert(QStringLiteral("shoulder_slope_neck_side_length"), QStringLiteral("shoulder_drop"));
-    // F01
     names.insert(QStringLiteral("shoulder_length"), QStringLiteral("shoulder_length"));
-    // F02
     names.insert(QStringLiteral("shoulder_tip_to_shoulder_tip_f"), QStringLiteral("across_front_shoulder_width"));
-    // F03
     names.insert(QStringLiteral("across_chest_f"), QStringLiteral("upper_front_chest_width"));
-    // F04
+
     name = QStringLiteral("armfold_to_armfold_f");
     names.insert(name, QStringLiteral("chest_width"));
     names.insert(name, QStringLiteral("front_chest_width"));
-    // F05
+
     name = QStringLiteral("shoulder_tip_to_shoulder_tip_b");
     names.insert(name, QStringLiteral("arc_behind_shoulder_girdle"));
     names.insert(name, QStringLiteral("across_back_shoulder_width"));
-    // F06
+
     names.insert(QStringLiteral("across_back_b"), QStringLiteral("upper_back_width"));
-    // F07
     names.insert(QStringLiteral("armfold_to_armfold_b"), QStringLiteral("back_width"));
-    // F14
     names.insert(QStringLiteral("neck_width"), QStringLiteral("neck_transverse_diameter"));
-    // G01
     names.insert(QStringLiteral("bustpoint_to_bustpoint"), QStringLiteral("bustpoint_to_bustpoint"));
-    // G02
     names.insert(QStringLiteral("bustpoint_to_neck_side"), QStringLiteral("neck_to_bustpoint"));
-    // G06
     names.insert(QStringLiteral("bustpoint_to_bustpoint_halter"), QStringLiteral("halter_bustpoint_to_bustpoint"));
-    // H01
+
     name = QStringLiteral("shoulder_tip_to_waist_front");
     names.insert(name, QStringLiteral("front_slash_shoulder_height"));
     names.insert(name, QStringLiteral("front_shoulder_slope_length"));
-    // H02
+
     names.insert(QStringLiteral("neck_front_to_waist_side"), QStringLiteral("front_waist_slope"));
-    // H04
+
     name = QStringLiteral("neck_side_to_armfold_f");
     names.insert(name, QStringLiteral("height_armhole_slash"));
     names.insert(name, QStringLiteral("chest_slope"));
-    // H07
+
     name = QStringLiteral("shoulder_tip_to_waist_back");
     names.insert(name, QStringLiteral("slash_shoulder_height"));
     names.insert(name, QStringLiteral("back_shoulder_slope_length"));
-    // H08
+
     names.insert(QStringLiteral("neck_back_to_waist_side"), QStringLiteral("back_waist_slope"));
-    // H10
     names.insert(QStringLiteral("neck_side_to_armfold_b"), QStringLiteral("back_slope"));
-    // I05
     names.insert(QStringLiteral("arm_shoulder_tip_to_wrist"), QStringLiteral("arm_length"));
-    // I06
     names.insert(QStringLiteral("arm_shoulder_tip_to_elbow"), QStringLiteral("shoulder_to_elbow_length"));
-    // I08
     names.insert(QStringLiteral("arm_armpit_to_wrist"), QStringLiteral("underarm_length"));
-    // I11
     names.insert(QStringLiteral("arm_upper_circ"), QStringLiteral("upper_arm_girth"));
-    // I15
     names.insert(QStringLiteral("arm_wrist_circ"), QStringLiteral("wrist_girth"));
-    // I17
     names.insert(QStringLiteral("armscye_circ"), QStringLiteral("armscye_girth"));
-    // I19
     names.insert(QStringLiteral("armscye_width"), QStringLiteral("anteroposterior_diameter_hands"));
-    // I20
     names.insert(QStringLiteral("arm_neck_side_to_finger_tip"), QStringLiteral("neck_to_third_finger"));
-    // I21
+
     name = QStringLiteral("arm_neck_side_to_wrist");
     names.insert(name, QStringLiteral("neck_to_radial_point"));
     names.insert(name, QStringLiteral("shoulder_and_arm_length"));
-    // J01
+
     names.insert(QStringLiteral("leg_crotch_to_floor"), QStringLiteral("crotch_height"));
-    // J02
     names.insert(QStringLiteral("leg_waist_side_to_floor"), QStringLiteral("side_waist_to_floor"));
-    // J03
     names.insert(QStringLiteral("leg_waist_side_to_knee"), QStringLiteral("waist_to_knee"));
-    // J04
     names.insert(QStringLiteral("leg_thigh_upper_circ"), QStringLiteral("thigh_girth"));
-    // J05
     names.insert(QStringLiteral("leg_thigh_mid_circ"), QStringLiteral("mid_thigh_girth"));
-    // J06
     names.insert(QStringLiteral("leg_knee_circ"), QStringLiteral("knee_girth"));
-    // J08
     names.insert(QStringLiteral("leg_calf_circ"), QStringLiteral("calf_girth"));
-    // J10
     names.insert(QStringLiteral("leg_ankle_circ"), QStringLiteral("ankle_girth"));
-    // J11
     names.insert(QStringLiteral("leg_knee_circ_bent"), QStringLiteral("girth_knee_flexed_feet"));
-    // K01
+
     name = QStringLiteral("crotch_length");
     names.insert(name, QStringLiteral("arc_through_groin_area"));
     names.insert(name, QStringLiteral("crotch_length"));
-    // K04
+
     name = QStringLiteral("rise_length_side");
     names.insert(name, QStringLiteral("waist_to_plane_seat"));
     names.insert(name, QStringLiteral("rise_height"));
-    // L02
+
     name = QStringLiteral("hand_length");
     names.insert(name, QStringLiteral("hand_vertical_diameter"));
     names.insert(name, QStringLiteral("hand_length"));
-    // L03
-    names.insert(QStringLiteral("hand_palm_width"), QStringLiteral("hand_width"));
-    // L05
-    names.insert(QStringLiteral("hand_circ"), QStringLiteral("hand_girth"));
-    // M01
-    names.insert(QStringLiteral("foot_width"), QStringLiteral("foot_width"));
-    // M02
-    names.insert(QStringLiteral("foot_length"), QStringLiteral("foot_length"));
-    // M04
-    names.insert(QStringLiteral("foot_instep_circ"), QStringLiteral("girth_foot_instep"));
-    // N02
-    names.insert(QStringLiteral("head_length"), QStringLiteral("head_height"));
-    // N05
-    names.insert(QStringLiteral("head_crown_to_neck_back"), QStringLiteral("head_and_neck_length"));
-    // N06
-    names.insert(QStringLiteral("head_chin_to_neck_back"), QStringLiteral("neck_to_neck_base"));
-    // O02
-    names.insert(QStringLiteral("waist_to_waist_halter"), QStringLiteral("arc_length_upper_body"));
-    // O09
-    names.insert(QStringLiteral("arm_neck_back_to_wrist_bent"), QStringLiteral("cervicale_to_wrist_length"));
-    // P11
-    names.insert(QStringLiteral("highbust_b_over_shoulder_to_highbust_f"), QStringLiteral("strap_length"));
-    // P12
-    names.insert(QStringLiteral("armscye_arc"), QStringLiteral("arc_through_shoulder_joint"));
 
+    names.insert(QStringLiteral("hand_palm_width"), QStringLiteral("hand_width"));
+    names.insert(QStringLiteral("hand_circ"), QStringLiteral("hand_girth"));
+    names.insert(QStringLiteral("foot_width"), QStringLiteral("foot_width"));
+    names.insert(QStringLiteral("foot_length"), QStringLiteral("foot_length"));
+    names.insert(QStringLiteral("foot_instep_circ"), QStringLiteral("girth_foot_instep"));
+    names.insert(QStringLiteral("head_length"), QStringLiteral("head_height"));
+    names.insert(QStringLiteral("head_crown_to_neck_back"), QStringLiteral("head_and_neck_length"));
+    names.insert(QStringLiteral("head_chin_to_neck_back"), QStringLiteral("neck_to_neck_base"));
+    names.insert(QStringLiteral("waist_to_waist_halter"), QStringLiteral("arc_length_upper_body"));
+    names.insert(QStringLiteral("arm_neck_back_to_wrist_bent"), QStringLiteral("cervicale_to_wrist_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("head_circ"), QStringLiteral("head_girth"));
 
     return names;

src/libs/ifc/xml/vpatternconverter.cpp

@@ -753,230 +753,181 @@ QMap<QString, QString> VPatternConverter::OldNamesToNewNames_InV0_2_0()
     // old name, new name
     QMap<QString, QString> names;
 
-    // A02
     names.insert(QStringLiteral("cervicale_height"), QStringLiteral("height_neck_back"));
-    // A03
     names.insert(QStringLiteral("height_scapular_point"), QStringLiteral("height_scapula"));
-    // A04
     names.insert(QStringLiteral("height_back_angle_axilla"), QStringLiteral("height_armpit"));
-    // A05
     names.insert(QStringLiteral("waist_height"), QStringLiteral("height_waist_side"));
-    // A06
     names.insert(QStringLiteral("hip_height"), QStringLiteral("height_hip"));
-    // A08
     names.insert(QStringLiteral("knee_height"), QStringLiteral("height_knee"));
-    // A11
     names.insert(QStringLiteral("ankle_height"), QStringLiteral("height_ankle"));
-    // A12
     names.insert(QStringLiteral("high_hip_height"), QStringLiteral("height_highhip"));
-    // A13
     names.insert(QStringLiteral("front_waist_to_floor"), QStringLiteral("height_waist_front"));
-    // A14
     names.insert(QStringLiteral("height_nipple_point"), QStringLiteral("height_bustpoint"));
-    // A15
+
-    names.insert(QStringLiteral("shoulder_height"), QStringLiteral("height_shoulder_tip"));
+    QString name = QStringLiteral("height_shoulder_tip");
-    names.insert(QStringLiteral("height_shoulder_point"), QStringLiteral("height_shoulder_tip"));
+    names.insert(QStringLiteral("shoulder_height"), name);
-    // A16
+    names.insert(QStringLiteral("height_shoulder_point"), name);
-    names.insert(QStringLiteral("height_clavicular_point"), QStringLiteral("height_neck_front"));
+
-    names.insert(QStringLiteral("height_front_neck_base_point"), QStringLiteral("height_neck_front"));
+    name = QStringLiteral("height_neck_front");
-    // A17
+    names.insert(QStringLiteral("height_clavicular_point"), name);
+    names.insert(QStringLiteral("height_front_neck_base_point"), name);
+
     names.insert(QStringLiteral("height_base_neck_side_point"), QStringLiteral("height_neck_side"));
-    // A18
+
-    names.insert(QStringLiteral("neck_to_knee_point"), QStringLiteral("height_neck_back_to_knee"));
+    name = QStringLiteral("height_neck_back_to_knee");
-    names.insert(QStringLiteral("cervicale_to_knee_height"), QStringLiteral("height_neck_back_to_knee"));
+    names.insert(QStringLiteral("neck_to_knee_point"), name);
-    // A19
+    names.insert(QStringLiteral("cervicale_to_knee_height"), name);
+
     names.insert(QStringLiteral("waist_to_knee_height"), QStringLiteral("height_waist_side_to_knee"));
-    // A20
     names.insert(QStringLiteral("waist_to_hip_height"), QStringLiteral("height_waist_side_to_hip"));
-    // C01
     names.insert(QStringLiteral("body_position"), QStringLiteral("indent_neck_back"));
-    // D01
+
-    names.insert(QStringLiteral("half_girth_neck_for_shirts"), QStringLiteral("neck_mid_circ"));
+    name = QStringLiteral("neck_mid_circ");
-    names.insert(QStringLiteral("mid_neck_girth"), QStringLiteral("neck_mid_circ"));
+    names.insert(QStringLiteral("half_girth_neck_for_shirts"), name);
-    // D02
+    names.insert(QStringLiteral("mid_neck_girth"), name);
+
     names.insert(QStringLiteral("neck_base_girth"), QStringLiteral("neck_circ"));
-    // D03
     names.insert(QStringLiteral("upper_chest_girth"), QStringLiteral("highbust_circ"));
-    // D04
     names.insert(QStringLiteral("bust_girth"), QStringLiteral("bust_circ"));
-    // D05
     names.insert(QStringLiteral("under_bust_girth"), QStringLiteral("lowbust_circ"));
-    // D07
     names.insert(QStringLiteral("waist_girth"), QStringLiteral("waist_circ"));
-    // D08
     names.insert(QStringLiteral("high_hip_girth"), QStringLiteral("highhip_circ"));
-    // D09
+
-    names.insert(QStringLiteral("hips_excluding_protruding_abdomen"), QStringLiteral("hip_circ"));
+    name = QStringLiteral("hip_circ");
-    names.insert(QStringLiteral("hip_girth"), QStringLiteral("hip_circ"));
+    names.insert(QStringLiteral("hips_excluding_protruding_abdomen"), name);
-    // D10
+    names.insert(QStringLiteral("hip_girth"), name);
-    names.insert(QStringLiteral("half_girth_neck"), QStringLiteral("neck_arc_f"));
+
-    names.insert(QStringLiteral("front_neck_arc"), QStringLiteral("neck_arc_f"));
+    name = QStringLiteral("neck_arc_f");
-    // D11
+    names.insert(QStringLiteral("half_girth_neck"), name);
-    names.insert(QStringLiteral("half_girth_chest_first"), QStringLiteral("highbust_arc_f"));
+    names.insert(QStringLiteral("front_neck_arc"), name);
-    names.insert(QStringLiteral("front_upper_chest_arc"), QStringLiteral("highbust_arc_f"));
+
-    // D12
+    name = QStringLiteral("highbust_arc_f");
+    names.insert(QStringLiteral("half_girth_chest_first"), name);
+    names.insert(QStringLiteral("front_upper_chest_arc"), name);
+
     names.insert(QStringLiteral("half_girth_chest_second"), QStringLiteral("bust_arc_f"));
-    // D13
     names.insert(QStringLiteral("half_girth_chest_third"), QStringLiteral("lowbust_arc_f"));
-    // D15
+
-    names.insert(QStringLiteral("half_girth_waist"), QStringLiteral("waist_arc_f"));
+    name = QStringLiteral("waist_arc_f");
-    names.insert(QStringLiteral("front_waist_arc"), QStringLiteral("waist_arc_f"));
+    names.insert(QStringLiteral("half_girth_waist"), name);
-    // D16
+    names.insert(QStringLiteral("front_waist_arc"), name);
+
     names.insert(QStringLiteral("front_upper_hip_arc"), QStringLiteral("highhip_arc_f"));
-    // D17
+
-    names.insert(QStringLiteral("half_girth_hips_excluding_protruding_abdomen"), QStringLiteral("hip_arc_f"));
+    name = QStringLiteral("hip_arc_f");
-    names.insert(QStringLiteral("front_hip_arc"), QStringLiteral("hip_arc_f"));
+    names.insert(QStringLiteral("half_girth_hips_excluding_protruding_abdomen"), name);
-    // D18
+    names.insert(QStringLiteral("front_hip_arc"), name);
+
     names.insert(QStringLiteral("back_neck_arc"), QStringLiteral("neck_arc_b"));
-    // D19
     names.insert(QStringLiteral("back_upper_chest_arc"), QStringLiteral("highbust_arc_b"));
-    // D23
     names.insert(QStringLiteral("back_waist_arc"), QStringLiteral("waist_arc_b"));
-    // D24
     names.insert(QStringLiteral("back_upper_hip_arc"), QStringLiteral("highhip_arc_b"));
-    // D25
     names.insert(QStringLiteral("back_hip_arc"), QStringLiteral("hip_arc_b"));
-    // D42
     names.insert(QStringLiteral("half_girth_hips_considering_protruding_abdomen"),
                  QStringLiteral("hip_with_abdomen_arc_f"));
-    // D43
-    names.insert(QStringLiteral("shoulder_girth"), QStringLiteral("body_armfold_circ"));
-    // D45
-    names.insert(QStringLiteral("trunk_length"), QStringLiteral("body_torso_circ"));
-    // E01
-    names.insert(QStringLiteral("front_waist_length"), QStringLiteral("neck_front_to_waist_f"));
-    names.insert(QStringLiteral("center_front_waist_length"), QStringLiteral("neck_front_to_waist_f"));
-    // E03
-    names.insert(QStringLiteral("side_waist_length"), QStringLiteral("armpit_to_waist_side"));
-    // E05
-    names.insert(QStringLiteral("neck_to_front_waist_line"), QStringLiteral("neck_side_to_waist_f"));
-    names.insert(QStringLiteral("waist_to_neck_side"), QStringLiteral("neck_side_to_waist_f"));
-    names.insert(QStringLiteral("front_shoulder_to_waist_length"), QStringLiteral("neck_side_to_waist_f"));
-    // E08
-    names.insert(QStringLiteral("back_shoulder_to_waist_length"), QStringLiteral("neck_side_to_waist_b"));
-    // E09
-    names.insert(QStringLiteral("center_back_waist_length"), QStringLiteral("neck_back_to_waist_b"));
-    // E11
-    names.insert(QStringLiteral("neck_to_first_line_chest_circumference"), QStringLiteral("neck_front_to_highbust_f"));
-    names.insert(QStringLiteral("front_neck_to_upper_chest_height"), QStringLiteral("neck_front_to_highbust_f"));
-    // E12
-    names.insert(QStringLiteral("front_neck_to_bust_height"), QStringLiteral("neck_front_to_bust_f"));
-    // E13
-    names.insert(QStringLiteral("front_waist_to_upper_chest"), QStringLiteral("highbust_to_waist_f"));
-    // E15
-    names.insert(QStringLiteral("front_waist_to_lower_breast"), QStringLiteral("lowbust_to_waist_f"));
-    // E17
-    names.insert(QStringLiteral("neck_to_back_line_chest_circumference"), QStringLiteral("neck_back_to_highbust_b"));
-    // E30
-    names.insert(QStringLiteral("depth_waist_first"), QStringLiteral("waist_to_highhip_f"));
-    // E31
-    names.insert(QStringLiteral("depth_waist_second"), QStringLiteral("waist_to_hip_f"));
-    // E36
-    names.insert(QStringLiteral("shoulder_slope_degrees"), QStringLiteral("shoulder_slope_neck_side_angle"));
-    // E37
-    names.insert(QStringLiteral("shoulder_drop"), QStringLiteral("shoulder_slope_neck_side_length"));
-    // F02
-    names.insert(QStringLiteral("across_front_shoulder_width"), QStringLiteral("shoulder_tip_to_shoulder_tip_f"));
-    // F03
-    names.insert(QStringLiteral("upper_front_chest_width"), QStringLiteral("across_chest_f"));
-    // F04
-    names.insert(QStringLiteral("chest_width"), QStringLiteral("armfold_to_armfold_f"));
-    names.insert(QStringLiteral("front_chest_width"), QStringLiteral("armfold_to_armfold_f"));
-    // F05
-    names.insert(QStringLiteral("arc_behind_shoulder_girdle"), QStringLiteral("shoulder_tip_to_shoulder_tip_b"));
-    names.insert(QStringLiteral("across_back_shoulder_width"), QStringLiteral("shoulder_tip_to_shoulder_tip_b"));
-    // F06
-    names.insert(QStringLiteral("upper_back_width"), QStringLiteral("across_back_b"));
-    // F07
-    names.insert(QStringLiteral("back_width"), QStringLiteral("armfold_to_armfold_b"));
-    // F14
-    names.insert(QStringLiteral("neck_transverse_diameter"), QStringLiteral("neck_width"));
-    // G01
-    names.insert(QStringLiteral("bustpoint_to_bustpoint"), QStringLiteral("bustpoint_to_bustpoint"));
-    // G02
-    names.insert(QStringLiteral("neck_to_bustpoint"), QStringLiteral("bustpoint_to_neck_side"));
-    // G06
-    names.insert(QStringLiteral("halter_bustpoint_to_bustpoint"), QStringLiteral("bustpoint_to_bustpoint_halter"));
-    // H01
-    names.insert(QStringLiteral("front_slash_shoulder_height"), QStringLiteral("shoulder_tip_to_waist_front"));
-    names.insert(QStringLiteral("front_shoulder_slope_length"), QStringLiteral("shoulder_tip_to_waist_front"));
-    // H02
-    names.insert(QStringLiteral("front_waist_slope"), QStringLiteral("neck_front_to_waist_side"));
-    // H04
-    names.insert(QStringLiteral("height_armhole_slash"), QStringLiteral("neck_side_to_armfold_f"));
-    names.insert(QStringLiteral("chest_slope"), QStringLiteral("neck_side_to_armfold_f"));
-    // H07
-    names.insert(QStringLiteral("slash_shoulder_height"), QStringLiteral("shoulder_tip_to_waist_back"));
-    names.insert(QStringLiteral("back_shoulder_slope_length"), QStringLiteral("shoulder_tip_to_waist_back"));
-    // H08
-    names.insert(QStringLiteral("back_waist_slope"), QStringLiteral("neck_back_to_waist_side"));
-    // H10
-    names.insert(QStringLiteral("back_slope"), QStringLiteral("neck_side_to_armfold_b"));
-    // I05
-    names.insert(QStringLiteral("arm_length"), QStringLiteral("arm_shoulder_tip_to_wrist"));
-    // I06
-    names.insert(QStringLiteral("shoulder_to_elbow_length"), QStringLiteral("arm_shoulder_tip_to_elbow"));
-    // I08
-    names.insert(QStringLiteral("underarm_length"), QStringLiteral("arm_armpit_to_wrist"));
-    // I11
-    names.insert(QStringLiteral("upper_arm_girth"), QStringLiteral("arm_upper_circ"));
-    // I15
-    names.insert(QStringLiteral("wrist_girth"), QStringLiteral("arm_wrist_circ"));
-    // I17
-    names.insert(QStringLiteral("armscye_girth"), QStringLiteral("armscye_circ"));
-    // I19
-    names.insert(QStringLiteral("anteroposterior_diameter_hands"), QStringLiteral("armscye_width"));
-    // I20
-    names.insert(QStringLiteral("neck_to_third_finger"), QStringLiteral("arm_neck_side_to_finger_tip"));
-    // I21
-    names.insert(QStringLiteral("neck_to_radial_point"), QStringLiteral("arm_neck_side_to_wrist"));
-    names.insert(QStringLiteral("shoulder_and_arm_length"), QStringLiteral("arm_neck_side_to_wrist"));
-    // J01
-    names.insert(QStringLiteral("crotch_height"), QStringLiteral("leg_crotch_to_floor"));
-    // J02
-    names.insert(QStringLiteral("side_waist_to_floor"), QStringLiteral("leg_waist_side_to_floor"));
-    // J03
-    names.insert(QStringLiteral("waist_to_knee"), QStringLiteral("leg_waist_side_to_knee"));
-    // J04
-    names.insert(QStringLiteral("thigh_girth"), QStringLiteral("leg_thigh_upper_circ"));
-    // J05
-    names.insert(QStringLiteral("mid_thigh_girth"), QStringLiteral("leg_thigh_mid_circ"));
-    // J06
-    names.insert(QStringLiteral("knee_girth"), QStringLiteral("leg_knee_circ"));
-    // J08
-    names.insert(QStringLiteral("calf_girth"), QStringLiteral("leg_calf_circ"));
-    // J10
-    names.insert(QStringLiteral("ankle_girth"), QStringLiteral("leg_ankle_circ"));
-    // J11
-    names.insert(QStringLiteral("girth_knee_flexed_feet"), QStringLiteral("leg_knee_circ_bent"));
-    // K01
-    names.insert(QStringLiteral("arc_through_groin_area"), QStringLiteral("crotch_length"));
-    // K04
-    names.insert(QStringLiteral("waist_to_plane_seat"), QStringLiteral("rise_length_side"));
-    names.insert(QStringLiteral("rise_height"), QStringLiteral("rise_length_side"));
-    // L02
-    names.insert(QStringLiteral("hand_vertical_diameter"), QStringLiteral("hand_length"));
-    // L03
-    names.insert(QStringLiteral("hand_width"), QStringLiteral("hand_palm_width"));
-    // L05
-    names.insert(QStringLiteral("hand_girth"), QStringLiteral("hand_circ"));
-    // M04
-    names.insert(QStringLiteral("girth_foot_instep"), QStringLiteral("foot_instep_circ"));
-    // N02
-    names.insert(QStringLiteral("head_height"), QStringLiteral("head_length"));
-    // N05
-    names.insert(QStringLiteral("head_and_neck_length"), QStringLiteral("head_crown_to_neck_back"));
-    // N06
-    names.insert(QStringLiteral("neck_to_neck_base"), QStringLiteral("head_chin_to_neck_back"));
-    // O02
-    names.insert(QStringLiteral("arc_length_upper_body"), QStringLiteral("waist_to_waist_halter"));
-    // O09
-    names.insert(QStringLiteral("cervicale_to_wrist_length"), QStringLiteral("arm_neck_back_to_wrist_bent"));
-    // P11
-    names.insert(QStringLiteral("strap_length"), QStringLiteral("highbust_b_over_shoulder_to_highbust_f"));
-    // P12
-    names.insert(QStringLiteral("arc_through_shoulder_joint"), QStringLiteral("armscye_arc"));
 
+    names.insert(QStringLiteral("shoulder_girth"), QStringLiteral("body_armfold_circ"));
+    names.insert(QStringLiteral("trunk_length"), QStringLiteral("body_torso_circ"));
+
+    name = QStringLiteral("neck_front_to_waist_f");
+    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"));
+
+    name = QStringLiteral("neck_side_to_waist_f");
+    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("back_shoulder_to_waist_length"), QStringLiteral("neck_side_to_waist_b"));
+    names.insert(QStringLiteral("center_back_waist_length"), QStringLiteral("neck_back_to_waist_b"));
+
+    name = QStringLiteral("neck_front_to_highbust_f");
+    names.insert(QStringLiteral("neck_to_first_line_chest_circumference"), name);
+    names.insert(QStringLiteral("front_neck_to_upper_chest_height"), name);
+
+    names.insert(QStringLiteral("front_neck_to_bust_height"), QStringLiteral("neck_front_to_bust_f"));
+    names.insert(QStringLiteral("front_waist_to_upper_chest"), QStringLiteral("highbust_to_waist_f"));
+    names.insert(QStringLiteral("front_waist_to_lower_breast"), QStringLiteral("lowbust_to_waist_f"));
+    names.insert(QStringLiteral("neck_to_back_line_chest_circumference"), QStringLiteral("neck_back_to_highbust_b"));
+    names.insert(QStringLiteral("depth_waist_first"), QStringLiteral("waist_to_highhip_f"));
+    names.insert(QStringLiteral("depth_waist_second"), QStringLiteral("waist_to_hip_f"));
+    names.insert(QStringLiteral("shoulder_slope_degrees"), QStringLiteral("shoulder_slope_neck_side_angle"));
+    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("upper_front_chest_width"), QStringLiteral("across_chest_f"));
+
+    name = 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");
+    names.insert(QStringLiteral("arc_behind_shoulder_girdle"), name);
+    names.insert(QStringLiteral("across_back_shoulder_width"), name);
+
+    names.insert(QStringLiteral("upper_back_width"), QStringLiteral("across_back_b"));
+    names.insert(QStringLiteral("back_width"), QStringLiteral("armfold_to_armfold_b"));
+    names.insert(QStringLiteral("neck_transverse_diameter"), QStringLiteral("neck_width"));
+    names.insert(QStringLiteral("bustpoint_to_bustpoint"), QStringLiteral("bustpoint_to_bustpoint"));
+    names.insert(QStringLiteral("neck_to_bustpoint"), QStringLiteral("bustpoint_to_neck_side"));
+    names.insert(QStringLiteral("halter_bustpoint_to_bustpoint"), QStringLiteral("bustpoint_to_bustpoint_halter"));
+
+    name = QStringLiteral("shoulder_tip_to_waist_front");
+    names.insert(QStringLiteral("front_slash_shoulder_height"), name);
+    names.insert(QStringLiteral("front_shoulder_slope_length"), name);
+
+    names.insert(QStringLiteral("front_waist_slope"), QStringLiteral("neck_front_to_waist_side"));
+
+    name = QStringLiteral("neck_side_to_armfold_f");
+    names.insert(QStringLiteral("height_armhole_slash"), name);
+    names.insert(QStringLiteral("chest_slope"), name);
+
+    name = QStringLiteral("shoulder_tip_to_waist_back");
+    names.insert(QStringLiteral("slash_shoulder_height"), name);
+    names.insert(QStringLiteral("back_shoulder_slope_length"), name);
+
+    names.insert(QStringLiteral("back_waist_slope"), QStringLiteral("neck_back_to_waist_side"));
+    names.insert(QStringLiteral("back_slope"), QStringLiteral("neck_side_to_armfold_b"));
+    names.insert(QStringLiteral("arm_length"), QStringLiteral("arm_shoulder_tip_to_wrist"));
+    names.insert(QStringLiteral("shoulder_to_elbow_length"), QStringLiteral("arm_shoulder_tip_to_elbow"));
+    names.insert(QStringLiteral("underarm_length"), QStringLiteral("arm_armpit_to_wrist"));
+    names.insert(QStringLiteral("upper_arm_girth"), QStringLiteral("arm_upper_circ"));
+    names.insert(QStringLiteral("wrist_girth"), QStringLiteral("arm_wrist_circ"));
+    names.insert(QStringLiteral("armscye_girth"), QStringLiteral("armscye_circ"));
+    names.insert(QStringLiteral("anteroposterior_diameter_hands"), QStringLiteral("armscye_width"));
+    names.insert(QStringLiteral("neck_to_third_finger"), QStringLiteral("arm_neck_side_to_finger_tip"));
+
+    name = 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("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("thigh_girth"), QStringLiteral("leg_thigh_upper_circ"));
+    names.insert(QStringLiteral("mid_thigh_girth"), QStringLiteral("leg_thigh_mid_circ"));
+    names.insert(QStringLiteral("knee_girth"), QStringLiteral("leg_knee_circ"));
+    names.insert(QStringLiteral("calf_girth"), QStringLiteral("leg_calf_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("arc_through_groin_area"), QStringLiteral("crotch_length"));
+
+    name = QStringLiteral("rise_length_side");
+    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_width"), QStringLiteral("hand_palm_width"));
+    names.insert(QStringLiteral("hand_girth"), QStringLiteral("hand_circ"));
+    names.insert(QStringLiteral("girth_foot_instep"), QStringLiteral("foot_instep_circ"));
+    names.insert(QStringLiteral("head_height"), QStringLiteral("head_length"));
+    names.insert(QStringLiteral("head_and_neck_length"), QStringLiteral("head_crown_to_neck_back"));
+    names.insert(QStringLiteral("neck_to_neck_base"), QStringLiteral("head_chin_to_neck_back"));
+    names.insert(QStringLiteral("arc_length_upper_body"), QStringLiteral("waist_to_waist_halter"));
+    names.insert(QStringLiteral("cervicale_to_wrist_length"), QStringLiteral("arm_neck_back_to_wrist_bent"));
+    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("head_girth"), QStringLiteral("head_circ"));
 
     return names;