Commit Graph

472 Commits

Author SHA1 Message Date
Roman Telezhynskyi
76f93ca63e Fixed issue #797. Custom seam allowance ignored in some cases.
(grafted from 3d77c1493f427eefbad7d98a828cd64061b72759)

--HG--
branch : develop
2018-01-15 16:20:29 +02:00
Roman Telezhynskyi
2295a88885 Clang warning.
--HG--
branch : develop
2018-01-06 15:54:06 +02:00
Roman Telezhynskyi
e6dcfd708b New internal variable RotationElArc.
--HG--
branch : develop
2018-01-05 21:07:47 +02:00
Roman Telezhynskyi
f52b690827 Resolved issue #792. New feature. Visibility trigger for internal path.
--HG--
branch : develop
2018-01-03 19:31:50 +02:00
Roman Telezhynskyi
f53343b01e Fix test crash.
(grafted from 8f904d2962fb3631f8ee3cdc6f8a9f5ed38f4d73)

--HG--
branch : develop
2017-12-04 16:38:32 +02:00
Roman Telezhynskyi
debc37d78a Removed unused postfix operator.
--HG--
branch : develop
2017-12-04 14:32:17 +02:00
Roman Telezhynskyi
a4df5612d9 Fixed issue #776. Valentina cannot recognize translated functions.
(grafted from 5b89c34d11eea52b32e9fb60b87820ecc5187c31)

--HG--
branch : develop
2017-12-04 11:44:29 +02:00
Roman Telezhynskyi
efb4b58b8d Fix bug with Increments. After creating they know more than should.
--HG--
branch : develop
2017-11-19 17:08:50 +02:00
Roman Telezhynskyi
132b7c9fc6 CSR - special modeling case.
--HG--
branch : develop
2017-11-13 10:53:27 +02:00
Roman Telezhynskyi
e8ca7f575d Fix bug. Modeling objects should be separated from calculation objects and stay
in not copied container.

--HG--
branch : feature
2017-10-26 12:54:08 +03:00
Roman Telezhynskyi
89a2323944 Fix problem with updating objects inside vcontainer.
--HG--
branch : feature
2017-10-24 19:50:16 +03:00
Roman Telezhynskyi
9c6160fa50 Fix bug with parent disappearing.
--HG--
branch : feature
2017-10-24 12:02:47 +03:00
Roman Telezhynskyi
660efa3844 Fix bugs.
* * *
Fix tool union bugs.
* * *
Fix preparing pieces for layout.
* * *
Fix bug with formulas.

--HG--
branch : feature
2017-10-23 10:45:58 +03:00
Roman Telezhynskyi
ca79c7ff93 Added place label.
--HG--
branch : feature
2017-10-15 12:25:20 +03:00
Roman Telezhynskyi
ef41c700f8 Improve Move piece undocommand.
Performance improvement.

--HG--
branch : develop
2017-10-18 11:24:15 +03:00
Roman Telezhynskyi
61172d46c4 Fix typo in headers.
--HG--
branch : develop
2017-10-05 12:20:01 +03:00
Roman Telezhynskyi
95a21e07cc Fix test crash.
--HG--
branch : develop
2017-09-30 11:31:41 +03:00
Roman Telezhynskyi
0adfbb8fb1 New math parser function "r2cm". Round to up to 1 decimal.
--HG--
branch : develop
2017-09-29 17:47:11 +03:00
Roman Telezhynskyi
d7b3ddc2d5 Resolved issue #758. Intersection Passmark - select which side is shown.
--HG--
branch : develop
2017-09-28 21:18:13 +03:00
Roman Telezhynskyi
4caab9a479 Fix export increments and preview calculations.
Separate both types. First write increments then preview calculations.

--HG--
branch : feature
2017-09-27 11:53:17 +03:00
Roman Telezhynskyi
0eb6b8b30f Dialog Final measurements.
--HG--
branch : feature
2017-09-26 17:24:02 +03:00
Roman Telezhynskyi
fa74e32769 First working result.
Doesn't change file.

--HG--
branch : feature
2017-09-17 09:19:13 +03:00
Roman Telezhynskyi
f6923a92f4 Show option Show label.
--HG--
branch : feature
2017-09-16 17:25:14 +03:00
Roman Telezhynskyi
600ded659e Trying to fix error implicit instantiation of undefined template
'QSharedPointer<VInternalVariable>'.

--HG--
branch : develop
2017-09-12 07:42:27 +03:00
Roman Telezhynskyi
27f605dc65 Fixed issue #752. Valentina produces corrupted file if unite two pieces.
(grafted from e0e2d27ac2a1f8f43879218a97924481ae674c77)

--HG--
branch : develop
2017-09-11 15:56:18 +03:00
Roman Telezhynskyi
3499b04c56 Remove space as thousands separator when return formula to user.
(grafted from 11b585c55b443564fefcff38cd7ce297d31659c0)

--HG--
branch : develop
2017-09-06 09:58:48 +03:00
Roman Telezhynskyi
d77acc524c Resolved issue #731. Improve tab Increments. Separate the tab on two:
Increments and Preview Calculation.

--HG--
branch : develop
2017-09-02 14:47:44 +03:00
Roman Telezhynskyi
c33b178e3c Template recognizes new placeholders.
--HG--
branch : feature
2017-08-30 09:32:39 +03:00
Roman Telezhynskyi
2885d95a43 Added dialog Pattern materials.
--HG--
branch : feature
2017-08-30 07:26:18 +03:00
Roman Telezhynskyi
8a53a7af71 Clang warning.
--HG--
branch : develop
2017-08-21 20:14:39 +03:00
Roman Telezhynskyi
ae870b8b2e Fix conflict of names.
--HG--
branch : develop
2017-08-21 17:10:55 +03:00
Roman Telezhynskyi
20f5cb3694 Read measurements size and height from individual measurements file to insert
data into label template.

The size measurement was added as synonym of bust_arc_f.

--HG--
branch : feature
2017-08-21 14:25:27 +03:00
Roman Telezhynskyi
4841a7937d Refactoring. Remove unused method.
--HG--
branch : feature
2017-08-21 14:22:25 +03:00
Roman Telezhynskyi
acf429518d Added more additional Piece label fields.
--HG--
branch : feature
2017-08-21 13:16:43 +03:00
Roman Telezhynskyi
f07fd426dd Clearing old code.
--HG--
branch : feature
2017-08-18 14:22:31 +03:00
Roman Telezhynskyi
09c67a099a UI changes for piece label.
--HG--
branch : feature
2017-08-17 19:18:03 +03:00
Roman Telezhynskyi
b80bd85dec Just replace() method is enough. It replaces all occurrences.
--HG--
branch : feature
2017-08-15 15:21:31 +03:00
Roman Telezhynskyi
5a649d4747 Fix bug translation placeholders.
--HG--
branch : feature
2017-08-14 17:13:16 +03:00
Roman Telezhynskyi
0b3342fe3d Translation from/to user text.
--HG--
branch : feature
2017-08-14 15:48:14 +03:00
Roman Telezhynskyi
89ed92e93f Added more placeholders.
--HG--
branch : feature
2017-08-14 15:11:14 +03:00
Roman Telezhynskyi
5fa0324185 Fix translation elarc variables.
--HG--
branch : develop
2017-08-08 18:27:36 +03:00
Roman Telezhynskyi
16ec3a3ea8 User should be able to rename increments.
--HG--
branch : develop
2017-08-08 17:43:41 +03:00
Roman Telezhynskyi
6f5199c5d1 Performance optimization.
--HG--
branch : develop
2017-08-05 11:03:19 +03:00
Roman Telezhynskyi
8dc5b739ad Cppcheck warning.
--HG--
branch : develop
2017-08-04 22:50:06 +03:00
Roman Telezhynskyi
0cea5c3347 Performance optimization.
--HG--
branch : develop
2017-08-04 21:25:59 +03:00
Roman Telezhynskyi
0a500c52dd Performance improvement.
--HG--
branch : develop
2017-08-04 20:46:11 +03:00
Roman Telezhynskyi
3999ebd82e Fixed bug in Tape. Each Window should has own size and height values.
--HG--
branch : develop
2017-08-04 20:29:43 +03:00
Roman Telezhynskyi
825b0b1431 Don't need to prepare increments because they do not support multi size
measurements anymore.
(grafted from ca88ea9874acb7e08edafe84ca716e58b6e4b05e)

--HG--
branch : develop
2017-08-04 13:05:48 +03:00
Roman Telezhynskyi
474c0949e2 Fix translation variables.
(grafted from dff11ab321d8eb16de58f01b70913190f527809c)

--HG--
branch : develop
2017-08-04 10:28:44 +03:00
Roman Telezhynskyi
a6bafb77e1 Resolved issue #734. Optimization. Stop increments/variables table from
updating immediately.

--HG--
branch : develop
2017-07-23 16:52:57 +03:00
Roman Telezhynskyi
45f860e9b3 By default internal paths should be in draw mode.
--HG--
branch : feature
2017-07-19 10:35:00 +03:00
Roman Telezhynskyi
54eadfdb3c Export to DXF-AAMA.
--HG--
branch : feature
2017-07-16 21:10:48 +03:00
Ronan Le Tiec
46f70788cf issue #654 refactoring the code so that the functions and variables are called xxx multisize xxx instead of xxx standard xxx
--HG--
branch : develop
2017-07-12 20:21:48 +02:00
Roman Telezhynskyi
b166ff83b2 Pieces should be positioned as on Detail mode. ref #660.
--HG--
branch : develop
2017-07-09 22:27:54 +03:00
Roman Telezhynskyi
b6e0d97df0 Qmake. Fix masks to support 64 bit versions of compilers.
--HG--
branch : develop
2017-07-05 11:35:32 +03:00
Roman Telezhynskyi
72ea1997fb Fixed issue #715. Build fails with Qt 5.9.1 / clang / macOS.
(grafted from d78ca13c4891ccf3542b0704a7d66af0f9b02938)

--HG--
branch : develop
2017-07-01 21:38:26 +03:00
Roman Telezhynskyi
bfd2620fad Next try to fix problem with tests.
Because different compilers and even different version from same vendor may
produce little bit different result this cause of test fails because it expect
too accurate result. We don't need such accuracy and can use variable
VGObject::accuracyPointOnLine to compare two points.

--HG--
branch : develop
2017-06-01 13:04:25 +03:00
Roman Telezhynskyi
cc5641a15c Added gcc’s 4.9.0 Undefined Behavior Sanitizer (ubsan).
--HG--
branch : develop
2017-06-01 10:14:17 +03:00
Roman Telezhynskyi
965d908663 GCC warnings.
--HG--
branch : develop
2017-05-30 18:44:16 +03:00
Roman Telezhynskyi
56dd8ef3b6 Resolved issue #684. Proposal: Add option to only show outer edges on detail.
--HG--
branch : develop
2017-05-16 15:16:50 +03:00
Roman Telezhynskyi
13a93ef5df Fix internal path support of pen style.
--HG--
branch : develop
2017-05-16 13:47:36 +03:00
Roman Telezhynskyi
03a9b07eff Fixed issue #673. The Insert Node tool changes Label.
--HG--
branch : release
2017-04-28 09:38:09 +03:00
Roman Telezhynskyi
677ef71626 Added second case when create a passmark for point that lies on line.
--HG--
branch : release
2017-04-27 18:19:23 +03:00
Roman Telezhynskyi
c9e005c65b Small improvements for passmark.
Added new option that allow localy disable the second passmark on the seam line.

--HG--
branch : release
2017-04-26 11:22:42 +03:00
Roman Telezhynskyi
89bf3cc005 Revert previos changes. ref #668.
Do not ignore nodes if a passmark is part of main path.

--HG--
branch : release
2017-04-26 08:07:07 +03:00
Roman Telezhynskyi
585213412c Fix case with custom piece path as part of main path. ref #668.
--HG--
branch : release
2017-04-25 20:48:32 +03:00
Roman Telezhynskyi
7840bf04eb Resolved issue #668. Passmarks on Hems.
--HG--
branch : release
2017-04-25 11:42:08 +03:00
Roman Telezhynskyi
e2f1b87596 Fix typo.
--HG--
branch : release
2017-04-22 17:24:25 +03:00
Roman Telezhynskyi
45ce22d6e3 SonarQube warning.
--HG--
branch : release
2017-04-21 18:01:43 +03:00
Roman Telezhynskyi
b2ed7d9db4 Refactoring. Add a move assignment operator to all classes that use
QSharedDataPointer class to keep data.

--HG--
branch : release
2017-04-19 13:27:17 +03:00
Roman Telezhynskyi
ef9f9c6af4 Fixed issue #665. Passmark not correct.
--HG--
branch : release
2017-04-18 21:39:13 +03:00
Roman Telezhynskyi
c2609b98be Refactoring.
--HG--
branch : release
2017-04-18 11:49:05 +03:00
Roman Telezhynskyi
73c035ecc9 Fix bug with trigonometric functions.
Functions sin(), cos() and tan() take radians. And their counterparts asin(),
acos() and atan() return radians. Removed hyperbolic functions because they do
not work with radians.

--HG--
branch : release
2017-04-14 18:42:49 +03:00
Roman Telezhynskyi
9284bfec9b Use smart pointer to prevent memory leak.
--HG--
branch : release
2017-04-14 11:30:00 +03:00
Roman Telezhynskyi
d355b4dce8 Cppcheck warnings.
--HG--
branch : develop
2017-04-06 15:50:15 +03:00
Roman Telezhynskyi
c0f36dffbe Resolved issue #652. Show passmarks for builtin seam allowance.
--HG--
branch : develop
2017-04-05 13:22:33 +03:00
Roman Telezhynskyi
4cd09e54e4 Extend a passmark length to 50% of seam allowance width.
--HG--
branch : develop
2017-04-05 08:43:16 +03:00
Roman Telezhynskyi
a9bb99937c Try to fix error: ambiguous overload for 'operator>>' (operand types are
'QDataStream' and 'quint32 {aka unsigned int}').

--HG--
branch : develop
2017-04-04 08:20:49 +03:00
Roman Telezhynskyi
e2383eb500 Refactoring. Use "=default" instead of the default implementation.
--HG--
branch : develop
2017-04-01 17:27:55 +03:00
Roman Telezhynskyi
f9aa896477 Refactoring. Avoid implicit conversions.
--HG--
branch : develop
2017-03-31 17:04:11 +03:00
Roman Telezhynskyi
dc9ded6600 Cppcheck warnings.
--HG--
branch : develop
2017-03-30 13:59:10 +03:00
Roman Telezhynskyi
f05cd909a2 Unite nodes to be able to show passmarks from custom seam allowance included as
main path.

--HG--
branch : feature
2017-03-30 12:26:06 +03:00
Roman Telezhynskyi
d3ab7f5b16 Return -1 if was used global seam allowance width instead of calculating its
value.

--HG--
branch : feature
2017-03-30 11:09:12 +03:00
Roman Telezhynskyi
e2db513172 Refactoring. Remove unused variables.
--HG--
branch : feature
2017-03-30 11:08:11 +03:00
Roman Telezhynskyi
d1e28f4d46 Refactoring. Replace PassmarkLength by VAbstractPiece::MaxLocalSA.
--HG--
branch : feature
2017-03-30 11:07:42 +03:00
Roman Telezhynskyi
e19c9392a1 Custom seam allowance now visible again.
--HG--
branch : feature
2017-03-29 14:20:55 +03:00
Roman Telezhynskyi
11a7bf89b4 Piece path now works with passmarks.
--HG--
branch : feature
2017-03-29 14:18:33 +03:00
Roman Telezhynskyi
ebda4292a8 Merge with develop.
--HG--
branch : feature
2017-03-28 13:33:31 +03:00
Roman Telezhynskyi
b9bebcaeb4 Show passmarks in the main path.
--HG--
branch : feature
2017-03-28 13:09:00 +03:00
Roman Telezhynskyi
39c11130f9 Fix bug with internal move of nodes inside the main path.
--HG--
branch : feature
2017-03-28 12:08:33 +03:00
Roman Telezhynskyi
f8836cf563 Fix translation bug. Default names for increment and measurement should also
be validated in unit tests.

--HG--
branch : develop
2017-03-28 10:18:19 +03:00
Roman Telezhynskyi
e9c9d263f6 Skip excluded nodes when prepare segment of curve.
--HG--
branch : feature
2017-03-25 10:18:03 +02:00
Roman Telezhynskyi
81b88db5cc Dialog Seam allowance tool now supports passmarks.
--HG--
branch : feature
2017-03-24 13:08:16 +02:00
Roman Telezhynskyi
e995f6f68a Added new tool Insert node.
--HG--
branch : feature
2017-03-22 12:05:53 +02:00
Roman Telezhynskyi
7fe86bc319 Successful build.
--HG--
branch : feature
2017-03-21 17:18:48 +02:00
Roman Telezhynskyi
47e50fe06f Fixed bug with internal path in layout piece.
--HG--
branch : develop
2017-03-18 10:44:27 +02:00
Roman Telezhynskyi
1ab541236d Successful build.
--HG--
branch : feature
2017-03-13 14:27:29 +02:00
Roman Telezhynskyi
38409f747f Successful build.
--HG--
branch : feature
2017-03-11 15:25:21 +02:00
Roman Telezhynskyi
fa50c1f4f7 Merge with develop.
--HG--
branch : feature
2017-03-10 18:56:18 +02:00
Murloc
506ca0612c Add 200 in heights
--HG--
branch : feature
2017-03-09 21:41:48 +01:00
Roman Telezhynskyi
fb402f84b7 Dialog get/set grainline center pin point.
--HG--
branch : feature
2017-03-09 13:10:46 +02:00
Roman Telezhynskyi
d47505b076 Merge with develop.
--HG--
branch : feature
2017-02-28 17:34:11 +02:00
Georg von Zengen
159432927a qmuparser: added triangular functions that work with degree
new functions are: degTorad, radTodeg, , sinD, cosD, tanD, asinD, acosD , atanD, sinhD, coshD , tanhD, asinhD, acoshD, atanhD

--HG--
branch : feature
2017-02-27 20:42:35 +01:00
Roman Telezhynskyi
5dff5b36d0 Fixed issue #631. Runtime Error when using elliptical arc and opening
Measurements Table of Variables or Formula Wizard.

--HG--
branch : develop
2017-02-26 09:00:40 +02:00
Roman Telezhynskyi
67a12ef86c Copy-on-write for class VPieceLabelData.
--HG--
branch : feature
2017-02-23 14:46:53 +02:00
Roman Telezhynskyi
2b1cd5c96c Copy-on-write for class VPatternLabelData.
--HG--
branch : feature
2017-02-23 14:36:08 +02:00
Roman Telezhynskyi
f36a4d6621 Copy-on-write for class VGrainlineData.
--HG--
branch : feature
2017-02-23 14:04:49 +02:00
Roman Telezhynskyi
9714e8cb07 Copy-on-write for class VAbstractFloatItemData.
--HG--
branch : feature
2017-02-23 13:50:13 +02:00
Roman Telezhynskyi
c5c3c73429 Added pin point ids.
--HG--
branch : feature
2017-02-23 13:36:56 +02:00
Roman Telezhynskyi
3cfefbe698 Refactoring. New parent VAbstractFloatItemData.
--HG--
branch : feature
2017-02-23 13:26:12 +02:00
Roman Telezhynskyi
1710e3cdb7 Refactoring. Prepare folder structure for new hierarchy.
--HG--
branch : feature
2017-02-23 11:37:19 +02:00
Roman Telezhynskyi
a287913500 Refactoring. Rename class VGrainlineGeometry to VGrainlineData.
--HG--
branch : feature
2017-02-23 11:33:17 +02:00
Roman Telezhynskyi
4e3ee3eefd Refactoring. Rename class VPatternInfoGeometry to VPatternLabelData.
--HG--
branch : feature
2017-02-23 11:26:25 +02:00
Roman Telezhynskyi
37efefe1ec Refactoring. Rename class VPatternPieceData to VPieceLabelData.
--HG--
branch : feature
2017-02-23 11:19:27 +02:00
Roman Telezhynskyi
3bf65edaa6 Merge with develop.
--HG--
branch : feature
2017-02-22 14:48:48 +02:00
Roman Telezhynskyi
b31a8d4c6b Extend max size to 72 cm.
Request from a user. See
http://forum.valentina-project.org/t/extension-of-standard-measurements/957

--HG--
branch : develop
2017-02-22 07:54:42 +02:00
Roman Telezhynskyi
38abf5c9a0 Removed redundant forward declaration.
--HG--
branch : develop
2017-02-18 11:22:59 +02:00
Roman Telezhynskyi
71ac49a221 Merge with develop.
--HG--
branch : feature
2017-02-13 15:29:37 +02:00
Roman Telezhynskyi
6fd45d9e2c Path should also supports elliptical arc.
--HG--
branch : develop
2017-02-10 16:47:15 +02:00
Roman Telezhynskyi
d7f9898edc Fixed a typo.
--HG--
branch : develop
2017-02-09 17:16:47 +02:00
Roman Telezhynskyi
aace2e0178 Internal paths in layout now support pen style.
--HG--
branch : develop
2017-02-08 13:48:05 +02:00
Roman Telezhynskyi
ac6969d64f Resolved issue #620. Detail path not correct. Previous curve also should cut
segment.

--HG--
branch : develop
2017-02-06 17:19:59 +02:00
Roman Telezhynskyi
ad403850bc Save pin inside a piece.
--HG--
branch : feature
2017-01-31 18:09:18 +02:00
Roman Telezhynskyi
a58a479db5 Refactor VPiece class. Instead of method AppendInternalPath() use overloaded
getter.

--HG--
branch : feature
2017-01-31 16:26:28 +02:00
Roman Telezhynskyi
a7987422ae Cppcheck warnings.
--HG--
branch : feature
2017-01-25 17:04:53 +02:00
Roman Telezhynskyi
9a51b165ac Refactoring. Eliminate unneeded reverse points and two methods hidden in
anonymous namespace.

--HG--
branch : feature
2017-01-25 16:12:36 +02:00
Roman Telezhynskyi
e206ef3d5d Instead of "-1" use local variable "CurrentSeamAllowance" if value is default.
--HG--
branch : feature
2017-01-25 11:40:10 +02:00
Roman Telezhynskyi
49167c0c3c Fix conversion to new seam allowance.
--HG--
branch : feature
2017-01-25 11:32:52 +02:00
Roman Telezhynskyi
7817936d3e Fix conversion bug.
--HG--
branch : feature
2017-01-23 14:03:07 +02:00
Roman Telezhynskyi
8c1bd37491 Show piece's internal paths on a layout.
--HG--
branch : feature
2017-01-22 14:32:25 +02:00
Roman Telezhynskyi
26c76bbc71 Replace VDetail by VPiece.
--HG--
branch : feature
2017-01-21 19:12:57 +02:00
Roman Telezhynskyi
0ef10c01b0 A piece seam allowance can be controlled by formula.
--HG--
branch : feature
2017-01-21 15:24:40 +02:00
Roman Telezhynskyi
25a2717682 Added new local variable "CurrentSeamAllowance".
--HG--
branch : feature
2017-01-20 15:58:35 +02:00
Roman Telezhynskyi
ccc8da800f Pieces should disappear from the list when deleted.
--HG--
branch : feature
2017-01-18 12:22:02 +02:00
Roman Telezhynskyi
d2ff75dedc Tool Union Details now works.
--HG--
branch : feature
2017-01-18 10:17:18 +02:00
Roman Telezhynskyi
8b839c7002 List of pieces should also be cleared.
--HG--
branch : feature
2017-01-18 10:15:51 +02:00
Roman Telezhynskyi
7490200806 Fix tool Union Details's dialog.
--HG--
branch : feature
2017-01-17 13:49:55 +02:00
Roman Telezhynskyi
bfd76b4e60 Code style.
--HG--
branch : feature
2017-01-17 13:49:21 +02:00
Roman Telezhynskyi
6faa0bc318 First successful build. The redesign is not finished.
--HG--
branch : feature
2017-01-16 12:08:13 +02:00
Roman Telezhynskyi
c9cb6adc36 VToolSeamAllowance add grain line and labels. Only the tool.
--HG--
branch : feature
2017-01-12 15:51:08 +02:00
Roman Telezhynskyi
3634867c47 Try to fix Qt error.
--HG--
branch : feature
2017-01-11 15:01:49 +02:00
Roman Telezhynskyi
b4c4a22a4c Merge with develop.
--HG--
branch : feature
2017-01-03 11:48:22 +02:00
Roman Telezhynskyi
da6cd92b22 Resolved issue #606. Mac OS X. Can’t type in measurements due to digit count
limitation.

--HG--
branch : develop
2017-01-03 11:14:32 +02:00
Roman Telezhynskyi
0467033855 Fix potential memory leak.
--HG--
branch : develop
2017-01-03 10:58:52 +02:00
Roman Telezhynskyi
86f4b21879 Instead of method QLocale::system() better to use the default constructor.
Usefull in case we will deside change default locale.

--HG--
branch : develop
2017-01-03 10:46:28 +02:00
Roman Telezhynskyi
0419f60e0b Merge with develop.
--HG--
branch : feature
2016-12-23 12:58:17 +02:00
Roman Telezhynskyi
5153e997d1 Fix warning "using-directive shall not be used.".
--HG--
branch : develop
2016-12-21 14:02:55 +02:00
Roman Telezhynskyi
2d61b87256 Remove empty statement.
--HG--
branch : develop
2016-12-20 21:19:21 +02:00
Roman Telezhynskyi
ffab000e0f Remove empty statement.
--HG--
branch : develop
2016-12-20 20:57:20 +02:00
Roman Telezhynskyi
0882313f1e Merge with develop.
--HG--
branch : feature
2016-12-20 17:42:51 +02:00