1234 Commits

Author SHA1 Message Date
Jack Ha
a83b1dd638 Split ShapeArray from Arranger. CURA-3239 2017-04-03 14:48:31 +02:00
Jack Ha
d6cd37626b Removed logging, improved spot for left-over object. CURA-3239 2017-04-03 11:47:04 +02:00
Jack Ha
e866c03b50 Fixed multiplyObject group. CURA-3239 2017-04-03 11:12:20 +02:00
Jack Ha
bd874a62ac Arranger: moved functions, split Arrange into Arrange All and Arrange Selection. CURA-3239 2017-04-03 10:44:53 +02:00
Jack Ha
abb5d1e76e Arranger: moved functions, split Arrange into Arrange All and Arrange Selection. CURA-3239 2017-04-03 10:40:04 +02:00
Jaime van Kessel
786a4565b7 Added a few plugins to required list 2017-03-31 10:30:13 +02:00
Jaime van Kessel
e0c77231e0 Merge branch 'master' of github.com:Ultimaker/Cura 2017-03-30 20:04:18 +02:00
Jaime van Kessel
891aebc366 Removed getBackend from Cura (and onto Uranium) 2017-03-30 20:03:21 +02:00
Lipu Fei
c74ff4b204 Catch exceptions when checking if a file is a project 2017-03-30 19:08:19 +02:00
Jaime van Kessel
0c6d0a0abb Moved recent files into Uranium
USL-41
2017-03-30 18:35:41 +02:00
Jack Ha
9db816b0fc Funed arranger for better performance. CURA-3239 2017-03-30 17:26:56 +02:00
Jack Ha
099752125b Arrange all now places biggest objects first. CURA-3239 2017-03-29 10:00:21 +02:00
Jack Ha
f357dea086 Tuned arranger a bit, good enough for proof of concept. CURA-3239 2017-03-29 09:32:29 +02:00
Jack Ha
bf08d30e7d Added first arrange function and smart placement after loading. CURA-3239 2017-03-28 14:27:22 +02:00
Tim Kuipers
7a67ab4e66 Merge branch '2.5' 2017-03-28 12:55:18 +02:00
Jack Ha
d8c20b9d6c First version of multiply object seems to work quite well. CURA-3239 2017-03-28 11:33:07 +02:00
Jaime van Kessel
6367755875 Disabled center_on_select for windows, as pyqt has a bug with it 2017-03-28 10:21:52 +02:00
Jaime van Kessel
8023341090 Merge branch '2.5' of github.com:Ultimaker/Cura 2017-03-23 15:15:08 +01:00
Jaime van Kessel
ecbf0e1e28 Only add center to list for merge if there is one 2017-03-23 15:14:34 +01:00
Jack Ha
462f3abead Merge branch 'master' into feature_arrange 2017-03-23 15:02:04 +01:00
Lipu Fei
622ff4e662 Add default for preference "view/invert_zoom" 2017-03-21 13:56:12 +01:00
Lipu Fei
9e5513ade6 Use QUrl to parse fileUrl
CURA-3495
2017-03-21 13:56:11 +01:00
Lipu Fei
f3167bb84b Add dialog for opening a project file
CURA-3495
2017-03-21 13:56:09 +01:00
Jaime van Kessel
70dbeaf256 Merge branch '2.5' of github.com:Ultimaker/Cura 2017-03-21 13:24:06 +01:00
Lipu Fei
555cd58f5e Save with code names for profile override preference
CURA-3561
2017-03-21 09:09:17 +01:00
jack
42e7a0defa Merge pull request #1535 from LipuFei/feature_CURA-3495_open_in_one
CURA-3495 Open project/models menu item
2017-03-20 10:59:40 +01:00
Jack Ha
7604ae62f3 Merge branch '2.5' 2017-03-16 16:04:59 +01:00
Jack Ha
7d62a699fb Capitalize Not Supported. CURA-3390 2017-03-16 16:04:47 +01:00
Lipu Fei
e00c68344a CURA-3495 open project/models in one dialog 2017-03-16 13:37:06 +01:00
Jaime van Kessel
138c3db26f Preferred mimetype is now used when saving to local or removable drive
CURA-3496
2017-03-15 09:23:47 +01:00
Jack Ha
9d6dd1580b WIP Added first arranger functions. CURA-3239 2017-03-09 10:21:25 +01:00
Jack Ha
42d939b34e Solved merge conflict. CURA-3321 2017-03-07 10:34:53 +01:00
Tim Kuipers
87c8ff0e08 Merge branch 'mb-infill-line-angles' of https://github.com/smartavionics/Cura into smartavionics-mb-infill-line-angles 2017-03-06 14:31:57 +01:00
Jaime van Kessel
419396cc16 Merge branch 'feature_CURA-3397_profile_override_dialog_options' of https://github.com/LipuFei/Cura 2017-03-03 14:43:42 +01:00
Lipu Fei
67b57129ed CURA-3397 Add options for profile override dialog 2017-03-03 13:23:32 +01:00
Jack Ha
1029fb4ddd Not to trigger reslice happy anymore, only retrigger if necessary. Also using isSliceable instead of property check when inspecting root node. CURA-3413 CURA-3412 2017-03-02 16:38:31 +01:00
jack
fee73c352c Merge pull request #1481 from Ultimaker/feature_override_profile
Feature override profile
2017-03-01 13:52:05 +01:00
Jack Ha
ba6a8eb869 Legend is now in the switching layer type area, removed legend upper right. CURA-3321 2017-02-28 13:34:58 +01:00
Jaime van Kessel
85b58c9296 Pressing the discard button now actually discards the changes
CURA-3221
2017-02-28 12:35:08 +01:00
Jaime van Kessel
2462699982 Switching profiles now shows a new dialog with all the changes.
CURA-3221
2017-02-28 10:25:42 +01:00
Jack Ha
8237421bcf Undo testing QVector3D. CURA-3334 2017-02-27 13:33:55 +01:00
Jack Ha
d300aad781 Merge branch 'master' of github.com:Ultimaker/Cura 2017-02-27 11:20:29 +01:00
Jack Ha
ccac9277a9 Undo old testcode, added testcode for CURA-3334 2017-02-27 11:20:22 +01:00
Simon Edwards
4ab6b74930 Fixed a bunch of error which were reported by PyCharm's code analysis. 2017-02-26 21:05:09 +01:00
Jack Ha
c785256ac4 Possible fix for CURA-3334 2017-02-22 10:38:07 +01:00
Jack Ha
057dc2fd7d Solved merge conflicts. CURA-3214 2017-02-21 11:01:20 +01:00
Jack Ha
cd54552498 Merge branch 'master' of github.com:Ultimaker/Cura 2017-02-20 09:45:51 +01:00
Jack Ha
b229d38a88 LayerView checkboxes are not remembered; added switching Legend on for compatibility mode. CURA-3273 2017-02-20 09:45:37 +01:00
fieldOfView
9229027001 Refactor properties that start with 'get' to avoid confusion between slots & properties
Case in point: LayerViewProxy.getLayerViewType was decorated as a property but was used/intended as a slot.
2017-02-17 13:35:01 +01:00
Jack Ha
74ce600978 Comments and removed logs. CURA-3214 2017-02-16 15:23:31 +01:00