Commit Graph

323 Commits

Author SHA1 Message Date
Roman Telezhynskyi
37efefe1ec Refactoring. Rename class VPatternPieceData to VPieceLabelData.
--HG--
branch : feature
2017-02-23 11:19:27 +02:00
Roman Telezhynskyi
5a2604d2bd "catch" a specific exception type.
--HG--
branch : develop
2017-02-22 19:49:17 +02:00
Roman Telezhynskyi
703a26a5cf Remove useless assignment to variable "date".
--HG--
branch : develop
2017-02-22 19:29:30 +02:00
Roman Telezhynskyi
67d69781f3 Remove the code after "return".
--HG--
branch : develop
2017-02-22 19:27:53 +02:00
Roman Telezhynskyi
e3d6b32aec Do not use "volatile" to sync threads.
--HG--
branch : develop
2017-02-22 14:04:47 +02:00
Roman Telezhynskyi
38abf5c9a0 Removed redundant forward declaration.
--HG--
branch : develop
2017-02-18 11:22:59 +02:00
Roman Telezhynskyi
33cdac0db1 Fixed issue #627. Seam allowance artifacts
--HG--
branch : develop
2017-02-12 17:29:54 +02:00
Roman Telezhynskyi
0ff63c57e4 MSVS error: C2065: 'not': undeclared identifier.
--HG--
branch : develop
2017-02-08 18:58:25 +02:00
Roman Telezhynskyi
aace2e0178 Internal paths in layout now support pen style.
--HG--
branch : develop
2017-02-08 13:48:05 +02:00
Roman Telezhynskyi
289157a511 Resolve broken dependecy.
--HG--
branch : develop
2017-01-25 18:07:18 +02:00
Roman Telezhynskyi
a7987422ae Cppcheck warnings.
--HG--
branch : feature
2017-01-25 17:04:53 +02:00
Roman Telezhynskyi
2c795281dd Merge with develop.
--HG--
branch : feature
2017-01-25 13:29:03 +02:00
fabrice salvaire
55509e523d fixed typo in code: allowence and greed
--HG--
branch : develop
2017-01-23 17:20:15 +01:00
Roman Telezhynskyi
41c7031aea Remove unused anymore enum class EquidistantType.
--HG--
branch : feature
2017-01-23 14:02:05 +02:00
Roman Telezhynskyi
8c1bd37491 Show piece's internal paths on a layout.
--HG--
branch : feature
2017-01-22 14:32:25 +02:00
Roman Telezhynskyi
b99bdc4742 A seam allowance is alwayse closed.
--HG--
branch : feature
2017-01-22 13:21:07 +02:00
Roman Telezhynskyi
a1a25a39e7 Fixed typo.
--HG--
branch : feature
2017-01-22 13:20:04 +02:00
Roman Telezhynskyi
fb86e6c51f Remove class VAbstractDetail.
--HG--
branch : feature
2017-01-22 11:20:33 +02:00
Roman Telezhynskyi
10a13a499d Rename class VLayoutDetail.
--HG--
branch : feature
2017-01-22 11:02:02 +02:00
Roman Telezhynskyi
c6f529992b Switch parent for class VLayoutDetail to VAbstractPiece.
--HG--
branch : feature
2017-01-22 10:50:23 +02:00
Roman Telezhynskyi
8fb6c9c508 Code that converts VPiece to VLayoutDetail moved to static function.
--HG--
branch : feature
2017-01-22 10:32:01 +02:00
Roman Telezhynskyi
12162e49e8 Port changes from develop branch.
--HG--
branch : feature
2017-01-11 14:53:16 +02:00
Roman Telezhynskyi
5a95ce9c8a Merge with develop.
--HG--
branch : feature
2017-01-11 14:05:06 +02:00
Roman Telezhynskyi
ff03f67663 Fix infinite loop in method VAbstractDetail::CheckLoops().
--HG--
branch : develop
2017-01-11 13:54:06 +02:00
Roman Telezhynskyi
e952260a9f Fixed issue #609. Bug in CheckLoops method. Better handling internal and
external loops.

--HG--
branch : develop
2017-01-09 18:25:13 +02:00
Roman Telezhynskyi
a842e2c2d1 Fixed issue #604. Seams allowances gets "weird" and turns inward when changing
measurment file.

--HG--
branch : develop
2017-01-05 17:16:36 +02:00
Roman Telezhynskyi
d4317a61ec Fix division by zero.
--HG--
branch : develop
2017-01-05 13:11:18 +02:00
Roman Telezhynskyi
ff87b32ae9 Port changes for issue #603.
--HG--
branch : feature
2016-12-23 14:00:50 +02:00
Roman Telezhynskyi
0419f60e0b Merge with develop.
--HG--
branch : feature
2016-12-23 12:58:17 +02:00
Roman Telezhynskyi
c9e9fb57d5 Fixed issue #603. Wrong layout caused by wrong seam allowance.
--HG--
branch : develop
2016-12-23 10:25:45 +02:00
Roman Telezhynskyi
2d61b87256 Remove empty statement.
--HG--
branch : develop
2016-12-20 21:19:21 +02:00
Roman Telezhynskyi
ffab000e0f Remove empty statement.
--HG--
branch : develop
2016-12-20 20:57:20 +02:00
Roman Telezhynskyi
067fd97ae3 Merge with develop.
--HG--
branch : feature
2016-12-15 11:42:20 +02:00
Roman Telezhynskyi
227e4f0ba0 Better way to find maximally suitable font size.
--HG--
branch : feature
2016-12-15 08:50:25 +02:00
Roman Telezhynskyi
97d76957e3 Use font's height.
--HG--
branch : feature
2016-12-15 08:46:45 +02:00
Roman Telezhynskyi
8d526d2ebc Set min font size to 5.
--HG--
branch : feature
2016-12-14 12:09:59 +02:00
Roman Telezhynskyi
4eb9b2da83 Cleaning code.
--HG--
branch : feature
2016-12-14 11:59:21 +02:00
Roman Telezhynskyi
62d3d5283a Cppcheck warning.
--HG--
branch : feature
2016-12-14 11:32:22 +02:00
BojanKverh
f6122ea8be Fixed font size calculation, so that the app does not get stuck
--HG--
branch : feature
2016-12-14 00:56:30 +01:00
Bojan Kverh
9690d47df4 Merged develop into feature
--HG--
branch : feature
2016-12-13 19:01:20 +01:00
Roman Telezhynskyi
93535d8f19 Port new test case. Zigzag in main path.
--HG--
branch : feature
2016-12-10 20:09:03 +02:00
Roman Telezhynskyi
bd49df3d50 Merge with develop.
--HG--
branch : feature
2016-12-10 19:54:13 +02:00
Roman Telezhynskyi
9b679d7c3e Resolved issue #595. GapWidth affecting to the margins.
--HG--
branch : develop
2016-12-10 18:38:34 +02:00
Roman Telezhynskyi
9cdf222467 New test case. Zigzag in main path.
--HG--
branch : develop
2016-12-07 18:55:01 +02:00
BojanKverh
21445db240 Fixed the hangup bug because of very long label words
--HG--
branch : feature
2016-12-02 00:44:28 +01:00
Roman Telezhynskyi
7eb4e806c0 Declare default name for detail.
--HG--
branch : feature
2016-11-29 14:18:23 +02:00
Roman Telezhynskyi
854e54ebc0 Handle seam allowance angles.
--HG--
branch : feature
2016-11-19 18:27:06 +02:00
Roman Telezhynskyi
7aa7ba8e57 Handle firt default angle type.
--HG--
branch : feature
2016-11-19 15:29:54 +02:00
Roman Telezhynskyi
d38f318569 Cppcheck warnings.
--HG--
branch : feature
2016-11-18 13:24:19 +02:00
Roman Telezhynskyi
726d8614dc Unit tests for testing seam allowance.
--HG--
branch : feature
2016-11-18 12:58:47 +02:00
Roman Telezhynskyi
a284ac024e VSAPoint class should keep data in pixels. Make testing a lot easier.
--HG--
branch : feature
2016-11-17 14:08:23 +02:00
Roman Telezhynskyi
afb267c05c Added several comments.
--HG--
branch : feature
2016-11-17 11:37:10 +02:00
Roman Telezhynskyi
4237456228 Fix seam allowance bug.
--HG--
branch : feature
2016-11-17 11:00:04 +02:00
Roman Telezhynskyi
cf5afffd60 Fix seam allowance bug. Speacial "dart" case.
--HG--
branch : feature
2016-11-16 11:16:16 +02:00
Roman Telezhynskyi
4de969daa2 Much better way to compare bisectors.
--HG--
branch : feature
2016-11-13 21:13:55 +02:00
Roman Telezhynskyi
1a9af78bef Fix seam allowance bug.
Fix reverse dart case.

--HG--
branch : feature
2016-11-13 11:23:04 +02:00
Roman Telezhynskyi
3544e5611e Fix seam allowance bug.
Because of local seam allowance width bisector angles now can be not equal.
Enough will be to check if they have a same direction.

--HG--
branch : feature
2016-11-12 16:49:21 +02:00
Roman Telezhynskyi
dd8067e47f Convert local seam allowance to pixels.
--HG--
branch : feature
2016-11-11 20:15:06 +02:00
Roman Telezhynskyi
2fc2491484 Set local seam allowance when building an equdistant.
--HG--
branch : feature
2016-11-11 17:58:13 +02:00
Roman Telezhynskyi
faad0419cf Using class VSAPoint for drawing base seam allowance.
--HG--
branch : feature
2016-11-11 17:55:02 +02:00
Roman Telezhynskyi
703c2d589b Refactoring, prepare to use VSAPoint class.
--HG--
branch : feature
2016-11-11 16:26:00 +02:00
Roman Telezhynskyi
b84b9cf387 New class VSAPoint;
--HG--
branch : feature
2016-11-11 12:54:17 +02:00
Roman Telezhynskyi
f992bb7bbd Returned visualization of base seam allowance.
--HG--
branch : feature
2016-11-10 14:06:09 +02:00
Roman Telezhynskyi
a5fc19d7ec Returned storing and reading base seam allowance values: width and
enable/disable.

--HG--
branch : feature
2016-11-10 12:53:02 +02:00
Roman Telezhynskyi
df20415e9e Returned "Forbid flipping" feature.
--HG--
branch : feature
2016-11-10 11:56:40 +02:00
Roman Telezhynskyi
39d2ea41ac Returned undocommand "Toggle piece in layout".
--HG--
branch : feature
2016-11-09 15:53:22 +02:00
Roman Telezhynskyi
22f9fb1e26 Added class VAbstractPiece.
--HG--
branch : feature
2016-11-03 20:15:53 +02:00
Roman Telezhynskyi
2c7bb5d5fc Clang warnings.
--HG--
branch : develop
2016-11-01 11:46:51 +02:00
Roman Telezhynskyi
d134e8b367 Clang warnings.
--HG--
branch : develop
2016-11-01 10:42:32 +02:00
BojanKverh
96cfc52202 At least one arrow has to be present on a grainline
--HG--
branch : feature
2016-10-25 23:00:42 +02:00
BojanKverh
21cd56463c User can now turn on/off grainline arrows
--HG--
branch : feature
2016-10-25 00:53:01 +02:00
Bojan Kverh
01c068ddd0 Merged develop into feature
--HG--
branch : feature
2016-10-23 15:28:40 +02:00
Ronan Le Tiec
ae9da263ab issue #570 tiled pdf case when margin smaller than min
--HG--
branch : feature
2016-10-23 11:11:00 +02:00
BojanKverh
8ab094c40d Grainline should now be visible in Layout mode
--HG--
branch : feature
2016-10-16 15:00:53 +02:00
BojanKverh
46eb6dfaa3 Added grainline to layout
--HG--
branch : feature
2016-10-16 11:38:08 +02:00
Bojan Kverh
f99693ae55 Merged develop into feature
--HG--
branch : feature
2016-10-01 10:28:50 +02:00
Roman Telezhynskyi
723d68b245 Resolved issue #570. Error: Tiled PDF : field values not taken into account if
one of them is smaller than 0,3.

--HG--
branch : develop
2016-09-30 19:33:10 +03:00
BojanKverh
083b2035af Hopefully this commit solves the #551 issue
--HG--
branch : feature
2016-09-29 01:39:50 +02:00
Roman Telezhynskyi
fed0705cc5 MSVC warning.
--HG--
branch : develop
2016-09-14 16:52:18 +03:00
Roman Telezhynskyi
bca10e71fb Fixed issue #548. Bug Detail tool. Case when seam allowance is wrong.
--HG--
branch : develop
2016-09-14 16:12:08 +03:00
Roman Telezhynskyi
ef576d7646 Enable rotation only for workpieces that forbid flipping. ref #560.
--HG--
branch : develop
2016-09-06 16:00:25 +03:00
Roman Telezhynskyi
038863fbdf Resolved issue #560. Flipped pattern pieces in Layout.
--HG--
branch : develop
2016-09-06 13:24:52 +03:00
Roman Telezhynskyi
f0cac1c191 Improve string to "Material, cut 1 on fold". This will look better.
--HG--
branch : develop
2016-08-26 12:28:30 +03:00
Roman Telezhynskyi
6281f46a8e Rewrite describing placeholders %size% and %height%. New way will help avoid
translation mistake.

--HG--
branch : develop
2016-08-23 14:02:09 +03:00
Roman Telezhynskyi
7950735833 Fix issue with declension name of material in some languages.
--HG--
branch : develop
2016-08-22 12:00:12 +03:00
Roman Telezhynskyi
bf82dc3bb3 Make 1 minimal value of the field "Cut number".
--HG--
branch : develop
2016-08-22 11:47:21 +03:00
Bojan Kverh
08bfd9cd82 Merged develop into feature
--HG--
branch : feature
2016-08-21 11:51:49 +02:00
Roman Telezhynskyi
0563df117d <QLoggingCategory> available since Qt 5.2. Use vmisc/logging.h instead.
--HG--
branch : develop
2016-08-21 11:54:32 +03:00
Bojan Kverh
19c69c691a Merged develop into feature
--HG--
branch : feature
2016-08-21 00:01:35 +02:00
Roman Telezhynskyi
fa8e63c49c Fixed issue #548. Bug Detail tool. Case when seam allowance is wrong.
(grafted from 90daa1f9dd73cd757462ad4c315ea6c1b272782a)

--HG--
branch : develop
2016-08-20 20:47:30 +03:00
Bojan Kverh
10f2d83edd Merged develop into feature
--HG--
branch : feature
2016-08-17 18:00:56 +02:00
Roman Telezhynskyi
e333c9bc08 QtDebug and QDebug lead to the same header. Leave only QtDebug.
--HG--
branch : develop
2016-08-16 20:35:21 +03:00
Roman Telezhynskyi
d66280033b Fixed issue #546. Compile error under Windows in current develop revision.
--HG--
branch : develop
2016-08-16 19:57:32 +03:00
BojanKverh
fb326d4f39 Added %size% and %height% placeholders to display pattern size and height in the Pattern size line edit
--HG--
branch : feature
2016-08-15 13:03:59 +02:00
BojanKverh
8fc3cfae1b Added missing headers
--HG--
branch : feature
2016-08-12 12:11:12 +02:00
BojanKverh
b0532e6fb9 Removed userDef attributes from DOM tree, where they are not necessary. Fixed some translations. Refactored finding the selected material in detail dialog
--HG--
branch : feature
2016-08-11 22:44:53 +02:00
Roman Telezhynskyi
0aabacfee4 String inside label also should be translated.
--HG--
branch : develop
2016-08-09 19:42:00 +03:00
Roman Telezhynskyi
7585db6a58 Fix build on Qt\5.3\msvc2013_64_opengl.
--HG--
branch : develop
2016-08-09 16:55:46 +03:00
Roman Telezhynskyi
80f00b361d Use "Include What You Use" tool for optimizing #includes.
--HG--
branch : develop
2016-08-08 14:44:49 +03:00
Roman Telezhynskyi
342bf9d124 MSVC doesn't support optimization flag -O3.
--HG--
branch : develop
2016-08-07 14:40:59 +03:00