From ac3f02ab49943d7e578b0c84a7e7ad89df274339 Mon Sep 17 00:00:00 2001 From: dismine Date: Thu, 15 May 2014 10:42:15 +0300 Subject: [PATCH] Changes in formats. --HG-- branch : feature --- src/app/app.pro | 3 +- src/app/share/resources/measurements.qrc | 3 + .../schema/individual_measurements.xsd | 656 +++++------- src/app/share/resources/schema/pattern.xsd | 6 + .../schema/standard_measurements.xsd | 975 +++++++++++++++++- .../share/tables/individual/individual.vit | 160 +++ .../tables/individual/individual_en-us.vit | 108 -- .../tables/individual/indivindual_ru.vit | 108 -- src/app/share/tables/standard/GOST_man_ru.vst | 230 +++-- 9 files changed, 1532 insertions(+), 717 deletions(-) create mode 100644 src/app/share/resources/measurements.qrc create mode 100644 src/app/share/tables/individual/individual.vit delete mode 100644 src/app/share/tables/individual/individual_en-us.vit delete mode 100644 src/app/share/tables/individual/indivindual_ru.vit diff --git a/src/app/app.pro b/src/app/app.pro index 06f0824af..b70163271 100644 --- a/src/app/app.pro +++ b/src/app/app.pro @@ -63,7 +63,8 @@ RESOURCES += \ share/resources/icon.qrc \ share/resources/cursor.qrc \ share/resources/theme.qrc \ - share/resources/schema.qrc + share/resources/schema.qrc \ + share/resources/measurements.qrc OTHER_FILES += \ share/resources/valentina.rc \ diff --git a/src/app/share/resources/measurements.qrc b/src/app/share/resources/measurements.qrc new file mode 100644 index 000000000..4d8ed6621 --- /dev/null +++ b/src/app/share/resources/measurements.qrc @@ -0,0 +1,3 @@ + + + diff --git a/src/app/share/resources/schema/individual_measurements.xsd b/src/app/share/resources/schema/individual_measurements.xsd index 55cd7f9a3..9be7a8eaf 100644 --- a/src/app/share/resources/schema/individual_measurements.xsd +++ b/src/app/share/resources/schema/individual_measurements.xsd @@ -3,6 +3,7 @@ + @@ -24,42 +25,22 @@ - - - - - - - - - - - - - - - - - - - - @@ -70,452 +51,227 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -526,102 +282,52 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -632,32 +338,17 @@ - - - - - - - - - - - - - - - @@ -668,72 +359,37 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -744,22 +400,12 @@ - - - - - - - - - - @@ -770,92 +416,298 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -872,9 +724,9 @@ - + - + diff --git a/src/app/share/resources/schema/pattern.xsd b/src/app/share/resources/schema/pattern.xsd index 1f1b0c00c..f6101313e 100644 --- a/src/app/share/resources/schema/pattern.xsd +++ b/src/app/share/resources/schema/pattern.xsd @@ -4,6 +4,7 @@ + @@ -229,4 +230,9 @@ + + + + + diff --git a/src/app/share/resources/schema/standard_measurements.xsd b/src/app/share/resources/schema/standard_measurements.xsd index 4ac6eb0d5..4d882d847 100644 --- a/src/app/share/resources/schema/standard_measurements.xsd +++ b/src/app/share/resources/schema/standard_measurements.xsd @@ -3,6 +3,7 @@ + @@ -17,30 +18,967 @@ - + - + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - @@ -48,4 +986,9 @@ + + + + + diff --git a/src/app/share/tables/individual/individual.vit b/src/app/share/tables/individual/individual.vit new file mode 100644 index 000000000..471b9d163 --- /dev/null +++ b/src/app/share/tables/individual/individual.vit @@ -0,0 +1,160 @@ + + + 0.1.0 + en-us + + + + 1900-01-01 + male + username@example.com + + + cm + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/app/share/tables/individual/individual_en-us.vit b/src/app/share/tables/individual/individual_en-us.vit deleted file mode 100644 index 2e9ff0777..000000000 --- a/src/app/share/tables/individual/individual_en-us.vit +++ /dev/null @@ -1,108 +0,0 @@ - - - en-us - - - - 1900-01-01 - male - username@example.com - - - cm - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/app/share/tables/individual/indivindual_ru.vit b/src/app/share/tables/individual/indivindual_ru.vit deleted file mode 100644 index b7329e774..000000000 --- a/src/app/share/tables/individual/indivindual_ru.vit +++ /dev/null @@ -1,108 +0,0 @@ - - - ru - - - - 1900-01-01 - male - username@example.com - - - mm - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/app/share/tables/standard/GOST_man_ru.vst b/src/app/share/tables/standard/GOST_man_ru.vst index ca4a1c00a..9f73960dd 100644 --- a/src/app/share/tables/standard/GOST_man_ru.vst +++ b/src/app/share/tables/standard/GOST_man_ru.vst @@ -1,87 +1,153 @@ + 0.1.0 Типовые фигуры мужчин 1-й полнотной группы, обхват груди 100 см mm - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +