From 1e6c8008084543f827d54d92ba75a4e449263b7a Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sun, 5 Jun 2016 13:55:24 +0300 Subject: [PATCH 1/5] Added link to "Pull request guideline". --HG-- branch : develop --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 000000000..042f82140 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1 @@ +Please, visit page [Hacking:Making pull requests](https://wiki.valentinaproject.org/wiki/Hacking:Making_pull_requests) in Wiki. From 2afed1f99102f71eca4ad30048f22377bee5fc2c Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sun, 5 Jun 2016 13:58:23 +0300 Subject: [PATCH 2/5] Seems like doesn't work without a header. --HG-- branch : develop --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 042f82140..53db97a09 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1 +1,2 @@ +# Making pull requests Please, visit page [Hacking:Making pull requests](https://wiki.valentinaproject.org/wiki/Hacking:Making_pull_requests) in Wiki. From 6f55ab7af2b438c69c0e3ec85d698024204299fd Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sun, 5 Jun 2016 13:59:36 +0300 Subject: [PATCH 3/5] The link should be described directly. --HG-- branch : develop --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 53db97a09..d62e24730 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,2 +1,2 @@ # Making pull requests -Please, visit page [Hacking:Making pull requests](https://wiki.valentinaproject.org/wiki/Hacking:Making_pull_requests) in Wiki. +Please, visit page https://wiki.valentinaproject.org/wiki/Hacking:Making_pull_requests in Wiki. From 6233e760eb3833b33f2de00a698e2df01e35f6e0 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sun, 5 Jun 2016 14:06:04 +0300 Subject: [PATCH 4/5] The bitbucket plugin doesn't support links, so better to make normal guide. --HG-- branch : develop --- CONTRIBUTING.md | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d62e24730..63d99a8c6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,2 +1,30 @@ -# Making pull requests -Please, visit page https://wiki.valentinaproject.org/wiki/Hacking:Making_pull_requests in Wiki. +# Before pull request + +This page describes how to create a pull request. We highly recommend you to read this page before you will decide to send us your changes. + +## Named branches + +First you should know little bit about our workflow. Right now we work with several named branches (https://www.mercurial-scm.org/wiki/NamedBranches). + +* *default* - used only for releases. +* *develop* - branch that contains a code for the next major release. Code in this branch good enough for testing and sharing among developers. +* *feature* - branch that contains a code for unfinished features. +* *release* - used for feature freeze state before the next major release. And for preparing the next minor release. + +These are the main branches you should know about. There are several long term task specific branches in repository too. But we will not discuss them in this document. + +## Check yourself + +There are several things you should know for successful creating a pull request. + +- Please, read carefully official tutorial from Atlassian Making a Pull Request (https://www.atlassian.com/git/tutorials/making-a-pull-request). +- Normally you are not allowed create new named branches. You should use **develop**, **feature** or **release** depend on a purpose. +- Be sure you use correct branch for your changes. **This is the most popular mistake.** +- - For very small/trivial patches (contains only one commit) use the **develop** named branch directly. +- - For regular patches (contains several commits) you should use the branch **feature (recommended way)**. Don't worry if repository already contains one. We can have as many as we need. +- Add correct description for your pull request. It should contain string "Resolved (or Fixed) issue #XXX. ". Where XXX is a number of issue in the Issue Tracker. Read more about Resolving issues automatically when push code (https://confluence.atlassian.com/bitbucket/resolve-issues-automatically-when-users-push-code-221451126.html). +- Don't forget to add your changes to file ChangeLog.txt. +- Merge your **develop/feature** branch with **develop** branch. + +# Reviewing +Most likely we will ask you to fix some issues in a code. In this case you will add your changes to the **feature** branch and update your pull request. No need to create new one each time. From 17bc0c3ff06c3f0d6cdb4ba8a7ec32643210953e Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sun, 5 Jun 2016 16:54:39 +0300 Subject: [PATCH 5/5] New test case. Male shirt. --HG-- branch : develop --- .../share/collection/MaleShirt/MaleShirt.val | 630 ++++++++++++++++++ .../share/collection/MaleShirt/MaleShirt.vit | 27 + src/test/ValentinaTest/ValentinaTest.pro | 4 +- .../tst_valentinacommandline.cpp | 1 + 4 files changed, 661 insertions(+), 1 deletion(-) create mode 100644 src/app/share/collection/MaleShirt/MaleShirt.val create mode 100644 src/app/share/collection/MaleShirt/MaleShirt.vit diff --git a/src/app/share/collection/MaleShirt/MaleShirt.val b/src/app/share/collection/MaleShirt/MaleShirt.val new file mode 100644 index 000000000..cec3bc8f0 --- /dev/null +++ b/src/app/share/collection/MaleShirt/MaleShirt.val @@ -0,0 +1,630 @@ + + + + 0.3.1 + cm + Timo Virtaneva + This a male shirt pattern. + +All the values are increment values in the table of the variables. +Look the values and adjust those for your own needs. + +The design is based on the measuring table. The table must be loaded, but the values in the table of variables can be changed. + +Adjust/verify curves after parameter modifications. + +Delete layouts which are not needed. + + MaleShirt.vit + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ + + diff --git a/src/app/share/collection/MaleShirt/MaleShirt.vit b/src/app/share/collection/MaleShirt/MaleShirt.vit new file mode 100644 index 000000000..c921d86a0 --- /dev/null +++ b/src/app/share/collection/MaleShirt/MaleShirt.vit @@ -0,0 +1,27 @@ + + + + 0.3.3 + false + + cm + 998 + + + + 1800-01-01 + unknown + + + + + + + + + + + + + + diff --git a/src/test/ValentinaTest/ValentinaTest.pro b/src/test/ValentinaTest/ValentinaTest.pro index 5e6434567..e1929619c 100644 --- a/src/test/ValentinaTest/ValentinaTest.pro +++ b/src/test/ValentinaTest/ValentinaTest.pro @@ -305,7 +305,9 @@ COLLECTION_FILES += \ $${PWD}/../../app/share/collection/Razmernye_priznaki_dlya_zhenskogo_zhaketa.vit \ $${PWD}/../../app/share/collection/IMK_Zhaketa_poluprilegayuschego_silueta.val \ $${PWD}/../../app/share/collection/Lara_Jil.vit \ - $${PWD}/../../app/share/collection/modell_2.val + $${PWD}/../../app/share/collection/modell_2.val \ + $${PWD}/../../app/share/collection/MaleShirt/MaleShirt.val \ + $${PWD}/../../app/share/collection/MaleShirt/MaleShirt.vit # Compilation will fail without this files after we added them to this section. diff --git a/src/test/ValentinaTest/tst_valentinacommandline.cpp b/src/test/ValentinaTest/tst_valentinacommandline.cpp index dda92e6e3..d94df0e39 100644 --- a/src/test/ValentinaTest/tst_valentinacommandline.cpp +++ b/src/test/ValentinaTest/tst_valentinacommandline.cpp @@ -273,6 +273,7 @@ void TST_ValentinaCommandLine::TestOpenCollection_data() const #endif QTest::newRow("TShirt_test") << "TShirt_test.val" << keyTest << true << V_EX_OK; QTest::newRow("TestDart") << "TestDart.val" << keyTest << true << V_EX_OK; + QTest::newRow("MaleShirt") << "MaleShirt.val" << keyTest << true << V_EX_OK; #ifndef Q_OS_WIN QTest::newRow("patrón_blusa") << "patrón_blusa.val" << keyTest << true << V_EX_OK; QTest::newRow("PajamaTopWrap2") << "PajamaTopWrap2.val" << keyTest << true << V_EX_OK;