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
Jaime van Kessel
dbfa5873ce
Merge branch '2.5' of github.com:Ultimaker/Cura
2017-03-30 17:03:01 +02:00
Jack Ha
76c1c31cf4
Merge branch '2.5' of github.com:Ultimaker/Cura into 2.5
2017-03-30 16:27:19 +02:00
Jack Ha
1164805a68
WIP Solved stash apply. CURA-3610
2017-03-30 16:26:39 +02:00
Jack Ha
3135dc7d77
Solved MC
2017-03-30 16:20:08 +02:00
Jaime van Kessel
6314d872e1
If we find multiple materials for a new extruder, prefer a read only material
...
CURA-3147
2017-03-30 16:07:26 +02:00
Jack Ha
fa7a026efe
Merge branch '2.5' of github.com:Ultimaker/Cura into 2.5
2017-03-30 16:05:07 +02:00
Jack Ha
da5288ea78
Fix updating allowed areas. CURA-3610
2017-03-30 16:04:57 +02:00
Jaime van Kessel
cd5e883010
Build volume now uses IsSlicable decorator to check for scene changes
...
CURA-3608 Fixes #1598
2017-03-30 11:24:01 +02:00
Tim Kuipers
a4272bf7be
Merge branch 'master' into feature_mold
2017-03-30 11:16:27 +02:00
Jaime van Kessel
13561bdb46
material_amounts is now defined in init
...
Somehow this was forgotten, which could cause issues in certain cases.
CURA-3617
2017-03-30 10:47:11 +02:00
Arjen Hiemstra
1f0f8cd6ea
Make GlobalStack a subclass of CuraContainerStack
2017-03-30 08:58:21 +02:00
Arjen Hiemstra
202f19a081
Make ExtruderStack a subclass of CuraContainerStack
2017-03-30 08:58:05 +02:00
Arjen Hiemstra
d4400b8674
Introduce a CuraContainerStack that has all the code shared between global and extruder
...
Since there is actually quite a lot of it
2017-03-30 08:57:37 +02:00
jack
3a255b341f
Merge pull request #1586 from fieldOfView/fix_radius0
...
Fix crash when editing material diameter
2017-03-29 10:43:41 +02:00
jack
f50c3f430a
Merge pull request #1586 from fieldOfView/fix_radius0
...
Fix crash when editing material diameter
2017-03-29 10:37:13 +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
fieldOfView
ba06f06cd0
Optimize code
2017-03-28 20:17:51 +02:00
Arjen Hiemstra
317576e983
Set container entry to empty if it was not found in the original container
2017-03-28 18:14:16 +02:00
Arjen Hiemstra
75931192f6
Allow setting Definition and setting Definition by ID
...
To match the other properties
2017-03-28 17:46:28 +02:00
Arjen Hiemstra
123c8bae45
Allow setting userChanges container
...
Since that makes it possible to create an external factory method for
creating stacks and makes the properties more consistent.
2017-03-28 17:46:00 +02:00
Arjen Hiemstra
2f6936c961
Fix type checking in GlobalStack
2017-03-28 17:45:15 +02:00
Arjen Hiemstra
4cea1b6d33
Fix error case in addExtruder
...
Error out when the new size is going to be more than extruderCount
instead of whether it currently is more than extruderCount.
2017-03-28 17:44:29 +02:00
Arjen Hiemstra
4005f5082b
Allow setting of properties on GlobalStack
2017-03-28 17:43:11 +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
Arjen Hiemstra
b6fafb06ed
Ensure we initialize the list of containers for GlobalStack
2017-03-27 17:52:38 +02:00
Arjen Hiemstra
39803cf7dd
Add missing imports to Extruder/GlobalStack
2017-03-27 17:52:16 +02:00
Arjen Hiemstra
5196ea695c
Add a notify signal to all container properties in GlobalStack
...
Contributes to CURA-3497
2017-03-27 01:35:34 +02:00
Arjen Hiemstra
dd8ea6175c
Add properties for user changes etc. to ExtruderStack
2017-03-27 01:32:36 +02:00
fieldOfView
67d66905ba
Fix crash when editing material diameter
...
While editing the diameter value in the materials pane, it can happen that the radius evaluates to 0. This led to a division by zero.
Fixes https://github.com/Ultimaker/Cura/issues/1582
2017-03-26 14:08:07 +02:00
Arjen Hiemstra
de1dbfbc07
Override replaceContainer and add some type checking
...
type in this case being container type
Contributes to CURA-3497
2017-03-23 17:55:21 +01:00
Arjen Hiemstra
dc0c666a54
Disable add/insert/remove container
...
Since we want to have a fixed list of containers in the stack.
Contributes to CURA-3497
2017-03-23 17:55:21 +01:00
Arjen Hiemstra
5ad0651fd1
Add an "extruders" property and an addExtruder method
...
Contributes to CURA-3497
2017-03-23 17:55:21 +01:00
Arjen Hiemstra
462d5fac8d
Add setters for properties
...
Contributes to CURA-3497
2017-03-23 17:55:21 +01:00
Arjen Hiemstra
f97a6ebd74
Move exceptions to their own file
...
Since that keeps the GlobalStack cleaner
Contributes to CURA-3497
2017-03-23 17:55:21 +01: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
Jaime van Kessel
94c6b23418
Codestyle & removal unused imports
2017-03-22 11:38:55 +01:00
Jack Ha
72db7772f5
Merge branch '2.5'
2017-03-22 09:44:47 +01:00
Jack Ha
3d6e378289
Revert accidently added test-code.
2017-03-22 09:44:21 +01:00
Jack Ha
8275c419c1
Merge branch '2.5'
2017-03-22 09:34:06 +01:00
Jack Ha
40a7d2fecc
Added not supported quality profiles. CURA-3555
2017-03-22 09:33:17 +01:00
Arjen Hiemstra
411e3a3976
Fix up a bunch of things with type hints and imports
2017-03-21 17:45:07 +01:00
