Commit Graph

326 Commits

Author SHA1 Message Date
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
9035382238 Cppcheck warnings.
--HG--
branch : develop
2016-08-09 14:18:49 +03:00
Roman Telezhynskyi
67360605b3 Fix broken tool Union details.
--HG--
branch : develop
2016-08-08 17:34:50 +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
da91ed974a Merged in BojanKverh/valentina-issue24/feature (pull request #134)
Fixed issue #24. New feature: Label on detail.

--HG--
branch : develop
2016-08-07 18:08:39 +03:00
Roman Telezhynskyi
c9cdd2cd8d Using macros QT_WARNING_DISABLE_*.
--HG--
branch : develop
2016-08-06 21:42:40 +03:00
BojanKverh
f56614966b Deleted unnecessary class member
--HG--
branch : feature
2016-08-03 00:44:22 +02:00
BojanKverh
192bd7e7d5 Deleted unnecessary include
--HG--
branch : feature
2016-08-03 00:39:02 +02:00
BojanKverh
a2ee1e24e6 Fixed cursor handling over the label
--HG--
branch : feature
2016-08-03 00:32:37 +02:00
BojanKverh
f2d5b00fd9 Detail bounding box is drawn when one of its items is in move, resize or rotate mode
--HG--
branch : feature
2016-08-02 22:51:40 +02:00
Roman Telezhynskyi
a2d18c15a4 Fix broken VTextGraphicsItem::paint.
--HG--
branch : develop
2016-08-02 21:16:15 +03:00
Roman Telezhynskyi
ffb6f1fbd5 cppcheck warnings.
--HG--
branch : develop
2016-08-02 15:12:13 +03:00
BojanKverh
a1c905381b Fixed label update on clicking OK in pattern properties dialog and the label is hidden when there is no text on it
--HG--
branch : feature
2016-07-30 13:21:03 +02:00
Bojan Kverh
c5f38207fd Merged develop into feature
--HG--
branch : feature
2016-07-29 21:47:49 +02:00
Roman Telezhynskyi
75e9e9b2ee Fixed issues with include paths.
--HG--
branch : develop
2016-08-05 13:41:02 +03:00
Valentina Zhuravska
1ae8509d63 Merge with develop.
--HG--
branch : feature
2016-07-26 15:32:55 +03:00
BojanKverh
a625c35616 Added comments to most important new classes
--HG--
branch : feature
2016-07-23 15:26:15 +02:00
BojanKverh
0e7b369c2e Corrected all the issues reported by Roman till 10:11 AM
--HG--
branch : feature
2016-07-22 11:56:45 +02:00
BojanKverh
312b8e458b Centered the label texts and did some refactoring, so that the label content is generated in one place
--HG--
branch : feature
2016-07-21 21:46:49 +02:00
BojanKverh
5ba40aad8c Fixed alignments
--HG--
branch : feature
2016-07-21 16:49:26 +02:00
Bojan Kverh
608b566006 Merged develop into feature
--HG--
branch : feature
2016-07-19 23:00:37 +02:00
BojanKverh
948102e74e Current date is always used to show the pattern creation date
--HG--
branch : feature
2016-07-19 22:59:14 +02:00
Roman Telezhynskyi
fc7e0bb6cb Fixed Valentina crash after undo deleting detail.
Emitting signal in lambda was not really good idea.

--HG--
branch : develop
2016-07-19 20:50:42 +03:00
BojanKverh
04780b4323 Moved VTextManager class into the vlayout folder in order for tests to compile. It also belong to vlayout folder more than into vtools
--HG--
branch : feature
2016-07-19 14:23:20 +02:00
BojanKverh
1759d4314f Labels with pattern info are now displayed in the Layout mode as well. Maybe needs a little bit of refactoring (the label styles and texts are now set up in two different places (VToolDetail and VLayoutDetail), I think this should be unified
--HG--
branch : feature
2016-07-19 13:47:21 +02:00
BojanKverh
9368978039 Added detail texts to layout mode
--HG--
branch : feature
2016-07-19 02:26:50 +02:00
BojanKverh
c9ee648cb8 Refactored the text managing in labels
--HG--
branch : feature
2016-07-18 22:30:14 +02:00
BojanKverh
25a58421cc Added pattern size field and creation date visibility flag to pattern properties
--HG--
branch : feature
2016-07-16 01:12:51 +02:00
BojanKverh
ea9cdd46b2 Fixed some code style errors and checking label position at resizing
--HG--
branch : feature
2016-07-14 02:59:42 +02:00
BojanKverh
634d8773de Labels now cannot go outside the detail bounding box with any operation (move, resize or rotate)
--HG--
branch : feature
2016-07-14 02:10:27 +02: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
Valentina Zhuravska
2cf2275365 Added ToolTip for editing simple curve.
--HG--
branch : feature
2016-07-13 14:05:37 +03:00
BojanKverh
7c2f4e54ba Fixed cursor handling on vtextgraphicsitem
--HG--
branch : feature
2016-07-12 23:11:17 +02:00
BojanKverh
e5f7c47828 Removed some compiler warnings and set the resize cursor when label is being resized
--HG--
branch : feature
2016-07-10 12:39:50 +02:00
BojanKverh
a557b99409 Material/Cut/Placement is not displayed on label if cut number is 0
--HG--
branch : feature
2016-07-10 11:32:37 +02:00
BojanKverh
d76cc0bd38 Corrected the label placement when moved on the detail edge
--HG--
branch : feature
2016-07-10 11:20:53 +02: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
a2acb032a2 Use static assert to check if minimal version is high enough to delete code that
needed for backward compatibility.

--HG--
branch : develop
2016-07-07 18:04:26 +03:00
Roman Telezhynskyi
eec1240da0 Fixed resizing scene when move detail.
When first time create detail MoveDetail class gets wrong scene pointer and this
cause refreshing wrong scene.

--HG--
branch : develop
2016-07-07 15:38:55 +03:00
Roman Telezhynskyi
c0bae287be Refactoring.
--HG--
branch : develop
2016-07-07 14:36:11 +03:00
Roman Telezhynskyi
ed0d4df88f Fixed wrong color segment that connects label with point in Base point tool.
--HG--
branch : develop
2016-07-07 14:35: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
15e840f49a Small refactoring VToolDetail class.
--HG--
branch : develop
2016-07-06 13:34:39 +03: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
5e3daf416c Fixed initial positioning of the labels
--HG--
branch : feature
2016-07-03 10:17:59 +02:00
Valentina Zhuravska
01f66d3c34 Resolved issue #461. Improve feature: Add a keyboard shortcut for getting pure 45, 90, 135, 180, 225, 270, 315 and 0 degree angles for all tools.
--HG--
branch : feature
2016-07-03 07:50:14 +03:00
BojanKverh
74a49662f6 Fixed rotation
--HG--
branch : feature
2016-07-02 11:15:41 +02:00
BojanKverh
f52f97740d Moved pattern info geometry into VDetail class
--HG--
branch : feature
2016-07-02 01:49:38 +02:00
Bojan Kverh
438cb466d7 Merged develop into feature
--HG--
branch : feature
2016-07-01 17:36:21 +02:00
Roman Telezhynskyi
b3f1b15c1e Fixed Bisector tool bug. The tool created internal variable for wrong segment.
(grafted from 53b851e1c883bd92a7f9267a8fcefaa98735ecde)

--HG--
branch : develop
2016-07-01 15:49:15 +03:00
BojanKverh
6effc2b5cd Rotation bugs fixed
--HG--
branch : feature
2016-07-01 01:45:16 +02:00
Bojan Kverh
9a64ddf6a3 Merged develop into feature
--HG--
branch : feature
2016-06-30 20:50:07 +02:00
Roman Telezhynskyi
800c1b4dc9 Little improvement for Unit tool. New detail will have offset from first detail.
--HG--
branch : develop
2016-06-30 19:53:16 +03:00
Roman Telezhynskyi
c89243a288 Resolved issue #520. Improve Union tool. An option to select about original
pieces.

--HG--
branch : develop
2016-06-30 19:48:46 +03:00
BojanKverh
23a31b1fa9 Rotation of the labels. There are a couple of bugs still to fix
--HG--
branch : feature
2016-06-30 18:04:25 +02:00
Bojan Kverh
d5a3289ef7 Merged develop into feature
--HG--
branch : feature
2016-06-30 18:01:27 +02:00
Roman Telezhynskyi
046ef4975d These strings should be translated.
--HG--
branch : develop
2016-06-30 18:34:20 +03:00
Roman Telezhynskyi
6bf31f2846 Resolved issue #483. File lost.
Fixed crash after redo Unite tool. Caused by wrong position of modeling objects.

--HG--
branch : develop
2016-06-30 18:32:08 +03:00
Roman Telezhynskyi
8a8f63e88e Resolved issue #519. Error: Crash with Union tool.
--HG--
branch : develop
2016-06-30 16:02:59 +03:00
BojanKverh
0f90b61235 Fixed the vtextgraphicsitem mouse events bug
--HG--
branch : feature
2016-06-29 23:52:48 +02:00
BojanKverh
caa13f06ac Corrected some warnings
--HG--
branch : feature
2016-06-29 23:39:52 +02:00
Bojan Kverh
83ec6e219a Merged develop into feature
--HG--
branch : feature
2016-06-29 23:19:24 +02:00
Roman Telezhynskyi
79d63f49a6 GCC warnings.
--HG--
branch : develop
2016-06-28 09:36:12 +03:00
BojanKverh
2b7f056566 Fixed schema and undo bug
--HG--
branch : feature
2016-06-27 20:51:29 +02:00
BojanKverh
6577d82771 Added new schema to accomodate for new parameters and did some other minor changes. There is a bug with Undo on details label, will check that later
--HG--
branch : feature
2016-06-27 17:18:43 +02:00
Valentina Zhuravska
289bf05642 Fixed issue #516. Valentina crashes when use "Point intersect line and axis" instrument.
--HG--
branch : feature
2016-06-27 15:09:32 +03:00
BojanKverh
80fcf30776 Moving, resizing and editing both labels now works
--HG--
branch : feature
2016-06-27 11:06:51 +02:00
BojanKverh
fa105537d2 Moving and resizing pattern info label (has few bugs still, probably just XML parsing)
--HG--
branch : feature
2016-06-27 01:17:27 +02:00
BojanKverh
e68fa3a0f3 Fixed few bugs: label position is preserved after editing detail, buttons for add/update/remove MCP are handled correcty. Added style to VTextGraphicsItem lines
--HG--
branch : feature
2016-06-26 14:21:06 +02:00
BojanKverh
21debaf249 Reimplemented QTextGraphicsItem class
--HG--
branch : feature
2016-06-25 17:19:44 +02:00
BojanKverh
33e1a12a67 Merged heads
--HG--
branch : feature
2016-06-24 18:05:31 +02:00
Bojan Kverh
3480f33922 Merged develop into feature
--HG--
branch : feature
2016-06-24 17:57:52 +02:00
BojanKverh
caa6b425b9 Tried QGraphicsTextItem::boundingBox approach
--HG--
branch : feature
2016-06-24 17:57:08 +02:00
BojanKverh
6fbffd2834 Position, size and font size of the text label are now saved into VDetail DOM tree. Undo/Redo for moving and resizing the label works.
--HG--
branch : feature
2016-06-23 22:35:32 +02:00
Roman Telezhynskyi
7eaadf1761 Resolved issue #480. New tool: Midpoint between two points.
--HG--
branch : develop
2016-06-23 20:20:21 +03:00
BojanKverh
fc0b1dce9c Added label containing pattern piece information to vtooldetail, which can be moved/resized
--HG--
branch : feature
2016-06-23 00:59:45 +02:00
BojanKverh
b14a3c9551 Fixed the SaveDetailOption::undo method and few code style issues
--HG--
branch : feature
2016-06-21 19:53:15 +02:00
Bojan Kverh
553f8dc2d2 Merged develop into feature
--HG--
branch : feature
2016-06-21 18:29:08 +02:00
BojanKverh
c05c51e078 Finished the detail dialog
--HG--
branch : feature
2016-06-21 00:49:22 +02:00
BojanKverh
8140647242 Updated detail dialog with pattern piece data editing
--HG--
branch : feature
2016-06-18 22:14:35 +02:00
BojanKverh
1899abc39e Added pattern piece data dialog, which can be accessed with right mouse click in Detail mode
--HG--
branch : feature
2016-06-18 16:00:01 +02:00
Roman Telezhynskyi
76d1c02423 Call details context menu through label.
--HG--
branch : develop
2016-06-17 16:13:49 +03:00
Valentina Zhuravska
43cba1b10f Fixed build in Windows.
--HG--
branch : develop
2016-06-11 16:27:14 +03:00
Roman Telezhynskyi
eaa1744262 Clang warnings.
--HG--
branch : develop
2016-05-25 16:28:35 +03:00
Roman Telezhynskyi
eb15b5d736 Rotated curves don't need mx and my attributes.
--HG--
branch : develop
2016-05-25 12:14:24 +03:00
Roman Telezhynskyi
58ed043b1b A keyboard input focus for class VSimpleCurve.
--HG--
branch : develop
2016-05-25 11:59:59 +03:00
Roman Telezhynskyi
e4ee400903 VToolLine did not have a keyboard input focus.
--HG--
branch : develop
2016-05-25 11:51:26 +03:00
Roman Telezhynskyi
ff34f05b34 Fixed crash when detail use curve created by tool rotation.
--HG--
branch : develop
2016-05-25 10:41:00 +03:00
Roman Telezhynskyi
9c0f5f2fa4 Refactoring. Use QScopedPointer for class Calculator.
--HG--
branch : develop
2016-05-24 15:25:58 +03:00
Roman Telezhynskyi
83243e5af3 Handle case when NaN and Inf value treats like valid.
--HG--
branch : develop
2016-05-24 15:06:35 +03:00
Roman Telezhynskyi
d13937fb40 Clicking on notselectable object do not clean previous selections.
--HG--
branch : develop
2016-05-24 12:43:30 +03:00
Roman Telezhynskyi
b820d5a6ea Fixed issue #491. Valentina doesn't update fractional separator.
(grafted from c658843945e37cd7f1d3e4e0ca4967d7a01b1c4d)

--HG--
branch : develop
2016-05-23 18:23:39 +03:00
Roman Telezhynskyi
b05da647fe Moving labels and curves did not call resizing scene.
--HG--
branch : develop
2016-05-20 15:20:08 +03:00
Roman Telezhynskyi
05fdbcf8f5 Fixed a bug with QGraphicsItem class. QGraphicsItem itself produce case where
clicking on empty space produce call to QGraphicsItem.

--HG--
branch : develop
2016-05-20 14:41:57 +03:00
Roman Telezhynskyi
182d07f761 Fixed wrong incrementing references to objects.
--HG--
branch : feature
2016-05-19 16:46:40 +03:00
Roman Telezhynskyi
948d384868 Fixed moving labels.
--HG--
branch : feature
2016-05-19 15:13:38 +03:00
Roman Telezhynskyi
d7b4cbf860 Remove all children before update.
--HG--
branch : feature
2016-05-19 15:01:49 +03:00
Roman Telezhynskyi
0266b27b36 Save information about curve color inside geometric objects. Help to copy this
data to copy objects after rotation.

--HG--
branch : feature
2016-05-19 13:11:50 +03:00
Roman Telezhynskyi
0052a883a4 Better way to check suffix.
--HG--
branch : feature
2016-05-18 16:44:23 +03:00
Roman Telezhynskyi
291c19d5a2 Property browser for tool Rotation.
--HG--
branch : feature
2016-05-18 14:32:51 +03:00
Roman Telezhynskyi
84a56545ea Merge with develop.
--HG--
branch : feature
2016-05-18 13:18:08 +03:00
Valentina Zhuravska
0d8d9cb5e1 Resolved issue #487. True dart point always goes to origin when the label is moved.
--HG--
branch : develop
2016-05-17 13:46:52 +03:00
Roman Telezhynskyi
970b876cf7 Show the tool visualization.
--HG--
branch : feature
2016-05-17 13:24:51 +03:00
Roman Telezhynskyi
18d3a297cd VToolRotation::SetFactor.
--HG--
branch : feature
2016-05-17 13:02:01 +03:00
Roman Telezhynskyi
ac49d298f8 Refactoring. Use tag names from class VAbstractPattern.
--HG--
branch : feature
2016-05-16 20:59:04 +03:00
Roman Telezhynskyi
7dbba35919 Parse the tool in a file.
--HG--
branch : feature
2016-05-16 20:27:51 +03:00
Roman Telezhynskyi
02eb12ba3e Fix warning "Class implements the interface QGraphicsItem but does not list it
in Q_INTERFACES. qobject_cast to QGraphicsItem will not work!"

--HG--
branch : feature
2016-05-14 22:58:00 +03:00
Roman Telezhynskyi
e9d23a7a32 Refactoring. Each a static method has access to each method in a class. So, we
can declare a constructor in private section for each a tool class that has
"Create" methods.

--HG--
branch : feature
2016-05-14 22:54:57 +03:00
Roman Telezhynskyi
6187f16c6a Refactoring. Use conversion operator for conversion VPointF to QPointF.
--HG--
branch : feature
2016-05-14 22:28:09 +03:00
Roman Telezhynskyi
4ec4f276fc GCC warnings.
--HG--
branch : feature
2016-05-13 18:10:13 +03:00
Roman Telezhynskyi
c8a041e4f2 Refactoring undocommands move label.
--HG--
branch : feature
2016-05-13 18:05:35 +03:00
Roman Telezhynskyi
fc4054e49e Undocommand move a label of rotated point.
--HG--
branch : feature
2016-05-13 16:50:30 +03:00
Roman Telezhynskyi
80b415f258 Merge with develop.
--HG--
branch : feature
2016-05-12 22:52:31 +03:00
Roman Telezhynskyi
910c40a5b3 Commit successful build.
--HG--
branch : feature
2016-05-12 22:11:21 +03:00
Roman Telezhynskyi
49bee0cada Delete key did not work.
--HG--
branch : develop
2016-05-08 18:04:18 +03:00
Roman Telezhynskyi
6f56b46d26 Fixed Clang warnings.
--HG--
branch : develop
2016-05-03 19:50:37 +03:00
Valentina Zhuravska
c95b162c0d Fixed build in win7
--HG--
branch : feature
2016-04-11 05:27:51 +03:00
Roman Telezhynskyi
48e411a3ce Working with group widget.
--HG--
branch : feature
2016-04-07 17:57:53 +03:00
Roman Telezhynskyi
cb67249b54 New undo command Add Group.
--HG--
branch : feature
2016-04-06 12:03:34 +03:00
Roman Telezhynskyi
ada64305c0 Dialog Group.
--HG--
branch : feature
2016-04-05 20:14:12 +03:00
Roman Telezhynskyi
371c352efc Tool "Curve intersect axis" store data about subpaths.
--HG--
branch : develop
2016-04-02 20:47:56 +03:00
Roman Telezhynskyi
c99cdb69ec Added new curve path segment variables.
--HG--
branch : develop
2016-04-02 00:15:04 +03:00
Roman Telezhynskyi
bb29984b4a Cut tools do not create subcurves anymore.
--HG--
branch : develop
2016-04-01 17:32:36 +03:00
Roman Telezhynskyi
9a6a5be59d No need anymore to disable the drawing of the selection border.
--HG--
branch : feature
2016-03-31 20:27:40 +03:00
Roman Telezhynskyi
9f5fd98865 Fixed tools Spline and Spline Path. For their work need section by mouse press
event, all other better work with mouse release event.

--HG--
branch : feature
2016-03-31 20:10:20 +03:00
Roman Telezhynskyi
351f01e0e3 Disable hover and selection when work with a tool.
--HG--
branch : feature
2016-03-31 17:01:41 +03:00
Roman Telezhynskyi
0d4c6c2208 By default user can select only labels by rubber band.
--HG--
branch : develop
2016-03-28 17:10:19 +03:00
Roman Telezhynskyi
2339a95585 Fixed broken redo/undo command moving of a label.
--HG--
branch : develop
2016-03-28 15:49:35 +03:00
Roman Telezhynskyi
0c9b8453bf Optimization. No need to refresh a pattern when move a label.
--HG--
branch : develop
2016-03-28 12:21:24 +03:00
Roman Telezhynskyi
0325e0a441 Changed code tree structure for visualization classes.
--HG--
branch : develop
2016-03-24 16:49:15 +02:00
Roman Telezhynskyi
70fd0be830 Use Q_REQUIRED_RESULT where it make sense.
--HG--
branch : develop
2016-03-23 17:27:17 +02:00
Roman Telezhynskyi
be7277eeba Refactoring. Use more safe function VFuzzyComparePossibleNulls.
--HG--
branch : develop
2016-03-23 16:09:30 +02:00
Roman Telezhynskyi
ff667c8602 The tool Detail now supports Cubic Bezier Path curve.
--HG--
branch : develop
2016-03-22 17:33:05 +02:00
Roman Telezhynskyi
4c1c0d4d0a Fixed empty point label in SplinePath name.
--HG--
branch : develop
2016-03-22 17:25:16 +02:00
Roman Telezhynskyi
2e0bf11261 The tool Cut Spline now supports Cubic Bezier Path curve.
--HG--
branch : develop
2016-03-22 17:14:53 +02:00
Roman Telezhynskyi
19265e1f93 Succesful build.
--HG--
branch : feature
2016-03-18 23:11:14 +02:00
Roman Telezhynskyi
2c4312046c New classes VAbstractCubicBezierPath and VCubicBezierPath.
--HG--
branch : feature
2016-03-16 20:07:50 +02:00
Roman Telezhynskyi
2d69e1a46f The tool Detail now supports Cubic Bezier curve.
--HG--
branch : feature
2016-03-10 19:08:37 +02:00
Roman Telezhynskyi
2548697a9e The tool Cut Spline now supports Cubic Bezier curve.
--HG--
branch : feature
2016-03-10 18:09:38 +02:00
Roman Telezhynskyi
53250a4dc4 Simple curve which uses point as control handle.
--HG--
branch : feature
2016-03-10 15:55:04 +02:00
Roman Telezhynskyi
d72ea565cb Fixed wrong handling with true darts points inside tool detail.
(grafted from c84b1a66716faa7e171e5acb2824a7fb5702dd27)

--HG--
branch : develop
2016-03-08 19:49:16 +02:00
Roman Telezhynskyi
f53fe379c6 Movable spline path.
--HG--
branch : feature
2016-03-05 23:06:54 +02:00
Roman Telezhynskyi
40436a5c57 Successfull build, bugs was not fixed.
--HG--
branch : feature
2016-03-04 18:08:29 +02:00
Roman Telezhynskyi
8d628404df Curve factor was removed.
--HG--
branch : feature
2016-02-27 16:49:10 +02:00