Commit Graph

423 Commits

Author SHA1 Message Date
Roman Telezhynskyi
b6e0d97df0 Qmake. Fix masks to support 64 bit versions of compilers.
--HG--
branch : develop
2017-07-05 11:35:32 +03:00
Roman Telezhynskyi
d25979f054 Merged with feature.
--HG--
branch : develop
2017-07-04 19:53:05 +03:00
Roman Telezhynskyi
72ea1997fb Fixed issue #715. Build fails with Qt 5.9.1 / clang / macOS.
(grafted from d78ca13c4891ccf3542b0704a7d66af0f9b02938)

--HG--
branch : develop
2017-07-01 21:38:26 +03:00
Roman Telezhynskyi
f94967d02e New option Export text as paths.
--HG--
branch : feature
2017-07-01 20:32:54 +03:00
Roman Telezhynskyi
275338da4b Allow user to setup font family for piece labels.
--HG--
branch : feature
2017-07-01 14:41:46 +03:00
Roman Telezhynskyi
b18f5fa928 Fix bug. Date on label doesn't obey GUI language locale.
(grafted from b60a78d145f51bef3bc08978e1fe3b0a7d6500ab)

--HG--
branch : develop
2017-06-29 14:47:24 +03:00
Roman Telezhynskyi
a59e0e54af Fix bug. Date on label doesn't obey GUI language locale.
--HG--
branch : feature
2017-06-29 14:47:24 +03:00
Roman Telezhynskyi
721165eae3 Export from a layout text instead of paths.
--HG--
branch : feature
2017-06-29 13:00:06 +03:00
Roman Telezhynskyi
d514b22611 Because we have been using C++11 we don't need this key.
--HG--
branch : feature
2017-06-20 11:30:44 +03:00
Roman Telezhynskyi
cc5641a15c Added gcc’s 4.9.0 Undefined Behavior Sanitizer (ubsan).
--HG--
branch : develop
2017-06-01 10:14:17 +03:00
Roman Telezhynskyi
7e064f80c5 Thrown away code for support Qt < 5.2.
--HG--
branch : develop
2017-05-30 19:52:38 +03:00
Roman Telezhynskyi
965d908663 GCC warnings.
--HG--
branch : develop
2017-05-30 18:44:16 +03:00
Roman Telezhynskyi
4d1c15c2d5 Fixed issue #696. Wrong grainline position on layout.
(grafted from 23e7ca4bff38c47729324aaa081d601351844035)

--HG--
branch : develop
2017-05-29 17:45:55 +03:00
Roman Telezhynskyi
cc83d9602a Fixed issue #686. Seam allowance not placed correctly.
--HG--
branch : develop
2017-05-18 15:10:05 +03:00
Roman Telezhynskyi
91a75f6f01 Fix layout internal path support of pen style.
--HG--
branch : develop
2017-05-16 15:19:27 +03:00
Roman Telezhynskyi
56dd8ef3b6 Resolved issue #684. Proposal: Add option to only show outer edges on detail.
--HG--
branch : develop
2017-05-16 15:16:50 +03:00
Roman Telezhynskyi
9fd611e2d1 Fixed bug with a grainline.
Grainline arrows were upside down on layout.

--HG--
branch : release
2017-04-28 15:37:31 +03:00
Roman Telezhynskyi
03a9b07eff Fixed issue #673. The Insert Node tool changes Label.
--HG--
branch : release
2017-04-28 09:38:09 +03:00
Roman Telezhynskyi
677ef71626 Added second case when create a passmark for point that lies on line.
--HG--
branch : release
2017-04-27 18:19:23 +03:00
Roman Telezhynskyi
32e3a6340c Fixed issue #671. Weird behaviour of the passmark.
--HG--
branch : release
2017-04-27 16:37:10 +03:00
Roman Telezhynskyi
585213412c Fix case with custom piece path as part of main path. ref #668.
--HG--
branch : release
2017-04-25 20:48:32 +03:00
Roman Telezhynskyi
7840bf04eb Resolved issue #668. Passmarks on Hems.
--HG--
branch : release
2017-04-25 11:42:08 +03:00
Roman Telezhynskyi
b2ed7d9db4 Refactoring. Add a move assignment operator to all classes that use
QSharedDataPointer class to keep data.

--HG--
branch : release
2017-04-19 13:27:17 +03:00
Roman Telezhynskyi
ef9f9c6af4 Fixed issue #665. Passmark not correct.
--HG--
branch : release
2017-04-18 21:39:13 +03:00
Roman Telezhynskyi
d355b4dce8 Cppcheck warnings.
--HG--
branch : develop
2017-04-06 15:50:15 +03:00
Roman Telezhynskyi
c0f36dffbe Resolved issue #652. Show passmarks for builtin seam allowance.
--HG--
branch : develop
2017-04-05 13:22:33 +03:00
Roman Telezhynskyi
b9f886d28d Fix building on Mac.
--HG--
branch : develop
2017-04-01 19:53:28 +03:00
Roman Telezhynskyi
e2383eb500 Refactoring. Use "=default" instead of the default implementation.
--HG--
branch : develop
2017-04-01 17:27:55 +03:00
Roman Telezhynskyi
f9aa896477 Refactoring. Avoid implicit conversions.
--HG--
branch : develop
2017-03-31 17:04:11 +03:00
Roman Telezhynskyi
b62aaaf992 Layout now works with passmarks.
--HG--
branch : feature
2017-03-30 13:27:57 +03:00
Roman Telezhynskyi
d1e28f4d46 Refactoring. Replace PassmarkLength by VAbstractPiece::MaxLocalSA.
--HG--
branch : feature
2017-03-30 11:07:42 +03:00
Roman Telezhynskyi
4907ce584f Fixed issue #646. Wrong seam allowance if node is on line.
--HG--
branch : feature
2017-03-30 11:06:47 +03:00
Roman Telezhynskyi
b9bebcaeb4 Show passmarks in the main path.
--HG--
branch : feature
2017-03-28 13:09:00 +03:00
Roman Telezhynskyi
d696af9a33 "static" members should be accessed statically.
--HG--
branch : develop
2017-03-23 10:25:46 +02:00
Roman Telezhynskyi
e56d3440d2 Fixed issue #642. Detail's main path is cutted.
--HG--
branch : develop
2017-03-20 08:16:35 +02:00
Roman Telezhynskyi
47e50fe06f Fixed bug with internal path in layout piece.
--HG--
branch : develop
2017-03-18 10:44:27 +02:00
Roman Telezhynskyi
c6d19c3b9b Grainline obey center pin point on layout.
--HG--
branch : feature
2017-03-13 14:33:04 +02:00
Roman Telezhynskyi
1ab541236d Successful build.
--HG--
branch : feature
2017-03-13 14:27:29 +02:00
Roman Telezhynskyi
778cbb2a70 Cppcheck warnings.
--HG--
branch : develop
2017-03-09 12:23:36 +02:00
Roman Telezhynskyi
20107a35f8 Cppcheck warning.
--HG--
branch : develop
2017-03-02 11:16:02 +02:00
Roman Telezhynskyi
71d10dbdcb Sync grainline and lable position after correcting to parent bounding rect.
--HG--
branch : feature
2017-03-02 09:12:48 +02:00
Roman Telezhynskyi
e91d037e0a Use pins to position grainline and label on layout.
--HG--
branch : feature
2017-03-01 11:13:36 +02:00
Roman Telezhynskyi
d47505b076 Merge with develop.
--HG--
branch : feature
2017-02-28 17:34:11 +02:00
Roman Telezhynskyi
38740f7ef8 Fix incorrect saving grainline angle and length.
--HG--
branch : feature
2017-02-27 14:28:22 +02:00
Roman Telezhynskyi
3b33eabc22 Clang warning.
--HG--
branch : develop
2017-02-26 15:52:00 +02:00
Roman Telezhynskyi
ae5650f1f0 Try to fix MSVC error.
--HG--
branch : develop
2017-02-26 12:25:14 +02:00
Roman Telezhynskyi
f36a4d6621 Copy-on-write for class VGrainlineData.
--HG--
branch : feature
2017-02-23 14:04:49 +02:00
Roman Telezhynskyi
1710e3cdb7 Refactoring. Prepare folder structure for new hierarchy.
--HG--
branch : feature
2017-02-23 11:37:19 +02:00
Roman Telezhynskyi
a287913500 Refactoring. Rename class VGrainlineGeometry to VGrainlineData.
--HG--
branch : feature
2017-02-23 11:33:17 +02:00
Roman Telezhynskyi
4e3ee3eefd Refactoring. Rename class VPatternInfoGeometry to VPatternLabelData.
--HG--
branch : feature
2017-02-23 11:26:25 +02:00
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