Commit Graph

396 Commits

Author SHA1 Message Date
Roman Telezhynskyi
4cd09e54e4 Extend a passmark length to 50% of seam allowance width.
--HG--
branch : develop
2017-04-05 08:43:16 +03:00
Roman Telezhynskyi
a9bb99937c Try to fix error: ambiguous overload for 'operator>>' (operand types are
'QDataStream' and 'quint32 {aka unsigned int}').

--HG--
branch : develop
2017-04-04 08:20:49 +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
dc9ded6600 Cppcheck warnings.
--HG--
branch : develop
2017-03-30 13:59:10 +03:00
Roman Telezhynskyi
f05cd909a2 Unite nodes to be able to show passmarks from custom seam allowance included as
main path.

--HG--
branch : feature
2017-03-30 12:26:06 +03:00
Roman Telezhynskyi
d3ab7f5b16 Return -1 if was used global seam allowance width instead of calculating its
value.

--HG--
branch : feature
2017-03-30 11:09:12 +03:00
Roman Telezhynskyi
e2db513172 Refactoring. Remove unused variables.
--HG--
branch : feature
2017-03-30 11:08:11 +03:00
Roman Telezhynskyi
d1e28f4d46 Refactoring. Replace PassmarkLength by VAbstractPiece::MaxLocalSA.
--HG--
branch : feature
2017-03-30 11:07:42 +03:00
Roman Telezhynskyi
e19c9392a1 Custom seam allowance now visible again.
--HG--
branch : feature
2017-03-29 14:20:55 +03:00
Roman Telezhynskyi
11a7bf89b4 Piece path now works with passmarks.
--HG--
branch : feature
2017-03-29 14:18:33 +03:00
Roman Telezhynskyi
ebda4292a8 Merge with develop.
--HG--
branch : feature
2017-03-28 13:33:31 +03:00
Roman Telezhynskyi
b9bebcaeb4 Show passmarks in the main path.
--HG--
branch : feature
2017-03-28 13:09:00 +03:00
Roman Telezhynskyi
39c11130f9 Fix bug with internal move of nodes inside the main path.
--HG--
branch : feature
2017-03-28 12:08:33 +03:00
Roman Telezhynskyi
f8836cf563 Fix translation bug. Default names for increment and measurement should also
be validated in unit tests.

--HG--
branch : develop
2017-03-28 10:18:19 +03:00
Roman Telezhynskyi
e9c9d263f6 Skip excluded nodes when prepare segment of curve.
--HG--
branch : feature
2017-03-25 10:18:03 +02:00
Roman Telezhynskyi
81b88db5cc Dialog Seam allowance tool now supports passmarks.
--HG--
branch : feature
2017-03-24 13:08:16 +02:00
Roman Telezhynskyi
e995f6f68a Added new tool Insert node.
--HG--
branch : feature
2017-03-22 12:05:53 +02:00
Roman Telezhynskyi
7fe86bc319 Successful build.
--HG--
branch : feature
2017-03-21 17:18:48 +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
1ab541236d Successful build.
--HG--
branch : feature
2017-03-13 14:27:29 +02:00
Roman Telezhynskyi
38409f747f Successful build.
--HG--
branch : feature
2017-03-11 15:25:21 +02:00
Roman Telezhynskyi
fa50c1f4f7 Merge with develop.
--HG--
branch : feature
2017-03-10 18:56:18 +02:00
Murloc
506ca0612c Add 200 in heights
--HG--
branch : feature
2017-03-09 21:41:48 +01:00
Roman Telezhynskyi
fb402f84b7 Dialog get/set grainline center pin point.
--HG--
branch : feature
2017-03-09 13:10:46 +02:00
Roman Telezhynskyi
d47505b076 Merge with develop.
--HG--
branch : feature
2017-02-28 17:34:11 +02:00
Georg von Zengen
159432927a qmuparser: added triangular functions that work with degree
new functions are: degTorad, radTodeg, , sinD, cosD, tanD, asinD, acosD , atanD, sinhD, coshD , tanhD, asinhD, acoshD, atanhD

--HG--
branch : feature
2017-02-27 20:42:35 +01:00
Roman Telezhynskyi
5dff5b36d0 Fixed issue #631. Runtime Error when using elliptical arc and opening
Measurements Table of Variables or Formula Wizard.

--HG--
branch : develop
2017-02-26 09:00:40 +02:00
Roman Telezhynskyi
67a12ef86c Copy-on-write for class VPieceLabelData.
--HG--
branch : feature
2017-02-23 14:46:53 +02:00
Roman Telezhynskyi
2b1cd5c96c Copy-on-write for class VPatternLabelData.
--HG--
branch : feature
2017-02-23 14:36:08 +02:00
Roman Telezhynskyi
f36a4d6621 Copy-on-write for class VGrainlineData.
--HG--
branch : feature
2017-02-23 14:04:49 +02:00
Roman Telezhynskyi
9714e8cb07 Copy-on-write for class VAbstractFloatItemData.
--HG--
branch : feature
2017-02-23 13:50:13 +02:00
Roman Telezhynskyi
c5c3c73429 Added pin point ids.
--HG--
branch : feature
2017-02-23 13:36:56 +02:00
Roman Telezhynskyi
3cfefbe698 Refactoring. New parent VAbstractFloatItemData.
--HG--
branch : feature
2017-02-23 13:26:12 +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
3bf65edaa6 Merge with develop.
--HG--
branch : feature
2017-02-22 14:48:48 +02:00
Roman Telezhynskyi
b31a8d4c6b Extend max size to 72 cm.
Request from a user. See
http://forum.valentina-project.org/t/extension-of-standard-measurements/957

--HG--
branch : develop
2017-02-22 07:54:42 +02:00
Roman Telezhynskyi
38abf5c9a0 Removed redundant forward declaration.
--HG--
branch : develop
2017-02-18 11:22:59 +02:00
Roman Telezhynskyi
71ac49a221 Merge with develop.
--HG--
branch : feature
2017-02-13 15:29:37 +02:00
Roman Telezhynskyi
6fd45d9e2c Path should also supports elliptical arc.
--HG--
branch : develop
2017-02-10 16:47:15 +02:00
Roman Telezhynskyi
d7f9898edc Fixed a typo.
--HG--
branch : develop
2017-02-09 17:16:47 +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
ac6969d64f Resolved issue #620. Detail path not correct. Previous curve also should cut
segment.

--HG--
branch : develop
2017-02-06 17:19:59 +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
a7987422ae Cppcheck warnings.
--HG--
branch : feature
2017-01-25 17:04:53 +02:00
Roman Telezhynskyi
9a51b165ac Refactoring. Eliminate unneeded reverse points and two methods hidden in
anonymous namespace.

--HG--
branch : feature
2017-01-25 16:12:36 +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
7817936d3e Fix conversion bug.
--HG--
branch : feature
2017-01-23 14:03:07 +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
26c76bbc71 Replace VDetail by VPiece.
--HG--
branch : feature
2017-01-21 19:12:57 +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
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
6faa0bc318 First successful build. The redesign is not finished.
--HG--
branch : feature
2017-01-16 12:08: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
3634867c47 Try to fix Qt error.
--HG--
branch : feature
2017-01-11 15:01:49 +02:00
Roman Telezhynskyi
b4c4a22a4c Merge with develop.
--HG--
branch : feature
2017-01-03 11:48:22 +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
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
0419f60e0b Merge with develop.
--HG--
branch : feature
2016-12-23 12:58:17 +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
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
0882313f1e Merge with develop.
--HG--
branch : feature
2016-12-20 17:42:51 +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
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
Roman Telezhynskyi
067fd97ae3 Merge with develop.
--HG--
branch : feature
2016-12-15 11:42:20 +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
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
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
3ee3fbd9cb Improve validation custom seam allowance records.
--HG--
branch : feature
2016-11-29 16:59:48 +02:00
Roman Telezhynskyi
3677a0484f Fix copy paste issue.
--HG--
branch : feature
2016-11-29 16:26:28 +02:00
Roman Telezhynskyi
ffec656d33 Fix bug. Used wrong index.
--HG--
branch : feature
2016-11-29 15:30:12 +02:00
Roman Telezhynskyi
a3843beb0b Insert custom seam allowance.
--HG--
branch : feature
2016-11-29 14:10:53 +02:00
Roman Telezhynskyi
24e5aa1039 Fix crash.
--HG--
branch : feature
2016-11-28 13:57:28 +02:00
Roman Telezhynskyi
fea2ec52fe New section "Custom seam allowance".
--HG--
branch : feature
2016-11-28 10:47:36 +02:00
Roman Telezhynskyi
ecdb53b7d0 Save VPiecePath name.
--HG--
branch : feature
2016-11-28 10:42:37 +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
8182f2979b Save VPiecePath in VContainer class.
--HG--
branch : feature
2016-11-24 21:30:26 +02:00
Roman Telezhynskyi
422fb60dcc Each path should know its type.
--HG--
branch : feature
2016-11-24 21:26:51 +02:00
Roman Telezhynskyi
965e588a9d New piece attribute "united".
--HG--
branch : feature
2016-11-23 18:40:27 +02:00
Roman Telezhynskyi
5d5e677e2c Added class VPiecePath.
--HG--
branch : feature
2016-11-23 12:54:46 +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
7aa7ba8e57 Handle firt default angle type.
--HG--
branch : feature
2016-11-19 15:29:54 +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
d38f318569 Cppcheck warnings.
--HG--
branch : feature
2016-11-18 13:24:19 +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
98dad0fb72 Fixed bug the Detail remains in Group list after the detail is deleted in
Details mode.

--HG--
branch : feature
2016-11-16 09:15:16 +02:00
Roman Telezhynskyi
ae7405d44f Method VPiece::CurveSeamAllowanceSegment. When start and end of a curve segment
has standard seam allowance setup only first and last points.

--HG--
branch : feature
2016-11-13 20:13:05 +02:00
Roman Telezhynskyi
caba2db95b Make sure that a point is really lies on curve.
--HG--
branch : feature
2016-11-12 14:00:07 +02:00
Roman Telezhynskyi
e1d559e1d3 Use information about local seam allowance when generating seam allowance in
VPiece class.

--HG--
branch : feature
2016-11-12 13:31:37 +02:00
Roman Telezhynskyi
c5536ab38a Control seam allowance before and after values in a dialog.
--HG--
branch : feature
2016-11-12 12:41:04 +02:00
Roman Telezhynskyi
7490e3f8d6 Calc local seam allowance for curve segment.
--HG--
branch : feature
2016-11-11 20:17:39 +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
f992bb7bbd Returned visualization of base seam allowance.
--HG--
branch : feature
2016-11-10 14:06:09 +02:00
Roman Telezhynskyi
39d2ea41ac Returned undocommand "Toggle piece in layout".
--HG--
branch : feature
2016-11-09 15:53:22 +02:00
Roman Telezhynskyi
988ce8f7f2 Returned undocommand "Save piece options".
--HG--
branch : feature
2016-11-09 14:11:58 +02:00
Roman Telezhynskyi
a32be533ec Fix crash.
--HG--
branch : feature
2016-11-08 13:07:29 +02:00
Roman Telezhynskyi
37173fb0e4 VPiece class. Added members for storing a piece position.
--HG--
branch : feature
2016-11-08 12:53:14 +02:00
Roman Telezhynskyi
977b52b787 VContainer supports working with VPiece class.
--HG--
branch : feature
2016-11-08 12:52:07 +02:00
Roman Telezhynskyi
65a38141de Added class VisToolPiece.
Show visualization creating piece main path.

--HG--
branch : feature
2016-11-05 10:56:44 +02:00
Roman Telezhynskyi
f40bf977c8 Enable internal move in the list. Helps user quickly make reorder.
--HG--
branch : feature
2016-11-04 17:34:15 +02:00
Roman Telezhynskyi
721d447af1 Refactor member names VPieceNode class.
--HG--
branch : feature
2016-11-04 16:28:10 +02:00
Roman Telezhynskyi
a378922bf6 Piece Node point can't be reversed.
--HG--
branch : feature
2016-11-04 16:25:01 +02:00
Roman Telezhynskyi
22f9fb1e26 Added class VAbstractPiece.
--HG--
branch : feature
2016-11-03 20:15:53 +02:00
Roman Telezhynskyi
27d6198657 Redesing VDetail class. Meet new classes VPiece and VPieceNode.
--HG--
branch : feature
2016-11-03 17:59:53 +02:00
Roman Telezhynskyi
d134e8b367 Clang warnings.
--HG--
branch : develop
2016-11-01 10:42:32 +02:00
Roman Telezhynskyi
b644209406 Resolved issue #580. Extend the list of heights.
--HG--
branch : develop
2016-10-26 14:49:09 +03: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
e1a4eeb4e4 Merged develop into feature
--HG--
branch : feature
2016-10-15 11:50:17 +02:00
Roman Telezhynskyi
d38e81cecb Added new option "In layout" to context menu tool Detail.
--HG--
branch : develop
2016-10-14 20:41:37 +03:00
BojanKverh
b755762aec Merged develop into feature
--HG--
branch : feature
2016-10-05 20:27:57 +02:00
Roman Telezhynskyi
c53b4fb433 Fixed issue #572. Issue with thousand separator during a formula translations
to user.
(grafted from d1621c1cd816e8b7323639ce41c8592ef4131e31)

--HG--
branch : develop
2016-10-04 16:38:54 +03:00
BojanKverh
3bc3c4bec3 Fixed the grainline formulas editing
--HG--
branch : feature
2016-10-04 02:07:58 +02:00
BojanKverh
60462bc303 Fixed some code style and replaced some code with more appropriate one according to general recommendations
--HG--
branch : feature
2016-09-29 02:13:18 +02:00
BojanKverh
744acbcd3b Merged with develop
--HG--
branch : feature
2016-09-27 22:00:02 +02:00
Roman Telezhynskyi
014ce1e45e Translation for new internal variable.
--HG--
branch : develop
2016-09-26 22:33:28 +03:00
Roman Telezhynskyi
fd8ab6123c Fixed issue #565. Bug : Some informations not saved in "Seam allowance tool" in
Draw Mode.

--HG--
branch : develop
2016-09-24 22:30:33 +03:00
Roman Telezhynskyi
3bb657ea1a New internal variable "Length to spline control point".
--HG--
branch : develop
2016-09-24 20:44:06 +03:00
BojanKverh
2dc19732a0 Prepated detail dialog for formula editing in case of grainline length and rotation
--HG--
branch : feature
2016-09-08 22:35:32 +02:00
BojanKverh
37e16b4626 Removed the vpatterndb.pro changes
--HG--
branch : feature
2016-09-06 23:52:16 +02:00
BojanKverh
287f8fc41e Added VGrainlineGeometry class to hold grainline parameters and methods to save, load and edit it
--HG--
branch : feature
2016-09-06 23:50:46 +02:00
Roman Telezhynskyi
23d9898154 Use QLocale::c() instead of QLocale(QLocale::C).
--HG--
branch : develop
2016-08-26 12:38:23 +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
0563df117d <QLoggingCategory> available since Qt 5.2. Use vmisc/logging.h instead.
--HG--
branch : develop
2016-08-21 11:54:32 +03:00
Valentina Zhuravska
74b30fa377 Fixed misprint.
--HG--
branch : feature
2016-08-16 23:15:54 +03:00
Valentina Zhuravska
09a9ec2855 Resolved Issue #424. Improve Formula Wizard dialog.
--HG--
branch : feature
2016-08-16 23:13:34 +03: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
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
eec896edd0 Fix errors. error: QPrinter: No such file or directory.
error: QMetaTypeId: No such file or directory.

--HG--
branch : develop
2016-08-08 15:26:48 +03:00