Commit Graph

556 Commits

Author SHA1 Message Date
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
Bojan Kverh
4138d30fb6 Merged develop into feature
--HG--
branch : feature
2016-07-21 08:30:51 +02:00
Roman Telezhynskyi
9375e0319d As part of testing make all compiler warnings treat as errors.
Added new CONFIG option "checkWarnings".

--HG--
branch : develop
2016-07-20 15:40:33 +03:00
BojanKverh
02edbcc8d6 Removed some compiler warnings
--HG--
branch : feature
2016-07-19 19:02:20 +02:00
BojanKverh
1cf04118da Removed the rectangles around the labels in Layout mode
--HG--
branch : feature
2016-07-19 17:25:04 +02: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
6516fb3204 Made the labels text in Layout mode look better
--HG--
branch : feature
2016-07-19 09:06:29 +02:00
BojanKverh
9368978039 Added detail texts to layout mode
--HG--
branch : feature
2016-07-19 02:26:50 +02:00
BojanKverh
0ea76c5914 Few changes at vlayoutdetail class
--HG--
branch : feature
2016-07-18 20:38:27 +02:00
BojanKverh
fed323fc25 Labels are now shown on the layout, however I still need to figure out how to paste text into the labels
--HG--
branch : feature
2016-07-17 22:52:53 +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
Roman Telezhynskyi
39f7727088 Used pngcrush key "brute".
--HG--
branch : develop
2016-06-27 18:42:31 +03:00
Roman Telezhynskyi
643fafcbc9 Resolved issue #517. MAC version incorrect sRGB profile.
libpng warning: iCCP: known incorrect sRGB profile.

--HG--
branch : develop
2016-06-26 21:27:04 +03:00
Roman Telezhynskyi
e3ee35bf50 Fixed issue #469. Error - Layout has overlapping pieces in develop branch.
--HG--
branch : develop
2016-06-21 16:04:15 +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
Roman Telezhynskyi
3c5d6aa500 Fixed issue #515. Seam allowance wrong way.
--HG--
branch : develop
2016-06-17 15:39:54 +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
edceeea620 Fixed misprints.
--HG--
branch : feature
2016-06-01 21:08:36 +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
6f56b46d26 Fixed Clang warnings.
--HG--
branch : develop
2016-05-03 19:50:37 +03:00
Roman Telezhynskyi
433efd08c7 Little optimization for the layout generator.
--HG--
branch : develop
2016-04-26 15:39:50 +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
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
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
7ec2e6d988 Fixed bug case where an open equidistant point is too far from a main path.
(grafted from cd63aeaa6228a84e977e06e9d006705103eb6c35)

--HG--
branch : develop
2016-03-10 09:42:09 +02:00
Roman Telezhynskyi
335a4db2d1 For vlayout library enable speed optimizations.
--HG--
branch : develop
2016-02-23 14:30:56 +02:00
Roman Telezhynskyi
595e5b0bf5 Resolved issue #306. Layout generator optimization. Divide into strips.
--HG--
branch : develop
2016-02-23 14:13:10 +02:00
Roman Telezhynskyi
4977604106 Correct disabling line to the label.
--HG--
branch : develop
2016-01-11 13:24:37 +02:00
Roman Telezhynskyi
ac5c8d8201 Do not remove a loop created by intersection point when it is the first or
the last point of lines that intersect.

--HG--
branch : develop
2016-01-10 21:41:46 +02:00
Roman Telezhynskyi
c2976614ba Correct removing loop if a path contains them several. Seek and remove the last.
In this way we will correct remove them all.

--HG--
branch : develop
2016-01-09 23:53:17 +02:00
Roman Telezhynskyi
90dac31a2e Discard vmargins.h. Build backport files if only need.
--HG--
branch : develop
2015-12-19 16:38:24 +02:00
Roman Telezhynskyi
717772c339 Main workpiece's path also can contains loops. This cause wrong seam allowances.
--HG--
branch : develop
2015-12-15 13:16:37 +02:00
Roman Telezhynskyi
f0691d7c9f Mark implicitly shared classes as a movable type. This can improve performance
and memory efficiency when using Qt's container classes.

--HG--
branch : develop
2015-11-25 20:56:17 +02:00
Valentina Zhuravska
3e9793dbbb We don't need variable points in method Square
--HG--
branch : feature
2015-11-22 16:47:50 +02:00
Valentina Zhuravska
d679187f15 Fixed SumTrapezoids method
--HG--
branch : feature
2015-11-22 15:58:31 +02:00
Valentina Zhuravska
40ef4732ca Changed SumTrapezoids method to static
--HG--
branch : feature
2015-11-22 03:01:56 +02:00
Valentina Zhuravska
e8deb4b29c The user must select points in a clockwise direction
--HG--
branch : feature
2015-11-22 01:52:18 +02:00
Roman Telezhynskyi
5eed97c640 Enable #pragma message in Clang.
--HG--
branch : develop
2015-11-16 12:28:21 +02:00
Roman Telezhynskyi
7038c25c39 Turn on PCH on mac os x.
--HG--
branch : develop
2015-11-16 12:22:34 +02:00
Roman Telezhynskyi
d118ccb218 Fix for calculating more accurate unclosed seam allowance.
--HG--
branch : develop
2015-11-15 20:49:16 +02:00
Roman Telezhynskyi
7027198f2a Resolved issue #400. Layout 'fold line' is incorrect.
--HG--
branch : develop
2015-11-15 19:06:25 +02:00
Roman Telezhynskyi
9327da7a2c Calculate correct paper size. Print preview doesn't support non native
printers.

--HG--
branch : feature
2015-11-09 13:58:45 +02:00
Roman Telezhynskyi
4411cccd9c First draft of the issue #313. Layout pieces too close to right edge.
--HG--
branch : feature
2015-11-09 13:33:36 +02:00
Roman Telezhynskyi
2e49d1437a For avoiding losing precision use double everywhere.
--HG--
branch : develop
2015-11-05 13:07:51 +02:00
Roman Telezhynskyi
9aa8713203 Refactoring.
--HG--
branch : develop
2015-10-31 14:56:28 +02:00
Roman Telezhynskyi
95ef34bf72 Removed wrong key.
--HG--
branch : develop
2015-10-28 16:24:28 +02:00
Roman Telezhynskyi
88324a11f2 Static Code Analysis.
--HG--
branch : develop
2015-10-28 16:22:36 +02:00
Roman Telezhynskyi
f1796eaf90 GCC warnings. Don't use PCH if use ccache.
--HG--
branch : develop
2015-10-26 12:04:20 +02:00
Roman Telezhynskyi
d1f18dc9a0 Use quint32 instead unsigned int.
--HG--
branch : develop
2015-10-26 10:36:07 +02:00
Roman Telezhynskyi
b516ceb8e1 "CONFIG += silent" doesn't work correct with msvc. Do not create target
"make distclean" with msvc.

--HG--
branch : develop
2015-10-24 14:13:59 +03:00
Roman Telezhynskyi
d6653ca9af Successful build with MSVC 2012.
--HG--
branch : develop
2015-10-23 20:47:33 +03:00
Valentina Zhuravska
dd9fecb89f Added Q_CC_MSVC
--HG--
branch : feature
2015-10-22 15:16:15 +03:00
Valentina Zhuravska
b877c49f61 Fixed MSVC build (access the not operator)
--HG--
branch : feature
2015-10-21 16:17:05 +03:00
Roman Telezhynskyi
467ffbd132 ICC warnings.
--HG--
branch : develop
2015-10-20 17:32:01 +03:00
Roman Telezhynskyi
4d90589f01 Clang warnings.
--HG--
branch : develop
2015-10-19 16:21:06 +03:00
Roman Telezhynskyi
be398bae93 cppcheck.
--HG--
branch : develop
2015-10-12 14:52:48 +03:00
Roman Telezhynskyi
2c042b82ae stable.cpp only need by MSVC.
--HG--
branch : develop
2015-10-11 13:15:08 +03:00
Roman Telezhynskyi
c1976401a0 Use CONFIG += silent in release mode.
--HG--
branch : develop
2015-10-09 20:22:49 +03:00
Roman Telezhynskyi
7676959bdb Fix for build on drone.io.
--HG--
branch : develop
2015-10-08 20:07:48 +03:00
Alex
7f1d2934a7 Merged changes
--HG--
branch : develop
2015-08-27 21:06:40 +03:00
Roman Telezhynskyi
e0f256514c Merge with feature. Conversion files is not finished yet.
--HG--
branch : develop
2015-08-27 15:25:39 +03:00
Alex
799d5d1dc2 Issue #334 mostly with minor neccessary changes, all options implemented
for command line, disabled gui popups when command line detected.

--HG--
branch : develop
2015-08-25 20:53:03 +03:00
val177
6293b88b95 fixed libpng-bug
--HG--
branch : develop
2015-07-29 05:05:35 +03:00
Roman Telezhynskyi
77767ed85b Rename ambiguous Valentina.pri.
--HG--
branch : feature
2015-07-10 12:28:30 +03:00
Roman Telezhynskyi
2d3b50637c Fixed automatic layout problem. Don't check workpiece bounding rect because it
is not always correct.

--HG--
branch : develop
2015-07-07 10:47:10 +03:00
Roman Telezhynskyi
d4e13bfe34 Use Q_DECL_OVERRIDE.
--HG--
branch : develop
2015-07-03 16:36:54 +03:00
Roman Telezhynskyi
8faded8de2 Move classes to VMisc.
--HG--
branch : feature
2015-06-15 15:02:42 +03:00
Roman Telezhynskyi
cababbfc37 New static library VMisc.
--HG--
branch : feature
2015-06-15 14:43:41 +03:00
Roman Telezhynskyi
5ebcd1caba New option "Unite papers".
--HG--
branch : develop
2015-05-18 14:26:37 +03:00
Roman Telezhynskyi
dffb7f27a0 Forgot disable these sections.
--HG--
branch : develop
2015-05-18 11:26:54 +03:00
Roman Telezhynskyi
7392e8e914 Fixed issue #304. Layout appears different than my pattern.
--HG--
branch : develop
2015-05-17 18:31:17 +03:00
Roman Telezhynskyi
3c6441bd85 Comments about disabling Address Sanitizer.
--HG--
branch : develop
2015-05-16 17:17:34 +03:00
Roman Telezhynskyi
027bd31c2a Speed optimization.
--HG--
branch : develop
2015-05-15 18:16:15 +03:00
Roman Telezhynskyi
1ee4ccc8e5 Fixed issue #302. Error when creating layout.
--HG--
branch : develop
2015-05-15 18:15:14 +03:00
Roman Telezhynskyi
3cf421bde4 Speed optimization.
--HG--
branch : develop
2015-05-14 20:22:24 +03:00
Roman Telezhynskyi
2db88bb95b For debugging creation a layout we don't need always have whole sheet length.
--HG--
branch : develop
2015-05-11 10:48:57 +03:00
Roman Telezhynskyi
c1980cc7aa Make possible disable Address Sanitizer.
--HG--
branch : develop
2015-05-11 10:10:25 +03:00
Roman Telezhynskyi
c73b2f51e1 Save/Restore a last layout settings. Added button RestoreDefaults.
--HG--
branch : develop
2015-05-08 17:24:20 +03:00
Roman Telezhynskyi
56c027686d New Layout setting "Save length of the sheet".
--HG--
branch : develop
2015-05-08 13:10:56 +03:00
Roman Telezhynskyi
fcbb301004 Spelling error.
--HG--
branch : develop
2015-05-06 17:11:12 +03:00
Roman Telezhynskyi
44ef0936d9 Much more correct work with QThreadPool.
Use "volatile" keyword. Don't use method waitForDone() anymore.

--HG--
branch : develop
2015-05-06 17:09:58 +03:00
Roman Telezhynskyi
b0e0f73aa3 QImage supports a maximum of 32768x32768 px images.
--HG--
branch : develop
2015-05-06 15:03:45 +03:00
Roman Telezhynskyi
7e6809557b Fixed broken checking intersection workpieces.
--HG--
branch : develop
2015-05-04 10:57:38 +03:00
Roman Telezhynskyi
6ce904d652 Memory leak. Quick stop creation a layout.
--HG--
branch : develop
2015-05-02 20:18:31 +03:00
Roman Telezhynskyi
5766523733 Resolved issue #290. Add paper type 'Roll - 36" & 'Roll - 44" to 'Create Layout'
paper size.

--HG--
branch : develop
2015-05-02 19:21:47 +03:00
Roman Telezhynskyi
74608b0481 Grid(1,1) instead Grid(0,0).
--HG--
branch : develop
2015-04-19 17:41:46 +03:00
Roman Telezhynskyi
44b01e8f1b Calculate allowance value according to resolution value.
--HG--
branch : develop
2015-04-19 13:59:19 +03:00
Roman Telezhynskyi
8616ef8b9b Check for loops need only do after we create equdistant path.
--HG--
branch : develop
2015-04-16 15:43:40 +03:00
Roman Telezhynskyi
89f13a0016 fatal error: QtMath: No such file or directory.
--HG--
branch : develop
2015-04-15 20:41:23 +03:00
Roman Telezhynskyi
78f1e89f08 Cppcheck.
--HG--
branch : develop
2015-04-15 15:44:57 +03:00
Roman Telezhynskyi
8bfc9d1ca3 Don't show bottom border if only one page need to print.
--HG--
branch : develop
2015-04-15 12:10:35 +03:00
Roman Telezhynskyi
d7d1c0b78a Don't show left border and top border if page margin is 0.
--HG--
branch : develop
2015-04-15 11:36:08 +03:00
Roman Telezhynskyi
c144c149e6 Class VPoster.
--HG--
branch : feature
2015-04-11 14:01:25 +03:00
Roman Telezhynskyi
07ec5aacf8 QVector::removeLast() was introduced only in Qt 5.1.
--HG--
branch : develop
2015-04-01 21:38:42 +03:00
Roman Telezhynskyi
6dea77276c QtMath apperas only since Qt 5.1.
--HG--
branch : develop
2015-04-01 21:21:24 +03:00
Roman Telezhynskyi
6b8cb0bf69 Improving for layout debug mode.
--HG--
branch : release
2015-03-23 14:13:44 +02:00
Roman Telezhynskyi
7555c67c3e Clang warnings.
--HG--
branch : release
2015-03-16 14:23:02 +02:00
Roman Telezhynskyi
2b711c5f8f Bad API in class LayoutDetail. Fixed checking seam allowence points.
--HG--
branch : release
2015-03-14 14:38:44 +02:00
Roman Telezhynskyi
8b0de7504f Coverity Scan.
--HG--
branch : release
2015-03-02 21:20:09 +02:00
Roman Telezhynskyi
850d51adac cppcheck.
--HG--
branch : release
2015-03-02 19:54:33 +02:00
Roman Telezhynskyi
22055ab684 Vera++.
--HG--
branch : release
2015-03-02 19:11:43 +02:00
Roman Telezhynskyi
629a2a7579 Copyright dates.
--HG--
branch : develop
2015-02-27 12:27:48 +02:00
Roman Telezhynskyi
018fae459a Build on Mac OS.
--HG--
branch : develop
2015-02-26 22:18:52 +02:00
dismine
245c6f522b Don't show arrow if edge too short.
--HG--
branch : develop
2015-01-23 17:05:23 +02:00
dismine
4a9e69d32f Saving the layout paper sheets.
--HG--
branch : feature
2015-01-23 12:07:58 +02:00
dismine
c84caa349d Clear layout paper.
--HG--
branch : feature
2015-01-22 16:23:23 +02:00
dismine
2388d8ef29 Avoid window freaze.
--HG--
branch : feature
2015-01-22 16:13:25 +02:00
dismine
ef73b351ed New options: rotatate and rotation increase.
--HG--
branch : feature
2015-01-22 16:11:50 +02:00
dismine
dd098506dd Move rotation to separate method. Preparetion for working with new setting.
--HG--
branch : feature
2015-01-22 13:47:20 +02:00
dismine
0d1725fc11 Allow user more quick stop generation.
--HG--
branch : feature
2015-01-22 13:39:04 +02:00
dismine
d538f2af73 Give program time update GUI.
--HG--
branch : feature
2015-01-22 13:35:12 +02:00
dismine
7a9447f7af Don't set information for debug if no need.
--HG--
branch : feature
2015-01-22 13:29:40 +02:00
dismine
2aa9de5f94 For rotation check only two positions 180 and 0 degree.
--HG--
branch : feature
2015-01-22 13:26:09 +02:00
dismine
9210d31c25 First realization multithreading.
--HG--
branch : feature
2015-01-21 23:49:38 +02:00
dismine
62aa898742 Refactoring. Prepare for support multithreading.
--HG--
branch : feature
2015-01-21 20:56:59 +02:00
dismine
8655460d6e Refactoring.
--HG--
branch : feature
2015-01-21 16:33:06 +02:00
dismine
dac95d00fe Combine edges not enough for all cases. Was added checking position after
rotation around point.

--HG--
branch : feature
2015-01-20 22:58:30 +02:00
dismine
7970678575 Fix for method UniteWithContour.
--HG--
branch : feature
2015-01-20 14:50:24 +02:00
dismine
2355e435a5 Fix for method Crossing.
--HG--
branch : feature
2015-01-19 20:07:32 +02:00
dismine
366519781b Fix for method InsideContour.
--HG--
branch : feature
2015-01-19 20:01:42 +02:00
dismine
120f4cf565 Speed optimization.
--HG--
branch : feature
2015-01-19 16:13:26 +02:00
dismine
3c76f32bed Alwayse first check if workpiece inside of paper sheet rect.
--HG--
branch : feature
2015-01-19 12:36:27 +02:00
dismine
dc2620e0df Need additional point on each edge for check if workpiece inside of global
contour.

--HG--
branch : feature
2015-01-19 12:14:54 +02:00
dismine
2937a9e594 Wrong rule for check true intersection.
--HG--
branch : feature
2015-01-18 22:21:20 +02:00
dismine
c191059ddd Changed Point-In-Polygon Algorithm. Additional field for saving mirror state.
--HG--
branch : feature
2015-01-18 20:56:01 +02:00
dismine
c044b334d7 Fix for method UniteWithContour.
--HG--
branch : feature
2015-01-17 22:51:17 +02:00
dismine
696aaa413b Fixes for method Mirror and debug system.
--HG--
branch : feature
2015-01-17 19:23:54 +02:00
dismine
1d1ae1acb4 Fixed creation global contour.
--HG--
branch : feature
2015-01-17 16:00:46 +02:00
dismine
56aa09a639 Don't save last options for creation a layout.
--HG--
branch : feature
2015-01-17 15:14:28 +02:00
dismine
28b2f97aaa Fixed getting seam allowence points.
--HG--
branch : feature
2015-01-16 21:35:50 +02:00
dismine
b04d1f92e7 Forgot save paper after creation.
--HG--
branch : feature
2015-01-16 21:34:37 +02:00
dismine
f849d16018 Choose first best result.
--HG--
branch : feature
2015-01-16 21:33:18 +02:00
dismine
f8d210e720 Better check more frequently if user want cancel creation layout.
--HG--
branch : feature
2015-01-16 16:45:56 +02:00
dismine
4fb5a048ca Ignore intersection in vertices of edges.
--HG--
branch : feature
2015-01-16 16:22:42 +02:00
dismine
040b9e607b Method Mirror now should work.
--HG--
branch : feature
2015-01-16 15:20:15 +02:00
dismine
ab2b894d69 Better round points if we want avoid errors. Correct way working with QMatrix in
methods translate and rotate.

--HG--
branch : feature
2015-01-16 14:54:37 +02:00
dismine
3d1100bc3d Send arranged count of workpieces.
--HG--
branch : feature
2015-01-16 14:53:14 +02:00
dismine
00e42b4368 Fixed broken seam allowence.
--HG--
branch : feature
2015-01-15 16:24:37 +02:00
dismine
79325fe91f Changes for table widows. All prepare for begin testing.
--HG--
branch : feature
2015-01-15 15:10:05 +02:00
dismine
a121845407 Dialog layout settings.
--HG--
branch : feature
2015-01-14 16:14:51 +02:00
dismine
3ed87757c4 Return QGraphicsItems with sheet and all details for show on scene.
--HG--
branch : feature
2015-01-13 12:38:51 +02:00
dismine
166f2fbcdb Save each frame to png file for debuging creation layout.
--HG--
branch : feature
2015-01-12 22:35:32 +02:00
dismine
789dcea6bc Standard way arrange first detail on paper not always allow find position. For
such cases best way is rotate detail around vertex.

--HG--
branch : feature
2015-01-12 17:59:15 +02:00
dismine
8dec59ef00 Also check shift for each edge.
--HG--
branch : feature
2015-01-12 17:23:25 +02:00
dismine
98d5dde2e1 Class that drive all process, also speak with outside world.
--HG--
branch : feature
2015-01-12 14:12:15 +02:00
dismine
b53d32225a Class that handle choose next detail.
--HG--
branch : feature
2015-01-11 15:11:56 +02:00
dismine
007bc1466f Layout paper. Main algorithm.
--HG--
branch : feature
2015-01-10 15:47:46 +02:00
dismine
9effd8af02 Layout detail.
--HG--
branch : feature
2015-01-07 18:54:43 +02:00
dismine
4ba488d0c0 VAbstractDetail parent class for VDetail.
--HG--
branch : feature
2015-01-02 19:02:07 +02:00
dismine
112dbd7f4e Class for abstract detail.
--HG--
branch : feature
2015-01-02 18:32:26 +02:00
dismine
67c93e2b5b Initial commit for class VLayoutDetail.
--HG--
branch : feature
2015-01-02 16:14:28 +02:00
dismine
44372c7e6b Initial commit for static library VLayout.
--HG--
branch : feature
2015-01-02 15:53:36 +02:00