diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/ChangeLog.txt valentina-0.7.49+1260+202107011832~ubuntu21.04.1/ChangeLog.txt --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/ChangeLog.txt 2021-05-14 08:28:11.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/ChangeLog.txt 2021-07-01 18:31:48.000000000 +0000 @@ -1,3 +1,14 @@ +# Valentina 0.7.49 July 1, 2021 +- Fix crash. +- Add tooltip for Export draw feature. + +# Valentina 0.7.48 June 29, 2021 +- [smart-pattern/valentina#129] Incorrect behavior of empty arc and elliptical arc. +- Parsing formulas with not canonical math symbols. +- [smart-pattern/valentina#133] Incorrect seam allowance. +- Fix regression. Fix correct handle export format for exporting details in the Detail mode. +- [smart-pattern/valentina#83] Export the Draw mode. + # Version 0.7.47 May 13, 2021 - [smart-pattern/valentina#118] Incorrect seam allowance. - [smart-pattern/valentina#119] Improve tool Point of intersection curves. diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/common.pri valentina-0.7.49+1260+202107011832~ubuntu21.04.1/common.pri --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/common.pri 2021-05-14 08:28:11.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/common.pri 2021-07-01 18:31:48.000000000 +0000 @@ -923,5 +923,7 @@ -wd4774 \ # format string expected in argument 3 is not a string literal -wd5204 \ # class has virtual functions, but its trivial destructor is not virtual; instances of objects derived # from this class may not be destructed correctly - -wd5219 # implicit conversion from '' to '', possible loss of data + -wd5219 \ # implicit conversion from '' to '', possible loss of data + -wd5243 # 'type-name': using incomplete class 'class-name' can cause potential one definition rule violation due + # to ABI limitation } diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/debian/changelog valentina-0.7.49+1260+202107011832~ubuntu21.04.1/debian/changelog --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/debian/changelog 2021-05-14 08:29:00.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/debian/changelog 2021-07-01 18:32:42.000000000 +0000 @@ -1,11 +1,11 @@ -valentina (0.7.47+1227+202105140829~ubuntu21.04.1) hirsute; urgency=low +valentina (0.7.49+1260+202107011832~ubuntu21.04.1) hirsute; urgency=low * Auto build. - -- Roman Fri, 14 May 2021 08:29:00 +0000 + -- Roman Thu, 01 Jul 2021 18:32:42 +0000 -valentina (0.7.47) trusty; urgency=low +valentina (0.7.49) trusty; urgency=low * Auto build. - -- dismine Fri, 13 May 2021 14:17:00 +0300 + -- dismine Tue, 1 July 2021 17:08:00 +0300 diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/debian/control valentina-0.7.49+1260+202107011832~ubuntu21.04.1/debian/control --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/debian/control 2021-05-14 08:28:59.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/debian/control 2021-07-01 18:32:42.000000000 +0000 @@ -10,7 +10,7 @@ libqt5xmlpatterns5-dev (>= 5.4.0), libqt5opengl5-dev (>= 5.4.0) Standards-Version: 3.9.5 -Homepage: https://valentinaproject.bitbucket.io/ +Homepage: https://smart-pattern.com.ua/ Vcs-Browser: https://gitlab.com/smart-pattern/valentina Package: valentina diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/debian/git-build-recipe.manifest valentina-0.7.49+1260+202107011832~ubuntu21.04.1/debian/git-build-recipe.manifest --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/debian/git-build-recipe.manifest 2021-05-14 08:29:00.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/debian/git-build-recipe.manifest 2021-07-01 18:32:42.000000000 +0000 @@ -1,3 +1,3 @@ -# git-build-recipe format 0.4 deb-version {debupstream}+1227+202105140829 -lp:valentina git-commit:622b58c0107ce6d36dbaa2bc612bd9ca77820dd3 -merge develop lp:~dismine/valentina/+git/debian_test git-commit:8e2625c48d4977b4382ee6acc1fd41f3b8a99663 +# git-build-recipe format 0.4 deb-version {debupstream}+1260+202107011832 +lp:valentina git-commit:5b7e98bf48a86e3c444423a9f03533440a39aad9 +merge develop lp:~dismine/valentina/+git/debian_test git-commit:06c6005462d110566eb182f7eacfa4367311d329 diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/dist/debian/changelog valentina-0.7.49+1260+202107011832~ubuntu21.04.1/dist/debian/changelog --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/dist/debian/changelog 2021-05-14 08:28:11.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/dist/debian/changelog 2021-07-01 18:31:48.000000000 +0000 @@ -1,5 +1,5 @@ -valentina (0.7.47) trusty; urgency=low +valentina (0.7.49) trusty; urgency=low * Auto build. - -- dismine Fri, 13 May 2021 14:17:00 +0300 + -- dismine Tue, 1 July 2021 17:08:00 +0300 diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/dist/debian/control valentina-0.7.49+1260+202107011832~ubuntu21.04.1/dist/debian/control --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/dist/debian/control 2021-05-14 08:28:11.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/dist/debian/control 2021-07-01 18:31:48.000000000 +0000 @@ -10,7 +10,7 @@ libqt5xmlpatterns5-dev (>= 5.4.0), libqt5opengl5-dev (>= 5.4.0) Standards-Version: 3.9.5 -Homepage: https://valentinaproject.bitbucket.io/ +Homepage: https://smart-pattern.com.ua/ Vcs-Browser: https://gitlab.com/smart-pattern/valentina Package: valentina diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/dist/ebuild/valentina-0.0.0_alpha(template_unstable).ebuild valentina-0.7.49+1260+202107011832~ubuntu21.04.1/dist/ebuild/valentina-0.0.0_alpha(template_unstable).ebuild --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/dist/ebuild/valentina-0.0.0_alpha(template_unstable).ebuild 2021-05-14 08:28:11.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/dist/ebuild/valentina-0.0.0_alpha(template_unstable).ebuild 2021-07-01 18:31:48.000000000 +0000 @@ -7,7 +7,7 @@ inherit mercurial qmake-utils gnome2-utils fdo-mime DESCRIPTION="Cloth patternmaking software" -HOMEPAGE="https://valentinaproject.bitbucket.io/" +HOMEPAGE="https://smart-pattern.com.ua/" SRC_URI="" EHG_REPO_URI="https://bitbucket.org/dismine/valentina" EHG_REVISION="develop" diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/dist/ebuild/valentina-0.0.0(template_stable).ebuild valentina-0.7.49+1260+202107011832~ubuntu21.04.1/dist/ebuild/valentina-0.0.0(template_stable).ebuild --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/dist/ebuild/valentina-0.0.0(template_stable).ebuild 2021-05-14 08:28:11.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/dist/ebuild/valentina-0.0.0(template_stable).ebuild 2021-07-01 18:31:48.000000000 +0000 @@ -7,7 +7,7 @@ inherit qmake-utils gnome2-utils fdo-mime DESCRIPTION="Cloth patternmaking software" -HOMEPAGE="https://valentinaproject.bitbucket.io/" +HOMEPAGE="https://smart-pattern.com.ua/" SRC_URI="https://bitbucket.org/dismine/valentina/get/v0.0.0.zip -> ${P}.zip" LICENSE="GPL-3" diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/dist/macx/tape/Info.plist valentina-0.7.49+1260+202107011832~ubuntu21.04.1/dist/macx/tape/Info.plist --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/dist/macx/tape/Info.plist 2021-05-14 08:28:11.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/dist/macx/tape/Info.plist 2021-07-01 18:31:48.000000000 +0000 @@ -19,9 +19,9 @@ CFBundleIdentifier io.bitbucket.valentinaproject.@EXECUTABLE@ CFBundleShortVersionString - 0.7.47 + 0.7.49 CFBundleVersion - 0.7.47.0 + 0.7.49.0 CFBundleInfoDictionaryVersion 6.0 CFBundleDocumentTypes diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/dist/macx/valentina/Info.plist valentina-0.7.49+1260+202107011832~ubuntu21.04.1/dist/macx/valentina/Info.plist --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/dist/macx/valentina/Info.plist 2021-05-14 08:28:11.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/dist/macx/valentina/Info.plist 2021-07-01 18:31:48.000000000 +0000 @@ -19,9 +19,9 @@ CFBundleIdentifier io.bitbucket.valentinaproject.@EXECUTABLE@ CFBundleShortVersionString - 0.7.47 + 0.7.49 CFBundleVersion - 0.7.47.0 + 0.7.49.0 CFBundleInfoDictionaryVersion 6.0 CFBundleDocumentTypes diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/dist/OBS_debian/debian.changelog valentina-0.7.49+1260+202107011832~ubuntu21.04.1/dist/OBS_debian/debian.changelog --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/dist/OBS_debian/debian.changelog 2021-05-14 08:28:11.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/dist/OBS_debian/debian.changelog 2021-07-01 18:31:48.000000000 +0000 @@ -1,5 +1,5 @@ -valentina (0.7.47) trusty; urgency=low +valentina (0.7.49) trusty; urgency=low * Auto build. - -- dismine Fri, 13 May 2021 14:17:00 +0300 + -- dismine Tue, 1 July 2021 17:08:00 +0300 diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/dist/OBS_debian/debian.control valentina-0.7.49+1260+202107011832~ubuntu21.04.1/dist/OBS_debian/debian.control --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/dist/OBS_debian/debian.control 2021-05-14 08:28:11.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/dist/OBS_debian/debian.control 2021-07-01 18:31:48.000000000 +0000 @@ -10,7 +10,7 @@ libqt5xmlpatterns5-dev (>= 5.4.0), libqt5opengl5-dev (>= 5.4.0) Standards-Version: 3.9.5 -Homepage: https://valentinaproject.bitbucket.io/ +Homepage: https://smart-pattern.com.ua/ Vcs-Browser: https://gitlab.com/smart-pattern/valentina Package: valentina diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/dist/OBS_debian/valentina.dsc valentina-0.7.49+1260+202107011832~ubuntu21.04.1/dist/OBS_debian/valentina.dsc --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/dist/OBS_debian/valentina.dsc 2021-05-14 08:28:11.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/dist/OBS_debian/valentina.dsc 2021-07-01 18:31:48.000000000 +0000 @@ -2,9 +2,9 @@ Source: valentina Binary: valentina Architecture: i386 amd64 -Version: 0.7.47 +Version: 0.7.49 Maintainer: Roman Telezhynskyi -Homepage: https://valentinaproject.bitbucket.io +Homepage: https://smart-pattern.com.ua Standards-Version: 3.9.5 Vcs-Browser: https://gitlab.com/smart-pattern/valentina Build-Depends: debhelper (>= 8.0.0), @@ -14,11 +14,9 @@ qttools5-dev-tools (>= 5.4.0), libqt5xmlpatterns5-dev (>= 5.4.0), libqt5opengl5-dev (>= 5.4.0) +Debtransform-Tar: valentina-0.7.49.v0.7.49.tar.gz Package-List: valentina deb graphics optional -Checksums-Sha1: - 581eb1bf36b4ab7126b5983d809130f15396859e 24838101 valentina_0.7.47.tar -Checksums-Sha256: - 9b156c7120a69b90373efb8ca9998c3e0563a60ad337210166cfd41b00b0f13c 24838101 valentina_0.7.47.tar Files: - 95677e29d3a59cf5b064f7be236a4b78 24838101 valentina_0.7.47.tar + 00000000000000000000000000000000 0 valentina-0.7.49.v0.7.49.tar.gz + diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/dist/rpm/_service valentina-0.7.49+1260+202107011832~ubuntu21.04.1/dist/rpm/_service --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/dist/rpm/_service 2021-05-14 08:28:11.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/dist/rpm/_service 2021-07-01 18:31:48.000000000 +0000 @@ -1,11 +1,11 @@ git://github.com/dismine/Valentina_git.git - 0.7.47 + 0.7.49 valentina git .git - %at + @PARENT_TAG@ master diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/dist/rpm/valentina.spec valentina-0.7.49+1260+202107011832~ubuntu21.04.1/dist/rpm/valentina.spec --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/dist/rpm/valentina.spec 2021-05-14 08:28:11.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/dist/rpm/valentina.spec 2021-07-01 18:31:48.000000000 +0000 @@ -95,7 +95,7 @@ Requires: poppler-utils %endif -Version: 0.7.47 +Version: 0.7.49 Release: 0 URL: https://gitlab.com/smart-pattern/valentina License: GPL-3.0+ diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/dist/SlackBuild/valentina/slack-desc valentina-0.7.49+1260+202107011832~ubuntu21.04.1/dist/SlackBuild/valentina/slack-desc --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/dist/SlackBuild/valentina/slack-desc 2021-05-14 08:28:11.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/dist/SlackBuild/valentina/slack-desc 2021-07-01 18:31:48.000000000 +0000 @@ -14,7 +14,7 @@ valentina: individual’s set of measurements. It blends new technologies with valentina: traditional methods to create a unique pattern making tool. valentina: -valentina: Homepage: https://valentinaproject.bitbucket.io/ +valentina: Homepage: https://smart-pattern.com.ua/ valentina: valentina: valentina: diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/dist/SlackBuild/valentina/valentina.info valentina-0.7.49+1260+202107011832~ubuntu21.04.1/dist/SlackBuild/valentina/valentina.info --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/dist/SlackBuild/valentina/valentina.info 2021-05-14 08:28:11.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/dist/SlackBuild/valentina/valentina.info 2021-07-01 18:31:48.000000000 +0000 @@ -1,6 +1,6 @@ PRGNAM="valentina" VERSION="0.5.0" -HOMEPAGE="https://valentinaproject.bitbucket.io" +HOMEPAGE="https://smart-pattern.com.ua" DOWNLOAD="https://bitbucket.org/dismine/valentina/get/v0.5.0.tar.gz" MD5SUM="f23019c92e3209dbfa7699a1c13bb98b" DOWNLOAD_x86_64="" diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/dist/valentina.dsc valentina-0.7.49+1260+202107011832~ubuntu21.04.1/dist/valentina.dsc --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/dist/valentina.dsc 2021-05-14 08:28:11.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/dist/valentina.dsc 2021-07-01 18:31:48.000000000 +0000 @@ -2,9 +2,9 @@ Source: valentina Binary: valentina Architecture: i386 amd64 -Version: 0.7.47 +Version: 0.7.49 Maintainer: Roman Telezhynskyi -Homepage: https://valentinaproject.bitbucket.io +Homepage: https://smart-pattern.com.ua Standards-Version: 3.9.5 Vcs-Browser: https://gitlab.com/smart-pattern/valentina Build-Depends: debhelper (>= 8.0.0), @@ -14,11 +14,9 @@ qttools5-dev-tools (>= 5.4.0), libqt5xmlpatterns5-dev (>= 5.4.0), libqt5opengl5-dev (>= 5.4.0) +Debtransform-Tar: valentina-0.7.49.v0.7.49.tar.gz Package-List: valentina deb graphics optional -Checksums-Sha1: - 581eb1bf36b4ab7126b5983d809130f15396859e 24838101 valentina_0.7.47.tar -Checksums-Sha256: - 9b156c7120a69b90373efb8ca9998c3e0563a60ad337210166cfd41b00b0f13c 24838101 valentina_0.7.47.tar Files: - 95677e29d3a59cf5b064f7be236a4b78 24838101 valentina_0.7.47.tar + 00000000000000000000000000000000 0 valentina-0.7.49.v0.7.49.tar.gz + diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/dist/win/inno/valentina.iss valentina-0.7.49+1260+202107011832~ubuntu21.04.1/dist/win/inno/valentina.iss --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/dist/win/inno/valentina.iss 2021-05-14 08:28:11.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/dist/win/inno/valentina.iss 2021-07-01 18:31:48.000000000 +0000 @@ -4,9 +4,9 @@ #define MyAppName "Valentina" #define MyAppVersion GetFileVersion('valentina\valentina.exe') #define MyAppPublisher "Roman Telezhynskyi" -#define MyAppURL "https://valentinaproject.bitbucket.io/" +#define MyAppURL "https://smart-pattern.com.ua/" #define MyAppExeName "valentina.exe" -#define MyAppCopyright "(C) 2013-2020 Valentina project" +#define MyAppCopyright "(C) 2013-2021 Valentina project" #define MyDateTimeString GetDateTimeString('yyyymmddhhnnss', '', ''); ; Appstatus: "" = release, "b" = beta, "a" = alpha ; this only modifies the resulting exe name of the installer package ;-) diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/README.txt valentina-0.7.49+1260+202107011832~ubuntu21.04.1/README.txt --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/README.txt 2021-05-14 08:28:11.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/README.txt 2021-07-01 18:31:48.000000000 +0000 @@ -1,10 +1,9 @@ Pattern making program Author Roman Telezhynskyi -Copyright (C) 2013-2019 Valentina project -Valentina Web page: https://valentinaproject.bitbucket.io/ +Copyright (C) 2013-2021 Valentina project +Valentina Web page: https://smart-pattern.com.ua/ Wiki: https://wiki.valentinaproject.org -Valentina main repository: https://bitbucket.org/dismine/valentina/overview -Forum http://valentinaproject.forumotion.me/ +Valentina main repository: https://gitlab.com/smart-pattern/valentina PPA for Ubuntu (develop): https://launchpad.net/~dismine/+archive/valentina-dev Help translate https://www.transifex.com/organization/valentina diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/share/translations/valentina_cs_CZ.ts valentina-0.7.49+1260+202107011832~ubuntu21.04.1/share/translations/valentina_cs_CZ.ts --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/share/translations/valentina_cs_CZ.ts 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/share/translations/valentina_cs_CZ.ts 2021-07-01 18:31:52.000000000 +0000 @@ -9381,6 +9381,22 @@ Could not create recipe file. %1 + + Shop + + + + Scalable Vector Graphics files + + + + Save draw + + + + Draw export + + MainWindowsNoGUI @@ -10800,7 +10816,7 @@ TMainWindow <html><head/><body>Select New for creation measurement file.</body></html> - <html><head/><body>Vybrat nový pro vytvoření nového souboru s rozměry.</body></html> + <html><head/><body>Vybrat nový pro vytvoření nového souboru s rozměry.</body></html> Name @@ -11693,6 +11709,10 @@ Restrict first dimension + + <html><head/><body>Select New to create a measurement file.</body></html> + + TabGrainline @@ -14574,15 +14594,15 @@ Length - Délka + Délka Angle - Úhel + Úhel Label - Popis + Popis Segment 1 @@ -15469,7 +15489,7 @@ Label - Popis + Popis Curve 1 segment 1 diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/share/translations/valentina_de_DE.ts valentina-0.7.49+1260+202107011832~ubuntu21.04.1/share/translations/valentina_de_DE.ts --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/share/translations/valentina_de_DE.ts 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/share/translations/valentina_de_DE.ts 2021-07-01 18:31:52.000000000 +0000 @@ -9378,6 +9378,22 @@ Could not create recipe file. %1 + + Shop + + + + Scalable Vector Graphics files + + + + Save draw + + + + Draw export + + MainWindowsNoGUI @@ -10797,7 +10813,7 @@ TMainWindow <html><head/><body>Select New for creation measurement file.</body></html> - <html><head/><body>Neu auswählen, um eine neue Maßdatei zu erstellen.</body></html> + <html><head/><body>Neu auswählen, um eine neue Maßdatei zu erstellen.</body></html> Name @@ -11689,6 +11705,10 @@ Restrict first dimension + + <html><head/><body>Select New to create a measurement file.</body></html> + + TabGrainline @@ -14564,15 +14584,15 @@ Length - Länge + Länge Angle - Winkel + Winkel Label - Bezeichnung + Bezeichnung Segment 1 @@ -15427,7 +15447,7 @@ Label - Bezeichnung + Bezeichnung Curve 1 segment 1 diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/share/translations/valentina_el_GR.ts valentina-0.7.49+1260+202107011832~ubuntu21.04.1/share/translations/valentina_el_GR.ts --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/share/translations/valentina_el_GR.ts 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/share/translations/valentina_el_GR.ts 2021-07-01 18:31:52.000000000 +0000 @@ -9230,6 +9230,22 @@ Could not create recipe file. %1 + + Shop + + + + Scalable Vector Graphics files + + + + Save draw + + + + Draw export + + MainWindowsNoGUI @@ -10543,7 +10559,7 @@ TMainWindow <html><head/><body>Select New for creation measurement file.</body></html> - <html><head/><body>Επιλέξτε Νέο για τη δημιουργία αρχείου μετρήσεων.</body></html> + <html><head/><body>Επιλέξτε Νέο για τη δημιουργία αρχείου μετρήσεων.</body></html> Name @@ -11408,6 +11424,10 @@ Restrict first dimension + + <html><head/><body>Select New to create a measurement file.</body></html> + + TabGrainline @@ -14077,11 +14097,11 @@ Length - Μήκος + Μήκος Angle - Γωνία + Γωνία Label diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/share/translations/valentina_en_CA.ts valentina-0.7.49+1260+202107011832~ubuntu21.04.1/share/translations/valentina_en_CA.ts --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/share/translations/valentina_en_CA.ts 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/share/translations/valentina_en_CA.ts 2021-07-01 18:31:52.000000000 +0000 @@ -9377,6 +9377,22 @@ Could not create recipe file. %1 + + Shop + + + + Scalable Vector Graphics files + + + + Save draw + + + + Draw export + + MainWindowsNoGUI @@ -10795,7 +10811,7 @@ TMainWindow <html><head/><body>Select New for creation measurement file.</body></html> - <html><head/><body>Select New for creation measurement file.</body></html> + <html><head/><body>Select New for creation measurement file.</body></html> Name @@ -11688,6 +11704,10 @@ Restrict first dimension + + <html><head/><body>Select New to create a measurement file.</body></html> + + TabGrainline @@ -14565,11 +14585,11 @@ Length - Length + Length Angle - Angle + Angle Label diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/share/translations/valentina_en_IN.ts valentina-0.7.49+1260+202107011832~ubuntu21.04.1/share/translations/valentina_en_IN.ts --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/share/translations/valentina_en_IN.ts 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/share/translations/valentina_en_IN.ts 2021-07-01 18:31:52.000000000 +0000 @@ -9377,6 +9377,22 @@ Could not create recipe file. %1 + + Shop + + + + Scalable Vector Graphics files + + + + Save draw + + + + Draw export + + MainWindowsNoGUI @@ -10795,7 +10811,7 @@ TMainWindow <html><head/><body>Select New for creation measurement file.</body></html> - <html><head/><body>Select New for creation measurement file.</body></html> + <html><head/><body>Select New for creation measurement file.</body></html> Name @@ -11688,6 +11704,10 @@ Restrict first dimension + + <html><head/><body>Select New to create a measurement file.</body></html> + + TabGrainline @@ -14565,11 +14585,11 @@ Length - Length + Length Angle - Angle + Angle Label diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/share/translations/valentina_en_US.ts valentina-0.7.49+1260+202107011832~ubuntu21.04.1/share/translations/valentina_en_US.ts --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/share/translations/valentina_en_US.ts 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/share/translations/valentina_en_US.ts 2021-07-01 18:31:52.000000000 +0000 @@ -9377,6 +9377,22 @@ Could not create recipe file. %1 + + Shop + + + + Scalable Vector Graphics files + + + + Save draw + + + + Draw export + + MainWindowsNoGUI @@ -10795,7 +10811,7 @@ TMainWindow <html><head/><body>Select New for creation measurement file.</body></html> - <html><head/><body>Select New for creation measurement file.</body></html> + <html><head/><body>Select New for creation measurement file.</body></html> Name @@ -11688,6 +11704,10 @@ Restrict first dimension + + <html><head/><body>Select New to create a measurement file.</body></html> + + TabGrainline @@ -14565,11 +14585,11 @@ Length - Length + Length Angle - Angle + Angle Label diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/share/translations/valentina_es_ES.ts valentina-0.7.49+1260+202107011832~ubuntu21.04.1/share/translations/valentina_es_ES.ts --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/share/translations/valentina_es_ES.ts 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/share/translations/valentina_es_ES.ts 2021-07-01 18:31:52.000000000 +0000 @@ -9379,6 +9379,22 @@ Could not create recipe file. %1 + + Shop + + + + Scalable Vector Graphics files + + + + Save draw + + + + Draw export + + MainWindowsNoGUI @@ -10798,7 +10814,7 @@ TMainWindow <html><head/><body>Select New for creation measurement file.</body></html> - <html><head/><body>Seleccione Nuevo para crear un archivo de medidas.</body></html> + <html><head/><body>Seleccione Nuevo para crear un archivo de medidas.</body></html> Name @@ -11691,6 +11707,10 @@ Restrict first dimension + + <html><head/><body>Select New to create a measurement file.</body></html> + + TabGrainline @@ -14572,15 +14592,15 @@ Length - Longitud + Longitud Angle - + Angulo Label - Etiqueta + Etiqueta Segment 1 @@ -15467,7 +15487,7 @@ Label - Etiqueta + Etiqueta Curve 1 segment 1 diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/share/translations/valentina_fi_FI.ts valentina-0.7.49+1260+202107011832~ubuntu21.04.1/share/translations/valentina_fi_FI.ts --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/share/translations/valentina_fi_FI.ts 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/share/translations/valentina_fi_FI.ts 2021-07-01 18:31:52.000000000 +0000 @@ -8385,6 +8385,22 @@ Could not create recipe file. %1 + + Shop + + + + Scalable Vector Graphics files + + + + Save draw + + + + Draw export + + MainWindowsNoGUI @@ -9603,10 +9619,6 @@ TMainWindow - <html><head/><body>Select New for creation measurement file.</body></html> - - - Name Nimi @@ -10352,6 +10364,10 @@ Restrict first dimension + + <html><head/><body>Select New to create a measurement file.</body></html> + + TabGrainline @@ -13003,11 +13019,11 @@ Length - Pituus + Pituus Angle - Kulma + Kulma Label diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/share/translations/valentina_fr_FR.ts valentina-0.7.49+1260+202107011832~ubuntu21.04.1/share/translations/valentina_fr_FR.ts --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/share/translations/valentina_fr_FR.ts 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/share/translations/valentina_fr_FR.ts 2021-07-01 18:31:52.000000000 +0000 @@ -715,7 +715,7 @@ Alias: - + Alias : @@ -842,7 +842,7 @@ Alias: - + Alias : @@ -1044,7 +1044,7 @@ Alias: - + Alias : @@ -1103,7 +1103,7 @@ Alias: - + Alias : @@ -1214,11 +1214,11 @@ Alias1: - + Alias1 : Alias2: - + Alias2 : @@ -1305,11 +1305,11 @@ Alias1: - + Alias1 : Alias2: - + Alias2 : @@ -1396,11 +1396,11 @@ Alias1: - + Alias1 : Alias2: - + Alias2 : @@ -1487,11 +1487,11 @@ Alias1: - + Alias1 : Alias2: - + Alias2 : @@ -1792,7 +1792,7 @@ DialogDimensionLabels Dimension labels - + Etiquettes de dimensions Value @@ -2103,7 +2103,7 @@ Hip dimension - + Hanche Waist @@ -2133,22 +2133,22 @@ Height label dimension - + Etiquette de hauteur Size label dimension - + Etiquette de taille Hip label dimension - + Etiquette de hanche Waist label dimension - + Etiquette de taille @@ -2287,7 +2287,7 @@ Lengths to control points - + Longueur aux points de contrôle Filter list by keyword @@ -2390,7 +2390,7 @@ Alias: - + Alias : @@ -2604,7 +2604,7 @@ <html><head/><body>Show full calculation in message box</body></html> - + <html><head/><body>Montrer le calcul complet dans une boite de dialogue </body></html> Formula wizard @@ -2715,7 +2715,7 @@ Tags: - + Marqueurs: Separate each tag with comma. @@ -2735,7 +2735,7 @@ Alias: - + Alias : Pen style: @@ -2751,7 +2751,7 @@ Invalid suffix - + Suffixe invalide Invalid group name @@ -2759,7 +2759,7 @@ Label: - + Etiquette : Default @@ -2771,7 +2771,7 @@ Invalid label - + Etiquette invalide Invalid alias @@ -2834,7 +2834,7 @@ Tags: - + Marqueurs: Separate each tag with comma. @@ -2854,7 +2854,7 @@ Alias: - + Alias : Pen style: @@ -2870,7 +2870,7 @@ Invalid suffix - + Suffixe invalide Invalid group name @@ -2878,7 +2878,7 @@ Label: - + Etiquette : Default @@ -2898,7 +2898,7 @@ Invalid label - + Etiquette invalide Invalid alias @@ -2929,7 +2929,7 @@ Tags: - + Marqueurs: Separate each tag with comma. @@ -3203,7 +3203,7 @@ Move objects. Suffix '%1' - + Déplacer des objets. Suffixe '%1' @@ -3366,7 +3366,7 @@ Curves control point lengths - + Longueurs des points de contrôle de courbes Invalid result. Value is infinite or NaN. Please, check your calculations. @@ -3386,7 +3386,7 @@ Unique variable name - + Nom unique de variable <html><head/><body>Search increments by term. Prepend "/r/" to the front of the search string to search increments by regex.</body></html> @@ -3425,14 +3425,14 @@ Number: - + Nombre : DialogKnownMaterials Known materials - + Matériaux connus Material: @@ -3471,26 +3471,26 @@ Nesting. Please, wait. - + Mise en page, merci de patienter. Time left: - + Temps restant : Time left: %1 - + Temps restant : %1 Efficiency coefficient: %1% - + Coefficient d’efficacité: %1% DialogLayoutScale Layout scale - + Echelle de sortie Margins @@ -3518,15 +3518,15 @@ Scale - + Echelle Horizontal: - + horizontal : Vertical: - + vertical : @@ -3761,11 +3761,11 @@ Text will be converted to paths - + Le texte sera converti en tracés Export text as paths - + Exporter le texte en tracés Margins @@ -3773,17 +3773,19 @@ Ignore margins - + Ignorer les marges Margins go beyond printing. Apply settings anyway? - + Les marges s’étendent au-delà de la zone d’impression.. + +Appliquer quand même les réglages ? Follow grainline - + Suivre le droit-fil Time: @@ -3791,11 +3793,11 @@ Time given for the algorithm to find best layout. - + Temps estimé pour que l’algorithme trouve la meilleure mise en page. Efficiency: - + Efficacité : Set layout efficiency coefficient. Layout efficiency coefficientt is the ratio of the area occupied by the pieces to the bounding rect of all pieces. If nesting reaches required level the process stops. If value is 0 no check will be made. @@ -3803,32 +3805,32 @@ Manual priority - + Priorité manuelle Nest quantity of copies according to piece settings. - + Regrouper le nombre de copies selon les paramètres de la pièce. Nest quantity - + Quantité à regrouper Auto crop unused width - + Rogner automatiquement la largeur non utilisée Prefer one sheet solution - + Préférer la solution à une feuille min minutes - + min Enable this option to prefer getting one sheet solutions. - + Activer cette option pour obtenir des solutions à une feuille. @@ -4252,7 +4254,7 @@ Skip - + Passer Shift (%1)*: @@ -4385,7 +4387,7 @@ Tags: - + Marqueurs: Separate each tag with comma. @@ -4405,7 +4407,7 @@ Alias: - + Alias : Pen style: @@ -4421,7 +4423,7 @@ Invalid suffix - + suffixe invalide Invalid group name @@ -4429,7 +4431,7 @@ Label: - + Etiquette : Default @@ -4441,7 +4443,7 @@ Invalid rotation angle formula - + Formule d’angle de rotation invalide Invalid length formula @@ -4449,7 +4451,7 @@ Invalid label - + Etiquette invalide Invalid alias @@ -4860,7 +4862,7 @@ For technical notes - + Pour les notes techniques Label language: @@ -5178,7 +5180,7 @@ Bisector - + Bissectrice Passmark @@ -5218,7 +5220,7 @@ Cut on fabric - + Couper le tissu Select if need designate the corner point as a passmark. Show only left passmark. @@ -5262,11 +5264,11 @@ Intersection 2 (only left) - + Intersection 2 (gauche seulement) Intersection 2 (only right) - + Intersection 2 (droite seulement) Check uniqueness @@ -5408,7 +5410,7 @@ <html><head/><body>Show full calculation in message box</body></html> - + <html><head/><body>Montrer le calcul complet dans une boite de dialogue </body></html> Height: @@ -5424,7 +5426,7 @@ Point: - Point : + Point : Piece: @@ -5432,11 +5434,11 @@ Type: - + Type : Edit rectangle width - + Modifier la largeur du rectangle Edit angle @@ -5452,11 +5454,11 @@ Cross - + Croix T-shaped - + En forme de T Doubletree @@ -5472,7 +5474,7 @@ H-shaped - + En forme de H Button @@ -6061,11 +6063,11 @@ Alias1: - + Alias1: Alias2: - + Alias2 : Curve 2 @@ -6197,7 +6199,7 @@ Tags: - + Marqueurs: Separate each tag with comma. @@ -6233,7 +6235,7 @@ Invalid suffix - + suffixe invalide Invalid group name @@ -6245,7 +6247,7 @@ Invalid label - + Etiquette invalide Invalid alias @@ -6257,11 +6259,11 @@ Label: - + Etiquette : Alias: - + Alias : Default @@ -6324,11 +6326,11 @@ Binary form - + Forme binaire Text as paths - + Texte en tracés Margins @@ -6344,11 +6346,11 @@ Top: - Haut: + Haut : Bottom: - Bas: + Bas : Paper format @@ -6360,7 +6362,7 @@ cm - + cm Templates: @@ -6368,7 +6370,7 @@ Orientation: - + Orientation : Options @@ -6376,15 +6378,15 @@ Scale - + Echelle Horizontal: - + horizontal : Vertical: - + vertical : @@ -6642,11 +6644,11 @@ Cross - + Croix T-shaped - + En forme de T Doubletree @@ -6662,7 +6664,7 @@ H-shaped - + En forme de H Button @@ -6801,7 +6803,7 @@ Hip dimension - + Hanche @@ -7110,7 +7112,7 @@ Alias: - + Alias : @@ -7269,7 +7271,7 @@ Alias: - + Alias : @@ -9374,6 +9376,22 @@ Could not create recipe file. %1 + + Shop + + + + Scalable Vector Graphics files + + + + Save draw + + + + Draw export + + MainWindowsNoGUI @@ -10784,7 +10802,7 @@ TMainWindow <html><head/><body>Select New for creation measurement file.</body></html> - <html><head/><body>Sélectionnez Nouveau pour créer un fichier de mesures.</body></html> + <html><head/><body>Sélectionnez Nouveau pour créer un fichier de mesures.</body></html> Name @@ -11581,7 +11599,7 @@ Dimension labels - + Etiquettes de dimensions The table doesn't provide dimensions @@ -11677,6 +11695,10 @@ Restrict first dimension + + <html><head/><body>Select New to create a measurement file.</body></html> + + TabGrainline @@ -11702,7 +11724,7 @@ <html><head/><body>Show full calculation in message box</body></html> - + <html><head/><body>Montrer le calcul complet dans une boite de dialogue </body></html> Length: @@ -11765,7 +11787,7 @@ <html><head/><body>Show full calculation in message box</body></html> - + <html><head/><body>Montrer le calcul complet dans une boite de dialogue </body></html> Height: @@ -11821,7 +11843,7 @@ Orientation: - + Orientation : Rotation: @@ -11948,7 +11970,7 @@ Bisector - + Bissectrice Marks @@ -11992,11 +12014,11 @@ Intersection 2 (only left) - + Intersection 2 (gauche seulement) Intersection 2 (only right) - + Intersection 2 (droite seulement) Acute angle that looks outside of piece @@ -12091,7 +12113,7 @@ <html><head/><body>Show full calculation in message box</body></html> - + <html><head/><body>Montrer le calcul complet dans une boite de dialogue </body></html> Nodes @@ -12518,7 +12540,7 @@ Hip dimension - + Hanche Chest full circumference @@ -13840,7 +13862,7 @@ Hip - + Hanche Waist @@ -13919,7 +13941,7 @@ Bisector - + Bissectrice Intersection @@ -13939,11 +13961,11 @@ Intersection 2 (only left) - + Intersection 2 (gauche seulement) Intersection 2 (only right) - + Intersection 2 (droite seulement) Passmark mark @@ -14544,15 +14566,15 @@ Length - Longueur + Longueur Angle - Angle + Angle Label - Étiquette + Étiquette Segment 1 @@ -15357,15 +15379,15 @@ Alias: - + Alias : Alias1: - + Alias1: Alias2: - + Alias2 : Point of intersection circle and segment @@ -15427,7 +15449,7 @@ Label - Étiquette + Étiquette Curve 1 segment 1 @@ -17135,7 +17157,7 @@ Tags: - + Marqueurs: Separate each tag with comma. diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/share/translations/valentina_he_IL.ts valentina-0.7.49+1260+202107011832~ubuntu21.04.1/share/translations/valentina_he_IL.ts --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/share/translations/valentina_he_IL.ts 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/share/translations/valentina_he_IL.ts 2021-07-01 18:31:52.000000000 +0000 @@ -7410,6 +7410,26 @@ Could not create recipe file. %1 + + ... + ... + + + Shop + + + + Scalable Vector Graphics files + + + + Save draw + + + + Draw export + + MainWindowsNoGUI @@ -8542,10 +8562,6 @@ TMainWindow - <html><head/><body>Select New for creation measurement file.</body></html> - - - Calculated value @@ -9239,6 +9255,10 @@ Restrict first dimension + + <html><head/><body>Select New to create a measurement file.</body></html> + + TabGrainline diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/share/translations/valentina_id_ID.ts valentina-0.7.49+1260+202107011832~ubuntu21.04.1/share/translations/valentina_id_ID.ts --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/share/translations/valentina_id_ID.ts 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/share/translations/valentina_id_ID.ts 2021-07-01 18:31:52.000000000 +0000 @@ -7748,6 +7748,22 @@ Could not create recipe file. %1 + + Shop + + + + Scalable Vector Graphics files + + + + Save draw + + + + Draw export + + MainWindowsNoGUI @@ -8880,10 +8896,6 @@ TMainWindow - <html><head/><body>Select New for creation measurement file.</body></html> - - - Name Nama @@ -9577,6 +9589,10 @@ Restrict first dimension + + <html><head/><body>Select New to create a measurement file.</body></html> + + TabGrainline diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/share/translations/valentina_it_IT.ts valentina-0.7.49+1260+202107011832~ubuntu21.04.1/share/translations/valentina_it_IT.ts --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/share/translations/valentina_it_IT.ts 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/share/translations/valentina_it_IT.ts 2021-07-01 18:31:52.000000000 +0000 @@ -2691,11 +2691,11 @@ Enable to create a visibility gropup from original objects - + Seleziona per creare un Gruppo di Visibilità degli oggetti iniziali Visibility Group - + Gruppo di Visibilità Name: @@ -2810,11 +2810,11 @@ Enable to create a visibility gropup from original objects - + Seleziona per creare un Gruppo di Visibilità degli oggetti iniziali Visibility Group - + Gruppo di Visibilità Name: @@ -4366,11 +4366,11 @@ Enable to create a visibility gropup from original objects - + Seleziona per creare un Gruppo di Visibilità degli oggetti iniziali Visibility Group - + Gruppo di Visibilità Name: @@ -6182,11 +6182,11 @@ Enable to create a visibility gropup from original objects - + Seleziona per creare un Gruppo di Visibilità degli oggetti iniziali Visibility Group - + Gruppo di Visibilità Name: @@ -8853,7 +8853,7 @@ Contains all visibility groups - + Contiene tutti i Gruppi di Visibilità Show which details will go in layout @@ -9225,7 +9225,7 @@ Groups of visibility - + Gruppi di Visibilità Export recipe @@ -9367,6 +9367,22 @@ Could not create recipe file. %1 + + Shop + + + + Scalable Vector Graphics files + + + + Save draw + + + + Draw export + + MainWindowsNoGUI @@ -10786,7 +10802,7 @@ TMainWindow <html><head/><body>Select New for creation measurement file.</body></html> - <html><head/><body>Seleziona nuovo per la creazione di un file delle misure.</body></html> + <html><head/><body>Seleziona nuovo per la creazione di un file delle misure.</body></html> Name @@ -11679,6 +11695,10 @@ Restrict first dimension + + <html><head/><body>Select New to create a measurement file.</body></html> + + TabGrainline @@ -11847,11 +11867,11 @@ Options to control position a pattern label. Not available if a pattern label template is empty. - + Opzione per regolare la visibilità e posizione dell'etichetta. Non disponibile se il modello etichetta non è stato caricato. Pattern label data - + Etichetta con dati del Modello Edit pattern label @@ -11911,7 +11931,7 @@ Piece label visible - + Attiva/Disattiva Etichetta del Pezzo @@ -12756,7 +12776,7 @@ Visibility group - + Gruppo di Visibilità default @@ -13636,7 +13656,7 @@ Restore label position - + Ripristina posizione dell'Etichetta @@ -14477,15 +14497,15 @@ Length - Lunghezza + Lunghezza Angle - + Angolo Label - Etichetta + Etichetta Segment 1 @@ -15364,7 +15384,7 @@ Label - Etichetta + Etichetta Curve 1 segment 1 diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/share/translations/valentina_nl_NL.ts valentina-0.7.49+1260+202107011832~ubuntu21.04.1/share/translations/valentina_nl_NL.ts --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/share/translations/valentina_nl_NL.ts 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/share/translations/valentina_nl_NL.ts 2021-07-01 18:31:52.000000000 +0000 @@ -1214,11 +1214,11 @@ Alias1: - Alias1: + Alias1: Alias2: - Alias2: + Alias2: @@ -6066,11 +6066,11 @@ Alias1: - Alias1: + Alias1: Alias2: - Alias2: + Alias2: Curve 2 @@ -9378,6 +9378,22 @@ Could not create recipe file. %1 + + Shop + + + + Scalable Vector Graphics files + + + + Save draw + + + + Draw export + + MainWindowsNoGUI @@ -10797,7 +10813,7 @@ TMainWindow <html><head/><body>Select New for creation measurement file.</body></html> - <html><head/><body>Selecteer Nieuw voor creëeren maten bestand.</body></html> + <html><head/><body>Selecteer Nieuw voor creëeren maten bestand.</body></html> Name @@ -11690,6 +11706,10 @@ Restrict first dimension Beperk eerste meting + + <html><head/><body>Select New to create a measurement file.</body></html> + + TabGrainline @@ -14571,15 +14591,15 @@ Length - Lengte + Lengte Angle - Hoek + Hoek Label - Label + Label Segment 1 @@ -15466,7 +15486,7 @@ Label - Label + Label Curve 1 segment 1 diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/share/translations/valentina_pl_PL.ts valentina-0.7.49+1260+202107011832~ubuntu21.04.1/share/translations/valentina_pl_PL.ts --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/share/translations/valentina_pl_PL.ts 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/share/translations/valentina_pl_PL.ts 2021-07-01 18:31:52.000000000 +0000 @@ -1214,11 +1214,11 @@ Alias1: - Odnośnik1: + Odnośnik1: Alias2: - Odnośnik2: + Odnośnik2: @@ -5585,11 +5585,11 @@ Alias1: - Odnośnik1: + Odnośnik1: Alias2: - Odnośnik2: + Odnośnik2: Curve 2 @@ -8522,6 +8522,22 @@ Could not create recipe file. %1 + + Shop + + + + Scalable Vector Graphics files + + + + Save draw + + + + Draw export + + MainWindowsNoGUI @@ -9778,7 +9794,7 @@ TMainWindow <html><head/><body>Select New for creation measurement file.</body></html> - <html><head/><body>Wciśnij nowy aby utworzyć plik pomiarów.</body></html> + <html><head/><body>Wciśnij nowy aby utworzyć plik pomiarów.</body></html> Name @@ -10595,6 +10611,10 @@ Restrict first dimension + + <html><head/><body>Select New to create a measurement file.</body></html> + + TabGrainline @@ -13224,15 +13244,15 @@ Length - Długość + Długość Angle - Kąt + Kąt Label - Etykieta + Etykieta Segment 1 @@ -14015,7 +14035,7 @@ Label - Etykieta + Etykieta Curve 1 segment 1 diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/share/translations/valentina_pt_BR.ts valentina-0.7.49+1260+202107011832~ubuntu21.04.1/share/translations/valentina_pt_BR.ts --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/share/translations/valentina_pt_BR.ts 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/share/translations/valentina_pt_BR.ts 2021-07-01 18:31:52.000000000 +0000 @@ -1214,11 +1214,11 @@ Alias1: - Pseudônimo1: + Pseudônimo1: Alias2: - Pseudônimo2: + Pseudônimo2: @@ -2068,7 +2068,7 @@ Measurements units - Unidade de Medida + Unidade de Medidas Pattern units @@ -2133,22 +2133,22 @@ Height label dimension - etiqueta Altura + rótulo Altura Size label dimension - etiqueta Tamanho + rótulo Tamanho Hip label dimension - etiqueta Quadril + rótulo Quadril Waist label dimension - etiqueta Cintura + rótulo Cintura @@ -2715,7 +2715,7 @@ Tags: - Rótulos: + Tags: Separate each tag with comma. @@ -2723,7 +2723,7 @@ Add tags - Adicionar rótulos + Adicionar tags Tool @@ -2759,7 +2759,7 @@ Label: - Etiqueta: + Rótulo: Default @@ -2771,7 +2771,7 @@ Invalid label - Etiqueta inválida + Rótulo inválido Invalid alias @@ -2834,15 +2834,15 @@ Tags: - Rótulos: + Tags: Separate each tag with comma. - Separe cada rótulo com vírgula. + Separe cada tag com vírgula. Add tags - Adicionar rótulos + Adicionar tags Tool @@ -2878,7 +2878,7 @@ Label: - Etiqueta: + Rótulo: Default @@ -2898,7 +2898,7 @@ Invalid label - Etiqueta inválida + Rótulo inválida Invalid alias @@ -2929,15 +2929,15 @@ Tags: - Rótulos: + Tags: Separate each tag with comma. - Separe cada rótulo com vírgula. + Separe cada tag com vírgula. Add tags - Adicionar rótulos + Adicionar tags @@ -4390,11 +4390,11 @@ Tags: - Rótulos: + Tags: Separate each tag with comma. - Separe cada rótulo com vírgula. + Separe cada tags com vírgula. Add tags @@ -4434,7 +4434,7 @@ Label: - Etiqueta: + Rótulo: Default @@ -4454,7 +4454,7 @@ Invalid label - Etiqueta inválida + Rótulo inválido Invalid alias @@ -4873,7 +4873,7 @@ Passmark length: - + Tamanho do Pique: @@ -5191,15 +5191,15 @@ Marks - Marcas + Marcações T mark - Marca T + Marcação T V mark - Marca V + Marcação V Please, select a detail to insert into! @@ -5343,7 +5343,7 @@ V mark 2 - + Marcação V 2 Select main path objects, %1 - reverse direction curve, %2 - finish creation @@ -5351,7 +5351,7 @@ Manual length - + comprimento manual Length: @@ -5359,15 +5359,15 @@ U mark - + Marcação U Box mark - + Marcação quadrada Edit passmark length - + Editar tamanho do pique @@ -6062,19 +6062,19 @@ Curve 1 - + Curva 1 Alias1: - Pseudônimo1: + Pseudônimo1: Alias2: - Pseudônimo2: + Pseudônimo2: Curve 2 - + Curva 2 @@ -6202,15 +6202,15 @@ Tags: - Rótulos: + Tags: Separate each tag with comma. - Separe cada rótulo com vírgula. + Separe cada tag com vírgula. Add tags - Adicionar rótulos + Adicionar tags Tool @@ -6250,7 +6250,7 @@ Invalid label - Etiqueta inválida + Rótulo inválido Invalid alias @@ -6262,7 +6262,7 @@ Label: - Etiqueta: + Rótulo: Alias: @@ -6699,7 +6699,7 @@ Edit passmark length - + Editar tamanho do pique The customer name from individual measurements @@ -6707,7 +6707,7 @@ The customer email from individual measurements - O email do clientes das medidas individuais + O email do cliente das medidas individuais The customer birth date from individual measurements @@ -6726,7 +6726,7 @@ DialogSetupMultisize Setup multisize measurements - Configurar tabela multi-tamanhos + Configurar medidas multi-tamanhos Use full circumference @@ -7847,7 +7847,7 @@ The pattern units - Unidades de medida do molde + Unidade de medidas do molde Invalid dimension A base value. @@ -9217,19 +9217,19 @@ Increase label font - Aumentar fonte da etiqueta + Aumentar fonte do rótulo Decrease label font - Diminuir fonte da etiqueta + Diminuir fonte do rótulo Original label font - Fonte original da etiqueta + Fonte original do rótulo Hide labels - Esconder etiquetas + Esconder rótulos Groups of visibility @@ -9305,7 +9305,7 @@ Watermark - Marca d'água + Marca D'água Load @@ -9375,6 +9375,22 @@ Could not create recipe file. %1 + + Shop + + + + Scalable Vector Graphics files + + + + Save draw + + + + Draw export + + MainWindowsNoGUI @@ -10403,11 +10419,11 @@ Cannot calculate passmark length for point '%1'. Reason: %2. - + Impossível calcular tamanho do pique para ponto '%1'. Motivo: %2. Passmark '%1' is not part of piece '%2'. - + Pique '%1' não é parte da peça '%2'. Cannot cast tool with id '%1'. @@ -10459,7 +10475,7 @@ Piece name '%1' is not unique. - + Nome da peça '%1' não é único. Error in path '%1'. Calculating segment for curve '%2' has failed. %3 @@ -10762,7 +10778,7 @@ SavePlaceLabelOptions save place label options - + salvar opções de localização de rótulo @@ -10794,7 +10810,7 @@ TMainWindow <html><head/><body>Select New for creation measurement file.</body></html> - <html><head/><body>Selecionar Novo para o arquivo de criação de medida.</body></html> + <html><head/><body>Selecionar Novo para o arquivo de criação de medida.</body></html> Name @@ -11687,6 +11703,10 @@ Restrict first dimension + + <html><head/><body>Select New to create a measurement file.</body></html> + + TabGrainline @@ -11859,7 +11879,7 @@ Pattern label data - + Informação de rótulo do molde Edit pattern label @@ -11919,7 +11939,7 @@ Piece label visible - Etiqueta da peça visível + Rótulo da peça visível @@ -11942,11 +11962,11 @@ T mark - Marca T + Marcação T V mark - Marca V + Marcação V Angle @@ -11962,7 +11982,7 @@ Marks - Marcas + Marcações Select if need designate the corner point as a passmark @@ -12014,11 +12034,11 @@ V mark 2 - + Marcação V 2 Manual length - + comprimento manual Length: @@ -12042,11 +12062,11 @@ U mark - + Marcação U Box mark - + Marcação quadrada List of all defined passmarks. To define a passmark return to the Main Path tab, call context menu for a point item and make it a passmark. @@ -12719,7 +12739,7 @@ VAbstractMainWindow Confirm format rewriting - + Confirmar reescrever formato This file is using previous format version v%1. The current is v%2. Saving the file with this app version will update the format version for this file. This may prevent you from be able to open the file with older app versions. Do you really want to continue? @@ -12742,7 +12762,7 @@ VAbstractNode This id (%1) is not unique. - + Esta id (%1) não é única. @@ -12761,15 +12781,15 @@ delete operation - + apagar operação Visibility group - + Grupo de Visibilidade default - + padrão @@ -13308,7 +13328,7 @@ The left margin - + margem esquerda Tiled page right margin in current units like 3.0 (export mode). If not set will be used default value 1 cm. @@ -13316,7 +13336,7 @@ The right margin - + Margem direita Tiled page top margin in current units like 3.0 (export mode). If not set will be used value default value 1 cm. @@ -13324,7 +13344,7 @@ The top margin - + Margem superior Tiled page bottom margin in current units like 3.0 (export mode). If not set will be used value default value 1 cm. @@ -13332,7 +13352,7 @@ The bottom margin - + Margem inferior Set tiled page orienatation to landscape (export mode). Default value if not set portrait. @@ -13388,7 +13408,7 @@ The page height - + Altura da página Order detail to follow grainline direction (export mode). @@ -13404,7 +13424,7 @@ Coefficient - + Coeficiente Time must be in range from 1 minute to 60 minutes. @@ -13495,19 +13515,19 @@ individual - + individual multisize - + multi-tamanhos templates - + modelos label templates - + modelos de rótulo patterns @@ -13603,6 +13623,10 @@ Obteve parâmetro de identidade errado. Permitido somente Identidade > 0. + This id is not unique. + Esta id não é única. + + Fail to write Canonical XML. @@ -13616,7 +13640,7 @@ This id (%1) is not unique. - + Esta id (%1) não é única. Couldn't get version information. @@ -13651,7 +13675,7 @@ This id (%1) is not unique. - + Esta id (%1) não é única. Add to group @@ -13667,7 +13691,7 @@ Restore label position - Restaurar posição da etiqueta + Restaurar posição do rótulo @@ -13693,34 +13717,34 @@ Result is infinite - + Resultado é infinite Result is NaN - + Resultado é NaN Result is zero - + Resultado é zero Result less than zero - + Resultado menor de zero Formula is empty - + Fórmula está vazia Not evaluated - + Não avaliado VFormulaData Not evaluated - + Não avaliado Error @@ -13728,7 +13752,7 @@ Formula is empty - + Fórmula está vazia @@ -13746,7 +13770,7 @@ VLayoutExporter Cannot set printer page size - + Impossível definir tamanho da página Cannot set printer margins @@ -13754,7 +13778,7 @@ Can't open file '%1' - + Impossível abrir arquivo '%1' Creating file '%1' failed! %2 @@ -13762,19 +13786,19 @@ Can't save file '%1'. Error: %2. - + Impossível salvar arquivo '%1'. Erro: %2. Can't create an flat dxf file. - + Impossível criar um arquivo flat dxf. Can't create an AAMA dxf file. - + Impossível criar um arquivo AAMA dxf. Can't create an ASTM dxf file. - + Impossível criaram arquivo ASTM dxf. @@ -13875,11 +13899,11 @@ Seam allowance angle - + Ângulo margem de costura Passmark angle - + ângulo do pique Straightforward @@ -13915,7 +13939,7 @@ Passmark mark - + Marcação de Pique One line @@ -13931,23 +13955,23 @@ T mark - Marca T + Marcação T V mark - Marca V + Marcação V V mark 2 - + Marcação V 2 U mark - + Marcação U Box mark - + Marcação quadrada @@ -14258,26 +14282,26 @@ Value for final measurtement '%1' is infinite or NaN. Please, check your calculations. - + Valor para medida final '%1' é infinito ou NaN. Por favor, verifique seus cálculos. Unable to create record for final measurement '%1'. Error: %2 - + Impossível criar registro para medida final '%1'. Erro: %2 VPiece Cannot calculate a notch for point '%1' in piece '%2'. - + Não foi possível calcular pique para ponto '%1' na peça '%2'. Notch for point '%1' in piece '%2' will be disabled. Manual length is less than allowed value. - + Pique para ponto '%1' em peça '%2' será desabilitado. Comprimento manual é menor que o valor permitido. Main path of piece %1 - + Caminho principal da peça %1 @@ -14296,7 +14320,7 @@ Not supported file suffix '%1' - + Arquivo sufixo '%1' não suportado cm @@ -14306,11 +14330,11 @@ in unit - + em Cannot open the watermark image. - + Impossível abrir imagem marca d'água. @@ -14349,11 +14373,11 @@ Cannot set custom printer page size - + Impossível definir tamanho personalizado da página Cannot set printer page size - + Impossível definir tamanho da página Cannot set printer tiled page size @@ -14508,27 +14532,27 @@ VToolCurveIntersectAxis Error calculating point '%1'. There is no intersection with curve '%2' and axis through point '%3' with angle %4° - + Erro calculando ponto '%1'. Não há interseção com a curva '%2' e eixo através do ponto '%3' com ângulo %4° Length - Comprimento + Comprimento Angle - Ângulo + Ângulo Label - Rótulo + Rótulo Segment 1 - + Segmento 1 Segment 2 - + Segmento 2 @@ -14696,7 +14720,7 @@ flipping by line - + virar pela linha @@ -14733,7 +14757,7 @@ Error calculating point '%1'. Lines (%2;%3) and (%4;%5) have no point of intersection - + Erro calculando ponto '%1'. Linhas (%2;%3) e (%4;%5) não tem ponto de interseção @@ -14752,7 +14776,7 @@ Error calculating point '%1'. Line (%2;%3) doesn't have intersection with axis through point '%4' and angle %5° - + Erro calculando ponto '%1'. Linha (%2;%3) não tem interseção com eixo através do ponto '%4' e ângulo %5° @@ -14794,7 +14818,7 @@ move - + mover @@ -15356,14 +15380,14 @@ VToolPointFromArcAndTangent Error calculating point '%1'. Tangent to arc '%2' from point '%3' cannot be found - + Erro calculando ponto '%1'. Tangente ao arco '%2' do ponto '%3' não encontrado VToolPointFromCircleAndTangent Error calculating point '%1'. Tangent to circle with center '%2' and radius '%3' from point '%4' cannot be found - + Erro calculando ponto '%1'. Tangente ao círculo com centro '%2' e raio '%3' do ponto '%4' não encontrado @@ -15382,48 +15406,48 @@ Error calculating point '%1'. Circle with center '%2' and radius '%3' doesn't have intersection with line (%4;%5) - + Erro calculando ponto '%1'. Círculo com centro '%2' e raio '%3' não tem ponto de interseção com linha (%4;%5) VToolPointOfIntersectionArcs Error calculating point '%1'. Arcs '%2' and '%3' have no point of intersection - + Erro calculando ponto '%1'. Arcos '%2' e '%3' não tem ponto de interseção VToolPointOfIntersectionCircles Error calculating point '%1'. Circles with centers in points '%2' and '%3' have no point of intersection - + Erro calculando ponto '%1'. Círculos com centros em pontos '%2' e '%3' não tem ponto de interseção VToolPointOfIntersectionCurves Error calculating point '%1'. Curves '%2' and '%3' have no point of intersection - + Erro calculando ponto '%1'. Curvas '%2' and '%3' não tem ponto de interseção Label - Rótulo + Rótulo Curve 1 segment 1 - + Curva 1 segmento 1 Curve 1 segment 2 - + Curva 1 segmento 2 Curve 2 segment 1 - + Curva 2 segmento 1 Curve 2 segment 2 - + Curva 2 segmento 2 @@ -15438,7 +15462,7 @@ rotate - + rotacionar @@ -15513,11 +15537,11 @@ This id (%1) is not unique. - + Esta id (%1) não é única. Tool was used after deleting. - + Ferramenta foi utilizada após apagar. @@ -15539,7 +15563,7 @@ VToolTriangle Error calculating point '%1'. Point of intersection cannot be found - + Erro calculando ponto '%1'. Ponto de interseção não encontrado @@ -15554,7 +15578,7 @@ This id (%1) is not unique. - + Esta id (%1) não é única. @@ -16535,6 +16559,11 @@ mm + in + inch + em + + Line_ Left symbol _ in the name Linha_ @@ -16602,7 +16631,7 @@ CurrentLength Do not add space between words - + ComprimentoAtual acosh @@ -16615,6 +16644,11 @@ tamanho + height + placeholder + altura + + C1LengthSpl_ Left symbol _ in the name @@ -16952,12 +16986,12 @@ warning Calculation warning - + alerta Show a warning in calculations function warning - + Mostrar um alerta nos cálculos @@ -17022,15 +17056,15 @@ Piece options - + Opções peça Delete piece - + Deletar peça Cannot find piece by id '%1' - + Não é possível encontrar peça id '%1' @@ -17065,15 +17099,15 @@ Tags: - Rótulos: + Tags: Separate each tag with comma. - Separe cada rótulo com vírgula. + Separe cada tag com vírgula. Filter by tags - Filtrar por rótulos + Filtrar por tag Preferences @@ -17126,25 +17160,33 @@ Point at distance and angle: angle = %1°, length = %2%3; %4 - sticking angle, %5 - finish creation - + Ponto a distância e ângulo: ângulo = %1°, comprimento = %2%3; %4 - fixar ângulo, %5 - finalizar VisToolLineIntersectAxis + Intersection line and axis: angle = %1°; Shift - sticking angle, Enter - finish creation + Interseção linha e eixo: ângulo = %1°; Shift - fixar ângulo, Enter - finaliza criação + + Intersection line and axis: angle = %1°; %2 - sticking angle, %3 - finish creation - + Interseção linha e eixo: ângulo = %1°; %2 - fixar ângulo, %3 - finalizar VisToolMove + Length = %1%2, angle = %3°, Shift - sticking angle, Mouse click - finish creation + Comprimento = %1%2, angle = %3°, Shift - fixar ângulo, Mouse click - finaliza criação + + Length = %1%2, angle = %3°, %4 - sticking angle, Mouse click - finish selecting a position - + Comprimento = %1%2, ângulo = %3°, %4 - fixar ângulo, Mouse click - finalizar a seleção da posição Length = %1%2, angle = %3°, rotation angle = %4°, %5 - sticking angle, %6 - change rotation origin point, Mouse click - finish creating - + Comprimento = %1%2, ângulo = %3°, ângulo de rotação = %4°, %5 - fixar ângulo, %6 - mudar ponto de origem da rotação, Mouse click - para finalizar @@ -17155,7 +17197,7 @@ Rotating angle = %1°, %2 - sticking angle, Mouse click - finish creation - + Ângulo de rotação = %1°, %2 - fixar ângulo, Mouse click - finalizar @@ -17166,7 +17208,7 @@ Use %1 for sticking angle! - + Use %1 para fixar ângulo! @@ -17185,22 +17227,22 @@ Curved path: select three or more points, %1 - finish creation - + Caminho curvo: selecione três ou mais pontos, %1 - para finalizar Use %1 for sticking angle! - + Use %1 para fixar ângulo! WatermarkWindow Watermark - Marca d'água + Marca D'água Opacity: - + Opacidade: Text @@ -17212,7 +17254,7 @@ watermark text - + texto marca d'água Rotation: @@ -17220,20 +17262,20 @@ Font: - + Fonte: The quick brown fox jumps over the lazy dog Use native text to test a font options - + Um pequeno jabuti xereta viu dez cegonhas felizes Edit font - + Editar fonte Image - + Imagem Path: @@ -17241,7 +17283,7 @@ path to image - + caminho para imagem Browse… @@ -17249,7 +17291,7 @@ Gray color - + Cor Cinza &File @@ -17285,7 +17327,7 @@ Watermark image - + Imagem marca d'água File error. @@ -17355,11 +17397,11 @@ untitled.vwm - + sem_titulo.vwm Confirm format rewriting - + Confirmar reescrever formato This file is using previous format version v%1. The current is v%2. Saving the file with this app version will update the format version for this file. This may prevent you from be able to open the file with older app versions. Do you really want to continue? diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/share/translations/valentina_ro_RO.ts valentina-0.7.49+1260+202107011832~ubuntu21.04.1/share/translations/valentina_ro_RO.ts --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/share/translations/valentina_ro_RO.ts 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/share/translations/valentina_ro_RO.ts 2021-07-01 18:31:52.000000000 +0000 @@ -8419,6 +8419,22 @@ Could not create recipe file. %1 + + Shop + + + + Scalable Vector Graphics files + + + + Save draw + + + + Draw export + + MainWindowsNoGUI @@ -9562,10 +9578,6 @@ TMainWindow - <html><head/><body>Select New for creation measurement file.</body></html> - - - Name Nume @@ -10307,6 +10319,10 @@ Restrict first dimension + + <html><head/><body>Select New to create a measurement file.</body></html> + + TabGrainline @@ -12854,11 +12870,11 @@ Length - Lungime + Lungime Angle - Unghi + Unghi Label diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/share/translations/valentina_ru_RU.ts valentina-0.7.49+1260+202107011832~ubuntu21.04.1/share/translations/valentina_ru_RU.ts --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/share/translations/valentina_ru_RU.ts 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/share/translations/valentina_ru_RU.ts 2021-07-01 18:31:52.000000000 +0000 @@ -1214,11 +1214,11 @@ Alias1: - Псевдоним 1: + Псевдоним 1: Alias2: - Псевдоним 2: + Псевдоним 2: @@ -1792,7 +1792,7 @@ DialogDimensionLabels Dimension labels - Метки измерения + Псевдонимы измерения Value @@ -1800,7 +1800,7 @@ Label - Метка + Псевдоним Dimension: @@ -2133,22 +2133,22 @@ Height label dimension - + Псевдоним роста Size label dimension - + Псевдоним размера Hip label dimension - + Псевдоним бёдер Waist label dimension - + Псевдоним талии @@ -4873,7 +4873,7 @@ Passmark length: - + Длина надсечек: @@ -6062,19 +6062,19 @@ Curve 1 - + Кривая 1 Alias1: - Псевдоним 1: + Псевдоним 1: Alias2: - Псевдоним 2: + Псевдоним 2: Curve 2 - + Кривая 2 @@ -9378,6 +9378,22 @@ Could not create recipe file. %1 + Не удалось создать файл рецепта. %1 + + + Shop + + + + Scalable Vector Graphics files + + + + Save draw + + + + Draw export @@ -10500,7 +10516,7 @@ Invalid global value for a passmark length. Piece '%1'. Length is less than minimal allowed. - + Недопустимое глобальное значение длины надсечек. Деталь "%1". Длина меньше минимально допустимой. @@ -10799,7 +10815,7 @@ TMainWindow <html><head/><body>Select New for creation measurement file.</body></html> - <html><head/><body>Выберите Новый для создания файла мерок.</body></html> + <html><head/><body>Выберите Новый для создания файла мерок.</body></html> Name @@ -11596,7 +11612,7 @@ Dimension labels - Метки измерения + Псевдонимы измерения The table doesn't provide dimensions @@ -11692,6 +11708,10 @@ Restrict first dimension Ограничить первое измерение + + <html><head/><body>Select New to create a measurement file.</body></html> + + TabGrainline @@ -13823,15 +13843,15 @@ Can't create an flat dxf file. - + Невозможно создать плоский файл dxf. Can't create an AAMA dxf file. - + Не удалось создать файл AAMA dxf. Can't create an ASTM dxf file. - + Не удалось создать файл ASTM dxf. @@ -14319,7 +14339,7 @@ Unable to create record for final measurement '%1'. Error: %2 - + Невозможно создать запись для финального измерения "%1'". Ошибка: %2 @@ -14573,23 +14593,23 @@ Length - Длина + Длина Angle - Угол + Угол Label - Метка + Метка Segment 1 - + Сегмент 1 Segment 2 - + Сегмент 2 @@ -15468,23 +15488,23 @@ Label - Метка + Метка Curve 1 segment 1 - + Кривая 1 сегмент 1 Curve 1 segment 2 - + Кривая 1 сегмент 2 Curve 2 segment 1 - + Кривая 2 сегмент 1 Curve 2 segment 2 - + Кривая 2 сегмент 2 diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/share/translations/valentina.ts valentina-0.7.49+1260+202107011832~ubuntu21.04.1/share/translations/valentina.ts --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/share/translations/valentina.ts 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/share/translations/valentina.ts 2021-07-01 18:31:52.000000000 +0000 @@ -9593,6 +9593,22 @@ Could not create recipe file. %1 + + Shop + + + + Scalable Vector Graphics files + + + + Save draw + + + + Draw export + + MainWindowsNoGUI @@ -11066,7 +11082,7 @@ TMainWindow <html><head/><body>Select New for creation measurement file.</body></html> - <html><head/><body>Select New for creation measurement file.</body></html> + <html><head/><body>Select New for creation measurement file.</body></html> Name @@ -11959,6 +11975,10 @@ Restrict first dimension + + <html><head/><body>Select New to create a measurement file.</body></html> + + TabGrainline diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/share/translations/valentina_uk_UA.ts valentina-0.7.49+1260+202107011832~ubuntu21.04.1/share/translations/valentina_uk_UA.ts --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/share/translations/valentina_uk_UA.ts 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/share/translations/valentina_uk_UA.ts 2021-07-01 18:31:52.000000000 +0000 @@ -9378,6 +9378,22 @@ Could not create recipe file. %1 + + Shop + + + + Scalable Vector Graphics files + + + + Save draw + + + + Draw export + + MainWindowsNoGUI @@ -10796,7 +10812,7 @@ TMainWindow <html><head/><body>Select New for creation measurement file.</body></html> - <html><head/><body>Виберіть Новий для створення файлу мірок.</body></html> + <html><head/><body>Виберіть Новий для створення файлу мірок.</body></html> Name @@ -11689,6 +11705,10 @@ Restrict first dimension + + <html><head/><body>Select New to create a measurement file.</body></html> + + TabGrainline @@ -14564,11 +14584,11 @@ Length - Довжина + Довжина Angle - Кут + Кут Label diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/share/translations/valentina_zh_CN.ts valentina-0.7.49+1260+202107011832~ubuntu21.04.1/share/translations/valentina_zh_CN.ts --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/share/translations/valentina_zh_CN.ts 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/share/translations/valentina_zh_CN.ts 2021-07-01 18:31:52.000000000 +0000 @@ -7536,6 +7536,22 @@ Could not create recipe file. %1 + + Shop + + + + Scalable Vector Graphics files + + + + Save draw + + + + Draw export + + MainWindowsNoGUI @@ -8686,10 +8702,6 @@ TMainWindow - <html><head/><body>Select New for creation measurement file.</body></html> - - - Calculated value @@ -9395,6 +9407,10 @@ Restrict first dimension + + <html><head/><body>Select New to create a measurement file.</body></html> + + TabGrainline diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/app/tape/mapplication.cpp valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/app/tape/mapplication.cpp --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/app/tape/mapplication.cpp 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/app/tape/mapplication.cpp 2021-07-01 18:31:54.000000000 +0000 @@ -117,6 +117,7 @@ } # endif +# if QT_VERSION < QT_VERSION_CHECK(5, 9, 0) // Hide Qt bug 'Assertion when reading an icns file' // https://bugreports.qt.io/browse/QTBUG-45537 // Remove after Qt fix will be released @@ -124,6 +125,13 @@ { type = QtDebugMsg; } +# endif + + // Hide anything that starts with QMacCGContext + if ((type == QtWarningMsg) && msg.contains(QStringLiteral("QMacCGContext::"))) + { + type = QtDebugMsg; + } // See issue #568 if (msg.contains(QStringLiteral("Error receiving trust for a CA certificate"))) diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/app/tape/tmainwindow.cpp valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/app/tape/tmainwindow.cpp --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/app/tape/tmainwindow.cpp 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/app/tape/tmainwindow.cpp 2021-07-01 18:31:54.000000000 +0000 @@ -897,6 +897,11 @@ usedNotExistedDir = directory.mkpath(QChar('.')); } + if (not curFile.isEmpty()) + { + fName = StrippedName(curFile); + } + QString fileName = QFileDialog::getSaveFileName(this, tr("Save as"), dir + QChar('/') + fName, filters, nullptr, VAbstractApplication::VApp()->NativeFileDialog()); diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/app/tape/tmainwindow.ui valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/app/tape/tmainwindow.ui --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/app/tape/tmainwindow.ui 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/app/tape/tmainwindow.ui 2021-07-01 18:31:54.000000000 +0000 @@ -34,7 +34,7 @@ - <html><head/><body>Select New for creation measurement file.</body></html> + <html><head/><body>Select New to create a measurement file.</body></html> Qt::AlignCenter @@ -968,7 +968,7 @@ 0 0 1188 - 21 + 22 diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/app/valentina/core/vapplication.cpp valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/app/valentina/core/vapplication.cpp --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/app/valentina/core/vapplication.cpp 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/app/valentina/core/vapplication.cpp 2021-07-01 18:31:54.000000000 +0000 @@ -114,6 +114,7 @@ } # endif +# if QT_VERSION < QT_VERSION_CHECK(5, 9, 0) // Hide Qt bug 'Assertion when reading an icns file' // https://bugreports.qt.io/browse/QTBUG-45537 // Remove after Qt fix will be released @@ -121,6 +122,13 @@ { type = QtDebugMsg; } +# endif + + // Hide anything that starts with QMacCGContext + if ((type == QtWarningMsg) && msg.contains(QStringLiteral("QMacCGContext::"))) + { + type = QtDebugMsg; + } // See issue #568 if (msg.contains(QStringLiteral("Error receiving trust for a CA certificate"))) diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/app/valentina/dialogs/dialogpatternproperties.cpp valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/app/valentina/dialogs/dialogpatternproperties.cpp --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/app/valentina/dialogs/dialogpatternproperties.cpp 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/app/valentina/dialogs/dialogpatternproperties.cpp 2021-07-01 18:31:54.000000000 +0000 @@ -135,7 +135,7 @@ m_completer = new QCompleter(m_variables, this); m_completer->setCompletionMode(QCompleter::PopupCompletion); m_completer->setModelSorting(QCompleter::UnsortedModel); - m_completer->setFilterMode(Qt::MatchStartsWith); + m_completer->setFilterMode(Qt::MatchContains); m_completer->setCaseSensitivity(Qt::CaseSensitive); ui->lineEditPassmarkLength->setCompleter(m_completer); diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/app/valentina/dialogs/dialogsavelayout.cpp valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/app/valentina/dialogs/dialogsavelayout.cpp --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/app/valentina/dialogs/dialogsavelayout.cpp 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/app/valentina/dialogs/dialogsavelayout.cpp 2021-07-01 18:31:54.000000000 +0000 @@ -182,15 +182,13 @@ { if (static_cast(format) < 0 || format >= LayoutExportFormats::COUNT) { - VException e(tr("Tried to use out of range format number.")); - throw e; + throw VException(tr("Tried to use out of range format number.")); } const int i = ui->comboBoxFormat->findData(static_cast(format)); if (i < 0) { - VException e(tr("Selected not present format.")); - throw e; + throw VException(tr("Selected not present format.")); } ui->comboBoxFormat->setCurrentIndex(i); } @@ -916,7 +914,14 @@ ui->toolButtonLandscape->setChecked(true); } - SelectFormat(static_cast(settings->GetLayoutExportFormat())); + if (m_mode != Draw::Layout) + { + SelectFormat(static_cast(settings->GetDetailExportFormat())); + } + else + { + SelectFormat(static_cast(settings->GetLayoutExportFormat())); + } } //--------------------------------------------------------------------------------------------------------------------- @@ -960,6 +965,13 @@ settings->SetTiledPDFOrientation(PageOrientation::Landscape); } - settings->SetLayoutExportFormat(static_cast(Format())); + if (m_mode != Draw::Layout) + { + settings->SetDetailExportFormat(static_cast(Format())); + } + else + { + settings->SetLayoutExportFormat(static_cast(Format())); + } } diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/app/valentina/mainwindow.cpp valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/app/valentina/mainwindow.cpp --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/app/valentina/mainwindow.cpp 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/app/valentina/mainwindow.cpp 2021-07-01 18:31:54.000000000 +0000 @@ -67,6 +67,8 @@ #include "../vformat/vpatternrecipe.h" #include "watermarkwindow.h" #include "../vmisc/backport/qoverload.h" +#include "../vlayout/vlayoutexporter.h" +#include "../vwidgets/vgraphicssimpletextitem.h" #if QT_VERSION < QT_VERSION_CHECK(5, 12, 0) #include "../vmisc/backport/qscopeguard.h" @@ -2245,6 +2247,62 @@ } //--------------------------------------------------------------------------------------------------------------------- +void MainWindow::ExportDraw(const QString &fileName) +{ + QT_WARNING_PUSH + QT_WARNING_DISABLE_GCC("-Wnoexcept") + + VLayoutExporter exporter; + + QT_WARNING_POP + + exporter.SetFileName(fileName); + + int verticalScrollBarValue = ui->view->verticalScrollBar()->value(); + int horizontalScrollBarValue = ui->view->horizontalScrollBar()->value(); + + QTransform viewTransform = ui->view->transform(); + ui->view->ZoomFitBest(); // Resize all labels + ui->view->repaint(); + ui->view->ZoomOriginal(); // Set to original scale + + // Enable all items on scene + const QList qItems = sceneDraw->items(); + for (auto *item : qItems) + { + item->setEnabled(true); + if (item->type() == VGraphicsSimpleTextItem::Type) + { + auto *text = dynamic_cast(item); + text->setBrush(text->BaseColor()); // Regular update doesn't work on labels + } + } + + ui->view->repaint(); + + sceneDraw->SetOriginsVisible(false); + + const QRectF rect = sceneDraw->VisibleItemsBoundingRect(); + sceneDraw->update(rect); + exporter.SetImageRect(rect); + exporter.SetOffset(rect.topLeft()); // Correct positions to fit SVG view rect + + exporter.ExportToSVG(sceneDraw); + + sceneDraw->SetOriginsVisible(true); + + // Restore scale, scrollbars and current active pattern piece + ui->view->setTransform(viewTransform); + VMainGraphicsView::NewSceneRect(ui->view->scene(), ui->view); + emit ScaleChanged(ui->view->transform().m11()); + + ui->view->verticalScrollBar()->setValue(verticalScrollBarValue); + ui->view->horizontalScrollBar()->setValue(horizontalScrollBarValue); + + doc->ChangeActivPP(doc->GetNameActivPP(), Document::FullParse); +} + +//--------------------------------------------------------------------------------------------------------------------- #if defined(Q_OS_MAC) void MainWindow::OpenAt(QAction *where) { @@ -2517,6 +2575,7 @@ connect(ui->toolButtonFlippingByAxis, &QToolButton::clicked, this, &MainWindow::ToolFlippingByAxis); connect(ui->toolButtonMove, &QToolButton::clicked, this, &MainWindow::ToolMove); connect(ui->toolButtonMidpoint, &QToolButton::clicked, this, &MainWindow::ToolMidpoint); + connect(ui->toolButtonExportDraw, &QToolButton::clicked, this, &MainWindow::ExportDrawAs); connect(ui->toolButtonLayoutExportAs, &QToolButton::clicked, this, &MainWindow::ExportLayoutAs); connect(ui->toolButtonDetailExportAs, &QToolButton::clicked, this, &MainWindow::ExportDetailsAs); connect(ui->toolButtonEllipticalArc, &QToolButton::clicked, this, &MainWindow::ToolEllipticalArc); @@ -3137,8 +3196,15 @@ usedNotExistedDir = directory.mkpath(QChar('.')); } + QString newFileName = tr("pattern") + QLatin1String(".val"); + + if(not VAbstractValApplication::VApp()->GetPatternPath().isEmpty()) + { + newFileName = StrippedName(VAbstractValApplication::VApp()->GetPatternPath()); + } + QString fileName = QFileDialog::getSaveFileName(this, tr("Save as"), - dir + QLatin1String("/") + tr("pattern") + QLatin1String(".val"), + dir + QLatin1String("/") + newFileName, filters, nullptr, VAbstractApplication::VApp()->NativeFileDialog()); auto RemoveTempDir = qScopeGuard([usedNotExistedDir, dir]() @@ -4219,6 +4285,7 @@ ui->toolButtonPin->setEnabled(drawTools); ui->toolButtonInsertNode->setEnabled(drawTools); ui->toolButtonPlaceLabel->setEnabled(drawTools); + ui->toolButtonExportDraw->setEnabled(drawTools); ui->actionLast_tool->setEnabled(drawTools); @@ -4917,6 +4984,11 @@ qCDebug(vMainWindow, "Reporting bug"); QDesktopServices::openUrl(QUrl(QStringLiteral("https://gitlab.com/smart-pattern/valentina/issues/new"))); }); + connect(ui->actionShop, &QAction::triggered, this, []() + { + qCDebug(vMainWindow, "Open shop"); + QDesktopServices::openUrl(QUrl(QStringLiteral("https://smart-pattern.com.ua/catalogue/"))); + }); connect(ui->actionLast_tool, &QAction::triggered, this, &MainWindow::LastUsedTool); @@ -5469,6 +5541,30 @@ #endif //--------------------------------------------------------------------------------------------------------------------- +void MainWindow::ExportDrawAs() +{ + auto Uncheck = qScopeGuard([this] {ui->toolButtonExportDraw->setChecked(false);}); + + QString filters(tr("Scalable Vector Graphics files") + QLatin1String("(*.svg)")); + QString dir = QDir::homePath() + QLatin1String("/") + FileName() + QLatin1String(".svg"); + QString fileName = QFileDialog::getSaveFileName(this, tr("Save draw"), dir, filters, nullptr, + VAbstractApplication::VApp()->NativeFileDialog()); + + if (fileName.isEmpty()) + { + return; + } + + QFileInfo f( fileName ); + if (f.suffix().isEmpty() || f.suffix() != QLatin1String("svg")) + { + fileName += QLatin1String(".svg"); + } + + ExportDraw(fileName); +} + +//--------------------------------------------------------------------------------------------------------------------- void MainWindow::ExportLayoutAs() { auto Uncheck = qScopeGuard([this] {ui->toolButtonLayoutExportAs->setChecked(false);}); diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/app/valentina/mainwindow.h valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/app/valentina/mainwindow.h --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/app/valentina/mainwindow.h 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/app/valentina/mainwindow.h 2021-07-01 18:31:54.000000000 +0000 @@ -130,6 +130,7 @@ #if defined(Q_OS_MAC) void CreateMeasurements(); #endif + void ExportDrawAs(); void ExportLayoutAs(); void ExportDetailsAs(); @@ -415,6 +416,8 @@ void SetDimensionBases(); void StoreDimensions(); + + void ExportDraw(const QString &fileName); }; #endif // MAINWINDOW_H diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/app/valentina/mainwindowsnogui.cpp valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/app/valentina/mainwindowsnogui.cpp --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/app/valentina/mainwindowsnogui.cpp 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/app/valentina/mainwindowsnogui.cpp 2021-07-01 18:31:54.000000000 +0000 @@ -659,7 +659,13 @@ VAbstractValApplication::VApp()->ValentinaSettings()->SetPathLayout(path); const LayoutExportFormats format = m_dialogSaveLayout->Format(); + QT_WARNING_PUSH + QT_WARNING_DISABLE_GCC("-Wnoexcept") + VLayoutExporter exporter; + + QT_WARNING_POP + exporter.SetFileName(name); exporter.SetImageRect(QRectF(0, 0, size.width(), size.height())); exporter.SetXScale(m_dialogSaveLayout->GetXScale()); @@ -1090,7 +1096,13 @@ const QList > &details, bool ignorePrinterFields, const QMarginsF &margins) const { + QT_WARNING_PUSH + QT_WARNING_DISABLE_GCC("-Wnoexcept") + VLayoutExporter exporter; + + QT_WARNING_POP + exporter.SetMargins(margins); exporter.SetXScale(m_dialogSaveLayout->GetXScale()); exporter.SetYScale(m_dialogSaveLayout->GetYScale()); diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/app/valentina/mainwindow.ui valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/app/valentina/mainwindow.ui --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/app/valentina/mainwindow.ui 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/app/valentina/mainwindow.ui 2021-07-01 18:31:54.000000000 +0000 @@ -372,7 +372,7 @@ 0 0 - 104 + 140 108 @@ -481,7 +481,7 @@ 0 0 - 104 + 126 243 @@ -746,7 +746,7 @@ 0 0 - 104 + 126 282 @@ -1037,7 +1037,7 @@ 0 0 - 98 + 140 102 @@ -1119,9 +1119,9 @@ 0 - 0 - 104 - 192 + -53 + 126 + 237 @@ -1317,6 +1317,29 @@ + + + + false + + + Draw export + + + ... + + + + :/icon/32x32/export_to_picture_document.png:/icon/32x32/export_to_picture_document.png + + + + 32 + 32 + + + + @@ -1324,7 +1347,7 @@ 0 0 - 104 + 126 237 @@ -1589,8 +1612,8 @@ 0 0 - 104 - 57 + 140 + 168 @@ -1728,6 +1751,7 @@ &Help + @@ -3026,6 +3050,11 @@ Create or edit a watermark + + + Shop + + diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/app/valentina/xml/vpattern.cpp valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/app/valentina/xml/vpattern.cpp --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/app/valentina/xml/vpattern.cpp 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/app/valentina/xml/vpattern.cpp 2021-07-01 18:31:54.000000000 +0000 @@ -85,7 +85,7 @@ //--------------------------------------------------------------------------------------------------------------------- QString FileComment() { - return QStringLiteral("Pattern created with Valentina v%1 (https://valentinaproject.bitbucket.io/).") + return QStringLiteral("Pattern created with Valentina v%1 (https://smart-pattern.com.ua/).") .arg(APP_VERSION_STR); } diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/ifc/xml/vabstractmconverter.cpp valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/ifc/xml/vabstractmconverter.cpp --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/ifc/xml/vabstractmconverter.cpp 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/ifc/xml/vabstractmconverter.cpp 2021-07-01 18:31:54.000000000 +0000 @@ -58,7 +58,7 @@ void VAbstractMConverter::AddRootComment() { const QString rootComment = - QStringLiteral("Measurements created with Valentina (https://valentinaproject.bitbucket.io/)."); + QStringLiteral("Measurements created with Valentina (https://smart-pattern.com.ua/)."); QDomElement rootElement = this->documentElement(); rootElement.insertBefore(createComment(rootComment), rootElement.firstChild()); diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/ifc/xml/vabstractpattern.cpp valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/ifc/xml/vabstractpattern.cpp --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/ifc/xml/vabstractpattern.cpp 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/ifc/xml/vabstractpattern.cpp 2021-07-01 18:31:54.000000000 +0000 @@ -291,7 +291,7 @@ void VAbstractPattern::ChangeActivPP(const QString &name, const Document &parse) { Q_ASSERT_X(not name.isEmpty(), Q_FUNC_INFO, "name pattern piece is empty"); - if (CheckExistNamePP(name) && this->nameActivPP != name) + if (CheckExistNamePP(name)) { this->nameActivPP = name; if (parse == Document::FullParse) @@ -604,6 +604,7 @@ m_watermarkPath.clear(); m_companyName.clear(); m_units = Unit::LAST_UNIT_DO_NOT_USE; + modified = false; } //--------------------------------------------------------------------------------------------------------------------- diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/qmuparser/qmuformulabase.cpp valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/qmuparser/qmuformulabase.cpp --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/qmuparser/qmuformulabase.cpp 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/qmuparser/qmuformulabase.cpp 2021-07-01 18:31:54.000000000 +0000 @@ -80,17 +80,44 @@ Q_UNUSED(decimalPoint) Q_UNUSED(groupSeparator) + // Together with localized symbols, we always must include canonical symbols + auto AddNotCanonical = [](QString &chars, const QChar &c, const QChar &canonical) + { + if (c != canonical) + { + chars += c; + } + }; + // Defining identifier character sets - const QString nameChars = QString() + sign0 + sign1 + sign2 + sign3 + sign4 + sign5 + sign6 + sign7 + sign8 + - sign9 + QStringLiteral("\\_@#'") + symbolsStr; + QString nameChars = QStringLiteral("0123456789\\_@#'") + symbolsStr; + + AddNotCanonical(nameChars, sign0, '0'); + AddNotCanonical(nameChars, sign1, '1'); + AddNotCanonical(nameChars, sign2, '2'); + AddNotCanonical(nameChars, sign3, '3'); + AddNotCanonical(nameChars, sign4, '4'); + AddNotCanonical(nameChars, sign5, '5'); + AddNotCanonical(nameChars, sign6, '6'); + AddNotCanonical(nameChars, sign7, '7'); + AddNotCanonical(nameChars, sign8, '8'); + AddNotCanonical(nameChars, sign9, '9'); + DefineNameChars(nameChars); - const QString opChars = QStringLiteral("*^/?<>=!$%&|~'_"); + const QString opChars = QStringLiteral("+-*^/?<>=!$%&|~'_"); + + QString oprtChars = symbolsStr + opChars; + AddNotCanonical(oprtChars, positiveSign, '+'); + AddNotCanonical(oprtChars, negativeSign, '-'); - const QString oprtChars = symbolsStr + positiveSign + negativeSign + opChars; DefineOprtChars(oprtChars); - const QString infixOprtChars = QString() + positiveSign + negativeSign + opChars; + QString infixOprtChars = opChars; + + AddNotCanonical(infixOprtChars, positiveSign, '+'); + AddNotCanonical(infixOprtChars, negativeSign, '-'); + DefineInfixOprtChars(infixOprtChars); } diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/vformat/vmeasurements.cpp valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/vformat/vmeasurements.cpp --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/vformat/vmeasurements.cpp 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/vformat/vmeasurements.cpp 2021-07-01 18:31:54.000000000 +0000 @@ -114,7 +114,7 @@ //--------------------------------------------------------------------------------------------------------------------- QString FileComment() { - return QString("Measurements created with Valentina v%1 (https://valentinaproject.bitbucket.io/).") + return QString("Measurements created with Valentina v%1 (https://smart-pattern.com.ua/).") .arg(APP_VERSION_STR); } } diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/vformat/vpatternrecipe.cpp valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/vformat/vpatternrecipe.cpp --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/vformat/vpatternrecipe.cpp 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/vformat/vpatternrecipe.cpp 2021-07-01 18:31:54.000000000 +0000 @@ -61,7 +61,7 @@ //--------------------------------------------------------------------------------------------------------------------- inline QString FileComment() { - return QStringLiteral("Recipe created with Valentina v%1 (https://valentinaproject.bitbucket.io/).") + return QStringLiteral("Recipe created with Valentina v%1 (https://smart-pattern.com.ua/).") .arg(APP_VERSION_STR); } diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/vformat/vwatermark.cpp valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/vformat/vwatermark.cpp --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/vformat/vwatermark.cpp 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/vformat/vwatermark.cpp 2021-07-01 18:31:54.000000000 +0000 @@ -45,7 +45,7 @@ //--------------------------------------------------------------------------------------------------------------------- QString FileComment() { - return QString("Watermark created with Valentina v%1 (https://valentinaproject.bitbucket.io/).") + return QString("Watermark created with Valentina v%1 (https://smart-pattern.com.ua/).") .arg(APP_VERSION_STR); } } diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/vgeometry/varc.cpp valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/vgeometry/varc.cpp --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/vgeometry/varc.cpp 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/vgeometry/varc.cpp 2021-07-01 18:31:54.000000000 +0000 @@ -263,6 +263,11 @@ */ QVector VArc::GetPoints() const { + if (qFuzzyIsNull(GetRadius())) + { + return {GetCenter().toQPointF()}; + } + QVector points; QVector sectionAngle; diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/vgeometry/vellipticalarc.cpp valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/vgeometry/vellipticalarc.cpp --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/vgeometry/vellipticalarc.cpp 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/vgeometry/vellipticalarc.cpp 2021-07-01 18:31:54.000000000 +0000 @@ -493,12 +493,23 @@ //--------------------------------------------------------------------------------------------------------------------- QPointF VEllipticalArc::GetP(qreal angle) const { + if (qFuzzyIsNull(GetRadius1()) && qFuzzyIsNull(GetRadius2())) + { + return GetCenter().toQPointF(); + } + QLineF line(0, 0, 100, 0); line.setAngle(angle); - const qreal a = line.p2().x() / GetRadius1(); - const qreal b = line.p2().y() / GetRadius2(); + const qreal a = not qFuzzyIsNull(GetRadius1()) ? line.p2().x() / GetRadius1() : 0; + const qreal b = not qFuzzyIsNull(GetRadius2()) ? line.p2().y() / GetRadius2() : 0; const qreal k = qSqrt(a*a + b*b); + + if (qFuzzyIsNull(k)) + { + return GetCenter().toQPointF(); + } + QPointF p(line.p2().x() / k, line.p2().y() / k); QLineF line2(QPointF(), p); @@ -566,6 +577,13 @@ } //--------------------------------------------------------------------------------------------------------------------- +void VEllipticalArc::SetRadius1(qreal value) +{ + d->formulaRadius1 = QString::number(value); + d->radius1 = value; +} + +//--------------------------------------------------------------------------------------------------------------------- void VEllipticalArc::SetFormulaRadius2(const QString &formula, qreal value) { d->formulaRadius2 = formula; @@ -573,12 +591,26 @@ } //--------------------------------------------------------------------------------------------------------------------- +void VEllipticalArc::SetRadius2(qreal value) +{ + d->formulaRadius2 = QString::number(value); + d->radius2 = value; +} + +//--------------------------------------------------------------------------------------------------------------------- void VEllipticalArc::SetFormulaRotationAngle(const QString &formula, qreal value) { d->formulaRotationAngle = formula; d->rotationAngle = value; } +//--------------------------------------------------------------------------------------------------------------------- +void VEllipticalArc::SetRotationAngle(qreal value) +{ + d->formulaRotationAngle = QString::number(value); + d->rotationAngle = value; +} + //--------------------------------------------------------------------------------------------------------------------- /** * @brief GetRadius1 return elliptical arc major radius. diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/vgeometry/vellipticalarc.h valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/vgeometry/vellipticalarc.h --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/vgeometry/vellipticalarc.h 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/vgeometry/vellipticalarc.h 2021-07-01 18:31:54.000000000 +0000 @@ -75,14 +75,17 @@ QString GetFormulaRotationAngle () const; void SetFormulaRotationAngle (const QString &formula, qreal value); + void SetRotationAngle(qreal value); qreal GetRotationAngle() const; QString GetFormulaRadius1 () const; void SetFormulaRadius1 (const QString &formula, qreal value); + void SetRadius1 (qreal value); qreal GetRadius1 () const; QString GetFormulaRadius2 () const; void SetFormulaRadius2 (const QString &formula, qreal value); + void SetRadius2 (qreal value); qreal GetRadius2 () const; virtual qreal GetLength () const override; diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/vgeometry/vgeometrydef.h valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/vgeometry/vgeometrydef.h --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/vgeometry/vgeometrydef.h 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/vgeometry/vgeometrydef.h 2021-07-01 18:31:54.000000000 +0000 @@ -97,7 +97,7 @@ }; Q_DECLARE_METATYPE(VLayoutPassmark) -constexpr qreal accuracyPointOnLine = (0.138/*mm*/ / 25.4) * PrintDPI; +constexpr qreal accuracyPointOnLine = (0.1555/*mm*/ / 25.4) * PrintDPI; Q_REQUIRED_RESULT static inline bool VFuzzyComparePoints(const QPointF &p1, const QPointF &p2, qreal accuracy = accuracyPointOnLine); diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/vlayout/vlayoutexporter.cpp valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/vlayout/vlayoutexporter.cpp --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/vlayout/vlayoutexporter.cpp 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/vlayout/vlayoutexporter.cpp 2021-07-01 18:31:54.000000000 +0000 @@ -139,6 +139,7 @@ QPainter painter; painter.begin(&generator); + painter.translate(-m_offset.x(), -m_offset.y()); painter.translate(m_margins.left(), m_margins.top()); painter.setRenderHint(QPainter::Antialiasing, true); painter.setPen(m_pen); @@ -375,6 +376,18 @@ } //--------------------------------------------------------------------------------------------------------------------- +QPointF VLayoutExporter::offset() const +{ + return m_offset; +} + +//--------------------------------------------------------------------------------------------------------------------- +void VLayoutExporter::SetOffset(QPointF newOffset) +{ + m_offset = newOffset; +} + +//--------------------------------------------------------------------------------------------------------------------- /** * @brief PdfToPs use external tool "pdftops" for converting pdf too eps or ps format. * @param params string with parameter for tool. Parameters have format: "-eps input_file out_file". Use -eps when diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/vlayout/vlayoutexporter.h valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/vlayout/vlayoutexporter.h --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/vlayout/vlayoutexporter.h 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/vlayout/vlayoutexporter.h 2021-07-01 18:31:54.000000000 +0000 @@ -90,6 +90,9 @@ static auto SupportPDFConversion() -> bool; + auto offset() const -> QPointF; + void SetOffset(QPointF newOffset); + private: QString m_fileName{}; QMarginsF m_margins{}; @@ -102,6 +105,7 @@ bool m_ignorePrinterMargins{false}; bool m_binaryDxfFormat{false}; int m_dxfVersion{0}; + QPointF m_offset{}; static void PdfToPs(const QStringList ¶ms); }; diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/vmisc/projectversion.cpp valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/vmisc/projectversion.cpp --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/vmisc/projectversion.cpp 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/vmisc/projectversion.cpp 2021-07-01 18:31:54.000000000 +0000 @@ -42,7 +42,7 @@ extern const int MAJOR_VERSION = 0; extern const int MINOR_VERSION = 7; -extern const int DEBUG_VERSION = 47; +extern const int DEBUG_VERSION = 49; extern const QString APP_VERSION_STR(QStringLiteral("%1.%2.%3.%4").arg(MAJOR_VERSION).arg(MINOR_VERSION) .arg(DEBUG_VERSION).arg(LATEST_TAG_DISTANCE)); diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/vmisc/projectversion.h valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/vmisc/projectversion.h --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/vmisc/projectversion.h 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/vmisc/projectversion.h 2021-07-01 18:31:54.000000000 +0000 @@ -49,8 +49,8 @@ // Change version number in projectversion.cpp too. // Synchronize valentina.nsi -#define VER_FILEVERSION 0,7,47 -#define VER_FILEVERSION_STR "0.7.47\0" +#define VER_FILEVERSION 0,7,49 +#define VER_FILEVERSION_STR "0.7.49\0" #define V_PRERELEASE // Mark prerelease builds @@ -66,7 +66,7 @@ //#define VER_ORIGINALFILENAME_STR "valentina.exe" // Defined in program //#define VER_PRODUCTNAME_STR "Valentina" // Defined in program -#define VER_COMPANYDOMAIN_STR "valentinaproject.bitbucket.io" +#define VER_COMPANYDOMAIN_STR "smart-pattern.com.ua" QString compilerString(); QString buildCompatibilityString(); diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/vmisc/vabstractapplication.cpp valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/vmisc/vabstractapplication.cpp --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/vmisc/vabstractapplication.cpp 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/vmisc/vabstractapplication.cpp 2021-07-01 18:31:55.000000000 +0000 @@ -198,17 +198,6 @@ #endif //--------------------------------------------------------------------------------------------------------------------- -/** - * @brief getSettings hide settings constructor. - * @return pointer to class for acssesing to settings in ini file. - */ -VCommonSettings *VAbstractApplication::Settings() -{ - SCASSERT(settings != nullptr) - return settings; -} - -//--------------------------------------------------------------------------------------------------------------------- void VAbstractApplication::LoadTranslation(const QString &locale) { if (locale.isEmpty()) @@ -326,9 +315,3 @@ return options; } - -//--------------------------------------------------------------------------------------------------------------------- -auto VAbstractApplication::VApp() -> VAbstractApplication * -{ - return qobject_cast(QCoreApplication::instance()); -} diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/vmisc/vabstractapplication.h valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/vmisc/vabstractapplication.h --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/vmisc/vabstractapplication.h 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/vmisc/vabstractapplication.h 2021-07-01 18:31:55.000000000 +0000 @@ -120,4 +120,21 @@ return loc.toString(value); } +//--------------------------------------------------------------------------------------------------------------------- +inline auto VAbstractApplication::VApp() -> VAbstractApplication * +{ + return qobject_cast(QCoreApplication::instance()); +} + +//--------------------------------------------------------------------------------------------------------------------- +/** + * @brief getSettings hide settings constructor. + * @return pointer to class for acssesing to settings in ini file. + */ +inline VCommonSettings *VAbstractApplication::Settings() +{ + SCASSERT(settings != nullptr) + return settings; +} + #endif // VABSTRACTAPPLICATION_H diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/vmisc/vsettings.cpp valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/vmisc/vsettings.cpp --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/vmisc/vsettings.cpp 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/vmisc/vsettings.cpp 2021-07-01 18:31:55.000000000 +0000 @@ -104,6 +104,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingNestingTime, (QLatin1String("layout/time"))) Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingEfficiencyCoefficient, (QLatin1String("layout/efficiencyCoefficient"))) Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingLayoutExportFormat, (QLatin1String("layout/exportFormat"))) +Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingDetailExportFormat, (QLatin1String("detail/exportFormat"))) Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingTiledPDFPaperHeight, (QLatin1String("tiledPDF/paperHeight"))) Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingTiledPDFPaperWidth, (QLatin1String("tiledPDF/paperWidth"))) @@ -784,6 +785,18 @@ } //--------------------------------------------------------------------------------------------------------------------- +qint8 VSettings::GetDetailExportFormat() const +{ + return qvariant_cast(value(*settingDetailExportFormat, 0)); +} + +//--------------------------------------------------------------------------------------------------------------------- +void VSettings::SetDetailExportFormat(qint8 format) +{ + setValue(*settingDetailExportFormat, format); +} + +//--------------------------------------------------------------------------------------------------------------------- template T VSettings::GetCachedValue(T &cache, const QString &setting, T defValue, T valueMin, T valueMax) const { diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/vmisc/vsettings.h valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/vmisc/vsettings.h --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/vmisc/vsettings.h 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/vmisc/vsettings.h 2021-07-01 18:31:55.000000000 +0000 @@ -206,6 +206,9 @@ auto GetLayoutExportFormat() const -> qint8; void SetLayoutExportFormat(qint8 format); + auto GetDetailExportFormat() const -> qint8; + void SetDetailExportFormat(qint8 format); + private: Q_DISABLE_COPY(VSettings) diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/vobj/vobjengine.cpp valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/vobj/vobjengine.cpp --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/vobj/vobjengine.cpp 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/vobj/vobjengine.cpp 2021-07-01 18:31:55.000000000 +0000 @@ -128,10 +128,10 @@ stream = QSharedPointer(new QTextStream(outputDevice.data())); #if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) *stream << "# Valentina OBJ File" << endl; - *stream << "# valentinaproject.bitbucket.io/" << endl; + *stream << "# smart-pattern.com.ua/" << endl; #else *stream << "# Valentina OBJ File" << Qt::endl; - *stream << "# valentinaproject.bitbucket.io/" << Qt::endl; + *stream << "# smart-pattern.com.ua/" << Qt::endl; #endif return true; } diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/vpatterndb/vpassmark.cpp valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/vpatterndb/vpassmark.cpp --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/vpatterndb/vpassmark.cpp 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/vpatterndb/vpassmark.cpp 2021-07-01 18:31:55.000000000 +0000 @@ -831,12 +831,20 @@ } else { - const QString errorMsg = QObject::tr("Cannot calculate a notch for point '%1' in piece '%2' with built in " - "seam allowance. User must manually provide length.") - .arg(m_data.nodeName, m_data.pieceName); - VAbstractApplication::VApp()->IsPedantic() ? throw VExceptionInvalidNotch(errorMsg) : - qWarning() << VAbstractValApplication::warningMessageSignature + errorMsg; - return QVector(); + if (m_data.globalPassmarkLength > accuracyPointOnLine) + { + length = m_data.globalPassmarkLength; + } + else + { + const QString errorMsg = QObject::tr("Cannot calculate a notch for point '%1' in piece '%2' with built " + "in seam allowance. User must manually provide length.") + .arg(m_data.nodeName, m_data.pieceName); + VAbstractApplication::VApp()->IsPedantic() + ? throw VExceptionInvalidNotch(errorMsg) + : qWarning() << VAbstractValApplication::warningMessageSignature + errorMsg; + return {}; + } } } diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/vtest/abstracttest.cpp valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/vtest/abstracttest.cpp --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/vtest/abstracttest.cpp 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/vtest/abstracttest.cpp 2021-07-01 18:31:55.000000000 +0000 @@ -241,12 +241,12 @@ AbstractTest::ReadStringValue(passmarkData, QStringLiteral("pieceName"), pieceName); data.pieceName = pieceName; - PassmarkLineType passmarkLineType; + PassmarkLineType passmarkLineType = PassmarkLineType::OneLine; AbstractTest::ReadDoubleValue(passmarkData, QStringLiteral("passmarkLineType"), passmarkLineType, QString::number(static_cast(PassmarkLineType::OneLine))); data.passmarkLineType = passmarkLineType; - PassmarkAngleType passmarkAngleType; + PassmarkAngleType passmarkAngleType = PassmarkAngleType::Straightforward; AbstractTest::ReadDoubleValue(passmarkData, QStringLiteral("passmarkAngleType"), passmarkAngleType, QString::number(static_cast(PassmarkAngleType::Straightforward))); data.passmarkAngleType = passmarkAngleType; @@ -259,11 +259,11 @@ AbstractTest::ReadBooleanValue(passmarkData, QStringLiteral("isShowSecondPassmark"), isShowSecondPassmark); data.isShowSecondPassmark = isShowSecondPassmark; - int passmarkIndex; + int passmarkIndex = -1; AbstractTest::ReadDoubleValue(passmarkData, QStringLiteral("passmarkIndex"), passmarkIndex, QStringLiteral("-1")); data.passmarkIndex = passmarkIndex; - vidtype id; + vidtype id = NULL_ID; AbstractTest::ReadDoubleValue(passmarkData, QStringLiteral("id"), id, QString::number(NULL_ID)); data.id = id; @@ -891,7 +891,7 @@ AbstractTest::ReadDoubleValue(itemObject, QStringLiteral("saAfter"), saAfter, QStringLiteral("-1")); point.SetSAAfter(saAfter); - PieceNodeAngle angleType; + PieceNodeAngle angleType = PieceNodeAngle::ByLength; AbstractTest::ReadDoubleValue(itemObject, QStringLiteral("angle"), angleType, QString::number(static_cast(PieceNodeAngle::ByLength))); point.SetAngleType(angleType); diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/vwidgets/vgraphicssimpletextitem.cpp valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/vwidgets/vgraphicssimpletextitem.cpp --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/vwidgets/vgraphicssimpletextitem.cpp 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/vwidgets/vgraphicssimpletextitem.cpp 2021-07-01 18:31:55.000000000 +0000 @@ -125,14 +125,17 @@ void VGraphicsSimpleTextItem::setEnabled(bool enabled) { QGraphicsSimpleTextItem::setEnabled(enabled); - const QPalette palet = this->scene()->palette(); - if (enabled) + if (this->scene()) { - setBrush(palet.brush(QPalette::Active, QPalette::Text)); - } - else - { - setBrush(palet.brush(QPalette::Disabled, QPalette::Text)); + const QPalette palet = this->scene()->palette(); + if (enabled) + { + setBrush(palet.brush(QPalette::Active, QPalette::Text)); + } + else + { + setBrush(palet.brush(QPalette::Disabled, QPalette::Text)); + } } } diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/vwidgets/vmaingraphicsscene.cpp valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/vwidgets/vmaingraphicsscene.cpp --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/libs/vwidgets/vmaingraphicsscene.cpp 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/libs/vwidgets/vmaingraphicsscene.cpp 2021-07-01 18:31:55.000000000 +0000 @@ -221,9 +221,9 @@ //--------------------------------------------------------------------------------------------------------------------- void VMainGraphicsScene::SetOriginsVisible(bool visible) { - for (auto item : qAsConst(origins)) + for (auto *item : qAsConst(origins)) { - if (item) + if (item != nullptr) { item->setVisible(visible); } diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/doll/output.json valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/doll/output.json --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/doll/output.json 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/doll/output.json 2021-07-01 18:31:56.000000000 +0000 @@ -112,11 +112,6 @@ }, { "type": "QPointF", - "x": 331.48273454480426, - "y": 104.45283583549359 - }, - { - "type": "QPointF", "x": 332.2173315417802, "y": 105.88700933180093 }, diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_642/output.json valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_642/output.json --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_642/output.json 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_642/output.json 2021-07-01 18:31:56.000000000 +0000 @@ -172,11 +172,6 @@ }, { "type": "QPointF", - "x": 2797.565477459869, - "y": 778.332404004272 - }, - { - "type": "QPointF", "x": 2798.0441679430687, "y": 888.6231149546354 }, diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test1/output.json valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test1/output.json --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test1/output.json 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test1/output.json 2021-07-01 18:31:56.000000000 +0000 @@ -152,13 +152,8 @@ }, { "type": "QPointF", - "x": -375.5837936477569, - "y": 385.67430269319027 - }, - { - "type": "QPointF", - "x": -394.93507981176816, - "y": 387.02124656268006 + "x": -394.4224543531813, + "y": 386.9889713429367 }, { "type": "QPointF", @@ -197,13 +192,8 @@ }, { "type": "QPointF", - "x": -740.1638197010636, - "y": 383.4834023373132 - }, - { - "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -739.6019742862287, + "y": 383.5327301728105 }, { "type": "QPointF", diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test1_1/output.json valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test1_1/output.json --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test1_1/output.json 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test1_1/output.json 2021-07-01 18:31:56.000000000 +0000 @@ -147,13 +147,8 @@ }, { "type": "QPointF", - "x": -375.5837936477569, - "y": 385.67430269319027 - }, - { - "type": "QPointF", - "x": -394.93507981176816, - "y": 387.02124656268006 + "x": -394.4224543531813, + "y": 386.9889713429367 }, { "type": "QPointF", @@ -192,13 +187,8 @@ }, { "type": "QPointF", - "x": -740.1638197010636, - "y": 383.4834023373132 - }, - { - "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -739.6019742862287, + "y": 383.5327301728105 }, { "type": "QPointF", diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test2/output.json valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test2/output.json --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test2/output.json 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test2/output.json 2021-07-01 18:31:56.000000000 +0000 @@ -152,13 +152,8 @@ }, { "type": "QPointF", - "x": -375.5837936477569, - "y": 385.67430269319027 - }, - { - "type": "QPointF", - "x": -394.93507981176816, - "y": 387.02124656268006 + "x": -394.4224543531813, + "y": 386.9889713429367 }, { "type": "QPointF", @@ -197,13 +192,8 @@ }, { "type": "QPointF", - "x": -740.1638197010636, - "y": 383.4834023373132 - }, - { - "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -739.6019742862287, + "y": 383.5327301728105 }, { "type": "QPointF", diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test2_2/output.json valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test2_2/output.json --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test2_2/output.json 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test2_2/output.json 2021-07-01 18:31:56.000000000 +0000 @@ -152,13 +152,8 @@ }, { "type": "QPointF", - "x": -375.5837936477569, - "y": 385.67430269319027 - }, - { - "type": "QPointF", - "x": -394.93507981176816, - "y": 387.02124656268006 + "x": -394.4224543531813, + "y": 386.9889713429367 }, { "type": "QPointF", @@ -197,13 +192,8 @@ }, { "type": "QPointF", - "x": -740.1638197010636, - "y": 383.4834023373132 - }, - { - "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -739.6019742862287, + "y": 383.5327301728105 }, { "type": "QPointF", diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test3/output.json valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test3/output.json --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test3/output.json 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test3/output.json 2021-07-01 18:31:56.000000000 +0000 @@ -152,13 +152,8 @@ }, { "type": "QPointF", - "x": -375.5837936477569, - "y": 385.67430269319027 - }, - { - "type": "QPointF", - "x": -394.93507981176816, - "y": 387.02124656268006 + "x": -394.4224543531813, + "y": 386.9889713429367 }, { "type": "QPointF", @@ -197,13 +192,8 @@ }, { "type": "QPointF", - "x": -740.1638197010636, - "y": 383.4834023373132 - }, - { - "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -739.6019742862287, + "y": 383.5327301728105 }, { "type": "QPointF", diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test3_3/output.json valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test3_3/output.json --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test3_3/output.json 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test3_3/output.json 2021-07-01 18:31:56.000000000 +0000 @@ -152,13 +152,8 @@ }, { "type": "QPointF", - "x": -375.5837936477569, - "y": 385.67430269319027 - }, - { - "type": "QPointF", - "x": -394.93507981176816, - "y": 387.02124656268006 + "x": -394.4224543531813, + "y": 386.9889713429367 }, { "type": "QPointF", @@ -197,13 +192,8 @@ }, { "type": "QPointF", - "x": -740.1638197010636, - "y": 383.4834023373132 - }, - { - "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -739.6019742862287, + "y": 383.5327301728105 }, { "type": "QPointF", diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test4/output.json valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test4/output.json --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test4/output.json 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test4/output.json 2021-07-01 18:31:56.000000000 +0000 @@ -152,13 +152,8 @@ }, { "type": "QPointF", - "x": -375.5837936477569, - "y": 385.67430269319027 - }, - { - "type": "QPointF", - "x": -394.93507981176816, - "y": 387.02124656268006 + "x": -394.4224543531813, + "y": 386.9889713429367 }, { "type": "QPointF", @@ -197,13 +192,8 @@ }, { "type": "QPointF", - "x": -740.1638197010636, - "y": 383.4834023373132 - }, - { - "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -739.6019742862287, + "y": 383.5327301728105 }, { "type": "QPointF", diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test4_4/output.json valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test4_4/output.json --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test4_4/output.json 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test4_4/output.json 2021-07-01 18:31:56.000000000 +0000 @@ -147,13 +147,8 @@ }, { "type": "QPointF", - "x": -375.5837936477569, - "y": 385.67430269319027 - }, - { - "type": "QPointF", - "x": -394.93507981176816, - "y": 387.02124656268006 + "x": -394.4224543531813, + "y": 386.9889713429367 }, { "type": "QPointF", @@ -192,13 +187,8 @@ }, { "type": "QPointF", - "x": -740.1638197010636, - "y": 383.4834023373132 - }, - { - "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -739.6019742862287, + "y": 383.5327301728105 }, { "type": "QPointF", diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test5/output.json valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test5/output.json --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test5/output.json 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test5/output.json 2021-07-01 18:31:56.000000000 +0000 @@ -152,13 +152,8 @@ }, { "type": "QPointF", - "x": -375.5837936477569, - "y": 385.67430269319027 - }, - { - "type": "QPointF", - "x": -394.93507981176816, - "y": 387.02124656268006 + "x": -394.4224543531813, + "y": 386.9889713429367 }, { "type": "QPointF", @@ -197,13 +192,8 @@ }, { "type": "QPointF", - "x": -740.1638197010636, - "y": 383.4834023373132 - }, - { - "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -739.6019742862287, + "y": 383.5327301728105 }, { "type": "QPointF", diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test5_5/output.json valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test5_5/output.json --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test5_5/output.json 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test5_5/output.json 2021-07-01 18:31:56.000000000 +0000 @@ -152,13 +152,8 @@ }, { "type": "QPointF", - "x": -375.5837936477569, - "y": 385.67430269319027 - }, - { - "type": "QPointF", - "x": -394.93507981176816, - "y": 387.02124656268006 + "x": -394.4224543531813, + "y": 386.9889713429367 }, { "type": "QPointF", @@ -197,13 +192,8 @@ }, { "type": "QPointF", - "x": -740.1638197010636, - "y": 383.4834023373132 - }, - { - "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -739.6019742862287, + "y": 383.5327301728105 }, { "type": "QPointF", diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test6/output.json valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test6/output.json --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test6/output.json 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test6/output.json 2021-07-01 18:31:56.000000000 +0000 @@ -152,13 +152,8 @@ }, { "type": "QPointF", - "x": -375.5837936477569, - "y": 385.67430269319027 - }, - { - "type": "QPointF", - "x": -394.93507981176816, - "y": 387.02124656268006 + "x": -394.4224543531813, + "y": 386.9889713429367 }, { "type": "QPointF", @@ -197,13 +192,8 @@ }, { "type": "QPointF", - "x": -740.1638197010636, - "y": 383.4834023373132 - }, - { - "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -739.6019742862287, + "y": 383.5327301728105 }, { "type": "QPointF", diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test6_6/output.json valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test6_6/output.json --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test6_6/output.json 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test6_6/output.json 2021-07-01 18:31:56.000000000 +0000 @@ -147,13 +147,8 @@ }, { "type": "QPointF", - "x": -375.5837936477569, - "y": 385.67430269319027 - }, - { - "type": "QPointF", - "x": -394.93507981176816, - "y": 387.02124656268006 + "x": -394.4224543531813, + "y": 386.9889713429367 }, { "type": "QPointF", @@ -192,13 +187,8 @@ }, { "type": "QPointF", - "x": -740.1638197010636, - "y": 383.4834023373132 - }, - { - "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -739.6019742862287, + "y": 383.5327301728105 }, { "type": "QPointF", diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test7_1/output.json valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test7_1/output.json --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test7_1/output.json 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test7_1/output.json 2021-07-01 18:31:56.000000000 +0000 @@ -97,13 +97,8 @@ }, { "type": "QPointF", - "x": -375.5837936477569, - "y": 385.67430269319027 - }, - { - "type": "QPointF", - "x": -394.93507981176816, - "y": 387.02124656268006 + "x": -394.4224543531813, + "y": 386.9889713429367 }, { "type": "QPointF", @@ -142,13 +137,8 @@ }, { "type": "QPointF", - "x": -740.1638197010636, - "y": 383.4834023373132 - }, - { - "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -739.6019742862287, + "y": 383.5327301728105 }, { "type": "QPointF", diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test7_2/output.json valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test7_2/output.json --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test7_2/output.json 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test7_2/output.json 2021-07-01 18:31:56.000000000 +0000 @@ -102,13 +102,8 @@ }, { "type": "QPointF", - "x": -375.5837936477569, - "y": 385.67430269319027 - }, - { - "type": "QPointF", - "x": -394.93507981176816, - "y": 387.02124656268006 + "x": -394.4224543531813, + "y": 386.9889713429367 }, { "type": "QPointF", @@ -147,13 +142,8 @@ }, { "type": "QPointF", - "x": -740.1638197010636, - "y": 383.4834023373132 - }, - { - "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -739.6019742862287, + "y": 383.5327301728105 }, { "type": "QPointF", diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test7_3/output.json valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test7_3/output.json --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test7_3/output.json 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/Issue_923_test7_3/output.json 2021-07-01 18:31:56.000000000 +0000 @@ -147,13 +147,8 @@ }, { "type": "QPointF", - "x": -375.5837936477569, - "y": 385.67430269319027 - }, - { - "type": "QPointF", - "x": -394.93507981176816, - "y": 387.02124656268006 + "x": -394.4224543531813, + "y": 386.9889713429367 }, { "type": "QPointF", @@ -192,13 +187,8 @@ }, { "type": "QPointF", - "x": -740.1638197010636, - "y": 383.4834023373132 - }, - { - "type": "QPointF", - "x": -756.9739837313467, - "y": 381.8746246893899 + "x": -739.6019742862287, + "y": 383.5327301728105 }, { "type": "QPointF", diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/loop_by_intersection/output.json valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/loop_by_intersection/output.json --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/loop_by_intersection/output.json 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/loop_by_intersection/output.json 2021-07-01 18:31:56.000000000 +0000 @@ -2,13 +2,13 @@ "vector": [ { "type": "QPointF", - "x": -214.69613672918854, - "y": 105.50483675932705 + "x": -216.6438440863518, + "y": 101.30502907435505 }, { "type": "QPointF", - "x": -217.06541703221671, - "y": -20.396250591591283 + "x": -215.90873077439113, + "y": -22.890393162266093 }, { "type": "QPointF", @@ -292,8 +292,8 @@ }, { "type": "QPointF", - "x": -214.69613672918854, - "y": 105.50483675932705 + "x": -216.6438440863518, + "y": 101.30502907435505 } ] } diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/loop_start_point_on_line/output.json valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/loop_start_point_on_line/output.json --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/loop_start_point_on_line/output.json 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/loop_start_point_on_line/output.json 2021-07-01 18:31:56.000000000 +0000 @@ -17,18 +17,18 @@ }, { "type": "QPointF", - "x": -2083.1478929409827, - "y": -1220.0868889606825 + "x": -2082.7202896908407, + "y": -1220.2021340324343 }, { "type": "QPointF", - "x": -2056.8141936259476, - "y": -1225.6770902684877 + "x": -2057.1296527192585, + "y": -1225.0231603699012 }, { "type": "QPointF", - "x": -2029.2249477701505, - "y": -1230.8064422813395 + "x": -2030.268678428484, + "y": -1230.6480813100734 }, { "type": "QPointF", @@ -122,11 +122,6 @@ }, { "type": "QPointF", - "x": -1581.1249477487709, - "y": -1139.9848040550612 - }, - { - "type": "QPointF", "x": -1574.7272893318411, "y": -1133.4913295743909 }, @@ -312,11 +307,6 @@ }, { "type": "QPointF", - "x": -1990.4276010223648, - "y": -91.09922907737571 - }, - { - "type": "QPointF", "x": -1997.2051328041664, "y": -82.58752869213653 }, diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/seamtest1_by_angle/output.json valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/seamtest1_by_angle/output.json --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/seamtest1_by_angle/output.json 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/seamtest1_by_angle/output.json 2021-07-01 18:31:56.000000000 +0000 @@ -227,21 +227,11 @@ }, { "type": "QPointF", - "x": 1078.7265805419665, - "y": 699.565875909043 - }, - { - "type": "QPointF", "x": 1083.206554246492, "y": 701.1878034134409 }, { "type": "QPointF", - "x": 1087.891993301369, - "y": 702.5858632116882 - }, - { - "type": "QPointF", "x": 1092.8646688655851, "y": 703.7605199081748 }, diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/seamtest1_by_angle_2/output.json valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/seamtest1_by_angle_2/output.json --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/seamtest1_by_angle_2/output.json 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/seamtest1_by_angle_2/output.json 2021-07-01 18:31:56.000000000 +0000 @@ -7,8 +7,8 @@ }, { "type": "QPointF", - "x": 1101.8482040478996, - "y": 244.8082798528157 + "x": 1102.2898194097418, + "y": 245.01541704287078 }, { "type": "QPointF", @@ -142,21 +142,11 @@ }, { "type": "QPointF", - "x": 1078.7265805419665, - "y": 699.565875909043 - }, - { - "type": "QPointF", "x": 1083.206554246492, "y": 701.1878034134409 }, { "type": "QPointF", - "x": 1087.891993301369, - "y": 702.5858632116882 - }, - { - "type": "QPointF", "x": 1092.8646688655851, "y": 703.7605199081748 }, diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/seamtest1_by_first_edge_symmetry/output.json valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/seamtest1_by_first_edge_symmetry/output.json --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/seamtest1_by_first_edge_symmetry/output.json 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/seamtest1_by_first_edge_symmetry/output.json 2021-07-01 18:31:56.000000000 +0000 @@ -242,21 +242,11 @@ }, { "type": "QPointF", - "x": 1078.7265805419665, - "y": 699.565875909043 - }, - { - "type": "QPointF", "x": 1083.206554246492, "y": 701.1878034134409 }, { "type": "QPointF", - "x": 1087.891993301369, - "y": 702.5858632116882 - }, - { - "type": "QPointF", "x": 1092.8646688655851, "y": 703.7605199081748 }, diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/seamtest1_by_first_right_angle/output.json valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/seamtest1_by_first_right_angle/output.json --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/seamtest1_by_first_right_angle/output.json 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/seamtest1_by_first_right_angle/output.json 2021-07-01 18:31:56.000000000 +0000 @@ -242,21 +242,11 @@ }, { "type": "QPointF", - "x": 1078.7265805419665, - "y": 699.565875909043 - }, - { - "type": "QPointF", "x": 1083.206554246492, "y": 701.1878034134409 }, { "type": "QPointF", - "x": 1087.891993301369, - "y": 702.5858632116882 - }, - { - "type": "QPointF", "x": 1092.8646688655851, "y": 703.7605199081748 }, diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/seamtest1_by_intersection/output.json valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/seamtest1_by_intersection/output.json --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/seamtest1_by_intersection/output.json 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/seamtest1_by_intersection/output.json 2021-07-01 18:31:56.000000000 +0000 @@ -232,21 +232,11 @@ }, { "type": "QPointF", - "x": 1078.7265805419665, - "y": 699.565875909043 - }, - { - "type": "QPointF", "x": 1083.206554246492, "y": 701.1878034134409 }, { "type": "QPointF", - "x": 1087.891993301369, - "y": 702.5858632116882 - }, - { - "type": "QPointF", "x": 1092.8646688655851, "y": 703.7605199081748 }, diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/seamtest1_by_second_edge_symmetry/output.json valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/seamtest1_by_second_edge_symmetry/output.json --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/seamtest1_by_second_edge_symmetry/output.json 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/seamtest1_by_second_edge_symmetry/output.json 2021-07-01 18:31:56.000000000 +0000 @@ -232,21 +232,11 @@ }, { "type": "QPointF", - "x": 1078.7265805419665, - "y": 699.565875909043 - }, - { - "type": "QPointF", "x": 1083.206554246492, "y": 701.1878034134409 }, { "type": "QPointF", - "x": 1087.891993301369, - "y": 702.5858632116882 - }, - { - "type": "QPointF", "x": 1092.8646688655851, "y": 703.7605199081748 }, diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/seamtest1_by_second_right_angle/output.json valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/seamtest1_by_second_right_angle/output.json --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/seamtest1_by_second_right_angle/output.json 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/seamtest1_by_second_right_angle/output.json 2021-07-01 18:31:56.000000000 +0000 @@ -67,13 +67,8 @@ }, { "type": "QPointF", - "x": 284.4390076163077, - "y": -68.44485122652873 - }, - { - "type": "QPointF", - "x": 284.5734311894892, - "y": -68.99248415563486 + "x": 284.4959443876258, + "y": -68.43087536087263 }, { "type": "QPointF", @@ -232,21 +227,11 @@ }, { "type": "QPointF", - "x": 1078.7265805419665, - "y": 699.565875909043 - }, - { - "type": "QPointF", "x": 1083.206554246492, "y": 701.1878034134409 }, { "type": "QPointF", - "x": 1087.891993301369, - "y": 702.5858632116882 - }, - { - "type": "QPointF", "x": 1092.8646688655851, "y": 703.7605199081748 }, diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/smart_pattern_#120_piece_1/output.json valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/smart_pattern_#120_piece_1/output.json --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/smart_pattern_#120_piece_1/output.json 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/smart_pattern_#120_piece_1/output.json 2021-07-01 18:31:56.000000000 +0000 @@ -262,11 +262,6 @@ }, { "type": "QPointF", - "x": 941.1480338176947, - "y": 1598.7097479128342 - }, - { - "type": "QPointF", "x": 929.6966471777685, "y": 1598.195756755684 }, diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/smart_pattern_#120_piece_2/output.json valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/smart_pattern_#120_piece_2/output.json --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/smart_pattern_#120_piece_2/output.json 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/smart_pattern_#120_piece_2/output.json 2021-07-01 18:31:56.000000000 +0000 @@ -2,23 +2,18 @@ "vector": [ { "type": "QPointF", - "x": 692.3263132377243, - "y": 425.0598484090772 + "x": 692.3267996783844, + "y": 425.0547824881589 }, { "type": "QPointF", - "x": 729.9485435174106, - "y": 428.6724161589221 + "x": 729.9490299580725, + "y": 428.66735023800396 }, { "type": "QPointF", - "x": 902.8367306099547, - "y": 438.0946986997068 - }, - { - "type": "QPointF", - "x": 1047.2274990256597, - "y": 444.9608350659975 + "x": 1047.3703808444025, + "y": 444.96790138807927 }, { "type": "QPointF", @@ -47,8 +42,8 @@ }, { "type": "QPointF", - "x": 1779.204057451268, - "y": 460.15036806979015 + "x": 1779.4842113185928, + "y": 460.1465274137461 }, { "type": "QPointF", @@ -117,8 +112,8 @@ }, { "type": "QPointF", - "x": 1986.4149731529892, - "y": 1450.5996057600491 + "x": 1986.415017807355, + "y": 1450.5995504284354 }, { "type": "QPointF", @@ -142,8 +137,8 @@ }, { "type": "QPointF", - "x": 2100.6375771334715, - "y": 1515.7770650603459 + "x": 2101.0413693548594, + "y": 1515.9306231177372 }, { "type": "QPointF", @@ -197,8 +192,8 @@ }, { "type": "QPointF", - "x": 692.3263132377243, - "y": 425.0598484090772 + "x": 692.3267996783844, + "y": 425.0547824881589 } ] } diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/smart_pattern_#133/input.json valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/smart_pattern_#133/input.json --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/smart_pattern_#133/input.json 1970-01-01 00:00:00.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/smart_pattern_#133/input.json 2021-07-01 18:31:56.000000000 +0000 @@ -0,0 +1,286 @@ +{ + "vector": [ + { + "angle": 4, + "saAfter": 37.795275590551185, + "type": "VSAPoint", + "x": 2929.9770747304974, + "y": -276.4297327130487 + }, + { + "angle": 4, + "saAfter": 37.795275590551185, + "type": "VSAPoint", + "x": 2929.494592436758, + "y": -276.7606225402938 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3020.6267648722614, + "y": -214.2615232263168 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3088.3164558816297, + "y": -169.50935896803173 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3129.0516855236456, + "y": -143.6575896644236 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3146.9122431535925, + "y": -132.85807100626303 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3182.3207891081, + "y": -111.31224886884328 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3240.854911582732, + "y": -74.8319142840869 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3282.194746084433, + "y": -49.82580136992735 + }, + { + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3310.2958622918845, + "y": -33.638475438863175 + }, + { + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3310.2958622918845, + "y": -33.638475438863175 + }, + { + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3310.2958622918845, + "y": -33.638475438863175 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3325.1763277140276, + "y": -25.257860139156612 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3369.4782848426557, + "y": -2.0857627157284724 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3403.4016107132747, + "y": 13.705195402949922 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3426.2415849998115, + "y": 23.34654364295037 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3449.230881619873, + "y": 32.10024036139115 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3472.3293291198524, + "y": 39.84657654277807 + }, + { + "angle": 5, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3483.9089681080395, + "y": 43.255120195555406 + }, + { + "angle": 5, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3483.9089681080395, + "y": 43.255120195555406 + }, + { + "angle": 4, + "saAfter": 37.795275590551185, + "type": "VSAPoint", + "x": 3447.5678964202975, + "y": 170.44883665362593 + }, + { + "angle": 4, + "saAfter": 37.795275590551185, + "type": "VSAPoint", + "x": 3447.5678964202975, + "y": 170.44883665362593 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3389.1244783120674, + "y": 153.77793257366946 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3252.3200130171417, + "y": 115.54965743238373 + }, + { + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3247.8444514992034, + "y": 114.3583692773959 + }, + { + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3247.8444514992034, + "y": 114.3583692773959 + }, + { + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3247.8444514992034, + "y": 114.3583692773959 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3173.1572046119477, + "y": 94.31817557366725 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3147.756296486791, + "y": 88.1473890182314 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3122.245206035337, + "y": 82.25776665675014 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 3041.9854088227075, + "y": 64.30895193326627 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 2972.2752985376483, + "y": 49.89666830709157 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 2927.2740602422737, + "y": 41.446379094112636 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 2886.864263786687, + "y": 34.93216727832491 + }, + { + "angle": 6, + "saAfter": 37.795275590551185, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 2854.15352003896, + "y": 31.234718533530163 + }, + { + "angle": 5, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 2842.1714408688977, + "y": 30.88990256838886 + }, + { + "angle": 5, + "saBefore": 37.795275590551185, + "type": "VSAPoint", + "x": 2842.1714408688977, + "y": 30.88990256838886 + } + ] +} diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/smart_pattern_#133/output.json valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/smart_pattern_#133/output.json --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/smart_pattern_#133/output.json 1970-01-01 00:00:00.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/smart_pattern_#133/output.json 2021-07-01 18:31:56.000000000 +0000 @@ -0,0 +1,144 @@ +{ + "vector": [ + { + "type": "QPointF", + "x": 2914.8751101032244, + "y": -322.14660963573755 + }, + { + "type": "QPointF", + "x": 2940.3264245982937, + "y": -314.92253942662785 + }, + { + "type": "QPointF", + "x": 3041.9531023346835, + "y": -245.46521190898392 + }, + { + "type": "QPointF", + "x": 3108.6971255127173, + "y": -200.96114841642915 + }, + { + "type": "QPointF", + "x": 3148.9580710534224, + "y": -175.78835654256642 + }, + { + "type": "QPointF", + "x": 3201.9395957269226, + "y": -143.55493133873182 + }, + { + "type": "QPointF", + "x": 3261.1271882374804, + "y": -107.36170019590531 + }, + { + "type": "QPointF", + "x": 3301.3564050369955, + "y": -82.40696567509488 + }, + { + "type": "QPointF", + "x": 3343.3191765382894, + "y": -58.4213684718917 + }, + { + "type": "QPointF", + "x": 3386.2208551896647, + "y": -35.981685402091905 + }, + { + "type": "QPointF", + "x": 3418.7308452277093, + "y": -20.848620528460394 + }, + { + "type": "QPointF", + "x": 3440.319979440316, + "y": -11.735284474201483 + }, + { + "type": "QPointF", + "x": 3461.9693959581145, + "y": -3.4917775300772096 + }, + { + "type": "QPointF", + "x": 3483.678198210371, + "y": 3.788524764758021 + }, + { + "type": "QPointF", + "x": 3519.731204659397, + "y": 14.18111796688273 + }, + { + "type": "QPointF", + "x": 3462.6234754097254, + "y": 214.0581162062353 + }, + { + "type": "QPointF", + "x": 3378.7569662168626, + "y": 190.12346255909503 + }, + { + "type": "QPointF", + "x": 3242.1482695261966, + "y": 151.95046087571671 + }, + { + "type": "QPointF", + "x": 3163.799392078877, + "y": 130.9394133995313 + }, + { + "type": "QPointF", + "x": 3138.833989122527, + "y": 124.87442658272099 + }, + { + "type": "QPointF", + "x": 3034.0345168547487, + "y": 101.25971932387034 + }, + { + "type": "QPointF", + "x": 2964.9609699226594, + "y": 86.97904259878241 + }, + { + "type": "QPointF", + "x": 2920.7778125684367, + "y": 78.68237183752217 + }, + { + "type": "QPointF", + "x": 2881.731281757689, + "y": 72.38792359271476 + }, + { + "type": "QPointF", + "x": 2851.4826590738026, + "y": 68.96877993652426 + }, + { + "type": "QPointF", + "x": 2831.5261872065494, + "y": 68.39447976624034 + }, + { + "type": "QPointF", + "x": 2806.07487271148, + "y": 61.17040955713102 + }, + { + "type": "QPointF", + "x": 2914.8751101032244, + "y": -322.14660963573755 + } + ] +} diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/smart_pattern_#36/input.json valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/smart_pattern_#36/input.json --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/smart_pattern_#36/input.json 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/smart_pattern_#36/input.json 2021-07-01 18:31:56.000000000 +0000 @@ -247,21 +247,6 @@ "y": 22311.722834645672 }, { - "type": "VSAPoint", - "x": 29.26377334895059, - "y": 22341.839586718215 - }, - { - "type": "VSAPoint", - "x": 29.26377334895059, - "y": 22341.839586718215 - }, - { - "type": "VSAPoint", - "x": 29.26377334895059, - "y": 22341.839586718215 - }, - { "angle": 6, "type": "VSAPoint", "x": 28.81889763779528, @@ -292,6 +277,21 @@ "y": 22564.876825218627 }, { + "type": "VSAPoint", + "x": 20.500199521052405, + "y": 22612.757327074407 + }, + { + "type": "VSAPoint", + "x": 20.500199521052405, + "y": 22612.757327074407 + }, + { + "type": "VSAPoint", + "x": 20.500199521052405, + "y": 22612.757327074407 + }, + { "angle": 6, "type": "VSAPoint", "x": 19.578089601275533, diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/smart_pattern_#36/output.json valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/smart_pattern_#36/output.json --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/smart_pattern_#36/output.json 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/smart_pattern_#36/output.json 2021-07-01 18:31:56.000000000 +0000 @@ -2,13 +2,13 @@ "vector": [ { "type": "QPointF", - "x": -218.88332702810496, - "y": 21602.601187587297 + "x": -216.57559446259248, + "y": 21608.014646112726 }, { "type": "QPointF", - "x": -222.85996685366638, - "y": 21586.28344916246 + "x": -222.82601779268137, + "y": 21587.061010495858 }, { "type": "QPointF", @@ -132,8 +132,8 @@ }, { "type": "QPointF", - "x": 55.849455392117505, - "y": 22133.479634813404 + "x": 55.82641527988781, + "y": 22132.93457364255 }, { "type": "QPointF", @@ -152,8 +152,8 @@ }, { "type": "QPointF", - "x": 55.826415279887826, - "y": 22490.511095648795 + "x": 55.84945539211752, + "y": 22489.96603447794 }, { "type": "QPointF", @@ -282,18 +282,13 @@ }, { "type": "QPointF", - "x": -220.620815347658, - "y": 23026.447080003007 + "x": -220.46264595849237, + "y": 23025.538326035232 }, { "type": "QPointF", - "x": -216.13435317554772, - "y": 23014.48384648047 - }, - { - "type": "QPointF", - "x": -202.58580499399324, - "y": 22985.400282661478 + "x": -202.6052425243754, + "y": 22985.452196583858 }, { "type": "QPointF", @@ -347,8 +342,8 @@ }, { "type": "QPointF", - "x": -115.32578480080944, - "y": 22485.162420331548 + "x": -115.33334113373941, + "y": 22485.70747025547 }, { "type": "QPointF", @@ -367,8 +362,8 @@ }, { "type": "QPointF", - "x": -115.33334113373941, - "y": 22137.738199035874 + "x": -115.32578480080944, + "y": 22138.283248959797 }, { "type": "QPointF", @@ -422,13 +417,13 @@ }, { "type": "QPointF", - "x": -202.6152214315237, - "y": 21637.97693416576 + "x": -202.58580499399324, + "y": 21638.045386629867 }, { "type": "QPointF", - "x": -218.88332702810496, - "y": 21602.601187587297 + "x": -216.57559446259248, + "y": 21608.014646112726 } ] } diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/smart_pattern_#99/output.json valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/smart_pattern_#99/output.json --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/smart_pattern_#99/output.json 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/smart_pattern_#99/output.json 2021-07-01 18:31:56.000000000 +0000 @@ -2,38 +2,38 @@ "vector": [ { "type": "QPointF", - "x": 166.2793358771866, - "y": 317.0063195835933 + "x": 166.02062314300517, + "y": 312.9788859158875 }, { "type": "QPointF", - "x": 165.64505339863834, - "y": 297.1143398796336 + "x": 165.70933046188543, + "y": 293.23000247811854 }, { "type": "QPointF", - "x": 166.1722452473025, - "y": 280.2244654294098 + "x": 167.30604170523088, + "y": 274.50013264093303 }, { "type": "QPointF", - "x": 166.16205798196063, - "y": 276.72549910116425 + "x": 167.19749972538847, + "y": 269.95767347494336 }, { "type": "QPointF", - "x": 168.97844031610092, - "y": 256.82932371757767 + "x": 167.28869518172655, + "y": 266.6239856783655 }, { "type": "QPointF", - "x": 173.11677764302698, - "y": 240.88394423619718 + "x": 171.2459135294844, + "y": 247.0901582437869 }, { "type": "QPointF", - "x": 178.0948003175508, - "y": 228.9419652712462 + "x": 176.64841312963426, + "y": 231.89367477880018 }, { "type": "QPointF", @@ -47,8 +47,8 @@ }, { "type": "QPointF", - "x": 185.99757111618186, - "y": 217.49928602474253 + "x": 186.39376078521363, + "y": 217.17940045276504 }, { "type": "QPointF", @@ -82,18 +82,13 @@ }, { "type": "QPointF", - "x": 255.24575032218632, - "y": 191.05145610681262 + "x": 258.32256210111353, + "y": 190.9510874021363 }, { "type": "QPointF", - "x": 277.95765129804875, - "y": 191.65321329780488 - }, - { - "type": "QPointF", - "x": 285.5408358146581, - "y": 192.855354584027 + "x": 282.88849327137484, + "y": 192.3327170360014 }, { "type": "QPointF", @@ -107,28 +102,28 @@ }, { "type": "QPointF", - "x": 308.61498933509586, - "y": 205.17662895779023 + "x": 310.57923284664963, + "y": 206.8104493101314 }, { "type": "QPointF", - "x": 317.8211186961886, - "y": 213.7039790657329 + "x": 320.37180984256605, + "y": 216.47325684819089 }, { "type": "QPointF", - "x": 326.23567071378, - "y": 223.57518983261718 + "x": 328.8995060022702, + "y": 227.14525040044498 }, { "type": "QPointF", - "x": 335.7687333062743, - "y": 237.32368245582865 + "x": 337.94611732452876, + "y": 240.8170859291849 }, { "type": "QPointF", - "x": 351.5894679236029, - "y": 263.84403704994895 + "x": 351.57469774103606, + "y": 263.8115467734212 }, { "type": "QPointF", @@ -167,8 +162,8 @@ }, { "type": "QPointF", - "x": 371.3330132939416, - "y": 177.8252966333725 + "x": 374.66587589785377, + "y": 175.5116088179777 }, { "type": "QPointF", @@ -177,13 +172,8 @@ }, { "type": "QPointF", - "x": 401.24232600874655, - "y": 162.09376642883635 - }, - { - "type": "QPointF", - "x": 416.5041370775075, - "y": 156.9754834453434 + "x": 400.5329831004733, + "y": 162.36522176917418 }, { "type": "QPointF", @@ -197,28 +187,23 @@ }, { "type": "QPointF", - "x": 434.6801823142321, - "y": 153.28952836821526 - }, - { - "type": "QPointF", - "x": 448.33671251987124, - "y": 152.809882511774 + "x": 438.0633612753594, + "y": 153.03192944510397 }, { "type": "QPointF", - "x": 465.38530369692694, - "y": 154.00600077743474 + "x": 455.2191266225963, + "y": 153.05624563323727 }, { "type": "QPointF", - "x": 475.68791359201066, - "y": 155.9902739944185 + "x": 472.13962450478647, + "y": 155.14589827825722 }, { "type": "QPointF", - "x": 484.19308368052646, - "y": 159.05322984284635 + "x": 482.43834619808706, + "y": 158.29886734863854 }, { "type": "QPointF", @@ -237,18 +222,18 @@ }, { "type": "QPointF", - "x": 529.6792386289801, - "y": 203.52841021677506 + "x": 536.0426969749838, + "y": 211.60401356856727 }, { "type": "QPointF", - "x": 559.7613549461172, - "y": 242.4936218299132 + "x": 559.4375896091323, + "y": 242.04457762986158 }, { "type": "QPointF", - "x": 569.5835818133556, - "y": 257.3121087709943 + "x": 569.311475660773, + "y": 256.86701943291433 }, { "type": "QPointF", @@ -257,13 +242,8 @@ }, { "type": "QPointF", - "x": 585.014909318949, - "y": 286.9983512578358 - }, - { - "type": "QPointF", - "x": 591.1019941479228, - "y": 302.05819169893664 + "x": 586.6374302807619, + "y": 290.77190755205044 }, { "type": "QPointF", @@ -277,28 +257,23 @@ }, { "type": "QPointF", - "x": 591.4691411901464, - "y": 336.9021533252068 + "x": 590.6510591717047, + "y": 340.91518746861993 }, { "type": "QPointF", - "x": 587.7772567627065, - "y": 353.05391040771735 + "x": 585.4872424358157, + "y": 361.2157855904426 }, { "type": "QPointF", - "x": 582.8754009676815, - "y": 369.4196601831339 + "x": 579.9229547052828, + "y": 377.65318039832954 }, { "type": "QPointF", - "x": 576.3979894710554, - "y": 386.4062544290843 - }, - { - "type": "QPointF", - "x": 568.7091425226228, - "y": 402.8846548007183 + "x": 571.8578768835727, + "y": 396.3873347680203 }, { "type": "QPointF", @@ -312,68 +287,68 @@ }, { "type": "QPointF", - "x": 528.3345265604034, - "y": 476.92160008646584 + "x": 526.817689287619, + "y": 478.6960129039927 }, { "type": "QPointF", - "x": 520.2343656529063, - "y": 485.0367289659276 + "x": 519.0740546654762, + "y": 485.9591789956344 }, { "type": "QPointF", - "x": 513.148845575274, - "y": 489.9896405767957 + "x": 509.94726195445895, + "y": 491.73200570919147 }, { "type": "QPointF", - "x": 505.5219398390943, - "y": 493.75314459015317 + "x": 499.48882330035383, + "y": 496.0219887131292 }, { "type": "QPointF", - "x": 493.1624730540218, - "y": 498.00078352401664 + "x": 483.1823868029168, + "y": 500.5066198031956 }, { "type": "QPointF", - "x": 476.32590489565666, - "y": 501.8211255823292 + "x": 469.31906002715755, + "y": 502.76699104452376 }, { "type": "QPointF", - "x": 465.68981801438673, - "y": 503.0580521806556 + "x": 458.61213259187986, + "y": 503.1196305607171 }, { "type": "QPointF", - "x": 454.9458499674166, - "y": 502.9444423349683 + "x": 443.8536819162971, + "y": 501.9185119737654 }, { "type": "QPointF", - "x": 439.3060103264079, - "y": 501.3191976012906 + "x": 427.1929958670552, + "y": 499.2248924703412 }, { "type": "QPointF", - "x": 423.2043144587875, - "y": 498.34929359863105 + "x": 415.2822129385592, + "y": 496.2167954717386 }, { "type": "QPointF", - "x": 411.3722974923289, - "y": 494.89048056695367 + "x": 405.51268591803284, + "y": 492.34625734655305 }, { "type": "QPointF", - "x": 404.0462328838181, - "y": 491.56426076213603 + "x": 399.1440538155622, + "y": 488.76255604621974 }, { "type": "QPointF", - "x": 397.6192436403225, - "y": 487.3958668879086 + "x": 397.651509179127, + "y": 487.0589090075787 }, { "type": "QPointF", @@ -382,23 +357,28 @@ }, { "type": "QPointF", - "x": 389.46280257533397, - "y": 476.7991800818359 + "x": 388.7637811139682, + "y": 475.5345799921174 + }, + { + "type": "QPointF", + "x": 384.02761759391484, + "y": 464.5866207957423 }, { "type": "QPointF", - "x": 385.21740968628404, - "y": 467.7455266773488 + "x": 380.4304614262938, + "y": 453.47849078579617 }, { "type": "QPointF", - "x": 381.98288724618385, - "y": 458.53069141599417 + "x": 368.49295008766654, + "y": 411.6985932639229 }, { "type": "QPointF", - "x": 368.3461454578772, - "y": 411.2975955501923 + "x": 367.6462390140756, + "y": 411.29354992278223 }, { "type": "QPointF", @@ -407,8 +387,8 @@ }, { "type": "QPointF", - "x": 354.94905309156206, - "y": 444.28762369139116 + "x": 355.1561846360663, + "y": 443.7676398081635 }, { "type": "QPointF", @@ -417,13 +397,13 @@ }, { "type": "QPointF", - "x": 340.52244605437, - "y": 471.85996007627705 + "x": 339.0381408643451, + "y": 473.9103469636046 }, { "type": "QPointF", - "x": 332.3013407792153, - "y": 481.91406607342856 + "x": 328.4003671533969, + "y": 485.7230912940063 }, { "type": "QPointF", @@ -432,13 +412,13 @@ }, { "type": "QPointF", - "x": 308.4504919589761, - "y": 496.94455134299847 + "x": 306.70041004704234, + "y": 497.47875631537966 }, { "type": "QPointF", - "x": 293.41117665937344, - "y": 500.741531068732 + "x": 290.47717224660175, + "y": 501.3077427754172 }, { "type": "QPointF", @@ -467,48 +447,48 @@ }, { "type": "QPointF", - "x": 220.20894480356736, - "y": 493.9717974895532 + "x": 219.11733302477276, + "y": 493.5618654509618 }, { "type": "QPointF", - "x": 214.23653207492043, - "y": 491.72898244053755 + "x": 212.63608885738194, + "y": 490.0800375140309 }, { "type": "QPointF", - "x": 199.2867956563084, - "y": 474.27137643587264 + "x": 202.91098065710946, + "y": 479.33521360057284 }, { "type": "QPointF", - "x": 193.05436777423637, - "y": 463.35364232842176 + "x": 196.03783581368415, + "y": 468.9566791455622 }, { "type": "QPointF", - "x": 186.4552262793201, - "y": 447.9927324953534 + "x": 188.96153147430664, + "y": 454.3702537301474 }, { "type": "QPointF", - "x": 181.07652203439048, - "y": 431.23130737455057 + "x": 183.1651247359179, + "y": 438.3396830609576 }, { "type": "QPointF", - "x": 176.74074040059125, - "y": 412.44411172139985 + "x": 178.31430533286823, + "y": 420.11842584896306 }, { "type": "QPointF", - "x": 174.31642834550638, - "y": 396.57264472089304 + "x": 174.82594122279494, + "y": 400.59766857295676 }, { "type": "QPointF", - "x": 166.2793358771866, - "y": 317.0063195835933 + "x": 166.02062314300517, + "y": 312.9788859158875 } ] } diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/test_data.qrc valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/test_data.qrc --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/share/test_data.qrc 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/share/test_data.qrc 2021-07-01 18:31:56.000000000 +0000 @@ -143,5 +143,7 @@ smart_pattern_#120_piece_1/output.json smart_pattern_#120_piece_2/input.json smart_pattern_#120_piece_2/output.json + smart_pattern_#133/input.json + smart_pattern_#133/output.json diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/tst_vabstractpiece.cpp valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/tst_vabstractpiece.cpp --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/tst_vabstractpiece.cpp 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/tst_vabstractpiece.cpp 2021-07-01 18:31:56.000000000 +0000 @@ -1053,6 +1053,12 @@ QStringLiteral("://smart_pattern_#118/input.json"), QStringLiteral("://smart_pattern_#118/output.json"), 26.45669291338583 /*seam allowance width*/); + + // See file src/app/share/collection/bugs/smart_pattern_#133.val (private collection) + ASSERT_TEST_CASE("Эдит 1", + QStringLiteral("://smart_pattern_#133/input.json"), + QStringLiteral("://smart_pattern_#133/output.json"), + 26.45669291338583 /*seam allowance width*/); } //--------------------------------------------------------------------------------------------------------------------- diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/tst_varc.cpp valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/tst_varc.cpp --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/tst_varc.cpp 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/tst_varc.cpp 2021-07-01 18:31:56.000000000 +0000 @@ -456,3 +456,12 @@ Comparison(intersectionPoint, crosPoint, accuracyPointOnLine); } + +//--------------------------------------------------------------------------------------------------------------------- +void TST_VArc::EmptyArc() +{ + VArc empty; + + Comparison(empty.GetPoints(), {QPointF()}); + QCOMPARE(empty.GetLength(), 0.); +} diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/tst_varc.h valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/tst_varc.h --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/tst_varc.h 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/tst_varc.h 2021-07-01 18:31:56.000000000 +0000 @@ -50,6 +50,7 @@ void TestCutArc(); void TestCurveIntersectAxis_data(); void TestCurveIntersectAxis(); + void EmptyArc(); }; #endif // TST_VARC_H diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/tst_vellipticalarc.cpp valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/tst_vellipticalarc.cpp --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/tst_vellipticalarc.cpp 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/tst_vellipticalarc.cpp 2021-07-01 18:31:56.000000000 +0000 @@ -577,3 +577,29 @@ QCOMPARE(elArc.GetRadius1(), res.GetRadius1()); QCOMPARE(elArc.GetRadius2(), res.GetRadius2()); } + +//--------------------------------------------------------------------------------------------------------------------- +void TST_VEllipticalArc::EmptyArc_data() +{ + QTest::addColumn("radius1"); + QTest::addColumn("radius2"); + QTest::addColumn("length"); + + QTest::newRow("Empty elArc") << 0. << 0. << 0.; + QTest::newRow("Radius1 correct") << 50. << 0. << 50.*4; + QTest::newRow("Radius2 correct") << 0. << 30. << 30.*4; +} + +//--------------------------------------------------------------------------------------------------------------------- +void TST_VEllipticalArc::EmptyArc() +{ + QFETCH(qreal, radius1); + QFETCH(qreal, radius2); + QFETCH(qreal, length); + + VEllipticalArc empty; + empty.SetRadius1(radius1); + empty.SetRadius2(radius2); + + QCOMPARE(empty.GetLength(), length); +} diff -Nru valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/tst_vellipticalarc.h valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/tst_vellipticalarc.h --- valentina-0.7.47+1227+202105140829~ubuntu21.04.1/src/test/ValentinaTest/tst_vellipticalarc.h 2021-05-14 08:28:12.000000000 +0000 +++ valentina-0.7.49+1260+202107011832~ubuntu21.04.1/src/test/ValentinaTest/tst_vellipticalarc.h 2021-07-01 18:31:56.000000000 +0000 @@ -55,6 +55,8 @@ void TestRotation(); void TestFlip_data(); void TestFlip(); + void EmptyArc_data(); + void EmptyArc(); private: Q_DISABLE_COPY(TST_VEllipticalArc)