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
Arjen Hiemstra
88e8138004
Override ContainerStack::deserialize
...
This ensures we have the right set of containers in the stack
2017-03-21 17:44:36 +01:00
Arjen Hiemstra
95a6bef50f
Add properties for the individual containers in the global stack
2017-03-21 17:43:42 +01:00
Arjen Hiemstra
37b4326e99
Mark addContainer as override
2017-03-21 17:43:14 +01:00
Arjen Hiemstra
f32f8b60df
Explictly import Extruder/Global stack
...
For some reason, things were not being imported properly. This fixes
that.
2017-03-21 17:42:57 +01:00
Arjen Hiemstra
3ee3e0aee3
Add a private class to GlobalStack that defines the expected indices of each container type
2017-03-21 17:39:06 +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
Jaime van Kessel
90a92dce19
If a container_changes can not be found, handle it more gracefully
...
CURA-3560
2017-03-21 13:23:50 +01:00
Jaime van Kessel
00258e570f
If a container_changes can not be found, handle it more gracefully
...
CURA-3560
2017-03-21 11:13:10 +01:00
Lipu Fei
555cd58f5e
Save with code names for profile override preference
...
CURA-3561
2017-03-21 09:09:17 +01:00
Arjen Hiemstra
4904e449a0
Start overriding getProperty in GlobalStack
...
Since we have the "resolve" property, we should transparently handle it
so lookup can just use "value".
Contributes to CURA-3497
2017-03-20 17:30:00 +01:00
Arjen Hiemstra
0656dd53c3
Override setNextStack in GlobalStack and raise an error if called
...
Since the global stack should never have a next stack
Contributes to CURA-3497
2017-03-20 17:28:42 +01:00
Arjen Hiemstra
b9f01b30c8
Convert generic "ContainerStack" to an Extruder or Global stack
...
Dependendant on the "type" metadata key, we create either an
ExtruderStack or a GlobalStack instance to replace the ContainerStack
instance. This should allow for transparent upgrades to the new classes.
Contributes to CURA-3497
2017-03-20 17:28:01 +01:00
Arjen Hiemstra
12c50dbac8
Introduce a GlobalStack class
...
This will allow us to codify some of the assumptions made about the
global stack
Contributes to CURA-3497
2017-03-20 17:26:12 +01:00
Arjen Hiemstra
3b0fdecb60
Introduce an ExtruderStack class
...
This will allow us to codify some of the assumptions made about
extruders.
Contributes to CURA-3497
2017-03-20 17:22:11 +01:00
Jack Ha
df09d49217
Merge branch '2.5'
2017-03-20 14:10:07 +01:00
Jack Ha
2b17f9665f
Fix prime tower location/visualization on buildplate. CURA-3525
2017-03-20 14:09:55 +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
Ghostkeeper
2f1d957f99
Split support_interface_enable into roof and bottom
...
You can activate the roof and bottom separately now. If you want, of course. The original interface setting sets both of them unless overwritten.
Contributes to issue CURA-3491.
2017-03-20 10:47:37 +01:00
