Commit Graph

1842 Commits

Author SHA1 Message Date
Roman Telezhynskyi
ad7928248c Merge
--HG--
branch : develop
2015-10-02 08:01:48 +03:00
Valentina Zhuravska
0b16f5acf0 Fixed "comparing floating point with == is unsafe"
--HG--
branch : feature
2015-10-02 05:46:10 +03:00
Valentina Zhuravska
55ab727d78 Correct structure members initialization
--HG--
branch : feature
2015-10-02 04:07:07 +03:00
Roman Telezhynskyi
2d4086206c Try to check all files.
--HG--
branch : develop
2015-10-01 21:41:16 +03:00
Roman Telezhynskyi
30cfa143fe No points to show warnings if we excpect error in test.
--HG--
branch : develop
2015-10-01 21:02:14 +03:00
Roman Telezhynskyi
655a297f73 Test "Converting old individual format to new version".
--HG--
branch : develop
2015-10-01 20:19:19 +03:00
Roman Telezhynskyi
019642e70a Avoid duplicated QStringLiterals.
--HG--
branch : develop
2015-10-01 19:43:41 +03:00
Valentina Zhuravska
c298be342d Q_DISABLE_COPY instead copy constructor
--HG--
branch : feature
2015-10-01 18:48:25 +03:00
Roman Telezhynskyi
06a54ba40c Use qUtf8Printable.
--HG--
branch : develop
2015-10-01 18:34:03 +03:00
Roman Telezhynskyi
9069337a7a Convertor error in console mode.
--HG--
branch : develop
2015-10-01 18:21:13 +03:00
Roman Telezhynskyi
0b57b8821a Show error message box only through message handler.
--HG--
branch : develop
2015-10-01 17:59:01 +03:00
Valentina Zhuravska
15834562af Fixed warnings in Linux
--HG--
branch : feature
2015-10-01 05:05:21 +03:00
Valentina Zhuravska
92a7f21621 Fixed warnings in Linux
1. fixed old-style cast
2. correct order of variables

--HG--
branch : feature
2015-09-30 21:10:13 +03:00
Valentina Zhuravska
1eaf5055a7 Fixed warnings in Linux (correct order of variables)
--HG--
branch : feature
2015-09-30 21:06:31 +03:00
Valentina Zhuravska
418a7ab57f Fixed warnings in Linux (default statement in switch case)
--HG--
branch : feature
2015-09-30 21:00:58 +03:00
Valentina Zhuravska
c3fef2abd7 Fixed warnings in Linux (old-style cast)
--HG--
branch : feature
2015-09-30 20:57:50 +03:00
Valentina Zhuravska
80d35507ca Fixed warnings in Linux
1. correct structure members initialization
2. struct has pointer data members but has no copy constructor

--HG--
branch : feature
2015-09-30 20:49:02 +03:00
Valentina Zhuravska
139027926e Fixed warnings in Linux (correct structure members initialization)
--HG--
branch : feature
2015-09-30 19:59:12 +03:00
Valentina Zhuravska
637baaeabb Fixed warnings in Linux (_MSC_VER)
--HG--
branch : feature
2015-09-30 18:10:42 +03:00
Roman Telezhynskyi
00e38fc119 Fixed Windows build.
--HG--
branch : develop
2015-09-30 13:58:59 +03:00
Roman Telezhynskyi
f6b6a0bc36 Second try to close issue #373.
--HG--
branch : develop
2015-09-29 21:56:46 +03:00
Roman Telezhynskyi
2113f6e7d4 Fixed issue #383. Crash on running Valentina after build.
--HG--
branch : develop
2015-09-29 20:12:23 +03:00
Roman Telezhynskyi
da05f74468 Do not create attributes "full name" and "description" for a known measurement.
--HG--
branch : develop
2015-09-29 18:52:30 +03:00
Roman Telezhynskyi
0601b46f87 Resolved issue #381. Add a 'measurement desc' column in Tape, Create/Edit,
'Add Known' dialog.

--HG--
branch : develop
2015-09-29 18:46:00 +03:00
Roman Telezhynskyi
e6fec09905 Fixed issue #379. Crash in Tape, Create/Edit when '(' in Formula field then
click f(x).

--HG--
branch : develop
2015-09-29 18:09:41 +03:00
Roman Telezhynskyi
2e344b27b0 Fix for searching the folder 'templates'.
--HG--
branch : develop
2015-09-29 17:13:29 +03:00
Roman Telezhynskyi
bf2db165da Fixed translation.
--HG--
branch : develop
2015-09-29 17:04:24 +03:00
Roman Telezhynskyi
31af1687a6 Improve handling error messages in console mode.
--HG--
branch : develop
2015-09-28 21:54:41 +03:00
Roman Telezhynskyi
77dd8f0c77 by default for console version use system locale.
--HG--
branch : develop
2015-09-28 18:34:29 +03:00
Roman Telezhynskyi
e236757d57 Test openning measurement files.
--HG--
branch : develop
2015-09-28 13:42:26 +03:00
Roman Telezhynskyi
25561858f0 Check known names after conversion.
--HG--
branch : develop
2015-09-25 13:45:58 +03:00
Roman Telezhynskyi
96f1f63fa4 Fixed issue #373. Incorrect groupnames in Tape.exe, 'Add Known'.
--HG--
branch : develop
2015-09-25 11:16:25 +03:00
Roman Telezhynskyi
6bbb0c531f Remove the file individual.vit.
--HG--
branch : develop
2015-09-23 17:38:46 +03:00
Roman Telezhynskyi
640202da5f Pass correct path to measurements in a pattern file.
--HG--
branch : develop
2015-09-23 13:11:19 +03:00
Roman Telezhynskyi
d90d24ca61 Check if all defined known measurements in a file are valid.
--HG--
branch : develop
2015-09-22 17:41:05 +03:00
Roman Telezhynskyi
c01bc165db Fix memory leaks.
--HG--
branch : develop
2015-09-22 16:30:06 +03:00
Roman Telezhynskyi
2107a2205a Remove NORET_ATTR.
--HG--
branch : develop
2015-09-22 16:20:19 +03:00
Roman Telezhynskyi
ed373cf6c1 Define "tr" makes code more compact.
--HG--
branch : feature
2015-09-22 16:11:20 +03:00
Roman Telezhynskyi
f1d32e375e Test correct order measurements.
--HG--
branch : feature
2015-09-22 13:50:29 +03:00
Roman Telezhynskyi
4f296d46d7 Updated diagrams.
--HG--
branch : feature
2015-09-22 12:11:52 +03:00
Roman Telezhynskyi
055f80ccd5 Updated the measurement numbers.
--HG--
branch : feature
2015-09-21 17:50:50 +03:00
Roman Telezhynskyi
2299054ae6 Updated the long descriptions.
--HG--
branch : feature
2015-09-20 21:08:10 +03:00
Roman Telezhynskyi
4e3197d3d6 Updated the descriptions.
--HG--
branch : feature
2015-09-20 17:54:55 +03:00
Roman Telezhynskyi
141a3a8a05 shoulder_width_f -> shoulder_tip_to_shoulder_tip_f
--HG--
branch : feature
2015-09-20 14:11:06 +03:00
Roman Telezhynskyi
7d72d2d579 shoulder_width_b -> shoulder_tip_to_shoulder_tip_b
--HG--
branch : feature
2015-09-20 13:58:26 +03:00
Roman Telezhynskyi
5a66e753e9 neck_side_to_waist_bladepoint_b -> neck_side_to_waist_scapula_b
--HG--
branch : feature
2015-09-20 13:53:27 +03:00
Roman Telezhynskyi
f444aebc2d Code style.
--HG--
branch : feature
2015-09-20 13:44:59 +03:00
Roman Telezhynskyi
e0cad4e732 Fix for support win64.
--HG--
branch : develop
2015-09-20 13:20:21 +03:00
Roman Telezhynskyi
305818bd8e Merge
--HG--
branch : develop
2015-09-20 13:12:15 +03:00
Roman Telezhynskyi
274cbb3aad notify() for MApplication.
--HG--
branch : develop
2015-09-19 23:08:03 +03:00
Roman Telezhynskyi
b5c6bf8260 Command option for setting a locale.
--HG--
branch : develop
2015-09-19 22:58:32 +03:00
Valentina Zhuravska
77cbcd673e Fixed wrong string in vapplication.cpp
--HG--
branch : develop
2015-09-19 21:02:10 +03:00
Valentina Zhuravska
4423d6b937 Fixed build problem on Windows
--HG--
branch : develop
2015-09-18 23:38:11 +03:00
Roman Telezhynskyi
643b84e159 Fixed build error. Fixed GCC warnings.
--HG--
branch : develop
2015-09-18 18:35:26 +03:00
Valentina Zhuravska
2bfd22c02c Merge
--HG--
branch : develop
2015-09-18 16:41:09 +03:00
Valentina Zhuravska
e3a049715d Replaced pointers by QPointers
--HG--
branch : develop
2015-09-17 23:46:45 +03:00
Roman Telezhynskyi
ec31f7268d Test original and translated measurement names.
--HG--
branch : develop
2015-09-17 21:44:15 +03:00
Valentina Zhuravska
07f928cba7 Fixed memory leaks for labels
--HG--
branch : develop
2015-09-17 03:46:05 +03:00
Valentina Zhuravska
4100b0f9b1 Fixed memory allocation for mouseCoordinate
--HG--
branch : develop
2015-09-16 20:38:54 +03:00
Valentina Zhuravska
6bba2e435b Fixed memory leaks
--HG--
branch : develop
2015-09-16 19:37:33 +03:00
Roman Telezhynskyi
826aac16d3 Run sending a crash report "silently".
--HG--
branch : develop
2015-09-16 16:47:32 +03:00
Sergey Alyoshin
0dc78c818c Internationalize coordinates format in status line
--HG--
branch : develop
2015-09-16 15:51:24 +03:00
Roman Telezhynskyi
54b3f642f3 Relock a pattern file after SaveAs.
--HG--
branch : develop
2015-09-16 14:29:01 +03:00
Roman Telezhynskyi
ad28a200f7 Removed unused variable.
--HG--
branch : develop
2015-09-16 11:03:33 +03:00
Roman Telezhynskyi
f2a111f0d2 Show popup message "Measurements was updated". Fixed path to measurements when
sync.

--HG--
branch : develop
2015-09-16 11:03:15 +03:00
Roman Telezhynskyi
b3f2869975 Fixed debug output.
--HG--
branch : develop
2015-09-16 09:21:34 +03:00
Roman Telezhynskyi
e75951eb8e Validate unique increment name.
--HG--
branch : develop
2015-09-16 09:14:00 +03:00
Roman Telezhynskyi
2e2a6e8f5c Validate unique measurement name.
--HG--
branch : develop
2015-09-16 09:04:43 +03:00
Roman Telezhynskyi
f722964c11 Add increment's formula to the export list.
--HG--
branch : develop
2015-09-16 08:16:27 +03:00
Roman Telezhynskyi
7718b0748e Show a message box with an error. Release a lock file after error.
--HG--
branch : develop
2015-09-15 21:21:51 +03:00
Roman Telezhynskyi
902fe178e5 Resolved issue #364. Add Search feature to Measurement dialogs.
--HG--
branch : develop
2015-09-15 19:49:24 +03:00
Roman Telezhynskyi
8dc048a47b Fixed typo in measurement name.
--HG--
branch : develop
2015-09-15 15:34:20 +03:00
Roman Telezhynskyi
cf0d1981ca Moved lock-guarding abilities to separated template class.
Changed application/mainwindow to use it. Most likelly mainwindow may be
upgraded more, since lock can hold and manage memory for complex object
like QFile, also it can have stored deallocator for the object
(lambdas), so this is effectively should simple code, when you have
allocation and freening resources declared on the same screen.

--HG--
branch : develop
2015-09-14 14:53:49 +03:00
Roman Telezhynskyi
1e806ccc08 New contributors.
--HG--
branch : develop
2015-09-14 10:38:04 +03:00
Roman Telezhynskyi
48d4ed5905 More pretty looking macros.
--HG--
branch : develop
2015-09-14 10:30:14 +03:00
val177
17d2df653d Fixed issue #362
--HG--
branch : develop
2015-09-14 03:02:18 +03:00
val177
07428353e5 Fixed issue #363
--HG--
branch : develop
2015-09-13 23:19:45 +03:00
Roman Telezhynskyi
7e2082fc0a Portable DebugBreak().
--HG--
branch : develop
2015-09-13 15:00:33 +03:00
Roman Telezhynskyi
59389aa049 Valentina did not read/write the layout dialog settings.
--HG--
branch : develop
2015-09-13 13:07:12 +03:00
Roman Telezhynskyi
ec82936f86 Fixed the typo in the Measurements tab.
--HG--
branch : develop
2015-09-13 10:44:59 +03:00
Roman Telezhynskyi
57c1465d00 New token.
--HG--
branch : develop
2015-09-13 10:40:41 +03:00
val177
9301347f3f Fixed metric bug in VObjPaintDevice
--HG--
branch : develop
2015-09-12 01:24:39 +03:00
Roman Telezhynskyi
5f62ce2bde Resolved issue #356. Measurement H12 has incorrect description in tape.exe.
--HG--
branch : develop
2015-09-11 13:14:20 +03:00
Roman Telezhynskyi
516c3eaa8f Resolved issue #355. Change Measurements 'Create new' to 'Create/Edit'.
--HG--
branch : develop
2015-09-11 13:04:01 +03:00
Roman Telezhynskyi
ef45bf2a94 Removed translation for the standard table.
--HG--
branch : develop
2015-09-09 14:24:54 +03:00
Roman Telezhynskyi
6f5757efaf Remove unused classes.
--HG--
branch : develop
2015-09-09 14:16:45 +03:00
Roman Telezhynskyi
df11ffa981 Don't ask if file was created without modifications.
--HG--
branch : develop
2015-09-09 13:00:22 +03:00
Roman Telezhynskyi
da077a5b59 Disable fields if a list is empty.
--HG--
branch : develop
2015-09-09 12:45:30 +03:00
Roman Telezhynskyi
b4c1e68eb4 Correct reading notes.
--HG--
branch : develop
2015-09-08 16:10:37 +03:00
Roman Telezhynskyi
fa6329c2eb Support single options.
--HG--
branch : develop
2015-09-08 12:10:28 +03:00
Roman Telezhynskyi
755cbc34d5 Correct file description.
--HG--
branch : develop
2015-09-08 10:37:23 +03:00
Roman Telezhynskyi
7d633d7270 Merge
--HG--
branch : develop
2015-09-08 10:22:42 +03:00
Roman Telezhynskyi
0c8b8514e4 Fixed issue #350.
--HG--
branch : develop
2015-09-08 10:22:09 +03:00
val177
80b0f38f0d Added dxf export
--HG--
branch : feature
2015-09-07 22:47:02 +03:00
Roman Telezhynskyi
b7b8523691 Fixed issue #347.
--HG--
branch : develop
2015-09-07 18:02:17 +03:00
val177
c9eb629e8c Added dxflib
--HG--
branch : feature
2015-09-07 17:39:04 +03:00
Roman Telezhynskyi
b9c91734b4 Conversion measuremnt namses in expressions.
--HG--
branch : develop
2015-09-07 16:51:13 +03:00
Roman Telezhynskyi
e90bbf3870 Conversion standard measurements.
--HG--
branch : develop
2015-09-07 15:29:31 +03:00
Roman Telezhynskyi
d2bb126d04 Conversion individual measurements.
--HG--
branch : develop
2015-09-07 14:51:21 +03:00
val177
d053d51cba Fixed issue #342
--HG--
branch : develop
2015-09-07 12:40:54 +03:00
val177
ffc51e5d6e Fixed filter in load standart measurements dialog
--HG--
branch : develop
2015-09-05 14:50:52 +03:00
val177
6a63ac7999 Fixed issues #348 and #349
--HG--
branch : develop
2015-09-05 11:59:31 +03:00
val177
00e98b8913 Fixed issue #345
--HG--
branch : develop
2015-09-04 15:39:01 +03:00
Roman Telezhynskyi
3d297d657c Fixed crash after retranslation UI.
--HG--
branch : develop
2015-09-03 13:31:23 +03:00
Roman Telezhynskyi
9a5fa4b026 Updated diagrams.
--HG--
branch : develop
2015-09-03 11:58:34 +03:00
Roman Telezhynskyi
882efbccf9 Fixed list groups A, E, H.
--HG--
branch : develop
2015-09-03 11:09:56 +03:00
Roman Telezhynskyi
7b732913dc Point in the end of each descriptions.
--HG--
branch : develop
2015-09-02 18:49:49 +03:00
Roman Telezhynskyi
90d794491e Updated full names.
--HG--
branch : develop
2015-09-02 18:27:48 +03:00
Roman Telezhynskyi
99873a4439 Updated group Q.
--HG--
branch : develop
2015-09-02 17:54:05 +03:00
Roman Telezhynskyi
2efb587983 Updated group P.
--HG--
branch : develop
2015-09-02 17:51:04 +03:00
Roman Telezhynskyi
afaa6cc370 Updated group O.
--HG--
branch : develop
2015-09-02 17:42:34 +03:00
Roman Telezhynskyi
e30ce7ea1a Updated group N.
--HG--
branch : develop
2015-09-02 17:35:21 +03:00
Roman Telezhynskyi
b92d1e0f18 Updated group M.
--HG--
branch : develop
2015-09-02 17:31:35 +03:00
Roman Telezhynskyi
3cbdb451f1 Updated group L.
--HG--
branch : develop
2015-09-02 17:29:02 +03:00
Roman Telezhynskyi
1dd6e6bf3c Updated group K.
--HG--
branch : develop
2015-09-02 17:25:17 +03:00
Roman Telezhynskyi
6340756ca9 Updated group J.
--HG--
branch : develop
2015-09-02 17:07:18 +03:00
Roman Telezhynskyi
bb447cd502 Updated group I.
--HG--
branch : develop
2015-09-02 16:58:40 +03:00
Roman Telezhynskyi
42a99c8282 Updated group H.
--HG--
branch : develop
2015-09-02 16:41:51 +03:00
Roman Telezhynskyi
e830773760 Updated group G.
--HG--
branch : develop
2015-09-02 16:28:33 +03:00
Roman Telezhynskyi
c50a931ccb Updated group F.
--HG--
branch : develop
2015-09-02 16:23:10 +03:00
Roman Telezhynskyi
37724fe83c Updated group E.
--HG--
branch : develop
2015-09-02 16:16:03 +03:00
Roman Telezhynskyi
f912bc80b2 Updated group D.
--HG--
branch : develop
2015-08-31 19:20:47 +03:00
Roman Telezhynskyi
37e25046f7 Updated group C.
--HG--
branch : develop
2015-08-31 19:06:10 +03:00
Roman Telezhynskyi
a39125245d Updated group B.
--HG--
branch : develop
2015-08-31 19:02:22 +03:00
Roman Telezhynskyi
34810726ee Updated group A.
--HG--
branch : develop
2015-08-31 18:56:23 +03:00
Roman Telezhynskyi
219d27632c Fixed issue #344. Error while building 20150828 #2.
--HG--
branch : develop
2015-08-29 12:48:03 +03:00
Roman Telezhynskyi
c849cd1a9f Fixed issue #343. Error while building 20150828 develop branch in Qt
(dismine/valentina)

--HG--
branch : develop
2015-08-28 22:54:17 +03:00
Alex
605fb6ad8f Fixed extra / found in include, changed Tool/Vis enums to use strict valid static_cast to make all kinds of tools happy
--HG--
branch : develop
2015-08-28 19:38:02 +03:00
Alex
8fabf871d8 updated save dialog to take file path from command line instead it had in settings
--HG--
branch : develop
2015-08-28 00:29:08 +03:00
Alex
7c6cd2e4a0 ok...more error message?
--HG--
branch : develop
2015-08-27 23:38:26 +03:00
Alex
f87d0e6642 1 more gui message removed when vit file is present but invalid
--HG--
branch : develop
2015-08-27 23:11:09 +03:00
Alex
f5d5c9fd57 Make load function return true/false to fine control DoExport
--HG--
branch : develop
2015-08-27 23:02:54 +03:00
Alex
505e938949 Added message to console when measure not found
--HG--
branch : develop
2015-08-27 22:53:03 +03:00
Alex
9a15ee5740 Forgot braces
--HG--
branch : develop
2015-08-27 22:28:54 +03:00
Alex
4b5250209c Added check when error shown for the wrong file name
--HG--
branch : develop
2015-08-27 22:27:37 +03:00
Alex
f4b4c6011f Corrections to merge
--HG--
branch : develop
2015-08-27 21:33:38 +03:00
Alex
7f1d2934a7 Merged changes
--HG--
branch : develop
2015-08-27 21:06:40 +03:00
Alex
3da8df7bbb -
--HG--
branch : develop
2015-08-27 20:34:29 +03:00
Alex
8cd58af79b --
--HG--
branch : develop
2015-08-27 19:20:02 +03:00
Alex
2ec0e31c2b still merge fixes...
--HG--
branch : develop
2015-08-27 19:03:43 +03:00
Alex
53e98f562f Still merge fixes...
--HG--
branch : develop
2015-08-27 18:55:17 +03:00
Alex
1641e16f50 Trying to fix conflicts
--HG--
branch : develop
2015-08-27 18:39:02 +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
Roman Telezhynskyi
e3d13cd3b5 Wrong conversion for the tag unit.
--HG--
branch : feature
2015-08-27 14:00:20 +03:00
Roman Telezhynskyi
a69223299c Reserve a pattern file before conversion.
--HG--
branch : feature
2015-08-27 11:45:31 +03:00
Roman Telezhynskyi
62a22b122e Conversion a pattern file.
--HG--
branch : feature
2015-08-27 11:25:11 +03:00
Roman Telezhynskyi
a988c4b185 Removed DoubleSpinBoxDelegate and TextDelegate.
--HG--
branch : feature
2015-08-26 21:32:35 +03:00
Roman Telezhynskyi
a5e0ace3a5 Use V_FALLTHROUGH.
--HG--
branch : feature
2015-08-26 21:21:42 +03:00
Roman Telezhynskyi
98a5d8aadb Don't clean measurement before begin full parsing.
--HG--
branch : feature
2015-08-26 21:14:47 +03:00
Roman Telezhynskyi
2f34e86322 Convert to absolute path and show measurements.
--HG--
branch : feature
2015-08-26 17:31:45 +03:00