From 7ef6ed47269c56055695e13b3092dba43b1e2aed Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sun, 10 Jan 2016 17:02:44 +0200 Subject: [PATCH] New files in collection. --HG-- branch : develop --- .../0.7_Armhole_adjustment_0.10.val | 666 ++++++++++++++++++ src/app/share/collection/MensShirtBlock.val | 87 +++ .../Moulage_0.5_armhole_neckline.val | 121 ++++ src/app/share/collection/PajamaTopWrap2.val | 261 +++++++ src/app/share/collection/Sleeve.val | 51 ++ src/app/share/collection/Susan.vit | 130 ++++ src/app/share/collection/TestDart.val | 57 ++ src/app/share/collection/TestGrid_10cm_2.val | 241 +++++++ src/app/share/collection/blusa.vit | 130 ++++ .../my_calculated_measurements_for_val.vit | 130 ++++ src/app/share/collection/patrón_blusa.val | 237 +++++++ src/test/ValentinaTest/ValentinaTest.pro | 11 +- .../tst_valentinacommandline.cpp | 81 +-- 13 files changed, 2139 insertions(+), 64 deletions(-) create mode 100644 src/app/share/collection/0.7_Armhole_adjustment_0.10.val create mode 100644 src/app/share/collection/MensShirtBlock.val create mode 100644 src/app/share/collection/Moulage_0.5_armhole_neckline.val create mode 100644 src/app/share/collection/PajamaTopWrap2.val create mode 100644 src/app/share/collection/Sleeve.val create mode 100644 src/app/share/collection/Susan.vit create mode 100644 src/app/share/collection/TestDart.val create mode 100644 src/app/share/collection/TestGrid_10cm_2.val create mode 100644 src/app/share/collection/blusa.vit create mode 100644 src/app/share/collection/my_calculated_measurements_for_val.vit create mode 100644 src/app/share/collection/patrón_blusa.val diff --git a/src/app/share/collection/0.7_Armhole_adjustment_0.10.val b/src/app/share/collection/0.7_Armhole_adjustment_0.10.val new file mode 100644 index 000000000..92178fd49 --- /dev/null +++ b/src/app/share/collection/0.7_Armhole_adjustment_0.10.val @@ -0,0 +1,666 @@ + + + + 0.2.4 + cm + + + + my_calculated_measurements_for_val.vit + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + +
+ + diff --git a/src/app/share/collection/MensShirtBlock.val b/src/app/share/collection/MensShirtBlock.val new file mode 100644 index 000000000..ed9549209 --- /dev/null +++ b/src/app/share/collection/MensShirtBlock.val @@ -0,0 +1,87 @@ + + + + 0.2.4 + cm + + + + Susan.vit + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + diff --git a/src/app/share/collection/Moulage_0.5_armhole_neckline.val b/src/app/share/collection/Moulage_0.5_armhole_neckline.val new file mode 100644 index 000000000..faf916ee0 --- /dev/null +++ b/src/app/share/collection/Moulage_0.5_armhole_neckline.val @@ -0,0 +1,121 @@ + + + + 0.2.4 + cm + + + + my_calculated_measurements_for_val.vit + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + diff --git a/src/app/share/collection/PajamaTopWrap2.val b/src/app/share/collection/PajamaTopWrap2.val new file mode 100644 index 000000000..53a5be0f6 --- /dev/null +++ b/src/app/share/collection/PajamaTopWrap2.val @@ -0,0 +1,261 @@ + + + + 0.2.4 + cm + + + + Susan.vit + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + +
+ + + + + + +
+ + diff --git a/src/app/share/collection/Sleeve.val b/src/app/share/collection/Sleeve.val new file mode 100644 index 000000000..274d8fba1 --- /dev/null +++ b/src/app/share/collection/Sleeve.val @@ -0,0 +1,51 @@ + + + + 0.2.4 + mm + + + + + + + + ../../../../../build-Valentina-Desktop-Debug/src/app/valentina/bin/tables/standard/GOST_man_ru.vst + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + diff --git a/src/app/share/collection/Susan.vit b/src/app/share/collection/Susan.vit new file mode 100644 index 000000000..d5bb88082 --- /dev/null +++ b/src/app/share/collection/Susan.vit @@ -0,0 +1,130 @@ + + + + 0.3.3 + false + + cm + 998 + + Spencer + Susan + 1959-11-04 + female + susan.spencer@gmail.com + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/app/share/collection/TestDart.val b/src/app/share/collection/TestDart.val new file mode 100644 index 000000000..bc3d1d8c4 --- /dev/null +++ b/src/app/share/collection/TestDart.val @@ -0,0 +1,57 @@ + + + + 0.2.4 + cm + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + +
+ + diff --git a/src/app/share/collection/TestGrid_10cm_2.val b/src/app/share/collection/TestGrid_10cm_2.val new file mode 100644 index 000000000..77a5b7b69 --- /dev/null +++ b/src/app/share/collection/TestGrid_10cm_2.val @@ -0,0 +1,241 @@ + + + + 0.2.4 + cm + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ + diff --git a/src/app/share/collection/blusa.vit b/src/app/share/collection/blusa.vit new file mode 100644 index 000000000..86dcfd75e --- /dev/null +++ b/src/app/share/collection/blusa.vit @@ -0,0 +1,130 @@ + + + + 0.3.3 + false + + cm + 998 + + Info + Juan + 1961-01-01 + male + cicam2000@gmail.com + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/app/share/collection/my_calculated_measurements_for_val.vit b/src/app/share/collection/my_calculated_measurements_for_val.vit new file mode 100644 index 000000000..ed21e1b89 --- /dev/null +++ b/src/app/share/collection/my_calculated_measurements_for_val.vit @@ -0,0 +1,130 @@ + + + + 0.3.3 + false + + cm + 998 + + Final measurements + Preethi + 1900-01-01 + male + username@example.com + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/app/share/collection/patrón_blusa.val b/src/app/share/collection/patrón_blusa.val new file mode 100644 index 000000000..4b55b4bf5 --- /dev/null +++ b/src/app/share/collection/patrón_blusa.val @@ -0,0 +1,237 @@ + + + + 0.2.4 + cm + Juan Carlos Gonzalez + + + blusa.vit + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + +
+ + diff --git a/src/test/ValentinaTest/ValentinaTest.pro b/src/test/ValentinaTest/ValentinaTest.pro index 615cb4f97..5734da493 100644 --- a/src/test/ValentinaTest/ValentinaTest.pro +++ b/src/test/ValentinaTest/ValentinaTest.pro @@ -263,7 +263,16 @@ COLLECTION_FILES += \ $${PWD}/../../app/share/collection/pantsМ1_52-176.val \ $${PWD}/../../app/share/collection/pantsМ2_40-146.val \ $${PWD}/../../app/share/collection/pantsМ7.val \ - $${PWD}/../../app/share/collection/TShirt_test.val + $${PWD}/../../app/share/collection/TShirt_test.val \ + $${PWD}/../../app/share/collection/TestDart.val \ + $${PWD}/../../app/share/collection/patrón_blusa.val \ + $${PWD}/../../app/share/collection/blusa.vit \ + $${PWD}/../../app/share/collection/PajamaTopWrap2.val \ + $${PWD}/../../app/share/collection/Susan.vit \ + $${PWD}/../../app/share/collection/Moulage_0.5_armhole_neckline.val \ + $${PWD}/../../app/share/collection/0.7_Armhole_adjustment_0.10.val + $${PWD}/../../app/share/collection/my_calculated_measurements_for_val.vit + # Compilation will fail without this files after we added them to this section. OTHER_FILES += \ diff --git a/src/test/ValentinaTest/tst_valentinacommandline.cpp b/src/test/ValentinaTest/tst_valentinacommandline.cpp index d3e56c409..8e56f2351 100644 --- a/src/test/ValentinaTest/tst_valentinacommandline.cpp +++ b/src/test/ValentinaTest/tst_valentinacommandline.cpp @@ -254,70 +254,25 @@ void TST_ValentinaCommandLine::TestOpenCollection_data() const QTest::addColumn("exitCode"); const QString tmp = QApplication::applicationDirPath() + QDir::separator() + tmpTestCollectionFolder; + const QString testGOST = QString("--test;;-m;;%1").arg(tmp + QDir::separator() + QLatin1Literal("GOST_man_ru.vst")); + const QString keyTest = QStringLiteral("--test"); - QTest::newRow("bra")<< "bra.val" - << QString("--test") - << true - << V_EX_OK; - - QTest::newRow("jacketМ1_52-176")<< "jacketМ1_52-176.val" - << QString("--test;;-m;;%1").arg(tmp + QDir::separator() + - QLatin1Literal("GOST_man_ru.vst")) - << true - << V_EX_OK; - - QTest::newRow("jacketМ2_40-146")<< "jacketМ2_40-146.val" - << QString("--test;;-m;;%1").arg(tmp + QDir::separator() + - QLatin1Literal("GOST_man_ru.vst")) - << true - << V_EX_OK; - - QTest::newRow("jacketМ3_40-146")<< "jacketМ3_40-146.val" - << QString("--test;;-m;;%1").arg(tmp + QDir::separator() + - QLatin1Literal("GOST_man_ru.vst")) - << true - << V_EX_OK; - - QTest::newRow("jacketМ4_40-146")<< "jacketМ4_40-146.val" - << QString("--test;;-m;;%1").arg(tmp + QDir::separator() + - QLatin1Literal("GOST_man_ru.vst")) - << true - << V_EX_OK; - - QTest::newRow("jacketМ5_30-110")<< "jacketМ5_30-110.val" - << QString("--test;;-m;;%1").arg(tmp + QDir::separator() + - QLatin1Literal("GOST_man_ru.vst")) - << true - << V_EX_OK; - - QTest::newRow("jacketМ6_30-110")<< "jacketМ6_30-110.val" - << QString("--test;;-m;;%1").arg(tmp + QDir::separator() + - QLatin1Literal("GOST_man_ru.vst")) - << true - << V_EX_OK; - - QTest::newRow("pantsМ1_52-176")<< "pantsМ1_52-176.val" - << QString("--test;;-m;;%1").arg(tmp + QDir::separator() + - QLatin1Literal("GOST_man_ru.vst")) - << true - << V_EX_OK; - - QTest::newRow("pantsМ2_40-146")<< "pantsМ2_40-146.val" - << QString("--test;;-m;;%1").arg(tmp + QDir::separator() + - QLatin1Literal("GOST_man_ru.vst")) - << true - << V_EX_OK; - - QTest::newRow("pantsМ7")<< "pantsМ7.val" - << QString("--test;;-m;;%1").arg(tmp + QDir::separator() + - QLatin1Literal("GOST_man_ru.vst")) - << true - << V_EX_OK; - - QTest::newRow("TShirt_test")<< "TShirt_test.val" - << QString("--test") - << true - << V_EX_OK; + QTest::newRow("bra") << "bra.val" << keyTest << true << V_EX_OK; + QTest::newRow("jacketМ1_52-176") << "jacketМ1_52-176.val" << testGOST << true << V_EX_OK; + QTest::newRow("jacketМ2_40-146") << "jacketМ2_40-146.val" << testGOST << true << V_EX_OK; + QTest::newRow("jacketМ3_40-146") << "jacketМ3_40-146.val" << testGOST << true << V_EX_OK; + QTest::newRow("jacketМ4_40-146") << "jacketМ4_40-146.val" << testGOST << true << V_EX_OK; + QTest::newRow("jacketМ5_30-110") << "jacketМ5_30-110.val" << testGOST << true << V_EX_OK; + QTest::newRow("jacketМ6_30-110") << "jacketМ6_30-110.val" << testGOST << true << V_EX_OK; + QTest::newRow("pantsМ1_52-176") << "pantsМ1_52-176.val" << testGOST << true << V_EX_OK; + QTest::newRow("pantsМ2_40-146") << "pantsМ2_40-146.val" << testGOST << true << V_EX_OK; + QTest::newRow("pantsМ7") << "pantsМ7.val" << testGOST << true << V_EX_OK; + QTest::newRow("TShirt_test") << "TShirt_test.val" << keyTest << true << V_EX_OK; + QTest::newRow("TestDart") << "TestDart.val" << keyTest << true << V_EX_OK; + QTest::newRow("patrón_blusa") << "patrón_blusa.val" << keyTest << true << V_EX_OK; + QTest::newRow("PajamaTopWrap2") << "PajamaTopWrap2.val" << keyTest << true << V_EX_OK; + QTest::newRow("Moulage_0.5_armhole_neckline") << "Moulage_0.5_armhole_neckline.val" << keyTest << true << V_EX_OK; + QTest::newRow("0.7_Armhole_adjustment_0.10") << "0.7_Armhole_adjustment_0.10.val" << keyTest << true << V_EX_OK; } //---------------------------------------------------------------------------------------------------------------------