Commit Graph

453 Commits

Author SHA1 Message Date
Roman Telezhynskyi
de6e3d7213 Fix issue with angle direction of grainline.
--HG--
branch : feature
2017-03-14 11:11:35 +02:00
Roman Telezhynskyi
011f0eaec0 Label item on scene has clockwise angle direction, we work with counter
clockwise.

--HG--
branch : feature
2017-03-13 16:57:54 +02:00
Roman Telezhynskyi
6802c6f154 Write/read label center pin point.
--HG--
branch : feature
2017-03-13 16:10:25 +02:00
Roman Telezhynskyi
1ab541236d Successful build.
--HG--
branch : feature
2017-03-13 14:27:29 +02:00
Roman Telezhynskyi
af3735ea23 Grainline now can be controlled by center pin point.
--HG--
branch : feature
2017-03-10 16:22:19 +02:00
Roman Telezhynskyi
fb402f84b7 Dialog get/set grainline center pin point.
--HG--
branch : feature
2017-03-09 13:10:46 +02:00
Roman Telezhynskyi
5fbdb4f7f0 Block actions with grainline depend on restrictions.
--HG--
branch : feature
2017-02-27 22:06:48 +02:00
Roman Telezhynskyi
1d91df5216 Preparetions to be able to control moving actions: rotation and resizing.
--HG--
branch : feature
2017-02-27 14:30:02 +02:00
Roman Telezhynskyi
93a59b9371 Use pin points to set size and angle.
--HG--
branch : feature
2017-02-27 12:01:38 +02:00
Roman Telezhynskyi
892e5f298f Fix bug. Piece must increase reference count for each pin.
--HG--
branch : feature
2017-02-24 19:48:54 +02:00
Roman Telezhynskyi
02fde1464d Fix infinite redrawing.
--HG--
branch : feature
2017-02-24 19:47:13 +02:00
Roman Telezhynskyi
5f4760f06f Read/write info about pin points.
--HG--
branch : feature
2017-02-23 16:49:20 +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
e7651c7194 Merge with develop.
--HG--
branch : feature
2017-02-23 09:29:28 +02:00
Roman Telezhynskyi
5a2604d2bd "catch" a specific exception type.
--HG--
branch : develop
2017-02-22 19:49:17 +02:00
Roman Telezhynskyi
34b70cfb02 Add an explicit "return" statement with an expression.
--HG--
branch : develop
2017-02-22 19:40:50 +02:00
Roman Telezhynskyi
67d69781f3 Remove the code after "return".
--HG--
branch : develop
2017-02-22 19:27:53 +02:00
Roman Telezhynskyi
3bf65edaa6 Merge with develop.
--HG--
branch : feature
2017-02-22 14:48:48 +02:00
Roman Telezhynskyi
a0380f4d24 Warning. Initialize member in an initialization list.
--HG--
branch : develop
2017-02-22 12:22:04 +02:00
Roman Telezhynskyi
146c936ccf Clang warning.
--HG--
branch : develop
2017-02-22 08:11:13 +02:00
Roman Telezhynskyi
d84fd78a38 Fixed bug. Operation tools did not obey tool selection type.
--HG--
branch : develop
2017-02-21 16:16:02 +02:00
Roman Telezhynskyi
38abf5c9a0 Removed redundant forward declaration.
--HG--
branch : develop
2017-02-18 11:22:59 +02:00
Roman Telezhynskyi
8f0f2399e2 Use QScopedPointer to prevent memory leaks.
--HG--
branch : develop
2017-02-18 10:43:06 +02:00
Roman Telezhynskyi
71ac49a221 Merge with develop.
--HG--
branch : feature
2017-02-13 15:29:37 +02:00
Roman Telezhynskyi
a8bd44b63a Refactoring. Method VDrawTool::AddRecord has sense to call only when do
Document::FullParse.

--HG--
branch : develop
2017-02-13 08:55:42 +02:00
Roman Telezhynskyi
6fd45d9e2c Path should also supports elliptical arc.
--HG--
branch : develop
2017-02-10 16:47:15 +02:00
Roman Telezhynskyi
5edc241426 Fix corruption a pattern after using Union Details tool.
--HG--
branch : develop
2017-02-08 11:06:17 +02:00
Roman Telezhynskyi
a1774149f6 Fixed issue #622. Piece lost custom seam allowance data.
--HG--
branch : develop
2017-02-08 10:28:18 +02:00
Roman Telezhynskyi
29c61b9778 Fix minore bugs in Seam allowance tool.
--HG--
branch : develop
2017-02-04 20:30:32 +02:00
Roman Telezhynskyi
8549e55fec Union Details tool now supports pin points.
--HG--
branch : feature
2017-02-01 13:31:14 +02:00
Roman Telezhynskyi
4831d263b9 Union Details tool. Small improvements and bug fixes.
--HG--
branch : develop
2017-02-01 13:27:38 +02:00
Roman Telezhynskyi
3f8dc54acb Union Details tool. Small improvements and bug fixes.
--HG--
branch : feature
2017-02-01 13:27:38 +02:00
Roman Telezhynskyi
415e5a25a5 Merge with develop.
--HG--
branch : feature
2017-02-01 12:26:08 +02:00
Roman Telezhynskyi
b5d50288a8 Union Details tool brokes a pattern.
--HG--
branch : develop
2017-02-01 12:22:36 +02:00
Roman Telezhynskyi
ad403850bc Save pin inside a piece.
--HG--
branch : feature
2017-01-31 18:09:18 +02:00
Roman Telezhynskyi
a58a479db5 Refactor VPiece class. Instead of method AppendInternalPath() use overloaded
getter.

--HG--
branch : feature
2017-01-31 16:26:28 +02:00
Roman Telezhynskyi
f2e88c71da Added class VToolPin.
--HG--
branch : feature
2017-01-31 16:04:51 +02:00
Roman Telezhynskyi
d6c68a4df8 MSVC warning.
--HG--
branch : develop
2017-01-27 17:41:08 +02:00
Roman Telezhynskyi
01a04fdb09 Clang warning.
--HG--
branch : develop
2017-01-27 14:07:12 +02:00
Roman Telezhynskyi
75efd4021b All united details should have appropriate flag setted up.
--HG--
branch : feature
2017-01-22 15:21:08 +02:00
Roman Telezhynskyi
ded6a9e76c Clean using class VNodeDetail.
--HG--
branch : feature
2017-01-21 17:47:53 +02:00
Roman Telezhynskyi
8b1e9e24d4 Tool path and piece now bring formulas, should cover this fact.
--HG--
branch : feature
2017-01-21 17:32:08 +02:00
Roman Telezhynskyi
669d295804 Class VToolDetail removed.
--HG--
branch : feature
2017-01-21 16:30:14 +02:00
Roman Telezhynskyi
0ef10c01b0 A piece seam allowance can be controlled by formula.
--HG--
branch : feature
2017-01-21 15:24:40 +02:00
Roman Telezhynskyi
121f003e7c Refactoring. Move grainline and lable to library VWidgets.
--HG--
branch : feature
2017-01-19 12:23:42 +02:00
Roman Telezhynskyi
84b285cbe4 Refactoring. Grainline and label have common parent.
--HG--
branch : feature
2017-01-19 12:07:26 +02:00
Roman Telezhynskyi
004c83a11f After each reset label or grainline need to repaint piece image.
--HG--
branch : feature
2017-01-18 14:01:51 +02:00
Roman Telezhynskyi
ccc8da800f Pieces should disappear from the list when deleted.
--HG--
branch : feature
2017-01-18 12:22:02 +02:00
Roman Telezhynskyi
d2ff75dedc Tool Union Details now works.
--HG--
branch : feature
2017-01-18 10:17:18 +02:00
Roman Telezhynskyi
8eba46ade1 The tool redesign was finnised. Code is not tested.
--HG--
branch : feature
2017-01-16 17:37:15 +02:00
Roman Telezhynskyi
6faa0bc318 First successful build. The redesign is not finished.
--HG--
branch : feature
2017-01-16 12:08:13 +02:00
Roman Telezhynskyi
60810c4d04 Use parent implementation for methods incrementReferens() and
decrementReferens() where possible.

--HG--
branch : feature
2017-01-16 12:06:50 +02:00
Roman Telezhynskyi
af51e5e240 Seam allowance tool already initializated and can't init the path.
--HG--
branch : feature
2017-01-13 19:07:14 +02:00
Roman Telezhynskyi
548f7844f4 Missed to replace VDetail by VPiece.
--HG--
branch : feature
2017-01-13 15:19:27 +02:00
Roman Telezhynskyi
f51d32d88e Move static methods to private section.
--HG--
branch : feature
2017-01-13 10:24:48 +02:00
Roman Telezhynskyi
29490b9e66 Removed dialog Detail.
--HG--
branch : feature
2017-01-12 19:17:13 +02:00
Roman Telezhynskyi
c9cb6adc36 VToolSeamAllowance add grain line and labels. Only the tool.
--HG--
branch : feature
2017-01-12 15:51:08 +02:00
Roman Telezhynskyi
5a95ce9c8a Merge with develop.
--HG--
branch : feature
2017-01-11 14:05:06 +02:00
Roman Telezhynskyi
fe8179d1bf Do not update labels and grain line if disabled.
--HG--
branch : develop
2017-01-05 13:13:44 +02:00
Roman Telezhynskyi
1882833ce7 Fixed issue #607. Cut tools do not support operation tools.
--HG--
branch : develop
2017-01-04 13:38:10 +02:00
Roman Telezhynskyi
0419f60e0b Merge with develop.
--HG--
branch : feature
2016-12-23 12:58:17 +02:00
Roman Telezhynskyi
3a8fd53dc8 Fix memory leak.
--HG--
branch : develop
2016-12-21 21:39:44 +02:00
Roman Telezhynskyi
a6a8ef29b0 Refactoring. Merge similar switch cases together.
--HG--
branch : develop
2016-12-21 21:35:07 +02:00
Roman Telezhynskyi
731eb9ec89 Refactoring.
There is no automatic disconnection when the 'receiver' is destroyed because
it's a functor with no QObject. However, since 5.2 there is an overload which
adds a "context object". When that object is destroyed, the connection is
broken (the context is also used for the thread affinity: the lambda will be
called in the thread of the event loop of the object used as context).

--HG--
branch : develop
2016-12-21 20:45:14 +02:00
Roman Telezhynskyi
e4c90a0809 Fix warning "Explicitly capture the required scope variables".
--HG--
branch : develop
2016-12-21 20:08:02 +02:00
Roman Telezhynskyi
5c40a91335 Remove empty statement.
--HG--
branch : develop
2016-12-21 17:36:38 +02:00
Roman Telezhynskyi
ffc1bae39c Remove redundant declaration.
--HG--
branch : develop
2016-12-21 15:22:44 +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
b6d0aa1a1f Tool seam allowance add support for elliptical arc.
--HG--
branch : feature
2016-12-20 17:50:39 +02:00
Roman Telezhynskyi
0882313f1e Merge with develop.
--HG--
branch : feature
2016-12-20 17:42:51 +02:00
Roman Telezhynskyi
2f46634eff Elliptical arc is an independent scene object.
--HG--
branch : develop
2016-12-20 17:05:34 +02:00
Roman Telezhynskyi
f613a3a28f Refactoring. Use QScopedPointer class.
--HG--
branch : develop
2016-12-20 16:58:00 +02:00
Roman Telezhynskyi
1fb0ab4d75 Added VNodeEllipticalArc.
--HG--
branch : develop
2016-12-20 16:51:58 +02:00
Roman Telezhynskyi
81eb33fe63 Merge with develop.
--HG--
branch : feature
2016-12-20 14:39:05 +02:00
Roman Telezhynskyi
f0b35ddc11 Added support elliptical arc in other tools.
--HG--
branch : develop
2016-12-20 13:04:56 +02:00
Valentina Zhuravska
00ab0a225e Added VToolEllipticalArc.
--HG--
branch : feature
2016-12-17 03:01:40 +02:00
Roman Telezhynskyi
067fd97ae3 Merge with develop.
--HG--
branch : feature
2016-12-15 11:42:20 +02:00
Roman Telezhynskyi
d45a04feb0 Correct label size according to parent's bounding rect.
--HG--
branch : feature
2016-12-15 09:33:01 +02:00
Roman Telezhynskyi
b16ee3a4d1 Minore changes for VTextGraphicsItem.
Clearing code. Changed size for control objects.

--HG--
branch : feature
2016-12-15 08:54:52 +02:00
Roman Telezhynskyi
a3f7b9f60f Fix drawing artifacts.
--HG--
branch : feature
2016-12-15 08:52:23 +02:00
Roman Telezhynskyi
97d76957e3 Use font's height.
--HG--
branch : feature
2016-12-15 08:46:45 +02:00
Roman Telezhynskyi
4eb9b2da83 Cleaning code.
--HG--
branch : feature
2016-12-14 11:59:21 +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
Roman Telezhynskyi
ffa241ea0d Removed brush for main path.
--HG--
branch : feature
2016-12-03 18:51:36 +02:00
Roman Telezhynskyi
641a807f24 Fix VToolPiecePath visualization.
--HG--
branch : feature
2016-12-03 18:44:24 +02:00
Roman Telezhynskyi
35f54c5cc7 Added Internal path.
--HG--
branch : feature
2016-12-03 18:01:39 +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
939644692d Convert all mx and my values to local seam allowance.
--HG--
branch : feature
2016-12-01 20:47:15 +02:00
Roman Telezhynskyi
b3f3f03cc3 Added custom increment and decrement methods for tool VToolPiecePath.
--HG--
branch : feature
2016-11-29 14:58:00 +02:00
Roman Telezhynskyi
14962270f6 Refactoring.
--HG--
branch : feature
2016-11-29 14:51:46 +02:00
Roman Telezhynskyi
83632bf284 Fix two bugs with VPiecePath.
--HG--
branch : feature
2016-11-29 14:11:36 +02:00
Roman Telezhynskyi
5156e0cf25 Read/write piece path include type.
--HG--
branch : feature
2016-11-28 14:52:31 +02:00
Roman Telezhynskyi
f56ea24810 Custom Path will work in two modes. The first extend automatic seam allowance,
the second show custom deam allowance. In this case a path must have options
for controling seam allowance.

--HG--
branch : feature
2016-11-28 11:58:44 +02:00
Roman Telezhynskyi
fea2ec52fe New section "Custom seam allowance".
--HG--
branch : feature
2016-11-28 10:47:36 +02:00
Roman Telezhynskyi
109e23e40d Refactor VToolSeamAllowance::InitTool. Enough to pass only tool id.
--HG--
branch : feature
2016-11-25 16:41:52 +02:00
Roman Telezhynskyi
20f8da230d Increment custom seam allowance in tool seam allowance.
--HG--
branch : feature
2016-11-25 16:37:32 +02:00