Commit Graph

1041 Commits

Author SHA1 Message Date
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
7b40bc3667 Show path to pattern file in a graphical shell.
--HG--
branch : develop
2016-06-18 16:57:07 +03:00
Roman Telezhynskyi
f3c66827aa Fixed issue #494. Printing is not working.
(grafted from 8bb1ab7575e8e04d0feb91c506facae80d22e4d8)

--HG--
branch : develop
2016-06-17 17:58:39 +03:00
BojanKverh
05b094deec Added a class to hold pattern piece data
--HG--
branch : feature
2016-06-17 16:42:38 +02:00
Roman Telezhynskyi
76d1c02423 Call details context menu through label.
--HG--
branch : develop
2016-06-17 16:13:49 +03:00
Roman Telezhynskyi
3c5d6aa500 Fixed issue #515. Seam allowance wrong way.
--HG--
branch : develop
2016-06-17 15:39:54 +03:00
Roman Telezhynskyi
9d9d2702ba Show PMSystem code in combobox near name.
--HG--
branch : develop
2016-06-16 16:25:28 +03:00
Roman Telezhynskyi
972dd36fcf Redesign printing system. ref #494. Printing is not working.
Made complete redesign of printing code. Now the code check printer's dpi and
calculate  scale factor. Instead of printing with QImage buffer the code print
directly on printer. Help avoid limitations of QImage class.

Also removed menu option "Save as PDF". The option duplicate option "Export As"
and also mislead a user about purpose of option "Print preview".

--HG--
branch : develop
2016-06-15 13:55:43 +03:00
Valentina Zhuravska
43cba1b10f Fixed build in Windows.
--HG--
branch : develop
2016-06-11 16:27:14 +03:00
Valentina Zhuravska
1ca5b4dfa6 Resolved issue #180. Search field in tape app and dialog Increments.
--HG--
branch : develop
2016-06-11 15:51:48 +03:00
BojanKverh
1d78009585 Trying to resolve conflict
--HG--
branch : feature
2016-06-10 22:42:27 +02:00
BojanKverh
96b2d28604 Fixed issue #479. Improve feature: The Preferences dialog box in Valentina and Tape should be expandable.
--HG--
branch : feature
2016-06-10 21:34:21 +02:00
Holger Pandel
349625fbed Create string variable for ini file name identifier.
--HG--
branch : feature
2016-06-10 16:48:30 +02:00
Holger Pandel
8735357fbf Resolve issue #508. Settings saved to INI files in different folders.
--HG--
branch : feature
2016-06-10 15:57:08 +02:00
Roman Telezhynskyi
6d18c71956 Try to fix broken tests. Error QPrinter: No such file or directory.
--HG--
branch : develop
2016-06-01 22:06:28 +03:00
Roman Telezhynskyi
37d025dda8 Merged in ValentinaZhuravska/valentina/feature (pull request #118)
Fixed tests in Windows.

--HG--
branch : develop
2016-06-01 22:02:43 +03:00
Roman Telezhynskyi
080da6d3e1 Try to fix issue #494. Seems like default constructor on mac creates non-native
printer by default or default printer can't be found.

--HG--
branch : develop
2016-06-01 21:55:27 +03:00
Valentina Zhuravska
edceeea620 Fixed misprints.
--HG--
branch : feature
2016-06-01 21:08:36 +03:00
Roman Telezhynskyi
e0bf6f11d1 Export to CSV. Added button "Restore Defaults".
--HG--
branch : develop
2016-06-01 17:21:03 +03:00
Roman Telezhynskyi
32d391c587 Resolved issue #409. New feature: Export measurement file to Excel .csv.
--HG--
branch : develop
2016-06-01 16:37:42 +03:00
Roman Telezhynskyi
ce720450f0 Fixed issue #493. Error in seam allowance drawing.
(grafted from 776b5b71c7e5aa6b9755c280f3f4e20e159c8150)

--HG--
branch : develop
2016-05-26 11:26:54 +03:00
Roman Telezhynskyi
eaa1744262 Clang warnings.
--HG--
branch : develop
2016-05-25 16:28:35 +03:00
Roman Telezhynskyi
73ad3a8376 Fixed issue with method IsPointOnLineSegment.
--HG--
branch : develop
2016-05-25 13:55:15 +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
1d059ca9a5 Show context menu VSimplePoint and VSimpleCurve.
--HG--
branch : develop
2016-05-25 11:43:36 +03:00
Roman Telezhynskyi
8d373f91af Show direction for VSimpleCurve.
--HG--
branch : develop
2016-05-25 11:16:21 +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
f7736d3bfd Fixed issue "Not all length of curves visible".
--HG--
branch : develop
2016-05-24 20:35:19 +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
5e6752793e Fixed build on Mac OS X.
--HG--
branch : develop
2016-05-20 18:55:21 +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
7aca6d8179 Added VSimpleCurve to list of valid objects to call a visualization.
--HG--
branch : develop
2016-05-20 14:42:48 +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
bcec065872 Correct support for Tool Group.
--HG--
branch : feature
2016-05-19 17:11:02 +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
f046624b36 Clean a file. Tool Cut doesn't need color attribute anymore.
--HG--
branch : feature
2016-05-19 15:40:55 +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
b55c0ffff5 Little fix.
--HG--
branch : feature
2016-05-17 12:35:18 +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
35c1267672 Try catch more cases where adding new tool will produce issues.
--HG--
branch : feature
2016-05-16 22:14:59 +03:00
Roman Telezhynskyi
048a49f784 Return all formulas that provide tag Operation.
--HG--
branch : feature
2016-05-16 21:11:48 +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
95a7553741 XSD scheme is now more correct.
--HG--
branch : feature
2016-05-14 21:24:27 +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
80eb2649b9 Refactoring.
--HG--
branch : feature
2016-05-13 20:40:55 +03:00
Roman Telezhynskyi
4537106991 Updated XSD scheme.
--HG--
branch : feature
2016-05-13 20:33:52 +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
e3d582fc5e Fixed issue #481. Error: Valentina closes on 'Zoom Best Fit'.
--HG--
branch : develop
2016-05-08 17:15:41 +03:00
Roman Telezhynskyi
043a3d4ee4 Fixed issue #485. Error when drawing a curved path.
(grafted from 28d51c1471759c1d6ff544ea92c7fc146dcac532)

--HG--
branch : develop
2016-05-07 11:56:14 +03:00
Roman Telezhynskyi
384d85dfae Fixed build with MSVC.
--HG--
branch : develop
2016-05-06 19:32:35 +03:00
Curious One
533968fca0 did a hg merge and it now wants me to commit. These are lots of changes that I don't know where they are from...
--HG--
branch : develop
2016-05-04 21:37:49 +10:00
Curious One
f5f915cbe0 Again, made compilable with msvc by adding compiler directive where necessary...
--HG--
branch : develop
2016-05-04 21:35:35 +10:00
Roman Telezhynskyi
6f56b46d26 Fixed Clang warnings.
--HG--
branch : develop
2016-05-03 19:50:37 +03:00
Roman Telezhynskyi
a23de6ab41 Merge
--HG--
branch : develop
2016-04-26 15:40:02 +03:00
Roman Telezhynskyi
433efd08c7 Little optimization for the layout generator.
--HG--
branch : develop
2016-04-26 15:39:50 +03:00
Valentina Zhuravska
66fbcab64c Better to use qDegreesToRadians than M_PI/180
--HG--
branch : feature
2016-04-11 05:52:32 +03:00
Valentina Zhuravska
c95b162c0d Fixed build in win7
--HG--
branch : feature
2016-04-11 05:27:51 +03:00
Roman Telezhynskyi
2717382d71 Rotation VSpline and VSplinePath classes.
--HG--
branch : feature
2016-04-10 18:03:15 +03:00
Roman Telezhynskyi
8713c628dc Refactoring VArc and VEllipticalArc classes.
--HG--
branch : feature
2016-04-10 17:40:55 +03:00
Roman Telezhynskyi
a7c4cc7aaf Merge with develop.
--HG--
branch : feature
2016-04-10 14:50:56 +03:00
Roman Telezhynskyi
f98f897fd3 Resolved issue #193. Undeletable zombie arc objects.
--HG--
branch : develop
2016-04-10 14:48:34 +03:00
Roman Telezhynskyi
1d76a59ae7 Rotation VPointF, VArc, VCubicBezier and VCubicBezierPath.
--HG--
branch : feature
2016-04-10 14:40:04 +03:00
Roman Telezhynskyi
f83c016c54 Updated description measurements N06 and N07. Add new measurements A23 and J10.
(grafted from cf140cecff83698ca48fcf563a5e8a857466f531)

--HG--
branch : develop
2016-04-08 13:21:18 +03:00
Roman Telezhynskyi
42e356ccbd New pattern format version 0.3.0.
--HG--
branch : feature
2016-04-07 19:56:41 +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 Telezhynskyi
5697af33e8 Fixed tests.
--HG--
branch : develop
2016-04-07 12:35:08 +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
Valentina Zhuravska
8911fb5e11 Overrided setTagText method
--HG--
branch : feature
2016-04-06 05:34:08 +03:00
Valentina Zhuravska
de221559f3 CheckTagExists returns QDomElement
--HG--
branch : feature
2016-04-06 05:31:42 +03:00
Valentina Zhuravska
9eeeb7baa8 Optimization
--HG--
branch : feature
2016-04-06 04:11:14 +03:00
Roman Telezhynskyi
d73256f119 The method CreateGroup.
--HG--
branch : feature
2016-04-05 20:53:49 +03:00
Roman Telezhynskyi
ada64305c0 Dialog Group.
--HG--
branch : feature
2016-04-05 20:14:12 +03:00
Valentina Zhuravska
c002aec49a Little fixes
--HG--
branch : feature
2016-04-04 20:57:36 +03:00
Roman Telezhynskyi
844d3764c2 Group button.
--HG--
branch : feature
2016-04-04 18:03:40 +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
e3acc16a76 Resolved issue #444. Length along Path seems not valid.
--HG--
branch : develop
2016-04-02 20:47:04 +03:00
Roman Telezhynskyi
9470f76ba9 New method curve length by given point.
--HG--
branch : develop
2016-04-02 14:59:43 +03:00
Valentina Zhuravska
84d6e157bb Fixed InsertTag method
--HG--
branch : feature
2016-04-02 11:37:37 +03:00
Valentina Zhuravska
56db3f6f1a Optimization. Make const in InsertTag method
--HG--
branch : feature
2016-04-02 10:25:21 +03:00
Valentina Zhuravska
ebab22d6ca Little fixes
--HG--
branch : feature
2016-04-02 03:00:00 +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
254ccf8f52 Toggle ScrollHandDrag mode by clicking a middle mouse button.
--HG--
branch : develop
2016-03-30 11:51:09 +03:00
Roman Telezhynskyi
77c09063ff Added horizontal scrolling by pressiong Shift + mouse wheel.
--HG--
branch : develop
2016-03-30 11:25:13 +03:00
Roman Telezhynskyi
e52fb734f0 Changed default layout settings.
--HG--
branch : develop
2016-03-28 17:19:29 +03:00
Roman Telezhynskyi
7328b207b7 The program crashed because of empty global contour.
--HG--
branch : develop
2016-03-28 17:18:38 +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
2e83967caf The layout generator optimization. Let QPainterPath check intersections.
--HG--
branch : develop
2016-03-28 11:53:02 +03:00
Roman Telezhynskyi
dd586bf01e Little optimization for the layout generator.
--HG--
branch : develop
2016-03-28 11:22:15 +03:00
Roman Telezhynskyi
09d2b96e73 Endge of empty sheet shouldn't depend on shift value.
--HG--
branch : develop
2016-03-27 22:53:41 +03:00
Roman Telezhynskyi
a2aaf0ccff GCC warnings.
--HG--
branch : develop
2016-03-27 19:35:55 +03:00
Roman Telezhynskyi
c4ca41aa83 Fixed issue #463. Wrong export to DXF format.
(grafted from a2df4c627d50fcd0225cc63d924c065063af326f)

--HG--
branch : develop
2016-03-27 19:00:08 +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
Valentina Zhuravska
fc27fa7fef Created a custom type imageExtension
--HG--
branch : feature
2016-03-23 14:32:15 +02:00
Roman Telezhynskyi
38dac0ada5 Small refactoring. Use M_2PI(2*pi), M_PI_2 (pi/2) and M_PI_4(pi/4) where
possible.

--HG--
branch : develop
2016-03-23 13:52:55 +02:00
Roman Telezhynskyi
910dadc871 New test. Check if epsilon value in method GetParmT() is enough for calculation.
--HG--
branch : develop
2016-03-23 13:23:03 +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