Commit Graph

1602 Commits

Author SHA1 Message Date
Roman Telezhynskyi
7f105e97e0 Port changes from issue #606.
--HG--
branch : feature
2017-01-03 11:50:55 +02:00
Roman Telezhynskyi
b4c4a22a4c Merge with develop.
--HG--
branch : feature
2017-01-03 11:48:22 +02:00
Roman Telezhynskyi
73f201303f Silent warning [-Werror=unused-but-set-variable].
--HG--
branch : develop
2017-01-03 11:40:40 +02:00
Roman Telezhynskyi
be17f7f30a Cppcheck warning.
--HG--
branch : develop
2017-01-03 11:32:19 +02:00
Roman Telezhynskyi
da6cd92b22 Resolved issue #606. Mac OS X. Can’t type in measurements due to digit count
limitation.

--HG--
branch : develop
2017-01-03 11:14:32 +02:00
Roman Telezhynskyi
dd3ec71c34 Original muparser doesn't support thousand separator for C locale because by
default used ',' as group separator.

In contrary we use ';' as gorup separator and should support C locale thousand
separator ','.

--HG--
branch : develop
2017-01-03 11:08:29 +02:00
Roman Telezhynskyi
c79c4ed256 Update name regex to support all supported locales.
--HG--
branch : develop
2017-01-03 11:02:24 +02:00
Roman Telezhynskyi
0467033855 Fix potential memory leak.
--HG--
branch : develop
2017-01-03 10:58:52 +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
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
82c48ef4c3 Fix potential memory leak.
--HG--
branch : develop
2016-12-21 22:40:01 +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
6fe96ca4d0 Remove empty statement.
--HG--
branch : develop
2016-12-21 18:12:49 +02:00
Roman Telezhynskyi
074620fe77 Refactor to avoid "break" after "return".
--HG--
branch : develop
2016-12-21 17:56:52 +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
36c8e96bab Disable MSVC security warnings for library vdxf.
--HG--
branch : develop
2016-12-21 17:30:40 +02:00
Roman Telezhynskyi
ffc1bae39c Remove redundant declaration.
--HG--
branch : develop
2016-12-21 15:22:44 +02:00
Roman Telezhynskyi
a2cfecd2f1 Cppcheck warning.
--HG--
branch : develop
2016-12-21 14:20:42 +02:00
Roman Telezhynskyi
5153e997d1 Fix warning "using-directive shall not be used.".
--HG--
branch : develop
2016-12-21 14:02:55 +02:00
Roman Telezhynskyi
bba88c108f Fix possible use of uninitialized value.
--HG--
branch : develop
2016-12-21 12:32:38 +02:00
Roman Telezhynskyi
049a72ff20 "C3861: 'snprintf': identifier not found" with VS2013 and prior.
--HG--
branch : develop
2016-12-20 22:55:40 +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
86330282be Fix potential vulnerabilities.
--HG--
branch : develop
2016-12-20 20:18:36 +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
Roman Telezhynskyi
1c9360ff1c Complete conversion to v0.3.9.
--HG--
branch : feature
2016-12-19 15:14:13 +02:00
Roman Telezhynskyi
24970440b7 Elliptic arc bring new formulas that we should also cover.
--HG--
branch : feature
2016-12-19 14:56:39 +02:00
Roman Telezhynskyi
b729f4dacb Fix schema.qrc.
--HG--
branch : feature
2016-12-19 14:35:57 +02:00
Valentina Zhuravska
a8a3487996 Added new schema v0.3.9.
--HG--
branch : feature
2016-12-17 03:53:47 +02:00
Valentina Zhuravska
51b21bc99c Added formulaRotationAngle to VEllipticalArc.
--HG--
branch : feature
2016-12-17 03:41:33 +02:00
Valentina Zhuravska
50f6418f10 Added AddEllipticalArc method to VContainer.
--HG--
branch : feature
2016-12-17 03:40:17 +02:00
Valentina Zhuravska
9e3fd67eb6 Added VEllipticalArcRadius.
--HG--
branch : feature
2016-12-17 03:34:12 +02:00
Valentina Zhuravska
aa24976f9a Added elliptical arc tool to MainWindow.
--HG--
branch : feature
2016-12-17 03:17:29 +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
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
Bojan Kverh
e86777d728 Merged develop into feature
--HG--
branch : feature
2016-12-14 00:57:25 +01: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
ad48858f3d Math parser should allow apostrophe in variable name.
Apostrophe is actively used in French language.

--HG--
branch : develop
2016-12-12 16:45:24 +02: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
67a6b67afc Fix broken test on Windows.
--HG--
branch : develop
2016-12-08 13:56:17 +02:00
Roman Telezhynskyi
9cdf222467 New test case. Zigzag in main path.
--HG--
branch : develop
2016-12-07 18:55:01 +02:00
Roman Telezhynskyi
2377373a89 Fixed issue #591. Control scene max and min scale factor.
--HG--
branch : develop
2016-12-06 16:18:40 +02:00
Bojan Kverh
5cdd5687bf Merged develop into feature
--HG--
branch : feature
2016-12-04 17:16:25 +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
Roman Telezhynskyi
e93eacc655 Cppcheck warnings.
--HG--
branch : feature
2016-12-03 13:31:59 +02:00
Roman Telezhynskyi
64c2026e6a Merge with develop.
--HG--
branch : feature
2016-12-03 12:43:19 +02:00
Roman Telezhynskyi
df758fd159 Redesign AbstractTest::Run.
--HG--
branch : develop
2016-12-03 10:20:45 +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
7b3c05dfa8 Refactoring VPiecePath::StartSegment and VPiecePath::EndSegment.
--HG--
branch : feature
2016-12-01 20:44:29 +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
3ee3fbd9cb Improve validation custom seam allowance records.
--HG--
branch : feature
2016-11-29 16:59:48 +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
3677a0484f Fix copy paste issue.
--HG--
branch : feature
2016-11-29 16:26:28 +02:00
Roman Telezhynskyi
9275968bbc Fix bug. Used wrong combobox.
--HG--
branch : feature
2016-11-29 15:30:33 +02:00
Roman Telezhynskyi
ffec656d33 Fix bug. Used wrong index.
--HG--
branch : feature
2016-11-29 15:30:12 +02:00
Roman Telezhynskyi
3ab96f0105 Better to manually define values for enum in this case. Values used in file.
--HG--
branch : feature
2016-11-29 15:29:29 +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
5cbb33a635 Each VPiecePath has a name.
--HG--
branch : feature
2016-11-29 14:28:46 +02:00
Roman Telezhynskyi
7eb4e806c0 Declare default name for detail.
--HG--
branch : feature
2016-11-29 14:18:23 +02:00
Roman Telezhynskyi
83632bf284 Fix two bugs with VPiecePath.
--HG--
branch : feature
2016-11-29 14:11:36 +02:00
Roman Telezhynskyi
a3843beb0b Insert custom seam allowance.
--HG--
branch : feature
2016-11-29 14:10:53 +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
24e5aa1039 Fix crash.
--HG--
branch : feature
2016-11-28 13:57:28 +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
530203966e Added custom seam allowance to XSD schema.
--HG--
branch : feature
2016-11-28 11:22:29 +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
6c04b2e7ca Remove attribute "typeObject" since 0.4.0.
--HG--
branch : feature
2016-11-25 13:19:38 +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
8182f2979b Save VPiecePath in VContainer class.
--HG--
branch : feature
2016-11-24 21:30:26 +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
Roman Telezhynskyi
8a5c4a1a37 Check if a path is valid. Should contains at least one object.
--HG--
branch : feature
2016-11-23 18:50:52 +02:00
Roman Telezhynskyi
1a73a1f870 Set clear button for field Name.
--HG--
branch : feature
2016-11-23 18:43:31 +02:00
Roman Telezhynskyi
524e98d372 Get active pattern piece list of pieces.
--HG--
branch : feature
2016-11-23 18:41:01 +02:00
Roman Telezhynskyi
965e588a9d New piece attribute "united".
--HG--
branch : feature
2016-11-23 18:40:27 +02:00
Roman Telezhynskyi
826411d595 Make method GetActivDrawElement protected.
--HG--
branch : feature
2016-11-23 18:38:08 +02:00
Roman Telezhynskyi
34e5fd2ceb Check size of pieces list in "Create mode".
--HG--
branch : feature
2016-11-23 18:36:37 +02:00
Roman Telezhynskyi
6793bb69f1 Some updates for dialog.
--HG--
branch : feature
2016-11-23 14:50:30 +02:00
Roman Telezhynskyi
bb39410296 Added visualization creating a path.
--HG--
branch : feature
2016-11-23 13:57:12 +02:00
Roman Telezhynskyi
5d5e677e2c Added class VPiecePath.
--HG--
branch : feature
2016-11-23 12:54:46 +02:00
Roman Telezhynskyi
6b89f43e87 Tool button connected to tool dialog.
--HG--
branch : feature
2016-11-22 14:33:08 +02:00
Roman Telezhynskyi
f741e1387c Added DialogPiecePath class. Not finished.
--HG--
branch : feature
2016-11-22 13:04:34 +02:00
Roman Telezhynskyi
f60c710ee1 Changes angle type allowed only for point nodes.
--HG--
branch : feature
2016-11-19 18:52:47 +02:00
Roman Telezhynskyi
cc3d97a015 Change order the angle "by first edge symmetry".
--HG--
branch : feature
2016-11-19 18:28:07 +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
c614a2783e Merge with develop
--HG--
branch : feature
2016-11-19 13:44:22 +02:00
Roman Telezhynskyi
c21aedc541 A seam allowance node angle. Read, write and set in the dialog. Not handled in
seam allowance itself.

--HG--
branch : feature
2016-11-19 13:44:12 +02:00
Roman Telezhynskyi
6b519092f6 VObjPaintDevice new enum PdmDevicePixelRatioScaled.
--HG--
branch : develop
2016-11-19 10:13:51 +02:00
Roman Telezhynskyi
af1061635a Qt 5.6 new constant for SVG.
--HG--
branch : develop
2016-11-19 10:07:02 +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