From f7230219521e7157837dde37f86ba0de62f5a773 Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <kroluku@gmail.com>
Date: Fri, 8 Apr 2016 13:19:50 +0300
Subject: [PATCH] Updated measurement templates with all measurements. Added
 new template Aldrich/Women measurements.

--HG--
branch : release
---
 ChangeLog.txt                                 |  1 +
 .../tables/templates/t_Aldrich_Women.vit      | 48 +++++++++++++++++++
 .../templates/template_all_measurements.vit   | 10 ++--
 src/app/tables.pri                            |  4 +-
 4 files changed, 58 insertions(+), 5 deletions(-)
 create mode 100644 src/app/share/tables/templates/t_Aldrich_Women.vit

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 2bf64be20..26d9798e1 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,4 +1,5 @@
 # Version 0.4.4
+- Updated measurement templates with all measurements. Added new template Aldrich/Women measurements.
 - Updated description measurements N06 and N07. Add new measurements A23 and J10.
 - Fixed GUI issue. After full parse some widgets was incorrectly reseted.
 - [#464] Crash. Issue with modeling node objects.
diff --git a/src/app/share/tables/templates/t_Aldrich_Women.vit b/src/app/share/tables/templates/t_Aldrich_Women.vit
new file mode 100644
index 000000000..44d676add
--- /dev/null
+++ b/src/app/share/tables/templates/t_Aldrich_Women.vit
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vit>
+    <!--Measurements created with Valentina (http://www.valentina-project.org/).-->
+    <version>0.3.3</version>
+    <read-only>true</read-only>
+    <notes/>
+    <unit>cm</unit>
+    <pm_system>998</pm_system>
+    <personal>
+        <family-name/>
+        <given-name/>
+        <birth-date>1800-01-01</birth-date>
+        <gender>unknown</gender>
+        <email/>
+    </personal>
+    <body-measurements>
+        <m name="height_knee" value="0"/>
+        <m name="neck_circ" value="0"/>
+        <m name="bust_circ" value="0"/>
+        <m name="waist_circ" value="0"/>
+        <m name="highhip_circ" value="0"/>
+        <m name="hip_circ" value="0"/>
+        <m name="neck_back_to_waist_b" value="0"/>
+        <m name="neck_back_to_highbust_b" value="0"/>
+        <m name="waist_to_hip_f" value="0"/>
+        <m name="shoulder_length" value="0"/>
+        <m name="across_chest_f" value="0"/>
+        <m name="across_back_b" value="0"/>
+        <m name="bustpoint_to_waist" value="0"/>
+        <m name="arm_shoulder_tip_to_wrist_bent" value="0"/>
+        <m name="arm_upper_circ" value="0"/>
+        <m name="arm_wrist_circ" value="0"/>
+        <m name="leg_knee_circ" value="0"/>
+        <m name="leg_ankle_high_circ" value="0"/>
+        <m name="leg_ankle_circ" value="0"/>
+        <m name="rise_length_side_sitting" value="0"/>
+        <m name="dart_width_shoulder" value="0"/>
+        <m name="height_waist_back" value="0"/>
+        <m name="bustpoint_to_shoulder_center" value="0"/>
+        <m name="@M_1" value="@M_J10 + bustpoint_to_waist" full_name="Front Shoulder to Waist"/>
+        <m name="@M_2" value="@M_A23 - height_knee" full_name="Waist to Knee"/>
+        <m name="@M_3" value="(0.91*leg_ankle_circ) " full_name="Trouser Bottom"/>
+        <m name="@M_4" value="(0.8*leg_ankle_circ) " full_name="Jeans Bottom"/>
+        <m name="@M_5" value="(1.41*arm_wrist_circ)" full_name="Cuff Size, Shirt"/>
+        <m name="@M_6" value="(0.9*arm_wrist_circ)" full_name="Cuff Size, Two Piece Sleeve"/>
+        <m name="@M_7" value="(0.93*arm_shoulder_tip_to_wrist_bent)" full_name="Sleeve Length, Jersey"/>
+    </body-measurements>
+</vit>
diff --git a/src/app/share/tables/templates/template_all_measurements.vit b/src/app/share/tables/templates/template_all_measurements.vit
index 15f4fd5a1..d432f9c82 100644
--- a/src/app/share/tables/templates/template_all_measurements.vit
+++ b/src/app/share/tables/templates/template_all_measurements.vit
@@ -2,10 +2,10 @@
 <vit>
     <!--Measurements created with Valentina (http://www.valentina-project.org/).-->
     <version>0.3.3</version>
-    <read-only>false</read-only>
+    <read-only>true</read-only>
     <notes/>
     <unit>cm</unit>
-    <pm_system>41</pm_system>
+    <pm_system>998</pm_system>
     <personal>
         <family-name/>
         <given-name/>
@@ -36,6 +36,7 @@
         <m name="height_waist_side_to_hip" value="(height_waist_side - height_hip)"/>
         <m name="height_knee_to_ankle" value="(height_knee - height_ankle)"/>
         <m name="height_neck_back_to_waist_side" value="(height_neck_back - height_waist_side)"/>
+        <m name="height_waist_back" value="(height_waist_front - leg_crotch_to_floor)"/>
         <m name="width_shoulder" value="0"/>
         <m name="width_bust" value="0"/>
         <m name="width_waist" value="0"/>
@@ -170,6 +171,7 @@
         <m name="bustpoint_to_shoulder_tip" value="0"/>
         <m name="bustpoint_to_waist_front" value="0"/>
         <m name="bustpoint_to_bustpoint_halter" value="0"/>
+        <m name="bustpoint_to_shoulder_center" value="0"/>
         <m name="shoulder_tip_to_waist_front" value="0"/>
         <m name="neck_front_to_waist_side" value="0"/>
         <m name="neck_side_to_waist_side_f" value="0"/>
@@ -224,8 +226,8 @@
         <m name="crotch_length_f" value="(crotch_length - crotch_length_b)"/>
         <m name="rise_length_side_sitting" value="0"/>
         <m name="rise_length_diag" value="0"/>
-        <m name="rise_length_b" value="0"/>
-        <m name="rise_length_f" value="0"/>
+        <m name="rise_length_b" value="(height_waist_back - leg_crotch_to_floor)"/>
+        <m name="rise_length_f" value="(height_waist_front - leg_crotch_to_floor)"/>
         <m name="rise_length_side" value="0"/>
         <m name="neck_back_to_waist_front" value="0"/>
         <m name="waist_to_waist_halter" value="0"/>
diff --git a/src/app/tables.pri b/src/app/tables.pri
index 972cc3db8..ecd75af47 100644
--- a/src/app/tables.pri
+++ b/src/app/tables.pri
@@ -2,6 +2,8 @@
 INSTALL_STANDARD_MEASHUREMENTS += $$PWD/share/tables/standard/GOST_man_ru.vst
 
 # Keep path to all template files we have right now
-INSTALL_STANDARD_TEMPLATES += $$PWD/share/tables/templates/template_all_measurements.vit
+INSTALL_STANDARD_TEMPLATES += \
+    $$PWD/share/tables/templates/template_all_measurements.vit \
+    $$PWD/share/tables/templates/t_Aldrich_Women.vit
 
 copyToDestdir($$INSTALL_STANDARD_MEASHUREMENTS, $$shell_path($${OUT_PWD}/$$DESTDIR/tables/standard))