Commit Graph

1664 Commits

Author SHA1 Message Date
Roman Telezhynskyi
2c795281dd Merge with develop.
--HG--
branch : feature
2017-01-25 13:29:03 +02:00
Roman Telezhynskyi
8322c8d0ab Fix bug with point on curve.
--HG--
branch : feature
2017-01-25 13:21:23 +02:00
Roman Telezhynskyi
e206ef3d5d Instead of "-1" use local variable "CurrentSeamAllowance" if value is default.
--HG--
branch : feature
2017-01-25 11:40:10 +02:00
Roman Telezhynskyi
49167c0c3c Fix conversion to new seam allowance.
--HG--
branch : feature
2017-01-25 11:32:52 +02:00
Roman Telezhynskyi
1014cc86ca Resolved issue #612. Valentina crashes when network is disabled on Linux.
--HG--
branch : develop
2017-01-24 15:47:25 +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
7817936d3e Fix conversion bug.
--HG--
branch : feature
2017-01-23 14:03:07 +02:00
Roman Telezhynskyi
3d835be3b7 Fix test warning message.
--HG--
branch : feature
2017-01-23 14:02:34 +02:00
Roman Telezhynskyi
41c7031aea Remove unused anymore enum class EquidistantType.
--HG--
branch : feature
2017-01-23 14:02:05 +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
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
26c76bbc71 Replace VDetail by VPiece.
--HG--
branch : feature
2017-01-21 19:12:57 +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
25a2717682 Added new local variable "CurrentSeamAllowance".
--HG--
branch : feature
2017-01-20 15:58:35 +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
6ee0c42d53 Used command "xmllint --format" to format files.
--HG--
branch : feature
2017-01-18 15:20:42 +02:00
Roman Telezhynskyi
ac58338fc4 Convert old tool union to format version 0.4.0.
--HG--
branch : feature
2017-01-18 15:17:16 +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
8b839c7002 List of pieces should also be cleared.
--HG--
branch : feature
2017-01-18 10:15:51 +02:00
Roman Telezhynskyi
7490200806 Fix tool Union Details's dialog.
--HG--
branch : feature
2017-01-17 13:49:55 +02:00
Roman Telezhynskyi
bfd76b4e60 Code style.
--HG--
branch : feature
2017-01-17 13:49:21 +02:00
Roman Telezhynskyi
7aebc22d88 Use MessageHandler to show better error message when load xsd schema.
--HG--
branch : feature
2017-01-17 12:26:25 +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
5442eb40b9 Move methods to class VAbstractPattern to be able to use them for tool Unite
Details.

--HG--
branch : feature
2017-01-16 11:59:02 +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
3634867c47 Try to fix Qt error.
--HG--
branch : feature
2017-01-11 15:01:49 +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
5aa863cf3b Modified output to see point coordinates.
--HG--
branch : develop
2017-01-10 20:45:15 +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
fe8179d1bf Do not update labels and grain line if disabled.
--HG--
branch : develop
2017-01-05 13:13:44 +02:00
Roman Telezhynskyi
d4317a61ec Fix division by zero.
--HG--
branch : develop
2017-01-05 13:11:18 +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
b41ea624da Fix linker error on Windows.
--HG--
branch : develop
2017-01-03 14:37:27 +02:00
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