Commit Graph

389 Commits

Author SHA1 Message Date
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
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
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
Valentina Zhuravska
a5f504a710 Added DialogEllipticalArc.
--HG--
branch : feature
2016-12-17 03:10:05 +02: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
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
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
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
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
ecdb53b7d0 Save VPiecePath name.
--HG--
branch : feature
2016-11-28 10:42:37 +02:00
Roman Telezhynskyi
7f1bab1ac6 Fix typo.
--HG--
branch : feature
2016-11-24 21:31:27 +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
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
cc3d97a015 Change order the angle "by first edge symmetry".
--HG--
branch : feature
2016-11-19 18:28:07 +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
3d835a1a2a Merge with develop
--HG--
branch : feature
2016-11-14 20:35:22 +02:00
Roman Telezhynskyi
fd02a71c14 Fix building with Qt 5.1.
--HG--
branch : develop
2016-11-14 19:41:12 +02:00
Roman Telezhynskyi
585bfec12f Fix bug Tool seam allowance. The tool returned to previous position after
selecting Apply or Ok buttons in the tool's dialog.

--HG--
branch : feature
2016-11-12 15:41:15 +02:00
Roman Telezhynskyi
878fdb6156 Disable Group Nodes if the main list doesn't contain points.
--HG--
branch : feature
2016-11-12 14:05:47 +02:00
Roman Telezhynskyi
6706f3b39d Use QDoubleSpinBox setSuffix() method instead independent label.
--HG--
branch : feature
2016-11-12 12:45:53 +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
49208a640d Fix few bugs with apllying changes for seam allowance.
--HG--
branch : feature
2016-11-10 14:15:43 +02:00
Roman Telezhynskyi
a5fc19d7ec Returned storing and reading base seam allowance values: width and
enable/disable.

--HG--
branch : feature
2016-11-10 12:53:02 +02:00
Roman Telezhynskyi
df20415e9e Returned "Forbid flipping" feature.
--HG--
branch : feature
2016-11-10 11:56:40 +02:00
Roman Telezhynskyi
0dbf26a109 Merge with develop
--HG--
branch : feature
2016-11-10 11:28:08 +02:00
Roman Telezhynskyi
2489f525f7 Added tab Seam allowance. Disabled if Apply button is not active.
--HG--
branch : feature
2016-11-10 11:27:59 +02:00
Roman Telezhynskyi
c4b9346021 Fixed issue #586. Valentina crashes if clear input filter string.
--HG--
branch : develop
2016-11-10 11:15:52 +02:00
Roman Telezhynskyi
91d43c4b26 Added missed signal. Little refactoring. ref #581.
--HG--
branch : develop
2016-11-10 08:53:44 +02:00
Raina
88130f1084 Resolves #581. User can now filter input lists by keyword in function wizard.
--HG--
branch : feature
2016-11-09 18:25:52 -08:00
Roman Telezhynskyi
f593d4ca5b Dialog seam allowance tool should show visualization only when user is creating
new piece.

--HG--
branch : feature
2016-11-08 19:11:47 +02:00
Roman Telezhynskyi
721b9b638b Fixed VPiece class method name. CountNode -> CountNodes.
--HG--
branch : feature
2016-11-08 12:55:57 +02:00
Roman Telezhynskyi
2ed35461b6 Forbid delete objects if user is creating a piece.
--HG--
branch : feature
2016-11-05 15:31:20 +02:00
Roman Telezhynskyi
bff5462ef3 Changes in dialog: reverse and internal move update the visualization
automatically.

--HG--
branch : feature
2016-11-05 15:27:19 +02:00
Roman Telezhynskyi
bf306f6101 The visualization connected to tool dialog.
--HG--
branch : feature
2016-11-05 12:49:20 +02:00
Roman Telezhynskyi
f8ee078ef7 When user creates new piece button Apply should be disabled.
--HG--
branch : feature
2016-11-04 19:36:36 +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
eb84ae7526 Added list context menu with options Delete and Reverse (except for point).
--HG--
branch : feature
2016-11-04 17:04:18 +02:00
Roman Telezhynskyi
e261d02f89 Check keyboard modificator and add object reversed if pressed Shift.
--HG--
branch : feature
2016-11-04 16:25:57 +02:00
Roman Telezhynskyi
1dd86e66fb New dialog connected to tool button.
--HG--
branch : feature
2016-11-04 16:16:11 +02: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
Roman Telezhynskyi
0a7097f259 Fix MSVC warning.
--HG--
branch : develop
2016-10-24 12:57:27 +03:00
BojanKverh
e82f65fc6a Fixed the grainline tab icon in details dialog
--HG--
branch : feature
2016-10-23 20:59:38 +02:00
Bojan Kverh
01c068ddd0 Merged develop into feature
--HG--
branch : feature
2016-10-23 15:28:40 +02:00
Roman Telezhynskyi
fdc1eac734 Refactoring DialogTool::GetComboBoxCurrentData. Returned wrong default value.
--HG--
branch : develop
2016-10-17 14:53:46 +03:00
BojanKverh
e192ff54ec Finished interactive rotation of the grainline and fixed cursor in the Grainline tab of detail dialog
--HG--
branch : feature
2016-10-13 23:33:32 +02:00
BojanKverh
5562e46790 Fixed the Grainline tab in detail dialog and also length/rotation formulas checking
--HG--
branch : feature
2016-10-06 23:39:57 +02:00
BojanKverh
b755762aec Merged develop into feature
--HG--
branch : feature
2016-10-05 20:27:57 +02:00
Roman Telezhynskyi
f86bf9edd5 Lupdate.
--HG--
branch : develop
2016-10-05 16:21:33 +03:00
Roman Telezhynskyi
121ef1323d Fix building problem on Windows.
--HG--
branch : develop
2016-10-04 17:51:37 +03:00
Roman Telezhynskyi
4f516c60a6 For the tool Rotate was missed checking changing a point.
--HG--
branch : develop
2016-10-04 17:50:48 +03:00
Roman Telezhynskyi
abce5439a5 Resolved issue #573. New tool: 'Move Point'.
--HG--
branch : develop
2016-10-04 17:34:37 +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
85b8cb2bd7 Fixes compilation error due to unrecognized qIsNaN
--HG--
branch : feature
2016-09-27 22:09:49 +02:00
BojanKverh
744acbcd3b Merged with develop
--HG--
branch : feature
2016-09-27 22:00:02 +02:00
Roman Telezhynskyi
3bb657ea1a New internal variable "Length to spline control point".
--HG--
branch : develop
2016-09-24 20:44:06 +03:00
BojanKverh
5f1d7a357a Merged develop into feature, removing the conflicts
--HG--
branch : feature
2016-09-20 19:29:49 +02:00
Roman Telezhynskyi
d556508265 Mark tooltip strings for translation. Tools Rotation, Flipping by line and
Flipping by axis.

--HG--
branch : develop
2016-09-17 19:18:27 +03:00
Roman Telezhynskyi
255db32720 Improve tooltip for tools Rotation, Flipping by line and Flipping by axis.
The app will show updated tooltip message in case a user selected point that is
already a part of the list of operated objects.

--HG--
branch : develop
2016-09-17 19:16:15 +03:00
Roman Telezhynskyi
74bc4179ef New tool Flipping by axis.
--HG--
branch : feature
2016-09-17 12:10:03 +03:00
Roman Telezhynskyi
9bb88afaa5 New tool Flipping by line.
--HG--
branch : feature
2016-09-13 11:27:44 +03:00
BojanKverh
f341f51125 Grainline is visible on the detail now, rotation and length can be edited, but it cannot be moved yet
--HG--
branch : feature
2016-09-10 18:30:03 +02:00
BojanKverh
906dafebe8 Finished the grainline parameters editing in detail dialog
--HG--
branch : feature
2016-09-10 15:17:55 +02: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
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
b6e9a7bab3 Fixed issue #561. UI compiler warning in dialogdetail.ui.
--HG--
branch : develop
2016-09-06 18:47:56 +03:00
Roman Telezhynskyi
0d35033275 Added global option "Forbid Flipping". ref #560.
--HG--
branch : develop
2016-09-06 17:05:54 +03:00
Roman Telezhynskyi
038863fbdf Resolved issue #560. Flipped pattern pieces in Layout.
--HG--
branch : develop
2016-09-06 13:24:52 +03:00
Roman Telezhynskyi
8cf52dc674 Length to control point can be 0.
--HG--
branch : develop
2016-08-26 19:33:54 +03:00
Roman Telezhynskyi
c2b7ead2ce Fixed wrong units in dialog DialogEditWrongFormula.
--HG--
branch : develop
2016-08-26 19:20:03 +03:00
Roman Telezhynskyi
c35f050b66 Improvements for the Dialog Detail. Added spliters, fields Letter and Name of
detail have placeholder text.

--HG--
branch : develop
2016-08-26 13:46:23 +03: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
89ce8afe77 Localize numeric keyboard's dot key according to locale and user preferences.
--HG--
branch : develop
2016-08-23 21:24:14 +03:00
Roman Telezhynskyi
73bcc89107 Fixed wrong compatibility with Qt 5.0.
--HG--
branch : develop
2016-08-22 12:16:12 +03:00
Roman Telezhynskyi
bf82dc3bb3 Make 1 minimal value of the field "Cut number".
--HG--
branch : develop
2016-08-22 11:47:21 +03:00
Bojan Kverh
08bfd9cd82 Merged develop into feature
--HG--
branch : feature
2016-08-21 11:51:49 +02:00
BojanKverh
b4ced822e0 Fixed material attribute writing to XML and removed commented out lines
--HG--
branch : feature
2016-08-21 11:48:51 +02: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
BojanKverh
ff6d3c7155 Fixed user defined materials
--HG--
branch : feature
2016-08-21 10:27:39 +02:00
Bojan Kverh
19c69c691a Merged develop into feature
--HG--
branch : feature
2016-08-21 00:01:35 +02:00
Valentina Zhuravska
00649770e3 Little fixes.
--HG--
branch : feature
2016-08-17 23:13:54 +03:00
BojanKverh
1cfa97497c Fixed translations after language change
--HG--
branch : feature
2016-08-17 21:38:39 +02:00
Bojan Kverh
10f2d83edd Merged develop into feature
--HG--
branch : feature
2016-08-17 18:00:56 +02: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
Bojan Kverh
37b683f125 Merged develop into feature
--HG--
branch : feature
2016-08-15 11:06:42 +02:00
Roman Telezhynskyi
da4bf27c75 New test localization (checking punctuation).
--HG--
branch : develop
2016-08-12 15:21:55 +03:00
BojanKverh
86f24bf0e5 User defined materials are now remembered and can also be deleted in preferences dialog
--HG--
branch : feature
2016-08-12 01:22:23 +02:00
BojanKverh
b0532e6fb9 Removed userDef attributes from DOM tree, where they are not necessary. Fixed some translations. Refactored finding the selected material in detail dialog
--HG--
branch : feature
2016-08-11 22:44:53 +02:00
Roman Telezhynskyi
0aabacfee4 String inside label also should be translated.
--HG--
branch : develop
2016-08-09 19:42:00 +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
31fa9785b9 Fixed several mistakes in original strings.
--HG--
branch : develop
2016-08-09 13:50:37 +03:00
Roman Telezhynskyi
80f00b361d Use "Include What You Use" tool for optimizing #includes.
--HG--
branch : develop
2016-08-08 14:44:49 +03:00
Roman Telezhynskyi
67b18fbbde Fix problems with layouts in dialog tool Detail. Returned detail name by
default. Setted clear button for field Letter.

--HG--
branch : develop
2016-08-07 23:41:49 +03:00
Roman Telezhynskyi
2af9c0e65a Fixed issues with include paths.
--HG--
branch : develop
2016-08-05 13:48:23 +03:00
Roman Telezhynskyi
75e9e9b2ee Fixed issues with include paths.
--HG--
branch : develop
2016-08-05 13:41:02 +03:00
Bojan Kverh
c5f38207fd Merged develop into feature
--HG--
branch : feature
2016-07-29 21:47:49 +02:00
Roman Telezhynskyi
7b7ef6c0e2 Fixed build.
--HG--
branch : develop
2016-07-26 16:51:38 +03:00
Valentina Zhuravska
1ae8509d63 Merge with develop.
--HG--
branch : feature
2016-07-26 15:32:55 +03:00
Valentina Zhuravska
f9c9cedfac We don't need DialogTool::ShowVisToolTip slot anymore.
--HG--
branch : feature
2016-07-26 13:45:17 +03:00
Bojan Kverh
4138d30fb6 Merged develop into feature
--HG--
branch : feature
2016-07-21 08:30:51 +02:00
Roman Telezhynskyi
1bffa92127 Using QLatin1String instead of QLatin1Literal.
QLatin1Literal is just a typedef of QLatin1String lefter for compatibility with
Qt 4.x.

--HG--
branch : develop
2016-07-20 11:39:15 +03:00
BojanKverh
9943fa7c8b Merging
--HG--
branch : feature
2016-07-18 20:56:05 +02:00
Roman Telezhynskyi
47f12c80f8 Refactoring. Use lambda for small slots. Move slots declaration in appropriate
place.

--HG--
branch : develop
2016-07-18 18:09:15 +03:00
Bojan Kverh
f7ebda3c6e Merged develop into feature
--HG--
branch : feature
2016-07-13 23:11:49 +02:00
Roman Telezhynskyi
e4d6df06b7 Refactoring. Instead of using proxy slots emit signals directly from lambda
expressions.

--HG--
branch : develop
2016-07-13 14:41:44 +03:00
Bojan Kverh
e93f2c117b Merged develop into feature
--HG--
branch : feature
2016-07-12 22:09:47 +02:00
Roman Telezhynskyi
f56f2a0209 Fixed issue #526. Dialog Detail is not on top after selection second object on
Mac.
(grafted from acde5cf1164d8227d71e7ff41ce03b45cbe7c9dd)

--HG--
branch : develop
2016-07-09 13:57:37 +03:00
BojanKverh
6e1dce0cd7 Fixed moving labels and added warning icon to detail dialog when detail name is empty
--HG--
branch : feature
2016-07-08 00:46:33 +02:00
Bojan Kverh
5aa75f2aff Merged develop into feature
--HG--
branch : feature
2016-07-07 20:47:16 +02:00
Roman Telezhynskyi
bd7f328a8a Refactoring deleting visualization object.
Instead of searcing inside current graphics scene use QPointer class.

--HG--
branch : develop
2016-07-07 14:56:55 +03:00
BojanKverh
3a40927764 Fixed layout in detail dialog and painting of text item in rotate mode
--HG--
branch : feature
2016-07-06 22:15:32 +02:00
BojanKverh
192c4d33a7 Added possibility to hide both labels for each detail individually
--HG--
branch : feature
2016-07-06 21:56:52 +02:00
BojanKverh
aa1d1f8ce1 Label cannot be moved outside of parent bounding box. Moving cursor is on when moving label. Name of detail moved to Pattern Piece Data tab. Hopefully all warnings removed
--HG--
branch : feature
2016-07-06 20:49:36 +02:00
BojanKverh
cdd3e03e53 Merged develop into feature
--HG--
branch : feature
2016-07-06 17:58:17 +02:00
Roman Telezhynskyi
0e24fae91c Fixed issue #521. Error: Can't create Seam Allowance after using Union Tool.
--HG--
branch : develop
2016-07-06 13:34:05 +03:00
BojanKverh
180e1ddc90 Merged
--HG--
branch : feature
2016-07-03 10:24:25 +02:00
Roman Telezhynskyi
14afb2ce9b Resolved issue #521. Error: Can't create Seam Allowance after using Union Tool.
--HG--
branch : develop
2016-07-02 14:43:01 +03:00
Roman Telezhynskyi
49258cac8c Added additional checks to method DialogTool::SetAssociatedTool.
--HG--
branch : develop
2016-07-02 12:12:12 +03:00
Bojan Kverh
9a64ddf6a3 Merged develop into feature
--HG--
branch : feature
2016-06-30 20:50:07 +02:00