Commit Graph

405 Commits

Author SHA1 Message Date
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
28c4eddbd7 Merged
--HG--
branch : feature
2016-06-26 19:35:21 +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
Roman Telezhynskyi
1608599795 Added list "Details in layout".
--HG--
branch : feature
2016-06-26 14:36:12 +03: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
9386ae2ff1 Corrected code to satisfy code style specifications
--HG--
branch : feature
2016-06-19 13:46:19 +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
35b1a2fb9a Show direction when show a visualization.
--HG--
branch : develop
2016-05-25 11:48:32 +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
66cc34ed64 Fixed issue "Rotation tool - Cannot edit formula after creation".
--HG--
branch : develop
2016-05-24 13:29:13 +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
64f72c69d5 Clang warnings.
--HG--
branch : develop
2016-05-20 19:39:13 +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
e2a059287e Update an angle during processing editing rotation.
--HG--
branch : feature
2016-05-19 15:56:50 +03:00
Roman Telezhynskyi
7665402d64 Fixed crash.
--HG--
branch : feature
2016-05-19 15:48:56 +03:00
Roman Telezhynskyi
123434f806 Mark with different color base objects and rotated objects.
--HG--
branch : feature
2016-05-19 15:23:37 +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
fd39c19da0 Show selected objects even before selecting origin point.
--HG--
branch : feature
2016-05-18 19:13:48 +03:00
Roman Telezhynskyi
19df01be2e Correct selection and hovering. Line can't be selected.
--HG--
branch : feature
2016-05-18 19:07:43 +03:00
Roman Telezhynskyi
ba76ba2746 Origin point shouldn't be in a rotation list.
--HG--
branch : feature
2016-05-18 16:57:17 +03:00
Roman Telezhynskyi
0052a883a4 Better way to check suffix.
--HG--
branch : feature
2016-05-18 16:44:23 +03:00
Roman Telezhynskyi
702245f9fb Check suffix in a dialog.
--HG--
branch : feature
2016-05-18 16:38:04 +03:00
Roman Telezhynskyi
180903b807 Automatically generate suffix.
--HG--
branch : feature
2016-05-18 15:35:07 +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
Roman Telezhynskyi
916598c86c Show an arc between two lines that reprezent an angle.
--HG--
branch : feature
2016-05-18 13:17:50 +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
b377042125 Merge with develop.
--HG--
branch : feature
2016-05-17 13:25:33 +03:00
Roman Telezhynskyi
970b876cf7 Show the tool visualization.
--HG--
branch : feature
2016-05-17 13:24:51 +03:00
Valentina Zhuravska
6e7b77b9de Added toolTip.
--HG--
branch : feature
2016-05-17 13:18:38 +03:00
Roman Telezhynskyi
18d3a297cd VToolRotation::SetFactor.
--HG--
branch : feature
2016-05-17 13:02:01 +03:00
Valentina Zhuravska
5933da7403 Resolved issue #472. Add 'Full Name' column to Formula dialog.
--HG--
branch : feature
2016-05-17 12:25: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
d2efd50030 Delete visualization before closing the tool dialog.
--HG--
branch : feature
2016-05-13 20:59:15 +03:00
Roman Telezhynskyi
2f7138e69c Forgot to add apply button.
--HG--
branch : feature
2016-05-13 20:46:57 +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
a0842b0f48 Merge with develop.
--HG--
branch : feature
2016-04-07 17:59:07 +03:00
Roman Telezhynskyi
48e411a3ce Working with group widget.
--HG--
branch : feature
2016-04-07 17:57:53 +03:00
Roman Telezhinskyi
0b9562a3bd Merged in ValentinaZhuravska/valentina/feature (pull request #107)
We can add image to file.val

--HG--
branch : develop
2016-04-07 12:03:40 +03:00
Roman Telezhynskyi
9c63c4f794 The method SetGroupName.
--HG--
branch : feature
2016-04-06 12:36:33 +03:00
Roman Telezhynskyi
a8feb5d0c0 New undo command DelGroup.
--HG--
branch : feature
2016-04-06 12:23:39 +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
d1480132a0 Don't separate data about spline and arc length and angles.
--HG--
branch : develop
2016-04-01 22:34:57 +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
baddba9e43 Resolved issue #366. Update 'Point from Distance and Angle' tool to read
distance and angle between points.

--HG--
branch : develop
2016-03-19 17:45:57 +02:00
Roman Telezhynskyi
02cb84c4a1 Show list of points from the begin of the list.
--HG--
branch : feature
2016-03-19 16:29:26 +02:00
Roman Telezhynskyi
505cec891d Several bug fixes.
--HG--
branch : feature
2016-03-19 16:20:09 +02:00
Roman Telezhynskyi
19265e1f93 Succesful build.
--HG--
branch : feature
2016-03-18 23:11:14 +02:00
Roman Telezhynskyi
ca020c4c7f Improved visualization for tool Cubic Bezier.
--HG--
branch : feature
2016-03-18 12:28:28 +02:00
Roman Telezhynskyi
037e91484a For tool Cubic Bezier curve show connection to control points.
--HG--
branch : feature
2016-03-17 16:26:25 +02:00
Roman Telezhynskyi
2c4312046c New classes VAbstractCubicBezierPath and VCubicBezierPath.
--HG--
branch : feature
2016-03-16 20:07:50 +02:00
Roman Telezhynskyi
f5c5995117 Fixed issue with deleting detail nodes.
(grafted from dc69de0a2dd73ae3cbbc6ce6b7007407540e4c4c)

--HG--
branch : develop
2016-03-15 17:38:36 +02:00
Roman Telezhynskyi
4a9302ee4e For modeling no need to seek parent tool id.
(grafted from b84438717fd8436e747b3982461cee3c4124d935)

--HG--
branch : develop
2016-03-15 17:32:12 +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
Valentina Zhuravska
ab78ee2550 Fixed build on Win7
--HG--
branch : feature
2016-03-09 20:59:08 +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
5be84df289 The file stable.cpp is useful only with MSVC.
--HG--
branch : develop
2016-03-06 21:21:21 +02:00
Roman Telezhynskyi
fe220f6305 Removed tag "zorder".
--HG--
branch : develop
2016-03-05 23:11:02 +02:00
Roman Telezhynskyi
f53fe379c6 Movable spline path.
--HG--
branch : feature
2016-03-05 23:06:54 +02:00
Roman Telezhynskyi
2e6be9119c Fixed crash.
--HG--
branch : feature
2016-03-05 18:30:45 +02:00
Roman Telezhynskyi
504a334717 The method FormulaFromUser throw an exception. In many places we don't catch the
exception and i think this is wrong. New method TryFormulaFromUser was
introduced for fixing situation.

--HG--
branch : feature
2016-03-05 17:27:07 +02:00
Roman Telezhynskyi
e120fc1d0a Calculate a formula immediately.
--HG--
branch : feature
2016-03-05 15:22:24 +02:00
Roman Telezhynskyi
e948a0ba27 Refactoring ValFormulaChanged. Continue fix bugs in the dialog spline path.
--HG--
branch : feature
2016-03-05 14:30:18 +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
Roman Telezhynskyi
a2561bc7da Updated property dialog for tool Spline.
--HG--
branch : feature
2016-02-27 12:28:15 +02:00
Roman Telezhynskyi
53cb607f34 Block moving a control point if a formula was used.
--HG--
branch : feature
2016-02-27 10:29:32 +02:00
Roman Telezhynskyi
679f90d627 Block moving a spline by dragging if a formula was used.
--HG--
branch : feature
2016-02-26 19:44:51 +02:00
Roman Telezhynskyi
773383ec70 Fixed moving a spline by dragging.
--HG--
branch : feature
2016-02-26 19:19:30 +02:00
Roman Telezhynskyi
a9112a29cb Create, save, open and edit simple curve by dialog. Editing by mouse still not
prepared.

--HG--
branch : feature
2016-02-26 16:38:42 +02:00
Roman Telezhynskyi
4eca4f97c6 Fixed issue "Warning: Z-order assignment: '' is not a valid widget."
--HG--
branch : feature
2016-02-25 21:40:39 +02:00
Roman Telezhynskyi
9b02bde691 Release a dialog size for deploying a formula field.
--HG--
branch : feature
2016-02-25 21:39:21 +02:00
Roman Telezhynskyi
990c03c697 Updated dialog for the tool Spline.
--HG--
branch : feature
2016-02-25 21:23:16 +02:00
Roman Telezhynskyi
fcd254f08c Fixed bug disabling tool True darts.
(grafted from 8c5aeccb775c10068c8f20a881994b3b4fac808a)

--HG--
branch : develop
2016-02-22 11:38:18 +02:00
Roman Telezhynskyi
7d991584fb Fixed wrong calulation tool True darts.
--HG--
branch : develop
2016-02-22 11:02:24 +02:00
Roman Telezhynskyi
c3db8bab68 For avoiding errors in future better seek the first tag draw and insert before
it.

--HG--
branch : develop
2016-02-20 10:05:18 +02:00
Roman Telezhynskyi
936a7fef07 Fixed issue #405. Crash after deleting first pattern piece in the list.
--HG--
branch : develop
2016-02-19 16:34:32 +02:00
Roman Telezhynskyi
04ae26d1bd Regesign dialogs tool 'Spline' and 'Spline Path' for avoiding text squeeze.
--HG--
branch : develop
2016-02-16 18:08:51 +02:00
Roman Telezhynskyi
0846d3c282 Read and save a spline path attribute 'duplicate'.
--HG--
branch : feature
2016-02-16 15:37:01 +02:00