Merge branch 'develop' into feature/manual-layout
This commit is contained in:
Roman Telezhynskyi
commit
e5105e4eed
|
|
@ -1,6 +1,23 @@
|
|||
# Valentina 0.7.48 (unreleased)
|
||||
# Valentina 0.7.50 (unreleased)
|
||||
- Fix regression. Minimal seam allowance width is less than the point accuracy values.
|
||||
- Call autosave only in GUI mode.
|
||||
- Warn about stale layout only in GUI mode.
|
||||
- Fix regression. Set default value for detail labels size and grainline length to 10 cm.
|
||||
- [smart-pattern/valentina#136] 2 decimals for entering values in multi measurements tables.
|
||||
- New warnings. Warn a user about incorrect cut curve segment length.
|
||||
- Fix finding point of intersection curve and axis. Case when the axis's point lies on the curve.
|
||||
- Fix visualization for tool point of intersection line and axis. Case when the axis's point lies on the line.
|
||||
|
||||
# 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.
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
Pattern making program
|
||||
Author Roman Telezhynskyi <dismine(at)gmail.com>
|
||||
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
|
||||
|
||||
|
|
|
|||
|
|
@ -923,5 +923,7 @@ MSVC_DEBUG_CXXFLAGS += \
|
|||
-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 '<type>' to '<type>', possible loss of data
|
||||
-wd5219 \ # implicit conversion from '<type>' to '<type>', possible loss of data
|
||||
-wd5243 # 'type-name': using incomplete class 'class-name' can cause potential one definition rule violation due
|
||||
# to ABI limitation
|
||||
}
|
||||
|
|
|
|||
4
dist/OBS_debian/debian.changelog
vendored
4
dist/OBS_debian/debian.changelog
vendored
|
|
@ -1,5 +1,5 @@
|
|||
valentina (0.7.47) trusty; urgency=low
|
||||
valentina (0.7.49) trusty; urgency=low
|
||||
|
||||
* Auto build.
|
||||
|
||||
-- dismine <dismine@dismine-To-be-filled-by-O-E-M> Fri, 13 May 2021 14:17:00 +0300
|
||||
-- dismine <dismine@dismine-To-be-filled-by-O-E-M> Tue, 1 July 2021 17:08:00 +0300
|
||||
|
|
|
|||
2
dist/OBS_debian/debian.control
vendored
2
dist/OBS_debian/debian.control
vendored
|
|
@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 8.0.0),
|
|||
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
|
||||
|
|
|
|||
9
dist/OBS_debian/valentina.dsc
vendored
9
dist/OBS_debian/valentina.dsc
vendored
|
|
@ -2,9 +2,9 @@ Format: 3.0 (native)
|
|||
Source: valentina
|
||||
Binary: valentina
|
||||
Architecture: i386 amd64
|
||||
Version: 0.7.47
|
||||
Version: 0.7.49
|
||||
Maintainer: Roman Telezhynskyi <dismine@gmail.com>
|
||||
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,8 +14,9 @@ Build-Depends: debhelper (>= 8.0.0),
|
|||
qttools5-dev-tools (>= 5.4.0),
|
||||
libqt5xmlpatterns5-dev (>= 5.4.0),
|
||||
libqt5opengl5-dev (>= 5.4.0)
|
||||
Debtransform-Tar: valentina-0.7.47.v0.7.47.tar.gz
|
||||
Debtransform-Tar: valentina-0.7.49.v0.7.49.tar.gz
|
||||
Package-List:
|
||||
valentina deb graphics optional
|
||||
Files:
|
||||
00000000000000000000000000000000 0 valentina-0.7.47.v0.7.47.tar.gz
|
||||
00000000000000000000000000000000 0 valentina-0.7.49.v0.7.49.tar.gz
|
||||
|
||||
|
|
|
|||
2
dist/SlackBuild/valentina/slack-desc
vendored
2
dist/SlackBuild/valentina/slack-desc
vendored
|
|
@ -14,7 +14,7 @@ valentina: allows pattern creation, using either standard sizing tables or an
|
|||
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:
|
||||
|
|
|
|||
2
dist/SlackBuild/valentina/valentina.info
vendored
2
dist/SlackBuild/valentina/valentina.info
vendored
|
|
@ -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=""
|
||||
|
|
|
|||
4
dist/debian/changelog
vendored
4
dist/debian/changelog
vendored
|
|
@ -1,5 +1,5 @@
|
|||
valentina (0.7.47) trusty; urgency=low
|
||||
valentina (0.7.49) trusty; urgency=low
|
||||
|
||||
* Auto build.
|
||||
|
||||
-- dismine <dismine@dismine-To-be-filled-by-O-E-M> Fri, 13 May 2021 14:17:00 +0300
|
||||
-- dismine <dismine@dismine-To-be-filled-by-O-E-M> Tue, 1 July 2021 17:08:00 +0300
|
||||
|
|
|
|||
2
dist/debian/control
vendored
2
dist/debian/control
vendored
|
|
@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 8.0.0),
|
|||
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
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ EAPI=5
|
|||
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"
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ EAPI=5
|
|||
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"
|
||||
|
|
|
|||
4
dist/macx/tape/Info.plist
vendored
4
dist/macx/tape/Info.plist
vendored
|
|
@ -19,9 +19,9 @@
|
|||
<key>CFBundleIdentifier</key>
|
||||
<string>io.bitbucket.valentinaproject.@EXECUTABLE@</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>0.7.47</string>
|
||||
<string>0.7.49</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>0.7.47.0</string>
|
||||
<string>0.7.49.0</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleDocumentTypes</key>
|
||||
|
|
|
|||
4
dist/macx/valentina/Info.plist
vendored
4
dist/macx/valentina/Info.plist
vendored
|
|
@ -19,9 +19,9 @@
|
|||
<key>CFBundleIdentifier</key>
|
||||
<string>io.bitbucket.valentinaproject.@EXECUTABLE@</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>0.7.47</string>
|
||||
<string>0.7.49</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>0.7.47.0</string>
|
||||
<string>0.7.49.0</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleDocumentTypes</key>
|
||||
|
|
|
|||
2
dist/rpm/_service
vendored
2
dist/rpm/_service
vendored
|
|
@ -1,7 +1,7 @@
|
|||
<services>
|
||||
<service name="tar_scm">
|
||||
<param name="url">git://github.com/dismine/Valentina_git.git</param>
|
||||
<param name="versionprefix">0.7.47</param>
|
||||
<param name="versionprefix">0.7.49</param>
|
||||
<param name="filename">valentina</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="exclude">.git</param>
|
||||
|
|
|
|||
2
dist/rpm/valentina.spec
vendored
2
dist/rpm/valentina.spec
vendored
|
|
@ -95,7 +95,7 @@ Requires: poppler-tools
|
|||
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+
|
||||
|
|
|
|||
8
dist/valentina.dsc
vendored
8
dist/valentina.dsc
vendored
|
|
@ -2,9 +2,9 @@ Format: 3.0 (native)
|
|||
Source: valentina
|
||||
Binary: valentina
|
||||
Architecture: i386 amd64
|
||||
Version: 0.7.47
|
||||
Version: 0.7.49
|
||||
Maintainer: Roman Telezhynskyi <dismine@gmail.com>
|
||||
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,9 +14,9 @@ Build-Depends: debhelper (>= 8.0.0),
|
|||
qttools5-dev-tools (>= 5.4.0),
|
||||
libqt5xmlpatterns5-dev (>= 5.4.0),
|
||||
libqt5opengl5-dev (>= 5.4.0)
|
||||
Debtransform-Tar: valentina-0.7.47.v0.7.47.tar.gz
|
||||
Debtransform-Tar: valentina-0.7.49.v0.7.49.tar.gz
|
||||
Package-List:
|
||||
valentina deb graphics optional
|
||||
Files:
|
||||
00000000000000000000000000000000 0 valentina-0.7.47.v0.7.47.tar.gz
|
||||
00000000000000000000000000000000 0 valentina-0.7.49.v0.7.49.tar.gz
|
||||
|
||||
|
|
|
|||
4
dist/win/inno/valentina.iss
vendored
4
dist/win/inno/valentina.iss
vendored
|
|
@ -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 ;-)
|
||||
|
|
|
|||
|
|
@ -9627,6 +9627,22 @@ Do you want to save your changes?</translation>
|
|||
<source>Could not create recipe file. %1</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Shop</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Scalable Vector Graphics files</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Save draw</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Draw export</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>MainWindowsNoGUI</name>
|
||||
|
|
@ -11217,7 +11233,7 @@ This option will take an affect after restart.</source>
|
|||
<name>TMainWindow</name>
|
||||
<message>
|
||||
<source><html><head/><body><p><span style=" font-size:18pt;">Select New for creation measurement file.</span></p></body></html></source>
|
||||
<translation><html><head/><body><p><span style=" font-size:18pt;">Select New for creation measurement file.</span></p></body></html></translation>
|
||||
<translation type="vanished"><html><head/><body><p><span style=" font-size:18pt;">Select New for creation measurement file.</span></p></body></html></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Name</source>
|
||||
|
|
@ -12094,6 +12110,10 @@ Do you want to save your changes?</translation>
|
|||
<source>Restrict first dimension</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><html><head/><body><p><span style=" font-size:18pt;">Select New to create a measurement file.</span></p></body></html></source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>TabGrainline</name>
|
||||
|
|
|
|||
|
|
@ -9524,6 +9524,22 @@ Chcete uložit své změny?</translation>
|
|||
<source>Could not create recipe file. %1</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Shop</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Scalable Vector Graphics files</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Save draw</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Draw export</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>MainWindowsNoGUI</name>
|
||||
|
|
@ -11088,7 +11104,7 @@ Tato volba se projeví po opětovném spuštění.</translation>
|
|||
<name>TMainWindow</name>
|
||||
<message>
|
||||
<source><html><head/><body><p><span style=" font-size:18pt;">Select New for creation measurement file.</span></p></body></html></source>
|
||||
<translation><html><head/><body><p><span style=" font-size:18pt;">Vybrat nový pro vytvoření nového souboru s rozměry.</span></p></body></html></translation>
|
||||
<translation type="vanished"><html><head/><body><p><span style=" font-size:18pt;">Vybrat nový pro vytvoření nového souboru s rozměry.</span></p></body></html></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Name</source>
|
||||
|
|
@ -12001,6 +12017,10 @@ Chcete uložit změny?</translation>
|
|||
<source>Restrict first dimension</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><html><head/><body><p><span style=" font-size:18pt;">Select New to create a measurement file.</span></p></body></html></source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>TabGrainline</name>
|
||||
|
|
@ -15693,15 +15713,15 @@ Raw layout format compatibility error: actualFileVersion = %1 and fileVersion =
|
|||
</message>
|
||||
<message>
|
||||
<source>Length</source>
|
||||
<translation type="unfinished">Délka</translation>
|
||||
<translation>Délka</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Angle</source>
|
||||
<translation type="unfinished">Úhel</translation>
|
||||
<translation>Úhel</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Label</source>
|
||||
<translation type="unfinished">Popis</translation>
|
||||
<translation>Popis</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Segment 1</source>
|
||||
|
|
@ -16588,7 +16608,7 @@ Raw layout format compatibility error: actualFileVersion = %1 and fileVersion =
|
|||
</message>
|
||||
<message>
|
||||
<source>Label</source>
|
||||
<translation type="unfinished">Popis</translation>
|
||||
<translation>Popis</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Curve 1 segment 1</source>
|
||||
|
|
|
|||
|
|
@ -9520,6 +9520,22 @@ Sollen die Änderungen gespeichert werden?</translation>
|
|||
<source>Could not create recipe file. %1</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Shop</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Scalable Vector Graphics files</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Save draw</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Draw export</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>MainWindowsNoGUI</name>
|
||||
|
|
@ -11084,7 +11100,7 @@ Diese Option wird nach einem Neustart aktiv.</translation>
|
|||
<name>TMainWindow</name>
|
||||
<message>
|
||||
<source><html><head/><body><p><span style=" font-size:18pt;">Select New for creation measurement file.</span></p></body></html></source>
|
||||
<translation><html><head/><body><p><span style=" font-size:18pt;">Neu auswählen, um eine neue Maßdatei zu erstellen.</span></p></body></html></translation>
|
||||
<translation type="vanished"><html><head/><body><p><span style=" font-size:18pt;">Neu auswählen, um eine neue Maßdatei zu erstellen.</span></p></body></html></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Name</source>
|
||||
|
|
@ -11996,6 +12012,10 @@ Do you want to save your changes?</source>
|
|||
<source>Restrict first dimension</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><html><head/><body><p><span style=" font-size:18pt;">Select New to create a measurement file.</span></p></body></html></source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>TabGrainline</name>
|
||||
|
|
@ -15674,15 +15694,15 @@ Raw layout format compatibility error: actualFileVersion = %1 and fileVersion =
|
|||
</message>
|
||||
<message>
|
||||
<source>Length</source>
|
||||
<translation type="unfinished">Länge</translation>
|
||||
<translation>Länge</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Angle</source>
|
||||
<translation type="unfinished">Winkel</translation>
|
||||
<translation>Winkel</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Label</source>
|
||||
<translation type="unfinished">Bezeichnung</translation>
|
||||
<translation>Bezeichnung</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Segment 1</source>
|
||||
|
|
@ -16537,7 +16557,7 @@ Raw layout format compatibility error: actualFileVersion = %1 and fileVersion =
|
|||
</message>
|
||||
<message>
|
||||
<source>Label</source>
|
||||
<translation type="unfinished">Bezeichnung</translation>
|
||||
<translation>Bezeichnung</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Curve 1 segment 1</source>
|
||||
|
|
|
|||
|
|
@ -9284,6 +9284,22 @@ Do you want to save your changes?</source>
|
|||
<source>Could not create recipe file. %1</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Shop</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Scalable Vector Graphics files</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Save draw</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Draw export</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>MainWindowsNoGUI</name>
|
||||
|
|
@ -10718,7 +10734,7 @@ This option will take an affect after restart.</source>
|
|||
<name>TMainWindow</name>
|
||||
<message>
|
||||
<source><html><head/><body><p><span style=" font-size:18pt;">Select New for creation measurement file.</span></p></body></html></source>
|
||||
<translation><html><head/><body><p><span style=" font-size:18pt;">Επιλέξτε Νέο για τη δημιουργία αρχείου μετρήσεων.</span></p></body></html></translation>
|
||||
<translation type="vanished"><html><head/><body><p><span style=" font-size:18pt;">Επιλέξτε Νέο για τη δημιουργία αρχείου μετρήσεων.</span></p></body></html></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Name</source>
|
||||
|
|
@ -11559,6 +11575,10 @@ Do you want to save your changes?</source>
|
|||
<source>Restrict first dimension</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><html><head/><body><p><span style=" font-size:18pt;">Select New to create a measurement file.</span></p></body></html></source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>TabGrainline</name>
|
||||
|
|
@ -15016,11 +15036,11 @@ Raw layout format compatibility error: actualFileVersion = %1 and fileVersion =
|
|||
</message>
|
||||
<message>
|
||||
<source>Length</source>
|
||||
<translation type="unfinished">Μήκος</translation>
|
||||
<translation>Μήκος</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Angle</source>
|
||||
<translation type="unfinished">Γωνία</translation>
|
||||
<translation>Γωνία</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Label</source>
|
||||
|
|
|
|||
|
|
@ -9451,6 +9451,22 @@ Do you want to save your changes?</translation>
|
|||
<source>Could not create recipe file. %1</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Shop</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Scalable Vector Graphics files</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Save draw</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Draw export</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>MainWindowsNoGUI</name>
|
||||
|
|
@ -10990,7 +11006,7 @@ This option will take an affect after restart.</source>
|
|||
<name>TMainWindow</name>
|
||||
<message>
|
||||
<source><html><head/><body><p><span style=" font-size:18pt;">Select New for creation measurement file.</span></p></body></html></source>
|
||||
<translation><html><head/><body><p><span style=" font-size:18pt;">Select New for creation measurement file.</span></p></body></html></translation>
|
||||
<translation type="vanished"><html><head/><body><p><span style=" font-size:18pt;">Select New for creation measurement file.</span></p></body></html></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Name</source>
|
||||
|
|
@ -11879,6 +11895,10 @@ Do you want to save your changes?</translation>
|
|||
<source>Restrict first dimension</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><html><head/><body><p><span style=" font-size:18pt;">Select New to create a measurement file.</span></p></body></html></source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>TabGrainline</name>
|
||||
|
|
@ -15555,11 +15575,11 @@ Raw layout format compatibility error: actualFileVersion = %1 and fileVersion =
|
|||
</message>
|
||||
<message>
|
||||
<source>Length</source>
|
||||
<translation type="unfinished">Length</translation>
|
||||
<translation>Length</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Angle</source>
|
||||
<translation type="unfinished">Angle</translation>
|
||||
<translation>Angle</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Label</source>
|
||||
|
|
|
|||
|
|
@ -9451,6 +9451,22 @@ Do you want to save your changes?</translation>
|
|||
<source>Could not create recipe file. %1</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Shop</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Scalable Vector Graphics files</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Save draw</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Draw export</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>MainWindowsNoGUI</name>
|
||||
|
|
@ -10990,7 +11006,7 @@ This option will take an affect after restart.</source>
|
|||
<name>TMainWindow</name>
|
||||
<message>
|
||||
<source><html><head/><body><p><span style=" font-size:18pt;">Select New for creation measurement file.</span></p></body></html></source>
|
||||
<translation><html><head/><body><p><span style=" font-size:18pt;">Select New for creation measurement file.</span></p></body></html></translation>
|
||||
<translation type="vanished"><html><head/><body><p><span style=" font-size:18pt;">Select New for creation measurement file.</span></p></body></html></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Name</source>
|
||||
|
|
@ -11879,6 +11895,10 @@ Do you want to save your changes?</translation>
|
|||
<source>Restrict first dimension</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><html><head/><body><p><span style=" font-size:18pt;">Select New to create a measurement file.</span></p></body></html></source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>TabGrainline</name>
|
||||
|
|
@ -15555,11 +15575,11 @@ Raw layout format compatibility error: actualFileVersion = %1 and fileVersion =
|
|||
</message>
|
||||
<message>
|
||||
<source>Length</source>
|
||||
<translation type="unfinished">Length</translation>
|
||||
<translation>Length</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Angle</source>
|
||||
<translation type="unfinished">Angle</translation>
|
||||
<translation>Angle</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Label</source>
|
||||
|
|
|
|||
|
|
@ -9451,6 +9451,22 @@ Do you want to save your changes?</translation>
|
|||
<source>Could not create recipe file. %1</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Shop</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Scalable Vector Graphics files</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Save draw</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Draw export</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>MainWindowsNoGUI</name>
|
||||
|
|
@ -10990,7 +11006,7 @@ This option will take an affect after restart.</source>
|
|||
<name>TMainWindow</name>
|
||||
<message>
|
||||
<source><html><head/><body><p><span style=" font-size:18pt;">Select New for creation measurement file.</span></p></body></html></source>
|
||||
<translation><html><head/><body><p><span style=" font-size:18pt;">Select New for creation measurement file.</span></p></body></html></translation>
|
||||
<translation type="vanished"><html><head/><body><p><span style=" font-size:18pt;">Select New for creation measurement file.</span></p></body></html></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Name</source>
|
||||
|
|
@ -11879,6 +11895,10 @@ Do you want to save your changes?</translation>
|
|||
<source>Restrict first dimension</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><html><head/><body><p><span style=" font-size:18pt;">Select New to create a measurement file.</span></p></body></html></source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>TabGrainline</name>
|
||||
|
|
@ -15555,11 +15575,11 @@ Raw layout format compatibility error: actualFileVersion = %1 and fileVersion =
|
|||
</message>
|
||||
<message>
|
||||
<source>Length</source>
|
||||
<translation type="unfinished">Length</translation>
|
||||
<translation>Length</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Angle</source>
|
||||
<translation type="unfinished">Angle</translation>
|
||||
<translation>Angle</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Label</source>
|
||||
|
|
|
|||
|
|
@ -9521,6 +9521,22 @@ el patrón.</translation>
|
|||
<source>Could not create recipe file. %1</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Shop</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Scalable Vector Graphics files</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Save draw</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Draw export</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>MainWindowsNoGUI</name>
|
||||
|
|
@ -11085,7 +11101,7 @@ Esta opción surtirá efecto después de reiniciar.</translation>
|
|||
<name>TMainWindow</name>
|
||||
<message>
|
||||
<source><html><head/><body><p><span style=" font-size:18pt;">Select New for creation measurement file.</span></p></body></html></source>
|
||||
<translation><html><head/><body><p><span style=" font-size:18pt;">Seleccione Nuevo para crear un archivo de medidas.</span></p></body></html></translation>
|
||||
<translation type="vanished"><html><head/><body><p><span style=" font-size:18pt;">Seleccione Nuevo para crear un archivo de medidas.</span></p></body></html></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Name</source>
|
||||
|
|
@ -11998,6 +12014,10 @@ Quieres guardar los cambios?</translation>
|
|||
<source>Restrict first dimension</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><html><head/><body><p><span style=" font-size:18pt;">Select New to create a measurement file.</span></p></body></html></source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>TabGrainline</name>
|
||||
|
|
@ -15697,15 +15717,15 @@ Raw layout format compatibility error: actualFileVersion = %1 and fileVersion =
|
|||
</message>
|
||||
<message>
|
||||
<source>Length</source>
|
||||
<translation type="unfinished">Longitud</translation>
|
||||
<translation>Longitud</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Angle</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Angulo</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Label</source>
|
||||
<translation type="unfinished">Etiqueta</translation>
|
||||
<translation>Etiqueta</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Segment 1</source>
|
||||
|
|
@ -16592,7 +16612,7 @@ Raw layout format compatibility error: actualFileVersion = %1 and fileVersion =
|
|||
</message>
|
||||
<message>
|
||||
<source>Label</source>
|
||||
<translation type="unfinished">Etiqueta</translation>
|
||||
<translation>Etiqueta</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Curve 1 segment 1</source>
|
||||
|
|
|
|||
|
|
@ -8423,6 +8423,22 @@ Haluatko tallentaa muutokset?</translation>
|
|||
<source>Could not create recipe file. %1</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Shop</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Scalable Vector Graphics files</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Save draw</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Draw export</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>MainWindowsNoGUI</name>
|
||||
|
|
@ -9761,10 +9777,6 @@ This option will take an affect after restart.</source>
|
|||
</context>
|
||||
<context>
|
||||
<name>TMainWindow</name>
|
||||
<message>
|
||||
<source><html><head/><body><p><span style=" font-size:18pt;">Select New for creation measurement file.</span></p></body></html></source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Name</source>
|
||||
<translation type="vanished">Nimi</translation>
|
||||
|
|
@ -10471,6 +10483,10 @@ Do you want to save your changes?</source>
|
|||
<source>Restrict first dimension</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><html><head/><body><p><span style=" font-size:18pt;">Select New to create a measurement file.</span></p></body></html></source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>TabGrainline</name>
|
||||
|
|
@ -13898,11 +13914,11 @@ Raw layout format compatibility error: actualFileVersion = %1 and fileVersion =
|
|||
</message>
|
||||
<message>
|
||||
<source>Length</source>
|
||||
<translation type="unfinished">Pituus</translation>
|
||||
<translation>Pituus</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Angle</source>
|
||||
<translation type="unfinished">Kulma</translation>
|
||||
<translation>Kulma</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Label</source>
|
||||
|
|
|
|||
|
|
@ -7432,6 +7432,26 @@ Do you want to save your changes?</source>
|
|||
<source>Could not create recipe file. %1</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>...</source>
|
||||
<translation type="obsolete">...</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Shop</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Scalable Vector Graphics files</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Save draw</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Draw export</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>MainWindowsNoGUI</name>
|
||||
|
|
@ -8680,10 +8700,6 @@ This option will take an affect after restart.</source>
|
|||
</context>
|
||||
<context>
|
||||
<name>TMainWindow</name>
|
||||
<message>
|
||||
<source><html><head/><body><p><span style=" font-size:18pt;">Select New for creation measurement file.</span></p></body></html></source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Calculated value</source>
|
||||
<translation type="unfinished"></translation>
|
||||
|
|
@ -9342,6 +9358,10 @@ Do you want to save your changes?</source>
|
|||
<source>untitled</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><html><head/><body><p><span style=" font-size:18pt;">Select New to create a measurement file.</span></p></body></html></source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>TabGrainline</name>
|
||||
|
|
|
|||
|
|
@ -7769,6 +7769,22 @@ Apakah anda ingin menyimpan perubahan anda?</translation>
|
|||
<source>Could not create recipe file. %1</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Shop</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Scalable Vector Graphics files</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Save draw</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Draw export</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>MainWindowsNoGUI</name>
|
||||
|
|
@ -9017,10 +9033,6 @@ This option will take an affect after restart.</source>
|
|||
</context>
|
||||
<context>
|
||||
<name>TMainWindow</name>
|
||||
<message>
|
||||
<source><html><head/><body><p><span style=" font-size:18pt;">Select New for creation measurement file.</span></p></body></html></source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Name</source>
|
||||
<translation type="vanished">Nama</translation>
|
||||
|
|
@ -9679,6 +9691,10 @@ Do you want to save your changes?</source>
|
|||
<source>untitled</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><html><head/><body><p><span style=" font-size:18pt;">Select New to create a measurement file.</span></p></body></html></source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>TabGrainline</name>
|
||||
|
|
|
|||
|
|
@ -2699,11 +2699,11 @@
|
|||
</message>
|
||||
<message>
|
||||
<source>Enable to create a visibility gropup from original objects</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Seleziona per creare un Gruppo di Visibilità degli oggetti iniziali</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Visibility Group</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Gruppo di Visibilità</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Name:</source>
|
||||
|
|
@ -2818,11 +2818,11 @@
|
|||
</message>
|
||||
<message>
|
||||
<source>Enable to create a visibility gropup from original objects</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Seleziona per creare un Gruppo di Visibilità degli oggetti iniziali</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Visibility Group</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Gruppo di Visibilità</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Name:</source>
|
||||
|
|
@ -4374,11 +4374,11 @@ Applicare la configurazione comunque?</translation>
|
|||
</message>
|
||||
<message>
|
||||
<source>Enable to create a visibility gropup from original objects</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Seleziona per creare un Gruppo di Visibilità degli oggetti iniziali</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Visibility Group</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Gruppo di Visibilità</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Name:</source>
|
||||
|
|
@ -6268,11 +6268,11 @@ Applicare la configurazione comunque?</translation>
|
|||
</message>
|
||||
<message>
|
||||
<source>Enable to create a visibility gropup from original objects</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Seleziona per creare un Gruppo di Visibilità degli oggetti iniziali</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Visibility Group</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Gruppo di Visibilità</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Name:</source>
|
||||
|
|
@ -8943,7 +8943,7 @@ Vuoi salvare i cambiamenti?</translation>
|
|||
</message>
|
||||
<message>
|
||||
<source>Contains all visibility groups</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Contiene tutti i Gruppi di Visibilità</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Show which details will go in layout</source>
|
||||
|
|
@ -9319,7 +9319,7 @@ Vuoi salvare i cambiamenti?</translation>
|
|||
</message>
|
||||
<message>
|
||||
<source>Groups of visibility</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Gruppi di Visibilità</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Export recipe</source>
|
||||
|
|
@ -9497,6 +9497,22 @@ Vuoi salvare i cambiamenti?</translation>
|
|||
<source>Could not create recipe file. %1</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Shop</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Scalable Vector Graphics files</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Save draw</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Draw export</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>MainWindowsNoGUI</name>
|
||||
|
|
@ -11041,7 +11057,7 @@ Questa opzione sarà effettiva dopo il riavvio del programma.</translation>
|
|||
<name>TMainWindow</name>
|
||||
<message>
|
||||
<source><html><head/><body><p><span style=" font-size:18pt;">Select New for creation measurement file.</span></p></body></html></source>
|
||||
<translation><html><head/><body><p><span style=" font-size:18pt;">Seleziona nuovo per la creazione di un file delle misure.</span></p></body></html></translation>
|
||||
<translation type="vanished"><html><head/><body><p><span style=" font-size:18pt;">Seleziona nuovo per la creazione di un file delle misure.</span></p></body></html></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Name</source>
|
||||
|
|
@ -11926,6 +11942,10 @@ Vuoi salvare le tue modifiche?</translation>
|
|||
<source>Restrict first dimension</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><html><head/><body><p><span style=" font-size:18pt;">Select New to create a measurement file.</span></p></body></html></source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>TabGrainline</name>
|
||||
|
|
@ -12098,11 +12118,11 @@ Vuoi salvare le tue modifiche?</translation>
|
|||
</message>
|
||||
<message>
|
||||
<source>Options to control position a pattern label. <b>Not available if a pattern label template is empty</b>.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Opzione per regolare la visibilità e posizione dell'etichetta. <b>Non disponibile se il modello etichetta non è stato caricato</b>.</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Pattern label data</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Etichetta con dati del Modello</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Edit pattern label</source>
|
||||
|
|
@ -12162,7 +12182,7 @@ Vuoi salvare le tue modifiche?</translation>
|
|||
</message>
|
||||
<message>
|
||||
<source>Piece label visible</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Attiva/Disattiva Etichetta del Pezzo</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
|
|
@ -13079,7 +13099,7 @@ Vuoi salvare le tue modifiche?</translation>
|
|||
</message>
|
||||
<message>
|
||||
<source>Visibility group</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Gruppo di Visibilità</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>default</source>
|
||||
|
|
@ -13991,7 +14011,7 @@ Vuoi salvare le tue modifiche?</translation>
|
|||
</message>
|
||||
<message>
|
||||
<source>Restore label position</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Ripristina posizione dell'Etichetta</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
|
|
@ -15523,15 +15543,15 @@ Raw layout format compatibility error: actualFileVersion = %1 and fileVersion =
|
|||
</message>
|
||||
<message>
|
||||
<source>Length</source>
|
||||
<translation type="unfinished">Lunghezza</translation>
|
||||
<translation>Lunghezza</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Angle</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Angolo</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Label</source>
|
||||
<translation type="unfinished">Etichetta</translation>
|
||||
<translation>Etichetta</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Segment 1</source>
|
||||
|
|
@ -16410,7 +16430,7 @@ Raw layout format compatibility error: actualFileVersion = %1 and fileVersion =
|
|||
</message>
|
||||
<message>
|
||||
<source>Label</source>
|
||||
<translation type="unfinished">Etichetta</translation>
|
||||
<translation>Etichetta</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Curve 1 segment 1</source>
|
||||
|
|
|
|||
|
|
@ -8454,6 +8454,22 @@ Do you want to save your changes?</source>
|
|||
<source>Could not create recipe file. %1</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Shop</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Scalable Vector Graphics files</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Save draw</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Draw export</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>MainWindowsNoGUI</name>
|
||||
|
|
@ -9717,10 +9733,6 @@ This option will take an affect after restart.</source>
|
|||
</context>
|
||||
<context>
|
||||
<name>TMainWindow</name>
|
||||
<message>
|
||||
<source><html><head/><body><p><span style=" font-size:18pt;">Select New for creation measurement file.</span></p></body></html></source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Name</source>
|
||||
<translation type="vanished">Nume</translation>
|
||||
|
|
@ -10427,6 +10439,10 @@ Do you want to save your changes?</source>
|
|||
<source>untitled</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><html><head/><body><p><span style=" font-size:18pt;">Select New to create a measurement file.</span></p></body></html></source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>TabGrainline</name>
|
||||
|
|
@ -13750,11 +13766,11 @@ Raw layout format compatibility error: actualFileVersion = %1 and fileVersion =
|
|||
</message>
|
||||
<message>
|
||||
<source>Length</source>
|
||||
<translation type="unfinished">Lungime</translation>
|
||||
<translation>Lungime</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Angle</source>
|
||||
<translation type="unfinished">Unghi</translation>
|
||||
<translation>Unghi</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Label</source>
|
||||
|
|
|
|||
|
|
@ -9453,6 +9453,22 @@ Do you want to save your changes?</source>
|
|||
<source>Could not create recipe file. %1</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Shop</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Scalable Vector Graphics files</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Save draw</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Draw export</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>MainWindowsNoGUI</name>
|
||||
|
|
@ -10992,7 +11008,7 @@ This option will take an affect after restart.</source>
|
|||
<name>TMainWindow</name>
|
||||
<message>
|
||||
<source><html><head/><body><p><span style=" font-size:18pt;">Select New for creation measurement file.</span></p></body></html></source>
|
||||
<translation><html><head/><body><p><span style=" font-size:18pt;">Виберіть Новий для створення файлу мірок.</span></p></body></html></translation>
|
||||
<translation type="vanished"><html><head/><body><p><span style=" font-size:18pt;">Виберіть Новий для створення файлу мірок.</span></p></body></html></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Name</source>
|
||||
|
|
@ -11881,6 +11897,10 @@ Do you want to save your changes?</source>
|
|||
<source>Restrict first dimension</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><html><head/><body><p><span style=" font-size:18pt;">Select New to create a measurement file.</span></p></body></html></source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>TabGrainline</name>
|
||||
|
|
@ -15555,11 +15575,11 @@ Raw layout format compatibility error: actualFileVersion = %1 and fileVersion =
|
|||
</message>
|
||||
<message>
|
||||
<source>Length</source>
|
||||
<translation type="unfinished">Довжина</translation>
|
||||
<translation>Довжина</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Angle</source>
|
||||
<translation type="unfinished">Кут</translation>
|
||||
<translation>Кут</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Label</source>
|
||||
|
|
|
|||
|
|
@ -852,6 +852,11 @@ bool TMainWindow::FileSaveAs()
|
|||
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());
|
||||
|
||||
|
|
@ -4159,35 +4164,35 @@ void TMainWindow::SetDecimals()
|
|||
switch (mUnit)
|
||||
{
|
||||
case Unit::Cm:
|
||||
ui->doubleSpinBoxBaseValue->setDecimals(1);
|
||||
ui->doubleSpinBoxBaseValue->setDecimals(2);
|
||||
ui->doubleSpinBoxBaseValue->setSingleStep(0.1);
|
||||
|
||||
ui->doubleSpinBoxCorrection->setDecimals(1);
|
||||
ui->doubleSpinBoxCorrection->setDecimals(2);
|
||||
ui->doubleSpinBoxCorrection->setSingleStep(0.1);
|
||||
|
||||
ui->doubleSpinBoxShiftA->setDecimals(1);
|
||||
ui->doubleSpinBoxShiftA->setDecimals(2);
|
||||
ui->doubleSpinBoxShiftA->setSingleStep(0.1);
|
||||
|
||||
ui->doubleSpinBoxShiftB->setDecimals(1);
|
||||
ui->doubleSpinBoxShiftB->setDecimals(2);
|
||||
ui->doubleSpinBoxShiftB->setSingleStep(0.1);
|
||||
|
||||
ui->doubleSpinBoxShiftC->setDecimals(1);
|
||||
ui->doubleSpinBoxShiftC->setDecimals(2);
|
||||
ui->doubleSpinBoxShiftC->setSingleStep(0.1);
|
||||
break;
|
||||
case Unit::Mm:
|
||||
ui->doubleSpinBoxBaseValue->setDecimals(0);
|
||||
ui->doubleSpinBoxBaseValue->setDecimals(1);
|
||||
ui->doubleSpinBoxBaseValue->setSingleStep(1);
|
||||
|
||||
ui->doubleSpinBoxCorrection->setDecimals(0);
|
||||
ui->doubleSpinBoxCorrection->setDecimals(1);
|
||||
ui->doubleSpinBoxCorrection->setSingleStep(1);
|
||||
|
||||
ui->doubleSpinBoxShiftA->setDecimals(0);
|
||||
ui->doubleSpinBoxShiftA->setDecimals(1);
|
||||
ui->doubleSpinBoxShiftA->setSingleStep(1);
|
||||
|
||||
ui->doubleSpinBoxShiftB->setDecimals(0);
|
||||
ui->doubleSpinBoxShiftB->setDecimals(1);
|
||||
ui->doubleSpinBoxShiftB->setSingleStep(1);
|
||||
|
||||
ui->doubleSpinBoxShiftC->setDecimals(0);
|
||||
ui->doubleSpinBoxShiftC->setDecimals(1);
|
||||
ui->doubleSpinBoxShiftC->setSingleStep(1);
|
||||
break;
|
||||
case Unit::Inch:
|
||||
|
|
|
|||
|
|
@ -183,15 +183,13 @@ void DialogSaveLayout::SelectFormat(LayoutExportFormats format)
|
|||
{
|
||||
if (static_cast<int>(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<int>(format));
|
||||
if (i < 0)
|
||||
{
|
||||
VException e(tr("Selected not present format."));
|
||||
throw e;
|
||||
throw VException(tr("Selected not present format."));
|
||||
}
|
||||
ui->comboBoxFormat->setCurrentIndex(i);
|
||||
}
|
||||
|
|
@ -783,7 +781,14 @@ void DialogSaveLayout::ReadSettings()
|
|||
ui->toolButtonLandscape->setChecked(true);
|
||||
}
|
||||
|
||||
SelectFormat(static_cast<LayoutExportFormats>(settings->GetLayoutExportFormat()));
|
||||
if (m_mode != Draw::Layout)
|
||||
{
|
||||
SelectFormat(static_cast<LayoutExportFormats>(settings->GetDetailExportFormat()));
|
||||
}
|
||||
else
|
||||
{
|
||||
SelectFormat(static_cast<LayoutExportFormats>(settings->GetLayoutExportFormat()));
|
||||
}
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
|
|
@ -827,6 +832,13 @@ void DialogSaveLayout::WriteSettings() const
|
|||
settings->SetTiledPDFOrientation(PageOrientation::Landscape);
|
||||
}
|
||||
|
||||
settings->SetLayoutExportFormat(static_cast<qint8>(Format()));
|
||||
if (m_mode != Draw::Layout)
|
||||
{
|
||||
settings->SetDetailExportFormat(static_cast<qint8>(Format()));
|
||||
}
|
||||
else
|
||||
{
|
||||
settings->SetLayoutExportFormat(static_cast<qint8>(Format()));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -68,6 +68,7 @@
|
|||
#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 +2246,62 @@ void MainWindow::StoreDimensions()
|
|||
}
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
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<QGraphicsItem *> qItems = sceneDraw->items();
|
||||
for (auto *item : qItems)
|
||||
{
|
||||
item->setEnabled(true);
|
||||
if (item->type() == VGraphicsSimpleTextItem::Type)
|
||||
{
|
||||
auto *text = dynamic_cast<VGraphicsSimpleTextItem*>(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)
|
||||
|
|
@ -2518,6 +2575,7 @@ void MainWindow::InitToolButtons()
|
|||
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);
|
||||
|
|
@ -3138,8 +3196,15 @@ bool MainWindow::on_actionSaveAs_triggered()
|
|||
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]()
|
||||
|
|
@ -4331,6 +4396,7 @@ QT_WARNING_POP
|
|||
ui->toolButtonPin->setEnabled(drawTools);
|
||||
ui->toolButtonInsertNode->setEnabled(drawTools);
|
||||
ui->toolButtonPlaceLabel->setEnabled(drawTools);
|
||||
ui->toolButtonExportDraw->setEnabled(drawTools);
|
||||
|
||||
ui->actionLast_tool->setEnabled(drawTools);
|
||||
|
||||
|
|
@ -4417,7 +4483,8 @@ bool MainWindow::SavePattern(const QString &fileName, QString &error)
|
|||
*/
|
||||
void MainWindow::AutoSavePattern()
|
||||
{
|
||||
if (not VAbstractValApplication::VApp()->GetPatternPath().isEmpty() && isWindowModified() && isNeedAutosave)
|
||||
if (VApplication::VApp()->IsGUIMode() && not VAbstractValApplication::VApp()->GetPatternPath().isEmpty()
|
||||
&& isWindowModified() && isNeedAutosave)
|
||||
{
|
||||
qCDebug(vMainWindow, "Autosaving pattern.");
|
||||
QString error;
|
||||
|
|
@ -5029,6 +5096,11 @@ void MainWindow::CreateActions()
|
|||
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);
|
||||
|
||||
|
|
@ -5580,6 +5652,30 @@ void MainWindow::CreateMeasurements()
|
|||
}
|
||||
#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()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -130,6 +130,7 @@ private slots:
|
|||
#if defined(Q_OS_MAC)
|
||||
void CreateMeasurements();
|
||||
#endif
|
||||
void ExportDrawAs();
|
||||
void ExportLayoutAs();
|
||||
void ExportDetailsAs();
|
||||
|
||||
|
|
@ -417,6 +418,8 @@ private:
|
|||
void SetDimensionBases();
|
||||
|
||||
void StoreDimensions();
|
||||
|
||||
void ExportDraw(const QString &fileName);
|
||||
};
|
||||
|
||||
#endif // MAINWINDOW_H
|
||||
|
|
|
|||
|
|
@ -1119,9 +1119,9 @@
|
|||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<y>-53</y>
|
||||
<width>126</width>
|
||||
<height>192</height>
|
||||
<height>237</height>
|
||||
</rect>
|
||||
</property>
|
||||
<attribute name="icon">
|
||||
|
|
@ -1317,6 +1317,29 @@
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="0">
|
||||
<widget class="QToolButton" name="toolButtonExportDraw">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Draw export</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string notr="true">...</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../../libs/vmisc/share/resources/icon.qrc">
|
||||
<normaloff>:/icon/32x32/export_to_picture_document.png</normaloff>:/icon/32x32/export_to_picture_document.png</iconset>
|
||||
</property>
|
||||
<property name="iconSize">
|
||||
<size>
|
||||
<width>32</width>
|
||||
<height>32</height>
|
||||
</size>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="detailPage">
|
||||
|
|
@ -1590,7 +1613,7 @@
|
|||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>140</width>
|
||||
<height>170</height>
|
||||
<height>168</height>
|
||||
</rect>
|
||||
</property>
|
||||
<attribute name="icon">
|
||||
|
|
@ -1728,6 +1751,7 @@
|
|||
<string>&Help</string>
|
||||
</property>
|
||||
<addaction name="actionReportBug"/>
|
||||
<addaction name="actionShop"/>
|
||||
<addaction name="actionAbout_Qt"/>
|
||||
<addaction name="actionAbout_Valentina"/>
|
||||
</widget>
|
||||
|
|
@ -3065,6 +3089,11 @@
|
|||
<string>Update manual layout</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionShop">
|
||||
<property name="text">
|
||||
<string>Shop</string>
|
||||
</property>
|
||||
</action>
|
||||
</widget>
|
||||
<layoutdefault spacing="6" margin="11"/>
|
||||
<customwidgets>
|
||||
|
|
|
|||
|
|
@ -661,7 +661,13 @@ void MainWindowsNoGUI::ExportApparelLayout(const QVector<VLayoutPiece> &details,
|
|||
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());
|
||||
|
|
@ -1095,7 +1101,13 @@ void MainWindowsNoGUI::ExportScene(const QList<QGraphicsScene *> &scenes,
|
|||
const QList<QList<QGraphicsItem *> > &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());
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ namespace
|
|||
//---------------------------------------------------------------------------------------------------------------------
|
||||
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);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ auto VAbstractMConverter::Units() const -> Unit
|
|||
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());
|
||||
|
|
|
|||
|
|
@ -291,7 +291,7 @@ QStringList VAbstractPattern::ListMeasurements() const
|
|||
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)
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(const QString, defBirthDate, (QLatin1String("1800-01-0
|
|||
//---------------------------------------------------------------------------------------------------------------------
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ namespace
|
|||
//---------------------------------------------------------------------------------------------------------------------
|
||||
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);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ namespace
|
|||
//---------------------------------------------------------------------------------------------------------------------
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@
|
|||
#include "../vmisc/vmath.h"
|
||||
#include "../vgeometry/vpointf.h"
|
||||
#include "../vmisc/vabstractapplication.h"
|
||||
#include "../ifc/exception/vexception.h"
|
||||
|
||||
namespace
|
||||
{
|
||||
|
|
@ -420,6 +421,11 @@ QPointF VAbstractCubicBezier::CutSpline(qreal length, QPointF &spl1p2, QPointF &
|
|||
if (fullLength <= minLength)
|
||||
{
|
||||
spl1p2 = spl1p3 = spl2p2 = spl2p3 = QPointF();
|
||||
|
||||
const QString errorMsg = QObject::tr("Unable to cut curve '%1'. The curve is too short.").arg(name());
|
||||
VAbstractApplication::VApp()->IsPedantic() ? throw VException(errorMsg) :
|
||||
qWarning() << VAbstractApplication::warningMessageSignature + errorMsg;
|
||||
|
||||
return QPointF();
|
||||
}
|
||||
|
||||
|
|
@ -428,10 +434,20 @@ QPointF VAbstractCubicBezier::CutSpline(qreal length, QPointF &spl1p2, QPointF &
|
|||
if (length < minLength)
|
||||
{
|
||||
length = minLength;
|
||||
|
||||
const QString errorMsg = QObject::tr("Curve '%1'. Length of a cut segment is too small. Optimize it to minimal "
|
||||
"value.").arg(name());
|
||||
VAbstractApplication::VApp()->IsPedantic() ? throw VException(errorMsg) :
|
||||
qWarning() << VAbstractApplication::warningMessageSignature + errorMsg;
|
||||
}
|
||||
else if (length > maxLength)
|
||||
{
|
||||
length = maxLength;
|
||||
|
||||
const QString errorMsg = QObject::tr("Curve '%1'. Length of a cut segment is too big. Optimize it to maximal "
|
||||
"value.").arg(name());
|
||||
VAbstractApplication::VApp()->IsPedantic() ? throw VException(errorMsg) :
|
||||
qWarning() << VAbstractApplication::warningMessageSignature + errorMsg;
|
||||
}
|
||||
|
||||
const qreal parT = GetParmT(length);
|
||||
|
|
|
|||
|
|
@ -30,12 +30,14 @@
|
|||
#include "vsplinepoint.h"
|
||||
|
||||
#include <QPainterPath>
|
||||
#include <QtDebug>
|
||||
|
||||
#include "../vmisc/def.h"
|
||||
#include "../ifc/ifcdef.h"
|
||||
#include "../ifc/exception/vexception.h"
|
||||
#include "vpointf.h"
|
||||
#include "vspline.h"
|
||||
#include "vabstractapplication.h"
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
VAbstractCubicBezierPath::VAbstractCubicBezierPath(const GOType &type, const quint32 &idObject, const Draw &mode)
|
||||
|
|
@ -180,6 +182,11 @@ QPointF VAbstractCubicBezierPath::CutSplinePath(qreal length, qint32 &p1, qint32
|
|||
{
|
||||
p1 = p2 = -1;
|
||||
spl1p2 = spl1p3 = spl2p2 = spl2p3 = QPointF();
|
||||
|
||||
const QString errorMsg = QObject::tr("Unable to cut curve '%1'. The curve is too short.").arg(name());
|
||||
VAbstractApplication::VApp()->IsPedantic() ? throw VException(errorMsg) :
|
||||
qWarning() << VAbstractApplication::warningMessageSignature + errorMsg;
|
||||
|
||||
return QPointF();
|
||||
}
|
||||
|
||||
|
|
@ -188,10 +195,20 @@ QPointF VAbstractCubicBezierPath::CutSplinePath(qreal length, qint32 &p1, qint32
|
|||
if (length < minLength)
|
||||
{
|
||||
length = minLength;
|
||||
|
||||
const QString errorMsg = QObject::tr("Curve '%1'. Length of a cut segment is too small. Optimize it to minimal "
|
||||
"value.").arg(name());
|
||||
VAbstractApplication::VApp()->IsPedantic() ? throw VException(errorMsg) :
|
||||
qWarning() << VAbstractApplication::warningMessageSignature + errorMsg;
|
||||
}
|
||||
else if (length > maxLength)
|
||||
{
|
||||
length = maxLength;
|
||||
|
||||
const QString errorMsg = QObject::tr("Curve '%1'. Length of a cut segment is too big. Optimize it to maximal "
|
||||
"value.").arg(name());
|
||||
VAbstractApplication::VApp()->IsPedantic() ? throw VException(errorMsg) :
|
||||
qWarning() << VAbstractApplication::warningMessageSignature + errorMsg;
|
||||
}
|
||||
|
||||
fullLength = 0;
|
||||
|
|
|
|||
|
|
@ -481,7 +481,7 @@ bool VAbstractCurve::CurveIntersectAxis(const QPointF &point, qreal angle, const
|
|||
axis = QLineF(point, VGObject::BuildRay(point, angle + 180, rec));
|
||||
points += VAbstractCurve::CurveIntersectLine(curvePoints, axis);
|
||||
|
||||
if (points.size() > 0)
|
||||
if (not points.isEmpty())
|
||||
{
|
||||
if (points.size() == 1)
|
||||
{
|
||||
|
|
@ -516,11 +516,26 @@ bool VAbstractCurve::CurveIntersectAxis(const QPointF &point, qreal angle, const
|
|||
*intersectionPoint = points.at(forward.first());
|
||||
return true;
|
||||
}
|
||||
else if (not backward.isEmpty())
|
||||
|
||||
if (not backward.isEmpty())
|
||||
{
|
||||
*intersectionPoint = points.at(backward.first());
|
||||
return true;
|
||||
}
|
||||
|
||||
if (VAbstractCurve::IsPointOnCurve(curvePoints, point))
|
||||
{
|
||||
*intersectionPoint = point;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (VAbstractCurve::IsPointOnCurve(curvePoints, point))
|
||||
{
|
||||
*intersectionPoint = point;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@
|
|||
|
||||
#include <QLineF>
|
||||
#include <QPointF>
|
||||
#include <QtDebug>
|
||||
|
||||
#include "../vmisc/def.h"
|
||||
#include "../vmisc/vmath.h"
|
||||
|
|
@ -38,6 +39,7 @@
|
|||
#include "vabstractcurve.h"
|
||||
#include "varc_p.h"
|
||||
#include "vspline.h"
|
||||
#include "../ifc/exception/vexception.h"
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
/**
|
||||
|
|
@ -351,6 +353,11 @@ QPointF VArc::CutArc(qreal length, VArc &arc1, VArc &arc2) const
|
|||
{
|
||||
arc1 = VArc();
|
||||
arc2 = VArc();
|
||||
|
||||
const QString errorMsg = QObject::tr("Unable to cut curve '%1'. The curve is too short.").arg(name());
|
||||
VAbstractApplication::VApp()->IsPedantic() ? throw VException(errorMsg) :
|
||||
qWarning() << VAbstractApplication::warningMessageSignature + errorMsg;
|
||||
|
||||
return QPointF();
|
||||
}
|
||||
|
||||
|
|
@ -362,7 +369,26 @@ QPointF VArc::CutArc(qreal length, VArc &arc1, VArc &arc2) const
|
|||
{
|
||||
length = fullLength + length;
|
||||
}
|
||||
length = qBound(ToPixel(1, Unit::Mm), length, fullLength - ToPixel(1, Unit::Mm));
|
||||
|
||||
const qreal minLength = ToPixel(1, Unit::Mm);
|
||||
const qreal maxLength = fullLength - ToPixel(1, Unit::Mm);
|
||||
|
||||
if (length < minLength)
|
||||
{
|
||||
const QString errorMsg = QObject::tr("Curve '%1'. Length of a cut segment is too small. Optimize it to "
|
||||
"minimal value.").arg(name());
|
||||
VAbstractApplication::VApp()->IsPedantic() ? throw VException(errorMsg) :
|
||||
qWarning() << VAbstractApplication::warningMessageSignature + errorMsg;
|
||||
}
|
||||
else if (length > maxLength)
|
||||
{
|
||||
const QString errorMsg = QObject::tr("Curve '%1'. Length of a cut segment is too big. Optimize it to "
|
||||
"maximal value.").arg(name());
|
||||
VAbstractApplication::VApp()->IsPedantic() ? throw VException(errorMsg) :
|
||||
qWarning() << VAbstractApplication::warningMessageSignature + errorMsg;
|
||||
}
|
||||
|
||||
length = qBound(minLength, length, maxLength);
|
||||
|
||||
line.setAngle(line.angle() + qRadiansToDegrees(length/d->radius));
|
||||
}
|
||||
|
|
@ -372,7 +398,26 @@ QPointF VArc::CutArc(qreal length, VArc &arc1, VArc &arc2) const
|
|||
{
|
||||
length = fullLength + length;
|
||||
}
|
||||
length = qBound(fullLength + ToPixel(1, Unit::Mm), length, ToPixel(-1, Unit::Mm));
|
||||
|
||||
const qreal minLength = fullLength + ToPixel(1, Unit::Mm);
|
||||
const qreal maxLength = ToPixel(-1, Unit::Mm);
|
||||
|
||||
if (length > minLength)
|
||||
{
|
||||
const QString errorMsg = QObject::tr("Curve '%1'. Length of a cut segment is too small. Optimize it to "
|
||||
"minimal value.").arg(name());
|
||||
VAbstractApplication::VApp()->IsPedantic() ? throw VException(errorMsg) :
|
||||
qWarning() << VAbstractApplication::warningMessageSignature + errorMsg;
|
||||
}
|
||||
else if (length < maxLength)
|
||||
{
|
||||
const QString errorMsg = QObject::tr("Curve '%1'. Length of a cut segment is too big. Optimize it to "
|
||||
"maximal value.").arg(name());
|
||||
VAbstractApplication::VApp()->IsPedantic() ? throw VException(errorMsg) :
|
||||
qWarning() << VAbstractApplication::warningMessageSignature + errorMsg;
|
||||
}
|
||||
|
||||
length = qBound(minLength, length, maxLength);
|
||||
|
||||
line.setAngle(line.angle() - qRadiansToDegrees(qAbs(length)/d->radius));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,10 +31,12 @@
|
|||
#include <QLineF>
|
||||
#include <QPoint>
|
||||
#include <QPainterPath>
|
||||
#include <QtDebug>
|
||||
|
||||
#include "../vmisc/def.h"
|
||||
#include "../vmisc/vmath.h"
|
||||
#include "../ifc/ifcdef.h"
|
||||
#include "../ifc/exception/vexception.h"
|
||||
#include "../vmisc/vabstractapplication.h"
|
||||
#include "../vmisc/compatibility.h"
|
||||
#include "vabstractcurve.h"
|
||||
|
|
@ -356,6 +358,11 @@ QPointF VEllipticalArc::CutArc(const qreal &length, VEllipticalArc &arc1, VEllip
|
|||
{
|
||||
arc1 = VEllipticalArc();
|
||||
arc2 = VEllipticalArc();
|
||||
|
||||
const QString errorMsg = QObject::tr("Unable to cut curve '%1'. The curve is too short.").arg(name());
|
||||
VAbstractApplication::VApp()->IsPedantic() ? throw VException(errorMsg) :
|
||||
qWarning() << VAbstractApplication::warningMessageSignature + errorMsg;
|
||||
|
||||
return QPointF();
|
||||
}
|
||||
|
||||
|
|
@ -364,10 +371,20 @@ QPointF VEllipticalArc::CutArc(const qreal &length, VEllipticalArc &arc1, VEllip
|
|||
if (length < minLength)
|
||||
{
|
||||
len = minLength;
|
||||
|
||||
const QString errorMsg = QObject::tr("Curve '%1'. Length of a cut segment is too small. Optimize it to minimal "
|
||||
"value.").arg(name());
|
||||
VAbstractApplication::VApp()->IsPedantic() ? throw VException(errorMsg) :
|
||||
qWarning() << VAbstractApplication::warningMessageSignature + errorMsg;
|
||||
}
|
||||
else if (length > maxLength)
|
||||
{
|
||||
len = maxLength;
|
||||
|
||||
const QString errorMsg = QObject::tr("Curve '%1'. Length of a cut segment is too big. Optimize it to maximal "
|
||||
"value.").arg(name());
|
||||
VAbstractApplication::VApp()->IsPedantic() ? throw VException(errorMsg) :
|
||||
qWarning() << VAbstractApplication::warningMessageSignature + errorMsg;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ private:
|
|||
};
|
||||
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);
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ const qreal maxL = 3.5;
|
|||
|
||||
const qreal VSAPoint::passmarkFactor = 0.5;
|
||||
const qreal VSAPoint::maxPassmarkLength = (10/*mm*/ / 25.4) * PrintDPI;
|
||||
const qreal VSAPoint::minSAWidth = ToPixel(0.015, Unit::Cm);
|
||||
const qreal VSAPoint::minSAWidth = accuracyPointOnLine + accuracyPointOnLine*0.5;
|
||||
|
||||
namespace
|
||||
{
|
||||
|
|
@ -1532,8 +1532,8 @@ bool VAbstractPiece::IsAllowanceValid(const QVector<QPointF> &base, const QVecto
|
|||
return false; // Not enough data
|
||||
}
|
||||
|
||||
// DumpVector(base); // Uncomment for dumping test data
|
||||
// DumpVector(allowance); // Uncomment for dumping test data
|
||||
// DumpVector(base, QStringLiteral("base.json.XXXXXX")); // Uncomment for dumping test data
|
||||
// DumpVector(allowance, QStringLiteral("allowance.json.XXXXXX")); // Uncomment for dumping test data
|
||||
|
||||
// First check direction
|
||||
const qreal baseDirection = VPiece::SumTrapezoids(base);
|
||||
|
|
|
|||
|
|
@ -142,6 +142,7 @@ void VLayoutExporter::ExportToSVG(QGraphicsScene *scene) const
|
|||
|
||||
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);
|
||||
|
|
@ -396,6 +397,18 @@ auto VLayoutExporter::SupportPDFConversion() -> bool
|
|||
return res;
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
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.
|
||||
|
|
|
|||
|
|
@ -93,9 +93,13 @@ public:
|
|||
|
||||
static auto SupportPDFConversion() -> bool;
|
||||
|
||||
|
||||
static QString ExportFormatDescription(LayoutExportFormats format);
|
||||
static QString ExportFormatSuffix(LayoutExportFormats format);
|
||||
|
||||
auto offset() const -> QPointF;
|
||||
void SetOffset(QPointF newOffset);
|
||||
|
||||
private:
|
||||
QString m_fileName{};
|
||||
QMarginsF m_margins{};
|
||||
|
|
@ -108,6 +112,7 @@ private:
|
|||
bool m_ignorePrinterMargins{false};
|
||||
bool m_binaryDxfFormat{false};
|
||||
int m_dxfVersion{0};
|
||||
QPointF m_offset{};
|
||||
|
||||
static void PdfToPs(const QStringList ¶ms);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -744,16 +744,21 @@ auto VPrintLayout::WatermarkData() const -> VWatermarkData
|
|||
//---------------------------------------------------------------------------------------------------------------------
|
||||
auto VPrintLayout::ContinueIfLayoutStale(QWidget *parent) -> int
|
||||
{
|
||||
QMessageBox msgBox(parent);
|
||||
msgBox.setIcon(QMessageBox::Question);
|
||||
msgBox.setWindowTitle(tr("The layout is stale."));
|
||||
msgBox.setText(tr("The layout was not updated since last pattern modification. Do you want to continue?"));
|
||||
msgBox.setStandardButtons(QMessageBox::Yes|QMessageBox::No);
|
||||
msgBox.setDefaultButton(QMessageBox::No);
|
||||
const int width = 500;
|
||||
auto* horizontalSpacer = new QSpacerItem(width, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
|
||||
auto* layout = qobject_cast<QGridLayout*>(msgBox.layout());
|
||||
SCASSERT(layout != nullptr)
|
||||
layout->addItem(horizontalSpacer, layout->rowCount(), 0, 1, layout->columnCount());
|
||||
return msgBox.exec();
|
||||
if (VAbstractApplication::VApp()->IsAppInGUIMode())
|
||||
{
|
||||
QMessageBox msgBox(parent);
|
||||
msgBox.setIcon(QMessageBox::Question);
|
||||
msgBox.setWindowTitle(tr("The layout is stale."));
|
||||
msgBox.setText(tr("The layout was not updated since last pattern modification. Do you want to continue?"));
|
||||
msgBox.setStandardButtons(QMessageBox::Yes|QMessageBox::No);
|
||||
msgBox.setDefaultButton(QMessageBox::No);
|
||||
const int width = 500;
|
||||
auto* horizontalSpacer = new QSpacerItem(width, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
|
||||
auto* layout = qobject_cast<QGridLayout*>(msgBox.layout());
|
||||
SCASSERT(layout != nullptr)
|
||||
layout->addItem(horizontalSpacer, layout->rowCount(), 0, 1, layout->columnCount());
|
||||
return msgBox.exec();
|
||||
}
|
||||
|
||||
return QMessageBox::Yes;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -138,7 +138,7 @@ private:
|
|||
bool m_isAutoCropWidth{false};
|
||||
bool m_isUnitePages{false};
|
||||
QString m_layoutPrinterName{};
|
||||
bool m_isLayoutStale{true};
|
||||
bool m_isLayoutStale{false};
|
||||
QMarginsF m_tiledMargins{};
|
||||
PageOrientation m_tiledPDFOrientation{PageOrientation::Portrait};
|
||||
QSizeF m_tiledPDFPaperSize{};
|
||||
|
|
|
|||
|
|
@ -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));
|
||||
|
|
|
|||
|
|
@ -49,8 +49,8 @@ extern const QString APP_VERSION_STR;
|
|||
// 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 @@ extern const QString APP_VERSION_STR;
|
|||
//#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();
|
||||
|
|
|
|||
|
|
@ -195,17 +195,6 @@ void VAbstractApplication::WinAttachConsole()
|
|||
}
|
||||
#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)
|
||||
{
|
||||
|
|
@ -324,9 +313,3 @@ QFileDialog::Options VAbstractApplication::NativeFileDialog(QFileDialog::Options
|
|||
|
||||
return options;
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
auto VAbstractApplication::VApp() -> VAbstractApplication *
|
||||
{
|
||||
return qobject_cast<VAbstractApplication*>(QCoreApplication::instance());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -120,4 +120,21 @@ inline QString VAbstractApplication::LocaleToString(const T &value)
|
|||
return loc.toString(value);
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
inline auto VAbstractApplication::VApp() -> VAbstractApplication *
|
||||
{
|
||||
return qobject_cast<VAbstractApplication*>(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
|
||||
|
|
|
|||
|
|
@ -82,6 +82,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingTextAsPaths, (QLatin1String("lay
|
|||
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")))
|
||||
|
|
@ -653,3 +654,27 @@ void VValentinaSettings::SetLayoutExportFormat(qint8 format)
|
|||
{
|
||||
setValue(*settingLayoutExportFormat, format);
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
qint8 VValentinaSettings::GetDetailExportFormat() const
|
||||
{
|
||||
return qvariant_cast<qint8>(value(*settingDetailExportFormat, 0));
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
void VValentinaSettings::SetDetailExportFormat(qint8 format)
|
||||
{
|
||||
setValue(*settingDetailExportFormat, format);
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
template<typename T>
|
||||
T VValentinaSettings::GetCachedValue(T &cache, const QString &setting, T defValue, T valueMin, T valueMax) const
|
||||
{
|
||||
if (cache < 0)
|
||||
{
|
||||
cache = qBound(valueMin, ValueOrDef(setting, defValue), valueMax);
|
||||
}
|
||||
|
||||
return cache;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -170,6 +170,9 @@ public:
|
|||
auto GetLayoutExportFormat() const -> qint8;
|
||||
void SetLayoutExportFormat(qint8 format);
|
||||
|
||||
auto GetDetailExportFormat() const -> qint8;
|
||||
void SetDetailExportFormat(qint8 format);
|
||||
|
||||
private:
|
||||
Q_DISABLE_COPY(VValentinaSettings)
|
||||
|
||||
|
|
|
|||
|
|
@ -128,10 +128,10 @@ bool VObjEngine::begin(QPaintDevice *pdev)
|
|||
stream = QSharedPointer<QTextStream>(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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -241,12 +241,12 @@ void AbstractTest::PassmarkDataFromJson(const QString &json, VPiecePassmarkData
|
|||
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<int>(PassmarkLineType::OneLine)));
|
||||
data.passmarkLineType = passmarkLineType;
|
||||
|
||||
PassmarkAngleType passmarkAngleType;
|
||||
PassmarkAngleType passmarkAngleType = PassmarkAngleType::Straightforward;
|
||||
AbstractTest::ReadDoubleValue(passmarkData, QStringLiteral("passmarkAngleType"), passmarkAngleType,
|
||||
QString::number(static_cast<int>(PassmarkAngleType::Straightforward)));
|
||||
data.passmarkAngleType = passmarkAngleType;
|
||||
|
|
@ -259,11 +259,11 @@ void AbstractTest::PassmarkDataFromJson(const QString &json, VPiecePassmarkData
|
|||
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 @@ void AbstractTest::SAPointFromJson(const QJsonObject &itemObject, VSAPoint &poin
|
|||
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<int>(PieceNodeAngle::ByLength)));
|
||||
point.SetAngleType(angleType);
|
||||
|
|
|
|||
|
|
@ -132,9 +132,9 @@ DialogSeamAllowance::DialogSeamAllowance(const VContainer *data, quint32 toolId,
|
|||
m_tabPlaceLabels(new QWidget),
|
||||
m_ftb(new FancyTabBar(FancyTabBar::Left, this)),
|
||||
applyAllowed(false),// By default disabled
|
||||
flagGPin(true),
|
||||
flagDPin(true),
|
||||
flagPPin(true),
|
||||
flagGPin(false),
|
||||
flagDPin(false),
|
||||
flagPPin(false),
|
||||
flagGFormulas(true),
|
||||
flagDLAngle(true),
|
||||
flagDLFormulas(true),
|
||||
|
|
@ -172,6 +172,8 @@ DialogSeamAllowance::DialogSeamAllowance(const VContainer *data, quint32 toolId,
|
|||
{
|
||||
ui->setupUi(this);
|
||||
|
||||
m_defLabelValue = QString().setNum(UnitConvertor(10, Unit::Cm, *data->GetPatternUnit()));
|
||||
|
||||
InitOkCancelApply(ui);
|
||||
InitFancyTabBar();
|
||||
EnableApply(applyAllowed);
|
||||
|
|
@ -2603,8 +2605,8 @@ VPiece DialogSeamAllowance::CreatePiece() const
|
|||
}
|
||||
else
|
||||
{
|
||||
piece.GetPatternPieceData().SetLabelWidth(QString::number(1));
|
||||
piece.GetPatternPieceData().SetLabelHeight(QString::number(1));
|
||||
piece.GetPatternPieceData().SetLabelWidth(m_defLabelValue);
|
||||
piece.GetPatternPieceData().SetLabelHeight(m_defLabelValue);
|
||||
piece.GetPatternPieceData().SetCenterPin(NULL_ID);
|
||||
piece.GetPatternPieceData().SetTopLeftPin(getCurrentObjectId(uiTabLabels->comboBoxDLTopLeftPin));
|
||||
piece.GetPatternPieceData().SetBottomRightPin(getCurrentObjectId(uiTabLabels->comboBoxDLBottomRightPin));
|
||||
|
|
@ -2626,8 +2628,8 @@ VPiece DialogSeamAllowance::CreatePiece() const
|
|||
piece.GetPatternInfo().SetCenterPin(NULL_ID);
|
||||
piece.GetPatternInfo().SetTopLeftPin(getCurrentObjectId(uiTabLabels->comboBoxPLTopLeftPin));
|
||||
piece.GetPatternInfo().SetBottomRightPin(getCurrentObjectId(uiTabLabels->comboBoxPLBottomRightPin));
|
||||
piece.GetPatternInfo().SetLabelWidth(QString::number(1));
|
||||
piece.GetPatternInfo().SetLabelHeight(QString::number(1));
|
||||
piece.GetPatternInfo().SetLabelWidth(m_defLabelValue);
|
||||
piece.GetPatternInfo().SetLabelHeight(m_defLabelValue);
|
||||
}
|
||||
|
||||
piece.GetGrainlineGeometry().SetVisible(uiTabGrainline->groupBoxGrainline->isChecked());
|
||||
|
|
@ -2645,7 +2647,7 @@ VPiece DialogSeamAllowance::CreatePiece() const
|
|||
else
|
||||
{
|
||||
piece.GetGrainlineGeometry().SetRotation(QString::number(90));
|
||||
piece.GetGrainlineGeometry().SetLength(QChar('1'));
|
||||
piece.GetGrainlineGeometry().SetLength(m_defLabelValue);
|
||||
piece.GetGrainlineGeometry().SetCenterPin(NULL_ID);
|
||||
piece.GetGrainlineGeometry().SetTopPin(getCurrentObjectId(uiTabGrainline->comboBoxGrainlineTopPin));
|
||||
piece.GetGrainlineGeometry().SetBottomPin(getCurrentObjectId(uiTabGrainline->comboBoxGrainlineBottomPin));
|
||||
|
|
@ -3210,11 +3212,10 @@ void DialogSeamAllowance::InitPatternPieceDataTab()
|
|||
//---------------------------------------------------------------------------------------------------------------------
|
||||
void DialogSeamAllowance::InitLabelsTab()
|
||||
{
|
||||
QString labelValue = QString().setNum(UnitConvertor(10, Unit::Cm, *data->GetPatternUnit()));
|
||||
uiTabLabels->lineEditDLWidthFormula->setPlainText(labelValue);
|
||||
uiTabLabels->lineEditDLHeightFormula->setPlainText(labelValue);
|
||||
uiTabLabels->lineEditPLWidthFormula->setPlainText(labelValue);
|
||||
uiTabLabels->lineEditPLHeightFormula->setPlainText(labelValue);
|
||||
uiTabLabels->lineEditDLWidthFormula->setPlainText(m_defLabelValue);
|
||||
uiTabLabels->lineEditDLHeightFormula->setPlainText(m_defLabelValue);
|
||||
uiTabLabels->lineEditPLWidthFormula->setPlainText(m_defLabelValue);
|
||||
uiTabLabels->lineEditPLHeightFormula->setPlainText(m_defLabelValue);
|
||||
|
||||
m_DLWidthBaseHeight = uiTabLabels->lineEditDLWidthFormula->height();
|
||||
m_DLHeightBaseHeight = uiTabLabels->lineEditDLHeightFormula->height();
|
||||
|
|
|
|||
|
|
@ -240,6 +240,8 @@ private:
|
|||
|
||||
VAbstractPattern *m_doc{nullptr};
|
||||
|
||||
QString m_defLabelValue{};
|
||||
|
||||
VPiece CreatePiece() const;
|
||||
|
||||
void NewMainPathItem(const VPieceNode &node);
|
||||
|
|
|
|||
|
|
@ -356,6 +356,13 @@ QString VToolCurveIntersectAxis::MakeToolTip() const
|
|||
return toolTip;
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
void VToolCurveIntersectAxis::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
|
||||
{
|
||||
VToolLinePoint::hoverEnterEvent(event);
|
||||
mainLine->SetBoldLine(false);
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
void VToolCurveIntersectAxis::SetSegments(const QPair<QString, QString> &segments)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -89,6 +89,7 @@ protected:
|
|||
virtual void ReadToolAttributes(const QDomElement &domElement) override;
|
||||
virtual void SetVisualization() override;
|
||||
virtual auto MakeToolTip() const -> QString override;
|
||||
virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override;
|
||||
|
||||
void SetSegments(const QPair<QString, QString> &segments);
|
||||
private:
|
||||
|
|
|
|||
|
|
@ -358,3 +358,10 @@ QString VToolLineIntersectAxis::MakeToolTip() const
|
|||
.arg(tr("Label"), current->name());
|
||||
return toolTip;
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
void VToolLineIntersectAxis::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
|
||||
{
|
||||
VToolLinePoint::hoverEnterEvent(event);
|
||||
mainLine->SetBoldLine(false);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -95,6 +95,7 @@ protected:
|
|||
virtual void ReadToolAttributes(const QDomElement &domElement) override;
|
||||
virtual void SetVisualization() override;
|
||||
virtual QString MakeToolTip() const override;
|
||||
virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override;
|
||||
private:
|
||||
Q_DISABLE_COPY(VToolLineIntersectAxis)
|
||||
|
||||
|
|
|
|||
|
|
@ -99,7 +99,10 @@ void VisToolLineIntersectAxis::RefreshGeometry()
|
|||
QPointF p;
|
||||
VToolLineIntersectAxis::FindPoint(axis, base_line, &p);
|
||||
QLineF axis_line(static_cast<QPointF>(*third), p);
|
||||
DrawLine(this, axis_line, mainColor, lineStyle);
|
||||
if (not axis_line.isNull())
|
||||
{
|
||||
DrawLine(this, axis_line, mainColor, lineStyle);
|
||||
}
|
||||
|
||||
DrawPoint(point, p, mainColor);
|
||||
ShowIntersection(axis_line, base_line);
|
||||
|
|
|
|||
|
|
@ -125,14 +125,17 @@ void VGraphicsSimpleTextItem::paint(QPainter *painter, const QStyleOptionGraphic
|
|||
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));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -221,9 +221,9 @@ void VMainGraphicsScene::InitOrigins()
|
|||
//---------------------------------------------------------------------------------------------------------------------
|
||||
void VMainGraphicsScene::SetOriginsVisible(bool visible)
|
||||
{
|
||||
for (auto item : qAsConst(origins))
|
||||
for (auto *item : qAsConst(origins))
|
||||
{
|
||||
if (item)
|
||||
if (item != nullptr)
|
||||
{
|
||||
item->setVisible(visible);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -170,11 +170,6 @@
|
|||
"x": 2797.5081938293038,
|
||||
"y": 711.5320126236637
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 2797.565477459869,
|
||||
"y": 778.332404004272
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 2798.0441679430687,
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -110,11 +110,6 @@
|
|||
"x": 330.9882848734929,
|
||||
"y": 102.87077188278468
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 331.48273454480426,
|
||||
"y": 104.45283583549359
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 332.2173315417802,
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
@ -120,11 +120,6 @@
|
|||
"x": -1592.433553865018,
|
||||
"y": -1150.9286376239052
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": -1581.1249477487709,
|
||||
"y": -1139.9848040550612
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": -1574.7272893318411,
|
||||
|
|
@ -310,11 +305,6 @@
|
|||
"x": -1984.5634596707787,
|
||||
"y": -98.8935172003726
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": -1990.4276010223648,
|
||||
"y": -91.09922907737571
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": -1997.2051328041664,
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
"vector": [
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 29.433070866141634,
|
||||
"y": 970.4328156646322
|
||||
"x": 29.11842519685024,
|
||||
"y": 970.4543384295728
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 29.433070866141733,
|
||||
"y": 2.2085234576982202
|
||||
"x": 29.118425196850392,
|
||||
"y": 2.21193428424408
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
|
|
@ -67,13 +67,13 @@
|
|||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 285.16939607807865,
|
||||
"y": -68.91025714339723
|
||||
"x": 285.54316176628,
|
||||
"y": -69.17631403269839
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 556.9804629248772,
|
||||
"y": -31.407692230837753
|
||||
"x": 557.0289896899872,
|
||||
"y": -31.71862328205888
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
|
|
@ -82,13 +82,13 @@
|
|||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 586.153833178555,
|
||||
"y": -21.2174860962975
|
||||
"x": 586.285424563237,
|
||||
"y": -21.503347379130616
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 1117.7037149530324,
|
||||
"y": 212.15307563552184
|
||||
"x": 1117.8412466375905,
|
||||
"y": 211.86982236967177
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
|
|
@ -225,21 +225,11 @@
|
|||
"x": 1074.3830151134664,
|
||||
"y": 697.7096649640414
|
||||
},
|
||||
{
|
||||
"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,
|
||||
|
|
@ -262,18 +252,18 @@
|
|||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 1290.4028062852726,
|
||||
"y": 707.5008815309488
|
||||
"x": 1290.475911190263,
|
||||
"y": 707.5015785231967
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 1302.4618765682826,
|
||||
"y": 882.3181924346007
|
||||
"x": 1302.486882635022,
|
||||
"y": 882.6858530210393
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 29.433070866141634,
|
||||
"y": 970.4328156646322
|
||||
"x": 29.11842519685024,
|
||||
"y": 970.4543384295728
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,8 +2,13 @@
|
|||
"vector": [
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 1117.7037149530322,
|
||||
"y": 212.15307563552173
|
||||
"x": 586.285424563237,
|
||||
"y": -21.503347379130616
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 1117.8412466375905,
|
||||
"y": 211.8698223696717
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
|
|
@ -102,8 +107,8 @@
|
|||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 1020.6660121283516,
|
||||
"y": 644.7426504865729
|
||||
"x": 1020.5214918560622,
|
||||
"y": 644.8368304816686
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
|
|
@ -140,21 +145,11 @@
|
|||
"x": 1074.3830151134664,
|
||||
"y": 697.7096649640414
|
||||
},
|
||||
{
|
||||
"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,
|
||||
|
|
@ -177,23 +172,23 @@
|
|||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 1290.4028062852726,
|
||||
"y": 707.5008815309488
|
||||
"x": 1290.475911190263,
|
||||
"y": 707.5015785231967
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 1302.4618765682826,
|
||||
"y": 882.3181924346007
|
||||
"x": 1302.486882635022,
|
||||
"y": 882.6858530210393
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 29.433070866141634,
|
||||
"y": 970.4328156646322
|
||||
"x": 29.11842519685024,
|
||||
"y": 970.4543384295728
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 29.433070866141733,
|
||||
"y": 2.2085234576982202
|
||||
"x": 29.118425196850392,
|
||||
"y": 2.21193428424408
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
|
|
@ -252,13 +247,13 @@
|
|||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 285.16939607807876,
|
||||
"y": -68.9102571433973
|
||||
"x": 285.5431617662801,
|
||||
"y": -69.17631403269846
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 556.9804629248772,
|
||||
"y": -31.407692230837736
|
||||
"x": 557.0289896899872,
|
||||
"y": -31.71862328205886
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
|
|
@ -267,13 +262,8 @@
|
|||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 586.153833178555,
|
||||
"y": -21.217486096297492
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 1117.7037149530322,
|
||||
"y": 212.15307563552173
|
||||
"x": 586.285424563237,
|
||||
"y": -21.503347379130616
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
"vector": [
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 29.433070866141634,
|
||||
"y": 970.4328156646322
|
||||
"x": 29.11842519685024,
|
||||
"y": 970.4543384295728
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 29.433070866141733,
|
||||
"y": 2.2085234576982202
|
||||
"x": 29.118425196850392,
|
||||
"y": 2.21193428424408
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
|
|
@ -77,18 +77,18 @@
|
|||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 330.2597593313006,
|
||||
"y": -109.8693765699337
|
||||
"x": 330.5479727319059,
|
||||
"y": -110.14723735764198
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 335.08623255837216,
|
||||
"y": -62.0230857634808
|
||||
"x": 335.3744459589775,
|
||||
"y": -62.300946551189064
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 556.9804629248772,
|
||||
"y": -31.407692230837753
|
||||
"x": 557.0289896899872,
|
||||
"y": -31.71862328205888
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
|
|
@ -97,13 +97,13 @@
|
|||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 586.153833178555,
|
||||
"y": -21.2174860962975
|
||||
"x": 586.285424563237,
|
||||
"y": -21.503347379130616
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 1117.7037149530324,
|
||||
"y": 212.15307563552184
|
||||
"x": 1117.8412466375905,
|
||||
"y": 211.86982236967177
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
|
|
@ -240,21 +240,11 @@
|
|||
"x": 1074.3830151134664,
|
||||
"y": 697.7096649640414
|
||||
},
|
||||
{
|
||||
"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,
|
||||
|
|
@ -277,18 +267,18 @@
|
|||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 1290.4028062852726,
|
||||
"y": 707.5008815309488
|
||||
"x": 1290.475911190263,
|
||||
"y": 707.5015785231967
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 1302.4618765682826,
|
||||
"y": 882.3181924346007
|
||||
"x": 1302.486882635022,
|
||||
"y": 882.6858530210393
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 29.433070866141634,
|
||||
"y": 970.4328156646322
|
||||
"x": 29.11842519685024,
|
||||
"y": 970.4543384295728
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
"vector": [
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 29.433070866141634,
|
||||
"y": 970.4328156646322
|
||||
"x": 29.11842519685024,
|
||||
"y": 970.4543384295728
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 29.433070866141733,
|
||||
"y": 2.2085234576982202
|
||||
"x": 29.118425196850392,
|
||||
"y": 2.21193428424408
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
|
|
@ -77,18 +77,18 @@
|
|||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 308.85408734019427,
|
||||
"y": -89.2325953918828
|
||||
"x": 309.14230074079956,
|
||||
"y": -89.51045617959079
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 335.0862325583717,
|
||||
"y": -62.023085763480815
|
||||
"x": 335.3744459589773,
|
||||
"y": -62.30094655118904
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 556.9804629248772,
|
||||
"y": -31.407692230837753
|
||||
"x": 557.0289896899872,
|
||||
"y": -31.71862328205888
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
|
|
@ -97,13 +97,13 @@
|
|||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 586.153833178555,
|
||||
"y": -21.2174860962975
|
||||
"x": 586.285424563237,
|
||||
"y": -21.503347379130616
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 1117.7037149530324,
|
||||
"y": 212.15307563552184
|
||||
"x": 1117.8412466375905,
|
||||
"y": 211.86982236967177
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
|
|
@ -240,21 +240,11 @@
|
|||
"x": 1074.3830151134664,
|
||||
"y": 697.7096649640414
|
||||
},
|
||||
{
|
||||
"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,
|
||||
|
|
@ -277,18 +267,18 @@
|
|||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 1290.4028062852726,
|
||||
"y": 707.5008815309488
|
||||
"x": 1290.475911190263,
|
||||
"y": 707.5015785231967
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 1302.4618765682826,
|
||||
"y": 882.3181924346007
|
||||
"x": 1302.486882635022,
|
||||
"y": 882.6858530210393
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 29.433070866141634,
|
||||
"y": 970.4328156646322
|
||||
"x": 29.11842519685024,
|
||||
"y": 970.4543384295728
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
"vector": [
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 29.433070866141634,
|
||||
"y": 970.4328156646322
|
||||
"x": 29.11842519685024,
|
||||
"y": 970.4543384295728
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 29.433070866141733,
|
||||
"y": 2.2085234576982202
|
||||
"x": 29.118425196850392,
|
||||
"y": 2.21193428424408
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
|
|
@ -72,13 +72,13 @@
|
|||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 335.08623255837205,
|
||||
"y": -62.023085763480815
|
||||
"x": 335.37444595897745,
|
||||
"y": -62.300946551189064
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 556.9804629248772,
|
||||
"y": -31.407692230837753
|
||||
"x": 557.0289896899872,
|
||||
"y": -31.71862328205888
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
|
|
@ -87,13 +87,13 @@
|
|||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 586.153833178555,
|
||||
"y": -21.2174860962975
|
||||
"x": 586.285424563237,
|
||||
"y": -21.503347379130616
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 1117.7037149530324,
|
||||
"y": 212.15307563552184
|
||||
"x": 1117.8412466375905,
|
||||
"y": 211.86982236967177
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
|
|
@ -230,21 +230,11 @@
|
|||
"x": 1074.3830151134664,
|
||||
"y": 697.7096649640414
|
||||
},
|
||||
{
|
||||
"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,
|
||||
|
|
@ -267,18 +257,18 @@
|
|||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 1290.4028062852726,
|
||||
"y": 707.5008815309488
|
||||
"x": 1290.475911190263,
|
||||
"y": 707.5015785231967
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 1302.4618765682826,
|
||||
"y": 882.3181924346007
|
||||
"x": 1302.486882635022,
|
||||
"y": 882.6858530210393
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 29.433070866141634,
|
||||
"y": 970.4328156646322
|
||||
"x": 29.11842519685024,
|
||||
"y": 970.4543384295728
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
"vector": [
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 29.433070866141634,
|
||||
"y": 970.4328156646322
|
||||
"x": 29.11842519685024,
|
||||
"y": 970.4543384295728
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 29.433070866141733,
|
||||
"y": 2.2085234576982202
|
||||
"x": 29.118425196850392,
|
||||
"y": 2.21193428424408
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
|
|
@ -72,13 +72,8 @@
|
|||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 286.5647821037859,
|
||||
"y": -68.71773166746928
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 556.9804629248772,
|
||||
"y": -31.407692230837753
|
||||
"x": 557.0289896899872,
|
||||
"y": -31.71862328205888
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
|
|
@ -87,13 +82,13 @@
|
|||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 586.153833178555,
|
||||
"y": -21.2174860962975
|
||||
"x": 586.285424563237,
|
||||
"y": -21.503347379130616
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 1117.7037149530324,
|
||||
"y": 212.15307563552184
|
||||
"x": 1117.8412466375905,
|
||||
"y": 211.86982236967177
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
|
|
@ -230,21 +225,11 @@
|
|||
"x": 1074.3830151134664,
|
||||
"y": 697.7096649640414
|
||||
},
|
||||
{
|
||||
"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,
|
||||
|
|
@ -267,18 +252,18 @@
|
|||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 1290.4028062852726,
|
||||
"y": 707.5008815309488
|
||||
"x": 1290.475911190263,
|
||||
"y": 707.5015785231967
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 1302.4618765682826,
|
||||
"y": 882.3181924346007
|
||||
"x": 1302.486882635022,
|
||||
"y": 882.6858530210393
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 29.433070866141634,
|
||||
"y": 970.4328156646322
|
||||
"x": 29.11842519685024,
|
||||
"y": 970.4543384295728
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
"vector": [
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 29.433070866141634,
|
||||
"y": 970.4328156646322
|
||||
"x": 29.11842519685024,
|
||||
"y": 970.4543384295728
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 29.433070866141733,
|
||||
"y": 2.2085234576982202
|
||||
"x": 29.118425196850392,
|
||||
"y": 2.21193428424408
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
|
|
@ -67,18 +67,18 @@
|
|||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 284.4390076163077,
|
||||
"y": -68.44485122652873
|
||||
"x": 284.4072000868026,
|
||||
"y": -68.45268234011405
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 284.5734311894892,
|
||||
"y": -68.99248415563486
|
||||
"x": 284.6164363645234,
|
||||
"y": -69.30417703672788
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 556.9804629248772,
|
||||
"y": -31.407692230837753
|
||||
"x": 557.0289896899872,
|
||||
"y": -31.71862328205888
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
|
|
@ -87,13 +87,13 @@
|
|||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 586.153833178555,
|
||||
"y": -21.2174860962975
|
||||
"x": 586.285424563237,
|
||||
"y": -21.503347379130616
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 1117.7037149530324,
|
||||
"y": 212.15307563552184
|
||||
"x": 1117.8412466375905,
|
||||
"y": 211.86982236967177
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
|
|
@ -230,21 +230,11 @@
|
|||
"x": 1074.3830151134664,
|
||||
"y": 697.7096649640414
|
||||
},
|
||||
{
|
||||
"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,
|
||||
|
|
@ -267,18 +257,18 @@
|
|||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 1290.4028062852726,
|
||||
"y": 707.5008815309488
|
||||
"x": 1290.475911190263,
|
||||
"y": 707.5015785231967
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 1302.4618765682826,
|
||||
"y": 882.3181924346007
|
||||
"x": 1302.486882635022,
|
||||
"y": 882.6858530210393
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 29.433070866141634,
|
||||
"y": 970.4328156646322
|
||||
"x": 29.11842519685024,
|
||||
"y": 970.4543384295728
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -260,11 +260,6 @@
|
|||
"x": 954.9126743758827,
|
||||
"y": 1599.02515094508
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 941.1480338176947,
|
||||
"y": 1598.7097479128342
|
||||
},
|
||||
{
|
||||
"type": "QPointF",
|
||||
"x": 929.6966471777685,
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user