aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,783 Commits 3 Branches 35 Tags 270 MiB
1fb0ab4d75
Commit Graph

293 Commits

Author SHA1 Message Date
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
7dd88da82d Merged in BojanKverh/valentina-issue24a/feature (pull request #138) 
Improvements for feature "New feature: Label on detail" ref #24.

--HG--
branch : develop
 2016-08-22 11:33:22 +03:00
Roman Telezhynskyi
bfff8ccb96 Changes for returning support Qt 5.0 and GCC 4.6. 
--HG--
branch : develop
 2016-08-21 18:57:08 +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
Bojan Kverh
19c69c691a Merged develop into feature 
--HG--
branch : feature
 2016-08-21 00:01:35 +02:00
Roman Telezhynskyi
948ae32dc5 Fixed regression with tool "Union details". 
One file in collection contain unpredicted case. For fixing returned old code.

--HG--
branch : develop
 2016-08-20 17:34:49 +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
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
3ef57202d1 Resolved issue #544. Error: Color Lines are black until touched. 
(grafted from f62bbdf4122fa02aa12d110d123b900b94c423d1)

--HG--
branch : develop
 2016-08-16 18:23:20 +03:00
BojanKverh
92ec78e6b3 Made sure that labels stay inside the detail after changing size or height 
--HG--
branch : feature
 2016-08-15 17:19:21 +02:00
BojanKverh
fb326d4f39 Added %size% and %height% placeholders to display pattern size and height in the Pattern size line edit 
--HG--
branch : feature
 2016-08-15 13:03:59 +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
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