Commit Graph

772 Commits

Author SHA1 Message Date
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
4ed5fd9329 QScopedPointer doesn't support deleting from outside.
--HG--
branch : develop
2017-02-22 08:02:28 +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
ca9bdbd3fb QSharedPointer doesn't support deleting object from outside.
--HG--
branch : feature
2017-02-15 16:43:12 +02:00
Roman Telezhynskyi
18bbca7b9a Cppcheck warning.
--HG--
branch : feature
2017-02-15 16:07:52 +02:00
Roman Telezhynskyi
ff2d9c28fe Init all pin comboboxes.
--HG--
branch : feature
2017-02-15 15:32:48 +02:00
Roman Telezhynskyi
a3d27bf9db Refacoring. Use marcos for getting current combobox data.
--HG--
branch : feature
2017-02-15 15:23:04 +02:00
Roman Telezhynskyi
6597f68dad Show all pins when tab Pins is active.
--HG--
branch : feature
2017-02-14 17:33:30 +02:00
Roman Telezhynskyi
79a1caa4d7 Translate path node names.
--HG--
branch : feature
2017-02-14 15:12:37 +02:00
Roman Telezhynskyi
fc86069f7c Dialog Seam allowance tool. Show pins in a list.
--HG--
branch : feature
2017-02-14 15:11:54 +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
8814c07d14 Fixed bug. Grainline's formulas were not converted to internal look.
--HG--
branch : develop
2017-02-13 08:30:34 +02:00
Roman Telezhynskyi
16871a0466 Fix bug with Default button.
--HG--
branch : develop
2017-02-12 15:42:21 +02:00
Roman Telezhynskyi
6fd45d9e2c Path should also supports elliptical arc.
--HG--
branch : develop
2017-02-10 16:47:15 +02:00
Roman Telezhynskyi
ddd2e3054f Fixed issue #625. Seam allowance tool does not take decimals with locale
de_DE.utf8.

--HG--
branch : develop
2017-02-10 15:02:03 +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
8a19d8a0b1 Fix bug with "internal variable" in localized form.
Some tools have internal variables, if click button Apply a dialog lost
information about such a variable.

--HG--
branch : develop
2017-02-06 13:38:47 +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
b9d635dab2 Dialog Pin tool.
--HG--
branch : feature
2017-01-31 14:28:48 +02:00
Roman Telezhynskyi
dcc36a253a Refactoring and bug fix in dialog Piece path.
--HG--
branch : develop
2017-01-31 14:28:05 +02:00
Roman Telezhynskyi
637eaa4256 Refactoring and bug fix in dialog Piece path.
--HG--
branch : feature
2017-01-31 14:28:05 +02:00
Roman Telezhynskyi
dc3c9511ed QPlainTextEdit widget crash a dialog if do not disable signal when closing a
dialog.

--HG--
branch : develop
2017-01-31 14:27:13 +02:00
Roman Telezhynskyi
21e034ef71 QPlainTextEdit widget crash a dialog if do not disable signal when closing a
dialog.

--HG--
branch : feature
2017-01-31 14:27:13 +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
c49f97d695 MSVC warning.
--HG--
branch : develop
2017-01-27 11:15:24 +02:00
Roman Telezhynskyi
ede59d003f Update formula value if node was changed.
--HG--
branch : feature
2017-01-25 14:42:51 +02:00
Roman Telezhynskyi
19400f5b83 A seam allowance value can be 0.
--HG--
branch : feature
2017-01-25 14:20:25 +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
426e24dccf Use predefined symbol degree variable.
--HG--
branch : feature
2017-01-22 15:08:59 +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
7490200806 Fix tool Union Details's dialog.
--HG--
branch : feature
2017-01-17 13:49:55 +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
4cc232fc74 Fix crash. Valentina crashes when change name of piece.
--HG--
branch : feature
2017-01-14 12:10:21 +02:00
Roman Telezhynskyi
e974f75b51 Make Internal path first in list.
--HG--
branch : feature
2017-01-13 19:09:22 +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
970762d0b3 Allow a user to select a curve covered by visualization.
--HG--
branch : feature
2017-01-13 17:03:15 +02:00
Roman Telezhynskyi
59c9a0b400 Allow a user to select a point covered by visualization.
--HG--
branch : feature
2017-01-13 16:57:49 +02:00
Roman Telezhynskyi
dabac6b17d Better help messages.
--HG--
branch : feature
2017-01-13 16:06:39 +02:00
Roman Telezhynskyi
c065824306 Fix crash when create an internal path.
--HG--
branch : feature
2017-01-13 16:06:03 +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
297b73a951 VToolSeamAllowance add grainline and labels. Only the dialog.
--HG--
branch : feature
2017-01-12 19:09:00 +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
b4c4a22a4c Merge with develop.
--HG--
branch : feature
2017-01-03 11:48:22 +02:00
Roman Telezhynskyi
86f4b21879 Instead of method QLocale::system() better to use the default constructor.
Usefull in case we will deside change default locale.

--HG--
branch : develop
2017-01-03 10:46:28 +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
7551cfda87 Remove the code after "return".
--HG--
branch : develop
2016-12-21 17:38:27 +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
0ec53b6499 Operation tools should control an elliptical arc.
--HG--
branch : develop
2016-12-20 17:08:28 +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
Roman Telezhynskyi
6ea0a12da0 GCC warnings.
--HG--
branch : feature
2016-12-19 16:00:49 +02:00
Roman Telezhynskyi
551dd29ec0 If start and finish angle equal user should see a circle and an ellipse.
--HG--
branch : feature
2016-12-19 15:42:52 +02:00
Valentina Zhuravska
a5f504a710 Added DialogEllipticalArc.
--HG--
branch : feature
2016-12-17 03:10:05 +02:00
Valentina Zhuravska
33a42e3b9b Added VisToolEllipticalArc.
--HG--
branch : feature
2016-12-17 03:06:20 +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
bf4f9a3c61 Check if option Reverse is available.
--HG--
branch : feature
2016-12-03 19:51:25 +02:00
Roman Telezhynskyi
1f96114c0b Allow delete object when creating a path.
--HG--
branch : feature
2016-12-03 19:47:17 +02:00
Roman Telezhynskyi
c2da41bbf0 Undo selection of last object if was selected twice.
--HG--
branch : feature
2016-12-03 19:18:58 +02:00
Roman Telezhynskyi
0a11ec59fb Show Delete option last in a context menu.
--HG--
branch : feature
2016-12-03 18:57:43 +02:00
Roman Telezhynskyi
0d1179a451 Allow delete object when creating a main path.
--HG--
branch : feature
2016-12-03 18:53:09 +02: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
5ab4169fa2 Because Piece path is not visible and information about point names left on
Draw scene visualizations should show it too. It include not only point, but
also label.

--HG--
branch : feature
2016-11-30 15:26:40 +02:00
Roman Telezhynskyi
b3b957cf28 Minore fixes for dialogs.
--HG--
branch : feature
2016-11-29 19:41:52 +02:00
Roman Telezhynskyi
e2579c231c Fix pointer to current scene. Show piece path visualization if the tool dialog
was opened.

--HG--
branch : feature
2016-11-29 19:39:40 +02:00
Roman Telezhynskyi
0c9a0347e9 Turn on context menu in dialog piece path.
--HG--
branch : feature
2016-11-29 17:45:43 +02:00
Roman Telezhynskyi
c7d61aec49 Update piece path name after change.
--HG--
branch : feature
2016-11-29 17:39:13 +02:00
Roman Telezhynskyi
0739b3f8a3 Update custom seam allowance settings if main path was changed.
--HG--
branch : feature
2016-11-29 17:06:22 +02:00
Roman Telezhynskyi
a2518509a4 Clear comboxes when piece path was deleted.
--HG--
branch : feature
2016-11-29 16:50:40 +02:00
Roman Telezhynskyi
8bb3377a60 Fix several bugs in dialogs.
--HG--
branch : feature
2016-11-29 16:29:09 +02:00
Roman Telezhynskyi
9275968bbc Fix bug. Used wrong combobox.
--HG--
branch : feature
2016-11-29 15:30:33 +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
51df681fbc Handle path seam allowance settings in separate tab.
--HG--
branch : feature
2016-11-28 13:58:17 +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
9c3a49e43f Renamed DialogPiecePath::DisableShowMode to DialogPiecePath::EnbleShowMode.
--HG--
branch : feature
2016-11-28 10:45:57 +02:00
Roman Telezhynskyi
0d65f1f4d6 Fixed code style.
--HG--
branch : feature
2016-11-28 10:45:02 +02:00
Roman Telezhynskyi
7fa1c6f901 SavePieceOptions. Removed unused forward declaretions.
--HG--
branch : feature
2016-11-28 10:44:47 +02:00
Roman Telezhynskyi
ecdb53b7d0 Save VPiecePath name.
--HG--
branch : feature
2016-11-28 10:42:37 +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
Roman Telezhynskyi
8e9b01a93a Decrement/increment custom seam allowance in tool seam allowance undocommands.
--HG--
branch : feature
2016-11-25 16:12:33 +02:00
Roman Telezhynskyi
cb95210d1e Rename VPiece::Missing.
--HG--
branch : feature
2016-11-25 15:35:52 +02:00
Roman Telezhynskyi
6424a92559 Read/write custom seam allowance record.
--HG--
branch : feature
2016-11-25 14:19:44 +02:00
Roman Telezhynskyi
39b27e4b24 New class VToolPiecePath.
--HG--
branch : feature
2016-11-24 21:35:54 +02:00
Roman Telezhynskyi
0e78efc714 Move tag strings from VToolSeamAllowance class to VAbstractPattern class. The
same strings use also VToolPiecePath class.

--HG--
branch : feature
2016-11-24 21:35:07 +02:00
Roman Telezhynskyi
7f1bab1ac6 Fix typo.
--HG--
branch : feature
2016-11-24 21:31:27 +02:00
Roman Telezhynskyi
024f1373f6 Undocommand SavePieceOptions. Don't need anymore pointer to scene.
--HG--
branch : feature
2016-11-24 21:27:47 +02:00
Roman Telezhynskyi
422fb60dcc Each path should know its type.
--HG--
branch : feature
2016-11-24 21:26:51 +02:00